6582 files changed, 72178 insertions, 62295 deletions

diff --git a/Manifest b/Manifest
index 3adfdfff03e4..c26c4890975f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29286 BLAKE2B d580a31c29b42d1dd7ca800579669dde5716ef3df5ef00e37357c9f10efcedf6c94b5bef1d3524679312bdfa40da5b4fe998cf5ea5f5dc2094d0dbfa809985ae SHA512 09a5158fea9ff6558cacd1707b9f441fac1741ab0d8dd1677a79a435daddb91eb61b6fa68e51b4734bc8cdf4c549c2f95d49d4e65787f836ebb7bd90e3845873
-TIMESTAMP 2019-05-21T08:08:53Z
+MANIFEST Manifest.files.gz 29319 BLAKE2B f31eabd58f5301c6af175c1f9b7e7d28f2307221ebe9fdab963a0ac12fabddb663f7bf5355ac6f158dd6f6ba24c4c4b8ddccf6b0bb4f2a78c6591304260f39d9 SHA512 2fa90cc994e61350733eba70f650794b2689a833f2b4a4ccd5e608437043842d00f143cab3870010c317f02350211aefca21e83714bd63973284f63e5681395a
+TIMESTAMP 2019-06-02T20:08:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlzjshVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlz0LNtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDkcA/+I2mH3Pj07NJUWsBabc3Fk+kpF3q7BvnDqNwD4nYNgbGSQZbb2kYmUTdZ
-qlwi/ctQI3twHO9zi+LzLvsCqy7nhNsxh2LGDhAGbHqPkzt5M93Al/FjZYI7B9v4
-bNc2TFnU+v4yaAC/MP+P+fk0IzdSNOBVydq1Ute2AfP8cKjKbQP/dP9ieJJlUhzR
-8LXBfuRWIehqfd7Du3m15SkzzdKXuXip/eIacqmfT2eCC2JSv2oyxH3RN6WOQA0w
-qOM1xrOw5Ld08oYAhZAEQ5iLHAhm4PotB9Dl80QNLjJ0q/y09rTCsCnfardZ2e3B
-TcImNTEdht+n1Txwd35rGg3zTOPMoAsGD5PiC+38/WHAGWarezTWOTsit59O0OyT
-Y7IrUxwDBQdCHAHLHuq1L180O9QPVzzb3UfMQcBsIh3UV7xfBFTOwrl4qeeQumyG
-i5FyPUda8zgZQgxMskFBHZZmPcam7vBhkzN4uyIZlsldmO77APSCxTYPT+j1np/Q
-FHMbbuWT2Tx5CNceLctdR4htK2lsp4ajroSdbJzVy9mXArTIbeEzN3MGl3UuMZvf
-9FfkOncnUeMkx0CpW5eRk4c9cVbdhkLyou4yzL7gN1M8ggmhMIkY1SQpZ1Qylrfm
-18YQT8yNEiY0yOt1aGnIH/i+l4ShJQkXVlopU8IMUnqd7SVYdIA=
-=urB9
+klD5VA/9GBatofooOgI9smmAt5ZpWe2TR1I9+R7wIo4BuxrH8qJ5KfWDGXbINog/
+BIjwA/9uREnR3G2hf0BX+he3HMZadkgHf73vggPRdhUr7Asp1M9ZKvXuBoSmyrg1
+XUDCw6G3OmgFeOWz9N8nSGgA9RmFJZaZbUlwj/JlpMG/ZWrasIkl41pPiV18NAKp
+bEhfgovojgT3l79TrShNEz5ZzJPenu3PxgsgFAZYBDBbVyQlHvbVqjsWUZhtfPf7
+pzixWlVRDlcu8DsfMzwG3RjCVYxwdq7U0Koe8DNNOvxXIEqSs2ItG1cGVg/k/gBB
+E0rMXpf30BZiq680RG55hAHVVZn1blF4nl2/NHNRkn7re/rFqqfDOwv6mw0bnSFO
+qvz8w2EG1Lk02fOWl4Ye8dI+nN/fa/Ox6yWCfqHr1eEaMkrteDvUxmXNvHuvjW27
+exIINEdcqajskzOxENYT3Sgd9MJ5QvpMNOmh13RSR4rL52dNYjwI5zHcp7+zqExy
+NpBBNsM32m/0Etn5/LmyzvHpvBRmSreJgxlWJgEBtxRFxuRZ6NIaxoq0wnDnnUpp
+zTcxYJa+i0mgP23rvZlANvdtq9wzYaCrjhCqSm1Ixa92YTYGoRFUrUaY+xPHDhXd
+W/2i3ZKB8gx6zZDTEbZP9d5darV4cW3qC7hu0+Y1W4JS6HIVlkk=
+=ztsG
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f6dbdebfbb68..17722d14b0df 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index f7a31f70b5eb..0ff82a8f8c9e 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 9126a4b569fd..f7a3db5a9144 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,5 +1,5 @@
 DIST at-spi2-atk-2.26.2.tar.xz 322800 BLAKE2B 108a01fd8c16816d9953ad42721080dd6dcb9f75c95c412387d7f54920998c66eb5855eb859e8e00096a47b387d05779691887a7717d31f4c70681d69a9c8266 SHA512 f938b8e2b999fcdfa13e9433bd13c39430bae2ceae0c664a24caccc6af522947bf73de02de3c359807f5370a85961193df2ba24b193b60b915c61828ea747bb2
 DIST at-spi2-atk-2.30.1.tar.xz 94812 BLAKE2B fe3ef77e749bef2300219fe32586ac0b871d06dce708ce8b7b57356a1fa17041c3f7b788e3e6d6b5f89dc97c3e8d43a9d1eb897ed8fbaac954f042421aef68b6 SHA512 862cccb65d2a8a7df4e899e4f53742535389a0efa0a75c936b52e68690c07e206b19d8308f0910cddb71bda0d803012d613f6959329ae43c411d1314062b7018
 EBUILD at-spi2-atk-2.26.2.ebuild 1045 BLAKE2B c31f716ec099bf46d0932c4aec785a85124882d69baa007345e1837e28521fc0c0c796d3373e42c70270e3eb401e398b71eb68acd47cfad7ac2f54d735de18bb SHA512 91e1ecd6ad2d751a0d1f73cd149767b0e03921965d59ba7722147547d0d55204dca5ecba251e761c95a42de586932e6be8167ed1b65579fa0b79d7ba91e9a676
-EBUILD at-spi2-atk-2.30.1.ebuild 1004 BLAKE2B 4725173708de83c3540565018532dd086a8653dc3a4de3317ca0f86a50f43256dcf454b096bd4e60024891868ec3eee8e7631eaf9ca18e14261918c1d68be448 SHA512 a19a00e0810c31e3f0601b7f0e43579acde3a54504800af077856564501fc31833fb49785b88b2fb25ef38c95c6c0ae43f6f7a5a8eb11a77d23bc65d67766b45
+EBUILD at-spi2-atk-2.30.1.ebuild 1003 BLAKE2B 2823e2d40473dc0fd35fc024c588c4a26cfaeda5c5cc614a18cba1da3ec3199780dc77e69bc242b10e7342b837c4a4f304c5dd9c08472040baa59d5488215a10 SHA512 121f444a4fdc16aa8eeea947e48f69df31579021e286a2300c45097041d80767ea784994faf34bb47ee7d3fcfd3ff7fb50276ad0fa58a7ae3be457bb0c6d3499
 MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.1.ebuild
index d6794533f74e..b99a06368849 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index a3bab5ba776f..0cc97396ed86 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -3,5 +3,5 @@ AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d983
 DIST at-spi2-core-2.26.2.tar.xz 494484 BLAKE2B 0c67cea9c0107fb6503a933de134eb662f192ae2a98734bde1b0629da151476858720d2dcb1791a00a44b61ae2ead945178fba659f88303c552567d7f3f9817b SHA512 6a8e158e30c37ce475467b6634aff046a318875271966d7bfa3e56052d0cd26cd37435d0b9ae14f079542b8b3e76088da5bd50ed39eb39f3f40394c55ed3f255
 DIST at-spi2-core-2.30.1.tar.xz 188056 BLAKE2B 8686a5bd0a359d575d052f5c42cec76bbd88f7d681decbcec92ef163d5f59dac4e642b544b928e141739479b9e349868c0f5ecb7d42a29e9b32615f27a852e52 SHA512 c8b6a2ae5f96ce7d8c1fd32c9fec861148ceff631069b417296425fe6e2ae15198628826e13a72e018871d38e12b1128aa299edcc45eaf3eb7bbff83774361cd
 EBUILD at-spi2-core-2.26.2.ebuild 1606 BLAKE2B 19e358388142aaf80fa64e30ab819a3021a6a37b089822d63f6524ed47450b1660c81a815db0632d8d8bf311feed2db5a3b69d127ecbb283c0be81f9b81b81af SHA512 7236f8967e3c733094c89fdb028cf9dbcf903778e235f1f40c0c01f64551e788f278b08f057c56f18ac50aa4669a002b5e851d132708069c47925eacc3b1ea30
-EBUILD at-spi2-core-2.30.1.ebuild 1523 BLAKE2B 151c99552307278e11a9d4f656cb6d980591364ea9aa47ee17053d92683a4b48c18f67fed5896b8c87d9c42377a72244bd979e9e9e028be5643df138356d2362 SHA512 9a9cea31b985d8553972632ff92a4a5bde8923f4becacf04bad10a06539edb7af6880a2660f55cf6413f927e029137e57b0f856418cbe906361573bfa8e5889e
+EBUILD at-spi2-core-2.30.1.ebuild 1522 BLAKE2B 23e4b577c93a0537f73a4134a306f0683d42ef7466fbbc209bfd123324dd5ab69b869d5426f9928ceccfe68434a094887df29918ff614f01187ce07e2db2e742 SHA512 0a5c882d39c98ae153f1228ee7cbf5c0768ab4ef73eaf3bd7751f7a5bc36ab9fdea1811cd561d6457f6f8dde8f2c3696759247105f3f2806eaadf0263e4c4d58
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.30.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.30.1.ebuild
index 243d384e11d4..1cc8db4969f3 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.30.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.30.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index be521a0c66a9..26f451492a2c 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -2,6 +2,6 @@ AUX espeak-1.48.04-gcc-6-fix.patch 531 BLAKE2B e17d5304b52ab2e805f63d685f05bf534
 DIST espeak-1.47.11-source.zip 2813649 BLAKE2B 0ebeabcfd8193dd0d37c43974616f5fc4d769bde7b0a730b37456cd1ab580ab84b5bc141804f4c25d7bff6f4b401fe46764e0117cd9c4a55e2216de6965c17b7 SHA512 77c3989fbd0e4aadae0da2d7f1c587854895ae103633704ee5b4042b0618897d01edffa80b1f13e6cbf356f2f31beaf4fdb7e90e4ab641d5286d559aaefe932b
 DIST espeak-1.48.04-source.zip 3019245 BLAKE2B a29da5eab832fa76b180049765f7fa671ebf47c0a68ee2cdfb0f4466846d97b2bf7b8f07dba747e236a27c9b077000bfd471e35b9744ffac7c9014679f5c04fd SHA512 f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa
 EBUILD espeak-1.47.11-r1.ebuild 2169 BLAKE2B b408bda739711e505f21c8d6848eb81aea9c012cd620fdd062b6a63d36500ecbfcbdca0ff5284e1a8225e34347ce742c5ae44cfbe9f5371fa25f9a9f60c5ac14 SHA512 e7f07689466f1d388170c9a88659b9d70529517e30af08d96297364e59733a69492599f683f91a7d54739817ae500f95f82bcdebe18af21e31473c9c66baa68e
-EBUILD espeak-1.48.04-r1.ebuild 2233 BLAKE2B c418cef82e2f14662f0d5165e38ddf26de0eddaf47191a44a7b9cf920e0ebda154333ef01a437bb222aa1d565be663b36e063cf1061b67e7b19e73cfffceb932 SHA512 0cf7bdd42f345134fa2b86f7a8bbdf2c834d2625d4f41d11f6b31355aefa3879e9c09901537c1a8495f08c4fb2a00a4926896cc59c7626e2099f64609711a156
+EBUILD espeak-1.48.04-r1.ebuild 2229 BLAKE2B 8fd88a1919884c4dfea657857a9c469e3aa7bae3e8642ddb2129f4e8de32d152f6e73c158592ccb1e869bd7dfa40063f2941edb1eb2c90181611c6478f0e826e SHA512 7fedc0f8ec3fa665fe1e3706935c32732ab33c7af66196a731d67dd505da5d51d06ae06d420f58eba69c36aa9b5932f2c090fad27e03fc5615cf4a4aa0243578
 EBUILD espeak-1.48.04.ebuild 2184 BLAKE2B 6b64fb9c609d35c708e6caac07671efa7faa0ee6ef20857283991898b76b8752ec1325c3011468d90c1a46574b33d3cd5f6e630617cf2e2f50abdd344d7c0b53 SHA512 25f0d32cc339ffe486127cc65e455cb5c5d757f3bd919c1a070af17645b09982fe70b5ab6932433701e040096f3adcc65d3ed93c65dcb80ba5c8e52b5d437659
 MISC metadata.xml 425 BLAKE2B a6169a58eac6bcb96da0494648d79f9d5de93430a267d7530f98204562da315deee7ac12f33b0b31e00bd25d190d63a89d00496f6f571ff9cbeb20bb9ee1e9bc SHA512 b3022c321c69fc77c743a0ef402af1801d426e3b72e84754100a4197a5a82df99bfe85b05411d0510e93a262b91d10d63189ff878af91383583e718b8e468f77
diff --git a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
index bc42c8624d34..fc83ff43998d 100644
--- a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
+++ b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Speech synthesizer for English and other languages"
 HOMEPAGE="http://espeak.sourceforge.net/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="portaudio pulseaudio"
 
 COMMON_DEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 )
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index bff77534e04f..e6b638c647cb 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,3 +1,3 @@
 DIST speech-dispatcher-0.8.7.tar.gz 1333677 BLAKE2B 0b08f1a1228fe1240e14b3d52913f8fa64a1f2ee9b563294b49ea8d3e5cfd3041aa5572ec72354b360dabd2d263deb79e418b95b6174a5b89ee541e9fd23c7e2 SHA512 0e7af02e8521aa8d397ea4d0329f9a8d56970beed645456dfedc738ececd2ccd8ecfdf66e92ae852878a473ba991175e1d4dc2b8b0148c958163682b49678375
-EBUILD speech-dispatcher-0.8.7.ebuild 2708 BLAKE2B 01c2c4d7508e5e758f40a13ba451323338a277114d3cf281f74b47a8c35a02bb2cceeba990aec75ed66ad6250c2f4ac453459d24d6c073c3194012c310c4a4f4 SHA512 483791e0c2842dc898c0a146d601a9053250c59f7695ff17b15ec8e431744c91f61de79f524579076cea7df6e168475dae9583e81feb6b2fa9bf1974bb6b42e1
+EBUILD speech-dispatcher-0.8.7.ebuild 2707 BLAKE2B 8f010e26ffdb79b57f3307b5ef16bfbdf72d8d1301370f2b5267d08e92500a0c2814098254fc8b5b09165d8dad85b9e7185990791aff3934b818b0f720fb9210 SHA512 f9fbc151c6e08e04b27e2c120f201764373306e9ba14e469ba8730e0b435b587689c6d340a7c09e3fd55560d57baa60bc89987deb2aa7da4051d7c44294cb492
 MISC metadata.xml 632 BLAKE2B 2a60d2e822db36bf3f0547d97ccaad05d6bcce11afa71534b108358f1d71f857f200907f01c31c3083a5196e43eb681c06e2991a086c91731daced3f56282c2d SHA512 db94cba99bd2c9bbfe98b1647ac53a3861cbd697df791bea025e2a713a5991ca6929f2bc82a985ba38eef4a2571515d96aac6558fe143b68e24713490c12dd0a
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
index 2f259014a446..09dbe1a312e6 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alsa ao +espeak flite nas pulseaudio python static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 25f0fe60e9d3..9128bbdb7772 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 8385ece773bd..9ad38af2fdb9 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,11 +1,15 @@
 DIST ansible-2.6.14.tar.gz 10732165 BLAKE2B c753860a521c37357c7a5042391957680865416c036fcaf3920a65e291dc3ed3a52e94ad5b99acdb0d2c919e3be68b8462e462a935497dfe83b406adf4e63dad SHA512 ee532c0d61ab03a0937e89bfa7565f27f1905987784f31895e8ac6e4a8ecf76ca9f30201d278a68a995b8fc27151712dba2e79c13269a472d923355e36072e4e
 DIST ansible-2.6.16.tar.gz 10738431 BLAKE2B b801eb524f631950c385f7a949bdeae288e95d1590ea96f98e955f6ebc4ccfc5970e3926727850e7ef13fbcd7118ad6388e516a8fe62b53f1bf8b4d5b484dbab SHA512 ff67803cf6afd512ab779b7c862d4427591c90bb0ed9391e32fc8ea30c24c70cc31c910c9af51b4dd423885f858f65c1c8d6274565c90296ecd7a00df3374977
+DIST ansible-2.6.17.tar.gz 10742849 BLAKE2B 04667612ab7d149d7a322ce674c2256164c0d958d3e5b34cafeba0b90d4f0f07ee95a31bf0c205c13c90ee4d63c3045ce2fc51de8996a7dcb877d39e2da680f5 SHA512 ba46192549be3e853232d865116c176aebd8ed2b63fcbb45cb633d3809fc534004849a70a2abad80f9fe99deeb55af3883ce1bfe0db4a9afd2f6b8045936e860
 DIST ansible-2.7.10.tar.gz 11844278 BLAKE2B c847b642ebe4cbc2194538a0b194cd5c0bb82e0ba2a6da2e272670c75596b9793e028d067ddb37000c07f2c2427b5b99248b16c544daed4976c0210b601d3c97 SHA512 4d58ef080c8ee02ef36eb3116ec89e4542b5b4042262953b2001081601fe1066237191cce5e647f354efa9e1933cf5010519d049e678a90e8ca08620cd1788a5
+DIST ansible-2.7.11.tar.gz 11855636 BLAKE2B 3de8fa1287655f778b1d9036bf78a91387cf238209eb2bfd17ee79f7d77a2e03ae734901bdc04226d635b3d8543d122aaa251107befab8cc4a4fc63cfcd8deec SHA512 06f805a701f8284ac1a65251b9358cf6f27d420aabb1e29298f9e4d8aa73251bd4a8e8a3981f744b97b2f750fd3b594a9b505e5baa3ff2cb3aa7a37603ba48fa
 DIST ansible-2.7.9.tar.gz 11830476 BLAKE2B 7688ce9f74b0ab1fafd0e31dce90d995a9d8ca90bbe436f2d4ee9d005069b6e1b2c4dd679c2430a6873233da54ae06d3ebf08736681ec2e59e5b3ddafa6bb1e2 SHA512 4d39c7d4eb97264ce8f92812fb986b24af0c663efa6d8cd1d9a4cb25731d55e7518e503c04764e62d0458916b601baaa7acc623f9f83ce8b93e7f22900e29a53
 DIST ansible-2.8.0.tar.gz 14285827 BLAKE2B 090c314e0c707e24ce4c21722bfbb34d18d95e6e8cd63b06af78e41fedb3183adbdf6718da1bb8a2c7037f9ea9ffffb96add17a44cb199d0c000c1d6f88cd53e SHA512 fab8a0ac00e947e47ab606bee0a15e8c031f900b5e6fc68540429db0035ffdf3144e18e1d2265ac07bbea0a78873b85c43e636ee51ecfe14f3d612d2c54eb29c
 EBUILD ansible-2.6.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
 EBUILD ansible-2.6.16.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
+EBUILD ansible-2.6.17.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
 EBUILD ansible-2.7.10.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
+EBUILD ansible-2.7.11.ebuild 1637 BLAKE2B cafff348e72d7970fe6851e36c2cab55e18583dbd4ec2cf018a04ed2f7093e91c341c32458d334996f7779477409d47fce82477ab812e607ba1d9d624e6efc73 SHA512 b3760d5cefead4d7965b1d1dbbcf7fd41f2bbd2b8a4941fb02791832fd60c4b0c289ba34fbf945b8889a4b15b286e051634adb90296ff81e43a15f71cad66f47
 EBUILD ansible-2.7.9.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
 EBUILD ansible-2.8.0-r1.ebuild 1663 BLAKE2B 45885bbb6444622d27827ad2243ce05aa2062bdde7e545aea5617b1c3979c088ea4565e0ce07f9fda2e9bc14bb819aa89954d51bb3eb1a287acbec1da0792d54 SHA512 e679d5e32060071736fd555ef68d44d8ca28e44cdb8229f2c79019f5c05b36fc8d095b33ff5e651d89d9a07007401178024593b3f6e4ac055961a3eecdc36af6
 EBUILD ansible-9999.ebuild 1654 BLAKE2B eb0aa61cfa0eab600a18d26cf8d7060be0f93cc0413a844ac5e6a9938010b52d77a0ef28a2b36b802e7e8deba33caf5c4f6659410c2d74b13a13f92d50c0106a SHA512 040e5403acec6a13ca5042a3840480c4993eff4beef319229bd761c3a46cb673473d9c0297be176a3806f4cc15b30586a8af5e7743778de36d19d16dc5512b79
diff --git a/app-admin/ansible/ansible-2.6.17.ebuild b/app-admin/ansible/ansible-2.6.17.ebuild
new file mode 100644
index 000000000000..4bec3453ac7f
--- /dev/null
+++ b/app-admin/ansible/ansible-2.6.17.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.7.11.ebuild b/app-admin/ansible/ansible-2.7.11.ebuild
new file mode 100644
index 000000000000..63e11740ae9c
--- /dev/null
+++ b/app-admin/ansible/ansible-2.7.11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 348e0823d9d6..aa609f0acfd6 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -3,5 +3,5 @@ AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c57
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
-EBUILD apache-tools-2.4.39.ebuild 2579 BLAKE2B 999d4b6367146198056cdcc4fc1de9fb733812db81c738d2d47aa420ac70ad677645b81c06f54e215b8bbf90e7fdabd1eccc9d0ad4c10b237d76bd18e28c577f SHA512 b9d8e3c80b143da54071fb3d8b92d7a1996a325b3151021462dd566e4d24656bec7393e0234a6a16c605dd5446b927140ca54824b6b5674c76e7f648bc642601
+EBUILD apache-tools-2.4.39.ebuild 2578 BLAKE2B 3567f7dc0cd337d498cfea3d950d8548fa515c7ae4f4fd03810e8ceec7e821f4673b119eadee5f568ef90a7aa5bb58e58b564ebef115e36bd7881dd2164d74ae SHA512 265e2abc71c36124c977bc79002b88d672e558f17537839d7de6bb158fc476c96fa5a615af2ce6a27b6dee6fbbb36a675840351525ec0f472bc0f87830326b1e
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.4.39.ebuild b/app-admin/apache-tools/apache-tools-2.4.39.ebuild
index 69417dd72479..6e1a527d5821 100644
--- a/app-admin/apache-tools/apache-tools-2.4.39.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.39.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~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/conserver/Manifest b/app-admin/conserver/Manifest
index 9f3f9a7d0e37..c9b95d237550 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -10,7 +10,9 @@ AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b
 DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f
 DIST conserver-8.2.2.tar.gz 329048 BLAKE2B 0148a5b5b11fcc75a071b9759e129a94f1fe623df35e7549e967d0037ddb378447623070ce43429daf4868308be150f5ba318354e3181d94ccb1199655231373 SHA512 7c59dc59e59e3ee0172b2a52214cd8dd83383168fe0f145870d128b900a012cfa38c2f1ae85769c226d941ca1a764f93ec3bf353da896537ae1be5b6bc17e6c6
 DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
+DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
 EBUILD conserver-8.1.18-r1.ebuild 2288 BLAKE2B d25a03bd1d6ee27d983c15455bc4f3ae76ca663cba75b353cfef17480f91f49d2d310a038ea9f16334bb75ece843f948a619c0980c1aacd9457bf2a2dfe0f1aa SHA512 4b87330c9eb8c9e731ce56b49afc45ccc04fcbe877d374b51a37b351c582b465946178ac41e50605ef958ffd0c65693b8f21ae0f28a65c462b99332bb6059078
 EBUILD conserver-8.2.2.ebuild 2350 BLAKE2B 6b502331697cffa995ab8e1cdfb03d086b78fa936941051a73dada85eea5de33572a07032d6973a1c7664c5a402345de1e2a06bc31646f987117c85e4d749dd4 SHA512 898c71213ff0b60156bf07ef2541df6d5a17ece9a8145fd080ae1932c59919272d9294e027aea1a051e6aa41acae87cd43c3418fbc5c1653482510a134942684
 EBUILD conserver-8.2.3.ebuild 2254 BLAKE2B 9d814ca1686d8ae19e5061d4a4dab85d35c47392a30233c37ebfa49de4ab8d627e90b9cd1fa8c22ae68ebb5c82f01fcf38a5d592514dbed99ba39df0bd3ff82d SHA512 2517c805ffd48239c2f65d53edda196fc61d7d1439297fe4319a32a2ce769373604657aeed27af17d288c911d0d564a258d7c3e16ffcf68049b7a5c27c754113
+EBUILD conserver-8.2.4.ebuild 2263 BLAKE2B 1aafde63585dce09739d0b06ca2b5c6dc8bfd6c2ea17ca4d7eac178ccc7c69680a29b8382da55ae425d22c5b065969b606ef9933b0c28c67627b3df9d86c533d SHA512 8d302941dc0c687370db246431ea78fa28713730e1d428bd9a5d9e5599383296367f1d4d6dfab5166802af78482c755422e084d8c02f938155e22cdf97683816
 MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
diff --git a/app-admin/conserver/conserver-8.2.4.ebuild b/app-admin/conserver/conserver-8.2.4.ebuild
new file mode 100644
index 000000000000..54eae640841a
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pam ssl-cert
+
+DESCRIPTION="Serial Console Manager"
+HOMEPAGE="https://www.conserver.com"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+
+DEPEND="debug? ( dev-libs/dmalloc:= )
+	freeipmi? ( sys-libs/freeipmi:= )
+	kerberos? (
+		virtual/krb5
+		net-libs/libgssglue
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}
+	pam? ( sys-auth/pambase )"
+
+DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial contrib/maketestcerts)
+
+src_prepare() {
+	default
+	sed -e '/^INSTALL_PROGRAM/s:-s::' \
+		-i {console,conserver,autologin,contrib/chat}/Makefile.in || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with debug dmalloc)
+		$(use_with ipv6)
+		$(use_with freeipmi)
+		$(use_with kerberos gssapi)
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with tcpd libwrap)
+		--with-cffile=conserver/conserver.cf
+		--with-logfile=/var/log/conserver.log
+		--with-master=localhost
+		--with-pidfile=/run/conserver.pid
+		--with-port=7782
+		--with-pwdfile=conserver/conserver.passwd
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
+
+	keepdir /var/consoles
+	fowners daemon:daemon /var/consoles
+	fperms 700 /var/consoles
+
+	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
+	newconfd "${FILESDIR}"/conserver.confd-r1 conserver
+
+	dodir /etc/conserver
+	fperms 700 /etc/conserver
+	insinto /etc/conserver
+	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
+	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
+
+	einstalldocs
+	docinto examples
+	dodoc -r conserver.cf/samples/.
+
+	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+}
+
+src_test() {
+	# hangs without -j1
+	emake -j1 test
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
+			install_cert /etc/ssl/conserver/conserver
+		fi
+	fi
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 10979e6f00f0..eca4ed626002 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -7,6 +7,8 @@ AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
 DIST consul-1.4.4.tar.gz 22736827 BLAKE2B a1b973a303f77d84993e4879aa92072d4f2d36353683cf9a2c6cdeaded8587e8464f066168f190f7347f6038df28b3cba1d8b8a3ca0b700ee085019af5014966 SHA512 d3e5dd536726976b705fe4c78c67eaf345b8f47225919c0ca1609d75e74343d9a16d893ef4cd5140998f23b3149cfa60f5b432ed9a7251bb3b232be9b65e7241
 DIST consul-1.5.0.tar.gz 20830405 BLAKE2B e64fbc22ade0c737db4f2f1b0e3966dbe617456a35d18a7a3cfa1b0f6ce2e335542b3add06c8b8e49995135b5a1576c824840030ac8dd46019bee915689bc5e2 SHA512 8cefb77b56b27995bba38517144bf42585bd1d9ad9a10fc0c9b6bc1a87bfbd042e336ed5e945cfce1fb8eb4b8162dbc8246e2b4109dea5767b8745a7b2159ef8
+DIST consul-1.5.1.tar.gz 21123963 BLAKE2B 4fe6a45f442d849196a7b9961110cdcc6f92931626ab583859efabe62038f6b2c356b27b37ea41b27755cca138c567be5c81854794a1ba0ccae3f9e0dfd10749 SHA512 7486d24bf1fa9fe94175abf9e008dc4fe4277c509381a524a9ee20e17bc4959f621e39be29e33622cb672ef3a04f9161e575009197bcd35c78b45f1d2637a2ea
 EBUILD consul-1.4.4-r1.ebuild 1548 BLAKE2B 65d5c22f412b28abf5c7067b5744ca2fb627f6513eca10d91055276016487f0123e6636c080d4841be9d05f4e26fe332f1867e7d540c7810ae43a187b1485988 SHA512 9ce2e18e5177ed96d005b6967d68e8df138ff18e47b28b52ea4fb971323c5cced167bc26fc08a30d39cb243bcaa275697fe7e10c6cacb87c12d969a00bd154b1
 EBUILD consul-1.5.0-r1.ebuild 1548 BLAKE2B b70a82e758c23c2c34ecd0fa5d45e56d840966135c8d578b09d702bed31b5148bffa2eb68412a0555464018ad04e62922a4e75d5c8a2fdc779b8497a6a539159 SHA512 00c8ddee82cacfaa5092bf45a37bccf7475e8fb6402579ee95188a9334f12309ba9a70771fb49f1b43bebec1e37ae68eb7d260a34c3134009f0b4507447c8504
+EBUILD consul-1.5.1.ebuild 1548 BLAKE2B d1d499907ec300d216e6884fb3c31d741911a799185f8220e0f4bb1f141105781368f9cb7c98bcd8ccd790e34b667f33b0dddc8eb5f1185318bf6c70917ead33 SHA512 6ab3f29b2416dd52250589d2ccae36f86161edea4a103d16a00e21e78c630fe8a6c7a61e8a50c08e3df546698e91f577e6ed94dcaeaf766b51f97ca93f894837
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.5.1.ebuild b/app-admin/consul/consul-1.5.1.ebuild
new file mode 100644
index 000000000000..23474dcfc441
--- /dev/null
+++ b/app-admin/consul/consul-1.5.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="40cec98"
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.11:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" \
+	GOBIN="${S}/bin" \
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake -C "src/${EGO_PN}" dev-build
+}
+
+src_install() {
+	local x
+
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/cronlocker/Manifest b/app-admin/cronlocker/Manifest
new file mode 100644
index 000000000000..e2e3c25a6192
--- /dev/null
+++ b/app-admin/cronlocker/Manifest
@@ -0,0 +1,3 @@
+DIST cronlocker-0.4.0_p20180710.tar.gz 60256 BLAKE2B 62adf6a935e13d97de9776f40a9349f7b3f1758c9d90c11f66759b87d3d8d9dc20a78ecfe0aa7849319be3c8c557dae3d9cc04c87bc6226af5842c72efac0611 SHA512 fc73b572da4fe485f9ba13340b946db40d7e0224643b5fe0b8f56b24560ce4bc32d0a42e3e0e33b979d3aec2910e96ff847249181e7b69776174e2f28d67797c
+EBUILD cronlocker-0.4.0_p20180710.ebuild 618 BLAKE2B 1c8809df94ec8662690f01d50441564fc39b0ce2d4c889a73cd96c0327eab42d3b6ef29072087aa9d5e69e4ba66e8bbf1694baae191c70aea8bc9dff37769ae8 SHA512 09efed34955f18ca53fe97b67e31a099d66637ef7b9e506cf200e976626d1560f174f869e753c09c8ca6b8ddf00dce12e7e9dccbee56d669ca06824ddcefd4bc
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-admin/cronlocker/cronlocker-0.4.0_p20180710.ebuild b/app-admin/cronlocker/cronlocker-0.4.0_p20180710.ebuild
new file mode 100644
index 000000000000..46e33d17179c
--- /dev/null
+++ b/app-admin/cronlocker/cronlocker-0.4.0_p20180710.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/Barzahlen/cronlocker
+HASH=c0ac605
+inherit golang-vcs-snapshot
+
+DESCRIPTION="synchronize a cron job across multiple hosts using the consul lock feature"
+HOMEPAGE="https://github.com/Barzahlen/cronlocker"
+SRC_URI="https://github.com/Barzahlen/${PN}/archive/${HASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" emake cronlocker
+}
+
+src_install() {
+	pushd src/${EGO_PN}
+dobin cronlocker
+dodoc *.md package/changelog
+}
diff --git a/app-admin/cronlocker/metadata.xml b/app-admin/cronlocker/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/app-admin/cronlocker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index e606897f116b..1c7a87f98eea 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -3,6 +3,6 @@ DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
 EBUILD eselect-1.4.12.ebuild 1623 BLAKE2B 6d8d236b4b11ec808ab1f95c0a1c295fc4ffff17f85151dd176354a1a1bb7459eb9d64f59411b7a7e3905a563884865c5dc23973f5d6674f13ebafde00ef3d0b SHA512 398ca70365af9bb0aef6807b8d797fe55c10afabe25b2e7a4657aba39b70748f04a5f94b24569701042399e9c4ffea1c48b824f7b179608d080981ff1159f2da
 EBUILD eselect-1.4.13.ebuild 1623 BLAKE2B f20b2426f4d508aeed32fa92d5c4b6e09024e867f830eb011a0e473d647ec9976d35881d6b39bd6f3c53aa97b03985cfe40ed95f4567afb6de4caf57f13141c7 SHA512 60ba4140a218a85f126790780e5810adf4aba9b7f5a2b58952fffe194dde0e41047f5ff4b481c4e9d491acdfda1b761041506c893a4f06d7dc121e3157a53de9
-EBUILD eselect-1.4.14.ebuild 1640 BLAKE2B a2628b326ad57259ad0dc50fcce13403dda4505f5f83aa9982ad0f230c543ea3937414f5538eb635cfe8dcd9e3d3cb93d6a97cbb541dea582245fceed1fc8e5f SHA512 4437117d84c679538e30e85e77a8707c1639c28619e9161a15cf90b69edc856901fed81a8eab6dfb867d4f4ad294c804d5f19197a627d7d40ffefbf9a2296e19
+EBUILD eselect-1.4.14.ebuild 1637 BLAKE2B 9f0e2e19dc35240c47d3218d96ba6d54ca552f2bef916e92aaa31390e10612b728f933effb2666df926262c1bd8a87e9538e1467c2f489f2a6aa1de923b7bcf0 SHA512 259dc8f16b3aacfd4416472c1d9e1f87a107443688dfb048914613edf791c99b288e7f6b771f0e9d73462ca039640921d40f4a59f624f22a9c1bc1f00aded472
 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.14.ebuild b/app-admin/eselect/eselect-1.4.14.ebuild
index 61a8c2e50a68..8065de2c7004 100644
--- a/app-admin/eselect/eselect-1.4.14.ebuild
+++ b/app-admin/eselect/eselect-1.4.14.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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~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="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index 9c98b2f33f5b..db961fa94a94 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -2,8 +2,8 @@ DIST haskell-updater-1.2.10.tar.gz 26586 BLAKE2B adc46f85118fa55e530aa079ef2df06
 DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbccbf9cb15d246b21609a21aac746a8a034e284fe0b99891b5035980252a7aa8b376ad943f32882dc29e16226d95583cb053 SHA512 f3a993cb556919bf2e57fdaca7eea9146abc59096e779cbffb69a5c29fc5f6ef889c8ccf4d8331dbd9279919ea91bb05a16d83ad70085d5ef5a44d61120fe7e7
 DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
 DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
-EBUILD haskell-updater-1.2.10.ebuild 1076 BLAKE2B a21ed61a21f62a06fb3ef9702b7bd82f696646c71a84e49f19a94250cd16701cc1aa18a3e0151a09df973c442957ae8f025294585916f66f82c88a6fa3045ef2 SHA512 877d611303b52feade51b60fcaca3513a20e5173235d78a65fd78988655ff6d76f0a2b51267549473e84374ef331c7231b25486af28951c3f46a616332f78b2f
-EBUILD haskell-updater-1.2.12-r1.ebuild 1093 BLAKE2B 9eaf109b857302eb065310c67e0f93b583a9a4d1d18683f78489a0f1dfe96bf29a2fb87fd10e14cab9abe5ded2277d7e4638e7c3c25186182b337dd748a45bd9 SHA512 274d02b8d3e2430b677c8b942f6028e6bcc6b407856d86a0a924d94c1ebc8af54cde249d77493346aee90000c2a3796cbcf447d9dc222748e43b00192983bf4e
-EBUILD haskell-updater-1.2.9.ebuild 1076 BLAKE2B a21ed61a21f62a06fb3ef9702b7bd82f696646c71a84e49f19a94250cd16701cc1aa18a3e0151a09df973c442957ae8f025294585916f66f82c88a6fa3045ef2 SHA512 877d611303b52feade51b60fcaca3513a20e5173235d78a65fd78988655ff6d76f0a2b51267549473e84374ef331c7231b25486af28951c3f46a616332f78b2f
-EBUILD haskell-updater-1.3.1.ebuild 1093 BLAKE2B 9eaf109b857302eb065310c67e0f93b583a9a4d1d18683f78489a0f1dfe96bf29a2fb87fd10e14cab9abe5ded2277d7e4638e7c3c25186182b337dd748a45bd9 SHA512 274d02b8d3e2430b677c8b942f6028e6bcc6b407856d86a0a924d94c1ebc8af54cde249d77493346aee90000c2a3796cbcf447d9dc222748e43b00192983bf4e
+EBUILD haskell-updater-1.2.10.ebuild 1067 BLAKE2B 13ec8d391f9046db45bd820988e90cc2b3e960a8d09cc245468206ba67da95ddad19056175012ec94a3be60e413a7ac17831ef622927e38b79216515bfd3cbb3 SHA512 73667872eb360dc9796de23306b049a55ab03d617bcbcec9caf8db0a5395522ac9bf8f3ba64a952c177bdf2e502de84fa7bf02699490f4c83979a474f6ff0651
+EBUILD haskell-updater-1.2.12-r1.ebuild 1084 BLAKE2B 134c72af64da1a9cfe55204f33ce8a207e545dd2430939ad81f3d06e4c6391272c633d1427e96376726b1d4cd6ccd516f8f6fb3477e4c18550901695ed340439 SHA512 0255aa8fffa8921f05bc8b083f0496c9a607b6766045554075e59f64912531ad28d61a7e3d46c694b433c8b933a017f17b6b286bdf699135c2a8088069f11a61
+EBUILD haskell-updater-1.2.9.ebuild 1067 BLAKE2B 13ec8d391f9046db45bd820988e90cc2b3e960a8d09cc245468206ba67da95ddad19056175012ec94a3be60e413a7ac17831ef622927e38b79216515bfd3cbb3 SHA512 73667872eb360dc9796de23306b049a55ab03d617bcbcec9caf8db0a5395522ac9bf8f3ba64a952c177bdf2e502de84fa7bf02699490f4c83979a474f6ff0651
+EBUILD haskell-updater-1.3.1.ebuild 1095 BLAKE2B 0bfeebae57f84fe2e8cded18f4884e5d3a2b4b0fe7527791e191e5f42c306a4357d1042a5cd341a74e37a10cc519582e5202ed5e23ce120b7b2103aeac0181bc SHA512 bd2b3b2bde105f209915b3ce091db03dad3041368acb009133d2ffb07fb9465ae56c81d6b940edce94db81a16410b6bce2243803dfa6dd5572a86e7ad07a7536
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
index 6a1b5a5f118f..61e60ee2e73b 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ CABAL_FEATURES="bin nocabaldep"
 inherit eutils haskell-cabal
 
 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
index 7861b7114a80..df22496ce85a 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ CABAL_FEATURES="bin nocabaldep"
 inherit eutils haskell-cabal
 
 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
index 6a1b5a5f118f..61e60ee2e73b 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ CABAL_FEATURES="bin nocabaldep"
 inherit eutils haskell-cabal
 
 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
index 7861b7114a80..9bdd7f451d1e 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,12 +7,12 @@ CABAL_FEATURES="bin nocabaldep"
 inherit eutils haskell-cabal
 
 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/ksonnet/Manifest b/app-admin/ksonnet/Manifest
index 93fb3a1c35be..777b0d078b55 100644
--- a/app-admin/ksonnet/Manifest
+++ b/app-admin/ksonnet/Manifest
@@ -3,9 +3,9 @@ DIST ksonnet-0.11.0.tar.gz 11228264 BLAKE2B 2c5be1124f2976b6f38b23c9f871bc67a1b8
 DIST ksonnet-0.13.1.tar.gz 12336756 BLAKE2B 1952c02a0dbefc0efdcde1728348e62b23e9ef92fedb8444f98dcc0e670090be56aa001ee50f5e6885752e565863b3813556b091dc614a766677ea4d6e0722c4 SHA512 be16e986c27da358df27d632d1191837d3c16a92e702f3bc29d504de80128870dd4d97752db07c06bd5a11b517e69d6690b9608125d702f809c181d4109622f4
 DIST ksonnet-0.8.0.tar.gz 5260937 BLAKE2B 3b14618d9e40e0f71f966a0acd1ac121040ddfbd378b363236f98c4ecc6d2a2b688988816cd56801bc127b41ac56f4a8446bf152b0ffbdc3f64bce879bfa7cc4 SHA512 c80bbb0d6959045c2de0bf3a21b8a869b53a397e2e31b4b273ccd4f16afceb4038c6263a34d8e0934234cea5997949202e58dd7603902b221a140be737924aec
 DIST ksonnet-0.9.2.tar.gz 6552479 BLAKE2B 46aa62fe5c647d87f11b0c35db1e494d7c045d65bd98a0cc81bcb9c5a1890739a6f782dd04735781cb11aff70e4ec6f04ab97ff51b567385fa1e72bd2d835f15 SHA512 fd9c3c966ed27799f5c7e29e031270406e901c16089f354984d5aed62ebc53f1fc3be0f7623c1dff4231e7a5676b3bed879448845e35d6c1db5104ec28669a48
-EBUILD ksonnet-0.10.2.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
-EBUILD ksonnet-0.11.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
-EBUILD ksonnet-0.13.1.ebuild 871 BLAKE2B de4a469dac9e43e91ce6eb9fafa38cac4ba7cb30a7aacedfa8ba57df4ef5aa09686a2677e98c5f03195fbe3ec1c8dc4a32abd087036158db1829408c0e2adee2 SHA512 793660b3a34fd44acdd1c11075bfad84f78f7b016c5280248d6706f5a586fb529bc7503003ad73db1fbe3375dd88b23f293633c8e0e7fe385e574b2a25f5231d
-EBUILD ksonnet-0.8.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
-EBUILD ksonnet-0.9.2.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
+EBUILD ksonnet-0.10.2.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
+EBUILD ksonnet-0.11.0.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
+EBUILD ksonnet-0.13.1.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
+EBUILD ksonnet-0.8.0.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
+EBUILD ksonnet-0.9.2.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
 MISC metadata.xml 246 BLAKE2B b7d647c23d2215c6d61312a66a7d3521c8c16f69cf801328c67e9017be2809c2d16e29d61f190837c9fabce655dc69a506311a7781f7aa57c320524ed1bcd463 SHA512 bd98d2c774eb61947df8860a6948cda7148264a3bc86b52d317b3d805e2ab17fe81fe94ffc353ecdda86ad56bbfa17a044c9a789a878e15c5cec13c8e6eeeb70
diff --git a/app-admin/ksonnet/ksonnet-0.10.2.ebuild b/app-admin/ksonnet/ksonnet-0.10.2.ebuild
index 48881fd39b62..0c4bbcbd400e 100644
--- a/app-admin/ksonnet/ksonnet-0.10.2.ebuild
+++ b/app-admin/ksonnet/ksonnet-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.ta
 KEYWORDS="~amd64"
 
 DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
 SRC_URI="${ARCHIVE_URI}"
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/ksonnet/ksonnet-0.11.0.ebuild b/app-admin/ksonnet/ksonnet-0.11.0.ebuild
index 48881fd39b62..0c4bbcbd400e 100644
--- a/app-admin/ksonnet/ksonnet-0.11.0.ebuild
+++ b/app-admin/ksonnet/ksonnet-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.ta
 KEYWORDS="~amd64"
 
 DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
 SRC_URI="${ARCHIVE_URI}"
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/ksonnet/ksonnet-0.13.1.ebuild b/app-admin/ksonnet/ksonnet-0.13.1.ebuild
index 47e17f761f7e..0c4bbcbd400e 100644
--- a/app-admin/ksonnet/ksonnet-0.13.1.ebuild
+++ b/app-admin/ksonnet/ksonnet-0.13.1.ebuild
@@ -11,7 +11,7 @@ ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.ta
 KEYWORDS="~amd64"
 
 DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
 SRC_URI="${ARCHIVE_URI}"
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/ksonnet/ksonnet-0.8.0.ebuild b/app-admin/ksonnet/ksonnet-0.8.0.ebuild
index 48881fd39b62..0c4bbcbd400e 100644
--- a/app-admin/ksonnet/ksonnet-0.8.0.ebuild
+++ b/app-admin/ksonnet/ksonnet-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.ta
 KEYWORDS="~amd64"
 
 DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
 SRC_URI="${ARCHIVE_URI}"
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/ksonnet/ksonnet-0.9.2.ebuild b/app-admin/ksonnet/ksonnet-0.9.2.ebuild
index 48881fd39b62..0c4bbcbd400e 100644
--- a/app-admin/ksonnet/ksonnet-0.9.2.ebuild
+++ b/app-admin/ksonnet/ksonnet-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.ta
 KEYWORDS="~amd64"
 
 DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
 SRC_URI="${ARCHIVE_URI}"
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 967dcf14e304..c770be83dfa5 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -17,4 +17,4 @@ EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054ed
 EBUILD logrotate-3.14.0.ebuild 2511 BLAKE2B c824de62f72544448b54948e5025b0bfee7be00b9355be4e5c64d51721efc064dacec319f9de4e93c61a7aec2bd70c4d0515a693be375d35c16c30cb1a2b927b SHA512 e088a56371b59e4d10f4ea5574ba12985b9b7fe81de11624cfb302fee0bc08581334230776aaca74d67d9ca160dad4301f06b14e5c608c26ecffccbf370a252e
 EBUILD logrotate-3.15.0.ebuild 2491 BLAKE2B 54d0c42640b5bc52d8a06515dc93a8fb3882e5bff1307ff83ba61c02022f5a798646e56eb3eac11edad9b1d4a347a792401a155e8782df4bfe78eb782d429043 SHA512 ca4f7eb1af6d0ade04ff4917b254bb63b733daac0bcffc758804c2f15478a8b8c2ea6715fd10ace0f09966557f3d6999fcfeddcd9fd22cae6594838507fa5f08
 EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
-MISC metadata.xml 1041 BLAKE2B da5759183dd7920f1b9eeaba5f210be086908a445239af3fd519dc7eab50caec35192a41987034c322a2e7decd6351444c551e552cdb99e1ec6a3371b0d5a14c SHA512 ac85df0dd82c18935ebd554d78993e9f57ba0c5684cbf5e85041b3f8ccc5e23f5c95e0d207255cc61bc1355f66f79b9802429ae581de66c50f9fd0cde5aa199d
+MISC metadata.xml 1126 BLAKE2B 1655e4bbc549896f4faef7cab3c539a5dc2a9910c80eacc6ee5626d97f1b6a5df448a502f3899833afb1723ee42f0be01e025a5d23ea3af1bab2a0311f43760e SHA512 f895d0c5ed7b02c4b92af5596a160199b6d765564050dda45171ff6e81137c508da5a8ae5fece89f04b2355d0f1b41f839aac667e4a8d8119ff64f44f34c6084
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index 7ace94cc2ebe..4d03c4b664a2 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
+	<pkgmetadata>
+		<maintainer type="person">
+			<email>zlogene@gentoo.org</email>
+			<name>Mikle Kolyada</name>
+		</maintainer>
 	<longdescription lang="en">
 		Logrotate allows for the automatic rotation compression, removal
 		and mailing of log files. Logrotate can be set to handle a log
diff --git a/app-admin/lsat/Manifest b/app-admin/lsat/Manifest
deleted file mode 100644
index 78628970c9c3..000000000000
--- a/app-admin/lsat/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX lsat-0.9.7.1-gentoo.patch 1484 BLAKE2B 98182a2732d424ec1069c53f5cc247492704099148f3fa8e0e4d8fb5da01ba8840a17a9b3fad08ffcb7bba196934474d9d9d9c87b60915c7c60d9724061d1393 SHA512 55d0806addabf5b431ac18016f1f1737a30994b3558dc511a850d747f7b11f344c2070c0ea239c24a11511bccdb0693f54701586561d4b018934fa7ffd63ef69
-AUX lsat-0.9.7.1-segfault-fix.patch 1695 BLAKE2B ecebddf3535a45c09fc379c76ac81fb06c2fedd19159f0adea52b1ca73efd7fad64f2cf09b9b61e731b9ddee2d45ca1be562b650f6b324e6c3de0f141f7b871b SHA512 8be007761729ed7b0162cdba3d90a86ccb4caa10064f64a0fe3c10434227b3a5e185c9ca4509ea877a605161bd0482d8ce8758c1cb853756fe81ac37d41832b2
-DIST lsat-0.9.7.1.tgz 86077 BLAKE2B 609eb2a3345d147f03d03eea31fc34834ab2c0f95cf8b348ae0289020e092a991ab215160dcb1bee06ec07186fc2b9ee61af59dcff140dbda0fa91ebc7f8574e SHA512 fa67b5ebb03d11e3ee023c921977ddb64ea1fafca1d4cdb4b0fc5dbfa6edf46d57e488e9702175afbbde360a63d02ee5839fdf6576d974354a3b1d57f8860ffb
-EBUILD lsat-0.9.7.1-r2.ebuild 1002 BLAKE2B d3efec21d4cb30580f0a3d91f9e21b16793045c940dfb3d46de46e966865ee5809eddac8699297a558811b5b6d540b4c942e596e361b9f1b4294464b67c0dcc7 SHA512 da7eb95c87693dc617a272714eb99dc8b7562c1543ec75b81e7643f2f6a65b2df7a95fe0cf9303c10a73e8752a17c6450bb1b27d22880063c32c7348840d29fa
-MISC metadata.xml 608 BLAKE2B 7492ab0cc9545ce95a721aff6d1f9c5fd56cd94f4627d4bf70dd82349d8c3dff917e9d9e078d075d9c370a13314c865960fcf42b1603b76e5caf40fefe828b1d SHA512 05e9c4d8f92ce5ffabefe6ecab78023c2b0df2c6cc83e7e9c6db837b94b5c3c0f8248d5a3179641eec3513cd646557d2a1028283a03059c722be42c2f230481a
diff --git a/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch b/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch
deleted file mode 100644
index 631dcd7322f7..000000000000
--- a/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur lsat-0.9.6.orig/Makefile.in lsat-0.9.6/Makefile.in
---- lsat-0.9.6.orig/Makefile.in	2007-05-22 11:38:28.000000000 +0900
-+++ lsat-0.9.6/Makefile.in	2007-05-25 18:55:25.000000000 +0900
-@@ -12,6 +12,7 @@
- PROGRAM= lsat
- INSTALL = /usr/bin/install -c
- prefix = @prefix@
-+exec_prefix = @exec_prefix@
- BINDIR = @bindir@
- DATADIR = @datadir@
- MANDIR = @mandir@
-@@ -38,9 +39,7 @@
- 	rm -f $(PROGRAM) $(OBJECTS) Makefile config.*  lsat.old lsatmd5.out lsatmd5.old
- 
- manpage:
--	pod2man $(PROGRAM).pod > $(PROGRAM).tmp
--	sed 's/perl v5.6.1/LSAT/g' $(PROGRAM).tmp| \
--sed 's/Perl/LSAT/g'\
-+	pod2man $(PROGRAM).pod -r LSAT -c 'User Contributed LSAT Documentation' \
- > $(PROGRAM).1
- 	rm -f  $(PROGRAM).tmp
- #	cp -vf $(PROGRAM).1 debian/manpage.1.ex	
-diff -Naur lsat-0.9.6.orig/checkpkgs.c lsat-0.9.6/checkpkgs.c
---- lsat-0.9.6.orig/checkpkgs.c	2007-04-27 00:48:31.000000000 +0900
-+++ lsat-0.9.6/checkpkgs.c	2007-05-25 18:46:00.000000000 +0900
-@@ -113,14 +113,14 @@
-     }
- 
- 
--    /* if distro = gentoo, use pkglist */
-+    /* if distro = gentoo, use qpkg */
-     if (distribution == 4)
-     {
-         if (verbose > 0)
-         {
-             printf(" Generating list of pkgs on system.\n");
-         }
--        shellcode = "/usr/lib/portage/bin/pkglist 2>/dev/null >>/tmp/lsat1.lsat";
-+        shellcode = "/usr/bin/qpkg -I -nc 2>/dev/null >>/tmp/lsat1.lsat";
-         if ((dostuff(tempfile, 0, shellcode, 0, html)) < 0)
-         {
-             /* rhut-rho...something bad happened */
diff --git a/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch b/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch
deleted file mode 100644
index 558c8de60321..000000000000
--- a/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- lsat-0.9.7.1/lsatmain.c.orig	2008-12-29 11:09:04.000000000 -0500
-+++ lsat-0.9.7.1/lsatmain.c	2008-12-29 13:31:00.000000000 -0500
-@@ -232,7 +232,7 @@ int versions(char release[], char kernel
-     } /* end while (fgets...) */
-     close(fileval);
-     /* clean up even though we will rm it */
--    close(infile);
-+    close((int)infile);
- 
-     if ( (system("rm -f /tmp/lsat1.lsat")) < 0)
-     {
-@@ -308,9 +308,9 @@ int main(int argc, char *argv[])
-     */ 
-     char release[50]; /* array for release level		*/
-     char kernel[50];  /* what kernel user is running	*/
--    static char *man_distro; /* if the user specifies a distribution */
-+    static char man_distro[10]; /* if the user specifies a distribution */
-     const char * header   =NULL;   /* to print out the header */
--    static char *out_file = "lsat.out";  /* output filename var  */
-+    static char out_file[255] = "lsat.out";  /* output filename var  */
-     char xlist[100]; /* modules to exclude */
-     int xarray[33] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; 
-     int  somethinginxlist = 0;
-@@ -350,10 +350,10 @@ int main(int argc, char *argv[])
- 			  diff = 1; 
- 			  break;
- 		case 'm': 
--			  strcpy(man_distro, argv[i]+3);
-+			  strncpy(man_distro, argv[i]+3,sizeof(man_distro));
- 			  break;
- 		case 'o': 
--			  strcpy(out_file, argv[i]+3);
-+			  strncpy(out_file, argv[i]+3,sizeof(out_file));
- 			  break;
- 		case 'r': 
- 			  rpmmodule = 1; 
-@@ -366,7 +366,7 @@ int main(int argc, char *argv[])
- 			  break;
- 		case 'w': 
- 			  html = 1; 
--			  out_file="lsat.html"; 
-+			  strcpy(out_file,"lsat.html");
- 			  break;
- 		case 'x': strcpy(xlist,argv[i]+3);
- 			  somethinginxlist = 1;
diff --git a/app-admin/lsat/lsat-0.9.7.1-r2.ebuild b/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
deleted file mode 100644
index c1285e7e6de2..000000000000
--- a/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="The Linux Security Auditing Tool"
-HOMEPAGE="http://usat.sourceforge.net/"
-SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="minimal"
-
-DEPEND="dev-lang/perl" # pod2man
-RDEPEND="
-	${DEPEND}
-	!minimal? (
-		app-portage/portage-utils
-		net-analyzer/nmap
-		sys-apps/iproute2
-		sys-apps/which
-		sys-process/lsof
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gentoo.patch"
-	"${FILESDIR}/${P}-segfault-fix.patch"
-)
-
-HTML_DOCS=( modules.html changelog/changelog.html )
-
-src_prepare() {
-	default
-
-	# patch for segmentation fault see bug #184488
-	sed -i Makefile.in \
-		-e '/^LDFLAGS=/d' \
-		-e '/^CFLAGS=/d' \
-		|| die "sed Makefile.in"
-}
-
-src_compile() {
-	tc-export CC
-	emake CFLAGS="${CFLAGS}" all manpage
-}
-
-src_install() {
-	emake DESTDIR="${D}" install installman
-	dodoc README* *.txt
-	einstalldocs
-}
diff --git a/app-admin/lsat/metadata.xml b/app-admin/lsat/metadata.xml
deleted file mode 100644
index 301bfd358039..000000000000
--- a/app-admin/lsat/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Linux Security Auditing Tool (LSAT) is a post install security auditing
-		tool. It is modular in design, so new features can be added quickly. It
-		checks inetd entries and scans for unneeded RPM packages. It is being
-		expanded to work with Linux distributions other than Red Hat, and checks
-		for kernel versions.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">usat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/mms-agent/Manifest b/app-admin/mms-agent/Manifest
index b89723703026..1d1adf853b91 100644
--- a/app-admin/mms-agent/Manifest
+++ b/app-admin/mms-agent/Manifest
@@ -2,6 +2,6 @@ AUX mms-monitoring-agent.initd 577 BLAKE2B 2a2df2f4179a8be766897fa97b543eb2e1166
 DIST mongodb-mms-monitoring-agent-3.7.0.212-1.linux_i386.tar.gz 2554037 BLAKE2B be5f8d64da4aade086d6487067b5ca3961752ad832d4a5ca63fcaf8db38d92eb7ff40d8704622c68e9ee6ee14d3973911c594a7d8829a407cd2d8fdc2ca23ed5 SHA512 532d1c2dee00ee2b64654f43ded1cd8b40da8401ea0edb24c81cee80a46289ebde47697c43cb3ffbf6ce3ef88e8d6b78c6ba1e0a615a7488efe1c42f1d827897
 DIST mongodb-mms-monitoring-agent-3.7.0.212-1.linux_x86_64.tar.gz 2643320 BLAKE2B 8f532f9a3ffc17a7cf9109660cde232babf8256dbeb9a0c0034e5231bd84a2ce9e5cc679306d2800baf9b642e2299a4fcd5eef3c6bdeb79ea6c2ad862a6daf7c SHA512 c4c0d10bca91485680760d25b0cd9dde2081af60fe7bd5528fea13b12676cb10bb069dab5acfac645cf56001a4579df32d34b268b99f449a59d314c6e3ffaa21
 DIST mongodb-mms-monitoring-agent-6.0.0.381-1.linux_x86_64.tar.gz 3618281 BLAKE2B 9c036707aacad3cdbaeb72817a010df5dd91c1c4160dd95dc026c77471c5a7eff7047a93c5b9097a7fc89db96c88eb2c1c83489fde7f132cb4d14ac446333634 SHA512 79366c8ec0aaa3209d7e54942a375185312c491ffc825d9bf70d1fca36b93ab819dccf12e8f1a54c8dbd24ff501a3e3547a5a453e80308d6d638e7c3cf866f9c
-EBUILD mms-agent-3.7.0.212_p1.ebuild 1505 BLAKE2B 8339ce11955f18b83215d992c8d6ac9d963f49ae000dd9661b57c3c1195a6dc243a26769d97fae80baa6c2172899f6f098b5948dca8f573446047682581b9fec SHA512 04098333aa796f7c7de91ba4f9707bb00bf54c902562dde7dfcea34b3d0534c93cc2c314aa08fea8b346c3db899511f708ff3dcb0bca82731e477a9e559767b1
-EBUILD mms-agent-6.0.0.381_p1.ebuild 1282 BLAKE2B 685f9f590f4445af2cd262f8758345d1775d691733247bc1f99c61c6e9c11b9a2c554b22f88fc9a5cd3312f1029ad15915845869c6b3ff1279c309e290fcdea6 SHA512 90cfeb0f2f965a2a2814a28024cd4ccd91d0172dce9679335f195584259dd052b24e83feda90193b4d6237e2fb2be73e15d1fa5199dc2fbc359fd907433fddc8
+EBUILD mms-agent-3.7.0.212_p1.ebuild 1509 BLAKE2B 6a6d1eee65df8bd608f31340f98f9ee0582c0b99d1615ab4ea65a08247dd4fd27789445fe046980cbecf8ae92460990672ee2761d71e59d869e0706afde808f0 SHA512 fdd4170c672a2432505db2bded015a6ea7941bd72e30eca689bc8135c07c0e9d90876b9768b969b18dd985660e30d6602769f1919adf00c7a381bed4b5a67c36
+EBUILD mms-agent-6.0.0.381_p1.ebuild 1284 BLAKE2B bc793eb7fc238c1f4ba2af5ce0a36aa51dd516025e8d8d5311886c5f5d35299d2a1baaab6262dd303770e38561c46444c2797fc847455722a7007b1c295b5892 SHA512 1f589480aa646f3a148b49cb504fc66f711e78f45c5359a84461bfb079cf5ee22c0caa5ac3555805da6d60f1c95075910f74e6705c004bac311d3f207999b194
 MISC metadata.xml 405 BLAKE2B ede71b3fd6b42c475b1f03b3fee1a715ef25c016645231b863fc3c6bdb7cb9b6a0c9d0ccedcd940198666ac6124f5037e918df2c9a315a588015b7ccd68b74b6 SHA512 1f2c0cf7a01e344fb2cf327b9a6619ca6e9d67e6a6e7e1a191b86a788f11826e72e0f2b96333e1270c91e2692d0733ad0fb64671d8d778b236f9c1b00d7a55b2
diff --git a/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild b/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild
index af3f9b652cfb..160ecf3ef623 100644
--- a/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild
+++ b/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils user
 MY_PV=${PV/_p/-}
 
 DESCRIPTION="MongoDB MMS agents"
-HOMEPAGE="http://mms.mongodb.com"
+HOMEPAGE="https://www.mongodb.com/cloud"
 SRC_URI="
 	monitoring? (
 		amd64? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-${MY_PV}.linux_x86_64.tar.gz )
diff --git a/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild b/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild
index e597d7f41fee..4f3872a06722 100644
--- a/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild
+++ b/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit eutils user
 MY_PV=${PV/_p/-}
 
 DESCRIPTION="MongoDB MMS agents"
-HOMEPAGE="http://cloud.mongodb.com"
+HOMEPAGE="https://www.mongodb.com/cloud"
 SRC_URI="
 	monitoring? (
 		https://cloud.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-${MY_PV}.linux_x86_64.tar.gz
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 99b37074235b..b620ef68c841 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -5,11 +5,8 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_5.5.14-1stretch_amd64.deb 17369338 BLAKE2B bc0544d49f704b07fe058164eb9e1f3f9dc8613337942043a1f4d1359105c986b3b170fda076e8bb4fb74a4d0a423c434d27669410edefe7834ab633217e1ff6 SHA512 410f3e76a571f48456ce6e6b83a957fe33391db72c428d2518001ccce23d29e4911d740cb9c70903050f9a69c815fce8988caa1ba469742b334b1f61229f1a31
 DIST puppet-agent_5.5.14-1stretch_i386.deb 18294894 BLAKE2B 928ea0c7113dc6789a37b83f4499485d17f09cf7ac1ace5c3aad87f0a93e4143cd4763f61e42d35a7561d5438d7b5d70d6181ab7233f72eaccb67cc4d5388d18 SHA512 8ae02257cf729ce41e6437d9ee2f221884b0e49dda7b3fc04ef200487c937f258075f563817bb064a19c30ec19b790f4d9d03e240d8a363f2942cd613c579c1b
-DIST puppet-agent_5.5.7-1stretch_amd64.deb 17300432 BLAKE2B 4c3b13361b9a97734a7b63ad94d1e96d9bcad284372d0b63a085c4415fa7c0433e66546bd43c99a82839837ed5a8683c6d2739d47b629f5580b8007219f06010 SHA512 fa17413afc2f2872963e241b38c2d7abe06ed37b0f01f2ace3cc6c31e53451291fe98905957377940b16d1b6926991ef39b556a4697e9ba06f10f62583f72c9e
-DIST puppet-agent_5.5.7-1stretch_i386.deb 18222282 BLAKE2B b9ce9269cc59d79450cb66c9c3e545ad4267ad1a43905df4ca57b45ad1213dd11c9ddcffb77719a151f52eb60d6792a486823ea4a29b2f4e83a2d62960c9691a SHA512 b65ecaf27c2bcc6556d7d43a0b78e282a64c72eed3b672af5d2e23c34eefe8134b6d4c60505f9d7c6e5b40ed4a1ad391128933c27710819f5078ec7d8680b6d4
 DIST puppet-agent_6.4.2-1stretch_amd64.deb 18776024 BLAKE2B d8fd52357abb9649d74c9b7e54eb0f599cc2b6b1cbe8a4bdd3bd21c69904379dcda2fdea4e642d3f86bef846d1bdfb14eb8c3daed50958ad3add46bde96fe5d2 SHA512 b1bdbcb1cb87bbf4391073b0596d759e1386bd5b93046d25be112f1ddad6a0d4da162116dc9f85908de67bfd3d956a1c418faf39a85c3ed0d02f9891d4d9906c
 DIST puppet-agent_6.4.2-1stretch_i386.deb 19250972 BLAKE2B 8424047586f7747daf24901f7ba134bfcd1fc4db094fd458f4298251880b0446221575cc463c511a32a6f7cf4c635c95b6132631640b5091e48b1e7cec67b844 SHA512 0041b1e3ff1401b21f7d9ab3b3aee66d76e30acd4748571ff3ff595d7006008e0d9d3f4c28db85cccece0cf08595cf4a3342353f5b18ea3e02ae02a094e42e41
-EBUILD puppet-agent-5.5.14.ebuild 2480 BLAKE2B 2dc21f5294f4ab42011e2359caadaf207a16e7a2eb235cd33ea4300c41c5ecdd8df771c92eb350d7e5f7334b207b42540271f016c2cf2560f9d38bb41c3e3113 SHA512 b8f39ea59b87fdf1c6b83ec6cda1bdc66650c15287219060f42015928f2739dff8084fb7722462201abe950c8888667796f76bd83cda1bfa48795af8d472f202
-EBUILD puppet-agent-5.5.7.ebuild 2478 BLAKE2B bc197abccc5e3ee2bf58c799e56437a818e56994309963561497e8eb70dce277e13d14c441b1cf4da0fc8f688af3163e87fa9044e4a3f48b71953666f65d7e40 SHA512 742a16a57da4578a0d4db4ebcf60487b6278070e3210c775d7c6b3bb0670d7cfae63c7cb661b327d3373f87bb8f348b81baefc872282e3a26717ba18485fee85
+EBUILD puppet-agent-5.5.14.ebuild 2478 BLAKE2B cf031524bec5e192c4601d0078db68fdf87f11dc589d7116e67cbb3a11467712a04fd2244bb45970e891f953a168631d15628b1214e4ceed76971577a9f5043a SHA512 c7c5641b67cbfa72f726f420447567b3b89d676a1ffaf07b4672e86874a876b34909659ca32035ec4398c4dcd9f44f1ce0dff336fbc3b13a9bf81c4112e7f8ba
 EBUILD puppet-agent-6.4.2.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild
index 388141a53241..e56b95fe5bbe 100644
--- a/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.7.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.7.ebuild
deleted file mode 100644
index 0eb9bfb5321b..000000000000
--- a/app-admin/puppet-agent/puppet-agent-5.5.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	sys-libs/readline:0/7
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 00e736bc1e00..f43a9eb38cb9 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,7 +1,7 @@
 AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41dc8f6bb2ca217d5b9ccc2b5d08872be5a65a45b7f8bc37130255df139a17b7ca09b39b5b1a0b9ddcd6c54d2448148495cf493e7a085d2f0f5 SHA512 65b303c957a29bb5782a2b849944fba029dea3a533c25d4c17830391b5e4963fef304c0be876f5e7892b1a0eb4da16390d4ab1e39f459c05ecbb7100c9c0a9ca
 AUX 50puppet-mode-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
 AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d279a63cdb65fc28713a9a2849c8e8cd0e42a30c9058e341d5bbabd3d24ae17c050fa551566e6c61301b83396a0b80a SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8
-AUX puppet-fix-tests-6.0.0.patch 1103 BLAKE2B 622364a21ca637a64e5462c800535e9973159e9f988d5c0056c685c9ef587ce3a9158bd5cf6228c2487dbdf8ba4bb9df43200f1e74cfc4c6129bd19fbf173b5b SHA512 d39fdc5b0ae7828268e8f322d38c9aa8d1dc54a09681e957fc263b40e98eade342811573e3a8045ed51ecd5570dc86e0b97b8e3e12980cec238268e9964da38a
+AUX puppet-fix-tests-5.5.14.patch 1005 BLAKE2B ebe103e8408c2015e431966a637521b673ed79b97c318699d34efffadfe311143382eb5e961d626574072c346c984206dc3f93863b2484d3fa838c2dbf51d18e SHA512 d07598d6ef8631e718e5c4b4d61db87b2651cd1f246791778def5561f0262b23b0b8f2244e326dcef33dcc083fa96438ac138b21d5fdc246642e35b81829d2ef
 AUX puppet-fix-tests-6.4.1.patch 1178 BLAKE2B 6767555c3f43519238b2e539267a40977cc460800644f2807fd1fe27fa49f805e62d5aa0a74e4c1a58160bad1fe1f1628873195a60b5b2e0a83d484e26b72bce SHA512 88a25ad9bb809f06d4af618b1da2711d84e18a63d2368c7191c6cc3170e0d85930fc235057babc92e26315312636d61d69f54cd8a3a2c8acac13ccebd187c258
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
 AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
@@ -11,15 +11,11 @@ AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
-DIST puppet-5.5.12.tar.gz 3073481 BLAKE2B 8044af48e7d86e754f767b42199814ff9b2dcda04f1e13920cea332ae79b23997cc1a17fe761bb5216d174bc5d77c244a9eba7752c004bf1558a648c334f698a SHA512 33d844d671710adae1dbe184981143883bf4f3ac1516f8aedd1cd8d30157bc947a3a66df30c10a2357a8cb42dafe02a80a24007312b2107c68350ed0871a3249
 DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
-DIST puppet-6.3.0.tar.gz 2831909 BLAKE2B ccf6353c0fc1fcdd4ac06e79bd8d91980162b8f1b2012fc2bfc1cdea3d2d6b22bf55216cea9b94a4024273ca9f76eedcc92a861de9db348408a361596033b51c SHA512 1d30706049fe378facddb923a9ecb521d37faa84740251602ac340ea1299c247252fbdaca17f1ea450ff716ab26ac4e9524f1137080318e6d9237a9e2699f6b8
 DIST puppet-6.4.1.tar.gz 2893151 BLAKE2B 5c48b30083f93ce3625551020cc3b386cbc4ca8ab249099249099dc7aa8866186c197732ad603366d5fa54c3fc1664d7b457d323a2e6d9266faa754f7d4fa4ca SHA512 260f933dac3a3033e807c5b7c63d5562d9d8d29d11550efd38b0a94eac811f27444156cc11db38da170dc2369981072288df471fd05738a0f0e951bbdffe2a52
 DIST puppet-6.4.2.tar.gz 2891159 BLAKE2B dfd8e5d9935d54272096fac66a037b8eab75dedc42caf18bafe29738e749a66869ad2e741753e8b38d872e21b1a261f2b4017c54faa57043754d619cf27652ed SHA512 7ec2746ef2a021d1cc3e3076840a9f1195fe51ba591cf2907e542b3f450cb1f4002fa3c958aee966c5976245073ba3cfacc9fd2a653d1d823720b33984aff911
 EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
-EBUILD puppet-5.5.12.ebuild 3821 BLAKE2B 2915cab6c5c2e04edc45b5720b4293bb7924e24709a012809c5c99691406bd35d15fd51a88aea268cc241b2db48137375f3ffc16a41e58bb9c640de876a584fe SHA512 0e4ce9f7b04eb4b48e1ed6e2cbb88d58a29c3c28c351220c9edd287039fb118b0b0c262dca25de7eb17d8f6ba895b93d3eb3648cbdf8d743fc3adf891ba3f2d8
-EBUILD puppet-5.5.14.ebuild 3823 BLAKE2B ae14e84e6114d043c6b6ed310defa964c8ccd4b43d1bc7d6388c1a1f4a24590e0f7cb5263887c16509d796d54855f287f221d044993be30a293d0853c7af1d59 SHA512 5645dc61fbb8d3703727cd966735ac222353ec12ee68dc03a8cca49d81df1618aa39f281bb4ddea3819f24d5bfd4e13ed97a9f5a1722901a22a4a995db81780f
-EBUILD puppet-6.3.0.ebuild 3652 BLAKE2B f9221b1c41d6afdf96e5c0ffe047b4d5eee16319618dcd4de5033d60aae7890564052e2098fb3f12b900bd41982a78831a16de144e451f0d405ea35ba22b823b SHA512 d4ae4744c0931fe56a07ababebdf8624b5df16fb22194a30de3dd78cd5de90c9cfb726230f2b1c0c3bc90d1df3b14897cc0c7ce8f3e4ef5a74d9a24144204806
+EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
 EBUILD puppet-6.4.1.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
-EBUILD puppet-6.4.2.ebuild 3654 BLAKE2B f29afbb842ad182df92104a03d02770c607f54ba228a694659b09d83c512bf9d7f269da42257e3ff92e68cd77e98da9f1b1ab317e791b97d338a3e30cdb3998d SHA512 4a197ad3b8114a4e7c685ff7b0ca21411645f542f1f3a948382f2755db126b6ad0cb61dc37f938a5c38a0c1ef27c5df4c91ea043ff2a3813f61406e63da4a84d
+EBUILD puppet-6.4.2.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch b/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
new file mode 100644
index 000000000000..09ffe07da1ae
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
@@ -0,0 +1,18 @@
+--- puppet/spec/unit/network/http/api/indirected_routes_spec.rb
++++ puppet/spec/unit/network/http/api/indirected_routes_spec.rb
+@@ -142,15 +142,6 @@
+       handler.uri2indirection("GET", uri_escaped, params)
+     end
+ 
+-    it "should not pass through an environment to check_authorization and fail if the environment is unknown" do
+-      expect(handler).to receive(:check_authorization) do |_, _, arg|
+-        expect(arg).not_to include(:environment)
+-      end
+-      expect(lambda { handler.uri2indirection("GET",
+-                                              "#{master_url_prefix}/node/bar",
+-                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
+-    end
+-
+     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
+       expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
+ 
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch b/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch
deleted file mode 100644
index 3e51218034cc..000000000000
--- a/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
-@@ -143,15 +143,6 @@
-       _, _, _, _ = handler.uri2indirection("GET", uri_escaped, params)
-     end
- 
--    it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
--      handler.expects(:check_authorization).with(anything,
--                                                 anything,
--                                                 Not(has_key(:environment)))
--      expect(lambda { handler.uri2indirection("GET",
--                                              "#{master_url_prefix}/node/bar",
--                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
--    end
--
-     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
-       handler.expects(:check_authorization).with(anything,
-                                                  anything,
diff --git a/app-admin/puppet/puppet-5.5.12.ebuild b/app-admin/puppet/puppet-5.5.12.ebuild
deleted file mode 100644
index 12914f0e266d..000000000000
--- a/app-admin/puppet/puppet-5.5.12.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	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
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	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
-
-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"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-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"
-
-	# 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
-}
-
-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 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
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-5.5.14.ebuild b/app-admin/puppet/puppet-5.5.14.ebuild
index 3f494c1f6871..75759e0d00b6 100644
--- a/app-admin/puppet/puppet-5.5.14.ebuild
+++ b/app-admin/puppet/puppet-5.5.14.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
@@ -66,7 +66,7 @@ all_ruby_prepare() {
 	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"
+	epatch "${FILESDIR}/puppet-fix-tests-5.5.14.patch"
 
 	# fix systemd path
 	epatch "${FILESDIR}/puppet-systemd.patch"
diff --git a/app-admin/puppet/puppet-6.3.0.ebuild b/app-admin/puppet/puppet-6.3.0.ebuild
deleted file mode 100644
index 3a0606a6edf6..000000000000
--- a/app-admin/puppet/puppet-6.3.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=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
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	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
-
-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"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-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-6.0.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# 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
-}
-
-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
-
-	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 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
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppet/puppet-6.4.2.ebuild b/app-admin/puppet/puppet-6.4.2.ebuild
index 0038f1ebf433..eeefd4e8c63d 100644
--- a/app-admin/puppet/puppet-6.4.2.ebuild
+++ b/app-admin/puppet/puppet-6.4.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 3ffe9ebfebc3..6d0647c0927d 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,9 +1,7 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
 DIST puppetdb-5.2.7.tar.gz 24353701 BLAKE2B 196b336a92031a25f7f28ca070a831857f3e0dde3ecc02e12e6884f3628c12dcc27b347c39147636addc975841f340fbf89196e86b3c10efc2ad1f16cf6f882a SHA512 989fa232d0fbd90c975fe110caca9b9c92a90167eb7b8d0384282dd8cf85111a56174c6785d7c73800e19185e879e258b8e6cefb210c1c44a229ce994336ef1d
 DIST puppetdb-6.3.2.tar.gz 41707817 BLAKE2B 480737af3abc862e90a7075011327ce3821a5d9460c785602c105ec7accc82f2ea712ae488c585226126e88f817cbb1acda7fa09793b7508aa38cc47e1c76ab0 SHA512 e2a3ce73c976cbbfa6acc62612187478cf5ecc9d514ff4866a74e2c6364979f17c3daeba0f03a01e7fc3eeb1ca84a3c886fd5eed07d2a9fbaa5fd9f7c9d577af
-EBUILD puppetdb-5.2.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
-EBUILD puppetdb-5.2.7.ebuild 2762 BLAKE2B a0a831a2d5fc57e047d2e02f3b186e07b16b4a2397c91f2d5420ff7664eeb7be1d3ad8dc68bf5577b1c43555c1e52bee45a3ec5179cd41f8475ed2d08856054d SHA512 3b7560b937e8888412fbbc44d891e587af7aaf27e2802534788dd248697aeac422e0be1348ef6896a09c8c60de9d48dc61ef067a61ec561f41ee9f8e6274e3ab
+EBUILD puppetdb-5.2.7.ebuild 2760 BLAKE2B e5c86d79191a026de2ffd9e322669c07258ef6fe4ddef436be534c580fb14e7ba5fb13c91d1cae61e7addd3571a938e2ec23c0fb61d6a4318f7807f08f1bdff9 SHA512 e60d80aa5c60d54b904e8402bb9e729e2216c2b038b34aff64ad5234cdeda32418da10b3f79029a879f20bfddcfd6923647aade0e3c566672316f72c9dd78761
 EBUILD puppetdb-6.3.2.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-5.2.4.ebuild b/app-admin/puppetdb/puppetdb-5.2.4.ebuild
deleted file mode 100644
index e2e9e4db500f..000000000000
--- a/app-admin/puppetdb/puppetdb-5.2.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-5.2.7.ebuild b/app-admin/puppetdb/puppetdb-5.2.7.ebuild
index 40efa2d8d9ca..5a1f774d271d 100644
--- a/app-admin/puppetdb/puppetdb-5.2.7.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.2.7.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 9373b9294ddd..1adf389de507 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,8 +1,6 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
-DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c
 DIST puppetserver-5.3.8.tar.gz 53615153 BLAKE2B 82de090126c18a607089c2d260c38c4dcf28c9dd55dedde43952493ac0dd0553b718f1e96c36737514527e72fbd04a4b54eb5667123dd46d21ff7e7e6688dd08 SHA512 ac2b28bd506a92606f5458a079fe9ffcd8a7d3b091ccbfcd649f0a818d0459b57bc3f40fa599f2f6e7012ffbd4b7e95af8ac9787cda74928bd29bb59b7633ba3
 DIST puppetserver-6.3.0.tar.gz 75698674 BLAKE2B 4eb88b15c936f8a66c5447e5761cc35772632420ca74de17f06453c9645f6f4d6483ec6a850810401efddf07f40710bd9563e78f5f870faaa85c0c6b2e450fa1 SHA512 a3c3e9c00e3dae274a2139a166c121d1d9b1dde8ad640e70d68433eee53a9bcf7ad8ba53d6e355ee1de93a522f8e0169eb80f52fc438ce6a76ebcd007398108b
-EBUILD puppetserver-5.3.5-r1.ebuild 4894 BLAKE2B 23e8e5a9b5d544c5107e8c56b5fffe727a06883dfcd13cf55f519e70a77798424a217970c4c38c1c703466a2ac16fe0032b9ccb7e377db5c40bdebba238caa53 SHA512 f43549918d1bfe8a9ffd444bd9816e91cde25b4939432949f28e4be5bf7081175bf524cbb66e9c9aa177b9da1844cb58155b1340b301c282a721db036cb83443
-EBUILD puppetserver-5.3.8.ebuild 4893 BLAKE2B 802069d0b2e2f414ed43eade2f993c708c9769ea25bbfeb7a49ed40e6690039a10f3014f07292b3a95eb42b05597aaea385e386d986fefac2b42eb3de6b7f4c5 SHA512 77a1f8e429a109e1347e47ba13198b7bcea17ec6564e84d1bbd4bafe1652b74507b3086d0ccd47da4fa04dbbaa177c67d2a8a0fc1043938948a4b50598c74339
+EBUILD puppetserver-5.3.8.ebuild 4891 BLAKE2B 98328c3b80442b6d2d2900f1fb9064074a04687ba4bfad2c34745a448c05a4a021c50aa53646139006a457b09249d951628be4ea340b8ab0d8dc9450b7529c71 SHA512 2e94ec40dd0b3dff133bb702fb002862373901fc84350c093b98970c567d2946902b0eda72770cdaa12e6d952b840c99b02159ec09157a84a22775e5197923e1
 EBUILD puppetserver-6.3.0.ebuild 5354 BLAKE2B c75b4c97ebd41fadf589e7ef752291425935af7d1f1528401f7dd1b2b670cc865570b8a610f1901eba1037bdaebb2d8dd2998380e001c046bcf54fe35b02153a SHA512 613533ffbcc1925f2ff040880d82f2a20c231d66697a49d6fc5fbf5a17528d3b3d1285918b83bf8ef4b4ee729656be610bb30f0bbefa827376f57da1fbd34950
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild b/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild
deleted file mode 100644
index abb2d3c69b4c..000000000000
--- a/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd tmpfiles user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	doins jruby-9k.jar
-	doins jruby-1_7.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	newins ext/build-scripts/jruby-gem-list.txt puppetserver-gem-list.txt
-	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
-	elog "while read LINE"
-	elog "do"
-	elog "	java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-5.3.8.ebuild b/app-admin/puppetserver/puppetserver-5.3.8.ebuild
index 954d16fdc3b6..b2fc283c15d0 100644
--- a/app-admin/puppetserver/puppetserver-5.3.8.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.8.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 052d103eb44a..3b94f52a7020 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,7 +1,5 @@
-DIST r10k-1.5.1.gem 164864 BLAKE2B 398f656913b9c0b3835d782dec3aa0d7a475dc49ac6fba7734239a795e209048969c1e66575029eae5ac19513ac57e24adbfc839c9f5c0537c82fe0fe65def30 SHA512 4440a893aaa6ec0337f9347b620f92afd93099465c148bfe90cd44c2c6fe29cc8411b8c225044a9547d24a8857b580dcf2ea190bf64fe9ba180d1c5c3832d1dd
 DIST r10k-3.1.0.gem 202240 BLAKE2B 46b7b03d7d57aa856f31ee1a8fe804b1e5ed2272f2543955c46fd194a956c4074fab7a0ca59ce828e1d0841cd7beabdcaa7a167329a8ac707e96be9e71f2cd2f SHA512 7ec80be0e09d0693f33eaca4420a47a6fa7c2216ab8a06a45611b7150f97be00eaca7dd674962f14b169f9b0b315c3b47c76612baee0724c7d928541e535a960
 DIST r10k-3.2.0.gem 206336 BLAKE2B badc840ec7e6793daf205f1352899fa909e9a922a353a52841809dc80fd03758a865e0cb8210e58bb5c25968207d537b3f19c1903fbb519c50b6af2dd27eb5fb SHA512 7ea00ec28ba631877d33fa8b00b25e1c69346b787499ec7b26118c16acecf6bd39fcdc4618af016ebf5b62850b6d984510f7e9153dd4e99771def299b7d0703d
-EBUILD r10k-1.5.1-r2.ebuild 2131 BLAKE2B de5a13b71bb521c86393bca53da848ffc973efb2f199d28ee541b9869cb874b701f86084ef74754eb8543e8c9622f07b9cb2f7ccc09f0c4fa0a37186fea07312 SHA512 006378f1882b424be37282753543b1c562cf4fbfd298368c37c3944aca1ec611bb6a2058e7cb6c59278ba9488dded3b6b83a90e00a3c72b5c2b221bb5e06ca5a
 EBUILD r10k-3.1.0.ebuild 1096 BLAKE2B dc9c736609bad40702eea4b23c93c1979d448ab1d5906ace81b855ae19f8087e245e1238bd3635827c4af2128d7d2f44819f864d0e4bd9a66ce13e2c7669083a SHA512 d193f72c3ebd4b0d809f93dd521900c638731f3d01993bc82639e1a5a067cd3b8a6a7710c7eb07188df898a17525fd67c493c515168cb9f53c508fe4b86cb922
 EBUILD r10k-3.2.0.ebuild 933 BLAKE2B 6e7df53cab2a25bb5bf6fa4218cd670b742a68aeeb5402dd09d1f34861d0596250b915965a06b4cc8c157009d671046c00758cb576223d108e6b8d40067a23a6 SHA512 66c0c7e12e9f934c9e5f3024021e31ef4dce674f3eb27763bdc60413c9ef79dd101ed5cdcbdeec6cab9332fcbb60454754aea7c05f251b23327fef6f227eb7c8
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
diff --git a/app-admin/r10k/r10k-1.5.1-r2.ebuild b/app-admin/r10k/r10k-1.5.1-r2.ebuild
deleted file mode 100644
index ff43d400d34e..000000000000
--- a/app-admin/r10k/r10k-1.5.1-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_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 '/semantic_puppet/ s/~>/>/' \
-		-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/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index adf7ff308813..f6976f815bb5 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,10 +1,13 @@
 AUX ras-mc-ctl.openrc 295 BLAKE2B 8f6da9d6d4e392e4255ac70a57ece6e665771fc0f91c64506af6fd2157a5a4c159921ac341e66d18176434c523b6060c0cb2cabee6f7ca003e1896c0b6b6a266 SHA512 be635afaf5182907b4ae085d8c15b7aa6ae07e19a277423fe180a5e0524fa33747ceba8fe991cc263341b6c15443d3aff8f6c6c0311a87194687e25fa8387f32
 AUX ras-mc-ctl.openrc-r1 419 BLAKE2B 50239d64b95c1759a2fb88107b78875b9f6227c256c2a59628b33dfaf720c649e714afe24424f34e865d1fc46145daa8deda4e8612ef6c0d11ef1bf67b2c2e88 SHA512 f12c82432086bfdd0ee24a767b2c6dae9a50cb65038189bfdc2aff9447e5e734e1277d809ed3c7a55ac31034773983e1f46f466adabdd4e727b491c260c5c53e
+AUX rasdaemon.confd 107 BLAKE2B a3c0b7c09b1f3f76be0186208702858ca6ddcc9a9e912a88357e79e7f3aabe92b5a99f95c7bbe5ea1443e2ba2f8fcb83834b32a68774439165c7da0fff1d27ff SHA512 bc89a1fb03289bed3a34e84f593f5bc3506553ac64810ae360393cd33f6109e0a469990a79f2c56fc07905671c3e2fe9a70a65ba180df3855fdc4113ae5d4da3
 AUX rasdaemon.openrc 369 BLAKE2B 81768b9a6cdf4696d8598dc61675b86f617ae543cdfda8166f961d9ab470ba107165b72be32370f71f52b07503f3ea948cf9d7ad10c2899e2e9b79f1e06e96de SHA512 eb91a3c54033a136e5b35aa769b5c01a0810970e77efa3f9efbcda5cf088e5268fd7bd9fff953bc47b9233a41e5321094b4d2ef85500dc0175f5be6a64c03105
 AUX rasdaemon.openrc-r1 484 BLAKE2B dd64b1b6164f74e887ebff43116bd23311b86a7bbdf7830beb4ba27ad3e2db33e2107c7083c23f14e50e781a339e49be8a69ee902cfbc98713de034daa5a82a1 SHA512 e27c08bc118edd95468dd466aea52764df5b400ce9acf2043bd035d2fadbaa3b953794869c1fdaa23320e9529960e97c9e47dd31e8d8f3f48a324090f784907d
+AUX rasdaemon.openrc-r2 424 BLAKE2B d3be2b06631ec3dc60e464b5fb38a4778e92a93fc284455f53f6b7c43a05d182b79f478362ed93a706b421ca99f6a21afdd2cbd53d125711bbf1d0f267304ace SHA512 2e30602222443e519cefc1f138dc537f5e22109fde2f8ebb0f8962abd926721389defc46cfa8db667db8618d4dc4257d36e9855367c3c8f2b7d28cb8684a4adf
 DIST rasdaemon-0.6.1.tar.bz2 363201 BLAKE2B bdc7ec3c2e7e4b2fee02dddc55b5afd82df64717f45da15dbfd5fee87721b80ac425af5806ee7462cad29c6ab2953a2e649c4b1e455983d8821a1f633d76c85d SHA512 a221a7ea0e4555befbf8acb9d4ce22d5cc7861a0da458111a24905fa06be0e8f3b18d8de5334310a423657febc0532d2705236de89cb1788302bf487ede29f60
 DIST rasdaemon-0.6.2.tar.bz2 375140 BLAKE2B fd22185172777865120fbd13b7bfb5db9b9b0348fe8575ca6b5f16fd662c1e847729e239342b1c9ece70a4e79ad00352bb69d9f80cfbc8da2c961e68874dd03b SHA512 d8c1ee2cc801124837b3a0739f3016a206165306e300ce51e6aac2cef56bb65479f96cdb019ba3a5cffeba94e7b67ca22686d4ac94bfa8a8a1145db6ba51096b
 EBUILD rasdaemon-0.6.1-r1.ebuild 931 BLAKE2B fe6abb4a500f9890dbdcb06a457d7a33ab8b138fa22af2d4046ff133a9205a8f75c6e07273e4fb7eeadf3bf8a974e8fcea39e29c4b6d080a627d6619a4c2e5fa SHA512 02871f282b1b7a4f4601293974d7fbccc41ee7c90a590e6d349db20040bd1cbebb562c56acf8c0cbad37dd6e4e04ac0140f2d34e70f208b611b1cb73873a0f67
 EBUILD rasdaemon-0.6.2-r1.ebuild 1033 BLAKE2B f3a939268a9b34f730424f8d7af85c96e0240fb8ed3d6dd8b181bdc720b84622e41f2b2bb541a055dff70bda6f2e5c4952bf53bf68a328a7907b91ea47292892 SHA512 5837d47d13166bed48f89cbd10682550f4c3abd9e4c00d1757d432e9ece382c323e8cdc44b938770517f93a801b1eb2bf91ae93e034a9113f1d123e1f74bc338
 EBUILD rasdaemon-0.6.2-r3.ebuild 1137 BLAKE2B a2402b26a92a0b9e6e6383c27d82e558bfe3f2737702ac3f0b2f57096f2eee6a6ca3ee9e8ab1fadab8366eca762a76d82ee02b783b39c35325b3a5af73f9f881 SHA512 490ed88bed969b3ab6a634bf3b04086b187a58deb39279911339f953f32da0618cb055b488b15996c011b4e681b338e640c162d2cf9a90c96fec47f409455e87
+EBUILD rasdaemon-0.6.2-r4.ebuild 1151 BLAKE2B 15161840fc5b98646cf3fbf08657a5492c054876fae43905f55285f3ae0434a88c238479f7a3c02bbda476f43316b559bb4805df49468f66e206c14d3bec78a0 SHA512 2e7ea61b7294ac22d809f32ed6fef34d73444a7a6f6a6bfa93bc004c7cb1e14c75832aeeda335c5c9e4b82b348fe5520b71a381d713a5ba8e093aa2eff6de6d4
 MISC metadata.xml 871 BLAKE2B c9b484c2fd3019681f9c335fc046c7718c35bcafd9fa46f59328c68fb4404571818b861cb938bcb00fa08a164688a58735d7db27e73120597cd114a3a39acaba SHA512 1815bc3a92340071b40de8129441bbf55fee7edbec94f5337d6a9b42311cc3c1d898598d0756b60b56d804629700a2c0109362933acf5442a74097e752b24935
diff --git a/app-admin/rasdaemon/files/rasdaemon.confd b/app-admin/rasdaemon/files/rasdaemon.confd
new file mode 100644
index 000000000000..2b89db191cd7
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon.confd
@@ -0,0 +1,2 @@
+# pass the -record option if sqlite is enabled and you wish store events in sqlite
+#RASDAEMON_ARGS=-record
diff --git a/app-admin/rasdaemon/files/rasdaemon.openrc-r2 b/app-admin/rasdaemon/files/rasdaemon.openrc-r2
new file mode 100644
index 000000000000..c8a2bc4b0e65
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon.openrc-r2
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts Reliablity, Availability and Serviceability (RAS) service"
+
+depend() {
+	need localmount
+	use logger
+}
+
+command="/usr/sbin/rasdaemon"
+command_args="${RASDAEMON_ARGS}"
+
+start_post() {
+	"${command}" --enable >/dev/null 2>&1
+}
+
+stop_post() {
+	"${command}" --disable >/dev/null 2>&1
+}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.2-r4.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.2-r4.ebuild
new file mode 100644
index 000000000000..19491e340401
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.6.2-r4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
+SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sqlite"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	sys-devel/gettext
+	sys-apps/dmidecode
+	sqlite? (
+		dev-db/sqlite
+		dev-perl/DBD-SQLite
+	)
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="~ACPI_EXTLOG"
+	check_extra_config
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable sqlite sqlite3)
+		--enable-abrt-report
+		--enable-aer
+		--enable-arm
+		--enable-extlog
+		--enable-hisi-ns-decode
+		--enable-mce
+		--enable-non-standard
+		--includedir="/usr/include/${PN}"
+		--localstatedir=/var
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir "/var/lib/${PN}"
+
+	systemd_dounit misc/*.service
+
+	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
+	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
+	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 2c9f3f4b984f..f3bf752b8741 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -13,18 +13,21 @@ AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b
 DIST rsyslog-8.1901.0.tar.gz 2750872 BLAKE2B 8bc07bd0c73cf309b5fb853e3bc66e555dee4284d0c8ede5b73420db7b42758f5fcfbc7ca90b618cc27e7067795f2725f5ed96f59170f3d2690a0653f2b69847 SHA512 2b8b2d40d3df4c47dba765d70fc716dc127ce776b31f217f78a3e1c2bf820e41799a5069d7f41f04ce39baead286ecd42fb353492873e3795aff704d686d67cb
 DIST rsyslog-8.1903.0.tar.gz 2786605 BLAKE2B 2c60450b5f5a54f3d4fe4f9f51c81145cdebb1b0e1dd4b76f2ad23803c8bb417affbdcc9b4a0d8ccb65b0e98f5cb5cf187ce219be3e44e44c5bd253cae5f95dc SHA512 0f698c264a4afba56467b341c094be7357fba08a6ee7a24bb1b053c06da04e83eb1832ee46b68ea21f8f4de841cd97aaadc46e78bb4adfe23604c9fe95103fa9
 DIST rsyslog-8.1904.0.tar.gz 2902708 BLAKE2B 515d5e32c2dc6cdd8dd51fc595ad775503438603f28828e9f1a427b184a5a61de32af2ee90334b7d56a9404106d74da47386a18a370278d5a16422a6bb09f556 SHA512 cccb48f06508d7e7c2dd788903f4d7ddb3020cdf6079aea1d52387c56b920f10b08957a79b5d420ccdb54cae50d1da6e5eb80cde9498bceaeda4f6ce37f694fd
+DIST rsyslog-8.1905.0.tar.gz 2911703 BLAKE2B 5767ff2e5f1104522bde2178ecadfacac3d0754fd746754b7b29509aea45c40b17cb37d0323e6b1116fc95f2e7b1f43277ef9c96695bdf89805f9ba90944f608 SHA512 e014d48c213723317b8d07e3083e32a480e2b896eccc0dc7a491798cf56fcc1e341acba64ab44c1d935e964082c405f2f1135bd420d821e163c148e736332d0b
 DIST rsyslog-8.38.0.tar.gz 2721798 BLAKE2B 578bc9eefce4893a9c1eb54ee7360cd9fa51b3c87ffe07a0fd5b122987f991835f603417243084de0b59286e993ad1c84237e61c44bc18457b3660668421101b SHA512 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254
 DIST rsyslog-8.39.0.tar.gz 2721560 BLAKE2B 0680cb31d0a07e5676a5c5626e46fa174b8df08ceec49b514624ff8ffeb750bbf199f73af1d89b9dfad121a292084d75b0a1218fb33138f1d7a149fd730cb3d9 SHA512 f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479
 DIST rsyslog-8.40.0.tar.gz 2726022 BLAKE2B 33f7f2018200a20b01dbfabeeab592aa09d530edd313bb13f16c47cf3f67aebd9c465af3f1e468ca3d352cd83e4f4eee567c6fd54bbaee1723bee56f4631b440 SHA512 3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd
 DIST rsyslog-doc-8.1901.0.tar.gz 7768575 BLAKE2B 40bc8b038fd0210d0cac01704624d87c2a73701a7494e5970423adf14948e46d1cff6df5894a82e6664d891d0c2760a5a0154bc42fb410ecf6dd25f3166e17b8 SHA512 afcc592ce4bf0dbe048786627d87b783f1c99e7711c44ffcc41cde67b2b2fef55c944b5c90e7272a84bbec95b78c0174df634b02baad2ac5819b3611efc1cb98
 DIST rsyslog-doc-8.1903.0.tar.gz 7816457 BLAKE2B 0628a5e7f0a2c8229470f6b05c22fa0d01de12eace4f895e17a47e7003bf078be5f3b2df15cd13a4cf53384d285b558b0936308cb58e7c7e71796ca99447da3e SHA512 b42f950499798fd2bbf9e2ac2da074781955cc552628edcd928f25943b6b80d5f2e1a2eab3b8fb0fa2f6278f2b4366f096c3e976a91223e545b4306479ca4f5d
 DIST rsyslog-doc-8.1904.0.tar.gz 8042650 BLAKE2B 585fe5c63eee1fb46f94dcd3d529045b3900e08c291e0e71ed9bf32a6200e6c7283820b262bd56e9aeb74cc227ecd518caafec5a8f87c1d8523d5d7fd95030aa SHA512 da0ff00fbe71756b3c27fd8b94e88611452c3ba611e583862556393faaaa596ca8f32f694ad40a3e1df67385d9f9ca80db6a58f5d2e336fe95639dd7cd0de828
+DIST rsyslog-doc-8.1905.0.tar.gz 8054440 BLAKE2B 76f832fcbb41d405240f7bce4796edf4a56da5ff809ed846edbbb1b780a35837a8d061519dbec2e7afbe46a71f617d5f92f431f45f6723c055bab2fdf0df28fb SHA512 7b468aaa79a2098746bc5592f2c03270aaacb07dd06fd3be7a8c62bfe531b266e27265d873290f9a6bfb26135a4a6c49be96177a3449ff7dba54f1193c452ad3
 DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5
 DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd17aa517c2fc875c46ac190428db6aa2a0f81f8aaed6e5b0b6991a5c13f45bc818be76c0fe4444c0eb45628ebf48b4956 SHA512 a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de
 DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
 EBUILD rsyslog-8.1901.0.ebuild 12354 BLAKE2B a5907ced4f42a503ce63d19bdb2fdcca4db442cd64e053f9858d3809e7a40ccb879bc00ae2021daedf6463cb16767413c9b530476ae5f4c326779a808657f390 SHA512 961b98101d517510c3de600e1e2e74cc5d7533de2d6317b53cce49a8a6d704729cf4b10b6f502d65c0ae876257ce8d42a46319b718763b4cb59eef03ebbccff3
 EBUILD rsyslog-8.1903.0.ebuild 12531 BLAKE2B e8ad30c6ca996894be5a84be8a8b19ec2354aaf44aaf915c8471c0cc51156080a45fd2c422d2dbef50904f8a820693ef5e1f93267ce9fa12b37cb863028dd91b SHA512 5918af3232e7d2bd9b6e8511a9f29f276b081ffe2a4f6b3c0773b737b97d104b0722a64a3506360ae8794c2b1aa7c8c6327d63a3fcf9385db6324a409b940060
 EBUILD rsyslog-8.1904.0.ebuild 12571 BLAKE2B 0d892e66f94d73b20c0addb444edd904d6961cd7918adcc024f813776d766775fad7c0a288df2656f1cee14387d33949bf1c85cb86f85158b1a700393aa3396e SHA512 2826e3eeff416a5673f8810673097a524ea34718af98d934a8eac7a3417167d167ea880bc3ec1ff0b984ab6d95bf3344566d557978c0cd04052d177ca55992f0
+EBUILD rsyslog-8.1905.0.ebuild 12571 BLAKE2B 0d892e66f94d73b20c0addb444edd904d6961cd7918adcc024f813776d766775fad7c0a288df2656f1cee14387d33949bf1c85cb86f85158b1a700393aa3396e SHA512 2826e3eeff416a5673f8810673097a524ea34718af98d934a8eac7a3417167d167ea880bc3ec1ff0b984ab6d95bf3344566d557978c0cd04052d177ca55992f0
 EBUILD rsyslog-8.38.0-r2.ebuild 12281 BLAKE2B 8debd0ba1551ece2c24fbfb8893204e592ed40682eeab26ea2b32febfbf1442aeabf3f7215bd5371fc9c6abfe6923da887f71d12be1e7e57193b03d6b65c4a21 SHA512 7c95fc07a96854386a611878a53b625b0d95615058c9c2c97dd2ad2e563bca1cb14e81be747dab108e7304734d2c2f86a8d626626ee52178dd769fefd8339260
 EBUILD rsyslog-8.39.0-r1.ebuild 12357 BLAKE2B 0baadf35229801863b6f2dcbafed210d8d9503595bd9410969e52006cfc0d34c52b9c6dece38285d6674ae757b9c1d223405d02813fea4d0c2e0c15e50915c5d SHA512 b7568c5217593aa764645793a8d92c6c116f8108c0b7e55fe625c463cadb2ca0a2e71060686fb100cea87e870911862fb5770dea07e866b98763596be56ed3dd
 EBUILD rsyslog-8.40.0-r1.ebuild 12337 BLAKE2B f2c9a511505a4656c5d39fb81ff65687d062bd78338865d702248ce77cbc9e55fe9edb0139d8aade2d793b6ad725a2f3060249959eab8e7278ca56dfc936df76 SHA512 f26f3f622e2242e70185ef62ff995394fd6fff830d6c21392fa0ce4bb49986c1417e14f1befb5923e08f5a2a15396af417f0a1f63acd7256d3f577d31da814f0
diff --git a/app-admin/rsyslog/rsyslog-8.1905.0.ebuild b/app-admin/rsyslog/rsyslog-8.1905.0.ebuild
new file mode 100644
index 000000000000..1161ca1f6d61
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.1905.0.ebuild
@@ -0,0 +1,463 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
+IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( virtual/libmysqlclient:= )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest
index cbc17f2b1c4b..a5765b9133a5 100644
--- a/app-admin/spectre-meltdown-checker/Manifest
+++ b/app-admin/spectre-meltdown-checker/Manifest
@@ -1,8 +1,10 @@
 DIST spectre-meltdown-checker-0.39.tar.gz 43785 BLAKE2B c8688b28eac8951b3cf813cd591adc9cb01756a1da149129d2045274bf3d01c56a9145c4dd9154f6229d53a993dd8803e6c0cca866710ba09973f13421be4e6f SHA512 175bc147356e9730fb13f71c66e8826e85e3ad4e0d7f1fbb075f8310e1763f442b3da85fae70f107dcd77172d498fb24857c9e8343cb6813857039d55e9eab6f
 DIST spectre-meltdown-checker-0.40.tar.gz 52463 BLAKE2B d0cbaf695bea41bf918900d1356b8dd26cd7ab7b66ce8a82b2e82a0554dcfe5435bb20262490dcab312e2be4962a2fabb1defba0295a84ee62b5fa876f20f5b8 SHA512 da2d63d9aa513a529537dc58f9370c811577f70ecd856ee001888108a871351484f47697cdefb1b0711be3fb342ba733e78b75fd154eec98c4c9a8504e6adcf9
 DIST spectre-meltdown-checker-0.41.tar.gz 56170 BLAKE2B 07ec1a56dd13c15463696d136652f67d771d71be5ff39ed0024ab69b5dc84b1bef0c695771b0966c89e7311a9c894e2f7b9ddb8ad2c4120da183948b63044c2c SHA512 4391098cd969a211ed77e386e79df3ea2c2482bc1817e9b037720922cbd845457c4192e1de7b0a62ec971c3b6c551240cf2ef29191fadce1698256af43737b26
+DIST spectre-meltdown-checker-0.42.tar.gz 57491 BLAKE2B b13fdf74e0b63db1dd1aaa6bc154ab2717ee4a3ca601d7c6fb18578e42d03545010fe74cb72fe17ccc8c2ff949d47af49704cd8bd7431b5ec3cf1d7fbd288d49 SHA512 721e9287ce367648e367850b94866a6465b92561a0c2f1699599ef333921fda988979db02004b2c83ec9c808f625f793d43eacdd84d44a9d1eba59b2b300174c
 EBUILD spectre-meltdown-checker-0.39.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f3548f64a6d34675ff83709430b7209ce817c362c7608a538439cec26d20c6507b556e822ea6e57ca9cc1260641092c55ed4b1c8005 SHA512 f1464c0b9ea01606833459688a90621b573c40ec598c39ec1bc4e41e48f8a5264345b82212d9332f09792a6cba1314f8bff2e519f982dbaf0a7b59e3b355dbef
 EBUILD spectre-meltdown-checker-0.40.ebuild 611 BLAKE2B be71069f07922e8bfe1ee4627a6483c22ad886807cfd95cd67151d45e38456c0e132ef2572ab0b2b4220c21ba76a5e2aeb7dcf1db4e745f5a7d24a9b9442e0be SHA512 9e9852fb0268f890061528c0e550f63b023aa966025b1d8dcde83e24f3de768eefd806aa90ec97c5e36b69e614b03c0218c2443d9d2af1b54da3d95b83536b13
 EBUILD spectre-meltdown-checker-0.41.ebuild 611 BLAKE2B 205796938c2b38c3dd99c7799cbf564be38be6ed377250e4f3e72da525ae80ce1966f53d6e4ea283496854923be899e9b01376f7ea952b6ec498b9f52ecec2cc SHA512 8f9b0362c498942079455927ac26dbefcdec549f216e1c250e0fd9531ff81ba1274f9142eb325bb0e0d3a5b6b8b006ced06714b9a0724f8be3904c137226fba7
+EBUILD spectre-meltdown-checker-0.42.ebuild 613 BLAKE2B 845c9882ebe3ea93f8658fe713845e4cab942fdd59a7d1888e4cc6a424defcaf4eee2a347169dce54b7ecd0f485c8310ddd6aa5b9ac260de3f213d9fb7347294 SHA512 af555d0e399c9cc9e100cb06e91821e74779286460262f87cf5bd0cd5832562fa6cad0a2f8bf80e01cfddd59a0722a4b2c5e3ed55d6bcc4207deb26e1e1577f2
 EBUILD spectre-meltdown-checker-9999.ebuild 616 BLAKE2B 1a0cd1b4cf550568a77bb037cd600cd9a54f4ff0eccd267a98b6849c1bfbee97ba967c78f6566a1b6349d50d4936b243714cec8b2e2d87509d3da9dee1048f18 SHA512 2c09e4d7b49095e2e1bd2a19fb26745898409295338167f5e8a77164b207984234b18c08916add448b7f31e6a2ae789ebc9bf955cf623e4678038d58fcaf572f
 MISC metadata.xml 461 BLAKE2B ffd3a0e87b161c95e73d98acfb9ce11068ff5698ad095703e48ff7a95bd9c65379bdfa87ed19f6a1c5e10458cb10042f33e986d58741f8667b49409c1d7083ad SHA512 9e59c70f06c412ef1a742d2edbf62ef5e69e3997e8ba713e61a91dfcdb4a399035e60d9ce6fad43a1568cec658f05d33bc3aaa5fd2efc1cf70eb0f5fd98e1dbc
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.42.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.42.ebuild
new file mode 100644
index 000000000000..6b4c5b8281fa
--- /dev/null
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.42.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
+else
+	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
+HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	default
+	newbin spectre-meltdown-checker.sh spectre-meltdown-checker
+}
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index cb65ab498d78..52d72678cf09 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -7,10 +7,10 @@ AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288
 AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
 DIST supervisor-3.1.4.tar.gz 392321 BLAKE2B 316789fae200f02242a90d3a22a3c6486576f74dbab81b95efc72768a89c54999a370625f9589afe1edff08351840fbe27a7ef8674e6f1e3bbdd4237f3227df6 SHA512 7182db4169d37aa8f7a2a4e1d57ce40f6dea21759ed73fb49286dd5ffb2bdede0fccdc71344e93c8f8c067a2cbc4e3cb0a9a50b22bacdb1b8bc1378581ed5f07
 DIST supervisor-3.3.5.tar.gz 421220 BLAKE2B 63e9db005596921c4a4426de361fc20992a27b67b67ee1256cd64fe6d385909682a5055e4797512410f36f6855592f53c9c5720c54a2dae967578691d05ff3fc SHA512 66c43d40c216e5c3120e083407c848295fa1e59d6d9da916a4bae5c37d4d13208c3bf7c0c8b8a5d570270eb44fac0b1bbcceddb2e84e4f3fc1b6241b43116af7
-DIST supervisor-4.0.1.tar.gz 433742 BLAKE2B dc0683566c9b052c6a832e09eb6eba76890f07f5b67a1c129343ed3de31e5dc88777cfcb1b3c06a6a687160c172c3d83227765678c9c54239fbe57eb9b5ebd0a SHA512 e2e0e92ef1dba74ea4e3e70c2bd56b8a497d22db8123411f4f2019b45626606e90030577ae79aa8b81103c2f337c76d7516f94bb01e97172e2e541ec44d0f1b9
 DIST supervisor-4.0.2.tar.gz 434408 BLAKE2B 567e680c4b350e94c10be28ab25a16392a10f904fbc453c4d59132bb9e284b47e723834d5a34d803f4e54d5d17ce84b3e7e275d7f884c4d0e3ee05d50470008a SHA512 662bc1052276c2f54e0eeae820f9ae53e7f37150db21f0547be74b90455e213c9ca2b21e07079f1bd1740fae6e3d664edd3d27d57a0128828fc1a9c3627b3189
+DIST supervisor-4.0.3.tar.gz 435960 BLAKE2B 001f556b955311e2453fe1091e46696f3712751e20fad54437fd86c6020e844047ac6cd8983d46a07dd1830e6324d198c84c9d0c8fe301bb5ca568e4c7345d72 SHA512 09de52dca9f71409954fb4782d42099d19892bd82797d2b3dc7100b2693da292fe9822b5144eaf4dcbe295f4e227d62601c8791016e1bcd5c253d99c89f59368
 EBUILD supervisor-3.1.4.ebuild 1190 BLAKE2B 914c69c7e7d8146273fa3b2dc9445a5fee5f7d52692884a208d1b4cd3b3ac11d902823ebf1f33e2d82aaa0bdf316de85b12d04917cd115d800516733b20fc445 SHA512 be9e9ece37f97cc515679f06ca358e3af4b06039ee9009be02e28c6acecbd157fde107622201e6cea2a5c00221a6ffb078a98611662ab002edc08e3ade26c983
 EBUILD supervisor-3.3.5.ebuild 1959 BLAKE2B 168867deedc11199bff5b9d25d44056219809f35c3627a720469d755b3312f704d6568ef9331d46b4b177154707b10721c7058ead18af690b57c98f5ce912262 SHA512 9a35ea4c5381762644e00c2de4ae3272537e12357fdf17f2daa7b8c9a9187075f4625c38c555a3d6f32c4690fd8940deebaf3a27d4de9ca08fc8aa1797ebc30e
-EBUILD supervisor-4.0.1.ebuild 1798 BLAKE2B 0101fb3f69ba6750541015c4fad57bc9d195ba46d9ae0c09d4de30ef6d9acf950023fdb2ca8f201cd010391163a076ce436a0b2cf5a7ed8c62ba3417bb3ccc7f SHA512 ac93e1a1845809f3e9cb03c413bd42025e1f5c2105c7f4c4e9d07a1d371e373d0e93c006029aa7ba60a06c23f9ae10bf9da2c247623c6ddbeb8b97ec7b68ce80
 EBUILD supervisor-4.0.2.ebuild 1798 BLAKE2B 0101fb3f69ba6750541015c4fad57bc9d195ba46d9ae0c09d4de30ef6d9acf950023fdb2ca8f201cd010391163a076ce436a0b2cf5a7ed8c62ba3417bb3ccc7f SHA512 ac93e1a1845809f3e9cb03c413bd42025e1f5c2105c7f4c4e9d07a1d371e373d0e93c006029aa7ba60a06c23f9ae10bf9da2c247623c6ddbeb8b97ec7b68ce80
+EBUILD supervisor-4.0.3.ebuild 1798 BLAKE2B 0101fb3f69ba6750541015c4fad57bc9d195ba46d9ae0c09d4de30ef6d9acf950023fdb2ca8f201cd010391163a076ce436a0b2cf5a7ed8c62ba3417bb3ccc7f SHA512 ac93e1a1845809f3e9cb03c413bd42025e1f5c2105c7f4c4e9d07a1d371e373d0e93c006029aa7ba60a06c23f9ae10bf9da2c247623c6ddbeb8b97ec7b68ce80
 MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-4.0.1.ebuild b/app-admin/supervisor/supervisor-4.0.3.ebuild
index 2741d256322a..2741d256322a 100644
--- a/app-admin/supervisor/supervisor-4.0.1.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.3.ebuild
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index f9a29defabdc..e37b52460855 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -3,14 +3,14 @@ AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d8
 AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
-DIST sysstat-12.0.3.tar.xz 603064 BLAKE2B 79666c16d7a18aa058f2b8c5e81a16e11a01ba94c809a924d4be6a37cdd67f8755a0112e7f227ceb35b1a4847348de0e6ec34ef3da62c2ea81fceb1590e292ea SHA512 b6f7d27981898faabf4349eb889a767e655ed797aa3f7fac3bdc99968bdb15ed2a7aa04acda610a014022bdc2aa7e603b1c413e0eb8d734db04675fcaa4561ca
 DIST sysstat-12.0.4.tar.gz 711554 BLAKE2B b671e185d70787f5773d6824a9838ddd5d5f537c66ac37895f88b6bbddbb78b4d81efa6f962e3b812d025b361ce388583811d4f199e1ffcfe1ba0f2119b6eb88 SHA512 0a47e2b692ac3317cfd72784f21cc03970d7673727c579d403895df0377d09836a1dc76ee5d99076f2c9347f033059d000d982f33ef915130c3a89afdd6dad96
-DIST sysstat-12.1.3.tar.xz 553880 BLAKE2B cc520d294fbd38385b2f248721a33b0dd7d7beca422dcd3cc00a2a010b98850d65ceb03e8949b12426c5dc3726cb06f0d63ae30d2792808814b5c5e6912d1a14 SHA512 f264efe377b61d5f62b1ad2c14115bd22ada3a25f726bb362c3cb1a6d45f370642783d547339dc118bf34c6f3d015bba19e88043b0753f8ec6c314778456b726
+DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54ba6315c858fae71f97290e8cf9c4f5358ad6389c7489366a62667c35835151e3187382a56c98153d3a04bcc2b8d SHA512 c1061f1af35430e81e488e4b2f18b8588ec4f3c419ade004c49ca24baf60b5b76a6a59eb25f3b17b51a9f60c5833a914a514872d0235b2ca405341a2f4a32cb3
 DIST sysstat-12.1.4.tar.gz 738031 BLAKE2B 6803a727bb67e5027400f684d9d93efa6ca22526a1363e04f8bce06a6cd300d4ebf7e02c8f9048fc25794974efa38117dacdf12831bee4bfd43fe40d0b34dbb6 SHA512 e60721408861045bcb1a52b170682df54631926bf4eef5a2709e25b1469c13377026bac3e51f5eeed11c7149b916c00bf5c06a2ff65d9c28063de1ae108b61c2
+DIST sysstat-12.1.5.tar.gz 1032031 BLAKE2B 9fbc0c0d132983daa334345f1f83ac8a46092cf52f35bafd443febd8ce40e4ab11b5b9b05b92e4074ecf9feab682035b2e08094ce10f3287036821be57db0800 SHA512 9dbc44b0226efc2f219ff71d2f0b83c930263fe8d6d0b451ae8404b3056558de04c76c16f2e8ba62083cde3a37cabbcd466d9247bd61ba5921dbc2ab6a1f686b
 EBUILD sysstat-11.4.0.ebuild 1943 BLAKE2B 18bfa393fccb957e8ff519b5e6182f5a3b9155997e9d8acf256d0ab3ead8bf92e0b12a7fb1aa64fea9be7712c8432e049c20d49f41abdb4f233bfa57db20217b SHA512 5186353168b53a613ee0e8d5eeae38e315056b00a71140e3f347c4c8af5e963dada702618e8f3c84f2c25ef483d3270cc50135b28294d32fa5c14ad1cb00a5c9
-EBUILD sysstat-12.0.3.ebuild 1793 BLAKE2B 330c74093228846f82d0ea709f649508b01a1618d7493b60c6be5f34b0583fc7eb7798fc5b386c14bd21a2ee7698ce8b8c098bf00761eda8e55ca6df7d2c0b9d SHA512 7a2a46ecd3be1db6de32abdfcd0e13330b8c7e8a69a986246b0382197d847d36234d084fbbf6b00cec591bebf0741578c8c7b1385a76ef6322b4ee4272702803
 EBUILD sysstat-12.0.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
-EBUILD sysstat-12.1.3.ebuild 1793 BLAKE2B 330c74093228846f82d0ea709f649508b01a1618d7493b60c6be5f34b0583fc7eb7798fc5b386c14bd21a2ee7698ce8b8c098bf00761eda8e55ca6df7d2c0b9d SHA512 7a2a46ecd3be1db6de32abdfcd0e13330b8c7e8a69a986246b0382197d847d36234d084fbbf6b00cec591bebf0741578c8c7b1385a76ef6322b4ee4272702803
+EBUILD sysstat-12.0.5.ebuild 1695 BLAKE2B c62a67fd51aa3094d9ccd9967214740fb44e103f28700c585744c5b92461022626bdff0799f7327057fb173077605cac87b4881d393e0a1afb130ae9a2294886 SHA512 e62834ec2a72ba996f7cc9093538abbc614272508e0ed92a319cc5c3b7df02e8707ef1f222d8d42ee74cf74803fd7655d3f631dfcff831888a1848d1138cd914
 EBUILD sysstat-12.1.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
+EBUILD sysstat-12.1.5.ebuild 1696 BLAKE2B 30c8162d768496f006711471b03b3ebeb57e27f9a5f91ac435c7bfd548f438abad283a8c9ded69394daf1e91fafede6ca774e73e4446ad2e216e5b12a88e9e5b SHA512 316de216ae7704dfc0c44ebeeb45d136b758da0f97957dab815e25c8c68eae024a6afcf0efe82ca1b8a6513f6c4e8f93a3f4b9273a28b8c4f31234ad3095c3f8
 EBUILD sysstat-999999.ebuild 1741 BLAKE2B 17d47e7c1a6f90d9930b1291d54f684889e7f617cd29030cdfecd4909c50c4008e5a35a860a2b1b165c432d7b444debf2fbd2f8aecafe51532ee3b35740f126e SHA512 450f00d7fdd18fff61eac06f2c4cb02aff1a540593812965aa8f29f3338da6c0950e89314eab5fe870a8d024e58126b7015f1b1c920b5a9012099c54a3394260
 MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
diff --git a/app-admin/sysstat/sysstat-12.0.3.ebuild b/app-admin/sysstat/sysstat-12.0.3.ebuild
deleted file mode 100644
index 45e90330a0f9..000000000000
--- a/app-admin/sysstat/sysstat-12.0.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-12.0.5.ebuild b/app-admin/sysstat/sysstat-12.0.5.ebuild
new file mode 100644
index 000000000000..0b5b3cac3c98
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.0.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors:= )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+	"${FILESDIR}"/${PN}-11.7.3-flags.patch
+)
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/lib/sa \
+		conf_dir=/etc \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/sysstat/sysstat-12.1.3.ebuild b/app-admin/sysstat/sysstat-12.1.3.ebuild
deleted file mode 100644
index 45e90330a0f9..000000000000
--- a/app-admin/sysstat/sysstat-12.1.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-12.1.5.ebuild b/app-admin/sysstat/sysstat-12.1.5.ebuild
new file mode 100644
index 000000000000..a5698a451e73
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.1.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors:= )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+	"${FILESDIR}"/${PN}-11.7.3-flags.patch
+)
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/lib/sa \
+		conf_dir=/etc \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 0a80c18c4dee..54c30f9f177a 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,4 +1,5 @@
 DIST system-config-printer-1.5.11-patchset-01.tar.xz 6948 BLAKE2B effe29c51cbe74fc72566df65f10ab845c9dc1f40ca2966c40be87e19f98046f34311c24b7bc77f471b840e35b0c8eb7754a7c5464d50335c8ab2e2ed0e79afd SHA512 2501bda0e75ea51cc8e14df6b3746a0ea51618919ef35ace849efeded0cddc49e6e3793142d1cd128ce3ce62c21661d5fdb85b19718df07b87a20f5fc641885b
 DIST system-config-printer-1.5.11.tar.xz 949816 BLAKE2B 96b41d64e0aa3494b7fc7ed15ac926d833a046ba2880b36b6f5dd4e7508e2bc1fac4cb52c9940c13cec6e34cb8972fbc11fcd5a7df510296444ca08a23f4cb2b SHA512 cc0a6faec0022092e64de3d7ab28669039c93853c6931d26c264f0035486e09ad0af784833e88ee8e3dc1b6f5be9dcf84144a2a6464dfa9711172966fa6a22b4
 EBUILD system-config-printer-1.5.11-r1.ebuild 2385 BLAKE2B 662c0baddb0b4118b4a54aff12dce7403f2a8a11856759fc322cbbe1be0869be81767a7791fbc6c12838b57bb0cb77b2f820b4dc57c546fbb9181f4fcf383844 SHA512 e2d9732510cd65a0814540ee1729ebd1bc876c94f30a16a08b4b2e9596e492a0228f8dc1b01cdb01758345206e03c61d3f7ac95b630d2fff2075592f8e530123
+EBUILD system-config-printer-1.5.11-r2.ebuild 2391 BLAKE2B a9ae83182a784c3ad131ab3445a75a5a334a68d95ef78caac0a52be8bd548ef5772adba59161e2c9df1c770c6293f0f58e0474b18e5c51480cecea4d2b5a88e9 SHA512 ce543d1b878d214133efb5452fbd74c53471b562647834e33b108fb81f899022ceb44aa63809c7bc6e9073ce313818173a7c635ff3a5176441f3a3c864231824
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
new file mode 100644
index 000000000000..3138fdc7de8c
--- /dev/null
+++ b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="xml"
+inherit gnome2 python-single-r1 systemd
+
+DESCRIPTION="Graphical user interface for CUPS administration"
+HOMEPAGE="https://github.com/zdohnal/system-config-printer"
+SRC_URI="https://github.com/zdohnal/${PN}/releases/download/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-01.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+
+IUSE="doc gnome-keyring policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# Additional unhandled dependencies
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+# python samba client: smbc
+# selinux: needed for troubleshooting
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2
+	net-print/cups[dbus]
+	virtual/libusb:1
+	>=virtual/udev-172
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/xmlto-0.0.22
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-python/epydoc )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycups[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	gnome-keyring? ( app-crypt/libsecret[introspection] )
+	policykit? ( net-print/cups-pk-helper )
+"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-auth-dialog.patch
+	"${WORKDIR}"/${P}-libsecret-optional-{1,2}.patch
+	"${WORKDIR}"/${P}-scp-dbus-service-{1,2}.patch
+	"${WORKDIR}"/${P}-typo.patch
+	"${WORKDIR}"/${P}-appdata.patch
+	"${WORKDIR}"/${P}-empty-LC_MESSAGES.patch
+	"${WORKDIR}"/${P}-fdopen-utf8.patch
+	"${WORKDIR}"/${P}-typeerror.patch
+	"${WORKDIR}"/${P}-debugprint-typo.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-nls \
+		--with-desktop-vendor=Gentoo \
+		--with-udev-rules \
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+	gnome2_src_compile
+	use doc && emake html
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( html/. )
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index 2de1fe46bc9c..8cb367c771b1 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -1,7 +1,5 @@
-DIST systemrescuecd-6.0.0.iso 931135488 BLAKE2B 82879883780ff11a35f2fe635a5ee1a268de590bac79326ac2c49c960cd18755b3c10548d65eb5fb7ce5749c00f5040bb10c5ad5b196e48033fb70e3ff466026 SHA512 9bd8c06338357882fd8e3f17ddfb918e1f69e25fff6460957f9c50d496ccc3d4501e39b4596e3f387e4f7a481c9b33d18ba18fb49d74f6d916a7c5997b24c03a
 DIST systemrescuecd-6.0.3.iso 881852416 BLAKE2B ab1064237902542845e11869f7076a829e9593d29b8d106f0309c61a1371173cd5b3ef3fa3b84910cc81bcec485d27c8e297f269820aa96b0043df7c441121a2 SHA512 21b77e38999f56457a4c0a096eb58b2e74a8b376af33290b2e75995762e12a977435e8a9ed2ad9448799c3246d85f3bddfcafea020a1336b14f4f81644e06bb9
 DIST systemrescuecd-x86-5.3.2.iso 585920512 BLAKE2B e68bb4e765359ac0e8124c9cb6090ed2ec9340a09e3ebafbcaa4acc175f8afe3985a57f193cd4be4192dfb23a6042a68328a29bbfb962f73fbe010c32d66e020 SHA512 c9da6a63556836bd38f7072b49a5408f2f9e5fa310dbae3f229c9b7af4fe6e073cdfc95b942bc1a6d9c42d41527fc54e8c6c15379082bc3ee0f025da80b01e5a
 EBUILD systemrescuecd-x86-5.3.2.ebuild 2491 BLAKE2B dcfda1a902812b84d00d5386caafdc522a84c75b03852b786441f029f2fb23766bbcf0622f005755c62e192cd2eab2fa782d6db774b55bef9f7b4d6525952b0e SHA512 0286a3c2edc3a7d4a2fa3a96476e2179936e9e024464bcd155c9fe759fb346d3df6b1c371c2b4d422f745bc6af3f307f95cbea3e607b9d76c6e08a17a474754e
-EBUILD systemrescuecd-x86-6.0.0.ebuild 2147 BLAKE2B ed068ad0a612eb7ff49b93e0a9653c888e66ea7938a70e7475b973aeffad42127d0077a8850ab0c0f8b4a76f8da5f6394dc715b3decc6d4411d978bfd82c8e7d SHA512 15a2db37a09a2082dda70cc9e7b785f6dc0838e77f15b58f87820fe0c42d9856ca1f69d7f1bd8abac22f954f30dfc52978e4b0c50c6535474d8b1a33f24851d9
 EBUILD systemrescuecd-x86-6.0.3.ebuild 2105 BLAKE2B 805cd8fb4d2b896220c3ca624c1b7d647e5a0636b50fac93b6a1defc3e4b4cb02ce5df6608d41c24efae5cca7605f602690c27c5d9cb678b446f7dc9845655ae SHA512 338edfaa329f3df1fbc5c6aa6ee1d1ca17113065ed6fb5432b999b63085417b96d52ad722edfada05e036cdf28cd209b6af1e7d9d3e3958332c593615283f4e5
 MISC metadata.xml 610 BLAKE2B 400c26cbce80747fe88b60d34ea0f018b7119ad6ef333e8de931424aaa929db90ba0836a4520fbe62baa0c7aa9992745c4c082e495f318066acf5285e56dcd10 SHA512 5092c69f83df351b3697ab0c83e165eba5c7ceffd197707047bdd4d2e809ff7267e436e91e3035223beb088c48835ae28fd4032a8122687af116fa1405b30b15
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.0.ebuild
deleted file mode 100644
index f35372ef646e..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/-x86/}
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, amd64 variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${MY_P}.iso"
-
-LICENSE="Apache-1.0 Apache-2.0 Artistic Artistic-2 BEER-WARE BSD BSD-2 BSD-4 CC0-1.0 CC-BY-SA-3.0 FDL-1.3+ GPL-2 GPL-2+ GPL-3+ icu ISC JasPer2.0 LGPL-2+ LGPL-2.1+ LGPL-3+ linux-firmware MaxMind2 MIT MPL-1.1 MPL-2.0 no-source-code OFL Old-MIT OPENLDAP openssl PSF-2 public-domain Sleepycat unRAR UoI-NCSA vim ZLIB"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-RESTRICT="bindist mirror"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	ewarn "Please note that starting with version 6.0.0, upstream has switched"
-	ewarn "to Arch Linux as base of their distribution, and running on 32-bit"
-	ewarn "systems is no longer supported."
-}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${MY_P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED%/}/usr/share/${PN%-*}/${MY_P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${MY_P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 2402965bf810..bffaccd965fd 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -8,7 +8,10 @@ DIST vault-1.0.2-webui.tar.xz 1252768 BLAKE2B d4af46bae84eb2e0e76633e5af061b351d
 DIST vault-1.0.2.tar.gz 25834864 BLAKE2B 88f3252547e05a70a377d7711c7df279619455ce26003868465df1030da9ffe95bddd094b40b99f7f4698bbacfd883cdee31d14ee47e815299eb41a18ef99b3d SHA512 e90a1db0401778650f16fa01827b274dc8e38e5f6fb420814bdc3f89507d3507a94d6bd3eacabf1ae782e72286dda598106918030b674f9b7d3f8e69cddbd3ec
 DIST vault-1.1.0-webui.tar.xz 1278712 BLAKE2B f0a61d644f613e14e1e8d2adcb894a9cc4ff7580afc2150757c8786dd6aa1c3641eae013289cf4cc696e6e16d67f9ff967413ee75dedeaaed007f1621d972499 SHA512 2a318a5b1ada29856bbb3411fa6f42666531acbe4f2dbdde012a7ae60defcfe1f71d4fb18e4640c5c1f66be29de5c2c1de8f841098458991b3f4e11c94ad48e8
 DIST vault-1.1.0.tar.gz 25943119 BLAKE2B 44a7e339a7ab5e5ecfa33b70f28424b45305714df9eccee1286bdc063e3b1036f7ef830138df54482257a112b03c8e7289f921ad4f353aa37aff8ad06cb405c0 SHA512 b0bc32f438e8432d849aa896f610c9532fa923384d40749efe49985d64a91f4768a3309af449efd8c8ab4604ecdb2474c39999bfe196f0f876894f788618ae61
+DIST vault-1.1.2-webui.tar.xz 1281868 BLAKE2B 9c3662dabfd9403fda4a8acd8f9a86ff867b1cdafb5e7fb01c426e1f83fa33fc7a9bce27f70991fbed4a1e0b5cacd05b20d24644521487bd1746cb83fe1d9eaa SHA512 a33ee124592faa9e7aa02093d4219f1706a34c97159d9e32c71923ddc377f7dd26f3705bc31f968b4036bf354b226f8d2dc2fac7a9fec49a7b73558f1e3e3062
+DIST vault-1.1.2.tar.gz 26026601 BLAKE2B df208b15076007ab87c3c6683698dc4348f56d5a73ff2a52ce17c5a9858acf4d597f7c53f709a1415247cd4cdc65454cc1aa6c18504cbb10368d39df2974175d SHA512 bc645bc5efeaf5a185479ab2ea78589762d09a40e889845d8cceac94568fcfcfeac94ae602c548648aea800b791121fbb2b75c3af9a9651d08dd9e38c1219826
 EBUILD vault-0.11.5.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
 EBUILD vault-1.0.2.ebuild 2177 BLAKE2B b0eca28eea305d1959990faa564907ba489d896e11be44c31a70a56b70e66666d7006d00ce5e652d028d15157178c16e7c8fab0b1962dfbefcecee3c9e494e60 SHA512 54b48f145821acc8dff09e5ed22070fdf7c3303e186de1c1721ee654e76a51025d041a1f45c3b3fde3f55a23b2f91cdf4b8d2ac94024fe266860faf4f04162a4
 EBUILD vault-1.1.0.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
+EBUILD vault-1.1.2.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.1.2.ebuild b/app-admin/vault/vault-1.1.2.ebuild
new file mode 100644
index 000000000000..a8b0cbdb9a1d
--- /dev/null
+++ b/app-admin/vault/vault-1.1.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.11:=
+	dev-go/gox"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+	if use webui; then
+		# The webui assets build has numerous nodejs dependencies,
+		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
+		pushd "${S}/src/${EGO_PN}" >/dev/null || die
+		unpack "${VAULT_WEBUI_ARCHIVE}"
+		popd >/dev/null
+	fi
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i src/${EGO_PN}/scripts/build.sh || die
+	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	mkdir bin || die
+	export -n GOCACHE XDG_CACHE_HOME #678970
+	export GOBIN=${S}/bin GOPATH=${S}
+	cd src/${EGO_PN} || die
+	# The fmt target may need to be executed if it was previously
+	# executed by an older version of go (bug 665438).
+	emake fmt
+	BUILD_TAGS="$(usex webui ui '')" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index edcc654d91d0..e77a5b2475d7 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index cae17b27485c..bb669c1afa44 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -1,8 +1,11 @@
 AUX clamtk-6.00-change_icon_path.patch 786 BLAKE2B 05a5e30bf33e4d13134d08277bac3011559c86d6a14d681dbf4217d62addb23345ded4e6e9c30bba1a5175a9a185150b1cf8d7d2773d49a33c6ef5117ab1647c SHA512 29871b25a948d182a613b5d12d60fc34e48ca473edae27763b51cc1403b7dbda56b4bfcf91bdfd04f0165f893010be8f0bf9975f74b8465239c7833cfd861932
 DIST clamtk-6.00.tar.xz 227592 BLAKE2B b1fe3afc1fed5d96fea9fad4dfd065fc794cdcac3bbb49e04afa78548c37d6817c2c7638f46cd045bb1447d71ec619026e8d5226674951045914d5df28c3166a SHA512 5b8434532142f340caf5b16f95da0f5d0f3910c3c834ef963c1c8a9d7c1d032555c38fcb3f6195ad5f6cacde796824b68432bc1d16460a34976f0608eee47fdc
+DIST clamtk-6.01.tar.xz 227872 BLAKE2B 25cc54b8aa3d6cd16317b0266dfc2aa035ad168f009678e82a648ea05da7850cee52772d0ea540b5cf84783c4ce52fda115de4695fb416e25f4242c0640c4a23 SHA512 43db326e322dce9632b03ce44475c36dacfee86e5059ebdea827ddc58b73fb66e36982a86427267b7ae37839688f16673e9e5dc4c9286eb545b75aac3711da6b
 DIST clamtk-gnome-0.02.tar.xz 14888 BLAKE2B 2137e7bc53f557cdb2f03afe3b6cb3b1185bb12c6b646f2bdb74c69bc3d6b59b23895d36583225f6a536d91237ffd84d307e7b52f16336a88311a60b84b2cbcd SHA512 f4a33d31ecf914f016fd029a7e9b9c903ba39bb139ed21f15786445d2394ace36ff08396baf68130d4bc3081847c34efda31ad3f727b9f5c479da4392750940f
+DIST clamtk-gnome-0.03.tar.xz 15088 BLAKE2B cc1440de117eea036cf14a9ed36650916703299799c90548b02a5fee92c80f82c1d4f63e1cd726438e428e1ae3ee1550b4c8acbc22e97093131f993099c47c36 SHA512 c35a3ee34cbe5609f2ad22d0974a503bf6f24710c26d71d865c3ad3751a72fe909a9773c27cc53295c581f77d33e58d49fdd6f38f71177aa7ef1570e00ea55f2
 DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e
 DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c
 DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591
 EBUILD clamtk-6.00.ebuild 3928 BLAKE2B 43d8bedcb8cc98e74c3301c845135b914bc2d00f02773303e5834f0544e3d009941ce790bf9e425cdaf86d8da4eb917692580693c2c1a32c5b69b51e2ff658c9 SHA512 66dacda515137d8a371e1c9d1f0939be2cb7c70b37b756ac29ca3a400a78bfec5b1748f5a7caffac221f418991d1bc6d2de0cba9e57131ce995bed2a563f5f11
+EBUILD clamtk-6.01.ebuild 3935 BLAKE2B fa56bab3c3b836627a6bfc68b9a67edb3e886d35e0baf0638d49c4073928fb5c63515ce06e090fde7e21d27e226998216f0939c0fcb05e2a38cf1f65d9b18257 SHA512 05539af541c603ff186b6a21e1867ec7c6c195f8e8111bc7ca1c132b8b75a165908e0c3b085e3c8739dfb6d0807e9c66c061a6908b37d1f89087a641b792ea93
 MISC metadata.xml 942 BLAKE2B 537f7480903f2c4d4d315e0a7becf14be2f4f7cd2280f1918877f738cac8e71b58d65fa702f4a9979f44f2cb81e61dd44e7f9ba8197472095d6c7071a1bc0be6 SHA512 9bd9e7e9560a7358ed5935949a913628f50b885509f065419060d2cb6dbe605723d98930027908c1faf64f368289cac3c86e9d75a91838912036912ed60022a4
diff --git a/app-antivirus/clamtk/clamtk-6.01.ebuild b/app-antivirus/clamtk/clamtk-6.01.ebuild
new file mode 100644
index 000000000000..a40424a65dc9
--- /dev/null
+++ b/app-antivirus/clamtk/clamtk-6.01.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop perl-functions python-single-r1 xdg-utils
+
+MY_PV_KDE="0.18"
+MY_PV_NAUTILUS="0.03"
+MY_PV_NEMO="0.04"
+MY_PV_THUNAR="0.06"
+
+DESCRIPTION="A graphical front-end for ClamAV"
+HOMEPAGE="https://dave-theunsub.github.io/clamtk/"
+SRC_URI="
+	https://bitbucket.org/davem_/${PN}-gtk3/downloads/${P}.tar.xz
+	kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
+	nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
+	nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
+	thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
+"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde nautilus nemo +nls thunar"
+REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-antivirus/clamav
+	dev-perl/File-chdir
+	dev-perl/Gtk3
+	dev-perl/JSON
+	dev-perl/LWP-Protocol-https
+	dev-perl/LWP-UserAgent-Cached
+	dev-perl/Locale-gettext
+	dev-perl/Text-CSV
+	dev-perl/glib-perl
+	dev-perl/libwww-perl
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-Encode
+	virtual/perl-MIME-Base64
+	virtual/perl-Time-Piece
+	x11-themes/faenza-icon-theme
+	nautilus? ( dev-python/nautilus-python[${PYTHON_USEDEP}] )
+"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
+
+PATCHES=( "$FILESDIR"/"${PN}"-6.00-change_icon_path.patch )
+
+pkg_setup() {
+	if use nautilus; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+
+	unpack "${S}"/clamtk.1.gz
+
+	if use kde; then
+		unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
+	fi
+
+	if use nautilus; then
+		unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
+	fi
+
+	if use nemo; then
+		unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
+	fi
+
+	if use thunar; then
+		unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
+	fi
+}
+
+src_install() {
+	dobin clamtk
+
+	perl_set_version
+	insinto "${VENDOR_LIB}"/ClamTk
+	doins lib/*.pm
+
+	if use nls; then
+		domo po/*.mo
+	fi
+
+	doicon images/clamtk.png images/clamtk.xpm
+
+	domenu clamtk.desktop
+
+	doman ../clamtk.1
+
+	if use kde; then
+		insinto /usr/share/kservices5/ServiceMenus
+		doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
+
+		doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
+
+		doman ../clamtk-kde.1
+
+		docinto dolphin
+		dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
+	fi
+
+	if use nautilus; then
+		insinto /usr/share/nautilus-python/extensions
+		doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
+
+		doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
+
+		doman ../clamtk-gnome.1
+
+		docinto nautilus
+		dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
+	fi
+
+	if use nemo; then
+		insinto /usr/share/nemo/actions/
+		doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
+
+		doman ../nemo-sendto-clamtk.1
+
+		docinto nemo
+		dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
+	fi
+
+	if use thunar; then
+		insinto /usr/share/Thunar/sendto
+		doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
+
+		doman ../thunar-sendto-clamtk.1
+
+		docinto thunar
+		dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index e3f78aa7415f..a313fed05e6f 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 5978e15df5a0..f3bc1f8cc135 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,5 +1,5 @@
 DIST engrampa-1.22.0.tar.xz 1358552 BLAKE2B 542bb963d232dd75eba6102926e2cf31b52cab16eb890039609cf6ec44e86a7d6bf49ee04da316bb46e49d9c012c1f100e4acb20541cb8f46e245946f83cbac8 SHA512 7b4c3b85184c1530ec72eba174ee571cc14490c88f5fef1232acd4197f1020107f5172d6d4271753f9f6fcfadcf049273095b3dfbcef6fdd25a51ad8d2e17382
 DIST engrampa-1.22.1.tar.xz 1363488 BLAKE2B 0f71e94af50443f9f562b0eed461ca1160fab0a5a3cd02c845fac09ee2466cb8634a458a6a4488ff5ac6674b0f525eccf754b8b1cc7e3f1729d4eb6ac224e025 SHA512 111eeb470555ae8edb7754159bb2e70b03cbbc7b1c9d61c253d9d67e50d84ff0e0654e16547883c39aeeb223e8ba58201d45b50819784fc6cf7a21f0cf176c70
 EBUILD engrampa-1.22.0.ebuild 1717 BLAKE2B 1b19d5b2a8a35909db0e38b59be3f5dd4afc87ac77800b946f1a91080f37c12e49f8843ec786f92e630adf727e7dbc6a68184f748f131eb9aefeae76efd0352a SHA512 640f9adac5ff1e040cb1e5bacb6ff9408bb8d5ab4b9db91c341090987ecb3bd6f19613314fb3bac69c113ef47f18b162401e26e8a1cd6ce69f5e8cf9be985caf
-EBUILD engrampa-1.22.1.ebuild 1719 BLAKE2B e6f541789b8ca0b4b2b0fa5b2b87e464ad1109d90915453fcc447376fe5318027d118d5545d384a38df5ff7e055736705544c5f30a9f62cf433736c6634c2369 SHA512 caabfba263c58a23c5f437fdda887baa9c58eac1c3fb1f7698d6488b34469f43911e3cd39b33bb5f7eaaa4186ca7b1f49b153286a39b8570bdc6df42e9d3e018
+EBUILD engrampa-1.22.1-r1.ebuild 1682 BLAKE2B 5c2a1be179d0100ab5d917f647e0859556234d427f36e8571b2e53db3e92508b69665758b490af57a8195bf4ad82d02616702ca9de3a537bce16a803a190ad22 SHA512 f16c1da4e62b05b9db27657134d75ce1ccb69346d2710043a43f89b1557b4cfab861524ae3163f90bde6bca675e6f734719d10d12efdbe0d66fc413af96513f5
 MISC metadata.xml 702 BLAKE2B de15449aa20cc44e6068bd8047630353f3389845a3332b57631bacdc9b9c4b188f8152678240e0142142db322af7058b09060f74413ff55fd1980fe697f32d0d SHA512 b465ea239cabf4ad1cd6b1f5ba7f87151e637595191c1a88cf17059f96ca1b03ce57d4200fc793d56be2b6ddb2ded20be460a4e1ac1727180e9662f9baba4522
diff --git a/app-arch/engrampa/engrampa-1.22.1-r1.ebuild b/app-arch/engrampa/engrampa-1.22.1-r1.ebuild
new file mode 100644
index 000000000000..63cc9bce008f
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.22.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate readme.gentoo-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja magic packagekit"
+
+RDEPEND="
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/json-glib-0.14
+	virtual/libintl
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[X]
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1 )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want
+support for a particular archive format,install the relevant package:
+
+7-zip   : emerge app-arch/p7zip
+ace     : emerge app-arch/unace
+arj     : emerge app-arch/arj
+cpio    : emerge app-arch/cpio
+deb     : emerge app-arch/dpkg
+iso     : emerge app-cdr/cdrtools
+jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip
+lha     : emerge app-arch/lha
+lzma    : emerge app-arch/xz-utils
+lzop    : emerge app-arch/lzop
+rar     : emerge app-arch/unrar
+rpm     : emerge app-arch/rpm
+unstuff : emerge app-arch/stuffit
+zoo     : emerge app-arch/zoo"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		$(use_enable packagekit)
+}
+
+src_install() {
+	mate_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-arch/engrampa/engrampa-1.22.1.ebuild b/app-arch/engrampa/engrampa-1.22.1.ebuild
deleted file mode 100644
index f1260b9b27e0..000000000000
--- a/app-arch/engrampa/engrampa-1.22.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja magic packagekit"
-
-RDEPEND="
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/json-glib-0.14
-	virtual/libintl
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3[X]
-	x11-libs/pango
-	caja? ( >=mate-base/caja-1.17.1 )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 6d35e935f5a4..d9bc1da42cd0 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -2,5 +2,5 @@ AUX 1.2-optional-vapi.patch 1417 BLAKE2B 69bb7480a352894ec9c96f0566972a87004801a
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
 DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
 EBUILD gcab-0.8.ebuild 924 BLAKE2B e1d26430d255f52f12ae93d5a5b034e384aa049ef75bea44c9dee082519f6cc166d8e4dd9dd2041879397d896d375aefff345578c96a5c9a1e712e1ee05107b1 SHA512 af2f575805991c4737106b77212c9b3f241bcf6fdc0ddd50fa497c6e6e4d6bf3a61dad3800512b19e3028016fc226f0cfe777d72edc57da2afb45add3f398795
-EBUILD gcab-1.2.ebuild 1150 BLAKE2B 9f3d6e6a0045882ac413df28d9c4a005d7bb127b3ac7dec2624bdf9d28b9d1f194a2ca0811f6627d521fb4360c6a99d95ce7c63670a8c97b85f3d69ecd280fda SHA512 8c893256dd0bac5e3faac7985f69166c9bed589dfbccc49a86d75d9654432cfa51f43672cb9b14c9afc848e34cfe0d515a7d8f9cd71af4a7c26f86db161daf5d
+EBUILD gcab-1.2.ebuild 1149 BLAKE2B cbb50f2b167bbc92a95e04b1d6de5f780c0da37620773bfc225a28bb454fdca04e5684ad5869bccd1fa0c750dc6eabf2049ec078feeb365a92848dd81c793e7f SHA512 366cad5fe303d0ceb0e4dd43cb83a97a2f388937b4b5f55b5fbaa166d1b0249d08042219d846223454da8f1968814a0eee1518c6e6c94fa8823f017dc3855fb1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild
index 4445fb2b6599..17126e5f55be 100644
--- a/app-arch/gcab/gcab-1.2.ebuild
+++ b/app-arch/gcab/gcab-1.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 0a7b93f7929a..7a5918f0d3e7 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-autoar-0.2.3.tar.xz 297632 BLAKE2B 37b5861b1e0866200884aa1791fced6168c12aa740413a1330a08629aaf4e18105b02b36828619c20a15874ac41c779836627728c82fa1a79a1bab6dc9224d97 SHA512 f87299817c52e7862a6c1cc950b1c362db8e7465e008d988e70245a203c728a9179400aac8601c399abe361e5a1ac4558b1190641ad3afa7224f883546fae7bc
-EBUILD gnome-autoar-0.2.3.ebuild 951 BLAKE2B 2b88f196ea5f84e3ca157e7ffb32f9ead635f380d7c2670769dc633a608a2eb86ac2c637a02bbb97428753957962718b6588163b66c1bea12abb40bf0e32ad36 SHA512 4573d081f43651ed59f51f9c9fa0df42c4cbeabd77e6c3521c80818773adbe17bc0723b36de98d5df088d7029a729b0a70438df4caf2e9ea790177d4ea07f8b4
+EBUILD gnome-autoar-0.2.3.ebuild 950 BLAKE2B e23df91c9242ce1dc880c39dbbcba5173cc4d7fea114d89685b0eaa50225cdab3de9c5ec4057ec583398bc82e33e0e90fa68febbcc1fac26ccbe102731c71db6 SHA512 cf2cf302e5a97b8c97e34c29fa0bc0a6d695ad243095620b83cd8c278247de70f9c8a209de9bba93937e56ae0fc39822f17a09142e964218515efc1a39bec98f
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild
index 6e367c852a5c..ac9604b0ef63 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-arch/libarchive-3.2.0
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 72d04a171e20..73cda42c2871 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -2,7 +2,9 @@ AUX lbzip2-2.3-s_isreg.patch 500 BLAKE2B 7839d78d204c0b88ee68d728d1279dc2bc2e622
 AUX lbzip2-2.5-glibc-2.28.patch 2142 BLAKE2B 408be3d126974d745e596a5a2f7b61246ed76bd8765f5875ca114a7d4adacc38831093f01149249f6335dcf3463827b96df669b42c8b5ec27d6b658cbe7c9458 SHA512 38990970edf8fb9a18aa808c42e4208ff9fc2901cc9f24ef3c4dfdd963f29338aff3712186ebdab78d3d4a7dedd91cae636bb079e3ed8bb3fee561e23ecb4839
 DIST lbzip2-2.3.tar.gz 630226 BLAKE2B c08a7257eff859c0b7fb66ae638a57f837f1a2380c500c42ea65dc36e5650b30865d3c4c9820d6fed62bdbc4e3bdf7bae9e8bfe519897d9aac7f0c77cceacfb2 SHA512 4f694445cc90377bf8dac5046b952ff174db571f390c2d7b0aa001f73c76f3d3f048ff8e7297c2055ed1f7b210174496dc31d6628e1cbeff63146a36a442ad4c
 DIST lbzip2-2.5.tar.gz 651399 BLAKE2B a53fc34084ed16c0e78a9f084f68fc0bd1217245e9470ee023f0a4f5a1e2ae4e5866086f9fbc3ff7ec5654c595b4388d9eff495bc0228edbe0322bf9d1fd1f23 SHA512 76e96cfa75b3ed515b2f891349dffc1403daab2dd0a2a614fa0c811cec6ca25faa395da08ad68a9b6ba4069332c4571f70fb7424f06ef3d800c3082c08d7d3d7
+DIST lbzip2-2.5_p20181227.tar.gz 704920 BLAKE2B e5da0091c0e4fb73724c5ea472d757d76356cffbf1fc679bf4ee05e25690b7712dceaf17f355383bfd4eb525c4aea04c2e5312592df5bb99159e000769bcee2e SHA512 53b29721a106d280927f2c18f33247645bb7fb3e67d835885d73e037910bf02e473f1210d848df41a387be30f829213d98ac9387b2a9201b94d12117809fbcf5
 EBUILD lbzip2-2.3-r1.ebuild 806 BLAKE2B e396324e0fde98a11c66232506c5beac4a5fc24c43ff5ba9550e5408cdd53efffee000b6f03ab70ea7f50a7982a3c20e9ff92fde74dabb1513a3ddb7c35f67b0 SHA512 ce7cb5acd3357e7ad80c782c90c6decd8a9ff6041064988ceb454d559058c1f531c92a903324a2b0e64560119fae3f03f54c6c8fb9b00345382220b5c52338b7
 EBUILD lbzip2-2.5-r1.ebuild 835 BLAKE2B 716c86925dd86ad45b02d4ef25e0ae4880fb9184e2d2953255535d14cefc53f352f9637b2572a95df03433059e59e3774991b6b0726bd336dbbe6682a6ecaf8a SHA512 49ae4874e0d9f748f32202b50914d561072821dc38b9917b4495f2150273fc07f26d416dbd3e5bb7d13057a9d03810f6435520f6562f28b3f810508f5988b991
 EBUILD lbzip2-2.5.ebuild 826 BLAKE2B c002af26958aa3d8e0cf2d2e6721e24afabd7080ff6680376828ad05c27e267307114ed096d876f74573cdeb35d35f913fd84c3b1154661c5c0a29e05c341877 SHA512 f63095d9320ab1ba66a8142b13592c5444e79315e1d765da3e47631df79e3b98ff6ab325725ab1dd00990c92190e05c9cc3d098b2b79340568435bd6033b03fa
+EBUILD lbzip2-2.5_p20181227.ebuild 864 BLAKE2B c2d2b7d6f3a644d1cb09416c8988e37c0782583017ae60d6a5f34b71ab73f3d3e47fe39d1da51f11a56dec54587d4a4c2e939f3f2a106477774e1eb42a0dc9d4 SHA512 b028ffa561fb130a5c1f5437df4dfe4261f0998812f4eb7a10e68508a31e6d27b2e93c08f1423568d3f436f45075e3f40884c824b5cc2320ce16a2040a8f3436
 MISC metadata.xml 534 BLAKE2B e09b3c70d05c66c9edffa19cc3e52be55ecade605c97da4e2f4f6c930dd1ebb548ddb873d31c50c995c0493fd3329978db661796c43ae029a5db79ac0e1974f0 SHA512 86b03f188fb14168b7d2d6956fa2df4941d94c95ff00e6bfd27451fe76b9318dac477bdb13b6443ae0186837335d66cf3e52ddc4ccc2f2979e60fe287f5ac2b2
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild
new file mode 100644
index 000000000000..f8dfd6720499
--- /dev/null
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="Parallel bzip2 utility"
+HOMEPAGE="https://github.com/kjn/lbzip2/"
+SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug symlink"
+
+RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
+DEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-s_isreg.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-silent-rules
+		$(use_enable debug tracing)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use symlink; then
+		dosym ${PN} /usr/bin/bzip2
+		dosym lbunzip2 /usr/bin/bunzip2
+	fi
+}
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index bd59e33cc658..aa6fd5c2d19f 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -6,5 +6,5 @@ DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba
 DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7
 EBUILD libarchive-3.3.1.ebuild 3438 BLAKE2B af5fa17a2a5ff850d88e81dbb88f2e275f4f601b1e61f7e067ff3c6806cb0bb115c307862ba5e74fb913aff9a7bda1399860e220e69c17826cae065e04a78d4a SHA512 31ae25cf9ec76a27098861dcec1a8a80fbfd132296febd7db47c10a8a34dc08a04657d41f66a3aacb0048e4154d740b8d346a287298e9067d555e8908b668194
 EBUILD libarchive-3.3.2.ebuild 3509 BLAKE2B 7338b74ba0ba1b9a120ddae5a320a834e6ce8cef981a2ad59aa26c6973a26e1088094a30334b50a013c34986dec783b872d9c57b117bddd90a11d048c7ebda02 SHA512 6affef3f8d8613fa74dedbf4788eaa103ba4bda8107084197f1790ea6ebd78ce7699dd4ee2ed718ea6c776e4a8b1572e8c00710e994f48f419374cff8d2034f4
-EBUILD libarchive-3.3.3.ebuild 3623 BLAKE2B e0720f6485ca9b2f280fda13eeb19a54df3dae0ab1ac5c183389b14f99ee80e0b7d7542af25b9c4ca694f47f4f3172a684e1a02ea70c645f5951dc859a904e0b SHA512 b705e01c23a11f88e4025538d541855c10a5e61feaffb88b34d0c6a60a2d8c637792768153ab2bcafa2fc007819a0dc2b0e93eba3ac3d156819ff8fb63c645f7
+EBUILD libarchive-3.3.3.ebuild 3622 BLAKE2B b228e1cc049dd910cc9cb1c9a9eb38fea8df2a35c9344810080afb666688e951c393361952b47c6c7b7ba2ce2e6d09541e36cb75c2a787e7590f9313429980c7 SHA512 50ca91c6e217f2d8f1c33ae6f08ad146b3192b65ca76088d76386c10de6d6354504f4cf29381c7821d621addf284e9dd08ad8c3a8762b70ffab5524464b661fa
 MISC metadata.xml 1447 BLAKE2B 342ab0c5aeb3fdae86b39228d4df3c98163b55c1fa23318b2b7a22f714303f1f0615d60d9c057b0a91f90e61e6a7357043096463ca3efe1e8d5cbcd2a5897ce9 SHA512 85b5c67f258ab07b14f15967024bd5d1f11a81bd203e67d40398b42b3728735e28cf2645a0db865c6b6ed81a64da6de470ce62c882d0f72dbceb5361f791b81d
diff --git a/app-arch/libarchive/libarchive-3.3.3.ebuild b/app-arch/libarchive/libarchive-3.3.3.ebuild
index 5329c003de35..62f03be1606d 100644
--- a/app-arch/libarchive/libarchive-3.3.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://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 ~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="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 3808509f91d5..0acfc812c4a7 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -4,5 +4,5 @@ AUX CVE-2018-10115.patch 8946 BLAKE2B 21fc8367ec1c811119bd43b5ca8ac1399748d4fe0c
 AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604dfd8cefdb5f4caca74d73f175722f777c4c13839951178b394c44b69577c8b5125f45581890dfaf1325d47d SHA512 7962a03430b94aec7c93d6dabee340f4f5915d728ba4df0dcaae483ab9c29115818e5e944572a3fd910addad8799c6a1e3911f6a0a02b661f804eea11c3a0f40
 AUX p7zip-16.02-darwin.patch 2134 BLAKE2B f8890b8b3e0a3ade007f162e5d3b7fdc9925e8960c6e22463a5ebc474e4ebb2577f0cc0312fda6c129bd1a02dc3ac6d3de17f2c551ee710ab36d0658acfaec52 SHA512 ed8689e39e5bd55eb9cc74c02c94782ac893fc30079492dbde459f24d07037ca63c91526ea428934814febbfbcd1f80c0683cd40d48eab055a3f856b1d78fb37
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
-EBUILD p7zip-16.02-r4.ebuild 4638 BLAKE2B 00f9f611234815c376e1dbcf8b0ce2b54a0bb56bf45287e02b58a18ff456591a9375ef62e64ffbbc4590d7bd9a77297ecf74101212e68fafeb246dd414bd5bf1 SHA512 6a51de0cc1d09cb4d1eba3afdce2c9a921b102d40e3ed77143eb07b24503649e62abe4766fd704485f6308196482749197c4a6d2ce6160e4fefb21efb1697320
+EBUILD p7zip-16.02-r4.ebuild 4637 BLAKE2B 1f47cc6b98a0b4bc5d6536a6379e3a418f5c819eb76860dd599558f71f2575c066e3f2ce671a0a819f07f38aaece402568e03d9a8217b3d9ece07ed31fc8c11d SHA512 d65d77186dd0da7cb685eff2f92f6c99343db73df1e4950bd4e7b956d1f92ef4113009d913ae03fa7a19c6c8233d96aa5694841405caa6296a67a6bc853dcf36
 MISC metadata.xml 393 BLAKE2B 6ab87f3e2f35dded47136efbf8f93c7a899a5918b4a8e3ab6658a427da8085e8eb0e6ce2aec09fd0ea5fb14909081600b79027878b7e5b8ef9d476def057e52f SHA512 50eb24c1e60e0be2c02d8054a5039c5e2b11ac82aea3f90c0a37c21e68b01135de88878b1079ec46eeb8d1f8ab52fb8c9f58f88a498feb38ae5743adb7519176
diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index e71c79f0fb00..e33c8523e3d5 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 8041bc045d53..fe792e547521 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index d8aba167ab39..34e0425e5323 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -33,10 +33,12 @@ DIST bacula-9.2.2.tar.gz 4115575 BLAKE2B affc6efa3543836690e3d89eb37faa2d5066344
 DIST bacula-9.4.1.tar.gz 4162956 BLAKE2B f3fdd2ab64dc4fe50210d83a80ce16f36996f6d23bb67326e8bcee97ae9fd83b2dc8a96eabcd86c522c5e1ca5b8923110e97c03be953427a5c5f59140fdea332 SHA512 5e05a939c5f457a121879a6108ce2ac6403dde556b415af4e5013e4f100cf4d878f3d468fd680fa1633a4c8d6ce3d7a6ed351a1600ef780166cd4be9b70191ee
 DIST bacula-9.4.2.tar.gz 4163642 BLAKE2B 5b12b44749186fbcd0da4eb97fca304cc8a0152cff87dd9dcf7058452a853a8a58208537496978a213067691cecaa5626e21d3a94438981e12f028a6157d3fb8 SHA512 f8c8f4c788ced1ab846e02656a0a1d9d1b65fe57ae0b888780167ac7e9272e8ca624ef5c41bd44a7454cf518c8e451c2201970b3e4862a99b4290a377da40b0d
 DIST bacula-9.4.3.tar.gz 4167892 BLAKE2B 058d51fa62f7a37ccb19d91c33589dd2d2a52ee2d17e82c5b5ce7b9f80f36ead81cd6cb4fafcfc269f4202a2a9f989106ade72efd673f89693f155c0f4a0b336 SHA512 042bf1b974ff60b054bd4a16ce93cd1d93b89d0b743f340c00cc4636922e1e25a38d97dc140bf5842859b3694736df2a812801747ced678610f8583e14ea5e81
+DIST bacula-9.4.4.tar.gz 4159759 BLAKE2B 29628626a9654369ea1633878c16ff8af48bf568ccd54c140c5b9c1e9df7fb988296f4d6f0119a4904827790f7c8881cd7207c9f4b9355bfbc1395a12f24a9c3 SHA512 f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31
 EBUILD bacula-5.2.13-r7.ebuild 11664 BLAKE2B 76603fc56fc0143680aa204e614bf66ed64e0502946c28663bc9dbd8d51bcb7ff77d60d74afd82b822cceea10d9c01a59faea6b0dfae437490e4eab2d08df6ec SHA512 29c0993f6a02fdb400d7a3cbcb94410e4ac3d96073ef84ea4fb39845ae1e637511a19ef419b52d10b5757f9d9196238a63c244fa0fb9bf3114e10c9d131931be
 EBUILD bacula-9.0.8-r1.ebuild 12685 BLAKE2B 23f9d0906008ebb264c5490f43eee05ccd85b590c152015037f281c3af33d31f8cd9b2e30b49b74406032331fbf38037755b9da4f5e18dfa951fb72f4860b368 SHA512 a495f5c3b076f9197435ca903afbab3bf8851a4c291ecf441408d0c231102a0549836bc113b80f092a209dfd7041399832fb14b39fbacbd8723e222c8b40d53e
 EBUILD bacula-9.2.2-r1.ebuild 12670 BLAKE2B a8c95b2a8eed0008d640cc5945d1f0ed735225e6ad708b91930e8183002876defb6ed992bb004d6d8a5b9f8e11a4ef05ade1b5ed2c5efb6cd1c5a51c2647cbda SHA512 cfa5270dfb41873e2fa625bbac8988784d4c3ad5f44da95edcb91ed57c098b472b8f683c38fbf9c953531e4a142cb22773b5489444df6c6979f7b7692c90b1a7
 EBUILD bacula-9.4.1-r1.ebuild 12788 BLAKE2B 7c4db91d2d226679542a82e5381ade4a4118dc34990932161b8144f60e5a704a966941cab9299d1cd87db9d1f6452fbcb73aca1d4e0119537178bacd1c487797 SHA512 555817ecbd8f685eed263b063bd0a4d5751103fbf8b873094a32194b63d9b238c17a063567fb0a61965793fbf0ab924d1ae38a976a820a305b5a595907bd0d0a
 EBUILD bacula-9.4.2.ebuild 12682 BLAKE2B 9edc19e42ab2f0c278135e8816dc4e4cb19566616f5d0a28383d4f30940b93beda567fdb3f4266715441f91d08b73eea8093df3abeb34d2369d00dd92588edd8 SHA512 75a02bab960ffed611c5987c4a3c7232ebcc61db7588e3442fd2e8a58b86aa7879cc8a31eb17d3c6d4f742b89b9bea9f5711b6f1335ca94fdd7c05f3515534c6
 EBUILD bacula-9.4.3.ebuild 12682 BLAKE2B 9edc19e42ab2f0c278135e8816dc4e4cb19566616f5d0a28383d4f30940b93beda567fdb3f4266715441f91d08b73eea8093df3abeb34d2369d00dd92588edd8 SHA512 75a02bab960ffed611c5987c4a3c7232ebcc61db7588e3442fd2e8a58b86aa7879cc8a31eb17d3c6d4f742b89b9bea9f5711b6f1335ca94fdd7c05f3515534c6
+EBUILD bacula-9.4.4.ebuild 12682 BLAKE2B 9edc19e42ab2f0c278135e8816dc4e4cb19566616f5d0a28383d4f30940b93beda567fdb3f4266715441f91d08b73eea8093df3abeb34d2369d00dd92588edd8 SHA512 75a02bab960ffed611c5987c4a3c7232ebcc61db7588e3442fd2e8a58b86aa7879cc8a31eb17d3c6d4f742b89b9bea9f5711b6f1335ca94fdd7c05f3515534c6
 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875
diff --git a/app-backup/bacula/bacula-9.4.4.ebuild b/app-backup/bacula/bacula-9.4.4.ebuild
new file mode 100644
index 000000000000..17ec8d24af39
--- /dev/null
+++ b/app-backup/bacula/bacula-9.4.4.ebuild
@@ -0,0 +1,438 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop libtool qmake-utils systemd user
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs] )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+
+	if ! use bacula-clientonly; then
+		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
+			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bacula' has been created.  Please see the bacula manual"
+			einfo "for information about running bacula as a non-root user."
+			einfo
+		fi
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# Don't let program install man pages directly
+	rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in"
+	eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch"
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# Install all man pages
+	doman "${S}"/manpages/*
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+}
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index bb4fe6a8b6aa..f8021c2fac02 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -7,6 +7,7 @@ DIST btrbk-0.27.1.tar.xz 86764 BLAKE2B a46514a94e6f49f83f92bba6f545738fe6a0b274a
 DIST btrbk-0.27.2.tar.xz 87012 BLAKE2B 7b25ce04e088b9c3df1f5d4f41ec3e6aef7e48bebb8fcd4c4a8365bb73d26dd09afdf1814985362b28958a93df2797dd62444475024f66bd027303955a160604 SHA512 497d1dd1d2de712d4de80d0bfcdf6995590fd5308b81d7198af7cebe81c45fd53c8940265c1451eb95339636cf0e4c2a9162befb7cdd48cc8d4142b4e9ca75f1
 DIST btrbk-0.28.0.tar.xz 99336 BLAKE2B 4becaac5a34029e57345baa3c8bb787032ddfdc523882f6334e7a0985a53194956342f792dd9022cb151aacbd64497b87aafee838b5811f716de4efc7eb54a10 SHA512 f4f3118daf55a80604dafec77087851860cfab8720d3f193ac4eec804ca39e60e3bb31d7feb45dd10c8b35b2844c680462a16f2ac0bdbd71731907f511bdc358
 DIST btrbk-0.28.1.tar.xz 94740 BLAKE2B 75313aabab7208083e06a2d4bb607950c7d5d0e87188a9a8f8c97cba1549cc2d3bcfff14b2bc2d20898c44bcc0fe50d74db2e16b213dde852d89704704b70ece SHA512 0e24908b3162b2ab67e0482a38fb966bf33b3c3ee5b2f62259673af14e9309bc4707bd049403579240ec416efae6643a8b5da73f4763e3dc01b3893047e92581
+DIST btrbk-0.28.2.tar.xz 94888 BLAKE2B 4501a8bbe1c88e2449c67d3c5e2322c8b3d3bd5b855cbc0451ff59a3e9aea66de4110587f786fee8f21acfb8a7e496f80a21a91a0e0756d37130bd49a76bb26f SHA512 43e9e0dfe48b0b0c8d1b64e2ce447b9dde9c494b2ad233d68e6ad0648d746d1e950751199f72affe77e06b0c94567912b399bd0b6aa8ebc31dd8fb87ef9ae0ae
 EBUILD btrbk-0.24.0-r1.ebuild 755 BLAKE2B 1ee8bedbe3dd869c4afb8103763269906d4a75c5dccfebefebb851bdb4a1243d14eac3a35d5e8ac5d29660b96e7856e0421d2804f83c982c47d58f888e3b498c SHA512 2924123eeabd0b1e7a325d9b413c6ff9ee750184b85ea1f460f236aa74e978df1e5537ab77fc49e8f82148caff743724355d31cf60aa5e760d1615b60d22f7e5
 EBUILD btrbk-0.25.1-r1.ebuild 743 BLAKE2B bb707beaa6dd1dae7648262190ee05f76f70197982d6994386e9ee8bc8e885a88ba0c9f9eb33d2846f9f7b023d6a0c97a95d9bf04fbb6de72d8ff489da09d8b2 SHA512 452cdc0bbcba6b08e00bbccdc0332dc06aa59d746a0e8a608ee5da5bb5ac2047705380df2e7865fdd3a2e3d44fce6a4b1fda8e890f150a8a3d543d63fa2610eb
 EBUILD btrbk-0.26.0.ebuild 1078 BLAKE2B 9c92380e34d5005cc0d738c68e7b404a4db77fccc1a233ada610d7518e253cfaafa91135da7d9ce6cf6546150a6805f524b3a9302b680b84e63616a1f910b029 SHA512 0d22df7d376f96de76a19be8a3ce7a9e7773c02c6da7545949ce0083a32ea6e5aaeabf026ce91655af34109532fa06fbd8b074e494e591d529dbb9d6f0bd4a58
@@ -17,5 +18,6 @@ EBUILD btrbk-0.27.1.ebuild 2102 BLAKE2B 1d7acf9fbc93907dbb559472f674b259a5c5fe2e
 EBUILD btrbk-0.27.2.ebuild 2319 BLAKE2B 56180c3685ea46964b9d4aa94f4064ba3815fcc2e9b1cff4fd6a8c220ed3dfc8473651ead17a3ffbc484a99114038c06f469937ca486b751b4d20116379bc78c SHA512 bd30e9dac79385423db045596e3d0ff24655a97c424ae66e45198360e18724ab4ba856f2634ccce1643809c6f964dd2118bed229f26276a238b8b397b9112247
 EBUILD btrbk-0.28.0.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4
 EBUILD btrbk-0.28.1.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4
+EBUILD btrbk-0.28.2.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4
 EBUILD btrbk-9999.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4
 MISC metadata.xml 1076 BLAKE2B 38beb88fb33730c665430ce275d33b231a57f02c2644b3ff89974935f93d1f0cea8b53b908019eb7bcb0ad99dca49e69475d44a506e08719270c2f8524b5e096 SHA512 20141d3aeba7ebe743ed3101af70c3f6515f11aaed4d43a73d507c18a933d30e778d10cfc17b98e33c616e80c79edd157d64fb0f54e35ad64a7e3114b3fd667f
diff --git a/app-backup/btrbk/btrbk-0.28.2.ebuild b/app-backup/btrbk/btrbk-0.28.2.ebuild
new file mode 100644
index 000000000000..ffd2ecb0e6f7
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.28.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+pv +doc"
+
+DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
+
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	pv? ( sys-apps/pv )
+	>=sys-fs/btrfs-progs-4.12"
+
+src_compile() {
+	emake clean
+	use doc && emake -C doc
+}
+src_install() {
+	local targets="install-bin install-etc install-share install-systemd"
+	use doc && targets="${targets} install-man install-doc"
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR="/usr/share/doc/${PF}" \
+		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
+		${targets}
+}
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+		upgrade_0_26_0_warning="1"
+	fi
+	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
+		upgrade_0_27_0_warning="1"
+	fi
+}
+pkg_postinst() {
+	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+		ewarn "If you are using raw targets, make sure to run the"
+		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+	fi
+	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
+		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
+		ewarn 'monthly/yearly backups could get deleted when upgrading to'
+		ewarn 'btrbk-0.27.0.'
+		ewarn ''
+		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
+		ewarn 'or systemd timers calling btrbk.'
+		ewarn ''
+		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
+		ewarn 'check if any snapshots/backups would get deleted. If you want to'
+		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
+		ewarn ''
+		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
+		ewarn ''
+		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
+		ewarn '(".keep_forever" suffix in the example above).'
+		ewarn ''
+		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
+		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
+	fi
+}
diff --git a/app-backup/consul-backinator/Manifest b/app-backup/consul-backinator/Manifest
new file mode 100644
index 000000000000..d81a189c0068
--- /dev/null
+++ b/app-backup/consul-backinator/Manifest
@@ -0,0 +1,4 @@
+DIST consul-backinator-1.6.5-vendor.tar.gz 3532654 BLAKE2B 826a873ee25e8cd89cc73bfa1c7d377da8d9227ec0a948cac0b8643542b37cae5412cb638c4fa2ce3490dcc69356b4dbbedbaefd9289e73ea8c3904db85be1b8 SHA512 f8ba7e93265dab3b44d09336f5c7ec0fdea88956d2945eeb039241ac80c39d678e4041221e681861b7cca9406d8a1ea5ce40e6f69cae6a8e89396b4be8fc007c
+DIST consul-backinator-1.6.5.tar.gz 32298 BLAKE2B 19dcd3603e6e0a5cd19e186ec2f45270125d8a0369b0e6033f047927c82e58afd641a3c74ddcfb61ebeb11dc4cf33383ebd75c5fed10962578dd0c62b7b10ec1 SHA512 94a618bdbec1da209c1774cccd2942594dd0f60857c69a50cb42a0c70dea5af94f36010d59fa49bd2e534fcb0649b362674caa46ddb59595c2d21afa82d5ff7f
+EBUILD consul-backinator-1.6.5.ebuild 765 BLAKE2B e593ec647caee0cf8647be44532e30e52f0a593ca6e540ae1f02d5f5187ccd75e3082a5d7120b0d5828a84f3c0ef3039be3e9ca93de4c1d43ebcb1f64dff3677 SHA512 96daaf2903d678a29dda96d2d5cf1213158989f9c4e3b57c507cdd89d9fcbe481f8bfb1be017207519d5138c1abf5dbdec713c8c85c2f54da9cb2972b2eedd5c
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-backup/consul-backinator/consul-backinator-1.6.5.ebuild b/app-backup/consul-backinator/consul-backinator-1.6.5.ebuild
new file mode 100644
index 000000000000..d74bd040c727
--- /dev/null
+++ b/app-backup/consul-backinator/consul-backinator-1.6.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/myENA/consul-backinator
+RESTRICT="strip"
+
+DESCRIPTION="consul backup and restore utility"
+HOMEPAGE="https://github.com/myENA/consul-backinator"
+SRC_URI="https://github.com/myENA/consul-backinator/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-lang/go:="
+
+src_prepare() {
+	default
+	mv ../vendor .
+	echo module ${EGO_PN} > go.mod || die "Unable to create go.mod"
+}
+
+src_compile() {
+	CGO_ENABLED=0 go build -mod vendor -o "${PN}" -v -x \
+		-ldflags="-X main.appVersion=${PV} -s -w" || die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc *.md
+}
diff --git a/app-backup/consul-backinator/metadata.xml b/app-backup/consul-backinator/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/app-backup/consul-backinator/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index dcfe2336c75c..1db6379becc1 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,9 +1,9 @@
 DIST dar-2.5.11.tar.gz 1891928 BLAKE2B 536cccca2533f7ddbc8b95972fe00e9c87a404481e6afbd7aa3634c00598403c18950eb876aefe71a818c3bf4df75bff5f3904dc69bd1d75880f6c8a349911a5 SHA512 36b90218a34ac7f41ce9ca0a2167cfb2fd243b23b8e84350153e8804f0faabf87291b4e4b061533bcb0ca079f087c074eeaa12a54ee8084dd386a072ac503847
 DIST dar-2.5.18.tar.gz 1931746 BLAKE2B 3d47665a1ab955ab9467d8f10a686565c549e1be57e77a9bcf65f1ea25c9b70d6d148d4b9dc35112b3ca74f9df05505c74e3a7eaa211b6a8b466308121206a2f SHA512 cde787bb4c3a3a1014efdb5e437b963d762eb87c512e1de1d60471035c535965e03adb5f75abc2bc95633bb6fb61226027d836a87fc903995e3a27a540632e69
-DIST dar-2.6.1.tar.gz 2098547 BLAKE2B 6c1fe1670cf46faefe04544f3d7fce0dc819e24a493c6bc903465a11e4b25a9642faf68a0bb66a2c6a92bba2782f24c5694b14571ff2c205f7954941f14aca63 SHA512 492c9ce6d7928271e5b7f263773b2129c7a237ca192cd40698848d3bcf212224c76d29c3e33ff5a8642594697f5bba660f5e97d1c7529a5794e078f2de0716e9
-DIST dar-2.6.2.tar.gz 2100192 BLAKE2B 1eb2f92e5162070a75182741f850e79932593f68fd1f31a4a1d19af77c6f86df0c8e5b995b5ccd265f051891827bfa89bf71832cb7ce6f97d9ab70e768c867b4 SHA512 88f128f99a3fe22866056e2fc881276c13731004e40437f9e2c363c4e24f603ab5b9fe7126e4f950526ccfc1b6f86fe1a4494036e83e1faf9a647ce239293ea4
+DIST dar-2.6.3.tar.gz 2110304 BLAKE2B 638bf949066c7c59e139f7a4d54d427dd86eb7d254f0cfff3cc977d75abb17d1c69d37018c46a9fab9be38193e758fd70d1598c32a98bb6f0006f97c356a4ff6 SHA512 3e3e1fa92a6954ac745dce9ecd4e82589bde562760f6cd5402fae9250f84e2df4784672ae9b0c4fa0e0baf5b2b642a025fa694a5975a5346e890655b65d93783
+DIST dar-2.6.4.tar.gz 2110571 BLAKE2B 769fd08d72e3a33066749ea8c93cd7eec8091796343f27eb991e751843ccad440afe5e24e54e148865da64764d465e1a4a057005a80f9dcf103f0c960c295669 SHA512 ba78936e645cc06f94e64bf0e288398ee522b4be6c3501f9b21d7038d7a66a083386c7520aaaddd265de68937d017dcb2fd87bf06f3e2a91f444f3307b4c15b9
 EBUILD dar-2.5.11.ebuild 2402 BLAKE2B 2399becf88620c4f86746df445e74c39b677f17352c3468462e4a64a3719c53cfd2fa25471026d3e950cd07c9231d83169e470e0adab51ed13b3ff4e9b08dc3c SHA512 2519d1c4ee298e6439cf09946efd68d9ee8f627087f276e629ed0bb9af9b9b50889dc9cff8888e98b40f2bbe8cde59e26bdebaaffef177829bf7d40994ed9ded
 EBUILD dar-2.5.18.ebuild 2398 BLAKE2B da4f12e9a5a975303cc0801c1081bc2742454b8f0fc2ee3f059bee3cdd1c1fbefc10765c9f83cd48c512e1bc634b93612aaf91498e73e37a71580d02373216ab SHA512 4da51e445dc0fe62d0f615b652fb53d3699a942bc1371616a9cd9f52a1bab61fbf5d5397bacac3d8ce1cae24554feff56b3392dcc6fe23564f9eadd4725b85dc
-EBUILD dar-2.6.1.ebuild 2559 BLAKE2B 831dafd72157ed23c4e30f593ba0b35fb5c3ee8bf7ac151a7f16eb26561cede5172735238b7ea9c91d3760e6ab1f0c44ac71942f28d1fb4e17ac9dd8c169cd2c SHA512 0c09d5fd841bb7a5a0e83eaba5b10a4eac8c3eebc94a321d48ab52e0bea0c518f538469ae5e002c1f1d188674eb633bd1535499ecd60d7c6f11b22ab1880c667
-EBUILD dar-2.6.2.ebuild 2559 BLAKE2B 831dafd72157ed23c4e30f593ba0b35fb5c3ee8bf7ac151a7f16eb26561cede5172735238b7ea9c91d3760e6ab1f0c44ac71942f28d1fb4e17ac9dd8c169cd2c SHA512 0c09d5fd841bb7a5a0e83eaba5b10a4eac8c3eebc94a321d48ab52e0bea0c518f538469ae5e002c1f1d188674eb633bd1535499ecd60d7c6f11b22ab1880c667
+EBUILD dar-2.6.3.ebuild 2572 BLAKE2B e1059c669c9cf569cad16f5d53492e4c9ab396173b51bead7f0a0e3529809bcb4a5a6f9ab8f2872f1c836405da011bc71ed8cbeeeef5ad1bfa202f287de4c9f4 SHA512 59144b0755ebe5e88147c4c0276f85c63893ff49a926ec904d50e0c74cd2d3c8139454877bb4d2143bc9d5370ea93fe302da8d3b0c2d05897cd98a9e6f8d0d88
+EBUILD dar-2.6.4.ebuild 2572 BLAKE2B e1059c669c9cf569cad16f5d53492e4c9ab396173b51bead7f0a0e3529809bcb4a5a6f9ab8f2872f1c836405da011bc71ed8cbeeeef5ad1bfa202f287de4c9f4 SHA512 59144b0755ebe5e88147c4c0276f85c63893ff49a926ec904d50e0c74cd2d3c8139454877bb4d2143bc9d5370ea93fe302da8d3b0c2d05897cd98a9e6f8d0d88
 MISC metadata.xml 887 BLAKE2B 7fc6c15d3f725d59a115a839feb6d138b806e1f0e168c6e726e83c9f0185c46cbf869284e17872a376ce52f515fc0446134b5f3a449a578a33c10154876fa1f5 SHA512 9210de7c2f273c52c39555e2db525b1bdaa58c44d22deab887d1bf96e42ac9e8f32545461c7129d4673ced220a6445ddda68c6c2733e5660fcad05e98db56817
diff --git a/app-backup/dar/dar-2.6.1.ebuild b/app-backup/dar/dar-2.6.1.ebuild
deleted file mode 100644
index f84ffdbd95af..000000000000
--- a/app-backup/dar/dar-2.6.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="A full featured backup tool, aimed for disks"
-HOMEPAGE="http://dar.linux.free.fr/"
-SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
-IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
-
-RESTRICT="test" # need to be run as root
-
-RDEPEND=">=sys-libs/zlib-1.2.3:=
-	!static? (
-		app-arch/bzip2:=
-		app-arch/xz-utils:=
-		sys-libs/libcap
-		curl? ( net-misc/curl )
-		gcrypt? ( dev-libs/libgcrypt:0= )
-		gpg? ( app-crypt/gpgme )
-		lzo? ( dev-libs/lzo:= )
-		xattr? ( sys-apps/attr:= )
-	)"
-
-DEPEND="${RDEPEND}
-	static? (
-		app-arch/bzip2[static-libs]
-		app-arch/xz-utils[static-libs]
-		sys-libs/libcap[static-libs]
-		sys-libs/zlib[static-libs]
-		curl? ( net-misc/curl[static-libs] )
-		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
-		gpg? (
-			app-crypt/gpgme[static-libs]
-			dev-libs/libassuan[static-libs]
-			dev-libs/libgpg-error[static-libs]
-		)
-		lzo? ( dev-libs/lzo[static-libs] )
-		xattr? ( sys-apps/attr[static-libs] )
-	)
-	nls? (
-		sys-devel/gettext
-		virtual/libintl
-	)
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="?? ( dar32 dar64 )
-		gpg? ( gcrypt )"
-
-#PATCHES=(
-#)
-
-src_configure() {
-	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
-	# logic.
-	# For example "--enable-dar-static" causes configure to DISABLE
-	# static builds of dar.
-	# Do _not_ use $(use_enable) until you have verified that the
-	# logic has been fixed by upstream.
-	local myconf=(
-		--disable-upx
-		$(usex curl '' --disable-libcurl-linking)
-		$(usex dar32 --enable-mode=32 '')
-		$(usex dar64 --enable-mode=64 '')
-		$(usex doc '' --disable-build-html)
-		#$(usex examples --enable-examples '')
-		$(usex gcrypt '' --disable-libgcrypt-linking)
-		$(usex gpg '' --disable-gpgme-linking)
-		$(usex lzo '' --disable-liblzo2-linking)
-		$(usex nls '' --disable-nls)
-		#$(usex rsync '' --disable-librsync-linking)
-		$(usex xattr '' --disable-ea-support)
-	)
-
-	# Bug 103741
-	filter-flags -fomit-frame-pointer
-
-	if ! use static ; then
-		myconf+=( --disable-dar-static )
-		if ! use static-libs ; then
-			myconf+=( --disable-static )
-		fi
-	fi
-
-	econf ${myconf[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
-
-	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
diff --git a/app-backup/dar/dar-2.6.2.ebuild b/app-backup/dar/dar-2.6.2.ebuild
deleted file mode 100644
index f84ffdbd95af..000000000000
--- a/app-backup/dar/dar-2.6.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="A full featured backup tool, aimed for disks"
-HOMEPAGE="http://dar.linux.free.fr/"
-SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
-IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
-
-RESTRICT="test" # need to be run as root
-
-RDEPEND=">=sys-libs/zlib-1.2.3:=
-	!static? (
-		app-arch/bzip2:=
-		app-arch/xz-utils:=
-		sys-libs/libcap
-		curl? ( net-misc/curl )
-		gcrypt? ( dev-libs/libgcrypt:0= )
-		gpg? ( app-crypt/gpgme )
-		lzo? ( dev-libs/lzo:= )
-		xattr? ( sys-apps/attr:= )
-	)"
-
-DEPEND="${RDEPEND}
-	static? (
-		app-arch/bzip2[static-libs]
-		app-arch/xz-utils[static-libs]
-		sys-libs/libcap[static-libs]
-		sys-libs/zlib[static-libs]
-		curl? ( net-misc/curl[static-libs] )
-		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
-		gpg? (
-			app-crypt/gpgme[static-libs]
-			dev-libs/libassuan[static-libs]
-			dev-libs/libgpg-error[static-libs]
-		)
-		lzo? ( dev-libs/lzo[static-libs] )
-		xattr? ( sys-apps/attr[static-libs] )
-	)
-	nls? (
-		sys-devel/gettext
-		virtual/libintl
-	)
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="?? ( dar32 dar64 )
-		gpg? ( gcrypt )"
-
-#PATCHES=(
-#)
-
-src_configure() {
-	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
-	# logic.
-	# For example "--enable-dar-static" causes configure to DISABLE
-	# static builds of dar.
-	# Do _not_ use $(use_enable) until you have verified that the
-	# logic has been fixed by upstream.
-	local myconf=(
-		--disable-upx
-		$(usex curl '' --disable-libcurl-linking)
-		$(usex dar32 --enable-mode=32 '')
-		$(usex dar64 --enable-mode=64 '')
-		$(usex doc '' --disable-build-html)
-		#$(usex examples --enable-examples '')
-		$(usex gcrypt '' --disable-libgcrypt-linking)
-		$(usex gpg '' --disable-gpgme-linking)
-		$(usex lzo '' --disable-liblzo2-linking)
-		$(usex nls '' --disable-nls)
-		#$(usex rsync '' --disable-librsync-linking)
-		$(usex xattr '' --disable-ea-support)
-	)
-
-	# Bug 103741
-	filter-flags -fomit-frame-pointer
-
-	if ! use static ; then
-		myconf+=( --disable-dar-static )
-		if ! use static-libs ; then
-			myconf+=( --disable-static )
-		fi
-	fi
-
-	econf ${myconf[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
-
-	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
diff --git a/app-backup/dar/dar-2.6.3.ebuild b/app-backup/dar/dar-2.6.3.ebuild
new file mode 100644
index 000000000000..b348f760a97d
--- /dev/null
+++ b/app-backup/dar/dar-2.6.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND=">=sys-libs/zlib-1.2.3:=
+	!static? (
+		app-arch/bzip2:=
+		app-arch/xz-utils:=
+		sys-libs/libcap
+		curl? ( net-misc/curl )
+		gcrypt? ( dev-libs/libgcrypt:0= )
+		gpg? ( app-crypt/gpgme )
+		lzo? ( dev-libs/lzo:= )
+		xattr? ( sys-apps/attr:= )
+	)"
+
+DEPEND="${RDEPEND}
+	static? (
+		app-arch/bzip2[static-libs]
+		app-arch/xz-utils[static-libs]
+		sys-libs/libcap[static-libs]
+		sys-libs/zlib[static-libs]
+		curl? ( net-misc/curl[static-libs] )
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
+		gpg? (
+			app-crypt/gpgme[static-libs]
+			dev-libs/libassuan[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		lzo? ( dev-libs/lzo[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+	)
+"
+BDEPEND="
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+	doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+#PATCHES=(
+#)
+
+src_configure() {
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	local myconf=(
+		--disable-upx
+		$(usex curl '' --disable-libcurl-linking)
+		$(usex dar32 --enable-mode=32 '')
+		$(usex dar64 --enable-mode=64 '')
+		$(usex doc '' --disable-build-html)
+		#$(usex examples --enable-examples '')
+		$(usex gcrypt '' --disable-libgcrypt-linking)
+		$(usex gpg '' --disable-gpgme-linking)
+		$(usex lzo '' --disable-liblzo2-linking)
+		$(usex nls '' --disable-nls)
+		#$(usex rsync '' --disable-librsync-linking)
+		$(usex xattr '' --disable-ea-support)
+	)
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	if ! use static ; then
+		myconf+=( --disable-dar-static )
+		if ! use static-libs ; then
+			myconf+=( --disable-static )
+		fi
+	fi
+
+	econf ${myconf[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/app-backup/dar/dar-2.6.4.ebuild b/app-backup/dar/dar-2.6.4.ebuild
new file mode 100644
index 000000000000..b348f760a97d
--- /dev/null
+++ b/app-backup/dar/dar-2.6.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND=">=sys-libs/zlib-1.2.3:=
+	!static? (
+		app-arch/bzip2:=
+		app-arch/xz-utils:=
+		sys-libs/libcap
+		curl? ( net-misc/curl )
+		gcrypt? ( dev-libs/libgcrypt:0= )
+		gpg? ( app-crypt/gpgme )
+		lzo? ( dev-libs/lzo:= )
+		xattr? ( sys-apps/attr:= )
+	)"
+
+DEPEND="${RDEPEND}
+	static? (
+		app-arch/bzip2[static-libs]
+		app-arch/xz-utils[static-libs]
+		sys-libs/libcap[static-libs]
+		sys-libs/zlib[static-libs]
+		curl? ( net-misc/curl[static-libs] )
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
+		gpg? (
+			app-crypt/gpgme[static-libs]
+			dev-libs/libassuan[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		lzo? ( dev-libs/lzo[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+	)
+"
+BDEPEND="
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+	doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+#PATCHES=(
+#)
+
+src_configure() {
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	local myconf=(
+		--disable-upx
+		$(usex curl '' --disable-libcurl-linking)
+		$(usex dar32 --enable-mode=32 '')
+		$(usex dar64 --enable-mode=64 '')
+		$(usex doc '' --disable-build-html)
+		#$(usex examples --enable-examples '')
+		$(usex gcrypt '' --disable-libgcrypt-linking)
+		$(usex gpg '' --disable-gpgme-linking)
+		$(usex lzo '' --disable-liblzo2-linking)
+		$(usex nls '' --disable-nls)
+		#$(usex rsync '' --disable-librsync-linking)
+		$(usex xattr '' --disable-ea-support)
+	)
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	if ! use static ; then
+		myconf+=( --disable-dar-static )
+		if ! use static-libs ; then
+			myconf+=( --disable-static )
+		fi
+	fi
+
+	econf ${myconf[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 39828a20f85b..a98aa4b4c4e9 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index 7c3f2a5fda7f..b321a9be6a83 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -2,6 +2,8 @@ AUX bonnie++-1.96-compile-flags.patch 611 BLAKE2B b4290c150cd7a84e3b3f60efb1999f
 AUX bonnie++-1.97-zcav-array-indexing-fix.patch 1474 BLAKE2B c31575b33594c310884d95c0030867706dee2598b49c9943e8ca6af3e6ebef5454f1cc786c487f8970f8be70df54830b54ab02ccd061a8bac2daf100d77b7578 SHA512 f26a3873965d70c3cb1b0ce4422daa1a9b3152d189a532c81ec4764aac1a04fadf45f1c562fedaaa6de443eeadcdc176ed7b5c1353eeaa91ad340a1560e96d32
 DIST bonnie++-1.97.2.tgz 102533 BLAKE2B 019182c08b9ff7ba60e421f94039c09d27855f9e5b313f451721afdaedc9dc694b468bb30e78a04b655ec9a358ace3d68b13fc8f4d80ca3c48e0ff9387525b57 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170
 DIST bonnie++-1.97.3.tgz 100166 BLAKE2B 30feca43a2ec37b795168d37bb941241777718222d7e0681dc85a34f8691e76b4306850e41dc6bbfb3f0ad34123ecd1c12396efea99e2ade12206aa6e78708e8 SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893
+DIST bonnie++-1.98.tgz 100339 BLAKE2B 2a75cbeb881fd12727b5edf4e67789e64bd624b1885cdaf83fe3fc920fb2346e98faea2d9ce5da6fac8a84318a9cbda013afa2c9809892b23d3cf85c5a70982b SHA512 3cf70be4a20c58c80e29a140ec6d3c3884f1b4101e0fb63da0ea831fe4a5eb4e275bda2ce4eaf7d9c2bfb65742e985249b491cda8bdad85984a62f2fc19756c0
 EBUILD bonnie++-1.97.2.ebuild 948 BLAKE2B 142eeb18fbf0f1c76dff7faad52f35311525958d66b2963cd478b04fe7a0e64b7ee8d24c6e3544ca907ce8de195b1b5b6daeb964cf1e3dcde239ea135001dfd8 SHA512 2e166452b06a6772b46ca1fcfcd9ba356153e764c53d1e4f6b90072194f7f4a8d3df8edf29aa1a67d9e6a73dec18513f6e52c2d518f53005e224667847d90f85
 EBUILD bonnie++-1.97.3.ebuild 947 BLAKE2B f5a6d581cf155ea688a61a15e2d9b0583c3d244ddab60864852cd105265248461d0ce3296f6d5cf416d5ab115c03107afa76ba48b451d966974e942af31d844a SHA512 b11ac7db608bfa2d993ad9247feee5a80ff7bf21651a3480eeb4d879a5aeeaf3810029b916e596e59c1f9c13854b409c6672eadc78a63bef49ae99f9bd8e028e
+EBUILD bonnie++-1.98.ebuild 954 BLAKE2B 6e526aa665af274640f705b2423dd5d22742a9a0b81aef5b824960bc2ff377886aaca8ae80ea9788247a5d6e4b76b3f7755d3da8c3bd8e499a83cdfe16a30743 SHA512 438619d2734cbf6ce88d7a380ed94b68036485871a9ea8898134e248e2877e0833ae11db209cfb6bd2bcc4c9efdcc54670c66bd738678a6274f42cff3735d280
 MISC metadata.xml 610 BLAKE2B f9248e7f0ed78f7b1beffc4fcf133e76b09a7140bfa1b6d4aa42278181362223f272d3b6444075b51cc4f553fdad7ed9d092c6edca604475bffb890a278d6e98 SHA512 2914ce1d553546237acfec2ef0ba8689a81105fc9414f543cd9080f56090027107e698c1ac0f98f26e5b9658ea16ed27123f23b518fd91ddd0b4a858f6ac98bc
diff --git a/app-benchmarks/bonnie++/bonnie++-1.98.ebuild b/app-benchmarks/bonnie++/bonnie++-1.98.ebuild
new file mode 100644
index 000000000000..3a228eca434e
--- /dev/null
+++ b/app-benchmarks/bonnie++/bonnie++-1.98.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Hard drive bottleneck testing benchmark suite"
+HOMEPAGE="https://www.coker.com.au/bonnie++/"
+SRC_URI="https://www.coker.com.au/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
+	"${FILESDIR}"/${PN}-1.97-zcav-array-indexing-fix.patch #309319
+)
+
+DOCS=( README.txt README-2.00 debian/changelog credits.txt )
+HTML_DOCS=( readme.html )
+
+src_configure() {
+	econf \
+		$(usex debug "--enable-debug" "") \
+		--disable-stripping
+}
+
+src_install() {
+	dobin bonnie++ zcav bon_csv2html bon_csv2txt
+	sed -i -e \
+		"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
+		bonnie++.8 || die #431684
+	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
+	einstalldocs
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index bec0a607fe82..edc7a6c365d0 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 082fb5026519..367a18a18d61 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -3,6 +3,6 @@ DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c
 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
 EBUILD acme-0.32.0.ebuild 1263 BLAKE2B 5486282dd90bee28ca65a9170546ed0d09de38880f7945dcef1009cb7c20b991e5d22e7efe89eae07a13013b24e627624c0da907604359e10c75cda5607478f0 SHA512 6517cd06f5430885b072407d11971850cec39c3bca45545006fb58c970f121aaafb725e6a77371bb08151b05a803fd274b45cb9c2e10e48c02e29e5bf9634d3a
 EBUILD acme-0.33.1-r1.ebuild 1681 BLAKE2B 020b1e9b09cc794ebd39ecffeaa904e260b375dd1bd853e62c926d6065501da6cec10977fcf45b7addc660e85b838012e1a5bacfa4f7015ab62496672a0138b3 SHA512 5330cefe084d1b20801bc34b7c8ef30f9f4891f9f3407b28ed84a307b7afe574a2df7bea29fbf208c09520b5075b1c8195e48cd6ba3051387dca8b0bf86d84da
-EBUILD acme-0.34.2.ebuild 1683 BLAKE2B 76931500e9d92a856cdd0d5e26c6df199d111fca3bab417a49bd0373e4f3522f0ea31dd53d43d53436d3e83097617214f9b381193e3e46207b00ba15f347b0ea SHA512 ccbb885ab6021ae583d48cae27e7b32cd24aa88a39cc453c27818cb84911eb7d9fce9d7cc1d42e1afed98cb9349ed05823fa4d1ea2b127a4fdd287da9b320966
-EBUILD acme-9999.ebuild 1687 BLAKE2B ef1c4040e3808237c26b628b8fb7911dc748753b3b30c4aee8e3fded2a4ef6610ddf39117ec8c1164a323b3fba9f0243d3a650f769d4dfad87633c2d4607da03 SHA512 b9de277e5db419c5c80b63d266f07890bb5446103779794c70b877ce4db638d3d9a2aa23d37da04b82a725b0d2ba2e624508d35c67521265dc7fb76ccd993c58
+EBUILD acme-0.34.2.ebuild 1719 BLAKE2B 5c80b37136ee7a8ada33074a902bcb58e3142e19076dbeec1ba2559d0e0943993bc6877e96f5a34dfde243e02c7512eb552d0b2b28c2b83ff2c2bda48421e803 SHA512 1936ca1386df956735403ca55061250c218ca072d4d9d7753c6eb9ecabb5cd959ae7cdbdebe8577c16259c796e97187cc1b1b5c6e04b6d5c3c50afe9c60930a9
+EBUILD acme-9999.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.34.2.ebuild b/app-crypt/acme/acme-0.34.2.ebuild
index 64b8beb25ff0..b972b974afbe 100644
--- a/app-crypt/acme/acme-0.34.2.ebuild
+++ b/app-crypt/acme/acme-0.34.2.ebuild
@@ -42,6 +42,7 @@ DEPEND="
 	)
 	test? (
 		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 9500982ce873..3acd37f75f8e 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -42,6 +42,7 @@ DEPEND="
 	)
 	test? (
 		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
deleted file mode 100644
index 7b3746ebf57e..000000000000
--- a/app-crypt/bestcrypt/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX bcrypt3 3197 BLAKE2B 5e9d721a5b4213fcc0e5eb4325c009685dee5bd8dd61f8b47ee1ca29e52faa12b3c6f3c9ab1bc283d7944f4f4178dc831a95348971bde439a7ae77f213df20dc SHA512 370c28c7289d86a0fbf639c85cb755fef10780f86daa4c5ce6071f32d7e36dea8e21f496e09e145c8c091042a70f3666df068611258a16a05d217d5ed355290b
-AUX bestcrypt-2.0.14-build.patch 16326 BLAKE2B 233e2f896feb159807de1be4e07fad6e97889198709010c5256b93044f1a13559b0a64e59d712c3ddd632f90ea34cf6631c257eac48409c7e0323e5e14a7ad63 SHA512 3ff5d6b69844562f16c1024bb7b409fdcd6f9889e6ea5b58a4ba5f43d04174fa5c60bd73f20eddf2687fea18a01ce06672880602b4b2604e6f014344a3da2911
-DIST BestCrypt-2.0.14.tar.gz 2211286 BLAKE2B 1ff777a72528ec22ca168492c335ec54be924b653323670619049cc9dfbcd144c28702bf857517c5189c937f3712e749c47ef14006a8883c63419b866b8f48f9 SHA512 1e542f00886413f1519ca5667bb297cce25a46fb5ec90a7e1a61934df3cd34e0d680f32e0b111727865459ef7d89d2761b379b4a557ada6d7ee3e47e32bf762c
-EBUILD bestcrypt-2.0.14.ebuild 1903 BLAKE2B cdff8c1095edfa9c228efa1ca54a8207c40b506b88b69ddc7493190d68b102c5fef02298834f3ec4dce95a1d1d480827457afb78397b43d76fdb044f9e60e9a2 SHA512 2bb8fbe1f726b8e369f72fce8f82f88e598bf2ad975d3f89c4e2aac5fdb1edc5506ad8765c3f7fa608efd53b7d08c307d20d3f1d0730440fb6717a1622cce9f3
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild
deleted file mode 100644
index afaa12d6d91d..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-MY_PN="BestCrypt"
-DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="https://www.jetico.com/"
-SRC_URI="https://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="bestcrypt"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror bindist"
-
-DEPEND="virtual/linux-sources
-	app-shells/bash"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=(
-	HIDDEN_PART README
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	CONFIG_CHECK="MODULES"
-	linux-mod_pkg_setup
-
-	MODULE_NAMES="bestcrypt(block::kernel/kmod)
-		bc_3des(crypto::kernel/kmod/crypto/algs/3des)
-		bc_bf128(crypto::kernel/kmod/crypto/algs/bf128)
-		bc_bf448(crypto::kernel/kmod/crypto/algs/bf448)
-		bc_blowfish(crypto::kernel/kmod/crypto/algs/blowfish)
-		bc_cast(crypto::kernel/kmod/crypto/algs/cast)
-		bc_des(crypto::kernel/kmod/crypto/algs/des)
-		bc_gost(crypto::kernel/kmod/crypto/algs/gost)
-		bc_idea(crypto::kernel/kmod/crypto/algs/idea)
-		bc_rijn(crypto::kernel/kmod/crypto/algs/rijn)"
-	BUILD_TARGETS="module"
-	BUILD_PARAMS=" \
-		BC_KERNEL_DIR=\"${KERNEL_DIR}\""
-}
-
-src_compile() {
-	MAKEOPTS="-j1" linux-mod_src_compile \
-		CXX="$(tc-getCXX)"
-	MAKEOPTS="-j1" emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		CFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	emake install PREFIX="${ED}" install
-
-	newinitd "${FILESDIR}/bcrypt3" bcrypt
-	sed -e '/\(bc_rc6\|bc_serpent\|bc_twofish\)/d' -i "${D}etc/init.d/bcrypt"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	ewarn
-	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
-	ewarn "http://www.jetico.com/"
-	ewarn
-	ewarn "Upstream do not support this package any more, it was patched to"
-	ewarn "make it built. Use at your own risk!"
-	ewarn
-}
diff --git a/app-crypt/bestcrypt/files/bcrypt3 b/app-crypt/bestcrypt/files/bcrypt3
deleted file mode 100644
index b1b6979e63e0..000000000000
--- a/app-crypt/bestcrypt/files/bcrypt3
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/sbin/openrc-run
-#
-# bestcrypt         Encrypted File Systems.
-#
-# Version:      1.2
-#
-# Revision:    $Id$
-#
-# Author:       Jetico Inc. (support@jetico.com)
-#
-# Modified by Stefan Tittel (with thanks to steveb) to work around
-# the "xargs: environment too large for exec"-error occuring in
-# the gentoo 1.4 linux distribution.
-
-# chkconfig: 2345 85 98
-# description: BestCrypt init script
-
-
-# Source function library.
-#. /etc/rc.d/init.d/functions
-
-# See how we were called.
-
-KERNEL_VERSION=`uname -r|sed 's/\(.\..\).*/\1/'`
-
-start() {
-	ebegin "Initializing BestCrypt"
-	declare -i status=0
-	rm -rf /dev/bcrypt?* 2>/dev/null
-        if [ $KERNEL_VERSION = "2.2" ]; then
-         mknod -m 666 /dev/bcrypt0 b 7 128
-         mknod -m 666 /dev/bcrypt1 b 7 129
-         mknod -m 666 /dev/bcrypt2 b 7 130
-         mknod -m 666 /dev/bcrypt3 b 7 131
-         mknod -m 666 /dev/bcrypt4 b 7 132
-         mknod -m 666 /dev/bcrypt5 b 7 133
-         mknod -m 666 /dev/bcrypt6 b 7 134
-         mknod -m 666 /dev/bcrypt7 b 7 135
-         mknod -m 666 /dev/bcrypt8 b 7 136
-         mknod -m 666 /dev/bcrypt9 b 7 137
-         mknod -m 666 /dev/bcrypt10 b 7 138
-         mknod -m 666 /dev/bcrypt11 b 7 139
-         mknod -m 666 /dev/bcrypt12 b 7 140
-         mknod -m 666 /dev/bcrypt13 b 7 141
-         mknod -m 666 /dev/bcrypt14 b 7 142
-         mknod -m 666 /dev/bcrypt15 b 7 143
-        else
-	  if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ];
-	  then
-            mknod -m 666 /dev/bcrypt0 b 188 0
-            mknod -m 666 /dev/bcrypt1 b 188 1
-            mknod -m 666 /dev/bcrypt2 b 188 2
-            mknod -m 666 /dev/bcrypt3 b 188 3
-            mknod -m 666 /dev/bcrypt4 b 188 4
-            mknod -m 666 /dev/bcrypt5 b 188 5
-            mknod -m 666 /dev/bcrypt6 b 188 6
-            mknod -m 666 /dev/bcrypt7 b 188 7
-            mknod -m 666 /dev/bcrypt8 b 188 8
-            mknod -m 666 /dev/bcrypt9 b 188 9
-            mknod -m 666 /dev/bcrypt10 b 188 10
-            mknod -m 666 /dev/bcrypt11 b 188 11
-            mknod -m 666 /dev/bcrypt12 b 188 12
-            mknod -m 666 /dev/bcrypt13 b 188 13
-            mknod -m 666 /dev/bcrypt14 b 188 14
-            mknod -m 666 /dev/bcrypt15 b 188 15
-          fi
-	fi
-	modprobe bc || status=1
-	modprobe bc_blowfish || status=1
-	modprobe bc_des || status=1
-	modprobe bc_gost || status=1
-	modprobe bc_twofish || status=1
-	modprobe bc_bf448 || status=1
-	modprobe bc_bf128 || status=1
-	modprobe bc_3des || status=1
-	modprobe bc_idea || status=1
-	modprobe bc_rijn || status=1
-	modprobe bc_cast || status=1
-	modprobe bc_rc6 || status=1
-	modprobe bc_serpent || status=1
-	eend ${status}
-}
-
-stop() {
-	ebegin "Unmounting encrypted filesystems"
-
-# The original line causing the "xargs: environment too large for exec error".	
-	# grep BestCrypt /etc/mtab |awk '{print $2}'|xargs -r -n 1 bctool umount
-
-# The line for which it work's fine now.
-	for i in $(grep BestCrypt /etc/mtab | awk '{print $2}') ; do bctool umount ${i} ; done
-
-	eend $?
-	ebegin "Shutting down BestCrypt modules"
-	for i in `lsmod |egrep "^bc_.*" |awk '{print $1}' `; do 
-		rmmod $i
-	done
-	if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ];
-	then
-		rm -f /dev/bcrypt?* 2>/dev/null
-	fi
-	rmmod bc
-	eend $?
-}
diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.14-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.14-build.patch
deleted file mode 100644
index c4ce215e975a..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-2.0.14-build.patch
+++ /dev/null
@@ -1,522 +0,0 @@
-From 71bd6e496af5990836c34e4dd2d9d0107467349a Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 18:49:17 +0300
-Subject: [PATCH 1/6] build: do not auto build/install module
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ec0fd7e..d52f509 100644
---- a/Makefile
-+++ b/Makefile
-@@ -98,7 +98,7 @@ TESTS_TARGET = $(TARGET_DIR)/tests/bctool-tests
- #
- 
- # default target builds console tool with modules
--all: Makefile helpers module console
-+all: Makefile helpers console
- 	true
- 
- rebuild: clean all
-@@ -233,7 +233,7 @@ module-clean:
- #
- 
- # install for default target
--install: module-install console-install helpers-install
-+install: console-install helpers-install
- 
- # used by RPM creation script
- build-install: module-put-files console-install helpers-install
--- 
-2.16.4
-
-From 42816e0a4e47e77f290b46460e35a1666748f8b0 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 19:35:26 +0300
-Subject: [PATCH 2/6] build: remove useless log
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp b/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp
-index 3c6fad8..9821073 100644
---- a/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp
-+++ b/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp
-@@ -78,14 +78,12 @@ cSymAlg * cAlgRIJN::createAlg( BYTE *key, int keySize ) // keySize in bytes
- 	return alg;
- }
- 
--#include "../../../../fs-lib/log.h"
- int cAlgRIJN::encryptECB(
- 		const BYTE *inBf,		// Input plaintext buffer. 
- 		BYTE *outBf,	// Output encrypted buffer
- 		int  bfSize		// In/out buffers' size.
- 		)
- {
--	LIBLOG_INFO("");
- 	int i;
- 
- 	if ((bfSize % BC_BLOCK_SIZE) != 0) return sae_invalidBlockSize;
--- 
-2.16.4
-
-From a0ffdc5a135b549b62e1421fcf75d627e0394529 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 19:41:17 +0300
-Subject: [PATCH 3/6] build: do not strip binaries
-
----
- Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d52f509..a93b850 100644
---- a/Makefile
-+++ b/Makefile
-@@ -243,9 +243,9 @@ uninstall: before-uninstall module-uninstall console-uninstall helpers-uninstall
- 
- helpers-install:
- 	install -o root -m 0755 -d $(PREFIX)/sbin
--	install -o root -m 4755 -s $(TARGET_DIR)/bcmount_helper      $(PREFIX)/sbin
--	install -o root -m 4755 -s $(TARGET_DIR)/bcumount_helper     $(PREFIX)/sbin
--	install -o root -m 4755 -s $(TARGET_DIR)/bcrrpart_helper     $(PREFIX)/sbin
-+	install -o root -m 4755 $(TARGET_DIR)/bcmount_helper         $(PREFIX)/sbin
-+	install -o root -m 4755 $(TARGET_DIR)/bcumount_helper        $(PREFIX)/sbin
-+	install -o root -m 4755 $(TARGET_DIR)/bcrrpart_helper        $(PREFIX)/sbin
- 
- helpers-uninstall:
- 	rm -f $(PREFIX)/sbin/bcmount_helper
-@@ -267,7 +267,7 @@ before-uninstall:
- .PHONY: console-install
- console-install:
- 	install -o root -m 0755 -d $(PREFIX)/usr/bin
--	install -o root -m 0755 -s build/bctool             $(PREFIX)/usr/bin/
-+	install -o root -m 0755 build/bctool                $(PREFIX)/usr/bin/
- 	install -o root -m 0755 -d $(PREFIX)/$(MAN_PATH)/man8
- 	install -m 644 bctool.8                             $(PREFIX)/$(MAN_PATH)/man8/
- 
--- 
-2.16.4
-
-From 7947ac3e152da1ed590364b7c8948deb602a5b50 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 18:52:32 +0300
-Subject: [PATCH 4/6] build: allow override programs
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile                            | 11 +++++++----
- certificate/CertificateLib/Makefile |  4 +++-
- disk/Makefile                       |  6 ++++--
- fslib/Makefile                      | 16 +++++++++-------
- kernel/Makefile                     |  5 +++--
- keygens/kgghost/Makefile            |  7 +++++--
- keygens/kgsha/Makefile              |  7 +++++--
- mount/Makefile                      |  9 +++++----
- spacemap/Makefile                   |  6 ++++--
- tests/Makefile                      | 12 ++++++------
- 10 files changed, 51 insertions(+), 32 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a93b850..d57ee79 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,6 +56,9 @@ KGSHA_LIB = $(KGSHA_BUILD_DIR)/lib$(KGSHA_LIB_NAME).a
- KGGHOST_LIB = $(KGGHOST_BUILD_DIR)/lib$(KGGHOST_LIB_NAME).a
- SPACEMAP_LIB = $(SPACEMAP_BUILD_DIR)/lib$(SPACEMAP_LIB_NAME).a
- 
-+CC = gcc
-+CXX = g++
-+
- BC_EXTRA_CFLAGS= $(CFLAGS) -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- BC_EXTRA_LDFLAGS = $(LDFLAGS)
- 
-@@ -125,7 +128,7 @@ helpers: create-dirs
- console: spacemap-lib certificate-lib fs-lib kernel-lib keygen-libs $(TARGET)
- 	true
- $(TARGET): $(BCTOOL_OBJS)
--	g++ $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET)
-+	$(CXX) $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET)
- 
- # GUI executable only (w/o console and helpers)
- panel: certificate-lib kernel-lib keygen-libs fs-lib
-@@ -339,10 +342,10 @@ module-uninstall:
- 	bash ./scripts/remove_mods
- 
- %.o:%.cpp
--	g++ -c $(BCTOOL_CFLAGS) $< -o $@
-+	$(CXX) -c $(BCTOOL_CFLAGS) $< -o $@
- 
- %.o:%.cc
--	g++ -c $(BCTOOL_CFLAGS) $< -o $@
-+	$(CXX) -c $(BCTOOL_CFLAGS) $< -o $@
- 
- %.o:%.c
--	gcc -c $(BCTOOL_CFLAGS) $< -o $@
-+	$(CC) -c $(BCTOOL_CFLAGS) $< -o $@
-diff --git a/certificate/CertificateLib/Makefile b/certificate/CertificateLib/Makefile
-index 06353bc..19b772c 100644
---- a/certificate/CertificateLib/Makefile
-+++ b/certificate/CertificateLib/Makefile
-@@ -1,5 +1,7 @@
- 
--CP = cp
-+CC = gcc
-+CXX = g++
-+AR = ar
- CFLAGS += -Wall -fPIC -fno-strict-aliasing
- CXXFLAGS = -Wall -fPIC
- #-Werror
-diff --git a/disk/Makefile b/disk/Makefile
-index e3915b0..1a9ff01 100644
---- a/disk/Makefile
-+++ b/disk/Makefile
-@@ -1,14 +1,16 @@
- DISKMON_OBJS = disk.o diskmon.o
-+
-+CXX = g++
- CFLAGS += -Wall -I. -I../ -p -gdwarf-2 #-DBC_DEBUG
- LDFLAGS += -ludev
- 
- all:diskmon Makefile
- 
- diskmon:$(DISKMON_OBJS)
--	g++ $(DISKMON_OBJS) $(LDFLAGS) -o diskmon
-+	$(CXX) $(DISKMON_OBJS) $(LDFLAGS) -o diskmon
- 
- %.o:%.cc
--	g++ $(CFLAGS) -c $< -o $@
-+	$(CXX) $(CFLAGS) -c $< -o $@
- 
- clean:
- 	rm -rf diskmon *.o
-diff --git a/fslib/Makefile b/fslib/Makefile
-index 9b99e89..0075a9f 100644
---- a/fslib/Makefile
-+++ b/fslib/Makefile
-@@ -1,3 +1,5 @@
-+CC = gcc
-+AR = ar
- 
- FSLIB_CFLAGS = $(CFLAGS) -Wall -fPIC -O0 -DFSLIB_DEBUG -g  # -O3 
- FSLIB_CFLAGS += -I. -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 #-fvisibility=hidden
-@@ -17,25 +19,25 @@ FSLIB_TOOLS = file_hfs test_hfs test_info test_free_space diskinfo
- all: Makefile $(FSLIB) $(FSLIB_TOOLS)
- 
- $(FSLIB): $(OBJS)
--	ar rcs $(FSLIB) $(OBJS)
-+	$(AR) rcs $(FSLIB) $(OBJS)
- 
- test_hfs: $(FSLIB) test/test_hfs.o
--	gcc test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs
-+	$(CC) test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs
- 
- file_hfs: $(FSLIB) test/file_hfs.o
--	gcc test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs
-+	$(CC) test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs
- 
- test_info: $(FSLIB) test/test_info.o
--	gcc test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info
-+	$(CC) test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info
- 	
- test_free_space: $(FSLIB) test/test_free_space.o
--	gcc test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space
-+	$(CC) test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space
- 	
- diskinfo: $(FSLIB) test/diskinfo.o
--	gcc test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g  -o diskinfo
-+	$(CC) test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g  -o diskinfo
- 
- .c.o:
--	gcc $(FSLIB_CFLAGS) -c $< -o $@
-+	$(CC) $(FSLIB_CFLAGS) -c $< -o $@
- 	
- clean:
- 	rm -rf *~ *.o test/*.o $(OBJS) $(FSLIB) $(FSLIB_TOOLS)
-diff --git a/kernel/Makefile b/kernel/Makefile
-index 1a71617..4f9760d 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -3,6 +3,7 @@ OBJECTS = $(SOURCES:.cc=.o)
- TARGET_DIR = ./build/
- TARGET = $(TARGET_DIR)/libbckernel.a
- BC_CFLAGS = $(BC_EXTRA_CFLAGS) -fPIC -c -Wall -ludev -L../build/ -lspacemap -I../ -fvisibility=hidden #-fvisibility-inlines-hidden
-+CXX = g++
- 
- 
- ### Build ###
-@@ -21,12 +22,12 @@ module: create-dirs force_look
- 
- kernel-lib: create-dirs $(TARGET)
- $(TARGET): $(OBJECTS)
--	ar rcs $(TARGET) $(OBJECTS)
-+	$(AR) rcs $(TARGET) $(OBJECTS)
- 
- $(OBJECTS): Makefile $(SOURCES) BCKernel.h
- 	set -e; \
- 	for i in $(SOURCES); do \
--		g++ -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \
-+		$(CXX) -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \
- 	done
- 
- create-dirs: $(TARGET_DIR)
-diff --git a/keygens/kgghost/Makefile b/keygens/kgghost/Makefile
-index 65c4bf6..a7b0af8 100644
---- a/keygens/kgghost/Makefile
-+++ b/keygens/kgghost/Makefile
-@@ -5,10 +5,13 @@ KGGHOST_OBJS = hash.o pbe.o keyblock.o datablock.o kgghost.o
- KGGHOST_CFLAGS = -Wall -fPIC -p -ggdb -I. -I../../ -I../../certificate -DBC_LINUX
- KGGHOST_CFLAGS += $(BC_EXTRA_CFLAGS)
- 
-+CXX = g++
-+AR = ar
-+
- all: $(KGGHOST) Makefile
- 
- $(KGGHOST):$(KGGHOST_OBJS) $(CERTIFICATE_LIB)
--	ar rcs $(KGGHOST) $(KGGHOST_OBJS)
-+	$(AR) rcs $(KGGHOST) $(KGGHOST_OBJS)
- 
- $(CERTIFICATE_LIB):
- 	make -C ../../certificate/CertificateLib
-@@ -17,7 +20,7 @@ $(KERNEL_LIB):
- 	make -C ../../kernel/build
- 
- %.o:%.cpp
--	g++ $(KGGHOST_CFLAGS) -c -o $@ $<
-+	$(CXX) $(KGGHOST_CFLAGS) -c -o $@ $<
- 
- clean:
- 	rm -f *.o *.ver *~ $(KGGHOST)
-diff --git a/keygens/kgsha/Makefile b/keygens/kgsha/Makefile
-index d3a33d0..9c8c688 100644
---- a/keygens/kgsha/Makefile
-+++ b/keygens/kgsha/Makefile
-@@ -10,10 +10,13 @@ KGSHA_OBJS = hash.o datablock.o kgsha.o
- KGSHA_CFLAGS = -Wall -fPIC -p -gdwarf-2 -I. -I../../ -I../../certificate -DBC_LINUX
- KGSHA_CFLAGS += $(EXTRA_CFLAGS)
- 
-+CXX = g++
-+AR = ar
-+
- all: $(KGSHA) $(KGSHA_OBJS) Makefile hidden_sector.h defs.h datablock.h
- 
- $(KGSHA): $(KGSHA_OBJS) $(CERTIFICATE_LIB) $(KERN_LIB)
--	ar rcs $(KGSHA) $(KGSHA_OBJS)
-+	$(AR) rcs $(KGSHA) $(KGSHA_OBJS)
- 
- $(CERT_LIB):
- 	make -C ../../certificate/CertificateLib
-@@ -22,7 +25,7 @@ $(KERN_LIB):
- 	make -C ../../kernel/
- 
- %.o:%.cpp
--	g++ $(KGSHA_CFLAGS) -c -o $@ $<
-+	$(CXX) $(KGSHA_CFLAGS) -c -o $@ $<
- 
- clean:
- 	rm -f *.o *.ver *~ $(KGSHA)
-diff --git a/mount/Makefile b/mount/Makefile
-index 7a3d66b..0e60095 100644
---- a/mount/Makefile
-+++ b/mount/Makefile
-@@ -1,22 +1,23 @@
- 
- HELPERS = bcrrpart_helper bcmount_helper bcumount_helper
- 
-+CC = gcc
- OBJS = common.o
- CFLAGS += -Wall -O3
- 
- all: $(HELPERS) Makefile
- 
- bcrrpart_helper: $(OBJS) rrpart.o
--	gcc $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper
-+	$(CC) $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper
- 
- bcmount_helper: $(OBJS) mount.o
--	gcc $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper
-+	$(CC) $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper
- 
- bcumount_helper: $(OBJS) umount.o
--	gcc $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper
-+	$(CC) $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper
- 	
- %.o:%.c
--	gcc $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 	
- clean:
- 	rm -f *.o *.ver *~ $(HELPERS)
-diff --git a/spacemap/Makefile b/spacemap/Makefile
-index 6dff240..7dd2ad9 100644
---- a/spacemap/Makefile
-+++ b/spacemap/Makefile
-@@ -5,17 +5,19 @@ LIB_NAME = spacemap
- STATIC_TARGET = lib$(LIB_NAME).a
- OBJECT_CFLAGS = -fPIC -g -c -Wall -ludev -fvisibility=hidden #-fvisibility-inlines-hidden
- 
-+CXX = g++
-+AR = ar
- 
- all: static
- 	true
- 
- static: $(OBJECTS)
--	ar rcs $(STATIC_TARGET) $(OBJECTS)
-+	$(AR) rcs $(STATIC_TARGET) $(OBJECTS)
- 
- $(OBJECTS): $(SOURCES)
- 	set -e; \
- 	for i in $(SOURCES); do \
--		g++ $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \
-+		$(CXX) $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \
- 	done
- 
- clean:
-diff --git a/tests/Makefile b/tests/Makefile
-index c6d78f0..419020b 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -2,8 +2,8 @@ TESTS_PWD = ../build/tests/
- TESTS_TARGET = $(TESTS_PWD)/bctool-tests
- TESTS_SOURCES = tests-main.c ../container/cipher.cc ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/linux/file.cpp
- TESTS_CFLAGS = -I../ -I../certificate/ -L../build/ -L../build/kernel/ -DBC_LINUX -ludev -g
--CP = gcc
--CPP = g++
-+CC = gcc
-+CXX = g++
- CERT_LIB_NAME = certificate
- KERN_LIB_NAME = bckernel
- SPACEMAP_LIB_NAME = spacemap
-@@ -15,11 +15,11 @@ all: $(TESTS_TARGET)
- 	cp insert-modules.sh remove-modules.sh bcmod-loaded.sh $(TESTS_PWD)
- 
- $(TESTS_TARGET): $(TESTS_SOURCES) Makefile
--	$(CPP) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev
-+	$(CXX) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev
- 	cp kernel/print-struct-size.c $(TESTS_PWD)
--	$(CP) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
--	$(CPP) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc  $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
--	$(CP) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c
-+	$(CC) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
-+	$(CXX) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc  $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
-+	$(CC) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c
- 
- clean:
- 	rm -rf $(TESTS_PWD)
--- 
-2.16.4
-
-From a7e9a6048e443b0a592c56b1b48e66d20092cf76 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 19:34:59 +0300
-Subject: [PATCH 5/6] build: add missing sys/sysmacros.h
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- mount/common.c | 1 +
- mount/mount.c  | 1 +
- mount/rrpart.c | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/mount/common.c b/mount/common.c
-index 0a14ea4..d88394e 100644
---- a/mount/common.c
-+++ b/mount/common.c
-@@ -9,6 +9,7 @@
- #include <stdarg.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
-diff --git a/mount/mount.c b/mount/mount.c
-index c57594f..7c802fe 100644
---- a/mount/mount.c
-+++ b/mount/mount.c
-@@ -10,6 +10,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
-diff --git a/mount/rrpart.c b/mount/rrpart.c
-index f7ce125..7ba5692 100644
---- a/mount/rrpart.c
-+++ b/mount/rrpart.c
-@@ -13,6 +13,7 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <linux/fs.h>
- 
--- 
-2.16.4
-
-From 9cb62cc4cbe9cb929aa1fca34d3d807a4e83bcca Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 19:12:13 +0300
-Subject: [PATCH 6/6] modules: build for kernel-4.14
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- kernel/kmod/bc_dev.c | 4 +++-
- kernel/kmod/bc_mem.c | 1 +
- spacemap/defs.h      | 1 +
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/kernel/kmod/bc_dev.c b/kernel/kmod/bc_dev.c
-index cddbf49..8b5657b 100644
---- a/kernel/kmod/bc_dev.c
-+++ b/kernel/kmod/bc_dev.c
-@@ -86,9 +86,11 @@ static void reject_bio(struct bio *bio)
- {
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0))
-             bio_endio(bio, -EIO);
--#else
-+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0))
-             bio->bi_error = -EIO;
-             bio_endio(bio);
-+#else
-+            bio_io_error(bio);
- #endif
- }
- 
-diff --git a/kernel/kmod/bc_mem.c b/kernel/kmod/bc_mem.c
-index 0b516c8..69ec832 100644
---- a/kernel/kmod/bc_mem.c
-+++ b/kernel/kmod/bc_mem.c
-@@ -6,6 +6,7 @@
- #include <linux/init.h>
- #include <linux/slab.h>
- #include <linux/kernel.h>
-+#include <linux/sched.h>
- #include <asm/uaccess.h>
- 
- #define BC_GET_CALLER_PTR __builtin_return_address(0)
-diff --git a/spacemap/defs.h b/spacemap/defs.h
-index f0c87ba..7de9052 100644
---- a/spacemap/defs.h
-+++ b/spacemap/defs.h
-@@ -17,6 +17,7 @@
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
-+#include <linux/sched.h>
- #include <asm/uaccess.h>
- 
- typedef int8_t		bc_8;
--- 
-2.16.4
-
diff --git a/app-crypt/bestcrypt/metadata.xml b/app-crypt/bestcrypt/metadata.xml
deleted file mode 100644
index f1c3d59fb213..000000000000
--- a/app-crypt/bestcrypt/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>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 28c5bf10c4b7..48e81b71d3b4 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -3,5 +3,5 @@ DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb32
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 EBUILD gcr-3.20.0.ebuild 1851 BLAKE2B 532e60ee150d6886ea24abda75d29b90acc66f7e055e5941a8c53293dc5491e3850729bc68b8a9f7d5658e0a2b5dd97dc3c0e1a75418fdbf132e0c6b4dbbde29 SHA512 f0c952bff3d6f66c8d75a0671cd886ac0611bd60f7b8a3b29dc71798d545baee9f2e2842ac76a87e34acb05fb200a472fc3bf58d4c0201e5fbaf60bb96efcbbe
 EBUILD gcr-3.28.0.ebuild 1892 BLAKE2B 4dbe4a19c0da7470fe68daa6191e1469fbc192dfd122dc2581340ab54e795289fe8d8ace674d159c851dd0da00fe544587a189c64ad7d50345f4a4b0245b4597 SHA512 c9d40cbf32c1570a9b152a26db32dcf1888945713fdefb3c0bc46add3c5e04d0bf7f4ac62a38e673265380d04b8a7428f511560390c0f756bab44abfaf989fb6
-EBUILD gcr-3.28.1.ebuild 1898 BLAKE2B 90d8b96064a03cf5e0ed33697780f8a89b435d9b67f9560fadd2d21c4b5c548f6be8982954e20970d6be33f033415483d6b4681ee02531d7449bc2ee5a8183ba SHA512 620cb26d286517f092751a6ae56b39dac1c9eb6a214b50106521aca3cd4f1021942b2273622ed81a27d1b6ebaa6bcc654deab0e34e3e3f7b8b758ec24c119294
+EBUILD gcr-3.28.1.ebuild 1897 BLAKE2B 61c7d825073eb4233381fa8b66b6692dae395886af4c6c31150bccdf2677e585a57bb90e6123c6e463b70623cfa885220c648c1ab89d4bd8888d2d11ee39132a SHA512 0a1264fceba0e6639189ba877ae7e7319c87faad00469a0a5759f7877a2f634154746daed4bd0f857d657c86101529c114d08246e09ae5e057ecf2722bc3da2e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index f0c83cd810ee..479ccd4377ba 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index 40bab3734fba..a88dcc5d375a 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -4,4 +4,4 @@ DIST glep63-check-9.tar.gz 73445 BLAKE2B cd229065da9a4663491a891787d2a9e719cd9d6
 EBUILD glep63-check-7.ebuild 658 BLAKE2B 3e742acbd0fdde1670de3348739b10f70b0ccee4b50615ddd3b49225847c5c2e2454652ca8748330e3adac7f9079ea7bb272b3160f4b8daa14a4113fd4793265 SHA512 470627606b86e27d4fb20e6f0281dc13db43e193ae4f3c2d71da21d949d91253afdbc5a375fd36f8505bfca210a86d733663c2ac4dd64785da63be75c73542de
 EBUILD glep63-check-8.ebuild 660 BLAKE2B cae7887511523f495f88aa4f4a2a3178c6b9437aaa51e14ae42a3611de67f64844a0fce2f2c102d53ebbb646a154a7119d929d4e6e5916659e771f62cee835d0 SHA512 481b395c429eedc70bb83e2bbe30298201a8d7981bbf6798ab7f8360597f2b4c42204748732caf3f73ca9e2d362d82a7564a207c406dfb9aa05a2af1bd5a9328
 EBUILD glep63-check-9.ebuild 660 BLAKE2B cae7887511523f495f88aa4f4a2a3178c6b9437aaa51e14ae42a3611de67f64844a0fce2f2c102d53ebbb646a154a7119d929d4e6e5916659e771f62cee835d0 SHA512 481b395c429eedc70bb83e2bbe30298201a8d7981bbf6798ab7f8360597f2b4c42204748732caf3f73ca9e2d362d82a7564a207c406dfb9aa05a2af1bd5a9328
-MISC metadata.xml 513 BLAKE2B dc5036a6556ebfefbbfc1ad01f436b9793c5c0c51e7cbda49ee896ff364a30761f92ec63531317b4bd55bb9cc018d6ee62d07776a61ba75d7d1245c3d0c1339a SHA512 44aac823dedeb848696d166e28d151449b59d30a7dd87a0c2c339c044e2704908a1882e3b818ad7007822b5fd2efc52ad81564fad953862851b44480d61642fe
+MISC metadata.xml 537 BLAKE2B cc05c3872c522fdcc2355da9d451f9ad102d23e2e5de657f447ce5c9441a4379fb5f6560cd22a8be325f322e901b65917b11630fc0229bd0e952c6f8b6b64bf0 SHA512 493bcb28f9144c49050445de98b54e19730e46cc24df02b15859f4114f4fa8775431aac9d8fcb4f50639609680656b108f6c4ca47f67b38680f926cf9610ccd9
diff --git a/app-crypt/glep63-check/metadata.xml b/app-crypt/glep63-check/metadata.xml
index 3c8bc0ae71d4..380dca00d407 100644
--- a/app-crypt/glep63-check/metadata.xml
+++ b/app-crypt/glep63-check/metadata.xml
@@ -5,6 +5,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer status="active">
 			<email>mgorny@gentoo.org</email>
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index ba2ba2659d40..c2a226b33803 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,5 +15,5 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 EBUILD heimdal-7.5.0.ebuild 4334 BLAKE2B 33303601d32d3b2c6f54a3681012f854b6addc55b09c65e6d0cea74e8ac91c12de09624e37f3d4f9933c54dbe8de3cf7f258bb99d33d26a25a0c280288777b44 SHA512 6d40e8a30e74b95c918e7ee5bf10b3d017178bd4775bba707ff2dfc02d208c121426b66ebdbb50df09a96f4caa5c55b35f2e8d53cad9eac4f8ebf46b0f6de266
-EBUILD heimdal-7.6.0.ebuild 4581 BLAKE2B ef258b25af07a37f83674d2aa2fb58547dd01682813e95e8fdcd0b03540e3bf89dd8e5c842a167dea34894a50ddbc160ff48aa8dac3f0cceb50fd43835363abf SHA512 f0b167596cbd5878371fda6a27686861a6c0c5f9d9bb2db340597d7822671b2765c5fbbd86893514bfc16994c5a194385cf327ffd9a4ce99b4e6d538805c1c9f
+EBUILD heimdal-7.6.0.ebuild 4578 BLAKE2B 6e7fd5f20944725b82a4eafdf169c68d2fc7cfb3bfcbf368e82ffc64712584cfe748732049d08087ef03bfec1ee605a664015826aac967b1ded0bec1ba6e0ac9 SHA512 835430b644c0579bb8cd08d79f77aa678466b156af6196abc81a13769cee0c3b4566e7c791107006215ec1b449d5485a7f68e45440b54bc2baa302f178b9bfe0
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index b4339db5f9bd..7ce4e6e49481 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd"
 IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp +pkinit selinux ssl static-libs test X"
 
 CDEPEND="
diff --git a/app-crypt/jetring/Manifest b/app-crypt/jetring/Manifest
index d28eb12420fa..1253dc95e022 100644
--- a/app-crypt/jetring/Manifest
+++ b/app-crypt/jetring/Manifest
@@ -1,4 +1,6 @@
 AUX jetring-0.21-parallel.patch 762 BLAKE2B 0cdb8e21c3afcf17fdf8dc2eb3c9d9728c1139f0599572168b00cc95581f4c84072b2b3c15f188a120c65d1d9ac678ff1b7721b6e3afc62796849697ce623c1f SHA512 67f866eb53bf6aab22ff955a8ecc4ae9907f2b6cc430e12c5183a18c23488b53ec1de8271dc853f1a429463228f80aa2f90b6161a5350bc6d85db50de95a5f0b
 DIST jetring_0.25.tar.xz 208944 BLAKE2B 417565c1590f677542f81b6f457482ff1c8219317b90d12666a8b497608f5ee16466c03f68d8c4424c4bb92a0713fefb243dc621eee9cd10f7cf3495590143bd SHA512 aa9de0c7c034093789bf74c75533e678b0822cf0d1261d1b906fd5ef2decb41654bf2facc5c06b469367bb1a0fea4c862c0836fd00635779a2e8dd4f3c08ff46
-EBUILD jetring-0.25.ebuild 595 BLAKE2B a451df5ba0382a63c325eb549e27b5429f0c0f396cbd12828abf372d4691768adbdd5ddbfb588959454361c67cf49151ccda3a6469c1ad72a4731fd4ab80700a SHA512 43f69b5b8ce3550ac8d178ae12f6284956c29440eebbeedf2ddac1daedba1984f2765f17336c18b8d436b5318e3a9a3e9970f2c1597947c41df205497eaebb90
+DIST jetring_0.27.tar.xz 209376 BLAKE2B 08081611d42f63dbfd0d8c44c67932ae6428ce244f9f2c01466bae0baef54e4ccaa67f78825004a0292bc619efd44b247b7982669cf5b29b366c4c20f776984a SHA512 707f480d6b5ef2943fcd54776631d2290ec892bcccb0a3099f28262e4660d844d1db135fa4070538ffcf1ddeda00c09dd258707857e0f1af0fcadb407cca383a
+EBUILD jetring-0.25.ebuild 660 BLAKE2B 4beaf7607a56c28d9d80c5707c58757a60a9ddf5dc192ad070f2e8fb932affa52bc88dc086a04f942b0dc7a050c09d27adbe75987168367b1775adb2b71165ce SHA512 26bd7f1dfb4520d82478994cd51deb34030843db4c4caaff325e47ec4779decc7f972656bcf519fb54dd7e39149b0894c99dbe1db176487e8f5292142936eb27
+EBUILD jetring-0.27.ebuild 677 BLAKE2B ba40e08faaa387666e6bf5a3c4c1e4c7410ed870fe696d5f90d79f351c13c3120b553f063c956c21326b8b1c5dec6dc39099fe2a90ab5e7a855f9362c7e6aec2 SHA512 4961d70e626c3df8a968a6dc1902f313f1ba32564577aa9a94bef0ccc5d76f1980c19ebb965850f6e41e03b29547826167ee1c16b8f0352d704b0261047a7c78
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-crypt/jetring/jetring-0.25.ebuild b/app-crypt/jetring/jetring-0.25.ebuild
index 04664bb5eb51..1e93e84f2d90 100644
--- a/app-crypt/jetring/jetring-0.25.ebuild
+++ b/app-crypt/jetring/jetring-0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -24,6 +24,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.21-parallel.patch
 }
 
+src_compile() {
+	addpredict "/run/user/$(id -u)/gnupg/"
+	default
+}
+
 src_install() {
 	default
 
diff --git a/app-crypt/jetring/jetring-0.27.ebuild b/app-crypt/jetring/jetring-0.27.ebuild
new file mode 100644
index 000000000000..fe2d14100c31
--- /dev/null
+++ b/app-crypt/jetring/jetring-0.27.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GPG keyring maintenance using changesets"
+HOMEPAGE="http://joeyh.name/code/jetring/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/gnupg"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+	"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.21-parallel.patch
+	eapply_user
+}
+
+src_compile() {
+	addpredict "/run/user/$(id -u)/gnupg/"
+	default
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/${PN}/
+	doins -r example
+
+	doman ${PN}*.[0-9]
+}
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 5df05448dd3b..aa704d341314 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -3,5 +3,5 @@ DIST libsecret-0.18.7.tar.xz 508392 BLAKE2B 9774df97c2abb362940c3b373e381afb82ee
 DIST libsecret-0.18.8.tar.xz 509432 BLAKE2B 3e3995d2c44367e31f3914087494764acfe82fb597b524c4982b4fca4e16612509c675f545191ee3cdae59698614395bef54ad82ae88a7e4e19898ba0be7828f SHA512 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4
 EBUILD libsecret-0.18.6-r1.ebuild 2658 BLAKE2B c413830dc2598673d5a0f70c83bc3709c6f2749b2ee7da24da880b52b1c69af977632a45c3c654523a9f0c3271b4d5b0bae7c6c9a776e4e7a6bbe603d5acaf40 SHA512 056cfe38971719b9bc6c97ccf330fb0dd98abbb9637a3e6fd362aa89bd348ed024d415a41ac954fddd5dcf98a81284a48c78f428fab2f7fb56cae7fac3c1b7d9
 EBUILD libsecret-0.18.7.ebuild 2647 BLAKE2B d64cfb08b81738a7f0161c3b3204c5a9371bf4f5493760d06dcce5ba087d0d9cd7274475fff43d9cb265706c1721d0ba6a26456faecfe56ae4662dc9b3082675 SHA512 be27d948abff0e425af426600d95c4dbb484e542d0df9e453efcf81e738b3cd492c0c8aa4dfaa9bb2e46357c884598a770a7c8b81440b985086cf052ff68c615
-EBUILD libsecret-0.18.8.ebuild 2645 BLAKE2B 05a928c17961215211bbabe07a0f6a2199df879bbd6072b927375b4d3370da12be4e733caed48706762b24046f5d4a24bc28b8aedce685f0ea434f112e6f9bb8 SHA512 31cf0d15b0f9ac47c2ecdcd8e6d58931d9c92a2d62720e1d6047f762617debaabf1378d71716d27cae48125aea032c8bd43ac8f9e61e01b5764e525c74420f89
+EBUILD libsecret-0.18.8.ebuild 2644 BLAKE2B 31a1a8281bf6fd9ed03f188b75cec535eef51fcdb9ab3761c7e61cdbcea9fadf815be50fa1affe34b7faac956345087a2aee7908c7d654c550ef00b002f46668 SHA512 c435a380b0ce34b510822d5885d7f0e756d155295b66ded74b075e01f1d31acf8bb6c83bcacbf37fbf72cf90f32ae3c26527c6c757054f217bf016e3bb85b135
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index 460fd730a7be..e0656ba4e28a 100644
--- a/app-crypt/libsecret/libsecret-0.18.8.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -18,7 +18,7 @@ IUSE="+crypt +introspection test +vala"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 2add1dfdd613..f512678b6e37 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -1,40 +1,40 @@
+AUX nitrocli_-_fix-rust-1.35-build.patch 1766 BLAKE2B 5516cf19c40fcd8fa51e804e59d038ab00f0bc67e3db0ea8d8889e1cf2ffb523435ada7eea687bdde23ebd968cae02be20dc94ff39df968261614fb9400b7c48 SHA512 5ce260720bd15b8c5eec026b13faffbcc527e9d994ff4fa46da7636af264b73929e74ed440707aadcea60de35f0c7ab75c3a5a9c3274b316b8d488a31119330a
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
 DIST argparse-0.2.2.crate 19440 BLAKE2B 7b15b2072ff52149bc08c5d02a266f2eef78a3aa8844e49154cf2ae1a9cb960ddc2a96a065b4aa44637aca8216211f2965291364d9f06ff6f68524a1f15dfed9 SHA512 97691566d3adc6f6be1c00cdca48424fd3576c372d1c995e7e31658bd20e17ef13553f7de21968ba189fd812928aeb93ef0fa89fe2fd258f45a0a8e095783706
 DIST base32-0.4.0.crate 7791 BLAKE2B 6e457d08f6fe17159b0231b62774d2c366c623b07c7b37196edb8f33b886cdf7affece70afae6dd0b64fc4d2be10d3a01f2f0b81ed12d5c5e1cf50d39c80e68b SHA512 4c999f2fcded06d803471d08b8d9e42512a85f81974388afb3d5b450c86e5ea60e7b1fdaccc49b1e0346663827408f847e897523955edcaf397f20fe97038345
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST cc-1.0.28.crate 42422 BLAKE2B 632455257fdfe0be6efddc6aee1a32a8a450c49f3a49b7dd13f770cda69334acb0d11e69a4bd4b94c09133ab4319a529c29de993b960276f7506511e4c0fda9a SHA512 2d1e8e34dd8d60aafb0337a86516b152f7f5b04ed5313079fcce66460b5d9c753afbf5e5ba13ada56bbaa7f5ffa1678eb3c2e27b9d58cdcec9f1a5374e6a32ab
+DIST cc-1.0.37.crate 44499 BLAKE2B d12551225fc4e20691a09fecc8a2a487090ce10ad7fe64b385cf54b74a124cf737aa31966f82d9a68e1a932dccb4ec495eb32cdb4dc808c985384fd0fa4b6950 SHA512 85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
-DIST libc-0.2.45.crate 349425 BLAKE2B ded7a699266fb8c8003181dbbb0a8ed9fb27613951b72d538e05bf1d262810dac7edb47560d06989d0d24a9cfac18f22744efed44d12452fa41ba68cb4b8e4cc SHA512 8188400f2f9fabd7c1e0dd1172032eb25bde2702019aec4e3e0c8b936209347baea347ff8d85fee3e93031df0741d32faed151c2b553151e95ae8321bb653381
 DIST libc-0.2.47.crate 351491 BLAKE2B 10ff90405b911c40478793cadc9a1962e14eb4d7b4ff758554a225bb87340989bbd6089441eaa2638db93782de7d0faba20f77a7e3569a52cec40ba55eb56c06 SHA512 f0eddcbe456b1ee2da22963585ff689ad44f0f8d70af33d9bec41a1ec5a1b3dee26fbeaa29786792cd44d020fc56461b44bbb2da962662377552fa562b2694f6
+DIST libc-0.2.57.crate 408902 BLAKE2B 5c84f490037b5e108400f710da79f5471d5f76c384641bbcb721aee21da84e6a2b523487dbf5984b746d070d23c449968ed546e0bfcdfa961dfd57bfb2f3dce6 SHA512 8f210c0e28d647cd2911ad2b7d2450b6e8ea3d628c0cc68000109a7bfdd64fa31706ed7e9bda0f71b920b38a3580fce3d53fe49e9cc53b6ab9e3aeb2eae0cb8e
 DIST memchr-2.1.2.crate 19520 BLAKE2B 4a8409fa4e019ab5cdbfc2787eeebacbbcfd21415d1ea6a3796ef18434ddfad0f63f6df3027eea5d286e08eda892e21cae66e3f25ffee9d6a2a3327b841e5377 SHA512 ba3bad3b911fdd767b6c770209e93dfc367c6228117a5d85bfa95d70ec66df9842f3cf788ac560d1255415dba49028187542000b9a71fbe79ec51a386afda38f
-DIST nitrocli-0.2.2.crate 53443 BLAKE2B b4385b6031f99719dbfde97248df07975d008b2d57fb2c6597e935b0f1d5f338ba4284988a9eb1a1b8b3d07db9b1b0f638acc30a0e6599f7ed09cf7c33211994 SHA512 76aa5e20afb7627730dbf45c6686f1b2ab7d9c6a2121a6c5827c563f4f3f5b8a293729d63cc2b17a7373bc246fd70e73f63e990c95cad7089864611148a50ea1
+DIST memchr-2.1.3.crate 20069 BLAKE2B 6afd95538abae42fdb22b82964b64657555734f2505e12c650f844b91d60a3f6f61277065e15289b6e6b7ef8ae5345674ce7465ce2320822e13734949ddcd49c SHA512 95fca57233f023191da0c0abf4835c63ca38404b05c2021e1fcb910068c29321e0b89660088e1be432ed8aea2c4d53f14587e08dba0b258892f2e608606b3b57
 DIST nitrocli-0.2.3.crate 60731 BLAKE2B 52e8a13179ef0391698b87e0172b4beae902c7586b48718538e55f2497a1d31dd645224041a81c8311512a905cd574f34f817b66b2b2f469c1a278437a6cba93 SHA512 e3467dedecc27dbe8b818c63bce9e29d22bf65af03ff53c4f85f1c3730f4b55a359dfe210875efdc8bee7e05147e066ca963d9a5ff1b68b5fc258c8a7d4d82e0
-DIST nitrokey-0.3.1.crate 24023 BLAKE2B e12a8f1a8f2366714ed762093260a001ea2d5efadd0624e5d7b710a5a3ae8bc0012fe6098c69873ca63703e6fe64cb1d9ec400be51fb0b096821769358129e61 SHA512 343f82ad6e643c7353ba5acb2eeb1cd70b4f678f579a7a14ebe5c68fd868bd03447c917495b7fe5e44c4476ca5b40754a58083ab605436c6262ff0699104e4b4
+DIST nitrocli-0.2.4.crate 63798 BLAKE2B 64a4998f9b232993692f85ca3890ecdd20e1027dee61b6f31f06be459a02f11a3cff2c035aa462ee5ea1d680f9e201e25cffdd4ca8d54de80c13d78d9a877fa4 SHA512 cf10287591d55378956118a213e4f9752087be37c67d4c89f7660f51c98dbbf3a877afaf11af7625d3776bdf2c7944b25637873af70119d514f2be93131f9733
 DIST nitrokey-0.3.4.crate 27462 BLAKE2B 07412e0d3d98a0fcaa54be3d494b107a0a4d999da41dc39f8710a5eb845911d175ca15918e212a1025a34e3ddfff89b5ca4a138d66effd47b639afcb19572ca4 SHA512 abb43ca94b7d4ba55cfabce56b712c99bc4e50671149ae2001de77c2cfae25f17465130729a4a856005a692b846c67b54b2992e41b708e8ad94a8c3af0843e20
-DIST nitrokey-sys-3.4.1.crate 61726 BLAKE2B 98a1cfa696434372d980ff5f645de77479e2e7977334df805d67d970df262e19c11c5880343c5bfc1a1b2abe7d29a34762bd90ad926c7cf7ba486e0b513c84fa SHA512 cc9cfbbebbad8a5c5846c60ad4125c87a64624ee90302327b03a94b1494d2329e45bbb09d58a3a00d465b23915faff3d3d787f64c0edcce6c63f25ab7830af13
 DIST nitrokey-sys-3.4.3.crate 61875 BLAKE2B 8c2abf91a40f54907f225c21df9d1e40ac22022a3b8229a8bd6c7a5cb8f87df74675ed5eadf6441bc81025e0cf3ebb21d8301004fe1fc76799e11568317bbf0e SHA512 ae69bc8d3fd0a58224ecfaacd159fbab4f7686daaecd96480a6c824ffbd22a8d2c948c5b2c803fa20ae41adfd4334c6462335f5d02dd7acbae0ab19b33cf0a3b
 DIST nitrokey-test-0.1.1.crate 8044 BLAKE2B de775515a73a500d3c37a58431c14a1cb6d2f715808c855466b78373f983b948b9e257f03fbcb16729a3f17a3f930ddf3eaac913955286e27e0b27f573659d04 SHA512 4dfbc79e64ed77f58599bc570b126f7975e614de07fa30b3c7da421bf184fbf059f401da42110b14eae5a953599e3875430cd4f0e117df5ce9bd03a753026cec
 DIST proc-macro2-0.4.24.crate 30970 BLAKE2B d6b0a5fe633c5773e6d8b4bc2c9f32c66f8072f85ff48bf449fd3d8ada87e639ee730f8bd3d3170acd1528806698bcf1c329c57f102cd79833f96e2fd1bb7e0e SHA512 57ae6a761fcc14f22277df025db6b09f1173035e1496d1c4906d9af9231c19f0b93750abf36e4013ae82799069869047a7e3f1b3e095344e55c603fe5a462d03
+DIST proc-macro2-0.4.26.crate 33854 BLAKE2B 833db134470a8f12342248c514b08463836ea22eec90162ba96364686e593e3048fe16de669316d88ed5f44b27f948613cf98f4952d49f6b5f37f2da51584c2d SHA512 e35ce0e0a05559417475abc402ef88e6214d7f27ee6cff35577077c5334ec7c6dd5d1d8099f25617391cd4fd2f54838a16ae74039ea6f99ea1d2f0ef58dec010
 DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
-DIST rand-0.6.1.crate 126613 BLAKE2B e7779ba6b13aa58edc3632f250787d35ad486185d3307d17528b12bb6d2adf6eef8aa91c5f51f021fb8e037d4ab1fb64fa364ec093fae0a5bd79095d51e06791 SHA512 dab500d25d538d28bac5b9b60e3b262f64e9d0581c5c17f165890497f7cb459603b815e8a43451610e75d8f5390aa41aad57dcb532307c479ebb99f475f4d4a4
-DIST rand_chacha-0.1.0.crate 11637 BLAKE2B 423f7e835d9c69f49f991ef2ad00c40c8af929935de531821ef32054b39bed54991709e04b352a9f429c7c49f17548084f703353df3a768f1f31a655111b8ebd SHA512 b911dea149eeb859e532d17074a4db8527da2d048b6f59b0d58fdbb51dfe3e839092e1c614e748f471a7381d28605e994ef8783643bb419eedb2c4e04f3dd0a3
+DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
 DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
-DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
-DIST rand_isaac-0.1.0.crate 16011 BLAKE2B 84cd447debff595683ceb97ae2b03cb31ca6e342769dc1ccfca0a20e5bc8474ca3c40cce4bfc3be59b2bc0c849b74848f8916a2bfcf9bf7c0d54b2e8b5ae3c67 SHA512 addd5b4fb2bfdafec8b3d50f607099ce8d9fd7c5cb5cfcd6603368e5022dda7562e2deb2efcf4d5f3304f248629160f906554ed40a0d7cbb19c4b807a36dc74e
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
 DIST rand_os-0.1.1.crate 18553 BLAKE2B 5b74bbce5ee3f20f7c92204c4b60f9450b3a19518356c70737c8dad9873da775c90b8786bc75f0fa166388f6bfc585240c56445a39603704df5e99a4c505e17a SHA512 a7ccc054fd4a60e868520af3fc15e6eb22e62411975923e4d968a4825a48cbf87238338cbf1336792d996da5cc2183ac465a6bf8094358f0e5fc56380ce16193
-DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
-DIST rand_xorshift-0.1.0.crate 9194 BLAKE2B e35999cedfb58b4c2192fcb0d4b606b1535a4ff32cf0f9a8d337f029704cff285af741b507c98afa27040e04f2be23d53a7c749fbd86242469a4a85d61939f64 SHA512 6bdec89da3e3c07c8fe42ba4ce5c24d76ea81b522fad533ae172c5d402f109fd9ce793bc13647dc1db188202bd78f48a9ad55f0caa43f1b88c711f3f2c18a0bb
+DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
 DIST regex-syntax-0.6.4.crate 272048 BLAKE2B 921cb35d306d796baeb9e3f2fd243bd6c90e92ff175cb9be23e12b1a0f19f51a40075aaf66a56e32fe9b1f08eb30b2a1f47469127061542c96b4f68733780b9a SHA512 7a199c43668f7d660a28a1324ce1951cd6ec299cd98edbfde3b6a6d172e9f1a52135457673b432a0318163a5c23e541abca58607623a310f15fbefeafb50ee3b
-DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
 DIST syn-0.15.23.crate 145369 BLAKE2B f66939982ee09090f2baf1cc4522615e6975d4350c7c65b3b0a3568cd3b3aef04231f6c23b818333107af784780366cafe7d726f03f346ed227c1db6cca522c1 SHA512 d447ec08199d36e289ea303ee8e871e13e002a4d67c396187ef56eb16b69cf21d64becd24fd8d2f7a1c826685f7b6df747903e7eb8cc5c334ee0528998597128
+DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
@@ -43,6 +43,6 @@ DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2a
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD nitrocli-0.2.2-r2.ebuild 1535 BLAKE2B 7639eaea62dc5f7e2b7e51813248b33a60899ce84e20f55572716aebb14155dcd74a42339e3d9009364dc162906c1fed14f4ec9371b2dc3e729c08ee5e4f2ab6 SHA512 e45bff033b969119f3e0658d692d7a6324ba020e8212a2a48709b6aa94bfbd5df5e84ea4ecfaa98a59a62aeb312025b643f12134b8df4896b984e1146d058bb8
-EBUILD nitrocli-0.2.3-r1.ebuild 1407 BLAKE2B e8bf0442d55a5cf48f57b65b1f47c4b5f0a1cf7bfb3fd363f818353ef433af1f7e9339a3c996505f1fb78ea12a3edacc5e540d36008d9051115e025d4c10ea57 SHA512 a4533889b8e9bc753489bb1f1f9a419ce46b52a96733649b5c153647c1983f589d334a3f6ab29f3ff8badf2d728b155cd0d2315715f34855c6956656d26fa407
+EBUILD nitrocli-0.2.3-r1.ebuild 1500 BLAKE2B d87f8fadc7af892145f84191279938cec8d4c39b56a8c2bb2c9bd33e9107f97cf29dfa7cd3b61d541c42b5661ea8e4469a61d6892eb63ad06da0dc2ae710a94f SHA512 e6eacfb0442e915ccb3d164ceb0229fc94b8fdf04d82a3a41ff6f29273cfd0348e1a06db4561ef121d6e4fb79df5ef95ba79f95aa4c563dd8458dc14a9ea868f
+EBUILD nitrocli-0.2.4.ebuild 1382 BLAKE2B 3757d9ddfeb7b0be189d95f2ab63be087996dcde5009524db2d7bd66d7bafdaca71dbd6495d5a855411f966d080ae4908a77d9489b24bd5bca567127fc596d7d SHA512 3a566cf66fdbb387adb6027215d6b3d52c2833620ae4a318647c243ffa0446d9c780112790f2be5b2178a91f6901c1c1781b0a2c79ac32389f9f4bbd10497702
 MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
diff --git a/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch b/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch
new file mode 100644
index 000000000000..d5da3b1f48de
--- /dev/null
+++ b/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch
@@ -0,0 +1,52 @@
+From 5383aa73b339e6a53ff027ee6012a3428f67466a Mon Sep 17 00:00:00 2001
+From: Daniel Mueller <deso@posteo.net>
+Date: Fri, 24 May 2019 17:39:14 -0700
+Subject: [PATCH] Allow for unused doc comments on macros
+
+With Rust 1.35 we get compile errors due to doc comments that are added
+to macro invocations but not actually included in the expanded output.
+The rustc wrongly assumes that we want to document the resulting code
+and not just provide details about the invocation itself.
+This change explicitly allows for those cases. Alternatively we could
+have "downgraded" the doc comments to normal comments or removed them
+altogether. There is little difference between those alternatives.
+---
+ nitrocli/src/args.rs     | 2 ++
+ nitrocli/src/pinentry.rs | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/nitrocli/src/args.rs b/nitrocli/src/args.rs
+index 7f0bfc..7e4f83 100644
+--- a/nitrocli/src/args.rs
++++ b/nitrocli/src/args.rs
+@@ -101,6 +101,7 @@ impl<'io> Stdio for ExecCtx<'io> {
+ }
+ 
+ /// The available Nitrokey models.
++#[allow(unused_doc_comments)]
+ Enum! {DeviceModel, [
+   Pro => "pro",
+   Storage => "storage"
+@@ -116,6 +117,7 @@ impl From<DeviceModel> for nitrokey::Model {
+ }
+ 
+ /// A top-level command for nitrocli.
++#[allow(unused_doc_comments)]
+ Enum! {Command, [
+   Config => ("config", config),
+   Lock => ("lock", lock),
+diff --git a/nitrocli/src/pinentry.rs b/nitrocli/src/pinentry.rs
+index 837032..8bab65 100644
+--- a/nitrocli/src/pinentry.rs
++++ b/nitrocli/src/pinentry.rs
+@@ -30,6 +30,7 @@ type CowStr = borrow::Cow<'static, str>;
+ ///
+ /// The available PIN types correspond to the PIN types used by the Nitrokey devices:  user and
+ /// admin.
++#[allow(unused_doc_comments)]
+ Enum! {PinType, [
+   Admin => "admin",
+   User => "user"
+-- 
+2.21.0
+
diff --git a/app-crypt/nitrocli/nitrocli-0.2.2-r2.ebuild b/app-crypt/nitrocli/nitrocli-0.2.2-r2.ebuild
deleted file mode 100644
index 653a9ce8ef2a..000000000000
--- a/app-crypt/nitrocli/nitrocli-0.2.2-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.6.9
-argparse-0.2.2
-base32-0.4.0
-bitflags-1.0.4
-cc-1.0.28
-cfg-if-0.1.6
-cloudabi-0.0.3
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-lazy_static-1.2.0
-libc-0.2.45
-libc-0.2.45
-memchr-2.1.2
-nitrocli-0.2.2
-nitrokey-0.3.1
-nitrokey-sys-3.4.1
-nitrokey-test-0.1.1
-proc-macro2-0.4.24
-quote-0.6.10
-rand-0.6.1
-rand-0.6.1
-rand_chacha-0.1.0
-rand_core-0.3.0
-rand_hc-0.1.0
-rand_isaac-0.1.0
-rand_pcg-0.1.1
-rand_xorshift-0.1.0
-regex-1.1.0
-regex-syntax-0.6.4
-rustc_version-0.2.3
-semver-0.9.0
-semver-parser-0.7.0
-syn-0.15.23
-thread_local-0.3.6
-ucd-util-0.1.3
-unicode-xid-0.1.0
-utf8-ranges-1.0.2
-version_check-0.1.5
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A command line application for interacting with Nitrokey devices"
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="
-	>=virtual/rust-1.31.0
-"
-DEPEND="
-	dev-libs/hidapi
-"
-# We require gnupg for /usr/bin/gpg-connect-agent.
-RDEPEND="
-	${DEPEND}
-	app-crypt/gnupg
-"
-
-# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
-# pristine configuration and will modify the device's state. Not meant
-# to be run as part of the installation.
-RESTRICT="test"
-QA_FLAGS_IGNORED="/usr/bin/nitrocli"
-
-src_install() {
-	cargo_src_install --path=.
-
-	einstalldocs
-	doman "${S}/doc/nitrocli.1"
-}
diff --git a/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild b/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
index 41cca617eb9e..fb74af29209c 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
@@ -46,7 +46,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 BDEPEND="
@@ -67,6 +67,11 @@ RDEPEND="
 RESTRICT="test"
 QA_FLAGS_IGNORED="/usr/bin/nitrocli"
 
+src_prepare() {
+	eapply -p2 "${FILESDIR}/${PN}_-_fix-rust-1.35-build.patch"
+	default
+}
+
 src_install() {
 	cargo_src_install --path=.
 
diff --git a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
new file mode 100644
index 000000000000..9ee7ee1a7e43
--- /dev/null
+++ b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.9
+argparse-0.2.2
+base32-0.4.0
+bitflags-1.0.4
+cc-1.0.37
+cfg-if-0.1.6
+cloudabi-0.0.3
+fuchsia-cprng-0.1.1
+lazy_static-1.2.0
+libc-0.2.57
+memchr-2.1.3
+nitrocli-0.2.4
+nitrokey-0.3.4
+nitrokey-sys-3.4.3
+nitrokey-test-0.1.1
+proc-macro2-0.4.26
+quote-0.6.11
+rand_core-0.3.1
+rand_core-0.4.0
+rand_os-0.1.3
+rdrand-0.4.0
+regex-1.1.0
+regex-syntax-0.6.5
+syn-0.15.26
+thread_local-0.3.6
+ucd-util-0.1.3
+unicode-xid-0.1.0
+utf8-ranges-1.0.2
+winapi-0.3.6
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A command line application for interacting with Nitrokey devices"
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	>=virtual/rust-1.31.0
+"
+DEPEND="
+	dev-libs/hidapi
+"
+# We require gnupg for /usr/bin/gpg-connect-agent.
+RDEPEND="
+	${DEPEND}
+	app-crypt/gnupg
+"
+
+# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
+# pristine configuration and will modify the device's state. Not meant
+# to be run as part of the installation.
+RESTRICT="test"
+QA_FLAGS_IGNORED="/usr/bin/nitrocli"
+
+src_install() {
+	cargo_src_install --path=.
+
+	einstalldocs
+	doman "doc/nitrocli.1"
+}
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index 88f39470e60f..98720a94fe55 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,5 +1,5 @@
 DIST osslsigncode-1.7.1.tar.gz 127631 BLAKE2B f0ced06a33968f03558e189fc9ed2340dba2cdfe823422c760d62476446646f198aed1a95f99734f80e7ec71d23cd286a23e68953f7e432a9a6ff048c76cae63 SHA512 cc5a7e0c5baa2a98db93f1d2cc9d86e732e2a8a55fc20bf8e6aa67e2120af37c6be857dfe4b8eb8c82fd40604dbb3c845190b59c7e6b4147f06b710a256b877f
 DIST osslsigncode-2.0.tar.gz 57951 BLAKE2B 67057c07bb667a546e3a8abc49e8a20a0ef42ae77edacd2e88486a4357e8e8e789307e1c2abd2e13d18401621ba5607bb42af46ed8451546a26bb6855a07e652 SHA512 aec7b101afd96925fbd70ac67a6752997f0dab3987151c0658e5f011d8a6be6f53518d7a4aba6dff696c722a1e669100143a87d07c3f59364cd62693e9f3e4e5
-EBUILD osslsigncode-1.7.1.ebuild 566 BLAKE2B b1c16506dc3f8bc5365de9f1012ad43e3f7d24c612b2f165b6a446531e240344a83d92485534e2e164f0c1f0bc4db1e5b339642e206dcce08bf9f9598a7e24e5 SHA512 00925defbd2447e2c4177624d39bcaf203f5600d73eaf6e15fc111119b6ae2a704bf53e7d020b88598ef7709d866b08affbdcac730430de9986440123e5dd1c5
+EBUILD osslsigncode-1.7.1.ebuild 582 BLAKE2B d95a1ad0de96294087a2ab81446ae718438661257a864b4525232c2b91029f68313932186f2a854e4ed2498c0fed9be49054b30c95a46938149918fd5e689779 SHA512 29cbf1ff27b7f04a7a00e02697a39a02b2222e9b23a7d507708db3b322c3ed7443fba4781cd900d3abd8c5a325020f97df1edf0aff5a152b68d594ebe0c40f53
 EBUILD osslsigncode-2.0.ebuild 661 BLAKE2B 6f1a7d79ad04c62a74675e0f0d8d96a7cc315d00d39c6bbc431433b51066016e2830794184a1e9ff6b5862024f382edab3233f2e7ce16158559c077d5410a6d6 SHA512 dc9e8de629017762d7599223597b583200a521a16739edff3d0137e237fa96c829eebc84e129656844ed74169d0c1dbf7e30b0fed828cb864585c24fe3d76a15
 MISC metadata.xml 249 BLAKE2B e2269cf35520934d37b0cace5aaa64dc71ba9917bb90ef01e3ddb5e0208ffd0e2c650008fe88df51ebf6c5c304dbf7670608712f4229cacf62f9c7a747fb8f00 SHA512 9d2ea5145e05b199a7c1cff11164a7eaa9179fec4149b5a0c6f17c5c689d041d68243f4e1cc550617f9649f72ca77d7cadf3d488d1c6cab31bdbdb3fdc26aa9a
diff --git a/app-crypt/osslsigncode/osslsigncode-1.7.1.ebuild b/app-crypt/osslsigncode/osslsigncode-1.7.1.ebuild
index 4ea247315fc2..6962aa2c45f2 100644
--- a/app-crypt/osslsigncode/osslsigncode-1.7.1.ebuild
+++ b/app-crypt/osslsigncode/osslsigncode-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,12 +12,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="curl libressl"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
+	curl? ( net-misc/curl )
+	!libressl? ( =dev-libs/openssl-1.0*:0= )
 	libressl? ( dev-libs/libressl:0= )
-	curl? ( net-misc/curl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	econf $(use_with curl)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 15d433f1418b..2f93b6b1044a 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,6 +1,6 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.2.0.tar.xz 691264 BLAKE2B 3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf SHA512 2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
 DIST qca-2.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
-EBUILD qca-2.2.0.ebuild 1965 BLAKE2B 9215472e01605560d3210345f76ae74f95f9909db4639c8e6b09762f10daa71e27494d22f68a936e60659da33eed583f10e976703259e72d7693c36bef2a9c0b SHA512 4955ec3ffe41fb89d19d722772a58eb4ac023d5957bed4e9a62baed6d0263ec8e33e3e3798390a297f034385d18679f5c12e279466631ad6a1ab59c6b5080cc9
+EBUILD qca-2.2.0.ebuild 1964 BLAKE2B ef9a051a8b339344646e78a52a517c988d14e36a1cca62d5d797417e8fcb17bdaea256bc7f6344ff146c05d5e429a4b5fbd50bd7cc1d039597fea206b9f402e5 SHA512 7cd82c7168ea8f43ae92dc5dc3843a4a4035417c067a1bdafea18d2ee3ee43070b6cbe95a793a8f3711d4c7929f252c646ba1f8324431d663cf5b9fd2cf36d19
 EBUILD qca-2.2.1.ebuild 1967 BLAKE2B a41078f18a95acc876566fda3d9a3018b5f1d8befc9cff5c6e1054f42a653cfd39f079430afb11e119d672c51048de2bb981b758585aeb78dbec21cd9122775b SHA512 ad17644227fb282cbcebb15510a070d283e5eb7e783f3bd7acf2611a7d7006ab7925d0e25017872f442259f22d97f5b0792cac28d818a83035a2732ba6dbdd37
 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/qca-2.2.0.ebuild b/app-crypt/qca/qca-2.2.0.ebuild
index af427423f54d..6052b0094ada 100644
--- a/app-crypt/qca/qca-2.2.0.ebuild
+++ b/app-crypt/qca/qca-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
 
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index 1e0dfb84b687..a5ae33cf196a 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,5 +1,3 @@
-DIST signing-party_2.7.orig.tar.gz 201320 BLAKE2B 4fe5781b610dc8acd5166fc7ce7daa1b856f6617952d5eb226cae0c8c6fcaa196b88ffe313b2d71b8f11423a81e84f2124d9adea86edbfb0d22808473d1c36fe SHA512 d1599ca0cb2dd554b4688bc8c77f4a1dd907d00539bb11abe147300dd2184f8548ebe9fdf793e83e2956a220b1c4bf9e19bd543b77f724b0c8ea4794ac945985
 DIST signing-party_2.9.orig.tar.gz 222606 BLAKE2B 5c7fd8fdb4945f3155d5dc146716ae402c72ec3cc728feb5b3d009878d88313ed26dbf4461820346bd3340ec84d9a439dfd52950452ad796bf1fbc98a342ff6a SHA512 31a0f15f679c0339753bafbac645609e9e16f3da2c5105c33e87e0f258453b3101f188398a7c1509fe5c005339289ac5465ccb18631a526d231c714f9ed61d96
-EBUILD signing-party-2.7.ebuild 2990 BLAKE2B 8abcd322db7149bf2eed60b099bd6cea5281d446148c61c75f59350fa8e718f637609aa91eaec4e5ae0a12d9edbb024bdb9820bf32b02f9cbe5b7e2de70029bf SHA512 31e56b7b2ce039a565b0010acf284a6aef90f479de63912bdcce72b4b2c27c896cfeed50c9e7096ed7ae3a2b9483953a1909e5a03c8f841adb4e7ace377a667c
-EBUILD signing-party-2.9.ebuild 2732 BLAKE2B 48ead04f0e21b455a986c0e3b3e921a7c3e82a2c04ffbbc14b68bc8cf0804e02a5b8a2d394f981c09929912d8dea4cc0e90d0221a24d8935e2a951c4c137d97a SHA512 6a0c2ada8b63f220162795bb5b736b7f28896c45b49aea2a1275574c6f640f18181e12a7769954b8214125529dbc788e764e4661e388f5534940c5d4a3da59e9
+EBUILD signing-party-2.9.ebuild 2731 BLAKE2B 173c2cb4d3b371c085bba45252ed049ee3738092b1dea0e3d175c88b585c96713f72adaf35dba82079f45578657f3d6266b38e58e0f28347f591d53a769b7605 SHA512 0c1b0ba4495c199a1a69d287c4bdfc8eec952bfaab3975f7ef47b5d91e6abc48b4652e85aaad2ed78dbe5d04d278f2935de596ae2615cc13740b72565b01d704
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/signing-party/signing-party-2.7.ebuild b/app-crypt/signing-party/signing-party-2.7.ebuild
deleted file mode 100644
index 4e555984e3e7..000000000000
--- a/app-crypt/signing-party/signing-party-2.7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs autotools
-
-DESCRIPTION="A collection of several tools related to OpenPGP"
-HOMEPAGE="https://salsa.debian.org/signing-party-team/signing-party"
-SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-lang/perl
-	app-crypt/libmd"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-1.3.92
-	dev-perl/GnuPG-Interface
-	dev-perl/Text-Template
-	dev-perl/MIME-tools
-	net-mail/qprint
-	>=dev-perl/MailTools-1.62
-	dev-perl/Net-IDN-Encode
-	virtual/mailx
-	virtual/mta
-	|| (
-		dev-perl/libintl-perl
-		dev-perl/Text-Iconv
-		app-text/recode
-	)"
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# app-crypt/keylookup
-	rm -r keylookup || die
-	# media-gfx/springgraph
-	rm -r springgraph || die
-
-	cd keyanalyze/pgpring || die
-	sed -i 's/AM_C_PROTOTYPES//' configure.ac || die
-	eautoreconf
-	cd "${WORKDIR}" || die
-
-	find . -name Makefile | xargs sed -i -e 's/CFLAGS:=/CFLAGS=/' -e 's/CPPFLAGS:=/CPPFLAGS=/' -e 's/LDFLAGS:=/LDFLAGS=/'
-
-	sed -i "s:/usr/share/doc/signing-party/caff/caffrc.sample:${EPREFIX}/usr/share/doc/${P}/caff/caffrc.sample.gz:g" \
-		caff/caff || die
-	sed -i -e 's/automake[^ ]*/true/g' -e 's/autoconf[^ ]*/true/g' keyanalyze/Makefile || die
-	sed -i 's/make /\$(MAKE) /' keyanalyze/Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		STRIP=true
-}
-
-src_install() {
-	einstalldocs
-
-	# Check Makefile when a new tool is introduced to this package.
-	# caff
-	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
-	docinto caff
-	dodoc caff/{README*,THANKS,TODO,caffrc.sample}
-	# gpgdir
-	dobin gpgdir/gpgdir
-	docinto gpgdir
-	dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
-	# gpg-key2ps
-	dobin gpg-key2ps/gpg-key2ps
-	docinto gpg-key2ps
-	dodoc gpg-key2ps/README
-	# gpglist
-	dobin gpglist/gpglist
-	# gpg-mailkeys
-	dobin gpg-mailkeys/gpg-mailkeys
-	docinto gpg-mailkeys
-	dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
-	# gpgparticipants
-	dobin gpgparticipants/gpgparticipants
-	# gpgwrap
-	dobin gpgwrap/bin/gpgwrap
-	docinto gpgwrap
-	dodoc gpgwrap/{LICENSE,NEWS,README}
-	doman gpgwrap/doc/gpgwrap.1
-	# gpgsigs
-	dobin gpgsigs/gpgsigs
-	insinto /usr/share/signing-party
-	# keyanalyze
-	# TODO: some of the scripts are intended for webpages, and not really
-	# packaging, so they are NOT installed yet.
-	newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
-	dobin keyanalyze/{keyanalyze,process_keys}
-	docinto keyanalyze
-	dodoc keyanalyze/{README,Changelog}
-	# See app-crypt/keylookup instead
-	#dobin keylookup/keylookup
-	#docinto keylookup
-	#dodoc keylookup/NEWS
-	# sig2dot
-	dobin sig2dot/sig2dot
-	dodoc sig2dot/README.sig2dot
-	# See media-gfx/springgraph instead
-	#dobin springgraph/springgraph
-	#dodoc springgraph/README.springgraph
-	# all other manpages, and the root doc
-	doman */*.1
-	dodoc README
-}
diff --git a/app-crypt/signing-party/signing-party-2.9.ebuild b/app-crypt/signing-party/signing-party-2.9.ebuild
index 15cc4572eb2f..cd273b6a7680 100644
--- a/app-crypt/signing-party/signing-party-2.9.ebuild
+++ b/app-crypt/signing-party/signing-party-2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-lang/perl
 	app-crypt/libmd"
diff --git a/app-crypt/stoken/Manifest b/app-crypt/stoken/Manifest
index de91d1f9d782..8af76717363f 100644
--- a/app-crypt/stoken/Manifest
+++ b/app-crypt/stoken/Manifest
@@ -1,3 +1,3 @@
 DIST stoken-0.92.tar.gz 117212 BLAKE2B 8d236a73b0626ab91d145d01fa07c28ba8c54a3053aaba32b64b4dacc39dc8265d5740630ec2495d678c975b1bfa480a79a5ec1115accf39170229b444673f48 SHA512 b41262320c24e487ece884fc431d835c787f057947a92e3d57ed2047bc02b576b072e8a69f4b58b47ab1f913b5ae8c3ee8108d3b55c1477f15848420b668fea3
-EBUILD stoken-0.92.ebuild 635 BLAKE2B 4ad1ad155df7f4f933cbd9137637ef5f9dbeea5be8722b1ce7d9afe5df0cbdfe0b0d9e9e21803a1d3338adf6a5e6e5c6ca24ecae5daa543e67846967e86bab58 SHA512 207e1881941c7b3a8307b8d885d7105edd1b1c1ac56e987bb5b957e7987a08d18e0230c1ea2db5e70bc4cbe2d8d3ad27a0866a693f2ae009de83d803d387b30a
+EBUILD stoken-0.92.ebuild 634 BLAKE2B beb51228bcf4b262ec2e2173e430e6886dbc50607d031a11b7b508da8f599046554d33f032b5f04dd2e15cd6c0cf0ceb00019fbe23362ce4c45e6d6b4469c1c0 SHA512 0eb9a2d3b7947f586bcc96a306005a102595f4e7456d17f1e8e3a5cf451a8c0ffd31d535f774d0d97f50c4a2c51da5c0c657ae6f9b104d1dbcfb95c4b2d330e3
 MISC metadata.xml 620 BLAKE2B 2655c4310ae4cc76e7609e4646879d81ef6ee26b9dff67b922822c89de19416c96bd63762920633ff4e018c8431fbb45f8dc93971f2fb8afbe1dd66c8ea2e318 SHA512 bda231308c073a40db47dfaca96c6af8bf194d5ef4727e8c8c99ad1492150f79a9978daeb3ffe503db03501a0a6c6c465d036bec7ad58398319f8d01d27f7931
diff --git a/app-crypt/stoken/stoken-0.92.ebuild b/app-crypt/stoken/stoken-0.92.ebuild
index 06a2e2468cfd..5774eec2cf50 100644
--- a/app-crypt/stoken/stoken-0.92.ebuild
+++ b/app-crypt/stoken/stoken-0.92.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="gtk"
 
 #	|| ( dev-libs/nettle dev-libs/libtomcrypt )    libtomcrypt is not packaged
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index 1f98875df8bb..9c14fe83440b 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1,6 +1,6 @@
-AUX tpm2-abrmd-2.0.3-build.patch 2266 BLAKE2B ae973682cd38c80405bbfb6c1cee5070c4df08579fe82dc169c04ff547f73d851eeeae0eafea8119dfe6569caace196ef1c523a673f6227ebfa2553cde631c47 SHA512 87ed96de2c8bd39b89e5570540ba84735b0fc3ded0c804b349f0d6588047b93df0df4fddacbe0e73c88c354ff38e9c8646a32eaf105de9f580f278be67a2b3e3
+AUX tpm2-abrmd-2.1.1-build.patch 4350 BLAKE2B 9d8dd854954bb79239a2b443d7d6a8eb4ada564036ef480438d716f06c30ec5d45476d1fee194fbb669d323ea4c67bb7f049f6acd3745ab5f8284cb8efab1e6e SHA512 2fb6f5a63928064612175f822a41295e1c74afe3850ff4b2709384bc7eb54e5ec14a2af60b8720500fa5d91a102a89d9c6b177e8cd880e3f2f8dafc9f82e08d8
 AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
-DIST tpm2-abrmd-2.0.3.tar.gz 563029 BLAKE2B 89c20066b05818825a2addacaf123568ec095d021e9811b78d11c336af9a9e97fe280a08b4478331663efd1da9b2db54207ca53728398aefe4407bfe4b0c7efd SHA512 70b431b9d09e1c1db819aabf6ca8e40a7553573339f43a6c872ad685b7822e5046bd8ede25dcd0608ce2d8fa32257f6c1dd7f234aa7d6a447ac795625d4e0fac
-EBUILD tpm2-abrmd-2.0.3.ebuild 1188 BLAKE2B 51842982c3644e7007cc827211bc342c0366110d81c10735d096fec3f4ee7332aeb5307f1ca9ecded8015bf2b6ab494e2fe0a4b80aab9ff8e9ff5fd99625f0cd SHA512 2861c1d3b622bbc33b676dd928c481763fab431735a944cf9ad2265656acf97fe1d2cf33fc4854de43d916aafd377e18cf96873f2719e2e1bccf048f93c18636
+DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124
+EBUILD tpm2-abrmd-2.1.1.ebuild 1215 BLAKE2B ede9c7f24240bbe5a22f5bdd3dcc7233fcafa38fee77979eaf8103ffa86cd60effed90dd1ee78a32a8de20558c32bb79a3d6b5196ea0174e035a685053723ec4 SHA512 bd3801de3795f6ef7261ea6d373e02eeafc5fefc200542973ee664f15187effb551f8188637d33a6ed339a379ca36c430d1fa7d0d1884ea2f95d8e59c24f4a93
 MISC metadata.xml 329 BLAKE2B 32d5f42e0427e9c83625ec972d4b266a1338c1629933628a0a32b8e4afb053468fece7f03916a983cdce9ff0a1d36d9c0f44006e7df4e383817005197a8be9a3 SHA512 920412d7cae5cfe3cd9a96133948b3101595edd966cc0d056934cdf45f9f4c36e1bb8fc79b0ee7146b2d1047d895de9d1fd57a7a753f4957707fad57962a9cb2
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
deleted file mode 100644
index 07c607579f12..000000000000
--- a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ecbc3bb..5973ff5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -135,7 +135,6 @@ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
- #   these macros are defined in m4/flags.m4
- AX_ADD_COMPILER_FLAG([-Wall])
- AX_ADD_COMPILER_FLAG([-Wextra])
--AX_ADD_COMPILER_FLAG([-Werror])
- AX_ADD_COMPILER_FLAG([-std=gnu99])
- AX_ADD_COMPILER_FLAG([-Wformat])
- AX_ADD_COMPILER_FLAG([-Wformat-security])
-@@ -143,19 +142,9 @@ AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
- # work around for Glib usage of function pointers type casting
- #   https://bugzilla.gnome.org/show_bug.cgi?id=793272
- AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
--AX_ADD_COMPILER_FLAG([-fdata-sections])
--AX_ADD_COMPILER_FLAG([-ffunction-sections])
--AX_ADD_COMPILER_FLAG([-fstack-protector-all])
--AX_ADD_COMPILER_FLAG([-fpic])
--AX_ADD_COMPILER_FLAG([-fPIC])
- AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE])
- AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
- AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
--AX_ADD_LINK_FLAG([-Wl,--gc-sections])
--AX_ADD_LINK_FLAG([-Wl,--no-undefined])
--AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
--AX_ADD_LINK_FLAG([-Wl,-z,now])
--AX_ADD_LINK_FLAG([-Wl,-z,relro])
- 
- AC_SUBST([PATH])
- 
-From 353c5e962f46e3739b1e92cbf6b1f3eb500157fc Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Thu, 17 Jan 2019 23:56:50 +0200
-Subject: [PATCH] tests: run without X
-
-Solves:
-
-$ DISPLAY= make check
-
-FAIL: test/tss2-tcti-tabrmd_unit
-
-** (process:17633): CRITICAL **: 23:53:22.403: failed to allocate dbus proxy object:
-Error spawning command line ?dbus-launch --autolaunch=4f9189e347d5cdf343
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
-
-https://github.com/tpm2-software/tpm2-abrmd/pull/577
----
- .travis.yml | 2 +-
- Makefile.am | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b32a5fb..2598f13 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -76,7 +76,8 @@ XFAIL_TESTS = \
- TEST_EXTENSIONS = .int
- AM_TESTS_ENVIRONMENT = \
-     TEST_FUNC_LIB=$(srcdir)/scripts/int-test-funcs.sh \
--    PATH=./src:$(PATH)
-+    PATH=./src:$(PATH) \
-+    dbus-launch
- INT_LOG_COMPILER = $(srcdir)/scripts/int-test-setup.sh
- INT_LOG_FLAGS = --tabrmd-tcti=$(TABRMD_TCTI)
- 
--- 
-2.19.2
-
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch
new file mode 100644
index 000000000000..e58bb7f72ef5
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch
@@ -0,0 +1,118 @@
+From a0a961c05c8916863a67a61f469c717f617e1c58 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 01:03:03 +0300
+Subject: [PATCH 1/2] build: let autoconf detect system extensions
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+https://github.com/tpm2-software/tpm2-abrmd/pull/632
+
+diff --git a/configure.ac b/configure.ac
+index 35a0c21..0cc8ce8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@ AC_INIT([tpm2-abrmd],
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_PROG_CC
+ AC_PROG_LN_S
++AC_USE_SYSTEM_EXTENSIONS
+ LT_INIT()
+ PKG_INSTALLDIR()
+ AM_INIT_AUTOMAKE([foreign subdir-objects])
+@@ -151,9 +152,6 @@ AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
+ AX_ADD_COMPILER_FLAG([-fpic])
+ AX_ADD_COMPILER_FLAG([-fPIC])
+ AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
+-AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE])
+-AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
+-AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
+ AX_ADD_LINK_FLAG([-Wl,--gc-sections])
+ AX_ADD_LINK_FLAG([-Wl,--no-undefined])
+ AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
+-- 
+2.21.0
+
+From 977de33fe1499e7e8fa25f4c1247aaf9b71ba3a2 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 01:03:08 +0300
+Subject: [PATCH 2/2] build: add --disable-defaultflags
+
+Align with other tpm2 build systems.
+Enable downstream to override flags.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 54 ++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 31 insertions(+), 23 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0cc8ce8..dc32b09 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -134,29 +134,37 @@ AS_IF([test \( "x$enable_integration" = "xyes" \) -a \( "x$enable_test_hwtpm" =
+     [AC_MSG_NOTICE([Integration tests will be executed against the TPM device.])])
+ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
+ 
+-# preprocessor / compiler / linker flags
+-#   these macros are defined in m4/flags.m4
+-AX_ADD_COMPILER_FLAG([-Wall])
+-AX_ADD_COMPILER_FLAG([-Wextra])
+-AX_ADD_COMPILER_FLAG([-Werror])
+-AX_ADD_COMPILER_FLAG([-std=gnu99])
+-AX_ADD_COMPILER_FLAG([-Wformat])
+-AX_ADD_COMPILER_FLAG([-Wformat-security])
+-AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
+-# work around for Glib usage of function pointers type casting
+-#   https://bugzilla.gnome.org/show_bug.cgi?id=793272
+-AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
+-AX_ADD_COMPILER_FLAG([-fdata-sections])
+-AX_ADD_COMPILER_FLAG([-ffunction-sections])
+-AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
+-AX_ADD_COMPILER_FLAG([-fpic])
+-AX_ADD_COMPILER_FLAG([-fPIC])
+-AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
+-AX_ADD_LINK_FLAG([-Wl,--gc-sections])
+-AX_ADD_LINK_FLAG([-Wl,--no-undefined])
+-AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
+-AX_ADD_LINK_FLAG([-Wl,-z,now])
+-AX_ADD_LINK_FLAG([-Wl,-z,relro])
++AC_ARG_ENABLE([defaultflags],
++              [AS_HELP_STRING([--disable-defaultflags],
++                              [Disable default preprocessor, compiler, and linker flags.])],
++              [enable_defaultflags=$enableval],
++              [enable_defaultflags=yes])
++AS_IF([test "x$enable_defaultflags" = "xyes"],
++      [
++      # preprocessor / compiler / linker flags
++      #   these macros are defined in m4/flags.m4
++      AX_ADD_COMPILER_FLAG([-Wall])
++      AX_ADD_COMPILER_FLAG([-Wextra])
++      AX_ADD_COMPILER_FLAG([-Werror])
++      AX_ADD_COMPILER_FLAG([-std=gnu99])
++      AX_ADD_COMPILER_FLAG([-Wformat])
++      AX_ADD_COMPILER_FLAG([-Wformat-security])
++      AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
++      # work around for Glib usage of function pointers type casting
++      #   https://bugzilla.gnome.org/show_bug.cgi?id=793272
++      AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
++      AX_ADD_COMPILER_FLAG([-fdata-sections])
++      AX_ADD_COMPILER_FLAG([-ffunction-sections])
++      AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
++      AX_ADD_COMPILER_FLAG([-fpic])
++      AX_ADD_COMPILER_FLAG([-fPIC])
++      AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
++      AX_ADD_LINK_FLAG([-Wl,--gc-sections])
++      AX_ADD_LINK_FLAG([-Wl,--no-undefined])
++      AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
++      AX_ADD_LINK_FLAG([-Wl,-z,now])
++      AX_ADD_LINK_FLAG([-Wl,-z,relro])
++      ])
+ 
+ AC_SUBST([PATH])
+ 
+-- 
+2.21.0
+
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild
deleted file mode 100644
index 8a2bb55ac659..000000000000
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd user
-
-DESCRIPTION="TPM2 Access Broker & Resource Manager"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-
-RDEPEND="sys-apps/dbus:=
-	dev-libs/glib:=
-	app-crypt/tpm2-tss:="
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
-	dev-util/gdbus-codegen"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	enewgroup tss
-	enewuser tss -1 -1 / tss
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
-		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
-		--with-systemdpresetdisable \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
new file mode 100644
index 000000000000..8d21d2b9b4c7
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd user
+
+DESCRIPTION="TPM2 Access Broker & Resource Manager"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+RDEPEND="sys-apps/dbus:=
+	dev-libs/glib:=
+	app-crypt/tpm2-tss:="
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	dev-util/gdbus-codegen"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+pkg_setup() {
+	enewgroup tss
+	enewuser tss -1 -1 / tss
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--disable-defaultflags \
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
+		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
+		--with-systemdpresetdisable \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index e6d0efbdfab8..c9a33f159107 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,4 +1,4 @@
 AUX tpm2-tools-3.1.3-libressl.patch 2589 BLAKE2B 2d949ed3d8470bbfee647e691f03ee4a53cc70230140dddba85424238670f147465eecaf85ce95696782e2cf3e8229fa5233300e93e33f4d48c0d56485f3d0a5 SHA512 e45ba9fa0f758105cccd4ded4422f285fdf3c8bd35240c8301ac911049618ae35ad5084045dc72658aced371a4af807dc521e830fdafe1cf9b71bc0f1a7a1325
-DIST tpm2-tools-3.1.3.tar.gz 544098 BLAKE2B 4c22ae98ed444b7d5b5f99e6a7d4cc37fcf9d46979669a2225b6f2abf8ccaaff203ccc8c816169be215c6160ce2480e4c9a0197040764013ab362dd060c29bec SHA512 37edf59e47168c42ffc66e948722753334ae3e00f3e258d9e801dffd259a763a1bf4f63b3feecf7728b4dade69ca5da15d631e1a606f68e10f7d314a1a757bdc
-EBUILD tpm2-tools-3.1.3.ebuild 682 BLAKE2B e8cdeba71654b6c0cd36f1362a1846eb5c7c0fc0b1a0bbfc0b9d7a524b9be1e5d1f7c2bc86a473ecd7e1f74baf811598ca6bda19657cffc8f581581a9f7a390b SHA512 85af6624609561725be46ca88a8d277cd578c840b3820d6ba23a9ed38c05bd70918e956c3742e09aed866fae721604bff839b876f7f3ebf941eaeabcabf8440b
+DIST tpm2-tools-3.1.4.tar.gz 589388 BLAKE2B aaaa9a0158d0658dc2db4734b18ea1d49bd6c0aef84c4f1236f3134245165dccdb0bada69d92f0e5a59ecb1f2973e5cd25924d2b9c4cad2891d9e4f9fb94a84b SHA512 c5e1be4ffab305ee42a8b4a9c9aa4373158259a58844e273465f97a74f913fb12098b9fd81127148be95ecba7378f6a45b96af256dde3101a237e5e33e8e8ccb
+EBUILD tpm2-tools-3.1.4.ebuild 693 BLAKE2B eba522790b3417c36f645a70eaed6279d3fa92711d9e9a287f9b987e36851ecfad3c638c622632da6d69b523de269c3364358bb31d0684c2beca8c361e7032a7 SHA512 2ee917cf0ae28faf2108d442e127fba4740aa0f6a8d4facf910e82bbbbd75dc3910db767fa81d960350349f02a4f82e7d3b48f108ff7d04a15d318a3e780bbc9
 MISC metadata.xml 329 BLAKE2B 4839966acc6a4c84deaf050a21adaa680d3a93e5cb17ecff79dd6818723264570b215796e9733ef9beb078b17977078bad12deb6716ee3774947502e8efbbd78 SHA512 49d92ff1f240ce29957166befc9af7af18e665a388943f81c5a3c11c6dd12a924b19ed8dfaf2656223028444bfafa63fb15a54ad6c51e7c37b55ff1fe7287912
diff --git a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild b/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
deleted file mode 100644
index df27445aa2b5..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libressl test"
-
-RDEPEND=">=app-crypt/tpm2-tss-2.0
-	net-misc/curl
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libressl.patch"
-)
-
-src_configure() {
-	econf \
-		--disable-hardening \
-		$(use_enable test unit)
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild b/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
new file mode 100644
index 000000000000..c9391925f760
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl test"
+
+RDEPEND=">=app-crypt/tpm2-tss-2.0:=
+	net-misc/curl:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.3-libressl.patch"
+)
+
+src_configure() {
+	econf \
+		--disable-hardening \
+		$(use_enable test unit)
+}
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
new file mode 100644
index 000000000000..52ea402b8f78
--- /dev/null
+++ b/app-crypt/tpm2-totp/Manifest
@@ -0,0 +1,4 @@
+AUX tpm2-totp-0.1.1-build.patch 2384 BLAKE2B 55acd1b8b8c3425542e7207653598b3c2854c84699d3b40f5f64d75e67a51868a5a8b1aca960124694ceaf3793a3f7a2f3dc51e1a3a71418502625c35785e033 SHA512 7330fccd400be74952652515b5c90a49d91e4b70a4488df18b4e34402ce03bcf2e480223a6b70d5f98b23e7fe0e8b38aa8d46012752a881498f2c804a96481f6
+DIST tpm2-totp-0.1.1.tar.gz 357787 BLAKE2B c7a24b30c155cfd5387180a2c8584497327eadd701068aa5eb3c385bbadf26f448f88c238849fbf68c4e7265f01d3783b3aa50a912070df1c2fd4485310f2299 SHA512 33a4af16a292ddd674a399bf12ce0b355d95de7014e8be11816a1d88edfd36ae222a8b7508f3aa1be3b46c7e04bf2712ee4839cf9f4f83fc308cb4f639ec5b9f
+EBUILD tpm2-totp-0.1.1.ebuild 722 BLAKE2B 2df2c7d4102da1a0d119260d802d76af2705ced973d1108b2309485407cf29805117c97009dcf47286ea97536d3eff7c13eff7057eec94a339f396ced5518c65 SHA512 961b438f32a367ef19b161355bd0e3157ec7a0ebb8fc77032a92531cd6cb5d9ab971443e47ba44035930f274efb3d5ea6b899982f41958815ce0c9c516c759d9
+MISC metadata.xml 328 BLAKE2B 7578cd490eb3c3614ff8a237bbb177830c3fc068579d7cf1e78099a718513b1120435bcb5256232ae6b2042e3282e05751fac4a16193511f450d397965822317 SHA512 c58e6858b8d127eacc0b4b3f1e5639e2d8358c7411461b90f0d6c26c556383390b12627c71fbbce3469d3b7342653393e5af804ecef02a0545961d17ca988c08
diff --git a/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch b/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch
new file mode 100644
index 000000000000..232b4f9e8682
--- /dev/null
+++ b/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch
@@ -0,0 +1,70 @@
+From 2652497a15572d2484f57fee8be252d0d5fe4f8c Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 01:39:29 +0300
+Subject: [PATCH] build: add --disable-defaultflags
+
+Align with tpm2-tss to allow downstream to provide flags.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 42 +++++++++++++++++++++++++-----------------
+ 1 file changed, 25 insertions(+), 17 deletions(-)
+
+https://github.com/tpm2-software/tpm2-totp/pull/39
+
+diff --git a/configure.ac b/configure.ac
+index baf596b..ac11e1e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,23 +47,31 @@ AC_SUBST([LIBEXECDIR])
+ 
+ AC_CONFIG_FILES([Makefile dist/tpm2-totp.pc dist/dracut/module-setup.sh dist/initcpio/install/plymouth-tpm2-totp])
+ 
+-AX_ADD_COMPILER_FLAG([-std=c99])
+-AX_ADD_COMPILER_FLAG([-Wall])
+-AX_ADD_COMPILER_FLAG([-Wextra])
+-AX_ADD_COMPILER_FLAG([-Wformat-security])
+-AX_ADD_COMPILER_FLAG([-Werror])
+-AX_ADD_COMPILER_FLAG([-fstack-protector-all])
+-AX_ADD_COMPILER_FLAG([-fpic])
+-AX_ADD_COMPILER_FLAG([-fPIC])
+-
+-# work around GCC bug #53119
+-#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
+-AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
+-
+-AX_ADD_LINK_FLAG([-Wl,--no-undefined])
+-AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
+-AX_ADD_LINK_FLAG([-Wl,-z,now])
+-AX_ADD_LINK_FLAG([-Wl,-z,relro])
++AC_ARG_ENABLE([defaultflags],
++              [AS_HELP_STRING([--disable-defaultflags],
++                              [Disable default preprocessor, compiler, and linker flags.])],
++              [enable_defaultflags=$enableval],
++              [enable_defaultflags=yes])
++AS_IF([test "x$enable_defaultflags" = "xyes"],
++      [
++      AX_ADD_COMPILER_FLAG([-std=c99])
++      AX_ADD_COMPILER_FLAG([-Wall])
++      AX_ADD_COMPILER_FLAG([-Wextra])
++      AX_ADD_COMPILER_FLAG([-Wformat-security])
++      AX_ADD_COMPILER_FLAG([-Werror])
++      AX_ADD_COMPILER_FLAG([-fstack-protector-all])
++      AX_ADD_COMPILER_FLAG([-fpic])
++      AX_ADD_COMPILER_FLAG([-fPIC])
++
++      # work around GCC bug #53119
++      #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
++      AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
++
++      AX_ADD_LINK_FLAG([-Wl,--no-undefined])
++      AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
++      AX_ADD_LINK_FLAG([-Wl,-z,now])
++      AX_ADD_LINK_FLAG([-Wl,-z,relro])
++      ])
+ 
+ AX_CODE_COVERAGE
+ m4_ifdef([_AX_CODE_COVERAGE_RULES],
+-- 
+2.21.0
+
diff --git a/app-crypt/tpm2-totp/metadata.xml b/app-crypt/tpm2-totp/metadata.xml
new file mode 100644
index 000000000000..0509d4663725
--- /dev/null
+++ b/app-crypt/tpm2-totp/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>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tpm2-software/tpm2-totp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild
new file mode 100644
index 000000000000..8b2622c25865
--- /dev/null
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Attest the trustworthiness of a device against a human using time-based OTP"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-totp"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=app-crypt/tpm2-tss-2.0:=
+	media-gfx/qrencode:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-defaultflags
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
new file mode 100644
index 000000000000..0bb11bf31ed5
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -0,0 +1,5 @@
+AUX tpm2-tss-engine-1.0.0-build.patch 2362 BLAKE2B d1e28ef019da77a9f857b90d9bce7d03a55504e0b74b7aafa2e56e417cc528b55ea8284ca9e2e30b35dd357a829b0329f26e595f9c421315c6b08ec8ac2aba80 SHA512 6a5fa163ccf8e0b24c9f1641b1c29be55d437d2e026343d9f33872fe2f2914a440884c705ec0c679130533ffa67d8ee33d475385568c57ed5d738d84b598c49d
+AUX tpm2-tss-engine-1.0.0-libressl.patch 1054 BLAKE2B 42f666eb44e61659e941758ab48bcf76c5be94be5944d7437db0671b286f038d8cee3e8754ca84fdbb0957b7e964445e798d2c494354c6ca9eff576ce45d7f6d SHA512 9b7c769d6a65ec67a522d78abb56da8c8560074a6bc1efcb300669308bfeeb39340da7c049a4c5d0a446f9e0d4e9fc03ee80ad0db52395c4a81013e11d27796d
+DIST tpm2-tss-engine-1.0.0.tar.gz 382277 BLAKE2B 6580eb83f4e9391a12df2fb9cb86ace385a9e29004a64f6ca9378d9b8f60572a7761f4f486e1010d435487fed28858737d2bb71b08e400e9551a7b83c198bbe7 SHA512 b06722c82c9cefd5184125b26fb46bd7b20d62631c21c51a028348833c4786b41ff64f2c1cb7d53f749a6cf35b8fae02ae02285fc43d1d044e2d2b6e2e7048a3
+EBUILD tpm2-tss-engine-1.0.0.ebuild 794 BLAKE2B 4d5fd45aecaa622ccfd1c53f251c9ead5988824b14ffebb5a23b74ab65a89d8fe3fa9f5fce2593a296660c8315c0cbc27d520ea2217ce905d4cdf05f6f04543b SHA512 fea4780fca65134fcbcda56994c6652e2bd934de7c8c50e26b41578596ab85d3dc4aa075d4542d1527247936b3f440ea59a52c8a0adde2caf3c548226cf58b4b
+MISC metadata.xml 334 BLAKE2B 8ee81cad095cd2c3f3a31e2b181ab678a4a51316e868bd6f84af46aa6bf87af35bea0a9d6fa0fad368175f55020e23cbdf2aed8af3ccb853bc3085db4ba82dc3 SHA512 0d38a3515c9b31fc64988812c4015a25fa8a7c6550cfe90e78f73bfcecad57d1c043da2843b5c72c7a220db1c77b1790c32cab61fa3ec970b72da7f448e12b02
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch
new file mode 100644
index 000000000000..aa2b2e4e4fd3
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch
@@ -0,0 +1,70 @@
+From 92aee12fbd246461a22925dd054c4d6394c4fdf5 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 02:30:37 +0300
+Subject: [PATCH] build: add --disable-defaultflags
+
+Align with tpm2-tss to allow downstream to provide flags.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 42 +++++++++++++++++++++++++-----------------
+ 1 file changed, 25 insertions(+), 17 deletions(-)
+
+https://github.com/tpm2-software/tpm2-tss-engine/pull/117
+
+diff --git a/configure.ac b/configure.ac
+index f3a399c..f59cfaf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,23 +80,31 @@ AS_IF([test "x$enable_tctienvvar" = xyes], [AC_DEFINE([ENABLE_TCTIENVVAR], [1])]
+ 
+ AC_CONFIG_FILES([Makefile])
+ 
+-AX_ADD_COMPILER_FLAG([-std=c99])
+-AX_ADD_COMPILER_FLAG([-Wall])
+-AX_ADD_COMPILER_FLAG([-Wextra])
+-AX_ADD_COMPILER_FLAG([-Wformat-security])
+-AX_ADD_COMPILER_FLAG([-Werror])
+-AX_ADD_COMPILER_FLAG([-fstack-protector-all])
+-AX_ADD_COMPILER_FLAG([-fpic])
+-AX_ADD_COMPILER_FLAG([-fPIC])
+-
+-# work around GCC bug #53119
+-#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
+-AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
+-
+-AX_ADD_LINK_FLAG([-Wl,--no-undefined])
+-AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
+-AX_ADD_LINK_FLAG([-Wl,-z,now])
+-AX_ADD_LINK_FLAG([-Wl,-z,relro])
++AC_ARG_ENABLE([defaultflags],
++              [AS_HELP_STRING([--disable-defaultflags],
++                              [Disable default preprocessor, compiler, and linker flags.])],
++              [enable_defaultflags=$enableval],
++              [enable_defaultflags=yes])
++AS_IF([test "x$enable_defaultflags" = "xyes"],
++      [
++      AX_ADD_COMPILER_FLAG([-std=c99])
++      AX_ADD_COMPILER_FLAG([-Wall])
++      AX_ADD_COMPILER_FLAG([-Wextra])
++      AX_ADD_COMPILER_FLAG([-Wformat-security])
++      AX_ADD_COMPILER_FLAG([-Werror])
++      AX_ADD_COMPILER_FLAG([-fstack-protector-all])
++      AX_ADD_COMPILER_FLAG([-fpic])
++      AX_ADD_COMPILER_FLAG([-fPIC])
++
++      # work around GCC bug #53119
++      #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
++      AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
++
++      AX_ADD_LINK_FLAG([-Wl,--no-undefined])
++      AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
++      AX_ADD_LINK_FLAG([-Wl,-z,now])
++      AX_ADD_LINK_FLAG([-Wl,-z,relro])
++      ])
+ 
+ AX_CODE_COVERAGE
+ m4_ifdef([_AX_CODE_COVERAGE_RULES],
+-- 
+2.21.0
+
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch
new file mode 100644
index 000000000000..66bb68e76940
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch
@@ -0,0 +1,35 @@
+From deb2b6697babf99aaf3f64b342ce414b48638ea3 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 20:36:47 +0300
+Subject: [PATCH] build: libressl fix incomplete type
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+src/tpm2-tss-engine-rand.c:90:1: error: variable ‘rand_methods’ has initializer but incomplete type
+   90 | static RAND_METHOD rand_methods = {
+      | ^~~~~~
+src/tpm2-tss-engine-rand.c:91:5: warning: excess elements in struct initializer
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/tpm2-tss-engine-rand.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+https://github.com/tpm2-software/tpm2-tss-engine/pull/120
+
+diff --git a/src/tpm2-tss-engine-rand.c b/src/tpm2-tss-engine-rand.c
+index 50d5661..86980a5 100644
+--- a/src/tpm2-tss-engine-rand.c
++++ b/src/tpm2-tss-engine-rand.c
+@@ -32,6 +32,7 @@
+ #include <string.h>
+ 
+ #include <openssl/engine.h>
++#include <openssl/rand.h>
+ 
+ #include <tss2/tss2_mu.h>
+ #include <tss2/tss2_esys.h>
+-- 
+2.21.0
+
diff --git a/app-crypt/tpm2-tss-engine/metadata.xml b/app-crypt/tpm2-tss-engine/metadata.xml
new file mode 100644
index 000000000000..7931bebd0b34
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/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>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tpm2-software/tpm2-tss-engine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild
new file mode 100644
index 000000000000..b42ef4ae8168
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="OpenSSL Engine for TPM2 devices"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl test"
+
+RDEPEND=">=app-crypt/tpm2-tss-2.2.2:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable test unit) \
+		--disable-defaultflags \
+		--disable-static
+}
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 24daf8c1cc03..8c077b2f6674 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +1,3 @@
-AUX tpm2-tss-2.1.0-build.patch 3044 BLAKE2B 4d166306c401e0a178626ab9c49f22ee8c69114051c753631870a65f6ae5c80a6ca710092f2ce66b0c2f5b937ec7f05f288a79cfbbaaf59b62bbe61b77e23f6b SHA512 9a3b4fce5e2403f0c9dc2ac3726efd3fd6e0e3f0b62109cce22b25e55f950aa3c2e32894460d016913eb4635fe99580bb7a14afae1677464af1c9f6b927e7f73
-AUX tpm2-tss-2.1.0-tests.patch 1066 BLAKE2B 2ec86af0165f3e50089e238760445046e073e7c9e1f69c0c739078518f83751512889f24f333fac7738539fd3c2057e42a52380003b6483400c78b68c335a75f SHA512 12b1df925a1bbc25ff00a57dbc614c2a01779c0f1849ef22f0172e343e6cc431cdc8daffa0eed271761ba17d035124532796a5072ed8fba19555e214e8b7a804
-DIST tpm2-tss-2.1.0.tar.gz 922814 BLAKE2B 06baa6b817b99c0955a5190b0f90f8a0c55987eb06feb827cb950b69992ec1623367db488617722712ce9932ad8310c1b743af038ac77508106fb8f6f4409b1c SHA512 2aea80a4cb2be59a87de6eda74a2907a2832aa76c3c208f610172f4c5bd29133b24b0876286c40855a742d6068b8f843e32f6d995b0e51c2d1e0a752b92fff7c
-EBUILD tpm2-tss-2.1.0.ebuild 1399 BLAKE2B 007296b2f01c92cd395c357b68a3b7666848b9867ebb6e077c43f1fa4015d4620aa4cd268fb4e77cc43b2022bb263ecc175f5fc8070ed47eacb9b714fe35df1d SHA512 3094d1a812a15b59b2d725c0bad668516805970f3a92e6840be7345cd5a1ce820b9775b97f8f5dc2808b8943af04edcd61a45ae570257e0def482c4ec103a70f
+DIST tpm2-tss-2.2.3.tar.gz 912179 BLAKE2B 36b2a462512822dccb3adab605ea9922132f027455a1d2895b6735f6200fe44f08288477c99afd0f6c06b4bff3090104b6412b12ea4a518888cf756fb8ee53c4 SHA512 68087cbf2b7acc33788e90b3825bf2c91faa65cfc04b576790634c88876a8a6930d6943f83b7cf0858e37e5e7307703d0c975b9fc0b0ad1d87f66c74b65bd411
+EBUILD tpm2-tss-2.2.3.ebuild 1274 BLAKE2B 60f825e8f666b4bd89b01a54d9b0c0802bd0e2bc733060e4c1cd4a5d34f881bd19c33bf6e36b7d31795eaf1fa527f9fd30c8618671fad16f020a11f8357ec036 SHA512 50e563c5fe26f5c223e56d7542d92a60ca68134722a662373eba50ae0f70ce2efdee61cb5073ca8de0779d1657579a3b0ad76f967798c15ac0d0440e8c53c0dd
 MISC metadata.xml 501 BLAKE2B be53401663c21ea24b8fd7a898a30b398c5773d86b5f30cf9a8c4b2334736e09b64ea60e2f6069b765d7babc5695b64a8b38aa3020d65ff224910eb633d76ae6 SHA512 901b9e66b98cea1ee90c8f885f402d66d7fb90494d9b95a2028e4834d5750edb4945563275def32f3944f4e28ba5a3aa558abf3ffce935df1af316cb1cb1d865
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch
deleted file mode 100644
index 85f84c38e1f1..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Next version removes these using --disable-defaultflags
-
----
-
-diff --git a/configure.ac b/configure.ac
-index c42b487f..f9118642 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -189,19 +189,6 @@ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
- 
- gl_LD_VERSION_SCRIPT
- 
--AX_ADD_COMPILER_FLAG([-std=c99])
--AX_ADD_COMPILER_FLAG([-Wall])
--AX_ADD_COMPILER_FLAG([-Wextra])
--AX_ADD_COMPILER_FLAG([-Wformat-security])
--AX_ADD_COMPILER_FLAG([-Werror])
--AX_ADD_COMPILER_FLAG([-fstack-protector-all])
--AX_ADD_COMPILER_FLAG([-fpic])
--AX_ADD_COMPILER_FLAG([-fPIC])
--
--AX_ADD_PREPROC_FLAG([-D_DEFAULT_SOURCE])
--AX_ADD_PREPROC_FLAG([-D_BSD_SOURCE])
--AX_ADD_PREPROC_FLAG([-D_POSIX_SOURCE])
--
- AC_ARG_WITH([maxloglevel],
-             [AS_HELP_STRING([--with-maxloglevel={none,error,warning,info,debug,trace}],
-                             [sets the maximum log level (default is trace)])],
-@@ -227,20 +214,9 @@ AC_ARG_ENABLE([debug],
-             [enable_debug=$enableval],
-             [enable_debug=no])
- AS_IF([test "x$enable_debug" = "xyes"], AX_ADD_COMPILER_FLAG([-ggdb3 -Og]))
--AS_IF([test "x$enable_debug" = "xno"], [AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
--                                        AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
--                                        AX_ADD_COMPILER_FLAG([-g -O2])])
--AX_ADD_LINK_FLAG([-Wl,--no-undefined])
--AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
--AX_ADD_LINK_FLAG([-Wl,-z,now])
--AX_ADD_LINK_FLAG([-Wl,-z,relro])
- 
- AC_SUBST([PATH])
- 
--# work around GCC bug #53119
--#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
--AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
--
- dnl ---------  Physical TPM device -----------------------
- 
- AC_ARG_WITH([ptpm],
-From 74037d3c15b9f9d98f9b50ca4f1c1a99d239d751 Mon Sep 17 00:00:00 2001
-From: Philip Tricca <flihp@twobit.org>
-Date: Sun, 4 Nov 2018 16:17:19 -0800
-Subject: [PATCH] build: Fix breakage in generated configure script when CFLAGS
- is set.
-
-This fixes a bug introduced in 3980bad87fe18ad9d32914e9d21dba145eba973f.
-That patch references the documentation for AC_PROG_CC but it misread
-the recommended workaround. The leading colon (aka `:`) in the
-documentation is significant.
-
-The `:` is a shell 'builtin' command that is equivalent to invoking the
-'true' command. By placing the conditional substitution of the CFLAGS
-after this, the result of the substitution will be ignored and the
-script won't fail. Without this the contents of the CFLAGS variable set
-in the environment will be interpreted as a command and since they're
-not commands the configure script will abort.
-
-Signed-off-by: Philip Tricca <flihp@twobit.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4e4592e..f88fe38b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,7 +31,7 @@ AC_INIT([tpm2-tss],
-         [],
-         [https://github.com/tpm2-software/tpm2-tss])
- AC_CONFIG_MACRO_DIR([m4])
--${CFLAGS=""}
-+: ${CFLAGS=""}
- AC_PROG_CC
- LT_INIT()
- AM_INIT_AUTOMAKE([foreign
--- 
-2.19.2
-
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-tests.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-tests.patch
deleted file mode 100644
index d537c40e1a90..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1ea85a32c0ae20a104badcec807b72ef458d356d Mon Sep 17 00:00:00 2001
-From: Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de>
-Date: Tue, 25 Sep 2018 09:35:33 +0200
-Subject: [PATCH] ESYS: Fix crypto_ossl return code
-
-Fix returncode and thus test of interal hmac_finish function.
-
-Fixes: #1157
-
-Signed-off-by: Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de>
----
- src/tss2-esys/esys_crypto_ossl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tss2-esys/esys_crypto_ossl.c b/src/tss2-esys/esys_crypto_ossl.c
-index 43088f4a..91871de1 100644
---- a/src/tss2-esys/esys_crypto_ossl.c
-+++ b/src/tss2-esys/esys_crypto_ossl.c
-@@ -448,7 +448,7 @@ iesys_cryptossl_hmac_finish(IESYS_CRYPTO_CONTEXT_BLOB ** context,
-     IESYS_CRYPTOSSL_CONTEXT *mycontext =
-         (IESYS_CRYPTOSSL_CONTEXT *) * context;
-     if (mycontext->type != IESYS_CRYPTOSSL_TYPE_HMAC) {
--        return_error(TSS2_ESYS_RC_BAD_VALUE, "bad context");
-+        return_error(TSS2_ESYS_RC_BAD_REFERENCE, "bad context");
-     }
- 
-     if (*size < mycontext->hmac.hmac_len) {
--- 
-2.19.2
-
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
deleted file mode 100644
index 07b4fb47e677..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/0"	# sublot is libtss2-sys number
-KEYWORDS="~amd64"
-IUSE="doc +gcrypt openssl static-libs test"
-
-REQUIRED_USE="
-	gcrypt? ( !openssl )
-	openssl? ( !gcrypt )
-	|| ( gcrypt openssl )"
-
-RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
-	openssl? ( dev-libs/openssl:0= )"
-DEPEND="${DEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
-	~sys-devel/autoconf-archive-2018.03.13
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~TCG_TPM
-	"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# next version add --disable-defaultflags
-	econf \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		--with-crypto="$(usex gcrypt gcrypt ossl)" \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60-
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
new file mode 100644
index 000000000000..8496a3630e8c
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info udev user
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/0"	# sublot is libtss2-sys number
+KEYWORDS="~amd64"
+IUSE="doc +gcrypt openssl static-libs test"
+
+REQUIRED_USE="
+	gcrypt? ( !openssl )
+	openssl? ( !gcrypt )
+	|| ( gcrypt openssl )"
+
+RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
+	openssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	local CONFIG_CHECK=" \
+		~TCG_TPM
+	"
+	linux-info_pkg_setup
+	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+
+	enewgroup tss
+	enewuser tss -1 -1 /var/lib/tpm tss
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--disable-defaultflags \
+		--with-crypto="$(usex gcrypt gcrypt ossl)" \
+		--with-udevrulesdir="$(get_udevdir)/rules.d" \
+		--with-udevrulesprefix=60-
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index f3ba4836e7c5..14797be1e05e 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index c18fc20ed39e..e8468a9d570f 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,4 +1,6 @@
 DIST eclass-manpages-20190329.tar.xz 428068 BLAKE2B 630f6ba06bef6e4aed7713776b8a0ce737dcba4441309ed326b6eb87a5515f5fbd2f95db4a12385788a1dbf1ff6bc3c09620f4564c0bba201f48f6aa31520b41 SHA512 8088078334c2b7f35301bd75dc2505a366d030cb1d28bf47c387ba0c727cf5a58e1f279708d4a32ecf47ceec543c287ea5ad8c76ce4bbd9c45f039be2924d7ee
+DIST eclass-manpages-20190602.tar.xz 412572 BLAKE2B 260bdf6f50d7b1735a006d560c76ec21dfef39ddd77231dd52102a73d485c0bb4d54735d2bf34f15aeca2a626ecb8020abcebbd6130c7e015fded71445f4cf16 SHA512 7d6868a8363c83dea81d7f839f4037c8ceaae157fa3c099d6e455707ea0e8045a0a333448aff2be1c0733f449c32237cb704758fb8df4ce9e7357e8001c3a498
 EBUILD eclass-manpages-20190329.ebuild 605 BLAKE2B ceef27f3e43fa279fa6e380ecc4254257f2a64cd643eb3f0da5f0985bc9aa98caa2939e8bd37247c65a01d959439667f9b931f6e1c845bcd9173df1980c06949 SHA512 95e1e5b5c09bc281dc0bdc09bdbd1facc548e4a7c5062ce9ff18725ecc489946e486c883235d570011bf69d792a33a3a45175e15f94a56317f167d2817c69236
+EBUILD eclass-manpages-20190602.ebuild 605 BLAKE2B ceef27f3e43fa279fa6e380ecc4254257f2a64cd643eb3f0da5f0985bc9aa98caa2939e8bd37247c65a01d959439667f9b931f6e1c845bcd9173df1980c06949 SHA512 95e1e5b5c09bc281dc0bdc09bdbd1facc548e4a7c5062ce9ff18725ecc489946e486c883235d570011bf69d792a33a3a45175e15f94a56317f167d2817c69236
 EBUILD eclass-manpages-99999999.ebuild 729 BLAKE2B 79cbaab27b22289c66c053232bf900a7ce8afacf48f0d5e750d324732e5c74918403cc271286da0eb005d15deb6f5579e04f6ff2eb5e9dd7372ef842d6ec31ce SHA512 64d4c7078873ac0814c68a02596ef6890949dbca960a452c867d2c7cc16b098b8922e5a915360fec4fee47c922e9bab81f84a04b3a71c92a96e47b6b02cc25e7
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190602.ebuild b/app-doc/eclass-manpages/eclass-manpages-20190602.ebuild
new file mode 100644
index 000000000000..c567d7c5fc37
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20190602.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stable. No need to change to ~arch.
+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
+	sys-apps/gawk"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr
+}
diff --git a/app-doc/zeal/Manifest b/app-doc/zeal/Manifest
index cc0f2a069b11..fbd608cb1a2f 100644
--- a/app-doc/zeal/Manifest
+++ b/app-doc/zeal/Manifest
@@ -1,5 +1,9 @@
+AUX 0001-libs-enforce-static-linking-of-internal-libs.patch 2648 BLAKE2B e4293669e6744dab5d3eec08fbedc4b99474d74a54bbcaf5765f66e5360006b0ed48c0f3eb8dd1cf255a2f12740401a4cd2e57d886d71aa075b6830f1931b022 SHA512 f654f6df58ae04361efa8957c492c076e340623e8634dc95aae2a016f59d74f88b9fdfbf6b97197344c7d5767e33c79f0cee197fbc6bb383b14b494c2ba9c877
+AUX 0002-settings-disable-checking-for-updates-by-default.patch 1080 BLAKE2B 07b40bdd13fe6e7a4efa24a17a1b734be50ec8e289c74278ae3f718c05388a4b36b064922798c4ec2e4f69e9dd49f3cd24d39c98adb0274914b28fcd42016a36 SHA512 bd5e7369bc5878df9c6dff093d710e73b8ed1a4e2c3a6927a26f5fbf97725fd695a90f197bf46d229b38a16c40e19308f8e058fd9819177c62cd7fbaae7e370d
 DIST zeal-0.4.0.tar.gz 1049326 BLAKE2B b3007dad0ed280954b05464bc107fa51c603d79607acd42ab85bc745d0590bdaed740edac75dac91e0d0da34b5966eb96815e8250a3b68041cb5a8e0389676fc SHA512 fd1e7cd71469e40914b713c10057b3f3d1d2ae9808d296ca01ceb43941b6e7d6754a4f21edf43a594b1c3ebcab20728812db1bdffda6bc78ee49a1d4faaf9627
 DIST zeal-0.6.0.tar.gz 1062223 BLAKE2B 691525380dcefa03a1ed94cf0651f16e4e630aef820beed612a4412d8cdef39de25d2cacb84a76b5f7d03b9c3833fbcd60e463722bd7f9c3e147e5e72037211c SHA512 453841cdbab405a6c3842818b0d18b93d3ee8ad299386c25f63986e04674dbd437665e1913a03f0d94944004a619ea18d218de969c487e68e06a205e0edc1d3a
+DIST zeal-0.6.1.tar.gz 1063963 BLAKE2B 72f38aac8275cea8da214962b568ff3f634c6c8499a73f506a6b63d947f87bb0b13bf6a0821d7803ccf09689744a79ebf8659ebe1d6ae07863662cb6a017c5ee SHA512 5b1a129980000c0fc8516e2c7d6c4a8de4adde7054ff8d9635e3be35441ad3ef0539746bbe1ca8abce7e6fb3d20c825b57661c3f8cd059ef1480db65ff81f3d9
 EBUILD zeal-0.4.0.ebuild 972 BLAKE2B a0b722a1b8363dc232f391a1668296ae1eacd2a16fd2c71b2b7bb8d7a132761154df6db50ec5f8584ff625fde4e13b7e115ec85964e1fa18e6f1d2ec0b2897af SHA512 eb7359929d6cb99447648798a1c9173f5f8f542fb6dd34d625eba37183e9abdbcf275a73eec8f6ad9d6e2451cdbc68de9928f67150646e82edad13cc608df6da
 EBUILD zeal-0.6.0.ebuild 878 BLAKE2B 20ed7fe613344d7a610293d79ed1eeb2f794ebacc7dcedd9528e30e71daa352522bcb6fd7bd9c7dc0dacc279768ae3b26b9ae04965b160e7144ebed39274f70d SHA512 fdad30af08e4582138d4700d8dfdc1a1ea45d7ae5bad0108b1af41498198322115b61d724d043c7cbb01dc70f71cdb456c57022e65184cea64dae71af2631ea8
+EBUILD zeal-0.6.1.ebuild 1073 BLAKE2B b6128e325734c7cec4e6c7b553aab921d42092b18cbf341d30d8031cbcd9f28437c569f984847ec1c20e869b06fb4db64065de07fb36f6df50a84b20ef59fc0c SHA512 6b13b60ed2de52923012bcd186ad945781c1c6cf277aeb442f086995989c0f4112bf032ec8b2ac5dff9e2506346bf8e820650a5cb4f43e0aee640e7620de8c8f
 MISC metadata.xml 343 BLAKE2B eb010ce88edcf15d87348b5170ca84d46d96d975ff459b4467428af5b75a95bc9e6c6d1245119907b5833f9a2ad2060adf41ba9aa884a5b846c1441241eaf8ba SHA512 a51b0043a255567189cb7ba1247cd6e9427292e7dbb3bc4f33d6c00acb3bf158bce6a7db1262275899b2b55806cfcb71e53a365aa25f05e259d497d5f028074f
diff --git a/app-doc/zeal/files/0001-libs-enforce-static-linking-of-internal-libs.patch b/app-doc/zeal/files/0001-libs-enforce-static-linking-of-internal-libs.patch
new file mode 100644
index 000000000000..137959b7ca28
--- /dev/null
+++ b/app-doc/zeal/files/0001-libs-enforce-static-linking-of-internal-libs.patch
@@ -0,0 +1,81 @@
+From b08ff87378dab3e6255864d2749e17b71210e7bd Mon Sep 17 00:00:00 2001
+From: Henning Schild <henning@hennsch.de>
+Date: Sat, 9 Mar 2019 16:35:52 +0100
+Subject: [PATCH] libs: enforce static linking of internal libs
+
+Since the application binary is the only file installed and the libs are
+not used by anyone else, make sure they are always static. Otherwise
+cmake can make them shared and those shared libs will be missing after
+install.
+
+Signed-off-by: Henning Schild <henning@hennsch.de>
+---
+ src/libs/core/CMakeLists.txt                 | 2 +-
+ src/libs/registry/CMakeLists.txt             | 2 +-
+ src/libs/ui/CMakeLists.txt                   | 2 +-
+ src/libs/ui/qxtglobalshortcut/CMakeLists.txt | 2 +-
+ src/libs/util/CMakeLists.txt                 | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/libs/core/CMakeLists.txt b/src/libs/core/CMakeLists.txt
+index cd212bb..3bd7371 100644
+--- a/src/libs/core/CMakeLists.txt
++++ b/src/libs/core/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(Core
++add_library(Core STATIC
+     application.cpp
+     applicationsingleton.cpp
+     extractor.cpp
+diff --git a/src/libs/registry/CMakeLists.txt b/src/libs/registry/CMakeLists.txt
+index 3372711..977919d 100644
+--- a/src/libs/registry/CMakeLists.txt
++++ b/src/libs/registry/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(Registry
++add_library(Registry STATIC
+     cancellationtoken.h
+     docset.cpp
+     docsetmetadata.cpp
+diff --git a/src/libs/ui/CMakeLists.txt b/src/libs/ui/CMakeLists.txt
+index 1fe12ef..27a4877 100644
+--- a/src/libs/ui/CMakeLists.txt
++++ b/src/libs/ui/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(Ui_FORMS
+     settingsdialog.ui
+ )
+ 
+-add_library(Ui
++add_library(Ui STATIC
+     aboutdialog.cpp
+     docsetlistitemdelegate.cpp
+     docsetsdialog.cpp
+diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
+index 8b1b0ef..1776839 100644
+--- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
++++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
+@@ -19,7 +19,7 @@ elseif(WIN32)
+     )
+ endif()
+ 
+-add_library(QxtGlobalShortcut ${QxtGlobalShortcut_SOURCES})
++add_library(QxtGlobalShortcut STATIC ${QxtGlobalShortcut_SOURCES})
+ 
+ find_package(Qt5Gui REQUIRED)
+ target_link_libraries(QxtGlobalShortcut Qt5::Gui)
+diff --git a/src/libs/util/CMakeLists.txt b/src/libs/util/CMakeLists.txt
+index d4ab871..ad0e9ec 100644
+--- a/src/libs/util/CMakeLists.txt
++++ b/src/libs/util/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # Nothing to moc here, so avoid empty build units.
+ set(CMAKE_AUTOMOC OFF)
+ 
+-add_library(Util
++add_library(Util STATIC
+     plist.cpp
+     sqlitedatabase.cpp
+     version.cpp
+-- 
+2.19.2
+
diff --git a/app-doc/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch b/app-doc/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch
new file mode 100644
index 000000000000..977412c47339
--- /dev/null
+++ b/app-doc/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch
@@ -0,0 +1,26 @@
+From 3d499c8391e36b7fb1780815d04e533f26333145 Mon Sep 17 00:00:00 2001
+From: Henning Schild <henning@hennsch.de>
+Date: Sat, 9 Mar 2019 10:29:54 +0100
+Subject: [PATCH 2/2] settings: disable checking for updates by default
+
+Signed-off-by: Henning Schild <henning@hennsch.de>
+---
+ src/libs/core/settings.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libs/core/settings.cpp b/src/libs/core/settings.cpp
+index 8922bc4..549ddff 100644
+--- a/src/libs/core/settings.cpp
++++ b/src/libs/core/settings.cpp
+@@ -72,7 +72,7 @@ void Settings::load()
+ 
+     // TODO: Put everything in groups
+     startMinimized = settings->value(QStringLiteral("start_minimized"), false).toBool();
+-    checkForUpdate = settings->value(QStringLiteral("check_for_update"), true).toBool();
++    checkForUpdate = settings->value(QStringLiteral("check_for_update"), false).toBool();
+ 
+     showSystrayIcon = settings->value(QStringLiteral("show_systray_icon"), true).toBool();
+     minimizeToSystray = settings->value(QStringLiteral("minimize_to_systray"), false).toBool();
+-- 
+2.19.2
+
diff --git a/app-doc/zeal/zeal-0.6.1.ebuild b/app-doc/zeal/zeal-0.6.1.ebuild
new file mode 100644
index 000000000000..19114642c849
--- /dev/null
+++ b/app-doc/zeal/zeal-0.6.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Offline documentation browser inspired by Dash"
+HOMEPAGE="https://zealdocs.org/"
+SRC_URI="https://github.com/zealdocs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="vanilla"
+
+DEPEND="
+	app-arch/libarchive
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	kde-frameworks/extra-cmake-modules:5
+	>=x11-libs/xcb-util-keysyms-0.3.9
+"
+
+RDEPEND="
+	${DEPEND}
+	x11-themes/hicolor-icon-theme
+"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/0001-libs-enforce-static-linking-of-internal-libs.patch"
+	if ! use vanilla; then
+		eapply "${FILESDIR}/0002-settings-disable-checking-for-updates-by-default.patch"
+	fi
+	cmake-utils_src_prepare
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 648b049808c8..af43d9484ce3 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/beaver/Manifest b/app-editors/beaver/Manifest
index 6a791192ad3e..99ffb6b3c972 100644
--- a/app-editors/beaver/Manifest
+++ b/app-editors/beaver/Manifest
@@ -1,4 +1,4 @@
 AUX beaver-0.4.1-desktop-file-validate.patch 541 BLAKE2B 3847326cc887bee9f3bff580fb15de09375a44180941551b67b8a8be66396c32c6e671b7bea724cd9c318a6fd6fb5851944422b64f6229e663501e1da331fb1d SHA512 17a1f673f3b7b9e283cb1d8ea33b387cf78f1a2623f2a8ae114960504db6c90afec980035ec5627584f144ec516f65b1c2a52880f0ad6114dbabff02031ba6d5
 DIST beaver-0.4.1.tar.bz2 436321 BLAKE2B 034829d795b5a0502a2df1e675e01d34cc62efbc482959e2d3e0ecf9eeddf1d8450e92ee9c2f98af3e2778ad4c14fac926291ca935ec79822f8f552a9579363e SHA512 3000bed3aa2a67d6c38a68a7782a9d5423bcec0b8420272b0f0dade604c094a7b52058b43222af38d56313f0aa27998028c984f69340bf28eeaa8b8a93548a1e
-EBUILD beaver-0.4.1.ebuild 926 BLAKE2B ae78dd9f1370ef0d161a5f11d2bfceaaec26a7d3cd86630cc366867522f0c62a5d26ed4780106796a76c42330381882dc6a3125e69dc1d52eb8257bdde5a792e SHA512 9ebbe07c0cbb89a13da8661d0f0d2860d5c158cbb39daefabe9690290998afc29ae4eecbc1c7d376db7ba0954a757ae02f50fa083ec4530f37bbad89a270b60a
+EBUILD beaver-0.4.1.ebuild 967 BLAKE2B 8dbe5be9037a81db5bfe3c7c26b616d76051f3a08343822549d86a64e4afe2f058c8a55d82d87971e40c0d5b84e15e0848ca0fe6bfcf12ca673617e598407acf SHA512 aacb9b7d54da3d774b0c1b98ae4ca9695d25e3d1e2d2e1d71253f91a1cafc41b4c0c3a09d199d67b6154dbf3deb1071339ad52071b8679bbaee633cb1eb54bda
 MISC metadata.xml 359 BLAKE2B d0b8402f3a7a6f77f7c79733394a2bf595320b8f51a65432fd545975b72e9d94ecd5845b8f9f446b3519f6ee2d44c111dadfe6d86cd78bee0f1ba4c3bd7da31c SHA512 7fec5e4168c877d16d8d744244e0aa3cfef4d6d219dc3485caeb21802de8aab2a00188572393b885ef7f8f7ed72b3bad3f5622ecf057347ce6969fb1d3fc5759
diff --git a/app-editors/beaver/beaver-0.4.1.ebuild b/app-editors/beaver/beaver-0.4.1.ebuild
index 88eebb1e378a..6e8052b4e9b9 100644
--- a/app-editors/beaver/beaver-0.4.1.ebuild
+++ b/app-editors/beaver/beaver-0.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils gnome2-utils
+inherit eutils flag-o-matic gnome2-utils
 
 DESCRIPTION="Beaver is an Early AdVanced EditoR"
 HOMEPAGE="http://beaver-editor.sourceforge.net/"
@@ -26,6 +26,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cflags -fgnu89-inline
+
 	econf \
 		$(use_enable doc doxygen-doc) \
 		$(use_enable debug)
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index cf9747f7545d..2406a986191b 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST gedit-plugins-3.30.1.tar.xz 1354644 BLAKE2B ee42fb2fe47c9219442e0bbdaf21a14a834b8bc38558713ccf0ad384814812fd71f4d318624b4d2c149b26d304203a2b954ef49c3299877f4d067ae181bfe1d5 SHA512 0e777779288b51015d7ab539bf896a00d5226560f2cc2211daf777da87824eed858255318c421524933a540135e4bfdcc294ba7ed89f680a35aa48f7279cbc94
+DIST gedit-plugins-3.32.2.tar.xz 1474264 BLAKE2B feb116ec201b9eb9630570818cc288f0044ecfc174fc84c7d812aa6dfba5cc3748b4e2351ffa2be0d3a593a58b2318c4296b54b84476fc887195ee27f27bb597 SHA512 2767bc766daba5e1c81ef5a00bc3589a301c02e0286a6622cf11a03b5b391ecbcf9456187563dad4f2916610ee9ddca4414ff4beb639820954385ee3f8091d2a
 EBUILD gedit-plugins-3.30.1.ebuild 2341 BLAKE2B c582963908681011ddfda5a61d7c2e3ef0747f150ac7724c3d1ef300429d17ea426ad8d72729ecf2c8dda2e660e4ba8260dc27488b921dbce13d96866d881684 SHA512 44b51f949bb6e6e6b0341c65c9637093db96326c443312ca697cd21426db7f99ea40cd6aec59256793426dc5970e4981781b1d7c0e016dd885f9c9a62e16b046
+EBUILD gedit-plugins-3.32.2.ebuild 2314 BLAKE2B 151c04ea8ec25be4a1eb06dd0695d80554e3352ff9643160df8163ab95fed90eb48762751ed7b67bfd83425b761da12cc14dc15680fa11bf7ee0449ba83b8738 SHA512 cf1248083c76e7a293067369956df44ac9571e7e3e4325a0541a4d1c89798e572eaeb65c077fa7e40c9fed5fdc704cc6ad97a858a51ed21136a310f7b18a71ba
 MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.32.2.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.32.2.ebuild
new file mode 100644
index 000000000000..2d7024b86e3d
--- /dev/null
+++ b/app-editors/gedit-plugins/gedit-plugins-3.32.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="xml"
+VALA_MIN_API_VERSION="0.28"
+
+inherit eutils gnome2 multilib python-single-r1 vala
+
+DESCRIPTION="Official plugins for gedit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE_plugins="charmap git terminal vala"
+IUSE="+python ${IUSE_plugins}"
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
+REQUIRED_USE="
+	charmap? ( python )
+	git? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	terminal? ( python )
+"
+
+RDEPEND="
+	>=app-editors/gedit-3.16
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libpeas-1.7.0[gtk]
+	>=x11-libs/gtk+-3.9:3
+	>=x11-libs/gtksourceview-4.0.2:4
+	python? (
+		${PYTHON_DEPS}
+		>=app-editors/gedit-3.16[introspection,python,${PYTHON_USEDEP}]
+		dev-libs/libpeas[python,${PYTHON_USEDEP}]
+		>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.9:3[introspection]
+		>=x11-libs/gtksourceview-3.14:3.0[introspection]
+		x11-libs/pango[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+	)
+	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
+	git? ( >=dev-libs/libgit2-glib-0.0.6 )
+	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+	vala? ( $(vala_depend) )
+" # vte-0.52+ for feed_child API compatibility
+DEPEND="${RDEPEND}
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# FIXME: crazy !!!
+	if use python; then
+		find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
+		find "${ED}"/usr/share/gedit -type d -empty -delete || die
+	fi
+
+	# FIXME: upstream made this automagic...
+	clean_plugin charmap
+	clean_plugin git
+	clean_plugin terminal
+}
+
+clean_plugin() {
+	if use !${1} ; then
+		rm -rf "${ED}"/usr/share/gedit/plugins/${1}*
+		rm -rf "${ED}"/usr/$(get_libdir)/gedit/plugins/${1}*
+	fi
+}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 0bc7f0c6b7d2..58ebaf234785 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,6 @@
+AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
 DIST gedit-3.30.2.tar.xz 3155628 BLAKE2B 96736adbce987af89b37a712448f42b2a2eeed72d52aa16377d961c9e929fa4e75205eac5987bfc067cc2fecb35aec720d85483c4e2e824a6e8248cc652d2fbe SHA512 58ae7a4c27aeabad670718e39e1860df112d0be00ea622cc8adc185cb5d0e16ac4af65cb3aa45423c7b1b94c88d04d081fe05f3647b054a3e3291abc73c41f6f
-DIST gedit-3.32.0.tar.xz 14793216 BLAKE2B b1d9af7882063a622fe27f8e5aa322e2a1724410c4419d538712fdda2cab10aa59014a82cc1a41b35966dceb1b75ce2613d9c5c98400743b31df76b0114e84e8 SHA512 f25ed05f5d3b7ab7711be32c6516479c8b515d6d5983e3bc3a00407740fb8ec42b1e9a3005473671fc144f4437b9e98355a3669210eefb5bf8288f171188f387
+DIST gedit-3.32.2.tar.xz 14789660 BLAKE2B 574a490e3beda9e8b4f8324409f3a1e3361b1fdd097c4bf8d05475be2a6bb66b230ab6d2047caa62c393458c29b6647c32293ce5c1428d030cb2345c19bf41c3 SHA512 a3ed4dea3d0f60fb2371d2b6bbf5f5db1f67c9a71d0d47836456e022903e86b8b127c88ece6a6d817b0c86ff82612c963a9e8ed60f9841af68474a1d129c886d
 EBUILD gedit-3.30.2.ebuild 2323 BLAKE2B 4fa5600d7163ce9fb6670a89d9151343cc7c256cbb0219f3150f94acdb2ff4b53e85dc116eec708ebf12b0fd5926325fdcd1d725c956b8c7001db89c643ceddc SHA512 a0c3b76b6f6454678d50a6f60bb8dae830023dabc22de5581848bf42932a25db9fa8c32b753e6747c486badcaa7c3f679b58a0874c26f99f69f1c7a2049a217e
-EBUILD gedit-3.32.0-r1.ebuild 1922 BLAKE2B 6dd9b4ad92a3190dd099f9fbd32b72bae48165e1aeb00d10bbf7b573177ed449dbb162cf06e324c85220576cfc7f995324935b41754e7f63d2e8abbe5bfb0eb1 SHA512 6492ed41a81a5ea20b8437e0206e1ea1db9e62787eac906e01131b317768457be0878f9f9b9e0b3cf40f4cbe733e32e7c06222c1ecff3ed483fcc3d55c97c44c
+EBUILD gedit-3.32.2.ebuild 2163 BLAKE2B abf16e09a414b271844be8d0edb6104f89cd31b10ad08d3e1fc1c559454f20695c1e9eef1bd6d6042e89087fffa057ad6a518cd0f2b027e4acaa4bf08904f626 SHA512 25581461a2c949e99e0dfb1eb2a06c998307d5db542c8407239cfcbf01c0ec9bce00210db2085efeabc7eb92203c3aba3379f42a13dc3c47a6b8e8ae4dc9f058
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/files/3.32.2-make-spell-optional.patch b/app-editors/gedit/files/3.32.2-make-spell-optional.patch
new file mode 100644
index 000000000000..1d772590f605
--- /dev/null
+++ b/app-editors/gedit/files/3.32.2-make-spell-optional.patch
@@ -0,0 +1,61 @@
+From 72efa486222cde6094c217efc6085f49af1cca85 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhan@gentoo.org>
+Date: Sun, 26 May 2019 14:19:17 -0400
+Subject: [PATCH] make spell optional
+
+---
+ meson.build         | 4 +++-
+ meson_options.txt   | 4 ++++
+ plugins/meson.build | 4 +++-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 2f4d7e5..f67e320 100644
+--- a/meson.build
++++ b/meson.build
+@@ -86,7 +86,8 @@ libxml_dep = dependency('libxml-2.0', version: libxml_req)
+ libgd_dep = libgd_sp.get_variable('libgd_dep')
+ 
+ libsoup_dep = dependency('libsoup-2.4', version: libsoup_req, required: true)
+-gspell_dep = dependency('gspell-1', version: gspell_req, required: true)
++with_gspell = get_option('spell')
++gspell_dep = dependency('gspell-1', version: gspell_req, required: false)
+ x11_dep = dependency('x11', required: false)
+ 
+ introspection_dep = dependency('gobject-introspection-1.0', version: introspection_req, required: false)
+@@ -189,6 +190,7 @@ summary = [
+   '  Introspection: @0@'.format(generate_gir),
+   '        Plugins: @0@'.format(build_plugins),
+   '       Vala API: @0@'.format(generate_vapi),
++  '          Spell: @0@'.format(with_gspell),
+   '  Gvfs metadata: @0@'.format(enable_gvfs_metadata),
+   '',
+   'Directories:',
+diff --git a/meson_options.txt b/meson_options.txt
+index 90803fa..e1f7349 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -16,3 +16,7 @@ option('documentation',
+ option('enable-gvfs-metadata',
+         type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
+         description: 'Enable using gvfs to store metadata')
++
++option('spell',
++	type:'boolean', value: true,
++	description: 'Build spell support')
+diff --git a/plugins/meson.build b/plugins/meson.build
+index af94ab7..abeeac5 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -21,5 +21,7 @@ subdir('quickhighlight')
+ subdir('quickopen')
+ subdir('snippets')
+ subdir('sort')
+-subdir('spell')
++if with_gspell
++  subdir('spell')
++endif
+ subdir('time')
+-- 
+2.21.0
+
diff --git a/app-editors/gedit/gedit-3.32.0-r1.ebuild b/app-editors/gedit/gedit-3.32.0-r1.ebuild
deleted file mode 100644
index 02db350e3688..000000000000
--- a/app-editors/gedit/gedit-3.32.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{5,6} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome.org gnome2-utils meson multilib python-single-r1 vala virtualx xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+introspection +python gtk-doc vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~amd64"
-
-# X libs are not needed for OSX (aqua)
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.44:2[dbus]
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection?]
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=net-libs/libsoup-2.60:2.4
-
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-
-	x11-libs/libX11
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-		dev-libs/libpeas[python,${PYTHON_USEDEP}] )
-	>=app-text/gspell-0.2.5:0=
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	${vala_depend}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc documentation)
-		$(meson_use introspection)
-		$(meson_use python plugins)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gedit/gedit-3.32.2.ebuild b/app-editors/gedit/gedit-3.32.2.ebuild
new file mode 100644
index 000000000000..1efe7a9a4ebb
--- /dev/null
+++ b/app-editors/gedit/gedit-3.32.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_{5,6} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome.org gnome2-utils meson multilib python-single-r1 vala virtualx xdg
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+introspection +python gtk-doc spell vala"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# X libs are not needed for OSX (aqua)
+COMMON_DEPEND="
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/glib-2.44:2[dbus]
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection?]
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=net-libs/libsoup-2.60:2.4
+
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+
+	x11-libs/libX11
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+		dev-libs/libpeas[python,${PYTHON_USEDEP}] )
+	spell? ( >=app-text/gspell-0.2.5:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	${vala_depend}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+PATCHES=( "${FILESDIR}/${PV}-make-spell-optional.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc documentation)
+		$(meson_use introspection)
+		$(meson_use python plugins)
+		$(meson_use spell)
+		$(meson_use vala vapi)
+		-Denable-gvfs-metadata=yes
+	)
+	meson_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/le/Manifest b/app-editors/le/Manifest
index b02237072b80..1945cab5cb9b 100644
--- a/app-editors/le/Manifest
+++ b/app-editors/le/Manifest
@@ -5,5 +5,5 @@ DIST le-1.16.5.tar.gz 1012934 BLAKE2B c3e037f701e5e8916258fd55a02550f0bae42f56a0
 EBUILD le-1.14.3.ebuild 523 BLAKE2B f57bd51998eaea4f15b420f69f12c3fa3260db82e92387aa94a81eabe84a712cf2423aac325c437f0fe9068d8e6e0bb7b6f3fc13ef45894cf025b2afcb3cfa8f SHA512 9d04c3765306fd5e1b021b57943d58a998909f7858c3f270b5dfe9e6c83d5e51b9527b41c90fcb309c3ed60c6337dca2f59ba8049b42798e9eeb1c110752877b
 EBUILD le-1.16.1.ebuild 482 BLAKE2B 83482fbf242c9301f48e26895be69296bdef286db5c52f661864c68539291deb87d404b3b45cd563aa2a7cba8717a7af59165011750b954573156410629fc20a SHA512 6de4d2214385b6d7cb42ff8c6ce6dbb1a976be5d211125d75ee2f758f546b3c14a206ff70925cc1e214797ebece6f6911a8a484276ad8c2a17b83222be44fbf0
 EBUILD le-1.16.3.ebuild 460 BLAKE2B fba82f3d371ef0005574250a1f4c0682b1301f766c507f1daeda45a078e3c248b0552beac2e2ccaea75b241f2e3232b8e3ea294963fd5157324d99254d2d777a SHA512 7c7acc1c43316f8d139ecc7dfa6894fba025e3627df71682b005e7764577e8fd5bcfeabeedac3982c190eb0002beaae05c6749e026c3beec24874e9a75d4a7c6
-EBUILD le-1.16.5.ebuild 488 BLAKE2B b8840fe3a56798e65ef384afd9346fa97a78e2eb4812b05db69dd67406a1a936d6b6c64be9ab49a6f60f2bb1b24e06cb2f15ff7b89dcff5854eaae3a69121b03 SHA512 54baf9008a46d4e7955d1d0608301671d603e17c736a153bbb58e8df6fe67763a37cde391c1ab2d0f99c8c0d475f77cabf68cf5a96b6a2d8578de7e4c495dd60
+EBUILD le-1.16.5.ebuild 487 BLAKE2B d74dbb00f183b185ad355feb03b90194688f99b29343ba6f2455586854f932921659fe59c7fad329510abbf1b778eee222022087c678c1d250071c67a51ebc94 SHA512 ab0971f255f42d9f58fa5167c43d626bdf1ad38273aa1fcb953ef08384e10df9d00bbc1b14cfbc7b614a06dce8540a62fd3af59e0e1f075b33067ee495b08dac
 MISC metadata.xml 372 BLAKE2B 87ce04f23c2c03caf708509901ae504cb952d4b69819e0f3cfcc5e3b149d82db976965c1bdbc31db66a481726264a2dfe355f3407938479c71be6111a96391f5 SHA512 366c7a4b144ab34cc9a6bd3328ce4c27f32fd9d638949361ee5e9db29cf3f564d3ad392f9cd59858d359e9050c76c0eb5afa12900834462daaba949675aa232b
diff --git a/app-editors/le/le-1.16.5.ebuild b/app-editors/le/le-1.16.5.ebuild
index 4319999d719e..1ae40439e62c 100644
--- a/app-editors/le/le-1.16.5.ebuild
+++ b/app-editors/le/le-1.16.5.ebuild
@@ -11,7 +11,7 @@ DOCS="AUTHORS ChangeLog FEATURES HISTORY INSTALL NEWS README THANKS TODO"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 5295666c58de..8ad529653871 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index cc7620316772..f332ca2afed5 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -4,6 +4,6 @@ DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
 EBUILD eselect-mode-1.4.12.ebuild 573 BLAKE2B 49644f3440da18f4cbf22d6681edca141578776cb899cf25b888200eb99ff0b9068919e24d6c86c46ca41005763a94f951d598a5916f78949fbb99bbf830f622 SHA512 f4a8c484fb16d0408abeb8e269a034b71046cfdb2686462c5c7e64cce27f03ad71f6172cbf4fb0fbb9e91eb7ebed73f196d68de04bb26d7a4aed3644777a850c
 EBUILD eselect-mode-1.4.13.ebuild 571 BLAKE2B 7b4853cf735d2173233beacb2419a949c209ec92291c1ac97b52c327e4e72167709bdb0b1b082b3fafb413c9a1fec1c9e7c1f7230e1bbd8958af0cb079fc6fdb SHA512 166fa42fc67f91b91abaab8fd101bc8dc251274561143a3a9154174e8af7fa075e757d75ee87a4d711751e66868b03855059e5166c23375421cdc03037855587
-EBUILD eselect-mode-1.4.14.ebuild 582 BLAKE2B 721100792af38d09632673239f1956a15af5bc0b2aba872e024bf7c454b7882dde3d8eebf5ab2a1e3a11bc7be6611d1611efd8fac795c2bf015553875d0697d3 SHA512 957edb82115c3985d6a8cfa6eb6f5260f0ad84ac12075122d305372dd4b408f9046668ecf7107a72bd49f346320213b134a468b490026abe75b257df8cdfda0f
+EBUILD eselect-mode-1.4.14.ebuild 579 BLAKE2B 7259203662588c081c4d1f51f2c6346560e18dfcdaf8520b3f116e6814ea7d4e1a91aa62fdca3432c68b30c4235464cf6d466f2a45cf8f7fee196bba19f9b1e0 SHA512 f2210b6ae79479502515cd1fb9562896b49243daa7c8fc5ba8d12c7c57af3a495e051491e055f29ad1275cf500078f87f54ee83fcd89f40054ac7d43ebc34425
 EBUILD eselect-mode-9999.ebuild 458 BLAKE2B 0a5b748fc09dbfe532ec9b40adbbb939bd5150ecac9ee610ad0dc5b37e7b6ccdcb8c183337d6f0ce04ee5bfad4f1ede0c13cc4dc55c828474b07265fd91ffba3 SHA512 5d11532145273d6956274ce05d732352593a20daa1d86f900b1fa9927aa536131e5ec922996f4e3939803253e5649f6c2a3ec9a81dabd6dac0475422cf0a4ceb
 MISC metadata.xml 449 BLAKE2B 711e97a9feb5a464b81a738024f1f8b1ea4dcf2dab78f1e814fcb30569df5a3192cc6e72308687bffd9f7c806f3ce37ef62856f86737d3e8aa4334f721a2fd7b SHA512 38b645859453423cb80be836dc712364d5650f07f071c44d07ad7f5f629b8efd0d26535ebf61e8c38281e8426109ef5828015e01b3377486ab28f942163d155b
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
index b342275247a8..6e34f02096e4 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_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 ~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"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index 63e548378309..ad613498aa00 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,8 +1,6 @@
 AUX 50ess-gentoo.el 58 BLAKE2B a643ea2780e8bb7c211ad438b41d709d39e3484a99ab1d603c86843aad92a66b8bbfc1bbe9a81c25fcc19cb68fa9de7d657bb99889704cc9593e61bff43e227c SHA512 e9023d176d39d3d3c35e004747007892e6f2e2b101b3c8e64fadc37d1fac8d264a786b7bad26c744730fec03580d7fb1170c8d2789e76e12b4eb47481b7f2808
-DIST ess-15.09-2.tgz 3248241 BLAKE2B 63e83436e60d6f9398dabaaed2aa795dee8888f3a992749bdf6ab9541464c65297c29e1d2936d3e6b1da6284c0c3508556b30a6b5a68e4e090e8e1ce3d925894 SHA512 9ba2f8800ece437e18749e29b6ecec3cf52297fa1c5a149dbf8eeb991df4f5dc99a76925458bd03203b7e8418347c4bcb5226e08dc64bd95d16e9a5b32f8634b
 DIST ess-17.11.tgz 3275703 BLAKE2B 50ec08040135fb05be35494829b347f1ce1c8fdb8bbc5c11f9327800cbfafbb4e7dd5dc46c2b6ce8d506e4e9ade90e369d14c0498e06f990eccbbacbb7d16cec SHA512 b2bb09d079922ed8bded04387e6aecd38d760d7a3b9a521044fb7e2537fdc0cbb59c707e5aa550fc76aa92a6c47eab0fa40f554060707cfc7656b19adbdea222
 DIST ess-18.10.2.tgz 2939425 BLAKE2B f9a6181dfaffc820a55214418d14aef1443945d6b15cb156ecfb70a8f5878df545662f37114a44ea8aa20338a5eaea6a6ce0884b02f108bd3372653db13e1eff SHA512 9bc04c5ec87ed639e56de9fd7817c3adb1a823f091254a91b906e22e8537fb097b21b80020bf245acbd61420d09949d66fc079f3c552d79bf32b95dc7fa1dca9
-EBUILD ess-15.09.2.ebuild 1164 BLAKE2B 8a3105ca2a7ff0acdf27c3b9a061a395a8eb005511c3515d286eb99b4aa1ba3b43ecc21c82bb01f82438934f47b4ca1f9a8723a82ba001b37d5e1d899815f52b SHA512 ae190fba951333cad7300484d6988ca1d6e2954697a36c719a0616b99b10911d00846f63f5a5c5ba2662ec90eaf9f9d991ef0be55a01c89c71263a28011c1067
-EBUILD ess-17.11.ebuild 1125 BLAKE2B 84b8e3cbdbee6ecb27fc88a742d209fc729c5fc107fbd7a6f78cafbb6f095db66781ad007f01b482548c48ac76524145fe88d9edd449031619e2d94f8e529fd1 SHA512 6756d9fcda88e56d09b84de0615c537c1ff0ef92d736f0b4a53b3ba081baace62bf7db0bfa0f3242d0bb9300322a6a7754130a49611ed835fbe63f5e16fa4436
+EBUILD ess-17.11.ebuild 1124 BLAKE2B 126dc327e8e0f412d08a5c6adb8daa604ecdd85bde5e0e6fee730bcd2d2173ba4a05e7067253be798b2e3db6c6597e0c97a6bab59e3ebdd8fd3eae919c4d2ac7 SHA512 7ee82320175b473c4546833e082d9e100cd7a34d4037a4959942785fb25b2d927ec1430c4da343269b724c4a758ca65ea18702c0838f56413da2f563da68dda8
 EBUILD ess-18.10.2-r1.ebuild 1151 BLAKE2B 6829c65356024a1e6a93372e245ca85a192c56ec50c3cbfb8097f1b9aa046226b62b8841d1cb12b9156b2fbed0e242a0d74747d6747f5d9368b232cba3eaad60 SHA512 49a8f781838fa66690e121e11e08ecb5ef91fd0338ef8aa3d51e3262b5319821567f1bf2a46f6e0a9d06130efd7ae063153f6346305689d0c9f40bbac2397d39
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ess/ess-15.09.2.ebuild b/app-emacs/ess/ess-15.09.2.ebuild
deleted file mode 100644
index 14e85a135646..000000000000
--- a/app-emacs/ess/ess-15.09.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp readme.gentoo-r1
-
-MY_P="${PN}-${PV%.*}-${PV##*.}"
-DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
-
-LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-DEPEND="app-text/texi2html
-	virtual/latex-base"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" \
-		INFODIR="${ED}/usr/share/info" \
-		LISPDIR="${ED}${SITELISP}/ess" \
-		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	# Most documentation is installed by the package's build system.
-	rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
-	dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
-	newdoc doc/ChangeLog ChangeLog-doc
-	newdoc lisp/ChangeLog ChangeLog-lisp
-
-	DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
-		documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/ess/ess-17.11.ebuild b/app-emacs/ess/ess-17.11.ebuild
index 9cbcc38fe00e..d4a2ae5fbefd 100644
--- a/app-emacs/ess/ess-17.11.ebuild
+++ b/app-emacs/ess/ess-17.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
 
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 RESTRICT="test"
 
 DEPEND="app-text/texi2html
diff --git a/app-emacs/magit-popup/Manifest b/app-emacs/magit-popup/Manifest
index e4f5d839f48e..b19370f2827f 100644
--- a/app-emacs/magit-popup/Manifest
+++ b/app-emacs/magit-popup/Manifest
@@ -1,6 +1,8 @@
 AUX 50magit-popup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST magit-popup-2.12.3.tar.gz 40195 BLAKE2B a351e949207b674c734f66b0431fa4c137293ccff880e3f457dfb825d7a36afd37f59197170a86d52606d371c181cd8a23be54d74aeee192a2d1a56588a55b3d SHA512 50620ce1d364ae28f30658dedd8f235bb1055be5cf4320142b7648e2ff6137f84cf865ea8f41e34ad7fb42612ff5d36fc0c4f6caa0aa0d2071bf775c15be5833
 DIST magit-popup-2.12.4.tar.gz 40233 BLAKE2B 959ed85a1a4fec06ea30cd8d3482616fcaf145e4c043e48d872c830f24d627c4047c68d9424649a1c6b24a027309e900792a342f5a048d6f5aab32e8130eaa9d SHA512 c538d8227ebed85a161a62deb351994cfa3ea67b400ddd8423ae90a6ada8653f3798db2dfb942921bcb505af3fa757f8c2c911c9da583a42210db82e20d7fa3d
+DIST magit-popup-2.13.0.tar.gz 40226 BLAKE2B 9b5a115de98440873eae51e23c51b19a426518d66d9c9bf9f4d3b2476aa1ad7829311bde7845d861fc8f63c38c87d2236274019456fd773a90880acf73bb1cfb SHA512 27d8c9268a9ccc682105c67ec5f6dbfdf62e527ca982f4f71781f571af5374a364d290abe60c84286563b1d73e000550796c7b1c8f2474f5df62e552afe2cefb
 EBUILD magit-popup-2.12.3.ebuild 594 BLAKE2B 4e1f7e95d6581b55aac702d4d4aed048f0ab0f9815b1d9a8dfb3688c541eadd13e39e9f9f40cb7ab931e6841f9cc9c86205d40dfff0560b8417a9764c7d12e15 SHA512 750cd4a10d07188fc9113e2e71604c3742f6d9ed02179f7cceef982fa1d4c037ef88eb4faf9ead8cc46d798cba9044c5f83cb183ceda69c110dccbd9a1d66e4a
 EBUILD magit-popup-2.12.4.ebuild 596 BLAKE2B 39e54e5f14d5648c2e8d1c30f2da09cfb7345d1cf80650a4fd226dc7dbbdb0560ca24761ed46a4910a47bc46bd6a5a403edab90afc051b7ea60c5af813106191 SHA512 60cf12225cf6a27a5ecbe0afe7ff6d3e6c20b351aae312518a150bd8bfbb485e7310b2a17ab4743f413f3cb7da35aef5ccc00d3a99fa23ee675eeb11e181a204
+EBUILD magit-popup-2.13.0.ebuild 593 BLAKE2B 81f187d21e58948428b64ce385f9e639790279f0762368ff6a3882335c4ea4216205f46601f1602bc78336c1de5d4ae143ea34b43ba1cc4d902a7c2506069baf SHA512 ffe8a449c68138255d2f3f139217b664925492693911d9b272ced959877ddd0bc5165dea210bb7c0e4d84385afb37474fc6937ac4675827013c70598eb21cdcc
 MISC metadata.xml 1170 BLAKE2B ab77cb475c6f77b7829a4fa62de4ab29423ed5e7531e64b60523ccf619b3e4edf4c69037d528bf3705f0de1311833445d02932d0a8b633860319ce200cadb454 SHA512 70806e5c38f43fcfe23b2eb64f818ad6d62fdacc61cb6d1be0b8aad236f766fd558592db617aeb0b41cc9330d1789339b8a3b9eefcf65f1bced7b18633cf884f
diff --git a/app-emacs/magit-popup/magit-popup-2.13.0.ebuild b/app-emacs/magit-popup/magit-popup-2.13.0.ebuild
new file mode 100644
index 000000000000..ca68dfa895cf
--- /dev/null
+++ b/app-emacs/magit-popup/magit-popup-2.13.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Define prefix-infix-suffix command combos"
+HOMEPAGE="https://magit.vc/manual/magit-popup"
+SRC_URI="https://github.com/magit/magit-popup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md"
+
+CDEPEND=">=app-emacs/dash-2.13.0"
+DEPEND="${CDEPEND} sys-apps/texinfo"
+RDEPEND="!!<app-emacs/magit-2.12.1
+	${CDEPEND}"
diff --git a/app-emacs/puppet-mode/Manifest b/app-emacs/puppet-mode/Manifest
index 0556f3a134d0..06ddfd237027 100644
--- a/app-emacs/puppet-mode/Manifest
+++ b/app-emacs/puppet-mode/Manifest
@@ -1,7 +1,9 @@
 AUX 50puppet-mode-1-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
 AUX puppet-mode-0.3-version.patch 547 BLAKE2B a3731babc0e9d207c5dde31f28f0a3e2481679bc2d95f9fdadc77e153689bf6e7c1498acb93e1783863bc66de1e65ecb332a4a605fb6c3856dc8964a42e4dd5e SHA512 623496493b6f920700e042c69099060b9e89cec3a04281af0d8fb7b32c57cfa9b70833935f1ec723c4e877545ac0962b9c70054891084b50c6eb2ad8bb1eb9f2
 DIST puppet-mode-0.3.20171221.tar.gz 36707 BLAKE2B 97b285e409a1e344c12773fd1fa64c87090c883662f87fbf01f5b535e5c9027a035b6c4656ac6ca138cf872b05ff8f05af2478f2bfa5b04a10168507b48c387c SHA512 12db350e4005d2b13d8e936f1a956c3bd603709a7a88489565fd4be3a8e74c7b33e6523a7371db85927c018c260762467d6e50153eea659f87711426df7774fc
+DIST puppet-mode-0.3.20180813.tar.gz 36999 BLAKE2B 1ba96a5bbe193c88e96e51973e0d742e611c2ffe0264bae998ce07d5e4f78d37e532dcedf578a801c8e6442ce35385b5c5915837da1073895ceeddeff99b65b3 SHA512 27aeb5a3029208180bd94d7f3f762d9a88863f963824636fdb688ccb79a3c41b9370c13a536e3438c94720e04d5a02c2f64f75d5c594fc7bca32d9738dd3b756
 DIST puppet-mode-0.3.tar.gz 25617 BLAKE2B a9afb8e2f6c0a2b40cef6bb39d0fa2effe2ddffaa3b646562f0fc5b84d1613e556df88206835d6aad5862d526161d69c49ecd188e299e4f4175b479fe1957eee SHA512 16ba5f71a1ec6c40b1eddf2acf5c1aa1968526b959279e1cac0cfac947f82f404fc35978ce12f5851309f293e2c92f054a718ade97d156528d505dcda58434e8
 EBUILD puppet-mode-0.3-r1.ebuild 613 BLAKE2B f98dab8fc53fcd00f2b3156ee8572d4c11181ff5d6660dda7b172e99f6ad7abf7f826c423e9500aacaa6d273c51b6acf3725deb76ab155ba5a5f4c34348382ca SHA512 12a42f2ecce4bce4b2963e22dd7c4b9f9545f1ccbb8713c0cf4344ee00da59b42e3eb5922b3b20e161d946aa7314a5c95df1a61797842e0ffcad4ae43e4f92e3
 EBUILD puppet-mode-0.3.20171221.ebuild 696 BLAKE2B 880055162bb6a62c1ce6ad5cf1843c8213aa24dbd56ef0664848320a349fac820c95e0dadbf17a3c3b5bb421230559b1f080c8bfb694ad19ca5e90f867380051 SHA512 4ce05b8aa028fdffca6b21c8309ddc4bf71bbf6e5ab183f4d3ed1028c97d556eb3914aaa7a7778cf75070d02998d6e31a90874618bb935e4d50468ef96adda47
+EBUILD puppet-mode-0.3.20180813.ebuild 693 BLAKE2B b83c5ef6c8f51f1a39f165ca84f9fc65ae67b3c74df6f4968ebd8c7cb008d3111719568aee531644e5320b25e00d055c9c9d90ef84df73ffc2719c3a97ca5195 SHA512 0ba3d4c9aad1fa9ba539247b26151bb0bb2a4b3a954507de5671c366492fbf0accabefa13ec5e1f8b5fc6ef80df45d8fe2a56536a544f1ad9c58c83ed7af72ba
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/puppet-mode/puppet-mode-0.3.20180813.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3.20180813.ebuild
new file mode 100644
index 000000000000..3c55e2f588ed
--- /dev/null
+++ b/app-emacs/puppet-mode/puppet-mode-0.3.20180813.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+COMMIT=7dee1b5a5debac6e56f9107492a413b6c0edb94d
+
+DESCRIPTION="Emacs major mode for editing Puppet manifests"
+HOMEPAGE="https://github.com/voxpupuli/puppet-mode"
+SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+
+DOCS="CHANGES.md README.md"
+SITEFILE="50${PN}-1-gentoo.el"
+
+# Tests require unpackaged ert-runner
+RESTRICT="test"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed -i -e 's/@VERSION@/'${PV}'/' puppet-mode.el || die
+}
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index 2fbe80e3e2aa..ffc731ae8480 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -2,7 +2,9 @@ AUX 50with-editor-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c6723772
 DIST with-editor-2.7.2.tar.gz 30121 BLAKE2B a610348a3a2b26059bf58b4b26fdb4e2edddcf70604db7c9d69d2050f4ed1ac745cf94638656339a915ac11a2abe0e8eee5fcb73c768747a8d14078931106332 SHA512 9d412928ce5234d3541d717b5b800312c82495f937088cb8308ff64ab92d2639ce078cdc8eb86d34b775a0e6567409249d58d94eb61183b82b5c19e2465905a7
 DIST with-editor-2.7.4.tar.gz 30159 BLAKE2B 2e1e84dd1e4bd0c4f5c0e0bb8730e8c4327e58ae38ee445c4f7f365279f7b8293639be675e735e82fea15c0fa93ff7b02c18d0fdb81889d6b44459d40f7322ae SHA512 d35409bc761e5ee797ca758878365a11695e0e8558275e8dd8eb2b22c92b7ea92024a56c1adbab47d4b5e0cc49a2e6adf5e8d1f7fd3e784774dab39bdbf1d93c
 DIST with-editor-2.8.0.tar.gz 30519 BLAKE2B 80502d3839818e5d0277b0189b7c7b814eddae72007c4018500cf64136beaea3eccf23c147f02eaf734558c2f24e0dd7cb2a2a80c09e700df3e5ba1e911ba798 SHA512 15df8706754d61ab8d57f866cde54833ea3126915352ed7ebd5020224141a069a62a3872694f95fcff66be165310f8111e4d4c9a1717189686460e8264636b4c
+DIST with-editor-2.8.3.tar.gz 30648 BLAKE2B 8989f8506fb58c1f54efa4fcb72fa8ddd477c0c73d82672028bdb027f74093b62c44ab5a545cd9db2e0e3222bf461e605aebc805112c5ae8486c224b22806c26 SHA512 389aa084f7dfb7f7b59a37802441718e20ee70d88b9af9631b1fc547e4c3238d053bb2b3ef50a4e6332fc3befae183a49d55b3c7bd7719a149cf83001d23810c
 EBUILD with-editor-2.7.2.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
 EBUILD with-editor-2.7.4.ebuild 657 BLAKE2B df8b950d0098ee43e157b40c92fb525a06485afb5f653cd7a0958904763aad2c2e8f9b6ab691c3710a9ee2fbae295213857234d4595df95c289f36703a8cc849 SHA512 d85d8c903296986b112df6fb2c1d84e6e6e8bc77c4dcdfd620696f697d45cd6b3c494ff96fe0581d5c56baae6791ab3776da12e6b7b695b15657ac9d0ae64747
 EBUILD with-editor-2.8.0.ebuild 659 BLAKE2B d0ae1c4101e73725f922573b11996e1e4c5edf7b28f09106872dfbefc3688e21a05cc8885af648da2576e7356001f40e07aa3307c520fd080fcc1780cc8c1a8f SHA512 b69e940bee0264a1763fe11bc042b8aa6b2d93f6b32e0b8a5894cf4be93558765c94eb8cbaf88c27b2d9537a57c2e5185c5856d6e37b867f2449e6ebf6615638
+EBUILD with-editor-2.8.3.ebuild 659 BLAKE2B a373ff680eee3ae047e3d93100b27ad0287afaab6c3fe43e378f5d7da0807ec26668021c19c4c34e5bb2caa90f65726fe68561937a0a88a639c61f64a8b25433 SHA512 0e3ccacb84a2d7b4b0b03a4b27b277b68bfc2da88443a4bc32d0f11f06edc9fa95b708e8ee9c8717b37dbea0df03541189b23b30d297a7016e22f74477edc5e2
 MISC metadata.xml 707 BLAKE2B 7f4c983cfd2f8b87a3708301ccc570a0d88b3d9b21b3e089e44dc5b22f8313826d2469efabe7ff4dc2b27262f93dc4b5e8fe0e68b2b3b7a6f79fa6f34283eeab SHA512 bce73ef41113175585cc46d00fc1306537c71f860b1f2d699c086f2b1042d26fb02e9770122c586594ab9012eeea0fa73438a2fb9a9cf3b2c077481eef13a5b6
diff --git a/app-emacs/with-editor/with-editor-2.8.3.ebuild b/app-emacs/with-editor/with-editor-2.8.3.ebuild
new file mode 100644
index 000000000000..f7155f29d718
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-2.8.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
+HOMEPAGE="https://magit.vc/manual/with-editor"
+SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md with-editor.org"
+
+DEPEND=""
+# Versions of magit before 2.5.0 bundled with-editor
+RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
+DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c479f50f8677..ef226540d2b8 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
new file mode 100644
index 000000000000..024cb9a3d522
--- /dev/null
+++ b/app-emulation/conmon/Manifest
@@ -0,0 +1,3 @@
+DIST conmon-0.2.0.tar.gz 48349 BLAKE2B f61d1750437102c3772669ac8cff75204bf6811a221212cb7127a439b57b70afacb460f4128413e242ccceb0fe44c417dcd0a7f08536f272131704f3a6cbd599 SHA512 81b6eb88a473c6b4e349e18ba48682dd15f5f1ad841d2ca6bead8b5f9b418dd20832a855a1c8d81ac77562d00cb6e5852aab4f6f4ce15f099ca63a0a3f432ec8
+EBUILD conmon-0.2.0.ebuild 929 BLAKE2B 8cebe07ee1dd31992efb45a3c35a1564c7806453d5c60d6f5a89a381a5c30476fae984736252f6868062161a462d7f2070ca796da3e49f54e921dd2146e03aa5 SHA512 08fefcc27c504946f006c5edd0c8a96fd55ae55db6208fdc865dbc65202f23eb79de876d2778c2c6dc3ee194227f6dfbe27dbf10aef98d24154405fba9337a11
+MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775
diff --git a/app-emulation/conmon/conmon-0.2.0.ebuild b/app-emulation/conmon/conmon-0.2.0.ebuild
new file mode 100644
index 000000000000..b529698cd21c
--- /dev/null
+++ b/app-emulation/conmon/conmon-0.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="systemd"
+EGIT_COMMIT="59952292a3b07ac125575024ae21956efe0ecdfb"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RDEPEND="dev-libs/glib:=
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		sed -e 's| pkg-config --exists libsystemd-journal | false |' \
+			-e 's| pkg-config --exists libsystemd | false |' \
+			-i Makefile || die
+	fi
+}
+
+src_compile() {
+	emake GIT_COMMIT="${EGIT_COMMIT}" \
+		all
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="${ED}/usr" \
+		install
+	mv "${ED}/usr/libexec"/{crio,podman} || die
+	dodir /usr/bin
+	ln "${ED}/usr/"{libexec/podman,bin}/conmon || die
+	dodoc README.md
+}
diff --git a/app-emulation/conmon/metadata.xml b/app-emulation/conmon/metadata.xml
new file mode 100644
index 000000000000..15f05bae08e9
--- /dev/null
+++ b/app-emulation/conmon/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">containers/conmon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
index d9dc2a765195..b9d9f3f17393 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,4 +1,6 @@
-DIST containers-storage-0_pre20180730.tar.gz 1410155 BLAKE2B 24595693e9f5706130dd5e9bf38d11b2b267a64924cb854ad2d9db8c0a3d7c47fec5a00fa100be67ceaf35ea1a08fada7314d5fbe114fe7508f54e8bfc4f64b4 SHA512 25c5c3c16bb9f0da4e590cf658e56cc2ce1dbc81751f984b426b5e09a95ee816632b0267c8f3028254e88fcd39f5d087f0357862b34379180b33ff38d7028453
-DIST github.com-pquerna-ffjson-af8b230fcd2007c7095168ca8ab94c68b60840c6.tar.gz 103474 BLAKE2B 66b456484cec51106e328a6d2c58a8597c1208956fca0c9f0ea45108b8d0942561882004a1ed5b90daa21509c9e0bc090dc9beed89b5a161f52ee8cf58e5d48f SHA512 243d8aed943dbadf3b127e07ad29a830ecded24aa80bb3bcc101db90ba8f3bfa03832e9d1f452e94b3eaccd683a044d0687a168e7e41979eb470442e689659c9
-EBUILD containers-storage-0_pre20180730.ebuild 3703 BLAKE2B 03c9f196330705267975f8635000be5a644ab04f1fa136bfcc47175f782e1e0e3d98b64892a8777be265f5f6b009a46b70de10a24779b4d6835e8940638b4b26 SHA512 4fd423ac41a16998df3312aa4679df86c69f40f089bc7ec8fe0093a6010c41c230eb1e2d1cb3e34b92f06a50084602d01468d5f58abb6c83f2abe682d3213a11
+DIST containers-storage-1.12.7.tar.gz 1562420 BLAKE2B 84b8f5a329aa191eb07bfab9e4b547e1a48cf5ff30b389f4b8f5aea702e5536cd420aeffb93cc0d15dcd33f3f0d1779f19fdfe2363b027ba3bb8e4776f411a78 SHA512 c0dc5aa32c3d439427ccd1721dd9d0b3119cd15b1cf65dc8079714a0df38e961084d090bb9cedd98a0e33c4d530ce898d885447974a86e024ec721d4f2900f34
+DIST containers-storage-1.12.8.tar.gz 1591018 BLAKE2B cbcc46e86d6c00badfa3e9d5988757fca969fb1b61f6cd0f81cf257c6feac6deefbdad8534fd99e52842efcfd5099ca0d7e27966b0eb16f699e6c1c06e90c683 SHA512 2badef5ccd7292c77ad5de70403c6d343c3a19a81c0e7c22539eb939b5a3ea59447176d5d3d99e34e9877a11b3608268f8951bc74378be99c074ba2a31f27fdb
+DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6
+EBUILD containers-storage-1.12.7.ebuild 3684 BLAKE2B 709d1851467a15e468cf51d02014a49189d723953a582011dcf3d728a6cb893a7c849f8d1b276ebab1f0d659feb62dc7ea58e456e6c1ca32527d63f494fd3708 SHA512 72ad508ba85806cf65ca5e316e36d71c2d405d4b1a6faf788a652df9f7a9379c1459ee5305aee85ebfdf12d0cb8b83d4630e5498ac25be56a7442a4ff676810d
+EBUILD containers-storage-1.12.8.ebuild 3684 BLAKE2B 709d1851467a15e468cf51d02014a49189d723953a582011dcf3d728a6cb893a7c849f8d1b276ebab1f0d659feb62dc7ea58e456e6c1ca32527d63f494fd3708 SHA512 72ad508ba85806cf65ca5e316e36d71c2d405d4b1a6faf788a652df9f7a9379c1459ee5305aee85ebfdf12d0cb8b83d4630e5498ac25be56a7442a4ff676810d
 MISC metadata.xml 691 BLAKE2B 512255d8e2d91d64a04fcd5da04fa6db20fbaf66c580491f001716a06c0ff81ff572491cb9b4274229f2312c7235abcbe8e32b6de9e2344b418015c253866f26 SHA512 eeb059ee40101e47a81d4ff871a55295c68891c9bb6a5a2f87d7855e3aea36648f2db77317f3660602d338d6f3f8cf1018cc61f2722fcd6cb78f7f32ac62989b
diff --git a/app-emulation/containers-storage/containers-storage-0_pre20180730.ebuild b/app-emulation/containers-storage/containers-storage-0_pre20180730.ebuild
deleted file mode 100644
index d5caa6e3a626..000000000000
--- a/app-emulation/containers-storage/containers-storage-0_pre20180730.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-	"github.com/pquerna/ffjson af8b230fcd2007c7095168ca8ab94c68b60840c6"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="btrfs +device-mapper ostree test"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="17c7d1fee5603ccf6dd97edc14162fc1510e7e23"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-RDEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	ostree? (
-		dev-libs/glib:=
-		dev-util/ostree:=
-	)"
-DEPEND="${RDEPEND}
-	dev-go/go-md2man
-	test? (
-		sys-fs/btrfs-progs
-		sys-fs/lvm2
-		sys-apps/util-linux
-	)"
-RESTRICT="test? ( userpriv ) !test? ( test )"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-	default
-
-	[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
-		"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
-
-	[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
-		"${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
-
-	[[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\ntrue" > \
-		"${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
-
-	sed -e 's:TestChrootUntarPath(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
-	sed -e 's:TestTarUntar(:_\0:' \
-		-e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
-		-e 's:TestTarWithOptions(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
-	sed -e 's:TestTarUntarWithXattr(:_\0:' \
-		-e 's:TestTarWithBlockCharFifo(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
-	sed -e 's:TestTarUntarWithXattr(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
-	sed -e 's:TestApplyLayer(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
-	sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
-		-e 's:TestApplyLayerInvalidHardlink(:_\0:' \
-		-e 's:TestApplyLayerInvalidSymlink(:_\0:' \
-		-e 's:TestApplyLayerWhiteouts(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
-	sed -e 's:TestCopyCaseE(:_\0:' \
-		-e 's:TestCopyCaseEFSym(:_\0:' \
-		-e 's:TestCopyCaseG(:_\0:' \
-		-e 's:TestCopyCaseGFSym(:_\0:' \
-		-e 's:TestCopyCaseH(:_\0:' \
-		-e 's:TestCopyCaseHFSym(:_\0:' \
-		-e 's:TestCopyCaseJ(:_\0:' \
-		-e 's:TestCopyCaseJFSym(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
-	sed -e 's:TestMount(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #678856
-	mkdir -p "${S}/src/github.com/pquerna" || die
-	ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
-	mkdir -p "${S}/bin" || die
-	cd "${S}/bin" || die
-	GOPATH="${S}" GOBIN="${S}/bin" \
-		go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
-	GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
-		emake -C "${S}/src/${EGO_PN}" containers-storage docs
-}
-
-src_install() {
-	dobin "${S}/src/${EGO_PN}/${PN}"
-	while read -r -d ''; do
-		mv "${REPLY}" "${REPLY%.1}" || die
-	done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
-	find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
-	GOPATH="${S}" GOCACHE=off unshare -m emake -C "${S}/src/${EGO_PN}" local-test-unit
-}
diff --git a/app-emulation/containers-storage/containers-storage-1.12.7.ebuild b/app-emulation/containers-storage/containers-storage-1.12.7.ebuild
new file mode 100644
index 000000000000..312d2cda060a
--- /dev/null
+++ b/app-emulation/containers-storage/containers-storage-1.12.7.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+	"github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
+)
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="containers/storage library"
+HOMEPAGE="https://github.com/containers/storage"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="btrfs +device-mapper ostree test"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+RDEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	ostree? (
+		dev-libs/glib:=
+		dev-util/ostree:=
+	)"
+DEPEND="${RDEPEND}
+	dev-go/go-md2man
+	test? (
+		sys-fs/btrfs-progs
+		sys-fs/lvm2
+		sys-apps/util-linux
+	)"
+RESTRICT="test? ( userpriv ) !test? ( test )"
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	default
+
+	[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
+		"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
+
+	[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
+		"${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
+
+	[[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\ntrue" > \
+		"${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
+
+	sed -e 's:TestChrootUntarPath(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
+	sed -e 's:TestTarUntar(:_\0:' \
+		-e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
+		-e 's:TestTarWithOptions(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
+	sed -e 's:TestTarUntarWithXattr(:_\0:' \
+		-e 's:TestTarWithBlockCharFifo(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
+	sed -e 's:TestTarUntarWithXattr(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
+	sed -e 's:TestApplyLayer(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
+	sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
+		-e 's:TestApplyLayerInvalidHardlink(:_\0:' \
+		-e 's:TestApplyLayerInvalidSymlink(:_\0:' \
+		-e 's:TestApplyLayerWhiteouts(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
+	sed -e 's:TestCopyCaseE(:_\0:' \
+		-e 's:TestCopyCaseEFSym(:_\0:' \
+		-e 's:TestCopyCaseG(:_\0:' \
+		-e 's:TestCopyCaseGFSym(:_\0:' \
+		-e 's:TestCopyCaseH(:_\0:' \
+		-e 's:TestCopyCaseHFSym(:_\0:' \
+		-e 's:TestCopyCaseJ(:_\0:' \
+		-e 's:TestCopyCaseJFSym(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
+	sed -e 's:TestMount(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #678856
+	mkdir -p "${S}/src/github.com/pquerna" || die
+	ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
+	mkdir -p "${S}/bin" || die
+	cd "${S}/bin" || die
+	GOPATH="${S}" GOBIN="${S}/bin" \
+		go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
+	GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
+		emake -C "${S}/src/${EGO_PN}" containers-storage docs
+}
+
+src_install() {
+	dobin "${S}/src/${EGO_PN}/${PN}"
+	while read -r -d ''; do
+		mv "${REPLY}" "${REPLY%.1}" || die
+	done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
+	find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
+}
+
+src_test() {
+	GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
+}
diff --git a/app-emulation/containers-storage/containers-storage-1.12.8.ebuild b/app-emulation/containers-storage/containers-storage-1.12.8.ebuild
new file mode 100644
index 000000000000..312d2cda060a
--- /dev/null
+++ b/app-emulation/containers-storage/containers-storage-1.12.8.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+	"github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
+)
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="containers/storage library"
+HOMEPAGE="https://github.com/containers/storage"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="btrfs +device-mapper ostree test"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+RDEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	ostree? (
+		dev-libs/glib:=
+		dev-util/ostree:=
+	)"
+DEPEND="${RDEPEND}
+	dev-go/go-md2man
+	test? (
+		sys-fs/btrfs-progs
+		sys-fs/lvm2
+		sys-apps/util-linux
+	)"
+RESTRICT="test? ( userpriv ) !test? ( test )"
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	default
+
+	[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
+		"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
+
+	[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
+		"${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
+
+	[[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\ntrue" > \
+		"${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
+
+	sed -e 's:TestChrootUntarPath(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
+	sed -e 's:TestTarUntar(:_\0:' \
+		-e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
+		-e 's:TestTarWithOptions(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
+	sed -e 's:TestTarUntarWithXattr(:_\0:' \
+		-e 's:TestTarWithBlockCharFifo(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
+	sed -e 's:TestTarUntarWithXattr(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
+	sed -e 's:TestApplyLayer(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
+	sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
+		-e 's:TestApplyLayerInvalidHardlink(:_\0:' \
+		-e 's:TestApplyLayerInvalidSymlink(:_\0:' \
+		-e 's:TestApplyLayerWhiteouts(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
+	sed -e 's:TestCopyCaseE(:_\0:' \
+		-e 's:TestCopyCaseEFSym(:_\0:' \
+		-e 's:TestCopyCaseG(:_\0:' \
+		-e 's:TestCopyCaseGFSym(:_\0:' \
+		-e 's:TestCopyCaseH(:_\0:' \
+		-e 's:TestCopyCaseHFSym(:_\0:' \
+		-e 's:TestCopyCaseJ(:_\0:' \
+		-e 's:TestCopyCaseJFSym(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
+	sed -e 's:TestMount(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #678856
+	mkdir -p "${S}/src/github.com/pquerna" || die
+	ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
+	mkdir -p "${S}/bin" || die
+	cd "${S}/bin" || die
+	GOPATH="${S}" GOBIN="${S}/bin" \
+		go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
+	GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
+		emake -C "${S}/src/${EGO_PN}" containers-storage docs
+}
+
+src_install() {
+	dobin "${S}/src/${EGO_PN}/${PN}"
+	while read -r -d ''; do
+		mv "${REPLY}" "${REPLY%.1}" || die
+	done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
+	find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
+}
+
+src_test() {
+	GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
+}
diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index eee3590919e3..eb7e45ae959d 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,9 +1,9 @@
 AUX cri-o.logrotated 81 BLAKE2B f17d96920c3e9bbfe68a38fcae49be999c0edcea085ebbc1f09585284c5b7930c185d5cd0ef6c2f7de5db2a6af80355518628a050c1cb0639ccf3b53c6c338da SHA512 1115228546a696eeebeb6d4b3e5c3152af0c99a2559097fc5829d8b416d979c457b4b1789e0120054babf57f585d3f63cbe49949d40417ae7aab613184bf4516
 AUX crio.initd 846 BLAKE2B 844400d3cd706d4f78616edb3c8a50a9819ee21aecc7fc33f7d3d00871fde86b59e4b604ccc7cdb0058b10ccd28277f19dbdce34c83b2529c14e063126318617 SHA512 29561e95398975748236217bbd9df64997f6e3de6c0555d007306bd0535895a648368385a13079eb7d52c06249a91980523a73b6563e86d0575d9cd9c3fa4ee9
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367 SHA512 b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
-DIST cri-o-1.13.5.tar.gz 6683259 BLAKE2B 982de5590411ad618401a2909dcd4f0404d5bfc49667027e29fd266e3e2d15bbf0d7716db570d433eec7f2baacbb33f7e9e0f347aa2ef964a06b8b883f76404c SHA512 116e51e9b31fca66b4edd9aac5d1f0c8929ba9a740af8b611fb7fa0e675e37facd4114d0848090b32f72f58d17c85060c15e07bee82098d83a0bd5b563f4c875
-DIST cri-o-1.13.7.tar.gz 6657183 BLAKE2B 8073211bb188bf6a03615fe5d3f931d45dee09bb506316e80c6b0914d3b798e77e194d6f31e74e314406af28c4a882e45250f8c6792c82d9b0e3cceb0750cf1a SHA512 5056f26decc96798738aa67350b0d7353ac025518c82e2591f4541284bbc3620976a97dcc805429adc748131f38d13edcdb77c3b6f1ba6b93f672637437acb10
+DIST cri-o-1.13.9.tar.gz 6685519 BLAKE2B 5d9e68c7a0ae532e2406e5e47562693cddbc34a8b3ddcab0a7a34509dff8383d1fc255cba634efb186193e5784cc6a7638387ca29e68288af7621b8b25f1a71a SHA512 1541368955c62c697dbd6b850cdf6762a13a7a308f699e3a50dbfe29fbf991f4f47cfcce75bc41745e0c27acb29457ec86d3312ef13341a5d94526865e60eb3e
+DIST cri-o-1.14.2.tar.gz 9347347 BLAKE2B 83a0d77245bc841a9f89c55c853b64e69cec124da07b1314cfc27237cc82c55e49becc0f14c579a09d23e8da047c6bbb285b0eb79c4609a23827ab24ae28ce4a SHA512 1499b09a8f5c51b426bd8fba7c254288707524a363bfa97537edd35fdf29ac354d13578f2bf3c09c2d128650082f9a2bfbf69872fa9fce77dbff43913afc8066
 EBUILD cri-o-1.10.6.ebuild 2850 BLAKE2B c83cc04c151b93c1fa95920dbc99e1a27f0add2fd17fdfdf5179df04438f0c62ab06c4df3cb352359bef1ba02805fe1b311ad9670481282e9dfc2e8d6feba14d SHA512 d08b6ce7eae731aed66892753dfe2ec8872bddc4054446c74ca084cf814c9a95033b996037b26d49bfff100e605edb6ee284ecb57fe959d705c5465c67ec5c2c
-EBUILD cri-o-1.13.5.ebuild 3075 BLAKE2B 34c608002088de6253a3bdd5445ccccfc806da1dafb3cb47b5de67986de5b4d803fd7790e5e573a1f055a5b63797209f761b542182fd677e8edc8111f72e1bbe SHA512 318d67f5c853cbd773ae2b6d92a593e093c6456e5622dddf4f1fbb4bed64dfdf721dced841a7018e14e5f27a6ee1a5b4e0324272d01cf05c9c443c9e8aa4331e
-EBUILD cri-o-1.13.7.ebuild 3075 BLAKE2B cfcf1ee7ce2d1ec39e917507b8eff776f13c23c789af4411eb2f4d4bcfc19d59b937ef0e2de924f318d1e6681e74530d99c607a075d0827796dcfbd8c22a27ed SHA512 3db46d7063fd93e5461b399f61bb85a15194237ddb0715bb3ab39affabd0e201587e553b099d3eb33226ae4e3824cec442a44c84681cabfae5acb72a15381493
-MISC metadata.xml 1005 BLAKE2B 2135f0344ae8ddad14851716be3816eca09e8fd44179cb1853ce35ab96ea77187e0028b2d53ab6802fc40df72d9dac568cc2dd2665e85d9ade71bce0ebddd995 SHA512 db455ac2997f0487aab95c753b8b19a89e863b2d1bb97b5d340d5cea511650cc2abde6f67c2e113517b01a2445f276cff5b5615cd6a6b69c7f590550192b5ac6
+EBUILD cri-o-1.13.9.ebuild 3075 BLAKE2B 232426f67cc91dce71e79bf89dfca85901bdb89cc48d9d8841e17d68414db749937ca21efaaa3f3014976a993eb598694b5ef61ee2ff8340620207db3ef22a58 SHA512 67b26c8a9b4e997ff7b5bee0603de14358f7fc4c99b662f0de839aa66457f1e81e341a3caccaececf62c721d4b059a864d6610fa0ecf38b648c70308e4f89e83
+EBUILD cri-o-1.14.2.ebuild 3004 BLAKE2B f8d1d2e2282275f99ff8132cd998cd3d378f9fe75152770f2f813e8606ef814700c304d93159e7d47a41c58b05db69699bce23fb4aa6f4f8fa61a0824345de0d SHA512 de591769d120c1c1b0898b9b7533083b94ba176684441f3ea5d02a6dbd314f85ab3152f3bcd3556509e01d81de9db4e8d56a2a52e8ba633cd48360f3b99a53a1
+MISC metadata.xml 995 BLAKE2B 81f504df91c54970e7bc65cc4085db45f8f95f354b578cd7ddbae6c34036201335af3c3e07efb39583314c53bdb7cde341568e7d912fa926978b5f146e9e8d25 SHA512 00809a79f64c171d9df3eda85b079bf7c36e46afe8c31c0a0cddb3999d23b09ac2282cd17e4e876a132fed55e5311990a4a4461265d409e976b23ad8ee13e759
diff --git a/app-emulation/cri-o/cri-o-1.13.5.ebuild b/app-emulation/cri-o/cri-o-1.13.5.ebuild
deleted file mode 100644
index 2478498c2a74..000000000000
--- a/app-emulation/cri-o/cri-o-1.13.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_COMMIT="a9d8dde49418572b6ea843a5d3346c966e82077f"
-EGO_PN="github.com/kubernetes-sigs/${PN}"
-
-inherit golang-vcs-snapshot systemd
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="btrfs +device-mapper ostree seccomp selinux"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-emulation/runc
-	dev-libs/glib:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	net-firewall/conntrack-tools
-	net-firewall/iptables
-	net-misc/cni-plugins
-	net-misc/socat
-	sys-apps/iproute2
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	ostree? ( dev-util/ostree )
-	seccomp? ( sys-libs/libseccomp:= )
-	selinux? ( sys-libs/libselinux:= )"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-
-	sed -e '/^GIT_.*/d' \
-		-e '/	git diff --exit-code/d' \
-		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-		-i Makefile || die
-
-	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
-
-	sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
-		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
-		-i Makefile.inc || die
-
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-i contrib/systemd/* || die
-}
-
-src_compile() {
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		hack/btrfs_installed_tag.sh || die; }
-
-	[[ -f hack/libdm_installed.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
-		hack/libdm_installed.sh || die; }
-
-	[[ -f hack/ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		hack/ostree_tag.sh || die; }
-
-	[[ -f hack/seccomp_tag.sh ]] || die
-	use seccomp || { echo -e "#!/bin/sh\ntrue" > \
-		hack/seccomp_tag.sh || die; }
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		hack/selinux_tag.sh || die; }
-
-	mkdir -p bin || die
-	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
-		emake binaries docs
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
-
-	keepdir /etc/crio
-	insinto /etc/crio
-	use seccomp && doins seccomp.json
-
-	"${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die
-	doins   "${T}/crio.conf.example"
-
-	newinitd "${FILESDIR}/crio.initd" crio
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-	# Suppress crio log error messages triggered if these don't exist.
-	keepdir /etc/containers/oci/hooks.d
-	keepdir /usr/share/containers/oci/hooks.d
-
-	# Suppress crio "Missing CNI default network" log message.
-	keepdir /etc/cni/net.d
-	insinto /etc/cni/net.d
-	doins contrib/cni/99-loopback.conf
-
-	systemd_dounit contrib/systemd/*
-}
diff --git a/app-emulation/cri-o/cri-o-1.13.7.ebuild b/app-emulation/cri-o/cri-o-1.13.7.ebuild
deleted file mode 100644
index a032de19c999..000000000000
--- a/app-emulation/cri-o/cri-o-1.13.7.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="42585737f5eb59273e791e47ab1643e10862d67f"
-EGO_PN="github.com/kubernetes-sigs/${PN}"
-
-inherit golang-vcs-snapshot systemd
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="btrfs +device-mapper ostree seccomp selinux"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-emulation/runc
-	dev-libs/glib:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	net-firewall/conntrack-tools
-	net-firewall/iptables
-	net-misc/cni-plugins
-	net-misc/socat
-	sys-apps/iproute2
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	ostree? ( dev-util/ostree )
-	seccomp? ( sys-libs/libseccomp:= )
-	selinux? ( sys-libs/libselinux:= )"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-
-	sed -e '/^GIT_.*/d' \
-		-e '/	git diff --exit-code/d' \
-		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-		-i Makefile || die
-
-	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
-
-	sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
-		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
-		-i Makefile.inc || die
-
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-i contrib/systemd/* || die
-}
-
-src_compile() {
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		hack/btrfs_installed_tag.sh || die; }
-
-	[[ -f hack/libdm_installed.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
-		hack/libdm_installed.sh || die; }
-
-	[[ -f hack/ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		hack/ostree_tag.sh || die; }
-
-	[[ -f hack/seccomp_tag.sh ]] || die
-	use seccomp || { echo -e "#!/bin/sh\ntrue" > \
-		hack/seccomp_tag.sh || die; }
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		hack/selinux_tag.sh || die; }
-
-	mkdir -p bin || die
-	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
-		emake binaries docs
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
-
-	keepdir /etc/crio
-	insinto /etc/crio
-	use seccomp && doins seccomp.json
-
-	"${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die
-	doins   "${T}/crio.conf.example"
-
-	newinitd "${FILESDIR}/crio.initd" crio
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-	# Suppress crio log error messages triggered if these don't exist.
-	keepdir /etc/containers/oci/hooks.d
-	keepdir /usr/share/containers/oci/hooks.d
-
-	# Suppress crio "Missing CNI default network" log message.
-	keepdir /etc/cni/net.d
-	insinto /etc/cni/net.d
-	doins contrib/cni/99-loopback.conf
-
-	systemd_dounit contrib/systemd/*
-}
diff --git a/app-emulation/cri-o/cri-o-1.13.9.ebuild b/app-emulation/cri-o/cri-o-1.13.9.ebuild
new file mode 100644
index 000000000000..8fc1dca0d81e
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.13.9.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="d70609afd5e933948284aebf15966bdc098d28b3"
+EGO_PN="github.com/kubernetes-sigs/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
+HOMEPAGE="https://cri-o.io/"
+SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree seccomp selinux"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	app-emulation/runc
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	net-firewall/conntrack-tools
+	net-firewall/iptables
+	net-misc/cni-plugins
+	net-misc/socat
+	sys-apps/iproute2
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	ostree? ( dev-util/ostree )
+	seccomp? ( sys-libs/libseccomp:= )
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+
+	sed -e '/^GIT_.*/d' \
+		-e '/	git diff --exit-code/d' \
+		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
+		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+		-i Makefile || die
+
+	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
+
+	sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
+		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
+		-i Makefile.inc || die
+
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-i contrib/systemd/* || die
+}
+
+src_compile() {
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+		hack/btrfs_installed_tag.sh || die; }
+
+	[[ -f hack/libdm_installed.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
+		hack/libdm_installed.sh || die; }
+
+	[[ -f hack/ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
+		hack/ostree_tag.sh || die; }
+
+	[[ -f hack/seccomp_tag.sh ]] || die
+	use seccomp || { echo -e "#!/bin/sh\ntrue" > \
+		hack/seccomp_tag.sh || die; }
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		hack/selinux_tag.sh || die; }
+
+	mkdir -p bin || die
+	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
+		emake binaries docs
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
+
+	keepdir /etc/crio
+	insinto /etc/crio
+	use seccomp && doins seccomp.json
+
+	"${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die
+	doins   "${T}/crio.conf.example"
+
+	newinitd "${FILESDIR}/crio.initd" crio
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+	# Suppress crio log error messages triggered if these don't exist.
+	keepdir /etc/containers/oci/hooks.d
+	keepdir /usr/share/containers/oci/hooks.d
+
+	# Suppress crio "Missing CNI default network" log message.
+	keepdir /etc/cni/net.d
+	insinto /etc/cni/net.d
+	doins contrib/cni/99-loopback.conf
+
+	systemd_dounit contrib/systemd/*
+}
diff --git a/app-emulation/cri-o/cri-o-1.14.2.ebuild b/app-emulation/cri-o/cri-o-1.14.2.ebuild
new file mode 100644
index 000000000000..5e2a18c86067
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.14.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="76b057a5a72ae379bb2f4915b791146d37a3f6cf"
+EGO_PN="github.com/cri-o/${PN}"
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
+HOMEPAGE="https://cri-o.io/"
+SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree selinux systemd"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	app-emulation/runc
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	net-firewall/conntrack-tools
+	net-firewall/iptables
+	net-misc/cni-plugins
+	net-misc/socat
+	sys-apps/iproute2
+	sys-libs/libseccomp:=
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	ostree? ( dev-util/ostree )
+	selinux? ( sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+	!<app-emulation/libpod-1.3.2-r1"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+
+	sed -e '/^GIT_.*/d' \
+		-e '/	git diff --exit-code/d' \
+		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
+		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+		-i Makefile || die
+
+	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
+
+	sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
+		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
+		-i Makefile.inc || die
+
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-i contrib/systemd/* || die
+
+	if ! use systemd; then
+		sed -e 's| pkg-config --exists libsystemd-journal | false |' \
+			-e 's| pkg-config --exists libsystemd | false |' \
+			-i conmon/Makefile || die
+	fi
+}
+
+src_compile() {
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+		hack/btrfs_installed_tag.sh || die; }
+
+	[[ -f hack/libdm_installed.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
+		hack/libdm_installed.sh || die; }
+
+	[[ -f hack/ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
+		hack/ostree_tag.sh || die; }
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		hack/selinux_tag.sh || die; }
+
+	mkdir -p bin || die
+	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
+		emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
+
+	keepdir /etc/crio
+	mv "${ED}/etc/crio/crio.conf"{,.example} || die
+
+	newinitd "${FILESDIR}/crio.initd" crio
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+	# Suppress crio log error messages triggered if these don't exist.
+	keepdir /etc/containers/oci/hooks.d
+	keepdir /usr/share/containers/oci/hooks.d
+
+	# Suppress crio "Missing CNI default network" log message.
+	keepdir /etc/cni/net.d
+	insinto /etc/cni/net.d
+	doins contrib/cni/99-loopback.conf
+}
diff --git a/app-emulation/cri-o/metadata.xml b/app-emulation/cri-o/metadata.xml
index e48b961a7b5a..0ebb508fdee4 100644
--- a/app-emulation/cri-o/metadata.xml
+++ b/app-emulation/cri-o/metadata.xml
@@ -26,6 +26,6 @@
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">kubernetes-sigs/cri-o</remote-id>
+		<remote-id type="github">cri-o/cri-o</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/e-uae/Manifest b/app-emulation/e-uae/Manifest
deleted file mode 100644
index 68cc0597acfa..000000000000
--- a/app-emulation/e-uae/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX e-uae-0.8.29_rc4-high-cpu-usage.patch 399 BLAKE2B 0b8d1126bafe49ecf1ca03c23efe51287a8b8b565084560caae054f2997d61c86f248e2bca3b511bf6e283fed8c47639d5ea266a147acc77cbb4b1cabc3b7f94 SHA512 a0d6dbe9dedbabb7700e2199d62814732a0d6f09be7758aa70565ba4d4cc1a86d848e3a9b5c743871a0052ee1b19b03615ee38a174634c7a339d218bab350b18
-AUX e-uae-0.8.29_rc4-no_schily.patch 708 BLAKE2B 8a67650e1b939149cc0e701538e15eb9e2ff85cce3c046a47210f82f5c3117b9d95e55b0ef2f0ab2ee0cc428b21d1b3b1afc4a3b6317eb9a88682bf7b571d422 SHA512 6f8bf99d031eb1f7363dd42a1cbea75689671dbde3782c76beb7e437c7f52b2daeea85cf39a819e586f4dd04c43df46d16a299409e99a8160e9750c7a336a3cd
-AUX e-uae-0.8.29_rc4-tinfo.patch 590 BLAKE2B f502517a50e3c61cafcfd2903b909e0fed7942877ff89e315f1ad0bb790fae6d293b242f5e1dc2897fea88e403e9a718bd01380b4c934287d2439979eb6cf95e SHA512 b5cad73be7a804f80ff5e73eba73c8d777ea5fb18ff829c3efe89ee4914bb08cfb87882b281b95d9a2a88967f2adf18971cc643a8442425c95d9f5d6cff35389
-DIST e-uae-0.8.29-WIP4.tar.bz2 1122718 BLAKE2B 4120e7d14e4ee1a8be04839680c30dc57286524a68eb8036a8f48a0724c3581884045c2ad11bb8409a88b2f43bd132b92083e1e1cc088c5b4768f3b6dfdef458 SHA512 63d5c60ca017ba7ffaba32c4d7edceba0410b773066cc58e226c8cc2c92152eb3689698b0affe478cc63c996c731fbbf56d9028dfd000394d904f193f860473f
-EBUILD e-uae-0.8.29_rc4-r3.ebuild 4143 BLAKE2B e372b1609cbcab1854280f232f1d059d066bb6eedd818f14bb5556d34fc6c7fc18cc03ca5f080ec7e61904eba1eca551a089bf960403421afbdfd5531a17b442 SHA512 51fd795cb83a6a4ef4c57472e40fffd14e42630e395ed202e4024524723bd00721dd90238f4dcf0238bf7904b2ccb9c0a9fc3fffa847496a1109998601f0a255
-MISC metadata.xml 465 BLAKE2B ddab23755d4ac531a0963f024bd4aff9b727f94a3aed47184a32a7e6f6c0b6b9d441c74cccd29028e831c9f290c8539a263317cc0e0d23928932a2f68c576429 SHA512 d66cf721c85633855983c22d2fd18e75635afe1fdd987b12a35f23caf1acb241398815ae643682864d3cd5099983b9b9c7581828ccd4668aca9d5b56fe9a8a00
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
deleted file mode 100644
index 27993eabc591..000000000000
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic pax-utils
-
-DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE"
-HOMEPAGE="http://www.rcdrummond.net/uae/"
-# We support _rcX for WIPX versions and _preYYYYMMDD for CVS snapshots.
-if [[ "${PV%%_rc*}" = "${PV}" ]] ; then
-	# _pre is used, cvs version
-	my_ver=${PV%%_pre*}
-	snap_ver=${PV##*_pre}
-	S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver}
-	SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2"
-else
-	my_ver=${PV%%_rc*}
-	WIP_ver=${PV##*_rc}
-	S="${WORKDIR}"/${PN}-${my_ver}-WIP${WIP_ver}
-	SRC_URI="http://www.rcdrummond.net/uae/${PN}-${my_ver}-WIP${WIP_ver}/${PN}-${my_ver}-WIP${WIP_ver}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X dga ncurses sdl alsa oss sdl-sound capslib"
-
-# Note: opposed to ./configure --help zlib support required! Check
-# src/Makefile.am that includes zfile.c unconditionaly.
-RDEPEND="
-	sys-libs/zlib
-	virtual/cdrtools
-	X? (
-		x11-libs/libXt
-		x11-libs/libxkbfile
-		x11-libs/libXext
-		x11-misc/xkeyboard-config
-		dga? (
-			x11-libs/libXxf86dga
-			x11-libs/libXxf86vm
-		)
-	)
-	!X? (
-		sdl? ( media-libs/libsdl )
-		!sdl? ( sys-libs/ncurses:0= )
-	)
-	alsa? ( media-libs/alsa-lib )
-	!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
-	capslib? ( >=games-emulation/caps-20060612 )
-"
-
-DEPEND="${RDEPEND}
-	X? ( dga? ( x11-base/xorg-proto ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tinfo.patch #527628
-	"${FILESDIR}"/${P}-no_schily.patch
-)
-
-src_prepare() {
-	default
-	# Fix for high cpu use when compiled with --disable-audio
-	if ! use alsa && ! use sdl-sound && ! use oss ; then
-		eapply "${FILESDIR}"/${P}-high-cpu-usage.patch
-	fi
-	eautoreconf #527628
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf=()
-
-	# Sound setup.
-	if use alsa; then
-		elog "Choosing alsa as sound target to use."
-		myconf=( --with-alsa --without-sdl-sound )
-	elif use sdl-sound ; then
-		if ! use sdl ; then
-			ewarn "sdl-sound is not enabled because sdl USE flag is disabled. Leaving"
-			ewarn "sound on oss autodetection."
-			myconf=( --without-alsa --without-sdl-sound )
-		else
-			elog "Choosing sdl-sound as sound target to use."
-			ewarn "E-UAE with the SDL audio back-end doesn't work correctly in Linux."
-			ewarn "Better use alsa... You've been warned ;)"
-			myconf=( --without-alsa --with-sdl-sound )
-		fi
-	elif use oss ; then
-		elog "Choosing oss as sound target to use."
-		ewarn "oss will be autodetected. See output of configure."
-		myconf=( --without-alsa --without-sdl-sound )
-	else
-		ewarn "There is no alsa, sdl-sound or oss in USE. Sound target disabled!"
-		myconf=( --disable-audio )
-	fi
-
-	# VIDEO setup. X is autodetected (there is no --with-X option).
-	if use X ; then
-		elog "Using X11 for video output."
-		ewarn "Fullscreen mode is not working in X11 currently. Use sdl."
-		myconf+=( --without-curses --without-sdl-gfx )
-		use dga && ewarn "To use dga you have to run e-uae as root."
-		use dga && myconf+=( --enable-dga --enable-vidmode )
-	elif use sdl ; then
-		elog "Using sdl for video output."
-		myconf+=( --with-sdl --with-sdl-gfx --without-curses )
-	elif use ncurses; then
-		elog "Using ncurses for video output."
-		myconf+=( --with-curses --without-sdl-gfx )
-	else
-		ewarn "There is no X or sdl or ncurses in USE!"
-		ewarn "Following upstream falling back on ncurses."
-		myconf+=( --with-curses --without-sdl-gfx )
-	fi
-
-	# bug #415787
-	myconf+=(
-		--disable-ui
-		$(use_with capslib caps)
-		--with-zlib
-
-		# And explicitly state defaults:
-		--enable-aga
-
-		--enable-autoconfig
-		--enable-scsi-device
-		--enable-cdtv
-		--enable-cd32
-
-		--enable-bsdsock
-
-		--with-libscg-includedir="${EPREFIX}"/usr/include/scsilib
-	)
-
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# The emulator needs to be able to create executable heap
-	# - doesn't need trampoline emulation though.
-	pax-mark me "${ED%/}/usr/bin/uae"
-
-	# Rename it to e-uae
-	mv "${ED%/}"/usr/bin/{,e-}uae || die
-	mv "${ED%/}"/usr/bin/{,e-}readdisk || die
-
-	dodoc docs/* README ChangeLog
-}
diff --git a/app-emulation/e-uae/files/e-uae-0.8.29_rc4-high-cpu-usage.patch b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-high-cpu-usage.patch
deleted file mode 100644
index ad73b34c062c..000000000000
--- a/app-emulation/e-uae/files/e-uae-0.8.29_rc4-high-cpu-usage.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/sd-none/sound.c
-===================================================================
-RCS file: /cvsroot/uaedev/uae/src/sd-none/sound.c,v
-retrieving revision 1.4
-diff -u -r1.4 sound.c
---- a/src/sd-none/sound.c	15 Feb 2007 04:47:38 -0000	1.4
-+++ b/src/sd-none/sound.c	25 May 2007 14:47:35 -0000
-@@ -30,10 +30,6 @@
- {
- }
- 
--void update_sound (int freq)
--{
--}
--
- void reset_sound (void)
- {
- }
diff --git a/app-emulation/e-uae/files/e-uae-0.8.29_rc4-no_schily.patch b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-no_schily.patch
deleted file mode 100644
index 1a9ebcb408b4..000000000000
--- a/app-emulation/e-uae/files/e-uae-0.8.29_rc4-no_schily.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-configure.in:1134: error: required file 'src/libscg.a' not found
-configure.in:1134: error: required file 'src/libschily.a' not found
-
---- e-uae-0.8.29-WIP4/configure.in
-+++ e-uae-0.8.29-WIP4/configure.in
-@@ -1162,13 +1162,7 @@
-         SCSIOBJS="scsiemul.o blkdev.o blkdev-libscg.o"
-         UAE_DEFINES="$UAE_DEFINES -DSCSIEMU"
-         NEED_THREAD_SUPPORT=yes
--        if [[ "$srcdir" != "." ]]; then
--          AC_CONFIG_LINKS(src/libscg.a:src/libscg.a)
--          AC_CONFIG_LINKS(src/libschily.a:src/libschily.a)
--	  UAE_LIBS="$UAE_LIBS $LIBSCG_LIBS"
--        else
--          UAE_LIBS="$UAE_LIBS -L. $SCGLIBS"
--        fi
-+	UAE_LIBS="$UAE_LIBS $LIBSCG_LIBS"
-       ],
-       [
-         AC_MSG_RESULT(no)
diff --git a/app-emulation/e-uae/files/e-uae-0.8.29_rc4-tinfo.patch b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-tinfo.patch
deleted file mode 100644
index 7f94dd20d8db..000000000000
--- a/app-emulation/e-uae/files/e-uae-0.8.29_rc4-tinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- e-uae-0.8.29-WIP4/configure.in
-+++ e-uae-0.8.29-WIP4/configure.in
-@@ -624,6 +624,7 @@
- AC_PATH_XTRA
- 
- dnl Check for ncurses
-+AC_CHECK_LIB(tinfo, main, HAVE_TINFO_LIB=yes,  HAVE_TINFO_LIB=no)
- AC_CHECK_LIB(ncurses, waddch, HAVE_NCURSES_LIB=yes, HAVE_NCURSES_LIB=no)
- 
- dnl Check for SDL
-@@ -793,7 +794,10 @@
- 
- if [[ "x$WANT_NCURSES" = "xyes" ]]; then
-  if [[ "x$HAVE_NCURSES_LIB" = "xyes" ]]; then
--  GFX_LIBS="-lncurses"
-+  if [[ "x$HAVE_TINFO_LIB" = "xyes" ]]; then
-+   GFX_LIBS="-ltinfo"
-+  fi
-+  GFX_LIBS="$GFX_LIBS -lncurses"
-   GFX_CFLAGS=
-   GFX_CPPFLAGS=
-   GFX_DEP=gfx-curses
diff --git a/app-emulation/e-uae/metadata.xml b/app-emulation/e-uae/metadata.xml
deleted file mode 100644
index 35a11c55489a..000000000000
--- a/app-emulation/e-uae/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		E-UAE is a fork of UAE which intends to merge all the new features of
-		WinUAE with UAE.
-	</longdescription>
-	<use>
-		<flag name="capslib">Add CAPS library support</flag>
-		<flag name="sdl-sound">Use <pkg>media-libs/sdl-sound</pkg> for audio
-			output</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index da5360646fbd..0d642d721052 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,5 +1,7 @@
 AUX free42-2.0.10-fix-build-intel-lib.patch 618 BLAKE2B 9039cdf8c78ff198ea9a4927621f7e23f362fffbd537a0a988030713fe061398d2b7b2fc6120cda280249807d9aee448095b1f5cdfb824909d7d381650daafbd SHA512 192eb5e78c50ce52449c5b859369ab7258a98162c5d924ab8b8f3566f52be7a3c4aba95c3cafd60af82d5dcf1b1ad784cf3fe6bf432839baa1b4ca994ddf416b
-AUX free42-2.0.10-fix-makefile.patch 1670 BLAKE2B 6170b3a2a1f397ab10f1d36fe26f55e2c430066fbf7f292240ee359d38b670b68b9f17696f466e4f913af314662de8cffb13b211adbd0977cfa20b331fe52f8a SHA512 8b234cd643dd760b290c3d6054afa799371d249dc23eba889a168eed413037b6463e5f2b1219b9dd4c350d3338aff5adf27b2ea413d229b961ed40d8388c6617
+AUX free42-2.0.10-fix-makefile.patch 1888 BLAKE2B 113bfc1f296ea3d35d6b4f8aea5f590298c5a47f50a2a20f0ac5f1968b06be19d53f03e64dcf22134938c232f68a6b989250064f45e88196c7fc8e7e9e0fca71 SHA512 1c9a16e29087c492fe1ee5bba8dc118674f4c167b5bc138ffae9ee08ad735a5b5aa2eec2e25236e5aeb95b89c94d7903e08e22cfaa321cf3c458b54defe72af8
 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
+DIST free42-nologo-2.2.1.tgz 7398286 BLAKE2B 041c9672305b712efab8e7d5eb73bc0bd159b5fd61e9ecf39d5ce691aff045be4a6a4c635c0948e610e51832db64b388bdd001eb57aad41724e27dff4cf95a0a SHA512 2ed735ff161ea14ca5be97131b69065410faa699ed05d3eb94abbb9653c694d83fc4e45ea2bcf0c2a7894f89e731ee7839105dc1d58d6a6326047c9bd55da5d7
 EBUILD free42-2.0.20.ebuild 948 BLAKE2B 59ada24ef7746d402bfc2e9cb8ea80c23a68e3ffcd1a3da035281d7544422b21ee3c41fe005721672a180f97a850a7066f3a8087f4aa377fb4c0b4e6233fe49f SHA512 3c117630b0266091dff0b540c1975f6e5c69ec46d8a1f8ad55d7757147df9fc2a6bc9bd3bcfead241cfa8dde29deed727bc1bf39e1f833aab686f2c98504a123
-MISC metadata.xml 457 BLAKE2B 6a9babdb5530decddfa82c22356c57f164a0af5533395fb5b6bb9e27d3bed41223fc22036b04d27fb6c1c0ab2b84e5f087c9c8aaf815eefd21a16380af17654f SHA512 cfb2c658c9e84d07180b9713832c0c6f0569245b72cdc8b74d5a9b5764a28880d9129448c7dc92306bdd9ab5e9216cca192bad7a5030520c8c41ac529c851622
+EBUILD free42-2.2.1.ebuild 1039 BLAKE2B cf5965b23191d1c38450c6643844ca476f3b812b7cda7f17e963c1de3a4d0ff9146ee9a913131a208cf5567a01e92b19fc1700eee272a71f30ec1c51e0262018 SHA512 8b60d1a40b493a0a72c8b4f36fca1228c6f64d5bb7758594f923f2c6dd5db480381401b666b8a485012fd12a55b538e610b02000d2a394eb6516242b9473b4c9
+MISC metadata.xml 547 BLAKE2B c7cdf7e2a312b69ae94b467836751bbf61dc771e58866edc21d70bf1b15c776afaefc20a947f6dc8af6586ec2b5e3416bd32446ca3a92890ed573daad6e48d38 SHA512 99885c9a7abecc41f53a946d1b94d2f8d8fda74f0e3f0a0cf6a43a418a874922594841e17b6197aee9f80b007d7633f2154ba85cec81dcfc22efcc7b52edd15d
diff --git a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch
index c033bbc60ceb..0fb915df2983 100644
--- a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch
+++ b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch
@@ -56,3 +56,12 @@ diff -Nuar a/gtk/Makefile b/gtk/Makefile
  
  $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks
  
+@@ -107,7 +111,7 @@
+ 
+ symlinks:
+ 	for fn in `cd ../common; /bin/ls`; do ln -s ../common/$$fn; done
+-	sh ./build-intel-lib.sh
++	+sh ./build-intel-lib.sh
+ 	ln -s IntelRDFPMathLib20U1/TESTS/readtest.c
+ 	touch symlinks
+ 
diff --git a/app-emulation/free42/free42-2.2.1.ebuild b/app-emulation/free42/free42-2.2.1.ebuild
new file mode 100644
index 000000000000..73ac9b4e00d4
--- /dev/null
+++ b/app-emulation/free42/free42-2.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="http://thomasokken.com/free42/"
+SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}
+	x11-libs/libX11
+	x11-libs/libXmu"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.10-fix-makefile.patch"
+	"${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/free42bin gtk/free42dec
+}
diff --git a/app-emulation/free42/metadata.xml b/app-emulation/free42/metadata.xml
index 1c7c6e8d33ba..2346aff6c159 100644
--- a/app-emulation/free42/metadata.xml
+++ b/app-emulation/free42/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
   <longdescription lang="en">
      An HP-42S Calculator Simulator
   </longdescription>
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 500f926c34ae..84fe65b9e184 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,7 +1,5 @@
 AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
-DIST libpod-1.1.2.tar.gz 7878228 BLAKE2B 8974949843c6f966d48715df320e47b814e442e374e1393dd5a116c6f7222e9ce29f480205f6a58e213e6cead58e5b4f31fd776865911b22e517607349654d35 SHA512 55456fe03da0873d3f6c67ced25dbe98f6a5a14c3da64ab2b4a9c6161c1d727ec8cdfe5414b534531e440e8c86f909449f4026d66898b909924aba1744ec0682
-DIST libpod-1.2.0.tar.gz 7978520 BLAKE2B c1be831553ced9795de266886890c36e89f2b6c2012cbe4f36fa49194c3a825abc097af879326e8e1ad7886ea188d60c42fe1dfa1ad46057c5928f3b5c4f7cd4 SHA512 16ae8fa8a6e9a15d17f7aebe0842bf41e289cbbe5ea8e997c26b2d3e984d669386022e7d1479ca31e8cab8990ae4e2dc1cf753f010bf9aeb03a34199b1146e89
-EBUILD libpod-1.1.2.ebuild 3891 BLAKE2B 342e1eede326f25bce2da9634d35b9c24cf803aa6c1e00a4926b89f0cb787bec5ebc3c89c7a50518f1c25988cab7dd394f16855fce6b0e0282a3f049fa2bba64 SHA512 86a62ec57c2c7fa4d29494824b56aedc25b304a2d54dca5b9cde5433baf5e392c08b05fb948e871a4d14575712665cefca1b5d005939aebde493929e74f41aab
-EBUILD libpod-1.2.0.ebuild 3891 BLAKE2B 160e5e14eb48df11a4f048c9e5fa39b93c844c04048dac851af692041625091e4e044f34a7a97dabf21e9f72265ef852aa4a1d261a3f6b99a206716211af88cc SHA512 469d9c5e63fe8b60ce812be09e6587ff045fa2acb35253bae21207a185bee1c8a6338a0ae04ffcb7f2701fbd2a76b212a0784354c7839b51c109ccbfbd2a7344
+DIST libpod-1.3.2.tar.gz 6901289 BLAKE2B 5de0cf9f47f7e10866839ba01f3c3ed930ebdb716ce10ca4cb6f6b4d0e96088e10a069726125f2dc4af6febe08e6b2fc058fb8e8ecd7dd870612ecb98f29bba5 SHA512 fb959bf6af314baf3d01c53b513390b6d181adca3f9ff2ca747fabd53abdd45907e8a3f8189ff2d1bd70cff8e8bad690407cf278392a0831e6109669a1c1b12b
+EBUILD libpod-1.3.2-r1.ebuild 3883 BLAKE2B 69659832d27cc862714e4f1e3c38f4ed17347849287c4d56a74ee13dbb0c76963d05792b583f250a5277d1e73bce69891568df2b1e355f28656faf8a4983868c SHA512 143e0f3590c2314574513f9884e4041381e9b246524e5b30ab9950eb05c297e91d8b22be21bde2c92ce3d98632baaaf0b86548931982bd62e7c911c9d70bdda6
 MISC metadata.xml 967 BLAKE2B 3fa19bf6148a1d6e7f2b73793d68a8cd22b612dc3f96356a967e01bd2cc9acf92b6aeebd4f299ab35841277a6ba3210a3014190672354c74d07733bf65fe262a SHA512 87c7701c60d07f8c3395dadf04ea52f5676d2f6cf845838ea300f2824203520f5b1229dd91da9ccd3c81c8cbbdddc320674e0075b4c1a7539cd863f7b8123555
diff --git a/app-emulation/libpod/libpod-1.1.2.ebuild b/app-emulation/libpod/libpod-1.1.2.ebuild
deleted file mode 100644
index 0d80616d4c55..000000000000
--- a/app-emulation/libpod/libpod-1.1.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="0ad9b6bf2aea4ba37e8c9738feabec61343ba175"
-EGO_PN="github.com/containers/${PN}"
-
-inherit golang-vcs-snapshot systemd
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/libpod/"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs ostree +rootless selinux"
-REQUIRED_USE="!selinux? ( !ostree )"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	>=app-emulation/cri-o-1.13.0
-	>=app-emulation/runc-1.0.0_rc6
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	ostree? (
-		dev-libs/glib:=
-		dev-util/ostree:=
-	)
-	rootless? ( app-emulation/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-
-	# Disable installation of python modules here, since those are
-	# installed by separate ebuilds.
-	sed -e '/^GIT_.*/d' \
-		-e 's/$(GO) build/$(GO) build -v -work -x/' \
-		-e 's/^\(install:.*\) install\.python$/\1/' \
-		-i Makefile || die
-}
-
-src_compile() {
-	[[ -f hack/apparmor_tag.sh ]] || die
-	if use apparmor; then
-		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-	fi
-
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	if use btrfs; then
-		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-			hack/btrfs_installed_tag.sh || die
-	fi
-
-	[[ -f hack/ostree_tag.sh ]] || die
-	if use ostree; then
-		echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die
-	fi
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	if use selinux; then
-		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-	fi
-
-	env -u GOCACHE -u LDFLAGS -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${EGIT_COMMIT}" \
-			GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-	LIBPOD_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
-	fi
-}
-
-pkg_postinst() {
-	local want_newline=false
-	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-		elog "You need to create the following config files:"
-		elog "/etc/containers/registries.conf"
-		elog "/etc/containers/policy.json"
-		elog "To copy over default examples, use:"
-		elog "cp /etc/containers/registries.conf{.example,}"
-		elog "cp /etc/containers/policy.json{.example,}"
-		want_newline=true
-	fi
-	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
-}
diff --git a/app-emulation/libpod/libpod-1.2.0.ebuild b/app-emulation/libpod/libpod-1.2.0.ebuild
deleted file mode 100644
index 526d4b90cde5..000000000000
--- a/app-emulation/libpod/libpod-1.2.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="3bd528e583182b4249f3e6bbd8497a8831d89950"
-EGO_PN="github.com/containers/${PN}"
-
-inherit golang-vcs-snapshot systemd
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/libpod/"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs ostree +rootless selinux"
-REQUIRED_USE="!selinux? ( !ostree )"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	>=app-emulation/cri-o-1.13.0
-	>=app-emulation/runc-1.0.0_rc6
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	ostree? (
-		dev-libs/glib:=
-		dev-util/ostree:=
-	)
-	rootless? ( app-emulation/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-
-	# Disable installation of python modules here, since those are
-	# installed by separate ebuilds.
-	sed -e '/^GIT_.*/d' \
-		-e 's/$(GO) build/$(GO) build -v -work -x/' \
-		-e 's/^\(install:.*\) install\.python$/\1/' \
-		-i Makefile || die
-}
-
-src_compile() {
-	[[ -f hack/apparmor_tag.sh ]] || die
-	if use apparmor; then
-		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-	fi
-
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	if use btrfs; then
-		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-			hack/btrfs_installed_tag.sh || die
-	fi
-
-	[[ -f hack/ostree_tag.sh ]] || die
-	if use ostree; then
-		echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die
-	fi
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	if use selinux; then
-		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-	fi
-
-	env -u GOCACHE -u LDFLAGS -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${EGIT_COMMIT}" \
-			GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-	LIBPOD_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
-	fi
-}
-
-pkg_postinst() {
-	local want_newline=false
-	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-		elog "You need to create the following config files:"
-		elog "/etc/containers/registries.conf"
-		elog "/etc/containers/policy.json"
-		elog "To copy over default examples, use:"
-		elog "cp /etc/containers/registries.conf{.example,}"
-		elog "cp /etc/containers/policy.json{.example,}"
-		want_newline=true
-	fi
-	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
-}
diff --git a/app-emulation/libpod/libpod-1.3.2-r1.ebuild b/app-emulation/libpod/libpod-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..aa7383b13970
--- /dev/null
+++ b/app-emulation/libpod/libpod-1.3.2-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="14fdcd0dedaec2fa89ccb58840e297ecb98cc617"
+EGO_PN="github.com/containers/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs ostree +rootless selinux"
+REQUIRED_USE="!selinux? ( !ostree )"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	app-emulation/conmon
+	>=app-emulation/runc-1.0.0_rc6
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	ostree? (
+		dev-libs/glib:=
+		dev-util/ostree:=
+	)
+	rootless? ( app-emulation/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	sed -e '/^GIT_.*/d' \
+		-e 's/$(GO) build/$(GO) build -v -work -x/' \
+		-e 's/^\(install:.*\) install\.python$/\1/' \
+		-i Makefile || die
+}
+
+src_compile() {
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/ostree_tag.sh ]] || die
+	if use ostree; then
+		echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	env -u GOCACHE -u LDFLAGS -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${EGIT_COMMIT}" \
+			GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	LIBPOD_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	local want_newline=false
+	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+		elog "You need to create the following config files:"
+		elog "/etc/containers/registries.conf"
+		elog "/etc/containers/policy.json"
+		elog "To copy over default examples, use:"
+		elog "cp /etc/containers/registries.conf{.example,}"
+		elog "cp /etc/containers/policy.json{.example,}"
+		want_newline=true
+	fi
+	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 46cb6cf86d45..3e4b4634ca73 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -19,6 +19,6 @@ AUX virtlogd.init-r1 562 BLAKE2B 52b0dce0d3dd856d6cbffbe37e721d8f053d53a4802ce3a
 DIST libvirt-4.9.0.tar.xz 14744184 BLAKE2B 03ddefc8f505c8688ad506b81ea9b37ee085e4c9c429834c6b6f338981bfc3c6034a5455a79feca604fb36e658de766ee6104aeed690c682ae596d10eb5632a9 SHA512 3cfada940f9de6cc4b0504e089f41aa03d9986f0163344dd3b3ab8e6c4eb556a56996dc8f24bca913b036862c75b256628ea9ab7674ef0a57b87f47c58689e90
 DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2fe5369a4cdde8cacd392e806203bf277406bb10c751bae27f34f27a38355fde84573b6221fc4843393f9ae60ae5c SHA512 378dc1552263cce746117487abc0a1f3411e5be149331717158ba23825734ceae7ca474290264d71de798fdd089ad9672026bcb242fa5b3aef87294284d06f04
 EBUILD libvirt-4.9.0.ebuild 9502 BLAKE2B 8ac78022b1fad4a0c6767554e0ca82854b886e2d3c6e4644bdd947e81f2df14fd54dd166b37054edcf115bdb8be61607a12189aed0376a7a68528702934a1f71 SHA512 a9c22d7651dd75fc3d6dd1caf00c429aa1c7104094a9ac199283da5c7c8108cef83f0a5f74b2215706ffcc10a62b1a9396d5faa9c0ebbe21745cbeed195f1cee
-EBUILD libvirt-5.2.0-r2.ebuild 9778 BLAKE2B b41a73c55961e3380fc7fe02c70b769cd5fc3a6d65dc5a75510efb73eeb85864b53b39dd834085cc694ef58283c051a82e01fc439c4bf8e28bc9d4dda31e65d6 SHA512 6333650de0a08a5eda3f34db0f010e397b40461428468f68f6b1b8aa9cb5626e5d5c53da42fd5ee1f877a8bea6955661189f76c6d6142e245fdeff0598dc2ec5
+EBUILD libvirt-5.2.0-r2.ebuild 9781 BLAKE2B 0765e5f6de150cb2fbd9366c4178785219a869bb2f48f212e216cfdefb79a84465302d5a3a5ae7b9825d046cdc70a72c808d0b9914cd2458632332b0919e532d SHA512 b8345ace2a7828bb0e29e64e21edd6618ea96c3faa350209a8ebb37dc0093103c0e8d598a40cc9327a0c8714fea257fea1a5fd2442882ee4fef51744ed3a94ac
 EBUILD libvirt-9999.ebuild 9732 BLAKE2B ce063a20315cdde7113a4af99ef50c8e00377968a337f34eae53e3f4aa065569cbb23e65e0cef97b140e01950b7896b4512ae985c974d1ae88d23b73ede26dbe SHA512 2ff9360b5c201dfeb776170207d68a88a4f7606d73f2b5a3cad96817c7690a2c6de73646fe9b26bb6f0d575a9ba91ff9661edac91ed572407aae01e0a114afe4
 MISC metadata.xml 3857 BLAKE2B bc5dc60897ca70f3a586c947784dec74cf7daa35909836955dc52a442668b08323398473f9df8be46f2819e762638dcfcb646a8fb7ee768210f27584fb91e3f6 SHA512 33274100068f99fe0c69546e81fb47517818adf2991529533b9bacfc6bcb23ee08ae00b9d0a7a7ff47cb920d2ff1e24b5fc788a3533a89ff477ab04dad0194fc
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
index c43ba47b2591..ce11748ab116 100644
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
 	SRC_URI=""
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 x86"
 	SLOT="0"
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	SLOT="0/${PV}"
 fi
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 57ef36cd033d..06a7c54e28b1 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -13,6 +13,6 @@ DIST qemu-3.1.0-patches-r1.tar.xz 2292 BLAKE2B 0861dcf2eebd7f1f6dd495035fc39a14e
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
 EBUILD qemu-3.1.0-r4.ebuild 23873 BLAKE2B a16ea397f5da2d3e36edaee9d584fe99366e2b85afe21d83eb906aac58c946ba85789c3430fab4913b8fd9008e2e13fcd13822bf643932988ac999e527311442 SHA512 158917bb98ac88f9d635e928b6397409051ea00269749751d5b0c5aa9d0bb539e7bb50573131e2eba0b6748ddee34a6ffd366c7aa180b2094553bb7b01193223
-EBUILD qemu-4.0.0-r3.ebuild 23898 BLAKE2B c10269bc3bc8aad04be3f37c3e6260dff40ece0b4cf5fbef2a2c4a7542b70677aa14e600ed3c7cb04eae94e8a8efaca48f9950af5ff55cfc713307f668933870 SHA512 db83475025011a9f0c1baac8e9b7e9ed98382a78932e80895ed4564553c3173af19d52f8d721fccc32f18b90a0cd4da217dab66f08c74535cdb535a93e2ab95c
-EBUILD qemu-9999.ebuild 23823 BLAKE2B c1a0f845c01c5680cdf93347ba79c26ddb992cc36f928643876e1500a52a4b590020a057b2647fc7230f6c455a6359b742b7da779909567b791b1992156779a0 SHA512 7f4fc47ab055941d4d8e4ec94337c319170838bc4532f05dbf79aea3e5445253ca43f4585c6b626ab7f651dd8090116276eb8b9cfc3e36eb30abdb815609b482
+EBUILD qemu-4.0.0-r3.ebuild 23896 BLAKE2B 7017b7230d82fe0be70c7e58c39728bd347cdb88398fdd5919103d4b47dab1036acc94229d8cd26bf9994b2759c0fd97237cf293a50e4c26c72b21471fdd7403 SHA512 24db550748e80d5e624ac9d154471fcafe74a77a592e2366423461c3b80b0521d44fa3693eace4382760fc86329245f0301dd93d5b836945c5fce33807853fea
+EBUILD qemu-9999.ebuild 23822 BLAKE2B 3579d3d62c9c8c5566e3130e4b9acd6d5344e51e02e9947441e68feb9492857ec6c5cd95644af7cec02038a4a37ca56a2af7c176f5b54bf6ed058b2884448240 SHA512 216f54fecf55fde9f0f87221d519e24ddc218c07ea4da9d0ab6b4179133312baea64cbf055c33195d4133cad2a74d944e94ea44249e1e3c3cb6af68f5587f476
 MISC metadata.xml 3903 BLAKE2B 47538d32d79321c208037c95184ab68dbbcaa2331a561142bbadc01fbc2b7973cc5ae76ac6dfa7faf1c3aa31d1d0b5dfd6a46211e94c17c5a8939b0ae99b227b SHA512 d501ede1f3182e635db02c8bac4381906ac47b8d6db4bb6b0fdeb91b35b440a2a59a5dd23b06462f1d49a6b64ae2f2bcf1f81fd0a898c8f4b67a40ccf2c58341
diff --git a/app-emulation/qemu/qemu-4.0.0-r3.ebuild b/app-emulation/qemu/qemu-4.0.0-r3.ebuild
index c2258e18215a..bd09a33e9d46 100644
--- a/app-emulation/qemu/qemu-4.0.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
 	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
 	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
 	pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 676ae8f0a213..3e7962a76402 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
 	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
 	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
 	pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index e5205ab9c2ea..f390f65d2107 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -5,10 +5,12 @@ DIST skopeo-0.1.31.tar.gz 2886364 BLAKE2B 9ef9eb4fdd722216f15e14de6702aa0dfe3331
 DIST skopeo-0.1.32.tar.gz 4366298 BLAKE2B b358cb197475d693fa47cdfda738a78f70c9f59c5e3e61e55f3be21ea137640de2e9c61eb6437faca9a8f0e8dd6dda673e1cd645922a23533e6101eb326ef789 SHA512 c52eeee85aa01448c9742d4e415e3ce6f2e0ef4e26a55758202baecb573ad8e3efb94c762d4c303fb21b896998b32e19f919a7382dfd6b17df2a96d66d07267b
 DIST skopeo-0.1.34.tar.gz 2859957 BLAKE2B f36062374b2afa7363a02d6410bd35bbf5ccd0599eea7eb6d68b769e9fbf492dc7843dbd184fccc742250fcd3e573e33bd5454971730bcec2151a52a32b81680 SHA512 3ba99fcbff9f46fa1a4226bfc54961cf640150e0e0ac6b3457e862ef94991fa05a7bd609cbf8c87a0424df6942653fb5492a3893fa5282242c4df6913c4312a2
 DIST skopeo-0.1.35.tar.gz 2723348 BLAKE2B 74a98e43ff2b32ea29b9e57ea6ba20323660b631f4a7541aa1c720e283286809c501d655af18aa794123b3af727ca54bb41686a6b0d79b33c8f82f8642cc6176 SHA512 ec5aeb596aaf51512c049dc55353ce2d076ac30ae0fc3f9e90b8a8a9fb07ec86aafe51111d38e2d34ea5193c0a6f9e74a69536bf5b759fdedfa0c97deb211894
+DIST skopeo-0.1.36.tar.gz 2754977 BLAKE2B 4a25bf092b45084d252f8cf0c50f2389210e06bb8ee4f2939cfc93e1e66764ee340d77ca7ff0e731b55dfc42c48bc69b567e6d43d10da1119f5eeeae34aba291 SHA512 2ee51017a8d768c2a7b264f4c50d4a29d8b99e30049277bca5a5d47ff0ff09bb1c92c54f7f5230d966976b41353f7c8ffb9aa5571da2471f526ec8476cb127b2
 EBUILD skopeo-0.1.22.ebuild 1341 BLAKE2B 7ad0f306ac63766a536809f9b895bd8a2a677c152f9806b593355cef618efd6aef8b1e2c8f70f979eeb1f99a8ba365b440dc9252f80cbbf0d4e882cef1840fba SHA512 84e7d05d76f896ef62021a80c093df74a575ccf2c79cab2f80e47b01e4d9ee4f60ee4713738d887579eb617a5e95d68a017c026d899c0a4d2d40b9ee5752a0e4
 EBUILD skopeo-0.1.30.ebuild 1292 BLAKE2B 554710ddbd65d0b3930ac4a0e23ce8cd2336cbc640a04e73afd885bfab1e5c84004b3e27e45ba86b19c40907cc4e28f37806cf6cef5c0e863d47da5a849cc3ea SHA512 708996e9c9bd91b474e6b443874d34c5c5752a64835ec7b279ae0c442ccbe28820bb003a1ab90fae8e23a9b8c534250c7f77f8574eef910dd8a64f5fe2449dec
 EBUILD skopeo-0.1.31.ebuild 1292 BLAKE2B 29f2228680d49b433e5376d230fe55e751d680ec24b9fd5755ba71cf635b2e8e416aef85ef0541e5e691f3ccdde5576bb43e9b7c8835aff8d2ffebc3298d83bb SHA512 11782377ce6d4263dc678e141f4b8ab96e0702e0f6b893ce41ad46f09fbcf837a20066622bd51e6640df3c5a72dd226f7879dacaf660b47d1e4d45771dde27e6
 EBUILD skopeo-0.1.32.ebuild 1280 BLAKE2B 7280ea0f0f7a3040fd2cf42563f7dd8a47d508bdb462c99fff6a41a6f7c7690d1c962a39a6c7dc6f8ad035fea52d6b72b7ca3af9e2be9460d76b40f50835802c SHA512 2a8209228700fc09c416d59e66c8f45b7a1e0b88cfd486b7009bb44419de8e11303ab6ea0bf0022e4e135c9b70f748b5e503ccdece578f1bbbff514081fd98b7
 EBUILD skopeo-0.1.34.ebuild 1335 BLAKE2B c18ebeb72018d0b37f6c1923c4867b528b05465d521e60b23531ba17b233ff17f26e0e7c0d57f9b912655d9bf13be46f875386e523c1b212b11edfcee95e5ed3 SHA512 4da6b6e6288e8f33b321670a363efe482199bc3c953410cfd0c82f386256ce60d9e3e90b5bea570036a257fbc4789e8a8975b1cb438ea31a43e175071bb3d356
 EBUILD skopeo-0.1.35.ebuild 1364 BLAKE2B e6be11dd4ec26eb3015a36daa38eade6aacf12ddbeb315485f8baa094b73348fa734f7b34999f5eb9d74e58169f130e09ded8feb19ee5be463924b6f632f5dfc SHA512 03e52ecb0d6f4769f05fcada7e3aa85bb98c973420cd7c235a9dd8d6d430e7c3ba1c0a4c8b2dbae797d36fada397c302d4689000ab7292fc18fd93af435327a5
+EBUILD skopeo-0.1.36.ebuild 1393 BLAKE2B 191aabe1ba3529bfdfc05d226cd55d2ecc624e8bd8b0d3f65144f68eb4fab4c23f5a482093ccfa1c37ed2c0a75f12db5819b2b0691902ddc3a47434a8bde86f4 SHA512 75ace3514d8ad5cc46f7f378b6a4cdb27494810022d04aa2132da9b5466333d7effd7daf8e9749b05ae6c335e57e49b2415b1dcedeeac564c85650d4eeb87183
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/skopeo/skopeo-0.1.36.ebuild b/app-emulation/skopeo/skopeo-0.1.36.ebuild
new file mode 100644
index 000000000000..8ccfaefb099c
--- /dev/null
+++ b/app-emulation/skopeo/skopeo-0.1.36.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/containers/skopeo
+COMMIT=41991ba
+inherit golang-vcs-snapshot bash-completion-r1
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/containers/skopeo"
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
+	>=dev-libs/libassuan-2.4.3:=
+	dev-libs/libgpg-error:=
+	>=sys-fs/btrfs-progs-4.0.1
+	>=sys-fs/lvm2-2.02.145:="
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+RESTRICT="test"
+
+src_compile() {
+	local BUILDTAGS="containers_image_ostree_stub"
+	set -- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" \
+		go build -ldflags "-X main.gitCommit=${COMMIT}" \
+		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
+		-o skopeo ./cmd/skopeo
+	echo "$@"
+	"$@" || die
+	cd docs || die
+	for f in *.1.md; do
+		go-md2man -in ${f} -out ${f%%.md} || die
+	done
+}
+
+src_install() {
+	dobin skopeo
+	doman docs/*.1
+	dobashcomp completions/bash/skopeo
+	insinto /etc/containers
+	newins default-policy.json policy.json
+	insinto /etc/containers/registries.d
+	doins default.yaml
+	keepdir /var/lib/atomic/sigstore
+	einstalldocs
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index 7d774d49b78d..6359c3ac962d 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,7 +1,3 @@
-DIST slirp4netns-0.2.1.tar.gz 136425 BLAKE2B 81d6a0e68433522c2382ca938515ff7a96bf9afab32d3b25db454c706f24afb671709bcca6d52b5673934bf1963ec1795f8022319c2f6d936fd17e87e4e3edff SHA512 f923fe7b02eb30a108e99c63574dd1e9e948c9afa56a2747ddb0b78ea24beadecbce93b3644171c3aea698e5d37f4302eb22e4187f14db870b1e8018f75f4089
 DIST slirp4netns-0.3.0.tar.gz 180149 BLAKE2B b7c552b5660f4be4a95d573ff51bbde1dec1daa7dd0d5a6c49b3d761743561e8211972d16e588519bce41eee0dd378837f7de3e4c7ccb37f13bfab21008ac640 SHA512 85eea233531123297efa5e7225cbda21c10ecb297fe13cd8bf75f8d18052bc8533c2db8ce6c1f7876f42b89e31ed2859eef33a3979cad95326d0c4b19f2871f1
-DIST slirp4netns-0.3.0_beta1.tar.gz 180649 BLAKE2B ca124cadf5cb14fdce9f0246babef32509db797ff8b8e707e85c63ad095ab44a3a20258d8b56de1899613d7cadd6e326aab1b279e89d2add2992aeab8aa8c741 SHA512 a7f4cf989d77738cf77ecc924bff177a20d87fa1c8ae8b91ac57917fa001346bad250a6ce776025b13b53ee0dc12d38cf1127011a127f34ca76eeb0453c2ca49
-EBUILD slirp4netns-0.2.1.ebuild 616 BLAKE2B e8465ab34bb62bce0add05711901da536310ef93b7333b2b4b685c696392ddfed951efadd20b75b8566cb62236682de51c34f6aacd05e5c44b756c9fb64df327 SHA512 edc8b417442015a8b045ace65631a5ec1cd0a80272a2251875d55118324500aec42b8f169da94e06f29222f4b99152c8cf363e4579a6708ce66e2a4d9dd0634c
-EBUILD slirp4netns-0.3.0.ebuild 663 BLAKE2B a0e4f8110c7b275a500dea381aadf01130c9d2004a9e88615e65aa294fa874afafdb1d5617f561e01209a0334cb53556e18d739dadfb8f5d56afe9d3c87f1dda SHA512 a59795763f34c7cb41ac916fdd46b32c1c7c5d2c3b198ba4bc41a36708062c677ae6768e814c27c6edb7a30250fecce1bd312a7735aeb70412bc69fc5a3f99fd
-EBUILD slirp4netns-0.3.0_beta1.ebuild 710 BLAKE2B a873821a34394f482b06e0ad327222a0795ff8f04f85164a20397b86ce39b619097c27824482b8fabdb1c44b0d19aceb0e054ba18e6993a014c9f57aa02fb846 SHA512 7e8ca26c5f6da1d4250e26a111a6443728f9871b5f11a70517e01f62699d6c7c5ce524d0f334b61d9f09657ab87d62ac376aaa41efd4d4f637c0cec64de5b03a
+EBUILD slirp4netns-0.3.0-r1.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
 MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-0.2.1.ebuild b/app-emulation/slirp4netns/slirp4netns-0.2.1.ebuild
deleted file mode 100644
index c0e3625e200d..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	elog "You need to have the tun kernel module loaded in order to have"
-	elog "slirp4netns working"
-}
diff --git a/app-emulation/slirp4netns/slirp4netns-0.3.0-r1.ebuild b/app-emulation/slirp4netns/slirp4netns-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..a87e63fe9495
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-0.3.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2=
+	dev-libs/libpcre:="
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You need to have the tun kernel module loaded in order to have"
+		elog "slirp4netns working"
+	fi
+}
diff --git a/app-emulation/slirp4netns/slirp4netns-0.3.0.ebuild b/app-emulation/slirp4netns/slirp4netns-0.3.0.ebuild
deleted file mode 100644
index e70e27b2aa80..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-0.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-emulation/slirp4netns/slirp4netns-0.3.0_beta1.ebuild b/app-emulation/slirp4netns/slirp4netns-0.3.0_beta1.ebuild
deleted file mode 100644
index 661c33043287..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-0.3.0_beta1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV/_beta/-beta.}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-
-S="${WORKDIR}/${P/_beta/-beta.}"
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-emulation/uae/Manifest b/app-emulation/uae/Manifest
deleted file mode 100644
index 7d7ffcfca8fe..000000000000
--- a/app-emulation/uae/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX sdlgfx.h 974 BLAKE2B aef68719eda2ee126bb8b9feb3efa8c83a765d829cb210946ee98465ae1af18368c4b9b8cc75f0c632653b6f555b678f4bd42f7386226322fac390eca8f0df77 SHA512 56614df4b2640f01a32e714fe3578d0607472b2cd49131124eee998d9ea43d223817d44c25be942c47e47a5599249672a61b03d3c87d94a8c48c6b3304e2bc8e
-AUX uae-0.8.25-allow_spaces_in_zip_filenames.diff 651 BLAKE2B 77d8e0044fa7bde30e2e2c185113dd846aababc0712cb3ac99aa97f81310bc89183e0be14cbe6b3a6c3326e5eddf9a58bddfd9fb1440764f31aa4cb4cae0a4c2 SHA512 f69200029c1c3e2a38ebbf09fda254e98e8ed457b447801953519969be6d78e73a8054a66f44c8c495a1205aa54033914da43159f84985f9421844c7a00740a0
-AUX uae-0.8.25-struct_uae_wrong_fields_name.diff 613 BLAKE2B 978f856d8490eb3bee12ce79f0f4c742b43ff1815c2059fc8cd1aa473a194f7806269ebe953b4c62c9bf16adc69ab4290d42484bbe15badc53a02a5750640eb4 SHA512 553150271c42ca76f414fd19e482230dedc7ea9c466d5bffb31ef5e729a92d558c020f91aae3a91570b1ef5cef5af5f6872bdaf009db17517651b5e106323270
-AUX uae-0.8.26-uae_reset_args.diff 3216 BLAKE2B 45d240927f36ceb3aa4a688178e48ad02326ccd0a2d02826d5446c2cc05dbd074f8ff9686a7c99c11b5d3784d0d9f943157cd2f3d8202a3f16595d73f2ab06a0 SHA512 04d404efa4d63fa89eb537e9c0f6b964e5dad031305abdf6ba08339d1aa5d211b51c37599202e52210b5805ebb5c1109b5b04092e2484001b7f630b268e59a21
-AUX uae-0.8.26-underlinking.patch 499 BLAKE2B e410d1670cca22d7983e26b412b3bd11b87c883862a6f9d41aec61856cf5bfaac50e96f88c45245b780c099c21256827290b28b18238f63d6964337b9305fe8c SHA512 8a297f34d3550a66b4145ef913cd2ef4399ebcd43adff88b9d0b93a6eabb1ace8dedef53f515b6f413faef7b6e6491fd81f3b60a0e6efa67212b082d2671b74a
-DIST uae-0.8.29.tar.bz2 925508 BLAKE2B 8e3c9d719ecfee863b299214837834715ab660d0ef32d99ae78125d6dc4e062d20f37b380fb2daa06019c8a6f9f176c3a2d9239dd85bc2597f253decc98192f8 SHA512 2b8f362f9ba7171cf9ce71938b0a4f22c5d90d518524d50023792f4dc9f75a1b1e17e55966926e1138801b4d9ffbc2f1ae4c4b5dfa42e98a8e6ec688adb84064
-EBUILD uae-0.8.29-r2.ebuild 1788 BLAKE2B 84d5d3bcd1b41dc2a0b286b27497099f724825121b169560d033a02b4de773a0a22f0ed87871e8506a46edc72b5a22e59209440b9f7a548e82093bc981816240 SHA512 c1d1cd60d58aefcca7583d56d1f6bd115a4f3f5d483740110a0309081bb488d8974f69739e2d6e8fe9902d993b831954c7e3934a3b6ed51f83519ccd89e650fa
-MISC metadata.xml 673 BLAKE2B 2478e77270a9f13f20f0f2ad6069a03c547edeec46d7217b610bf7565e555d412eed3b7346d938363d18719f772ffe7529d90d99a2243743ef53b2bf74b635ec SHA512 032f19c7d06b328cf02f8ef99094999a59bdc1072141e96313cfd2c8d1b3bd6ef4644e8d0f4a066e0d21cff73334b186e05d5ae9935d366c4a2920992cce6868
diff --git a/app-emulation/uae/files/sdlgfx.h b/app-emulation/uae/files/sdlgfx.h
deleted file mode 100644
index 30bee2ee4024..000000000000
--- a/app-emulation/uae/files/sdlgfx.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * UAE - The Un*x Amiga Emulator
- *
- * SDL graphics support
- *
- * Copyright 2004 Richard Drummond
- */
-
-/*
- * What graphics platform are we running on . . .?
- *
- * Yes, SDL is supposed to abstract away from the underlying
- * platform, but we need to know this to be able to map raw keys
- * and to work around any platform-specific quirks . . .
- */
-enum {
-    SDLGFX_DRIVER_UNKNOWN,
-    SDLGFX_DRIVER_X11,
-    SDLGFX_DRIVER_DGA,
-    SDLGFX_DRIVER_SVGALIB,
-    SDLGFX_DRIVER_FBCON,
-    SDLGFX_DRIVER_DIRECTFB,
-    SDLGFX_DRIVER_QUARTZ,
-    SDLGFX_DRIVER_BWINDOW,
-    SDLGFX_DRIVER_CYBERGFX,
-    SDLGFX_DRIVER_AMIGAOS4
-};
-
-extern int get_sdlgfx_type (void);
-
-/* keyboard support */
-struct uae_input_device_kbr_default *get_default_raw_keymap (int type);
-extern int keysym2amiga (int keycode);
-int modifier_hack (int *scancode, int *pressed);
-
-/* hotkey support */
-struct uae_hotkeyseq *get_default_cooked_hotkeys (void);
-struct uae_hotkeyseq *get_default_raw_hotkeys (void);
diff --git a/app-emulation/uae/files/uae-0.8.25-allow_spaces_in_zip_filenames.diff b/app-emulation/uae/files/uae-0.8.25-allow_spaces_in_zip_filenames.diff
deleted file mode 100644
index 629ae702c520..000000000000
--- a/app-emulation/uae/files/uae-0.8.25-allow_spaces_in_zip_filenames.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-## 03_allow_spaces_in_zip_filenames.dpatch by Florian Ernst <florian@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow spaces in filenames for zipped files, bug#238678
-
-@DPATCH@
-diff -urNad uae-0.8.25~/src/zfile.c uae-0.8.25/src/zfile.c
---- uae-0.8.25~/src/zfile.c	2005-07-01 17:53:26.000000000 +0200
-+++ uae-0.8.25/src/zfile.c	2005-11-08 01:17:59.000000000 +0100
-@@ -126,7 +126,7 @@
-     if (!dst)
- 	return 1;
- #if defined AMIGA || defined __unix
--    sprintf (cmd, "unzip -p %s '*.adf' >%s", src, dst);
-+    sprintf (cmd, "unzip -p \"%s\" '*.adf' >%s", src, dst);
-     return !system (cmd);
- #endif
- }
diff --git a/app-emulation/uae/files/uae-0.8.25-struct_uae_wrong_fields_name.diff b/app-emulation/uae/files/uae-0.8.25-struct_uae_wrong_fields_name.diff
deleted file mode 100644
index cd8d7e00cd8a..000000000000
--- a/app-emulation/uae/files/uae-0.8.25-struct_uae_wrong_fields_name.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Somewhere wrong (old) names are used in accessing the preferences structure.
-
-This is just a remainder for the upstream!!
-
-Antonio Ospite <ospite@studenti.unina.it>
-
-diff -pruN uae-0.8.25/src/tui.c uae-0.8.25_patched/src/tui.c
---- uae-0.8.25/src/tui.c	2006-06-07 17:45:55.000000000 +0200
-+++ uae-0.8.25_patched/src/tui.c	2006-06-07 17:55:39.000000000 +0200
-@@ -606,7 +606,7 @@ static void SoundOptions (void)
- 		currprefs.sound_freq = atoi (tmp);
- 	    break;
- 	 case 5:
--	    currprefs.stereo = (currprefs.stereo + 1) % 3;
-+	    currprefs.sound_stereo = (currprefs.sound_stereo + 1) % 3;
- 	    break;
- 	}
-     }
diff --git a/app-emulation/uae/files/uae-0.8.26-uae_reset_args.diff b/app-emulation/uae/files/uae-0.8.26-uae_reset_args.diff
deleted file mode 100644
index 3df99e4d2a4f..000000000000
--- a/app-emulation/uae/files/uae-0.8.26-uae_reset_args.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Naur uae-0.8.26.orig/src/ncurses.c uae-0.8.26/src/ncurses.c
---- uae-0.8.26.orig/src/ncurses.c	2007-08-05 20:01:58.000000000 +0400
-+++ uae-0.8.26/src/ncurses.c	2007-08-12 18:36:33.000000000 +0400
-@@ -595,7 +595,7 @@
- 	if (ch == 16) --lastmy; /* ^P */
- 	if (ch == 11) {buttonstate[0] = keydelay;ch = 0;} /* ^K */
- 	if (ch == 25) {buttonstate[2] = keydelay;ch = 0;} /* ^Y */
--	if (ch == 15) uae_reset (); /* ^O */
-+	if (ch == 15) uae_reset (0); /* ^O */
- 	if (ch == 17) uae_quit (); /* ^Q */
- 	if (ch == KEY_F(1)) {
- 	  curses_insert_disk();
-diff -Naur uae-0.8.26.orig/src/NeXTwin.m uae-0.8.26/src/NeXTwin.m
---- uae-0.8.26.orig/src/NeXTwin.m	1997-10-18 17:39:04.000000000 +0400
-+++ uae-0.8.26/src/NeXTwin.m	2007-08-12 18:36:33.000000000 +0400
-@@ -86,7 +86,7 @@
- @implementation AmigaView
- -reset:sender
- 	{
--	uae_reset();
-+	uae_reset(0);
- 	//m68k_reset();
- 	return self;
- 	}
-diff -Naur uae-0.8.26.orig/src/od-beos/beos.cpp uae-0.8.26/src/od-beos/beos.cpp
---- uae-0.8.26.orig/src/od-beos/beos.cpp	2001-02-19 23:59:11.000000000 +0300
-+++ uae-0.8.26/src/od-beos/beos.cpp	2007-08-12 18:36:33.000000000 +0400
-@@ -719,7 +719,7 @@
- 	uint32 mouse_buttons;
- 
- 	if (reset_thyself) {
--		uae_reset();
-+		uae_reset(0);
- 		reset_thyself = false;
- 	}
- 
-diff -Naur uae-0.8.26.orig/src/od-win32/keyboard.c uae-0.8.26/src/od-win32/keyboard.c
---- uae-0.8.26.orig/src/od-win32/keyboard.c	2007-08-06 00:23:08.000000000 +0400
-+++ uae-0.8.26/src/od-win32/keyboard.c	2007-08-12 18:36:33.000000000 +0400
-@@ -488,8 +488,8 @@
- 	record_key ((akey << 1) + 1);
- 
-     /* "Affengriff" */
--	if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_LAMI] && keystate[AK_RAMI])uae_reset();
--    //if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_RAMI])uae_reset();
-+	if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_LAMI] && keystate[AK_RAMI])uae_reset(0);
-+    //if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_RAMI])uae_reset(0);
- 
-     return 0;
- }
-diff -Naur uae-0.8.26.orig/src/od-win32/win32gui.c uae-0.8.26/src/od-win32/win32gui.c
---- uae-0.8.26.orig/src/od-win32/win32gui.c	2007-08-06 00:23:08.000000000 +0400
-+++ uae-0.8.26/src/od-win32/win32gui.c	2007-08-12 18:36:33.000000000 +0400
-@@ -2260,7 +2260,7 @@
- 	    }
- 	    break;
- 	case IDC_RESETAMIGA:
--	    uae_reset();
-+	    uae_reset(0);
- 	    break;
- 	case IDC_QUITEMU:
- 	    uae_quit();
-diff -Naur uae-0.8.26.orig/src/svga.c uae-0.8.26/src/svga.c
---- uae-0.8.26.orig/src/svga.c	2007-08-05 20:01:58.000000000 +0400
-+++ uae-0.8.26/src/svga.c	2007-08-12 18:36:33.000000000 +0400
-@@ -438,7 +438,7 @@
- 
-     /* "Affengriff" */
-     if ((keystate[AK_CTRL] || keystate[AK_RCTRL]) && keystate[AK_LAMI] && keystate[AK_RAMI])
--	uae_reset ();
-+	uae_reset (0);
- }
- 
- static void leave_graphics_mode (void)
-diff -Naur uae-0.8.26.orig/src/tui.c uae-0.8.26/src/tui.c
---- uae-0.8.26.orig/src/tui.c	2007-08-12 18:35:41.000000000 +0400
-+++ uae-0.8.26/src/tui.c	2007-08-12 18:36:33.000000000 +0400
-@@ -683,7 +683,7 @@
- 	     case 0: DiskOptions (); break;
- 	     case 1: OtherOptions (); break;
- 	     case 2: save_settings (); break;
--	     case 3: uae_reset (); break;
-+	     case 3: uae_reset (0); break;
- 	     case 4: uae_quit (); break;
- 	    }
- 	}
diff --git a/app-emulation/uae/files/uae-0.8.26-underlinking.patch b/app-emulation/uae/files/uae-0.8.26-underlinking.patch
deleted file mode 100644
index 16bf5744826e..000000000000
--- a/app-emulation/uae/files/uae-0.8.26-underlinking.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -81,6 +81,16 @@
- AC_CHECK_LIB(audio, alOpenPort, HAVE_SGIAUDIO_LIB=yes, HAVE_SGIAUDIO_LIB=no)
- AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA=yes, HAVE_ALSA=no)
- 
-+dnl Check for libm for cos()
-+AC_SEARCH_LIBS([cos], [m], [], [
-+	AC_MSG_ERROR([unable to find the cos() function])
-+])
-+
-+dnl Check for libm for floor()
-+AC_SEARCH_LIBS([floor], [m], [], [
-+	AC_MSG_ERROR([unable to find the floor() function])
-+])
-+
- AC_PATH_XTRA
- AC_CONFIG_HEADER(src/sysconfig.h)
- 
diff --git a/app-emulation/uae/metadata.xml b/app-emulation/uae/metadata.xml
deleted file mode 100644
index 86f65e797020..000000000000
--- a/app-emulation/uae/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-needed -->
-	<longdescription>
-		UAE is a mostly complete software emulation of the hardware of the
-		Commodore Amiga 500/1000/2000. A Commodore Amiga is a 16/32 bit computer
-		system based on the Motorola 680x0 CPU and a few specially designed
-		custom chips that provide very good graphics and sound capabilities. It's
-		first incarnation, the A1000, appeared in 1985, followed by the highly
-		successful A500 and A2000 models.
-	</longdescription>
-	<use>
-		<flag name="scsi">Enable the uaescsi.device</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-emulation/uae/uae-0.8.29-r2.ebuild b/app-emulation/uae/uae-0.8.29-r2.ebuild
deleted file mode 100644
index 98485c01745e..000000000000
--- a/app-emulation/uae/uae-0.8.29-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools
-
-DESCRIPTION="The Umiquious Amiga Emulator"
-HOMEPAGE="http://www.amigaemulator.org/"
-SRC_URI="ftp://ftp.amigaemulator.org/pub/uae/sources/develop/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="sdl alsa scsi"
-
-DEPEND="sdl? ( media-libs/libsdl
-		   media-libs/sdl-gfx
-		   x11-libs/gtk+:2
-		   alsa? ( media-libs/alsa-lib )
-	)
-	!sdl? ( x11-libs/libXext
-		 x11-libs/gtk+:2
-	)
-	alsa? ( media-libs/alsa-lib )
-	scsi? ( app-cdr/cdrtools )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.25-allow_spaces_in_zip_filenames.diff
-	epatch "${FILESDIR}"/${PN}-0.8.25-struct_uae_wrong_fields_name.diff
-	epatch "${FILESDIR}"/${PN}-0.8.26-uae_reset_args.diff
-	epatch "${FILESDIR}"/${PN}-0.8.26-underlinking.patch
-
-	cp "${FILESDIR}"/sdlgfx.h "${S}"/src || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disabling lots of options, cause many code-paths are broken, these should compile,
-	# if you want/need other options, please test if they work with other combinations
-	# before opening a bug
-	econf --enable-ui --with-x --without-svgalib \
-		--without-asciiart --without-sdl-sound --enable-threads \
-		$(use_with sdl) $(use_with sdl sdl-gfx) \
-		$(use_with alsa) \
-		$(use_enable scsi scsi-device)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	dobin uae readdisk
-	cp docs/unix/README docs/README.unix || die
-	rm -r docs/{AmigaOS,BeOS,pOS,translated,unix} || die
-	dodoc docs/*
-
-	insinto /usr/share/uae/amiga-tools
-	doins amiga/{*hack,trans*,uae*}
-}
-
-pkg_postinst() {
-	elog
-	elog "Upstream recommends using SDL graphics (with an environment variable)"
-	elog "SDL_VIDEO_X11_XRANDR=1 for fullscreen support."
-	echo
-}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 7c7a8e3cbb8a..1c0df6868e61 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -4,21 +4,21 @@ DIST gentoo-wine-patches-20190430.tar.xz 58896 BLAKE2B 96c30ee48c4c50720abe8bb1d
 DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
 DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
 DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
-DIST wine-4.5.tar.xz 21879868 BLAKE2B fc2bc13fefac97570a67a1c48a0144c1194896f779803efc0c3229fc234f128f53c78cadb1d47d28ec6772ecea73831c8850322e537aa1af62b537b7856ecae5 SHA512 261420efdf14595715cff5bb6a61223b0f2090b89dc05dca8c053a8a81abc3018715d41db50769a0f0488c658efc0742ac0f577b578e69eace70be4e463131dd
 DIST wine-4.6.tar.xz 21940848 BLAKE2B 1dbac3b3e6d74b99123a0954015343514d0135a26cffe86499f8fbdfadd04205edfcd0635562519b73397519f298abe7e18693fa1433aa05255b2435a2eedb1a SHA512 b5d8568de0256bdd9f3fcaef725c8daa90d028838fd490f75d7f08a7c538103a957a4fd03857a8fbbdf1de6acb7237b183dad24d6057be50dae12af227cd2c98
 DIST wine-4.7.tar.xz 21962632 BLAKE2B 2f90212c93fb089fafb0dd44189044b3875a52e3f6b5300a44893ac9760afb398330c293abbffca15cd9f9a6da72e97c2702c04525e02663186d723f1f322da7 SHA512 cb768528db510f81d464b9c1bb48847162baaa86ef00dc7a418afdce38aa51262d150c14b3362fb40c93cc2e3633fc02b2916167f21af8a708eb393da6ba9163
 DIST wine-4.8.tar.xz 22024100 BLAKE2B cf87407a5fca83660c866a17ebeec62a97404c1eeb1d7b34a0995510e04aec2fe0350b644870a3d4817177b002cf07e69cd6761593122c93c22bda50bb8aec0b SHA512 ad91c31aad86b9932777a1c5a84760f41c63cfbb5d79f1a8afd132a8948667283f85e081a454cfc0904544394eaabb00fb986eba15efd8a8409db38e793f3dab
+DIST wine-4.9.tar.xz 22077528 BLAKE2B 98cf186152abc8379275b353e3934efc285cc386f33188a283e3568f803090057bcc90da6dd6c6c1e9d7dbbcf61fbe4a2316107ff129a7d7baa174982f9dcf26 SHA512 bf750af9569b0c564cd9581b9de8c399f6e42227eb6e79338ec6ba70f135fe3388b0792ff013add97341c488ed906227cdf93cc275e362ba232df78afaaab66d
 DIST wine-staging-3.20.tar.gz 9950555 BLAKE2B ee66217b708287bd95d61e23fb92009d927a75556f22e89b9c5af66cb6c6445f77a1c3153da168da92ebac58606843c4639f1a99bd5089941595181f390980f0 SHA512 4b92e53e84046d99c3f7ec5e0d0d7e62fdb767b1c44e23605125744686439fe62991c8adea941950b390a01d251ecbb79f3b329cfe5a1b1fbc76c5372283579d
 DIST wine-staging-3.21.tar.gz 9945982 BLAKE2B 988927c644e9abf472c42021cae39f38cdae24b397072fb53dc803da32bc80e8b6256554d787db0b6bffafac4104a9abf4ab8fa6e78fd0a308bf8906d658a65d SHA512 17f8194954a420d1424d564ba9ad5e6d4dd574dc38da4895d5b6740c1990f8655cb573bd57c77ace2c78c71da4782b511a5ac937ca1f0fc958e3c925abaeefde
-DIST wine-staging-4.5.tar.gz 9859696 BLAKE2B 3d6ea22659fe45fe6cbe0f292737d4238e9f32b307b1750debfcb628a72b1dfc8a486c644a78c2d0285a206d13644ecc3bd26a307e61f78cc118219bf3395ec6 SHA512 fda32b26de79bd3bbff6b1ab2249d7ff8adc7e8da2753271e8dae4f84bc71764ea6d1a887cc643e0ff70b217bd75fefebd3eb1bd4b6faace9a36399878998029
 DIST wine-staging-4.6.tar.gz 9937386 BLAKE2B 105f1e040b03835ea59100cde609ed005970ccdcc37ede775f13df73a50f19a8b192f17500e3658759eabe3dc0e529d0b658c218f7fd87cae72994806fd4dfe2 SHA512 4b44cbdeffc8042c22d485c3d440894287793652734b7a791269a2f45ea10ceb81ce8c8bd302c55f62b04c127344532772ce2078d99835d22afa0088e153a888
 DIST wine-staging-4.7.tar.gz 9944737 BLAKE2B ccbded3c39efc00cdedd3eee9d4cf21ccdb75fceeed2a953bef6f5ed642e665eb8c519e1717f1b152ee456e6c2fa3759369a7014940bf035dbc34e2188ffa894 SHA512 1d9040ea542d18d5d041179cede7e1db40fc638bdb4ffef70a257dc50310e9fd0f93e5aa222d2d90551783b5a5064b3919a19e9072f931a7ae89506c462fb3e6
 DIST wine-staging-4.8.tar.gz 9926681 BLAKE2B c5b5017c9675b3124f647d099755a997626a0c9f969a0d024473cb7cf52d2bb6b58f6ce427b86a13531d53b6172a3d3d62096926b6ffe013c9b15fc03ae11470 SHA512 f2e7fbe1ed0f77bd307185d0f7aa9e837e64f86ae98828db25e05c998ec07a9dd57dc9f3e6b093310c95ff2a517825d36420d7bd9fc9028d11bc29321ac3559e
+DIST wine-staging-4.9.tar.gz 9926386 BLAKE2B 17030134343da1971075f0397b56442d4cb459b491f0751c9f21dd4061d5110ab2c5c44cc984d43b8ad3480f735df3e6b9246868aec4984cc1c8be56072c44c1 SHA512 9676f54833a424f965af7591c40aa40cd3fb3b36062484de56585a631dafa68a9a545f00153350c067a0d73146f9f169a678041bb141f7562f9df6e31ec4e2d5
 EBUILD wine-staging-3.20.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
 EBUILD wine-staging-3.21.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
-EBUILD wine-staging-4.5.ebuild 20280 BLAKE2B bb9251fe89e9663b2301d60390af94452e518edb583493271531e765f78a03b6febc09a95fe53ef8c2dbd3a1f1448c0984603fbec24b3a975a820a564f9743cd SHA512 add579ceb72dfefa06d6664391a80cb7a1db98a54854e642d55ab1365d7420d63d3a9a4c599629f0c59aebe5378a44d20a4eea2b4eff7d2df4223ec78e1bccb6
 EBUILD wine-staging-4.6-r1.ebuild 20280 BLAKE2B 8c5ee19d0ce0c081f2d3a4895f6c1dc546ffa987ae48051d6b0d0a9f86e7d4a2f16222a1c0ecbe0627663e22eeb66bfde33be425bf82e0bef9c50ec58bc84fb9 SHA512 0efbdb07fd637d36172872c8a8757553941b9c11718fae6fec0090e0b651e31dc1b86d79632831f6964719beebe3db77a047415cdb4e0afed8c794efaeb483e3
 EBUILD wine-staging-4.7-r1.ebuild 20337 BLAKE2B 008d5ad36dd73036675bcd0360825c5f46ecd826078c629377ed15e8412b7e154d2ab1178623d348d6baeb37b6d3565af88f53408e661cae3d1bee760bd1eb55 SHA512 ff3f0320a9a5c98eaa26a873101afb431f6ff37d05f0f02c0b09f381129b4d1f636448fe64831e6cea76dee5be2ab725e62d5eb230974049b8f5df11277ec064
 EBUILD wine-staging-4.8.ebuild 20347 BLAKE2B 8a0cf4b66164c7131f642b6a92605aec55ceba26589c7b6cdb2130ca7f6b93782d115e45ffe1cde8cf9a9870bdbf22482bb5d1aabc5296127aebdfa5d5bc5d1a SHA512 f0b1fc084f792086c127b48f77420b0d9fb2c3f759a126945c0212237b94de4740aabd7f85649e2680c10e27383095d6a2610ea73676cca79ac61668aba35bfe
+EBUILD wine-staging-4.9.ebuild 20347 BLAKE2B 8a0cf4b66164c7131f642b6a92605aec55ceba26589c7b6cdb2130ca7f6b93782d115e45ffe1cde8cf9a9870bdbf22482bb5d1aabc5296127aebdfa5d5bc5d1a SHA512 f0b1fc084f792086c127b48f77420b0d9fb2c3f759a126945c0212237b94de4740aabd7f85649e2680c10e27383095d6a2610ea73676cca79ac61668aba35bfe
 EBUILD wine-staging-9999.ebuild 20347 BLAKE2B 8a0cf4b66164c7131f642b6a92605aec55ceba26589c7b6cdb2130ca7f6b93782d115e45ffe1cde8cf9a9870bdbf22482bb5d1aabc5296127aebdfa5d5bc5d1a SHA512 f0b1fc084f792086c127b48f77420b0d9fb2c3f759a126945c0212237b94de4740aabd7f85649e2680c10e27383095d6a2610ea73676cca79ac61668aba35bfe
 MISC metadata.xml 3712 BLAKE2B e42b36bfa8f6d0f4c9b2538c04bb0b7650c411b621a1be5cba58ca8f6f64a1bc68517eeef385351461ef72e33152b05df14775777de14e848802ee8eb4980909 SHA512 1a904083074cad42013d9a8798ea32898332fa0697f79a1a11e6a0f5b6dcf35cb42dbb52a3b5baaeb3fe2012f80dfbbafbd874df4eef783e8a151b13b98afe77
diff --git a/app-emulation/wine-staging/wine-staging-4.5.ebuild b/app-emulation/wine-staging/wine-staging-4.5.ebuild
deleted file mode 100644
index 1fa673641c44..000000000000
--- a/app-emulation/wine-staging/wine-staging-4.5.ebuild
+++ /dev/null
@@ -1,617 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20190316"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	ffmpeg? ( staging )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.8.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-4.4-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environment variables:"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environment variables:"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE=""
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-		use faudio && STAGING_EXCLUDE="${STAGING_EXCLUDE} -W xaudio2-revert -W xaudio2_CommitChanges -W xaudio2_7-WMA_support -W xaudio2_7-CreateFX-FXEcho"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		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
-
-	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() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with ffmpeg)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for 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() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/wine-staging-4.9.ebuild b/app-emulation/wine-staging/wine-staging-4.9.ebuild
new file mode 100644
index 000000000000..fa474a55dcfa
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-4.9.ebuild
@@ -0,0 +1,618 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast 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 si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20190511"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	ffmpeg? ( staging )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.8.3 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environment variables:"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environment variables:"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+		use faudio && STAGING_EXCLUDE="${STAGING_EXCLUDE} -W xaudio2-revert -W xaudio2_CommitChanges -W xaudio2_7-WMA_support -W xaudio2_7-CreateFX-FXEcho"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		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
+
+	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() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with ffmpeg)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for 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() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 3b8daa118f63..16a551bc887e 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -8,19 +8,19 @@ DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a
 DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
 DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855fa98ac3128e9b89dbeee6e92044ed1e662e1dc9669bd8d805424c36f2dd2c836c51bf6a5e4d78350926a13150 SHA512 dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc
 DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.5.tar.xz 21879868 BLAKE2B fc2bc13fefac97570a67a1c48a0144c1194896f779803efc0c3229fc234f128f53c78cadb1d47d28ec6772ecea73831c8850322e537aa1af62b537b7856ecae5 SHA512 261420efdf14595715cff5bb6a61223b0f2090b89dc05dca8c053a8a81abc3018715d41db50769a0f0488c658efc0742ac0f577b578e69eace70be4e463131dd
 DIST wine-4.6.tar.xz 21940848 BLAKE2B 1dbac3b3e6d74b99123a0954015343514d0135a26cffe86499f8fbdfadd04205edfcd0635562519b73397519f298abe7e18693fa1433aa05255b2435a2eedb1a SHA512 b5d8568de0256bdd9f3fcaef725c8daa90d028838fd490f75d7f08a7c538103a957a4fd03857a8fbbdf1de6acb7237b183dad24d6057be50dae12af227cd2c98
 DIST wine-4.7.tar.xz 21962632 BLAKE2B 2f90212c93fb089fafb0dd44189044b3875a52e3f6b5300a44893ac9760afb398330c293abbffca15cd9f9a6da72e97c2702c04525e02663186d723f1f322da7 SHA512 cb768528db510f81d464b9c1bb48847162baaa86ef00dc7a418afdce38aa51262d150c14b3362fb40c93cc2e3633fc02b2916167f21af8a708eb393da6ba9163
 DIST wine-4.8.tar.xz 22024100 BLAKE2B cf87407a5fca83660c866a17ebeec62a97404c1eeb1d7b34a0995510e04aec2fe0350b644870a3d4817177b002cf07e69cd6761593122c93c22bda50bb8aec0b SHA512 ad91c31aad86b9932777a1c5a84760f41c63cfbb5d79f1a8afd132a8948667283f85e081a454cfc0904544394eaabb00fb986eba15efd8a8409db38e793f3dab
+DIST wine-4.9.tar.xz 22077528 BLAKE2B 98cf186152abc8379275b353e3934efc285cc386f33188a283e3568f803090057bcc90da6dd6c6c1e9d7dbbcf61fbe4a2316107ff129a7d7baa174982f9dcf26 SHA512 bf750af9569b0c564cd9581b9de8c399f6e42227eb6e79338ec6ba70f135fe3388b0792ff013add97341c488ed906227cdf93cc275e362ba232df78afaaab66d
 EBUILD wine-vanilla-3.0.3.ebuild 17120 BLAKE2B a8cf3d4872ba5f91a691817bfc9421a6a5bc1079141c8c3d53dc5726bc2aacd46090d253390278ec5e8e19c63e613c1289a62957a75487f7dc10ee68b8e4778d SHA512 36c54300f1d396a0e5d990316525dd68103a5e25623e84134b35e708d35d7c8b4cbf6100e91396b29daed058fc64a51bac39b7b14684baffafe1e2f05f695b23
 EBUILD wine-vanilla-3.0.4.ebuild 17085 BLAKE2B d1831445374f36c0fd20b930b2786c79054473868b1d319d1824b935e5e3f2fd07aafa24948040ac1cade51e5748843438f51e473a385c654fa3fe282277e0d7 SHA512 20342989e375114278c77c3dbd8fc1e9483281ab4147006a5f7fc6e657287c327b25cf002581c1a94fec9e9e982710b179415af4cbcf9eebae708ac41079765e
 EBUILD wine-vanilla-3.20.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
 EBUILD wine-vanilla-3.21.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
 EBUILD wine-vanilla-4.0.1.ebuild 17349 BLAKE2B 7b7039fa758f0c0cc786edf757e9ffa3da2aef90f723ed4a84b6079e0d62c52a55ab4a82388b4f2864cd07e35668bda72f21064d2f69c773d045622e26812699 SHA512 794293029f75fd2924b3e02bf5f79ec610480083b75e4b45916f645a5ed53386fb2391a13ef2a382dc79ec9a2e3dbe737662745e91c315c34aff80951a5b0b80
 EBUILD wine-vanilla-4.0.ebuild 17341 BLAKE2B bdb219c3352300bfa6bf2194696ed44a4632170ae6c03c938203c57b9b6aa23c5de2276a42bc9943dfbcbc942214fcdeb7a313deebf25c9b8570c3fe51c9bc8e SHA512 65e06fc637ec397e3365d7be2e58b130852675a93ea235e6066e01f9e5b7efd098868fdc1c3fce810dd72dd1c0e66bab9a4941b7f3a1ceff40a744776cb91055
-EBUILD wine-vanilla-4.5.ebuild 17389 BLAKE2B a6ed1703bc53e986e53ead04bff804a0cc2da4f704ffc018d980fd1a4be5cffc49b57565edf148286d0d5501cb0c6381dc17b92a93b51e899b50b3844fc978b1 SHA512 8ed9bd56ae83e179df73a55b47c04a6f8fb124e065c7ca6275c74eddbed764293f41ab4c0799cff14a9596e486eb0c871602946bf8e82fe4b4f7db17c975e64b
 EBUILD wine-vanilla-4.6-r1.ebuild 17389 BLAKE2B cd54cb08e094ee3b32ea280dd335c8572ee55fbd18071e1cd5796672c110faac5fc5b08613332658ea7a101d5bca903c7b87e4f384d4fd9f6c716aa5cbd51de4 SHA512 a6ddcd8036dbbe714bb7e406f35be62e4b2a37f49048a1b16df0fc0a7aac09ed013d573d475c48151beb15ff6c032089ff8b078ddd40fef643a7a040e8e69bd8
 EBUILD wine-vanilla-4.7-r1.ebuild 17450 BLAKE2B 161e709bb04d61fb6f9eba1ada3a602210c9836f68db1106a39f83a14e603aa039f3a46a468027297d6d00d5fd007b9c5f119c9bd69f796099c32600c3aa1d00 SHA512 ec40c999dfb76bd2706525cf6a08b4d8305ed9105b3a5374cf48ed23b41f78cc5958a041125302d4626fd17277ea82f658cccb8d1b4a34d74148222b9634c456
 EBUILD wine-vanilla-4.8.ebuild 17457 BLAKE2B fff97c3b2b1e4b34d9cc3f7704d642330a026c8e3a2fa95724a063d4d3ad735c096171b41735c6dc068c26fbdd3f9da2c64fdd6fa68718c73de31c33481cc95f SHA512 3a3b8d73f8467640e236113120eda2e80b45378a6b9b4c9644d6abb320bc6064eece3163ea4c8da6f643adffac9d317518c34e98bc8571fa121fa8b1bdaebe86
+EBUILD wine-vanilla-4.9.ebuild 17457 BLAKE2B fff97c3b2b1e4b34d9cc3f7704d642330a026c8e3a2fa95724a063d4d3ad735c096171b41735c6dc068c26fbdd3f9da2c64fdd6fa68718c73de31c33481cc95f SHA512 3a3b8d73f8467640e236113120eda2e80b45378a6b9b4c9644d6abb320bc6064eece3163ea4c8da6f643adffac9d317518c34e98bc8571fa121fa8b1bdaebe86
 EBUILD wine-vanilla-9999.ebuild 17457 BLAKE2B fff97c3b2b1e4b34d9cc3f7704d642330a026c8e3a2fa95724a063d4d3ad735c096171b41735c6dc068c26fbdd3f9da2c64fdd6fa68718c73de31c33481cc95f SHA512 3a3b8d73f8467640e236113120eda2e80b45378a6b9b4c9644d6abb320bc6064eece3163ea4c8da6f643adffac9d317518c34e98bc8571fa121fa8b1bdaebe86
 MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.5.ebuild
deleted file mode 100644
index b1a8313b6930..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-4.5.ebuild
+++ /dev/null
@@ -1,534 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20190316"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.8.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-4.4-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "EGIT_OVERRIDE_COMMIT_WINE"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		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
-
-	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() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for 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() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.9.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.9.ebuild
new file mode 100644
index 000000000000..70c9c99fce97
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.9.ebuild
@@ -0,0 +1,535 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast 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 si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20190511"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.8.3 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "EGIT_OVERRIDE_COMMIT_WINE"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		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
+
+	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() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for 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() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index c48fd3f7e92b..393bdb62e5c7 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,7 +1,5 @@
-DIST winetricks-20170823.tar.gz 639027 BLAKE2B ce0de22ff3363bd6fd675d07ea235ed5fb03ea7a84b3242329c094d6a9190c61813a1f360e74ece49d43d2dbf48dbbb1e94c4febc6e1a0d84cf1df895b0be6f9 SHA512 edc805be1a1c4fa64ae16b14fdd46786e259b88a0cde7afdf24bf934fa79f4acf3d9e599727fa589f155ec265569953b9e419cda79d54057157cbb1510261e3a
 DIST winetricks-20190310.tar.gz 673467 BLAKE2B b6c6a6d28e49f9b2745ac623f9a9d35bdcaa402c11b3f2055f3d2ef2d13ccff6adcda47261447aff7b70bfcd9bc65ea2a278368616df93f031fe212aa3201a5d SHA512 4f08228306a84cd2e1ecf0df46e951dfc5844716fadab903eca7ed09f15ed2bbba7ca5bf48384f934783be6a85b812129427a296a580561ee5b8483df0e64025
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
-EBUILD winetricks-20170823.ebuild 1844 BLAKE2B c6781f586fc1ed47ac10e44e46c5d45cdec3af746ee58b091138a309a296c61b0f57985031b4543416e359e34b0cf87c014fa5130c6b63f08845b24ed2536f82 SHA512 49ba07ab2db89109ba4a444827849c1aa96cdfa3485cb013f1a92967a9923943225784c34427aa160a476c31b3b55aac30b28a95959a6f6d5f98c59ef5d41c94
 EBUILD winetricks-20190310.ebuild 1910 BLAKE2B ce6174352c8370e08edb836801010698fc2b717c438e8661818e2f0b6538f3af4ff647b7693e6a56e07b1d7db8732dd3e651d24ecd186e135603c521d8d0c6e0 SHA512 9fec59c039413af08fff8d8ee301607683fd9645f79b1bd4e4fdc52a0e93e40a1cc126dd160a7387722e22bddab1e8a2d90e4afc58558e3d3a7532176b0f7d26
 EBUILD winetricks-99999999.ebuild 1912 BLAKE2B fe3c652325f6d428cacbc22f74ae0fd93e397e8b4b81287e7611608cbf7f3c0261e5844d722ddc1823a94be344b4e3c1d3bafb07e958afd7568cfc1b576f105a SHA512 b10f311f6be55a688021dc83821b0c78e8305271e3bc1a982fab034b9b0c8f489a26df94140c2c4f545d79b0639930f90ea7380cbfccdcc460ee0e88d2a5b946
 MISC metadata.xml 713 BLAKE2B 144bf83fd445c85df10c852a798f8e6f049923489e039fceb81989279eba2f869fb5b660482cd2f0be872761bdee3fb1104df207f44daa060dee1aab6cddd9f4 SHA512 f1fc5650abbff4a82a006461932d765d775cdbd630ebcbfdd02488b2f1999d41e89b2a45d6142175e715e186392f4bc4820f501c4064e4a9aa9c8dabbc1ce6a9
diff --git a/app-emulation/winetricks/winetricks-20170823.ebuild b/app-emulation/winetricks/winetricks-20170823.ebuild
deleted file mode 100644
index 111786b25a30..000000000000
--- a/app-emulation/winetricks/winetricks-20170823.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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"
-
-DEPEND=""
-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 )"
-
-# Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552
-QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
-
-# Tests require network access and run Wine, which is unreliable from a portage environment.
-RESTRICT="test"
-
-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_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/x48/Manifest b/app-emulation/x48/Manifest
index 8d0e8fbd103a..ded0be9e0c4d 100644
--- a/app-emulation/x48/Manifest
+++ b/app-emulation/x48/Manifest
@@ -1,3 +1,3 @@
 DIST x48-0.6.4.tar.bz2 227991 BLAKE2B 8db2962860eeb161a8efc9d46730c71d95d0331157e3e2481a978385ad54b04b7a4eb601c68e7df966194b23e0cd04bed4e80511d22695bb7ccdd3959d8fd8d7 SHA512 60fdba1171a02e4a5f9bcefb29fff9398fdbda50553c3d3b952fab0b4ebf87b219d4615139ca3673b1c61ff6d6559aab3e93218334aa6cdb442d4861347138ce
 EBUILD x48-0.6.4-r1.ebuild 1728 BLAKE2B 556cf772f97059b55e666e7a83929da28cb53f0e1275775b8054775428c90c155455a273f0f8aeac8c50c39e3e563756f7a094f400769a71f6a21f9eee22cd15 SHA512 79572ae1bb8b28b46b1255fc0b25a5bf3e61778e89484857e0d131f6981584225a608664462ee0e9d940600d2a967df676a5718ff7df74bc6076ca854908c800
-MISC metadata.xml 633 BLAKE2B 204e522b01951f9bb0b49cd92633429db663f82847efce9a73654ef3bcb91f2d8f49d36d74cca8773d426c915dcf552e7eb82a405e828c59e29d0c2d9d3a623f SHA512 b294a7e2f3abba60b26fde892cb69ababf4948a677bbf470dddc558e568df8cb195c757dac46ef3bb0f677925cd93384b3a2195c1c19e83490f045d64593af10
+MISC metadata.xml 723 BLAKE2B 98911516312cc5d5617bbf9d6e33915608b30639c2354024cc74407888a699cf7464261fc7d40afad3fd6632ae39da74b5f90ede1bd51e491d0193c759d8ed07 SHA512 0de7f42012bc6624f1eca6d08c3807185f5fcd7b44a34fd701cd7af2ede5b0ab21f41b41fc7b784b3fe641b3b12b58ae412a2969679fbfcc1edbfd99b6e39685
diff --git a/app-emulation/x48/metadata.xml b/app-emulation/x48/metadata.xml
index f87e1e5b28de..727692a8fcbd 100644
--- a/app-emulation/x48/metadata.xml
+++ b/app-emulation/x48/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
   <longdescription lang="en">
     The x48 package is an emulator of the Saturn Processor and the I/O of an
     HP48 calculator. 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index fe65ea2008b0..1a20aef72405 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -28,8 +28,9 @@ DIST xen-4.12.0-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e2253488
 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
 DIST xen-gentoo-patches-16.tar.xz 36980 BLAKE2B a59fcb221a915e39fbbc463fa8b1ca1ef00007654936cc17f64853d91737478a6f78480a3e459b07b8c3ddcc81ab9400beb9ea3906750ba69864d1b97db349d2 SHA512 7727e5c7f4ef997eea830618bc26b26f3a99539a1c702264132401e41a328b384346a06b6721f18e3056fc91a2d2d2bf6320e0ae3c79432c7458a24a0d269c56
 DIST xen-gentoo-patches-17.tar.xz 15688 BLAKE2B d5e3bdb15e182c5f0c21adfa5cb5b88e3453e5035659823e3322074646c3ea89b55bf54d0ec6c54966d9739544d156de365a60acf928b799b68978be3380a002 SHA512 f1000ca36166fa21d4b18fb9ecf36f55b1450c312622fbe38545f78aabc150e2d6cce4bd58472c41bd9be8945940a0bc953ba7e470cd5095cf2e7d8a87769b2b
+DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30
 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
 EBUILD xen-tools-4.10.3-r2.ebuild 14270 BLAKE2B 9d3452ce90498bb4db604d8813d6be2ad5989b7a0d9719868cdbe83ff2ea3b79b23bbea316bb2473f52e2d7cc9c14eea78426be02c13f7a1510deba938729516 SHA512 2a795d0296edd20b52d95f96d8c3d0fa5dc8110cf8b106d5d26a2c91c3311b9fa38f08dbf162a6452a21ba2a5530ac9b8b69b59d056d251720b555181a25b960
 EBUILD xen-tools-4.11.1-r5.ebuild 14499 BLAKE2B 57aee1303bf56cd15967f56da5fc252837b28be7c3afb0c63036e979e7b1b5d99960e564a1c333a2446313460a243301e4ce112acb4b8d9904aadd611e231f50 SHA512 b14390507fff50a6e4351651ab91f0596899ceb181607b69c474e3d231361f48b9cd06679ab2db36ca2ad590a46735c428bbc11309ea478abe2b3229c0c75b80
-EBUILD xen-tools-4.12.0-r2.ebuild 15008 BLAKE2B caf0a02f1c207650ceefc46d07246f99192437a765c9affc989e0e02049bc2d7f3f87707fa88afa1053cb8777945dc8c67d9dd7795c35a857e496e394418d3a8 SHA512 c28528fe67f5459f57cabd3a2df73f99c9da78838f3a23be6f8ffa08625978a36d0a522c18fb4f0224ab31ae7158686315e6ba387fda1c242342580b6dc6524d
+EBUILD xen-tools-4.12.0-r3.ebuild 15206 BLAKE2B 5882535287fe38420b3ea1238c04c1774835543868475c713dedde87602abf8386bcaccb8c6ad3434cb187fc4d66dd4977a15d8fb892e3506ea221b381adb248 SHA512 1446616a548eb26571c119abe5fd7328e7219372f5c010933d52a58d16ce6d667b2b63884b98fd36904a1a9f4f54039df545bbcf8e46544f309e0a28b110fcec
 MISC metadata.xml 1479 BLAKE2B 1b994f8dcaa5cf67f588af6ce9533467816f7c4726e412566640138e631427decaf890856fa255b516580502c97c2e29c21bb84b4888df7603a9491a012381a5 SHA512 d125649737e0b34407fb32b67b741feca60d100454fdbc84b07305849295f134e1b657f5e13b6e74a90d25d7b408880316d470ee94447b7a6f99abd75eb82a83
diff --git a/app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild
deleted file mode 100644
index ea900713a631..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild
+++ /dev/null
@@ -1,487 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,xml,threads'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=17
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=
-
-	SEABIOS_VER=1.12.0
-	EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
-	IPXE_COMMIT=d2063b7693e0e35db97b2264aa987eb6341ae779
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
-	x86? ( sys-devel/dev86
-		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-power/iasl
-		system-seabios? ( sys-firmware/seabios )
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		x11-libs/pixman
-		sdl? ( media-libs/libsdl[X] )
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/edk2-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		-i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-		unset CPPFLAGS
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--localstatedir=${EPREFIX}/var \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_enable api xenapi) \
-		$(use_enable ipxe) \
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
-		$(use_enable ocaml ocamltools) \
-		$(use_enable ovmf) \
-		$(use_enable pam) \
-		$(use_enable rombios) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
-	use amd64 && myconf+=" $(use_enable qemu-traditional)"
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED%/}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config system at boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild
new file mode 100644
index 000000000000..ccd98499ae3e
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild
@@ -0,0 +1,490 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=18
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=
+
+	SEABIOS_VER=1.12.0
+	EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
+	IPXE_COMMIT=d2063b7693e0e35db97b2264aa987eb6341ae779
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.11
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/edk2-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+		cp "${WORKDIR}/patches-gentoo/${PN}-4.12.0-ipxe-gcc9.patch" \
+			tools/firmware/etherboot/patches/ipxe-gcc9.patch || die
+		echo "ipxe-gcc9.patch" >> tools/firmware/etherboot/patches/series || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		-i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable api xenapi) \
+		$(use_enable ipxe) \
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+		$(use_enable ocaml ocamltools) \
+		$(use_enable ovmf) \
+		$(use_enable pam) \
+		$(use_enable rombios) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED%/}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config system at boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 2ebbaa98987b..54414f09c0ff 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-mpg123/Manifest b/app-eselect/eselect-mpg123/Manifest
index f01255189e70..9020bd3780eb 100644
--- a/app-eselect/eselect-mpg123/Manifest
+++ b/app-eselect/eselect-mpg123/Manifest
@@ -1,3 +1,3 @@
 AUX mpg123.eselect-0.1 343 BLAKE2B 192ca6ef608cbdcab5b5c866515b25dd5e7110479fef2741fc6deed0b809dff3519ef36451cd017f03063381dca5d04023f4d885c5f9db9ee83075059640326f SHA512 b11891308231ff322c0028eca8fcbac999a74c31a26e5e0376195276fc52c210febc21a46a78b23a1ca6099abb27e5ef401d4b3f50de3c98eba3631dabee3593
-EBUILD eselect-mpg123-0.1.ebuild 614 BLAKE2B f3143b7a97b156b90e2e3efaee0d43e36a45eea890a4567f0df550ac38400fab513c02441e629415648f7a3471a56f71a3d2cae650e59fc48a7ad4b9b7da65c6 SHA512 3f5815a9c069868c845fb3040b72e01f230e18d27a0a4d5c5db103fbe49593fb5f68d9b5d5b66fd0a8673865ff9fbb211450ec41eeb5635c2d981ea4124e1863
+EBUILD eselect-mpg123-0.1.ebuild 613 BLAKE2B 64009785e596a05f6ac52c11bd3a8e5adfa0e01cf90df43152a1a83e694eef38daef933185c9fc652091f355ef4b9eaf39d9e078eeebab7f423888bd270bebc5 SHA512 91cbcbeebfe7c947d87c34846885344f23ee4d1609a53fe0feba707216577f84c35afd58f8eef59475c7a4a372f26ee5657493d0392767f23c3ed1de53d81702
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild b/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild
index 1834b66879c7..fac6714b4655 100644
--- a/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild
+++ b/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index c666529ef243..74d26b119e8b 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -3,7 +3,7 @@ AUX php-fpm-launcher-r3 223 BLAKE2B 80c90d2388118e6dbdceacebbc87de145e94e34a6d96
 AUX php-fpm.conf 29 BLAKE2B 505e957038315f8668a558f91eac2ad8ae6bc3e87db238001042ddfe7d817c1589891235d88edc91e213215b7a632fa9358795290599223097ac66f546085c1c SHA512 824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f
 DIST eselect-php-0.9.4.tar.xz 49576 BLAKE2B 417956b355ffec7d7cda03dffa94e4d749a2b33a64a216c2ed8492181a5385f5219078efe6cc4d0d2d81b0fac40901c0cf07914a826484b83833542a12b47359 SHA512 2ba1dd75d4bb9611c6687ed4449f715728263538f772652aa1ac013103cf9ddf328c854326cf6da4f9b3ff2279bf99d973325520fe8b4e3ba7a76a9c3264e78e
 DIST eselect-php-0.9.5.tar.xz 49732 BLAKE2B 78c2010abcb1c9efd4d5f2f3f934365b338901a98bc8528131f2b9f564c1c3f740ab2dc2a28a0a58912e750062e61f75a7c6611c2f37019ca6525d729ffb5fd2 SHA512 55e401cb0c3ed19fed90485d62ba3deed3355503542898ff0d1b5404bd5fafb2f887df433609d4d4b28f32c0034100ea32c9e58547ef6417ea0b0f60d061d119
-EBUILD eselect-php-0.9.4-r5.ebuild 1380 BLAKE2B 01481c8a8f62d08a9a6999be2550c61c9015dc425669228d3d0c30213c32660c5acbca1491539793b4b150fbcb2b4cedf595a2e168acc08b2598dba3c5ac7ebc SHA512 9d68f99730d01b00366ac6c6327e458a5d2aefaca34dc62d711caa1bde2d6c29a1a4672715cbd336f116f059d52f262611ec1f0a4a6dd0a107393374e29e02bf
+EBUILD eselect-php-0.9.4-r5.ebuild 1379 BLAKE2B 927f8ebde82583f721960bd222bad82f53e2ee0da290c39f1f1ab1c463105f0a6064481fe27c5c509f3101e760e6b3d7b5671449954442d86b0141891a404058 SHA512 12fd23d5a33fdd64ab9000eb3a1c1bd9561c6f4b4b82f718bfd7f2bc93d15be9afd394335c5f85ce394d5f965bbc6d0c3ebcf97511533ff1348dd0b610f3d0f5
 EBUILD eselect-php-0.9.5.ebuild 1392 BLAKE2B 453096b9bc1e6e624220bb93457ad8740a2a1e2b544f3f1588b48048cf9b86875689ce826ffe53638956513f21368e33b99d432a510af8e999c1370f748b3bfc SHA512 c441ff53824454e2ec2639a64b59b85e54afd876d936a61395ad49e5eeb92392e9528de1f8816d3c3a314e36dfa4afff37cb0138a33ecf1f471bd74d187da04c
 EBUILD eselect-php-9999.ebuild 1306 BLAKE2B 45c8551979e6c5cd4623cfbd77aff888462ddd18121892b6891459e2281581382c0c6738370f859f5dbd21fcf7ead4056afd78de587b8387bc79cefd689d88b3 SHA512 9982c8bda294445cf3496da2d58f0126278924165cf66967d31628a2eb907c258e50d460e3c1daf5b9c042386730452d2c02a096d1f45c86d10c6538e8afeec7
 MISC metadata.xml 387 BLAKE2B 956f8e21e799bd346de09b2814c359c3c28a37dcad3bf42a11e58e33acfe26354069fce71e3ecb687dac83e176500c2127cb8dda5651e083e27aad92cb385862 SHA512 80a043e0836a1ac58120f1471e997face2f60117e3a83d490ad259a05cfdc39098c457573e3550c9fc3a7712f28b9faacd427c076e8f46ed3476e42f58f8f1b5
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
index ee5d2f4da128..b83b18f53cb2 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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="fpm apache2"
 
 # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index d584ad6a275f..ce206112487a 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,4 +1,6 @@
 DIST eselect-repository-6.tar.gz 5605 BLAKE2B 4a6dbb3f573cb1c4e212d02d011e79d8522828b8928bf28016b616c8eefd3beb08db8b555728d4e7f83473f2d36395eb1e2f1d8d21ccd5817e38a5d555cf6f09 SHA512 02ca2d66a6cfe4c68dea780440bf7fd431c575e535139a43c2b6201e833e43d174772486c97dc4154fc2d813935079d36c116ee907db115f7cb281db3d72add7
+DIST eselect-repository-7.tar.gz 6768 BLAKE2B f648b880ab188b5beb21161dd011d8cea0bc9dd124d524d747a1867a37f334667363be9c0ad9f04275aa1534b904a519d7551c25ea547ae2acff625382c35dbd SHA512 87569158dce3acfdd81a469387fe1a7a7c268cae2e15cfdb12d8377984be5feb674c9b385f0171d27dbe8c2066ae98b2c9a74214340e85380cba173ba26d6f0f
 EBUILD eselect-repository-6.ebuild 964 BLAKE2B ad1bf7e3e8769b22d9ad1ce832aab7568783ad578650b78ee7ad02585f2677b9f84c80efa0ce5c92632f2cce23efa8557beb81e591fb9d9c7b75da162943e955 SHA512 f11435a8f33020d4a2dd01498ca0b5594b0e0159c2e83c4a5e2015ea90383bf2f1571b774c70a2937358559e49cf37e3b0c0c88d3d76e8c09821a65f9487afe3
+EBUILD eselect-repository-7.ebuild 967 BLAKE2B 89e1a393105305614293d99e772666b64607aa9c4cddcd6d70c25ad97e4a5b61d4da69c943a9d6179c8a561d7916d47dfdc1d61a4480a9e9836872a0876b4ba0 SHA512 f6d5b96b513e02814e5ccb2591c77825391dfcd6bd230dbf14f94ba17dff51c7ee0a84a045709b598cc782408367cfb098b4dd891854be38c31312e7eb20c948
 EBUILD eselect-repository-9999.ebuild 881 BLAKE2B 2373feef6139c44fd898b66a1b8a182c5901f1f413cbe7bf6fdc2e172acced7e82468bb33f96fd0344c6377582d2ce66d26d5140dc25944c4f2546e4a5112260 SHA512 3bb7f50b44ca2231d25844799e9d5c1cf46cc8f6a9c335e4f631c6149aaf18267fff824c1d77dda12ece95e0198a7fbe6607d44c0dcf1945cc72ff108b6d01c8
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-7.ebuild b/app-eselect/eselect-repository/eselect-repository-7.ebuild
new file mode 100644
index 000000000000..1e3790748b61
--- /dev/null
+++ b/app-eselect/eselect-repository/eselect-repository-7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+inherit python-single-r1
+
+DESCRIPTION="Manage repos.conf via eselect"
+HOMEPAGE="https://github.com/mgorny/eselect-repository"
+SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	app-admin/eselect
+	dev-python/lxml[${PYTHON_USEDEP}]
+	net-misc/wget"
+
+src_compile() {
+	MAKEARGS=(
+		PREFIX="${EPREFIX}/usr"
+		SYSCONFDIR="${EPREFIX}/etc"
+		SHAREDSTATEDIR="${EPREFIX}/var"
+		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
+	)
+
+	emake "${MAKEARGS[@]}"
+	python_fix_shebang eselect-repo-helper
+}
+
+src_install() {
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	keepdir /var/db/repos
+	einstalldocs
+}
diff --git a/app-eselect/eselect-rust/Manifest b/app-eselect/eselect-rust/Manifest
index aea48acd612b..5e82c616b7a0 100644
--- a/app-eselect/eselect-rust/Manifest
+++ b/app-eselect/eselect-rust/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-rust-20190311.tar.bz2 49358 BLAKE2B be8060638a7ee553275e230466de8bc5e3fb1059afb049b71b767794f4f8e3968af03a755270d892e20e5ca6aa3efc869d2fd031713f9e8ed516e6465aad19ff SHA512 98fb4502c1f5358e1a3fd2e91a0e9905aced990d62bb11414830b150e8d72fbab90c23518f9c30d04d015b4c303270a6332400bbb373cd4ea9dfbf0d0b3c942e
-EBUILD eselect-rust-20190311.ebuild 713 BLAKE2B 54e382fd3f318bffdaa8187ff4bfe3db14a02cb85c21b103a48cf611929bc9222c09c5829e72ec29d666bf5e694c641cf38ad4f208a3310f0572a04ff10a9ebc SHA512 15661d9d43b869403fb4eba06af369c30bbeb799db8f6a7e7ff9f54766346cb8bab2b95fbab60cdf4e7325d43ae57ad8a6eea9ac856b0767c2f848f52dc2eaee
+EBUILD eselect-rust-20190311.ebuild 712 BLAKE2B bad48a1fe9289a0700a0b2eb006e1fe0276c6ab8605cc3338f97396fe0f8e7bf205559e7eb28e19791f1d993c950a4d2d66def10d56c160603484138f31ebb31 SHA512 fcc1eb2974e86800aa5c44426e9206746dea0f3139ec98cfffa9a3632e80fea5b40256eea195d003eabd763cd6649d90d4c37f50ebd0472b64d55537df77718e
 MISC metadata.xml 301 BLAKE2B b569454ab084e600cd974251af1ec665c54a5f37b03d6fdfd43384a36d0c738482ca4605031a8e6a000de46c7d1f756338417b313dd0212e2b0671dc7839a94d SHA512 63b1c2f65bc5f26653ee98ca2722f5da05f1a8b3d430b5921b685c7506c3d685c36d0bc2c2eb293529ffda32d50e1a59783c24d2399c1f647b1bdedb68d48616
diff --git a/app-eselect/eselect-rust/eselect-rust-20190311.ebuild b/app-eselect/eselect-rust/eselect-rust-20190311.ebuild
index 1fe212c520f4..7bcab50586b8 100644
--- a/app-eselect/eselect-rust/eselect-rust-20190311.ebuild
+++ b/app-eselect/eselect-rust/eselect-rust-20190311.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Rust versions"
diff --git a/app-eselect/eselect-wxwidgets/Manifest b/app-eselect/eselect-wxwidgets/Manifest
index 908ce8084dfd..2085497c8814 100644
--- a/app-eselect/eselect-wxwidgets/Manifest
+++ b/app-eselect/eselect-wxwidgets/Manifest
@@ -2,5 +2,5 @@ DIST eselect-wxwidgets-20140423.tar.xz 6792 BLAKE2B ee94e98b9f2473b8e8356ecab483
 DIST eselect-wxwidgets-20180529.tar.xz 2380 BLAKE2B 2f5d5e79b9cd85442b0aa0d1453d84651308d4c33711b919802b383bb98865b615a9afd0493b4d34232c3d986e68246e35943d96a31e25a3fb2778b6483ec764 SHA512 d91e87f23c7feb807ed75fcfd363b61fadd8c305e3aa82c5e3dfa3d9fbc2c18a8b7e6404bcac9ebd6c34269406712d453e5bd877509f26f3648cb864df36e281
 DIST eselect-wxwidgets-files.tar.bz2 9126 BLAKE2B 47ec94aec721d325fc483ece28e84b48c35b103078415447b6e79e68ab44af9356955c960b9464713396f4cbbf663522e5a4493516414641aa5b99e7cdca0ac8 SHA512 c5aba3bf4bbb891534e0c7a444da6cb90a947dab407e436a1eccd13ddb33251816ce95b5fb6826aa9a64ec2b3d9be09c9852859597b0b8ce91cbaf0f6ed6da5e
 EBUILD eselect-wxwidgets-20140423.ebuild 1495 BLAKE2B 4f35935267d75a93759edb7f7f94d86dcfbb66020d1b4d090774f9c57a800411b214c8d6c5e95c66d225c88fe7fabcfbf1a34ca08134148b824f57fecd49c02d SHA512 ed5efb11f21261bd2ec7be6fe0505e97cc3db44f9faf7ef882836a0337364f6cbebc7596ecf53156d97424d263394ac7d15da8a4780f4b5ae2302024565cb5bd
-EBUILD eselect-wxwidgets-20180529.ebuild 1502 BLAKE2B 984527e5bd405f2b8fc63f8b938debe58e63bcac8110c6a7ca8dc327d5159dddf37c513f22d23699d55aa82169e0bda9eae1ab65241fb0816a4474cc6e62317f SHA512 06235300cae8e9bdb6dcba30429f7f294e4af5fa07238a28f82b9120093e0d65b0ed94f6cad6169e12e83f525481de3fe7e62e412bfcd8d4ff442e66e841e7eb
+EBUILD eselect-wxwidgets-20180529.ebuild 1498 BLAKE2B 053780f68cb56cef8482318b00478aa4e399976a4e93f7fe2720d8255bbee69199ba212d1db024415cb93b87c8d666d59e7b91e0159917ba2d18512bd5bf1328 SHA512 9ec1d1a63b6d5bc68f37f2166b94642399af581499dd4c327d11ea64c637c29c17d6ad30e63ec315349681ce82f10afd6820d5b8210b5de20b5a07dc36286548
 MISC metadata.xml 261 BLAKE2B 6a1c213fc272c8d1e93e73a8aba2f3fffce3525a0b505f56a0ebc185d0000d2f472480842e2e588a59209047f3da0830cb0e59835ac738b548bd8a74dae3c176 SHA512 f7ad013dd5f01aaedd4528f98ba9a4b4b44d353502df3438a8b513dd2ee7af1e24328c34187e156370efb550c401b81175cccc7a7643ea6a5a83766d68a05221
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
index 5f554d3672a5..1d6b9c8ef963 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~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 ~x86-macos ~x86-solaris"
 
 RDEPEND=">=app-admin/eselect-1.4.13"
 
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index c5e19d7d662f..1e71da2eb6ef 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/honggfuzz/Manifest b/app-forensics/honggfuzz/Manifest
index 1b61d2d7ca13..1012dbf8a07b 100644
--- a/app-forensics/honggfuzz/Manifest
+++ b/app-forensics/honggfuzz/Manifest
@@ -1,7 +1,7 @@
 AUX honggfuzz-1.1-binutils-2.29.patch 569 BLAKE2B 63198bc698c56517cb7f6394808096e8cdf3261e244f398ae18b24a8031e95c7e55bf8cc131aafc3f0a6b92414a7ebae54c7087f6dd46983b581f50579398c62 SHA512 c86927faf45e345fd56ff0eaaebadaaff41f020f853df8c791dc04b7f00890d3bdfe173cd0e78d5293c0eeba88f0626585c611f40d9a5cd49e705135922e59fb
 AUX honggfuzz-1.7-no-werror.patch 219 BLAKE2B 704987f5aa2bcd805e1235baf063c4e1a32ac203b1008899e4e2ee4c899a9d14534835fdffe244a6df58cf640ea7b4860182a3c5c2f98f6654f7ad8cfde8054b SHA512 9bae5bec03a1d22a80f4841aaf4b6a6659ccb3745f4c0fe43f6c60e73e9b09c71490e121bca4eb41612fb463132f4f3ec2769c4262ef0b5d954b8ccd0f3e7f2c
-DIST honggfuzz-1.7.tar.gz 70077774 BLAKE2B 74aa85aecb2c1480bc75ef0af68ff893c25bee6d33b068b8fbbcd0d4f5cf9e6b4c09f95f7272a4071e323d35e62c135095d9413355df75d26a0f4a6312527b2a SHA512 d7d9cdba67fc7cabb6991850d725f13377614785b397acbeae6c5d64414ae826ac1c8c7fc0fb2ce83d1e5d2df64875a39df0160367d2d8e244b996d8de0d08d2
 DIST honggfuzz-1.8.tar.gz 78491883 BLAKE2B 359bc3c78046bded1003d08795f5c1eb65b2dc9e7e0952bb772d73840c3886acd370bce3973693b45b0db3607bb8b5c3a648dbbad5e6b8278000762f126731e5 SHA512 4643deca357dccaa6f229b6c56a040b6b16682a3de7396dcbecb7fba6075beef8381a8c4699b602c8677e06e90b7c870393b027126242fcc326c485b741352f0
-EBUILD honggfuzz-1.7.ebuild 843 BLAKE2B 09b2829fab1c5dc809f9659eb5c1917e194946e473022e10b947301344a7f66f8899318eeca5c94394b8d4e42aeee5b5f91bf87bb5bde86c3faa2dcd17732af6 SHA512 31284443db31b9332e77ca55b8adc103c682d7abe28b63730f9e5ab9820ab64512b3693165c323681c0e50caf85cd5f970349fd36ef7a1737d34f27648540de3
+DIST honggfuzz-1.9.tar.gz 78491908 BLAKE2B 961562d87e063804cb6a91d6ba0cffd0a4c3b3cb140f93a9362bd6749b8da251f7203e9ff7643bbad561620a8fdb9ca755758beb45fc46194c5907ecafcf0d2a SHA512 07ee10de723b14bc8ed9df9de196bcf308d8c10a825ba18b20d4f881d22c4254a45455bcbf965653572d9f71b2bff009284a34d0d5a6f879114b149b456c2eda
 EBUILD honggfuzz-1.8.ebuild 755 BLAKE2B c4d5161ba8d5c0b2beb9288bba088b0125b1735bc744043caa9bec9b2aac76efa5385d4aa2d4f61743d6bf210a753a8bff89177f9c69f744ae068a2fea3d56aa SHA512 5d70e63df289568c455b32787cbfa20e4fce047f2fccb700656e0837950163d6e6e3f82b1a4c5ed1ad93e55ce595c0360aacbdc2595be65f5be3401b7e2121ba
+EBUILD honggfuzz-1.9.ebuild 755 BLAKE2B c4d5161ba8d5c0b2beb9288bba088b0125b1735bc744043caa9bec9b2aac76efa5385d4aa2d4f61743d6bf210a753a8bff89177f9c69f744ae068a2fea3d56aa SHA512 5d70e63df289568c455b32787cbfa20e4fce047f2fccb700656e0837950163d6e6e3f82b1a4c5ed1ad93e55ce595c0360aacbdc2595be65f5be3401b7e2121ba
 MISC metadata.xml 332 BLAKE2B 72702618670b8f8ef24ef68d5f9b1b29c8d25c3630cc5fb22ef859ea7879af84d0c7fc758a02a0b4175e10707f2c161930151b65e2e3d07f154a1b2c48fee152 SHA512 1f75a39cce6995d550344225849dafb3a980df19cc6afd10025e58e6c08086a27a67173ff435c084660970cb4ed18183914afeba712dc461d7fd55f83f9e679d
diff --git a/app-forensics/honggfuzz/honggfuzz-1.7.ebuild b/app-forensics/honggfuzz/honggfuzz-1.7.ebuild
deleted file mode 100644
index c41e64b032cb..000000000000
--- a/app-forensics/honggfuzz/honggfuzz-1.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A general purpose fuzzer with feedback support"
-HOMEPAGE="http://google.github.io/honggfuzz/"
-SRC_URI="https://github.com/google/honggfuzz/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	sys-libs/libunwind
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=(
-	CHANGELOG
-	COPYING
-	CONTRIBUTING
-	README.md
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7-no-werror.patch
-)
-
-src_prepare() {
-	default
-
-	if has_version ">=sys-libs/binutils-libs-2.29"; then
-		eapply "${FILESDIR}"/${PN}-1.1-binutils-2.29.patch
-	fi
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	dobin ${PN}
-
-	einstalldocs
-}
diff --git a/app-forensics/honggfuzz/honggfuzz-1.9.ebuild b/app-forensics/honggfuzz/honggfuzz-1.9.ebuild
new file mode 100644
index 000000000000..4aea054863e9
--- /dev/null
+++ b/app-forensics/honggfuzz/honggfuzz-1.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A general purpose fuzzer with feedback support"
+HOMEPAGE="http://google.github.io/honggfuzz/"
+SRC_URI="https://github.com/google/honggfuzz/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=sys-libs/binutils-libs-2.29:=
+	sys-libs/libunwind
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	CHANGELOG
+	COPYING
+	CONTRIBUTING
+	README.md
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7-no-werror.patch
+	"${FILESDIR}"/${PN}-1.1-binutils-2.29.patch
+)
+
+src_compile() {
+	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	dobin ${PN}
+
+	einstalldocs
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 0666b461fa62..c540429141e3 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index e29f76ccf319..479492c66c2d 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -5,6 +5,6 @@ DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42
 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
 DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
 EBUILD ibus-1.5.18.ebuild 4303 BLAKE2B 8ee9740732ddce17e04235a81334ef3547825a3f5d23029df92e172c6a0fccfc180e46961d025c232acbc89a37fed4a50daed7eed94fa14917b9a7523e4a677c SHA512 22280af357ddc970b4408b8a689c497fa5a13265e5dd0fe48d5182409cdcf42ecf818012ba7177ebdd4485b6ee2878ed0055c377528ebb0fd42e9f6195366c6e
-EBUILD ibus-1.5.19.ebuild 4389 BLAKE2B c5709a4754abb779916e6dc040c401cc724037621589e2e1c5b22b1e0901ab3213adb32d171c0024e2d6f497dfd400f4cfb98aeb4f8d226ed45831eb4d74ef55 SHA512 7b332fe339d720143fc0eee35b8bb6425cd48d0958ac15fc3c5e654c6fc98875ceffa58722501a5b5de5ba9ea1dd6cbee619d27de7d4b82ad0889c523420e2b4
+EBUILD ibus-1.5.19.ebuild 4388 BLAKE2B 120ada841667850ec020871d3a67d4dd914e499774cad13eabdf37f69c43e6cad7ae8bda66c1068ebfb6082aad2e9c1819c464232952dfb9beacdf5037af0805 SHA512 d1131ea27881fb493a4c824ee58e8e84920c00856b7fae346c9fbfdc2ce34871a538ff2fb7e721d2618dfa4e7183258a579b9034a1d536afaf69fff2a430bd0b
 EBUILD ibus-1.5.20.ebuild 4137 BLAKE2B 79c1156db2c7fdd94d509691cecf8a85fba0974a37bb388dc2de2342f27daf740f9634eafa6843140f0fa219d1837570b8af390b786cb620af672be4ef1c5731 SHA512 e5b6acf1e7f3c793c232d3d7123aea3662caa6eac00c6f48223e57400c2648d3547823459d8f40d01c695b2b8478bdba1256190c5636e3800fa32fed6b8a0861
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index cf521786bea3..132efcba6083 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index ae8544a9f21e..8e4814555f57 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -2,5 +2,5 @@ AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37
 DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
 DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
 EBUILD scim-1.4.17.ebuild 2549 BLAKE2B 32dfb1d2d19757539c79b161a9adb47e36df4747eb139a3f657cf676cdc2d8a1bad42200a40cdbe4a0bffc4c9e4de7dffe2a04da67484037cc235fd7eea01acf SHA512 8901a0b280b589f4285be3754506d40cc9957efaf66302768e5db47035d5563c8ecd38bde285059d43b01c08797737e71ee6759979955270e347366c1300f573
-EBUILD scim-1.4.18.ebuild 2565 BLAKE2B 0c26f31eabb0fb25c9b6f26b47ac44395bbec8b94fcee216ff455ef12ad5f609225aad315bec9857dd5fdf402e046c45af802ac681fba033d862e54fafa54a35 SHA512 559babaefab381c14ac843344474bdc13bc24baccc31acfae34a7348720a7312d0e3bf2114be970f95482451a1fac3e9284716112ace73e7d23143c116bc9a3e
+EBUILD scim-1.4.18.ebuild 2564 BLAKE2B bf331328eac7aa0013ca7bdc57c87f902f2d323a21c12a7152d8e7a164aa92151905f41ef8d30a8aa0d6393fb916c1b635d3fcd3bdc566a60b92e1b28c8a32ca SHA512 d951884c152a488c68dc4717b8f10d4cf6d7c5d7d2223208b5c97712d3ba3fce9e258423d6d5cf2edbeb0e01d044c137cd2d74473be46e502a1d8f99bd12603e
 MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
index bb1ad4d74082..5d4dad86662d 100644
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="doc gtk3"
 
 RDEPEND="x11-libs/libX11
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index 4628757ea78c..30f8fa5d2d59 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,5 +1,5 @@
 DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b37c82e025e12841d75ef9e4e2620f887384c4dbb3f8c36febcd86d19cd17d4d84e77e11121d1ed1cf2ccf67a09260cdddc9f7 SHA512 6ef4a73b31bde5dead5af9145e5befa5969e9449b4072c94c5370c979db54e3072ec5bf15f54152045da329bf4382e54edb532c0ec77a2ce451bacc8778b73bc
 DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd
 EBUILD unicode-cldr-31.0.1.ebuild 496 BLAKE2B 8df1bcb6bbc05a9177c20aab6337a752e65d21ac11993aaa85a48025f5e196eb151a09dd3525ee76ffdae1710c0ff399fe6428dbada25ae89d83f64300b445ff SHA512 93ba56c3abf39bc27c7d825c63255fcea2c1c2d942b3984fd5a98cd911399f5ac4002e1e89972ca5495e9787cba266d0ce82f4d83ff9699d4c33bce90a02a880
-EBUILD unicode-cldr-33.0.ebuild 706 BLAKE2B 62e7d0d9c372e0eb5cb514bdaf1cb42430f9cb78499036fd0db4d36a9dd767d63568e409a689c722859ec4aa7cf35088b12ae6ff01c9525de2d77e44c4d33c92 SHA512 8c942329e2dcaec4fbb6dd5c9b2f16604f38869f49761e7a1fa30f0f5fd4b8a92cdc1798142cd5947927df2afb52f06324ace2a0911b5d8df13a284bf4308f15
+EBUILD unicode-cldr-33.0.ebuild 705 BLAKE2B 73ea6797b4239c42a965749a75c0b3518010604f4b00a9d644ee4ed88cc73dfab1538da90e7715997695e3e43e7ac5499e84ffd82cad40bf6e43f7827291047a SHA512 dbbcedd585bcb20a8371dccc438dcd9af8653f211bb2514b30723326153d438a30477cec3619dcd9d31a51e1382dc0badb3219025895bc289f3ed47cc0bf9495
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
index 0890b8de3b58..89f7987b2c63 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ fi
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index a80cd77bc3f9..269ca3a2eb5d 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -7,7 +7,7 @@ DIST unicode-data-12.0.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa
 DIST unicode-data-9.0.0-UCD.zip 5655592 BLAKE2B bacfd82142e2327d5633a927d6283d1bf3d43d0476b43ca5b23190abafba5aec3f29a59f096a651acc320a7bbf5f511aaa39e1f09b9fe24e96b0623610bec6a0 SHA512 e9bdf8ed6647b4d0bd83c6fcd885cb450fddbf84dac376e9771bddbb7ee1e8ea1ca8c2ca79e23832c26a4819dd62f86fcfa6eb6a1fcc7294185f5bc78be8fa2a
 DIST unicode-data-9.0.0-Unihan.zip 6558824 BLAKE2B 18900bacb9ec84eef99758a1647f657685f2fc40d705b7cd8f88ea727d9494aab38cf4d40829d52afca7c11087e6b2b2c03547c14980b7d206ba241bff3d3e47 SHA512 9856d30afe5d7b0b088bde36c12431eae267992b315944ca8a7ddb3559adee7474fedd2d0d6b22716439f9cddad573a4bb45c6209036b0066a85fbd19412852e
 EBUILD unicode-data-10.0.0.ebuild 805 BLAKE2B 541f56221efd9e3e525ddd8812c3f417f254ec51550fb42ccbb7f73b8ba470e77769c991c0e5eec5471827ed275f4a2578ebf39c48ed5bae0b71942bfd5214c7 SHA512 9b4edc49c53726cc5daf1a243605956a70469976d6bb1d631032be5cc2beb11298271d180928dac2f66f4db4cbf228858ba56484a39f72262065210cae5c4be9
-EBUILD unicode-data-11.0.0.ebuild 808 BLAKE2B 96d06216ba781a9b12d0e30964daa020aeb3a79ca5fa709a8160b8b2eecc93278f937a38d8f0a584b826d942ac18d7be189cbc205f4ca4270be344ab2542c6ab SHA512 f7158d3c77a7ac4b8458e2823422025cde1b0beb934dd6c624c9e1ccfbd5fb70722cca4c73790cb2c8e8859cd9a5254100d2b19bebb9eeec74b6db6c5eec6215
+EBUILD unicode-data-11.0.0.ebuild 807 BLAKE2B 9f609dcb58f74095bf4de57dc579b22d5bf2a897f89a803163480b4b0a90c101fa34e2069901f0058097ecc9df48be039451024d9fd5756feea37ec8b69aa853 SHA512 1681adeb675c14c3ceed2cae9023b27a078ce0676c519571a231c08cdae6ae768822d778b7550a278c64ff6160e2bb40257e1d27584af9878e616e8d6d808cf3
 EBUILD unicode-data-12.0.0.ebuild 812 BLAKE2B 637a6d363e1a8237064fb19eedb29b5f187fc0d9d77b66ce662868c07ba6893e505c5a082fa2d0c61374dfd87a8d62610cac8397f4af33672797a4e969c1d302 SHA512 dab6a3362c66e62491e248ddaf72421e7246782f830d42e1086e471a819985a5ed7c0c61ad40217158fe220ed62656aeadbb0230f337b9bbebc5ae4629af1d5d
 EBUILD unicode-data-9.0.0.ebuild 799 BLAKE2B c384b186534f8d15cb0531293d091231b8594148500d7e620be5e4915a3b1b7ca8a4018f8d0dc660d438b2216c507f8aa92b1ebfd701224857bd9e29311c1c4d SHA512 3138843b7a6df197b6394e4b521f41c1e7351f615b037ed6a7a0fe7f7a8534ca45cc0161939516dc00c1b16ca70feacabe9e11c621ecb57d4fdcf7f47afd00e0
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-i18n/unicode-data/unicode-data-11.0.0.ebuild b/app-i18n/unicode-data/unicode-data-11.0.0.ebuild
index f4f64c47d52f..a6c919684872 100644
--- a/app-i18n/unicode-data/unicode-data-11.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-11.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index bb6c4fa7ce73..3a705253a30b 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -8,6 +8,6 @@ DIST unicode-emoji-variation-sequences-11.0.txt 36333 BLAKE2B c32b674969a102d246
 DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc4fd7784ec9bd5869e58f934738fa1d46edc030202fb9490ddebd6f1cefb98dd78b3be2c4da7e3f2acef0ce54487a183123311efbf7205 SHA512 484509ed56c5ea5e73160e211643a938d3fa08474281d316e5ed2d2346f38f5140a147454a9cb81c9f463d6c62befd98a8b70b695ee50effdbcfc6085dcaa520
 DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d
 DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
-EBUILD unicode-emoji-11.0.ebuild 1020 BLAKE2B 8fa5c7d357e534ffd5e25ed379a1c5afccb9371a0a0f1e96cc58edba433ad2845cfc63ad3ce0915c82cb023253961180f1eabacf15cd41e3b3f1894f6f2b153b SHA512 2e0257a4cea40c485b8eee9d94ff49689538cd84b05f5b471c667547d33fb4e46e569d1f73f374cb58b457e5681dd6e4093b6f97a65b2c5002bd1df86af9d1e4
+EBUILD unicode-emoji-11.0.ebuild 1019 BLAKE2B eaf29ee5adc2ef74b2d7b74d57fbb7a97665d89ff092e7f5c93df72b7891d32b6e1ef078c2fb2259aba912bf9fd4b8a3a6fff21c5ca8495ecfa48bcf580073dc SHA512 3db83763f3415b6f8ede1ff61ae781ea8cbf3ebe4188a64ec773cde558ba9ce54cc09425ec44ec7377a78b8f28dc92773d5861d9853f806267e005899e5d4519
 EBUILD unicode-emoji-5.0.ebuild 880 BLAKE2B 08d91ce21e632d7a1befe8be1ca4495ece3e56d38d9bf2f062d086ebe10c0b8db89d021ddde659f0c1a383edfae80bdc5becbcd0ca37c7edc158c1d93ef8775a SHA512 b23eae90ba1df31c6965028ebc6d9b0f3064cfdb16f1069a7774e20ea61780bc4b4c086113f45aaa7e5aa00c4501782ed01972186cb5b753b61d9b33dbc328c5
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
index bf849c4e6cdd..1180358b305e 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 8456de7bbc8a..93e1fc0363bf 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 0c7bca96a271..5835911dd6d2 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,14 +1,16 @@
 AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
+DIST prometheus-2.10.0.tar.gz 11752395 BLAKE2B add59b45e3823d6ab8dcef8f00ba3dda4bb01f8edf891ee142ab790b7145fb2190ee98386dce6aae6afc3ea7bfba3c69749944828c62ed40169e56cda3f53c1c SHA512 eb67fc8a1ecd95689de0aae7e822c40395f82ec4b7f711457d7d504ffaf9a240ad9015a0c568dc93d350cea12cc3db2492bb5fe6300f6193be410b0e00d4463a
 DIST prometheus-2.6.1.tar.gz 6612143 BLAKE2B 33dc64406dd45f494720a1ff5f6d09ed4b45b3880b15626ab7455909258addc5d1549d3edbf8af9a374516930b297c5bdb6ef51a78cac3cb338357896c0d71ae SHA512 80bf6afa00b60aa4245a53e275a2b9579a7936609aba4ffacbbe478f34e530208e0498d8c5ea53dd3a940726e05bd6fac19fed3d6d9dd209af565d5368b2340f
 DIST prometheus-2.7.2.tar.gz 7276689 BLAKE2B 4fa1325b0f68bd33f4db45d3ea0fcac24bc1319284086d3ee0d3aa65c1a4ab4c37a1a67fd6e1de74e851dd90d50b566f5a1fa5b68b11c3defefd2506f5b4ce98 SHA512 3dc46069581c457005de0eefe777e93ae72b73c624d7c728973f3c64c34d68628da13d76e3527e3825309d543fd81ef7446c776e0772c1f6bf58e5ebad805973
 DIST prometheus-2.8.1.tar.gz 11097954 BLAKE2B 90add9b1daff278b8ec185eee1af5e00e26abaa6ab1f99383dd7de8ce2b99cc0612957681c36640b7a822d3b8d05e5ecb015b00409d67292d6176a058233932e SHA512 7a93d7c6e1f9fc1a57d11e6a17e6d0b3375b2e1babac0a89b8deac0834eac29b3ed7c4131c8992e4cdfd76f7d9eea0162e880fd9e44432f537e070eda647cef2
 DIST prometheus-2.9.1.tar.gz 11474112 BLAKE2B bd5916c81b56b90fc92881cc223974bdf1dc511bc0be5493977f3f187da8deea85e1af2fa0a9dec217d210c2b6714bcca677daa559f7c12e001e80c73f8148ed SHA512 d9ae1078ab5b242020f00f5dfc154a75c3e1473be8f1fbecdf8f2589d55a09f8418cbf9aa189a9b2e61b4b5fca875735a26200496c02bb17793bbccbdc9f69cd
 DIST prometheus-2.9.2.tar.gz 11477683 BLAKE2B f0c18c57ff0fe292710174a91080a84ecf0375b4335aacaf4a8e32c842a9346b9fd48888ef8a19a597511c57eb8af7f90cca57d0cc51b9de4558c3f22953d165 SHA512 4cce1827580e49b1659ad492de946a81694c1dab90e079f3f0e56c1991254cf4ecac7f052aac75bf58a0b95d3cf4daa8c15b3e8305a3c089570da40c44a8ccc0
+EBUILD prometheus-2.10.0.ebuild 2006 BLAKE2B 6ca787542ee4f0360352dcc7f9bfaae190f6f2d6132b4c749942b979bb3a2304cc1a5b3b361c1cf014cef6d363561b20329ff371e58b4645526c3ce47ca81180 SHA512 66f860e92ba1a7054b2ec72aa60128a3a2d983091fdfae766406694ef44c34b303fe4a94efdf6f139cf221670acaaa9a92ac6477951457c4afd7c5ae2f245e37
 EBUILD prometheus-2.6.1.ebuild 2057 BLAKE2B 2f9c0dd3bc43b880df01e82bc1f0285d0f2aa8a0a248ed5164abe05aa39303785a05f2a53fcb3db2ae6a0a401b9683b86922daa7cf636a89c89eb3b8dcf8b9bb SHA512 93dc6bf0920de873ef5ad44f5a1461389bdc4d2eacdf66cbcdbbde0ce0443ac050ecd1a924f0fb4f8042f76ea189afead79140537c528ea961a2ae46fca03fc7
 EBUILD prometheus-2.7.2-r1.ebuild 1998 BLAKE2B bba14ebdcd6e12c2cb562f448da0fa5359e6a384d7ed23a55b3dbf47ab485012bb2fb5ba219962ca7000b71fa98a889321b484b54210d2d6e2ffc5bf03e0009d SHA512 8c5eaa91525bf646bd7dd393f665637e62d9fb2527e93ab8a6f32ffaf58c3616daea65d3d83b095e81be6e4852d792d5a84d7a9cef64217935e305e16cb3ed6a
 EBUILD prometheus-2.8.1.ebuild 2005 BLAKE2B 6546ff42fc6d8a6d28ae207278294cd1002c4f952c7ecc912026e591a3888ad51fcb952dbdc09963c2429d86ff308de7bf99fdda94b2134ba373a54ffcdcd305 SHA512 a61ae371278d6c1428cc99972fbd66787c78ee29d22a4e43d2de7365048a4683264f9b8f468c74f42c2f23adf6aefdb2e748c909285609fda1c53588151c5092
 EBUILD prometheus-2.9.1.ebuild 2006 BLAKE2B 67d045245eac3498e8f53bcfba2c3dfa3bf1751237def837ae33093ad2ed5c9580ca63c83bb6ed192923108a53a83e98eeb97cce4522bc9f6c04689dce789dca SHA512 cbbe31e6896d860c9b7ea40cc96f40d2c995ee10f9d101ed66ee6025e0ca14961dc273acd268537efe67128ebaf06c7ad621ebaad6b3741c83690f313958c9ab
-EBUILD prometheus-2.9.2.ebuild 2006 BLAKE2B 53f5bda34fa26abec3f3f7aa361a59fcc26ba2ad9498728221e6e588a34ae77797713dd43e7cd38500b8d5772769c01c5042746b75ecf741de161e1aca177dc4 SHA512 ab7f9d8ee37690d8c6c8578046169a7b6df2e3c314060a71f78c8042d299a6ad313c6a3eeaa8720e17eee8d511b0d293a3a4d384033d6b0ef1f755578cb2baa4
+EBUILD prometheus-2.9.2.ebuild 2005 BLAKE2B be44fa8627cb4ba1be2f6696bf8a7086bdf720508bf1fd47d451f7fcc0d54b7f97e6ba1c46260a71dca1a18fbca3013ae861cdf6437c6d9a25140e731d10e5d7 SHA512 937cac2265388d791b486b5131692f3d8fa30bf0fe20d76fe35f0ea44087a9fb036a5557a3deb70d8627ba4783525ce8510f9531190a097ffea6f91834161f7d
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/app-metrics/prometheus/prometheus-2.10.0.ebuild b/app-metrics/prometheus/prometheus-2.10.0.ebuild
new file mode 100644
index 000000000000..45f198a6df6f
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.10.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+MY_PV=v${PV/_rc/-rc.}
+PROMETHEUS_COMMIT="d20e84d"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.12
+	>=dev-util/promu-0.3.0"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	newinitd "${FILESDIR}"/prometheus.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/app-metrics/prometheus/prometheus-2.9.2.ebuild b/app-metrics/prometheus/prometheus-2.9.2.ebuild
index 59bbd678238a..8b6174ce2b4e 100644
--- a/app-metrics/prometheus/prometheus-2.9.2.ebuild
+++ b/app-metrics/prometheus/prometheus-2.9.2.ebuild
@@ -7,7 +7,7 @@ inherit user golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/prometheus"
 MY_PV=v${PV/_rc/-rc.}
 PROMETHEUS_COMMIT="d3245f1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Prometheus monitoring system and time series database"
 HOMEPAGE="https://github.com/prometheus/prometheus"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 307f1902de24..2ef4c946a853 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index 4f3943a18737..eb967a7d4af7 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -5,7 +5,7 @@ AUX fdupes-1.51-makefile.patch 779 BLAKE2B de015e63777f64b2f798eb61314f71e3b66a9
 AUX fdupes-9999-gentoo.patch 426 BLAKE2B ec2b67101e35617fdd479c68df0b61161852d1895b2de1ff8ca127746b4b3deb5906f388a7f6030cd4ed95ff6781b648133ec50ab075039092b560581a89e690 SHA512 86482e46a6e2b3800f34122ef44ca830c065360fce5806962fcc49b2d9a6a76f65b52e89283e150ce5b885f038b70d992f753fecbb38694f2485a08e221f1216
 DIST fdupes-1.51.tar.gz 48942 BLAKE2B b2673a5601d0bc1d7bb0d312c3d4fbf67494916e9445fba6c46bccbeaa471ebc776b9deb18b323c6eebea4f231bdf1503af9010cbe83b6aae2a3efe479c3a49c SHA512 7cbc414f25427793317667b8d5494f7247a08ba402855929de77d1db01eb3dce41ea608f8dcca047c4a7856e02b10261982cf2acd7f6a79ab726b3009c710a8d
 DIST fdupes-1.6.1.tar.gz 20869 BLAKE2B 683b75b44ea4662e555a81405d6c9c291c7980b579c866ad953e18ad8c92beb37c2b6f7ca29ea4e40269ef751851dd8afbb77b0bffb5139bbfbcc0d41ab23a5a SHA512 6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db
-EBUILD fdupes-1.5.1.ebuild 961 BLAKE2B 2d19c1ddba82e8223da2a54f52b448a2c9be964f19c516ee62bb9b9100d5887cc3f3eae51263fabdbb63dc66cf24d9e348f1b2cc273917e1d439612ed0aa1bbb SHA512 07c76d4c55477f6403da7792e827e67ac4150d04c8387b001a6a3ea52c879f41e8f11ea0746a499cf4380f0148628d6a354a87b065d286ebe60e5d5b89571801
+EBUILD fdupes-1.5.1.ebuild 964 BLAKE2B 3c4e2a8e7a1c2540e30e5d2a77ffc3b3ca82803cdcd99ee140cf39e13f8da3eb64879ed47ee1f1463e57522f89bdecf929f6d963799f5316bc42e4f3b317792e SHA512 d3b500ef04700bbf3958bcbc2635b8ce894c994385ce2b7b6021c52cab0ca159ab2ce510010225cd3c581f86a8a7eaf58ca8ab3c22ee66bf7ce0fbb01f4c6883
 EBUILD fdupes-1.6.1-r1.ebuild 684 BLAKE2B 18a6313c4e2f3192c049db83278630ba938cbf8e48503f672b1be4ff6a3fc5e2071b8cda985ace481c3fa2fa093f35df9bd0a274cb8f2c376d0111fa1407e6e6 SHA512 84434c700455f906ecc95f8386117c338cad2150bbd7b5fabf5a9e4251618a0831410aa2e9c817e4a6971d2aee1477da44e5e1d76f5444422177469c1678f4f7
 EBUILD fdupes-1.6.1.ebuild 707 BLAKE2B 6c1f60031766bb4d10490242dfcca71afd27875802e742a3bddfae3e976610dc5252ba4ccfe71e036efee845f014a83818b493bf6202271743970537d6846845 SHA512 0be0c0134f22a83e3e862b828d151fc20ef76635e33a77a4c6c0e93eb2a4197951be64c64a698466e61b3238aa06edac4593bcf727fc7d54c50597b22c3a5278
 EBUILD fdupes-9999.ebuild 676 BLAKE2B 061f5b9146f1a815ae16a056ddc95bf0f8bbcdda0b22e704986018df8d178582cfba854205814d41a7587433200eef4e326edc21b27f2715d1f641366e568077 SHA512 f04df62de8ddd45ad72015f8d346f15f4b81c066be0ff53e0f301ff5eb370ecc74192e2e03265f3fe729059cd1d330623eacca57177b1d8b9e777f8a090608d5
diff --git a/app-misc/fdupes/fdupes-1.5.1.ebuild b/app-misc/fdupes/fdupes-1.5.1.ebuild
index ac75fedd87d6..8365eb23a2b8 100644
--- a/app-misc/fdupes/fdupes-1.5.1.ebuild
+++ b/app-misc/fdupes/fdupes-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/${P/5\.1/51}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index f371c5e9bd7f..5c3b4a0c7f9f 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,6 +1,6 @@
 AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b
 DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
 DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
-EBUILD geoclue-2.4.13.ebuild 1679 BLAKE2B e474c73cfaf8a2af3edb0cc1f8fe059b98650160cc7a1a6c953fd50c95f78b0905740cb33d63d59f7832e494f391c55339b42cfa735715fa8aee0775e4291ca2 SHA512 8154326d2c76eef796d3037ce2855ee08e6c0870d1a2ad802e84f3befd42983f5763a4003ab63ba6c1440123789294d207f752f1ed196fc14f82df442910201a
+EBUILD geoclue-2.4.13.ebuild 1678 BLAKE2B c09cb3ca67e9c522f430f701ca5a34da594146e83d684ec1fa9e907ee8ebc3d831ea7e7c58257ae341eb8c8a841dd8e8a00ef6fb52d6e62d82d7ed2d1e9459f7 SHA512 db31b96bc758adfb7c33bd56972e44a99d6e9880a79cd0dac0255b7d836104f4db85fa37ff4bc8a9c319bcf00c4b81c052eac697d1d53837c45a55efebb42a5b
 EBUILD geoclue-2.4.8.ebuild 1592 BLAKE2B 0f3d58e79786d2b0e80905d9bf236e6f6d90e1fb6a98051c319abb89d8723097a4690545468a191bac46bf9317962bee5012dc67d6f5fd00722d084d63ad718f SHA512 ed5f5259c3913294d0b9698b6f7b536c34b546401c7fc004705d1a534cd3fffffe879958274e59152769b082329fce822167652f4640e1b5cf19b5096e0e372d
 MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec
diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild
index 0d9c96fb366a..ce50032457d5 100644
--- a/app-misc/geoclue/geoclue-2.4.13.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="+introspection modemmanager zeroconf"
 
 RDEPEND="
diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
index 45c2b3fa6716..69a2ae93e7c5 100644
--- a/app-misc/goobook/Manifest
+++ b/app-misc/goobook/Manifest
@@ -1,3 +1,5 @@
 DIST goobook-1.9.tar.gz 29274 BLAKE2B 1c2b0b04a7bd21135395d9c3965095973d6a67a9ecb1a6bbe948864eb8bd0e4ed86197de6f5545ce112cc8538abb5ab9fb773b72b569bc9f16c67dcbcd432d5e SHA512 66d017bfa0fcad39d24b80e454d4d2e97f92a95f6dbf545739b89721b8c44702177a7f656d9cf1f38ac8278f235935afe666047cbfb64733f8deae6838f91d81
+DIST goobook-3.3.tar.gz 34964 BLAKE2B f57a0252467220e734b95714c4086bdf233902dbd93fe9259504a2aee5d8f6c51775d0aa94574defd37dd80673e1483c46eef52154f4f99f20fa6abd1f7545ac SHA512 3921d25b55b35dc18944f8ed700e0f23ab1ad51131a4b98469b0b6a1688ddd79d31c16b36600b4f7b003be64964b3c2c78a257b28805b26ae697bf405d77c409
 EBUILD goobook-1.9.ebuild 1283 BLAKE2B 3c2d2f5e9abd108e7b862277a2ad4e7a1210b54020bedaaf2852c0676ab5bfc0a780b178b9834bfde07a3f06962c88407d622f92ba1320846519d22a9a0ce077 SHA512 6e2b832fa37515cf0261aa6470d3574030bfb77c3b31341727bdaea88dab105d282209d7b9715af4fe4b6cad81666f403f899ac144ba70b203a323753f1680f1
-MISC metadata.xml 236 BLAKE2B 0b441545ebad176e67b82577d407fc280cea06ace296cf2093a27e857949f54a26223f5abbe647a0fb0af84ca1d5de8cf65a9bd42ff94d800811b35d851c95b1 SHA512 6b64fd0f7010bcab565170cca870128cf8146528f82ec1ae7c0d8a0e1d128f0259023ced9f021e5f3b467727164b95f0a9324caf71d14acc8c83ac7a0be42254
+EBUILD goobook-3.3.ebuild 1140 BLAKE2B 485a6adb4e0813c904753aa32bc3780f108db58ffc4ee36354db99ff4d24a9745eb76dda7511a868b64dbe2ca89b48326d06f79837d6be9a73d021267d451b06 SHA512 6aadf4298c5ca3ba0e5ffa053690587a9e6e9098eae0a65054bca70d035dd2106260ed8102d44ca18330538f52129e53abb1186a89f6bc199c5ee692c375d5a6
+MISC metadata.xml 453 BLAKE2B 000e304e5d8f67c8f2b272b75a3f501e5b73366e8ac75f9a1a8f5f7b4c67ef75e8a8f540f3f30b73ea85d9bf290f0676697094ecf55dc11180d84200194614af SHA512 910714efd3b83f29a6b95b5ac13a7c832ae336a6c5bc7505d6ed44a8342ad31b5b2545c63ec25be525a0cf54efb62283d576cfb11947018f75490453a0823045
diff --git a/app-misc/goobook/goobook-3.3.ebuild b/app-misc/goobook/goobook-3.3.ebuild
new file mode 100644
index 000000000000..214c67fd4524
--- /dev/null
+++ b/app-misc/goobook/goobook-3.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Access your Google contacts from the command line"
+HOMEPAGE="https://gitlab.com/goobook/goobook"
+SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/google-api-python-client-1.6.4[${PYTHON_USEDEP}]"
+# dev-python/{simplejson,oauth2client} are deps for the above
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+To setup initial authentication, execute:
+
+~ $ goobook authenticate
+
+If you want to use goobook from mutt, add this in your .muttrc file:
+	set query_command=\"goobook query '%s'\"
+to query address book.
+
+You may find more information and advanced configuration tips at
+https://pypi.org/project/${PN}/${PV} in \"Configure/Mutt\" section"
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-misc/goobook/metadata.xml b/app-misc/goobook/metadata.xml
index df79387b9d9e..7502096e1290 100644
--- a/app-misc/goobook/metadata.xml
+++ b/app-misc/goobook/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">goobook</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <name>Kalin KOZHUHAROV</name>
+    <email>kalin@thinrope.net</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">goobook</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/i2bits/Manifest b/app-misc/i2bits/Manifest
index cb8ded40720e..b72f8e80521f 100644
--- a/app-misc/i2bits/Manifest
+++ b/app-misc/i2bits/Manifest
@@ -1,5 +1,3 @@
-DIST i2bits-0.0.2.tar.gz 1751 BLAKE2B b8efa931754eaae55935c72d52bbc9441044ee674ce2bc48971e9aede1ad6b731d0d5ddc9a595d5d044b3c13073e4e483b44990186861f95b6a3ef6187e614d8 SHA512 8dfca8513f8ad16ac5d093120d49f5d9d7acfd20cad0883c0533d2927aba0b6d779b1ad4d3575e7a66f0e56ead5f783e90f49208d6cc9c65bcb60c8558f5447c
 DIST i2bits-0.1.0.tar.gz 2649 BLAKE2B 050e7eddadc4e8b4e1da50128b735adbe6fbace35a06709fd2f31db3e8ffb672b3d51eced0ecb9c87c3566d32c9aac7a431c641e53597ee55ae431328dfbee48 SHA512 9f7b2fe8ca66740cae081c3f74f0c5d67d956c8cd2b5f39cb7306e58a8f75d6d5848dd640e7e514638dda6f3d1efe5f292605dc4fddffe5e530bbd5f173a1db9
-EBUILD i2bits-0.0.2.ebuild 479 BLAKE2B 9b372d8a3ed130318dca61514c6e14fe492e939dd1e64a1625c8920a47694516803cb7f4308f07aa4d2679d97000dab1b99b59168fd7988a6ec21f6e0adfc4fa SHA512 73b9eebdf5e7babd2d167940463f0b4096a9c1510b505ad791f73b529d7d61305d96153554f8aae851cd60efe17de6e50a9317f75aa72332c3257290b216d5f1
-EBUILD i2bits-0.1.0.ebuild 343 BLAKE2B 9666545851a35afd5463b7ba2ead0161deb7ec684eb4c59a460365655d248a4eeb282fcd1a2d5ee74a69bd428620d371965335634293c6104016456029e45180 SHA512 2bb51305996bc1875678058f1915bc52772d604f397f9b9d6f27f3f23eeb403204c1cb91eeb18dceef8aa17a27cd1efb2fa68c52e9967453e44a1be16eaaa972
+EBUILD i2bits-0.1.0.ebuild 338 BLAKE2B 443017c5d2a904e5478d4f73519699f8ed86498d96c7fa4919f8d7c16cffa92dfe703cdb9516ac51cc52c7b26d74c37cfc5cc81b01f25e611b4736f7b46e03e2 SHA512 02c2078fabcb663810d7a533ed1bc0295c4b63cfb5032d920852bc653d5a05a9bdf5d6a9cdf8ad0d8aa78d78dcf4ee7f75fea27e93fa43f106061183c8ea46c4
 MISC metadata.xml 334 BLAKE2B 02924a4da850188a7552708c5e13c82b3d8912197d09b8a83678960c3de0e408e9dcd458d8dc18a8ae829e33c1c9b9a7754f6b2a6f8a7bce85b35a3ddbebc1eb SHA512 62b95a5794d247168cf9351ac0d70e9d910416241897ceb6b8203eeaaec82cd0c462333b7559f1cf68a7edbb9660af8892cfa50e6368f24f18a0200d78458e74
diff --git a/app-misc/i2bits/i2bits-0.0.2.ebuild b/app-misc/i2bits/i2bits-0.0.2.ebuild
deleted file mode 100644
index 887db7c9d959..000000000000
--- a/app-misc/i2bits/i2bits-0.0.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
-
-inherit cmake-utils
-
-DESCRIPTION="Utility to convert hex or dec to binary format"
-HOMEPAGE="https://bitbucket.org/PascalRD/i2bits/"
-SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-misc/i2bits/i2bits-0.1.0.ebuild b/app-misc/i2bits/i2bits-0.1.0.ebuild
index f4d07dee5b44..4bb902c770b3 100644
--- a/app-misc/i2bits/i2bits-0.1.0.ebuild
+++ b/app-misc/i2bits/i2bits-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,4 +11,4 @@ SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index 3f1383617665..b14e4b16ae0a 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -7,6 +7,5 @@ AUX linux-logo.service 155 BLAKE2B 706487d4b0a266d563bf427996ba15775a6e317d77a71
 AUX linux_logo_creator 604 BLAKE2B f2956ddd3cf79488495262040b1756ffbbab5608a4895c76c379f90470d4ac9d28d24c8f02321ceab42007cb149c5d20bd7b87bbd2f978f289123fda2afba941 SHA512 a1098c1ea4c867c8950e744c598373f6f409eb411525b2e6e7a0e592b78ba237ec71a591b13c8a958e4622c3471d087ef196d07e2a958450392b75aeb9318513
 AUX logo-config 195 BLAKE2B 7ed5aa9a16ebcf27c73672bfc2e9256034c3c1b14c1d0d3d172b0292e658850a10c0cc8835e6fce224fd1664a85e6804f6d69c8fda5dffca257e0403eaa1557e SHA512 d58c60821d60d511f637d9abfd996b1420662df3bc5df8ce3ee2b3bd97974b4996a4a57ac18f8fdf5305cca3221244088d28e6d9ae5ee10d6df49f6247806469
 DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4ab91df058a31a5bffed38b8f3caac01b80ce49d52583f77632cc5e3061a20a5530437ca3508e823eeb88eb2e94cb SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114
-EBUILD linux-logo-5.11-r3.ebuild 2185 BLAKE2B 3e1bcd4fbacf8b1a3aa2248748c6711aeaf94858fb33f594e74df8f3afb1c9a70279a20e234b9ab56d1556fd66469421594ef2fe41a820aa8b2a93f980ba904a SHA512 6f0250d887fbe33372d34ab32966dcb08ae7fba7c4dfd3d80055b5c5f676c7dcef03b9f604d17d5da3e227a39b613d4d0f191bd5cc05b8ca1831d5382bcbbd76
 EBUILD linux-logo-5.11-r4.ebuild 2260 BLAKE2B 991a099bfe2644d2cdbc8a87bc6ad741bcaf957af788246bf9e9d80c0f4c40b013c8ab30b34877af053263b22d249266d6f2ed8d3681657c23ce1a9d43994d95 SHA512 9319f5f3d9db13737766bb2ab8bbd6a84c4a281106ff6d0f3ee171560b4201b23385797ee6ad1ce87f4017b79882cf98a32a7588ea2eb418b97bb0e52231e7be
-MISC metadata.xml 410 BLAKE2B 70c580020aa70cdd8014ec30006a34222d0a09397eeba4e09ecaee3a3ce14c65a5990d401334a06e54adcaab4898b1b4d6526c2a628f9d50610f331ffe2990bf SHA512 90b168683db981176423d73dc4454cd216b5985e6100793462d28bbdbf8e08951a400502e8835c11c230a8f37db0e67a2911738875ac22fa3c5824ced3c8aab2
+MISC metadata.xml 490 BLAKE2B 86e3962880353e6e86dbbf5d6582140126a5d2c56eff5e110119aa9a77b73051258ab4624220733da236e6ab438aeb6ac11102481a792afd4807dcbcdf669c11 SHA512 103652d3e84265d69b041a3268935de7fd1935c0cca90d905656d845009037774e46cae7116fccdac64c3fdb919a1a2b011600ea1858277117420bb63b5740df
diff --git a/app-misc/linux-logo/linux-logo-5.11-r3.ebuild b/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
deleted file mode 100644
index 6406607e1caa..000000000000
--- a/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs systemd
-
-MY_P=${PN/-/_}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A utility that displays an ANSI/ASCII logo and some system information"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	cp "${FILESDIR}"/logo-config "${S}/logo_config" || die
-	cp "${FILESDIR}"/linux_logo_creator "${S}/" || die
-	cp "${FILESDIR}"/linux-logo.service "${S}/" || die
-	cp "${FILESDIR}"/gentoo-*.logo "${S}"/logos/ || die
-
-	# Remove warn_unused_result warning
-	sed -i -e 's/FILE \*fff;/FILE \*fff;\n   char *stemp;/' \
-	    -e 's/fgets/stemp=fgets/' "${S}"/load_logo.c || die
-}
-
-src_configure() {
-	ARCH="" ./configure --prefix="${ED}"/usr || die
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install
-
-	dodoc BUGS README README.CUSTOM_LOGOS TODO USAGE LINUX_LOGO.FAQ
-
-	dobin "${FILESDIR}"/linux_logo_creator
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${P}.conf ${PN}
-
-	# systemd support
-	systemd_newunit "${FILESDIR}/linux-logo.service" "linux-logo.service"
-}
-
-pkg_postinst() {
-	echo
-	elog "Linux_logo ebuild for Gentoo comes with two Gentoo logos."
-	elog ""
-	elog "To display the first Gentoo logo type: linux_logo -L gentoo"
-	elog "To display the second Gentoo logo type: linux_logo -L gentoo-alt"
-	elog "To display all the logos available type: linux_logo -L list."
-	elog ""
-	elog "To start linux_logo on boot, please type:"
-	elog "   rc-update add linux-logo default"
-	elog "or for systemd"
-	elog "	 systemctl enable linux-logo.service"
-	elog "which uses the settings found in"
-	elog "   /etc/conf.d/linux-logo"
-	echo
-}
-
-pkg_prerm() {
-	# Restore issue files
-	mv /etc/issue.linux-logo.backup /etc/issue 2> /dev/null
-	mv /etc/issue.net.linux-logo.backup /etc/issue.net 2> /dev/null
-}
diff --git a/app-misc/linux-logo/metadata.xml b/app-misc/linux-logo/metadata.xml
index 28aea643562f..351315604363 100644
--- a/app-misc/linux-logo/metadata.xml
+++ b/app-misc/linux-logo/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-  A utility that displays an ANSI/ASCII logo and some system information
-</longdescription>
-<longdescription lang="es">
-  Una utilidad que muestra un logotipo ANSI/ASCII e información del sistema
-</longdescription>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription lang="en">A utility that displays an ANSI/ASCII logo and some system information</longdescription>
+	<longdescription lang="es">Una utilidad que muestra un logotipo ANSI/ASCII e información del sistema</longdescription>
 </pkgmetadata>
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 199440cab6c5..0da4a8697c01 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -7,6 +7,6 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r1.ebuild 3776 BLAKE2B ad69f84d9d4b7f2a016714a5c66dbe9afe9e1a12a648ce99b6974d0eeaaaa96f4fffbaa2a49e3286c6b9448237b1d3824811b5b8cc6f2bcc9789cdca62006f97 SHA512 488cc6c639db5fa28d6ecfebd44d818eb5fd463ae094325268c2a6c696166db3d6fa292ab43e384a03f5c7368ac68124b07752771f18fb4e19a30d61f3ee9264
+EBUILD lirc-0.10.1-r1.ebuild 3774 BLAKE2B 50fddecf53e357e92921d2b469704bbad1350420a1b8adbaa3a00ff834727621ad2c7ea0582de54982f61ddacc4462e0a0595221e96a3d2f3548ab36dfe15cf4 SHA512 0344ff3b1c1a4f737cf4fea23a4015d0005f9a7b4974ea3d72c672c9710039a25b87f4ad9693504fb887030d1618b0f9036c86153ad1d243cdbf7c788059cf75
 EBUILD lirc-0.10.1.ebuild 3726 BLAKE2B 7054ad4a9a02d499e4460c9178f24eead6da0efa148e680e96c0a261899a05e63fc77221f270e448e2a3269a538b1a92f58b90592193f569ee1b29499b7e68d3 SHA512 db8f02c0931238d4d8d73a2217076d31d4b609dcd874a246005633d98ec655ac51d818e4007a673d19db279d3a1995609c6d3e0ac0cbb4a28242432ab1ae351e
 MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/lirc-0.10.1-r1.ebuild b/app-misc/lirc/lirc-0.10.1-r1.ebuild
index e69687a9d3b4..d054d3132398 100644
--- a/app-misc/lirc/lirc-0.10.1-r1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
 
 REQUIRED_USE="
diff --git a/app-misc/mx5000tools/Manifest b/app-misc/mx5000tools/Manifest
index 0e40057141d9..0741e107f32f 100644
--- a/app-misc/mx5000tools/Manifest
+++ b/app-misc/mx5000tools/Manifest
@@ -1,4 +1,4 @@
 AUX mx5000tools-0.1.2-find-netpbm-header.patch 941 BLAKE2B af7f7ae5d27f403b2429a4c8298acaf7fcf3971382a8c8c630b6ec12462164e2b1433894de4aac4235ae96706c0b79b4b7fba49611f31ed8a83fc73f93946abb SHA512 c663b416fae74cb937db9dce28e4b3d23ab3fb78df154f226524adb4cd8af7f5db38602e029cd8ca4ab8d66d250bd88083a92c09136fed3501e1b4dfac75aebe
 DIST mx5000tools-0.1.2.tar.gz 343118 BLAKE2B 74316ca3c730b5e03aa73a8cf5422eb3690b0e088254f9078da549f2d964df065ca7cd09f5f822cb3e66ad5bac0eab546c49703eaf837a132a61ab0755e729b8 SHA512 3773b8b233f02711bb7a768a68ccd3bf72e3d51fbb64ee2a70197d1b51e884a4f40048ba6b7dcde4be0703f25672ccb0fac9b0d6612b8a94f9e01b6a9f463613
-EBUILD mx5000tools-0.1.2.ebuild 757 BLAKE2B 6dab8e6640b1f6a657cc915ff411f631163309e2a7311829d3b1bfeab94ccb7bba362e3d3a6b79cd1b6ee1d6df81630baac812e83bdf1265e5a89bd27e1fcca4 SHA512 9f95ebc428b64a6171bd63ecf648b3cdac0e89419e24aa1f03eb0a9a890f6574180668ff56f41fc9121a34804d9ce9c18ee529fc1106208cb3c781a42ef92412
+EBUILD mx5000tools-0.1.2-r1.ebuild 805 BLAKE2B 6de00dbf50b046681fb6442888e724125d1894cdaffa9cd31e27ace915100ee017ce5cfc3a63eab6fe4bb0d37629f09395ab2f9a44a0d1b4db88bb2f057f30b1 SHA512 d4fa41ef9faac3ffb62f68493253e458f92aed621641b429eaf316b964ebec0ac0ff86449cb72d1e9ec05a7edd9fb01ba5385818af1573c6ae3f3a3a004759be
 MISC metadata.xml 739 BLAKE2B f242204a9d3f27f2c68cc7771be37cb329cbf57725ddb0ae823191fb62ec23050dc530b20fb22115fd2582a919375404322a8b3192734975d6eb6b187a02c618 SHA512 19a17587727e544f9c3c7dcb5a58693aa294c6e86807a610d484fb568b0a83472abc155609e5fe66e33a07d165ebd1b5968cea18b474ad5a934e99cd7318743f
diff --git a/app-misc/mx5000tools/mx5000tools-0.1.2-r1.ebuild b/app-misc/mx5000tools/mx5000tools-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..dd66bb738bec
--- /dev/null
+++ b/app-misc/mx5000tools/mx5000tools-0.1.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for controlling the LCD on a Logitech MX5000 keyboard"
+HOMEPAGE="https://web.archive.org/web/20160409073317/http://home.gna.org/mx5000tools/"
+SRC_URI="https://web.archive.org/web/20170225160711/http://download.gna.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/netpbm:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-find-netpbm-header.patch" )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild b/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild
deleted file mode 100644
index 71ca5f515e94..000000000000
--- a/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for controlling the LCD on a Logitech MX5000 keyboard"
-HOMEPAGE="https://web.archive.org/web/20160409073317/http://home.gna.org/mx5000tools/"
-SRC_URI="https://web.archive.org/web/20170225160711/http://download.gna.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="media-libs/netpbm:="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-find-netpbm-header.patch" )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-misc/pwsafe/Manifest b/app-misc/pwsafe/Manifest
index a397e25836a8..0fc6ca84767a 100644
--- a/app-misc/pwsafe/Manifest
+++ b/app-misc/pwsafe/Manifest
@@ -5,4 +5,4 @@ AUX pwsafe-0.2.0-man-page-option-syntax.patch 848 BLAKE2B d05bca68e0d8d224c059b4
 AUX pwsafe-0.2.0-printf.patch 1868 BLAKE2B 85ca5b70068dc50f6f650d766cf381dd2013640b45db0628df7137c5694a18783932e0effcb86f60b27a84aaedb77c25c86c281f4d05b357cea72961340a64be SHA512 7567e666f7dfb9c798aa2e6368ea1abf72f749c953da42bff7ef1b61aea6bf2faca96ef702ef9f7a9ceeece90999c066763006e549c5f2ec365cbf9358547449
 DIST pwsafe-0.2.0.tar.gz 127433 BLAKE2B abfcf36e3fc685100302b4dc7862cc8d8335e5dade40943cb0b7ef17b83dd2b75c36e3069d6bf759ba907e46adf20f3712af5223a8d8a586ae57e98ff6c0a3db SHA512 e8d3684f523f83def6317ef5561a02d1493685cfbda18707644bf335b7f45b1a548aae17a735838d9f6df345ddb17934607162a6e99348df625b34a9ad5f4cf3
 EBUILD pwsafe-0.2.0-r4.ebuild 1017 BLAKE2B 8ab2711772f5f83105c7456a19f829a2cec02d077a9fe890df142d580ebc9ad9dfc914b9fc0cd40c4e1803fa8ae55aa1d9899d2d163f68c28dc5be60b37bc840 SHA512 3a58950a8f72c0696cdee221c63b75536bde0f5095b609dd260442ef204675ee7f673ce4d7e2d94a40c1094ef34039d141126f402c952274a36672e28acd657f
-MISC metadata.xml 868 BLAKE2B 4d255755c7ef0e69a916ec6bcac744805885da500e04cbc25822967abe5737379d5c4d46877fbdbfd4c0c166618a2c9a0237c3d7e8e595d1fc9b86e6a3a91bba SHA512 65c7ff9d5db3d2b16f5430344f944e042b27401be87183d7c6b761d95adefc5dee11dbf2d734675686cba48172276c3c70c7fd1f2c7d7d54303bc838a0817577
+MISC metadata.xml 867 BLAKE2B b5a9fe61bf56a919e466f290917b0bdabc1fd36c493d95afdcee9afa21ca6a547169bb6f39a5a118a0eb25e478b8b487a1d7b37efc451fb4563f16db2a8c3b25 SHA512 e73ba53f01a694f4bc93857c94fd7e999295b3a8cf3990bd8e0699007131ff16bf1dcb64d946ea9832713bd960d68f5940e3dbe00786e5fa77de48b22c23cf2f
diff --git a/app-misc/pwsafe/metadata.xml b/app-misc/pwsafe/metadata.xml
index 7eaa453dfe23..c94aeaa2dcd2 100644
--- a/app-misc/pwsafe/metadata.xml
+++ b/app-misc/pwsafe/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chead@chead.ca</email>
+		<email>bugs@chead.ca</email>
 		<name>Christopher Head</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index 32171dde99c2..908591b82ad2 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -1,5 +1,6 @@
 DIST aho-corasick-0.6.10.crate 26122 BLAKE2B 752eccb2fbf36fbc73b8694033d2f80f6ab6d2a8c2ae023329b90bb252b537adb1e80a604b4266bfb1ccc2963fcaa6579be48ef011c9728734c7cb77fa3eab99 SHA512 4a21b0e68c416e5dcfe99ded917577abdbe7c92e50227b7906a2b3bd25105f8e7d03103514d388171a41090cc7bcb63bb5b4dc3c6847a9b4e09bb3856a1bbd9d
 DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
+DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
 DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST arrayvec-0.4.10.crate 26133 BLAKE2B 43772765a9be4e3e6dd5b2ee8864f7894aab3128123a673fd0ddf18dafb69d7ed94709dad6de26e222f080b1de83d31aacbb3419b1d926ec4005de64e4db8b30 SHA512 8aa327fcc18220da496c63c76a521c383c7d506e8c39448f5cc6535c47b8c70ca74f73322b0c368fae7b8a8cec11c9854ac45b4eb7e537fed34e007aa3ad175f
@@ -25,8 +26,10 @@ DIST derive_builder-0.7.1.crate 30908 BLAKE2B 5bb18cfe4af9ae479f0ce0c23e23fb4e93
 DIST derive_builder_core-0.4.1.crate 17157 BLAKE2B 56a1ff198fb5fefa1186fa829eb79ddbbaf4efef191cc56ed41950a8e32a27bf980994a41ebedb84fa6432d10d8ed83022a95a858daa8047fa5570aad66f798a SHA512 abb287b29f4c47741c7f8cccc7d96d23312f2880011a428613562de387326c76b15aef7e9449de3fa5c8f471330fe42639b9f06f7b9ceb16256fd97df764db80
 DIST either-1.5.1.crate 11532 BLAKE2B 3cb46de61309efeedb614c20a83bdcf2c4de024fa1ca4e6e1cec6384445596cfbf2c9d7a9712faf554a373eaa462835b455d7b2a908a99e99ae1c738680778a8 SHA512 268d218b10ed7cabbf1a116afa22ebe47791303aa012a61676d04376961156983374490d3d939e5d68b2ccf3a9c56f41eb9c9651cf81ea1294ef275dc898733e
 DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
+DIST env_logger-0.6.1.crate 28567 BLAKE2B a7302e44a807dcb1b523e1dde683a040837b1de2fbda5e8e7347478f77d4b7a39521aadd1d6d42dffbb6229e0dd6bd1b2b9fc47b860db45281a95612dd78faab SHA512 7e5142fa24e46aeb246515f42f9fc561364f266a693ec9f8c45dbe96d31174bf5663ef6233f41a5f96849dd19b61e2a97ab7ca1a7a55c51f741f4efa5af371c5
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fuzzy-matcher-0.2.1.crate 8135 BLAKE2B 9fa6417a90190905b0c563d2f629a77f4a711c4c87eb2600b2411c00f11b125b2fad346be02ef30fbf21c0e6d0ae068f89baf5b300ba61bf705c4a4256909687 SHA512 c177eacbbfb45bcf6f607e0d421da18eaf4c25738a26fd553574901be2e9f5b9fd877f4886b0f6d68050dbd7a04d37f73420648fa3e122f2a18e26794865b63d
+DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
@@ -40,11 +43,13 @@ DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422
 DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
 DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
+DIST nix-0.13.0.crate 176804 BLAKE2B 4aec3245a1812d0db51b77b65f1a75f039797672f5929d8cf02200a4f6c56f432d6fe9bb313ee160acc86ab7aab59f8e5ef83f25d45a1e024f6e93d24d5feb22 SHA512 6345871b599ea0c4482248d0ff98953e4976d5af85d596d8a1ef739c661e54734f1379f3a6c41162a9e2b8eff1d9dd9a9e3fdef6928ba21eb855bd369a278752
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
 DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
 DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
 DIST proc-macro2-0.4.27.crate 34098 BLAKE2B ecec94ab4c79dbdfc77731054e3c370c2ae330baa3502efba34d2f900ba9ddcc5d89373adb06a465fa10c9bda061f7b3040c5f20fcf1b1accaba177632b6edb2 SHA512 b1ec1f59355c122022ac93f7ac03ddcc092b8712321f4ad74bf346a0dbea06c31cc695b1edfb735010620ab5eac5c62d3bde423c8458691edd0336127462359c
+DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
 DIST rayon-1.0.3.crate 134391 BLAKE2B b0f938ad39bf8772374d312893097bb91ee3886e79f6c3050658b0797fad55f309d03d99c3f300837e86aa28f4b5041d9cf7dc455cb418fb4d38b678e8063a10 SHA512 bd23dbcd8b17061e0623df01af141d0e51532b46ef360ddbd392f4992d6b62fda26255cd9908f853a5a4c3cf111f6c9224a97abb0a3f9754aa0ed79ac58392f7
 DIST rayon-core-1.4.1.crate 53760 BLAKE2B 0c8c9b83e3459f85fbd168b70ca8a4f34378a2e902b5cdf88730dd57e84248c8474c5cfc5dedbc66322b996733bf404226c0d2694fd7139ae9706a822f567d3c SHA512 4d12b8097356d0a9eac8b3ca64085de8d19360dae81b3ccb199275c3487f705e2aded498e819958bb81d4de56c05d4d29c21c07da02236ba6fa0b2888ecfbea8
@@ -53,8 +58,10 @@ DIST redox_syscall-0.1.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-0.2.11.crate 209507 BLAKE2B d8e52b078e96c64663a730208d14af4808abb62d7f2ddc21026410d78305bcf45c8fa5bd6bc28a61a62dffc3dbed6118562bf5294d176f04a9aa8b3eac295a5c SHA512 e0f48ab9a692f7ebd83a21bc70060aed0a7dccc9aaaef6995262fa4e2e33f4404a04a217588b72025820b1a0e4697c076ad47a017e7c51cdd4b6c1909c015ead
 DIST regex-0.2.3.crate 193983 BLAKE2B e59478e264afed2ca0f675dd5abc39b0ec5f77609c7720ce6ebdd4cb31f51201024ffb3d13dce3f9ba643f8ab623248790412c63867ac660d8226bbec586280a SHA512 639e8f0e62127fa9ba84a53c2b9e4774ed126eb48dc0f3bbe093d8683987d74e90124f5ba1722af9ad5d8487469320f6dd6e5e76bfaa64e170c788c41162b58e
+DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
 DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
 DIST regex-syntax-0.5.6.crate 233912 BLAKE2B 828c35471d8a91be9fbcad00e036c40ff0e2c38d008c5d916cb096f0a6856f124a64a203d547fb5ef45cc296565221e5f96343754413cf6bf2fd1463c7e02f1d SHA512 4ee43272d0d6e5cc0b554816e20e2d93b0ee774fd71643d5edae06627b295d374769ecdc3c1233a688d306d1cb86a83b6850ffe4022baa3db78beeea1190b455
+DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST skim-0.5.2.tar.gz 78847 BLAKE2B 0530a730abce8bdcaff1e6b2637777e87a0a9184dde112b9c8b4dde08780d7d50cb8bb4ec2ef555df941be4e89f1f3aa49b335e640702bf8b10e609d6cfba211 SHA512 018962a728b9729b51afdc8975cddeceec84731f43b776a740ad2b4d2a479ceadd7a4d45c6eb5389ef73cdf18955a74ac85e9bbb4ad823e4d4a5d9972a4aa19d
@@ -62,10 +69,12 @@ DIST skim-0.5.4.tar.gz 87040 BLAKE2B c7816dae5142d3230bf98db7c86ec8b8d78adac52df
 DIST skim-0.5.5.tar.gz 87411 BLAKE2B 98dbd5d8f5d45a0752975316aa41971622e6d65e91dbfe9c8248882931d05dcfb0d8ab32fc51504060fd41aef7c456c8f753e2939a726ad41cd3b82515adeeb1 SHA512 a6970252633e32004edc4e4cf910a5d07d1a63b11b77e56d5ddc6ad656d33ea984dc02523fbfaf5eeb58c197d95a17fb6bcdf16448d68c6a239798b3180d7aa2
 DIST skim-0.6.4.tar.gz 85922 BLAKE2B ddf8a64bf3e7daca04bea7e0a208b9acf7e336c299ac3e524bff081f55b103b431d8f35790265222d36ba26abe9e0377cf6c748af81739d42fb2a0b82a40f6f7 SHA512 1aaa10158cae58d2fcd0a2c25c03699ef63cf6d2ae94adba5988259c5be23eda5837b22c45643904e96bd095e8ad6efb48c7c36ffb3db14492773e71fe9d66e6
 DIST skim-0.6.6.tar.gz 86665 BLAKE2B 5e89507ab76d974bd0925aa273565eae0f9e7783a18a84da6083d28ac13394ace48123cc658bab6065c0fd4f46a2e96469ac990ef58e6a0391e740825095581f SHA512 df4c8c9a3641321786e014f63d1f1bc4b15762d666792d3f8b86e73704c15643ca01e3f6242243eb903454cc7c8e983255583b1cddc39cfdd5e779c00f1a546e
+DIST skim-0.6.7.crate 84440 BLAKE2B 8d941d790071b3c2b310dc7a407b5e58b5f482637ee97aebad34052141799cf3b074ef415d9806d2d25701082ca195088d59f8d3ed9a19492cb1084d36fc52da SHA512 273337fcf6e46eff99f10b4a6eef7a66e215db0e0632531b5bab7bec4087f283dfb2bbcfcfb45613bedb94b208235f7f7acbadc1c2008c46ede7c64125f938e9
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST syn-0.15.29.crate 146203 BLAKE2B b9280bda7735dfc08f80816e5db9c22e27596e5bfcbc54accd37a9bc4899c2caf1bcef03155c653441365ed9fc8cad910fa47c58ba7a386b3fc9f40b4be59a27 SHA512 1a5f365a8239758c9a2e2cfac3bac1bc94995ea48eb087cc8a2dc62a33a2f22b2bbe2985e344fdd758021ab66e55ff17e76c0234e9ae342499d1ae1fc3294767
 DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
+DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
@@ -92,10 +101,13 @@ DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 EBUILD skim-0.5.2.ebuild 1353 BLAKE2B b9ce81124e4cceb55af348e45105bb5cc55ff1e21270534dc2e4fe2ce339717129e9e9d82380a3503aedfcb19106959cd0684ba41f0b06788baf8e7778077c67 SHA512 ee1d0d208c8b887487ad9e09a9ad3f144bb9838108036901495623682d4f5493082f5c4355798b83e14112903132b245df95eb46a9e4909552fbf40d0b0fb734
 EBUILD skim-0.5.4.ebuild 1389 BLAKE2B b7a979df15c653f37dbd805e6d34095ce47f8869e355699c476febe75d51dfa61212a4153c6ba2de8ea2b8dfb6528272259a2b884aac1f95bb0e85c0ddcd2067 SHA512 eacdaa3d57aa3c362ff48541ad81c4d234549e03255be1b217e88c81c343f2af9259747d001031bc44a3c734f29b356ec830757984094f06e3216bf8b62ccbae
 EBUILD skim-0.5.5.ebuild 1367 BLAKE2B 200e4fdb046dbb5f16316e9c7dd390393fedc184e76d5a061b0ad1b65ad18171f76a49f334bd3ceefef41c4d3a95931bc375973c8fab804031508b8e54d0e444 SHA512 4df3904246b2f25ffed97eace185604786c412c0420433ce51352ac071148dd9f08e619e654e49436949662c25973534ae18ec01972e936a2d78ba989b9b456f
 EBUILD skim-0.6.4.ebuild 1998 BLAKE2B 31a28862d37f875671e5084b9568cd271aff60e76b450090e4f1ac140444f89dc4271f579b8ec3c61022155dcf580bd6388ed4d0c0ad3f0338706c0a0118645a SHA512 41d0873d8db5373f020e44c7fd5eb7f5ee5c537def71d355aac3b1ec91265c1f79a8cdc1ae3fca69fd85b2fdf6f0ee4d92b762175eab9db11b0eed4d2609dcf0
 EBUILD skim-0.6.6.ebuild 2059 BLAKE2B 7336f85a6e335a049c33c415fb2d3522fd38335bb8df16c3bbba5aa06b351e7d37caec6cf6a9368572b4e25652ef62cdbc2cc3e3e2db53a4712df9f8dc2cfa41 SHA512 58dc196e36edc43b5d8c4e793e0ecd3be72d9ba92df5b901eaca3ee558e64db48f3992116f595cf59334e47d3b42ab8aa8fdd83f5a01482a380fb5c18e2a1838
+EBUILD skim-0.6.7.ebuild 2059 BLAKE2B 5be72c371d268e4efddc4e12c96f989c972c3a7c9417924645acdd3972f05b519b11a4ac115ce393744a6878303400e0d21eebb7613678aac946c1743f6d511f SHA512 7ed306f4334480e0075f33d712a00bc83669330c0ef3b9362488e9bac18e9fac27b63c0f63f9fcd2724d9b56e6ab9934ce23b7f368f29cd88f1adcf97958621e
 MISC metadata.xml 582 BLAKE2B cfdc16bbc46445ceb6fa494cd23600d7e73aac9b88d9ed04a639242cecd82ef930372ff9807cd3a595fe07f8dcc0eff20d06bddd7153e624f5bc65823fc27991 SHA512 28756c12e60594e90969979d729a3f05359e724e230dd04492780215d21a727429caefb048a6d3976cfd9c0acb63fca76c5195eb9fd5cdafdce73ec429274315
diff --git a/app-misc/skim/skim-0.6.7.ebuild b/app-misc/skim/skim-0.6.7.ebuild
new file mode 100644
index 000000000000..cc50f91bb4d3
--- /dev/null
+++ b/app-misc/skim/skim-0.6.7.ebuild
@@ -0,0 +1,116 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.3
+ansi_term-0.11.0
+arrayvec-0.4.10
+atty-0.2.11
+bitflags-1.0.4
+byteorder-1.3.1
+cc-1.0.31
+cfg-if-0.1.7
+chrono-0.4.6
+clap-2.32.0
+crossbeam-deque-0.2.0
+crossbeam-epoch-0.3.1
+crossbeam-utils-0.2.2
+darling-0.8.6
+darling_core-0.8.6
+darling_macro-0.8.6
+derive_builder-0.7.1
+derive_builder_core-0.4.1
+either-1.5.1
+env_logger-0.6.1
+fnv-1.0.6
+fuzzy-matcher-0.2.1
+humantime-1.2.0
+ident_case-1.0.1
+lazy_static-1.3.0
+libc-0.2.50
+log-0.4.6
+memchr-2.2.0
+memoffset-0.2.1
+nix-0.11.0
+nix-0.13.0
+nodrop-0.1.13
+num-integer-0.1.39
+num-traits-0.2.6
+num_cpus-1.10.0
+proc-macro2-0.4.27
+quick-error-1.2.2
+quote-0.6.11
+rayon-1.0.3
+rayon-core-1.4.1
+redox_syscall-0.1.51
+redox_termios-0.1.1
+regex-1.1.6
+regex-syntax-0.6.6
+scopeguard-0.3.3
+shlex-0.1.1
+skim-0.6.7
+strsim-0.7.0
+syn-0.15.29
+term-0.5.1
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+time-0.1.42
+timer-0.2.0
+tuikit-0.2.6
+ucd-util-0.1.3
+unicode-width-0.1.5
+unicode-xid-0.1.0
+utf8-ranges-1.0.2
+utf8parse-0.1.1
+vec_map-0.8.1
+void-1.0.2
+vte-0.3.3
+winapi-0.3.6
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.2
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+"
+
+inherit cargo
+
+DESCRIPTION="Command-line fuzzy finder"
+HOMEPAGE="https://github.com/lotabout/skim"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tmux vim"
+
+RDEPEND="
+	tmux? ( app-misc/tmux )
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+QA_FLAGS_IGNORED="usr/bin/sk"
+
+src_install() {
+	# prevent cargo_src_install() blowing up on man installation
+	mv man manpages || die
+
+	cargo_src_install --path=.
+	dodoc CHANGELOG.md README.md
+	doman manpages/man1/*
+
+	use tmux && dobin bin/sk-tmux
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins plugin/skim.vim
+	fi
+
+	# install bash/zsh completion and keybindings
+	# since provided completions override a lot of commands, install to /usr/share
+	insinto /usr/share/${PN}
+	doins shell/{*.bash,*.zsh}
+}
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index a9f09e645274..8e55098043e0 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,4 +1,4 @@
 AUX 2.1.6-cue-meson-fixes.patch 2632 BLAKE2B d3d63e27b8d1ff4f3463826399133c2396dbb17fb38e9aae43df8da43aea1c05ccb6c0567235773ecaa8a5741dc75ec1be49ec06d604f6751d79e32fbb3d153a SHA512 3cfda20f1be0c956de2de2b2cc70960373c2d74ddbb895480026faa32e053bcec4db42473d15d8b37d567d2fdd2b8ccb34e8bbdcc9446fb03089eefe2fe8bd4f
 DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2
-EBUILD tracker-miners-2.1.6.ebuild 4476 BLAKE2B 2ed41d58ba8d86590e9d0e1f57887183dded68fbf02d9876914e6ceca20eac9ea23b55231688b99878d1338bf4c006c12934abd5031f52a6aeeef51369d4cad1 SHA512 2e00876341901b1e75e894b2f101089cde4c0c1fa7da0fd19ddf320cde6b188ea51685cdfe1c4260c020f6c555ac88575af85d06bb8f6964f1899f872ed157ba
+EBUILD tracker-miners-2.1.6.ebuild 4475 BLAKE2B 1966ad8ce6befb049de06e3688ccfa4a8c2fc795c3dcd425eab17429ca176d98d4ebc416eb494dc42d33186d82c172587295d96468f2248b2d36c6adc8523923 SHA512 e33236ef8ff6770566a4f0bfc53882642b195887b5e0be1738a4dd54d4a032dca08c0d7c7c30355b5e724b951fb0db612e2d03f2bf589e357eba72f27616af86
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
index 0a0db96c6544..2c9a7047dd77 100644
--- a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
@@ -15,7 +15,7 @@ IUSE="cue exif ffmpeg flac gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playli
 
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index b573193336e1..f441fe3c3afd 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -3,5 +3,5 @@ AUX 2.1.8-fix-library-symlinks.patch 2937 BLAKE2B f26621b37fbd3f4e58289b8182bf56
 AUX 2.1.8-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5c7f87afdfde764f1940735617cbad12afc02e25df9b9a848a580d4e5b969cd0f55b889ba50f5618c33cb9f9e5966d82ea996 SHA512 0d7374605e6221f14877539db2e17d4536ce45adc25d76adfb78043d3d699a291a213aeccd4e0bc4338a10454bb93c47270cfc525b258bf2a1029e856c1b47a9
 AUX 2.1.8-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2
 DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696
-EBUILD tracker-2.1.8.ebuild 2816 BLAKE2B eb6bb2f0476e98f9c5e48ddc602c6b5fedc07f740666c419c0b83f39b4ae247b1a3d72ff88cc54344c2bf33e928e884c607ccb1e7acbb0b209778a2963087d16 SHA512 a9bb8bce1fac193010db66dab020068013689ccfda79dd03385b16975ef039574b0721145c78e32308e3831ab8fd8bc7cf6580717bca0632945e9dcafa381618
+EBUILD tracker-2.1.8.ebuild 2815 BLAKE2B 3d92b83341efe24d2109e611dadbf8979fb315884f38dddd4b394f0a38c1b403bf8e99a2d836f3b0b8b4126b461582c53cff5cc8277203cf28d5197af9d3f8c5 SHA512 5c87a0318c60fcf792884622e2de37de8a0372e2942fa58dc4ef96339f69589b3fe9088ab733480040fb315e70176891af199ec01369ec7fe61ea8a9867f8124
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-2.1.8.ebuild b/app-misc/tracker/tracker-2.1.8.ebuild
index e4ad7a80ea7a..5ee135fd3cc5 100644
--- a/app-misc/tracker/tracker-2.1.8.ebuild
+++ b/app-misc/tracker/tracker-2.1.8.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/2.0"
 IUSE="gtk-doc +miners networkmanager stemmer"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 PV_SERIES=$(ver_cut 1-2)
 
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index bffd77e93edf..930d932c9b2f 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -3,4 +3,4 @@ DIST vifm-0.10.tar.bz2 1054361 BLAKE2B 81ec964b3bf236764976bcedb84c922eca0da6509
 DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
 EBUILD vifm-0.10.ebuild 2115 BLAKE2B 2c4af2cdd610d10cebb29815f3c1c0d840593339eeb8165d32bc21a0f33c2bcaa8a88c86760620dd4000eee87b6807f37db30fc611a9824a3eb10e2fd713b102 SHA512 97af2e063f33030d81a8013d47cd905c981413f87052588d776351d63c17964590af64ace4ac17b42554bd778c7336d558928f35373b6c332410bfdc52ac1c4e
 EBUILD vifm-0.9.1.ebuild 2171 BLAKE2B a21fb0c2f78322b2fff57396ee4b7a0e8177b5b8a9249cba884ce98062e9aa63d5bed314f53709dd125377e58701558bab58d4ad64693387d6e0cb51ab8f4d80 SHA512 3018627eea8ad64162a8239ddf84d5054f8639fb0771b2ad9eaedc2d4b46f2c467cc0c0947b890f3b6494146903b7db573a765a652b817e607816024f1efe2c7
-MISC metadata.xml 1237 BLAKE2B 690f9f340aa6a71d70ad8f39a71d1f4a65539a7e9a9ef1698aafc97cab2387a0d9af18333f3b259bb79b7d2427a76ed79be9196bfcd060d551abefc1ec92493d SHA512 b7dd2ee856bf79c8355a9c9ae2a4ebe076d285d01cc8201b4166a4ed295eeb27d3f054f29d3becdf9c91665ad5757f3c9f97801eba7088f79a66db3c3ea16e01
+MISC metadata.xml 1321 BLAKE2B c6807a0e954f939d55ad627668984afcca9cd6856122996620c110a3059a179d70f162362ef9ea490a29449c229a4bed0403f126015c64a250b5518c6fd7d78c SHA512 e24fce2de5f37d665ce6362ea03e2bf17a30c7b016228ba1cecf71c2fb83f34fca2101f15044748b1322465228bed8129bcfe144bcda9118820a9fcc6685c174
diff --git a/app-misc/vifm/metadata.xml b/app-misc/vifm/metadata.xml
index 4395156e1f28..399ce9552f86 100644
--- a/app-misc/vifm/metadata.xml
+++ b/app-misc/vifm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
 	<longdescription>
 	Vifm is a ncurses based file manager with vi like keybindings. If you
 	use vi, vifm gives you complete keyboard control over your files without
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 438a42588a6b..4b12eed7ad79 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 885715b8063d..5486e001d5a1 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -7,8 +7,8 @@ DIST gnucash-3.4.tar.bz2 13564432 BLAKE2B 478d8e2e4acbd0725ceaf997a1e62ba3875e9d
 DIST gnucash-3.5.tar.bz2 13766397 BLAKE2B b840fa6af719e1d21daabd8e26f7026a12ca9cefe8c0f644a8382b42c34a6dec2dfc67350645437c2f12792518f289f446824a8c99ea83453e69d976c3cd5c9c SHA512 76230d2fe1ba4cc605d0d58976ed3214b10a2549fc7eaa1e327bbf85c861baa082523c70ed088a59bb56deb6af9a7808752fc719eda0df3e9209cec05c9c8d13
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gnucash-3.2-r2.ebuild 3957 BLAKE2B 370393aa80d47a51ded47b3a582385fca4ab3e6e33e7802c56ec86d8cec66cacded0442c39c8cbd6563a9f811065e95bd2a62657645a67c259b9f3f23b380e63 SHA512 17b11b3df4088f4575fcdef67a9b0a3cbf0204b2027124683570d124f41f4009bd87b53337aa4d757447c29a4524fff558a69baecaafe1d18e2a39142f1795da
-EBUILD gnucash-3.3-r1.ebuild 4016 BLAKE2B 664d20d11ddd8bed1e4865fafb3564adad0644742366550b4eb163ce7e42d20832b33a8679f9afd49ee44b0774a0dba375a5529ded39b08fb03f458eddd663e7 SHA512 efabbe12715c1a0003b46cca5240d1ad8b68eb7b43124d5fce85e65cdcfc5592c80df05efb6aacc92972ac381dac13c5db97acd262431398f822c24956306383
-EBUILD gnucash-3.3.ebuild 3958 BLAKE2B 35b076b3acd653d50202bc14be031ce99c42446a3fa3f815da8e7e2dcad6647c65554282bcdc9cd3970aa0accd01e58be756f3e521461520715cbbd6f95c8d62 SHA512 8ca173e15044302059437413835428c4c3327123b26d02dac4ec3319872359ae8ab78e767a806da7f9b369228fd49941d3c6c0e38d369cd2e7f1c5bb91e2b4cb
-EBUILD gnucash-3.4.ebuild 4280 BLAKE2B b49a00f52570b8b31ce77e735f9a68d8e029259aefb7a5740d6bffda8986116b25719752d4e2e39cc5db0b58c4472e155fd56fa49e515d57acc2efaae6810c32 SHA512 bf8188909b45bbc13e2a20615ed01fdf912b7a1da035a559a379790e5133813a68078357365984de8ba8ccc14dda16cb4c0f45a2c66a4ed11210b452b377744c
-EBUILD gnucash-3.5.ebuild 4210 BLAKE2B 2326ee1d3c37c9e443b344a3000621dc4a72a40dc1e9d6681a1d31eea38b706c514cfc3f1d5fc8fd5eba4c4fa28c1055a266f42c1b57b8ec73ad1fef6e8bb063 SHA512 8d1b629a82eb138f114cf3b0febb82bb9a055b618b7a5aa5543e64e7d2cc23f366ef9c0f4703cdd38b1ba216f3ebfc4dd28ae7314e7ecae686d57f6c7b672d32
+EBUILD gnucash-3.3-r1.ebuild 4083 BLAKE2B 0c0f75dd4b3d476ea03b667b56a48a50a484cc27257208a49d7fc012ef62ea0665d2da69b4dd01e3bfa042644035548779d1eda57f5453b4a64b1b4dfffa764c SHA512 5e6fc01fc09b3cd03f0ac33a82342b5953bb0e39ceedda8e576d61f82d7f2142a4f3288bcd2b73c4520c04b95ea6e6954c6615d4c90c5179509959a50c503968
+EBUILD gnucash-3.3.ebuild 4025 BLAKE2B 94b349ed78db812b6267ac108cbc9c0ad12a5f13a1ec6816f0b2ca0eff92afd135ccd19a473fb3f12706e9597589a9069ca6095cc0d53a9fb577b8e416cd28c2 SHA512 e33005c224501bfdce4f82e809978dec9d273de55b8eaf938908c5f2feba68125c3b65805da70835dd5439fa229f13fe101fac737b9b33fd4bf1de6578963e3b
+EBUILD gnucash-3.4.ebuild 4347 BLAKE2B 746435f6184b90c177adb969ff67e4d26803258cb0970adfb30f7d240d73f40ff37664089d50aa180d0bd75124079fee9d6c13b53648514e5ee66b7b30b0de15 SHA512 1285926767b3ddb372cd5d555d93b543d40abb2bbbd874eedca0ca74930c15335b26db251a9dcbce3a274bcc57912e3c0f98f43b7877b80f3bf6e85d3ac69e4f
+EBUILD gnucash-3.5.ebuild 4223 BLAKE2B 5f4f025d1b6e2f7a39603202296b1491e54c21e14089061ac5e3034221b6d853f5ae47dd02351206aa4e17f8830d9359c01eeb86ea2e7b8c7d515c4f1029683d SHA512 4c38db2ef50b9083e2284bb61e6eee5b4e2b758f2685ae96d94406e1f48a44ffe439738d14f2f1985ed990c0097c2f7399be76c39ec5ce3ad55d4d07a6094f5b
 MISC metadata.xml 877 BLAKE2B 0fcba4a83ba82aa6634bc2e3d71da766f2890340e827ba478157fae994456daaecd12722991626069e04086d670a77f156e378a5b0d7b8ee35717561ca944a03 SHA512 1654790fbffc4ec76fc9520221877ad7eaa8fc774f4a05e9e250e44c0fb989081bafcacb018c8d2f6a4787d1794672a87e09c1687919b544a8f1fb36bb449bdc
diff --git a/app-office/gnucash/gnucash-3.3-r1.ebuild b/app-office/gnucash/gnucash-3.3-r1.ebuild
index 982eb4a96333..89dcc50498b5 100644
--- a/app-office/gnucash/gnucash-3.3-r1.ebuild
+++ b/app-office/gnucash/gnucash-3.3-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 GV="1.8.0"
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
@@ -109,6 +109,8 @@ src_configure() {
 		-DWITH_GNUCASH=$(usex gui)
 	)
 
+	append-cflags -Wno-error
+	append-cxxflags -Wno-error
 	cmake-utils_src_configure
 }
 
diff --git a/app-office/gnucash/gnucash-3.3.ebuild b/app-office/gnucash/gnucash-3.3.ebuild
index cdbe0c78c640..6d5c46b0c02e 100644
--- a/app-office/gnucash/gnucash-3.3.ebuild
+++ b/app-office/gnucash/gnucash-3.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 GV="1.8.0"
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
@@ -107,6 +107,8 @@ src_configure() {
 		-DWITH_GNUCASH=$(usex gui)
 	)
 
+	append-cflags -Wno-error
+	append-cxxflags -Wno-error
 	cmake-utils_src_configure
 }
 
diff --git a/app-office/gnucash/gnucash-3.4.ebuild b/app-office/gnucash/gnucash-3.4.ebuild
index 85fac5c295af..b7de02ad0aa0 100644
--- a/app-office/gnucash/gnucash-3.4.ebuild
+++ b/app-office/gnucash/gnucash-3.4.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 GV="1.8.0"
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
@@ -120,6 +120,8 @@ src_configure() {
 		-DWITH_GNUCASH=$(usex gui)
 	)
 
+	append-cflags -Wno-error
+	append-cxxflags -Wno-error
 	cmake-utils_src_configure
 }
 
diff --git a/app-office/gnucash/gnucash-3.5.ebuild b/app-office/gnucash/gnucash-3.5.ebuild
index ca794fbd46ee..e7521d2945db 100644
--- a/app-office/gnucash/gnucash-3.5.ebuild
+++ b/app-office/gnucash/gnucash-3.5.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 GV="1.8.0"
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index 4488958170dd..3aab2ed0dae0 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,4 +1,3 @@
-AUX kexi-3.1.0-qt-5.11.patch 724 BLAKE2B 8571c381220f163685017a5f6ed74cae80042e23836227e510160ffc1190e2172deb7c8280c3fadbec9b85d6f7469747e185e89414a5e2e508a4c6888442b17c SHA512 11817808ff2b0c86b52511c1f03941470beeebb61f63a6f1b5b29546de17371f9f3d771a49b2664e8c9fe07b5ffee65995d22ff19cc1aadf50af484cb2d43e17
 DIST kexi-3.2.0.tar.xz 3624956 BLAKE2B 8d0b3712f07d13f606c4c0d714b3d4ea0fe9f56e4d4a3aeeb144ffda56cd5ef89e4f08d5660550364103c86acd60923ddc74fcea135a23fffbae87853a7c00f4 SHA512 5cb9e0747c8e7ea19020b62345571ba10f65278dcc718bb0772827721bf8812d0ffee3c35d53b57285884c66e0406520835c7b00789fbe5459717722dff13e93
 EBUILD kexi-3.2.0.ebuild 2230 BLAKE2B 343bf9c07df11bf1c55744a47f3930bdaaa580beac08161ff2b66aa0b225121dfd66b399a28f2d4a9364bce0558a5c1bc17b84a1c144cec531605c7870e45777 SHA512 4f6ba3e0838916d96abd774ef9dd43e57a3a29434880edc868e7beee71549f5db5bca1370f10827e2a1dd897286ef0c152ec7693021fe272cc1cdca10fc1d12b
 MISC metadata.xml 600 BLAKE2B 383b28f24ff8522330ed843789c30ac771b4ecb03f45f7f60503463ead5e6a6fd4480eea83be7904d3e0cfecaca73c6fc9d8d29214fbfb2082aa97c45ba607ff SHA512 fc7615150e90fb963d4ae2775b5d0dda7667c0fd975cdcd8e5d52a87d01935471c37c9256e894c68fe88268d61d7a3cde42f36171f9160dae20ce8140eaab22f
diff --git a/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch b/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch
deleted file mode 100644
index a879b2a46045..000000000000
--- a/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c7b9215e7ae30a052fa11aa4199e7adea517c7e2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 20 Mar 2018 00:06:46 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
-
----
- src/main/startup/KexiNewProjectAssistant.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main/startup/KexiNewProjectAssistant.cpp b/src/main/startup/KexiNewProjectAssistant.cpp
-index 59e819acc..6568f1b5c 100644
---- a/src/main/startup/KexiNewProjectAssistant.cpp
-+++ b/src/main/startup/KexiNewProjectAssistant.cpp
-@@ -48,6 +48,7 @@
- #include <KIconLoader>
- #include <KStandardGuiItem>
- 
-+#include <QAction>
- #include <QDebug>
- #include <QLayout>
- #include <QCheckBox>
--- 
-2.16.2
-
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index c154688dcb06..f3d9a1c2c04a 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,5 @@
 DIST kmymoney-5.0.3.tar.xz 11690060 BLAKE2B beb836c4753caa81ee3a06f12fce65fd584fbeaa228cba087b77284e0f3ecce8b88b030466198db62fdf23af26cee5caad59eb845653006d700cf68a0793231f SHA512 9f8aaa26a3cb3f5eb2a61936ecc54f97096f98d4f0ffbfbfb6adbe099a559f797d997b1d23bb7f18d31d76182f8fa8601a70176a4bc16f5cdf2fac0af8903fc0
 DIST kmymoney-5.0.4.tar.xz 11708760 BLAKE2B 62fd279039ef41078fddfc4a69d9a8e7c425965114ad91464ef94f7e8f72f07ed9cc16989d1ed6ee01fdc8cdd274afb231fbfe43e8a5e0c8d17c33aa17fcb70b SHA512 406460f33b32941796e8b0a2fb21f783db6c2444b35b0402647e688b78ecccb82401a7a1fa7c008ffd840cbd88c82db91e367be917f9ab7b231a0208b439b91f
 EBUILD kmymoney-5.0.3.ebuild 3200 BLAKE2B a97e6f49841042928fdf88f3480540e05bc84dd18c833172a56d73df6b74eccc56b0f398326073f95226d4a2524813c957542055a4e195e4df06b0120f72407b SHA512 734e6756d2bca72650b87b7fa25ed9d82d3905d18aad0ed72a560b56b6653da36113626899de587f792cb59a46c8661e3476471e548ff26355e7dbeaf4f56b3e
-EBUILD kmymoney-5.0.4.ebuild 3162 BLAKE2B 604da7bcbfc3566a2dfb240d482acd71ab2fc539b6c7a89f0210762a30f948a318fc7bc2e3be7c56de0dfe693c104bacdb839de339b67b95e632a026e93f6ce5 SHA512 5fa9fbb89d6f1dd35c260f1853622874b18852213aabf7feec3388f0704a031de69d789b306c9b07b1cb7cf09406275e41670a587bddda139f90995248931eb1
+EBUILD kmymoney-5.0.4.ebuild 3161 BLAKE2B c108031005cd76da3c921fad1ac3d96bd86e992f0d700c55ff0ef989b90b3d840d1ccc69a5e228b6ff98bdec5452cf68a76b5252353e7e9563b573cf1da7bcde SHA512 adde5db52f0fc02a2cd0b044350cd65d6648b7226085dabc1150f36c1559874b6f7c115488dcb4056d840eefa71b5a91809077201fb4f26be16686593c5a927d
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.4.ebuild b/app-office/kmymoney/kmymoney-5.0.4.ebuild
index 65dfaccc967e..9c92a22c0aec 100644
--- a/app-office/kmymoney/kmymoney-5.0.4.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.4.ebuild
@@ -18,7 +18,7 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
 
 REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index d3c285cb9d50..c0470d6cf160 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -11,5 +11,5 @@ DIST x86-bin-libreoffice-gnome-java-6.1.5.2.xd3 25335202 BLAKE2B 9b98001c51861eb
 DIST x86-bin-libreoffice-java-6.1.5.2.xd3 24864117 BLAKE2B a990edae78593ff6d97d51d24b6b17e7f5ca9fa65dfc37a60909f21ce7d73ef598b7958eb7d35ac61f9c635e319ee703aa599cd66fd553cb6447d5e2860c30f9 SHA512 7e2e227365502d1037679041e861f2a547bb33dd818e91c754f1356bde69234cfd419119aca861ec95a2e2eeaf62b62210bc63379c676451d77d6a2196d35946
 DIST x86-bin-libreoffice-kde-6.1.5.2.xd3 14984951 BLAKE2B 2fa3af871e90833ba492d35443937fb572fd4cc48cfcbd210b542b6963a93c007d29d007a51e54a73cef8cbbde4a9866229013920f5ac981e15d6c632cc9fde5 SHA512 7f8ceb5c4235b1e3892e5c8ea708f54e66c40535653ba4703a45a111c20339355eb90e382b8aea4336956261a2da46c1369f658a47fd0ad0646ed742e8490687
 DIST x86-bin-libreoffice-kde-java-6.1.5.2.xd3 25252595 BLAKE2B 207ae00d0b210bd869d3d19d7348ee0380153c7d108ddb03d5bdac92718b78106fac321c2df00dc2cc71cfdf791b309a591b530c936ee1673314d55e30d46e9c SHA512 70edcebceee32c82c78ba704cb292cad8e59f31d8d58f72c525cd32723726b251221370c6d2dfe4a54d3f0615f0859792160f1c66b20d8f7b77030f54c084073
-EBUILD libreoffice-bin-6.1.5.2.ebuild 6769 BLAKE2B b7fcbc498c3f2246ae4e06db9599eeaa1a85539861681c9327a13e304799529b186481515dafd031064f860e136847cdc58cba41cac00da2fb7ae31d8a905bb2 SHA512 1cf00015d51727ab65fb931963f7cedf376aa9906d65d5f9282cb415b43c8a6bd96692230c8a6f7f5d313b5b651472cde826a21d60ab80f63f72f7453c8cee76
+EBUILD libreoffice-bin-6.1.5.2.ebuild 6776 BLAKE2B e2ede8bab5f7463da2e97e8ec0cc377168c06b1a86eae93e9f072dfc659f5d1d4e71ed808ece490f630d118be56fdd0932621d30029462af7bb7c7215f49b6e6 SHA512 d6f3a381a17bcafc9b880a12b0957024fe9627d27f198ad896d177880aeb5791b72fd177aa852c8deb77292f432691122099c79700380c57c68264f82adbdf9b
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild
index 6c64fa2c6a95..de26ee95d59a 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild
@@ -64,7 +64,7 @@ BIN_COMMON_DEPEND="
 	media-libs/libpng:0/16
 	>=sys-devel/gcc-7.3.0
 	>=sys-libs/glibc-2.27
-	virtual/jpeg:62
+	virtual/jpeg-compat:62
 "
 
 # PLEASE place any restrictions that are specific to the binary builds
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 64f7ba6f243c..7a4fc9537665 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -167,174 +167,174 @@ DIST LibreOffice_6.1.5.2_Linux_x86_rpm_langpack_xh.tar.gz 289979 BLAKE2B 4f43689
 DIST LibreOffice_6.1.5.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 799720 BLAKE2B 743ca753bcc5819dbf8ff88a93f71d8cc68fe95b090a68f8afc9b7d5d7123cc82c5acfdbffaa49dabaa809281a6fe10f8550d187d26575401d440647d6c6cab3 SHA512 03f24a6bd2c838338af841c589982e19036787dcf5d16feb42a3f14dbe4e1e1d539dc1ee7da2a7cd3df8a112ab6c91af3683c9243818649d1f4a3c2119f09aac
 DIST LibreOffice_6.1.5.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 799065 BLAKE2B cec2d4481857f5fef0c9cfba34362a113d6380e5bc2c1764c7a03df454324aced62cf0c9c7152c41bea06a148d6907c403968e3320525991093035f8397b06f7 SHA512 458c862fec8d6ba9d7e7b2e45e5c725784a54aafe541b7c6e1c8b950da111496edb73b86803740e4dbdc31cade1c9ea7f924c695dc75a027983a91541a252886
 DIST LibreOffice_6.1.5.2_Linux_x86_rpm_langpack_zu.tar.gz 321028 BLAKE2B 75aee804980813727f9d42c65001b47303703d97dd3faed4fc18680d1fbc282f9adfd033c723de6f079161e5362f03454f13cef929f1becfac66d7ac448b2e27 SHA512 447dba75bec89abbcd491e9b0279890a5e99c2e2c69f1f243c70625fd1ad439837452888d51775e0a1a3835e544b65b30d877c6d2cf759391ca33e6e001325c8
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_am.tar.gz 2494274 BLAKE2B 80aa466ebd897bf243823ab0b829152e496c153a3f1351b8581b7760dbb2bf7091b9ce365aa3b9611052be366ccbe4fc73a9fb635d73d5be042677f960f34e6a SHA512 66c5faa81abce6dace5ae5e7b7c00faa9b22b60159a35014a1024e949bb18b61f458ab5cb8a1f865f7f0c591e7f1d83282e689602d2f9b1442c380f51ef53ca0
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ast.tar.gz 2388826 BLAKE2B 61ccfd6e3333c2507dd530f4f509cdc1958fad741b13bb449f181a4c24fc61a697f49e3ba57af956b020cf69754c3384c964dfdcb5ad2c1152a016dea88e0b2c SHA512 3d1a5d7c2b66751c58dbbc911a20735b4bd5ee0d90497b9da137858eecb9d6f150b381cbb6c000fa95f134c436c84e878b71261f992a6789256f9b247c785cde
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bg.tar.gz 2567088 BLAKE2B 66376d155ae1d15d427b0be02bf74d677eb2ddf31fb7890aa31420640547b83b4ac85ddc81358d5a8a3476b74041d5cff45026c53c9680cf5f09d88c7e340d21 SHA512 5fee8e5b865b171f374cab99424bbe07c597c2debcfc09026a7781e459e4780659ce877d41a0a87e28035271a0eacdb2bf2628a41009bb9e4a890745eeb46572
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 2578564 BLAKE2B 93cfe1205d6d8d3a894e68f86f4e27c7e12148b02f65e1572f3dab99e6b9aaf6acf2926e510c5e95eadf3461f08cfd2312f8214665d18cfb5dac5a0dfabc0dbd SHA512 f0f951df705b6fe3d6ee03402a2832d6a563198859da989b0afa8b194fbc5f0cdb3fcb7da442e8b81ad4682944892c7c1a2fd99f3e599a653e31dbb461e9c265
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bn.tar.gz 2561328 BLAKE2B 923158dd1349af4714f831506af60b109209b1329dc246b78adc8e874635e44f1669f06251e4f0236b925608f4262e83584ee64b44239762a1b2f2afdcaf223b SHA512 f94fbb673e1d9b18d917877274d864d67e9c52c92aec1db808c58e435f83b92c21435400da049084f0a744a333af0abf16a96ba54597ca5e1b065676de4c7585
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bo.tar.gz 2576429 BLAKE2B 461d4b91a8700323de66f8d5522b30f97ebebd9fc6572cde9b2d92cf9e4ee2b805da7a5446b514e023a2f14dd3f61e0da5032618c877c4f839235b25bace49cd SHA512 3b26e6450ee49bfe665545ef27f108f23a29ed7a3ddb9c59184c8907abb1104523662af77ff3d8c7c1ff2228d3f617ed5b7f99c7d39c1a7f46448595ffe9240e
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bs.tar.gz 2302671 BLAKE2B 346484ec045bf8c3bb8e5fa5c106cc918792b45325dc925edfabd924643aa39def05f7ae2f0b21188acb771ac68eb3b72b654fa95a7ca908819acaaa96157439 SHA512 83d54d855f7035e1b683f33e1df9523201eeda4701a3286ab54d8947824b21b615eabd9da77424377f77897ea6caba803dd148564447287aeab46651b3205fe4
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 2380744 BLAKE2B 6f09ecaeb12de5443ee15945b6cbf4a19b60fa3f3c55764e6477390486618799760aac0c1cae12ff6533cfaf0edea2edc413aa7f3db19f11575954a36dc1e8fe SHA512 fe8f4a8c608677647e45c368d0f229fa6735c27a2199138be9e48f2b45b6a0f2bb1c281be6a2c5ae6bace6465f6fbf797dd1749cafc002144a7f6ae19caada90
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ca.tar.gz 2366789 BLAKE2B 3606763a566a39934323e20838af9cc22d808c8c8d441818d27a6630e891b618f8adfe73631ebccbf8df1d083ef272e3fc5a162ca45ecb0b6d2731c6a6009931 SHA512 5dee85aaac07fd7e9b86dfc8fe4061f1352d58cd255343c4e0fe575b739ebcd5903e523d8a8dd7d3c9ac64faec00cce0cffd8994e10a12a3d77717fe5809ede4
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_cs.tar.gz 2362791 BLAKE2B a68c28b46ea14736d752266adf78077ec3ae72a83f8517000e6542664d9033845eae9a0444e3227a2f29b83d3c76a6681bd7b3a7afd49c946028820dfd321af0 SHA512 55007cc341db7f66bbd7af6cb290b3a4aa53756bf792f7c08aa351fa1b3dfc524a3162b6467f548d9b4f8b38c10365929ebff7c5ad19154e500593aa01a262d3
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_da.tar.gz 2328860 BLAKE2B 58f22c03c52c7e471e4dce1b6c30ffc817db0b9e9e1c058488078842f25fc078b11ba533a15aaa7ba2d770edfae10daa5b77d3f6c2b6127f1160e6467e47161a SHA512 07f795298e0f563e417d74b5a84bc13f75e499aba129407838d01b3277070d76e54be90adbe0f61e635134c51916e2b46305b812d341b209d5dcda2538011ed7
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_de.tar.gz 2423087 BLAKE2B 8a964a3d57c62a8e6907faee316c1fd751ed22f642ea8a9603cba68b977027d42f9077b3610207a7357a6dcd86027299ce45c60b3a4b3bcd4a1881bbd04f9246 SHA512 625805289e9dcf4009a0bb4bbbcfe6db2e85e1aa42e234489cea8bb34c2c54d9202bda76cfecc36442b168773fbb07de60257871875cf87c5c9242d9fc16a689
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_dz.tar.gz 2732360 BLAKE2B a3e2a43bb6a25d63072dcd01ed4d423b874fa6794e794b326cbe62b53bd2e9a2306b2d30aa7126a3386c756ea4865b55efb8ad522ade64f10cb680abea4cca94 SHA512 7eae68b2e9542308a5f60a9e09145b1fdf6eaeb6bff9df4d4c4b44ba61a8538c1a40bb397f7622e727175eba681b903453bbada201bb6c589b61d3c650246c8f
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_el.tar.gz 2770595 BLAKE2B c3387eaab5207d6544f898e094e77f6cc445086000c735bcef5f21d20f7ae97ed4fcf7f7831b3c5d7f11da0855e46bb7acbe37a1ae3303c93f14f5e7e056aec5 SHA512 ae2b28bc7653ed02f22e68cfe3e0aa0413cb457fd13efcfdebd4ac1cf17a2742f87b06c3e802a44d2bf900ead4072ba3ec180c87f16b05c26ae68b8124744fdc
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz 2209915 BLAKE2B a7f9a8ac92ae1d6fd89262f077043d5d7d768bba28039095131c211f09ccd8c600391ba0310f8c04ec869a4f27ebfe2d0f024d1d4dfd56e77f5e5eaef861a919 SHA512 146a81ce01004d4a14692082757250258b8dfbb2170bb57d5b6e0932ecf9712e80d4ce0a6d5cc6d10139f766a50aa998d11f6fa2e94e6e7dd09a860ae3c5e5a0
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-US.tar.gz 2056715 BLAKE2B 1b61f11047d13f72012da7b9c2b826b66d1f74295c229d741fd57d095d9e93dc3a69b9d28847e1c1eb4fb9030a1b69aeeef07b952fe67aa2ceaa2fa078858148 SHA512 d0814979280021262b4735762d1d27f5c1b11be8c39d4cfa1fe847185f68b8bab62c96863f2a980fad3dee5d284e9ce0b019da7ea7f51ac835ff612053ac6254
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 2208349 BLAKE2B f392034d04f0ef0e52d69ce75d92af64abd8883da6764fec8c4ca7bc62d90f3e01956bba728c281e17dc9944d4b5465043cf3cb14eb9b4cf5224f340f5a5058b SHA512 fd82446abc1862d280f69ff7cc6cafe206d290914d8c6fa9c14eed84d3b744960e5fdf3dc4cbbe053bd3928cae8f969a6368022731cd533db31d4953783330ed
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_eo.tar.gz 2288555 BLAKE2B 9cefb0fbf4537704c4273e46624c77d845618612f77142e9e241a504636f9eea010751fae024143d4addec10688615e2ade81919a30b5d3afeb3cc98328e688f SHA512 bd12686eb012e4e0940e013775178456cda3a3e26a345740d446e2658b033b18a1e5f328e18ee6d90087e0440ba1f370d03d8c5007cdb104427c6f3fb1676d34
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_es.tar.gz 2407551 BLAKE2B 6ccbb2f04d7b3cae0612b0ba478ad5c3dda93cbc34aa668f0e5837380b0371c59922ebcbc745932c115b724d769301a852e83e0078683cca9107f0613745ec11 SHA512 4b661a16e10bef1cb8583d7908598bdeee66cce53d760e25a7ed28c2aa6b1cd9651992a6f921c619205c60b492047313338849e7a13c6c8270f4712d377b0ccc
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_et.tar.gz 2330493 BLAKE2B 959eb54f68e9fc7e642e88f82042abfc9faccbfe47a5ced10981c9f1dd55c9a8193c19a75035f4f523eb0b31196b4580c214bb5a65551cc5c9c39afec61f3ee6 SHA512 6d20e628f3a7eb537e25019128a8e1a2bc29cd27c4bc72594baee5dd0a62c78cd7299cdc5355c06f03182976ba4983070ee2c672e1098987bbe6853ac972b9a6
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_eu.tar.gz 2283298 BLAKE2B 7d03dde95b6e18be3f9d323b8ea2b7b6d273286ca41a18b118856176c040fe97b0b2cacecdd2a76e5ebfaa230beac7acaf6e8c14284fa9c1e32446ebda7bea9a SHA512 fb441c3f5e36dfe3d3a8c512cc87b8bf85a08caa7f5dbf683e08330f16f3f087ef50c94eb89d1d207301d016b565864f5856c81f4a8ae273a0d2dd0811a6738d
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_fi.tar.gz 2377868 BLAKE2B 319a2c08cfe3747fd87cf3f37265dae9ccaf8b312a7483d31fe3d92af407312e20b5d8cd4a7f5f28b1038af6df8b37fd6a155ec4abb60d2c39ecdf311b2d1f08 SHA512 b0039f99f5857cc28df9c33e02bb57f75529edeefdcad56c73b6b497446a37bcab337333251a69f76b4f9670a93de94dbce8767e9fd38c1622af39ba2b64e9d6
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_fr.tar.gz 2389889 BLAKE2B 27c6a1f6256dced8d2e8edd7c34597222b434af89863292c851729aa527302ec49d0081f7448071ea49a880547ec9a471a15fc61350c088dcf616f25eedff8b0 SHA512 a26d295f8f7a18e3c1d17113b6f0d85c5a435d00102a4e11102dcabd0dae82a1c6e976f105ce305b43249fe72dd27fc212148066d2ba36c36a621db7683545a2
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_gl.tar.gz 2367311 BLAKE2B b28fa6aa6cbb1d9baa961e3e2c997a70e71ef6c6a45a8dc5d9027175eebc4f34017a9bb04f62bd7abf88c2ac0b63f9e7ffe05ba36c511a3cb8fed916487bf4ac SHA512 688d4d5b02871a5a8e894c07caf0d73caa30368fb8e1d4ea6edb415b6292e2f37b46cb3075a17965be1d15568111f50892eb25d2f06c18d87b31631cf80c519d
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_gu.tar.gz 2254573 BLAKE2B a81e22bd1aa835e06944709fc5f46c3695a9ee82ccee73c6db585adc0c1777cd9f71ee882bb69cfbea7613dcc8e181edf1e896c36326117549a57357faaf9156 SHA512 cdd3ec3a26d3b005effd710a44d45580a13024dddae49e47147ac63e0e190d2a1f6fc4a3deab4689349a58879ba5c2f775562336eaf82695f184b1a751d8d5fc
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_he.tar.gz 2147797 BLAKE2B ac0c503cc5bf803fe23efa9e58b0abc670a2b0612a6f673817e03aaf380edc1c2e94e365d96dec652c69a296b5c8e2e187c9e8b9ba5204e150f2aea669afb09a SHA512 22ce96f7b86bdc8d09000bb09c605194de578409e4b6800554e1f705567be92a65e5270ab58151eac0893fb0d89b520b94754e1c4c6e6caa1f512b9814204995
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hi.tar.gz 2358902 BLAKE2B b50944d2ed47398694500bfa40208cd546c88098cbd9adb1e296809c1102f5b1be7c6e13a10ad51394fb7620a0cedaf1033d92a8d7ee46cbb5f408a2f03e2105 SHA512 11b0c9951ffe64d13cc7a65f965e848f9d28d97f7e5eedf9668a4c97199e057dc2f8c9432735da4b0a69107645077ccfbb3b11b6f3aea4dcccb84825adef7cd6
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hr.tar.gz 2263147 BLAKE2B 53c45eeae2d52ed797b8a852a8747f952a85e5cc74575713c1015c6bbe896ddfad478cfa4472f69d98e02181aa6770e529100ac7ad136a5527f2e1419ebf8d1a SHA512 0dc8f8ee6ca2863a08d8a7e76f0c1e3c6338eb9b2ab66af70ed44cd8393bb073b39d1f5c0d645f5a26babe0d9e25e38ef4e5039b464dd3895c41020daaa08dee
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hu.tar.gz 2488953 BLAKE2B dee633bd16fb4269a98dd8443ee306ec14bdfae3648373a3696a2d23b978a107554ff93c0b47f12e2539ac68225f68a2365b39071d21c184f7d9c7b2a6387a2d SHA512 58e9825c673a1adc95b4979da15d3db76f7e3e040614d9f1481ececcf8a8efff9f5316f748a227b2dffe0a0fc588288102404af6a3b393a4ae47ca20dcb6e974
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_id.tar.gz 2263224 BLAKE2B 3e018c8a042726e4d71cf774f96a442e8e66c7c3ee0b31e8ec354843c77ebe27bf0321a4193236bca5c00e618ed42b811bc5bca224381c79a3ba67999ff5e33d SHA512 d115ac18ba7ae97d2918e83a96acd942bfe6079d3f993214223bb828b01bfd2c612d1c4b6418e958a5cca125e8396ef3a9004386cf38c31c380aeefc0cf44b70
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_is.tar.gz 2285432 BLAKE2B 654664b60d058afc09661099bbfa07ac062a236207a258f32a9fd31e063657a88c7f812772b987eb51a7efd1bb03cea7292ee3ef2a164ed04424c801ade17acd SHA512 1b20b0314a8dc141e1dad2a3b45a69f8303c98723e23e4732f68f8585adb2f38c08469d82bac4bd4ea431c369d4ebb138c0ade36c5068f17bb4195cbe7839c0d
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_it.tar.gz 2358373 BLAKE2B 38b36f79fa044ee523e32ccfdfb536f5ce02e14e6bbdff9e313e824e02126dd6361265de004dcccfb75099a58f444738d103ec78149ff758794995816035d931 SHA512 9682899ba656b555b7170a41ec4cf665411c42cccb553b26399972749efd6ce45798f95f816ecbae47ccefdfa5a52c2f31a74f953e02a3ae1e59f88cbb7e5102
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ja.tar.gz 2526519 BLAKE2B 30cf05eee750fc59b2edb73fcc86f0d368ca30682a374f3d3e0bbb86955fe15fb757f774d16d31a0b982d11df6b261eeaf94260317dabf8bc9e01ca077a521b5 SHA512 2fa745471544b646995793d09d101d45925dc49862d78da217e23022d10691f8994f29e2d97c9e211680a5e0513a4a3604ce84045f4b094c120d99a02c6988c8
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ka.tar.gz 2388591 BLAKE2B 6be62eab46d77e56dc72ac47ba15cc104f587f4f82ad79eaefb4faeab10687b7c15c935625e4998a6d9e5c211d1a63c8bfada891205b9c5be22c0c946da140a6 SHA512 a563f64af149f07d3e0e1269b3fa063ba82b2c10d117f58db9f60b37f87256ebba9600c294369609ac8239eded195c00db40514c80f2861ec105ec1258d61c25
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_km.tar.gz 2676681 BLAKE2B 11f5ec67148483478fa2f40ca82f93340119a944720c3ed27ce2cc6ba2ee5db420b44bff7b1786a87f37d4669c7e45bc6adf653032a56d4ff8e7b13b3c05f43a SHA512 5ab123375f9fb56d95c2901e91980b6b88330253845c9bbb569d36d4f9e6777ca94e90096ae4a837a9bc56176c5b5206e14bc8854455e9028f45a357f1dfc2e3
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ko.tar.gz 2402861 BLAKE2B 7dc2d061fad17bf6e511d186d434912cdcd1c33ac4c1be7c32bf01d3c5eaf87f2fb985745b41faf1238d7e7e3db4aa33d14d1bcbb44e2e522318435be47d4006 SHA512 3997af35b7a38e1955fa23706f3d1e0e9f269706168c35adbe9c8fc0fdbf31757d0581e970673de9f64313ad6d95cb28094890bb9f2fb10d229d80bacb3c421e
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_mk.tar.gz 2376408 BLAKE2B c1e912b60d402197150b08cf88d386518cdae51704fe09d8639177396e3e877ea962074cff141a7fa8f17c782bbf3801ae3494509b36a73bffa1aec96e99d268 SHA512 f03738a30f30ddf63cabf10917b5f3704ea3fb0e2849bbc05684b5c52720de0c7593a40252c2adfacddb9ba2532a12e70f5990304e04036333e030542447fba0
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nb.tar.gz 2310857 BLAKE2B 2ac2d7372ea8ced407bfbf95c346540937bf210dcf4511ad8b0cea07f401292176b2db2d99b61e0cd012b8218c3f2bf52cd35876f46cfa7d27765481f5f29a7b SHA512 92d172ca897e00a735bdf84f6c5c2af93c346d518c232269c93bf3ff0acbeae30549951ededc7f22083425183662aa6091e5daa3ce2c47dbb3691ee75ca65098
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ne.tar.gz 2600600 BLAKE2B edca50aa4e0a51cff28c770923d04deb5b0ba447628128367ef22758e7c5b2aa0701becc1303fc6687949db9d098f9bd76b060649d73f922ae3d1176206a986f SHA512 6cf646c6f514b6c9c0c888f485ac81c8057e722d6bcbebd91f909c757db57f5bdc89fc6e830bfef34d57948d589deacb378c7783d2af50fee03937bebdd5fef5
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nl.tar.gz 2357209 BLAKE2B a3c457f7339da0c5cb9695541198d71b4997c046cb9f4535e1a29bcd66a7e9dbbe1f6f9d43a9fb1c2d26c90e33dfe47d804e55583d95ad675688d30c34f3e482 SHA512 b4e4bd661a6c146b1d94e53485b6b626cf1b845de8534b3dcb7672c90bd81f328a05d4ca379e2b21ad66276b8966a0326dd793b212538ba38e0efa706da10da5
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nn.tar.gz 2303428 BLAKE2B 1807211e7a6f9122623cd5a91440eb2007bc0e49445f4e8755537d5350e82686b051d836fbc860a40046538843577865d0e5a6517752dfd71979071009e74c71 SHA512 363b11312eb54a7c9bf1190f244a9a5cb79211c87fae6daed3d92b0ef244f0a77b414f5d6ce9f559c1b3da65b87eb852f7d8b283e36a56de7f92083dd0fa94ae
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_om.tar.gz 2393884 BLAKE2B 44f11fb450eaee211eb844c35076149b92cd5469345becad5ad4373a3a0616e023e2ea5ed3c988caf60caa2264af6911cebf3772ef0895645a64bd152fe341cd SHA512 0f59c7fa56ef20d4b6e5ff71568eeea9f21e922f957b323459d3d4418de74dde567a53a976898c1dfe211485e9bfefbb55735ad2669c8ef6e063e4aa2add8ae5
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pl.tar.gz 2458457 BLAKE2B 3cd748330066ca2a2c5802ee0aceddca7bb68a1798d8642d3cfec235fd922ef1205f15b8ea35a0713d18c4dcd06f676124586563f19211870eadd0e6bc547c0c SHA512 32404bf0dcb49626593d85dce3a95c6f5497c867a7ce572af917de7242914c32d2abc181ab17f68a3bcf445a242e0f479605e9bc4f499e8de5b53a055bad03f4
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 2376026 BLAKE2B 25d744ccbde074fd23b4ad5e234ba929a4c1693de87d1a1bd5606a4c2327fd519c84e498d2ea10d6fedf97c303faa1747297711eeed140ffb5fbed811bf2466e SHA512 ba60ef2f1654060b9c3213dacb7de7604668f0b3fa07f83d7b7cef500b2b6c5bee552cfef01ba951b6570172ac9b48b85bb746da60e4becd3ff9a32803418aba
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pt.tar.gz 2340756 BLAKE2B 63c299a1e5556d5951baba57235a11702166e2fefae78acfbc8c0e6113fa776e1fa5fa4c78d61afd2e029d733c441c75e0d9433c8d3d4294f67610c1bff26bb3 SHA512 bbe0c95ed0227cae65922a6d24b2fb89391aeaca8d9dd51fafc35ae7f12db1a053f9bdcdb248f78465c171220f549de8b26c40657b2403aa628410e860b55329
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ru.tar.gz 2637650 BLAKE2B 405239ab8db17aea60d2d0b58749318e5b09b653a49aad7941bda7316b035af3f0eedce04e0282d92c5e74d778826c2bfc9468fb64409a54062179c32c493995 SHA512 2ca0065920f334537c19fdac947f367b2e0a1d094c283b208ed266cae578ae3174f108180da31109be0f9c4f59503b643739c355b44931d164ecace8dfe0d77c
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_si.tar.gz 2345682 BLAKE2B b6bbb8cec778d97b2c0883b00d3bd2b4af71e8edb08db8e1a937043da7a511930828a0f36bbe03d305a64dc89d36c34c09bc40078f7aa5d2f6b8ee2002c2420b SHA512 def2a4ff59e41f43b747968c722eb0d6dced6e9aed2261d930d8d621d9e1e1f02bbf4778d5563dc87fcaafcdb14fbb64bbcdb18061a5cc8482db42648ffe2250
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sk.tar.gz 2399880 BLAKE2B 0dc6ea21eab9f394446ce33fe79d66efe2d12094450f63843b4d63fc6f9d4c0641b200742643d64f1fac5848af98e78e61fa73e3401ee61ea446737f304849bf SHA512 000fa62ca1e83e2e946b6300582b6c281df9f0763a46ec981d23da098e7e86e4f273924914eef7e070353f140e7f075354337146808d552003f866f15df7c5c3
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sl.tar.gz 2344853 BLAKE2B 2aa9bb464d8a3d3fe97ffd6f9aedd5b421aeb7ba1f3e0a3aeef5895fe5e6e42632987ceff6903d4bab8edfe1724d9f0b614b1ff0d964196fb598d494949853f5 SHA512 aee086e109a7f9f988e2e4ab72c8cf7f0bed19c4097dd4c22d64338e525cf355ba8c9a5f387bf41f5ef3226910148bbbcc6e69b4e79af8d0626e1575a12fe380
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sq.tar.gz 2262769 BLAKE2B 3ccafcbd56955c1c7229b7165ad5fc8672a06be90ab70a864832c4c68797f2bedc9aefd77f074f4dd6efac89412272f94908fe1785ae66478e70352883d13b86 SHA512 c5a9e4836240e107f90697f100a5df6c8245484b0cc67be28fa36c50cc8760ac58ab5181101a3db3fc242c7ad031a25cfdf9d952382e26d939c5dfb5fffafde9
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sv.tar.gz 2343593 BLAKE2B 5ac5442128e5dcffd92896ab720f25df5f0309b053bbcc7a78d76faff3228155c9aee1ab36e2028451d51ce23795a87785f26c27383fdc5ba18a2cb2a8f080c0 SHA512 9d1b4113c6a16b658c0b05d05ee315e233b9348cd8698fab6436a60b00d86acc182ee068cbcc0dc8f1fd079306a9f0c4e70030ba975fb31eaf46373af6f26499
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_tg.tar.gz 2347122 BLAKE2B fd67cee10b59ae94563cb0d36e528c693560f93c630db44ed3c1c324cb8537a1bc8cc8d324ae60cddbea4f29ddb79c346d8ede2da6c5b6d735c56871837410fc SHA512 4728e45b5da96767b5355255bf1255904cbecd6e42e70c0e5acce95f33b154f0f35459e0b2051d2d7517af844ee6a2c51400044c975c30f787c70ba260c13f45
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_tr.tar.gz 2410988 BLAKE2B 0e274789c274854ba921065fee8bb515dbd73596433eb40a8d208e59f0939032672d63e43d7d50a059ff70d175f61c238f17f974668e1fd8f43c94ffc448d21e SHA512 c2809b90571ce6e96fd0ac67d7d4dd44f8e4711dbc53104dd2b00dc4aae7abd345626c8bf70a02c090e7066d0a6a4d3132ac96d0390750aac368823771147f92
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ug.tar.gz 2313116 BLAKE2B cdc68b002b0b654adcd52e5dbef0d4465136e89290c1fbb39d191d8ed99277d79548a25dc621593ebe965c0ec0f916a1996d62dc70499bd2c7c83231dc96b0a2 SHA512 b4a5070cd377f256a63269b7be59aa74eb4aa330aa3d54910b38fc89ed9c27ee69a21b4d695076a3782f6c14ae687661452cefd0ff19cac749643dc68c95a398
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_uk.tar.gz 2593024 BLAKE2B 825870305b5270adb4d20797000118a29293787983296e97874ece6adf4515df7524bed13133c6cb46eb299080c7c0a1f53902537ffe98bbaa15649e80394e82 SHA512 3717e2d1de8205298a46eca6a8f477f9a4015e494d1a8000b15f2d7ab70a60d1278e46e3195434d6395836517a8df10393c69c54a1b91c4b36e1931ddc71d728
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_vi.tar.gz 2399473 BLAKE2B 86ab17c7e66ad859371215c32522ca3bc0b5290a1dc79f5307e6eecd106da6cf62eeac70df0ffd8e4157bbbcbd134f660329fead028293c03f17fb14f84102df SHA512 c92354d4124e222ef016789b7dabc41954aa2e5197f50783ff6bca75d7079f5081de8a62a9aec4374de027f3e3ddeecd86ceb41581bcd267e2d37592a4c646f5
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 2339439 BLAKE2B ee9c81f071bdf9d2a3c7fe7591d6d5d37a575607b5dd60afea08b7f1c5cf4217b6b1902bbc9565e9e0c373967540d02d8844f1356bba01d8d38b7f45ec9ae93b SHA512 cd881baf7df8e1e53629fb430fcd1542f590a9d51379d0a572e9103f6388f6a56c79f62f0b2b0f086f4139d5b592b8f1f8308db0caaff55bf7dd65f30504ce4e
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 2436855 BLAKE2B 92148c18f0082f95fe56e22ec0d3fb9ad21078f61ce8f25cc2c8b80be09bd307160ad96a5ca98692c93f15afc69a28fd578b9567635ca2e7bd3670cc004d7595 SHA512 1e15b97e5b6e3a71b78c1b612dd66b7ba736bb154a2112be382602bc813eefd278a572cf7db5b03aa2909f96b90df875cd242f9cc209765bdaec03739da8e4ac
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_af.tar.gz 1018506 BLAKE2B bbc57fdd260022e3c1489f7090b0ed882292aa4f58e332cccf895dda897a932d3c0d71c920fdc5f419113945a9d12bb44c07813c1c23920f4b6e3910f71f16a4 SHA512 5a313d9251f6c2411a54de729224a9605dd2eb70771a1653c6c88fc3faf39bca04cdd88b019949b6ea39094d270290e5bc1ad838cc89dbdb83709999823ce42f
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_am.tar.gz 763534 BLAKE2B f3983204ce93a3263803c095e26879892c7234945e23e64f4e95a3270395619f5dca412341bb2f2ff5b4d06bed862f5d3409ae4d8014fc26325df603394482cc SHA512 d0be760b723f47e2fbe7437bc8757ab75d6d6cdfb700f68ccf8555ad315809dbdb77c3e35d1210dfa71c6a869ed6c5168ca838ef35ff00ccec90a04ccb972d25
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ar.tar.gz 2414693 BLAKE2B 0543ac3ebfe9eb8476dd1f9ce8c109ea159449a4c9f89bbc8df8a2d82e07280e0f05da3d664556762661a6bd3213ea8e07dba79f3d7cd4911dde75a7c696db96 SHA512 3cb53978940f42a9c62c02d76b7f44a84e1731f14b74c1d08e2e7dafd8774add400cfa5d2ff9fc4e98dedd71ff2122985a63520bdf07133889463574ab0b5892
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_as.tar.gz 531449 BLAKE2B 8579af71f9ca3cceba5f3a82ba5f53f02b7038e84f4b7709a2653343918db1b13c9fab542432b2d8b0ca22e6d37872b64f8af741309a37334b6bdd665fd1b17b SHA512 473935f3ea03d4fc235fd384fbde7864dfccb64bb02dd122868d785776e556cac1fd0938a2f281df52819826d0eedd6262dbb6ab52790fd0fea9a20e3b4c68d7
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ast.tar.gz 440720 BLAKE2B b234d9e35bb31afb1e1baab423429c83126546204a11efb887ae108ba6d665c032979baef586014587706b097654a8b7322ae3e2817e55ecb55b7a7741a3db60 SHA512 6329da5ffc3fe90a68c624a63fe6e96f50b0d245078c3b976367d32fd9f6b9bb2ec0db03d06d332dd5b11eb4f392203583d71bfc56c9191cf9975f717f3cbdf8
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_be.tar.gz 1055783 BLAKE2B 575b6962fc31e284900e05e62fa8430eaf1a44e8e04e0cee2dc5ac86096bf5d8463b36c151a6d6e92ddccf813a1a5fe7949e4f556c94c460ee4baa31556700f0 SHA512 e198921a5ccd68096c828b0c27d0e75f1aa3a6eb658a9494eb71fbb35bb36c131a24de51d76149b5e4dd5d780f25961726083f740546a0da070af2f70a0b5a54
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bg.tar.gz 2449064 BLAKE2B 94248408b2308b5ddab790ff324ff177c7ecdd921aa2ce18ec4b606821bf18840db9ddb673bb42d8bc319a03987d7720d34c76c300314cdb69a8d9f237d66a5b SHA512 afaf9b44ba69bed681930d1da2da1e6acd4d0db5bf8b1ca92caf462ac96da28be42e3d9330723e5d8b0190d0aac2362743769efc11fab64a312ffc75555a25a4
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 649597 BLAKE2B 297b6117e988621d6416b46bf7a5125322705213860545019980d6c69c4d1c1b691cbaa4405b742fa26a76b2aaa517e4ffa09c148292fce1a8f028620742f6be SHA512 7ee0c6881446f98629fbb44bd7018165b25e6958cc1c5bd668eaa29a5ae4bd9884ba9e1cb42de71987bcb27493b3473de575ca9515374ca6b3dfcae29661155b
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bn.tar.gz 789499 BLAKE2B cfd034d8e4da3e3ef71349bac926021e23062874d4442d0a561030d158d2dda3c291d14f604cb5d538e0baef1877fe9e71452904230de127a374743b5d53ad4b SHA512 afad871766ee41dca8d72296035b2d43772e4e7cd92652cb502c45025878187796aa7559600c1a50efa606768e80cf2efc0f9c358eea7d86c984ca04f818352f
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bo.tar.gz 380816 BLAKE2B 4cf9fe709c6a45e9bdf6a05e423175081823b7124695d9711130350f6f045eaafe10f7211034338f7bb063a8856b73c6f81f6648598b5ab731b66e31f98699ce SHA512 292cd8be983bf22b81a09351b4355515e06bcad3b8bdd416f1abdabfb55948bd00167fcabd9e7fa0591889a55d17af46ab396badaf8791efee3072d3ec130eb9
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_br.tar.gz 1537928 BLAKE2B c9ffa50d59922d29bc151069b172f362536c0ab3d90d094e3ae0d7aaec414af987f88dbf280127a2de16c1964c97ae980fe355089bf06b069bd34b2410044bc2 SHA512 a16157ffdbef8c305fc696cffd17732fcd8d4d5610e5fc1346df46daaeceab55954cfea4b45e9469bdcd8874609003109b9ee255aad86e6ed6fb0e765b0537ef
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_brx.tar.gz 337832 BLAKE2B 555c7fd7c324e157a4b31c2f9bd4c85a17662238299711489f876f7aa06acb1c04a804f241a41e42726bd2965d5ead9fbd2a48f3f7a0d6726a8a4082a6bd5ef8 SHA512 7c7f2715c60e29e0c8faf1c1279e2aa285ca9c0579c0f09e7e009dcd49f8e26278ac246ad66522eb47ff6378bb04a6d67bf058b36ce4f630549ac5adef9ea472
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bs.tar.gz 637322 BLAKE2B f9714be1cc2e6bf5d2606bfb540a64c1765926f863a09b1c6623f03c4698abfbc0605fdac40878a7e38b2014920034597e49e380ff5c604f5bfe4ab250b206ed SHA512 af5a0897f9c78a56ee58731adf720b8996f41e6f8f5ddda6ee98041799d1a0440a747d285efb48f1883c4fa68adf918e5d35a580173fc5279a00d8e1454a284d
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1973324 BLAKE2B f7644c0cff98bd4ac58d0bfac86a06bdb1e66f9e7473cf920351673d8f547ff9fb30a2b8195ae31bbd1ad3b2cf1b0e89e4031e0629334af025b0ed329bd45031 SHA512 1fa36a036c0ddfa4391b23de2f95c98ef8fedb5d52d955d32445b62684ecfcd85618df080b0fb44d978bbb639d6a08ab21ca0a8508dfe60e3975f85fc14ac9d5
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ca.tar.gz 2019784 BLAKE2B 9ed120c18b08b9b361b748d8cf37aa02b1396ba7bc2921791581efbf10409263049e1126b6ac1b83e84bfa61dbb82bcf7c04a3183284e265be3be164084336f3 SHA512 db186a3ec6b293fe2a44cb105609dde3ee74cf06396ad1c5758207b8eeef7e0ef459e53efbf6aacafaa2b94db8e184f003984082dce5cf69a11568dd7e2b904d
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_cs.tar.gz 3190512 BLAKE2B 5ee2caa393355f97bc8cb0f05681311182c699c5607419d8e6f61589531ee984a4ce8ae6bf4e540c0840b31923a84b3e331a9230011af285cde3989c1c39315d SHA512 fb537d05ac0d9e581187ffc141ee9aa06b9f946e6827f13c3c731d992a128f166e81904544570974c544d1b7ad92c64ab70ba4d01778f7010a04e12723eba71e
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_cy.tar.gz 724387 BLAKE2B b28e4be4783c32b086edcf47d568da1bc3f95ed6c588e5116e930e66f08f73f20d7fa4c1064ca78a6eb0b2a5dcdce5c593e22dda0c551662be555d2931756012 SHA512 80fc3868542012494acfb1e78f7bf71f11472f6cf6c7fb0f4f5c82a5e04c2591dd9b250141b4b430cd7776bf1d23eab867bc6b5e47e07f7e947331730f244d55
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_da.tar.gz 2629104 BLAKE2B a67b177ceb7cd384d42d81fe3206e9e23857af28bb301ca89eeba5e524983b904eb4e7f7e6285e2bcfe839b6a7e4ffd67dabc86001c2e616a689e6f5d70da118 SHA512 b76b9c0bb0817d1dafd05b170dd79221829c016a465cec6e5f964dfd8bbe088c6e01dc816c36c3b51ae4b6355938fc3df2f5f0f37f8ea465da30bfd1e2a6bdfd
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_de.tar.gz 21757542 BLAKE2B 147912338c31183c74b5769f2e39085b265e063a53133151f3ad45689604a0b2e3ec4a7099535257ef1137641f6047fa58c8516f033c4227342ebb1e6c43ff8d SHA512 a264cb6944c72d5194de712cc7653a7d3ff0cfa8f8dd2ad6cfe3002776b2bde353c03661c2aba331e7f37ae36407fde09a7bbc40c72962e3cab7bda7e47e7ea0
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_dgo.tar.gz 441026 BLAKE2B 985ebae4fe6658565836d47972c4c44804b66975617e1979746acc64ef7725dba9f38bf6ca0af47966831d90e1118eaf819929acc1ccb516019a1db40171e094 SHA512 1d0fb819368c4cb6b26d2ad8f97958930c8175ca7853969ba518c4db70914592eb3befbf2306ec34e97b5c4c4c0c4b95df2db3b4b9fea1b122d5de336365e72b
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_dz.tar.gz 367860 BLAKE2B 55b587b29c44d4ea09d6f2e3c2e03a076dbe740b2af8f08f64f98f9b5ab2cfe3adbd894017572a80875a3875dfc0fe55988c4d838c21d7742113271dad2d0fbd SHA512 baea82086aa7b062adf5a04e261afb2357fbd02c3f011857c705d9c03b0ec1453c54f95c9d65f3849d7fbf31cda55dbdc7eb8bae5f9ff74de7907261722967ef
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_el.tar.gz 2828895 BLAKE2B 35258166dff2baec1a0798302d2321a186e266243ebfc29c27f85b0ff377b84bcafc65c70cfc8075833244df64a9102a516e11ca3ab23b3f9fc7cb32c532e61b SHA512 4fc20d644b007e6683261c22edfe521d034fa764a68aae7d335c3d50d45c7291f55fc68485aa1e98a203e42de675f2989f8d8e7e618c2500e423fedb52ce86f4
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz 7337360 BLAKE2B 5763158012b1288de54784057d9557594ac702dbdfc2e835c305b16156f7194ae977a632582be2fd253fd1db7dc33154d71c5803c09d2ac7a338775aee6963d4 SHA512 e463122dd02006a8e16412aaa74203c02d2ef4849a6b9fe05b143164595de05bc64031ab7d70e628223d289c6bc39787270aac7fd240278dab32e2eacac95c17
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 6924371 BLAKE2B 1d749202c7bab1738e69e49562317c92def4258523d66ca651e2eb3e570bd39d7e84976755ccf2452e5bf60d9f9378e5728b4e991ca287f4d72676dbb079690b SHA512 3cd6aec6fd0e0bae5329631c3ab51f7bef29a1ca289fcb2c1a289398bfac4a89b5b1973c597df35bd0f06a94bf36fd33abbbe380cfee2aa5f586d09047ab185c
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_eo.tar.gz 720871 BLAKE2B cd5388551176c225b8f78215d9766f4f5bbaf08b6075b08cc859260f2615df675e65ec983046ab749f78e26a3fc95de9242ba03a736f2bd9de2c98f9d2c93409 SHA512 706e860a23f80d9edf51eeb3f0028b082f7e2aeb3cdab43ec2dbb1109149eec308b77cfe6eb0e97c339da154d20c484216efa7846ff5bb955110a1c5b84ee12d
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_es.tar.gz 2241549 BLAKE2B eabe20145f47728606384377bce5961c9bd0991ac5b44834fa6de9f92d7cdd0070e7773332546f7f0b4bd8644d497e2b6888cd4e77ba338bafac35d513a5427c SHA512 7c6993f06ddd7b8b4f65a21da3608c388d251b643b0ed257f33ba70b1aef07a96fbefa4416c431f08cf956b3af8ecc3360ded1b503795f02c7e979e52a05694f
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_et.tar.gz 1633822 BLAKE2B 9c1fc7cccaf484cffe977be7a9a57d84657a90bab3b14e4be44ea11f7c459da58c5849b50bc11e4f4e8c13192a591079147c956578656b660ef79c2850539642 SHA512 7dfec5fe2070b68a8f98e01e664152130b80d2be5dd8d5e45d1d1679ce7b66c8ed79438585d9eb0d1d20ec86c1edc2ccfb171f2be724681d8a09a767351fcda6
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_eu.tar.gz 729316 BLAKE2B 5c3b7aa7b48c1fe3c8e9d7e04042db4bf4c4cc9231ffb9a3935feff58ca8ed9d4c142ae46fd4021f9705fd3a85aa75b3419249a2b903cec0f4a927fe425df68d SHA512 d077e185c07335aeb508ead9d1b883eee358b4e5e3bf6860ffdb1df2260defddc50d762e34dd68a282b40fb742daadd651b25cfd5528b25c6edb5b6cd3d58afb
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fa.tar.gz 332919 BLAKE2B a05e3857de920a1f8c9368b8f73bef6fc2339d8e91f8836383a406b12f1706bca17701348c5672d38d49185c1603021e138429c4e17d28e100b049dde4825f86 SHA512 a7c7e69286d98d24b1cb36f1c9b3c04564ef7a5bc6d389b0adc6e236c076cdd294436dd5f2a3d1a0aa4f0b0e61621af635f992f60d82de4381c23cca2cbb5f3a
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fi.tar.gz 706543 BLAKE2B 80bace928d779eb328a99073aa902756197443a2d702eec5f18914ea87e1d203c70287f9b40d2d91e9c25f9f725f7bee01d994ee118554db013d4eb1a817581c SHA512 8c37a311d2c7a8abcd10c5fb8d2ae81a668261dd029e308f08e2194fa9ae34e72139cd5dc65d5f8b213246ae8b027a196975dd5090b2d8c9aa6906b3c7a3046a
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fr.tar.gz 3036038 BLAKE2B 3995d67710dac9bb9011139e532f4e5e70d91340b162739e4320d7ec2be15d60a6b4ae92a7357fb5ef9641d69e3ada74895138034153d92d8cc1bcb7b5d2c85c SHA512 98f0ccc722f718e44b191b2b8ffc8dc450753dce0e6a924b4f5d4803ae8fb2f8523050d94ea8d6e6c3160525129d8ced22cf359bfdb5fcb277a8125cd430fe55
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ga.tar.gz 742386 BLAKE2B ed2a67f12bf6fb1748e1402190967f0eaa7ed86550d5d68971796538819d8c798b9dfda9387b8078efd9c338996f6f13abba2b498a6268fefb566806f25c57a7 SHA512 08ac3b5cdb68f381d1fd471e1e28d48385da5b0c41598e315eebaf6cdd1567818aa674e5a6585ee2eb96b8a2f95385498ea992b8184b34bfb26958aee7c7906b
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gd.tar.gz 1781487 BLAKE2B 0dafabb3056bffd946314967e926ef9ab8c72209d4efd92bb531ac279dc79827b1b9e59c55953e22bb3d2def3a03834184a5d90482110ea696e98deb3a14935e SHA512 c968d39a66291ba536fd14aaa1e4b492d8d6f45b15b1874704f660c934cb1b3862833ae1003bd33605f49a136ee2b65c950a014b71aa5ecea81193dfe8463874
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gl.tar.gz 2620934 BLAKE2B 4d5adf9eab478f778566993b39de81099b2079cbaa51826c2c48df433838c4a29cd351f597f3aa270e419ec5cd0249f0516fd4b2fd4b44fd6761fcea04e37532 SHA512 5623c0cb1f969ad8ab56d4e83ebac5bf67d7e79fb119e496ed54ce7c76aa2016919725fb32772180884922a10e5466382d89eae57d6b50219ebc127524813f87
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gu.tar.gz 1229414 BLAKE2B c42775489a51a1307bb8fc635eceb3ebcbd5d87d258ca57a821c1d1c754e90ab78e7cec7b56c9213bae255971fbd7b6465cc3089cc443e636ad7cde30d99b871 SHA512 4f40c528eb7df030da15ec4e005d4c63227f587830d2da6d5e1fdbd4d895511d06495a14218fb35a9c894903fc2ef28ec5a3b875bc84db9816dcffaba2c89ee5
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gug.tar.gz 509201 BLAKE2B f289285ffbbb84ca5c1b3c81d9a21e88d4f60a357ab88d4ff304422034eceb9bb130cb9630569da302c9a76af93d2f6c7d320e3a4b371e647de7f0a1254ccdde SHA512 5a12c31ac157362593603bccbd87cc663b35cda5c8c4aff0bd93bd92378f12730a78352a6b5577ee140e3dc8860a8eb8aa73412d1c9c2c1d725d4c4b7c3b8a0d
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_he.tar.gz 1622140 BLAKE2B 6f06ffe43a2605f3bd359b031c015abb0cf785f744611efbcbd61e43fb704c059ef84cc24eb3f15e0c3adaa321c8b28011c79341da20b39c49896fbd9252c2fb SHA512 d1e55703d8a2403285178586b43dce156e41ab4bd3a9915ae2ce6ea6a76c5edf211e31cc703fe1a39fbf03cc75b7adf908855a7af3725be888a87389e2eb8da4
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hi.tar.gz 570904 BLAKE2B 32baf9805e5273847c7d16c28d70e46e9cc1dc37e2b86d0449e4f4c41702122c80c10e01712b3e285b5bd70806d039ba86e5d65d41f83df9e66bed86cf473e0c SHA512 df1da8e0b944e074e5aba3b45a87bc00df315432b360bdfda7f9c820e312b12ea3f8458027f82088175d38bec656ee7dd6ee9e020f81126731d1f8ae247fa2dc
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hr.tar.gz 970894 BLAKE2B 35ec22628fbfd56a7988b706f28e698ef284dd204d0fca278d5e7c18bec52603fd26d21f9329bb41803cc37c8760b252837e840e3acdeec3b6f497d8be268410 SHA512 35f2447ee2abf3fb4ce917e40052642b2a26b99398700dccaab80665b539b046a9fec9ae1a90a8da1de82fad6fbfb4bf634427776d8a8455e0bb33cc331789bc
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hu.tar.gz 3017975 BLAKE2B bd48f5c16164281310a2f82fd9a831c239bdc4d9ff5710790fe967b04e706dc88bfc4b8fd35edd824d5c2f9595b911a097b6692e363e26279bd3d73ae3ce6590 SHA512 6ab386729b885dacc01bad1ba014e4fade8dfbd677fed6f72acfe103077fd5d3aac17db35a25a5cf773b7ea20433231c5f73533f9c836465f2e914745e53867d
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_id.tar.gz 1587167 BLAKE2B 4af2baa6e344c5f5f9f702831fd5de36fe3015a1a93548371c742913b1285656dde3f4a2a6575f4a055ee0fb90cc96f56331f3c8f4f5b5a41d1a7f76c69d84ea SHA512 d35d02f61a8203e3a4259edd69e220e2cba5593f0ed63279d7ebbc3410cfcccefd5c0dcbeee4d06906b0d3574242dce658f5e6e9e8611d44cb5c8c47a973a053
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_is.tar.gz 1518324 BLAKE2B 1317056d38cf678f15104cacfe63006651e933a7385b49553a2d96d8933df63c3e58dd32f7fae8b7e200a272640334cbec91f7b9dd5e99e1a2864b2832989ff9 SHA512 76c7b10ebbe866dbe0d3b75defb6b2e941b32ee5f98b12b03ff589b4e9c6605e963e132b525180f07d27d100b2d74637cd353d22009935fab37bdb38a6e250bc
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_it.tar.gz 2069465 BLAKE2B 30aa7d8dffe5ce1ef520c9234394b11f3ff7dd3e473949e8ea4461b6a8618b9dec4f8716a4b031e9e5fb3a25b3146ca57f4303a792a143162b23cfc12b2eaf66 SHA512 5487990bd93117a29ab4b6647a84129447bb72609504793a11485f97572a0adc36e4372a3c86f73729cf296852c2dd11831bfa8b8b2de9f631a49a8d2d4b7e17
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ja.tar.gz 809368 BLAKE2B 8bd4363692ed6f0c6b5273b1b2d2d2d047f2b75e0dd0ef2722128e97e413d6b30ab6d3edb5b12d9f81c86f378aac4a212c21a6d2209b319f1d621e93c053e1b0 SHA512 e4ca3adb9faea8a222dd3dda3c14537cd6327dc9dc23e18fe15da574c28ff45ebcc3e39529dd6c7c723466e746c9e5f966c147f281d8cf26d0bc49b9753a8809
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ka.tar.gz 361362 BLAKE2B a2f94aef48f6fbd90ccc524c3f455e62ad70549687eb818bf184cc09deb3915046866c5d290cca896ec13f66583066f9b43828cb89c921cfce6270e43bc78864 SHA512 d14b59bbf5568a0c032b937cfad07577b3c2070d0a9309ff4b97e0621941ef9b6f9dc9fea053d7eafba43b2a7b9807d4955b37b7d20dab87c5d863c70aa01c0a
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kk.tar.gz 785771 BLAKE2B ac6131d64bee5c54682b6a93fed0e11c43101d600b345d92d30ef6ca3f3b057824fe91d8f20b51b5e4706864153341ea28f2b54dc845c2055926ff0dd8b78052 SHA512 22e382d716fd30d5a5dea5d2fef68570e516ebb1993742ce5a707fda3ce9347bd3f202355b84aa61af86d728062e8f455938c1c3bb7442c0707804b6e2ebb783
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_km.tar.gz 684249 BLAKE2B 02c1ba1bc7e7579634d8b0f1f5acd42f0415a8f490bb9dea894ffc758f7d4f03589357c4470ded97cb83d16e5a33bbbc9e20e08175b12f817e2c13cbba018bdb SHA512 d08d735d0567041d1f19bab10b009628a342ba2e2b8a13e9ca061dff3f5b9e9e5e3b5772311fda576f07d9c756b3032ca1c3fd78fd03459a3e930d70ce0b724d
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 334446 BLAKE2B d03e8fb70bfd2a177edf38d45969349c5ff78a97bb827f4391ab361e57965554f50cc658d1da5bce3fa98e3513dfce0d42ba0be3a5ffc90b68433a3839407ff0 SHA512 8fb3f6e8ca9e62233130310add46be2e6d20e1050584a7585e869d1578e97c5555fc47ef27ce0aaee7214bc85012148990f933e35e692e76894b2bc3bac6976a
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kn.tar.gz 583670 BLAKE2B ea18519fc6caa70caceb07f87dacd94527c63760a8ec3e5db3269c4c86b327f6029495ff687ea6087de95dfbe4d8647ba84d1f76f323961c71c74f1dc2f52bdb SHA512 51afb5b4a1d255403d5af3409d97de1e38171c1fa3ec7db37bddc136659ee8f7e9c4f4aa278e5b2c8686a80b1815bbc8118499874c8a9e57babfaa3e007ecef3
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ko.tar.gz 808077 BLAKE2B e66ed9c8692c5a23aec44a5e3ff982cf9418004af44d01aff658bbfe21360f0db56a02b90df22d1d6a1a148f5ce5c5e9a66715e09ff3f21a8014d26353dc387f SHA512 a7a127d237fe495a3c9b34682c546923a93ff85c8bb79100cec93e64ddf7c12812211ea595db5ead5df450f9d32c87af3a0c1bf26861461430441d4d0cf06138
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kok.tar.gz 412546 BLAKE2B 1f56b78dda74b27ab892d78b7c80f621f3ab219156f34e8e7ebb459aab98a049e32a0baaaf4f18e7a7f7c1513ce451704df6aa1e784764350e10f57120987ee8 SHA512 980aabba57c0ed2df8aa7206d201ae410012f45ad0ac329149f975167849a856d0ef46fcc07945a088062196dc3a0d73db7da4bfe78411dd39f0ff799e005720
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ks.tar.gz 330684 BLAKE2B 76b6c161893447b28b268b84d1042304286ceb065a404c693aa13fe421cedde0e977aae91dc6cf4f04978eb445408803279941b4f77b6bc776e2239f8674132d SHA512 aa78155b3cdc1f15f7e640a4a2f37068dcdebb420cc77776e19aefacfbe069b8e77575f6752d26ff6a0cda946ef5ecb9f14054dc2b997dfaa6cf4e6dd273a72d
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lb.tar.gz 142670 BLAKE2B e8f5095a4aa77d5db664593f378820f0a0a5c461285018bf5d422365841340b8e609bc7fecdb540bd2e8265a94ac3ce47da49c653a2517c91d2d02a8f25d655d SHA512 8e9221a9d4cccf9dbf63e98e489329b3edf51d4f11781946186d4d4fd233a1e15108b3d2a0f440c8e907ff3f99626bb48e21b0e257fe5237b7c8282e3544a006
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lo.tar.gz 432835 BLAKE2B 1608c1c766ab4d020e050d49a37250193b99dc53ad43aa333674135efed0f5a6d290217498e92b677004bc92d6f4fdfa157e56b2766bdb7a7b6027edc9e6728e SHA512 86ed6368eb006a36b5f70791f3a544401f022150689b2a76ac6c0029244e672e233939e09be45747aab6bce148dd67f67c1fd10cfa8045d73969cd101a0a810f
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lt.tar.gz 1032069 BLAKE2B a8a58360d4bfbd60258e530e5b0ad9b7b5f43e676a0dfe61b6d850ab18294d4fa948f8cab60c6a48b308034fad9f24faed1941e67ecfcebeb17314b29f2c377c SHA512 3675d122de166f55175026e23a1d08dfcf30653412a2ec1bb6b01472b552b2518ec6de050ced9d5419bc7a996ec9a7f0ec42bc2653c91c3e9d5ce2bcf8c0b8ab
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lv.tar.gz 1493801 BLAKE2B cddd406be791422909ec7b1be56c4032842ef13aea9028d8b072496c059a84bf3e2599c3c1e9d11603b371b67fdff764d643d4b93561bdaf9f79c4963a709ddf SHA512 8ebee6900eac408dca385b650a757cc1dd2aa5d5d73662c4ff130f570e9533ebed7a4fb31f037727a72a3845a569b2148100fb2a3847dca072ad04282d948635
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mai.tar.gz 331123 BLAKE2B 992719e54020d6f71d98765073f27d54bbed8989fe392d140759cfc43ddc59395211ceae6a06ff4f345ef064b12727cb16b41d3138ba601e0a3957140ed7e314 SHA512 ad4303e3cf700ecdbf39667b739df6c67281fe0964c42cc17595bea2d4b2ae1f328b88ae5052880613b2bc9bb5b8985b02c1df0a7871e6c83b340cde03dda15f
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mk.tar.gz 383600 BLAKE2B edb20a076a8720cf21634a00152135879f53853f3ba50980ff7f45c4e0b4ad2110cb13d0448e4a6906a0dbf30cf93c910acf4c34f65dd2847dbfe0c4df38e365 SHA512 eb80a9dc979cb06d415f4e5f2ce1c0bf39101bf0bf4ddf8f4f98f6a0934204ca0b9f28e7df156a84cae5676694bdab6a05682988ead037a65b51b4eb397e87d4
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ml.tar.gz 545155 BLAKE2B aa5ab8056ef360ce1a93bf401ae2272d9980cacaf3ff9469a5460357dd5774de09bbdb07302f446fa605ab22855ef4b23496d451dc626309a7c6b9da2da3b828 SHA512 d0c00e2a9e684e281832d8e36509764271b8228d4912d4c0ebdc62e430847c2927de6fb5990f5b983df790d2c5d2130a73026a619e9958a1af3d431da1083b50
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mn.tar.gz 508940 BLAKE2B a056a1645e873a9440b61d47b2a3246bd23fedbae0637a3178bd3f72719809d34ba9a4edef99dfecd0ef8149c56b2f7da998a69706588fc78298babbee61ccb4 SHA512 f088c25481328ecf0b6fa634240b008526f89e1bedf9c2eaa7f4f3f38db2dbe61e2b2e5c62c2f7b2f2a91e5f7ac50267312fd6c9ec3fecbc790c4b77c08c1f90
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mni.tar.gz 403775 BLAKE2B 9f93ba7fe297effc3fb93674e607168040460fb78adeb3dbf73e175c2a35045494906ddc702eb00a8ccbfaf3ecf16ca4b33cfd980ec003c4cec665ca8fd4911a SHA512 00ca1e9ba4c34fa36b21471c2cbcd334b89d277e3c2377ce129eaccd5aaaea6f05613840dc6737943dd2431fa24b312929db4bbf77b175cda02f76cfa2108d09
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mr.tar.gz 578929 BLAKE2B 4487fe3cfd3ac4bfd7b8c2124fe83b9214f31928cfaa009084eab2a966990125c1666641dbc5b2bacda9c918bf527463c57ef43877f9ba99b479ad18617bc33b SHA512 1bf15e89da9cd13bf23d8bb0457215f6cd1340a315c0a2acf3bbcdc568c2f03a978363db93d89e3bc6692b3cbde0c3989c9a7d0dc5459d7be3a761f172f90d4b
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_my.tar.gz 464864 BLAKE2B 5907cc95765e41a730bd1bd013f0e96b1f9f858656b58bd708484e97dbb69812b32ed3eadcfd9cd3904516db2e393d7ac2b5fd39c7e5c4e89aa9efce104b8e94 SHA512 bef2da8230f76895d0bc32443dfa34d396dcb23f8ad48ca274d5c1d98c0de2d744e9f3579c136c1f72773dca590ab8f1c9681da5c6ac9f6415aa86f7cefff380
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nb.tar.gz 4065339 BLAKE2B 2acf7a7e5c7d61ea9fc679c9a55340db8b193893962928a66fa5d65637271e823f4713c8d9e585ba4f37bf4e5da98243b5e31a76b2bd5caee20be89883622cad SHA512 ff225b326fce57b5266ab2dd899ed32d21b94a6cbdcc2b8fb67a4888f3a804d0a28cbabfbf486b6294aa25c16239b28c8ffb3014ac581a87dd7d96d116d5b665
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ne.tar.gz 859560 BLAKE2B d32be0add2932b300531f98caef61f7d5878e8acf9a14698737a398709121f728f9147603195c03e23ad13f5233db9e46b07237b8a647e472e33fbcfef57449a SHA512 0fe58095abc72ed20643bbaf2366a1ff3fd4453ecf30d242799404cda30995e220636f33308678545aa0e9d7a31bdbf51cbc5fcfd60529b71d50e12b7fb8f580
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nl.tar.gz 1523368 BLAKE2B 604db40634fb0c1af8345424089bdb7db3cdbc57ab7b69fc947e06ade502ee7565b1ad89e891ff30a348fa9ba90cb8bb2b88ab634f04306d9454dd101510bfe6 SHA512 1deac0dd21cf294db3773efd7f3bc6ffe363f6d019c661fc1fb32bbd0f38799158dae61cc5e90f43e82d3b5a9a84245b7958a766ecf330e05711124986fff15d
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nn.tar.gz 4063882 BLAKE2B 03fa15c8df8425203b16509dacea8e3d91e46092dadd87b1dfff6d6fc9993c83a1a145330fb17f6ea6df02425aac5bba535471bec94a54c54b14b18423bbb370 SHA512 ec601b9a07be905e8b23fea840082639aac25d575d219c6273999ea7bcf3b90046642e2d39a7836c8ec86f6b0381a4a1db520036892d906724bf1d90ef989c4c
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nr.tar.gz 277545 BLAKE2B da6df92d1a84484f528b2403eb1a597ba9c774584f7023eb8b19eed6a44e8b95dc34da14f97de32be63a18538d1d58635152d564e7e502eea43325b1f30ff077 SHA512 0887b5fbfdb158071237d6fee97fbc0d474ee589d50e1c88727fb8fe116e22d9b920e175aaa016e65a415b4c85f237ee39262ae3ac3e724a048c37c64ed874de
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nso.tar.gz 322000 BLAKE2B 655644486c33ec279d5169198c22b441157469189ff8f069d47530da0433c6c9c927f7fabdd283bd13746ada808925f2f5017114085b6cc83f4e0de703be19b5 SHA512 59baabc175f95185816663b3ae9bacb68716535c200179ffc3cb70ff08e732f8877b78b55d9d6ec4d620564395629e9f2e4429c74127a67fcd000f64af37985c
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_oc.tar.gz 882003 BLAKE2B 4092bc1aa6dac0b3f737aefc0d4b732b7eced08688daf4b1a485e748ef81f5853e36fbbc79b4d72e0f63fca4293f681d3f5f779fa5c751cc7deb2bb62f39016c SHA512 840bb4577f874ffe132c943b1f05898e1226c2712bedd990f2fc46fb91cffa3295cfc90207b6840892a3c6f0f38a6490ccaf182f46edbf97dbb03ad3a43842b5
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_om.tar.gz 370384 BLAKE2B 5f7e4793ce38359a36ec64a77beba33415201c49265e4b4052f4817fbd8aaf58f03e100d1290bcf8fa506a1b95e710383d8e10f27e17271e1940abea1e386c56 SHA512 72e028a1e8a37e3a1da60a57bb90fa55a81f3300fad7fa752fed92f616e1ea4066fbf4873e6d4ca29602239b948dc44beca6527228de8fc11f0c9e42e5e51956
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_or.tar.gz 602685 BLAKE2B de55976ce5de0466c2db3abe1b86cc905ecdf2b3c92dfae56570dd2a2bb924e21b640901d1c1eea8c46a3a5f98895ecdc73ae0450c0c67121e88fcc1b875c2cc SHA512 bc66c37c52c78610d1fd1086d2657355360e605f1e15cf47193b5e022b9476619e469a4db1312d20c662a79836888595a0dfb089c6b7c70e2e9f88144ad6f4b1
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 470982 BLAKE2B d9437cbfc4aaa208a4313a9f26907be8584d5da5a364bb3f023f4a8222a26f0df2fbb39c76ada2fc28384af1595ce5b247cd12e63333bb261825fa7bc972cb60 SHA512 2fe11ddf94d31796872d4109bd584bc0f56694acb4e3720c20d9316e48c3d81dfc5666c816238816db68cac214dedd7f83db00834c6eb4dbba26c32cf83c80de
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pl.tar.gz 3094486 BLAKE2B 838472f23a257d7702ee0b778b14e591e735f8ed960abc693e3f1324c2a65a4c376f47cce0d70f0a722c0c39c39c3473d079bfe9ff767883894aba15058a90cd SHA512 2953d9c1e70dd2310d21ff28a127c10207ee587cbb73f4e089ea0c9015c244db159233839408ea6dd6f9bc4ff2373917e6e66aeb0d77db1b82824cd9b54f6f6b
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2816827 BLAKE2B 58cb9691babec628719b1d82d1779ec41f36e317aa7f0aa7e66c0dcb5c8cfbbf47fce7664eab3fc3416377951a803b4522fbf366693f4f094bc7cf3d196495d8 SHA512 747823c4edc1cb8a73303d30c7ee5fa357f7aaefc6d42c0f86e54a663d06546ef93f38b8fc9337da730593d16531f3568c0358ba5c59c471d94433f801c32918
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pt.tar.gz 2372184 BLAKE2B 319e2dabf5a00cb5fadd1592019ca388858ad7fa237cd9f46322b9e6313265fb65b857897c0813068663dfdd780c6deb68de199607e63272e2f9d1233d6d1a09 SHA512 a8f59d465846e560bd8cd8bb51757b087f211d5791d69c76d5c10d77a5399ec16c5695c2449dd66f304a028ca689d4b83eef4c0284b218e5e0ba27a1b9faaa9e
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ro.tar.gz 2532103 BLAKE2B fcbb7e5ac03d5cc20f1b26ce5b2fdf780aa5b5b48ae6e818fdaeb0db83b626c66b04a60cf85d3a7b1213813b5e5eef6e43fb7fef5fef8b1e3b098d80e490da24 SHA512 fa2d40d9dae35c5a686c8cd7d7f28b16bf90802264ca96930f8a9a23e1f46d350c969e890e2667da343681dc92bd84ba86174d84bab626db35bb45df208bf038
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ru.tar.gz 1902459 BLAKE2B 47abd8dde6fbff528ac8f781f7399010fb4b4823bd6b9c8bb6345eadab0998df0f5bbf5793c9aed3c2e3ae9f272f34c510931edbd7581362bed7c8ef0d642f57 SHA512 b26b30d653d19f6c2a4722002af3d249e1c72de4b8a264e63d64cb0fcd853ce08c006038933edfe330437fee645be3cd945ae4fac6de472e8eb5c9e630ab1ff5
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_rw.tar.gz 346206 BLAKE2B a33893de0377de557d34361c505a331ecb1a990ffef9af28a76605716a2fd6d24481df017d30a5f73354882b41c1e905fd0111b45318c64c447f1871d9a3f73c SHA512 6cb165fa5a1d5abd2c5f085ddae833d7c4cbda55a6e9b743ff14d1afbea8b3e79b81aa811b0f2656f206055ad7bb5509bc0f78e0048973ff6338fc4117f74e0e
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 451153 BLAKE2B d29718ee48e8933ca99441d49aa2e4e3c7fb6648be85f76d06d08580d84e0e19c297f318f9b32a0d37c32f15de04da419c7b20ff2b1f9854b0a11d6dc8f8ef9e SHA512 9a47f3efcc85e0bf27f1e01ce216a4b43e19cc1cf296915adeefb2ea36e0f6948769b8764cb97aab6d48e280ac0a601567b0459e735b282629cec62a58051f7a
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sat.tar.gz 523281 BLAKE2B d712b6a348e41f2d7d5d82c0fd5c3046df94e9b3a8fefb4133b6c50b7085f695e1096cf58bd845d6d25d4fef8d0967a2039e9aeb5eb497466495bbed820923ed SHA512 f0e117770651c17c3500ccf76131a590b0160a7fc6cb8ec6fb93da2c6642672e6be4dcedf8a19fc5f9121154ca191e5c4b2a0b62d0097abba3ad2f9048205832
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sd.tar.gz 437886 BLAKE2B 67fa00c93fde29de1755129c35d28b5fed98799a23b6be40d47713e5a81996d0f9408fce582a65c49d87b08921a227d0f5dadcfa3450c5eb59f59b84344696a7 SHA512 05c08c30e479b282781868dc1086b82c114d864dfbaf99358e1762a819cd1d62c0f9da681aeeeeaa175cc4008d2cd44c67d80d8fba37763e073d29c5bdde6da7
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_si.tar.gz 739126 BLAKE2B f76a80799b67544ff3338b543fe3a66064917050414fded6bbaec0b96c606c879a5cf43aa867381bf8d60dd1f29ef8d15d91ab3245593685050a25ae5d33693e SHA512 eba357f5bf1a41e2317e0aaee420aea88680ab7f064fe5a9e884ecc7ee78878f4115780fcc0d98425881de923a8cfadde5d20b09e9f5f2ad83d4383b05e452c9
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sid.tar.gz 452286 BLAKE2B f5526c377ba0c6284f6325968bb2d8271784e9304be102c9eb096768de6fb5d69b20674a729bda624bc5def7affb64b8d3cf75e686f507248ec837fac24a2e71 SHA512 a6300283a9b71a45a9333541aff9dcc5e597aab9258578a60f2d89bfc47eaf626bdc8d6befde89eccb14ae839a56dceac28c5c4e3db153154a26348d02383831
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sk.tar.gz 2027712 BLAKE2B e5aac9f6444955abb090e3628451b40dcae62840313ba652cadc4f2b06a4ca4f10fbeca320e14d341c329a98d1f23ec21574e3a1af51409470a689e8bb4ffe85 SHA512 890f2468e6140a61424dace38a41004fcdff01bd90d5db45f72ed541d5ec19e0383422fe8f7af16fe22a4fc8f366bb2ee1e3f16eccb888179c1c6472eee548d0
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sl.tar.gz 2433333 BLAKE2B 4b1a320269b9f02d624b66bfdce5c2698bda5d905a8e867255d8f4a7d82f6139dab2d29dc6f9a99b643a8a89bcaad0887eb00d5789fac5f0dd7fd28d6ef12eed SHA512 cafd119e9a35fe4bc86a6f56ee470c47738476f64aca20727bc0c8555c700c890e9ee9a8d49d5ec8beebf960fd5dea9680e776bcad01eb245a4e803afa3e99d1
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sq.tar.gz 1171727 BLAKE2B 8606c4af2378c6e763ad984a4bcc2bb902c4c6a06e1f85b7dfa1a53ba5ef0a0d1ac2233cb0f408e9c89509da3fcd773ee3b24004e5b0af3c0ba6134bfd9d3f70 SHA512 ca04d85aa911494dee7b7c8a2c4aba1f782514d2b9e230963f9845862a66c1606fa4ae28fcc4f59e942b881a9ff9051fad679afb31bb239115d13272a94d15fc
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1461625 BLAKE2B 23152c4b9cf48446c31a0941bea747fafddbca2ac6e0b7898ad5c3e59367765542a62dc30fcd5c320ef8dabcf2f4bed0e0a4127d9af101b54965fb6c659d17ac SHA512 4eaa0b6a450168e615ab47beb0ca0c28d14bd75fa6b4066574e287f7641fcb6d395003e8187700b677b902c6fba1799f871d9f125c5d16a52d6336ac64828f10
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sr.tar.gz 1479879 BLAKE2B d7292af13c24140bfcfaf012c863afc22c4cd33a05a5750b6fa460c40c401e683daff729c16502bc57f7c5d77b7543eec5bd839117eae948354d208ec61209d3 SHA512 dc9abf0bc44425002628fa69634d46d23dc3d378985c4e3469fa7204ed9f9985e59eb768dbad434b872bd47433dd92fce565f7db1eeddc440304e74048ba4736
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ss.tar.gz 286940 BLAKE2B 9fe9a6f52e19886006c47b09672c1223d35c576b13297351c0ba2219e90af9984fadde3b1841e425104f12661a9044ef319e21a07137725c7a13b1564e7db044 SHA512 a2992e8ccb80cd90c8efe56407955e4ba16be0d926c5f31a8220b38fc60927c2768190914dcdcab72de4b723913209df1226aebfc3200face2b8426fe0a98c4c
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_st.tar.gz 279992 BLAKE2B bce400bae8b756814eaabb7e289be2bc5e6709c6b5ff6cc9f1df8aadc41f2b8d72d4b4f7e467e594ec1cb66710c52af5e417e9ab7812eb188e7f50ce7844c8ad SHA512 cb9180b157daeaac2d7518c0c09711ad9c83d5d0f23eb6cfe1957ecfe4aa1ce296b3048245664f165807177ae9f74844eeaffe730314843af58b4809f39ffbb0
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sv.tar.gz 2609202 BLAKE2B 607fc50a3abad04db69e688f27d0108cad8210122cdbdbb6efdf26e41b1dcc08d401dfd2857b6dc6a2761399c7357cd2b59bdcb14d35de06bbfa7cd7f35c070d SHA512 4f3d4dc9af74a884cb13010a74275a43705237f5afd1487f546ebb70d3d4826875c4bb06da1104a67568476180e85c05bbd9707b2138285208b42290cba8a4ff
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 319280 BLAKE2B eca7b0c3220b8a2c16e426a9fe350ab5987a7e83dcb36dda8b61afae7d817fb67400bae972c664c57deba1759879a3617878dbfb0208c188cb155d72a1474b79 SHA512 2948b1b2e94a62e94a882cd4afb19e5ed79d407cd62b73071101561889b22fe1d1f33a6c7e4d742873eadbfe455cf468cdbce1b91107852d53992d8e688ba030
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ta.tar.gz 686297 BLAKE2B e4c9ed0a8828b0a7e8d95cd3105616acd46b4d7ac907798ecd9bc5aa4377031ab674f7112567bdb237657be9a873e2438481432f5d080c575a16a66833144f84 SHA512 6a142cd35dda3bd6c4d960f54cda363fad4ce8f5573db089b9bd0bc4d3113e0d323e8de7ef8df06ad48aecec7b28ffbae4dbf239ef6afaf4182b19d27c78f193
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_te.tar.gz 1088783 BLAKE2B 647def8e9271f714e518e81c711fd6367f2026828e4b25ecfc11d5c569710428f87329515f7648248b97f855383767f0243ee9dc8aa890d9289795cdcb95c24a SHA512 c75ad07e120c942d2442a4f66ae35fb9e8b8934732c64c83bafe0f3ffa9e7971e58122c25a1b45bb49097fcdf5e7b5ec511ee90b18043895e4714e10714d9fe5
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tg.tar.gz 358361 BLAKE2B 70f3c097ef4e872d7893a0d2e718fe4f3c57de44b66821db493aa842352665416f1c2d879b7d3f9935e0ea3a5c2ae688ed6a766e143219a30fa6717bf5f47eb7 SHA512 c9348b77817935ff0b947e4210b8a7ad9bad66893f6e5b69c710bed99b5c4b478b77691d65152e00eca12371dc2e53928d53f0c35ffa263650c1c252483f2f55
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_th.tar.gz 622571 BLAKE2B e2f92b61c966c044965505424e35d30d66fc339ea5723340f3c7a8565d9c8ed59963f98553f51ae654078d662a187b58d7ee83a1f3164a3f33afe5a949e64420 SHA512 a0595bd597da647eb47c930497f9b142d2684f154982827104bf2130b9b9221e1494d5079c176487e665660add948de2ce9341db17d7081e884223f94fd85628
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tn.tar.gz 258980 BLAKE2B 7fd79c448d07f95ce15855a333cf82c61fad778186941ce00e600a99a53167b30a5ed330c00f32eee2d363a1bf427055ffe1b4e994320e6b03ba3b8e9bf923d9 SHA512 4ab9aedbf0cb596f86c43a7192f1aaeb57aa31248a84224d294cdff4b96b6ed024214a58a15e3f47eb7e5469b844083610798c8f5ea77fac888d0c880daf8e70
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tr.tar.gz 774230 BLAKE2B dd4445ad3d9d71d6eade6ae1579c19fb183e031256854f77d55b8aa3c582ab170d8e9974432d15aed7d3afa5c9fbc233f7fefe3ce6546b15974dab80a4b9583e SHA512 7a77760fdaa1a4ca7c5b17d0ecfea73c4f1e9a3676ba0519818450790513ed58aef75a2a93ea45c2188826c48aa64f9725f06437d8bfee02bc2180464ae089e9
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ts.tar.gz 277116 BLAKE2B f2de3718b29cacec6eb61b5a7c6c5560505c902e77b77cbaab3764716b528911b43601a08630c50068f4b94acaffd7234e2644b0610cd20071b759a47a3c9e35 SHA512 1480ee80aa5df4ed98a30fb1d64e011f5c10df7ca44f3d42b582b50020a8ab1a5b36504bebb16a93d6f20d46e1d0369f6a9849da1a7cc78042af2ac0b8525dff
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tt.tar.gz 183373 BLAKE2B aa9180304ba2a8dc759130ee11fcb4acd39725a71383d327132c8a8f29a716745ed8944fddb7a759678c7c2d95a05b2b78ba26dcdcbd8dc6c8d3c2ecda61dee1 SHA512 9127cba0cc62ed4231a58d75fde171244edb2acf8d644f5409ad4e76c1b6d70009b77047efa8444b034b9f35806492771982357511863844f111ed464f719055
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ug.tar.gz 549268 BLAKE2B 958a281647b541428b1c6d4cffedb99902287a78a8d3ba100793234d617b54b51a45dd73ea78044dc28dfb10b257b7191dcc996bb8c0fe7ffa4502a6e8830f68 SHA512 d839bfe3ed4ad8a2a8fd2d95d0199950e33b1245da01622668f353c837f6a03eff278e72acacb75d95385ef9affa20aa231833a3f9051a1df7cd39cb7a2504f0
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_uk.tar.gz 1622105 BLAKE2B 502618a3e5c19099ed6370db877b33971bc6ad9901da1ed8b42d12631231d71a8e4b0575dfbd1219289888ba0ecd4208173fca1422348e2d166142ed71cb7a0e SHA512 574292e8b7c15449e4875da34f0fb97fdeb6f640a4e50194191421f9e220d913a32c97d93fe17aad3192bcccfdcbfbb2e33eb6995021b6267419842e2086b7c1
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_uz.tar.gz 314457 BLAKE2B f5ad5a787f1e7fc26d4d0bb0da7492c89832a7b3ba81d43fc2860245cdc98e1705b829c996b2337a19b80b7704281f225d2cd9d48574a4e24d55f994c1b7c7d6 SHA512 3fcd6c4c749bf39ff35d5088ce97527e6b4af3960dfc5b85b471e346c0caa033cb9d161d1ef27fee5c150cf058b84f37c05f534ad65a0fa31f3ccaf0511211ed
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ve.tar.gz 282262 BLAKE2B ee274dd1904285d7201a28870be8595bb4afdfea12a2d9f0fc5357eebe86bf72beb6c5f6846eec2e95cd23f6ba964ad6fe2acd8a0a62bdab5098d30a9aca5248 SHA512 cf4aca847c24e3e953c41e530fa41abef9b18dd5959bdc7e0e9480be0b4a537ee434ddbb30943211a5d1e732b6804a7da1dbf1e38506f78a905308e1e1d3cae6
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_vi.tar.gz 465539 BLAKE2B 26e7aecb305ea3fbd019665adf637c690977866dd842a4452bcdd27947d916a5def9f0532ae229e5f20cc8812dfc7cf8d9636e7cd8da9501bd314c1c8d047da5 SHA512 c481b6c2773f351a645058889f098040b823198eb398f6c5d79907f8b8bd704fd3b46f99891966000701589ff591a86ef2b26738d51b761dde8afdbd8be2dbad
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_xh.tar.gz 290178 BLAKE2B 7f591f647232a1f5ef9d30e7f3e624119ff8a7710de544c422ae954c86392a3dfdc83a5fa090688ea8ea7357eef914f0f166bc6c16757aff0356e51b824459ac SHA512 45258251e71e0341a7d7726807b97d1e369c1c9f72eee88cc6453078ede8d5a7d94b69a81e9786f87e7742b2d7e475fc8a56303737512533157338c21042f399
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 809091 BLAKE2B ac8bbb947ca9ff64f28d1817774ff3fec6f83366d15e7a977afed48f8af7d1d6109678884c04841827e48c43dea634962468329f87d03870445bed31675141b4 SHA512 da50a3f95e44e6325a03907de6a34bdb8024ed78c9a1da7a0938906385faef5aa954c82d38f6de5c6a31180f34d2453cc4b3aac7af05bdc0eed1ed848b793a1a
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 808478 BLAKE2B bdc04c988f8dd7c8db30e07a0c191d918a1d98a1e0aca2e8e192418f1f31e68628a0c4d0abc5f0af7f808b65cdd4ad118a835e77d4b2a6e0276830ddef8b4000 SHA512 4e3924e7a5e615bb27781f5a2d997b45db9e497f6cfb6e9621d6151fd62c9d0046796177d747e279c5d3bf76822615690dcdcc04e17b7a4e549a1afde9d96b9a
-DIST LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zu.tar.gz 320570 BLAKE2B 95f90b6ed1a87f3e1fc50419464edfb7a5b613e541f20841367b83b85d3eede92adfdb980050df1ae3862918f6f551ac71031c98b99fc62ff02774b009eacbdb SHA512 b122ed2baecfea4ec2e538b4cb094a0e8d66ac7056fd8f587a54c654b9195f8b7ddc3eb23fbbc0a0283bc96c44b51459338883fac51a636db7729b492e12db37
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_am.tar.gz 2493916 BLAKE2B 0910b2a688eaaa415c275ffcf6c12a7e7227dc89df2bd92b58cbf97fb4ce5322544f22aa1b6e692a680364e200de187b6221b558dcc92d873a66f2fe26941ce7 SHA512 290a26e7b8e4e563ec0e835c5a9982bd8d1edca14816d63603be669e04b03ac363e33be7318e9c02641ccee3125cb3626dfb968cf378efcc329f25d16a41e750
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ast.tar.gz 2388910 BLAKE2B 596436f20feed884448cbfab4304d234bdde438504fd82756a007d73014b0b5ae7c5749369c49d5ee449f799aa3b9e138b519ab657627dc32e5cd9731b6a2dd5 SHA512 63ddf54e5dd17ce9c1d121b342a39e77a7b3f55c1c04e4b9a1fa00fd513dbd1689fee9befd62f78aefabc5c87250cbf09771522e455f98b149767e37d30adce7
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bg.tar.gz 2567508 BLAKE2B b8d01be6ab47606a655f623e284838146a7681881611418b59ec17baa444f3a716ffe36c99e1caac648f01a5268092d09853dc55b6b9a9b4db3c0f6907593eeb SHA512 4dc478e4665e9d6f158e4ad8c904a62eace878fab144cb483f2584b771cec2d688cddd1e857ae31ed573232ce078fd9bdca727e68d8bcdee0300af151009097f
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 2578503 BLAKE2B 358ec0c05053379688dd0309ba479f9139ec9ee38c0931d52f8b6bce3b7f7e0a7dfc5cee80a5a01711a903fce45a029dcfdf00c02b296c789aa710f645de7f6e SHA512 31e080685208f0b349253125d7a8989f2e761a0924db99678819ab27b45854a6a6273abbdba6e7b29623c941f24e959fe0c1aa97db63fbdd98f4605861fa8be7
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bn.tar.gz 2561452 BLAKE2B a102d9c7cd2a8999bf5a3a96d5133cf7e54229096eba032bace9a0f50d8f39af61d85fd1ead8268e4d7c318a5c7ee235db6d80fa6327114cef462640182e7d77 SHA512 500f37ea38b7afd5ff5476dbb86365ecc4881208a75f3ad60a7508f654cf146d23b07d7a934912c15781e771cbfde60a260bd0d4ba8d4bbd5bb36b48780b5730
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bo.tar.gz 2576191 BLAKE2B fe6695980d1c358a19ecd4cd55a2c1c3ce0dd66cdc3482c072d9db48afc9a8016bb60f08d371671330bd78b0e677af9799f0de2c662f48dc96a313feeb18620e SHA512 64b8db68b01185baa40d0adfb1709ad42d4b24832c0c7ff62fb8106e4ebf4f6f7385684f4f0ac966b6277f49a84bdde2e3b8cb1cb9f469db5cacfa8612c2abc7
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bs.tar.gz 2302524 BLAKE2B 0af09e61b826886c65c22d8a35412b4177224c6837e11b8c33ad8df9cac58a950a8e6e88573b70ba8427e5eba4609219f6fbb0b2aa78af88fc8eaddec574eeb0 SHA512 676b52be9e41e5637c0042babfe0778ae256265d24ce05e8c347bcd1720be856dbd43c3bdcb070048a0b98a2506e53c57853e66c274cf78b45b594a5b553c411
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 2380534 BLAKE2B 31b8475a418f4b8bf66fc822105ba21228e5970c79eb7d4a96f69d641f797cb2cef4907eec739ba4d4f93ebcd72470f410796726a3d779d8578ddddae245bec9 SHA512 1555a6c18564613c706cad7d0d2f99068c716910c876a2bc5fd7e4c827c5229b5372af0baa1893d207b0257c36fe6640d192ea4384229ef18f7f061ed1cec045
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ca.tar.gz 2366279 BLAKE2B cb7191b7f5cdb21c38114e5daf362725437122140b5a9953730cba748e083ae20dab2540b68513af6725b0ca74b154483de9171b6f24a4e4e5dc6c8499c87962 SHA512 1e01dfa999b1ab398a4c7d9565a156cbed4365f3e7f1da67d261827d67924a53846fd7945a9fbd2fc170262a17bf5edc4812696a2d9e2db810c4cae573f9d4d3
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_cs.tar.gz 2361687 BLAKE2B 5d953501e0f0a8ac061f741565299bc1a7bbb6cf0c2a71971ef3fd6413226824f7b26c5cdad5f590280aeae4e205f082161bdf2988aede869f33c68614fa440f SHA512 b3653ea4d8758ac16e0170f7b15ce0df558e8178f824ca1c5856d33e2f2200c827c5373a96d85918c63879943ba2b01b0b897f1a02d6266aab43243f9864f275
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_da.tar.gz 2328408 BLAKE2B b17e08d896cf7507d89b8525e0ae536dd8fda659fd4320849076e8755fe59a04bd6792ecf1e1baf9df90ce11cd566a7fc41649513144f158da288d7546409961 SHA512 60269943e3766a1c4820968b9d9827fc19a69f72844c6e5660389909135b4532daf1a0e2056d8139da3313493e77074efbf4a8e7394cfeb355368c4d1609813d
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_de.tar.gz 2422725 BLAKE2B 689be9e3163dcb88926e1bf943703cdb5db1b55b895bf6a41ce0e956a7e229674843c8d553b3a5e94597b80dcddf03968dbe982e1fb76ce2c4ea3779bbaf836f SHA512 dd20c522dad565b761fb633d4b65a13b636030769cb4640e0a384ee9bbdc4b9b108f4207bde27aa6f1bf12b4c4b54520c93012f469a363d27d54668a89ef978a
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_dz.tar.gz 2732621 BLAKE2B bdd8b4dddccefe8e8761b6b63071fdcb455fece9cb80b54949d5aa7b1fc88f7300253ad9138dde1de68e8ad2c8cb9db6c2820f53062e41037bb54671a62c66c7 SHA512 4d1fa2106b41681a6a67aac798d352bb6370290f5a86322487683770a1baba62ae866b1d567ed00b2f4d9378c77c48584c3fca8420f6e7ca811512f35ecde728
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_el.tar.gz 2770459 BLAKE2B f4f51acbaf155f475031a0ebc8e45de9683b2b8bdc0d75b7c6bc51b10539278fedc130cb22fe6dc7f0851719fa3de34d3a75e06b3d492fcf448a03603b11595e SHA512 52813226511d1810c28084f478b5bccae946929071b65a78cfb7f8571a04ed5b74e3cbe96fe4976988a0bc2ed0c455c5631ff59ab54ec424a74fb4ffebd32115
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz 2210601 BLAKE2B e2b6b88ac552f6ce6da81b855d2e67d5ffaf9078cd2b4cfc4455f0f5098c794685e4ceafe6f08563a4992aed4f9ad997186fd6e995321313660e5385189dcd36 SHA512 e517a7a0dbe45e537b350d3205ccc01655da906e6fb07aa18b08f6a708faec69578e99f9a490edadd9b69d33a5843acf1d77c9b984cba8787bf331e7880be831
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-US.tar.gz 2056700 BLAKE2B 437d1c0130cd4af9fde46934e6d07d0fdb71c3f6309fe3d6281927634832197d2875fe002861ba8efb8e0c90199d91002298908c67d68daa841e507fb5ef6522 SHA512 04417d4ece31d4d1f0b4f8550a1146a6b201eacc17d50df09bebd3345f5eded90c7550dad6870ab3c281351c5ec2833d863449599d7a3c62952ebe4919149eb9
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 2207967 BLAKE2B 6f0532a9150095f7c7216373a07335dd84ea30f26040004d53e48ce3e2813bf52d95bf138e309887f62d1e91a8e4526150574f0b1489fe4e85c2eef49eba00d2 SHA512 2d9e1004a464fd088d06dff15c720535c57fb37a4afb2980baf50e6c11fa9e96e95478769daeb3f8aebacea73dc0d789c9556eb2a6f456e5d42ef5fb54cf9771
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_eo.tar.gz 2289430 BLAKE2B c5defab579f77484420c622886edc12da0e764f136a68abb3483c518f8fe5c20b6c143a9d18e4a656ba9f67338e9fce4770a4363a09c375e108fc6f51ec21bca SHA512 61a15c553f962f26df867f24db94554450521338648645f24845fe60614a907e9d2c26ea1c2b250bf6f0a5f780546527198810fa608ba0d547a24f95a02885da
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_es.tar.gz 2407540 BLAKE2B 7fe22282b88042f62640c915a0c0c21abb26e1bb77b11fb43617a91515cbe2f3fa6f5873b26650f4944923ef911973cf1c4840b8689ee36b8e70e8edea1699d2 SHA512 98ad9adf4ed5030811ff28d283677df945beab026566517e3f6f9a44f43744920f68b1c5e3db888d8e41222c947e7932dd308134a191370a1dd225c254143ddb
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_et.tar.gz 2330254 BLAKE2B d4b6a0ea00e8a9967e79ec32864f92c826b02555dfe4d68d82301c2ad4e49c51425127cbcb92ee7cbb40a23e23abaf63692c61be7516027b681dc4fdbe2da240 SHA512 c4230d897e958290c953c8620463d9de74f324edce176826b77007838ee32d26f9c72aba47c794e10c690d0ae52034f41727aff821c03f805cc0c8a8e66c02fe
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_eu.tar.gz 2283533 BLAKE2B ca5cbf3a95d5da6214b99809b314221baf86a58c329cfbc020e5757242218c412170422ca62ae2669ffe8006a8ed3592b02db53ab71e1ad6e85167e888381e39 SHA512 daceb1fbed3f37f07b6bb4aedeec44266ad9df2170c4e6f34724806bb14718dc615682b6f57d4706e8ed5bbf5465c486c077771d3db330079a04e0e806b72738
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_fi.tar.gz 2378010 BLAKE2B a967508c4fa3b2cc2132be20ba43a51bdea2b63f773a46894ea447468cb926236d49fb573f21ee1e40b69249814c5702d97338a67f5bf49fddd3fc7cea0f5631 SHA512 7608bf6e7ab435154ed9ddc041c3a7d8aa50d323eea9618099352a3cb4970f5be45102e0088f1b2ca6769aa4d12b3285e2d2d70fb8a6a1aea9f3b0384e993943
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_fr.tar.gz 2389473 BLAKE2B db43322d4216d979bc9e8b39e19cdce5a6aa0e11d26b8a017bfd2dc267c368b2dbc14778cd2c71d41387f6343bdc32f4848ee5548226a5953cf5977ab5cd4b5a SHA512 3324b370dafdc97d35db991c1f9e2cf884244d2ebbe36be295deb5bc8f3882a23c3640abf085418e8ff90a4e918d6c18bfd39781814ce26159fb433d3d68f98e
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_gl.tar.gz 2367990 BLAKE2B d28b2d9b192cb59a5635ddbd6d279e046e1ae3107da9ece64a1d2ec5ba5a961e2002e716f70ed2f61c732922a55d53b003621a046ae0a01a484393bc912ee1c7 SHA512 77912c19a53c818a72e925ac1cb13b89cc379ba70dc7197e77d36c3b0836d926f8f3584e98a900b24e7cee89e9a4e68e9d6c673662860444268070c605473370
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_gu.tar.gz 2254483 BLAKE2B e43d5eb25469e83265036214a5d06905c4002afdc25956466eb4db83a4187340c211f3dd542cc0044d9b7b0bbeeb9e8184f1c81a921e3b8618bd0fd8a4c496d4 SHA512 693c604348e9e6b3b68cd89bef5162996b479933437a05e946b989de720c9cdda3fa167c497100938a1d1529890d03312d597cbf2678d56e453fd5a011428a68
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_he.tar.gz 2147709 BLAKE2B 867450ab990551b8a95799c56c19a1474b337564d88e19db699b5c11acb2571065def339e7a5c39720201db758a4c525bf7e31111938926bc47ad2afbde7275a SHA512 ebf90f514442f4cda3fad89e12d185f34a78d1fda519d1c2069ba0efb728ad6f499371bbc3d3386210054ab6d7273d8b4fd7be6fa73b454bbb9ddf449379b7c6
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hi.tar.gz 2358481 BLAKE2B a3016bf1cb8ac610eb0df51aeb734d00c928014898e6bf17be9b0457b99a04805d4c8aaa1fa5da5fb2fd293b97edcd4f7d9a7473dfa35342cbdd303f1fc8cab0 SHA512 8b2f741bf606077f9e254532ba380d304053c35abdda43782fd26811a45f8b607bc40ceb43a239f63b8b0ce5ce8ea59db740c574fdf94fd1871c1015c4805bea
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hr.tar.gz 2262634 BLAKE2B 811c063961d4e82d82fd23728f3199f16e17cdc1846c75a80dcbfe39f1f66f3ab0dad67a3c201ae11d987a7f079936b0fc87eea5480f961f15303d18fe008774 SHA512 4ecb9b26c1804f0c6ec25b704ac8b400f39f8075272e09b2496e8bf5cd0fc768a9cbfddadee0bfe5c1638ade88f5fcbd1818cb76bad181f004c918213ff2a29d
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hu.tar.gz 2488466 BLAKE2B 8cb9dccd7cf86862fd39ccec40104814b9df2cb5019cf7b6f4a11bc39abf4f165fbf19c58cf8da8d117f05a087d8947ede9a2f8f7a55485186aadfe240d8f1ee SHA512 30990eab465f476cdb00bdf4c3d7dfc1d89afe8a3f70b846f7f0072d009e6dabe490e1c532bbff1d7d475b2c0f9cb1042f5abd9cf1d66e3db17bf59fa73a5abc
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_id.tar.gz 2263255 BLAKE2B a22db0dfb6cedb125e7d46a3ca4fb190b82d9c18a5e5f786cb47546037b6516a49788c371e0b24b2d211412f36cff0d49b9bec1d0ae65c5f5c18286d30df41a6 SHA512 1a143e4879c042e35ee6cc2e917cda7cf0cf5738cefdeb76ad00fd1743910dec0ce0f205a32552c15820477e8446a8e0b9d16a857d66a4bc56adb0e72c32c376
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_is.tar.gz 2285714 BLAKE2B b6ba0c2ede74bccb257d97f74b785dae89ccd8eb0ae12cce4f1a09c8bfeaea1c62b926688df061e59a13c19caf1c31be6beab4ad8dee59af599e4428e5638941 SHA512 a3e219e6b957699afc82044c5f9c33261d6288d577426a6094b689b24aa1edd73986808e6651b57131d899faa771af78cbf26b5ce02cd68960b261de1cdc6219
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_it.tar.gz 2358443 BLAKE2B 5c6ab32314c616075ca182256fc7eaf862a50074f7bbd5b4b6acedfb32b1dca5e6f2b7f0565ded60da02fdba56b88854137d35c0b8880e56fa27c6b3a25eae9d SHA512 a753bf14e1520d9135337fc283533563e777ab33c3f10a1e36b712740d60bb5b0db066f9803539f148cd6ca842db5cd55b1444cb5ff23e724ce6b1e5b3d6f5ad
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ja.tar.gz 2526887 BLAKE2B 53e2e9bd4277d318da36c14c9f12346e808ffbcf4ff34c81deb9e4d6735f8d223441442e193e0943b9e5c1f88d1acd3c21e4f21a7960b91e94519f1101a82729 SHA512 8af101bfaa2adbfb6f1f64bf89557d9e6ce0b7edbef1df870b1fefe8031d8aa6bfa5fd305168231f09bc7d688947556d130154744ccea8132902758361546125
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ka.tar.gz 2388973 BLAKE2B 92b08b384874d4a7e5ba9e9af1eb9bca74ccb93c3f4c464f533a8a39a7c4018ec1fe5887f70fac490ecceb18fc83094358fd1970271942ebeb8feb826939cc89 SHA512 4f40cda795fd7cc0fd78fd5588de647d8e50c06601ae1666b147c03467ff63f809857aa3917c49fd345bf2bfb04796fb5131c57453f5c1c933272cce92cf3ebd
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_km.tar.gz 2677247 BLAKE2B 1154076b6bc69655c09559f4f633217d6fb09b124f35826d6e2c63f6ae24c0ee1269bd5195b973c5accb407bf47e51d0c4e6f88ccafc8dc86642e8050fd42233 SHA512 9aa38fb28615892d8bcf8f9b0d885a9040eef180b982ff5e4ae30fd0c907d0e004fdf9fc2747db8f807bc7e32bd88cb69ec2c0aa84b55d8b7f77cad696e6295f
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ko.tar.gz 2402405 BLAKE2B cda3f81783f077d2ea69be3fb7b78c7b50af4f95c3c19ca740186673386819a579b5095c23e31eec9656b4fd4b52a8594961eb0130a8b19e10abaf461470a497 SHA512 ed62af90e8df50241cc3aafa4103135260005469ed114e4211a1a8b30f5ab3bf07bb933d1ef7a96c1e814471842c82efd313474e66e3daf24a175e0a285b279f
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_mk.tar.gz 2376485 BLAKE2B 1790348da396318b618de037f4e715e9bdfc0c89866549626db7f0e2d8952c903bf1d06245aaac75ef2fe33cdb95e78e5dbc404401150fd9bd2e88ac13102dd2 SHA512 aaeb7312f2f36f1fe4760dad9fba691e0aa9ec654c32c441cdfb80ed4c4e9d5891c97189fa6d828e902a297b8d4b7b33f6dfbe1e761d28ebe5eeea8e8717a977
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nb.tar.gz 2310341 BLAKE2B 38cd5bf2a9008afe12968129fb61bdc96c2615d6d1db2241c580acd324ab095fd48a827af126a8daff49abf68df70f76330f075aec3956261eaa83e81c1c562a SHA512 48bc4431f1900deb8706299677bc36147688e48d70faed945bb9378af1c9ed0f61db110cb0f06e8737f5ccbfb7605f01eb3f8355855b12cbe82a933f71ac3da5
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ne.tar.gz 2600622 BLAKE2B 33e4fa99c130750e6941b1f2a60a33b0186b780062c02f24fc4f90d7aa125123ba0e85173c6f81bc4c6dcb13157e73599fd077d0f9e4a26375fbda2419cae725 SHA512 8de15558461096e987d772aea566b3d18b909125605975f29c8d05eb1734097b924cc9b8f72614d66386a48e3f363e62b42d254d2a6129c346ec860547351822
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nl.tar.gz 2357570 BLAKE2B 8bac30f78c1dcdaf2779b45b60b9748ca7dc9b7392587ce9779b874776afde2783c125cd5eb5ef7faee75a95f4dedf7df062cfe9474c754b3238392e598d5f99 SHA512 ad77b7ed4201d47c0af92c894a16747e9123985725644f7dc673bf000ca6e8a03bc5257c9a4d7f399ae7eb8043ba2dd54fe183c78d5c96268e77ea648ab32827
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nn.tar.gz 2303570 BLAKE2B 6c0c347a564ef651501bf94f9ff5eb347686e753367de2a44aa4828f1e905cc86c852c600e11f2a540bdfd3df88a4d7eae3c4439a72a9379c63dfa18671c37b8 SHA512 04623c9a6e5b551a1e86028d72a789569eeb6f016672dc84ad5a5b0868c6d43f8dc7067f7bd6015f0ce1ff71ad04ba6393d3d70d61e650e6a3c4da923cb0cfa4
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_om.tar.gz 2394002 BLAKE2B 804c4e56d6141f3d0e713d67f8254327dba3330545e7636a95b8ff091b096beef0c67c7eb3f39b6e6735bd53b42d843f06c24a9d8b080213f67e0edfe1c9a7c7 SHA512 597530f513280415aa29ea879e9fb6feb8daa246cf9a0dbc0a5b29f1e1ff07a2c0632ed8a106b2e4442da9b7ba8da59f3bedc0937d76f6778467d49065a4acf7
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pl.tar.gz 2458278 BLAKE2B d426e8cfb4612044401975e49a471c4a868dff1485f24fca40f3855f77332b25116b219e4645e345adc1bbded551ef0eb87139c0d139bd5f3279dfb538a70378 SHA512 c8a1dd8008066314d3e73f78da2f1dba2f14da4745b4b74ce4dcf0122a9bf7d88e353b9cfee1f31a5b161eac27fe98db79cfd8a404ca18538258db7344f38819
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 2375954 BLAKE2B dcef2a70d0d45f4a7a9186d0cdf1f95e7d8e1461c25c5135431d67c18fffbe6c626dd13a4881841f15cdeb0da61bcdb96667fab8a506499f190cbdb22ebe9cb9 SHA512 50277bcfe1ba771a2031c63df09529aa64f94eb1a5cb3140dec90d34ae00b19beaf4efa8c9cac6da51f170dde74eb15c102853b85410262e7fa4659c7614f630
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pt.tar.gz 2340532 BLAKE2B f0035beabf7cdb28b5df7a0148dae8bb696245b36c4d3f331194d9861b81e86b91b0df1837d1c9fc6a964ee76cd8ad78d4424240fe2138db9274eb730c778b30 SHA512 87b9e4b6dfa0c573a3954d70a8bd4b2a76d9031a00ced33119f43f48346f6627c5ba41ce9952c2781cc15bf87a3ba74e6ac39f460c3457a6f4fb7b206da1b80e
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ru.tar.gz 2637689 BLAKE2B 178ba121da1f3a788233d388fbeb17640bbc60a588417b7d34979b2f90e32c891401e11a3bcf119cf9637ef3445e47e4f6dbd1f71f65d7e78a963192da8be4b4 SHA512 02e4ba9844de6c506bd87ae3839321c5a7db60b1a77236c841574a053812f47da87ce16ccfe93e5baaf9754f6df7dab3180ff36fe3b14fc02225046aff001a34
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_si.tar.gz 2345597 BLAKE2B eda0a9c221fa7237ff0e4d444795108c7748d1104af3af2dc3dc864f9eab66a8eec1bf5d832bfd3a30e8d84a69c08f95dc4a7408d61032a8de71cc17c8785124 SHA512 8e29ef30a2cc7dd23ca3a6b920bb444a0d868bf41c91249f8cd84faace6287c9f63cda0e05616d3edd076d3962c750722ebec4598cf944f8f9c918b32cdfb1cf
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sk.tar.gz 2399361 BLAKE2B dffe234a2ff616e3691e5e675f39787d08684b1a3932ef3f326328020838f4f627412e8abd6d153b292397d32aa3d25ddeab50b5bec21098b409e7712b4926d5 SHA512 d0bb0802090434f11c1cd5d1391772ff8856ee0cd539965282d30cfd77962b284d840266f55f859e67135d8a993de47cb23a21b8bf21c3268ab558c34d747022
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sl.tar.gz 2344927 BLAKE2B f57d3da8139e6b07501558ad1b096a91aeda072e0e7dc6aac84312080be1b0f092b0a66a66fee6fd6e20c72001857979688886660c7541d0b5e34905f3ae4662 SHA512 49d8edc3041ad56e810ba79bdb2651bfcbef99691e40706f3bfbc205ae58703f7e033a3e19718085cf33d9196c79bc89c692a7bccc43f52982b89d7a5d92c759
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sq.tar.gz 2262910 BLAKE2B f08f7f936bbaa85d70cbe0507aae5f901ba35dcf869440f977100217af5c74c54ec8a9fd854c5b73df2b06f147908e11d2f74da3897b2e79dfbdc7c6723fc6dc SHA512 3781e37744e8f162f1c81e13ec7bf95a233c8dffa60e5d82bc1d859ae0c51494720157cb0c165404e4685450d88b115528462750e96d05e0bb4f7a0102d25bf7
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sv.tar.gz 2343636 BLAKE2B bfecd331dd531583d9da78ca06533066879fabdb477618327182537408c0f0e9a6f427d4171122af2ee9dcfe7947ff92f4d661a35438cf123bb5b44dd5f1ec00 SHA512 451702e18cc761157ddfc59ab30478534af8e7744504ecc026a63779fb1793273dba01751732c6e0f914a4cbe8e6a9721fd91bc7ea79bf78b5df0ef4404ece8d
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_tg.tar.gz 2346530 BLAKE2B d14eee927278ca7eff6463b67c4b2174027434bb6a6335e6828f8512f633b1fd8f8884734d49a8f97d55fcb0dc790d2f25cb84da3fadbda70c52847a99b1df42 SHA512 71c80a4bf47f0529fd51625b4824583683d3481f11b08ebd7eea904a712d7095c3fd15f05a7728b1cb814c5b31830b58b154e37abbb4b7c899febf9717bcc51e
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_tr.tar.gz 2411112 BLAKE2B ae6e42a3eb5d191b2b3d68efe2214fdd1fdd90da983d32c9d6558e5604f09aa873b9da9b6755a088d3daab8d94e7c0eb5ce254d2a99c7dd0451a6656782dc0d6 SHA512 e24880f8a214870344db4c79f03ba25a4ca225cf402ed2351ae5483a4a38b6d07def90fbcadbf33ee6cb5e4bb5bf5d6240eea25f0b359df645f0f4e20a1885aa
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ug.tar.gz 2313348 BLAKE2B 39299095e7b550b40cc4de8630d5d17cd4a778c1e8eb8698a8f885698af1f98e47b349b8c30fe791c120ff1bca866399b265754b60217b643c278fba6ef30c72 SHA512 a9dd20330c8a62a6016f56c50ec8cd09717b44e6be426f23d8d776950bbb0a4ff120768d1e3adb64726dfc74e9b8d7e9ad120b90a54624fd03eeb66375ab3bc5
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_uk.tar.gz 2592677 BLAKE2B c4ef430d7dc20c9b1b6ec677261f8fb8e595910ec3bdf9579a4f19be553815f170ef2c6295bb77cce92240911eb41310dc07e1c21810a37e08098e1084c1dfb4 SHA512 c2cf603d6d255f5c24f1525365c10db12ceb90e9b0f30d7a372df39f398b71159799cd719874ed44223d56feabcb6fe941a1ddc9f4b7c999026947339fff4aa2
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_vi.tar.gz 2399636 BLAKE2B 5434c3c396ae388d05f561e1e742277e26dca6f3ac294fba27fedd12e14af83c3b9538880d2ebb80a042cba25f8a71e6a3169e10733a35cc8ae3b942a4de5813 SHA512 13252ee624a3943e7cd85427765bedc5f5c4b9412a85833b54f4a89d2244720907de4a0ae1e81f8e0befe7257e06ca4274d2c1bd39501352b2b24c1c6f1217f3
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 2339789 BLAKE2B a9f4a4c2d86fd2678afcc48dd2cce2ffab9cf289da074c7faa7143c82f1b175cf43bd43feea502ed153d00b69dd6ae8d2989164a05ecef54d33af8755590e9f2 SHA512 630c9ea385138e12307589fb449f1717227ca6951e6bf67dc3523b83b40495bd8050a5a9060139519aec962a8d2fa90e1498197c98bb66ed461c7aeb807ae4c4
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 2436611 BLAKE2B 5d286178b7009f54bd669408d43604e8eb1022bf96636d3bd70eea17b8bcf54646cefe024c3a0e6d2a9a607e308cb12f9c176454538f9b3fb4fda6435d0f0103 SHA512 6fcf1248725f5aa53984f3af70f416c5c186ce7c6c2ff0846b477510d0017f8a7cbc2bf8329ca24ca83a64a15127f9b2e482b0fb1a8523f2cb8aadf3211689c5
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_af.tar.gz 1018485 BLAKE2B 978a46bdfe8260ce5262904dc761cdc391dc46fd01d8ca85dbaf95f89e4f1b5c4bcee2890e43965171307bfd3458e1acd8abe636984673994be31de5b7c5ee96 SHA512 5711594fdb1e2005084507db369ce7da74d631019f10aa0e4666f5ee5d4eca529bfc3e577ca047fc56247cefd483ab35c586239e9333b365dccca90301d5c8b1
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_am.tar.gz 763052 BLAKE2B bd182a5d6be461c6f8bdb41aef3cbf92b0f1cb7f843c492557d09476c7b9df58511b639975e1526350b03cc501e10f2b64d4d7c46cbcd725a9ea6b0de7987984 SHA512 552298ed749e99f4e2c7cb9da472720132bfa7a4e70c7329f5035db22d139b342c9478f8b76ccb0ffedbd6c650f709d52835204823e4a4ac61a3f84b5cf4d04a
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ar.tar.gz 2415225 BLAKE2B 3c241f0206a872c78b66704b2edb16b6ae47f80244351b86ba18fd5595729681f8158d7a499e21e5cd00292ff02d8ce39e780422144d7f95d3e4386f77b0f502 SHA512 5f1ad9b0c5983c6516e7df4fb1772c3ecee03a67e39ceaedba05e914be0a53522f9a92a415ce84ba00e45c277e5081119ebce9c73715531004d3ac9fea149cc1
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_as.tar.gz 532131 BLAKE2B 124343268d7fdb8162a4c75dcbdbe8988850347ac06fef2802ee5e2c9da6c2056648da3596296acfb1f2608ec673dd2f3c674688c3467bcbc942518ffc7b754c SHA512 bee9058969935048aedd34977918ef0a8abd28f276f4c6b0a6b13ef0d6c5c0979d8fb4fbbb09cdbf10821947b74ace3bc57ae1ccc39ec71368929d1f37750c39
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ast.tar.gz 440249 BLAKE2B 39833ac6d0fdaf1793cf91e03bb3fe832b55e271c0973848dd43e6502c816a3879af0a85ee4db458b62ce8117f239b2d0428b20f4aa857e2b3fe71a393b21500 SHA512 af56a8aa2c8f0422d873d518dc852af95f95f572777b75035209e60123f1a2bc01dd849e92fd627073ff4b4139d57d3b7c8da3fa645f329ab6da4fdbb16bd954
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_be.tar.gz 1055777 BLAKE2B 3bc3e09eda84fde33185964d6eb43884e1f5d79ce3439769118712629f2c8f7093b17da737711dafe8599bc4380fabeb4cc3aad4539a3f8cef6fffdce5a83ae2 SHA512 254d26db5836f0f06ce66446fecfe4943fc743fb96e8237edeef8360f8748f3bd75e597bcef39919f375a67915e972851f137ebad58e3141c77afaf39feb1280
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bg.tar.gz 2448479 BLAKE2B c538a254ddb0db92108ba057684558f6d00bfbaaffbb90fcea0a022f5a84849b16baf0e7636c3fefc52698087ee5fdf345b231ffd2c751ed20457bc9426717d2 SHA512 4c3047abcad94b64edd052cfb4fa052c47daa2cf851f25a08736ccc89c8b88bafe06c1fe4bb26b5be705846e43f51e3c28ab2c48900860825d511f71f38bba03
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 648944 BLAKE2B 3c3a5e811c62e498ac7292ac135ae134ad1fca0d8e0c54f68ff8a8704448e0007d05c70775e619a3f90d61dce96dc00981f3f5f2ee4a58b476332f40c56a16ca SHA512 c21cbba7078cfaeed41b2c20494ad4ad9281c7c74f67043f05f514feb68caefae1f34da440f0e1bb9a3c8381224cdf2101c33ce4497be75e7f22e1ceb2d2f0a7
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bn.tar.gz 788893 BLAKE2B 941b067951d9a13328ee49ac724d5a928e3dab762787234e8dd7f5e244cd01fcde3b477fe2717cd75afaf348d02db2c11f100dc952ad7344d41f66ac57c4b652 SHA512 871caf83474a22fd23f81ec6f7f28a63e57ff71c7b83820429ef0e64031844108f094ea0af1efc5fe3e6df7557588db6b43fd3ff79cca5c7b336899b1956cb0f
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bo.tar.gz 380832 BLAKE2B 7bced6b43969d281ce10335555a6420bfeac85301bf19bab990f02808ffde1ef9fda2c3fbeabcfaf0fe0dd31fccd6a107f7876f70903c1dab0f7f97cda4eea0f SHA512 d2909fdb2c5d66bd1e2a8978fc12932e02f5a05c4e6f67fc099003845a6a96063f56784074900aa87d6b45cc2c69ee5cd062e6c98988ce4faab4680ee780f26a
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_br.tar.gz 1538563 BLAKE2B a1900e1643c4a13375f8010eb99672381db9b6e2d008ea47a8e5596bbe66904f59c0d1d6dac91dd790cad7684ee237996b279c0bdd2527946511e9e3e65f2d8c SHA512 cf8199aa92cfc85cc5e6e28ff7e625444b595bc710afc8057c86572c720b95c26822f1f0194f6cdafb7b618effd57a75ae7aa583ca1c86f6de7eb3a5a8449ad0
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_brx.tar.gz 337266 BLAKE2B 4e79c88d4c2c0fb5e2529a323b99429b8ebde2ca0e9844ff18cb499140da3d080a755ac59456a78a77b6df51fdb467aa9d2d09c526d1d59cb062fce0168fb1bd SHA512 c3023ce0d186b955dce4980305f5962e6ae0384f683c8c3d703fa9822bd4b0fa2e00bb2e86e5d427f2d6d9600770b5456dfb0210c4c09f53537f3b018da3798b
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bs.tar.gz 636999 BLAKE2B 31564e4756e8cf63f504cf3811b1f32d1fa4666fdea7ac8c91ade4a75a797dcaf93e95dbd0600b1803b04a0eb1b35d75e007fd4f361e6661bfada77121444754 SHA512 558bd74dbf1b0373cb94601567e1e9633ae43ae0c7671f6312098f6aaee624e0a33199968370804c96f2a52cfd939bed1fdb17b716a62ef5467898c699d22fa1
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1973282 BLAKE2B 99c55692d14eaf3a737bca5290b08d7fbaf7345d2daaa0627ece7b536ab13698fd5ca8c2b482b356b922957b9c46d996648ab8ba0b210c020ce301ac1159f649 SHA512 29c0ecd81bcc7b33b8167269505c3eb9d713fb6a3293edd0b09832338a64c206f6e90dcf42bbafdd94686ffd47e462804734461d8c15b1cb7113089055b0920d
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ca.tar.gz 2020286 BLAKE2B caea0343fe84b648cd2b8efde282442eb2471129e182fde3def2d293ea56d2815c47586ff1a1988f8a92611118c8196f7a2cfdc196a7909bca37604a8e0dbf52 SHA512 3229b3382a7baaf9f9c9be49b77eb3f05877e8a7fb819819a72e110ea60b95d738084133897f2ddc1f07ac9f0fad58f2643eb63186eaebd7d130e65de07e70af
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_cs.tar.gz 3189470 BLAKE2B 89667ae2f4394c81751cd1de4ed3ec79971fb9b9013d0a14911c528cb28d38acd7c5d8dd61c758a3da4c17eb997886eda6acc2c99e72d47973677b5e8e8e95bb SHA512 fbd525fe4125501154b9ce620b55fad30718de8193697e94df01817cd8d1e422c5191cdb97221c7be765f36cf5c930b34d56db25fd6202aa717848a05d77ce2a
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_cy.tar.gz 724161 BLAKE2B 940ab13394794eb4e85907aca14f1809698a27f9d1aa7b344a9da16fe7a32bb9f2e56497cd9d96336aa3396635009bf1904c558e69e3bf0466fe6426689c3381 SHA512 d2d18f6c761ac4cf7d743e363f222803b6e6db3b5324f7ee35b127528c18fafce5157e1245281c9e3abf87e4a40d92fc59f137a73b03692c79a6a10f086cbf25
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_da.tar.gz 2628877 BLAKE2B d1b701472850e2498e7e37e6f4c90b29123a955a5e0fe0b68cb840f62ef9025b305ba55b24858b55e048a7288f88c1baa157d54bd4fc19f7ba45a4496cdc1d28 SHA512 d58fb1e17db0999a168b7cd91dde85a842885503a11e34ca958c6f8f6a3eb60ab27174d035ea58bfa422bea81fae4d4b77d2a1a496d26637b75362e9a3c3afeb
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_de.tar.gz 21756521 BLAKE2B bd67cd1cd9c55df120eab788e1aed80c40b9e4c84661bab3388448e0cb332df2381a7d73fb5cddcd77c24620b1d3b23ba16a4421f5de5af03ea9e0cbf6bf3823 SHA512 0e2da3941f409f27362bc5bfda127d74efde21cc712897d2dcda13a8ed33697ec41a56d12c88498feadda01b429f33a7e94dcb922104004bd90a9da5659a5267
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_dgo.tar.gz 441821 BLAKE2B 797e055ae9ebf27e98cd1d47e9f5736d51fcaff90d61213b94cbbaa76c4048533823dcd3aff527d9b3e28137b2522b3a235ef929ec7482b2412cbad39c7961e3 SHA512 44d49819ae9603fe3c015ed88cf0e24e2992fc0fb6f2deafc57de6fa2d32a8d62aaa82ecb1fc139797919b8b62f9b9bfac185fa6c36d6181125fedbddb2243d3
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_dz.tar.gz 367924 BLAKE2B 99aa78859fc96b3389f0ef7ef3ca101af9ebaa61763d869bbfa58a0f09f1b0bea299f27191bf9806ad6a83e2ca4047147e223abd19161e15133ee8502666cad7 SHA512 3ed1eb624fabc1b3f4353c9c3c754d82879fd4db27b8f5b747708522cfa6d495d714c38a12a38df80c6753089fa965e205470b260fb2ce1c2b9cd68ce6c7a367
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_el.tar.gz 2828700 BLAKE2B a59f87b5d54a79436f4a4e87940c6d70d9eb5afd0a2a0b1c4b28aea8c5bbb3296715b215f3ee3601b83add82c1715c5b18c2d329e8fa33b089891930e657587b SHA512 6ecec66d1c5c550eb908fafb5bddd1f168eb9914d98e94a943131d56b2ab97f0a9fc3ccedfb8c7ded02675fb6c8561dc0e19f0b44fc46925cc08c1635c6a1dcd
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz 7337055 BLAKE2B 5db60ac596662ef4ab116ccf83f208e77c45f38e8c25ffff162f2bb7aee6fc4526b66432de60af918902226575f42f0a996782295a33c2b455da7d26ed6bc977 SHA512 ffdb47b691faf1587bf1380fbf2af7d12b904d47db8f928b4576b85bab758f627e9301c50cf2adeac0744646f8cc9d7fa7942fe434c5cf76f29b855aafdeb259
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 6925030 BLAKE2B c4683fff346f8ee73dbdc380292f7ccbdb428234e69bb0e69780f28323dd9e9dc30abbde99e2f582636a5a5cc5f12084dfeaa5f07791df1f144d19b5cb6f2921 SHA512 c8e04c8bf44916a1ae8ed2aa944191e1e83e1853df93cc513a3c4a2199019cfa88ec66b950b64e8266ae5b9984e579c1391e20cee3734c2546b65790f2be21af
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_eo.tar.gz 721112 BLAKE2B f26c9af2f79cfcc40f474e7d6867c131f71da438081a097c3b94ea16f1d2fb6e69eae8eefce6e711396effc77c502ad24b0486bf5547946f3d8814ecaf98f38f SHA512 d981f00e7191b8a50eadce90122c4075941487e58da3188dd7639c01c49ff79431f43165dac0a31988b92628cdd618f87f597c8f485af3b8e905d83731c2d0ef
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_es.tar.gz 2241054 BLAKE2B 5ad41987235c132d70ae7697afda3bc66c11af2bad8e8f0e54cbc15c1ee4f671b5daed71925c9ec529642ef99a4c7118258ed818f24a3a23e6beea736401f590 SHA512 d751283dfedff30b8869bc9ca8a61459348d67b8711d810815524346035856ef532aac6699173aa92f5bff6cefad687ea50883b0cffd7f1561000563afb0f5b5
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_et.tar.gz 1633924 BLAKE2B 89a7b433d4425cfc978038d51002915e0a8fc7cbaa9284f48a498d62cc66b6c581a613d5bec9f887e66bb628117ca78fb7c9098aae11764a907082f1aae9e871 SHA512 66427c96a781ee0c13f8449fa958a7a022181d2f00f6d73d9871f510c8686fed5190c93eda479f566650fa5c19272d38ae67f081ec74e6627b4aa4effb1e449a
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_eu.tar.gz 729650 BLAKE2B 6d0febb8db5ec0f95949a27e5082a34ca1b99e06d7f77c7667f273b26732944638130eeca1b18767d7e5d034bd5dd72189e6d756e5ec604e45e3e15da8eee2be SHA512 c9280c75f0979a77bb0fe1aa52fae99a068c143d17c23f6b50331241a99eeff1f58c46f5831e8432b425279f1bad1706e0eff8ea4fd9fe6c94ddb5406592af06
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fa.tar.gz 332276 BLAKE2B d55beddb1fddfa5395c45dd8835def8ff78804330d596b1a1f3e2e6751dcba0bbef88d46429686c8d9f114fcab65b2a13dcba5b049a022282d8eb69015bb33ad SHA512 374bc4eba8c7b6023b52638ceae32c14a93d5fdccb339e7e630006eadc39a9c41022ead08bb85e66afec3c9187a1dc516be9930f7b15c3768dcbf842b2a8f525
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fi.tar.gz 715974 BLAKE2B 1f3ce6ee40b56b99f7945e7089274943417f4a8c9d4c982488fae1a471934d7c9b7c9a4c9e2a1cf823f6a6809f72d529f698edcacf5a78f09a341707623abb01 SHA512 56c5912c49aa46bc46bc9057b97865e5893b510e068733bd847ad3aad54da3fb044478317b67654b520ed93f890e93187e99780125b8cb86209f3c72e7210e0d
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fr.tar.gz 3036294 BLAKE2B 1a43f8db493cac3d84e00277ff67825c83e4976516059f987cf2facd6995f7a511b336a3ef69068514c0f3d8ab4995068cbda188bb73da7d0d0040fecb4329a7 SHA512 6102a5e78836720b746e50871b453e57c0e75bc9ea390fee58098d78b1b91f88fb20ed390a0d2861e49302f3a724aaa36d2561dae21878970cc8e65bc89d60e0
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ga.tar.gz 742593 BLAKE2B 0de250f35f802759f6c8702db36ec994258f1b3e5d323892abdd6abd20b5e5af67370d0eb156658bf6a3b940876eb187b89d9987cff640f157ba1840ab87491e SHA512 bec0e87afe0558ca8068df91160d8eee520e84d43eafc84204eb5bfa25af5c1eba5b5bab3f369abc7b9314c33b768141a206883f42303b9d47d9af58c350f446
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gd.tar.gz 1782047 BLAKE2B 345ee54bfb75b6f18f93f46a9a64321573a7098d896f89e7e97c14f17a78267186e93692f5284e4ae86773b952894fcc55f8fb32c187f388ecc8111223216a8b SHA512 e3ace34cdbebda6676f296c4319c3c8c1a68fab1a34fc00e2354deb8ba63fb945eb6fe4360017be42c87e1c6041dd580759a2977be19c9ecbc971396e607a552
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gl.tar.gz 2621268 BLAKE2B d3a660af9c090180049cbc5fe092d1b3c28aaf6055bded40a796acf883e2dc81a7442606b21ae790161155f5825e5f4129b3bcd5ca23cf684224b9f254a0ca52 SHA512 e449e902701e3e50d879a9ed991e25c8dab1a0e770dcb2e3a7da66d4aff756a3c8f70994db5eacc8747186211a5ad130e56961d7b28c55b1002f3b4e96e781a9
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gu.tar.gz 1229667 BLAKE2B 3d3ed08bbffb76598faeec22fbbe5c536eee5fc03dd9f01615e2a60c7a2140af5b43e52b113d22be93d23dc1846431c0c57f77c1aaabec457194e1f798b9ed5a SHA512 e0ccd95387540f3a820291d33e4e124790fb4ed82bac17247fcf59780a5295cd1d4e0444432f2995d751daca50feab515a3bd7f9345063de6fe751d50c896438
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gug.tar.gz 509337 BLAKE2B b95a440e2b862b43a550367319589053b53991b66660b6d42ae32e09b19b069bdcd44084961fc2eb3f8fd051f7dc8aeb187b35d86c75f2378c800d90cdd53f81 SHA512 e372fa444ba78115dfd87584a5d617fcc123a70f8e62ef8c8aee475b47f05bab4b4d6c5d73d2215f927d2f99ffd9ef40967246b359a637c40bc77af45ad82c21
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_he.tar.gz 1622096 BLAKE2B 6fff901cbdfd2186bd4661f9dfe02357bc65035748015c144751d78c9c0e6b4b1cfb71d36b8cee656cedff0ba942fa5f04dc1b682928199ee58f33ede9cb6f32 SHA512 9bfee63c7a74f56f70fcd0e68c583940a0f8ec8a50a672f465022647c0f7542e7cc238dc7485ebb7e49d78c9f4b2e85db6088969b00c0c558283acfc5a09ecca
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hi.tar.gz 571551 BLAKE2B 8e010050d1313c02f0119b28840634bc23ae9382052c68da47199872783d0018148ff32945c026936a440daad0c414e57fafac40cbf6cbc91325fe6afe555a1c SHA512 bf36a405fbbb31b4ab248ade00cd8d0c5cce57c1fe14cb869b708c9fa3df606fce9902f5a2df80772fb076eadf4ac97be2c214808b6b759c396c09a7e17b14c0
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hr.tar.gz 970743 BLAKE2B 79c84ad9a7f4b3073a95f690945efc0058eea17e9f1c088994e771e40657de30085ea523a2b6700b748fee516bd760d6117eac79d0607df4a6ca9e6601869f48 SHA512 bde18cbb05230a7bcbd15afc9d2cd54eb53aac33450d02ab30bc1401261a7867e5072fbcc34844f5788f39da0c0b15193c311f2db190dca8dc5ac6e03569afe7
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hu.tar.gz 3017236 BLAKE2B 01b041768c148b58b9d28c54ce03e46205bcf2107694cd7eabba15bf6d6197ebc86e3892c753f439e33e3aeb6297aab999290d65713c2a6977fd51b368df6627 SHA512 40a99a8b204f41290f14935744f224a17d9ee669d0f451a520e5eb47b58e77f57625ab39b2854ab0ebeefbe27ba2fa5b2b3b1f8e18543e7637951b69a54eed9a
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_id.tar.gz 1586755 BLAKE2B 5055166d33340c1bb18bbb08c7be30a3c0924f7ece41e054d153f1cc6c736c17d98a9b366fe73c74797886f8e5243cdb4b49a1b009944b567ea8bc5fb5545de2 SHA512 cc315048ad8e8c01362bcf864d4f7f1c220022dd3a628de2ec4d4fdb6d44f1b4f5a8206020846ce0856c647d4681a13d8ee42add4a5ce2d3df0929d16e50fb64
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_is.tar.gz 1519054 BLAKE2B aa4105c9e0e6fce422b35e9da1832e0208df2f31e6b239c2ed5a8ccab67569aca7492bac4cff827a2ca98f99d00a9027630b9fea8367637fda62cfbc1033713d SHA512 e2e50a3261022ee0baad3c5be8d6af4843b10453e6c9f05135064bfb7add3ee8676602bfbcd35324372297c8a528d757be547e4c2b7b07fee098e630d637674e
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_it.tar.gz 2069392 BLAKE2B 5d97ab5fa7b21f0d63e56d4a954611afe8beed39813cdea31fefcf6d8f62ca99bb4424723421841a4720a140486aeaa0cb44b1aea124612258a29fc6c1d9de62 SHA512 bc51f8df8507306db45e6eec94b406a1d1d132d6b5d0842188ffa2d4e79739858ceb89b09039324812415ac7db788a19d2dc19a44639cd23fe81c69d5fecb238
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ja.tar.gz 809130 BLAKE2B 7c9acee63e9d4115221e387d31bfe56cf63e9366965df8238a582da8f029c6c9603f73d04c9070862d4e250116d666e8aa3e0d323b808aca4aacb3d4f1d0d725 SHA512 755b9e259ce3f21548e7cb22baa87df64634e355804d404fb7b74dbd2928248e4049ed49c7eddd6d2720c57b07e4352ac3987d95b447b62e542d391b32ca8995
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ka.tar.gz 361423 BLAKE2B 0b4d72bf9b104b2b9914d3fb5cf376893632dcd33211a33dd5b2308bd409cf4b2b335b4fe1fe8bc3fc9d88a81d7b598eb8f356b322b74a97b1702f560eac86dc SHA512 07d3b48c3b67f8103e1bc930a549b76de60bb28c944cd3de3e85fa09dd0813c50e97e4d578ff0719c286bdc6321b2c0ec720e94a02bcca35b1c0e31b5937be91
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kk.tar.gz 784616 BLAKE2B 2941324535f16ef7b53248daec510a4f3db64f3ca27c7498ff43ad35210eea81e7be1b3be2b908bab891efb83c33b90f09acb22a1d32fe1beb2fddb859d03b8e SHA512 f72c0232723552d08ebb7c29db5a9de98551f453ea81bb864ce54a0896ba2e56bb63a406f2875a45fc40c31d61bb501e0ab6b65f9a8a0d47e565c3813a500811
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_km.tar.gz 683872 BLAKE2B c3c0c536630a53f6f10632a2823063ef7ca084e2fd77c2808c447e816c9183492f1914fc74080a3e2ac82b4a95fabd3f6a36e5b3a083a98090da0f43593ca93d SHA512 e2ead72daf377783c49d4cc5f267caedbf652ff66dc59debe648f17e2b3c6d2afa7c1aaa3b33c19ddd74eaa5dd95f6bd408451b3492ac6357b218bf0d3bd1945
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 334523 BLAKE2B d54e5e7d164c7da88988088f241d736baa154a9a06a91ef74056e0163f0573ff91b025dec1c1d55747ba214510486ef3368344795b77605bb9b1cae0fb89e9fe SHA512 d0cd9f65cb15b12ceb2a95bacf19c3fa9d2b094c0c3e9909a43aee3e3fd911409b5adf12368fefc9661dcefddcfde9440975b8823136d8b508ad43297da0329e
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kn.tar.gz 582965 BLAKE2B e7f885413b3b631f87f5e8e00c70ea67df188de8524a84391b1ff508b692765cb99d74f5bcbb53cc9e1f0e783591af23c83bcbc9821af48dbe17586341ace04a SHA512 365504461948873b3147ca1b0901f759cbfede56210a681058c68741c2283ffb001b138615fd2c079140f04bff35f16e8e025cbc7cdf53f225c2f4f88869f32c
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ko.tar.gz 807449 BLAKE2B f089723c8fe480cf41290d7a719816ff01f4858e1967fbd9d549752fe3b653918026d26a294b8522c8ef7ec563f8da19ac4d5fa9f8f452a16f55b772d20164b9 SHA512 8738e8047dd14cf5d497d9c359757fa87944bc351a3030c08a0db26d3aa42904ccfcec553039bc4b8b30854a27c1eceb644ba05d675cbae22e3cef15e4acdd6f
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kok.tar.gz 412095 BLAKE2B 6ccb3dc557739178fdde1aef864ad41ce46acdd1a1f66ca9e11b2e78af36d5c95c5b1e251392c88c7b9dfde00316c168a90c81bd68da43f06f8337b360f09ac7 SHA512 3d669b577ae88a8a9f88545c919536526187f057968665ce17bcbeed94fb912fec66df40871d33737059a4a62ef1cef6e7b8f7b8d5ab463c7f5b44a756fc8116
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ks.tar.gz 330070 BLAKE2B eca71be40497974d1e6956741de18b08fa63f2f63ec9f7e33d52d5afe2e5d38cb1a9a9acafb5f7c1335608d6b00f9644b5211dea31b0ea4279e633cc68a68143 SHA512 cbc72889ec69d977abc2950bc6866455ae9d9e3d9dfb747b13ee67f7ef004016fbfe4aa4fee1bc441ea33b016afc96e066eab88289fca695ef12bbaf906dd3ba
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lb.tar.gz 142085 BLAKE2B fee308558a7ac0ee93c20e31372913871f1d766263c236661b35108e4f7ef04a9f0a81062c83ab064a3cce42e8dbeafa5a0551feec11ee456bd06cb5770ae706 SHA512 0749dd841595fa3a2191dfb0159cbbf104128abb09c69daebd18485a1b96903a165fb965faab6ae514a9fdc236658b305c8d9b7512415145e8cfdbc1aaccf09b
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lo.tar.gz 432858 BLAKE2B 8ef12bfbd20bb9318bdb390bc6676d1b85d47ed2bb779cffafabdf6e61d1f71e622f9cea6af7817e90591c5f7a90246361472279955c55cfbfbe6cefc2b6e940 SHA512 1b30737d2c31d58ee936a6eb36615f92d8b54ada88e36600a8a12f6c43c7cf0ad975c1977cb583e139698da1d351e07206e93771a3b30b914759b87818a963ab
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lt.tar.gz 1031191 BLAKE2B bb35145a846eab0f02377c2b6f03ee03aae0e7f9dbb9c72ea8dc89bd22aed54d923950fc3c457d48c7e81c9009574646c4b8bafe4846d17ec1c4f298b6549350 SHA512 b43eb02e92ed02d6e2750133b67f68a6c6011c612ab106848de4bafc8b75a679772f94ff2e256e7441672eda4d5ee41b6d7ab5d32ae9f558aa4b90ee69441ec6
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lv.tar.gz 1493989 BLAKE2B f1ff16b8f6c330b22c114b0453a268d3ee9f7d7567115e3e4ea317d2de018d17767f18c514addf6534cc92fd37367aee5473cff7398b5f8218930429823ed4b5 SHA512 5253391e3410e4fc26288f2dfa7a4da814a3892dca363e78127090eb89a6eb144a83f8dcfb03c7876d4aa8c00e449e3041e413644999ace7e6fd7302e2149087
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mai.tar.gz 331926 BLAKE2B bb2ccba2aac3efc8c55f62d76ab20ebf4242284211afd74269955d22873061fb1b441914311640fa4de55ad59bf1b48270686b41647331a4fd35ea2adaa26906 SHA512 4b77de0f1055572faa61681c6dd15dee7767c4db93d8d54e6f4ceb0d2391fc37332f61e806c717240e51bfe1e40ba686af3be845ec46cdbc12f877ab0c1f9cfc
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mk.tar.gz 383588 BLAKE2B 082e2b1b3129f95bfb8cca8a276419efc1d3fc90858f1bdd339c906b58de87c46e42985f14371ba0d46852bf27d462fe8123aa8ea1157729ddfa5c162d924ed2 SHA512 60c4e2ea80dc3803fa8fdb0045644e1f228119d965feed33ee5e12144ec9c6402bdf36fb4c4f701bf7402cb93eb2815216e717db51e6986e0ce8a4f037583aca
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ml.tar.gz 545151 BLAKE2B a3fd080bfee01eb5c42245801f4f9f1efae056076f606c676e92a8eac36c2e4b4746e0614a15ad3ef8e693da08688cda8fdd0d360dc7f2ecb513a9bc3419cf6d SHA512 48b7ff5c26d54ee92397bc6213094721cc445ed3301618bf282e2325ec1a96cc7ce11c7f675b44ecada9adfe780f554c6c1d5a1b44171a6a283b5ffd59ad6732
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mn.tar.gz 508999 BLAKE2B eca291b0dbcbd50df14e889604635b5c00bf1f5e1a92ffe785455e3f6b71271ebd91abcf57cda46eb723d009c16acae968f16ba353c37f8fc1659eb6f48237c2 SHA512 fd25ff43b081e2006a19a088cf21290337108f2f2b7a18c6b3dff6c9be0c81cdf1c2eef615f751753fa7b4fee047dcedc5041770a85284e5b87e1841184f2673
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mni.tar.gz 403869 BLAKE2B aee03d95c331f33449cd9668dcfa30b493ed32a725702c5b8d8fe7eb6769908b85f3cd8b6e4c092bda8903068081f0c5ca7e92208f0d7897d6a97370799ccc87 SHA512 180a78a0e8d93154d5ceb654b637ad771158de9922a84ef6abcfefdac73461f1788b312b1f6c62648a4910f278a3f54df88f3c554cffdc5079f5ee654bafa345
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mr.tar.gz 579161 BLAKE2B 31d56f7b47f2f612a1b4f9512da9c8b3e524a839bd34d1effd9829b49a152a25f271ecb571bcdc6f5037c34ed84f3ac6f0afc6e55e3fa5655c356d8697d3cac6 SHA512 9cdf3207e389e79d575850219b25ca94651062bee8b9ca34271d04b3bcc08070e65d8c7e950d90de0a440f98b44a64f9a5f745a1f64461934d85508083532464
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_my.tar.gz 464971 BLAKE2B b9f1d7f41e307877c3103191d914311b656d07df3e86e53b5db21a40743fa1f5e96a1c56a1e0e1d42fad5aa6f7d7cdaae5b4fe9f3d7abdb6978d6460db58613a SHA512 20269cbf515499db1215d6ceffbeb3e1ea0004533f33bc2490fadcf333a779a87dccbb81b9a0750696dbcb11dcc251630ea1a2b94bbcf0238e8fac81f005b1b7
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nb.tar.gz 4064663 BLAKE2B bf54957cedb008761f2c9331bbbacba21e9f696f859047ac743121a91746d9eb7044fec8c88822a81457af8910f44d03d848ff49ae23b8ab3853abda9defc1d9 SHA512 a9fcb18a2f23e18fce6820471517243e1a26f0a4dbe7fdcd3de2d1b4d2e8af12e983b190b263eaaab78b507d8d60a39087659d6b0ed97614c2b4073eafa4390c
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ne.tar.gz 860300 BLAKE2B a0b216ecb228c81ad04867ed4757466e82e5a4359150cd0f6700d6a8824aec284011f3ad7ee0296ec92297c1b98129be947df252c67634388eea17f4ef8a1e29 SHA512 338764ab83d06632a8cb8720d9882bb6f062bdf5f18e4df13cf1c64a27671462315ece71a95cb029edc925342086776d55719f71eeef8a3b7c80f49368016f99
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nl.tar.gz 1523034 BLAKE2B 4f6e936a97169dac9a5beccbb13ed3b77bd2397b574f60b069e1866096b75baec8b0d97f9ccddedc845e5bffe8eabc9a0d88b8456749a49d4f7f267d28ec9a79 SHA512 fcc929d373ca2d4c4aa9e06e52ec4520b4aeeed0be7e7b88284a6df8c2ffa7ad137ca7dfb481e8edea145af58e20a4ab3cae435df459b05627b139ab0607ebbb
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nn.tar.gz 4064832 BLAKE2B 9b1b5165ab1b056a27346d0d705b64a9347c585bd4fbece7946dfe0a75a448c7c227883e004142266b5446396b64b76e04663b64b6571d7c9c8c13ff77d8ec9c SHA512 e3aef5ca38752f9b38c9b67df53d9d50e19ff513876083adbab680fbdb189edfbbf0fb47bd420909983b0fb1b23cfa7c3a667eae9fa48ea6dc9408df01ac2e34
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nr.tar.gz 278231 BLAKE2B c438ea42b09bc5f5135372c3c381665fb7da85103647373f32477a77804eec660bc5e0fc02bc817d814af4f0b06d743942647a46b3aa87776644007a0b767287 SHA512 1caa260b6c0648a1f94a38ffc61fbdeec64360e0d1184e3d0dfe8268a883d044dd90d98e6e76f04003d17fdd3fc2cc518c227ef2ff4ca996cd67a1191a72e708
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nso.tar.gz 322036 BLAKE2B 0dc0086ae2ddb51b720badfe7bfa341848e7a8742ba938e12967f2e142a5f0dccecd35db9e3a4c09bfb44d3a9f1800c94e338b61e8b083290799d10a42fffa35 SHA512 d8447f1c333bd7edad48ced48526be798c9ce2f0c1ae95b31189d24ee88810b811b334981467c71125a6b8b18917bd404f12abec9e5edd34d2b309b9d1168363
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_oc.tar.gz 881424 BLAKE2B 1199ae64bdd75f35adce3c216f591743efccc5d439febc96aecba141a5aa0716cef0296fcb6a0c83e0a56f515a58f6060c70cc7873db5b47a628051b917401db SHA512 53436df8bcb26ab90bfb305ba6a076219ef811756351381e3bb02c49341135712bd08aa2a12707d801a5b26d6a17a28d2e32fa05da4b8932de00f476cc50bfd2
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_om.tar.gz 371098 BLAKE2B c51ae7a927d5686646590cf21fa6607e2bbee36a454851ea25c169533feccb497234a6c4d547fb0f6f78708a5c6d6286c6c6d06d74b90b82c0cf9b691d293f01 SHA512 cc3c0e7db54e5693511c2b065de5d384b71ed2d403b9deab54efd0aca3f545ffb6c804bdddbd9694e4d813826db23729950c14d410127079de7a9c479c134164
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_or.tar.gz 602091 BLAKE2B 3d95654bbca9a3f992981ac129982b95b318102239eee0da425c7c350336499c0ca6ed28757eef073015357a75166b6f512f0ec6e60bbb4e85f50d2985e16517 SHA512 390e518e6c82269bf93aeb296af061caf9faf3a7d1532e70b1682a5477ce44c5b46fd726e39f518108258808c281700b110fcd526809690152b99c793efbba2f
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 471625 BLAKE2B 2702bc46f7b3fcb70f20977a040ad14c0698599c10cb29b82b6408d8fe1eba43739ffe1d6099b54d15b474d0e341b08bdcf6970322b7c7d5adfb1fec62de5b21 SHA512 59a91a521af807cdb28aa2be291b8b9c9357268349ef777707ffd4c18af674255a20be50610871881bc7e236eb99ace21713f7000a5d03cc6eb986b1f2fc7f6e
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pl.tar.gz 3094744 BLAKE2B f520af367f47df6c1fd6c5041b041f18d15a868234b1c6a49ea3db64962ce32f56a88b336bc8cf98adfb366e31756291b8a24c9d6b52bec268cc5055204e6520 SHA512 53deddeb03acbf275280cd1499ec49fdda32f6b21bb9bf84faa667aebe40e83cc45cfc713d1d80075d4b72d40b42e263538bed4fc53ddfc4448c8c8200eb4cd7
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2816211 BLAKE2B a6e1f9aa35b88839f2239c512c9a1c22f9dd3d7f292fb651d536cf2bdcfef82a687c1f706ae2799aeedf3cfec52e4d02c903827f96ac24df688aa983edecb593 SHA512 2343190ef1efeb77c865506031b9c9ff0bd621c7e6e10f8fd3944ae91e5d11c162dce8eb82764d7b0c63c9a0c4d148298a2fbfd33623bab795c323eba151d4b3
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pt.tar.gz 2371157 BLAKE2B 5630ec8bcecd6c1d6f366e485203a43de3c90600b54cbf3db412cee4a0eed235bbe912baaa1ad182e01a3526a9cedafbfe017e271b4ee59a4ed10a737ff8579f SHA512 53b7808ff061d80e68068a1ba25c94caa54ab7074ba77d8216448bf338acf77642d75d3fba60427c4e3de3b71cefdfa55bda52fff5414b4cfd26e707ffebcac5
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ro.tar.gz 2531590 BLAKE2B 52cb9dd2900ee2fd8c8cabb5e70ab70be77278e02243b06a43e0bd39f50a148ac90c5d3ff775120db7f31205e9b42110af750231085cbf474f80e06275c9646d SHA512 7808e7860f7752d7b1032ddb8a0aaf3a8bd85766c9de55c94e636532c12a3e5c5678f096fe6a6b2ec13a661f3aa640d521dbf50b3241c41ec4cc357b0e06e470
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ru.tar.gz 1902284 BLAKE2B 6de560069f86b611c925f9844e252b0d1c79824fcec64f2fe9cba8bae981a273f874720eed396cf7cfd804c49a6a77edc9c85d3d471c1be39c3b78e99dd484ed SHA512 cea324f8fb54512b05c565bebc79005cda23769143d8644c6b0f0ad16ea92e52fc6b6b8d8159efe191ce1259db0df0d84c81d50a3c3456532e47d01b4a332265
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_rw.tar.gz 346256 BLAKE2B ee41a659609fb1d6317fb05788831da2c3e13886dacc88120d26b6f707187a5e117e3d8e98d353a6aba72ffb3fb775dba89f7eaadcfe01e77eb59d0bdf0eff51 SHA512 b85b10b39003e16f3b28146c9fd1014691daec9c32bf18a3fe5d7549f35d17d87f7024377edc55d85b42adbea6524e8a4d260938c030785dcde76f560156fbb6
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 452111 BLAKE2B 197681444d88f06a274a14b194e01ec899b9cfcfe8af810d20bc03db7795ca6e57046b1db81235ed2dc92db053bc638e9bea55e9ac5452d9d41cc7a028040b1a SHA512 55f4cf87914bf34e658ceae9e4b974543b71c015752f37edebc1e21f1e7f6e0a587a612bee3af53c96c376f37a78057226b78406424917f0e6da9ec6d6665653
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sat.tar.gz 523531 BLAKE2B 57aeb27ebc162134ee89be40ed8b09cb112e57b979dc40aaf3f477e555bf080ab3f25ed54cb2dd6f7e8761c922f88c07f25f9b91f62287aa3475d39b9e0a7473 SHA512 e0609e729ac8d01d2d4ef3407a9a42ca53e50a2cf93a2e72f407929ce6799dab3de5620f01c68089c1063fd4e27eb40747708e90b427e5acd407fb4409e81aa8
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sd.tar.gz 438025 BLAKE2B 19eb645c56217f7d0e368fdf4706699fa81ed6668555221c7ad85b1a737cfe1fe88152ae7dcec874700543a6bf4862c7b9fe0f0bb437e58cc37704881e8e7707 SHA512 5d1cf62f8acd64c397da7ec026644b03a4092e423d2484916dc74c436c0b103a6012ed5c7110b4d18ff3085e3773ad6d333530b02edfe7f688dcda158b0634f4
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_si.tar.gz 738566 BLAKE2B 3c68aad0df4866f5c82164f318304d457813b0fa748009e4f9f32cfdd5acd27481488a54c8e88f29e5d4224d03ae2c4ec5dd4e8a546ba3e86ce00e5ed6971be6 SHA512 f389cda147eb3eded4b03649e68a5facf7dfaf0a3bd43bea0f31b13f45b3a0868217bde4954d84df7b30aa42d044a0f05790963f82f5c315f0fe702e7dc9e326
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sid.tar.gz 452351 BLAKE2B 05798b1afb4709a6e6ef303e058c7fa34110297a9c1cbcf1e076f619b3a2dab84e5ea0df04c3938bab3545a7881f75ae4c62154e385c027f6a089d090219df4f SHA512 dd3ffb3f62526ed7d91f0f96f9e05a83ab36d48be4c52735842d09c0db7260bb79e8377cd771b71d0cf73d05113a9ca3208575ec5ad59159f050fed1b2f2fe49
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sk.tar.gz 2027389 BLAKE2B 442eb9e05e6ac87a86083e8f557215c9f87452d6b64ea5010f364e9848418fbf376d55174b2ec3fdcb3c7402e8b64ee58116ff0e5e28cfcb738b65bf2de90949 SHA512 58907dbab1ad60df675343bf4b158567c44c98f7a5201701c27613db54a04b1fbd862ce0e52091fcb2abfe47767d5da3e62a62bc6f1983fe0efc722a6a2f5eb6
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sl.tar.gz 2432714 BLAKE2B 4fa1becc33f0db06770e3a9a745228ba25b89250d8c626c6365f4f59f2bb4b528882a2bf89cf20f37f2bcf45cca5cbc1e31ce6b9506125a3fcb77c6d5db3773e SHA512 9a24e643b60d0fd3cd965dd05810f4c28a9ba01b056d181ddef04a16ce26355e7e081583461b7ac6348d22bd3f78f9b6809df157b45dba98ff439fea74b284ea
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sq.tar.gz 1171180 BLAKE2B bb9e083cc257b6c6e098eed4e02d0ec7030cf38287d66e181907b1be221b5b2b97e7b2d240d0c7ea72974430905f079dccb77dc7013730b887ec5e5c503f25e7 SHA512 3c0c0dd774c25d98994fc02fa1356d29ec8c1f3a9f86118fbb159c0cd50509dda358e6ca5b8357e0aa6c9fd9d0a281be3bd2681d8fa5ac1a6572d79a0397fb8f
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1460998 BLAKE2B 3ca03a0688e02428403c2e26ce5814a0a471de6369b6c8a0a6302d06858622886046e6f151c1407728e3105a5f9194d6a21757719bb429c87cbd52021d84070a SHA512 3ccf100fd4c3ed207eee746d22f258bf11554c04694451105fcca5f6f588f2a7b7433962de39fa62916f56ce60c3ae4525a94ca003d123080cd0fc300a220e78
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sr.tar.gz 1479787 BLAKE2B 8bf57d7ff5b4e7f7197e15394672acab2eaf697eda32e7d758e9bf48f3209526b92a8e8d848712ca789e4f4d90c456646c3bcb1e0fca792e197352115774af13 SHA512 310e0523646c850379aaad211778880a7efe4c1714e904a75677b717a5af99c4f3d3f5817ce9a8f038db9e120858c296353fb21400062d894f8c833cf5663e83
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ss.tar.gz 286345 BLAKE2B ad3e4add1135e58a60e66bf2622db29e30c04db3357e1fd0540e25f6350fef1ff645b7960088e7d04b4ad700b08993b3ec9ed42203ff89d8554c6aa4024050fd SHA512 c8d0951f9d5fc9dea83b002ed9a1cd4d1de8c130f4b1c0458ada869a95124adf2be2845776b7ccc571ad91cb5910f6152374f86fbd362531cbfb758d16a88531
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_st.tar.gz 279512 BLAKE2B be2562f48122ee67b66a667fcfdd2683ef79af7e143f615e8cba299b1a6487de4b0ea9607b560edfe8deddbae9596fecabc10d6d494b58477e1980cc99164ede SHA512 f3182338444bbd510f3f32a0692958c0a5bd143fe639a89bd9795c46bd47f80ac87b2029718486b663d4d44a609db9ce9979b0c8aa19ae86eca720ed3169bdc6
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sv.tar.gz 2608300 BLAKE2B edf58824773c77d56713f4416fbf149a7ea077fcf9e6d1d0c23bfaa041acd9b48aef5cc0bfe71534da7895e034d8550007e94bd8c0b3b1bcc7c6408a7e2afba9 SHA512 a62d5137a4fafa897cee2f4c310478c8cc67e815ed1c7a6d7e3ccf023e6b9e6e8f65122663e811469b525294e989abc9c344f408726add1f6864307be615bcc8
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 318662 BLAKE2B 60796ec7831d97e53a99d6f0b6c95d04906f82244215ba7965613c959d710556da82a6df509d311679dafad5870fe028bd059433f8e898db3251e606824bba0a SHA512 12a263578b861e81e5638c11f4ab353837996aa11cce7ad6e8e065dd95738918417d449fe048664eefe87275ad99092c24a666802e35d8b5a8c3e53285a0c7b6
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ta.tar.gz 686570 BLAKE2B 805aac77f3b664b702afc90cdcdeab0b1a6091d4fe8bac18dcbb6ec36230f0a12e6237ea61dd6b2294ed1c5d76155cdfae0bf2d9d13e7c0a792e56dcbdbed3ea SHA512 27a3237c19bd9c97565ab254ed515466867b8762ac0c0106585bb4f0845b1061ba03fb51b180b4004552d49fbd1c4d7431b1d5f7d1353dd18003a6a1a4cff2e9
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_te.tar.gz 1088712 BLAKE2B 61c1f1b8d10aa0a5c6d3808ecba65bc08276c37af42cb92e8d7af54f69461471c371cc3c820f8e59de663f7870d8969a255f959bc768dad31abdeaaf5a4d9ac3 SHA512 2fdd6c5bca4b79b2a380ec1c4503a537aa2796a9825a353ac1b1d3664cbbeea9eb6b8e08a91e34570b275f4ff2463058ab3c0bb6a2102e1fa590430ef0c25dea
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tg.tar.gz 358332 BLAKE2B a4a49507ba1c74028919fbe6aec07d08c35c3c97a647615444405e0844e611b5956d15e6fa95c0db5ed8006209ea91c2efdec50f7fe4f62aeeba36f566c5d4c9 SHA512 2a35f501a2ae327532df3b0b586b6dbcb4c937adb43fa31256390005844d11c66d59468926fbcf449018420f226bcb48739c0435c58a71bd759364c932536af0
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_th.tar.gz 622054 BLAKE2B 8c3a3324a82c0a5e85d88393f5833b079583dd5e1bfa9ebdfe60aaf1635abddeac624869642d3a8bd3e41bc24a324eb50bfb4ec4cdca35e6444fba4c2160ac23 SHA512 03e49befb166d99c6c95e9b2d2468d72b47408522dac86a4d9d9e24846817cb3066443ad36da1ec47792cca3944dff7220bb2708ff9f09751e206e158ed7280e
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tn.tar.gz 259021 BLAKE2B d33575d8dc958880b3e1ec9cae50937f0dd3788751cdc44e4fb29bbdb4efdfd537b1026ed6bb5507d6add4241ee8e11484c2b7551b04216187b3d59e72ae0428 SHA512 38953b9333fb75ed3b8b957c503da5ec6ad0cfab7021b6dea24df795f5fbbaeff5853fe73b3c86728c2d93631e54b0f0b966f73f828d2821daca4a6d5f1ddafd
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tr.tar.gz 773845 BLAKE2B b3c59ee53daeefc20dd930145e8bd69f590f465959ef64e63bdbe2252ec89870c797d7446df55d84ba5956416e188ceefac6f33a807b14f606f344de10b257f8 SHA512 ae5caf354fdecceb265f698c9b2c1644fff6fa782149702e4bc4e7eab41a2d99f02b665c83e680c7abf7fc45f5c847119ddd1e76ecc565171cdc1a191d1cdc68
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ts.tar.gz 277782 BLAKE2B ff34804b695a2d2592e5244d8d1bdef33bcd6e94502a73c3908acc6b0b9db1e09ce436f002fe6ddc358d4f1d0a8e2e5dd32c5006733231a4b9d8e2281572c0f8 SHA512 5effa08c5bce5e312dbfd12efeff7fe2535c159b903430f94343f0d6be4ee01c728444e5f9455507473972749cc92b152b503212cb98b9935a26cfe7235c9c43
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tt.tar.gz 183420 BLAKE2B 877a30867970363d240c16f3ebb0b61a7c01fb7bf73e62f3936548d060297295d92d787872c92f90936f79c7a5834bf6d9069506aafea36f17d39e84a33e0abf SHA512 84588be1e9fb026a897ff2e1c7c71e794ea98ab6dfa3a07d22ae5854305a8379c4591f6038431ca9d5a550024315064afbda1be7f7878e2b55f9bb9dd7ee1b6b
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ug.tar.gz 549957 BLAKE2B e7ddd698e6e1071bbbe22a4fd0bb214023adca5d02ce16d2336e26e2564f208e707ebb3f8a4d3fce771b7d57d760c01a95c38763e499bc8215f91627e7609f8d SHA512 dd5368b2cd244ff0dc0ab6dff3b50f4633b6e2c23aa6aedd37751d3c689f20013171326bd22c1ff4df584387239743fc86a4666fdfd1153aee254d32a2cc4080
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_uk.tar.gz 1621785 BLAKE2B cb74b2df1b23394ad029bf55a0bf8e9e468314247419693eb6b77bf25ea212fff7400378f76abd695032a9f0eec73a30d33e1343f0b9e1f128f4746fb7252a27 SHA512 58b4edcf1b20c8f5c0c67e58cf87058b98a198d884a3ed526c9ed8937f28466faa226d43419de901401eff6cf2265b5ad167398de330a3008d2e58de64e9bfeb
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_uz.tar.gz 314554 BLAKE2B 60a94edd03ad601c471af270532f8442bdf60c3c7f44266728dd876ab6ceb4a7a78b630182bfa2e2c0c9f5c6434402bf77f5ce87bf50f92b1d9702be9770aee3 SHA512 0f617a93c5c58c6056581fce6f5ec0dee63bed0dbda12184694d09901a9857a9865005750e1732926a121b8c840491c1795ee0f5e8c4d0b8d3363cad11c27906
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ve.tar.gz 282318 BLAKE2B a7e82d50be6f8c060bccafc28369b7984de12de9c7db1a74efe2ccb03fa7ea85cb4936ec595ccf5fcc49981cedfd6ea8b91723dd731d591178d6986c7d430823 SHA512 b73c0b3813411ea7c241a5d657830137a5b8b668c105decb4ca3f8d5ccefc61323c6d50937274f515093438f7511e2cd6a90819ef93ab9cd75133bf21f626d65
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_vi.tar.gz 465614 BLAKE2B ade7d59d7dca8faa2d8c3ad138ea913a167893bee991dda8d85483ed9a17cc34e0eb7ad2572490526589f6e6f3cc8ae8afcd4a61c064fa43308184eb8ad4e018 SHA512 a5d2acf2186973fc1c8fece36a85a86b79be315f009cd59140039e9631b37c25349a16c100bca86297c8fcc28ecddb13ac2520c96d581502ba125f557a58b412
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_xh.tar.gz 290248 BLAKE2B aa1ac545db88015c2c4f0dc187df610e6735a3fd9913d540a1609ccf726479f021ea377b35d5969c2b9827529833e0138a374cc94ebed9f4e8a9914e3fba7778 SHA512 ec38727a71a4696b6322b70dc0cc26dbf3acff266eac5d7734690271f57e80486eebb75fc8d6e1f6ea02818dcfa4545e343a7a831ec1e8ff6a8cfede1acc64da
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 807741 BLAKE2B f32deba843589fd638ee7a1d4ab9c9aa35571350654fbb6130cb57fc0a38c53aa9003dc8adac6c7a4fc2df082a10c439cca7d58782af63501b097f96f78dc930 SHA512 32db96b9288a6fcf3c4734ce5ae056643476e4599e5fb7ec1aa81ca091a5f4ca7d5b141342b1677f8808dec9cfb4ffbe79f1b6ec36bd814883bb3deef5363c21
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 808093 BLAKE2B a9a96e687d98a395f0ec917a3f3feac6c9a7d79dcd428ffbb04590899faf02e1fb497c6b6a1a211a5f44684c92da8e063c5839a444e8b660b830f85ccca4a8f3 SHA512 d9b3a84584afde6bd86842c9fadc96ee276f75e44c79d1357fca0d3ca06eeb7917875c472605d962ef726361850db1388f9be1b86d1c1d256e970b65c833272b
+DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zu.tar.gz 321382 BLAKE2B aba2c826aa536ea5fb2642b27334e3c7ac67cb07e8013329ea61369c772536de233b664e80e4b8f61f108f2530d49f68d2f90be36df1b7ba539c4833c27f6b64 SHA512 6d823e59d2958fdf448ddd7114f13f1f781631e1bd4c7747f0e6504aa23e2b2f090d3e6689504185b80c2e6ca9992628d4ba770311d4313092c26e15f3cfd39c
 EBUILD libreoffice-l10n-6.1.5.2.ebuild 3624 BLAKE2B 2b6d4ac738668df01a41adec81827de1b93dcee3ec6f622f89ebcddc3ca2a162c6493a06c635f17cf7a9b69f9c6eb8f61606124640f438db1f5a064c16d09811 SHA512 f4347080c7a16640feb557b566c332901b4090a1b711caafe7e7445d7728bfabe2bf7617ac7047489921384dd601320e32f3ea205d7a4db2c6f510b3d6748e9c
-EBUILD libreoffice-l10n-6.2.3.2.ebuild 3626 BLAKE2B 98b23450185353f96f166b2aeb3d2fa741f73b0ac064c8c6e2bb578946520ac7801f2c2d6b7cb15b73ed12fad268fb413440b5c76399391560aab6174a2555a9 SHA512 410c9b184e8e0617b045074fb0de5aa91210b9380423cdb70b84ef83f5500ce1c9ab4d27b0e0592c8ed94e6fb51f3a47a287a45d05e4035eacc5a1e58b69966d
+EBUILD libreoffice-l10n-6.2.4.2.ebuild 3626 BLAKE2B 98b23450185353f96f166b2aeb3d2fa741f73b0ac064c8c6e2bb578946520ac7801f2c2d6b7cb15b73ed12fad268fb413440b5c76399391560aab6174a2555a9 SHA512 410c9b184e8e0617b045074fb0de5aa91210b9380423cdb70b84ef83f5500ce1c9ab4d27b0e0592c8ed94e6fb51f3a47a287a45d05e4035eacc5a1e58b69966d
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.2.3.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.2.4.2.ebuild
index bcf1dc5f21fd..bcf1dc5f21fd 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-6.2.3.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.2.4.2.ebuild
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e2f9ad81ee39..ded4ea3d789a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -10,13 +10,13 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
-DIST libreoffice-6.2.3.2-patchset-01.tar.xz 6424 BLAKE2B 38d0be171c79345b5916e988312cac53901cadaa4d1981905822dee8ac8377954abbc36f8a82cd6bc9c9abc1bdb3863b10f425291ce1c8273e523478f42a8746 SHA512 0f54044ed14c69b37954c77607925ae7dc902429edaadb21d4a508e4628558ae3a172a51dbeddb3f4e87a5e82a9cd6be3badca17bed9ce2ff90fe433982f7903
-DIST libreoffice-6.2.3.2.tar.xz 214234080 BLAKE2B d565a7bc80cb550179ba38a1f2233bda68acf312e8966db84a72b242a10673ac81198370ffa46a7a222ad6c0654f5691404f1a17d7b0c9a60fd378d04dc6d550 SHA512 06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000
+DIST libreoffice-6.2.4.2-patchset-01.tar.xz 34176 BLAKE2B 5f246f8e1ffed70ef2c8d1618481a90159a48ad6aa0e2b0657ca594f97d7b5209467111411d797fa91c10bebc1a12f963bf3431d0724e829be0410785b777a3d SHA512 00db791292d438acfb2d4b04c31516f1170a395cb0f6aa87d44414472b1461f6e6bdce811ff09c43922b73f4df0fae4e7eed4d8d82ff265ee1e38ecafab29686
+DIST libreoffice-6.2.4.2.tar.xz 214494968 BLAKE2B bd317bc15ea5b48ae4eb3405e12eea3265d0f08c46bcc6891b550d05fff220868d035a0d9991319d6ffa80f0c770a9a79696fd11584e328300c66d5c6f672bf9 SHA512 d3c28629315fa78c1a18384b9c4144773f573c9721cb33f2c1b2beccbaa73068b1096c7009353261b1a8993f1bf5296e9dfc4279605572938b749ce9c39026e5
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
-DIST libreoffice-help-6.2.3.2.tar.xz 13024476 BLAKE2B 1d4a993b4725dfeb2993db6ad8afa4f1cc6d68f0e3e51cf712e3983b9eb3d5e092b2fea69628b5f88237c59ec568e1a02a5898bcb0f950288ece6b4408de153a SHA512 3c2c05f22bebf59662ff2948b59055c2b8b962f8c717e8d894a6f0df1878cd13cce0e55d39c2cbbf7e83af61623149d757ec65495c4ed23a1e587832595be037
+DIST libreoffice-help-6.2.4.2.tar.xz 13024208 BLAKE2B e4b6c8e9071ca0786c2679e7a27de13ec78e0e1935dacc23970123e4056b34f294beee941ef34b72a43208abdbba1d53614cb6d8cf0a0a2e5868431692409ef4 SHA512 d93a3cac65659575fb0a17528c5d5c0cfdf6d20b8b694908b9795cac1f1b4f2122c849a31a9e5d04f579c8a27b2b1913ec7474560300ee0fbf4e0f39d3937048
 EBUILD libreoffice-6.1.5.2.ebuild 16963 BLAKE2B 3191a0fea6afc8225d61796f3a78f82540e9aaa67bb4965613c17e110a1fa88afc36f1c7cd9a8f57b631369653d6b4035cc15d085ef5ebbb3f080febba4d3861 SHA512 2232556f0b75e5f24724315fecb409066d976013a70f1689e9714ecc31824411aef345fc6f3897792e43b817dbb3af8d80ac30ea14cd72ba3c873c1998f543c3
-EBUILD libreoffice-6.2.3.2.ebuild 15757 BLAKE2B 3983061bb9ab3a0fa77302d2232a5f486443d52ea74259c69c3a2717a50c404276af52a85e0e3437fc4ffb8a1a02004625749b22bd537526907848a0a9735cf3 SHA512 f1a9062f2f865a97efcb2362345f48426f11ed0616ad14ef8454e28b66141c935926c06f8f8027dc9ad9c76e1b4cee022d11a26c73398df8077526596fdb03b9
+EBUILD libreoffice-6.2.4.2.ebuild 15750 BLAKE2B e268ae04c27bccf6e30aad50f2fa5035f17698019d93083661d7f1cbea5c1f4dfe71c31c26740329500f0bedb3b1a1720b993cfc36ea252543ae658fe9ef74d8 SHA512 aad531d86b8b1516e033d8ef2ed5ed7e295d3263777dc55e2c2d9bc95fc87a20edb2eb6fbd225fbaf618a4653d562c0c9c40d4be42d5c286fcb1cd4ff24deec9
 EBUILD libreoffice-6.2.9999.ebuild 15740 BLAKE2B 4d1061d3fb675fcbcf424d68d7697cd6e793a595c723a8d8425ced8d436e4447165d85e19ab852ee82b63be82bc926fda8761fa8d4d13bfc99353999e92e4b55 SHA512 10ffedfe6da3f65e3ebd1daa5871400a88846e3b6393b454f802fd655837592713d91c936037cf62e686fcaf9ed49b6cf3ec58828a11d7e52db8d48b575ca10e
 EBUILD libreoffice-9999.ebuild 15678 BLAKE2B 6282d6df8cd81553e0db03edebd6150aac7df2a270dac3be8f22ce528524a43d4e6bb64e92ade05ecfddcd87252a815359a8c9283137d0129d416e85461787b9 SHA512 ebe8efc2dbe687012085584b91e0713f257827fb81d1610631cd34497c8d5473e527ded434b4594dda98b0b3af88b7d88ad4309d44bb95b9e805a8ebfcd7d568
 MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7
diff --git a/app-office/libreoffice/libreoffice-6.2.3.2.ebuild b/app-office/libreoffice/libreoffice-6.2.3.2.ebuild
deleted file mode 100644
index cacdb7a6fb54..000000000000
--- a/app-office/libreoffice/libreoffice-6.2.3.2.ebuild
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	app-text/libnumbertext
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.14.0
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
-	bluetooth? (
-		dev-libs/glib:2
-		net-wireless/bluez
-	)
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( sys-apps/dbus )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	gtk2? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtwidgets:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	ldap? ( net-nds/openldap )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mariadb? ( dev-db/mariadb-connector-c )
-	!mariadb? ( dev-db/mysql-connector-c )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-#        tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	>=dev-util/mdds-1.4.1:1=
-	media-libs/glm
-	sys-devel/ucpp
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/breeze-icons:* )
-	vlc? ( media-video/vlc )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
-	# master branch
-	"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
-	# 6.2 stable branch
-	"${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-	CHECKREQS_MEMORY="512M"
-	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		CHECKREQS_DISK_BUILD="22G"
-	else
-		CHECKREQS_DISK_BUILD="6G"
-	fi
-	check-reqs_$1
-}
-
-pkg_pretend() {
-	use java || \
-		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
-	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
-		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
-		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
-		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
-	fi
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${MY_PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${MY_PV/.9999}
-		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-		LOCOREGIT_VERSION=${EGIT_VERSION}
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://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_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	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
-
-	local gentoo_buildid="Gentoo official package"
-	if [[ -n ${LOCOREGIT_VERSION} ]]; then
-		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-build-opensymbol
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-bundle-mariadb
-		--disable-ccache
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gstreamer-0-10
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-report-builder
-		--with-build-version="${gentoo_buildid}"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--with-help="html"
-		--without-helppack-integration
-		--with-system-gpgmepp
-		--without-system-sane
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable gtk2 gtk)
-		$(use_enable kde kde5)
-		$(use_enable kde qt5)
-		$(use_enable ldap)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vlc)
-		$(use_with accessibility lxml)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with odk doxygen)
-	)
-
-	if use gtk && use kde; then
-		myeconfargs+=( --enable-gtk3-kde5 )
-	fi
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		)
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
-	fi
-
-	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
-	fi
-}
-
-pkg_preinst() {
-	java-utils-2_pkg_preinst
-	xdg_pkg_preinst
-}
diff --git a/app-office/libreoffice/libreoffice-6.2.4.2.ebuild b/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
new file mode 100644
index 000000000000..ce0fc855d366
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
@@ -0,0 +1,546 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	app-text/libnumbertext
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	dev-lang/perl
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.14.0
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.24[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	gtk2? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtwidgets:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	ldap? ( net-nds/openldap )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c )
+	!mariadb? ( dev-db/mysql-connector-c )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3
+	>=dev-util/mdds-1.4.1:1=
+	media-libs/glm
+	sys-devel/ucpp
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.6 )
+	kde? ( kde-frameworks/breeze-icons:* )
+	vlc? ( media-video/vlc )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+	# master branch
+	"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+	# 6.2 branch
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use java || \
+		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+	fi
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://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_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	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
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-bundle-mariadb
+		--disable-ccache
+		--disable-dependency-tracking
+		--disable-epm
+		--disable-fetch-external
+		--disable-gstreamer-0-10
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-report-builder
+		--with-build-version="${gentoo_buildid}"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--with-help="html"
+		--without-helppack-integration
+		--with-system-gpgmepp
+		--without-system-sane
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
+		$(use_enable kde kde5)
+		$(use_enable kde qt5)
+		$(use_enable ldap)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vlc)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with odk doxygen)
+	)
+
+	if use gtk && use kde; then
+		myeconfargs+=( --enable-gtk3-kde5 )
+	fi
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+	fi
+}
+
+pkg_preinst() {
+	java-utils-2_pkg_preinst
+	xdg_pkg_preinst
+}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index c47a2a9e62a4..545330b2e65c 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -4,6 +4,6 @@ AUX scribus-1.5.5_pre20190429-poppler-0.76.patch 2102 BLAKE2B 80cc47f73cd3c2d8fe
 DIST scribus-1.5.5_pre20190124.tar.gz 85713996 BLAKE2B c4bb181012c5b2d15076239cb06d5b2d88fb24ef67d5e258142a4acb7979a304d5fdbd9163a24aaa47a1c8f354b0b70af7115430173ade9a8e77c1cb489fc849 SHA512 e9bd63c37a4818a5dda151b7bb6b7fa9cf7918949bd5612009646335d630b4b4188c2346c7567a3dc5f857849a2d49967f825320720c12e38a6038c7a0d3c34a
 DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B 4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a SHA512 1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324
 EBUILD scribus-1.5.5_pre20190124.ebuild 6747 BLAKE2B 8d6e459e6168bda2702ed9729602ebf31c0f90f3140f58fd9f02ce34a453fec108aeb98d0fd77febf7aaab322bc0e91448285db30f271137e403ed6519beb59d SHA512 bd8b75b386e11a9b7fc7b19f930453a5e9ca130add472cb0177928bcd50b6f5010b635bca9612b9b591dc6e0708b14cd5bb8ebe5007c2c532ff587331390bf50
-EBUILD scribus-1.5.5_pre20190429.ebuild 6845 BLAKE2B 7d536d739a1ab12fa298dee795a4eff4d2713eb0c025a93631d3ba8b47b3da169a3f2798c9173de77fbed923f07f20dbb4dbfe481bfe295ea7945134eba4a108 SHA512 25a2d224d92e6e585198fad73bd40818a55ea989ef4a40c6e9201a2789a7a10168546fe03c9214b6fcf35f828344101701b30ed8453457342fc1df4c68e16f70
+EBUILD scribus-1.5.5_pre20190429.ebuild 6843 BLAKE2B b302dbe626d7683093511f2b317115ba51afe5b74d1710238530be81672785b855d13aacb582d9bda07dce61e319b48e352f72daa8b5575af9d210dd74198270 SHA512 fa349878cfab3fc837a0956dd2af09d0c2ce8491fc04b3aaa8f81fdb8b8468937a5f3ba0a7a1bd08dbe6c49bca4067a46f7dd780e70325fe190e6bedfdbcb180
 EBUILD scribus-9999.ebuild 6643 BLAKE2B c1c8ea9bb6f97b3f37c8bf10dd974e2ecf2330d564108b30351c3f126bd699b8e3ebcdba5e4e4254edacaeb28e78801d954986531379a4b8fc312c2a9d332dee SHA512 6461c89f4ef4fda64e6c31420889fe51666930d3efb5fcb6142329249b314b12ae20feca11800afe735c69e4eeb695f587ab2b9710ae74a3a71c75053d2750c8
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
index 6402cd3d0d54..56615d2265bc 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
 
 #a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index c17056a0de9e..9d7de8e0f17b 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,5 @@
 DIST skrooge-2.18.0.tar.xz 20951548 BLAKE2B 7679c519cab88a165c878dbba0a077d7f4cddc9bd1252ce5fd1e6f2d90c98b9fc39b8251df83470debdc8a6fb4f093fcff55768aa41b6a4c379c9e4c4f558f25 SHA512 b8a222947f535eee9041e6bc71703a053fa9a201de352c5f39fcbf35be5259f76532ed5291becab4c676ff8eaba7727730f6d957af36bac54aa4ada11db25da3
 DIST skrooge-2.19.1.tar.xz 21111836 BLAKE2B 5a1a7a8212699ce657e33f5b2ab12b305a3c6840dccaeff20fc42796b3587d02a60cd1f2313909b6411e9ad71c4f1bd254349d9a9846c6707a31736507713fef SHA512 4c9addaf56bda0a575c995a2d9229927f6c23ca1931d8ea50ec83afab31149006fd0cc339af79afe0d046c00b5d3dbe4c629e48eac404a31fbe45b3747dcb869
 EBUILD skrooge-2.18.0.ebuild 2498 BLAKE2B 7f84d72f121f53b8468ece77cb7bfa38222298fa0c9dc96030cdba8944edb12b3b19bb8b9832c76bde11fe24c6a043725f975e694c330d72c7889bf5c9185795 SHA512 64d5705cdc86afd350600591ffa53980ac18ab8840993d0bd78dc84725584882327b00058e52cbbafeafa9fe49805ccca8088c770d3145aedba17c1d2cb1c8df
-EBUILD skrooge-2.19.1.ebuild 2477 BLAKE2B 335437ef1e1ee9e115e6dae4815ed4b6841890fa69cbde275bbfb0669f9857213aa23fe92b47fc35c3d7c5ebfad0e5b4e4f5b97dd7c90bf8262dfd97f65987c1 SHA512 e658d8e00ab6090a9dc7c9778cca1672c7453462a5f6ea0547dd0c6139bd719916148d6d53c277fa7a7624fda7086749400ac32f8cea7a44a098beb8c3affb86
+EBUILD skrooge-2.19.1.ebuild 2475 BLAKE2B 1f540144c20948024ef8f19fdfeec84d9a1124644dfcefb982f98f977b6cd2228856d56c0ba06b65f2f0d7434b143a6e2d992341ec9a095c633d1706f4acb571 SHA512 530b6edbb410e9b54ffa1f0f43a1ce6b7304565de1118a030a61a3304f5f75cbec359023dd01e073528bc23a5e95e07dce52b132e51b642850cfb80e8f3a54b0
 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/skrooge-2.19.1.ebuild b/app-office/skrooge/skrooge-2.19.1.ebuild
index d051d843d447..cc7150dcd553 100644
--- a/app-office/skrooge/skrooge-2.19.1.ebuild
+++ b/app-office/skrooge/skrooge-2.19.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://skrooge.org/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities designer kde ofx webkit"
 
 REQUIRED_USE="test? ( designer )"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 4cc0ce11a1b2..393827b00360 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elicense/Manifest b/app-portage/elicense/Manifest
index e37b984fc18c..dfcc9903da7e 100644
--- a/app-portage/elicense/Manifest
+++ b/app-portage/elicense/Manifest
@@ -1,4 +1,4 @@
-DIST elicense-1.0.0.tar.gz 8719 BLAKE2B 4d9c06cf3229f5a13ec246080098e1f8389afa951bf95cce48159509c160bbc43da511ec0936139c282f59514419fc4911b6a7c9c89bdce18ccda8d175baacae SHA512 5b81e9256486f42f9060d29c7ba3c9101a23a60bfc1ceed978172a2d6feeda22e42486b950ee181a3fe5166e69cabc0ba29043811076865b38f687c0258e9aa8
-EBUILD elicense-1.0.0.ebuild 695 BLAKE2B c9a2e729e957e9a856c08fa90fdaf903f62e4f9068279775a8932897aabf71b4c3800c17ec485a0526caae57a8d74a8d43ff4237141816b37b9d9e0b2e9b4e7d SHA512 8fc2dc5be6ad20d05d3c8fb25d1ffbe24e9db5651ce92ac4a6fd9f7261e5cd69372a130c086ff982d90b06d488e110cf39bfc53ff5cd8812523bfb28f4fbec2f
-EBUILD elicense-9999.ebuild 695 BLAKE2B c9a2e729e957e9a856c08fa90fdaf903f62e4f9068279775a8932897aabf71b4c3800c17ec485a0526caae57a8d74a8d43ff4237141816b37b9d9e0b2e9b4e7d SHA512 8fc2dc5be6ad20d05d3c8fb25d1ffbe24e9db5651ce92ac4a6fd9f7261e5cd69372a130c086ff982d90b06d488e110cf39bfc53ff5cd8812523bfb28f4fbec2f
+DIST elicense-1.0.1.tar.gz 9260 BLAKE2B b5782412de613bce009ff1d685de6af9a129afadd131a91328cfd02d55c416e5c7549aacf676c4596a4512de4e3a42d2b89c24d2367404177e9675a7fdc35d94 SHA512 3b7b412742a9b67b5c4dda10838d6380c1f18199bcaa87458f30b06bff068228f64364d336d1daf4b95df6c1889ae9de7f277dea3defd18dbf74d50fc9381500
+EBUILD elicense-1.0.1.ebuild 940 BLAKE2B b8caa99f39eb24d20ab49e5a73c1db2d334b98721ccc19a174ebb4982679381107c9c68f9acb663b7a26cc30c2f919c7fc511447d70dbed4ce9b4f7d6e1ac97e SHA512 1230df0f640f01e7c753a3bd956bf82652ae68e9452567aaf554a830335d105585c7a51b166fa7c78e172c2a2bcd20fc035be838ab733cd66ade8c876d978b56
+EBUILD elicense-9999.ebuild 952 BLAKE2B 1f07bd06d78d0477ab50cbe4e58872acb853500bc41a5c1c79e06bbdbc7b847dbdcff98758782c2d0d051eb2d4acec375344b31d52a9b3559597abfee9d05f22 SHA512 ef169f0c15add750841267965de9b12c8a1e8845d107461b82952c94623b55ccde90c1b88b5108a8489e33466edca0fa87a39e91b8016c332e7ac9d07c07b94a
 MISC metadata.xml 355 BLAKE2B 3b6e208a86ad1c40713f9e441d5ec81de0040c146d4cdfd1e1026d550dda0177ae659120ee272d84035fe9fbfc0d2089a7f2726056247710530db9b59e4ae1d2 SHA512 2c5c3010075adc10002bbce3613c30228993c3a14acf9785ac452b39608fa8cb7e9f810490710b91be4558c9a30342e679a44e7ba88fe060eb563da7369e2bba
diff --git a/app-portage/elicense/elicense-1.0.0.ebuild b/app-portage/elicense/elicense-1.0.0.ebuild
deleted file mode 100644
index a7cb3da3c328..000000000000
--- a/app-portage/elicense/elicense-1.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/Whissi/elicense.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
-HOMEPAGE="https://github.com/Whissi/elicense"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.3.62[${PYTHON_USEDEP}]"
diff --git a/app-portage/elicense/elicense-1.0.1.ebuild b/app-portage/elicense/elicense-1.0.1.ebuild
new file mode 100644
index 000000000000..b6b7af167598
--- /dev/null
+++ b/app-portage/elicense/elicense-1.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/Whissi/elicense.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
+HOMEPAGE="https://github.com/Whissi/elicense"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/portage-2.3.62[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	local MY_PV=${PV}
+	if [[ ${PV} == "9999" ]]; then
+		local last_commit=$(git rev-parse HEAD)
+		MY_PV="${last_commit:0:7}-git"
+	fi
+
+	sed -i -e "s/^MY_PV =.*$/MY_PV = \"${MY_PV}\"/" \
+		elicense || die "Failed to sed in version."
+}
diff --git a/app-portage/elicense/elicense-9999.ebuild b/app-portage/elicense/elicense-9999.ebuild
index a7cb3da3c328..bbba9eea7ef6 100644
--- a/app-portage/elicense/elicense-9999.ebuild
+++ b/app-portage/elicense/elicense-9999.ebuild
@@ -21,3 +21,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=">=sys-apps/portage-2.3.62[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	local MY_PV=${PV}
+	if [[ ${PV} == "9999" ]]; then
+		local last_commit=$(git rev-parse HEAD)
+		MY_PV="${last_commit:0:7}-git"
+	fi
+
+	sed -i -e "s/^MY_PV =.*$/MY_PV = \"${MY_PV}\"/" \
+		elicense || die "Failed to sed in version."
+}
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index f261acbc54a9..4b1addaba035 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -4,7 +4,7 @@ DIST gemato-14.1-multiprocessing.tar.gz 71707 BLAKE2B d7d22615a65bd598160b23e01a
 DIST gemato-14.1.tar.gz 71142 BLAKE2B a7c8f814f9c6875e977aa178d4a49e3454ea8d6e19750786452aa2f34f0904f0ccc0a9a58411a0214a68cecd571320769c6374b265e2aa7f52fbead53ba6b284 SHA512 de57f3b7aa17e650894876bc2423c4fa9809f2de25aa2fb8ef070e943faa182c80f7ea8a519ecdf6edec8098d11f786344ee872b9e98c69bd6739760652baa2e
 EBUILD gemato-14.0.ebuild 1352 BLAKE2B c2d1e7c84eb461f2b2f321f699958e480ec7d4459c001f542b36bd3219358ecdcf9f5211fa39ec320f32feb5fb07929f3631a3d243a5e7909f91a61fbfe4885b SHA512 caf7b72bf8cd730dcf8ac572223c1b2ec0ca4d7f6fa021cfed7d2d398e8c4bbb64211baac89dd7f317526a733a496dd3ef0559d81706d7fa7eb8c6af0260901a
 EBUILD gemato-14.0m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591
-EBUILD gemato-14.1.ebuild 1365 BLAKE2B 3c6b7060d66b0d53d63578425c8826459e232b0054d4982ac316b6cb6816edb5d6f2b1f08d012190c587effcccbacadd939d6048cd62e8842d9f9810d2de77ae SHA512 02eb84f44d5ffbda592dcaac785f438dc97d4e4c66806e6b6d14de607c4cb835745024ee7f247d98ebfe38e62851acdd3b43edcb3fd8de325db12081e3892e52
+EBUILD gemato-14.1.ebuild 1360 BLAKE2B 1471a5580bf77e1d3784c06545e75fb16b5feaaf6e1e1f56a1aad22bbfacbae1e3990f999a086b6fc7718b2cbc6bb21ee50b954fbc776a65abf4d3859e5a4f04 SHA512 0282b0228f936c9fb4e9afc83fbe96fd14087849e9d7517e8dfe863e302c015134a5e311b21925ebaeee230b91cc4ea12186358b24b2cc77e661e8b853eb9be9
 EBUILD gemato-14.1m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591
 EBUILD gemato-9999.ebuild 1271 BLAKE2B 761c2087c144d5936aefcb45cf2be23641c2605f1f836e07ade31b577f8bc6f82c8ffe7313580b371b89bea6f036996d7a1925fffbb03553cf57d02800ca370a SHA512 a910a795abe974d3c389a77cfc827fa7393e6adc603ade32d782dc5838eda46f7c255abdbb89de263ac7c38d948bfb616d1c3cb72088d3fb5a7da6bab027cd28
 EBUILD gemato-9999m.ebuild 1466 BLAKE2B 53d42b54cc09dd377a60bac37fabc82ae5e272cbd336fd7f5047fbd7d940dc9005ac1006ffce31576ca146c5f65c56af83405c1f0a93831e4a24051c0f075a8a SHA512 4deb02e736943d5014d53a05602da09b1d7436ed28a4f528240b18b65741fad352cea686f9532f81d6f60a0c62735a3e5db3ace44c6dd7308f55928d844a2562
diff --git a/app-portage/gemato/gemato-14.1.ebuild b/app-portage/gemato/gemato-14.1.ebuild
index 0a832d61d642..b25839d56663 100644
--- a/app-portage/gemato/gemato-14.1.ebuild
+++ b/app-portage/gemato/gemato-14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 
 MODULE_RDEPEND="
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index 7563a8e147fd..e0177f6b9448 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -4,7 +4,7 @@ AUX genlop-0.30.9-display.patch 676 BLAKE2B 4fe5071ecbd13e1c10e969d66a9bd74dadaa
 DIST genlop-0.30.10.tar.gz 20872 BLAKE2B e06088678598464c67b78cf10a7472d7bf7b22d69c85fc072064b7a90fe57e2015fddba30edaa85574381cd59367b81c7bf514c269d5dc186fbcc367bba0cca4 SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593
 DIST genlop-0.30.9.tar.gz 21160 BLAKE2B 4d8fd34c8ea1e49498ebb887782c02b2dd20bd20bd1559b469dc93ccaa9873b27681c8c50ca85d3a96ca687f28f77750d79d9d93ac50e10c3d0fac2a593dd1ea SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936
 EBUILD genlop-0.30.10-r1.ebuild 772 BLAKE2B c1d35e9e7bdae44a38a36da8592c1d390cdddb59644063946653736869b0d7ea93b4af41e9b29128108990d2b4ad75ab0b9f361fc8766c27c8750069599a4c3a SHA512 7fa8dfea27721eb493556cbccccaa6ef878de49a7d5f2c0d9d0897600f0380979671c8487f5b74979762dd87381f6296c50a6e491750e996e0b52776051c76bc
-EBUILD genlop-0.30.10-r2.ebuild 802 BLAKE2B b2f7e022697ada81eda7c26f02d3b4131b1f861fc3595e0680a757feca5fb2e103d448596c26cf4f45af07ac873f3f70e35bf5c74d52c3baed7411176f4225f6 SHA512 411d087bc42afac13961cfbd9d7956aaaf3f602d5a91b960970fef2bcd046984910e778e09f214572a12cd2f7ecdce0a1bcd03f50d505737cf1dfd4010451422
+EBUILD genlop-0.30.10-r2.ebuild 800 BLAKE2B 4cd7507a334f0cebc51f6bf20a35bc4d381779a9a86b2be4f5b6cae168908dffaf9b8d36918b6c43f4fe6efba551ba26e801572eee37b531a3c18622f0fff04a SHA512 807c8fda6471ac1463170fb2f6c060be538f09865cb001d639349c52558dcc73263b2939b43cbfeebd1ba1d2bd85e9124a8cbd230a3a7013893f94c04fde856b
 EBUILD genlop-0.30.9-r1.ebuild 773 BLAKE2B cfccd4ab36b55323bf320928c7c0e8719b92c00e1254dbf295241287010913768865b3428ac0130db3d93ab6fc12f5d60e50a4e417280c21a630a83cb1180711 SHA512 c53494d4d127c4b54d6c8a8897b1ff76d3bb0f6f2ee686042ad18422570802b2ca0d8a9f4e22fd1076342f48409182a9d72f196a3f652757c312f3c9e42d84fb
 EBUILD genlop-9999.ebuild 540 BLAKE2B a1785e1dd85c8d0fc365a21175f8df825390f5ce3ba9da561d99bb7138b965eedae647e54536567aeffe32014edfd2ee909a1030db96248ddae48a13b23c8f7d SHA512 7912f2f2cd550ecee97e1778a77613b22595839f0effe4815b7afc710a03530027b1bf29baabdd75705aac5a1cd2f0721c097a6514c0556e050a400866c5f162
 MISC metadata.xml 377 BLAKE2B 275b2a7cd7c400a7f16f8031457520d9a1e44ffdf0f2a53ffc06194a4f2e752ede65f13f36b852a24a67267907a6a2a8c7a81f1cc812c5b4c676edcc1fc492cc SHA512 3bc89900e1d25dc84831f78427b06089a1f0a16710d2adf31871af825041522b2446eb2a8156c4506d7e19cb6c73fa055f318b9dc48c9bd15d92511493098f1c
diff --git a/app-portage/genlop/genlop-0.30.10-r2.ebuild b/app-portage/genlop/genlop-0.30.10-r2.ebuild
index dcf811ab6d16..166dbebf221b 100644
--- a/app-portage/genlop/genlop-0.30.10-r2.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index e63a0894bc60..d860765f4778 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,14 +1,9 @@
-AUX mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch 721 BLAKE2B 6faf73309a13a2f4b039e00555f9c8ffa01458aaf1a80eecd5ab8fb9349b869f7c9d63d2d288668f2960e230b9c4323cb6c309e9c19aad38ca87dccf5fcf9468 SHA512 032544106b1e6dad76f46131f94913b1875d9605808dbe5145ca0fd80916c158551745a850a25cf4252f9f860e8608ed76e31ca878110db66e05003e86d55127
-AUX mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch 658 BLAKE2B 21ec938fa75ec527f9670eaf25a7d308126a098ce558587fd3a1995ac02ecb82ae21ed76dcb5f0605581e777ba93c987780e11e3990cc3f15383b5a17e3f18e7 SHA512 4f2ce8c8136a380cfcd0f44489fcd51be1a8c66353dba59ff8872ca6f72901c0f19f231f8c44fe396bb5735e6e8e16b389e22bcada1f9a0a793dec20baefe604
-DIST mirrorselect-2.2.0.1.tar.gz 13138 BLAKE2B 40a2724ee8c83018e19a56a49b677cfa3f89d56450ba743ddf67a324b43881fcd8e99022f9532499b5b4d826b8d6700a5606294af3becde1f928ecaa07338f44 SHA512 08216c381b70856dd56e903a208bc0ed202826b89136dd0b1cf69bd7cf2afa2df608ac2a0aed5161a56f51cf4bcb51f3826ad55b3a26e671ba2c68490c9cffad
-DIST mirrorselect-2.2.2.tar.gz 15964 BLAKE2B 96698286c05fd96ea03ec6594c8b0849fad3b1ffdd3f1ecf1a76d205005b07bd4971211e72f10952f5155c91376192fd81efbdfdd5058c9a1c60cf731b0bacd1 SHA512 91ce16d236418ba186c447c6497684c4138afd4279a0ba95ee0f069309e8ce086a5a4ce4715ef21275362b7c3772924d422d7711d188d40c1e0b90f773765cf9
 DIST mirrorselect-2.2.3.tar.gz 15230 BLAKE2B 7234ab8a681713c63b201e1ae362ea9a28d5e76b5640c6128d79c66d9967660474d0597822604defd3f562cd155524835c5ae20cbf21c5526595775b3be39dc4 SHA512 af1d3657b9ff5a6184ebfd89579a1bdbf11f7389ca12d4cd7a41cd136a553732cbbfb7675e25f7d79756b0b9e74b496d28ee5fdc8872173825262fae0052e8e2
 DIST mirrorselect-2.2.4.tar.gz 16085 BLAKE2B 67d3de3e25a993a4bfc546ae7d188b2a7e61da1cfbc85ac50119c88a81c4966959e31f88101880ba86ef27f0b0674a3d279b11135d2475d0b2fed1ea899021f5 SHA512 8749a916911088d128f9064d5aa78c3bf8b529d583db86eb6f7190959008257e231f7b0bae9a2f2fd6edc45f6d0ffb07364c16a3f190f8c97b88472c2d082037
+DIST mirrorselect-2.2.5.tar.gz 16638 BLAKE2B b306f146936344309e79469281830bdbd088bae3686de777bf24bce5bd4e915c951b1f01612c9600cadcbc90139c74a9a5774ca5779bae339d1d5f33d17f70f1 SHA512 845df4073f5dc7544d7c1ae410f154e27ef9a9848c2fa182f4d0acd287f17792d11065b1b3394856bd760589d6b24e30e031d10e4ef6c987ac4321dc7e044e4e
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
-EBUILD mirrorselect-2.2.0.1.ebuild 858 BLAKE2B a02fbca35c275845f8363b6c62196efc717dc5e598020fcfe87386c938e6c45c883809a17cfa611ce19c446f1f4f202d58105639d8b97e159fc8b8891862e843 SHA512 07bd6b8a86105dd42c6645dbcb97e72c681dd10651591036d5eb63bbd928c3f745a670c5be1adc5149f074f99d8f02ddcca907b0eba98f303ce0da44ea875632
-EBUILD mirrorselect-2.2.2-r2.ebuild 1123 BLAKE2B f46044dbbc399f0a328353d3341d009c49b7ba07d7302c83fcdf1c25e8882b18eea130ae9d2b5352bc8ae1c42edc4dfaa5087e038e0c12e2ee6b88bdae1e1957 SHA512 b591331504d1b799156376682f19ae419a129738fcbd7f3141f92fe0c03d7badc79ffeabad0695c47f6f2b2f17b624bff02e98184cb9551d96dbd40fb8387b37
-EBUILD mirrorselect-2.2.2.ebuild 1009 BLAKE2B c94f8f77acc95639337ec600388242c956cd2804bef08d2b0c472e8e1ebebc30dd6604e0232ca3167cf8293ef1d2a69c98122f26d7b0ea82eb2dde1ca9d2cfaa SHA512 08f27bfcd5101cc0446d586c935639e1724278259490ba34dd45947410559438793d9d8e3c34533f4a47bc68fde0254334c642fbf720ab4cd2fe604011ce347a
 EBUILD mirrorselect-2.2.3.ebuild 988 BLAKE2B 8595db07b837f8c8d31b19415d6e68cb8d91dad412fe4e9bcc31687a230239b8ea94edb71a2aa44bb967e47643e1407e959747e6fb72ed20f8ca6bea0ae8ce23 SHA512 844328048a7f7cf05e6fde4b5b81a5b37b99e719e09878bde75f027735378eefc6461552550c5b093186d3820ce65c53a2e8899bdc28821b04eb01491eb0aecb
-EBUILD mirrorselect-2.2.4.ebuild 986 BLAKE2B 6eee6df9c8666a281520511348fc7f182e539ea7a3e179c4b31b94b67d22bb96615f73237ae4928b2db9c9e1cf84dfd2dc83446939faf49cc68b0ad276332599 SHA512 c1a1469efaa63b3ffacaabb470abfe3375d6c5fe04c44254f1639340e34fcce6025b56a74b508b456789339c97e0335fdb115dd46ced53c5ee0e3141cf6a7c0e
-EBUILD mirrorselect-9999.ebuild 1046 BLAKE2B b150f3953eb8fab0dafafb9b70862559961cb882fd56304ecf1fb389d77429e53a652c72298d69f1c3a896cdbf5b44dba9e11a620c190be2869535d7e5bafd35 SHA512 4a4aea0b7bcad385dbd6a6a793965a8c3714ad0a5dc6a6a8c3c3603478ffa372441b207c60dcd77ac64eb73fcbbed2e800f0a87007143ccbba3b0ad030b25794
+EBUILD mirrorselect-2.2.4-r1.ebuild 974 BLAKE2B 1f29d20581f56fcc6a8530e342b93e6c0da8251d28be1a8418648f214cd561b8de7e810bd3352e1c0e5106ef9d016b1b59c05a480db17fb34f6774065dfc26f9 SHA512 06381acd35fda51d71ce12386b673aee1963ec336ce316238c53bff30075db2e77393f83c40ae029aacbe43783dcf76508107a7edbbb9d0c7483fd0667ba289a
+EBUILD mirrorselect-2.2.5.ebuild 1069 BLAKE2B d5f3eb9996e4787b2bdcd86b50c79beaf9e1863a5fa4d875f857acfe9f9d683066e6be1e81e73494fd337399aa105d6c1ac396951c211b61273a4a0eb8d964d3 SHA512 6c710d4520b3b1ec78e4e3bcffa262461a4cf26386b2e8cedee3717cea55a0df2fca77e662096e81455e63fc3ff134270e03d942d97f27e1297532b1a85e81c1
+EBUILD mirrorselect-9999.ebuild 1125 BLAKE2B 52bd3f705108f52a8cc381fca6b9296264b2152848b88321b5b874fcc9672469fde32f20a27728b2b0fb042ff591f961dcd4a702f77bd73adc9b7ad948b44ada SHA512 eb6bb88fc85b92606f3dcf3fe149e6c41f5bd67bc6a96dd158ff2db1f191909557d82cbf82d3ced101e18de5101a91bb22d53913eee9b719b0e839e78a234b4c
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
deleted file mode 100644
index d170103a4657..000000000000
--- a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e9dea3a98aa5031fecf1c7115de77e948e8d07ca Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 27 Jan 2015 10:19:05 -0800
-Subject: [PATCH] Add missed output mode function assignment.
-
----
- mirrorselect/extractor.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
-index 59efad1..06dce6c 100644
---- a/mirrorselect/extractor.py
-+++ b/mirrorselect/extractor.py
-@@ -107,6 +107,7 @@ class Extractor(object):
- 		# setup the ssl-fetch ouptut map
- 		connector_output = {
- 			'info':self.output.write,
-+			'debug': self.output.write,
- 			'error': self.output.print_err,
- 			'kwargs-info': {'level': 2},
- 			'kwargs-debug': {'level':2},
--- 
-2.2.2
-
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
deleted file mode 100644
index 2e5fd93c09cb..000000000000
--- a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9ec1e9649c980d32d23aab40eff3cac5e8f6f555 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 26 Jan 2015 18:23:05 -0800
-Subject: [PATCH] Update for ssl-fetch api change
-
----
- mirrorselect/extractor.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
-index ec5f299..59efad1 100644
---- a/mirrorselect/extractor.py
-+++ b/mirrorselect/extractor.py
-@@ -109,6 +109,7 @@ class Extractor(object):
- 			'info':self.output.write,
- 			'error': self.output.print_err,
- 			'kwargs-info': {'level': 2},
-+			'kwargs-debug': {'level':2},
- 			'kwargs-error': {'level':0},
- 			}
- 
--- 
-2.2.2
-
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
deleted file mode 100644
index 81e105381e8a..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~dolsen/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	"
-
-python_prepare_all()  {
-	python_export_best
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
deleted file mode 100644
index 2d83632168c0..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
-	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-	"
-
-PATCHES=(
-	"${FILESDIR}/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch"
-	"${FILESDIR}/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch"
-)
-
-python_prepare_all()  {
-	python_setup
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
deleted file mode 100644
index c70e13ffed3b..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
-	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
-	<dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all()  {
-	python_export_best
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
new file mode 100644
index 000000000000..70711940f738
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
+SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz
+	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-util/dialog
+	net-analyzer/netselect
+	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+	"
+
+python_prepare_all()  {
+	python_setup
+	eprefixify setup.py mirrorselect/main.py
+	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild
deleted file mode 100644
index 92d8fee57299..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz
-	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all()  {
-	python_setup
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
new file mode 100644
index 000000000000..6a451ee30e96
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
+SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz
+	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-util/dialog
+	>=net-analyzer/netselect-0.4[ipv6(+)]
+	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+	"
+
+python_prepare_all()  {
+	python_setup
+	eprefixify setup.py mirrorselect/main.py
+	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test || die "tests failed under ${EPYTHON}"
+}
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 36964fd86606..de12fd9a5ea9 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 git-r3 prefix
@@ -22,18 +22,22 @@ KEYWORDS=""
 
 RDEPEND="
 	dev-util/dialog
-	net-analyzer/netselect
+	>=net-analyzer/netselect-0.4[ipv6(+)]
 	=dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
 	"
 
 python_prepare_all()  {
-	python_export_best
+	python_setup
 	eprefixify setup.py mirrorselect/main.py
 	echo Now setting version... VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
 	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
 	distutils-r1_python_prepare_all
 }
 
+python_test() {
+	esetup.py test || die "tests failed under ${EPYTHON}"
+}
+
 pkg_postinst() {
 	distutils-r1_pkg_postinst
 
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 83261ac38419..ec9a96099767 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -3,8 +3,10 @@ AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713
 AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae
 DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
+DIST portage-utils-0.80_pre20190530.tar.xz 1758056 BLAKE2B 2d595db45ecfe125da80924b145be4d1ebfcda09afb3dd39c4dfa084b4113e162637cbfc8f3362554b39de55339462de9714cbef6194816b7340e77c335d3432 SHA512 720bb057e6428d51832d1e92e8ae1fb4d7b6c1f407f78656ef4853822b08525849614f7f760a395385d69400c08bf103eb05308b87bd9f7189cac53e95e93583
 EBUILD portage-utils-0.62.ebuild 2006 BLAKE2B c44402ebef59a344bfb3ed571a46b7a58dda17b3b1d231aee55c77d42a59c62ec5de69b595a67ca2dbadc568022f63385950964f0350303c65cecc5f541b36df SHA512 579f27018139dd0dda0781d7b9483ca4a467d069f6b0a8aa55a9786b8cd3fbfa78919b7fa6b85044f78bac6ad6ec896ec7bd990cb428d0dddf5bfeb1f2175272
 EBUILD portage-utils-0.74-r1.ebuild 1140 BLAKE2B d58ad14ab2c7f786fc36147436e68ba29bdd100c912538cc2f28ff8a54be4c0556a87cafc512cd62c2b3be50c9ba784cf4b5dbe184929f3684b39d5df4e324f4 SHA512 84b221b821b7beedc52d15aefe9646e571c66f4086e89c4ac8cee7cc398b19428eb09000ca033f0eaadeb84222c468d002c76ed84070eb26a5e7200572679445
 EBUILD portage-utils-0.74.ebuild 1073 BLAKE2B 813ec25c4030ad26b1b28294c268c0f3bbbe296488a811ecd2a8d87ea6bb7f1caaa9ecdee34f272e9cf5879cf3454506ad7a62be2d3e74b926cdd012e239be3a SHA512 fa9079a716b50a4caa61fba5225ec28a2fc4d8ea2c95cb8bc283434a7c96392fa9898537c6f98277860fe06a23fe02c255c17e54a2869e371235e094a99a8e4a
-EBUILD portage-utils-9999.ebuild 1025 BLAKE2B 19c5e62767263aef9e68337535359d1c1c9684ab83c2c395b9ac26dfc5e5c2e556aa5b564f9780ed80d5a2eb2aebaf7349e5048186a48c2482404af4ab2d9b2b SHA512 0a0c5564b45eccf468e32493958ae7ecc00c7690ac3b4514458b2e9c8ed9aabe0d01419e456b0e5404ea5ca30d98a6c568b53e4da214ca9bbcb7812f93a898c0
-MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
+EBUILD portage-utils-0.80_pre20190530.ebuild 1258 BLAKE2B 828316494d67b4712d6917a1a1504257a622d9c65c13a8378113da30676a1e7eb96310459a33edd655852ca5454e477a960b66cf1e6e480e66dda62c40ddf7cc SHA512 14cb6d702ee4dbba7f8c3ab2b21cccc66f6c4379cb02eabdc01a95dfc3e7e3b794825cc4174f12ccd2c39c143b32391c6cddb07efa7da5ff1527a8963db8406a
+EBUILD portage-utils-9999.ebuild 1298 BLAKE2B 323a076f738e9700c561e234cb93ab703d8533946a626035fa9749e76a4442f96488d3bc737bfac18798d4a2c2f81e1027465c13829052bedefc1dc7ad81ccc4 SHA512 533e36b48b751fdb3b2d4a52082a00fe93b8145d9f6f15c79de842db8ad00c2bf6b5d39eef9dd9075366300f9a710024e14aeb084d66f0c1305991628a0de1b9
+MISC metadata.xml 390 BLAKE2B 8912128b1d4cc1afd29f01ca9b9014a5e1726d2a74fd42e57836f40ecfab15c2fc89bc403c9e4a41fd14e40fd732e546d93ed03004c820b5a25be69e0725e606 SHA512 a152ae18c44f4a4946b62e8724d84409c4cc1ffa66892e649551b3815935de4f3a926b7b9926fef9d5c9594fb9f70ef7571e1f9ea3c3709516b47665279a549d
diff --git a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml
index a53ffbea77d3..dac8feca7f1d 100644
--- a/app-portage/portage-utils/metadata.xml
+++ b/app-portage/portage-utils/metadata.xml
@@ -5,4 +5,7 @@
 		<email>grobian@gentoo.org</email>
 		<name>Fabian Groffen</name>
 	</maintainer>
+	<use>
+		<flag name="qmanifest">Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190530.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190530.ebuild
new file mode 100644
index 000000000000..5ff83758116d
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.80_pre20190530.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static openmp +qmanifest"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+RDEPEND="dev-libs/iniparser:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	static? ( dev-libs/iniparser:0[static-libs] )
+	qmanifest? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		app-crypt/libb2
+		dev-libs/openssl:0=
+		sys-libs/zlib
+		app-crypt/gpgme
+	)
+	"
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable openmp)
+}
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 224433e36f2b..25967bcab798 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static"
+IUSE="nls static openmp +qmanifest"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -24,12 +24,29 @@ fi
 RDEPEND="dev-libs/iniparser:0"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
+	static? ( dev-libs/iniparser:0[static-libs] )
+	qmanifest? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		app-crypt/libb2
+		dev-libs/openssl:0=
+		sys-libs/zlib
+		app-crypt/gpgme
+	)
+	"
 
 src_prepare() {
 	default
 }
 
 src_configure() {
-	econf --disable-maintainer-mode --with-eprefix="${EPREFIX}"
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable openmp)
 }
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index 95705946333f..718ec5af0bf5 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,5 +1,7 @@
 DIST pram-3.tar.gz 4334 BLAKE2B f06f9cfe938f83702baaa8f8bee06937e8790e533e14ab419251934d0f4300ee75d5377a4f4e0e47a774bd3c25ef31236d7e451b929cfbfe8343d226a311ca2d SHA512 526149523b748b57095ecb3eb23f6808ab57ee1d8dc60e27067931d269ce3465ad8a0e54e8edaa3a1f74fd0a8dd135fe4a92779382ba6e367112016bc254fc98
 DIST pram-5.tar.gz 4443 BLAKE2B 0c5d1ddfa44944e8480cffd0b4f49d6143fff36ed690c9e7c0acbdd54ae6ea50b6c1610c65914c2626a260c9de1084b42e101ca38952a3e8fb9264663c3ad00c SHA512 7634bcaac11c999e2ef01d5e12305d96032396ce624cc6085b4954583aebf6d54f0a1155604863d1aeda1c2bdf17ddcfd81b833decddfbe11eb8689297c70b23
+DIST pram-7.tar.gz 7471 BLAKE2B 5152002be35755031a81dbaa61118fcab0529eb9732f134b11eb2499a539e04b8b8cb6402ee3bb39c7b7c82bc918ee4fef30e247fcdba3fe32c5457cf654e257 SHA512 42e95577802d5940a0eab8da5fd36d9eb2338eccf654260364b91990a0d8de9d56cbfde767dc60bfd3c826eb45a1b0e73af717740488af0a25ff6d8c656df93e
 EBUILD pram-3.ebuild 493 BLAKE2B bed413200050b99fd437dddbc02048e966e7c81f35804475e8e174ef3298647cd1a84c402deb2af0090603e1e03c0f7b8ffe616e2eb01616b7165e82f3913e98 SHA512 201dc579fd7918a6044b0b1938b74211afe19a6d50ae3d12d72017dd4695c5fe3b737135fa57c7768b8b1bfdf7859a971d0663ae5821b983609395cbd977b730
 EBUILD pram-5.ebuild 495 BLAKE2B 564ab559666243a00b0484e74608cec8d1cbe75fed20c86b7532ba1b2563af221e1dc9600ee4cda700093cd7291d62734e4ae8fa86b9c36c209eb14f15bce8fc SHA512 a5c13b3f07a9b4190c14f4c2ab23d28a060a6e48feaa1d0775aa950232489bb4343a35df91bcc1aa1e31d87f93c4f69d56977dcad7f86cbbbd35536c5177ed33
+EBUILD pram-7.ebuild 561 BLAKE2B 08cc2882eecb7ae25d59705aeac1671b3096c73e31aae38d5c894241d6066c0f301e7a9627b28f718a9168924bd9ddf6c2e96e661f4a1e381b192c6b5e175ed0 SHA512 8ef56b158ebd21d89e2fd6db80b2acb4ea3e97c413645526f31a8cfbf7331fc4476669478f1f28f9e65deaa41c124be309f3c90e949e2f50c7a75e38340b2950
 MISC metadata.xml 521 BLAKE2B 666d2a5e1366b0623f3ee47cae65ec248612729ffd0d39b009f0bb95ea79fefb1b0fa3343eff98841d2b1b0f6ccf03c6579370415cb4240441cff5f942557ed5 SHA512 36326936f659a738a0a7a0d1e7b6388820e4f19acf29dbd9efa646cdeb7ad65814b509f9619dddb822fc012ea8b2e06258d2887c5825283db6c77365a6fdc77d
diff --git a/app-portage/pram/pram-7.ebuild b/app-portage/pram/pram-7.ebuild
new file mode 100644
index 000000000000..515d0a342fb1
--- /dev/null
+++ b/app-portage/pram/pram-7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Tool to ease merging Pull Requests and git patches"
+HOMEPAGE="https://github.com/mgorny/pram"
+SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-vcs/git
+	net-misc/wget[ssl]
+	virtual/editor
+	!dev-perl/Gentoo-App-Pram"
+DEPEND="
+	test? (
+		${RDEPEND}
+		app-crypt/gnupg
+		sys-apps/diffutils
+	)"
diff --git a/app-portage/prefix-toolkit/Manifest b/app-portage/prefix-toolkit/Manifest
index ff3466f15f5c..041f2b31e6af 100644
--- a/app-portage/prefix-toolkit/Manifest
+++ b/app-portage/prefix-toolkit/Manifest
@@ -1,2 +1,3 @@
 EBUILD prefix-toolkit-0.ebuild 15920 BLAKE2B 2870e1ec8e65f26f38e15bad7f4ba5e6bedd909d34de3017885fa9d45a885646b586e26af29d226558103800e8b68db637516d5256007bba0f5e07452e565696 SHA512 87ca32003ec443f57d6980db36f098d2abc9bd28ae2c9361ef2f01fc9d9da66bac2fb2f1354b293212fa8cd53605cf5cc9a1974718e0d88f30a120f01816e50d
+EBUILD prefix-toolkit-1.ebuild 15932 BLAKE2B bd487e55cfc8bbd571d4668505914610d5be4627db4e43b5c941fe72e0ca276501e0312546078f5ca0e510e9630aff7212f9e696709dcd374cbb290f181f6de5 SHA512 86e1e36ca1460622cc6ae2ac2b75a02540966ed27e079b8dbf24d900bcccf5d9249c9d1133ba5228d83e27ad8eabb8bced37befde69b1fb93231425ae0e2ee5c
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild
new file mode 100644
index 000000000000..0b61ff486871
--- /dev/null
+++ b/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild
@@ -0,0 +1,567 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utilities for users of Gentoo Prefix"
+HOMEPAGE="https://prefix.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] ||
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+BDEPEND="
+	>sys-apps/portage-2.3.62
+"
+DEPEND=""
+RDEPEND="
+	!app-portage/prefix-chain-setup
+	!sys-apps/prefix-chain-utils
+	prefix-stack? (
+		>=sys-apps/baselayout-prefix-2.6
+	)
+"
+
+S="${WORKDIR}"
+
+my_unpack() {
+	local infile=$1
+	local outfile=${2:-${infile}}
+	ebegin "extracting ${outfile}"
+	sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \
+		> "${outfile}" || die "Failed to unpack ${outfile}"
+	eend $?
+}
+
+src_unpack() {
+	if use prefix-stack ; then
+		my_unpack prefix-stack.bash_login
+		my_unpack prefix-stack.bashrc
+		my_unpack prefix-stack.envd.99stack
+		my_unpack prefix-stack-ccwrap
+		local editor pager
+		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
+		do
+			[[ -x ${editor} ]] || continue
+		done
+		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
+		do
+			[[ -x ${pager} ]] || continue
+		done
+		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
+	else
+		my_unpack prefix-stack-setup
+	fi
+	my_unpack startprefix
+}
+
+my_prefixify() {
+	local ebash eenv
+	if use prefix-stack ; then
+		ebash="${BROOT}/bin/bash"
+		eenv="${BROOT}/usr/bin/env"
+	else
+		ebash="${EPREFIX}/bin/bash"
+		eenv="${EPREFIX}/usr/bin/env"
+	fi
+
+	# the @=@ prevents repoman from believing we set readonly vars
+	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
+		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
+		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
+		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
+		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
+		-e "s,@=@,=,g" \
+		-i "$@" || die
+}
+
+src_configure() {
+	# do not eprefixify during unpack, to allow userpatches to apply
+	my_prefixify *
+}
+
+src_install-prefix-stack-ccwrap() {
+	# install toolchain wrapper.
+	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
+	local wrappercfg=${CHOST}-${P}
+
+	exeinto $wrapperdir
+	doexe prefix-stack-ccwrap
+
+	local cc
+	for cc in \
+		gcc \
+		g++ \
+		cpp \
+		c++ \
+		windres \
+	; do
+		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
+		dosym ${CHOST}-${cc} $wrapperdir/${cc}
+	done
+
+	# LDPATH is required to keep gcc-config happy :(
+	cat > ./${wrappercfg} <<-EOF
+		GCC_PATH="${EPREFIX}$wrapperdir"
+		LDPATH="${EPREFIX}$wrapperdir"
+		EOF
+
+	insinto /etc/env.d/gcc
+	doins ./${wrappercfg}
+}
+
+src_install() {
+	if use prefix-stack; then
+		src_install-prefix-stack-ccwrap
+		insinto /etc
+		doins prefix-stack.bash_login
+		insinto /etc/bash
+		newins prefix-stack.bashrc bashrc
+		newenvd prefix-stack.envd.99stack 99stack
+		doenvd 000fallback
+	else
+		dobin prefix-stack-setup
+	fi
+	exeinto /
+	doexe startprefix
+}
+
+return 0
+
+: startprefix <<'EOIN'
+#!@GENTOO_PORTAGE_EBASH@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
+# Enters the prefix environment by starting a login shell from the
+# prefix.  The SHELL environment variable is elevated in order to make
+# applications that start login shells to work, such as `screen`.
+
+# if you come from a substantially polluted environment (another
+# Prefix), a cleanup as follows resolves most oddities I've ever seen:
+# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
+# hence this script starts the Prefix shell like this
+
+if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]]
+then
+	echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr
+	exit -1
+elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] &&
+	 [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]]
+then
+	echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr
+	exit -1
+fi
+
+# What is our prefix?
+EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@'
+BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@'
+
+# not all systems have the same location for shells, however what it
+# boils down to, is that we need to know what the shell is, and then we
+# can find it in the bin dir of our prefix
+for SHELL in \
+	"${EPREFIX}/bin/${SHELL##*/}" \
+	"${BPREFIX}/bin/${SHELL##*/}" \
+	${SHELL##*/}
+do
+	[[ ${SHELL} == */* && -x ${SHELL} ]] && break
+done
+
+# check if the shell exists
+if [[ ${SHELL} != */* ]]
+then
+	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
+	echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr
+	exit 1
+fi
+
+# set the prefix shell in the environment
+export SHELL
+
+# give a small notice
+echo "Entering Gentoo Prefix ${EPREFIX}"
+# start the login shell, clean the entire environment but what's needed
+RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
+# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
+[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
+# ssh-agent is handy to keep, of if set, inherit it
+[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
+# if we're on some X terminal, makes sense to inherit that too
+[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
+# do it!
+if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
+	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
+elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then
+	# shell coming from different prefix would load it's own
+	# etc/profile upon -l, so we have to override
+	'@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i
+else
+	echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr
+	exit 1
+fi
+# and leave a message when we exit... the shell might return non-zero
+# without having real problems, so don't send alarming messages about
+# that
+echo "Leaving Gentoo Prefix with exit status $?"
+EOIN
+
+: prefix-stack.bashrc <<'EOIN'
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# In stacked Prefix there is no bash installed, yet
+# etc/bash/bashrc from base Prefix still is useful.
+#
+
+if [[ $- != *i* ]] ; then
+	# Shell is non-interactive, bashrc does not apply
+	return
+fi
+
+if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then
+	source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc'
+	# only if base Prefix does have an etc/bash/bashrc, we also
+	# run bashrc snippets provided by packages in stacked Prefix
+	for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do
+		[[ -r ${sh} ]] && source "${sh}"
+	done
+	unset sh
+else
+	# etc/profile does expect etc/bash/bashrc to set PS1
+	PS1='\u@\h \w \$ '
+fi
+EOIN
+
+: prefix-stack.bash_login <<'EOIN'
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# In stacked Prefix there is no bash installed, so there is
+# no bash able to load this Prefix' profile as login shell.
+# Instead, you can specify this one as bash rcfile to mimic
+# a bash login shell using this stacked Prefix profile.
+#
+
+if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then
+	. '@GENTOO_PORTAGE_EPREFIX@/etc/profile'
+fi
+if [[ -s ~/.bash_profile ]] ; then
+	. ~/.bash_profile
+elif [[ -s ~/.bash_login ]] ; then
+	. ~/.bash_login
+elif [[ -s ~/.profile ]] ; then
+	. ~/.profile
+fi
+EOIN
+
+: prefix-stack.envd.99stack <<'EOIN'
+PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
+PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
+EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
+EOIN
+
+: prefix-stack-setup <<'EOIN'
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
+PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
+CHILD_EPREFIX=
+CHILD_PROFILE=
+
+#
+# get ourselfs the functions.sh script for ebegin/eend/etc.
+#
+for f in \
+	/lib/gentoo/functions.sh \
+	/etc/init.d/functions.sh \
+	/sbin/functions.sh \
+; do
+	if [[ -r ${PARENT_EPREFIX}${f} ]] ; then
+		. "${PARENT_EPREFIX}${f}"
+		f=found
+		break
+	fi
+done
+
+if [[ ${f} != found ]] ; then
+	echo "Cannot find Gentoo functions, aborting." >&2
+	exit 1
+fi
+
+for arg in "$@"; do
+	case "${arg}" in
+	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
+	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
+
+	--help)
+		einfo "$0 usage:"
+		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create stacked to the prefix"
+		einfo "                         where this script is installed (${PARENT_EPREFIX})"
+		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
+		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
+		exit 0
+		;;
+	esac
+done
+
+#
+# sanity check of given values
+#
+
+test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
+test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
+test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
+test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
+
+einfo "creating stacked prefix ${CHILD_EPREFIX}"
+
+#
+# functions needed below.
+#
+eend_exit() {
+	eend $1
+	[[ $1 != 0 ]] && exit 1
+}
+
+#
+# create the directories required to bootstrap the least.
+#
+ebegin "creating directory structure"
+(
+	set -e
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env
+	ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf
+)
+eend_exit $?
+
+#
+# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
+#
+ebegin "creating make.conf"
+(
+	set -e
+	echo "#"
+	echo "# The following values where taken from the parent prefix's"
+	echo "# environment. Feel free to adopt them as you like."
+	echo "#"
+	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
+	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
+	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
+	niceness=$(portageq envvar PORTAGE_NICENESS || true)
+	[[ -n ${niceness} ]] &&
+		echo "PORTAGE_NICENESS=\"${niceness}\""
+	echo
+	echo "# Mirrors from parent prefix."
+	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
+	echo
+	echo "# Below comes the prefix-stack setup. Only change things"
+	echo "# if you know exactly what you are doing!"
+	echo "EPREFIX=\"${CHILD_EPREFIX}\""
+	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
+	echo "BROOT=\"${PARENT_EPREFIX}\""
+) > "${CHILD_EPREFIX}"/etc/portage/make.conf
+eend_exit $?
+
+ebegin "creating use.mask/prefix-stack"
+printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack
+eend_exit $?
+
+ebegin "creating use.force/prefix-stack"
+printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack
+eend_exit $?
+
+ebegin "creating env/host-cc.conf"
+cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
+	CC=${PARENT_CHOST}-gcc
+	CXX=${PARENT_CHOST}-g++
+	EOM
+eend_exit $?
+
+ebegin "creating package.env/prefix-stack"
+cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM'
+	# merge with the parent's chost. this forces the use of the parent
+	# compiler, which generally would be illegal - this is an exception.
+	# This is required for example on winnt, because the wrapper has to
+	# be able to use/resolve symlinks, etc. native winnt binaries miss
+	# that ability, but cygwin binaries don't.
+	sys-devel/gcc-config host-cc.conf
+	sys-apps/gentoo-functions host-cc.conf
+	EOM
+eend_exit $?
+
+#
+# create the make.profile symlinks.
+#
+ebegin "creating make.profile"
+(
+	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
+)
+eend_exit $?
+
+#
+# adjust permissions of generated files.
+#
+ebegin "adjusting permissions"
+(
+	set -e
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack
+)
+eend_exit $?
+
+#
+# now merge some basics.
+#
+ebegin "installing required basic packages"
+(
+	set -e
+	export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}"
+	export EPREFIX@=@"${CHILD_EPREFIX}"
+	export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}"
+
+#	# this -pv is there to avoid the global update output, which is
+#	# there on the first emerge run. (thus, just cosmetics).
+#	emerge --pretend --oneshot --nodeps baselayout-prefix
+
+	# let baselayout create the directories
+	USE@=@"${USE} build" \
+	emerge --verbose --nodeps --oneshot \
+		'>=baselayout-prefix-2.6'
+
+	# Record the prefix-toolkit into @world file, as it provides the
+	# env.d telling the PM to manage this stacked Prefix, but may not
+	# (unlike baselayout) be part of @system set per the profile.
+	emerge --verbose --nodeps \
+		prefix-toolkit
+
+	emerge --verbose --nodeps --oneshot \
+		gentoo-functions \
+		elt-patches \
+		gnuconfig \
+		gcc-config
+
+	# select the stack wrapper profile from gcc-config
+	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
+
+	# do this _after_ selecting the correct compiler!
+	emerge --verbose --nodeps --oneshot \
+		libtool
+)
+eend_exit $?
+
+#
+# wow, all ok :)
+#
+ewarn
+ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
+ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
+ewarn
+EOIN
+
+: prefix-stack-ccwrap <<'EOIN'
+#!@GENTOO_PORTAGE_BPREFIX@/bin/bash
+
+if [ -r /cygdrive/. ]; then
+	winpath2unix() { cygpath -u "$1"; }
+	unixpath2win() { cygpath -w "$1"; }
+fi
+
+myself=${0##*/} # basename $0
+link_dirs=()
+opts=()
+chost="@GENTOO_PORTAGE_CHOST@"
+prefix="@GENTOO_PORTAGE_EPREFIX@"
+absprefix=${prefix}
+if [[ ${chost} == *"-winnt"* ]]; then
+	# we may get called from windows binary, like pkgdata in dev-libs/icu
+	# in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
+	absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
+fi
+[[ ${myself} == *windres* ]] && mode=compile || mode=link
+orig_args=("$@")
+
+for opt in "$@"
+do
+	case "$opt" in
+	-L)
+		link_dirs=("${link_dirs[@]}" "-L$1")
+		shift
+		;;
+	-L*)
+		link_dirs=("${link_dirs[@]}" "${opt}")
+		;;
+	*)
+		case "${opt}" in
+		-v)
+			# -v done right: only use mode version if -v is the _only_
+			# argument on the command line.
+			[[ ${#orig_args[@]} -gt 1 ]] || mode=version
+			;;
+		--version)	mode=version ;;
+		-c|-E|-S)	mode=compile ;;
+		-print-search-dirs) mode=dirs ;;
+		esac
+		opts=("${opts[@]}" "${opt}")
+		;;
+	esac
+done
+
+# remove any path to current prefix, need base prefix only
+new_path=
+save_ifs=$IFS
+IFS=':'
+for p in $PATH
+do
+	IFS=$save_ifs
+	[[ ${p#${absprefix}} != "${p}" ]] && continue
+	if [[ -z "${new_path}" ]]; then
+		new_path="${p}"
+	else
+		new_path="${new_path}:${p}"
+	fi
+done
+IFS=$save_ifs
+
+PATH=${new_path}
+
+# binutils-config's ldwrapper understands '-R' for aix and hpux too.
+# parity (winnt) understands -rpath only ...
+case "${chost}" in
+*-winnt*) rpath_opt="-Wl,-rpath," ;;
+*) rpath_opt="-Wl,-R," ;;
+esac
+
+pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
+pfx_link_r=("${rpath_opt}${prefix}/lib" "${rpath_opt}${prefix}/usr/lib")
+pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
+
+# ensure we run the right chost program in base prefix
+[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
+
+case "$mode" in
+link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
+compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
+version) exec "${myself}" "${orig_args[@]}" ;;
+dirs)
+	"${myself}" "${orig_args[@]}" | while read line; do
+		if [[ "${line}" == "libraries: ="* ]]; then
+			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
+		else
+			echo "${line}"
+		fi
+	done
+	;;
+*)			echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;;
+esac
+EOIN
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 7e30dadef91a..f6f8b66cc91d 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,8 +1,10 @@
 DIST repoman-2.3.10.tar.bz2 87545 BLAKE2B 67e1e514eebd50516aeaea2708ebe4c9d69cbf61add5fa19a31681f085a6dd8c39695cb63d9b4cd23caa955c85669148fce3c31c08b913e31839ff186e3b3ecc SHA512 498ce493661eb5939a5f1345337e11a84e97fc11a0556f2660bd8900f0cb0f6340a401e5728c4557248dd54bcdc0a7d2c72dbb23eea3acb35e053d7359c0e535
 DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06da4fb742e430c237d9be0e6261bcf5d8f3412f1c20a34e2766c5acc86176b4731f20adc9554de9949bd5622a5d SHA512 331614554bb7ba49b8b63b8612642426fb458aa84de78bb9958be85d03e43d662fc094ecd2472a6f06c6b4f0368ec0542083b04c25f7d8b6aabb432cd2b32367
 DIST repoman-2.3.12.tar.bz2 86737 BLAKE2B b27d89b0fe62d52607c55b1cf1d5662699d1e46ad7ef85553d642be8fb915435f1748914b9d63febb7dddd67bd5623f72ba4aa9ca7634af98f85634af91a74c1 SHA512 64bede0e1deb7d2a8c4c702d6845e84f8937cbfb54f6f35d88a10b13c961f28948f17c9e1d623bf0f663b22f98dc4e8f514c200fb4f1b93d7535addd5efa1342
+DIST repoman-2.3.13.tar.bz2 86733 BLAKE2B 7e281284924520c656acfe219eb57acdd61c8cc59b4942444a1eea0353649727ff79746f4237aa6f022e3ee8cfb13336e2c1db1a0469e1d5c34ea6067a04ae9d SHA512 852952cbbfb5cc7148ada111bad6db162843812a7ad35073426f1b9fc8a16adba43beebdb613e08712681fe3c3479904fd7bebb623af18465cbb5cc69ec00db9
 EBUILD repoman-2.3.10.ebuild 1947 BLAKE2B 5d1a5e9fe74a16d9bac3c12577c76e3e18dd6c6249d08a44b0d8b02863f9bfa5610470a2ca33a724ec7b5079402b4c5bf8f4d339da3200661cc6fb4148392355 SHA512 399353e4ea2e55a2d2be99b44040d1ff63786395f68270592f65db6a0172aec3dfbf1ec66f42e6b6511d01bae71b6c425c2b00f28fa1f0981b7b7d2ed46472d2
 EBUILD repoman-2.3.11.ebuild 1944 BLAKE2B e1fcbbbe81adb06fff85c70a53a5f0ef4951e99351ad32f99e3bf64a5b97a5ea9bc30b3de922e3355a623b840c5ed24d13215b9fdbe091cd858dea6e824a9356 SHA512 309c463aa75cbc09d1e0c58748ccb6920ba722a57d5146e319aea38f9a7c80308859ea746668bfe66da23c23748d470b91b5e71faa6feb6acf913aca3e73b11b
 EBUILD repoman-2.3.12.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
+EBUILD repoman-2.3.13.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
 EBUILD repoman-9999.ebuild 1984 BLAKE2B 731d6bd31c3f65e5402c3ca736afda5e7c566a25d59e869fde16a39cad2541a9261820d72c67150e8789464c8043f24d8329d40c3e8121ce61bc1bc6daa3795c SHA512 e411f9c7ba86104fb32f0013c12956362fe3de11fe5d3238999c4b5c3c625bdd6c7fe6fb136de24993e2525655b9c22c0a06d285323a8babccfb6fc0572a4924
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.13.ebuild b/app-portage/repoman/repoman-2.3.13.ebuild
new file mode 100644
index 000000000000..f4313d582c61
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.13.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+	S="${WORKDIR}/${P}/repoman"
+else
+	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.3.43[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+pkg_postinst() {
+	if [[ -z {REPLACING_VERSIONS} ]]; then
+		elog ""
+		elog "This release of repoman is from the new portage/repoman split"
+		elog "release code base."
+		elog "This new repoman code base is still being developed.  So its API's"
+		elog "are not to be considered stable and are subject to change."
+		elog "The code released has been tested and considered ready for use."
+		elog "This however does not guarantee it to be completely bug free."
+		elog "Please report any bugs you may encounter."
+		elog ""
+	fi
+}
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 830cf77d177e..de8f1fbc443f 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,4 +1,6 @@
 DIST unsymlink-lib-13.tar.gz 8736 BLAKE2B 5b44112299232185f3f7a5d88057caa7e9161ca03a3e79bebd9dbf70a61ddde255d3a24679b9004cc572fedcfc24ffeb42693319e5dfa1f8371f8fed1408b15d SHA512 c87676b80259f2a20fde257e2b090380c3b04be1542a5a92832487327b8d1eb737059a6e6898f713fa378b792e23d2896280b94cb00d7961a0beba81cd6b3bd2
+DIST unsymlink-lib-14.tar.gz 10089 BLAKE2B 24252eb31a0a0fe83a260e8eee76d42c473d76dbebe4d2fd604d1ab663ea7439da4c03dd0b953efa30e0d74d654101b7a0264db1da50de826c5a5f4ae79f3ff0 SHA512 ab3ffcbc7cdcac98068a6e3c86e71cb472cff67aed1ddc570701ed6c34fa17e04d84a13bf5fb2696aeff0f8338b2464d1e06ce829ffc693011c51481ecba2be8
 EBUILD unsymlink-lib-13.ebuild 582 BLAKE2B b62d621c212ba50a4fd23f1a7f82556293cb641fea9780b8912f4eb0574afc4d743487a0d7c0ed1466085de10a5c80f2cd5d2908b1b0c8175e12952fd8275ee9 SHA512 99c47df9a06d16b8ab5a35dd1a5d987641f8652a447de245cce7786a8cfc252d57fd693c9e78078bea53b933664826200e8f3b5fe958974f67cf0152d176cc88
+EBUILD unsymlink-lib-14.ebuild 630 BLAKE2B a7a82062dd14d42f6933b292abcc5567bf5e942238f3604719796675e4a41509c06afb04d9ed2005e500be83f5ebc6802c0c9744e3b3ddd5b76f569dbb311c47 SHA512 b082779cccb6a4fff08bbe6028b3a4daaa14f606616081e9b7bb33ae9377c1a0cc92b552b78857dd9904a82dc8963e9310b0d37e05fd68015011e5d945d012d6
 EBUILD unsymlink-lib-9999.ebuild 568 BLAKE2B c9759f261cf2c0e79b5250f7a9cc80a4f64d489152833cfc163e475071278d83e5c22946433da0a1659c247fbbe33a6904d91d1ab05bdffac75b7e499d537342 SHA512 4e97c29a2633b030c81151cad3348dd7fe3eec2d7908c21153b3fdde4fe0566f3be9c6036730769520525e851bcbd4597ddde767c0300b9397f29657e9e819a0
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-14.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-14.ebuild
new file mode 100644
index 000000000000..90b56e60ca45
--- /dev/null
+++ b/app-portage/unsymlink-lib/unsymlink-lib-14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit python-single-r1
+
+DESCRIPTION="Convert your system to SYMLINK_LIB=no"
+HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
+SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	sys-apps/portage[${PYTHON_USEDEP}]"
+
+src_test() {
+	# tests are docker-based
+	:
+}
+
+src_install() {
+	python_doscript unsymlink-lib
+	dodoc README
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 57b56be45bf4..86dee11916c7 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 a974014ddfb6..71aa438e7f58 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -3,8 +3,10 @@ DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aa
 DIST bash-completion-2.8.tar.xz 286128 BLAKE2B a99faeb3c9ee2ea6d1cc9988e61951f4e688ac0b3c6837d1fd43381519fedf5f95167e8dbc166543b0235f3ac61d92af35eb8399efc0cd297a62849071dee5c7 SHA512 d839ef5a98811a2aade7ebdc0bc84c84a41c74db384f89913b06f3c25add1ba22528ac25392b19d27280685d258c74dcdc11247cbaae5b8d82f2c0b546abc268
 DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
 DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
+DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
 EBUILD bash-completion-2.7-r3.ebuild 4109 BLAKE2B b19159a733eb34738622add375c11d71dad1b5bee4c16b3d7bf2b2d588757e0b412807601a3e9ab9a2bb9e1a796354d59f3fbe796f91577d7eb5368c499896f5 SHA512 2e91fc722b51b39cef6ba2892645cac41321d840e14d3774732084f6a091859d5ff01282e10a7ce1cc5ed89ed8e1473fe7afee551f0df4c1104b4d44dd7c770a
 EBUILD bash-completion-2.8.ebuild 4057 BLAKE2B 09f82c80d498f02154d144730a7b8d2d4ddf254fe2e52d972bd1107d0ae3bdb583d161e04a3bd3c3a45d41b87c1bfbf187697d2789926e0af410dbb09cfefc9d SHA512 081ead91d74f818f4c3fdfeb3643fe55f744afa26730284b79242379d7358c957549efda8091cf108aaa5f8195d2fb3610474072a141eda1573d68121a7d7b23
-EBUILD bash-completion-2.9.ebuild 4704 BLAKE2B a9a7dcc93f15aaecb10909f1f82c107168be24fa3b717632f76ef90196cadf8ab163354cd137d85329ac219cfaa7b98551870ddddd6f497b251e78ed50cc3983 SHA512 73d473f2f811aba2e32f2498115506fe6cfed7dc055b012ea4a6c45a6ae9e516996eed097c89cd67fb102bffe0b6e9299dc74918c4ee6d2c554fb24df4b6f4f2
-EBUILD bash-completion-9999.ebuild 4421 BLAKE2B 8c597c1aefa2a578376111283516ed30731fec0f1ce499fadb60828bc272d0f16fd009275e9945583f22027ca56d749d111f8ec3ebee797b9d4a11805c40dab7 SHA512 e94c33b431069544d88b34b0729ed0057efb26f65faa5471e7c54e70699fd11aafd64e9c00b747ad19eedf8b7fd0b9dd3495e42e69b9875142765f789b2572ef
-MISC metadata.xml 1309 BLAKE2B db08060cd74841bd7220e688e251225ddaf59e4da737c08785e7c6ce83c2d40600fbe38e9b9449fb559ccb2d03b8c2368295b647ec2a52191429fe1d3d1c7470 SHA512 3ee23fb6cbee1e80a0c8fab13f7bb67bdad3292fa8ec187e306b00804a7bf709358c8c08eda4101a5f5baa408e0892aa94c07ae466b5beae4edc18055b1192ee
+EBUILD bash-completion-2.9-r1.ebuild 4816 BLAKE2B fb10aa20dcace7020a209d479aa2346bdbddb28eb73f3d7a7aeda1cbd02820b8e2ddbc63ecc46f7ea255aa1a442a4341ab4416a1b566fe99657827f3f1adeaa0 SHA512 62f99d0f540441b5e14c26de777e0c41b40c1bb8eb03faf194d93ffcd3923b0adf573512a2056544e44a798f9645b7cf30c6dc870ce6a8774aaea66e710fdf6d
+EBUILD bash-completion-2.9.ebuild 4699 BLAKE2B 9bb3a90bee16acb270a76a669e710c1c6095d07bb89803ff51668cf37e60809b31f58ba22c2d15b772292b3cfbddaaadcfdf843a8f503b772f7c5c7685607d98 SHA512 330b4679a4e98c39d14f25c02a25626fd216c65cce2fbc80b6dac894837e87028e448730f2bfdf63397349ec7525fcf3b96e6f67ccab47295cae271b95d3a299
+EBUILD bash-completion-9999.ebuild 4580 BLAKE2B d974f17d8526f30e9907d2f09ed6024f688e8829499a0069d042404752712e7e70b24182fb71a61acd9820c916b6af9c2bc785629959ca66e0491b8add77c9ce SHA512 1dadaf29fc2ca6c5f42a7eb954b060ad400ab4eac953a581d09d8412fd863343391e2c6f8ca31bad25595aecc2ba515c67ff04417b4c3e490d2a127cb77fb3f0
+MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d
diff --git a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
new file mode 100644
index 000000000000..91aa3bb0061a
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASHCOMP_P=bashcomp-2.0.3
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit bash-completion-r1 python-any-r1
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="
+	https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	eselect? ( https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE="+eselect test"
+RESTRICT="test"
+
+# completion collision with net-fs/mc
+RDEPEND=">=app-shells/bash-4.3_p30-r1:0
+	sys-apps/miscfiles
+	!app-eselect/eselect-bashcomp
+	!!net-fs/mc"
+DEPEND="app-arch/xz-utils
+	test? (
+		${RDEPEND}
+		app-misc/dtach
+		dev-util/dejagnu
+		dev-tcltk/tcllib
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+strip_completions() {
+	# Remove unwanted completions.
+	local strip_completions=(
+		# Slackware package stuff, quite generic names cause collisions
+		# (e.g. with sys-apps/pacman)
+		explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+		# Debian/Red Hat network stuff
+		ifdown ifup ifquery ifstatus
+
+		# Installed in app-editors/vim-core
+		xxd
+
+		# Now-dead symlinks to deprecated completions
+		hd ncal
+	)
+	if [[ ${ARCH} != *-fbsd && ${ARCH} != *-freebsd ]]; then
+		strip_completions+=(
+			freebsd-update kldload kldunload portinstall portsnap
+			pkg_deinstall pkg_delete pkg_info
+		)
+	fi
+
+	local file
+	for file in "${strip_completions[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+			die "stripping ${file} failed"
+	done
+
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	use eselect &&
+		eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
+	# Bug 543100, update bug 601194
+	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
+	eapply_user
+}
+
+src_test() {
+	# Tests need an interactive shell, #477066
+	# idea stolen from:
+	# http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	# override the default expect timeout and buffer size to avoid tests
+	# failing randomly due to cold cache, busy system or just more output
+	# than upstream anticipated (they run tests on pristine docker
+	# installs of binary distros)
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check RUNTESTFLAGS="OPT_TIMEOUT=300 OPT_BUFFER_SIZE=1000000" PYTESTFLAGS="-vv" \
+			&> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	strip_completions
+	# fix missing aliases
+	bashcomp_alias tar bsdtar gtar star
+
+	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+
+	# install the eselect module
+	if use eselect; then
+		insinto /usr/share/eselect/modules
+		doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+		doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 2.1-r90; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}
diff --git a/app-shells/bash-completion/bash-completion-2.9.ebuild b/app-shells/bash-completion/bash-completion-2.9.ebuild
index bef979856f82..0046eb1249db 100644
--- a/app-shells/bash-completion/bash-completion-2.9.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE="test"
 RESTRICT="test"
 
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index bd5e53f21aa0..ee27e7fcf8fe 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -3,19 +3,17 @@
 
 EAPI=7
 
-BASHCOMP_P=bashcomp-2.0.2
 PYTHON_COMPAT=( python3_{5,6,7} )
 inherit autotools git-r3 python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="https://github.com/scop/bash-completion"
 EGIT_REPO_URI="https://github.com/scop/bash-completion"
-SRC_URI="https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
 # completion collision with net-fs/mc
@@ -23,7 +21,7 @@ RDEPEND=">=app-shells/bash-4.3_p30-r1:0
 	sys-apps/miscfiles
 	!app-eselect/eselect-bashcomp
 	!!net-fs/mc"
-DEPEND="app-arch/xz-utils
+DEPEND="
 	test? (
 		${RDEPEND}
 		app-misc/dtach
@@ -79,13 +77,21 @@ pkg_setup() {
 }
 
 src_unpack() {
-	git-r3_src_unpack
-	default
+	use eselect && git-r3_fetch https://github.com/mgorny/bashcomp2
+	git-r3_fetch
+
+	use eselect && git-r3_checkout https://github.com/mgorny/bashcomp2 \
+		"${WORKDIR}"/bashcomp2
+	git-r3_checkout
 }
 
 src_prepare() {
-	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
 	eapply_user
+	if use eselect; then
+		# generate and apply patch
+		emake -C "${WORKDIR}"/bashcomp2 bash-completion-blacklist-support.patch
+		eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
+	fi
 
 	eautoreconf
 }
@@ -124,9 +130,9 @@ src_install() {
 	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
 
 	# install the eselect module
-	insinto /usr/share/eselect/modules
-	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
-	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+	use eselect &&
+		emake -C "${WORKDIR}"/bashcomp2 DESTDIR="${D}" \
+			PREFIX="${EPREFIX}/usr" install
 }
 
 pkg_postinst() {
diff --git a/app-shells/bash-completion/metadata.xml b/app-shells/bash-completion/metadata.xml
index 2bb3ef236242..159d6c88d62d 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/metadata.xml
@@ -9,6 +9,12 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<use>
+		<flag name='eselect'>
+			Support blacklisting of completions via 'eselect bash-completion'.
+			This enables custom Gentoo patching of upstream completion loader.
+		</flag>
+	</use>
 	<longdescription>
 		Since v2.04, bash has allowed you to intelligently program and extend its
 		standard completion behavior to achieve complex command lines with just a
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 34a256cad8b4..8c3ed5eb0d53 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -4,6 +4,6 @@ AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
 EBUILD fish-2.7.1.ebuild 2419 BLAKE2B b94dbcf8431311f50ec2b49ab8ad62e8af3519262b2518d4b72a0074e837b38bf3aea6e93655d7b60ccbb09ef2abbbab946ba5012337c15de73a3c7d910295a8 SHA512 d818578a42171939d35ecd9dadbe875bbf93427e662783fb6bfb3033f17ab3298df58999f4e71e4ec8af666c7388fbc6bd694af119c0d1532c78ff5de1286b41
-EBUILD fish-3.0.2.ebuild 1687 BLAKE2B d46f0eab97bb5ee1e40ec2fba96904da49a939332144dc893c1b1f7f9454ebf7551256db444bff6f47bb1226b2bbf8b8dabe49a9b965ee0fe8e88e74646b4dcb SHA512 ab99cd6976905444e75bf65dc296c890f90be9d616d0638a15d595f5d548f3f037bf26948e1325836de7d782644651742ede7329b3f2bce721035ed6e4103f47
+EBUILD fish-3.0.2.ebuild 1686 BLAKE2B 5584cd3239c40a13cd6f2cf74ed50547911fd2327feeb316c9e86d6614d63d30b8f07e72015e7ae65286dd3ea7d3fc268baa5db1758481513ab1663cabcb0b3a SHA512 1c16fee53eb2496bd8b0bd008af7f18b942ecf5aaea6240780fc3bc4d0ba91b35ba21012d67ab40c763d8499039323a414809df684b3b94ea9dd99d26f7a4209
 EBUILD fish-9999.ebuild 1619 BLAKE2B 0153dd8b58b2215d878421411226a7b32d7bca3ba69622456506b0c75bfde528a0ba2ad10000c046f87f4b4d77d828a1fa102c56be0f9972707d7017f7ce4e57 SHA512 f695e364fd3cd033775787fab19135bb8c10bdcb9f90d2943d7c62fe12dd8c0f8e4c58ad78577239a7019828b461da3fd820300cc5f0e314b215f72a7a3c9400
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
index 207077a6dcf4..e6150ca3dcc6 100644
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index af819e23fdd3..7e17b8da1e66 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,3 +1,5 @@
 DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981
-EBUILD ksh-2020.0.0_alpha1.ebuild 598 BLAKE2B 05efbc081efdac93e1b8ce188d0e4d3e18ea7755a2e15e12bf79ed57f6496db4da2539bcaadea05c5e9fb6c907413a20d330bdf83f125392775bf99303e31594 SHA512 694bcb9a212ed86d0c50af3b518b6a1ed8bffe8769b56b9fe6652ecb42dfda074854f58d51b1cee3b42983b0dddd030b5a639233978678483861ff55723e458b
+DIST ksh-conftab.patch 118773 BLAKE2B 63466e18a77cb86af80d6f6b4af74e3ac1edbfa735decfcd772633808a4593f6d4b057a99547482d17b22445e68c6d3e2becdf68516f913c73550da718f2abc3 SHA512 b29a70e8e31a259ac5bf556ddcdb5d4742a8dac4d11c06e4b5fc3043012e08b26d136cce8c18e9e8a1fe751044699d2258388d618408b09379732bea89a51765
+DIST ksh-solaris.patch 12317 BLAKE2B 90681bde2f3bad0e097a9367ea5a3f1d4c95f70c6e0c872dad769609f97a6332328e21399a3b9ba20f3840b3387a02370831ae4663457728bd8e41b7471c675b SHA512 5a0b818f44a860210e2a7795335d0edec01c61dd5ad04670bb2ca505690ff1b111dbda12d0d15e8b264113d4e7a5a42a49f64c9aba0cff809c2ce3185921acad
+EBUILD ksh-2020.0.0_alpha1.ebuild 881 BLAKE2B dbeac3ac74490d77d17e65dd2a0c612f5cdad924cd6de08a74b52c8f6a24a85aa387c0f7ac362cb41ed93ab838611b5bc6c5dbafd10dd4e6138c0e02c297bced SHA512 2ed9f8f485ed1ccd5fdc891f4a96fe7974c6d7b65d234b125e7f7cb442073975c67cf8217695d909cfad44b238d6d31b7b0067dd1d3eb07fc9ed2b5657bef28b
 MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810
diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
index 4927a8e7fe18..b8f743ad437e 100644
--- a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
+++ b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
@@ -10,7 +10,9 @@ HOMEPAGE="https://github.com/att/ast"
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz
+	https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ksh-solaris.patch
+	https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ksh-conftab.patch"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="CPL-1.0 EPL-1.0"
@@ -19,6 +21,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="!app-shells/pdksh"
 
+PATCHES=(
+	"${DISTDIR}"/ksh-solaris.patch
+	"${DISTDIR}"/ksh-conftab.patch
+)
+
 src_install() {
 	meson_src_install
 	dodir /bin
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index 08b7ea0c58bb..4857a7ef4837 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -23,6 +23,7 @@ DIST libsqlite3-sys-0.10.0.crate 2175426 BLAKE2B dc7cbbcb632e2de1e8fcd6372cb0a82
 DIST linked-hash-map-0.4.2.crate 15980 BLAKE2B f31e0dc6f6bb3af355981491e42ce70ac91cbcf059c3d7da8ad2160c40c379bf6d10aab1fdc8400df4497e30ae8dc8c37149ec23084b589fb9a17b8dcf7fbdb4 SHA512 e9ca0dcf09338b8bf2e669eae241b1d07a08c430b2c1fb8adde9a79218aac8f0ad3a13d515202fbf7d0d6f3607e64c4fb3b8b9fe9190655897ae7aeeeb91dbce
 DIST lru-cache-0.1.1.crate 8645 BLAKE2B 027f7051ce930701b97017638f2091efef0b3be330fe1cf534d31c7040c8eb55d73d8e397644584d642e370ed2c109f6df61a6da020f6df5f5756cfccbdf9216 SHA512 f397be62edf59bcb36767e338427684274c3ec900d96f92c75859c61ae52f78c42a551bb298e256b76f65bc7b5765c453a07baa61dcb01bfb93ca8a41612b521
 DIST mcfly-0.3.3.tar.gz 242714 BLAKE2B 05f038bfb502d0dd6938c6ecf2a8f36673a26e7bebd8b8f543f12c500db0b1b431c476384641fc0d66efc9fd537a2c94c0ef41bf26d1b2f78f3ddd551e94b51c SHA512 b68484256421f0e8f11326cc4e321fdc0bdccb9fb01e919c143338ec315c0a69c90e2d9977265096a34d3db5f2709663579e851f41b637903e3d12ca92959631
+DIST mcfly-0.3.4.tar.gz 193516 BLAKE2B e30e438460788ab385924e729d1bd1a00eb6642eaa2f09d378ad20431218dee56153ac8a22c310b733202ac1929dc4e8c800ad480c66cfe3a21f96a79cff43b6 SHA512 49a69c6b4af6814333860262ced4d0d83703d397f5c2f46f9d4351eec9def91c0eff39069982ae67c8fbd5371d562e9e6afbb778472d83dee13aace62f456bf2
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
 DIST nodrop-0.1.12.crate 3033 BLAKE2B 69792f5ac9722dc570749795b6e0e6c6373c44614bf5861846af08d426d18e5929ad3c5b957adf3480e8c77444cec9d33b3e8b272eea9c7200f0cedf0d78e7ac SHA512 8f2856a6467715565ea5b3be181fc957f6cbc885797c15582ef5be5a71089201292ea58f94877496737dfd427b19523228fa4bde49d9413a8399d2e7888b99aa
 DIST pkg-config-0.3.11.crate 13227 BLAKE2B f22a748d9330848379d9bcc32026c9ba4bcffc043495b864af95dde36ce3fe71344bf5b0534aa61574f677b9a3d1ec0e09f774dea0ee57c1810f1e6bd7edc1e4 SHA512 c5e53a9dd777bce55889fdf7028418443896890ff120beb2fda5e5fcc55624aaefc2ac058c2b4bc88519d48bacc477351b0ab1c4d4a65b4e4bf66a69a419aae6
@@ -55,4 +56,5 @@ DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD mcfly-0.3.3.ebuild 1648 BLAKE2B e8189acac680a7036bbe74ccfda2d82d060272b540e59ac7068b541adbae6c59ba6c168637ec743f00f0ae719372bb428daa60bad7678d94872ef46dd04067c2 SHA512 f06fcb0cb38d6c643aabbf5378d22b73eaa576e4c2e482f2889b8e2129ee4e61b402267110ac2cf26d00c59eb3edea27bd6e62162b29598f2287654a42dc4af1
+EBUILD mcfly-0.3.4.ebuild 1648 BLAKE2B e8189acac680a7036bbe74ccfda2d82d060272b540e59ac7068b541adbae6c59ba6c168637ec743f00f0ae719372bb428daa60bad7678d94872ef46dd04067c2 SHA512 f06fcb0cb38d6c643aabbf5378d22b73eaa576e4c2e482f2889b8e2129ee4e61b402267110ac2cf26d00c59eb3edea27bd6e62162b29598f2287654a42dc4af1
 MISC metadata.xml 754 BLAKE2B 9ffcd71049bc11d8ad580f9721158f931918b2d0cd4fc9e465fda580bad0a853a47c58b4b258d98a654102d195015b32f9d8cbe62343b2c14222a0ea229ea3a3 SHA512 8159ff903511596ba5c7779f89a827101a6c22b8b36bde69cabf89470dcc970fc1755f921bb26952778f9b8e9e518ac7b45edb92c08471b9ec89f01074e8ee9b
diff --git a/app-shells/mcfly/mcfly-0.3.4.ebuild b/app-shells/mcfly/mcfly-0.3.4.ebuild
new file mode 100644
index 000000000000..1ce9fc5247ae
--- /dev/null
+++ b/app-shells/mcfly/mcfly-0.3.4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+ansi_term-0.11.0
+argon2rs-0.2.5
+arrayvec-0.4.7
+atty-0.2.10
+backtrace-0.3.9
+backtrace-sys-0.1.24
+bitflags-1.0.3
+blake2-rfc-0.2.18
+cc-1.0.18
+cfg-if-0.1.5
+clap-2.32.0
+cloudabi-0.0.3
+constant_time_eq-0.1.3
+csv-1.0.1
+csv-core-0.1.4
+dirs-1.0.4
+failure-0.1.2
+failure_derive-0.1.2
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+libc-0.2.42
+libsqlite3-sys-0.10.0
+linked-hash-map-0.4.2
+lru-cache-0.1.1
+memchr-2.0.1
+nodrop-0.1.12
+pkg-config-0.3.11
+proc-macro2-0.4.20
+quote-0.6.8
+rand-0.4.3
+rand-0.5.5
+rand_core-0.2.1
+redox_syscall-0.1.40
+redox_termios-0.1.1
+redox_users-0.2.0
+relative-path-0.4.0
+rusqlite-0.15.0
+rustc-demangle-0.1.9
+scoped_threadpool-0.1.9
+serde-1.0.75
+shellexpand-1.0.0
+strsim-0.7.0
+syn-0.14.9
+synstructure-0.9.0
+termion-1.5.1
+textwrap-0.10.0
+time-0.1.40
+unicode-segmentation-1.2.1
+unicode-width-0.1.5
+unicode-xid-0.1.0
+vcpkg-0.2.4
+vec_map-0.8.1
+winapi-0.3.5
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Context-aware bash history search replacement (crtl-r)"
+HOMEPAGE="https://github.com/cantino/mcfly"
+SRC_URI="https://github.com/cantino/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	cargo_src_install --path=.
+
+	insinto "/usr/share/${PN}"
+	doins "${PN}.bash"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local p="/usr/share/${PN}/${PN}.bash"
+
+	elog "To start using ${PN}"
+	elog "Add the following to your ~/.bashrc"
+	elog
+	elog "[[ -f ${p} ]] && source ${p}"
+}
diff --git a/app-shells/rc/Manifest b/app-shells/rc/Manifest
index f560f8c97eff..f0cfdf1a6a2c 100644
--- a/app-shells/rc/Manifest
+++ b/app-shells/rc/Manifest
@@ -1,4 +1,3 @@
 DIST rc-1.7.4.tar.gz 215206 BLAKE2B df01f618cd4d3c5bbf155768ada49c20fe7916e2b999ae13d08487b00c4565c3c4d1d45d16dddef70fe58cf7c405d293832b31dc8a66d8b36b2503675b260db1 SHA512 49e124207b5370b88b8fba0376dda33451451a58bfb85fabfc06ae59eb88fedf38d7aeaaf292e4f380e2c00efc8301ba68d12180923186d1c53ef94f78f7e435
 EBUILD rc-1.7.4-r1.ebuild 931 BLAKE2B 68829f9ee2219282bfb380ded88f23dbfea27a78a8d78f7a150172df26deedb28878324bff39ec04b9d87c31d64310f8b32ef5d217903a72dae79ab44b3209eb SHA512 74abce16dd79d884cc7067585b5295b16704edfe1695caaecd6c8389bea8821465533e71f0da2219417ae4b81f9798ed94542483baa12fca57b81b915a699ba0
-EBUILD rc-1.7.4.ebuild 891 BLAKE2B cd4906a048ce647f7bdf36bb6e6bb57075190cca66f14e52e5216fdf8af2661315d7e76850d6e624be390d824c420210e928dbbb2f417b0bce721e8b93a5978c SHA512 510499cf748c113ec3a2ed6338e3a36256da9166ec3a6fcb49f31597e75c078409387ca40a883236c7158e150e01919f3993bc5aef6e052d2a74787b7efa988b
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/app-shells/rc/rc-1.7.4.ebuild b/app-shells/rc/rc-1.7.4.ebuild
deleted file mode 100644
index 71bf031e21ab..000000000000
--- a/app-shells/rc/rc-1.7.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A reimplementation of the Plan 9 shell"
-HOMEPAGE="http://static.tobold.org/"
-SRC_URI="http://static.tobold.org/${PN}/${P}.tar.gz"
-
-LICENSE="rc"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libedit readline"
-
-RDEPEND="readline? ( sys-libs/readline:0 )
-	libedit? ( dev-libs/libedit )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myconf="--with-history"
-	use readline && myconf="--with-edit=readline"
-	use libedit && myconf="--with-edit=edit"
-
-	econf \
-		--disable-dependency-tracking \
-		"${myconf}"
-}
-
-src_install() {
-	into /
-	newbin rc rcsh
-	newman rc.1 rcsh.1
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if ! grep -q '^/bin/rcsh$' "${EROOT}"/etc/shells ; then
-		ebegin "Updating /etc/shells"
-		echo "/bin/rcsh" >> "${EROOT}"/etc/shells
-		eend $?
-	fi
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f62f4fc8c4c9..287694635789 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 05ab5b6d35ed..e4108e8a1c9a 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,9 +3,11 @@ AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc910314205944
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
-DIST calibre-3.41.3.tar.xz 38508848 BLAKE2B bbbe888bab285207a23a24a152b396cdc51723442e49d6e8ea6d3631cc4c6d67d421452d3d616d03dbe89f6df292dcdce5b564d6ed423dfece60a4bc59678a87 SHA512 9bed5d05fbe0a6b0e5c8d290f21ffc9b61c51767437aafb72afd3db94f755be3bd68f84cd1f73e5d15c7039dd0858a666975e860577f9ce84999aa9ed8e1a895
 DIST calibre-3.42.0.tar.xz 38530420 BLAKE2B 3b1fa7abfed277f7a787fa2b65697817d0fe8553d570901a8817e63756f7edc8321c18768fb9c965382f9027d053af708fdf54c4288c831acb0ec03a64748651 SHA512 0a9b18cbf1d4e75d1e10e9dcf7318f07687e0a39d1d524f99f47240d28bc13cad6f28bc30e7cc9662766264d9a465fa4f24cbc27e5f36d20cfb1a8f94ed8ced2
+DIST calibre-3.43.0.tar.xz 38682448 BLAKE2B 6a19be6741ecc2abc839731ca35684363310431db5fa8f5cccd264f7bef37cd365ae5f38f97f8b4de323c035bcfcab30e0b2ade8a366d1e96a70a22f6c4aaa54 SHA512 e187b2509041303102980cbd70b856b7699a7d5b2a9010f817406164ef785cd0c6c7ee77ebf8d674183e0dfc6928ed9316d2c2440bc1fe762f112784216c35a8
+DIST calibre-3.44.0.tar.xz 38643008 BLAKE2B 7eb1412aa5de6ba2f48ea13e922dffff7ace0f4f475832ebe122db967c71df05b6bbb45092bdd53ddfe35d7a0c2af566ed83dde9aac64200d41ea2adc4cb1886 SHA512 a97f45f5f788357f62b4088c4d8190cd3e3b790685871d5a024342d5d21ca978d46fa4e47f85eef4b9fbc0774923732938a812dd188cd4a315445cf25b187d28
 EBUILD calibre-3.26.1.ebuild 9312 BLAKE2B b9e7712133717e608f2d6195fb3f4cc88a40f6628f74e7ae08294bc75bbb7ac42e29f7b07db77712028bc12b71950ffa3782a17dd028a7fa0e083cd2a58f733b SHA512 6a5297715b33057a539ddf46d195cdbef6a8fe9cc4f183dbc2dd78ec55352da288c904a969417c53b38db3500f4a2fb88df741fd1a0c54df11739b1e27471eb0
-EBUILD calibre-3.41.3.ebuild 9544 BLAKE2B c59219a990d34e9e1ee641f42e7c5ecd040c425874d2bf81009255b744ba79920ac933e86375112051c8aec995fe2832bf24a666aa3597c267803b0c89dc7cda SHA512 0f8993342fa9a0ba2ada9cdbac9781e0aa84116e54cc875b88d2a38263462781e286c143947f5d3ca5668b901f972f5676411ec39ebc6812e708942c2ea860fb
 EBUILD calibre-3.42.0.ebuild 9381 BLAKE2B 0212217986fc7cbf879ba2561709fe9214dfd041f0559c304d4688149e9aa7b5b37be18cf96a7ce260b95a0eebcebe842ea83184823debaa3fcd60b794eaa5ad SHA512 749550359d7f0413acab0525516fa6cae110ba85dc0547264184e300926b5be9b6add87cb662f442369129a807cbbc32b5a71a4e4efcf396b83bc2a76006070f
+EBUILD calibre-3.43.0.ebuild 8463 BLAKE2B 4d64575071287d1887961951f15b27a191528c25dd23aff2b63f8485b37df6e0e13b8a2fa60cf4775ae66cdc43c3fa993cdb3f51b30766fcb748a52b2e93fcd3 SHA512 b53974d5a58bf7bedea790b1ef41d79f152c7b2f91a9849294768ef321591b03de9e59ec46fd6f4cd1f1cad52e655c3ebbd69e1e3e0afd59ab20cd1d14356504
+EBUILD calibre-3.44.0.ebuild 8463 BLAKE2B 4d64575071287d1887961951f15b27a191528c25dd23aff2b63f8485b37df6e0e13b8a2fa60cf4775ae66cdc43c3fa993cdb3f51b30766fcb748a52b2e93fcd3 SHA512 b53974d5a58bf7bedea790b1ef41d79f152c7b2f91a9849294768ef321591b03de9e59ec46fd6f4cd1f1cad52e655c3ebbd69e1e3e0afd59ab20cd1d14356504
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.41.3.ebuild b/app-text/calibre/calibre-3.41.3.ebuild
deleted file mode 100644
index 721c5da17ba3..000000000000
--- a/app-text/calibre/calibre-3.41.3.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# don't create/install uninstaller
-	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
-
-	sed -e 's:^#!/usr/bin/env python3$:#!/usr/bin/env python2:' \
-		-i src/calibre/devices/mtp/unix/upstream/update.py || die
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C #684484
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	#dodir $(python_get_sitedir)
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	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-text/calibre/calibre-3.43.0.ebuild b/app-text/calibre/calibre-3.43.0.ebuild
new file mode 100644
index 000000000000..cc0a05f19e8f
--- /dev/null
+++ b/app-text/calibre/calibre-3.43.0.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/calibre/calibre-3.44.0.ebuild b/app-text/calibre/calibre-3.44.0.ebuild
new file mode 100644
index 000000000000..cc0a05f19e8f
--- /dev/null
+++ b/app-text/calibre/calibre-3.44.0.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest
index 071b67e6af52..4bfe86590820 100644
--- a/app-text/convertlit/Manifest
+++ b/app-text/convertlit/Manifest
@@ -2,5 +2,5 @@ AUX convertlit-1.8-respectflags-r1.patch 838 BLAKE2B 4ba437ea3a7eb23e08c262b6e6b
 AUX fix-Wformat-security-warnings.patch 936 BLAKE2B 636599eb3840f5ea084dd60fd96f462f6757a4ec04e41360469eacb03badb3b8271a595692f055d10162e591600994be7e4676800e0f8a8feadbbabccbaeb21a SHA512 6f8798a8b54951c15da4f28d4c8103811c4d77ba96eb12a4e19bc35876c148c1247d19ea5b3d60028b156d50d5dbd67ec5254e47a556d195ca8c084bbc571e4d
 AUX support-ar-variable.patch 408 BLAKE2B d3649dcc362cb54a67eba34b9b6bfc6a52a22cd0ed33de95aad3cd5dad75729c35c45b8817e9c64040b3ea4baee876b456121a7e55094f0ceb01aabf4d6a2a8b SHA512 8d807507cccc58979092becb1725d4871f62746f06b3d4ac8740a0704019d3900cd60098497a0d770fcb9bab68e9bf34dc50219afda0995209ea88a71b084ce6
 DIST clit18src.zip 135120 BLAKE2B b2c47c03df2cee8779f50eee1a19f46907fa966165629d17fb25c66e5bf7b68b6ada6efa1790d36deb6a10f69c17ec7ef2cc66551796cbba04a3f2f7e5e3294d SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36
-EBUILD convertlit-1.8-r3.ebuild 951 BLAKE2B 710d2cea0762a47128c8ab78b49ff4d7d3000d986d83f8a14fc5bd9b7aaf2fc029017f5ee7c546cd9100230a2cade1dc4a885af41af85983747bbe601d892a9b SHA512 b95136ce98aeb00b1bcd455984bcc1f2605afac35364e6b7c17558aac169f99eceee28ac1bf1c755ccde14057a42dbdade005fd8a77e26c876baf0fb00e9c196
+EBUILD convertlit-1.8-r3.ebuild 947 BLAKE2B c4d3a14480b5f7720b2787ba66a7bf0020c20fb85212ab15e6d7933f4824aad15eb3acbae93d3abee4e3a7e0a9d956900003cf63d948644aa049785c29341785 SHA512 c9814b98eca144c4e12c2d9cff21f06a783a6f6a02351d92b37b52fbd300fcc5c2e69c9e4143a47926ce1d0f32480c5e2529d36a03619000d35a7b5865210091
 MISC metadata.xml 562 BLAKE2B 65f7b124b050f42c8c6f800e2e05d2e9404869c42a1217e0d280895d52d8f2588f37bbb4a696cffb58129f080580aee9cbca83740e888ccf9d272a8162a053ef SHA512 1264f1669bece35fbd465ebf7911c7d416d85d092aa6e1601b240728fc2a0cb521d913e3bae08962fc5e70c2b70ee17989191e0bc21f04c9c1ed30592ff4820e
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
index 7befeb7eb306..d56b60c9caf7 100644
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libtommath-0.36-r1"
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index a13c5602dbaa..8e351d74ed9e 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -1,13 +1,17 @@
 DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-module-dvips-2015.tar.xz 159316 BLAKE2B 1a47ae6e5f8ccbcbe98d318d3206eba62b421b0f1d8271c10a85a1e7a1f2d7a7ee3d8fc10c07f5d28a0a9b3da34c921cdebf4cd0818e189909ac95ff0e3d00a4 SHA512 1dc167b54b4e8e5d45867247347e62a6d3613fcb20db6ae145e259e591ad96693f29f2b5ef0eecc2cb625f418c54c082646e3c36a61fdb25ea9d6715f87e6ef4
 DIST texlive-module-dvips-2016.tar.xz 34372 BLAKE2B 445cf1c46b0adeb811ff0ded3ac940de6482d2061478f302e9ae2f1af06aab36ab0a05fae04d67ef9ba7af7cd08ee4b186e43eb8b570d59652a4e4a7e3496781 SHA512 e5fb9e65f0070d52b13b94d11c72247fac71bfe45d43daf8b6bebc3f8b06d63927832bd1fbf5f66464ff1d9ae001773c650ffdd9e9b30f26dee2087b3d3118a7
 DIST texlive-module-dvips-2017.tar.xz 34372 BLAKE2B 445cf1c46b0adeb811ff0ded3ac940de6482d2061478f302e9ae2f1af06aab36ab0a05fae04d67ef9ba7af7cd08ee4b186e43eb8b570d59652a4e4a7e3496781 SHA512 e5fb9e65f0070d52b13b94d11c72247fac71bfe45d43daf8b6bebc3f8b06d63927832bd1fbf5f66464ff1d9ae001773c650ffdd9e9b30f26dee2087b3d3118a7
+DIST texlive-module-dvips-2019.tar.xz 34492 BLAKE2B fcc7ae96fd1fc87a4e4164e61c611587ddebf628c156d798df819fc9e2fda2c23e70bf2e7eddd779275fbf9b223ed0e7092d5e0c82144d8dedc70c8a7b7a1136 SHA512 ee10b8c1b67997d1c781fe2c3e5ce7826c111a2b6f4078330b566bf5525ad2a1cb2b89c4efa8d877ae1557fb319941ed09db30b229a62b6d3ff6f6a784e48df5
 DIST texlive-module-dvips.doc-2015.tar.xz 481208 BLAKE2B 973d64db8edf7dd4720d13ef81033d59bab3d771a23c533c1a95770837028cc506b5c05cfcff68b0d15912f1a8245ddb4edc244606ed556ae65a3a706fd5566a SHA512 bbe2ff14b1f2f3cc3b5b2d7866cef64f33b7a8e1a5a71a9e6efd210748ab8fa5b6be94d0efe46d3b757b1c7db7713d9dfe56164c63488142eb790990a1d99f2c
 DIST texlive-module-dvips.doc-2016.tar.xz 513008 BLAKE2B b7a7675d213298aeafe9fabef465011c8c6412c265880fb2042f8652ae0d00299f587d3da65f031a4128cee1cacf2ee911c3975ac165c1c7127900aa695b623f SHA512 ada60c607ca2034663277a15b11c37c2d1b0350193e26934ee3a96adaf15ccd4ae76a35113c44d30d471732062dfe971a4a024f64e7e028518bd7bbc05b914de
 DIST texlive-module-dvips.doc-2017.tar.xz 481464 BLAKE2B 43a82ac2a058cfd10e8cc60459e42d312159fc62ac7d5aeb69ff6aff2494391894dbc0890e4b6781de9e4d6b26eb0b910980704323e353d436fb1ffba1fdfdb6 SHA512 87c2577ee4c0a82430b165fd7864ec266d00b9a621b8964f39f2adecc427dedf63d7354c0849bc1bc9c0f220b35f47b499de5255500208881abb5ea5e2012f18
+DIST texlive-module-dvips.doc-2019.tar.xz 514068 BLAKE2B 91e4717b49f7c3b3cc0b350d9b5d029dfb6dacfba7a0d0f95195e681bf55e86c18f666d9a0a72ea3a5ca6cf4ad85e91e3faf2febaac3878b3e6b2d8138097d54 SHA512 fcc91e88fd3536244d878458a90d31ad3b9ec9efbc08d09d8b23f13d3887ca575e17663b2e21451abf88de389f7fc3937ce3ab49bc9e6ea94ab77c66ba179a00
 EBUILD dvipsk-5.995_p20150521.ebuild 1944 BLAKE2B f3f3c1655be30372750d06afb40367d22169ee2cada945995fa4f92dad409abab12d7a54b5d03814d79599680c897d061686db76451fa04e304267f226ea0ce0 SHA512 a4d3295a5d8fc8d11b0023d37e3f1df30c836fbcede3c2b131f550704f959678238720705dad182f325fd181bce032615afe242f1bbafd9d68cfa1a29984d680
 EBUILD dvipsk-5.996_p20160523.ebuild 1956 BLAKE2B be85abf0a4d4ff7ade60990a777b51e7d2f7b772f10088d1b434e5a5ac10a3bc4eeb46f8d84cf945e78ac6eae4613b3900525e2182c8526af797f26f3b33e8b2 SHA512 b4d84566fb3655cf8a38c28fae357485ed3ae936d569aedd7114200cd65c19e0ba651e2c7a6f0b1410f78c1d2d3132b92b0610953763914446f0d215849f5668
 EBUILD dvipsk-5.997_p20170524.ebuild 1968 BLAKE2B e93d33ad3b952a161a82d73f306e8f8892f0cc7b999424ac22bc7387b412af9556af361d9a44c3237326b951368ba2c8900b7d00be21c32fc75bd7291fc50d23 SHA512 95f56cc680033b0581e5bf0b13157d173f06712b517e33e9d0ee0ab83225d80a4aeca40d277ec53301694514a984b08a798350402d682a58d95eb2168494c359
+EBUILD dvipsk-5.999_p20190410.ebuild 1530 BLAKE2B 4eb70ef4ee346dac810e505d1e915539381a7dfd9dd47c0136ba9abe45477cb943e80040ce31d7161922ede4b1094621a9509a8ba8cbdf3dca5bf8a3eefc8d52 SHA512 ab638d2e8b270683f9b27ec3a0f1d6e8816d27158b566a9d547aab38b674880e08a28b8bb4d7c2aeb403f2d62b82269f799d78202b652fbf3a2c0f2a9d2672b8
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
new file mode 100644
index 000000000000..0caf307b1c72
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit texlive-common
+
+DESCRIPTION="DVI-to-PostScript translator"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+
+TL_VERSION=2019
+EXTRA_TL_MODULES="dvips"
+EXTRA_TL_DOC_MODULES="dvips.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+DEPEND=">=dev-libs/kpathsea-6.2.1"
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+	econf --with-system-kpathsea
+}
+
+src_install() {
+	emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	if use source ; then
+		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/app-text/ebook-tools/Manifest b/app-text/ebook-tools/Manifest
index f53afa5b47be..6b00828d0797 100644
--- a/app-text/ebook-tools/Manifest
+++ b/app-text/ebook-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ebook-tools-0.2.2.tar.gz 46889 BLAKE2B 20b6ff048e9e31d2e00db3a02b67e21f3031d74aedfc663331b08f626b1816adecad5039e124462f97ff2ff7dc43f002eb39dd625f031ae42fe2b46338e94fcf SHA512 b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a
-EBUILD ebook-tools-0.2.2-r1.ebuild 665 BLAKE2B 86dde90fc9d8134a8f844ff95f090fc96a89cc7abe2ca0991c6678b19dc3c57293f93bfe5519d4dae8f233250191578d91fefe9caf02a1b9a57168a269130c29 SHA512 c6a835c5c14e7a9a5d97896bc693caf91c8269a55dfcf886c4a0f0ce54a83acabda39b164ba3f05287fbcdd081f29ba3907b7c18ea6b2705a0827e4bc09988ad
+EBUILD ebook-tools-0.2.2-r1.ebuild 661 BLAKE2B fc16b12917144bdb98c38a84a29c3a1223a667e85dc5c59a9c6650338c2db1b156cba70bf55ef9e5715523952ba2226b18dda3b58b423398b19a45ca38c3ef67 SHA512 db52a5fab32760cc5a886ef3343e5d093d8dd39c870e22a920bb24f1e3c7afb63eb8c0bb397b9d13db779de37e65f1858352183ac077f6ca8c17e269806fc56f
 MISC metadata.xml 400 BLAKE2B c225e8514134fea3843975618d6bb5b6085785eb71a9b0413bf986d752eff783f973c10fb7e6af504a3efa1c0e05475b421ff4c1f4c24bf51d4a948d485ed103 SHA512 2ab30e14742c63fc54cc75068b57d1c9fa178d6f57fb03b8b15c5649d4bdf35c5068a132c6ee50fe855a2037af67b5c2fd2229cc97b4f3e89f4eecde6d21885b
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
index 548b754dde90..511f12be65dd 100644
--- a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd"
 IUSE="+lit2epub"
 
 DEPEND="
diff --git a/app-text/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest
index c523910632f9..0b925b948003 100644
--- a/app-text/editorconfig-core-c/Manifest
+++ b/app-text/editorconfig-core-c/Manifest
@@ -1,5 +1,5 @@
 DIST editorconfig-core-c-0.12.1.tar.gz 65369 BLAKE2B 30296b64bd215a8b51d3b4d6146ce5eac13cb1a8ba8a25d0faabcc22989503d9d73bc138240b475eb7ea4eecd5f5bbbf347519b1696373daf55ffd27fc772f4c SHA512 3517f7db84d632615ba651eeafab6730739b7bf01f4ea34fbca65f58463fbbcbabc101587b289a7922b55708453262c65569077c51087424d47d0676dc1db686
 DIST editorconfig-core-c-0.12.2.tar.gz 67002 BLAKE2B 6b808366acc8d0a96fc47cb74d620a4028978d7114b4a64d6799527276442f1d39ba8d5611530f873c78b7c49893c5edecec84dcc6f2616ba2663cb36fa92d0d SHA512 6ab3e4f7f95c83c0781064ca15bb70394bb947f9d4cd1348224f02e25c65021d14439b913775d7cfafb93476158799c34438fa548adf3c7ec6dbfd6f1052a046
-EBUILD editorconfig-core-c-0.12.1.ebuild 905 BLAKE2B c775e5af2fd5c0833d528b791b2bcc100e3fb7ca1f41dd5196bfc7525c9d003b261763bb69bb2015c759f984ea468768912a20cfa967c7bcaa2a78a14a5d8585 SHA512 352392031c02ede3b966bae19b4ed60c3e9575e221ee40ff2e3162a5f41f981dae0629c8b62f13b90195de274983119e152fbd6f45b19a10532c69c64ae2a6b3
+EBUILD editorconfig-core-c-0.12.1.ebuild 901 BLAKE2B 541ba2ea83d46ae92146d81fc61f33c28135596ada38f0eca29a8a8e4bf556cd8ccd640cb8c346e2e0df799bc821cd9649d96d4e6800019d4540bfc58cf973f3 SHA512 84b2b7388a7df7ac9d7de0d3ba136d513bc005f729ca833d9f2dcb1ee06087d3935c37b82ac2e85184500b157c08b014e1432eff4f09449f3d20e21efc6cd98d
 EBUILD editorconfig-core-c-0.12.2.ebuild 907 BLAKE2B 5d210b84b242c0ef32d601bb34674a0583aa9e8fbc0fddb39b41dca08a2e80a5c62d92b86761ce63f49cdda6aaa8803a607a9404c4ab7fa83b4829433596f7a2 SHA512 eec1a6c04c3ae5c18fb54d37765ab947dc99c6e113c8a81bf3036bbb2209cbc07cbf0eb5cef274dcbcc766a39885c9293beb6dc626e63ac273e5af8fee716b59
 MISC metadata.xml 388 BLAKE2B d2a5f28be0aea3f3aefd1b8e82e337b87e67192b96bea1e2e0e5073e44f8c54d3f0380a089118d405c417d42ee6d978919dc8e0212a36ee0d3808b706846ad70 SHA512 fbaff22b9f648c2e94d68904cbb23de8ee0340641c626d5a533992837ec6405b65a96872bfdedce3a75351ac73e344d5faed1a51f63a4330f65e4aa8190ffed4
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
index 48e7e80a5aab..237604945552 100644
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="cli doc"
 CDEPEND="dev-libs/libpcre:="
 DEPEND="${CDEPEND}
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index 30d93cd6576e..8544a2f95850 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1,5 +1,5 @@
 DIST libgxps-0.3.0.tar.xz 93000 BLAKE2B 8e04ae281aa8ee637d597265992a5bf6df3592b7d251d657dae3833c8cca848f7142f926964d96586f50ce9987dee94841be15554a733816a3b4f0acef282f12 SHA512 283ce3041f0238ef1dcae30ce2adbc3f843677e00ae22f20ed3459828f3edaab6d05d87c20dddb613925ab248ed0b29855a94198b982606c3dcb2e59f800b013
 DIST libgxps-0.3.1.tar.xz 93132 BLAKE2B 63af298ef1dc345ef7c40fae4006ba73aa7529381cc6cbc8cf86f4d5b69c8c5617b902bef833ed7d3fa968d927b441e888889179f598b06e2ca13084d3b199af SHA512 80401bd3c9753c74e425c5c08510cac314ad255ebeda9676bd5396a217770c7f5d8733c64b649cc6fdaa43423bb1a4ad21e1e0e3f7903f486e75a1d678850239
 EBUILD libgxps-0.3.0.ebuild 1220 BLAKE2B 5a253905c2e9c7cfac0362a25f77e7d43bf204a07756ac12efd10b3a6b07331dca27a027aa125b4390557eba939dd8623433b06087989c78b67a0c4cb2aa1efc SHA512 a03b58d526fe52b849ffc7aaab979e18ba4af390e3a887732c7f3aab4a96f6abc01e141a6127c38fd2f8fb1bbff412abf596600a11e5c29b3e70cd220fac01bf
-EBUILD libgxps-0.3.1.ebuild 1228 BLAKE2B a141417a9a7a08f896cebba41d2ebc13542033c46d898e6cdb71fed93d241cd763c45f37f3d558b45673d6821a55158fc2b2e6ec3282939e054ad7e8395632d9 SHA512 a1caa283f24e16acf79429f45374f80132b29a65166ef4019f939ded785e32077998958a59bbc8d585d04c808153a82f509efd5379963df6877cdcd1869af8fb
+EBUILD libgxps-0.3.1.ebuild 1226 BLAKE2B da663df2f2316ac94dbafd058f2a9068d9457a72b6345c8ed8a4a0977e221cf09e1e0aa51eafcf0b379cb4def650a83809d172f8e3f518307bc8a70b81e34dc5 SHA512 e0a1d260cff3c79f1bf0a2b47cc4ded4e864ce5aba41b97d26a598250a9f4333a67640db044001a510a3fd2747ab014b3b51c57333bb05ca6b980dd7c2c87977
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/libgxps/libgxps-0.3.1.ebuild b/app-text/libgxps/libgxps-0.3.1.ebuild
index aa87362f6be9..a2cc8d18ed6a 100644
--- a/app-text/libgxps/libgxps-0.3.1.ebuild
+++ b/app-text/libgxps/libgxps-0.3.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +introspection jpeg lcms tiff"
 
 RDEPEND="
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index ddd9550dfe54..d5bea5641b57 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,7 +5,9 @@ AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27
 AUX poppler-0.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c56fae4a34f470551a666767a5ff82ec23b387b31228fe8ca8ba3727c67211fc3fdd66bd6ba4719320a5c6f86f3858e1eb19fc SHA512 764f0d0264fede2812cd6630d744fdbf5e258616e90fc01f67f6a3a0f31ae64e0680def9768764efd890187c78cb4a1ad73556d5b138dbe187aeb955a02f2700
 DIST poppler-0.74.0.tar.xz 1514044 BLAKE2B af3821d5a5c68a3f2541cd9468fd7318ad0182cda66cea068dc42208fef6c2af78a401e50a6a5906cdc943de7339620937ddc6f69f0d8d1b15082aabc6cc3482 SHA512 4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66
 DIST poppler-0.76.1.tar.xz 1531548 BLAKE2B edbd9c1be99aadf4f14608a1e0dc58a2fed351b10e18aa3c006f4e54cf0f2082deaded9c67a0181bb0f012bcbc550f1208e8a632df9cbe26261b735ca44cde60 SHA512 e4af2785948ecc89c105ab00269b0072b33feea25224e5beb158d515b1de789f979084bed2d4260c9659382cf437c25c0baf2444f5b4fbbba5c58afeb707b7ac
+DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f SHA512 7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040
 EBUILD poppler-0.74.0.ebuild 3515 BLAKE2B ece68c444171e98859d712870d0611b9f2c49d4fc46b181d383253fe62aa64e4a1f4bef87c7940f103e878c722d4b29dd5f137d2a199da2cd0f86459cd313a62 SHA512 9ae8a8e2860129702bc3f03b0e934c7f3484c57d3e41fa2a2defa7e97c58d885cfc195289d5e2fd5ffdee809433452d4c9f7d40856d66366ca3bb9318ae038e0
 EBUILD poppler-0.76.1.ebuild 3526 BLAKE2B 8b38ac436ac303afdb856fcc07ea072452aa3bda92a4f3d6a95ae1ab3e019c67c267f2caa574f61bf65ae4a2e7ecb2090980795542d6f56f1e43d5b7136a528a SHA512 a0c05954864faa57ca3bf48b8de04eb74768b9357dbeba8d2b65db8e437ed91208d9f1e51c02655e731e301764964e9a42c6fc18c37600135ec160f56f5add6f
-EBUILD poppler-9999.ebuild 3526 BLAKE2B 8b38ac436ac303afdb856fcc07ea072452aa3bda92a4f3d6a95ae1ab3e019c67c267f2caa574f61bf65ae4a2e7ecb2090980795542d6f56f1e43d5b7136a528a SHA512 a0c05954864faa57ca3bf48b8de04eb74768b9357dbeba8d2b65db8e437ed91208d9f1e51c02655e731e301764964e9a42c6fc18c37600135ec160f56f5add6f
+EBUILD poppler-0.77.0.ebuild 3525 BLAKE2B 7be2d265493b97f6520d6905a82abfd382ac15a6d541525fc3923def0212c16d69353aa7e92456fb19fa8914a2b8da8d0b15c77ef28a749e9f16787fe1a8906a SHA512 466ef5490267a07923f2c9b5e6415cd36a6ebb70c05ec4defd36113d050033c02652290004f8f563ac2573e5380e41c8c08cd93aa0c53b6a129b6619a9029281
+EBUILD poppler-9999.ebuild 3526 BLAKE2B abeb81a635d4e399510cf828cc31235c4c2b9b6e843b88ceed22d8645da9a21aea27ff362bb9931c6245bc0152bdc48fa9b23c931ba202c22c3715699b740456 SHA512 3cf4680cc0774ca4ae267485d7a0ee904b209686b307bfcba6dcaa47064ef4aa30fef74d3ed22b46069698bf1ea0a3f24760a224086314259115f919fe7abf13
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.77.0.ebuild b/app-text/poppler/poppler-0.77.0.ebuild
new file mode 100644
index 000000000000..c63a446c3b85
--- /dev/null
+++ b/app-text/poppler/poppler-0.77.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/88"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1: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 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.71.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 61a50816fcf1..929d23b313b1 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/87"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/88"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index 683278abce51..9ad482a7eac2 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -1,7 +1,9 @@
 DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 EBUILD ps2pkm-1.7_p20150521.ebuild 836 BLAKE2B 10e2fa2b739ab555770328f5e5cc25d9bd092b2a8efc7a519256eda0e056fe84d76a4a9d5f642e04e230639c0161b5f5814b524ecdc990f01fd3863ac6dfbbac SHA512 5007f586c9941ae159cbfdc49ebbd0da23f11b81731f5954ff79dcdff700764d15c555173c17b9d4bcfe82727eada7a0d07c98e19a62ce3e2933707c8557cb24
 EBUILD ps2pkm-1.8_p20160523.ebuild 848 BLAKE2B 7b28623873b847d71ff2f5f2f5bca7d68ab82b5cfd62e39c2f040cfd38b7895f3c6729b0544f6872d882539598aaffb233306bbcefe6dccd78897200d36b89f5 SHA512 829b0fa2979bc26a1198bc265b8e5977ccbf6edc2b9834f60ef504318d54c288bc54621f646e5f01313d12fbeee9d4223e9d8d7aae75635e24e3069f422a7659
 EBUILD ps2pkm-1.8_p20170524.ebuild 846 BLAKE2B b4d755ceb012e39002be8da61a38d0479f4d5a6b3dc11467d766e894b274648cdd0ebb5e79d96aad97b167f0d2d23fda3d148712e6aae1d0cc2cfec77dc69c58 SHA512 d8d68f8b71aa47b384709a58f686c24c8b22767d9e596fb29f06fc759774558c2807ff55a52f609c915e8acd3f351ca6a9d73444874d6eda7dfdd30af3b991f2
+EBUILD ps2pkm-1.8_p20190410.ebuild 797 BLAKE2B 3db9744d097d42bb3872ee29a4b7376b57d43952badfeb235d84d701ea996e4ff28bc17a28f9b3302d6cc8d35edecdbef86963f9c3b6158d8363fa4e0a157052 SHA512 06445820e57442cbb50d1c498c17cee7831352e1c35f90ec94c50c4c71fa6fd2535524b36843f43537b256a0db6c41555aea615b4f815b3dd220c660e1c5baf5
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
new file mode 100644
index 000000000000..60873d1ab8fe
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-libs/kpathsea-6.2.1"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
+DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
+
+src_configure() {
+	econf --with-system-kpathsea
+}
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 2b49cecfac06..b70016d897b9 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -3,6 +3,6 @@ AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
 DIST recode-3.7_pre20140303.zip 1902903 BLAKE2B fb85ef7710b6b4ad1bfe34f066d8a51252c40fbc4f958940eaaba142ad51982c8ee3d2da97d52a1e40e23617bbcf6450c9b45be99067efee7c1149735ea81cb6 SHA512 256d79d6f9de18bbf53cb322f0467411ef2ff8e4f242d073d7302fbd05e4942373023514d0a88e33701280c1cb4e0235d76efb9220729cd1f91f9ad8fd2407de
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
-EBUILD recode-3.6_p20-r1.ebuild 1667 BLAKE2B 7fde7a6da18f666a3711a13235b118c0f9e4962acfcbfd130dec412af8610eab9c6350378dbd6bac32c45c0d133761be4b08ae171b0d96a253cd0fa0b55d2583 SHA512 73b11ba7aa86643856d0b2cef8ddcae846108bbd38ab59e3eb779b7846b7afd5552370a653965f1d25ca32d97ba6461b37ece56b4d92b4c45e97fd6b5d6879b4
+EBUILD recode-3.6_p20-r1.ebuild 1666 BLAKE2B 4d47ac76ad8a1a57bf31c313b345158d7a36995a5b7478cd6a698aed49ba43a0d9e9f29c9813aee1b602cea80f5a8e3a98789a2cea930a7687fbd3ccd096764b SHA512 e934997a54c90398769ea35803a4008bfeca5ba69cf7c20b9001cd49f4f342648f66185e6fa0df3a59598408d233860f5effbe08bcc6c077d372ca32f7e1d294
 EBUILD recode-3.7_pre20140303.ebuild 1114 BLAKE2B 04c89e3e73d3cf4cd961d4e024d0e141898bd037402d563871981afb2536bdde7faff2cbe32895f145131c47c750faa741b39d8b67a1eaa653ff1513580a067f SHA512 24e1156be1209ccd38cda16c665007203afb5effe7934652d48832afcbe8319aeb88bd337cded810fe2650c38ae20468fce23983ddbe5ca50e565af51265668c
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index 9444428a270b..c54f1f42b139 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -19,7 +19,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 ~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 static-libs"
 
 DEPEND="
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 5b940cb777a2..3c31a542f5bb 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -5,7 +5,7 @@ DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47
 EBUILD scdoc-1.3.1.ebuild 1031 BLAKE2B 3da18d09700584dc4c3365ea66c06bdcc5e8363e5dd3ca44a0c36a2237abe6ec444a760ed0ee288e522d6c4ea1994f8c9dc0db09a6b3bb07005f8cc9c379915d SHA512 2a943adf9b0ecac43499c55f74ab56fb0f5cc59d74bb43862726ff4da4aa9a765c09cc8b4ff1de28cae3de0d7856634de65027c83577a61c91c2b222fa6f14cc
 EBUILD scdoc-1.5.2.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
 EBUILD scdoc-1.8.1.ebuild 1109 BLAKE2B 9e0265584e2e9dca427d2ecd419a0ab72e723f88d4cb88be78e0ad5266a48534930d848c35a7542d8de89a12c91b7d279002c5d2b6a9550358666737fe191838 SHA512 5fbf573577f5e489e8361c8fc03594a1a4a0c38371e2df40af7178e0bbcc5b4bc78ce01c88e35326c6c66142a491bfb40a25b6be2e6373d10bd382e048bc3e68
-EBUILD scdoc-1.9.3-r1.ebuild 1159 BLAKE2B 2d641f93754cdcb59473165a212b127b21d4ab64ee2a0756ad05d6384ca2e67c9e6f94f51b1d4398340076e92472f44b2f1767509ea7671e7128a141d3e481ac SHA512 8cca09a88f643d3e08febe334c5d4fddc4a80ec4e8b014b785ae10220f45eab3a3911e5eab8b5c36c9904cba8d42905d3c742367c4daf9fc2352147fc7351b01
+EBUILD scdoc-1.9.3-r1.ebuild 1158 BLAKE2B a97624e0abd5bb2c33dc4ef261954af6df58c4c133aea60883a3ab5b0032580011e91d414394cd6bf87d0320e04223d1233a0d247662f6fe6ac7900eda6d0501 SHA512 4d6e8e745b0c4c9b1b7e792eea029b4c8ec9d4c93d3f5f706bc7d60fcbffb8da57598055663ff94a89e884e48018e7171d487a11738cb20737decad89a876c97
 EBUILD scdoc-1.9.3.ebuild 1108 BLAKE2B 7beb9f0d42619ac83496a9e9e7d86ac1ca359f397d3b7d74162c8c4fc60dbb5bcf2cfbf5a8d83497d34919ff8b0bc4417916ab2fc237c16aa138e076a792f9b9 SHA512 17def7a7bf2e90554eb736a7d50e4450b12508430a5c3464e6f12ace019596cd640241fd2d6941ec1c0b3d8235e80d2fa9fdd2df185d7efe30a3e16bb562baca
 EBUILD scdoc-9999.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
 MISC metadata.xml 444 BLAKE2B fe48dd13d534bacc09205bd073b4052e2f5afca50eedea53236f7d2d2f31f4f876fe0b4dcb57eb8a87b4090fffb5f924ed57b9a636453be7c2bb586cc4d1a142 SHA512 3a172b03f1768baf0bb940bd842f7e6c05762e79bb1d8632bdbf86276e79cda7f1b334750a3650cc86106154a8b2e2e426c7ab99d41cc5bf5119ac1e81e7b5fc
diff --git a/app-text/scdoc/scdoc-1.9.3-r1.ebuild b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
index 7e318dbd570a..77bf0dba2e95 100644
--- a/app-text/scdoc/scdoc-1.9.3-r1.ebuild
+++ b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index 21acba543a5d..5a257dc1e529 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -3,5 +3,5 @@ AUX sdcv-t_list.patch 588 BLAKE2B ea7106246204d2c18eaecdb05e4bf7a9c1d12d0ef6e150
 DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 BLAKE2B f2cca4dea35df82015607c88b225da593780d027978f5cd9c03d6f31b03d7ca134e0f2be3bd7ad6c4ed71f7c4ce8fab1bdd546914867b247e6c814ca669e7da5 SHA512 e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570
 DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00 SHA512 8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
 EBUILD sdcv-0.5.0_beta2-r1.ebuild 1426 BLAKE2B 6711cb854f6f010a06bf7e016de9739d719a3429e400005009847ee53087c4c1c2b49bd64e342b365cbe70d1fd9efbf333bf3287470537585ef29da1f7fe8023 SHA512 c721c50436f5f3224412f6229ca2796ab685bec580702025a341656b1d3b62400e5cbddbeea13ef0178e7635b55ee7616db6ac39c06ce4640ac464d837423d00
-EBUILD sdcv-0.5.2.ebuild 1583 BLAKE2B 3cfabacdc4937baf92450af012052f57b5c07251cd18a572327c030b993708d1bb419807080ebc67eb05a601e9b0ada709039d01c618bf39db375b0db9842552 SHA512 e38f01bee566df106b226d6af44d82ce30e0df06cc3200546daa111d16e56411041709812ab1d048831020d5ebf66ba9a18445345a31c871be4e0bebffce43c4
+EBUILD sdcv-0.5.2.ebuild 1582 BLAKE2B 509c6433aeb10d633bf9aac30b5f8b4f41d8021b09cbaeab9ee3ca0993af19f12641a388432a767c69bbc114950acb28848942115e27597c41d499347f7359dd SHA512 69ed0bf1a33c915c39ea98fd24b5e148051d0ad8f401848c097246c1fe17fa5bcf6aaaefa244013abe07013bd97206fc33f4ce002e6dbdabc0290af1e9b5a09c
 MISC metadata.xml 528 BLAKE2B 56e25a716843e62cb0a90bb7e75abf3811dbbb38c5c91a4153d5b340c355efdd4db771a815b116650e696b637deb4dc42320e0300d903ddbbc9b124b57934071 SHA512 0128fc0c89045f17ca1dbd13e18d2351dbcdc7af76451b80ba586ad223025c8c96f9100c09db5857e88f503534c6d699e649bf68c1bb3e23c6972ca2e5536c99
diff --git a/app-text/sdcv/sdcv-0.5.2.ebuild b/app-text/sdcv/sdcv-0.5.2.ebuild
index d408750a82c6..59a8f62a0b14 100644
--- a/app-text/sdcv/sdcv-0.5.2.ebuild
+++ b/app-text/sdcv/sdcv-0.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="darkterm nls readline test"
 
 RDEPEND="
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 8daffa826688..8af8e9647cc5 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,163 +1,321 @@
 DIST texlive-20170524-source-freetype.patch.xz 625056 BLAKE2B 70bcd15da1edfe5422f6dc0e736bc842f93787d45a81f823c8ddc5a420eff65f176ccce20cb17ac1dbc3b4eef3081de7dfbe34eb390f1baaa925e17f3d55c6c1 SHA512 daa0ff9306b39e6d5058c53572fdc741adad17cec9a874785005aacd0e57b75ce59f21d0d12260f4178d47b7b0e6509e49c44e2ab524613fe962ac1199a9120b
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-core-2017-poppler076.tar.xz 9232 BLAKE2B 945e4f8e6f3230b78dc43560c664fbe4989fb32759b41c0ef83d656b43b008030cebdbf668718c4f22831d01c3fe1466f686f7f6b76183d3d1bb5e760f17140d SHA512 63fb2b426921be5f6d310b31e7fea6fc0edc0900f4790445fcaface9c931ca6c3e8f98b81a3bccfd1c877750e854c9410a59ff9a124aa2826d7b4187d54ed8ab
+DIST texlive-core-2019-poppler076.patch.xz 7460 BLAKE2B 92219d1119231b31f3d2ec49f9d3b8db8f4eaeb2b7790ccfb62f106b5626b0d9f6c197b4016129230b32fd873515d1fd99676677f1584d0cfb6bcbf352f7e704 SHA512 e7d6d4692d702b24714d3d28da258d615d614577ad81ebf9cf261be2c4cf8a8207dc8861cd3c86bd82b2425c6c4ab1766f11b8b0ad14f9d6de2b12e3f76fed14
 DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980 SHA512 fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e
 DIST texlive-module-a2ping-2017.tar.xz 31136 BLAKE2B cc0d99992cb780711a2a423fa26135845fa1f2cbbac76485d64a0b3184e338e7a60cdcfeaca129e6251f72110b0069c32164f9c4904d7f7c9c2edc6306f50411 SHA512 4711f184222fd95498a6d3ee94db19209c7836e6b775303926766d97921f2e8324b0aa2252a958fb619dbeca50729d2be4851a2add5503e7e8f4e713fc993e41
+DIST texlive-module-a2ping-2019.tar.xz 30616 BLAKE2B 545abfdd3aa23b8d2bed608d7b7aef0f9578d5c4d6039880d435144c687014edb8c841afcb2d9ca1fc48a365b2bcb57832d49d1c6bb35480a01a813e40e18ea6 SHA512 983084ca3d70eff729d81d5d52a74e1bf1f95e384916bc81d17be81290f70c1da5ac891c1665a2451975f36fd56ea0036e1d0dc46b2e98b61ddc660ac044c23c
 DIST texlive-module-a2ping.doc-2017.tar.xz 17524 BLAKE2B dea1db9fb3650c56161190823e4015d3e6399be3612f7e54702264a5187e72c7be987abb2cf8465d82711c9894d604fa03d79dc770bbf93b3404f18a633fbfa0 SHA512 8cfcc3b2a5dc462895a2bbd82f3a21537ae5d3fe81217b0b664b2008d6d18259f18de10e6eb3e3ac2655f96067b0f9bc6e30f69d068d9335598eb0b075eb4cea
+DIST texlive-module-a2ping.doc-2019.tar.xz 39740 BLAKE2B 1a9cf6e4cf4dd4dd7677efddafc9da191ab3c34eea3b7bd0f51937f6946e1696b858aa9d53e7599c220933b06bc0332869a0bd596ca66b9801b48adb5ab1aa2b SHA512 daeefb01a0197e3b7751614cb84e2926f670d36b7e8a389bfbbe39cbd941c4d10ef5112593bfb88e11fa15f7f7bb07f2538c7d0a68cefe1482bbdaf02d475512
 DIST texlive-module-adhocfilelist-2017.tar.xz 3568 BLAKE2B c472d7a318d1dc36d1bc4c9fff821c527b6f0dbfe6fd7ee945c209cc48e97c179bbc1ff244845f287df6dd5398640d2ba73415a7e228b5aeea7ef121950800e0 SHA512 637cd01a30bf9808b7cff6a0024230f20d0bd68911beddbd4ef64072855d28ac57d1df0f7cf4b78e376aba1f06f979f03c135bc65b58ef1beb9a0c8128b2c2c5
+DIST texlive-module-adhocfilelist-2019.tar.xz 3600 BLAKE2B cf6e37b1b3ce64ee7033f43677416c3de6abf2859bb2d985795608f8ccbfc09f842cd3d2664840ff64a7352f179abe4e5fec096b25326a47bd074cbd26bce78d SHA512 57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954
 DIST texlive-module-adhocfilelist.doc-2017.tar.xz 9876 BLAKE2B 91dd2728d567450d55a6e1503d9f10fa1bde452af9876cfcae164269c0ceeef3aeb834689d4aee2295327ea6244eb15fb96f5d4f5ce05986022fa1e193b8cd78 SHA512 db69dca80f163a9c8d1eb7d911b5c030341ee3d93a383e0dc4b4d60715c736c80192e61b665310bdc9c819b8fe702f6a28049cb5e08bf87d880fcf27069c9beb
+DIST texlive-module-adhocfilelist.doc-2019.tar.xz 9876 BLAKE2B 6f0a079b7aa05335f4cde30cc93bdc0781f6fa9fee39e7e7cb0cee7e66fb27dcd73b64afc51e02b66bd2ae6caed641eec402ee7350505daecec05b4a4dc684c5 SHA512 14bde143bf3ffa3f2b972f93544089e4c0314c7696e1d711719549b7e831278c66fee0676665fe6eaaac744689d613dce159e4eee2e3f9c24dbbe602794fc62e
 DIST texlive-module-adhocfilelist.source-2017.tar.xz 16408 BLAKE2B f3d72e2c9abbc6594b34eebf2f1ecc18b6adbca55f7c14fd5d87a9da5642665ccd55f61e4204b540f5ddb639e062283462ad4136718a1cf5e2c191b6ab9f431b SHA512 1e74ead0f3cc61b6985e530d884702867c2cb9af1e545b697adf7ef1fcaa49cf01ac768cd1c5161900feccfcb3accbe96b3da7b62219e9dac5cad89cb04a35f0
+DIST texlive-module-adhocfilelist.source-2019.tar.xz 16408 BLAKE2B cb3c8401e40f4b2d922be8ae6fb5381894df8b1a0634f8aaf21d2d4dcc861de0818904ff0342ce9684d1ac956afcc71b6d9e1c1bfcd0523b405444359e8de063 SHA512 15e7f652408c5975ba47131109e0d18bcb1d270e0ea630a9a3ff385e499cf3607a366e708a5ec9559d7ccc2a5e0b2d3d0f5f615142978a918b0bd1bd0218a30d
 DIST texlive-module-arara-2017.tar.xz 2333636 BLAKE2B 4422d6171af16f51c67bf6f48c5d981f85d3b45b7a3f051c6272db2525e6d0fadd6a0a276780339d15f9726019dab585eb41a0bbe4978d8dfcab52bc0586a4ec SHA512 3acfdc5872c866f8c883bb5e0ab97bc15e67c8afb799a633905493c82e20bb1183a50786d4d39b41a21e2b0fa51a8d373e645379774249ddfca5a851526bff21
+DIST texlive-module-arara-2019.tar.xz 4536520 BLAKE2B 8ce431b87dcaa166d6c527d1d9d192ad12770e502ebbb4144d3161811a1527c1832427d868f99d7108c0949576fd496cca1d023c57d06999762984a3f65b53a7 SHA512 9a999610563bbafd4dcf95591d90aac65a0ba2b0e4da7d5f58c694896dd01b1be5c06d2693d9fd69576e3b32e4becaf9bc046ecbd045394a5dc7e2db5c86a02e
 DIST texlive-module-arara.doc-2017.tar.xz 2748360 BLAKE2B cf0233cb8c5bbf3b871889f189092a7334c6a17ed6dfb6dee29997031eecfb2921b389c65dbfa5ad546f18941ef927f96be04de79bcbd200aa415df55bac8560 SHA512 5e917d8f326d1c9dc4568ed9a9c27c9aa31513c5188c66986056138ee4144b79b9fd8111a8638b0c42ae5c0fde62ba89bfa2f98cf9d2238a7ed929ae917625c9
+DIST texlive-module-arara.doc-2019.tar.xz 1677204 BLAKE2B 5a72ca0ee042b73d5fdef7189a0471afe622260fa94c2fe84609743bbe0396595be11a93c31fda2268a293ee66eb0f3bd5d1525717d465b3344adebf6d73e52d SHA512 b4654d62b725c493e175d9d70c459b05be8a365fb389d5f20c2bd920671f03130586305d225676a3524a5835b87066223deed62db6dbe0ff8fea76f2caac5ce3
 DIST texlive-module-arara.source-2017.tar.xz 22508 BLAKE2B 911b0cd932bfc99772de4742b476012cc285d08e8c601c3cfe7468c1e136f16b48e513867c2551ef33073c2aeec13dd4212f538d853fe139e8f7835bef43d0a7 SHA512 fff9a37c9a3c8ddf835552c9ee5b87234a2db96b699a5324cf880bdf68bbece8ed2329f57c4c646859ccdfc065e3fde7e413014727a607eb70bce8aaea48e536
+DIST texlive-module-arara.source-2019.tar.xz 63544 BLAKE2B 1a8ad9e8e7ae8a645a3efe50c5dd7be8bb907a9aa25741367d840aedab1b53cd0ac74df03e378fd68c3a0d96e8359866a09730f593273c516d3d8775288e45c4 SHA512 3ec571f4e1d8f13811aa17a4d95cb5e364e63fce1f5b320414b08abdd8907df28a18af42deac3bdce9964d7af8ddb7825702f88e4b58007d9a005369be8d4e53
 DIST texlive-module-asymptote-2017.tar.xz 277568 BLAKE2B dc7d046c5aaa1f7d51cbe930085a295b913123764064141c6fee171b80516a4ffc64236540248889558c5527e891e882abecb0f4b4cd12bb9396838e21672d3d SHA512 184cdd0ae495ce695309453458b8a6db2e29950e192a45c86f7b553823ce978eacc506e5e9454de1b1b4a2ed4c12450b0b59a006dff954d008311437aefeb3f9
+DIST texlive-module-asymptote-2019.tar.xz 312964 BLAKE2B 1c1ced6f3af846bd6c9512efabb784dea34d3a6fea7ecbdac89e893ca08b8a90c85112073a8afc75c43a5544fda59bdf5e1a53df96033dbc6457f3be477a015f SHA512 e314e473c14c2fd8980d3d0256c6cf6fc7c757a5b4b4dcf90c93cbd15fa70a5e7a0ce453c8382df3f9cfa4aba9c9047b3ee44084e398d9c767bb88ccf3bb47ad
 DIST texlive-module-asymptote.doc-2017.tar.xz 1791956 BLAKE2B de5bc12e4ca274bc7575a6b7184b2c1f602c128c37a389eae2c2aa2580018fcb1408d1543a5dae03fd9fca8a8f47fc9d96a6814afa3868aa5260a8320e282f82 SHA512 50a12a697b9b9c45a4137af23d88d7dbbe2cbfcb091655feed4511418a559863193236ff8a2c0c5730052d6984a03aef3ceddf1d96fc9ff838b57459fc288dca
+DIST texlive-module-asymptote.doc-2019.tar.xz 1810712 BLAKE2B 2aea38bcbb43767b512f8ba9fbc0f7b8027a17bb4766816d0cf57269cd2951fc70a77efaaeb8d10d1b4223d20bdb104b7bf6099c4e56d65e8a96724bfdf5da20 SHA512 7969d7001bf3662ed28f92b07defe67a9262aaf62d8dd2f137a4f36d90fb4ffac034052a6c037882c3bcfbc0fd2b9836fc8815c90c741a26dbc68b59a8879782
 DIST texlive-module-bundledoc-2017.tar.xz 12208 BLAKE2B 54be93937a61573bc64522651dbe23e6e72336dd8170e6c9b226e30f6641d32f47475c7b2f8ccb67f6d13bf45551d45a61e6f908413e8cad53fa3555ac094c84 SHA512 075193471d65e6b7eb61a1cd18b1380054467b346bd66f82a02b060f259e0fd1b49f510ae088579f555360effd40ae3a6e3a35dde0e956b8271845b445507ed1
+DIST texlive-module-bundledoc-2019.tar.xz 12276 BLAKE2B 228fd77fee1c600e7582fb4a30276b54544624b9f67e1b3d76b5e37e8025fd3e9688375577e5081958f709cc62ff7cb342370c1bf2baf7bd0fa3108386f40e45 SHA512 fd342f56a110ed29a4562057910c9bde89a3a70dc619381005dd38610736f9dd43a3c2c25dbdaf557b648e3d126d943418969dacfa26e6627fe8f9f767a9004d
 DIST texlive-module-bundledoc.doc-2017.tar.xz 37392 BLAKE2B 642564e479ee5312a9c38beb70967ae1915659ac5cfa7d00fb2478d90f754ee2fa26c2f8b55f3bfc68c2003ac724b5e0488d90dc713bc3d52c2b2f75a2841621 SHA512 f765ad03ec75b1a0f7d577ac8c3cd03e196e6dea569836eb3a02d6aa50a7cd0084d8a41eabdc4207423291eb8e7f4002340c32e6d04c07968a8533cef80a6b97
+DIST texlive-module-bundledoc.doc-2019.tar.xz 80972 BLAKE2B 0c0061a4808f9cbc97111dc6e59dd191e29c56d7f3449bbe0a677c59eec077a94d8b14d8a83984776cbbeeea8b04accc89abfb722cd03f14ed2c5ee2d5146087 SHA512 384a9519a3aaa328444dfb569e86d037ca283d2d24529057bcbd1dccb41a3ba7bda027c01bc986b0932da77198ca13e9d7c4f4859d898a284577796255baa9c9
 DIST texlive-module-checklistings-2017.tar.xz 6476 BLAKE2B 709a4935942eaacd2cbf694f2c06a7e6ccb9866577e2dc0df8bee3a47e471f0db71b5e47007f02f6c78f26d08f308b5afa3e4e4f06b7bd0d71deb75b5c2041cc SHA512 c58753601d1af48ec2bae629b5671fdf1de8f055058763a9328a1fea9829960a86df836358fef16985747b31f4e1a569d78d4acf167cdece2d34eb57ab738548
+DIST texlive-module-checklistings-2019.tar.xz 6496 BLAKE2B 7ea3bd63da0c718dcc1406507c1c800a62f09ab2c0dee1d043ea73573c0a4e645a01ffb2d2ca2008c230bd14c1ae858638d050d4a24b831b898a98bdd4bdda00 SHA512 599ed476321a825bea61fbdd468670cadcdb11249a4a9324fc88339a9445ceeced3680459dc2d27c2e6263cd207ffc0ce3b60b325d31072922bf4644478cf544
 DIST texlive-module-checklistings.doc-2017.tar.xz 364452 BLAKE2B d9e5855dae2195c2d085277abfd1c6253c2d46c49bdce4548d5720cc0e21104cfff618e8f30a1048d73c7e02d8922cb62280de21f2366f637ae8bbba1d5ae344 SHA512 771246b9ccc70cb337a3f55e0d04e406c338217298f091c9372533bb55c5c98f0947287b2f0340bda049f5f0acbd33d2ab9e706426c5b487e0a31460863d5e40
+DIST texlive-module-checklistings.doc-2019.tar.xz 364456 BLAKE2B f742b41e3b18c1248fb9a8f4cda9a1ff5fff26b4c6eeccd0dc658a95ee690f0dfef9d8384265f0bd6ee5d42d38e3a2d45f3e74536bbda364b4150b494515052e SHA512 3f8d6eb67f305fa5e03bb625a4034ffe616a6c0223774688463884df99c337c1e5bdd76bbfa3b9428ec4812ec72388979c4252ba7407ae8b79e3de7cfacbeb01
 DIST texlive-module-checklistings.source-2017.tar.xz 10948 BLAKE2B 6ddd87b790a5ecb35382218452f787a0fcc43bfb59455f3660b1b5a2176eed033b72aecd7da0d2f1ad0efd21085f4cb468c1487ae7609eba9f2321e2dc722f92 SHA512 8fd158560f0bbdc7ea996b510ca69cf30dce26decd6c963533ea80a6eba7d6543c72e12175fc568725fbd8e4c8226503cabc607b52d68d51901bc8f32146e818
+DIST texlive-module-checklistings.source-2019.tar.xz 10948 BLAKE2B 08881ceb308803c8e2a6476d72e4446e63ceb714db4893c6fdeb773c46f8ffa39b4cd4a2642e3d90e88c0adc145e421007d5e0614a862cd4ede6af224f0db4d4 SHA512 a7435841305ce368f1bedac9cb531d8f0fce3fac27484547821a2e82998e977968e578601382f4cddf6c089b42e8e175c56d2e466faa5c4c0e5b49edaf6baf1d
 DIST texlive-module-collection-binextra-2017.tar.xz 848 BLAKE2B 2a417424ea3cbd4333d7dd0bc42d8a50a56fa61ac40f276759576d71c2d94969a44806fb57a3d6d795cfd71846fe332f352fc64b47b62fef262ab7569c352fd2 SHA512 ab5459f4a6431f22b88255e3b2114ecc2cf34e58e5d450da7ef70904511a6596061250c27b23fcae74f955b8e040f1820e444f504a71ae3f41d0784c67aaecdb
+DIST texlive-module-collection-binextra-2019.tar.xz 900 BLAKE2B f54b161a33b5d3038bebf8976ffa3182bc53068be423e7aea76421ceb199894ec956b916a5ce10a2b961ab9c6ba13c27b2683af4bc09b5abbc0be4828528e504 SHA512 885f7b2009983d71ee4fa4dddc48045fe1fb92841bad8de3009b52cf4157c9bd79d1607b8fa6e55db298d1ce763423d8b1f1273d8faf41708e8bdc391bb76fdd
 DIST texlive-module-ctan_chk-2017.tar.xz 512 BLAKE2B 2757ec920c4c058246157553950036229bd4a685193c19faa9b9d548d09c93ed7348dab350549939b53ee65572c5c93448b59243e855099ab43aa8f3bc672106 SHA512 b1a15b0ad26055dff982bcb30d8798ac0dbc021f1265239118a97b0fe0fd53accb3d2c215365f998c317d25eab1bfc8b1b52f481b166e8fc88dcf37931abbc85
+DIST texlive-module-ctan_chk-2019.tar.xz 512 BLAKE2B 80525a48521023cf7ab0cf3ab19d9fc3fb72dbe3fb3c638803076a0775794f6f30935cef8ec77936574a61d8676e123f4ef7c84beeacc72812fcbb86a4dd0588 SHA512 6eabd7281d79ff0ad19080350dfcca8ee3a33ddfa6d17827a7851cc53f09f627729c8d715a1dfe50e0c079add44331a07d543cb8b6a57000efa6d73c30f2ffe0
 DIST texlive-module-ctan_chk.doc-2017.tar.xz 222000 BLAKE2B a5c92248896a0160e8a81e110bd8e93355769fa264453c7720e7312f94edea56557c1f8d1c23f4afb47e78b6f8d85b5a5f46cd612105aca9098c504c39e7df0d SHA512 cb3c694bb7b2f361b9e05e8dbd8d4594aac84886d1138e55b45dc2cb102620d2ec904f4e061e931d1ed57b410efb3d6b7fb699fc7f714d049337f285e531ab6a
+DIST texlive-module-ctan_chk.doc-2019.tar.xz 221996 BLAKE2B 43def8aec1f47ab26750a3678d68eb846f5a4383c681e1cee66529d877bb636b8867b5ce4a6b330a6b4239f5ad9db9125799c12b6ca5453f872fdfffdcb3fb75 SHA512 c61bc0d70cadcc4382dae55cdc1af076882801321a2de16f164223267732e476e41f949f566808c928f446d69aa22bd9965adb155c97905e32b93808810c76c0
 DIST texlive-module-ctanify-2017.tar.xz 8228 BLAKE2B 73d304f42f0f88cfb15ec6d60f375582276c96a846b061602e5b80fb9ff5b052244db74fb975638d6782ab25baab2cec45fb1a9e1d2b7109130945bf2ae3697d SHA512 335cfca62d46fd278f3c9b80dad62ca7a10310a5101c53fbd3060a4025b388eb962f9f41b4b7dd9bc896f4b7c32e127ac0b901ebd1f7a9e8a16a6ce749cbe92c
+DIST texlive-module-ctanify-2019.tar.xz 8236 BLAKE2B d8b56d748f70530caab43039a73b2263e3ad7178e3fc1e2fb0e8280ca2304e2bad34ce73b4ffdbc6ab4a96bccd36c51e3d30aa5a2bf37f6e16fc653944d19f59 SHA512 6774b151bb0fb052d41d8447c7e8d378d7f31b0a5aea5f2f00b93669b8c2f629f479ae21d40480fd62f468d866cbe0c6f0dedd8a0248f8d83cd1039131849439
 DIST texlive-module-ctanify.doc-2017.tar.xz 57964 BLAKE2B 973b48b1f35faea3ffea7ad260cfaacbb11e44047aa5eec4671e664da5578d3fd96873ef8524e0fc89b71783ebcac38310ee70c167b41d04650f59ec6f95bc52 SHA512 c845fe36bb7c388e07a254938796181dc19d36a5947cbd9d571ce983ef2148bcad275f6f593386ef18ac26490b743b6db3a337cead46e20cc952946a7f3fb89e
+DIST texlive-module-ctanify.doc-2019.tar.xz 57960 BLAKE2B 87879b04d622f78564ddc1edeb6dfbc8e7da4796f45fe6b441c0c27b5090c2e03226ee4436d7be07e59ed64be7c1a151a76a26b54549e18930049a6a65ee1f8d SHA512 f9b636cb41b126809d808c167410a37052b1c6c385fe4eb8df3b819c0cf2cac2c7c1c74d7ea15d2916c1cbc563e078845e451000e3a08cd9a8e0696a342b22ac
 DIST texlive-module-ctanupload-2017.tar.xz 5108 BLAKE2B 889704ff7e23c84c31785b0a14c310e35d94d45aae4671efed4495a4667c9ae16aec75869c9e164d4988adf56e38fc607503760290b8c8ee80772c47a17ce3f3 SHA512 814d68f2870afc8c22d411dc8a2c55fe00851258c315b0be0db28122c939d4b3dd5a446579a0da3c66b807c288eb38dfabc855af9cbcf4fad3905b5cb7ecc1fd
+DIST texlive-module-ctanupload-2019.tar.xz 5104 BLAKE2B 77ad6a6c1d493f9b3d7f7f39d016b391dc4d8d82fab32c1c91838e16ad86a268fde2ee750063315853c2a1825a4331a8e32de7c217df440f53e72c43882f19c4 SHA512 4464bdfbf72318b24abcd88e1c25dae5925a96e867c694f3f02a594ed7b8b24cffdcdb345f0054e200a6af63f88b591ff84058af0adfb4a1b3feff2a057d9d72
 DIST texlive-module-ctanupload.doc-2017.tar.xz 174944 BLAKE2B a8a104a280d4dfa84ac35a277501db71dfbed72f15fa9916f057aa896e461d456f491c427d17485fac3136b9677c9b2819ed3b9be75b969d1dcd44e7243c2bd9 SHA512 29f8c0649a249c02f05b153590de221eab0147e093c241e78521d0264045c5de3f9f26a5f008294ba10622f4fe7c7cb00217025282faef22cca2d4d6a87a347e
+DIST texlive-module-ctanupload.doc-2019.tar.xz 174964 BLAKE2B 804ae2c963ec668924d105454416faee356832baee3f452aafcd8489bda55627b6a60d307f58932e2487a4c2e6ab4a533f10369053a7245896da37df3cc5a40c SHA512 9e027f7ce08041be7668a7a404fad6b6c7cfc71e581ad1216956d0b53c379d204bd84d2d55d186c74f784df8911770b96f934775f44f7141a5f1b9b5e773cb7a
 DIST texlive-module-ctie-2017.tar.xz 408 BLAKE2B 73f6a6343b78fb7b1b6ff2d60e2a6cd39d7549853ceb2ecf33e632d1d4aba72452c97437be06d04ef32587f3e21c8cff74fb50c0c154f929c6e92d2f6636ae91 SHA512 b881e721bebd88dfe7de6163f76c424ef85d480cb09e52d9b2b02c6224578fc2a416e1afd3ef803e5cfb7428fea53879029f1ff5c52d7377149cb4fb9ffa0722
+DIST texlive-module-ctie-2019.tar.xz 408 BLAKE2B 752ee2564532f95c89533d7348235e238f62da84048351c0dc94ced6a1c362de08c1d1eccca7295c0b2481671472c08bfa9613783593b784390a6a256ecf784c SHA512 05fd794d4437c662b77b0662dd0c9169aef35a10140abad2519702577c087177d0a02ee5b6163873fe5b3c83c3f77c342c4774af168ebca2ed875717c7d0c5b0
 DIST texlive-module-ctie.doc-2017.tar.xz 16580 BLAKE2B 2ab872f2b201ad432e60dd81ee3e788d808a2948cc09155766de3a0d721ef27d3b64ff90d18e753a3d85e5a838e1c126aecada33dfa00502b8b569a8154f1a39 SHA512 311931484aedb2c217acb7760de9406bfd6e5922c3fc1a9590514ac27087b27268b22e4ec7d8be2b704aba9ee55803ee52ceb6431c6aeb27b23ab8a45c613afc
+DIST texlive-module-ctie.doc-2019.tar.xz 16456 BLAKE2B ef2aa98bbf2e3c270308f4ded3d18b55aac99b9059d4543abcfdc383b2a4f761a4d24a5f01beb94cd0e1bb1842c9dc6be641e964dd2117258193dfdf56421513 SHA512 83bb53248ce262bc8310faa8c0e057dac72c7c682e295fb9888acff237249a66a69d66b99d79033f5a1d8611ef582dd2121f8c28be9800ebcce775bf3adecf63
 DIST texlive-module-cweb-2017.tar.xz 12900 BLAKE2B 703d65399507ea73329a1f69605ac97c8abd102ed5b57cf1505c48417385d2befa0784fce6c255145f1915fc49adfd75f90c9a058ae4f7710353d5fa437a1514 SHA512 6e8bea28c9e8288d186f46afdd30b864ecd0abc20fd687f0a8a35aaa9b1ceab0d208af6d0bb5eb5fd0d47a57d0d3826610dcaaba5e95c1821590ade62207548a
+DIST texlive-module-cweb-2019.tar.xz 9364 BLAKE2B e43cb0e84e570223523b552fb96ac754888a418a10077f5beadcf29cb8d5b7eef0db17fa543a0c3d930ae1c3882aca0d011072151bb7c0d9c5f9ecd294cfa809 SHA512 274b81a9a12de63e62c72878971c517427fe3dbd9a5ab10d89676326ecf23caefaa961504cb0e9a609224c519a3a6983346212fa67e759dbbf18c2c74de4c61e
 DIST texlive-module-cweb.doc-2017.tar.xz 60908 BLAKE2B 426ae54d4e0d2d46c8e62b7283463d0ef126befcb2e7460cd15c44a5471e93ac8606110e050d2da594950c5b714bff42f3dff20003c3e75c690bfe0b99ec1bda SHA512 10db26820e6d3998fc0be20f73088fe7a2aa06cedde32aff51a539d71ad49e8e7f51a25950e1db578770dff78a8f5a486f28590ffc0a655a72cc04b4072d0221
+DIST texlive-module-cweb.doc-2019.tar.xz 388288 BLAKE2B 6b1a369c86b0f4b01e190e049382d615f9163f928074d9e371d39977d0fa1201ee47a6f0131ee3f235c2a7dbc97584cdd5d5d43dc0b11223c5fea7b9dcb4a13d SHA512 1acb8eb3dfa5d563369baccf3615c06c61f03ae70e18988fe4d4637bc97290f04288a9d15c548d48c65aba0dd3b0b23faa9c1a7f7aa093ed37035fab569c8d4f
 DIST texlive-module-de-macro-2017.tar.xz 7840 BLAKE2B 4d50cb8d5213d652c7eb493e32eaad381310b385a766ee43a27377c39e02c4d8b8338149cbf66883e779f5fd94f097c578e9690d7ad89af50e0977cd843cbc06 SHA512 759f9146b37d485bae92cd6ecfc4291ece42017ce6be601669d989e52229270e04d6e8e26a2a8db46cc9f6f1eed3c5babe57bcf7c080afe828e2320510a3aed3
+DIST texlive-module-de-macro-2019.tar.xz 7848 BLAKE2B fb911180e375163a6339c4d884942f3d20dea41a81a203845c6e87ef8c8712b8460da928995385ece0961bd8e773f589ee59be5384ddacb11f3a19a6cbd1901a SHA512 5ce9beff85d65654173557af668ff15af6989d9fa6d341fe9c26149d0715ed7cf57bf5b2a59b6cf99e8ec14e4ebb6816e9972268516a0b2a78ee13c6423b3599
 DIST texlive-module-de-macro.doc-2017.tar.xz 49764 BLAKE2B 935293c1dd2f509b49320f0f91e61cfee825e3025cdb63e7cbf4cefb7cc8b6f3c30b26f84bd08cb80ad6177e224e37973eaf7da9780365176fb9929211ba3e88 SHA512 00784c0670b5f11ed715f76745acc3ebc098b318ca2b00c294dae3ebf162af0f47b4192d993f7b1f5d443eadf0f7a2644cfc2bfb71956eb680cad2c593a29cee
+DIST texlive-module-de-macro.doc-2019.tar.xz 49764 BLAKE2B c3f60cba4b9a6df10de15e7ca3b5bfb7c16a6e0f82e230ea0b78fe59efeb27fd83e2717262fe36bd6983d62eb5724dc4b6b2bdc3a15d6448b986df4f8625a490 SHA512 05793930357ad58a57e221696d836895f02dec82cc93b9aa7ea302978bee24410d4b382ff72407faa67f4133c75a84fb2454957de446beca05606776c6581ade
 DIST texlive-module-dtl-2017.tar.xz 580 BLAKE2B a69a36d545938321e86fdd20083f0ea3d1fd691115a5a45e4e04c290c3694c27d483a90cae7b082acda1266e03dfc473af69bacdb6f356bce70aab5ac0769f85 SHA512 a10e239f20462a47c8ca0955dbfac1c8d3fd6a73ccaeacca07afe4dc5b7fcb70768cb9c61cbe245b306cae045e8179772c69cfcbd866f6b0f9388c6da54b483f
+DIST texlive-module-dtl-2019.tar.xz 580 BLAKE2B b005aa4657527bb58aef3b3f6c30592a7e81177147d9b046a777fc0476778975de675c5393b96223830e16dd85870e11801ea0583587316e231452dfd13c1712 SHA512 796f01b568969124edc40662db5d8699a815b72d9eafea640c9499b7cd907e4cd36ab42c87ade466c51fcb18a47de3363f5c6068f4c678243c7633343705f35d
 DIST texlive-module-dtl.doc-2017.tar.xz 19580 BLAKE2B b4bb591348ddddec9ea975f2ad10fbe5db5fe786c900b236d811490710c0eb92a5804f2347f7bc478780fce54fd3451b81b328269346c24513e197d7a5d764be SHA512 a340bf2a2af68edca51f4c6a7cede18faa8da5fbddb26a134bfc28e4d79dfb33631a8ee562fc1598596453e4030fa6ec343dae588223adadfae5dcc6953b3169
+DIST texlive-module-dtl.doc-2019.tar.xz 52488 BLAKE2B 1296b8fcbf60fbba28fcb161a4362b97c84e9743b9558287d2aca178a0e5ca36def4926d332ac918a992cd4f70dca3e84a734936cebfbaee72da60c7ddbebfcf SHA512 b0e1d2c3728b859bc010efc5d31c50b10c7f9a045530f99278228fd4a4bae5563d58852dc995e9f4430d64512f7b0ec0c868c6f86259127bdf524c6f66bbec86
 DIST texlive-module-dtxgen-2017.tar.xz 5700 BLAKE2B 5dffbe3fa2894984f1d1b6458c7260439497d6a7ea64a2967ddee9fe59c719c11fd2e32c1c0f27c7a37347bc9ea2332dd82f8dac1cdc64110969bc0194e6dd72 SHA512 faaf12b7897a2d9f2d647096770e0f65bc44fd36b84a6587672c9551cb79627c71bd6cbf251bfe3ebc407d7537f9e8d42f5b301df7760afca7269cf2e6699915
+DIST texlive-module-dtxgen-2019.tar.xz 5696 BLAKE2B 70293ebd3e2942cd602aa34e0916622f4c66458341b16cdc8230b8b5e40857ec9c243d93619d52c6788ea6b6ed5f20cc7b5f26eba881740789e187ae783a03a7 SHA512 e4d1bf82d1a64eafb67f3f0ff570b1b7eb8b45e869891482ba5e37ebb33312e2aabd22f433d1401e3f02e12b1ba9814c543899c52f7fbf8d191ac78d4856f2a3
 DIST texlive-module-dtxgen.doc-2017.tar.xz 46204 BLAKE2B 0ec76f5e6713dcbb748ba94b14f753c3e9695eb1f0668444bda605bb55ee72b13482b5e5f1ce2547a84fc37d60f592ed7970233c48dde9c794a64f45249f75ed SHA512 e53316cab21fd5c9902c566dff44d4f16da6d666040185df3962c8119726fa135acdfe1f08b5a011a3e2287d157b3ea98091db46a5dfdea68994edfedc04a90c
+DIST texlive-module-dtxgen.doc-2019.tar.xz 46204 BLAKE2B 249c303629eef5b5af847f8340ad8109e3ff12c8b635d6eb21fe2b5028cfc82464237daed7d3f85b3bc632dc7fa0c7e685fe59ea54afef5193fd8997db75f613 SHA512 a6f57e26b579a34aa61a76ac3e3539c53ee47427a02e39bb39ab4ead1e28135106c0b7a88a9de2211fefc6f5df84a0f1b5b797e3efdcf54d73426eef23cd0a3a
 DIST texlive-module-dvi2tty-2017.tar.xz 472 BLAKE2B 77de3968ff65aa8b98e86487a77e2bf06f886ec476619f8e92324112b6095775603e6f495d5fa3d096b1d59a2315d57c19e0521f20879c0d046611a74cf44ad4 SHA512 21a8e5e9f077ce1fb1e6b5b249d8eed4a75d007bbff65c58edb83fe07932440568d8d8ad19ac714e12e57d0aef56ca2d5e6276e51c249c172498ca404cba55fa
+DIST texlive-module-dvi2tty-2019.tar.xz 504 BLAKE2B bc28b5dba8887d5144f3006c07ad27854bb9c0d2e55c3ff78629c0f29c96aaf5e3c874d61c6d54b453fa83ef380b36fadf1d466958206059fc7569c5dd4832a9 SHA512 41399ea5ec5d9e32cd032caf70009181bef98b28e29ffee84414914ca436a49bb59caa7e5523ae3c76cb8ede89d89ab74af79dd6ecc89cdf9f0d65605668e9c2
 DIST texlive-module-dvi2tty.doc-2017.tar.xz 10964 BLAKE2B 799fff8a088c6614e9cd99bbb4c2590b0a4595490fd4797d9099f1b349fd0d84b6e995f2c2c1049cd3dbb08eb17fc667fbe415b9fdcea29a356718f9dcf3d92e SHA512 5384f60e4b72858c10503f458a50f0d554bcb081cbf3614bbef77aa351855bc70b69a59268b8a3dc1bcc2a26ecfbbe06d424a888806fa7a3d05df1b31c1b1532
+DIST texlive-module-dvi2tty.doc-2019.tar.xz 35892 BLAKE2B 1577b9aec7144caca92df4567a0258faf6012752690a041681e224182637bdac308ae05f2730d9b0c233c2161fa3406c275b4c195b4effe4cb6e678e8ad3c00a SHA512 31cd9e13e873269f27e7e40b681a56022e7c0d776179fedb3c9396bcd9743b9e2b5f3043d6d2858858593aac49e40c16bb27d676f77ded984f4b803dfd9b07eb
 DIST texlive-module-dviasm-2017.tar.xz 9516 BLAKE2B cdcaee4e5fd57e17e39a267190a48f02cf5f96ad5f62fb74d0c608629f3d36d10f992ab9a0941d189126725801753cb368a1cd375cf27125fb0b388a3c63a5eb SHA512 25bbe1b0a90886a025cd1b64e63669baa382e1ac4517211edb8d01dc7876cfacc3dd13358727c4a5f3cf171aa90f8af7c822c31c8dbe3bb55512eab97ec1e4c9
+DIST texlive-module-dviasm-2019.tar.xz 9776 BLAKE2B aa2494bb1f86725461a274df15a926cff19fe55a82fd908dd4bfbd4f32d6a479e56b842f6d8b48ff81edf7d7195eed9075f3199093d6c18c8e29d8d9d3e7d6e6 SHA512 f8f24627f416053ed4a53008eb6f4b83a6f7114793e361956c3a968efdfe06c11c233e24e14568ccffec612d1ef63daf8f6644333f68d202b816cafee1da98b2
 DIST texlive-module-dviasm.doc-2017.tar.xz 664 BLAKE2B 26782dff43ab32f90d1d74ca7cb5af8250fd6d7019e3e99762a50177d068f796976308749ff64602b11e86734a90d2e2bb11e976d1c6fb274161bd101987ffae SHA512 13b9b6fe891fe6c0e5c7819c74225b2b943811452562a684c1f71fae7628ba167acb48178187a5a6d56625744ab840aac90cff15010e64e36c3a4eeb1ed84ceb
+DIST texlive-module-dviasm.doc-2019.tar.xz 664 BLAKE2B 8cce538c9bf68d2a245ce53eb15fdc77c921358b060caa1be1fb2c45527c6498e528c542ac268800951eb0a511dd4f09fa464472927b70eb75d5b70497d36c70 SHA512 49d49f53bbba34659a96d587d899af7a1d4eb4841d3b5132ca8647efeb27bf6590f7bbac42bc5d5becca356f7bfcd4fb244f6ce9282539fc9aae4bc99a633ecc
 DIST texlive-module-dvicopy-2017.tar.xz 524 BLAKE2B 088d69167909c33a373c581d01b1dbd7b0312d7cb79438fd95c6657dd3f35af59aa68630ecf5be688f9a03ae899cec346a3d31a43a621d1c45e1fbd4d387454f SHA512 537444d1baa72d23c09c42a53c39bf111a363ad683fa94851baa186b856730e37c01ea5aa60076a3da5475503fb134c44f8b32bc8bceed3d63e809d1e4161c0a
+DIST texlive-module-dvicopy-2019.tar.xz 608 BLAKE2B f0e20ab50bc3a9f9eb90f94369b011538e10b813246fc7e4683f1088507facf86d061a48f1b6fd4513e9076060cb4f8cd2d3b144ef668cdb1906aa9a6e7d94d4 SHA512 34e16ff93daa924658b433affc70fdab01bd8d6c1d537cf1787389b8de34e7348aaa91a39ba3f3671d25d216420421a5ca73cff5de254fbf25a8433e20fda322
 DIST texlive-module-dvicopy.doc-2017.tar.xz 3592 BLAKE2B 1f610dd0d92f39b993cc393107aa55e921819fe04930fb8855215f36646e0f30e2d7af6571c7ec5ae72890881cbe5be164ec18bd3390e1a7ddc4457be64bc563 SHA512 c308ffafbdfdf152abd842918c73aa55689a514a1de6cdc53595ea988bc7aebacb022efc77bc5b7eb0469e619f1fb6916e2a3515ba5dfc6e4744a22b64dfaee8
+DIST texlive-module-dvicopy.doc-2019.tar.xz 18264 BLAKE2B bfdfef70d6c7dcd1ea68ccf1306b8bad580dc54638b0feff058cf72ab6f784d1c2e86a4320e4a86e3668190a0915da7a4626ec40b054e84d02917f82fef9a2e6 SHA512 a85e3cf8ee5e500264ffaffddf8ebe6642373f29fcca42c346654f304f34b9389f2e190014eacd215ca0d78debe44859e05696789b9f703fd6eaefc9bebd4ff7
 DIST texlive-module-dvidvi-2017.tar.xz 468 BLAKE2B 0e301f188aca041dac510018e4da638194cfac151b9229f4ab766ce021bbcbc153dfa39558cc2be696859eb153175044ba0a8aae3447ef49d47f0e512c419b02 SHA512 29ccf47b7a4d81999daa3a16b774783d582df2b9af1dd814ba09329b5fdcda4af8a9183af31e2f9c4c416cf26425c2443571c9249f992dde98058824a64bdb31
+DIST texlive-module-dvidvi-2019.tar.xz 464 BLAKE2B c82c37107c4679d87d240a68d7b394ff78af9e94456490d5977e97e952c4c9bf88dd2c56b5ad4934c2b81e9023703d21646633355d4fcb4ad8ba317dc063aea6 SHA512 0b21ec8ae0741fe0b9cbe53fd97c4ef20cd4330bae769424b2fbd2998293b05419008ebcc7ab74bc17f166a30a66cad980f5692ab32aa1621ad4a771d20d720a
 DIST texlive-module-dvidvi.doc-2017.tar.xz 7880 BLAKE2B 58d04f3df26776118c4684b8d3eab3badf304c7987f006e8c1e9330e949a4bf34f978747dc162147092ac1ee9f588d5055ea11217c55a92b61a102dc6be0ca30 SHA512 72685126bffcdb0adf0aff770d17eabb1da16e999b24a40c4f5a0925e8eee1e168f88abca69a6d803dc91a8871beac954feca4d22b08542e5887d8f4226f7cda
+DIST texlive-module-dvidvi.doc-2019.tar.xz 19336 BLAKE2B bbb9a82346ec68d3d179451dcc142ab32e1cb2d24559314f2ee23579c6e83dd84429dfdbe80240a9abc746c6cc4a868abbe043f5717f3a9e82613e8e0f4ca1fe SHA512 831daec5b770f866c15440a384d1352824ead05faaacb8ae991e2d9bc1b115d599e5260cc9d7db6f0752ca7a16f21b0c52b5fff58ed1b23f30ffbfae59387c13
 DIST texlive-module-dviljk-2017.tar.xz 532 BLAKE2B 692aa25033a35e776a79e829e1d202c8609b1bf6d74a3940568d41e289132c42c4e195b895efed633732896b7fbb8c235840ea4a492ba8244ec8f0e67127b199 SHA512 2fc2bd385e0952e1f1a348040de644aa98c63ddf436e7cdf30366f779203d55632b96e2a8e167413887a6eb1f5a86e37b3c49b067de582db553ffcec51c046d2
+DIST texlive-module-dviljk-2019.tar.xz 532 BLAKE2B c7bd650dbedb417e8a29b4c3ab7152d4b9ca591e9d5fe60f140c4daf284c074f8d374a91265055c852787d7e73a622f9ea41bc42ba45d5f9117204e178d20421 SHA512 9c94578a0e4a43663cf1d3e05447d51ee84b892bb78ac105321b471e21417dd636bf8746d04c0decce06293f8ae8d8f60e0127b52796310a9c9dfc512158ab4c
 DIST texlive-module-dviljk.doc-2017.tar.xz 42128 BLAKE2B 41d9409a8ea851316f9321a951f2fc84107f3cfefbacb68ab6680f80a3ab024ceeeb4c0afe4d027b453e1caaed59b4bfe371bcc5c04fd072c747f4fe75e25926 SHA512 4140bf5492da8d3e4566d7dcfbb3c45f722fc1b924b429d1b4b8a32acae424b4485d0810390182527c6400ace88c4b45b6da06bb4838141e12142ec5c87f05f0
+DIST texlive-module-dviljk.doc-2019.tar.xz 74944 BLAKE2B ffdde2707be4b30895d107f65cf6ce77b2f9af40fcc2c066664a2dfab355331939ed89a3f3e43bce3241fabc83f22abc16bfbe4ddb9e5b935d85941c6703dfc4 SHA512 fa77f151e69f8baccbd01f8beb29c0143283892d42f5b0213909c7d434688a4e4c5e121ef9b8b73d93ebb211ca03a454ce309efd447a7d351968cbe9066b5ae8
 DIST texlive-module-dvipos-2017.tar.xz 244 BLAKE2B b6ed5118a94f06e170d34150fbe43c96da3ec8d1c1e305092caa06cdda497b662c91b2752eea7049fc37187e031103e84c9ccf305f71cf4b98847a1d4af16ed9 SHA512 ea01dc9fa33eb847010fc4f13b023d8ef0e87a9da1e9cb7b8f15f51ac6c428952ea5d8406184c0807ba4eeec255933637122155ebe08fbcd8fc5d3df5fa1fbd4
+DIST texlive-module-dvipos-2019.tar.xz 296 BLAKE2B cd298e3137e6ef39c1963f70a9f9e592f424bf70871f551aead7669d176de2dc02f71e79bbb0f465806f8af9c6060cb9554298d0b860240efd01056637de2bd3 SHA512 ea771c689b519ab7167a0e363af501db771e7883c0b82fe0ded3661b57fcf31b932cb268b08b7e1f2f4ea3a7f85a7bc1efca83272f7eaf163354166a0b9a5a93
 DIST texlive-module-dvipos.doc-2017.tar.xz 11144 BLAKE2B ca5a8d9f604cee30f57e01b94733599a6c72feccbf20e7ae3d080138a02db87afb0169b7738717dd56cef3f95d8f8882ca6428b7731a6803b861671ab9bc4d2d SHA512 e1720314341e7063baf34dc5ce7086dddf282a82c5723df8b67547b9ac868e336657a88b0243b1dd20762c4371e2b5a8341314af558c55a7462534bb35c2a965
+DIST texlive-module-dvipos.doc-2019.tar.xz 28512 BLAKE2B 6295ba336dbf940fb4ef72e4dfdac982a0f50c47ab91860198cab77087937a7bb16b09c22b507fd8c533f2bf8f1ce27d18a9e6858d1154cc0b66b29c40d18ed0 SHA512 0e4548fc7abe4aa8f54a1b1a17d4582e1cb6e9f0aecd9812a1e2337ab1aa9995b4f3c4e2417f3eed248a9d40a5ba2c314aab273fda3ff5dafda3d9ca23307b77
 DIST texlive-module-findhyph-2017.tar.xz 3904 BLAKE2B 8ed8db21800eaea0afce6ee4c0ec4e61441537c43f79c82506de3ce9558f74e8b29a9067d8d4e453acb88a84a9633165150ba206181302f72999aaf5770042f0 SHA512 f6f117fd97f3c5cc7833da907b49783925704a43580b980d67a6bde4c501ab0d48b6d662bef3c11d1c802559a120ebaf3673c7a69f4d636133fd1e46629fee26
+DIST texlive-module-findhyph-2019.tar.xz 3904 BLAKE2B ed688ba5b589ecfda3c1de90f7977fb76952576534b4614ba01643335d25a7a7b2593d954515f96e65e6fffb5544aae6237b5ad1dd7b011691a0666cf516ba86 SHA512 aea6305dc0d9b31367638078a7958933468e761ef4cf47a1c44d9fd5ab2e25f7af22273c4631946a90edc9b51947c2e56b3d4b74c8c59f0a79250c2edf5bc137
 DIST texlive-module-findhyph.doc-2017.tar.xz 12024 BLAKE2B 1036486064c040454e1c4fdd8d1ab95ed28847ddc8811b279529346ad148d2039ea86f24f01fbbd9389358fcf6396624e66cc006f6b3ddb644e21be2682e80b2 SHA512 fe8f33cf13a69b43b80464e3799a090e0a0eb0bbc3420b5b9500ceb490582f79defa4b2ad29d406dccc4b2ddb5d5b83fbf644eaa99ea0565cb258706d1acc0f5
+DIST texlive-module-findhyph.doc-2019.tar.xz 35040 BLAKE2B c8c7bd2eec414c4289b441c047c36870726826d2e22cdfe852117117831f63f92457fc25ad27714ab7eb110832e3c052ff197f503ae969c941bafb6d5d48d24c SHA512 97f3fa22fe490d21bc9e5ce5ea0b23ff25ab9afd9c5dbf6e8d78b24fd306ddc132c5ba7ca7ea7e3d7aaeb48993c7968b0c02ae0b765416a939d84b53171f4179
 DIST texlive-module-fragmaster-2017.tar.xz 6872 BLAKE2B 574cf41226398f1f0ebe3a46c515449b95ce39c5639d00e21822753c560f3236cb37c1f410a33e1cd52ae59a5fe8ed72fd6c2ba3e7ccdfb1e77ac5148a82c330 SHA512 a7e6fccbd850e7b3ee942a3d5af379e79a946fa9b037ed47d8de50b250eff15d0e6250ce2ddfbf8f7535a1b7c1bf39d80d5a352e1b77fe9bbe0bfd25da434bdc
+DIST texlive-module-fragmaster-2019.tar.xz 6872 BLAKE2B 85cb9e3b240f22274f25bf1ff002b86ad20389d20840c197653242e8983795e4f61358b9546b302be786eeebe7359f51ae60a7b82fc06d2a5aec561d50fc7cfc SHA512 dc5d80aa4bab7a0a66258face6cf8222d03b12ea492f7cf568ef815a6d5950a8a2b36c7403ab466141f49cb8faedfbb33146820b88da17d8b8fa18a2b16235e4
 DIST texlive-module-fragmaster.doc-2017.tar.xz 80256 BLAKE2B fabb4875633e49d260fbb6dc263ba1412d022fca85a3811183933ad19605c69c8c11a7b2b4b1e32295afeaf43c566c91cd137ac15263176eafb5b34ad7c95f0d SHA512 cab8ac6247875ed48f86f16a67cf3ba8b320aeabd61cf95a6c43a6cabea9ae11ee0cd9e2bee0b577ebbb414216cd4015a36161c83627647371418ef61d28c8b2
+DIST texlive-module-fragmaster.doc-2019.tar.xz 80316 BLAKE2B 5fe2d1f1b5b38dbf579e0ab8819103a04e885c9b43ed7e76afc4836da78f230a0a56840a0c188a6f40e06d17084108f0f7cccb8e45f5a9c32c2856d8c681a55e SHA512 61f0bd7dab46bfb91b634006217f01648007cbce3c9187b0811a5cc1755ec19654da94b47866ad9873fd57629f1561d1cc46bf3a4d62db618502aa0e67500637
 DIST texlive-module-gsftopk-2017.tar.xz 3428 BLAKE2B 348791efea69f8ad6a37480770d1cde59c8e3a0791f16bafbfa94955fb200e8285b086d95ffab90d08d631010f053f5a03ac7509592f0a455a004c0e19dcccf0 SHA512 9f3cf2841b1f275c13991ca07483bb47e9e833bf5d2d137af2660d7e01127f878b26cf0bab98668504edbf0d87e4e17fdeb8c7c654de01048298298771d289ce
+DIST texlive-module-gsftopk-2019.tar.xz 3548 BLAKE2B b4d4c355587e6665ee542c9a58e0d67ed773e3258cba1e8d86a78042d614db5dcd70014cf4b24c96d0aff2fd76bb353ccc16e90ce2802a0f00337b3557bc46d4 SHA512 d05802963d499c4dc0979a58bfb56a1c04e006b25b7eac4cdeb7659ac6f31a0380e476e933586f4169846f88d727742ae5494cdbcb29995439a4cca5be4c7332
 DIST texlive-module-gsftopk.doc-2017.tar.xz 11764 BLAKE2B ef3ae2f15809430ce3db9090ebceb9395a1a66bf31045de689207cf52b9744a1435d29f32787b73dfb77ba951109633ab09972216d3a999960d0d94d97f149b6 SHA512 6114d30883da80d9ca222c7191f57c613d28871d737df506f977442484ece94934c2c72e0c78c8ed619622c4d0a2c4a174d917ea9408f976ee0e14f3db7cd55b
+DIST texlive-module-gsftopk.doc-2019.tar.xz 27536 BLAKE2B 4c84bd07e016fd4b23d7ba30c33f1cfc581c41e9f7354f0f9d3849c5e49264aed35372f22344753f8bb832e285dd8f5bcefecf11b353cc489e86aa1e883c5894 SHA512 7d9fc4dc5c3b4cbc05939332e7286be712a51f74b408df2e6cd9f1c52f81b01104e4f41074c55f74ecd003276f2b9fa2285e875a27c20e16936e78ffedc6a4f5
 DIST texlive-module-hook-pre-commit-pkg-2017.tar.xz 776 BLAKE2B 34892ff70e1b4ad25ab9356f26cae2ae183f403afdc729d9a1e107d161eaab0aa78f22ba2d0c27d7b90f0a30d1e83d29805e1000bb81c50a629888cefc96afa4 SHA512 8db15c4d2347289caf9cbe967e4bc7ee819868d11d6723afbc9ff045247fccf52694e0533f441ad8b69ffbcffcc98e52f17ad901b47a7a9fa2c19cfdcc693dc1
+DIST texlive-module-hook-pre-commit-pkg-2019.tar.xz 808 BLAKE2B 99741f4b4ae417b9e1975fbcaf412416702730bc4c0aea51be2e8324ad539abc2687b690c5541e89ce085d07584b63b24946c7d5beb538476855053ebfaaacfe SHA512 6fb3009d4bb4016f0d6e92571d52aaf7e3780d39a6b2ec73ffb37112b3f153ed71ecbcd985b81dd841f296a39da83e9004a2d6e6e85e9a49765e1682563cfde3
 DIST texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz 2784 BLAKE2B 290480e643130dedf245b25741141ae910e094ddab5b3a169e9f9999c794afb6f8c1a999a0d2df5b0eafbf414a6c15bc11841a29552a5c9bc2b78aa93b5277d4 SHA512 727cce2647d203c3a8c8c918ade775af08da1edcea7bc57f55b566caaba5ca42310b6c0a90b089f3ca10718a5c1dbd16c95549930b0d4b33c68b0a3367dbb172
+DIST texlive-module-hook-pre-commit-pkg.doc-2019.tar.xz 2788 BLAKE2B e87de5b35b848539f0bb55e82e60e147ada03120a55f3098b1d0b1bdf7926c57882c5c4296dcaaf4da89f2ef46989593642908db22e75a37802aa2b71c905ac2 SHA512 3873c4714a8a6d221f860a5d0606113c64482b363727067e0017d27e99d73f31cfdac88a799fb1412225baffaecd7bb03dbdc66b607a075b1e4539ffc0df2a9d
 DIST texlive-module-hyphen-base-2017.tar.xz 22296 BLAKE2B 8de6b540c4df5a4a51136b96e33fbf9e5fed9a4e63517edeacd0c978a9890abd8721dacf011ee3f49b86252e3112e938b775f627eeb74f3bc868a4f4f7c5e72c SHA512 6a6ccb73d2e56233956460ab6ec1e1585f9ff4d88cf14e91186429f7fee78bdf58c78d96f25e0e8208d8824ab907b49f2d61119e4d7d17c1b79aed2fd2b3e834
+DIST texlive-module-hyphen-base-2019.tar.xz 22420 BLAKE2B 752153e786b90c402f327a2ebd87e80bb5ca2705d55cbdde91f01c11e428a41a50cd8adb1d96cc72d5b85112250b6a1a5af14c855b2bcab73b332942faf7d218 SHA512 e1980b81a98b82da2e590d08ae5873529041f3b048396d9bd1c3e644e6e8a48a8eb2040ce120462a9e844353f8f0c3fa93c38bd7492d35d390525fac69794503
 DIST texlive-module-hyphenex-2017.tar.xz 7512 BLAKE2B 77e2016ad16e11ece80b11cfa803fa74aacb41d1bf54ac98ec7a685e152cf6a98ff071b6134a493648ab333cf4a32235566c1bebdd543fec8ac17b33ddad8fd2 SHA512 d92236780a8e22c2430bc656fb4d4f630665d7be084a796a11508ed102592dd4de940f99e6a3501577c093cbb0cbd861eb8d41d92fba09a6cd0f5e5d2dab9f22
+DIST texlive-module-hyphenex-2019.tar.xz 7512 BLAKE2B 788a74fcad29a9f80fb23067baa1757a449d0d56e8e0788dd76d9eacde4e95548e96068216d63871107d44ff852648761ddbf11595fbe38d21f4a9117361fe42 SHA512 dfa1f625e736c2c4125209552f084fbd5d64109db5dd5b8f37b5add3fce90984bfa5db855b581396ffad20b1f5a3461cae01e031c086f7db5dc98203bb7bf8d9
 DIST texlive-module-hyphenex.source-2017.tar.xz 183840 BLAKE2B 9123337f2ca79b38b5dca08f9b2a53acea4502ce4a5d4aa702b82efdd1ac2918c80d1f0cb03186173cd60ea3ef25219a4e9e326d55fb1cbb357d86cecaacc9e5 SHA512 370235797f5754994efb735b8c1691d3be19dcce9e112969323e16502cc5cf695bd63ac5265ce90a7312415a6acc106999dd290a22e9865a03b0ce952ee62f56
+DIST texlive-module-hyphenex.source-2019.tar.xz 183836 BLAKE2B ef7bdeb8230caf5d1140bc0ea0eff144ca1e747eb8918cf9abcc58cfb20bc7a5783361c557e375fd47325a083133dd3fa227a46cb48b1d8cc45802286208c868 SHA512 cedcf83033a5aaebb44a8270b5e670b9db2fba2b8f65925cddee4684bf50fee5dcadb02921b04288d02c91ca3d003c8da143c7bb1974e7af26b1f392dfd4283f
 DIST texlive-module-installfont-2017.tar.xz 4796 BLAKE2B 05d37b0526c314d3416aa48ce80c843e2bb7b7e6b239931689ed2eb02e413d9ac2d1a3bcae98b865234449e5496e5f5363c75dc87fde7bca7d6d62c6fab54209 SHA512 f15bf4b91feaf5af8466db0492aee40c3570494a9ad503b62badf319b2aa20371eac883f714b60e015fa3ff15d8cddff65da373de653a6780fe2709de8fe8071
+DIST texlive-module-installfont-2019.tar.xz 4840 BLAKE2B f5fdcc51fde58473041db0aebb682b431ceb02476fda93fc7cc59016982d613f0ceebc2a662a6260d51ebd8a96e03ecffa717cd098fa2fcf2d614e3458777624 SHA512 cd5133b93c5daabaa0ea13649f3d34c28f9af9f92db54917e64cafca5f5e7fe5169d87e36783036850ccde0002d34860eceaea528ad06e21f08141106e6599ae
 DIST texlive-module-installfont.doc-2017.tar.xz 56028 BLAKE2B 91169625c57838433c30f8b4e9830d9a949d9adb13b0dc811f68f4de516e05f9ca119634d769ac5fd630728ffc5ca7ee53c1a363d8699e374ac9bbdac9007eca SHA512 cad711520909fabcb44a551c3d3b4ac12682ffa5ac5986d168fe0e0c0e5ca0cf8135d2a3964f7d4f15f8891ec5d44fc88d0f00a458308b82e31dd1bb52dcdcce
+DIST texlive-module-installfont.doc-2019.tar.xz 56040 BLAKE2B e1b66c235779773678580a4a2730734460c3efa433de30303bdf8731c4d303e3b0b41784bb5643f379d64e53b768941e9ccec124847dcadd8b928bda9a0975d7 SHA512 2b61c4b229e0c4ec89c591075e52bcf8c150f5f9584bff94f81ec1f229940dafef11d6b6f84dd086692cbd99e6616685533d4313ef5bc48c56a7494fef3583b7
 DIST texlive-module-lacheck-2017.tar.xz 464 BLAKE2B 8657aa4ce38ff1d433a1fd37347c362169f12a3af8e2127e462565f8f7444e53d103c0a44acf38c45aa3b222a40ad5699093c6e9556c2f3f254d5728a29cb293 SHA512 16a3bcff6278cbc0b8237590951b6e5c5cb4f13402d2991db8f69ed4ba7c95a4cc2caf6563a2e38a386caeb68af11452d26a3a18a8bab3576255ba88128a8eac
+DIST texlive-module-lacheck-2019.tar.xz 464 BLAKE2B 306cfae738b04113bebe25cb6e57598af61078f587f91503408bff5190362927bfc5d2456b4396fc524eab495ab70c48f70f20afe24b966acf753f4a86d1a435 SHA512 7b8c4c7d15618b7e0d860afce675124372d31bc11b5e89ba169c355401714929c2c192912e7d666a3ca98c805e2f4942bd6173763a5a9265d1f19467a29223d2
 DIST texlive-module-lacheck.doc-2017.tar.xz 7404 BLAKE2B 73eaeb32befa917817aeee5cd5c345654dfc565e82e8276ec19cec4684bea321ce66e63bbf92f80b88866dbec1a6b0e3e2016611bcb104fc459392b2b9d8bda1 SHA512 dccade3cb114fcaed052b8474e6d4e3884023cfffd34ba8e4895452dd84f114270f3cd20a731b52d5443953154d6d0c112b27bbad536ff1cdef463f66f1e9fa2
+DIST texlive-module-lacheck.doc-2019.tar.xz 21132 BLAKE2B c0a0dfce1f35ea67691faa65f8d2d6917eaed9ef5c9ecc7bfb846131139749d9ecac115bc557a2e5e71bd42546f8bf850508e6d814b76995dede37baa25d774c SHA512 59202286440ad95fc96576f6915843adfb2b3f0092509175c759c690069e36c0ce1ae66ef46c1dc1b9c33e42e7819b1f3490b45d3c3933233201d3e86eeb5746
 DIST texlive-module-latex-git-log-2017.tar.xz 4840 BLAKE2B da03a5d25ba505e0f545056c9558abf7a0482bdd783d9cfa7484b07345bbd1781c9c06ac9db8c1ffa9a6981432515857eec74ba3ee590e6b34a4c7bfdda1c626 SHA512 01a823d96ea3cb193617ad26405768231a1ba3f22165b008f0a4898e3db14da424cdcdd12fc353e0c89b42e6cd80e3b1531d772f663ea9487f8fb02c763a1c03
+DIST texlive-module-latex-git-log-2019.tar.xz 4856 BLAKE2B 9cd08c5a9dfffbd71c2e00f1bfa80fe831aecc5ff4b93570d873e98890ad50528532fc906ad6d108283cb8c7ebbd2c93db055f2c88464e2e0d4166bd098e6e43 SHA512 7277bd2160cfbab8daa88144b384cd03647192d516114d692af232906a39ea44ae5721ff0b935e7dd6425ec5514851220787827b819af71ae3f0c57b29d0d924
 DIST texlive-module-latex-git-log.doc-2017.tar.xz 91528 BLAKE2B 1fd46609e1e87d5d55bf61c61141ce7467da6a45d6fd36a350dd74924b9c67619843d7ca7bc11cca3eab62801f444fe0761ba1224db9f2085231cee4514ecc14 SHA512 0e08eb2ca6a0c933a82b66058d463c781b0313e5631ed4e35312d0f612dc2c627dfa5ad5d4b520a457975f31266c6ce132f2318fa2fd1a66f4860fc14dfd334d
+DIST texlive-module-latex-git-log.doc-2019.tar.xz 91528 BLAKE2B 7200b51158e2e6b2e028ad94c54e2de9beca10fb109187e42b6f1eed693394f9990b5c578dbf2cde46c7153420ec8c514c3388d5265c8d6845993ae6b1d94c70 SHA512 34c96eaa3950f9577ddf63fb42aac51080f8e92c55f02b217d2b680353f97b1fa6bcdd59158fa9e81d48dbe63d35859b52285912ceac4b523a8ae34ec894a1ac
 DIST texlive-module-latex-papersize-2017.tar.xz 4608 BLAKE2B 702216f90287e9a05883c7c50dc28c1c12be11dff0d0f97c9a6fd4ba7dbfa0e7b19151af47e25ef4d2c60316db2f634e8feaeaad54c016fce8a082e53ec406de SHA512 84f4af6e54673015a85ac1bc7e16a93b1fc9c57df4251ca56fd3af5a90bbb750a9d4aef4fc5ab769bd3ccf965ee1bc31704de90d0f2c88d23d696b866c8a2fa5
+DIST texlive-module-latex-papersize-2019.tar.xz 4612 BLAKE2B 8b41ce3b6d519e1167a7f198c7050f393f919c7a3a708aaa5576e2a88acd7ff343b072feeb037fa00feb90ef8f1e27ae75a1c8a38b33cb2c0574c6a57ddd5283 SHA512 cc3c6b563e16f70cab0ec113068d7f870a266c090ef518c06b4e3eced8e8fd9cb7aaa3544ef362ffd4af7f1d033a104daa48d47416061c3a73ba8329cc9a0fbb
 DIST texlive-module-latex-papersize.doc-2017.tar.xz 600 BLAKE2B 5dd6592c5680266f071539d861b4d5acaef86743b2643267b40c8a25dd21454f608a593dc804291ce241000af96b9206ca2bdff5322c88a351fd80459363bf01 SHA512 e3aa2050c9fab9c806f0df66bc2d34b97a8b67e6e1bb41b13e524054731419145003305117ecf515dc47c98ae365c78784a5f09f823145e01ea08aa54ebb024b
+DIST texlive-module-latex-papersize.doc-2019.tar.xz 596 BLAKE2B ddcaeef03ece18b323d153b84b3369f317b5ecceb10f320d98c93f3963d739673a5df9c0e2918caf7424f14197fac79ded05964893595f8efd2d802ff6ce8bea SHA512 662d7a890978bb772a79db7a1d406ce6958970f6cdec352f78347d9ad8df47734ddae444370fa9e93582d4030568cd516ca32125b2d1e0f60aac3ce1c9b930e9
 DIST texlive-module-latex2man-2017.tar.xz 13940 BLAKE2B 1289010000370b5b88ab4baa6d26b299c2f67d385efcee8c5387658b5fbd1b8033463cba4c664365dae9ae0eed84dbf0831559f81286ad46bb6ba08aa5df6a41 SHA512 e3579403dc9e984cb51f8854436968abf69a29ae6984cdbd0fb2fe0141b1ff2af65d2100011fb6355580b7f8a73a3c0bdcd3b225c8f7e13a828c6b2c5ee602af
+DIST texlive-module-latex2man-2019.tar.xz 14088 BLAKE2B e791e164f7d8faf12c30719817cb887eff7706b3b3db97cc0cce773b4c722e62564935a5061804e531a3dbc862a919b3606c9c57796679029b5208473bf7faea SHA512 9ce1870958d7de7625fe73dfb735488d2512b048c8c06fed3f87255db0914080675017d24c88a97ec71ddb9cfe6f5769ea378f099d8787e447837a1ff5167436
 DIST texlive-module-latex2man.doc-2017.tar.xz 344456 BLAKE2B 39e69f1301796e5b3561075496b3f46b7d464296dfe4db2f55e7230cb788efc23dfb399838e6245cf64602dbdb865ecf725ddec214824913974f1c88a6882ac5 SHA512 88f4b0fc6a12355b0defe1c1ee10aba1d06cd498556ddf043ab12d480ed5f1946cbceb58de7beef452afeb24e416261eed8aff8c21c330909f6cc6a8cce9d5c8
+DIST texlive-module-latex2man.doc-2019.tar.xz 369336 BLAKE2B 897023bf06fb5ed6f172251fc21cbb3bef908742ec86e3fe998a080a890b74e029d52332ce7b9c47334bae40648812ea5fc9888e18a9b28ee53f059ceb9be4c3 SHA512 214685e6982c7a9c694d74a73d37c58f3947d7304637d2ed44fc616cece6026e5d02763f26e280ab21212d18a962c31b4ac5315fa840f10bf1efcfb782f4dd2a
 DIST texlive-module-latex2nemeth-2017.tar.xz 7082664 BLAKE2B ece6a898180446590b092deeb1f1c8dcd96f3692d2dfaaf24ff8981a25fea8080b10d8fa74dfffb3f0bdc899ec63aab4033a39fa4f672b543ac5c4357828c588 SHA512 f65a25838d5feb6c90eefec17e13561241359db663dc1c109a1a0fc6a4d8dbf48919ef068db1284c8e117d22566230ecae405c69813fb7e95d26cc1e5da1f403
+DIST texlive-module-latex2nemeth-2019.tar.xz 7113440 BLAKE2B 3220792f23086f9c8dfaaf146f83f72c3329b0ce0d2e891ca9c461fe6540f837798b649887df890caae09afd5d90bc151afa9315e455df012817274c0accc02a SHA512 ee82b11dfd3ede3b926a034ce8a7f46ae2bdd065f648fc0375a62392a8be605e391c64726eea03efc439b7a01fcd3cecfd70106335c72927e45c70ef0c8aa48f
 DIST texlive-module-latex2nemeth.doc-2017.tar.xz 23852 BLAKE2B 6636c3c0fe7628d8ba8c600ae4ff84add3bc9f7702f596fcc3bf2d24f5a2b85e87e9ff8cf301adf5354504033ab0c3ef0d5bbc3ed5c52c6bb9dd36e39e445dd8 SHA512 c55505f0b00e4d600ef9a40461f6e3888f4c820ca1462a2c2edbd5c9f9ca75e08e543cb9fb25ce56313a6eb80747a710134ec5933f71a172e5a675ea9a0d76ee
+DIST texlive-module-latex2nemeth.doc-2019.tar.xz 26732 BLAKE2B 0310a18a972caa58589eafd322d4d767e023d3c3a42a3dc250b673eb24d09c1a5ae86789119f1b21ec9575654a186a47d159cf5da03ffce59ceea9bee239c7fd SHA512 a674eac6b80811890433c613f7ec9c6fc4667791c5b4692606e88d3e38ee59a3b68951e5f19b26d2b9f9de3b79002d17f4c539fdcfce37b82c3dfea5cb811086
 DIST texlive-module-latexfileversion-2017.tar.xz 1652 BLAKE2B 5552ae1828ec81909956d20d68bc35c1d6e09a10b7a7439c633ccc8612553340d4b7afcc7000a8db1e4793d618fe0f31116e993bde0bd907ce644d1e2b929e7e SHA512 7b2c2ef5ae64d2921da0fa553f7fb745dc7c8f9c5675f5c018e29a4745f2333c0f51d00eaeac6474a35a382d9286896b0c9a7a105424ec680f53f8a93faa5b2e
+DIST texlive-module-latexfileversion-2019.tar.xz 1652 BLAKE2B 57a97adc83f9e367c3681f6943bb38ca238e6057ecf9873611751da624013e891f5dc184a46daac80a2464fe32ee7002e53f63343e6d8bc3bf313e5b347c5e50 SHA512 3a017b8a367864358370f0063957c301014df2aa039566ef33ae78dcf428235ccc2a88e19c917c940e186371e2c0b747887cb04e7cb78b9a04ac1720dbd94cf9
 DIST texlive-module-latexfileversion.doc-2017.tar.xz 928 BLAKE2B c5654e989d5c5edb203cf77493edaf588cbd125f49eeda6513eb0f335ec1c98d11a53df98c0e5233503e985aa89fd9c6239a250d85e6eb15d26c23082ac6d305 SHA512 46a5495320ead028664b1c02c872147cf350f05f1f9a18291fd47a266a06a66449bbdc0d9d4818cad30f75f29a2ea3611fd6c88379aaf3a703e76e6df9f6b679
+DIST texlive-module-latexfileversion.doc-2019.tar.xz 928 BLAKE2B 3a72c41b0da50e9793ef2ca44653aec32780da76201a43a57e0ee77ffd4ef6225d789f1614b166e2c1b324b97a1515867f4af13d68a5225fafbd444c7ecaf11f SHA512 b1df01f8bc7daed937cd20d1ab7cce443a3d1fbb58e04cb18f0c0b30ef0795c988cf51bf49ace2f960c173f6a95fe982ee9d29d7650dcde21784c788165094c1
 DIST texlive-module-latexindent-2017.tar.xz 38844 BLAKE2B 3ee9541872df5fc37587c563ad6879f7c9d151b19838b71b79c8a17a252c233a581ed7333e0317e4c152b5789e6a67c01de9f3157851c48e14599cb9b55a13d7 SHA512 f8797cf236d783536bd208abfbd7bda3fe05f5101e3ff2cdf546179a526029ab47fc25eadce6f54cd8f0ab29ea155d412163726cc2119395ced80507d8597f69
+DIST texlive-module-latexindent-2019.tar.xz 53160 BLAKE2B 11455103e8e251ac61b7abcf01e638059b89c981e3002b909aec682392dfd5c4fa72837c09d8e773e02f5e5870886f225ce39a6bb248ba29241ac6c55e952760 SHA512 e8f6f5dd0cab6f203014a57d455996794acb84a18e690acad00f1740264b28da6e4a6f8aa0b1525c44fab01c9bd8bb9292a8bf9cacc5cd049a06c11bff57df78
 DIST texlive-module-latexindent.doc-2017.tar.xz 541996 BLAKE2B 7b239ebbbbcd0904a2ed31ba6f092918bf75703cfaa032001aafac18dfb1f10f312ff8edcc919ee389c2242ff6622bf5ac6b1ab859cd4a75f2ec163109bb079d SHA512 53d8e5566272f7dbfca899687a4981e142d9e801d6f9c6c9a33e5fa6adb0bf22828edc130f7320a3719b93001125066ec48a497743490ae5f7872747317b6f2d
+DIST texlive-module-latexindent.doc-2019.tar.xz 755148 BLAKE2B 577c31ff736c40977ab3fd317cf082d85bd195c6f05d2fe67484e48644baad138fbc66e8cbf9c4470a4590e4716d684b06ad9a02b8b7c381ea4e7076de4ca24c SHA512 89d85ccc7faf8890b09c9e4818a07f706c0be9b39b035bbcdaf278016a78222cfaae0292d92b13f27febaf8d4c0d1e5078295bbaf08f3d17219c495c05c1ac69
 DIST texlive-module-latexpand-2017.tar.xz 4664 BLAKE2B 3ab8f981d0b2c6fe62610c84c436738aeb16b05be8a38634ead040050272585593a5a8cb701af329e923e3b6ca1759f7b7dc3d7f37bcdfc88b6f417345ce1e00 SHA512 e74ed2886e781740d77c18303fd98eab17e431812f033b0e7734e4aec966ef3476605ffbdefb960f7be511ac5c2e4e01586f3ba3b3b1708e02b0656a02e4b6d1
+DIST texlive-module-latexpand-2019.tar.xz 5752 BLAKE2B 61a55fa12048faddaa58202e769d46b949a6367980b8d29ef8fe10e7b09693dc009b330944862fae5ec9677a32804f0599545cc6984b9a07c2439083434be63d SHA512 9248c63fa16b9f9ccfb0243bdc6d56bb80b9887e26d8f1cae53092ecef94f046f554d8c5b9ed6cacf7202dd5be212472f8bddf9eb740f4ce54e521c9baaf75dd
 DIST texlive-module-latexpand.doc-2017.tar.xz 3000 BLAKE2B b37e0a3af2f1c77fa3399034966d758374555b87381b614b92eea44ea031f0f3d535adb1f845fbad57b6e8f022e3fe650e656399f171b9ccf95081a52ba3c8e8 SHA512 ab847d512042ea1079621f9492001ee09c278b130a7c61412d883fb3687bb85d52dc53c3133d54acd444c38d21d42d5ad1b95f918ccf38bd9575f9fb19bd6ede
+DIST texlive-module-latexpand.doc-2019.tar.xz 3072 BLAKE2B da7fc2e838df1f2288b8f5d74241f25ac16dba6c9eb69ebfc149599e13fc12fae2a754f8395892b9ab97cff41a25ea9123fad616121a5d2dfaac0d1965a23853 SHA512 faf4b269446a008ba77d37d8f51ab123171a3cc56d59dc6fae9c5274833e97276c24392064f6f95e8e8eb5b88717d1c4433a915208cd81788364d382aae200c5
 DIST texlive-module-listings-ext-2017.tar.xz 4852 BLAKE2B 5cec8bb40972739e36b6f2e18b0d0b85ab0d719e8b752c1184fcd84da3c8bbb7687794b256e4581bc94718e97400ca1c1d2a0abbba171cc85531381dd608a6d4 SHA512 a40ef2786fe5624c233f846995903ebe19fe6fb9525899f23e73818eb8f87dcb296d6bf0c23366741f6a8eb8655c21ae7337a4b80d90949961b007ccdc67f461
+DIST texlive-module-listings-ext-2019.tar.xz 4856 BLAKE2B 0317ca2bd6c6cd1ebdebccb4b924c57bc9b9409d97e9e967a78a16282541655f454dd4c20e6e8cf1613a05755cdf5d88c1c7aee6f030a80d8364807aa8434a2e SHA512 c68752d0e7a1ffb7d08f153bf337849164d0287f20ff8f092635ad7083b2e5a6c487bcd9dff913dd029f4ea92750768d23583eed53a0c2d3bf012e4db059708c
 DIST texlive-module-listings-ext.doc-2017.tar.xz 103660 BLAKE2B 6160b391e62ab03455f226c7db98518a4735c630b7599bc88a868ac760d602bf07bd05e846d7586791b7ada2c666de73bf860c222e2d1d9b7d4616ea0dc063d3 SHA512 edd67257cb74020f36a11a95e6f53dca80b376d73ccf75a87d689ec606019ba35f5b836f012c1817764da8c3b2947ef47ae707f22c47c4096dd31c4bfa58a327
+DIST texlive-module-listings-ext.doc-2019.tar.xz 103704 BLAKE2B a7367a78ebd5d466b0b4adde5926264d4b5325a635f4db25483a491ddcafe3436d2f97e64d50d4825e5def63439c50543dc893e08504501fab56b3ef7d84e6d3 SHA512 82491f81dfc89950d085f7cc41dabdf7b895b23c8a69f80c1b4f4c420fe8f036ac181b56e3ab60496910d0f1165ce19b2f94c5e268dc1d59e352ab6747e3bee5
 DIST texlive-module-listings-ext.source-2017.tar.xz 22640 BLAKE2B ced7c27da8c445870a22c02575adcf3749f6f04fa0db23016e9712fa95087a75ffb8c4129d3eb4bad28c0d780502289ac7f5016a0bfe28db16eb81a1a31f2943 SHA512 4bde1dbcd6c5dcd258682314cbde29ce93c4c765158798b27fa17a23fe77c3e4ef73f86578716da6233039f864bb44a1450206bfa7c12b7500d650c16930784a
+DIST texlive-module-listings-ext.source-2019.tar.xz 22652 BLAKE2B 15f7ecd55bbdd3e34de77c72e710ad7aa5b7be6d31da0e550171f8477627e0cbcc9cac8bb852c2771b639d66992b846a9cd37952f8b6ffe16a7ea9a7fb3e43a1 SHA512 fab34f07d6384a5474f3ac30e2e00a75398418668134ac1041cabded6209c9521244e1637e4037e7346bc70b3247ebcd90526d5e34fc3c4e388fa978382bf228
 DIST texlive-module-ltxfileinfo-2017.tar.xz 5172 BLAKE2B 612f8b21a4ec4c2571cc0fdc9776ab5c5faa5bf865b7946a1b8e2d4354c70a2d7825565016da339c8f89e2899e49dce841460660913fb959fee70d14ff434ed5 SHA512 f441ef14def62f9ff9a6dd80574f0a526748810b17a5993f2880f464eeb30997578406112179103fd614afe91d2f6bf8ca19448e83ef455d630623980eee67f5
+DIST texlive-module-ltxfileinfo-2019.tar.xz 5168 BLAKE2B 65e798fa705b8420a03db389c5990784d9c1f208d23f9e07c615a47c2abe9a560ecd55d0eb589151ae39450738a98b8eb48c949d4a4fe285d6defcbbb81927ee SHA512 ca078af6b822747e9b337eb5694c1b019444e55f5f9f9dbdf59fa1a65c9445b19a62b0d610514c9231365017d3ea95ad9288a37b62b400c12df74c0c7f774a44
 DIST texlive-module-ltxfileinfo.doc-2017.tar.xz 37604 BLAKE2B d36e08a057af2bfb964901caa20b79ff84013f80fbc9ed19545027c104e007110dbda9ceb62f8d5091f50947624533d45393a9d7cc0bc1b470a768fcb390adb8 SHA512 44e7b6664fd865a78ef23379cfd39c720ddf9040d3ffe63c4ea922e2825a14f49926782e1e3ae4cba347c26b8bbbd15e630d94dfc36c68dbe813fcaaeb11da88
+DIST texlive-module-ltxfileinfo.doc-2019.tar.xz 37612 BLAKE2B b8021ed8cd1d977b18b92ca463046ebb67fae757794d881d8bf65b81dffb41ebdbc9aab960d06bfd7514d55d36c2d780fbe890a76e5fa3b415b53f174ff9e363 SHA512 0020ffc5874e0545c7ae4d1f6f9c0d5d598786444f4e98369e0c5fc872c5d63f235222594a9b0f5d2def5c3dcafc5ad660a4fd5a9e4551dd7717bc6ac06189d5
 DIST texlive-module-ltximg-2017.tar.xz 10352 BLAKE2B a16c2be4855eaf69e527bf91a152c1e677688340f56c3c31ed4453c4e3700e104df42d03b761bb18a8a65fd1ee9a26c27b202ffe460aa38c76ff129b13ef8e1c SHA512 ddae4ed4afc9c4e18b0cb7a49cf7a0f3aadcbe75bff0c0962b40aab505ebd5c2a8b60f523d9cfaa9235beeb75601126b5621b3a84437ce21c3fd4d651ead2783
+DIST texlive-module-ltximg-2019.tar.xz 15896 BLAKE2B ce3638279a98f98fa8b2c4d19f40a7e23a545fe563e863d2bc2557532c4696007d9032bb76900de50e2688d8581dcd25dfb5ac61a1b14a3513ee38ba2d845fef SHA512 388b4826e49a57071f5dc8718d02d9f62f1c4f85368ee9e2f3f435fecd80c698cd3acde79d0dc9edcdda46e1cb2386e6efefc12a25b79f6ed73c0b5e5ce1dca6
 DIST texlive-module-ltximg.doc-2017.tar.xz 350876 BLAKE2B d4e2fb1c140120aae6c89d347005a6c385c7c2fce1cc69ab6dd32d5456df90871b8ec3f251e035332e5b3359ba6804924b622257a1b510878412f2337059e8df SHA512 a761b23a9873912e677f042378b7598750480d527c7fd58b5c36be638265138033e4a6aec411e879a9ada801aed85694898b4da9459c52040e9d33408ae485a8
+DIST texlive-module-ltximg.doc-2019.tar.xz 189772 BLAKE2B 3a5909954eb83a4fdda6e4b4e6b3a4fa3c79c4f30b223449ce374f2ea40c71a255c69690a7189b323d64e4574bad9c22fcc3997ca353dbdcb2b39239eec14a43 SHA512 2c5af9f2b1a843f5e27f96759cdca8d92dec87013cdfadceeafacbf77eed00e2db9dc286ecc7316cc6838fb85f59c399457490529426fb2ef7daf02f393fb622
 DIST texlive-module-make4ht-2017.tar.xz 15268 BLAKE2B 8ce45523d313cd72676027b072c2bd19094b5017dcb92eeb35d82ac7973d5d7ec111d7cfccdeb5f254ca3abd82f4db2e696ccbe8b1284790c65a274234d7743a SHA512 06d90bcc80409a9f18024bf730f956d126bb5745f43e30cf159ca8a94487fb0dbc347b1b30b2d954e8e3d79160ee0c13c94f4ffbfefae332bf39f94823da599f
+DIST texlive-module-make4ht-2019.tar.xz 33224 BLAKE2B 5fe5decba37c652d4f6ab837af47ca9e9b72d6b254ad7bf8016ecb42ee633065f264b64051c1f6aa822ea94e16d0b9af1fad39664f769ac108354a4d39e44623 SHA512 ba85b1b4055d997677f5a158513eeca0390e9e07b872250970908151f33f7203a4d0938aaf4dc56c33e36f57b99f797b3a28f999add39d931bf4e78b907ceff3
 DIST texlive-module-make4ht.doc-2017.tar.xz 72112 BLAKE2B 24a227bf3025db627785580ddeb2a4dd894b4e3b41bc95d53e8f98ca0b319cdb1237b93cbf59a0d15398ff31f303800cfe1f68e1c2e9514fb36905b5bc993d25 SHA512 05dceee32a5488df1bc889e2ebd006cc2c901e8445a7f7e3ddde51afa24dab59fabca9b2df963febb7018b4e840f0107f7aded5653ac9046b7625d3a5852fbe9
+DIST texlive-module-make4ht.doc-2019.tar.xz 125828 BLAKE2B dc9daf6639b32dda301fb9070cfe4e6b2b54793bcdf6f4ec53bb6a2c110296b3d16067fda7b95de3ef3bb941294542d77e1672ab103170fbee8be37b55a84dcc SHA512 45637b363c64d0ad91e164d8c8a254506f98c8105d226ef9ce1912c2c4ee50057233f17035e8a5ab995c49875e638bbd14e1a13949867329a3e3cae65b844c55
 DIST texlive-module-match_parens-2017.tar.xz 3328 BLAKE2B 22441bf4709086eb73afc83e46525059825457a0e28ac4a345fa2a20de92563353c5dab5e794b884dda66a596f89ba79a485ade65e1d65f78211c918238093a0 SHA512 a604521dd72736f3f5ac703734218e534f4690d59fedfda06576f6ae402306e94a810da9ef8c7739dcbb7537df04f7d09bf5d08b2b58e0df90710a3394eab03e
+DIST texlive-module-match_parens-2019.tar.xz 3328 BLAKE2B 3fd79342cb4a1d3de5a60e7364730af1fef0e7de20e45c78c2e7c6aea1457259a7cd53daf6875f9a35f1f5425fb34a67426ceceeab7868a1f781a67a82ab3594 SHA512 1e03e279e977af436a8f5d5c3d30f046f46f1a31a0fd3de6d8ab458a64f0634b5f3ef8a338954971a898a1c68128f60c6eabd7ca231df9f3ca8ed12e55967dad
 DIST texlive-module-match_parens.doc-2017.tar.xz 57280 BLAKE2B 0fd6b2c6f7ac7eebe6b7d1bd975181dea960284dfbf98866557dfa45c29202129bffe587c3bdba50217790e0d97aeef98f5467ef7dcb0fd0b0d7084bdfc657da SHA512 d92fa529b9cd6cbdee2d8e6f178fa8395c08540d044d0522d1da2a68c78654666d0f7ec05960c9b9f8b2530b4c54bc695887da13a1ba383d6c3bfcc49ebd64b1
+DIST texlive-module-match_parens.doc-2019.tar.xz 57268 BLAKE2B 3540abdc804c0b062e5a06c570ff9be7aa87514004a780b96d159dc90bc9fdd98847fdb1a5559d944da15908bd6cb8b6a03bb56e8de4f40a13e13557c3e4d3e5 SHA512 60428bc16f65fe820e267852c9d85a5f862c6800ac9c2aae0915a48819da381b2a311fdd3d08096d4aab7311ef86c1c89fabff3d88caf419dacbef515f4dd39a
 DIST texlive-module-mflua-2017.tar.xz 27848 BLAKE2B c2f2be68f0072b49a94e535bd7fb948e24d6f6e4e711aa067efc7643ad599c26dd66f9635e3aa9ed4cf876f4bfededd1f8a24b06328db042f06fa11e45212e5a SHA512 83d84e3cb1291c2af4067df2fce91e14bc30d11843c5aae36aefce4e0e1fe5cf6896ecff8791c2888abb16d13933cdcaacec11421d534b71dc3b6cf8c1c02bd6
+DIST texlive-module-mflua-2019.tar.xz 31672 BLAKE2B 89204162fdab8140533133a48ff92a741746839a55c7e3fa9fe91cfd8fa3c842f100ca40e03be80dac08f676d5d84371ab0b3f6fff7be00d59c265c3317b6754 SHA512 a12e8a56228f0e3c49ef08a47c989135028ce6a99db714eee1304feaa31ae10ca5f030291ac56e9a344b54626247a521a909a18a35038333dbdce6553019e31f
 DIST texlive-module-mkjobtexmf-2017.tar.xz 7444 BLAKE2B 20a80de587212d1a89610b378c50ed8802cd8ebfa7c3b80529add90a8f737f7a6b87d3614e77e3a820292bb8145ef369b2c4f393efa41eabfef65336a5bcedce SHA512 b87432ef1fcface11e93e541595fdf74de1539d9f2ce0dbbe3e35c73064230812628745aec782b8026cc60f9797aeaca9057c534ac852b22bf44d24d5cf1b960
+DIST texlive-module-mkjobtexmf-2019.tar.xz 7444 BLAKE2B 624ff2a3059854ad4aec624e43e8bf03286b477c2210ba4d993affe076fa12bf932a9b6376862aa98d06b4f848ab8b49257215658a8c55196f8e59594d64d4aa SHA512 c0dffdb276141b78bd2c47e6d2bfddcd13c1800d3a0806a05ca1fba72a91621364b827801430bc757601e07f2a5130366ade49d7ac1df27901fbec29827739c3
 DIST texlive-module-mkjobtexmf.doc-2017.tar.xz 80276 BLAKE2B 206017cc2c54a2f1dce32d7b4ff2670a5fc0e3f3afc0c5c013b849aa1309af8ebeeaccc9aafd59ed2336d226b53afd6d07895177bbc5b62329b10754b81592c4 SHA512 4df1df676df7f1a1c1bf0d1c0a51df8e4839558b79fd410446b522ce218f499960420af351c195c61fb66f9eeaea869762f3ca8091f76c662aeec333fcfd0f80
+DIST texlive-module-mkjobtexmf.doc-2019.tar.xz 80276 BLAKE2B ee2373e795425a3c40e1a46af3d1fb7a800aec9db9d808b6a6b32e64de6f449f4421320e429f635eb8b04c03e7768a4ada3f37e8c044d89c903d13ae32ed0f87 SHA512 3ef5c333cedd5104b63c1457fff2eee40aea7d1f1b187d34ce4cfccd5b6bd38809b7686dc7b41a147fbee2ae0e951470f3ae574bd3c10a5f9b6fb76b686ce4f5
 DIST texlive-module-mkjobtexmf.source-2017.tar.xz 19820 BLAKE2B bb68f6151bd777e677ef75ffaef1338a9995e37308cbaf4307378b5d7291c52950be369c66539e322dbde11bb8951b3e0fd6b227e47de9238027081f359cba5f SHA512 2ff63f05ec1d4b09842a20b93a1ecab09245dfdb3cfbd3e37f1e1cd9d25760c161948433c10ef05373d84cc44b56714f86073afb48053a8f965c64490da0b3ed
+DIST texlive-module-mkjobtexmf.source-2019.tar.xz 19828 BLAKE2B 31b3a262ea9c1202d17c542a5a707ca36df035338844ba5973fddcdc6fb96805185bdcbe0de69dddb7f7f3b4a898de540caeb66088fa57abb0d3501c699f6677 SHA512 7f9de9bafb890d12ef2f07d3b8596dc31c4bb97079f826c9efd4f318383f64d8250099a937d8d692fecf703e626b42f942962f4d906e705cf4b0155e354bff0f
 DIST texlive-module-patgen-2017.tar.xz 532 BLAKE2B 21f5b2ba902932c026e6f8d395031510625424341b494063010384aabb4d5c1c4bedad0223e738dcf57a7656e0bf13996e9662ada35933ae328ebcd42ebb70a8 SHA512 129087787df6ff3f450ba9b4af53eec8c5349bef186825ade2d2831139c2c4d2de5b8d2a354052a06f86f1fca251047cddea3bae2d9dbdbcb469d0dd0877786e
+DIST texlive-module-patgen-2019.tar.xz 648 BLAKE2B 3bc7cd6eddb45607f2a6858b31dfcb65d2a8252115293ee8a2cac24747d00ba0024b4ff8c60c54b67ad46e50012749ccffcf1dafb5f885b1d5b920d2079cd949 SHA512 524ea5aa09feba7ef5efd47e35d8d94703be4e191bb081d0b13007e853e88729c6029451e58a7237ad5ddf524c4d0798421316c38d1d9374ed7cd05f2744f761
 DIST texlive-module-patgen.doc-2017.tar.xz 10960 BLAKE2B 08b89c5a01af4e9f14bffbb17561e2591753e853395b29476fd98ec3c5fe18120e223ca96fe6a4c7a2f5220bc8a0f07707e4ffe0b7a7fe914ff8246db9231226 SHA512 b1b69e00f32402f3bf2012f25840e63e3e1ebb00a5224efe7c7425d54a4c37945dfa097a1f41e89b360e4d0d769ae003774503fed41e4e1076004d296be27117
+DIST texlive-module-patgen.doc-2019.tar.xz 28652 BLAKE2B 9ec6e794bba001e7a94956d632cf0376a10fa0575fd287b4acf3c36de4ea19021ed117670f236346784e3c1640b2ec91c3c3fcf1f0bd91e1d2637d61a35c3b8e SHA512 136e6c23505593788da8343f4dffccee77ffcf9fa63382871507db47c3ff23d6c25d0cefc985f67e4ee137840aa3af8f1738a5b2dac5272e568e73b18b71a5e2
 DIST texlive-module-pdfbook2-2017.tar.xz 3492 BLAKE2B 8f20b8b924d72575b0685fc9b2f4478e78e99bf8a2cf820188db9f5dcf2c4b761794cbcebd3785a5cd084ba77e39528a422b8290a2c226718c25a97f29e15253 SHA512 62aa520c215830d8145bb0fd7af60915245be4b246bf42eb912124e61c9a388da67f3ca7efad560f98701c5b32be0b87ec9e78078b9900f44f0095c9c069ab1d
+DIST texlive-module-pdfbook2-2019.tar.xz 3500 BLAKE2B 851f722554a74d47696ece850f9381fd470acc75457ab24590cf42375f836fec1e0631c531ec1da3e5491004c33330d59d9a56e2840def598f80cc5178f81ed5 SHA512 ecee1f160c1898110bffda10fd1a329b66b8689d7fb967254eb9dabf8bf7d71ad94399fcf3ec6f01db08309c3b4803789ce768e347ca70bd9a81e2c49a6f1f78
 DIST texlive-module-pdfbook2.doc-2017.tar.xz 7552 BLAKE2B 086bf910bc66166a2a441465094d95d13fa8c39b4840c9ef19d9595ab2aaa14eb4251de5cd2b4ff2589768259ac3048e4057bf3bcd7bbef4b86d6c82b6bc3746 SHA512 7620a797dcae68e7bf093c119b06f377ea2665b228125bedae11ce129d8053df066e771df2053fb8d90473cd7d00a75ec5235a0ac5221b0171605d145a18321d
+DIST texlive-module-pdfbook2.doc-2019.tar.xz 7552 BLAKE2B eae92ede4b9beb7fac91f0baf6a1d2c9edf95b9e665d600c0f1d6c76ec7ab910108272f63b87bd3b2f06ed849b69a2b57f0f9f578a70228ef3ed9b4a6e5d7d11 SHA512 b6b58cce91ec59d43e5aa868d5f1a692e76ef84f57c2399dd0d25b7ad9a94c2e23b376cb49a9d1c33a084362095e018a177c95bb3b752c5ab4840d054b241b51
 DIST texlive-module-pdfcrop-2017.tar.xz 10720 BLAKE2B 0287ee170ff11967df2932d9dd7ba947abbff12045b059c906b9dc399a56596915b9aa06d4c924db84cd9d5b2d04e42637f5ec1291d4657730ad5225de002cc6 SHA512 11d2e8e911e8cfcabd5a4f6555715e08cd6ca51868c1a0dd7d9332fea5fe7fc4b571669058a99ca518f7dbafdf45a517231ea8a654ad39ad9169a789b3346a00
+DIST texlive-module-pdfcrop-2019.tar.xz 10732 BLAKE2B 29c12f811d7e0bd7a5475d35eab2b35549d404e90df4b0c70aa299ebf938b1abdb3eac9eb1ea868d98c297b5cd22e1fab629d2013a475c36157761f4a901b68e SHA512 eba7fd5c529e1b3a29d00ee679c24748050f1a6005391de4bdb6e6fd537cd447b01e6569e0eaa87251d49e14f548dfc80d5e33f037862a4e978905af37e9e186
 DIST texlive-module-pdfcrop.doc-2017.tar.xz 4300 BLAKE2B 7d5a70a0f8ef86b1bd9c60e534a20e95571d0808d6219e0cfb011def705427b843c1492b2021611d2b27b79324c764d249b852499e9dca5fa9e71aee1f7343e5 SHA512 fc9537872e8a7234d80e76709d69ea7c3e17e02321b26477a96186e9b190d6c093a62caef83bebc76d4aa4134273e28e74d456ddaeb9e53fd073f9838ecb6110
+DIST texlive-module-pdfcrop.doc-2019.tar.xz 4300 BLAKE2B 67bddc633e05ab07d56b78be20da628f44beb511b636cbdc8b9b74883e2778ed917a0a96d16bd17355124feee5544c9e5392057362b508273f08e7340c602f36 SHA512 5deb207030892f9e351d511bba20e65e957b5db17df6af60022c3f069cba127be6e9bdc1e94600b6f36af8f35697b041ac5aa529ef7997f57264b1dcbf76ce2e
 DIST texlive-module-pdflatexpicscale-2017.tar.xz 3120 BLAKE2B 9b4630ba97d27258bcdf58f9abbcfb2a3c14f846b575c365462c46775685728443290488108af99161f164b16714a7bca6717ccba0c9d5878cef8ff1baea6ff6 SHA512 2e6c4baababe8b656e12eecdbe73d8410c060c3d4aca5dcfc626728126481a5a86b8b7d031a35c85a26e2cb79ed1e7bba7e143b449b0118b5a11d9bd9bd135b3
+DIST texlive-module-pdflatexpicscale-2019.tar.xz 3124 BLAKE2B 491b0d733a769aa494ce026add50ae710a2257ddfa2737cddd83465d33c564f553edc735f61f3dd09b41c3e92cee095d38d777e52bfd57d77ce5f04e21868cb1 SHA512 d36dcc4d70156d52bcaf668d620c8eee5db8914473f943412ea5ad5c8bde673a6715fd5a69d13e502a5d4fe0b1e0e55099432c4e0e5e02bd5f6155ca5804c3f3
 DIST texlive-module-pdflatexpicscale.doc-2017.tar.xz 86448 BLAKE2B 45de64a373368a72acd8511a46ca37b6a0fe10a2b4c0d3f7c65a32799f1a25fc22b2fa9f22a9a0b0abaaf372a1b29ab26a1dbefc37cfc7a4569a8ca2f43b4ff1 SHA512 6a19f1366879369ccebfb53663ab565e3a635bdde413fa7c1d8d6a58faaab745cf213b35e183ca1bbca4c90dc3a8c60f1ff0e472817d703ce015852d0028122f
+DIST texlive-module-pdflatexpicscale.doc-2019.tar.xz 86376 BLAKE2B 53f8b82efd4f7c4f27edbba3a6ac5a790d40dd9fbb652bcc798973182604166ac8a748dfb4ac3147d206fef6072d178ef5c7ff7a334cc009f3bac0c06b48d7e8 SHA512 64440f794e88c08bfeeac75d6d4174eccb800125c8d57e3b0be3ac6883c04790d422cb05cbed6be7335ab2e4d2e6bb2c8c0137c04160db126674960ddb7603e1
 DIST texlive-module-pdftools-2017.tar.xz 1872 BLAKE2B 57670c928b435abae7bbd86d7a0f9160ca194e8e4dc07ee9a077fb6061b4895da02cb5c71db7011ac90d9c0ddc6f27177769b9f0e39d079dce7191a9a9683050 SHA512 9f6684fa61f3bf757fc970214065b76523e9f0bf324024fe90268034a2322646cbd10f3a005135cc176e7ea17c434fd9e727337d45929ef24f024b0ee7edfb10
+DIST texlive-module-pdftools-2019.tar.xz 1844 BLAKE2B 1e8533512e15a8fbf5bb62f2a4e05e61e2769c1cb68c9e50144696015703442902ff8016ddad1f9c0bd695a0d28fae932e2f8c9231c5f968276533e14497ce5a SHA512 ba9ae7b0bbe512465357405e87f3d523235c2398d4a94e8d0c8191e37db06bfabd6676f3fb9f603397e5682f9dd4f9b1b4cad03fce89448a9f0b254f8a7f2b46
 DIST texlive-module-pdftools.doc-2017.tar.xz 73680 BLAKE2B 039106802e0eb4b7c26c857194a3906f553c038723f42ca4c1f7f575e5e703506c49f731b03b4a8f302d1bc230a6c38140664f9f7be301e35584886be15f9682 SHA512 e89610bc333017173d5e3f81826a244daa5e7a9ea779f580e06ea54ee2e1a456b7d83ca8fae39a38270d14bfcda4a8c8d9520e0903ab9e91cafcb1aae0207bcc
+DIST texlive-module-pdftools.doc-2019.tar.xz 64040 BLAKE2B e8194e09bb210f1b09d3b08e0f68f15a3412db38a9300cad6036612551580a0ae82962fc9847b3ec50fa7419349ebfe207fdab8da7afe749879da5e3b4bf13f0 SHA512 3f95883d9405bcec282468f42f8718bf9c510d98c41510aa643ce0b70eb7557f67b75def0dc0e1f862f79d586f0f49959b4c826f8c468ca9460fdd69d3d4ceb5
 DIST texlive-module-pdfxup-2017.tar.xz 7260 BLAKE2B 30bdcb82091edf920b31a0ff9c3b4e4ff16e3c2cb1e91584766319f1ccb9f3211d9d064aca5636f4181b9eac47e3202aee0ab8474e198dabbe63ac63c6503368 SHA512 598107c336f9ace01c160c107da09e6a43d0d508b1e8b9f5304d6ab099b924ef97726d925031c5643b179e647d7d66638028cf006d9afc7898ccbb6830b87a68
+DIST texlive-module-pdfxup-2019.tar.xz 7264 BLAKE2B ae89dab0e28b42bd0c5c18ed813f00d7f61e1569bac172ba662933a12cd0ae8b64bb361805eff7d8e86b4c24de061cbef82f516e3bc30679f141516395553e91 SHA512 4086f58241799139e980c97c1aae786566bb7801932334d78e89dfc5f8e718b6b9fd3eada32ae006b9aeb74d8b2644071a1b1e60db7dda3b4b4942947d727fca
 DIST texlive-module-pdfxup.doc-2017.tar.xz 21260 BLAKE2B 5256bfb3c4439855976f940e5a220372349cbe355fd95cce1c90e60840f71634410fe9551cc476e457c19516627c7099c788ab092d72ad8f365440eeae6fa261 SHA512 934aef9a1ddfe0e1f6cab6078e4bb4c1e4c4d428ca3f249f32ebfa72f9148af342c080164cf291b4e1cedec5fed1d596026427e9c7253c4e151778ccaa399b2f
+DIST texlive-module-pdfxup.doc-2019.tar.xz 21260 BLAKE2B 59bd932a68ef363af4de08d8e444a9e796bfad0c250c549bf224e3105ef1825a9bc44bfccd288cdb4af5fb074358bdc9e772726d0dd685f89a619944c963ab83 SHA512 3888fce668affc7efa7e9d88c890f72c94b49dd88ea3c05af956943dc015e89ad930e2de3a67e023c7e1be2cd1c7911e5df29dbc273e3c2b219eb5377c165956
 DIST texlive-module-pfarrei-2017.tar.xz 4640 BLAKE2B 04bf192c53a5f9828f96f6ccced8fe77e562279c99e039a793a2da6a7a346cb7c9ae5439723ab8c50ba95155befccc90d2979543a9d836de23ffd323949a5b10 SHA512 3fd11229796b4958fe8b8a3e2c4a4f0556063328ecb83cd9f4273c9bfa7b0d81dac776fc5d79f5b96b7366e0dd259d27af1747752e1fe4bcf7396519020a6d95
+DIST texlive-module-pfarrei-2019.tar.xz 4632 BLAKE2B 658455eb955f1525dc9f5e00a748ef19d89bf2d65f8168121d1a0539b298fd32a9494d58724706857885364c86f6d46d42c8045e8124716b93726f8aea8aa3e8 SHA512 f6046dc96672b60ed272dd6fe23a4a51032f039d3aeaff3f8b5e2407c99fe1f43c568a03564a7c20212a97bbfa4ecbd0dcb7f5f44593e1485c8e5d9197467a6c
 DIST texlive-module-pfarrei.doc-2017.tar.xz 499400 BLAKE2B 4553271b95f9d295ec870681ebfe9431c84d7314fd69cffb96555b132095715738fb101184cf66002ffba91078b97b33b4e88326d73aee77163114f120afb4e2 SHA512 66ce3c9aa05bee674cc1966f52968edef3b0da97225457f5bc723e3f800c5f14200c75597fc67b82b167ad8aed92a28235d53b9030f08e5a29fcaaf2be3f5324
+DIST texlive-module-pfarrei.doc-2019.tar.xz 499400 BLAKE2B ea640be4e5f113f9c2cf07b7b2dfe6da8889f79eb5a9c6bdf8758b2b587b1f3e4fd5337051b374e330380a6efa941cf10be47d643f2555af99b8847a6904cd1c SHA512 d50ff4603d51eb72d1d12e7f5b1440fa3d7abb1ab74fdf441d7e4a474df91247a1ccad504a14438bc0c3c6354c8f8674f180b5d9d826ff09a8749db3cf0d08c4
 DIST texlive-module-pfarrei.source-2017.tar.xz 13448 BLAKE2B 3e01dbdeb61416eb45b83f077452b694b1243b132941f2aa8329c3b544e3c9527008b44d2755ea7e54a113382e00b344c6c393d8a1a5dceb19c232e80ba6fdbb SHA512 2a00bb71000bce7cdba9648d51cc5a7943e2b11ffe1a9bf68dea4d4a320a337f73aef4152b7d5ef10b8a406329b0979eac82e84c21bbeb89421bf0785cb085b0
+DIST texlive-module-pfarrei.source-2019.tar.xz 13448 BLAKE2B d30c95a4970d5674f7b44915d8129d13c7c8ccb43725a8a12129ebf64eb63aa9c17a9e39d6478d57584ffa818aa9542cebf865220de3ba286b18318386bc25da SHA512 1e4008782161066066fc4cb1b029a36f6a18eb0d5d52f11a2a70d04d4778de6ed1a80ea1fef5d8cc86c2e13b8cbcb1cf8ce43e58ff4431b16ca23c3fdafb9884
 DIST texlive-module-pkfix-2017.tar.xz 7572 BLAKE2B d4036a5922fb8ff9e4ec2e6644c29f5799dacdfa97195cb21d998f327e6aff8441aa4570e62464f1d36c04019f35f91546c2e26c8e02642eb75fd15bf4b0cc28 SHA512 5ec75f9a8760dc9d159a003738e700938aed4312b76c3b32feeae1e3736bfb7e0ec61bc6627753ba2c035c93a47f21176ed8588f73510e1deb76dd8d159b3691
+DIST texlive-module-pkfix-2019.tar.xz 7572 BLAKE2B 3b655dba7deda0576d7c9f84d8d6d136709b516df18cae7f15a010ef3ab3ec8997032c02b1b0ff027fa611d638648e1e713894c31defe16c0cc671fcd7ae060e SHA512 b4d374e5b771e131075ec59ef6713c6433cc3cefb6331a933e791c3774a9d54d6c8427d70a4aadb2c6326c3733abdb562ca103f0b6a9dbcafd87856d20b18a24
 DIST texlive-module-pkfix-helper-2017.tar.xz 16716 BLAKE2B 954f041f4cc1d2b3abb126952000497ed98f49abe4e84304244b828db0ce5d18ed379591ce8d2037d0165996cf055be6f0c82de711e2c76bb4b1cf7c54d5c45f SHA512 14de8aed71eee67bb1b5f7989c18e16dc35191aa762a4e30ffe916161b81c1397f284d6cd8a497ca9e639302b663c388d0ddf3bd7110bd512021232e63e84086
+DIST texlive-module-pkfix-helper-2019.tar.xz 16716 BLAKE2B 4c178cbeaab6845ac2e7bcd8d8f81d2dd541be4c265413403f8e749290f6efb80ebaf7cc0cd134c8dd0cf1bd29a348ba82416c62d0903a0e43549ec8da63899f SHA512 4828927668f21f465ab672b92e6e3934e81e60bd9b3bc1f28a65b2c4dd26d2ce244258ac1b7d8846c0bfbb653a2fe009875ddfcc0383b34249e775f675497478
 DIST texlive-module-pkfix-helper.doc-2017.tar.xz 640356 BLAKE2B 47f4671dbf99a20a2458073c39ce4aee1257db7c975095fd16132b8af23e3cd3aa25d68e4bd354edf3b9555f0c8619b794d80be377091de602060a53e6e59e6a SHA512 9bd23f5fbad0899936b27d91de75a248b304ace9314e28e9e4278d482545bb7cbc027b7f4933c2f868ce2c19ac3eb74527e176c4f648146613717de36488f7b5
+DIST texlive-module-pkfix-helper.doc-2019.tar.xz 640356 BLAKE2B b2514d1862eeebcc883f5799e46bb5d856f2b100adb6bf83e2f04dc0226c71107270c7a006a3c3f248127dc726e5d50a4e799c9ffd87c97838e6e1f1d60fdf01 SHA512 146bc49beeb779c4815737cffe1bad30c28e7e44409a3e7036ab82c58f6f1b7e0ea3498f1a19cfd312390bcbc31c72d9f61a92501d87690a61cdc7c66c2fd2ae
 DIST texlive-module-pkfix.doc-2017.tar.xz 4376 BLAKE2B a550f55ff869a06be90fed27ffd46dfbb6039736e9fcf87117774ce6706d1d7bd3d615f42e79dbb7bc5d7d0850f4e9d5758fea0bebcd0a9fd8ece64f330126b2 SHA512 209405747fd8faa6fa5b5c109bfadfb3dc8c764ecfbef044a4bef219f1a31d06efa6da205e1b45bdbc35e36f283430cdc0610f5a7fb9692ce1fbab0307e4e4e6
+DIST texlive-module-pkfix.doc-2019.tar.xz 4376 BLAKE2B 7cc25ca096dfcaacce04fb4241dade290ce51fc6bd2791ddf4961d059080d449ecf68ad972e7c6f4cc2564e3faa982e86e128e1227ca3beae02055c160075644 SHA512 c6819c63aa4cf7df5879a796e08299f2fa132e1244648d17a7fb0b3c28204b0641e56fe4661887c257ca4f5998786c31b1cae2aa64e3163340f08d02fda4c8d4
 DIST texlive-module-purifyeps-2017.tar.xz 6212 BLAKE2B cee315c9eb13aecb59eee53c58190aa0775f7e1b5297b02faabee2268b036d9006cdceb704df6e7cbee7da68547227a89b5ac43a9dae50f79f4e9adae0bbe700 SHA512 28561a89dbfb895180d0112fb39920c0da0f52830c6a1389afcc080d381c70ccdb217192b2b154f0f31611c67b16603f33c69eaed9d8e5d0571f3886e1481817
+DIST texlive-module-purifyeps-2019.tar.xz 6212 BLAKE2B 648b7a323d2a1f9e48e5eba4ec9c43e796a50c166af2ce880514679cc5ff04d429fc48e1381e8797bce848e3b4fd5f0428d6825dc3facb6369df3fe1a2d25712 SHA512 79d99ef7ebc462c7c65d03f23cc85b9f136df2b0c9d647fc0672584fa57bfb7447f6db0e6d6b11bfc738cfe8c8658f45fe0b4059ff00f355e4b21d44f0d4102a
 DIST texlive-module-purifyeps.doc-2017.tar.xz 15060 BLAKE2B 2d9872bd873b6d149d84a8c9075b1aa4119c1ea54fc17e5d519db5a7ec06493e095e12d308c2b315f18933f492b92fddb4604cf235fdbc91d4ffd305bc7305fc SHA512 666846fdd403a143a1756c271c02561576c1ba314fa02400156914baf694d90d461c621bd2d9eb1491e498bb92a4d68e1d69bc20e35d9aaa7440bdc4b76b9b07
+DIST texlive-module-purifyeps.doc-2019.tar.xz 15056 BLAKE2B 7d6e071fcceabecaef60b58f0f69119e8b0950820075b97adc07651de19f9db92e33a6cab8d860b23c6fe5ed89ffbdcb11cd792f3dd2198d81fcf61c77a91c3c SHA512 3f9fadfb35596835b250cab98b0d1e3c6d537cfac5878e0b9788aeb5cc7ef455ce3d44f7d0f03e9002796a162d374f6aa8f9bce5bd4c3f0e8937040de0b82a8d
 DIST texlive-module-pythontex.doc-2017.tar.xz 1525440 BLAKE2B 4dc91d1b2ae4199094af30fbb0718a966eb51be23d4f28986888761d200a4b8f6f83471299587523d58a44db6327a52f33fc52e29aebcd8a2ad6a2a93f0e7888 SHA512 8ddd52bb6fdd93510120343222234a3f8dff4497037a6529017437353c5d409572f122f5b1cf78088d554986f1694d8674cb7d8991d90683c197a4b08c5bb844
+DIST texlive-module-pythontex.doc-2019.tar.xz 1543832 BLAKE2B 71dfdb873479eb2f0e0ef1f48785e97294630fcb6838b4c3c3e241a83fa7714a5347d9ac92c2a717271683ef49cfabeda5a79b635eff6a950976b4c0a3d4d305 SHA512 4a79de9023f8b12a22ff6ab14295e580118ba749a465884fce3f43a2bdfa8c3f7a4e131223f191863f2f3b3049f2b6d83d7c52bfcd3e4b3d90698591c61a8e6c
 DIST texlive-module-pythontex.source-2017.tar.xz 81880 BLAKE2B 59576a4d07721caf2a13b2b25c26c9ebd537e7b5eb119a42ff9038c054cf05ea0b82f9f79c120cea3f1a68afebbc57040e301a76759bde1b7529df2838125e2b SHA512 4e05da64a7dc831a169d891aae6202cd1e9c72812838552a23dd3d43b961fc39f2db30080a61056b950df730c2144ea82526255aea213c8793a4e629c6b4c4fb
+DIST texlive-module-pythontex.source-2019.tar.xz 82424 BLAKE2B 3069ce8f0c51f7535c423765beb3db2a44ba55a506085d159b55d91b790148ff17c85f20c322ab9e6d5863110dbf422048de3c73750b3f029110bfa551fb28d4 SHA512 a1fe4099a2508da8e901de36a302c368ac1ad9990f896e0d36dd5fe911c7bc3de43d2c19ebca5f7ec078ffc03797fb4d600d34501f568fa68fa87d0019584660
 DIST texlive-module-seetexk-2017.tar.xz 644 BLAKE2B 9347aee58780cfd2ca45b4178cef3eb312686cba1239f83c34cbf515bc558b1610410d26569fe5f33483729c296fafa24feba60466637d544b9b7b7cf02255fc SHA512 f18b647cd991c862a1e27a0d172d294918cab89d91a00f6de33858b67f07a2d1279d3b343a711b20a2067b631fbe7908a60b613f22a475e95bcb90c0ef1604b5
+DIST texlive-module-seetexk-2019.tar.xz 644 BLAKE2B 8cf432fd5eaf36fd87e686ba69765421b74012514b4615357cb01d8999a9fa3869c039fbf044e01e8dfaad4b145ef01d661930fcd65d75336d49227fcc6c8262 SHA512 b3dea76f239ec78da4eb15d4bea4dd1171c3193e9d9e82a1ecc5d5ed747e421a7a3dc96e422839772d2f825e862b8a71befbacb7cd816405d707f654c7e5a32c
 DIST texlive-module-seetexk.doc-2017.tar.xz 16780 BLAKE2B 4724e3475aadbc2bc2d1fa70a52ad7a4e57acf1f906852e8e35fd9102811acb3ad10ea14215af6a52bb02a0d1ce7c5bf7ababc6be8450b3311853e610afd0eda SHA512 8d0f79f6d4528d234c264752ce27944f70291d299f6d7e1a254537b0acf1a296894d8f961efb8ddea6130a1faea0e400f99456bf15464e5b08a26a652ec9df94
+DIST texlive-module-seetexk.doc-2019.tar.xz 68816 BLAKE2B e764173c0bfab5979bba3af955da85d03c8f3244f0a84748f46bae4388de8e63cfba0d337f6c8c60451ae66fa45f49d7b286f4f6f248513e3a967e879b942c2b SHA512 39504cee7a077e16d10b2d4d1f393b1b90e7c21c7452f761dde1117f4b8668962b1baeac4b834b71b481fd170059e4e60f2d529e523e40503d26704ff15a7dcf
 DIST texlive-module-srcredact-2017.tar.xz 4236 BLAKE2B 67eb56cdfb84688a69fb5f1bca4e5e5ab67687174736501b72f4d7caed65286fb6f291a216d4192413aae98d6e57cf4a17cf15cbc58c1490579525ec733d9e80 SHA512 f192de24c480a97a17784b567ad29d592da33a0e2b1dd56800b17144dc2e23bc7f6ee51d0f36eaeea037eb30113e7c7df1f2ed430c06fadec6957a6c9f54470b
+DIST texlive-module-srcredact-2019.tar.xz 4240 BLAKE2B 553cde0085a142f679d327b1b3edd4a16a7a74a1d0b5871346964298ad796d9c3c3cfc5a01851f620e9748f47e0e23b7e18bbccfd9d5037d042618a4e0acc11a SHA512 9e11ed88fbbfc0130f43fdecd8fb0b3eecbdf50eb33bdca57bd34c860cdfe84dcd560371efba4cb261e65aaf4577306f478d1c43ed89152e7e21fd627eb7328d
 DIST texlive-module-srcredact.doc-2017.tar.xz 384372 BLAKE2B 74fcccb38f2a598f6ddd5139f3c903910b3cdbe555f062ee2d5a7043764bd3d56d917cc4ce0d6eb6dfbdc4fd707d30e69a8891f49f0c5b3af027be7c084cab40 SHA512 fbd5c700002f3d7c72bb127b24f13b4017a17b69eba9897e1a84d65fbb5123f36c56c06a8ab35fcdde7e4c13731cc5d92f2f3a92734bf9c4e77fb6af14622a16
+DIST texlive-module-srcredact.doc-2019.tar.xz 384380 BLAKE2B 8ddc8328384950b5feb4b59e29a4af4b69fed9d0072905dea0e2619a3a48490bd6c30e22cd38a16d7413f947339626a57aae11765e982b2ae9632b01ce93f602 SHA512 dba9916acf75e800af1e581b4276e82bfe4c421a500a400773354766b37849568c1f19752a75983374ca41f793903f9776423888215f00376db1e0f5f3b3dbbc
 DIST texlive-module-sty2dtx-2017.tar.xz 8672 BLAKE2B a0da05e670dc8b998bb1642a6fbe32940ac5cbc038aefd62db9ff37456691d5d329cf8aecd3f5fd2c0a17c9755d9c8090ea11725c7c0ba578daf19878f0c0f7c SHA512 28858f261898d682760a3eb6f381f4b4d56c604d7bd471ce1217a229131110a7e7c99b22808d48999b86d68c801354018e75e56c763d629e0aa8c574da2d164d
+DIST texlive-module-sty2dtx-2019.tar.xz 8676 BLAKE2B d3f185f31dfbcf3ac4019480546a7b67422a1650795f4b9beb619374cf69305bfd718dde52f4a55395932abb18f07bcfc3f3c98309e0b90b929d557ee64b2318 SHA512 05e17abf8322e70f275308e983a244e178883aa36571640d513962e813a2bfeb88264c0ae9ccab956f9bd016923d1727c14a7a26bb58b257c7d05600a540da1c
 DIST texlive-module-sty2dtx.doc-2017.tar.xz 151552 BLAKE2B 69e10ca9ba5aa92c5bbe575381e966d6c149b4ff391eedebb925be298535396991eb82943b5de681b9bea29b4830c8a9cf8d0719ad66ac3afb5813b9ba2c5eda SHA512 0323a7d039fdd1a3f623418c5294a5e1193da458b5a3d955c0a20551fe8928fa81461d76de1c9b0c1b5020156bc1e56a571439fcb83241e1f5ffeba741988b10
+DIST texlive-module-sty2dtx.doc-2019.tar.xz 151548 BLAKE2B 0e3b78110e1ba71fe8fc9828ffdf389ff9645e40e14555209b4f1e72a471275ef883d773b778865537e7dd2e50003f5be18abb17204bb9ffc7e69e5373837229 SHA512 1abba13831a0cd4b93f9665f242b96d32e764c39ccdb917f655922fe2a4b00385d6a78c77c151e212082eace3b9c9447705681416b5cb2eed9f794d7eb30c905
 DIST texlive-module-synctex-2017.tar.xz 244 BLAKE2B 86c14efc8163ad3f0240cc2680cb21fab85551f91d3f981e2dfafc1ac53c421172b16f9e2dc71af967e95e0317abee3b021165e6bc82f19d7311a95725eefa27 SHA512 f6c0b41e5691dbec92aabdfb1e84716766cfd0aecaa260d66014f3bd7e08da57800978b3bf6b892cdb88ac5c960f898fa836488883a7a533fd98d48dba58ade8
+DIST texlive-module-synctex-2019.tar.xz 464 BLAKE2B 991a1570f8dcc53e5b4a55eda741de55b846871e51fb588101aed6a5084e88f3fcacd2bc93111ed37f33fef411067765a03e59c65511e72f9e20e4c05639ce25 SHA512 9fb5f8c3729115a91a51efb3645f39809b07ef9eb842d2ded1d64cdfe558c0bfec6234827dd87b38c40bb167225a88c6ff09e3d7bd49b50db7561981105bd6a2
 DIST texlive-module-synctex.doc-2017.tar.xz 21220 BLAKE2B 59aaac4a0b21fe9407aa0b07de94f9ef64dc61aa19ed70b751485fe6c0a9e081cb1587faec7079836dd77feb2f562cc18a523b74d5d8d6fd65275ce073eee998 SHA512 1a2ae03662a4104f1b2923c9ddb5f63c3040f2f646128cf4987865ff72d367852580a15d01b179a14e9dce4efbab946ef78ee7766ca98d99021d0adc7cbc36be
+DIST texlive-module-synctex.doc-2019.tar.xz 41824 BLAKE2B 0d062f02aa107730caa701f42a25d0e628233765cd3a52523cdd8e2b596fae33a5e3703a9113113e001cc0fac6ce25418ea5ea3dcb0489edb0c3044ec8949a32 SHA512 3a61c57a78772d6f8441db824f489c7dbd5b547760b43dce500ba9ec07780a839d0c6db7f90921846985ce4400bccbec2435e6d4d8bc2952fe1dcbeb9a23c91f
 DIST texlive-module-tetex-2017.tar.xz 60072 BLAKE2B 0b46ea74e06218517620aa2a9b13485807f8e1032c30417e32ba712e3728505a2e4e1f1e0ff0e4d437082a1a7887cc96bdcc146b9dfc265a959704999497f3c3 SHA512 22eade74858326f76f6ea22f2eeedcabc313e2e59a36a1a079cfafe7c9351953fb8e381fe9097110336dbbbea9c123a437fbd5e4fb9d7efe395ebdfe0c7d453a
+DIST texlive-module-tetex-2019.tar.xz 71648 BLAKE2B c15666bdf9c178d6e99d9be29091aa7178c0ca094344b7f6fd1467b208715562c3c1dc482a89d24074afea62f0c7ef502d4476be238e0feda0d801a0492d630c SHA512 4c51b762a71c161923e98af99bc9c695bf9ba46bb6f8aef2da1da0aabb65db48836fadbc964f0bd5eb25fc51fbd1e48214eadf63b7b1175683b6bd03a389aae7
 DIST texlive-module-tetex.doc-2017.tar.xz 348764 BLAKE2B ce1f98e48be94453dfee368dd8a90f66bdb83b4595eb04155fd4bc965f1813aee62b5ad18151da7beb14a723761a76764c412e3ef8b9a9ed9cdaed2a996fadc2 SHA512 d0e83b87f9a844c9961bda9875f8812dd507e8edb9664fe0edb19a775f34cfdd3f096295f5d0c209ecd3c7ef4a11416601c61f0d4db4bef0297ee96d9ae430f2
+DIST texlive-module-tetex.doc-2019.tar.xz 525320 BLAKE2B 00ccb37eebaa3c3501292568c10d1144792e3dcd1391ec3b6456350b5f42d3ecc882a87d657fb115b234f761dd7664a75df807a1afd0e465f8d811f962f28283 SHA512 1b049d99c487f66cdf0b05a0371d7cfdeff99e6fef86fc33b20fc31af6c40fe2280a082ea7572a6463498e5bada30d6587134a3fc9026fe9f8a18dee45fbad65
 DIST texlive-module-tex4ebook-2017.tar.xz 13352 BLAKE2B 392661a4b57691baeddc5a1885222256712744d3346011aa33ffd3c948c744fe6895a6a396b76839f30f37a86007038bc57536c23bec33c1b52e757d5d4769fc SHA512 06f7b0af006fff3d3d583967066bf2b7320e7e8d1aeefb0776fb5cf30f5fa49c956a47f677f115b680f50db6b6486a11d1a00e7a687a49a6870761e7c90bea42
+DIST texlive-module-tex4ebook-2019.tar.xz 15776 BLAKE2B 066aa3f462dd91623a4cfb2cfb66e7202bd6602321dd947e822848df969bddf081273edcf694b1f10a49fd6e0f177ff400638453172c4a108606ac721a132fc7 SHA512 946317be3532db3e60b1fcf2c027f616c00526da55562ab3b682c01306277059edaf14138902d1e21eab53cfb9bf293c636598cffddb9f1980b287b2fba081d9
 DIST texlive-module-tex4ebook.doc-2017.tar.xz 72536 BLAKE2B 3109ec747de67cb46ddf6b522e00537ec1239a3c28fb3992827ca0028b33539a25c734d15d1d8df7469256d8f765c5e6df8b64b61bf4f1cd58b00c83893489ac SHA512 2da50214c0612614b539eb2db68e30cd73edd024b14073cf6ceceddbfffe29aa4eb8ba5c0c6f002856e097574a16045aebe7fcb2c7e04ddb218181c5ab64c3e8
+DIST texlive-module-tex4ebook.doc-2019.tar.xz 81192 BLAKE2B deab1e660b58e71e2dfc9902198baead1049a1b81087908aa6dac658448ac6a521977b0b4c84089232c137527c54711e330739eaf20742874b250c8019fce925 SHA512 586d3ce7642a0f06e358e0cb3d3dc577396a638d7e7c9f333a118716bf4dee8c18991d1736ac7169ba32c22b9aa10b887a8ae77ae5a4f40c800f2f1aca958abd
 DIST texlive-module-texconfig-2017.tar.xz 12492 BLAKE2B 432779d8f44ce00e5a3551ac9271c510f1575770d99ab8b32d98afa9e36a78c77878ac63075f08a553bcfd94f34f9eb64c56b316e86bebbad03e53a7ea3fcd02 SHA512 5473622487ae5b5f6bd430bc3b75ee7c1fdd646f74442fbcb9d4a943f27e013a21bb05a35a724efe4dd330bca3572dc6024be031072aa2d9ab8c9d4e75ea065c
 DIST texlive-module-texconfig.doc-2017.tar.xz 28132 BLAKE2B 737d716a4be9e86e3805af4d92a94d25b2e9ebcfdcac797dd0bb0f20e4529e6a209afe9820d91406f0a7df76d1723e2e65f8a4e1e15aeb85cae39ef5ab99f5d2 SHA512 3467b34fee7dc7bda25a85d759ab150d113effb27d64c632d69bea332114372299accf749e112709a39104afeb2c562a1f189c9bbbe41325b27827e515545b79
 DIST texlive-module-texcount-2017.tar.xz 33976 BLAKE2B e88e6c3b3173a00e0537642a3b3dbdf381455bbfd51958633502029f4d58e5605e530ebdf1c8772e3b755ba91c553b77addcd90edc8295662fb30ba07b4c1026 SHA512 1283f3554ad91423c5244c74670821a098ae8aa10c06b0a409b1852ca86c0c90b24ef3a1d76e894dda6636a95784fb8820aaba6442efdda566b8674a8faeffaf
+DIST texlive-module-texcount-2019.tar.xz 35908 BLAKE2B 7c84cc1f4f07d9d9cc3aba2cc2526274b42484ba4fbfd0b4f985bb5d7ddbe8d259cec8f5033f029db2bb30abe15c8941eb2f19fe9b37c5b4679839ef8c19508d SHA512 82f51346d9474270af6374cc1619ca005206b1bd729ce1559b8b66e361b184a192c7fbe085216a3a64e656197756593f7d76e52437ac562fd33bf09504b0f58f
 DIST texlive-module-texcount.doc-2017.tar.xz 554756 BLAKE2B fc8aeeedfdeb7a88dba8e23cde6ebfddac01f0ba379d90acd88ffabf6e069039aa88f6402c932eae63076f9d577e08fa0f32f8efe894bdce63f9ed743acb0e85 SHA512 f87c36f1d46552d258156d36764c6d96839576e30510257f72d24b4eddba1c624b12ff4405be3e39e1aa9d3f70c02e272a3affd513f2dc9ca3671568279ed6ca
+DIST texlive-module-texcount.doc-2019.tar.xz 559548 BLAKE2B 9c5acb7caaadd303532206e5ff2aec75be3dab53b6a1fdd1f726e7b2ae54819198b33033ee60d267d59b5a9b3f0efb66489cae55ff69c18ba7e1ddeb2597abfe SHA512 5141bdf4378cf87a19933945d6742427f4467dc73d92f4a470e34474232dbb2f60c4d8db065f812481520f1aa2f8a90d7e97dfc83f0f089d10386847f64f4d94
 DIST texlive-module-texdef-2017.tar.xz 9280 BLAKE2B 736d66b8bddf7315b6891d7b5e17473afe7390f9fc9bfaaea323fefca59e59af8a96f7724aa07e168c1a6fed077f7fcd2011c9fd5e8e9d170a78378a9765845c SHA512 79527a3b020f5fa3ce69f3436ef71f0f17d388b61b53e133dc8558ff26ab9a600d06233c41aeef6e4935d98c3b2d1c2b1ebb6f8265f0750bbfde847fcaddac6d
+DIST texlive-module-texdef-2019.tar.xz 9408 BLAKE2B 9383a0bebbd66a49babd66da47b4220d71c3afc799d00d523f2d40da287c82275ac3bb6fd53269791561f5c65186c92f228d0fb00b0e9ffc7e9a6dcc390933b2 SHA512 7c5defeb9cf9d5fbe92f8433265543e6d7024e9f7fdc768582ec51a5880745c54cf8576f1b7455e32d51429e2faf122c0775ead117be97510f4b2d8123b04d71
 DIST texlive-module-texdef.doc-2017.tar.xz 249876 BLAKE2B 5752e8cf7f2cc497748267a822c19972e5adc223b54e829e9431a1540ecf73c33e3e1f38d26b5e29ed0bd1c09c7af02e58c7c76f3689a5a270423fbff51e7a63 SHA512 9ad1743eb54c5d32dddda440294595f512b9eb64d45d4041ff2edb44a99cc689df17b5384bb5ef7150202a7d1f5c2cd08cfc81abcc2c1fea5e9098c7ef74877a
+DIST texlive-module-texdef.doc-2019.tar.xz 155444 BLAKE2B 00a24992c6a1bc2a607bb6f6b7348b0331d46b50594972d56f253a0a9f01ef1bf78d6b7bfa4cbda96a0498880ab2ea7c94bdc8e5a455889f91b73a2289639c6d SHA512 a4727d57bb5b56106a9baf4aabbabd16cc8a8ac08358c28263abe9c40b76a6d692d0e819c23c7b8e946e97fd3f7574a498a6f43207c04e7544a0383b3681f54e
 DIST texlive-module-texdef.source-2017.tar.xz 3888 BLAKE2B 1e724963bef41f950df0f86ff25015a5e43e80c84b2de6ea35df36505b075d8cbc90413dd634452edbe0cb0226c7b9507bb1fbc993d9a84f088e499d85c57486 SHA512 41c19aea1b9141542a6b5262decf3aea1d241c41d1aa0225eac028b564facead789c637e9d580b65ed68db7698dbe6d9fc7572b045259571b802860c7b455d68
+DIST texlive-module-texdef.source-2019.tar.xz 4764 BLAKE2B 01537ec90b734610e5e7bed83dd4ee6d07d53cd88bf68b23fac06738c4d919416e376a5361035e07d6027096c1c6efd5c301f4ac5714b467d63ea92ec5f116c2 SHA512 4b57478b06d4cd67ae6b8d2afb059eb52e03e31c4c4066108d471134865a64f3eb3dc99f8bc4330625eaa8e7c660f445365c6bbe510f36d5770b406df99d6c8c
 DIST texlive-module-texdiff-2017.tar.xz 7152 BLAKE2B f35399766adb4c0ec92d1642d3148a10c66d51e350f7e7b9c52117a78155b87dcf54d73d638d15c339839269360b13103ab06223684b08037a0600defe92b13c SHA512 8e300ab38c698a33ba6fce3416e6e1c57e53929dd5ccd7cf6c64b17e8c79f5eae0faaa9fd54f9bc909dcc1d3b961b3b799a98fce219503a7add53c0bc306a150
+DIST texlive-module-texdiff-2019.tar.xz 7172 BLAKE2B b68d85c65018983ca389a365efa425e1f30b015b376bc64449ad155b2a93ffbcadb1d005155c63f32404eb4b72de786896779a2deb922438f01a3692324b1c0c SHA512 26fa84b3090d641efb186947ce4d1d89c30a2c224cfc8fa759da3ba7ec9cc113c0ed4afc1c3d0fa5f9d0a88af4f9b3001d57651df6b5be6e0234fb78ec4f252a
 DIST texlive-module-texdiff.doc-2017.tar.xz 10300 BLAKE2B a6c11347315fb8035fd73720d0766a1c2843fe36487cb6837cc6adb9b939a50629bd72d596c105fe028a45ffc833ca43c499e581fdd6eee68241a5ff9b753f10 SHA512 d5c5c12dc2d6186f5e196bba31216986166b7efa9f6d44599d43446278d00576f94b858fe91ca5911811c5daa2d409411722e7d29543973641c78036aac15bd1
+DIST texlive-module-texdiff.doc-2019.tar.xz 10296 BLAKE2B e9bf5a7721ad75a86f406efe948df02c7db85a69317a0d12c601d491bf80c62a8fb5d944441d683a0e5125b7c74e7f48ff97298a7e1b5d34f484c19de39e4afe SHA512 d458fa8db6433b4c7fbd23a16f9be53c2c822e396e7f50844cfa6acdd2a08acf8efdd0bd946c8fdc09ca8aa28d1eb25708d3719184634abced92ea5c94d9a948
 DIST texlive-module-texdirflatten-2017.tar.xz 3084 BLAKE2B 4f9c3aafc996be5990596850fceacd4b825f6422a3f94d092d342ea27c65294045860ed7e70e1df871128a63bea9f482c605a2c40f250837d50e558b25df044d SHA512 73404f73d3c7ee569ef019ed4ce621512b6cb2d6f6c85bafc362759b1e1bbc4f56048d17e98b481099d7a0c4348594ec5a514752ff8888c153f4239f3e6d2322
+DIST texlive-module-texdirflatten-2019.tar.xz 4848 BLAKE2B 0e98680a98837b46ca20066382215ce6c9ab396b0fd234331c369e6010f64fffc7750bd4830945df32ec59c348f2cfd5327d3e085e33aa501f999858464798bd SHA512 e4f03e9a434e1ab8ea1b69ca0ed2dffe1f8cdb2c853a733e275bee74ed4b17b84b72cd8cc7d1820f595e1c2282a38b9bfc7f7b7a9e003fdace6488390a1b97ba
 DIST texlive-module-texdirflatten.doc-2017.tar.xz 5608 BLAKE2B 13f2c288e526c827c4759ed26938b8203f204415c4e6bd8f0852b4b09e82caf8c370e4db4752ddbb99673734095ff304f3c0a0009a7fa61a29ff00c642c9ab38 SHA512 a3e00dff899ca3bb7033eb8c8608d44cc3319f73afe6fa0d00c25e330ee13827df9556857f75b9000b4716ad1ab9d8b648f20509cc3ea4b10d2991bd6b3f9ea7
+DIST texlive-module-texdirflatten.doc-2019.tar.xz 11016 BLAKE2B a5525f16389a978b0aecfef7de04d5cb302fafb894b5d681c3f0fb3fd9676055c0befee94326dec2b819d7b34d75233f4750e6ea047e2fb13edc0a346c343158 SHA512 972fc69b705b2f6289358199cedc91ec386da9212048f7f7a84e43eeadc943f7f42ade8d7faa9f58d1685d2bb10408e274b2461032927042371feb86b4ef6b43
 DIST texlive-module-texdoc-2017.tar.xz 214216 BLAKE2B 7dc8381f2617b5e03587604fb5cd5c162a35f03b3a28c521349c529e20fe87b2aa33167116c2bde1f0e5fb4437da7dbf79783a75a45561e7b200d75dfd76b892 SHA512 f20124d5e65956d568b96efa1c58214d6ff664477e9525610f07b48898d2a09d55c39276571a7d2954c09bb6732abf5a0067c430d4f0f3ff9355f2d57fab22cd
+DIST texlive-module-texdoc-2019.tar.xz 25736 BLAKE2B 316d26e8f25d0f1dec8e0cbc8fb1949e14a6b47777c2191e113e2fb81ae7786c0b90b6df08907e463821c72e5f008231fa980893d7b937e736edb42dcc0328ff SHA512 2c12bf48d03d456e95d6bc31ad6d46f77c0dfebde73fd8a87e2128c7267327377b8d8d7d9b04ecf7295eaad16eccf1df5bab6f9050df7113c62bfbbffc0d00be
 DIST texlive-module-texdoc.doc-2017.tar.xz 157676 BLAKE2B 5c11d2a3d6a8fae9d6d2c277582366e46601a22a499a447e27291a97246c5a27c6191e2f664f805c5fec118a7a546a3aaa32fe3ac7a6783aa19c8bd91486982b SHA512 52ac9f9406c18856aa1f1570fa52e7ba4dd29b84b10a9c877dd88561248d48b8aa954ac4260d07018e2873dd5a43cf3c02bca02a87db2470d72c6becb115fbe6
+DIST texlive-module-texdoc.doc-2019.tar.xz 124736 BLAKE2B 22ec7dd263b1c525d6119e6cf24505e4844011f3ad0853a743d5e35b25a71da1c29872df4eedf42c1fa16cd582af1cf59ebcdcf543b5d187ff0c49b23573f591 SHA512 133abc048e8cbfa84bd2788fe0942bc48d4d2844bec525c010a3590afa62b22ca77518ebbfd26e78c825152ec0eea0a8e1513d15931332656b8fec702b0b7479
 DIST texlive-module-texfot-2017.tar.xz 6148 BLAKE2B 4631014160a90292d30c1c22af88aed44d3260a4600cf0186676ff0ed8ef27cf67a10bbe674db23c71a37fad248838919ae914c9ce24408414c18ee688e756a9 SHA512 40b6db87dc624e9fde0c134b982920fd59b29d771b9a8016870f9c161befbf1d0f3a6f122c20363285e7e71b2aa8464cd1fe4afff2c9ea96b850da4a0841e6dc
+DIST texlive-module-texfot-2019.tar.xz 6204 BLAKE2B edfdd65ebe4b757eba7d79993cd3c850b12bad9fa918055142a114557f42e671b8e252edbc66f859d66d7e9a3cf3dc9156bc144e7087b7e2fbc6ee5a9b73d09b SHA512 19b496131b7d68e77e7370a28cf05ab5edd2540027a927750237be0956c8e0fe9773017db5501f1ed31e213b1978aa217973d22ded0315b59cea453f59519bfe
 DIST texlive-module-texfot.doc-2017.tar.xz 31680 BLAKE2B c93ab467401c57826e4a16878112b5239724036dc96146e24101cd6912b29d8a3d5063cdf85a53c9aa4c500c058ea8ddbeae52745e51386d3a44a01e6f92a92b SHA512 ea12297d42d3ee6166aefc6a08507a9c1840c162ac837d1a3705c0e4cb7c4bed57c483ad6ae8ca01f487e492a88c2c0d9fdf7f07833553aabd07112a0aaeb786
+DIST texlive-module-texfot.doc-2019.tar.xz 19076 BLAKE2B 691590c51e6fea5f6c52cdf2d141d0678e2119e3e8389d6fcc1511eb3f648dce90e78b06f16a8d21b044f6d8442218fdc87421632d2b911aab2519ff5d945ddd SHA512 c0645e3061ec11cb0f27840391fd762eb18f407f173dc10da98190bcc33b2c64ecb7aac11fb7c79df7861273ce8710881bacfd976e635b3870f29a662a19caac
 DIST texlive-module-texlive.infra-2017.tar.xz 200472 BLAKE2B 4163baabb72bca39c34a77edf7a56ab6c93b1ed8a128ff71e4efb5309ea4465ae9fe427777e02b42ae685064fd32a7008864fe1a62656d25b5e6e9a12a358eea SHA512 13b73020baaf358a4812a10ac17fc22250fb9383ba1f1d535b7f25f2354e9f4fceb5cd6f479f38c8951d4894ff6315315fa058ef415ab11d4eea03601308ad53
+DIST texlive-module-texlive.infra-2019.tar.xz 220796 BLAKE2B 398d91a7e729c318fc4bb5a5f0100c9091bd878865f5423494170495702cd044a0e71b0fab84dfa467a572dbde00656e04990096edc8fdceabef8f965d6505e9 SHA512 4550aca83dffc9acd90a538671a13f82acfe3270b6f42ab3e3485ce67b45da539521ef075d3212f1dd8a637f2fef597388edb87a2cb1c57c763369b3acae6cba
 DIST texlive-module-texlive.infra.doc-2017.tar.xz 168904 BLAKE2B c78a14af1befd93c18055302d02f2cc51d36acb1e671319f37e5cf5d3bda7775af3dc1f6f3a7891c20d0d3458cb251c9bbd9f9dbe6b55f98111e0fac4ddb1abf SHA512 dd7c466ca4c94c81a0b7bd0d3ce5938c82f38c878a5b1e6ea68317f064ceecb43f02616c303265998f92bb486f3eddbbc3d6d16cea8c92a57e01f1591219c710
+DIST texlive-module-texlive.infra.doc-2019.tar.xz 180540 BLAKE2B 5945f5b3a1889109e42288684268dc98798b774f88103557bf0fc40bf0712796a8b7a13985eeef5a68e4cf6ff9917d6c0111e57ecb913501b4305c83891c269d SHA512 be27926d824c4ddc48c0b70d03b3e129e9392cc32ed10972aab1ab3e8c16695947f648e6dcea9b6b0aaba11e34ff5c2ef60d6c955d6b3cf28fa4e9e6f84848c6
 DIST texlive-module-texliveonfly-2017.tar.xz 6148 BLAKE2B b96e747db7175367f8d7b21e834b102b4ea83310b26cd502dfff0e75e81bf2bcd14a504f598b56a82529fd3328ad6f87edd76d9cf366d3937f865f8cbf17143a SHA512 dd18460601a387dc43587a81e6e2f1b3282c84340a1c1e89644eb22718f4d911f9fe651707645237cf74b07d9b05b8c5cb54741698141e0f3cffd6d184289612
+DIST texlive-module-texliveonfly-2019.tar.xz 6148 BLAKE2B 5e5bcf0ec5f61718852b2e0d29dd0d868f733051fe9db1fe3b970aa8ebb88eff61fdaeeed454c9508067f26baccc89c854220ff26b5e7daf46f59943d1c340b7 SHA512 e02a1214775f209c0698e62fb7f0ae91c9ad14024c076dd6a5ca73fad4c92ebbf9bbb0f281869cb0c073538c66edae2af23245f1bd0e1f939c80841269625af6
 DIST texlive-module-texliveonfly.doc-2017.tar.xz 700 BLAKE2B c21187393153d4122ae169e79d8c22ced1e8e076e049cdca68f2f637eb67a6fdeb4cb59be1217c90509ee0b16566ba2c04f517f50f3f1e282d7ab1923a5e3a72 SHA512 e84543231522b62de362760cec32e57321470382b6eedc944b5f02200d9454f10a743397d48acef3e5f926f378830607f9fea20208d5aaca0884cbc4bf6988ce
+DIST texlive-module-texliveonfly.doc-2019.tar.xz 700 BLAKE2B 7c2f1f682e9b1780176cfed3f141b621234f402eac6fcfd0926dc54db243ac334880684842674a6b3dd42ba38305def0fdfa815c75f2b051635a90ab146ff7d6 SHA512 f89f82a59f726b226101275b1aeaec00b99ea1302ee5ff8c021e4696b4abad39d1a95b544a4bc45483440591e1266cfba4d5c3c3bbc769f193671a46aa7458b2
 DIST texlive-module-texloganalyser-2017.tar.xz 3844 BLAKE2B 965f18c9f1e885df90853cdbb552b75d24673b54d2eb260c22738e3600bfa47982dab68f9cfbb2ba974d75baf3a134b075f557c0fd91fa1cc3a9b3071da8056f SHA512 4ad74a418469bca56eeac138830d4e4020b3a0c3db36b0fbd25b89bd14367219590ef5d948cab79f22f1acccedf4b0073a2ace78447075242a66b40a1b6faf93
+DIST texlive-module-texloganalyser-2019.tar.xz 3844 BLAKE2B 85c9ae09f242f54cee0d77910ff12a7e0005c2e1785eb923e978858307e5474de4853cdc330c328fc96ab46bdce3e05008146dc50a5e1e5ebd72e5dd7c584979 SHA512 cbc18031b9b9ecfb6088b82b99eb72ad70fce92e4b103230a06ffeda0a50871715405a0aad18a7495ba1b80f16913cbadc4b8d1a7d2ebaa77d5cbd00e1682c93
 DIST texlive-module-texloganalyser.doc-2017.tar.xz 512 BLAKE2B ba1e799f3e68af8b38a74bf1531704385ee23ead7fa83ac1d3514a19497265954a50e59dccafb99824e6a688f14ed5c4fb02e2a728df272e3a020c1db460e3aa SHA512 922b73d9948fb8a0c79d553d7ff96389172fc924ec03f400a9bdccaa288bb59163778b01cec5ac74df700bfafcaba3d961a22bfb9b025f47440ec4b718bd81e6
+DIST texlive-module-texloganalyser.doc-2019.tar.xz 512 BLAKE2B 5743ee9faafe9308ae7eb897cb8e4b94f0331ad14be4b3075728f77e2b22ceed0a9ff27928ffd8ef0af9b8ec16a7ccbcf16cc4ace4c0c6d13bc22d1bd633a846 SHA512 1cccf82314d9afc841044aabbb5f06933f6bbdfcdb46c22909ce18c2736d40c532944405232633f61893f0f56de24233d520edd64d4cc89baeca5c01ffd0f9ea
 DIST texlive-module-texosquery-2017.tar.xz 163988 BLAKE2B 2599645600750ef77ddb3811b7a2ac82ebedca438b9e488a17f281aa047f977ab0922e8a2b94590dc9cdf33cb4f298d15ab0300748efd2cdf479238f7fbd13b5 SHA512 3a34bbdf928908993cdbf0287680b0136ca3a43e4bf7ac245ac4c15cc2f55cfc9f0e80d4e8a443619d8ecea259d7541790ee1cfbcc8dc8094295b22c77dbb8b7
+DIST texlive-module-texosquery-2019.tar.xz 170196 BLAKE2B 6899cef3b0afffbb0d908a015ceff481b271a25e4497a7d767ce823a5eca49bad2616790c2301bd9b83f1371a8da0f9e703eb981ea4d0824db4f46ab6de03237 SHA512 bfe5cbc793a81a9ce3c98ddc94fd217c3b235614394d2f329db4f98ae29ded1757bba5d98997118a2c78cfdf6d774146a7ac6a716b2bce91c876b0387e1aeba2
 DIST texlive-module-texosquery.doc-2017.tar.xz 496380 BLAKE2B e3378dd5b925defd800530270c997154a927fb6ca07aef013c138d333eb88c83b4b9d06d2b0940afb7803d7b129059176fa5aef33b985ba9475fbd0611076a0f SHA512 b57a8c02deed662b5437cc1d739994f69542ed307ea5b37ea6d1f7dec45e441e6d05458e8cacd6837d76598f0a83f6c912152514e62791e82b403a27534cf7d3
+DIST texlive-module-texosquery.doc-2019.tar.xz 502508 BLAKE2B c2396bf194fb0cda0aa89171d0513e96e33839bbbef2004c54eb42c22f12a6d0895362437fd8b6c53d7192da0658a661a2a0b50c8982b7ccc73566dcd6118ff5 SHA512 2b7cf8dad61829b96a2f17f1063baabd21087ea2526c8d8a6408b4c2e63c8f44be3f318be6d1e198661efe683afbff7055c678e7229a13d3b01e200565caea9d
 DIST texlive-module-texosquery.source-2017.tar.xz 69084 BLAKE2B 653a547c1d0221c5744dbd205de5065b495ff6ebd172dd10092b8029bfbdde9d36486a26a3381d07800b8cfc0a1d6ef406f5c57a83aa4a59d166c3318a538f8d SHA512 d16795a95e298913d0bc5a3f41453a523278259b4c211890609635d7445d0a6eb0367d8c842a6e7df4a9ae9cf0b9ba2b9a804aa8b2ce5abd380c59958a60b27a
+DIST texlive-module-texosquery.source-2019.tar.xz 71160 BLAKE2B 827a60a866bb959468fb5699b764ec3cf5447da4110c4532024a8ff05c6ac04acc3300666bd75a6dd1c0d49fc58f6b44376bff950262cf2d3f538c0776806f18 SHA512 c834540e5448887bb0d80dac77770c7f89b8017743bbe4691e46aa5c95c3f59f2bdfde93e0dd72aa8dd94295b1dbcfdd374a8892d4c622c41df7c4a37a68a701
 DIST texlive-module-texware-2017.tar.xz 588 BLAKE2B d41d855b39779785b0ba8b9fa32ba271ac33e8c832077f6e40f773a289762d29557c2e7dbe5ce45c7a088d99132b245e654a28351147329b8e6774bbfd6c6e9b SHA512 b210ba9c3492631bb63fd230b5c719e604724a66064a4fdd1cafbaa6a66e3727aa7634d856bf3c10fd8d49155a62c447d261e0181a46ae7d067ef8ebf39f2a7c
+DIST texlive-module-texware-2019.tar.xz 668 BLAKE2B 6324a93d098bca2e6038f13cff1ff9dd302a6494a8ef0dd0b9594e249eab957a81336991df171cb804aee580c651a1d9257f4fda3f3b7d6a90f3baa8d49c9c63 SHA512 cc66e87d459fb04070b0c43c16f3412ea22e3cf8a2748efb8a87fb0417bf0b9caa32a38147a9dd068d7ad0d25e320dc78ac54d9004cf5adef337ed0a90e52923
 DIST texlive-module-texware.doc-2017.tar.xz 34412 BLAKE2B e0e92cfa8b2e6dfd50fe0a03f62271779c6f9528ec1666686aa2cd44627f83fbb86027f58d44a83055bf819ea9b20322eb9df7ec6f17b38d44d9cdba25b8ab44 SHA512 63decbabef250daf9ac5ac6ce97e447333dc7724a56850d63067dbb929b1840fa5467f8db6a310d3992e93d4dad93d6e41f1dabaeaeaf811ce2608b3bc5b7987
+DIST texlive-module-texware.doc-2019.tar.xz 34600 BLAKE2B b6949f864ff00cfdd8f620479ea38ef8eefd739dbaccb6e0e249cadd9bd6b2eb504947c29d78b0df0bc6f2e80829153db9d79cbdc69373b4ce6570b22ae30266 SHA512 a8ef6e6a062140ca6ab3311b7e57f452bbbb0eddebe36d02cd8122141320814508438d764a97d351febf9f65a5539b03774f611e9bfdcb5abdc5fa989fc5a848
 DIST texlive-module-tie-2017.tar.xz 504 BLAKE2B 7ff539b26566f25795a748e3bf76d0fec6611d2f37796c56ce4af587757be0f8ccad6d1ab797dfdeba42cd1894aab628d1052d57bdfe9a62f07b77856b0b1a2e SHA512 91d008e9f9734c4b0eefd7d016395cf095602e3efad281c01ee502790b40ce357673dac432bdc2869f917e7a71e007df871524e993cbcbb581390b85a8287b24
+DIST texlive-module-tie-2019.tar.xz 500 BLAKE2B 6d4c87a35b8bf59f2dbb9ac2437f91dbcf47c7396b4b150dad65229a9d08d86a04ea4c9ac6e8ffa45929040bfdfe7d31eb36c8e64d718a1571327ccf3944901e SHA512 970a855d2d025b3ac30a4e1631986568459bae84727b661ffc8e0982656bc66eb940b59e2b9c3ee6430e3abd5f7d8b0ce4ff828127bd2f9420e0139f1860527b
 DIST texlive-module-tie.doc-2017.tar.xz 14984 BLAKE2B a0b24055c843dd454900b82b821ed3a8114ff7e00d3e529105d0bf47b6d06d6f6c897445492b11bc5420b97cf8caf2f09254988c5ae98e238a901680b7571c50 SHA512 93d9eaaa217c1504852ad52ca04851616d5b7ea5c5d3521538ca29f16f03b28fa0ce22275f4d22026192826259ab6e80547f80dbfaa3117eb7e44517c22c01e8
+DIST texlive-module-tie.doc-2019.tar.xz 14936 BLAKE2B c300333466ab30ca31413cb23b473e4162f0aed966255522357c04864575f919856637d56abf4760a45b49bb7e56299a59ad8fd6016d88869ac694bbc6e0d4d2 SHA512 24f07d9954fe0385abec8487d4c488df551453e13e8f638e32899722d62dc91b23df9d4494f9bc13662d57fed6e8dfd4d71835ef79832b59f075f9023797e858
 DIST texlive-module-tpic2pdftex-2017.tar.xz 440 BLAKE2B dbe8d3012f351853db1c2019b650f5c1c2d24d4ed9f39e3b891062f8946ecd42315069e833c4500e06b8213c8f5c40a7b58f6edc5e86180f360bd226de74d55b SHA512 ff542fc31ae85d199a72d5f6913c482ee9441b31d95a109a6a9a3dcfeae41aef85e80911b9e755f11cc700765f9b40527406bc36991a2280c4b09ec63d0e9bc5
+DIST texlive-module-tpic2pdftex-2019.tar.xz 440 BLAKE2B a64a6f371b7331b4f963c039c9b42bc8e396bc5bf56931e76bf8b7b73a7a11a67c1defc7e9dcedf23556b65fe7d86b6c437ebb2a4fdace0ddcda6b2a2ced6f67 SHA512 3a0bfba17911731b52960646914da0050a6928b2b433c84140ccbe63835d816f018cea4b16a8513b447c7490fcfd610cbf7a48c8cb0d5dc67ee925c238361b14
 DIST texlive-module-tpic2pdftex.doc-2017.tar.xz 41848 BLAKE2B 2e0cb6a73fdadfbe2cf85c8f241e650905ca1e94520ade6482bbb8e0362c07fa41295e0557b92df4d8b529eccc326f930ee079a47683565ddd9cd6688773d053 SHA512 e08e33a9c04f32bf4dd5d1f3f9be95cd36cec5998c8dc1dba2799ee9ca9ac1e9326550ecc53500c98506c03cea4fb08a766eea88ba85482ed2bd6dc03b306708
+DIST texlive-module-tpic2pdftex.doc-2019.tar.xz 54396 BLAKE2B ea93ec21f96ab67ad58b3baef1f18f1133230805adbb3335d489dbd901ff5eec06ff61911c685764f05291e2a15a029c6e047e4c108306731956539c906e16ea SHA512 b2734d86215332e7898e611ee12880c559b095468881c9ec1f15696a182afaa2f056c46ebdcf4cd69427e9716ed70b1cf50f72384d9f698e644e8b2fe9d3a1a6
 DIST texlive-module-typeoutfileinfo-2017.tar.xz 1596 BLAKE2B 3c20d6daebac40630f491876917686e83572b57f043000825d0600f3f3329926243e88151ec087c7384e366c244960d96705939eb6afce60f3ff5a56c13d5158 SHA512 d287e4c728d33ba67e8c907c8c28f06d5b75660d0f5b996c917c127c903b0a6f5d292c9a97e5ed34a23d953ce62ff5b9bd357ef7674f87a60ffd71eda3d0d7fb
+DIST texlive-module-typeoutfileinfo-2019.tar.xz 1628 BLAKE2B f934ffec09993f9ccc2958330442c594f45710de2d1f7565f978ab5bed2069a67b06ed289840f190935e16fe25c49b849d4cb12261a429cb6747c175bef59970 SHA512 b30d2618c8cdbf69fcb8a5444922185a52b934448b5d28ba143948cf80ed17cb402d73d1162194df3d2992a52ca9e6faca79000644eef968c4eba892c415b6bd
 DIST texlive-module-typeoutfileinfo.doc-2017.tar.xz 760 BLAKE2B d6ae70e4c4baf44728d0fc474cd1a39036997366b9f4565f6a1648a27ec904fc24100ab0109d35825b171f9d094a165cf72f7fbcf53ce766c5cd6acd336f2ac0 SHA512 277b08d5cdf7d6ebef2d03644c635c0a3ead2d18e037264a3505dd1c6a7c9c7bea60a7e81fd99648efa486158d573ebd58b10b62014b5194c84386f4ab6788de
+DIST texlive-module-typeoutfileinfo.doc-2019.tar.xz 756 BLAKE2B 00d7c631ba6815997b46ec9adf1eed4f765a583de7fc5925349ebef150f633d34325ce7831e89fdffdf0c3f64147b0da5b883d9000c6555ea04e16880645abc3 SHA512 143c4ad9cb3890b6350069d5d045f74c0bb0cfbe50e7d051c50c82011b56e651d483c1422d7d553a8d1d1784ae726a1ca1aead023fc3ccb1da4f0d59d47f7920
 DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f35225cc9bd041706b3b755f231def9959a092fc78746c48c6a1b954679fffbe3cc03f0a4ce8dbb49059ead58826045e08868 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e
+DIST texlive-module-web-2019.tar.xz 524 BLAKE2B ec134eb2d40143e1f45a076e05eafa25f991568c53cef0d812be7415f8979e4da38ed14ab9c6d97f3b2aaaf62720816822939d4e79fb7a18ef77f0025317035f SHA512 0d2d771e8452d67278adec061e1df8cfc06f3af729ea5ae7849acd5fe1b628167b18d86b1037484dbb6b20d5f703bba7ba9fb255788becc53ce22fd87f39ca7b
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
+DIST texlive-module-web.doc-2019.tar.xz 41588 BLAKE2B e0bb24840f72cf3b8a2b2d314fc82ca124d09700cdce32a4472b69963b0c6d6b1287b573018fa2b4698a3ce6594398031db7becb5b7c09db2fb0f9a7e893e038 SHA512 5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322
 EBUILD texlive-core-2017-r4.ebuild 12341 BLAKE2B 97ce4f9a733fddb0bc85ba3885ac9e988b89408b71d045fa3172d643937587193f1a71c9b156f71eabe4e59f155b2694c6f5d7522d4d2f463950cd7a8ffe1b6f SHA512 bc97b917ce1da33677f58b865d551c904efbb0b971a8f2cd25cb785c2e999b1f550cf08cec2e8df40fad934176994c4865732c7cee44a53458cf92e8e8c6a249
+EBUILD texlive-core-2019.ebuild 11088 BLAKE2B ee18e88fa38f30e38e53c14cf7beb44d69389a2be67d5c4e19e8ca610754253ba2575bfe5fbaae92a989500e402f1266759c03b4ed82f33979ca66dd926c99ca SHA512 e082a113fb582bba27132d16211eae01fc32e1ca2716664e02d9072df294fe2286f5393594c9ee2ade3557a63b1a32036994db251c99b2eae9b266a63d08a62e
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2019.ebuild b/app-text/texlive-core/texlive-core-2019.ebuild
new file mode 100644
index 000000000000..33c6995ada00
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2019.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TL_SOURCE_VERSION=20190410
+
+inherit flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="https://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_P}.tar.xz
+	https://dev.gentoo.org/~zlogene/${P}-poppler076.patch.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
+	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
+	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
+	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
+	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
+	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
+	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
+	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
+	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
+	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
+	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
+	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
+	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source hyphenex.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.source
+"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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="cjk X doc source tk +luajittex xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libX11
+				x11-libs/libXmu
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!dev-tex/luatex
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.58.0:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	app-text/libpaper
+	dev-libs/gmp:0
+	dev-libs/mpfr:0=
+	xetex? (
+		>=media-libs/harfbuzz-1.4.5[icu,graphite]
+		>=dev-libs/icu-50:=
+		>=app-text/teckit-2.5.3
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/kpathsea-6.2.3
+	cjk? ( >=dev-libs/ptexenc-1.3.7 )
+	>=app-text/poppler-0.76.1:="
+
+BDEPEND="sys-apps/ed
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.8_p20170524
+	>=app-text/dvipsk-5.997
+	>=dev-tex/bibtexu-3.71_p20170524
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/Tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}" || die
+
+	default
+
+	eapply "${WORKDIR}"/${P}-poppler076.patch
+
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+		texk/web2c/configure || die
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--with-system-gmp \
+		--with-system-mpfr \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pk \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		--disable-build-in-source-tree \
+		$(use_enable luajittex) \
+		$(use_enable luajittex mfluajit) \
+		$(use_enable xetex) \
+		$(use_enable cjk dviout-util) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable cjk pmp) \
+		$(use_enable cjk upmp) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk" || die
+	dodoc ChangeLog README
+
+	docinto dviljk || die
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk || die
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README
+
+	docinto web2c || die
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	einfo "Regenerating TeX formats"
+	fmtutil-sys --all &> /dev/null
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 582753919ace..569dd9672fc2 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -2,8 +2,10 @@ AUX ttf2pk2-2.0_p20170524-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67
 DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 EBUILD ttf2pk2-2.0_p20150521.ebuild 1380 BLAKE2B 8a332fc015d1e328b342328096e173d90b4652b3e29ee5f235661741e350404edc9eebd919dbc7fb8d2607da798e333eec8b4dd714967296f96dbd51b2896872 SHA512 86c034a1d85d74894efb55ad7b6aca38606f8291d58d993dbe17c124e44cd71bce7b8aed5e4264e45ce4d8b43ce8e8e6108f42820d86e23448f62f7576219065
 EBUILD ttf2pk2-2.0_p20160523.ebuild 1251 BLAKE2B eb840feed846e552a3202b42db5872d26c19949be4444ec538470e02ce1da85a2a3e2f3cd03e0d1e81f0282978cb86b3282310ca8865b576c6be4eadb393e0b9 SHA512 aa1cfe98ed451aaa6066e4815698113ea0e925b4361eb50ebb51935089f26ac438e511eb06d74dc7c7737981422718a4e4fe67b5aaa839594d617f0c488296d8
 EBUILD ttf2pk2-2.0_p20170524-r1.ebuild 1462 BLAKE2B 29fbec0d2ecfb06fb7c7303b9ffcc8d0aab170ae70c171a92f9c0517763f4a18e9860decf85cdff98a71b2a98cb760139fdc60d743abf2d512edebb41093f4dd SHA512 27fc9486fbadb5e73bb9f70ef3b695bebef7b8a580b13bf0d427aef54bcf6a86e400c2d14cc126302bff39676b28018e082dda2791a50b4afa389bc197395a30
 EBUILD ttf2pk2-2.0_p20170524.ebuild 1257 BLAKE2B 88872ff9775a86392454eca4ecd81c1b1e92fed99a6c46ac73082d5242d6a33a78b0d5f5cc2f056fa077366f6ade864063d5d59e286ea65dc611a67bef119051 SHA512 8ef2e82cd26116b828b4e287210d4823f4ff4d9b0b89efb3ad3ec37c00da8b9b23649ce245d7c05bae8f6fc0820138fd7fb073886a7aa5be048230da66c76a2c
+EBUILD ttf2pk2-2.0_p20190410.ebuild 1121 BLAKE2B 98443e3800854dbf00fd38f0c7d3477aea61e6914cc8e5ce86c4db650848ec687aad02d078e041649419d5cce2ccec4d8cac08d14f4b2b3934171e15dabff9b4 SHA512 bd351e4a69e6860c6c2b2afb32ad31223c456ff352c5daf48317d2d68d33f7986407d6e486f0f28cb1b8ea275a4ed8c36f6661c2ec03903348ef0b6cc3fea7a6
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
new file mode 100644
index 000000000000..5fe37002fddb
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Note about blockers: it is a freetype2 based replacement for ttf2pk and
+# ttf2tfm from freetype1, so block freetype1.
+# It installs some data that collides with
+# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
+# meanwhile we can start dropping freetype1.
+RDEPEND=">=dev-libs/kpathsea-6.2.1
+	media-libs/freetype:2
+	sys-libs/zlib
+	!media-libs/freetype:1"
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+	econf --with-system-kpathsea \
+		--with-system-freetype2 \
+		--with-system-zlib
+}
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index 6ea27bf836aa..879695aee2c8 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,4 +1,4 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 869 BLAKE2B 302d6f9d26eb12219fe1748d0f9a6501d6f3d8a0245c587f0eec8e4843930afca88dd82e29e4767b882e1fb5821f66bf876a11da39e2052581adf8062047bda7 SHA512 88f9319cd22c1da88b666389659dc5b4d22fa40ffbc672961276a58df13a925e5ffe6044b523682a34083dc1882543b01841e2a5feb9b806c3c64d105f9739f7
+EBUILD wdiff-1.2.2-r1.ebuild 873 BLAKE2B 153436ba42f195828fd94d44e8f2f466dee684c34faf6d0861d98e340eca8e2196b2b4827bff04bb3aa506aef1a4fa1328a2086abf07c1bb2a81cf9e45579a1f SHA512 ff0b0ff424b9efd252e30fcaa7c0e55b9c4ad9c4f4282cf12c997a4fca97649cc292fc554c3df9afb311fc26eb9c518a581c2f7f403d6c956e3eb429ac8acca4
 EBUILD wdiff-1.2.2.ebuild 839 BLAKE2B 05f9a12ffccb81d5f5aa8a99f604975255b76c95324068a7cf5fbce3411213689bac7becc3f9c6d110a53b81ee65f966272435b4e7559f8a51e14f5d7fb17c71 SHA512 bd6430c5c7ee706d37adc6489ba72d9021b5887e2864f45edfd23cc051340586fac6f79daef740bae11c16ad9b9ce6a54d980a0738bd6cf1965d85248fa91dae
 MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index 88b88f79755c..e5340d3ca4e0 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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"
+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"
 IUSE="experimental test"
 
 RDEPEND="
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 182db31cd214..e3b0de96bc31 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-tools-3.18.0.tar.xz 210712 BLAKE2B 8b9af089bc2d337d5474525f369b5ff5773391dac4deba7610545625a8550cb2735f9295282cd490b176ba9648f3b91e3865fedba27c4c0b4155b2e99bf8db8e SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8
 DIST yelp-tools-3.28.0.tar.xz 210496 BLAKE2B 2904b0ffe50f302d7f0938fecca74b37f6d070fe42fd681dd96b3a70b73244f65e204c34bb6f6ffb2b5bcd3400334b3d85a82807793b2bd30261c616382b8be6 SHA512 0b5adcb746ffb2b9c60303ef484dac01fbb59a06abf94bb8ec8a66bd573451939299688dec088a7421eab8f69ec2d7628475e81720640f0cb5b947a8d410ed62
 EBUILD yelp-tools-3.18.0.ebuild 665 BLAKE2B cca32e98a9cbcf49457795aa608955662f8a58ab7276b24aed66b5069f1f67de5c6ea5c244c4ec8dba26670b996e3d1554d210888fe339bc1f7b299b32aca978 SHA512 265e23a9f7286e866e85c431dbab8bed4f1c6477ac55029f1e55680cee77840be72260470d6bb81590174a16a0f5affc8c54fe8d072bd834ffb666f4d685f8c6
-EBUILD yelp-tools-3.28.0.ebuild 650 BLAKE2B b771bd288c85a98fa12c8c9c2df0a68e9dace8b2b191bfa26c8e0686d2959b0d6108ccfd9b3f640e5203cba795b8fb059b71794b88beaa67316d794c76d3f506 SHA512 f67a7908bfb4c4bc1ad7d578922454094513076b65b06fc81f3d74a60f60add54845a70a095c973c0bda0e772a07f753455f372708802f59f9fd0073d498bdd5
+EBUILD yelp-tools-3.28.0.ebuild 649 BLAKE2B 19572de7e8ac8d2e37edc6adb4b3f5f2b04f082e50cb22592662eaf02fc56c49a921eb690ac3fbe397b0a9fcf7175586eef94657bfc801cf70b8a792162aa5d8 SHA512 80c3839434fdb7baa5eee36d22f731c57cd5ece6984df0e7770e4615bf081f83c6b17669b0ff438ee7911da0277182c5734f35491740e82045e9d6a7937a4255
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
index 721dcd0a68a6..5ab20341f2d6 100644
--- a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 96a00b323810..10bb5b0d8738 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/vim-go/Manifest b/app-vim/vim-go/Manifest
index 3f82d766c536..3e81aabe340b 100644
--- a/app-vim/vim-go/Manifest
+++ b/app-vim/vim-go/Manifest
@@ -1,5 +1,7 @@
 DIST vim-go-1.13.tar.gz 870173 BLAKE2B a2f67cef249191cf91caf45c120e471301a89ee365ba9add839edea17990ff3aba7238965dac1c71a89d2004dfcfd486319fc4f1474c7ee94d3845724cd9b289 SHA512 c2aa31104168f3a8e1f96b0ad2c51dc1c2e5a1de3db76f0009edfb38bf60ebfcd9bd8a86fedb6ff6d6d789973a557d6ed03e38e67159bc43c5231449b0253c25
 DIST vim-go-1.19.tar.gz 218988 BLAKE2B 3bbafde28342b8febc8763fe9858575abc8f3e9735f3886de508cb7986bd97d1d2eeb36bdd4eb9b2f514e74f47b08355549e32c101519dac41427f302f57e29f SHA512 fc2cdcbc58878ab435c6b253a226e46ca60083bfd4e6df683e1dbeb368bb25b10fc531630a6b1f6cbfc32306a255eb6eae6bcc3f7a7b770758d4beb71c539f77
+DIST vim-go-1.20.tar.gz 232322 BLAKE2B f72664c79d781152748b6d5e48e9363a924e257eb0054931127d83fe4dc56d5b3e3592800ae3be3812609ec92c9b66fbcba8a1b1ca76891573408db14a0b2865 SHA512 1f5499dd33b72466127c1fbbd7a10dca41d9e8c3add6a0b2b3efa8dc0caf2aaa26311357a5b5eaecf2461a3465aabbf608a9ca35203139ead083bbcc806ea552
 EBUILD vim-go-1.13.ebuild 585 BLAKE2B a46b8e468163abddf2ec305b76e24fe82ab82f631dbf773bf927c0962f55303b21e2eeba36e44a0c2d172160c65fa6ec02cde729260783b0ae9c7a5e0f199fe5 SHA512 4d7b8ba229f5c1318993517923701078909ac0fda31c34ea296b62e5e16395a7bb926ea9811b6fbfc8df4e660435bdc1407da209dc4dbb56cb7f887854e31e73
 EBUILD vim-go-1.19.ebuild 584 BLAKE2B a1d61f13d28312d2956db0cb8773d1726e4dba10779d0f30dd6837876e9fa1f5e88e7d9d36f7f02e38b6baeaee639df28f42157c96db5d770b082fd8f2568dee SHA512 c709456699e0a87ed9908a01f92cc0fc5d78e3648cc6656181c63683daeb7caf5af173d755fc3109736df53572e11e4616a70235fc8bd3a78823237bb00d17bd
+EBUILD vim-go-1.20.ebuild 586 BLAKE2B c444e95a3a815b6277442b67080c341005d3e3449ec49c1699cfcdd4d583df27d97d23bd71e789240fbb840415bcfb2f0e9c968e224a2ba0771cbb291216ee0f SHA512 6322c39bd08299e5de49c08541f84c265c2843ba35337d17feafc2a5d068c27beb6f70075a34b57ae02e6e69cd2a5282fa5247812009c94ce4a0ba85d69d2620
 MISC metadata.xml 326 BLAKE2B 2c1d1ecf6dc417d2646fbeeebbd2bf1191c93f6439df663e863cebe0b33cfea5040bbe3f1b85107f5370395d9472c4f903379c3a5cf925a997789c492ac0cc66 SHA512 0075500c50b5ad7cf5610fbc4bb71e3ee3d655bc089916371ee0d66731387a2268df98ed6d7fcad6e70db28d6852b48c2e6742e131b7c5d50fc7a9656807fc60
diff --git a/app-vim/vim-go/vim-go-1.20.ebuild b/app-vim/vim-go/vim-go-1.20.ebuild
new file mode 100644
index 000000000000..3a6740617589
--- /dev/null
+++ b/app-vim/vim-go/vim-go-1.20.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Go development plugin for Vim"
+HOMEPAGE="https://github.com/fatih/vim-go"
+SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RESTRICT="test"
+
+src_compile() {
+	# safely skip `make test` triggered by `make` as it runs `go get` commands
+	# TODO: see :GoInstallBinaries (https://github.com/fatih/vim-go/blob/master/doc/vim-go.txt)
+	:;
+}
diff --git a/app-vim/vim-tmux/Manifest b/app-vim/vim-tmux/Manifest
index 6b6c921697e5..c38f57f4acae 100644
--- a/app-vim/vim-tmux/Manifest
+++ b/app-vim/vim-tmux/Manifest
@@ -1,3 +1,3 @@
 DIST vim-tmux-3.0.0.tar.gz 9658 BLAKE2B 188485b4c74e60292aa153693246c9e612cbc4736accb7aafad3ee901084023b3f40374212afe2139c634b8457c2ec871f0cf5e6d02beb69fc3c433f26b8610d SHA512 d251ff07b0702e4f9969d02a9c32924db62f77b71250fda175053883abc35c18932f9869ea0514df1b7acb9cc65f6b39e2b8c640ad77ff36a19ceaa74d13d77b
-EBUILD vim-tmux-3.0.0.ebuild 443 BLAKE2B aa3e0a7d41cc9d6a794d2013024ddf9f1a5b218870f4f455ec494f5e9b2938fb35e609475c38ae12c97315f131f5050c823b99653a696cf2c0617f5a001332b3 SHA512 6b978e3cc57b0e97f9835e19c1595754a77b0f087e331fd43887417c0968048bfb090f13803d8d11fd790a1b8200758f9309a2277d2c0e61269caab8f17822c7
+EBUILD vim-tmux-3.0.0.ebuild 453 BLAKE2B a5d9b4172988a4e34d367e57530fb7928505aa88dc58465f89e395fa831ff2396517773fe3003e20987a64792d3043f71438421ed8be17aabc71854325577da5 SHA512 5e0af402ba29703cb1bb7ca16765ca856c80159ff41ed84785674c0f78777c06670759c85f8210cceeb2d5555d9393ccf511876ecb79d3b8922267131a89b2e7
 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 8f192ae47bd1..d159003e5a1a 100644
--- a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
+++ b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
@@ -8,5 +8,5 @@ inherit vim-plugin
 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}.tar.gz -> ${P}.tar.gz"
-LICENSE="vim.org"
+LICENSE="public-domain MIT"
 KEYWORDS="~alpha alpha amd64 ~arm arm ~arm64 ~hppa ia64 ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index dca9c48c3642..3c0b079d066c 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index dc8171935958..d32c1450bb0d 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -3,5 +3,6 @@ AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d9180
 DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee
 DIST asis-gpl-2018-src.tar.gz 5983604 BLAKE2B d91e3ff5cb95ec5b69121ed09e73f7bff234147b809353577315cd25cae0069ec5ebfc221a9798341b2a33bde316d74c4ce47c7ace580fe4d867e47032e207f2 SHA512 e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a
 EBUILD asis-2016.ebuild 1220 BLAKE2B 3d31f42030ea2cf19b2c98159018528cfe423cdb4fbabb0bfe116cd5f153c2c2f4a80f357381cc8dbacb25134234f4529b36214596bdfd6f03af03423ed71e03 SHA512 77c3f1f87a1cfbbb96080e37a1ebf5d3a3407eda5e31e8fba02f2e155207e07cc3ec5c47917a0b4ae11293ae053e5c0602a2b46d5655bbe817a5a1a0d0010111
+EBUILD asis-2018-r1.ebuild 1441 BLAKE2B 61e2a30f0c81fbfc7ab0203c3b518b410f4bd912e3722760e2bb9b36ce95fcb042a58c8e3c5fd87978ab1a1210dc9d9f86a62995dde61d3302996abe4c5e3dd3 SHA512 013d1d4dede6929b512b58d9244709dc56b4524a0ccc655e7fe372b1d18651851eb026490f2c5df990ab85471aba5fba9a8638e16dfc5faf7eba22b18796dc6d
 EBUILD asis-2018.ebuild 1297 BLAKE2B e8fd884ce0b058dd198aadc4c0937ccac24585ec37dfe40e34f44f65e756df2ddf6b84d366a200f018aa60887c8564cc552966118cf8be2ce81a9cf803e355fd SHA512 6f4ced4d984e41c98bce656dc82c266f04287728660d80720595c4382c799b1382522eb7f4df6e6f8b81b34ee5fb7865ecccf40dee3f4e86982470fce602d395
-MISC metadata.xml 758 BLAKE2B aebcdb7e9be0cccf7350d68082d2461ec6a28c94df18dd936f689a3cf02a0139b96c0208fb7e8ff677ff0cb977199f8b4ef097faf6b3376624c4bf220845f216 SHA512 b673b7f404971e44cd09f746338dc2cd655b4b5cd0ced7a742e6986a8d454b4c2738a7576dd5b1ebe5fbea4ff073de60a1fbaf8dddac90e54981159affa0fb07
+MISC metadata.xml 826 BLAKE2B 78caf8098338709c972cf58c16fb95f006658a97960dba628820ede952f99be63219690e0720225cce2291ca79d4ad878f9aea398c5736fe5b51a04d8d13478d SHA512 ac2ac3258c10548492e1cfe863b2666bd916cd5a89ae83aefbabba8ff235ab0e4a70e80cc94ef9768867c47b2d1ef98da6dd037ba144f64c33fe435d44617563
diff --git a/dev-ada/asis/asis-2018-r1.ebuild b/dev-ada/asis/asis-2018-r1.ebuild
new file mode 100644
index 000000000000..0bb54ce915bc
--- /dev/null
+++ b/dev-ada/asis/asis-2018-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multiprocessing
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="To develop tools for Ada software"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8
+	-> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2017 +gnat_2018 gnat_2019"
+
+RDEPEND="
+	gnat_2017? ( dev-ada/gnat_util[gnat_2017] )
+	gnat_2018? ( dev-ada/gnat_util[gnat_2018] )
+	gnat_2019? ( dev-ada/gnat_util[gnat_2019] )
+	|| (
+		dev-ada/gnatcoll-core[gnat_2017=,gnat_2018=,gnat_2019=,shared]
+		dev-ada/gnatcoll[gnat_2017=,gnat_2018=,gnat_2019=,projects,shared]
+	)"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2017=,gnat_2018=,gnat_2019=]"
+
+REQUIRED_USE="|| ( gnat_2017 gnat_2018 gnat_2019 )"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
+
+src_compile() {
+	emake PROCESSORS=$(makeopts_jobs) \
+		GPRBUILD_FLAGS="-vl"
+	emake tools PROCESSORS=$(makeopts_jobs) \
+		GPRBUILD_FLAGS="-vl \
+		-XGPR_BUILD=relocatable \
+		-XLIBRARY_TYPE=relocatable \
+		-XXMLADA_BUILD=relocatable"
+}
+
+src_install() {
+	emake prefix="${D}"/usr install
+	emake prefix="${D}"/usr install-tools \
+		GPRINSTALL="gprinstall \
+		-XGPR_BUILD=relocatable \
+		-XLIBRARY_TYPE=relocatable \
+		-XXMLADA_BUILD=relocatable"
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	mv "${D}"/usr/bin/gnatpp{,-asis} || die
+}
diff --git a/dev-ada/asis/metadata.xml b/dev-ada/asis/metadata.xml
index 416ad818fe85..eade29a824bd 100644
--- a/dev-ada/asis/metadata.xml
+++ b/dev-ada/asis/metadata.xml
@@ -9,6 +9,7 @@
 		<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="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 	</use>
 	<longdescription lang="en">
 		ASIS is a library that gives applications access to the complete
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index e055f055a7c3..924a77b9e327 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,6 +1,8 @@
 AUX aws-2016-gentoo.patch 1255 BLAKE2B a2b2d944a131d83b789fe91a1b31b062f039b2f6bafa870d524aefbdb59146a26ad5e7cc39222318aaa8ae9ccca663bead98e198aef845ce86d3195568a15d33 SHA512 53b4156f9c025969a8e2f603e1672949f7f2dd58a4c3d1a4ee8b17094a399bb207b6a242419ddd5e5a7e151ea3a72baee1c67f132aafb260ab5f89d8d12ad377
+AUX aws-2018-gentoo.patch 2097 BLAKE2B cbb0ed91c632292994efc2bec19d49b8ce62b0ccb04b052d201cf698c71c5adf0b699a9dab8df92f7a8787af1c7147b53ac620f4d98466bd04d3b05b8224d3ac SHA512 08bd51c90699e8d64acd1947c430ee2dd73c3fc82e754f8330be5a58525c0fce7953bc55e3d3a42078e717bc935db4b49bf3d73f154ff1e8695e1567644c8182
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
 DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
 EBUILD aws-2017.ebuild 1025 BLAKE2B f7b86bf4a470b5376061b4ce47263889f66d68cde383136312d979959d9c1f59e96d8367d242e44ec750bf6e006d7144f1fb337bbdcac6f95f2a42b82b3e0756 SHA512 23a477b56590afe16de4fc6707fc776daf431a0f576d002bbf0ab5305694b2d0f701bb5d4c85ca622bb4b13f3f3c7c7760820457688b5ee6bb78984558a68df5
+EBUILD aws-2018-r1.ebuild 1187 BLAKE2B d0da98e6202e6a4f6cd010bf6c7bd06ab98599dbc55ed14c9133493a34cf26fb9256e489b0e341dcb37271869b140d35d100826ce20efea3a2a8eb9f3476a19e SHA512 682f81e42ce05d2c651cd955fd23efcd565a3321caed4472f7a177ee0c72b920e2a103e252ead045d15f33530326cf15365cc13b24da491b5eb797ac4c6c9733
 EBUILD aws-2018.ebuild 1004 BLAKE2B 54fe0f8d215f2f4e48deecf0439fa38c9a6ea33691e12378e39722413f7615e6650af2e4f14aebe2003f242f2128c97013bb8b035d9ab088377a653f2b50ef25 SHA512 0f61677a688267efc153d69ba68f9e9f12140cc5883f955894c896dacc1b9a1b24c045a476250834e74de12476223fc98e393b7f25038bcb75bab9cd95c7f74d
-MISC metadata.xml 910 BLAKE2B 32c65b10f1286c68aaf8c4eb5d5078dca8b09a451ec02d1a845282124b71cac7363e8f068910fe6908befcf49d9e476f30f53b78bd66d6269cb7cb38f5d69597 SHA512 e3b9b10331c66b3e3ce4bb0b74a1c426656d33ffb37936a433fad3f7fc2e64de233c7d18158c5eea409d406ebe1edcf77135e7b490bec40387adc8b0928cad5a
+MISC metadata.xml 978 BLAKE2B 26ac96459fbd324806e5376c1a37ad537af66cc31452dcf5311a6e994e74daaf81aa67bd3dd045f29375f36af424a637e08312de03ff521ee7311911ab50c9d0 SHA512 100d9184d55d7187cf9e5d4f2923c9aefa1dede4b3edfa6a762a30449b5aa2551e94637e2372260bf3d67ea91a5fd64de9401645a0a318d7e91edb2b2ba7350e
diff --git a/dev-ada/aws/aws-2018-r1.ebuild b/dev-ada/aws/aws-2018-r1.ebuild
new file mode 100644
index 000000000000..14d971edcf9c
--- /dev/null
+++ b/dev-ada/aws/aws-2018-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multiprocessing
+
+MY_P=${PN}-gpl-${PV}-src
+
+DESCRIPTION="A complete Web development framework"
+HOMEPAGE="http://libre.adacore.com/tools/aws/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd
+	-> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019"
+
+RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=,gnat_2019(-)=]
+	dev-ada/xmlada[shared,static-libs]"
+DEPEND="${RDEPEND}
+	gnat_2016? ( dev-ada/asis[gnat_2016] )
+	gnat_2017? ( dev-ada/asis[gnat_2017] )
+	gnat_2018? ( dev-ada/asis[gnat_2018] )
+	gnat_2019? ( dev-ada/asis[gnat_2019] )
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=,gnat_2019(-)=]"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2016-gentoo.patch
+	"${FILESDIR}"/${PN}-2018-gentoo.patch
+)
+
+src_configure() {
+	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_compile() {
+	emake \
+		PROCESSORS=$(makeopts_jobs) \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/dev-ada/aws/files/aws-2018-gentoo.patch b/dev-ada/aws/files/aws-2018-gentoo.patch
new file mode 100644
index 000000000000..5c615d32dba0
--- /dev/null
+++ b/dev-ada/aws/files/aws-2018-gentoo.patch
@@ -0,0 +1,56 @@
+--- a/config/src/aws-net-std__gnat.adb	2019-05-31 19:03:42.565961279 +0200
++++ b/config/src/aws-net-std__gnat.adb	2019-05-31 19:05:23.895245892 +0200
+@@ -132,7 +132,7 @@
+ 
+       if Reuse_Address then
+          Sockets.Set_Socket_Option
+-           (Socket.S.FD, Option => (Sockets.Reuse_Address, Enabled => True));
++           (Socket.S.FD, Sockets.Socket_Level, (Sockets.Reuse_Address, Enabled => True));
+       end if;
+ 
+       Sockets.Bind_Socket
+@@ -263,7 +263,7 @@
+       package SC renames OS_Lib;
+ 
+       Option : constant Option_Type :=
+-                 Get_Socket_Option (Socket.S.FD, Name => Error);
++                 Get_Socket_Option (Socket.S.FD, Socket_Level, Error);
+    begin
+       case Option.Error is
+          when Success                                       =>
+@@ -439,7 +439,7 @@
+    is
+       use Sockets;
+    begin
+-      return Get_Socket_Option (Socket.S.FD, Name => Receive_Buffer).Size;
++      return Get_Socket_Option (Socket.S.FD, Socket_Level, Receive_Buffer).Size;
+    exception
+       when E : Sockets.Socket_Error =>
+          Raise_Exception (E, "Get_Receive_Buffer_Size", Socket);
+@@ -454,7 +454,7 @@
+    is
+       use Sockets;
+    begin
+-      return Get_Socket_Option (Socket.S.FD, Name => Send_Buffer).Size;
++      return Get_Socket_Option (Socket.S.FD, Socket_Level, Send_Buffer).Size;
+    exception
+       when E : Sockets.Socket_Error =>
+          Raise_Exception (E, "Get_Send_Buffer_Size", Socket);
+@@ -709,7 +709,7 @@
+    is
+       use Sockets;
+    begin
+-      Set_Socket_Option (Socket.S.FD, Option => (Receive_Buffer, Size));
++      Set_Socket_Option (Socket.S.FD, Socket_Level, (Receive_Buffer, Size));
+    exception
+       when E : Sockets.Socket_Error =>
+          Raise_Exception (E, "Set_Receive_Buffer_Size", Socket);
+@@ -725,7 +725,7 @@
+    is
+       use Sockets;
+    begin
+-      Set_Socket_Option (Socket.S.FD, Option => (Send_Buffer, Size));
++      Set_Socket_Option (Socket.S.FD, Socket_Level, (Send_Buffer, Size));
+    exception
+       when E : Sockets.Socket_Error =>
+          Raise_Exception (E, "Set_Send_Buffer_Size", Socket);
diff --git a/dev-ada/aws/metadata.xml b/dev-ada/aws/metadata.xml
index d2da63463732..7384a3dfb57e 100644
--- a/dev-ada/aws/metadata.xml
+++ b/dev-ada/aws/metadata.xml
@@ -9,6 +9,7 @@
 		<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="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 	</use>
 	<longdescription lang="en">
 		AWS is a complete framework to develop Web based applications. The main part
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index 74a2a70a53a9..e0a7ff904dc7 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -2,5 +2,6 @@ AUX gnat_util-2017-gentoo.patch 2419 BLAKE2B e8085e6a6cb65c5ffe6054aa360e90042a0
 DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
 DIST gnat_util-gpl-2018-src.tar.gz 883945 BLAKE2B e30ee379f4ea9525337b0794d4fc91c80458b3b1dd3d10cbc455c6f566d4d073b6753c171ffbbabd85995717de249cdee7c094b7ba00d752a13e18d0f54da192 SHA512 490b0fa944f4b9fee2a4e78c1181658eb8f95262314455c41beb3ebe9db5dd540090d1f9840357572969721966fa11085dc680f3498dc539631ef3f4dbf56426
 EBUILD gnat_util-2017.ebuild 1422 BLAKE2B b69c22ede488f993d0efeb7e66846c33f20f15e10b5344ff02252fb6d037910fc4bc24fd0421a08504164796bc50481bae6109e2d3ebd21a4425ff6d969fc918 SHA512 d3a1ebb59b8a31162349bc40027f5cb36f8e7ed4de8190fc336f4ad930792b8263bd0c47909d909245c348823a57d05bfe26fabce0938c4e292c7b7f70154cd4
+EBUILD gnat_util-2018-r1.ebuild 1436 BLAKE2B 4a97460a25fdb8bfcac1eb0783a3fc9111aae0636f01a966a0c58c1298244f23eae1345d56ff72d4b3b6d03ce97e6890b70393d00f00a6347d5ad69e5a9ab652 SHA512 ffcb270b491efdfd0a6cbeb9a3d1c9a3ec1d3c8d7d5b7f3eab9da404789f570611cac0861b77933f67fe2977d9fec5672aea8293d11b66e361650d6f0a2ec6bd
 EBUILD gnat_util-2018.ebuild 1326 BLAKE2B 336432396b5b98f7d59704f30a7063873651c296eb8a63700025c5c37cda497baf1caac3d4097ed95b99cfb1aee9e8402a1e75293560b7db1e12bb40b1a5aaf6 SHA512 8014d612eb4e2fcd1599aa6262f6afc131ca5dea70b40f096aa22c95a94bcb0ecc38a94c705254085b84c56e89fb21a034f082a5606885f58231dfe37738b247
-MISC metadata.xml 1157 BLAKE2B e747ed9b4c63bd802debbc784ca3aed291382259989a1ca3c5622a8058e407df3133d05635ba7442038dd78d5627bb37a9f16af278aa9bb490244884532a00c2 SHA512 b7dad53debfedd16f6192d7632557b4a65580bae8a47bef0d6138958b91ac329c96e629713c3274707a70846f332834081755fbb77c12842e75da966a39ec6ad
+MISC metadata.xml 1225 BLAKE2B 17a8dad6ea3eea9f628c65dc437f24f8558b4758cafd4b9b3683ed324afb42d59f082555100388ad8453c0223c1f1a0cbf54df1542a2f3fa8f326989a8591f01 SHA512 f629c1dd7e93c217995923542db690399ba3f2a25774d08cc8e3d9f62fb25d65ec939a80f31a3793fa729ecfe48a357da436d95a94608e2480a92b029661c806
diff --git a/dev-ada/gnat_util/gnat_util-2018-r1.ebuild b/dev-ada/gnat_util/gnat_util-2018-r1.ebuild
new file mode 100644
index 000000000000..48e3c1768608
--- /dev/null
+++ b/dev-ada/gnat_util/gnat_util-2018-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6b
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gnat_2018 gnat_2019 +shared static-libs static-pic"
+
+RDEPEND="gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
+	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2018(-)?,gnat_2019(-)?]"
+REQUIRED_USE="^^ ( gnat_2018 gnat_2019 )"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
+
+src_compile() {
+	if use gnat_2018; then
+		GCC_PV=7.3.1
+	else
+		GCC_PV=8.3.1
+	fi
+	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
+	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
+		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
+	if use static-libs; then
+		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
+	fi
+	for kind in shared static-pic; do
+		if use ${kind}; then
+			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
+				build-${kind}
+		fi
+	done
+}
+
+src_install() {
+	if use static-libs; then
+		emake prefix="${D}"/usr install-static
+	fi
+	for kind in shared static-pic; do
+		if use ${kind}; then
+			emake prefix="${D}"/usr install-${kind}
+		fi
+	done
+	einstalldocs
+}
diff --git a/dev-ada/gnat_util/metadata.xml b/dev-ada/gnat_util/metadata.xml
index fb8adc913f1c..be52463254cc 100644
--- a/dev-ada/gnat_util/metadata.xml
+++ b/dev-ada/gnat_util/metadata.xml
@@ -9,6 +9,7 @@
 		<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="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build gnat_util shared library</flag>
 		<flag name="static-pic">Build gnat_util static library with pic code</flag>
 	</use>
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 23c48f2c62dc..3a91f83257be 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,3 +1,4 @@
 DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295
+EBUILD gnatcoll-bindings-2018-r1.ebuild 2176 BLAKE2B 72cb896359627f2e9e2f129f7160ce7f0f8728a7594ea78661f7d0432420d9e262d4268b1cbce8ff3064f6dbc311622f43bc4c0f5b33f38edddf2f8bd1a63887 SHA512 a53aa84d5846aa308e624afbd06a5966750bd4ece2a1efa648628d460f1923fc3a2e1e8aa2d4a5bd41f462ca5a8c5f7c0efd818dc8874b6e790c855d3d280fda
 EBUILD gnatcoll-bindings-2018.ebuild 2142 BLAKE2B 8ee5521ae2b74c65a8adff85ae19459c5dfb993184c436d05813236cc8c2bad0b7df87f46e9c1c7efb614020d51cae95f717d0be60fab88229cbfe65d9dc88e9 SHA512 16a17b64f31fbb362c58325efa18da979193befbc642270b240e0b6b36bfe243c1aef67e3b91efba097cb55097ee0b1dadc61bf8faf153d5431a6ceff1d22118
-MISC metadata.xml 1317 BLAKE2B 99ea5cb11a8d16c2cde5c902f68f515b2a337d2753453405f2747c72e1d15ba597991ed2bc8d842d1ff127be653d9e59c9e18eec8e034bd5a3bb3726a8ed35a2 SHA512 833bd43bb77645561af5df8ebe904e1b2354ca4be7915aa0fdbe6f6986b116cb8850d91d36bfb1bfd520e037ce93eb206b86488939840e2f64e714f5c1daa083
+MISC metadata.xml 1385 BLAKE2B 4c67538a9b8292aa6db271d52fe30461523040a100c44b5f7c0f9450d32691796640613b6275e2d11ba2d95c913e7beb85027beadf1854ff10d211c4e3fec9ba SHA512 23592d21bac06f63bac379a582f6f58b32a1a4477d6f4b5a4cc801417c1f34a74cc7a3ef42d13b682741ccb6dbc4718d8c933f773f410184166e462c925c1490
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
new file mode 100644
index 000000000000..dcebe0e138eb
--- /dev/null
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib multiprocessing python-single-r1
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gmp iconv python readline +shared
+	static-libs static-pic syslog"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
+	gmp? ( dev-libs/gmp:* )"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}"/${MYP}-src
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
+			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
+			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in gmp iconv python readline syslog ; do
+				if use $dir; then
+					build $dir $lib
+				fi
+			done
+		fi
+	done
+}
+
+src_install() {
+	build () {
+		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in gmp iconv python readline syslog ; do
+				if use $dir; then
+					build $dir $lib
+				fi
+			done
+		fi
+	done
+	if use iconv; then
+		sed -i \
+			-e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
+			"${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
+			|| die
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-bindings/metadata.xml b/dev-ada/gnatcoll-bindings/metadata.xml
index 2c51f48ee668..ec2b20f2032a 100644
--- a/dev-ada/gnatcoll-bindings/metadata.xml
+++ b/dev-ada/gnatcoll-bindings/metadata.xml
@@ -9,6 +9,7 @@
 		<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="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build shared library</flag>
 	</use>
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 8cb80024c715..6822a60bdbae 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,4 +1,5 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
 DIST gnatcoll-core-gpl-2018-src.tar.gz 1657129 BLAKE2B 616aef931fb542f4a022c63db53acb0f8b4323e3b948eb7b8b5688c36817b3f52b5f517b969b0560b6492d51a3e59c8350449cbbe7246b5294c45caeead4d9d6 SHA512 bf6082573dc537836ea8506a2c9a75dc7837440c35c5b02a52add52e38290d99e90a9706690591f8899b8b4935824b195f230b3aa1c4da10911e3caf954c04ac
+EBUILD gnatcoll-core-2018-r1.ebuild 1732 BLAKE2B b46a3422419a8b7c78fc1c8c42b01798a481b1d359f7b89c02fdc5640dbd6b93f2ff0c0287c52a195449f5a6dc0f24873683bc84681bdabf5a5949325597f98f SHA512 c79ca25354e6be4afb1c870d05e1a862f0a3debb9109828c5e6929dd16e2debafe27fa27277c0318cf3afc67911cd8b4339c7a6a02cbdb9bc1f65db0dfb6360d
 EBUILD gnatcoll-core-2018.ebuild 1657 BLAKE2B 65f2a5a2f354b4582607e90d278099cdc17f9dfa416639e39c095f991b531d01c45256d059b30a9f26c41393c52f6f84d9e91cf8e073b3f6d314f7585334bc1f SHA512 17303963480f1335c29d4af93e2038f128a676a2a62ced9a77cf4434892b1bc94356992f55af24f3dee18f4cc9f5b65c10a799298bcee691a1d84a891cf46881
-MISC metadata.xml 1331 BLAKE2B 0227dacfedf39550b497596c95191f5c8524b9aaaaa19dbab296f4e34fe3ff3ea32f4f92a40c16194204661229986ad90a527131d4bb97decf1b6bd59b911884 SHA512 008d3836de7baa71b8d3655e3e7834d68a7ec304345bfda8a715416e46fa5255185336f84f6b75dbf7a85d24afebd0fdb85131b52ce7c655635e09b42bc1907e
+MISC metadata.xml 1399 BLAKE2B 087446f8961a357f11c578ab00a3971bab55bc58b4d959b701377461db3ca764701801a3cca7ec09539b8e603b384ca1f394890d92e7fff6e19ce07878bb6006 SHA512 7ab75b65bf39980464d60f8103c2ca2357b0d392981af771eac547ca4d01bd9f12df71394cba9aa71435457f827c4b77b3d1b3d14679ef2e654159401b755e77
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
new file mode 100644
index 000000000000..5aee1f706e90
--- /dev/null
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="GNAT Component Collection Core packages"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic"
+
+RDEPEND="
+	dev-ada/libgpr[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+	dev-ada/libgpr[shared?,static-libs?,static-pic?]
+	!dev-ada/gnatcoll"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	elif use gnat_2017; then
+		GCC_PV=6.3.0
+	elif use gnat_2018; then
+		GCC_PV=7.3.1
+	else
+		GCC_PV=8.3.1
+	fi
+	default
+	sed -i \
+		-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
+		src/gnatcoll-projects.ads \
+		|| die
+}
+
+src_configure() {
+	emake prefix="${D}usr" PROCESSORS=$(makeopts_jobs) setup
+}
+
+src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) \
+			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
+			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	if use static-libs; then
+		build static
+	fi
+}
+
+src_install() {
+	if use shared; then
+		emake install-relocatable
+	fi
+	if use static-pic; then
+		emake install-static-pic
+	fi
+	if use static-libs; then
+		emake install-static
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-core/metadata.xml b/dev-ada/gnatcoll-core/metadata.xml
index 294071cbcd12..5065682aa1e5 100644
--- a/dev-ada/gnatcoll-core/metadata.xml
+++ b/dev-ada/gnatcoll-core/metadata.xml
@@ -9,6 +9,7 @@
 		<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="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2018</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index fb72a19daba7..5ebaa4ede88f 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,4 +1,5 @@
 AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7
 DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de
+EBUILD gnatcoll-db-2018-r1.ebuild 2678 BLAKE2B fb771dd4bcefbaf7facb102bc5580b7e2eb048a07a52e258ad4955b7b51415901e3c0141e65f64c14ef67daf29dfa354e4c2fb20bdb102cfe767e435dce2cc76 SHA512 916494ae81f97370432aadf5bf5c3d38e257ae3d436cad85280940e72aaa84bd1d04b276bf9eab8868a6d09b92c5ea948016058efc7956641fdbad32fbcc46ea
 EBUILD gnatcoll-db-2018.ebuild 2633 BLAKE2B 87dd5f392ab6986ba13268ca70c7c873486471c9dd4e62f8160666a149a386249693506c244b02b455f47f033c28325da27c7ca893ca93a7cae4a39a1fa9e8d8 SHA512 5e0885514dc75800d83b444f53d5487b1c0ea3faf04581335f876cd64b2631ba541f76fc5bb1b704190f20c13ba9421e0bd7ac7d0e336654de3e3f16f7de2280
-MISC metadata.xml 1519 BLAKE2B 93aa938ca272fb984d08a0471ff339204d0afc854f9fddc4c1f0e060650263c36166e1de91453bdfd52bc0d53844c7042c6f5b14d955b72ab042e6dffadaf4f4 SHA512 27cf0aa52080186fd7970dc02f31eb861ee20edc08366926ea29ec0a826d10c92d80eea840a403fe9be1ccf0be33aaf866f94fe66d351926ffb30104ce143e88
+MISC metadata.xml 1587 BLAKE2B 93b843e3b7074661abbb461a9be802ddef765688c4301241669a39546892e22370fa1dbc7d1e91d4235f81bc56affe979f34be720e9bd7c7bc2c228a97851540 SHA512 9a5c5a683005bb02decec2445e5af02569762931fca5e258e0152410e4e1d702f22321dffb0ca01dbfd4c1579a07513bc4eded7cb2f5db3f9643efb2388dca8c
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
new file mode 100644
index 000000000000..98215d07880b
--- /dev/null
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit multilib multiprocessing autotools python-single-r1
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gnatcoll_db2ada gnatinspect postgres
+	+shared sql sqlite static-libs static-pic xref"
+
+RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
+	sqlite? ( dev-db/sqlite:3 )
+	postgres? ( dev-db/postgresql:* )
+	xref? (
+		dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?]
+		dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+	)"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]"
+
+REQUIRED_USE="gnatinspect? ( xref )
+	xref? ( sqlite )
+	sqlite? ( sql )
+	gnatcoll_db2ada? ( sql )"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_compile() {
+	build () {
+		GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
+			gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
+			-XGNATCOLL_VERSION=2018 \
+			-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \
+			-P $1/$3.gpr \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in sql sqlite xref postgres ; do
+				if use $dir; then
+					build $dir $lib gnatcoll_${dir}
+				fi
+			done
+		fi
+	done
+	if use shared; then
+		preflib=relocatable
+	elif use static-libs; then
+		preflib=static
+	else
+		preflib=static-pic
+	fi
+	for dir in gnatinspect gnatcoll_db2ada ; do
+		if use $dir; then
+			build $dir $lib ${dir}
+		fi
+	done
+}
+
+src_install() {
+	build () {
+		GPR_PROJECT_PATH="${D}/usr/share/gpr" gprinstall -p -f \
+			-XBUILD=PROD -XGNATCOLL_VERSION=2018 \
+			--prefix="${D}"/usr -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 \
+			-XGPR_BUILD=$2 --build-name=$2 --build-var=LIBRARY_TYPE \
+			-P $1/$3.gpr
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in sql sqlite xref postgres ; do
+				if use $dir; then
+					build $dir $lib gnatcoll_${dir}
+				fi
+			done
+		fi
+	done
+	for dir in gnatinspect gnatcoll_db2ada ; do
+		if use $dir; then
+			build $dir $lib ${dir}
+		fi
+	done
+	rm -rf "${D}"/usr/share/gpr/manifests
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-db/metadata.xml b/dev-ada/gnatcoll-db/metadata.xml
index 4a18c9113ff2..9695cab8d5bc 100644
--- a/dev-ada/gnatcoll-db/metadata.xml
+++ b/dev-ada/gnatcoll-db/metadata.xml
@@ -9,6 +9,7 @@
 		<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="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="gnatcoll_db2ada">Build gnatcoll_db2ada</flag>
 		<flag name="gnatinspect">Build gnatinspect</flag>
 		<flag name="shared">Build shared library</flag>
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index c30ae6cb2416..ff2febd3910c 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,10 +1,15 @@
 AUX gprbuild-2017-config.patch 5738 BLAKE2B 6089d8aa9fc3654958e46eac7ed22f887dc7017c670df53d4aaec37d937bfea866f99ba1232d3f3c55532b0c4754bed4db074850c1160308eddd3223d4d2c921 SHA512 45fd4b1cf4bf94f333350a4d3b3cdd0efd673f4eb32e8b0c837d8cf08aa87bda2b57749c230785f53807f48fcad67331c82ce1857fffbcb4af395d26a5d8f886
 AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66
 AUX gprbuild-2018-gentoo.patch 11203 BLAKE2B 0dc7c1e7bfc4d3864c3e200ebb1e5f4f7f920fa1939cd940f67d72cd0bf9044f0bdf09a51e492f133be1ba3ffa50816531d7038ed60c8d757fb3d60f12da268b SHA512 56c439a97109e805dea79ed624cb8687327170351e760078acc4506f02af7374fe1e51aad57150a8960ee7d904f496e0e4583543f5cbcfce2ba3677600b01ead
+AUX gprbuild-2019-gentoo.patch 11240 BLAKE2B 609968e7d95bb686db4362c06600a90cd9d9cde1c4058618ed40fd90585153b02316369dc3a439b84f3c8e1031d182ed3f739b449ed8e09761e90e2b80d73a4c SHA512 f48ed180ecfd8cb6691473e1f996f1805dcae693a0e2710fdfd0c246443cbe732ccc6dbb415c90396886b0b79d8aac22e3c7b720ca4f6da746e22485972aace5
+DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
+DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
 EBUILD gprbuild-2017-r1.ebuild 2207 BLAKE2B 50a99fa4729a7cb8a9689fa23b6f764be7077094101aa7dbe7452002b7b0c5602dbd82924ef1a6252ce6c973ec5f1ed687ef1d773b43ada1d0a5c707c97d564c SHA512 0c0d40bcd506f86da9e9b1e2d1d57163de5e3dc12095e6566251a673ddc236e099460a83be1a47e2b103d30474c168240257a442ebc5f727633fa6608e105b7b
 EBUILD gprbuild-2018-r3.ebuild 2115 BLAKE2B 6a30d38af19eb3c18bcacae6aa3bdd6e4315102c5f0c3591df90f31e51fa954c654c975c527b8b93d5190851fda8d50cd894050f36cacd351fc707d06dfbf20c SHA512 91dab25795db0e5acfa4d3a1ce9d3653d94726ad9a8f733437b2ea23cda9db17af81c998fa8b70e5ad8d5abb14f15f59aaf9aaf6f4640b11a471b14a5e0b2099
-MISC metadata.xml 1057 BLAKE2B 5f0e5e778d450e3f0d37ad489e0be03f69bdcd35e60d1555468ba69608268d7ff0bbffece8b36cac58a84a5739f381a449fe9684f7d5540ff8817ea5ac2b8562 SHA512 753f7ba070723fb9ae26bdb8580d72656d115c7f5515fc11fe4933a216bd0e0734a0a410bd14011a2cff0cc791a93b132d2bddfe889aea372d955c38dd91e650
+EBUILD gprbuild-2018-r4.ebuild 2218 BLAKE2B d5fa3a5a331aa64863907e3f20b581f7849dfb9b39e437bb4b37623c987c1ba89326f2b2bad000e7cca887c8f25ee39a1bd0024988d9eec8d4ca9975b5443129 SHA512 e6bbbd20754a90acce55c8f8145e8867491cd0208a0fe19d22e6fdd357a2e17dad9e4cc912d82aa263791cd6cc12c608531f8f72b2d386d35c22fe52dace903a
+EBUILD gprbuild-2019.ebuild 2235 BLAKE2B 8ad3da8f3d75130c32b061b20767eb2c69104e7f0e0ed5fd3cce1e559da8b4027894866341559c6e0c5dbb157bcb30e2681e32a980e110b3aadcaa6ba297cc55 SHA512 f0cf271cc42876b71a82763228e877ff74f5a97ae460366abc94a885ba220245c7743ba9c454007e5a467b740d061d61a24b1e2ad6d4c0445777c9ece579902c
+MISC metadata.xml 1125 BLAKE2B eb8158df946472627b36cf599bcb82e0784667b167be320007d1ebeabdd0fc5d286ba0bf9ae0560fd74b938aa10c8e807471ba4d1a1334e0d56432c195a9c23d SHA512 2975617f346492a42da5085de24ac8243ea8360a1c2dce200c1438ce4d33e9ee60ee0101b01df1cdfcb02a59b306bba5f954ae60c2fc82c991e0592671323181
diff --git a/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch
new file mode 100644
index 000000000000..352ff033b81b
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch
@@ -0,0 +1,274 @@
+--- a/src/gprlib.adb	2019-06-02 10:57:49.807002425 +0200
++++ b/src/gprlib.adb	2019-06-02 11:01:32.986518447 +0200
+@@ -266,7 +266,9 @@
+ 
+    Driver_Name                   : Name_Id := No_Name;
+ 
+-   Gnatbind_Name                 : String_Access := new String'("gnatbind");
++   Gnatbind_Name                 : String_Access := new String'("@GNATBIND@");
++
++   Gnatbind_Path_Option          : constant String := "--gnatbind_path=";
+ 
+    Compiler_Name                 : String_Access := new String'("gcc");
+ 
+@@ -2081,7 +2083,7 @@
+                           and then Line (Last - 2 .. Last) = "gcc"
+                         then
+                            Gnatbind_Name :=
+-                             new String'(Line (1 .. Last - 3) & "gnatbind");
++                             new String'(Line (1 .. Last - 3) & "@GNATBIND@");
+                            Objcopy_Name :=
+                              new String'(Line (1 .. Last - 3) & "objcopy");
+ 
+@@ -2089,7 +2091,7 @@
+                           and then Line (Last - 6 .. Last) = "gcc.exe"
+                         then
+                            Gnatbind_Name :=
+-                             new String'(Line (1 .. Last - 7) & "gnatbind");
++                             new String'(Line (1 .. Last - 7) & "@GNATBIND@");
+                            Objcopy_Name :=
+                              new String'(Line (1 .. Last - 7) & "objcopy");
+                         end if;
+@@ -2241,7 +2243,13 @@
+                Mapping_File_Name := new String'(Line (1 .. Last));
+ 
+             when Binding_Options =>
+-               Binding_Options_Table.Append (Line (1 .. Last));
++               if Last > Gnatbind_Path_Option'Length
++                  and then Line (1 .. Gnatbind_Path_Option'Length) =
++                     Gnatbind_Path_Option then
++                     null;
++               else
++                  Binding_Options_Table.Append (Line (1 .. Last));
++               end if;
+ 
+             when Copy_Source_Dir =>
+                Copy_Source_Directory := new String'(Line (1 .. Last));
+--- a/share/gprconfig/compilers.xml	2019-06-01 21:29:57.611722804 +0200
++++ b/share/gprconfig/compilers.xml	2019-06-01 21:42:56.000608601 +0200
+@@ -20,15 +20,15 @@
+   <!--    GCC 3.x & 4.x (not for GNAT Pro)-->
+   <compiler_description>
+     <name>GCC</name>
+-    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
++    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@</executable>
+     <version>
+-      <external>${PREFIX}gcc -v</external>
++      <external>${PREFIX}gcc-@VER@ -v</external>
+       <nogrep regexp="for GNAT Pro"></nogrep>
+       <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
+     </version>
+     <languages>C</languages>
+     <target>
+-      <external>${PREFIX}gcc -dumpmachine</external>
++      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
+       <grep regexp="[^\r\n]+"></grep>
+     </target>
+   </compiler_description>
+@@ -170,14 +170,14 @@
+    -->
+   <compiler_description>
+     <name>GNAT</name>
+-    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls</executable>
++    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls-@VER@</executable>
+     <version>
+-      <external>${PREFIX}gnatls -v --version</external>
++      <external>${PREFIX}gnatls-@VER@ -v --version</external>
+       <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+     </version>
+     <languages>Ada</languages>
+     <variable name="gcc_version">
+-      <external>${PREFIX}gcc -v</external>
++      <external>${PREFIX}gcc-@VER@ -v</external>
+       <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+     </variable>
+     <runtimes default="default,kernel,native">
+@@ -187,67 +187,11 @@
+        <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
+     </runtimes>
+     <target>
+-      <external>${PREFIX}gcc -dumpmachine</external>
++      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
+       <grep regexp="[^\r\n]+"></grep>
+     </target>
+   </compiler_description>
+ 
+-  <!--  CodePeer -->
+-
+-  <compiler_description>
+-    <name>GNAT_CODEPEER</name>
+-    <executable prefix="1">(.*gnsa-|.*codepeer-)gnatls</executable>
+-    <version>
+-      <external>${PREFIX}gnatls -v</external>
+-      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+-    </version>
+-    <languages>Ada,C,C++</languages>
+-    <variable name="gcc_version">
+-      <external>${PREFIX}gcc -v</external>
+-      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+-    </variable>
+-    <runtimes default="default,native">
+-       <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory>
+-       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
+-       <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
+-    </runtimes>
+-    <target>codepeer</target>
+-  </compiler_description>
+-
+-  <!--  Generic GNAT LLVM Target -->
+-
+-  <compiler_description>
+-    <name>GNAT_LLVM</name>
+-    <executable prefix="1">(llvm-)gnatls</executable>
+-    <version>
+-      <external>${PREFIX}gnatls -v</external>
+-      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+-    </version>
+-    <languages>Ada</languages>
+-    <variable name="gcc_version">
+-      <external>${PREFIX}gcc -v</external>
+-      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+-    </variable>
+-    <runtimes default="default,native">
+-       <directory group="default" >\.\./lib/rts-native/adalib/</directory>
+-    </runtimes>
+-    <target>llvm</target>
+-  </compiler_description>
+-
+-  <!--  Generic C compiler for LLVM  -->
+-  <compiler_description>
+-    <name>C_LLVM</name>
+-    <executable>clang</executable>
+-    <version>
+-      <external>clang --version</external>
+-
+-      <!--  'clang version 6.0.0 ...'  -->
+-      <grep regexp="^clang version (\S+) " group="1"></grep>
+-    </version>
+-    <languages>C</languages>
+-    <target>llvm</target>
+-  </compiler_description>
+-
+   <!--  Generic C++ compiler for LLVM  -->
+   <compiler_description>
+     <name>C++_LLVM</name>
+@@ -262,45 +206,6 @@
+     <target>llvm</target>
+   </compiler_description>
+ 
+-  <!--  C Target -->
+-
+-  <compiler_description>
+-    <name>GNAT_C</name>
+-    <executable prefix="1">(c-)gnatls</executable>
+-    <version>
+-      <external>${PREFIX}gnatls -v</external>
+-      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+-    </version>
+-    <languages>Ada</languages>
+-    <variable name="gcc_version">
+-      <external>${PREFIX}gcc -v</external>
+-      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+-    </variable>
+-    <runtimes default="default,ccg">
+-       <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory>
+-       <directory group="1" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
+-       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
+-    </runtimes>
+-    <target>c</target>
+-  </compiler_description>
+-
+-  <!--  GNAT_DOTNET -->
+-
+-  <compiler_description>
+-    <name>GNAT_DOTNET</name>
+-    <executable prefix="1">(.*dotnet-)gnatls</executable>
+-    <version>
+-      <external>${PREFIX}gnatls -v</external>
+-      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+-    </version>
+-    <languages>Ada</languages>
+-    <runtimes default="default,kernel">
+-       <directory group="default" >\.\./lib/dotgnat/adalib/</directory>
+-       <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory>
+-    </runtimes>
+-    <target>dotnet</target>
+-  </compiler_description>
+-
+   <!--    G77  -->
+   <compiler_description>
+     <name>G77</name>
+@@ -404,21 +309,6 @@
+     </target>
+   </compiler_description>
+ 
+-  <!-- LLVM Compiler -->
+-  <compiler_description>
+-    <name>LLVM</name>
+-    <executable>clang</executable>
+-    <version>
+-      <external>clang -v</external>
+-      <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
+-    </version>
+-    <languages>C,C++</languages>
+-    <target>
+-      <external>clang -dumpmachine</external>
+-      <grep regexp="[^\r\n]+"></grep>
+-    </target>
+-  </compiler_description>
+-
+   <!--  Windres compiler -->
+   <compiler_description>
+     <name>WINDRES</name>
+--- a/share/gprconfig/gnat.xml	2019-06-01 21:53:53.383281607 +0200
++++ b/share/gprconfig/gnat.xml	2019-06-01 21:57:08.414196529 +0200
+@@ -60,7 +60,7 @@
+    &filter_gnat;
+    <config>
+    package Compiler is
+-      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
++      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
+       for Language_Kind            ("Ada") use "unit_based";
+       for Dependency_Kind          ("Ada") use "ALI_File";
+       for Leading_Required_Switches        ("Ada") use
+@@ -77,6 +77,9 @@
+       for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
+       for Driver         ("Ada") use
+           "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
++      for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
++      for Required_Switches ("Ada") use
++        Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
+    end Binder;
+ 
+    for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
+--- a/share/gprconfig/c.xml	2019-06-01 21:57:36.244755708 +0200
++++ b/share/gprconfig/c.xml	2019-06-01 21:59:14.919191663 +0200
+@@ -14,7 +14,7 @@
+      </compilers>
+      <config>
+    package Compiler is
+-      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc";
++      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
+    end Compiler;
+      </config>
+    </configuration>
+--- a/share/gprconfig/linker.xml	2019-06-01 21:59:34.546880368 +0200
++++ b/share/gprconfig/linker.xml	2019-06-01 22:00:50.906668730 +0200
+@@ -1015,7 +1015,7 @@
+     </targets>
+     <config>
+    for Library_Partial_Linker use
+-         ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o");
++         ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
+     </config>
+   </configuration>
+ 
+@@ -1034,7 +1034,7 @@
+     </targets>
+     <config>
+    for Library_Partial_Linker use
+-         ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
++         ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
+     </config>
+   </configuration>
+ 
diff --git a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild
new file mode 100644
index 000000000000..2b14a7c3d2a9
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
+		-> ${MYP}-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40
+		-> xmlada-gpl-${PV}-src.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019"
+
+DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
+	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}-src
+
+REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )"
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	if use gnat_2017; then
+		GCC_PV=6.3.0
+	elif use gnat_2018; then
+		GCC_PV=7.3.1
+	else
+		GCC_PV=8.3.1
+	fi
+	default
+	sed -i \
+		-e "s:@VER@:${GCC_PV}:g" \
+		share/gprconfig/compilers.xml \
+		share/gprconfig/gnat.xml \
+		share/gprconfig/c.xml \
+		share/gprconfig/linker.xml \
+		|| die
+	sed -i \
+		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
+		src/gprlib.adb \
+		|| die
+}
+
+src_configure() {
+	emake prefix="${D}"usr setup
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+	GCC=${CHOST}-gcc-${GCC_PV}
+	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
+	local xmlada_src="../xmlada-gpl-${PV}-src"
+	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+			-largs gpr_imports.o || die
+	done
+}
+
+src_install() {
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gprconfig
+	doins share/gprconfig/*
+	insinto /usr/share/gpr
+	doins share/_default.gpr
+	einstalldocs
+}
diff --git a/dev-ada/gprbuild/gprbuild-2019.ebuild b/dev-ada/gprbuild/gprbuild-2019.ebuild
new file mode 100644
index 000000000000..7afdf9a67bf6
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-2019.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multiprocessing
+
+MYP=${P}-20190517-194D8-src
+XMLADA=xmlada-${PV}-20190429-19B9D-src
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="
+	http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093
+		-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5
+		-> ${XMLADA}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019"
+
+DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
+	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )"
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	if use gnat_2017; then
+		GCC_PV=6.3.0
+	elif use gnat_2018; then
+		GCC_PV=7.3.1
+	else
+		GCC_PV=8.3.1
+	fi
+	default
+	sed -i \
+		-e "s:@VER@:${GCC_PV}:g" \
+		share/gprconfig/compilers.xml \
+		share/gprconfig/gnat.xml \
+		share/gprconfig/c.xml \
+		share/gprconfig/linker.xml \
+		|| die
+	sed -i \
+		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
+		src/gprlib.adb \
+		|| die
+}
+
+src_configure() {
+	emake prefix="${D}"usr setup
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+	GCC=${CHOST}-gcc-${GCC_PV}
+	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
+	local xmlada_src="../${XMLADA}"
+	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+			-largs gpr_imports.o || die
+	done
+}
+
+src_install() {
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gprconfig
+	doins share/gprconfig/*
+	insinto /usr/share/gpr
+	doins share/_default.gpr
+	einstalldocs
+}
diff --git a/dev-ada/gprbuild/metadata.xml b/dev-ada/gprbuild/metadata.xml
index 5a1bc58bccd3..655a849b520f 100644
--- a/dev-ada/gprbuild/metadata.xml
+++ b/dev-ada/gprbuild/metadata.xml
@@ -9,6 +9,7 @@
 		<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="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 	</use>
 	<longdescription lang="en">
 		GPRbuild is an advanced software tool designed to help automate the
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 60e949d5f3d9..383bcc2e3dad 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -2,5 +2,6 @@ AUX gtkada-2017-gentoo.patch 2270 BLAKE2B 54b7f2258ce0073b79f56a3c0c379123622e7d
 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
 DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762
 EBUILD gtkada-2017.ebuild 1291 BLAKE2B 4f26d0c4c40df64522c77df6acf75175f22cf0aef8e8e3213d663e3bb4c4b7ebff538540b7bbdb212d0ecce2e60f7d7d463f3178a1df44059ce7a2ef22fe8936 SHA512 433a5ce57cf39a012f17756d8843933910e51ad3b1641360e7dd28e0f871399a57f3ec0376e7ae7c69491f2e4712aad23c71c7fabd2ce507c9c5a79c247daabc
+EBUILD gtkada-2018-r1.ebuild 1528 BLAKE2B 80bd791d0dfe9d660730d416715c8b1a3ce58c538bfd3174a8184e308a08b366b24518f3cde15cb7c945601b4a08ee212291465e41e91f37084472df0bad92cb SHA512 0d98424fc275821ad887d45fbcc546805574956c2e95b126c5b27af8762bcde267606686f687612d6d7f747c6c6a082ce234553bdc91ed41b79b6f02d744365d
 EBUILD gtkada-2018.ebuild 1412 BLAKE2B 60234e0a79c8b865d0adeefe8089de9b2e480b89cd2513c0ff53107202eb7a164350ed182bb6b36e269ec6a946d87d94cbf43cc26a0519de2b94c06e43312d05 SHA512 1c0739006fabdfc1b587eb6db5c55f3de8036db2b6aeb844c14b485b9b7321c90aea91b87e3a390d2e3fba38d94fd12939392557403920f62319b33cb253bb1c
-MISC metadata.xml 772 BLAKE2B 5368ab9afd9387d681eca36cb0e93435b72570c31691a27b830b2ecca307ac3a1aba7c3aece27a5bdc27185fd822c9adc76a5091d480c10b7802bae37efa65c7 SHA512 fe764650755d97e2e148cf36fa1ac973a96e59e2143e5a8e90da27dd1272687f61f0e1fe602535366e068c813e3af54d74c0e2e1b88e2a4df8561165bc6448b7
+MISC metadata.xml 840 BLAKE2B 0067a781b5e7074b09d838209ac8847b8834782f284c4d998610779b91fdf35bd8bb06cac5d9841ec10bbe67281ac15e6f34d6ef9e5405c4f7f29be778b23c17 SHA512 17a1c9f90bd0b05e859ee2dea19c50c8ff67165b4b03f800c5e031561187594501af5e9c331763d35c1ce8e9059ac8f8def3ab6261267bc50f33f50fba251756
diff --git a/dev-ada/gtkada/gtkada-2018-r1.ebuild b/dev-ada/gtkada/gtkada-2018-r1.ebuild
new file mode 100644
index 000000000000..e00886917885
--- /dev/null
+++ b/dev-ada/gtkada/gtkada-2018-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="A complete Ada graphical toolkit"
+HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced
+	-> ${MYP}-src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs"
+
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
+	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+	dev-libs/atk
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=,gnat_2019(-)=]"
+
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac}
+	eautoreconf
+}
+
+src_configure() {
+	if use gnat_2018; then
+		GCC_PV=7.3.1
+	elif use gnat_2019; then
+		GCC_PV=8.3.1
+	elif use gnat_2017; then
+		GCC_PV=6.3.0
+	else
+		GCC_PV=4.9.4
+	fi
+	econf \
+		--prefix="${D}/usr" \
+		$(use_enable static-libs static) \
+		$(use_enable shared) \
+		--without-GL
+}
+
+src_compile() {
+	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
+	emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
+}
+
+src_install() {
+	emake -j1 install
+	einstalldocs
+}
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index 0373a027e239..ed2942a83891 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -9,6 +9,7 @@
 		<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="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build gtkada as shared library</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 923854bf431b..b93f81c7b71b 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -3,5 +3,6 @@ AUX libadalang-2018-gentoo.patch 678 BLAKE2B ebc0c63b62a0b5c2b53a036de1a71ca33af
 DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7
 DIST libadalang-gpl-2018-src.tar.gz 1990774 BLAKE2B ffad46d4988de7fb8c9bf94d24360a726c59e3c70a2318725a59e0b6b62351e8f5d8dd6501964618607122e3c7cb3bda0e1181818c68324d4067d59ac93e2b1c SHA512 b95196323097065be2996ced767f8f89fb77445f99c249d84043c68d926d61c78b310b4fef0699d08f9112dc423596c076f452745469a75a8467c35b5e10ac2c
 EBUILD libadalang-2017-r1.ebuild 1089 BLAKE2B ff0e7e37c2f2cf5f7ce0d38b5d0efc073edaf16aa77d65bcf5edad54d234549c33a105164e417a7dc838300415568d34bd2a1dbf3d5d07df99a5e00b2940c331 SHA512 1673bb70bc3a2f323b8ca3cc00d2213e5b6ee81eb90319776845b2ec797ebfca1709ce264cfbe995a76f5ca5d0dd9d91bc80b812d94fef650cc3f6e98b8c5510
+EBUILD libadalang-2018-r1.ebuild 1375 BLAKE2B 75d0bf05bd6d196daf9dc39d60371540dbcfa9459181bb571b521123b85e383e8e66d9a3f116f454bbf10bc669c6b4cd9b8706ecab980f4c21cdc20c52ff973a SHA512 a993c93fb3ff5b4953525e675c8b9d8308128ce21361a5670153c50cf6388036c2a1407a21c57c18e7cc529f9634b3b1ec2603356a677276a6cc9a94b4c6ffd7
 EBUILD libadalang-2018.ebuild 1328 BLAKE2B 2383fa22a63f725534503d4b70887f68ad807f64290737075b5dc010410006e8c7a2e0ad337f051a887e2982de9096a79a89d2e29252a4f947c5f01fd2fd262b SHA512 2cbb2b9c76b319326a2717be045993d1f465dcfcb4b80b06438a2918d6a3c0dc22c864ffc5a125453ea7fa8159318b36cd63a058f28bc02c17359a83a7c1fe56
-MISC metadata.xml 810 BLAKE2B 89dbced5c050ba4dea4ba0537cda9512bc534bee25aa8260cd7ac30129ada091ced7c37d29efdbf11ceac9e295171e84b248d186cfb11b2072fd2beb7997089a SHA512 6857c4ac7b2cd9de167039889a99d9cdac1ba0235379f36630d51e075f1fbfccab974bbd9f34a1be08cab7869c8dbc5ec14da9ff4ec6225bd89470c350f22ebd
+MISC metadata.xml 878 BLAKE2B b8b5f581aa552350fdb737fd9d89fc33a02ccccad106424333f87992a8f9c6ba60d5e70f3aaba1dae13bc117e2ac97f81a66ae6cc34a1aa13a8c86cab08c2a65 SHA512 02ea95c2cf1d7c131edb2634a6daf3fe77d50d2368c1d2afa5ab18c802de0a8b596bd3bf176fbfa67f7cada1d4a8bddc8c51cb444e23ebf0d437c19922c511f9
diff --git a/dev-ada/libadalang/libadalang-2018-r1.ebuild b/dev-ada/libadalang/libadalang-2018-r1.ebuild
new file mode 100644
index 000000000000..8bb71fe888b0
--- /dev/null
+++ b/dev-ada/libadalang/libadalang-2018-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+MYP=${PN}-gpl-${PV}-src
+DESCRIPTION="high performance semantic engine for the Ada programming language"
+HOMEPAGE="https://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18
+	-> ${MYP}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs"
+
+RDEPEND="dev-python/pyyaml
+	dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+	dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	>=dev-ada/langkit-2018"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${PN}-2017-gentoo.patch
+)
+
+src_configure() {
+	ada/manage.py -v debug generate || die
+}
+
+src_compile() {
+	ada/manage.py \
+		-v \
+		$(use_enable shared) \
+		$(use_enable static-libs static) \
+		build \
+		--build-mode='prod' || die
+}
+
+src_test () {
+	ada/manage.py test | grep FAILED && die
+}
+
+src_install () {
+	ada/manage.py \
+		$(use_enable shared) \
+		$(use_enable static-libs static) \
+		install "${D}"usr || die
+	python_domodule build/python/libadalang.py
+	rm -r "${D}"usr/python || die
+}
diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml
index a2f3f0910000..5ed09e4fd913 100644
--- a/dev-ada/libadalang/metadata.xml
+++ b/dev-ada/libadalang/metadata.xml
@@ -9,6 +9,7 @@
 		<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="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build shared library</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 71ae0a8d2181..6a2a781dfe4a 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,4 +1,5 @@
 AUX libgpr-2018-gentoo.patch 1691 BLAKE2B 4e11098f835d9d0adbd6a4eed0e63f71140eb68d0e350fd52303a0d21c308e483556b31ce84ba97a7fccddfc91e519a6ae8f999d87258c0d4f4ee473597f7267 SHA512 959e4e63c3367fd98878a2004d0fac981a1acc2a29e35960a27f2ca48b4557fc16148aa052cdba590f208c8b23832f3bc2f3959523f6e54eb8dfe2e87812f285
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
+EBUILD libgpr-2018-r1.ebuild 1455 BLAKE2B 09c0754d011aaa9507c89e7931ee261a06d72f507fb171ea2290a5087fe423837e4c16c82408732ffbf5375f16fd315e19dff4889604f3a934b1379e8c514e06 SHA512 2e48d5c512756b1e0222a43e958b6bab697be451b74e20a9b3afb3f7dfd65a15671b1a81b2479cad60eecd9f0b893201ebba9d1fa70b47cb9fd5a63d4b49c4f3
 EBUILD libgpr-2018.ebuild 1418 BLAKE2B ea2cd84edd7c32b6094559a9de24d8ac0ff84806b6f90fa393f07e48d984ad4f79be53211198952456b2695dc2d1af2e0bc46a0e6cf30ecbb36cccc9e64430d1 SHA512 77c55ea1e0d33b2f4ced11e495390bbccc30425fd1842361306b92aa21eff2be446837d6100977deb1ea174a1415d6de9e8c5a195a95bbbba6386bce89f0e4f1
-MISC metadata.xml 1175 BLAKE2B 8b512fd5efae4481d319fc52a11f3730af081d5c3ff12f6c6d62768e905e0651e3b4792765f65edbf659862b56372f32ba3aa7ae51c12b2911b711cb12a013e1 SHA512 edd6bb889abfe036d2509e56f350cf058e249e398811fdb2890bd001b75143b8d9df28bb64acba195852d01d484b7e6381e82ce972aad6d8cf1e0c961b3ade72
+MISC metadata.xml 1243 BLAKE2B 83ab2df9d1adc5438dcf1b1a66cfcc6da75ddc676a4a7a8a7c0930cffc25dcdd4831cd066aa5883d3a7ff3e49fc121bad04572269b96a842ea9ebb2b692c8cca SHA512 ade42a66f1e614f719b9dcf1c1ba30d80b851667817bb9206967b6937bc373d53df717449fa34d02cf21a0c0ff8b8b428441ddd98ed64c0c12af90f7c8b89f75
diff --git a/dev-ada/libgpr/libgpr-2018-r1.ebuild b/dev-ada/libgpr/libgpr-2018-r1.ebuild
new file mode 100644
index 000000000000..18b7fe860f2a
--- /dev/null
+++ b/dev-ada/libgpr/libgpr-2018-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multiprocessing
+
+MYP=gprbuild-gpl-${PV}
+
+DESCRIPTION="Ada library to handle GPRbuild project files"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
+		-> ${MYP}-src.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic"
+
+RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?]
+	dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+	!net-libs/grpc"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	emake prefix="${D}"usr setup
+}
+
+src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
+			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+}
+
+src_install() {
+	if use static-libs; then
+		emake DESTDIR="${D}" libgpr.install.static
+	fi
+	for kind in shared static-pic; do
+		if use ${kind}; then
+			emake DESTDIR="${D}" libgpr.install.${kind}
+		fi
+	done
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/libgpr/metadata.xml b/dev-ada/libgpr/metadata.xml
index aa6b2a5d355a..348ef838562d 100644
--- a/dev-ada/libgpr/metadata.xml
+++ b/dev-ada/libgpr/metadata.xml
@@ -9,6 +9,7 @@
 		<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="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index c022a5336efb..42314f28a0af 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,4 +1,5 @@
-AUX xmlada-2018-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
+AUX xmlada-2018-gentoo.patch 1553 BLAKE2B efc30a51ffa02bbf20704cb5e89f540e0da880ee9ff7f7c9d9a0bed48aee34706d803bd8fc22e61ce984f92dd63da5503b618b983a42a3a9a62a1f78987382d0 SHA512 89e82f45f6762078fe7dd695c46270f7015ce7938f8348c926f7571ba8fb757588be1bb4b8c3e8e8108e4547151506bfe47cea452cd1d0ec8223afdcfdff1f13
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
+EBUILD xmlada-2018-r1.ebuild 1947 BLAKE2B 0cafb5e8a347f4ffe68416af6ea936ec61f30da8951b2b099fcfff0d1502ff974d9538de8786722507e3f0abad05bf9f2febade8243e70968514c7413f3ef829 SHA512 50096d45540d4edcfde73271b5fc4f7a228bafebd0210a48f17f09267f664c7ac83b082b29a3ac9d5f887d9e30f12784cf4d20d34518b5a261f2cb8902410983
 EBUILD xmlada-2018.ebuild 1871 BLAKE2B f36dba5e21dadead63933f44e9b62da81ba3a40e523f92485515c7b9ccda27a84ba454325cbd7155de2da0552708266d4d05907255c852eef685e7ff007093fb SHA512 0753455dcdcc5f9e95d3966cdfffaf4fc7598f75efdc175f401ef759edcf86f89039b5035ca469399b3c67ef6e73387ec5aa53ff2145632e0b0809979d0a2580
-MISC metadata.xml 1143 BLAKE2B 7f633dfb6a079c1e981b7b7fe53f60df746919bea32c32c257002c3e13682d24b269d5bbe1b61700df930b7722d3f503bfff52c00676301f7a19523749edda81 SHA512 ce5fe7f5ca7d79bbd4b648608f1521056b62b90c70aec62b49e4be5737319df56a9248bd57b695b1469e2bb9b9b49c6c910c2321f1a690546ae1447bb0519006
+MISC metadata.xml 1211 BLAKE2B c4a426110f0fee7aedb724e8e20528c1975ef2e95b107fc9c7712a5d9a747bded5ab0992f744f375d522f1aa5afe564c3f48af0ddbd4385d32d37795014c8ad9 SHA512 bfe1919e064a72a81cd50197880579c2280e38bd63956ad329c26f0bc0b493df3718036feebf5f380d4ab669c7ace09878e36102317658f473e05e50fd900cf6
diff --git a/dev-ada/xmlada/files/xmlada-2018-gentoo.patch b/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
index 9e79572e3067..439b85026d5f 100644
--- a/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
+++ b/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
@@ -1,5 +1,5 @@
---- xmlada-gpl-2017-src/Makefile.in.old	2017-12-04 20:09:23.730805855 +0100
-+++ xmlada-gpl-2017-src/Makefile.in	2017-12-04 20:09:51.586331155 +0100
+--- a/Makefile.in	2017-12-04 20:09:23.730805855 +0100
++++ b/Makefile.in	2017-12-04 20:09:51.586331155 +0100
 @@ -62,7 +62,8 @@
  
  # Rebuild the tests (and not the XML/Ada code itself)
@@ -9,8 +9,8 @@
  		-XTESTS_ACTIVATED=Only xmlada.gpr
  
  # Run the tests. This requires an install of XML/Ada first
---- xmlada-gpl-2017-src/tests/Makefile.old	2017-12-04 21:38:29.722818904 +0100
-+++ xmlada-gpl-2017-src/tests/Makefile	2017-12-04 21:38:54.229382658 +0100
+--- a/tests/Makefile	2017-12-04 21:38:29.722818904 +0100
++++ b/tests/Makefile	2017-12-04 21:38:54.229382658 +0100
 @@ -1,8 +1,6 @@
  TESTS= test_unicode \
  		 test_state \
@@ -28,3 +28,14 @@
  		gprbuild -q -Pdefault.gpr; \
  		./validate > $(RESULTS)/multiple_xsd.out; \
  		cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \
+--- a/input_sources/input_sources-http.adb	2019-05-29 10:18:23.428517625 +0200
++++ b/input_sources/input_sources-http.adb	2019-05-29 10:17:53.451007226 +0200
+@@ -191,7 +191,7 @@
+ 
+       Create_Socket (Socket);
+       Set_Socket_Option (Socket, Socket_Level, (Reuse_Address, True));
+-      Set_Socket_Option (Socket, Option => (Receive_Buffer, 3000));
++      Set_Socket_Option (Socket, Socket_Level, (Receive_Buffer, 3000));
+       Connect_Socket (Socket, Addr);
+ 
+       Channel := Stream (Socket);
diff --git a/dev-ada/xmlada/metadata.xml b/dev-ada/xmlada/metadata.xml
index 22eacbe16159..17a114e73ebb 100644
--- a/dev-ada/xmlada/metadata.xml
+++ b/dev-ada/xmlada/metadata.xml
@@ -8,7 +8,8 @@
 	<use>
 		<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="gnat_2018">Compile with dev-lang/gnat-gpl-2017</flag>
+		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
diff --git a/dev-ada/xmlada/xmlada-2018-r1.ebuild b/dev-ada/xmlada/xmlada-2018-r1.ebuild
new file mode 100644
index 000000000000..48988109dcfc
--- /dev/null
+++ b/dev-ada/xmlada/xmlada-2018-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
+	${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
+
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
+	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure () {
+	econf --prefix="${D}"/usr
+}
+
+src_compile () {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+			-cargs ${ADAFLAGS} || die "gprbuild failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+}
+
+src_test() {
+	emake test
+	emake run_test | grep DIFF && die
+}
+
+src_install () {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
+			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"usr \
+			--install-name=xmlada --build-var=LIBRARY_TYPE \
+			--build-var=XMLADA_BUILD \
+			--build-name=$1 xmlada.gpr || die "gprinstall failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+
+	einstalldocs
+	dodoc xmlada-roadmap.txt
+	rm "${D}"/usr/share/doc/${PN}/.buildinfo || die
+	rm -r "${D}"/usr/share/gpr/manifests || die
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index a0da41a0d2cf..27f445ead167 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
index fb77854c7f28..abae57791b41 100644
--- a/dev-cpp/antlr-cpp/Manifest
+++ b/dev-cpp/antlr-cpp/Manifest
@@ -7,5 +7,5 @@ EBUILD antlr-cpp-2.7.7-r1.ebuild 2807 BLAKE2B e634333474fdf4c94bdf2aee57ff4e116f
 EBUILD antlr-cpp-2.7.7.ebuild 2775 BLAKE2B 0bf429b5ba9fce3e0a23b46837aaecf1570c77fa922f26a4070bd894230d025c45d593d77b105ff328a52c4eec0aacdda33c5f25f262a907e57c435c53a80636 SHA512 ddd74d4cdd861c3718bb96a56cdf1f400dfc0f9ad320656aef8ab508471e9d6472b80e6490113888f689be41a7a192bcf2b56e99a3d3cf10e4ebb8e779ca8e2d
 EBUILD antlr-cpp-3.5.2-r1.ebuild 450 BLAKE2B 0456a663c4d75c0a5788f38d810abfb034e240d172f17598226e1589722758675ce84d547cb43bbe9b5be97601aae180046ad1611788d8a011cd5db05ae2462c SHA512 122123894e3e58d371aeb898fe465791b28dd238a38ed1fa9f9fc645d7d51c2a05eddbb9a70ce534c3316ab3efd4cda8e358ec282564d4cd05a099c839b63d16
 EBUILD antlr-cpp-3.5.2.ebuild 510 BLAKE2B b6261b5e717ad42726cf56ff552e29ba6940f7ebd25725fc3d139fd35799e3a180f53ef5a8082fe205d7906c04f58253511b491294d1c02f415b70c0c93740d9 SHA512 50c661b440248ae8738f5f4ec42b7be07fcd0d24266eab4faa852c0c7267dadabcca7046e1dd333dbb973c69489fffa988d3dbb63e7c01f53555ff3ca105a621
-EBUILD antlr-cpp-4.7.1.ebuild 636 BLAKE2B db982a3afe6fc6abf42d25f63eada207b7300fd87d145272c4a19d019605b98c999bdda9f46124a75cbca69106f31dae8b42573406f296ad59cd7893336df297 SHA512 ab39b61e33b4903acfee1752d7a40d67fdd328df4c8c95dc699133bc3b787a6d890477e501efbd901d77273b53ac39f332ba2d5a5249e20e5f900180964aa1b9
+EBUILD antlr-cpp-4.7.1.ebuild 635 BLAKE2B f119f2e0d13dc9e6bb4872d5c2289ee22e5f4670c21c2a403d82fa337cc0f32e60f1faf47e8f7d9a8c825e6c5355959998f1587f3d3cba0f9e9668c16ac3e04b SHA512 8dc47072c4ff172a5aca7e2451643c9e236959f1b27e7e822c907d40d33f97435ddc2ce53c96edc3bfa1b416cbe13df4c118f013f1cbdbbe315d167ab567c44e
 MISC metadata.xml 313 BLAKE2B 3ddef83abe4413f33dae4c121c76dfdfab2336d433ef94716eced1df9f669f83883b4174d5a472b06ae8fb16c7179094469fe65258646d7dd9094b5c1673a2a3 SHA512 39988a3826d440aa378b455d18ce23230ba1870bf7b7c64123cfdd09c54b112e8586c87d421a2227370c6b4eae385af46ce3a9e4aab3c676fdfdac360fed8265
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild
index 4c54326473f2..44be13003a2e 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.antlr.org/"
 SRC_URI="https://www.antlr.org/download/antlr4-cpp-runtime-${PV}-source.zip -> ${P}.zip"
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="app-arch/zip"
 
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index 52ac0285533d..eba3458706e8 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,5 +1,5 @@
 DIST atkmm-2.24.2.tar.xz 849784 BLAKE2B 2cd96268cf727de1ebe83428e98f1d21f8dbd1a72ef01be80ec28d169ff0ae9ac375bbbd1a530f3c47b60b49a40e317fe39645d74f6be3c017edcb9735bc0236 SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2
 DIST atkmm-2.28.0.tar.xz 891904 BLAKE2B 8172effa5f4dc542020b58d7e3d3bea66b0affa98db977e94249dfd8fa6c4fdea88cabb385dcfdb2d79874017c4e648a737413bae021121d1423d62e335d2737 SHA512 8457cff58648c3d3944d6a9fb400062985c70a714856a5d84d4553cb6b1202bdc47aa48c612851fea1cc1b7ab59381116c65d2a22212907e3c4b7090601946bc
 EBUILD atkmm-2.24.2.ebuild 852 BLAKE2B 26f9d3d5ded68cb0da224ed19cb04771bc148d29b4dc312da97bd2e5c133f90efe086bbe12626b844120a13f131a7c85478e07c90aa292b8c92667e269475ed1 SHA512 17fcb05ffaf5b624a7157b7e08c918818785a05c99a9c8cb76a5128e68d53d197c517a9f93309f17e98562536207c558bb5c72f7cc5984b202bb9dd5e98601db
-EBUILD atkmm-2.28.0.ebuild 838 BLAKE2B 369585604539e92689d60a70741278042919ade503cc39e9407a8fa62ec55bd12b79797b00df5d6dce9fda706e99b335440703c9eedfb989b07832d65f330d8a SHA512 f4b449bc522265592b77306d304e41e604c9249f1ca9d972d7f1c05b9b82a6bef4693a9ca052dedb42512963f3fe8f3d1082c279c14bac65ee5f6a514e7d3853
+EBUILD atkmm-2.28.0.ebuild 837 BLAKE2B 843688cb04a53d2cd61d99fb50bde115d808a9ef8fab80a85b742e0eab74057e97ea43036a2baa9c82d49ca4003946a58ad520d7d1179bd2bf1db06540593468 SHA512 781b1e59362d80e3d8243127c8b0b2d14704eead534864103fc3865bf2c935bd4c436bda129ebc7d0abc9faf7950ab8e78c3f722bb08c7e3da79b5d875d8ea21
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/atkmm/atkmm-2.28.0.ebuild b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
index 2afc2c8c4d89..a65b4558ce5d 100644
--- a/dev-cpp/atkmm/atkmm-2.28.0.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 46eb9dc09dbf..3864ee73454e 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,5 @@
 DIST glibmm-2.56.1.tar.xz 6841240 BLAKE2B db0e1402f322fd31138cf4db2fc2fabb6fb9896f226f98bd524fe005f0e3412f6973774571b7ec79a9e3c79f6622b0969a55dc91631cc996906dd1e558ad4fe8 SHA512 fd5ad19c5dcba484573520e1d00b5bbb600ee805ab8cd9c0d985880cc1bcbe67ad31fa9f2b5789b5892eddd6be345e3f308593e5ef021e1cfda132e4235fb735
 DIST glibmm-2.58.1.tar.xz 6778632 BLAKE2B e51e43cb9361147627c2ffc4c232bd8b15d935cc3a20a4fa8d98f5be9c45f7dd635aab69177d033cf65a6e39cee53bcc723be56cc8db966e88b00b5f9cb1f29a SHA512 c1a67412e6de3853557318cd921e6e73874a14ffd3cb51fc158b0d45fb1d5c2560e011b3b0be7f8cf8afee13952e824625d832e5237288b974c2ba20a6f042cb
 EBUILD glibmm-2.56.1.ebuild 1633 BLAKE2B 18f75726ccc969a8985bc2b04ef257277fb4eb7bde203030e09f3eba1f1a25d96a5d2a4318346c176b9a54c62a00ffadf4f045987f89f4d8cc448677c56311a2 SHA512 0827bac28286463c413d8bce0f25420e467c47f49771ca414fa5f12c357daf420a49c763ad2265ba14ba66a051387990d5f06d9fe6e9c757a1c9325f84c6c496
-EBUILD glibmm-2.58.1.ebuild 1640 BLAKE2B 1631ccb8ed178388469cff882d6ca42877a71076541f3beade3079b1c675b7b77ae3c4703962bf08b8954d1c83344dfdebaca59dc3746fb07d8a554febd0cbfa SHA512 0c2cdd4675a3cbcba979a4178e829c90bdfc274bf599f28da007abb5b0690c962d3da83eba7a7d8480a97e7920550ada4b5420be18dd89f4f8cc3f1c59801ec8
+EBUILD glibmm-2.58.1.ebuild 1639 BLAKE2B ac88ee6c731b40e92e36e549dd11f2ce4226116085838eb7f03d3115e3745bb61647941e5b0727002a00dbb0d4427dde7b2bc5a988c6fdf06c51fd42b0ae24a6 SHA512 55aba3a13b40784342b927a20a79e03738240657280ecebfe324b9e6cbcc440d59370c683c2a6abd37189a6eca6ff10e7ffebeb445a2fe350acff494aa9d02cb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.58.1.ebuild b/dev-cpp/glibmm/glibmm-2.58.1.ebuild
index 60f374314f55..6df86de9b29d 100644
--- a/dev-cpp/glibmm/glibmm-2.58.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.58.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 
 RDEPEND="
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index f75ed8f867b3..aef6f7ef21b1 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -3,5 +3,5 @@ DIST gtkmm-3.24.0.tar.xz 12515792 BLAKE2B d1150019b28ecffbf1e2f561e8b691d584dfc8
 DIST gtkmm-3.24.1.tar.xz 12482756 BLAKE2B 238b9224a57b929cf75617de326f47ff15da07a4a68e6ae10903b29f5e1e29f4fbbaab82f7b483fcdb4c27aa25908bf9e80c4362ba3df298073c73530b79bcb0 SHA512 be7144edb0d5d68f761c9e92c197c3b84de045072443222694c1595faebf3390623a390dbec9f7232a70231aca138b1cb4343ab273333b2a6a418af7ec1586ed
 EBUILD gtkmm-2.24.5.ebuild 1539 BLAKE2B bcde9c3cabad5325df0293ea9bd8dafaa68245222b0cd8e378b41bbfb7d026265a1f3dbdab7120cf6d43d7108917be08556b4958aa9623cefbd99da321c7c435 SHA512 0333f5d68fd5d7f5d14c8e7c765b5b9723d2842068751be364d8b7e52ebc8ddb22afb77f846236ac92a48918674ad0da713f277f20e8dbec398d91038f97bda2
 EBUILD gtkmm-3.24.0.ebuild 1827 BLAKE2B 5f4d0c994812f59a60e75ee4d10b181be8a439079c5bdb076da907b942d964d027262e637b704497155d0baa002553aa47d1dcee5ff43c13d521c62b0e47ea21 SHA512 1d27ebed4aa2f6cf4f74b20042f507f816d97b3b0813bb62e20996f388434cb4b51cc733b67241eddd742fb16c73398ef266c16a283319c018cf1e7addf87182
-EBUILD gtkmm-3.24.1.ebuild 1834 BLAKE2B 1f31bf9dc572254d54bb2ebf1cd4cbe80f52c7b4811be77a21dbba4bb123c9492fb04e38a38275bd2cc6a5deb6e8cde76ed14706b3a8903a56711c099d0f5cbb SHA512 679dcebe662c1e26720b774ede0daa315da4093198c8c9c9274d07f96fdeaed31d6b0a2f13ca6a08fb08ef07d7e54c1f82a42da77c752676f3209141482e76e9
+EBUILD gtkmm-3.24.1.ebuild 1833 BLAKE2B 0c97bd21c7a03ffc512c7f9fbd8af76aaf51734de239ff044c16fa348dd3b3bcb1856cd625a3d2c1b2cca1e1bdcf40b49a2ccd796dd7c9f22ab2afa7e0f5c744 SHA512 29d9953aa08a1aa0b555abea477d6e33decfc948d7153c7ae9325eb1caab14ea456c4769b2c57cc824c03af02e40f0d6bd0027ef89de4ed4c8b636c3fd32660a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
index a41d551f9e59..75d7274baf9a 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest
index c65bb9ffc563..96bac3e57f39 100644
--- a/dev-cpp/libcmis/Manifest
+++ b/dev-cpp/libcmis/Manifest
@@ -1,6 +1,5 @@
 AUX libcmis-0.5.2-icu-64.2.patch 378 BLAKE2B 0c3bb956dc02c1b6100e59ef771c076071db5612bfd322314346c1595a6b115e51a65eee577af586d09ab8108b1eba1b90915c7cc01d1bf4d6bdb9c4fd11e2ac SHA512 0904a529eafa8e1cfdb673e4e7f37150b0b88886cdc32096a89153cb5856d16dc5fee52f39ae5bfea86065b20690a6e14e4b9ad11b36b682c062702b797e82cd
 DIST libcmis-0.5.2.tar.gz 295020 BLAKE2B 325eacedd87eb1888a439c727a648c5aeb8d58c9b80add9761ffc55381193b71b589865d13ecd55177faafa935642685001f60456c1354e037989b29e9451c05 SHA512 45d8cd6d420a9593b46e1f2d6fbf384ea248cb218b0db6326ee2f082ff29100b65a2cc999ccb849e61df4f4ed7c3721b09addc6c322ef03c6c93f8c0acc02bde
-EBUILD libcmis-0.5.2-r1.ebuild 1244 BLAKE2B a9683d29808ee2ac3ab918b1bd3ddcffd3100e7676649d7b1c7d80722a849c510901699ca15a639a4027898bb3cc6c8fe9afcc278137761e7758b86cc46a442c SHA512 5e11619a749158e56e87a5856b0b213afd67509c6a1a9a66031161eb06bf81bfc727e4e7bf44a221a275b2a3b76e9b4ef6662752896919c8f55bd9a1ff7b41c5
-EBUILD libcmis-0.5.2.ebuild 1179 BLAKE2B 0494be5eac19549e7893016a0e3093e58ff720ed0d471657513f82eb875a6aa5eba976b28b64e81ab945640c60afd30300a97531492df401773e8412e91b0abb SHA512 9193c38528178a608e4fc6ce74438d50bbe7a470d68b7a3db492e729c25837373d2fb73b1c74ead90e814fc1cac9a09e8af82b0992e0dfbb85664e6805702ac8
+EBUILD libcmis-0.5.2-r1.ebuild 1242 BLAKE2B dff1d2be8337b6793ed0deecb7b5c69e20e716bd4d8ea7c9dd68a0274504a80035ea5ca7780204d671e5fd2c1b3871b37e8091b4f9e39b01bfdd9dc91ddbef7e SHA512 9084be83f746c58a248d3887d7e452688d3ec09a445789b90b9112df132dc4e7ac7e056f936d9da2334257c8d9ccc9e67d4c4196a100d5d80347e73768b8f1fa
 EBUILD libcmis-9999.ebuild 1197 BLAKE2B ce7e0e242844b6b2113ec13600f52691c6e1cf2bc3484809c9d7de875bb047f5a31976a6c7d67f2dcd71170be1e24a29948c2b5b30d7611cc94691fb51de5c10 SHA512 2c998193bf07a5d93f78d715c431283ef054cfca7b035e2ebd8110add4ec968ef57bfe635287177aaced49e92c7dc4a0ce83dc5612ba4454edaa5718b04e178a
 MISC metadata.xml 479 BLAKE2B fd8a30e8f39c1455e1dc8c14b32a74012db73dfd66b6f44a025bfebc950b65e8f94c52bff16542f50b4e3d9a1daf6e34fc24f6274c4aed6914bdfea29b542949 SHA512 612413c8d2f4a64e5021710796c465b5b9e44a54bee4d551755d520b934cccb8e6aa488d1156c66db41504d0c53b24a9b92cfffcf62d863b86a1cdfee0768e73
diff --git a/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild b/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
index c9f4938bb63f..1383cf4ab3cd 100644
--- a/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools flag-o-matic
 
diff --git a/dev-cpp/libcmis/libcmis-0.5.2.ebuild b/dev-cpp/libcmis/libcmis-0.5.2.ebuild
deleted file mode 100644
index bd2e18fadf28..000000000000
--- a/dev-cpp/libcmis/libcmis-0.5.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-inherit autotools flag-o-matic
-
-DESCRIPTION="C++ client library for the CMIS interface"
-HOMEPAGE="https://github.com/tdf/libcmis"
-
-LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
-SLOT="0.5"
-
-IUSE="man static-libs test"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/libxml2
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		app-text/docbook2X
-		dev-libs/libxslt
-	)
-	test? (
-		dev-util/cppcheck
-		dev-util/cppunit
-	)
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug 618778
-	append-cxxflags -std=c++14
-
-	local myeconfargs=(
-		--program-suffix=-$(ver_cut 1-2)
-		--disable-werror
-		$(use_with man)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--enable-client
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-cpp/sourcetrail/Manifest b/dev-cpp/sourcetrail/Manifest
index 2ab75dd0f625..ee8235b27420 100644
--- a/dev-cpp/sourcetrail/Manifest
+++ b/dev-cpp/sourcetrail/Manifest
@@ -1,5 +1,5 @@
 DIST sourcetrail-2018.3.55.tar.gz 74278615 BLAKE2B e046acfb90cdb495ff28c3dcf4530129cc569a0e9c481f127f656059f80575e4be22e9b63a8b6f00ffdac977ca930ad7a3c4d0e1aa7912af711150afbef03707 SHA512 b8fccc4bae55abf5c5a05418b37c665817c860cc27e314f8ccb69665a63b90ef68485c2395fc899f1112a05def8e95068d7a5c92db399f1d3f7a203a09107767
 DIST sourcetrail-2019.1.11.tar.gz 76120891 BLAKE2B 865c8a510a544705e130e3ec7bc82f1e7ca16d4dee2fa27849dd3530a92a20ef47ed909765ac08c8106ee0e992e3b4a03e79ef7094fb1593c4088b7d8e356423 SHA512 9022873572aef796fcbacf079c37b916d645aacd1479cc79fcddbfd8c561d0004c97202c46812b60d8c539dae3d68bd805da101678ebd1518ce13c3e58009ac9
-EBUILD sourcetrail-2018.3.55-r1.ebuild 2585 BLAKE2B 53ac837cb7949b08ecaed0e7f2859459d05e112a592b30f7bf72325d170229f6c202cda4f780739a903017eeb97cdd6f7b2b4a354de43435d75a9f5b42b4aa17 SHA512 b8a4645d02e3bcccbb3062b328c3f25ea10ad9b70ae0f60f7dcb797fc2be7765cdf6589c5141eeeff5d4c1f866de313489b9e9f6c85b07039764ce3904c7b082
-EBUILD sourcetrail-2019.1.11.ebuild 2585 BLAKE2B 53ac837cb7949b08ecaed0e7f2859459d05e112a592b30f7bf72325d170229f6c202cda4f780739a903017eeb97cdd6f7b2b4a354de43435d75a9f5b42b4aa17 SHA512 b8a4645d02e3bcccbb3062b328c3f25ea10ad9b70ae0f60f7dcb797fc2be7765cdf6589c5141eeeff5d4c1f866de313489b9e9f6c85b07039764ce3904c7b082
+EBUILD sourcetrail-2018.3.55-r1.ebuild 2603 BLAKE2B 37d47d996d77aae09d0391e5787eb7f7af370f762f09cd1cb54747559402ca4ad48fd3d467ad6ecc33ac6434afb1812d5756fac43211edf0dc630ea06805ec7e SHA512 7edf65dc37ab1f71df2137eeb35a7a32b83c70e2da4a34bfad987215add331de01f7c833956fb7b208f44abaee2f36e530303b772cc255a1d5e66e3b7ce6fa08
+EBUILD sourcetrail-2019.1.11.ebuild 2603 BLAKE2B 37d47d996d77aae09d0391e5787eb7f7af370f762f09cd1cb54747559402ca4ad48fd3d467ad6ecc33ac6434afb1812d5756fac43211edf0dc630ea06805ec7e SHA512 7edf65dc37ab1f71df2137eeb35a7a32b83c70e2da4a34bfad987215add331de01f7c833956fb7b208f44abaee2f36e530303b772cc255a1d5e66e3b7ce6fa08
 MISC metadata.xml 445 BLAKE2B d04d2bd24a8c19606568123ce7a5f5b35a68bafd35728972b887232dd0bf501902ec4e91ebd2c782396d8a945fa6a456765c974dd45f7c004d5b543ff5e8e9e1 SHA512 d3682126116eb02bb50564213649fcac41f0c44fbcf481016bdcc0193fff7b71a64631883a2df21113c85d141f7c5fea3d463dd8c5a102ef24d9b69e1029b677
diff --git a/dev-cpp/sourcetrail/sourcetrail-2018.3.55-r1.ebuild b/dev-cpp/sourcetrail/sourcetrail-2018.3.55-r1.ebuild
index 07a989c7d931..75402064800d 100644
--- a/dev-cpp/sourcetrail/sourcetrail-2018.3.55-r1.ebuild
+++ b/dev-cpp/sourcetrail/sourcetrail-2018.3.55-r1.ebuild
@@ -9,10 +9,11 @@ DESCRIPTION="A cross-platform source explorer for C/C++ and Java"
 HOMEPAGE="https://www.sourcetrail.com/"
 SRC_URI="https://www.sourcetrail.com/downloads/${PV}/linux/64bit -> ${P}.tar.gz"
 
-LICENSE="Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3 BSD"
+LICENSE="Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="examples selinux"
+RESTRICT="mirror bindist"
 
 DEPEND="dev-util/patchelf"
 
diff --git a/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild b/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild
index 07a989c7d931..75402064800d 100644
--- a/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild
+++ b/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild
@@ -9,10 +9,11 @@ DESCRIPTION="A cross-platform source explorer for C/C++ and Java"
 HOMEPAGE="https://www.sourcetrail.com/"
 SRC_URI="https://www.sourcetrail.com/downloads/${PV}/linux/64bit -> ${P}.tar.gz"
 
-LICENSE="Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3 BSD"
+LICENSE="Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="examples selinux"
+RESTRICT="mirror bindist"
 
 DEPEND="dev-util/patchelf"
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 8c05d7e64354..20e25e40e390 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/cdb/Manifest b/dev-db/cdb/Manifest
index b45728960314..33f4cedfb90f 100644
--- a/dev-db/cdb/Manifest
+++ b/dev-db/cdb/Manifest
@@ -1,5 +1,5 @@
 AUX cdb-0.75-errno.diff 243 BLAKE2B e0b2433529e8ade1c4802353017948fd709f47843f339d8e1f77f9c665ece80721613d2dce8c9e67b595ee03f9b7298b04f927a26ad0bf8b5e38a10836799c81 SHA512 03c64d2ab185c16d88f51aaa12d1ca06102444c3eed9d712fcd53e6b8eaeeeacbdf525d91c7fc3eb28bf88be776de4748157d596103b9fc7776a5bde05eef4c4
 AUX cdb-0.75-stdint.diff 11423 BLAKE2B 85f0c3d1b2908c001ebdb055ebe4d7a79bf16a61d1d3ce8295e17cc9c0d5f1d7859465e3dba377a2857741ef082efb621c0cb77179bc6208b35120d390b71f53 SHA512 0308d25c6f9ee3b8fc49e75a2e69c7cdbf8cca7dbf165b3a107d5e2717051f6c68df04a962456295c56e6dde97ee0777944cf406c3eb48f4b7f39ecfaf56f877
 DIST cdb-0.75.tar.gz 54162 BLAKE2B 7b488bf330b2aac88a1cca82a6a49e24d0fd953c77935231a31bd72cc0936a37628736b5b22ea0d58aaa77cd118976ab8aa82ccc080f99e190e3f1db5d51b622 SHA512 6faeab91a77457348b58f685e81000b83fb609691317198a06284c5c62dee1e4d6138f90be1e727021f279d740169c175a21b23c96adb39a654e3f7fafdf36c0
-EBUILD cdb-0.75-r4.ebuild 1501 BLAKE2B c902dc285bd0ece506899636df6008a2a56653812c25344624f5eef7f1bff8b60d674173fdd8f5bda7723e554e841658f81639cff7aca282f035007fedcb968a SHA512 ab8e65b45cd1de6533f61e69d79cb26f84c18545e644c8d62c49d69bf99cfc945be9f1a53ae67c17f21a5e595189c722427382b92af2d33b404a3ea1a750a75d
+EBUILD cdb-0.75-r4.ebuild 1500 BLAKE2B 5fde9966aa9746487aac81b989d7fad91c348cc9628a1e9b7105ca27efff62d7e4c3bc434e418fea50dfb353745fc51be45c85c5d4b3507a7226f68febd37722 SHA512 4286df10538dee2499a072f2826ecb2b412fd9c1b2256d4cca7bfe15e2062587e3d2c1515a68a099dc04db8c7f1314cebd35d37ef333254f1e9cdee22dfe45d7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index 2c365e5f26c9..0525b98345af 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils multilib toolchain-funcs
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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"
 
 DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
 HOMEPAGE="http://cr.yp.to/cdb.html"
diff --git a/dev-db/cockroach/Manifest b/dev-db/cockroach/Manifest
index d754aca3fc5a..761aada78767 100644
--- a/dev-db/cockroach/Manifest
+++ b/dev-db/cockroach/Manifest
@@ -10,7 +10,9 @@ DIST cockroach-v1.0.3.src.tgz 69127502 BLAKE2B 803f88e19a6128f18024748610c1af3e9
 DIST cockroach-v1.0.src.tgz 68753479 BLAKE2B 6377614e9fee896a0115909b02d8a191a7aabe8da341c98547c0ac496d2e8fcce801e35f93a8a126c9d65c1106e0217359b161825a11597da1db113ca6a51216 SHA512 d74ad9546908535f9a7ad4172a04a5f86f5ed22698bbb005aec7478a52632e0497a966b859fd68b40894eb7ee68bfa80dc4188d198f2f23725b9cadd50a55191
 DIST cockroach-v1.1.2.src.tgz 79607942 BLAKE2B 39ce9db2ada1c9a5727431438d4d8fe0d5a31af3161816ee7af672c69909aa6b4681edabdfabc332c00ba3b0a142ea7d700851c8833b80947fdbcc88b7fa2c7e SHA512 385e33ec30c23d84403938420a2fcd66edff02a5c4b9d6220ce3683d833f065010953fd78ee57120c24f2947509b2fd29eeee2a45fd3ad47c16a6c8d779534d2
 DIST cockroach-v1.1.3.src.tgz 79615899 BLAKE2B 86d9a63a5e5e8f21114dda500f30a007bf64769b76322fae282d06fa9eb63eb8a965bf990378c624ccac66124efadf1a0dfdebbc8dc8c6f04173e20334341e89 SHA512 f6dc4178e91fd47aec1fce658c9d621183f0bdcdc6101b87f8187757ab9b965c27e48d0d628dd9c10a386bc1a2f184d9d03270243baf0ec4758c812caac5fda1
+DIST cockroach-v19.1.1.src.tgz 103054418 BLAKE2B eaa4f0e24f74a4bbc9a209b8778431ddc7944d0735eef0e136cfcdf820e70ad17eb4781757c325906e65d56d4c36881c294e0dd79d9e153359be859fc7ee887a SHA512 a7051fea3808b785e8d0047b0273021119d0eb1d12f5c680afa649713a79b155aff0bfa8ec123eebea095549308d002ba82dee3eb94b66c6f729d80115d20c06
 DIST cockroach-v2.0.1.src.tgz 45511681 BLAKE2B 9d0828e5e6bd41bb5590e58f0e18b8a07169335b9ff1284daf89b48dae6eea3cdb683bf8af703b5bac46978e8c37b4a092c53a3d7e18de626acc2095a7daf2a2 SHA512 ad7c64dc70cde6bbd10cabafe595ce35deeda9284880bebde75e41a4b1355aa85f01fb8c6b6ff0bae498b4b04a8d7d60bafc986c49875cff9ccf0ead0bc481a7
+DIST cockroach-v2.1.5.src.tgz 89931919 BLAKE2B 7ed310acf18cbe7c8bafe5992edd3350d9e7654cda86931dbfd64fe17043140132ec019de9f1f44d61bc92d2461618c81e60fffb014446521e747a57f6b5d442 SHA512 3ef2ad985b463e681cdaffe5590543024ca11e9c0c5528415b47bdd4cdfd42504cbc21a350449fea6da08625f801ef94fe51f55be1e9a62bac27fce0cc7b73c1
 EBUILD cockroach-1.0-r1.ebuild 1703 BLAKE2B 263b32177c96e6c5f4512c6eb60cbef7310fdbac297f5219f3e3d8ba708befe6ccc7a0eb43467c6dbc4c01542e5eddd899b01d61b0b6aa67fa3950d38b879767 SHA512 f9d54c7b9395e8ef6552211535641b9241df50d922f6c2e8c74c1782538ea25953c8c15fd89bf6ab17c6264b75bcfd23b5fd27ea9b4054f6579a2753b81c9eb3
 EBUILD cockroach-1.0.1.ebuild 1701 BLAKE2B e011a698cd2493fe26d24112a8ae8b9184ff66c7a1bcf25f6933c19374f036781ff093f7d84048c4df219aa93b66b4f3879af68b6835f9c02e62c503d8597841 SHA512 61ded57cbd28008a27b3b8a2e048a89a70be76317d350c29554ac0450de8932c275aedb63f6d032997013abb63b8a29aff4dae107bccf7876d7afe7ed14149df
 EBUILD cockroach-1.0.3.ebuild 1701 BLAKE2B f9e7fb748c2495586fc600dec992a0272cb89a39a48131ae687a469d1ffcda0b6fe5bad83751b514d8f3906c9f6defdfadb3175db34dbf0c9317143865c7cdbb SHA512 b1a0a2adb8555a227bdb9caff6a91efba4c010a82372b5ad446ab2feb9b68a98456b5b60c14513e5aeebae290a56fd936a8c17194821d12f2b910e8e0f3d1979
@@ -18,5 +20,7 @@ EBUILD cockroach-1.0.ebuild 1689 BLAKE2B 1a9afdfb31ac9142f4a21cda3274eea404593ec
 EBUILD cockroach-1.0_rc1.ebuild 1593 BLAKE2B 511ff8271f507e055d792d98f12f1adce3eba73b15d198e4adf33d7ac1ba61eefa5c9a436ae8b1b474aac802e961205a49195187067f53320ffe038308a8df13 SHA512 6f273468fd5b869144d474027dd644a9031c18f1b18525c89775c9d8eacdeb59d64b195216189ebe6a2251973abc500b2f3047fc88af7d97aa9798c0db8fa16a
 EBUILD cockroach-1.1.2.ebuild 1701 BLAKE2B f9e7fb748c2495586fc600dec992a0272cb89a39a48131ae687a469d1ffcda0b6fe5bad83751b514d8f3906c9f6defdfadb3175db34dbf0c9317143865c7cdbb SHA512 b1a0a2adb8555a227bdb9caff6a91efba4c010a82372b5ad446ab2feb9b68a98456b5b60c14513e5aeebae290a56fd936a8c17194821d12f2b910e8e0f3d1979
 EBUILD cockroach-1.1.3.ebuild 1784 BLAKE2B a23a4d6971c40d68bd280917159ef280c534da3339a48ff1d60351ed63f78be331e323a2d311b3a051db072f4dac88dadf7cc460cd2a2f7f59d19dbc7656176d SHA512 48e34da012ea4ffe51278e2d921a6a93e444b9e4a07855664e468d966f867c341c478afa9ea1f41fb31fcb8f6f94e373811e6bea879a4042a3d23f05d24d220b
+EBUILD cockroach-19.1.1.ebuild 1824 BLAKE2B 11514ea1b9923318be05fe7958aadae67795dc00620ae7191a1ade866dc4e31468130d30e7493d5e87e5d8427a02a6055728979f6b01120ac9b4fc14472707f7 SHA512 5ed2cc7899152a98314aca9d39b3791c14b838b9621011ab23d9e69a968ea37af923e5ce22e147ec7309433a3ef8e1e5e5e587b71174a962c039f2071c8f5039
 EBUILD cockroach-2.0.1.ebuild 1820 BLAKE2B b16dd86cb9bb805db65d47c36bcab1942443942473b96c74c95a53ee55a1878e61247dc58945119bd6a09a1a0ac3bdc5cb9f9ec6fd28db2ab8acdea55b540ca2 SHA512 e8d4fac1f1463ea4643630662d92d187207fcd299bce5c92532ca184fdbf73981e98f07ce5ea56044f255f70a579a46bbfcd202f35a5b1563c0c7b842fddaca2
+EBUILD cockroach-2.1.5.ebuild 1827 BLAKE2B 594d54f1abebfe8d6bf71069ac6addb73328c47b3befb33c2414efa9ae80807f157adab4af2319f1cb430f6ba82799858361d839d1ee51091ef294157115d157 SHA512 ad3de8256f586d8f03eff83db12a6c4ebaf205c416e52ec3dcce09014794c46dba6fcfef2ba98b5c87ad3b6d5f805c83edf6282e226caca75cdc09662d42d802
 MISC metadata.xml 409 BLAKE2B 0fa2933efa8102fa19917f3268b4424257f26efdd94698d22253ed62b562dddc53e09a9312069a9bcf817ccd3f6a0b4423c04c8d8dcbe387e7b30d727e8bdd0c SHA512 e4494324632e55e32fdfe7c1d1b25301b8f7cff3f7475efaf7c6c59d435777eab7245bb200b39b90121babce4e1573038fb0f42e586854a820e1489c1afddd19
diff --git a/dev-db/cockroach/cockroach-19.1.1.ebuild b/dev-db/cockroach/cockroach-19.1.1.ebuild
new file mode 100644
index 000000000000..b4fd44218a0a
--- /dev/null
+++ b/dev-db/cockroach/cockroach-19.1.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PV=v${PV}
+CHECKREQS_MEMORY="2G"
+
+inherit check-reqs toolchain-funcs user
+
+DESCRIPTION="open source database for building cloud services"
+HOMEPAGE="https://www.cockroachlabs.com"
+SRC_URI="https://binaries.cockroachdb.com/cockroach-${MY_PV}.src.tgz"
+
+LICENSE="Cockroach Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=app-arch/xz-utils-5.2.3
+	>=dev-lang/go-1.8.3
+	>=dev-util/cmake-3.8.1"
+
+S="${WORKDIR}/cockroach-${MY_PV}"
+
+QA_EXECSTACK="usr/bin/cockroach"
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Cockroach cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	enewgroup cockroach
+	enewuser cockroach -1 /bin/sh /var/lib/cockroach cockroach
+}
+
+src_compile() {
+	# workaround for https://github.com/cockroachdb/cockroach/issues/20596
+	unset CMAKE_MODULE_PATH
+	emake build
+}
+
+src_install() {
+	dobin src/github.com/cockroachdb/cockroach/cockroach
+	insinto /etc/security/limits.d
+	newins "${FILESDIR}"/cockroach-limits.conf cockroach.conf
+	newconfd "${FILESDIR}"/cockroach.confd-1.0 cockroach
+	newinitd "${FILESDIR}"/cockroach.initd-1.0.1 cockroach
+	keepdir /var/log/cockroach
+	fowners cockroach:cockroach /var/log/cockroach
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "The default setup is for the first node of an insecure"
+		ewarn "cluster that only listens on localhost."
+		ewarn "Please read the cockroach manual at the following url"
+		ewarn "and configure /etc/conf.d/cockroach correctly if you"
+		ewarn "plan to use it in production."
+		ewarn
+		ewarn "http://cockroachlabs.com/docs"
+	fi
+}
diff --git a/dev-db/cockroach/cockroach-2.1.5.ebuild b/dev-db/cockroach/cockroach-2.1.5.ebuild
new file mode 100644
index 000000000000..1cb7ed140e60
--- /dev/null
+++ b/dev-db/cockroach/cockroach-2.1.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PV=v${PV}
+CHECKREQS_MEMORY="2G"
+
+inherit check-reqs toolchain-funcs user
+
+DESCRIPTION="open source database for building cloud services"
+HOMEPAGE="https://www.cockroachlabs.com"
+SRC_URI="https://binaries.cockroachdb.com/cockroach-${MY_PV}.src.tgz"
+
+LICENSE="Cockroach Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=app-arch/xz-utils-5.2.3
+	>=dev-lang/go-1.8.3
+	>=dev-util/cmake-3.8.1"
+
+S="${WORKDIR}/cockroach-${MY_PV}"
+
+QA_EXECSTACK="usr/bin/cockroach"
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Cockroach cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	enewgroup cockroach
+	enewuser cockroach -1 /bin/sh /var/lib/cockroach cockroach
+}
+
+src_compile() {
+	# workaround for https://github.com/cockroachdb/cockroach/issues/20596
+	unset CMAKE_MODULE_PATH
+	emake build
+}
+
+src_install() {
+	dobin src/github.com/cockroachdb/cockroach/cockroach
+	insinto /etc/security/limits.d
+	newins "${FILESDIR}"/cockroach-limits.conf cockroach.conf
+	newconfd "${FILESDIR}"/cockroach.confd-1.0 cockroach
+	newinitd "${FILESDIR}"/cockroach.initd-1.0.1 cockroach
+	keepdir /var/log/cockroach
+	fowners cockroach:cockroach /var/log/cockroach
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "The default setup is for the first node of an insecure"
+		ewarn "cluster that only listens on localhost."
+		ewarn "Please read the cockroach manual at the following url"
+		ewarn "and configure /etc/conf.d/cockroach correctly if you"
+		ewarn "plan to use it in production."
+		ewarn
+		ewarn "http://cockroachlabs.com/docs"
+	fi
+}
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index e4dc35a760a5..8b46727610e4 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,6 +1,6 @@
 DIST freetds-dev.1.00.341.tar.gz 3002134 BLAKE2B c9396c1f205e13c9f3449bef19830cf3b6c2fa72539555ebd6bc1532c014472c862ba2ac7f495bee8f53d640d628c6b15bb50183585d43cf3dbbea4e314636d2 SHA512 fd691535dfa5c97463ff72056cfa5721557b71e41b6186ffcb08e193e51214cf966a33ee55b8e538a6f035aeeef14ac5b15fe8758f1afea9e1252a3b8951ba58
 DIST freetds-dev.1.00.558.tar.gz 3151542 BLAKE2B e7b7eb1d4bad1472a675e7657d524837a27ba18176cf410ebad6dcb949cd59bb50e932526790c816c05cf0ba02fb750a1cfbcda10073e5cbf8908bdc4ceb9cc5 SHA512 763f04ae36be8385f9be955defd2d91698389836e80e19019f0da0ee15515d8b7e3733f7659362a307b492dc83830f0a7f27d2a68cb5b56e2ef171ac1dcfeeca
-EBUILD freetds-1.00.341-r1.ebuild 1913 BLAKE2B 07be1119c77a70b99c9b32234f0ecae224d0587544691783cd627aaf15b66fc3d8b8df17c0912a665d8f095b890aaab736d8f1e08a576fabe9ffaf91100a3632 SHA512 95f2f9c3778c9da63591be505e89efd4b9922e7fc4abda0c454e9908f02ba22a30fc1a473e79808433eef814017beb862b380d1e2f1503363aad9fd208bffa95
-EBUILD freetds-1.00.558.ebuild 1921 BLAKE2B 13bbeec39875647163f1fd0d955e85547e7f899c14d057962a193e72a0996bc9ed89e23898aab2b99f902605f76976ce0a1ecbf10c1b8228957a25fa1b939e36 SHA512 4a8de64a5d6221ea92ca79dd9d39d1a67ad239b5a7000b51dd17c0ad9a771178a06829a73510bc4a9b1d7a77fa7c6f04226ecf42979e3b00ed93d5476be7c14b
-EBUILD freetds-9999.ebuild 1603 BLAKE2B 4a6149df3ad684b7246fed4f19c457f8a74c12a6ad89114d04890a86f9a41a02f7023c07dc55c139865091aed89a70accf993dc77bae4ffdc1f0bb3ff1698794 SHA512 264144b12f57bd34d1ace56458e4ea2cda0f4f5fd9f789373d8e7b4695cdf910562441359218b0c7c8bac446c8fa5673c56a37d0cfef444fc6d11fe57f2121b9
+EBUILD freetds-1.00.341-r1.ebuild 1914 BLAKE2B a739c9f05f37b5876d79074a47d018bb9742ee1a7461fab15dac1db5d9b01b8442412c6a06245b93619bc16bec74bb92edc965a81a8437930235beda4a3933f3 SHA512 2709b5630a970e0beca0cc70b7b9778da7bb1875646a5d68bec6ec46f98e854395a0638c273c2aaa31d3f2f16d970b2a4b11e4671abc32d08c386128d661d5ca
+EBUILD freetds-1.00.558.ebuild 1916 BLAKE2B d27b8dcf799d78988ada22a9975a594348fa0ccef84920011524dc1c3481a70d90c8ea011a20e655a62629a9c0822111cdb05392c3cc6fe08f21055fc5e3d094 SHA512 2cc78b860e8c538018e49649eac1af94459e68ee00563367793461e460e6da0fa649aeef5cc6e1d63026c08f8fe8d0ec39fe0ca5d4748627a5ef8c7f32cd2c0f
+EBUILD freetds-9999.ebuild 1601 BLAKE2B a7dc691ca1e9785e216015af2ca9defb1191ad2a2178677192e0a747d94b430bc12caa403bb9ecfc81f966a770c5a67f08b59ef24ab9730459bc13eac25cd32d SHA512 d7a1ace59c852d24f8c58a70bb0b44261d08dbe92e63a725beaf3b347053a21f5d9162233eb79fc9e296251820c17f87bc60b24b86bef7950a5fa100a65f7f3b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/freetds/freetds-1.00.341-r1.ebuild b/dev-db/freetds/freetds-1.00.341-r1.ebuild
index 56072f26e1bb..27e73e304acd 100644
--- a/dev-db/freetds/freetds-1.00.341-r1.ebuild
+++ b/dev-db/freetds/freetds-1.00.341-r1.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 MY_PN="${PN}-dev"
 
 DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="http://www.freetds.org/"
+HOMEPAGE="https://www.freetds.org/"
 SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-db/freetds/freetds-1.00.558.ebuild b/dev-db/freetds/freetds-1.00.558.ebuild
index 5da473b6d29e..c8a203c3c42c 100644
--- a/dev-db/freetds/freetds-1.00.558.ebuild
+++ b/dev-db/freetds/freetds-1.00.558.ebuild
@@ -8,12 +8,12 @@ EAPI=7
 MY_PN="${PN}-dev"
 
 DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="http://www.freetds.org/"
+HOMEPAGE="https://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"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 
 IUSE="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
 # iODBC and unixODBC are mutually-exclusive choices for
diff --git a/dev-db/freetds/freetds-9999.ebuild b/dev-db/freetds/freetds-9999.ebuild
index ec6e2cf418f3..a18ef188436e 100644
--- a/dev-db/freetds/freetds-9999.ebuild
+++ b/dev-db/freetds/freetds-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools git-r3
 
 DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="http://www.freetds.org/"
+HOMEPAGE="https://www.freetds.org/"
 EGIT_REPO_URI="https://github.com/FreeTDS/${PN}.git"
 
 LICENSE="GPL-2"
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index e14b847f9efe..0c095e25e9f1 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -13,6 +13,7 @@ DIST mariadb-10.1.40.tar.gz 63573615 BLAKE2B a57f89c3a9cbfdfc7ff85ec6d7f4231f29a
 DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b SHA512 cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2
 DIST mariadb-10.2.24.tar.gz 71965656 BLAKE2B 2e78d7fc98fe6221126b7700c821ec4294af9d474f440857530b41d5633821b9995b732bbcdcba14c6a01f5decc56f506c99def4dc1a9a4dd52253d3045a88c6 SHA512 bd0e8c506e94f063b6cfbb1e7e872b4fdbe9ab704e07ff3af1e1efabb89daa39fec3b06ec5294d9a19fdc680da082d095cd3c5f9e4c4ee6f9ee5ae0514d6bb6f
 DIST mariadb-10.3.13.tar.gz 70745600 BLAKE2B f62b6de0566910cd0995954e3b84528bca4d8b99dab79ce1e8b5d4076a223890fc0bb7b43ac3d81c81c0b907cabbc3b042eab936b845ef18d259793759b05d51 SHA512 3cbd93291aa43b235e5b81d953ea69fb32df54fb518f922f69b5485952f01fae693c77b0efac37f414ed7ff132d3b58f899812bdb7be8a5b344c3640e2c3a0dd
+DIST mariadb-10.3.15.tar.gz 70824529 BLAKE2B 6a84430e280db287859bd82cc2b6bb63bddd9188e599165d6ccb3e0fa75cb9de083d3d8d267b7de9de70be692a45b72570c8943d949c43673b3c1387623bb0b0 SHA512 35332ac32cba27fef1b4ddd2209236853f4309756fd121fbdbd2b6be0651e817cedc80e276b89ccfa4bc76760811434fab45a4d380d0ebd500c7d9bd7377fe93
 DIST mariadb-5.5.63.tar.gz 45946425 BLAKE2B bddfd67d8393ec22c4bc8d7dab2838825394636bd690c04574bdc4da84fbf6c779fcae7f6be5d596458baa732cb5278475f308f03df083cdfcecffc486950d81 SHA512 4699d8af2210e12d0eea659a4d3fd4bfa68ce11a38cffaf939a96cb7a1fe64dd0827d39c3a0a36fa7cc1981a804a9af7a6d5cfaf23a8cfc8440e54c0163c2acb
 DIST mariadb-5.5.64.tar.gz 45953561 BLAKE2B d6efe53e520b829ec337a00efadd7d813afd5e3ee6ac5a298773c7cd1b724d01856979317fe2bcf814af3bdabdbd7c6c3d2e27a60b4cdf6032b1dfd64e54d84d SHA512 3e93044eb30d2ce50fefce503f16f4b542fd647ff4367675147ebe1b1f576b4fbad5c0bb25670136d0758d2b8b0c571119244c87d66565bb9b3471811f5dc6b8
 DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970 SHA512 fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec
@@ -28,6 +29,7 @@ EBUILD mariadb-10.1.40.ebuild 29512 BLAKE2B b87872354f3fad04ea8267fbed91397510e4
 EBUILD mariadb-10.2.22-r1.ebuild 32515 BLAKE2B dcf2376e7f0f3f47ae5d3c997f2feda6441bf340bcdb26c64220932ee3c3971da712b5567df7cc76ca4528136673348c8335208fe72c91926bb3ca025d899d6d SHA512 cfd00d2fe5499e8378d025e886da35e9e5a29edc4fc0104d0daa783a3ac054c56d24a23cba21f82e0640cfe3fe6b64598128e42b131944b7ac14e544bbc2db8d
 EBUILD mariadb-10.2.24.ebuild 32530 BLAKE2B abfdf9b1131eacbf59acbbdd250c58609db09b306cdc7ffbad02aa7b2b5e976f528c988a489e71c108bc9ead860aaddfdc3ab51af5d851b69f11e62056fa84d7 SHA512 d25d74d44ebff3f9857f1600fd974d4190739cf83aff6a897753847ff98d502951bba97798d7f049cf9053ecd5f8d9df992ba0de5d92f769595e624d8fe547be
 EBUILD mariadb-10.3.13.ebuild 32189 BLAKE2B 1a79ec6ce0ce0bc6d9000368712d25a0d9d0e096f244d3422bb56518fd20439b3c701291d9b75a45420ac6fe1e2dc0d81cf8142c80334001a9ac6087a66a8004 SHA512 a474f4856bd10379da5173f843ff476379672839d68793c5436a8b7618ef1637050b61ddee11f1cb423cf33aacd28fb5e03d03e73b0a415c3a9e7ea7ea8f45d1
+EBUILD mariadb-10.3.15.ebuild 32225 BLAKE2B 95ba72ff67806f04371bb1fcd88461609c5bf74cf81fd1022a2c592aead3a0f98fc91b32df5303dc8680209f2a760e99f957839e07c54dde93378903c010560d SHA512 b444bbaa65de8f4535fb6ffd3a2062f74426d316e9cff4e341362a15a3ccaedcf45cbf5478ee308a2e997261b4967ab52bd51413c4e76b070867705ffdad50ce
 EBUILD mariadb-5.5.63.ebuild 27054 BLAKE2B fb6b085846137c6607ccb1b58fdaac6abe8999ad67102b3993b52340dd4c7805640379b79c0a0fe300b237438f836a8b62794c423ebc47707b414f7712214919 SHA512 d9356369a5e93dc1dd1a6c6c332ceac7306cc14b33068739d5fef621ea6f14bf2a36e0b8a9f39500ccb8fb7cf35dae013c9303ade0002459971f48d28097d3de
 EBUILD mariadb-5.5.64.ebuild 27101 BLAKE2B 1ac27c83ba4942c415c073e69e27047418237d4b51bdbb2fd471678c27502e67cddb56f794b957e4fed9ab0e4c03bad5d78db0ea9d6c07100bc87a3533d5285e SHA512 602085111323ab3c8049a7c7a40797dde9928c3f70d15d11eae2128773dd5c71c286565f4a4cdec032f6d03327c1e65df88a520874efaf91d0011951cbfab73c
 MISC metadata.xml 2611 BLAKE2B d1b6b11359e92a3d9cb2c58ed35a15e3cf42ab616ed907fa36a5f777168a805ffd03d01bd13fcd30352ef6c5e8b1d80f4e882ffaf8f6445ed3fce2bcc2a92923 SHA512 80395b35839acebbb18ac8d01e8c806bd89f18d32f85fcba41f41ecfc4f1f869dc8c51c90bb21ebd3c9ac30d51d47869a4dcf3b8ce73967e337e6e396b267c97
diff --git a/dev-db/mariadb/mariadb-10.3.15.ebuild b/dev-db/mariadb/mariadb-10.3.15.ebuild
new file mode 100644
index 000000000000..ac4aefb98391
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.3.15.ebuild
@@ -0,0 +1,974 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190305-2052Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+	java-pkg-opt-2 user cmake-utils
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+	SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="+backup bindist client-libs cracklib debug 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 static systemd systemtap tcmalloc
+	test tokudb xml yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+	server? ( tokudb? ( jemalloc !tcmalloc ) )
+	?? ( tcmalloc jemalloc )
+	static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
+	EGIT_CLONE_TYPE=shallow
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+else
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+	"${MY_PATCH_DIR}"/20018_all_mariadb-10.3.12-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
+	"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
+	"${MY_PATCH_DIR}"/20035_all_mariadb-10.3-atomic-detection.patch
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	>=sys-libs/zlib-1.2.3:0=
+	kerberos? ( virtual/krb5 )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sys-libs/ncurses:0=
+	!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 )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+		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=
+"
+DEPEND="virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	!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-r11
+	${COMMON_DEPEND}
+	server? ( galera? (
+		sys-apps/iproute2
+		=sys-cluster/galera-25*
+		sst-rsync? ( sys-process/lsof )
+		sst-mariabackup? ( 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 ) ) )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
+	 server? ( ~virtual/mysql-5.6[static=] )"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+	fi
+	java-pkg-opt-2_pkg_setup
+	if has test ${FEATURES} && \
+		use server && ! has userpriv ${FEATURES} ; then
+			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+
+	# Here we need to see if the implementation switched client libraries
+	# We check if this is a new instance of the package and a client library already exists
+	local SHOW_ABI_MESSAGE libpath
+	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+		elog "Please run: revdep-rebuild --library ${libpath}"
+		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+	fi
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	if use server ; then
+		if use pam; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			einfo
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+src_unpack() {
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+	_disable_plugin() {
+		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+	}
+	_disable_engine() {
+		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	elif use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	# Don't build bundled xz-utils for tokudb
+	echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+	sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+				locale_info qc_info server_audit sql_errlog )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext
+				debug_key_management example_key_management versioning )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+		_disable_engine test_sql_discovery
+	fi
+
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	if use mroonga ; then
+		# Remove the bundled groonga
+		# There is no CMake flag, it simply checks for existance
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	else
+		_disable_engine mroonga
+	fi
+
+	cmake-utils_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mariadb
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+		-DCONC_WITH_EXTERNAL_ZLIB=YES
+		-DWITH_EXTERNAL_ZLIB=YES
+		-DSUFFIX_INSTALL_DIR=""
+		-DWITH_UNITTEST=OFF
+		-DWITHOUT_CLIENTLIBS=YES
+		-DCLIENT_PLUGIN_DIALOG=OFF
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	mycmakeargs+=(
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+
+	if use server ; then
+
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO )
+		fi
+
+		mycmakeargs+=(
+			-DWITH_PCRE=system
+			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DINSTALL_SQLBENCHDIR=""
+			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+			# systemd is only linked to for server notification
+			-DWITH_SYSTEMD=$(usex systemd yes no)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		# Workaround for MDEV-14524
+		use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
+
+		if use test ; then
+			# This is needed for the new client lib which tests a real, open server
+			mycmakeargs+=( -DSKIP_TESTS=ON )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+	fi
+
+	# Remove mytop if perl is not selected
+	if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then
+		rm -f "${ED}/usr/bin/mytop" || die
+	fi
+
+	# Fix a dangling symlink when galera is not built
+	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+	fi
+
+	# Remove broken SST scripts that are incompatible
+	local scriptremove
+	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+			rm "${ED}/usr/bin/${scriptremove}" || die
+		fi
+	done
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ $UID -eq 0 ]]; then
+		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+	# Enable parallel testing, auto will try to detect number of cores
+	# You may set this by hand.
+	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" > /dev/null || die
+
+	touch "${T}/disabled.def"
+	# These are failing in MariaDB 10.0 for now and are believed to be
+	# false positives:
+	#
+	# main.mysql_client_test, main.mysql_client_test_nonblock
+	# main.mysql_client_test_comp:
+	# segfaults at random under Portage only, suspect resource limits.
+
+	local t
+	for t in plugins.cracklib_password_check plugins.two_password_validations ; do
+		_disable_test  "$t" "False positive due to varying policies"
+	done
+
+	for t in main.mysql_client_test main.mysql_client_test_nonblock \
+		main.mysql main.gis_notembedded \
+		main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	_disable_test main.plugin_auth "Needs client libraries built"
+
+	_disable_test main.func_time "Dependent on time test was written"
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd > /dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1`
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_config() {
+	_getoptval() {
+		local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+	}
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=${EPREFIX}/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
+	fi
+	if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
+	fi
+	if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
+	fi
+
+	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now"
+		einfo "or through the ${HOME}/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options
+	local sqltmp="$(emktemp)"
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see https://bugs.mysql.com/bug.php?id=31312
+	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in grant-tables host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+
+	einfo "Creating the mysql database and setting proper permissions on it ..."
+
+	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+	PID_DIR="${EROOT}/var/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]]; then
+		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+	fi
+
+	pushd "${TMPDIR}" &>/dev/null || die
+
+	# Filling timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+	local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
+	[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+	einfo "Command: ${cmd[*]}"
+	su -s /bin/sh -c "${cmd[*]}" mysql \
+		>"${TMPDIR}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+	fi
+	popd &>/dev/null || die
+	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+
+	use prefix || options="${options} --user=mysql"
+
+	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT}/usr/sbin/mysqld \
+		${options} \
+		--log-warnings=0 \
+		--basedir=${EROOT}/usr \
+		--datadir=${ROOT}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${pidfile} \
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+	"${EROOT}/usr/bin/mysql" \
+		"--socket=${socket}" \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	if [[ -n "${sqltmp}" ]] ; then
+		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
+		"${EROOT}/usr/bin/mysql" \
+			"--socket=${socket}" \
+			-hlocalhost \
+			-uroot \
+			--password="${MYSQL_ROOT_PASSWORD}" \
+			mysql < "${sqltmp}"
+		rc=$?
+		eend $?
+		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+	fi
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 8823d31759e7..1dd29c5e057e 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -8,7 +8,7 @@ DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B f37dbe83ecc642
 DIST mysql-workbench-community-8.0.15-src.tar.gz 15631418 BLAKE2B 4bfea1e4dbdda2bef856bd1601d85a1196052d7abc253eb1e291a5d2b5a6b807875e0367a6e542975a12529d142695c1b45f9f1b9b8e094cdf6183f1b1b11b43 SHA512 f6b1dedd0fd97aae0da04fb5a7ebaac980753386f10588dcec2c77fdf5832caf4ee10f277d338f74a1551d8071b17ae4724386e7e62e2bf8421377b304c31055
 DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9 SHA512 e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9
 EBUILD mysql-workbench-6.3.10.ebuild 2858 BLAKE2B 09cfdc16accc4772a41b3f0de95982bd5aae411309bcc0b17efb7f4cb801ba94f4f9898226b7ddec30ff4544094f9526b4f93c34e535a4a306e65d021a57acfb SHA512 abe0d26d0e9424262d58b9063cfc2f979af87bd084339fc7a2d9384d188d7f762401ba6223b86a3ba73de9774d2eaef16c8b7d08d2bca4dc177684dd3828bd97
-EBUILD mysql-workbench-8.0.14.ebuild 2720 BLAKE2B b226b0dbdd20925395c3f98be1377688b9cd320463a16ce8f169627632acdd41c19edd140b74d1273aea1ae00c1f1fd2fb3da8c7e2f31bfdebfae3435ff19b2e SHA512 4654925e83b481f0e47c65319165b18b55965c43db2ea056e5a576d55381ecd76335a33c6c81d8d7113fa1a20cf9d1ba8503f83f3595b1c462a33b5d86111473
+EBUILD mysql-workbench-8.0.14.ebuild 2719 BLAKE2B 0dce51095fdab897c7ce6b089f557917edd8242067289730e47d5d7fc6ebf841ce621f29279ef302bcc25cbc88d09fd5a6d3c46af2379b3a72b22cef2bbfdd01 SHA512 903e9d3fba8d49ad5c47ff2d7e40ccd88b774d2ac85d8396d7d3c9cb80ab0e5e190a17cf8a46848664c209bc26a79dc3bb008b9ee9df3a07292ef4f58eb30776
 EBUILD mysql-workbench-8.0.15.ebuild 2720 BLAKE2B b226b0dbdd20925395c3f98be1377688b9cd320463a16ce8f169627632acdd41c19edd140b74d1273aea1ae00c1f1fd2fb3da8c7e2f31bfdebfae3435ff19b2e SHA512 4654925e83b481f0e47c65319165b18b55965c43db2ea056e5a576d55381ecd76335a33c6c81d8d7113fa1a20cf9d1ba8503f83f3595b1c462a33b5d86111473
 EBUILD mysql-workbench-8.0.16.ebuild 2639 BLAKE2B 6c098dd06091de5bfbd409adf57157675b6fad999fb4f3e2384a940233d7d1bfd5c0801edf6cd58089a86e9a319da612b95d4a8b46fd1dee58711f187bb47ca1 SHA512 275b70d0bda900f19e36b51d067d9e2078860c85eb071302567ed734d3bc04fe026fcdc57f3ba97a5103e0889002ee5e0acbf97da6ce64590b6bfa8333a41600
 MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
index c5dfe62875e0..6b14e1edca13 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz http://www.antlr.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 45aac169b145..6058b4678a70 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -16,6 +16,7 @@ DIST mysql-extras-20180804-2323Z.tar.bz2 322215 BLAKE2B cca9e502e375bf4347333586
 DIST mysql-extras-20181023-0012Z.tar.bz2 327834 BLAKE2B 91a82cbcecbbbe94933da0d8c26cdfee0171602785b2f717fbfec7da422f0ec36f26e897a3c21695f4748017d36c9956cbef03d0852246468368b812a604df82 SHA512 94996708a9da4d55c3aab74f75b74fa4aa80e3fbbb87d9dfe6c1596a934aceed466b7c853e38d9b63f59660763ccef617defc4e6e8770451c21a252250f4e7fa
 DIST mysql-extras-20181111-2314Z.tar.bz2 329013 BLAKE2B fa928b699ef0e6f092e028fc1331cc33953d9855e784998fb2f8c1f1712e9424567b2d2b6b7c5ca375f178309522b3596fcba7babdbed7c85b87ae4b85e5db22 SHA512 5cc4d16c5c6b0491fb9532469ec0b9c65e27e1514d561ea4180845a1578fc8e7ba00fca479b9a784646846f5147e4f676340f639b78c3f5ee140dda26bd5bff2
 DIST mysql-extras-20190303-1852Z.tar.bz2 331026 BLAKE2B ee033fce8f1b6a58f1f690710fb9709a585cd45564b35e71d4f840a3a7f83a5d80f53c24236c9976319abd89c68c62c74a7111517f1b9721d3cbd0898bf0dd8d SHA512 30361a0b848ed27f9170b1116458a9bc13b1b585c5fa1933c99927541c31e9bda4008b0563f2fc7db286f998089ebebf1fe3f18fce7a45e62acbf769ac62d8c1
+DIST mysql-extras-20190524-1046Z.tar.bz2 331517 BLAKE2B e6d48e34b0a7f7176de8740971f8151923beb20a520df73c22d44005059ef6779ad5aa8437e30018b9bbfe1d6d69043cbd8522b6f3662746205193b44372a6b3 SHA512 2f7238578f3aabd1701e1c54da36bc0100c9479871e3c77b22131fd6cde865037307f93b3343ea5e52251c45ef35cdc52cc2dec5a26d44fd41700598282c5c2c
 EBUILD mysql-5.5.61.ebuild 25515 BLAKE2B 2e8a5ff36ec6003ff7e4d746157afe8af9d462537d2808ab6cfe4d469cee1a594df38aafddcb010d0157335b42253f12474614f4eec85729f79d2e05a28cb8b3 SHA512 9ea05d2509c6693d71c5ce048e11393a77cf50570fa19f40500900284b9e5e5d1097de5c82fa518058ea773ac8fd30131a9c153b4effb371f4ce04f454e8867e
 EBUILD mysql-5.5.62.ebuild 25693 BLAKE2B abb1400994767e1a29259fda70531e27e9160b849a6228802baa440f8a5c8244393cb155ac9985f04353c8b35516e653a563c2eb84b72a714c5ee81d016e5d27 SHA512 759b82802fdeb7840b0da3e4ef1d6e7b1f32d7bd815ba780b11e57143b52bcb7eb483c008d25670f4626968028a46f7080abff247e5d2047f6b500ac67888ad4
 EBUILD mysql-5.6.40-r2.ebuild 25714 BLAKE2B c78b1d8b2a77d095302f7e203c3ee6c0c2014770944072b87bd77f97972fcb6db52b05088adacbc821ce2e8f3dbb780bd40d850e381b866458b0d530fd11ea5d SHA512 b6301834c7813714f18f9763922d10e6faa33675705ba479c6d76e3c5673d903b0683f64a8281836bd6be396f398ed1bee14f9e6c8ddfe30b84ad1ac66a8be48
@@ -23,6 +24,6 @@ EBUILD mysql-5.6.42.ebuild 25955 BLAKE2B de075ce30850d5f2fe17a5aaf02e5888d626340
 EBUILD mysql-5.6.43.ebuild 26058 BLAKE2B 900da4370bcf01f3bb6f3c54220e80beddd4243724603c839caddc644504c6255bb68fc3b99522e23df7f7b0290edd859ffcced2819dcc7bbd8ec80a26eeafd3 SHA512 9f33a0924fab366635627643e85d33a8404b27afa098eb7411a9f223b9f4d90a3a4ff2dd47261de1d235ffa5865c44808e053329e21d8728c418b7c890ea026b
 EBUILD mysql-5.7.23-r2.ebuild 30078 BLAKE2B 57bf58e862639e651335a10a8c4dfc5f7f0f76bfb0545414d697875906d917131fedd3e9d0e58f57b886d8cae55adbd2a104ee3632d49b4ba0669b93a1a68bff SHA512 dfbb88e79b717ceb615246a806123ee2d30c1632cfb40d0bb9e04a9204565a92afbb2b37245794c15985e99a60d2adc46723b97e455fb85e137079d6192b148c
 EBUILD mysql-5.7.24.ebuild 30386 BLAKE2B ecf0c03821af6a21467b53a02e6e0a0ae2f7e5d267ff4669266d34cdb9fddb7defbd8a4013dd3a1f8a103c84da4c6eddafae06fc1ebc4bf94c9769e64dbbfc1b SHA512 f8b372573d82b513ea1d82a1e00d728501c483ef949a2411c05ac93a8d2d90162d6992b58d3a101fefcbac541f9f37dcfa2263ac49231839d338af158557153f
-EBUILD mysql-5.7.25.ebuild 30466 BLAKE2B 3622e31330f47924ea99c0b31ede3b755a2bcead553730fc3728f6eb505493e90b0206af7235017f80dcecc297ae6dd3022255ca1884de251db0033140a9b3dc SHA512 85418f95306981b3d3ee0ecd91abf3b2c212c4b7d708ad70834a6df3f5e941c0469f5ba29079adc4e51477e01836ae316c1ad86452ee9d705e1180ac4854fc9d
-EBUILD mysql-5.7.26.ebuild 30477 BLAKE2B 61ae7d6a7de17cea9baafb3bee71c7811b963ad078defb7a725878e2274e959422292c15d69f680e50fa83859e004b7c484ab6b157b3b6c71d2368d18fcc5c58 SHA512 f9e3a2e8deda27ecc3cb27fea0f321c37af94a5afb36bef19928eb2b39f5ebca8edc60afde2354aae7d64d892687c3c63b22343d1a5664ed5a3603a5891e6829
+EBUILD mysql-5.7.25.ebuild 30466 BLAKE2B 09a9d351068993f776edaec7df6af40709ae1f29edfccb5c0881cb4e6c3c30370eb5dd605972eb2da02c9f1cc981d809a7fd4a5f61f61ac5b91b714e9ef8b8c6 SHA512 a8adb0af5cadb08556c2d19b6a0e7c659568dd36fc4448db2808e74bbfe6c7690d33e36b7d3ed91148b00d7093b1a09a7e522a17101fe35f9da1940d2751db2a
+EBUILD mysql-5.7.26.ebuild 30477 BLAKE2B 799f6a4d605e4e91858df8eaee9695c657c179043c2555d7c69f5bc344606b3a9c8780fafe9455346c166b4e4171bf478e576b29f8ad2cafa795b1d6b29d0c46 SHA512 690fde2496a52872512df7d057bb6f0eacb4b7157848949853fe66d0257cde4a1d02df5adeb4469aa398978d64c5b2ded85787cf1fc6c4125eb1cb25ddb6b2f8
 MISC metadata.xml 1539 BLAKE2B 0bc66c5855bd1f4353a7f0b551229d68a940478687b4f38653f973e4a5cfcb946c86bdc2d8318aa96aba43598eb476b995005f26727dfa176ced00fbe2b129a1 SHA512 bc0ce8a3de5e55d954f65eec657930af069d3550f485334f80dfa4c6d17c6298d0609d1ba4fe8b6c988f8ad007858f147c17f1354c207891ac1a062a36af50ad
diff --git a/dev-db/mysql/mysql-5.7.25.ebuild b/dev-db/mysql/mysql-5.7.25.ebuild
index baea2685372a..a66ab389e877 100644
--- a/dev-db/mysql/mysql-5.7.25.ebuild
+++ b/dev-db/mysql/mysql-5.7.25.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20190303-1852Z"
+MY_EXTRAS_VER="20190524-1046Z"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
diff --git a/dev-db/mysql/mysql-5.7.26.ebuild b/dev-db/mysql/mysql-5.7.26.ebuild
index 99cb2805dc75..ffd198b3867a 100644
--- a/dev-db/mysql/mysql-5.7.26.ebuild
+++ b/dev-db/mysql/mysql-5.7.26.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20190303-1852Z"
+MY_EXTRAS_VER="20190524-1046Z"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 2d00861c261a..85ba2e5653a9 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -2,7 +2,7 @@ AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e
 AUX my.cnf.distro-client 637 BLAKE2B b0812e0e03aa9a3b2e55e08b933a0b41b6afd95ded61f4d9d7c34a2d3810ec38520abd0d89e1c6565f61d4cd8a36d653f9f3199b3dd6a91345cdb5ff962685d8 SHA512 74bd1d9a58075d0a6195be1f94db310bcbe8da532b03844e6fa1ff84676e84843fc9adf9aed06b7e4db53c9aa24ef0885d96de0ccfe4c6ad98afe4c145d43f4f
 AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST mysql-extras-20190303-1852Z.tar.bz2 331026 BLAKE2B ee033fce8f1b6a58f1f690710fb9709a585cd45564b35e71d4f840a3a7f83a5d80f53c24236c9976319abd89c68c62c74a7111517f1b9721d3cbd0898bf0dd8d SHA512 30361a0b848ed27f9170b1116458a9bc13b1b585c5fa1933c99927541c31e9bda4008b0563f2fc7db286f998089ebebf1fe3f18fce7a45e62acbf769ac62d8c1
+DIST mysql-extras-20190524-1046Z.tar.bz2 331517 BLAKE2B e6d48e34b0a7f7176de8740971f8151923beb20a520df73c22d44005059ef6779ad5aa8437e30018b9bbfe1d6d69043cbd8522b6f3662746205193b44372a6b3 SHA512 2f7238578f3aabd1701e1c54da36bc0100c9479871e3c77b22131fd6cde865037307f93b3343ea5e52251c45ef35cdc52cc2dec5a26d44fd41700598282c5c2c
 DIST percona-server-5.7.25-28.tar.gz 82296869 BLAKE2B eb12f185be6885e124f8fe5d434c0bba22a67fc2d82a28a52b6f7852722ce046a9a5c30ee5c55280b8046786c39336b131c94c05601580ab81ccf0113254f609 SHA512 e323e092d2af39969edc36d647400c20b50ec059b379f9ac32e71d88524940130639ebb2591d4126d6796e111c31c3a03ab1d00726471be00e1662417e5e63b3
-EBUILD percona-server-5.7.25.28.ebuild 36188 BLAKE2B 1d4b219e49db090b90b1a3986653205d89af2f9848f790d2cba620cfa0bdac197a84a43ede5e2e846162ceb951387fabe676b282b7aed9a07e94099d8459b4eb SHA512 664f2b505fde195cf5ccac21162826b66dfa0c9dc7b2a5e4535e4e0a15400d42331598e846fd97b8b05483512b9c86a7cac232f903781140aed00ad512e80511
+EBUILD percona-server-5.7.25.28.ebuild 36188 BLAKE2B 8f328977e7890dd7efb905691308d0183588f8eea097f3ad78a4645544a4c797f8104ad7741c46486726e955d1c9a04cb57f4f42c8aaeb24aae6620aea2c36d9 SHA512 28a5c0bcb08654fd107db48ce397e7dc0ef1fc4473231ff8926eeb39cc14d6c96d4dd7356dbde1746e0f8dad175eeb8f3012eefe52a74438bf22ebf7cce7984d
 MISC metadata.xml 1416 BLAKE2B a479a1bc7b6e5947ccef2fdf097d3dd91af932500483112c05b86c5d60ab6ec1ac4179bee0fa291a746281054baa791152cac7a34c8c79a0ad4fd8f5e3d1bcf9 SHA512 ec92d201154c3af80aa4cdcd1eae207827a1b2711cfe7b1a9b0153268a33e472329011c56ec39a009776c629163fc9d4f9e77ad2b00461f07199f3dd12db0b52
diff --git a/dev-db/percona-server/percona-server-5.7.25.28.ebuild b/dev-db/percona-server/percona-server-5.7.25.28.ebuild
index 5a4345214857..f32804b6b57e 100644
--- a/dev-db/percona-server/percona-server-5.7.25.28.ebuild
+++ b/dev-db/percona-server/percona-server-5.7.25.28.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20190303-1852Z"
+MY_EXTRAS_VER="20190524-1046Z"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
diff --git a/dev-db/pg_activity/Manifest b/dev-db/pg_activity/Manifest
index f4c00f73c1c4..d5be8169277b 100644
--- a/dev-db/pg_activity/Manifest
+++ b/dev-db/pg_activity/Manifest
@@ -1,3 +1,3 @@
-DIST pg_activity-1.2.0.tar.gz 88863 BLAKE2B 2436b206bc9aec2d5ee678e753191020520f282f62e25f23aa8182bbc215716b82bf800af5e68567c0cff7eb3ff9ff02c46b8f646e4ffc4d2401e89830d8811a SHA512 0bf2f3f746755cb3bc6cbff6a9377d172b15a82c836a19cd52ef8073c39cbb8ffaf2f9583fca437cabc7251bab55a874e1ee8e0559778881d42bcc030bf5d0c4
-EBUILD pg_activity-1.2.0.ebuild 623 BLAKE2B 0734295c8ddb694cb0ac1a10831aacc3fdec44b9d426918c27170918bc301cb76a665d786cf7f5fbd39658bedae20133cd6f35cf20dd417c07682c3daebb39c1 SHA512 1f7debcfb9165f69f7e52b8f40470e3449a4aa4fb8773f2a1ed5baea0c158d74f9758d430a1f513fde5ebc6dfba45f27823bff8fb49966acac27c8ba4e197d32
+DIST pg_activity-1.5.0.tar.gz 92392 BLAKE2B ffe39f602773e0e63ca9bc8a5c96a5dad6a0862aa622b7bf4f3073d869c33bf6e4b79a152a3c956e780d70852aaedf3172a693536436ecbbf89e6943e41ba654 SHA512 01e3d2a1f0c839e40d1da79197dd8a405dee302d46495b972f11e3672e52becceb6211cccc6e1a5c711ca36247dcead6e959435d5f4eb1735556073b6c834904
+EBUILD pg_activity-1.5.0.ebuild 615 BLAKE2B 86dc87e83a36d44c164a04546db38ffbff8258d05bb9e7c6461e57b819af7d2f22c5e65c0c5bc3b24231d937537e46d5448d1f98805945d5cfdc715a2f6b0b54 SHA512 b5efb74fe8447f1be4e3a72796fd1e73028af59bfe6b7cc56affc0735694999f512dfeb286d98d0f961cc7ee05fb680f02337146e2d82f6faa0d42b037e4b807
 MISC metadata.xml 339 BLAKE2B e80c6ca98d1020eb5d6dffdd9cc41239d8dee1131c977d54666293044bd1804e08b3d88a439e867df26e541bc75a084752a19287591643a1cd20e687e9f7e223 SHA512 db6f9da66f99eb53ef5c118ebb7e6d2ecde79c118a0a7b3094375405cf02700bb2f423b830d23ad4819819557bf35a1073a67bafe0de01654f9651e956840355
diff --git a/dev-db/pg_activity/pg_activity-1.2.0.ebuild b/dev-db/pg_activity/pg_activity-1.2.0.ebuild
deleted file mode 100644
index ab84a426b26f..000000000000
--- a/dev-db/pg_activity/pg_activity-1.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Realtime PostgreSQL database server monitoring tool"
-HOMEPAGE="https://github.com/julmon/pg_activity/"
-SRC_URI="https://github.com/julmon/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="POSTGRESQL"
-
-DEPEND=""
-RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/psycopg:2[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/man/${PN}.1
-}
diff --git a/dev-db/pg_activity/pg_activity-1.5.0.ebuild b/dev-db/pg_activity/pg_activity-1.5.0.ebuild
new file mode 100644
index 000000000000..4dfd633a9d5a
--- /dev/null
+++ b/dev-db/pg_activity/pg_activity-1.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Realtime PostgreSQL database server monitoring tool"
+HOMEPAGE="https://github.com/julmon/pg_activity/"
+SRC_URI="https://github.com/julmon/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="POSTGRESQL"
+
+DEPEND=""
+RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/psycopg:2[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/${PN}.1
+}
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 9a66a6469bdb..b20857a1d47c 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -4,10 +4,15 @@ AUX pgpool-configure-pthread.patch 251 BLAKE2B 69ae31095583e4615117fbeb08ceff520
 AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf86412fcf491759ca6f46b1264e7647a8d278ac45da3e20702f6f077dfbcccf83cb3f45575dd3571308 SHA512 5f9a4fa1e68161049ad767d64c764fbf70e84a4239e58119455a45a7e45d86ea2d19b617147cf891053e0dad4420c84704d67015334c7d41bad05b260d70e910
 AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c5490377fdbc5f8490cdead18fdbeb0ce8379d9cbd4bbb1aa21221d61853ff49a456a5ef6a8d78f3f5129 SHA512 05dd358d20bae60cfdefd7116b1111288b5a2be6d68a9dc40eaf6ba641524d422f2faac79bd3c629cee4f8b1ca601a9b6e303d4228e538d742ea407b6190ee53
 AUX pgpool_run_paths-3.6.5.patch 11626 BLAKE2B 5d0b7a49b3c8bf2f2d69d369894e9976037025b289b0ec0f2cf11ed9862347dc4cb166af2cbd65637de40fdae09809a9232b0638cf69339901d6f3f67e9ddcd5 SHA512 ea718378d0ea14fa48975a899df26bc8aafa1e61b0d3f264ead81031a21d68284f4af5ce065c5534d113faf36724c880ce280665e148ec623e9fea9c8f91c77c
+AUX pgpool_run_paths-3.7.10.patch 14548 BLAKE2B 89a18a3c3d4426d82978e303836ff4fafc8d7b4c36154a015c0dadf2e3eb1fa8f19ecf75f39a513b15bca8bfb543ea99e718fff0fa8ef5fde39ecbbe40469df9 SHA512 ea9541a5f9d27011005ab0fd04e2945dea1befaf060429c6a66e0c2091ac8b73a74b01174e5e409c189420405734e73fe2458fce56f4d7b56303957c450bd42d
 AUX pgpool_run_paths-9999.patch 11759 BLAKE2B 35df553f704846cc4ff8d67e5e6b54ca8ed0a5817a148c359b47cae7ff388fe2bb57600113d7f8ac9afe760ea75e3ddd410d111c2ef87aea3c3fb38671d59260 SHA512 109be0f3bcda49db14ebb86d6e9347aa0a47d582ac1a1438b07719f9fa503045cc5b65a27964c3c0b1690ef489f752a497e3b050b816569d0ce01193dc007259
+DIST pgpool-II-3.7.10.tar.gz 3375419 BLAKE2B 96d589e9a3eff631bd4bffdcf321b3b532e5f0985dd4a5948fabc3228400305dc98fbf17ba64e162ecbaecca400e1bb3cad6fc954b2d624292f6f22deb48a789 SHA512 a89c392e336f5dd608c6876011f996fa1e4d7cb4b0eef31c24b2338ac287b72b73948e82429715d38fd9a7a6598f56828192722a2a8ee0d473738b804c4a2a48
 DIST pgpool-II-3.7.8.tar.gz 3337039 BLAKE2B bce75be04d3c37dffecbc0a1f029d6e97f316cc2497de032ccd4862acc6e7ae64f12ffffdb42a99141e548a2cc616ed02d7eef6ca2f63e222fb400cbad72828c SHA512 0f4e337c2307368cfd38f29c63b9267dd3171dc4b9cd2c59cff564295908e2f561230156a5b690e4d87ce4c8b3174d01b081147e7f5d8ff403d3adc8e7cea7e7
 DIST pgpool-II-4.0.3.tar.gz 3715976 BLAKE2B c5ecfebc44ee4d6ab8fda5ae0854bb51423252ba518b356a37d3b125bc8f4fac048f6f944fdf9b1ee785aae5ac3eca4c4196adf218bc071dd90b93da5c6e6c08 SHA512 76ffbc8df120d4ef68b761684a1805c0349665375f549cd3a194f7d09b9bbdf70d0824da0cbe975e6d15f850704c4fc7c1a2218f551f88f2ce56f542bdfee9b8
-EBUILD pgpool2-3.7.8.ebuild 2637 BLAKE2B 11d6f1983309788e808af8e72d27a6b7fcfb18b71135215786046b9766509a7674ad52ef1b861ddc4d1156cba0fce62a768932e6509e8a0868984da4be4cdb85 SHA512 421c34bfc8aa2bdae0e213dfee556328b0b784af973ae8de8c6c84e2f4b433ce0afc34d16342b0d02abeabd52b828da188d53c73143b66e3b9e00d0c123fd675
-EBUILD pgpool2-4.0.3.ebuild 2643 BLAKE2B 3a1a873d73bca65bc0aada8ffabd5bf249cb47f0931c40aa48c23718fef7560cda55c005195ca180af9f2fdfbc45f36ddcc3b2e154a9803e3393a4c03f91f6f6 SHA512 62f6f2ec58d9c8b6fe21b0f344a22f4e9b4fe7d0de0d15473ff5c004c83e68bd535c02b0ea3b4412a61e79e4d2694b7a31221208eb7cebdfd23cd8f4acd715f9
-EBUILD pgpool2-9999.ebuild 2720 BLAKE2B a63e0ba961271a6719fd7fab4a57280fd22eb93ada6d7a37a2c8d7bad381f64b4f160461adc4de760e1b1747cf9536ba56027d7a93710cff3d76251b3453a8ca SHA512 8e3c7a0e2c2562d31974dfd9a9503f1d2c20499b34f69fdd0ca26cf08f344fb115a5f65251e854e9fae9bbd6d007f5d1d9243c17b84885e359f42bad0c6ef5b9
+DIST pgpool-II-4.0.5.tar.gz 3768842 BLAKE2B 2756d23db950a037a9203aae41293535de25d11bf9860f509040bf5b483ae5fb9e651c8189ee5f0a9398a45d20d2c54566769945e38c52361c160a1162a8e3af SHA512 897df553dba3a1800adae5d22ed4f4fe210a3013fb533730837591244877eeaf0e4090d1a0c65e189b71798b5c303ea22e2198f6317b54f74f10ba48fa2188c6
+EBUILD pgpool2-3.7.10.ebuild 2642 BLAKE2B 509e1fc0b475bb66aafcb6ab14c28f4b28c9c059fd7421b84b485309a38e95179e0e8d2d523c084442e8ec57d7a01296796c46dc39d3677e00c8d13dc1b28498 SHA512 aab742d98796c688ca0f175512919f97f92f56da56d85370184ceffc00ebfa18fd65cd0ecf9405ce40b8ed6648474986ddbe81464fcb68ffa18cdc23e8a43a51
+EBUILD pgpool2-3.7.8.ebuild 2639 BLAKE2B fc593487bd9393dae1f56ddebfacbefa99f6801be0a7e674750ffaee5b095399b6af0bfddc888c8c216d42c03cbe140bc7a2a4f3f3d6b56250fd73f2e11e0327 SHA512 a4549c126c7d4c37bcd130cba470666cc93a4eb039d21b2096a7c9f4cd02258fd248731ccf4b3daeff285381d494df1d998c760801dd22ab2635b349c195bf4e
+EBUILD pgpool2-4.0.3.ebuild 2645 BLAKE2B d7d9afef024a3cd2df6a13eb3a037c55be7d4f28b13f751a72d3de0857397432094d139cbcecf109f9b1fdbfd8794f08908368775a0821531cc8c2f2c3a71a6d SHA512 c4e89b31755d5033385bf939715ca4977dcb93d0d4b55c81b18e9fde2292aeb58c2352c3ede83449052423042913f977a784d7f726a0b879a21d58c29bfbe7fd
+EBUILD pgpool2-4.0.5.ebuild 2648 BLAKE2B 95c398868dddee909756512e95fa8953026ac844691626b055f27bb22714f7b865085b3ae82f9b6f519abd4a6ece176d3d77bfd1aece0cbae57650997f208028 SHA512 c2a8402cac1778b07f5e508b6aa82f568e29746c38d4abcd1062c24ae2a6d598b0b057766e5aef6fc43c0180f6b6f072a0db6261ad93d892ed41397eedbaedd0
+EBUILD pgpool2-9999.ebuild 2723 BLAKE2B 4c593cebf5c8f46ffe83697d500b3bb0151c27a58c1aff005f4668d88ddb35d41ce2b18078cff1bd90b6ea4b2b1010ef40ea313f20595d5e1def107b2bae9cf7 SHA512 5a90ab19128765d850037360b7595338364875a4b17e18d91fff167371a3cf8b0439706388fcbc9a89f54909b5dc4d46129e326acabb1e8dbea488b9b452b5ef
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch b/dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch
new file mode 100644
index 000000000000..2374054b0f5c
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch
@@ -0,0 +1,322 @@
+diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
+--- a/src/include/parser/pg_config_manual.h	2019-05-15 03:04:59.000000000 -0400
++++ b/src/include/parser/pg_config_manual.h	2019-05-22 17:33:26.657307088 -0400
+@@ -208,7 +208,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
+ 
+ /*
+  * This is the default event source for Windows event log.
+diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
+--- a/src/include/pcp/pcp_stream.h	2019-05-22 17:34:22.377167537 -0400
++++ b/src/include/pcp/pcp_stream.h	2019-05-22 17:34:45.263776883 -0400
+@@ -48,6 +48,6 @@
+ extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len);
+ extern int pcp_flush(PCP_CONNECTION *pc);
+ 
+-#define UNIX_DOMAIN_PATH "/tmp"
++#define UNIX_DOMAIN_PATH "/run/pgpool"
+ 
+ #endif /* PCP_STREAM_H */
+diff -Naruw a/src/include/pool.h b/src/include/pool.h
+--- a/src/include/pool.h	2019-05-15 03:04:59.000000000 -0400
++++ b/src/include/pool.h	2019-05-22 17:37:07.220088017 -0400
+@@ -72,16 +72,16 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+ 
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "/run/pgpool"
+ 
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "/run/postgresql"
+ 
+ /* Unix domain socket directory for watchdog IPC */
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
+ 
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
+ 
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
+diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
+--- a/src/sample/pgpool.conf.sample	2019-05-15 03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample	2019-05-23 06:17:33.641244614 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -217,13 +213,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/var/log/pgpool'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -512,10 +508,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
+diff -Naruw a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
+--- a/src/sample/pgpool.conf.sample-logical	2019-05-15 03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-logical	2019-05-23 06:24:39.766884345 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ 
+@@ -47,10 +45,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -218,13 +214,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -511,10 +507,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
+diff -Naruw a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
+--- a/src/sample/pgpool.conf.sample-master-slave	2019-05-15 03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-master-slave	2019-05-23 06:27:27.259814032 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -217,13 +213,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -511,10 +507,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ # - Virtual IP control Setting -
+diff -Naruw a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
+--- a/src/sample/pgpool.conf.sample-replication	2019-05-15 03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-replication	2019-05-23 06:28:29.479664086 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -216,13 +212,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -510,10 +506,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
+diff -Naruw a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
+--- a/src/sample/pgpool.conf.sample-stream	2019-05-15 03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-stream	2019-05-23 06:29:16.582883904 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ 
+@@ -47,10 +45,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -218,13 +214,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -511,10 +507,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
diff --git a/dev-db/pgpool2/pgpool2-3.7.10.ebuild b/dev-db/pgpool2/pgpool2-3.7.10.ebuild
new file mode 100644
index 000000000000..8c538b170823
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.7.10.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{4..6} 10 )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc libressl memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	net-libs/libnsl:0=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	!!dev-db/pgpool
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	postgres_new_user pgpool
+
+	postgres-multi_pkg_setup
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}/pgpool-configure-memcached.patch" \
+		"${FILESDIR}/pgpool-configure-pam.patch" \
+		"${FILESDIR}/pgpool-configure-pthread.patch" \
+		"${FILESDIR}/pgpool_run_paths-3.7.10.patch"
+
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	postgres-multi_foreach econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+		$(use_enable static-libs static) \
+		$(use_with memcached) \
+		$(use_with pam) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	# Even though we're only going to do an install for the best slot
+	# available, the extension bits in src/sql need some things outside
+	# of that directory built, too.
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+	# We only need the best stuff installed
+	postgres-multi_forbest emake DESTDIR="${D}" install
+
+	# Except for the extension and .so files that each PostgreSQL slot needs
+	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation!
+	dodoc NEWS TODO
+	doman doc/src/sgml/man{1,8}/*
+	use doc && dodoc -r doc/src/sgml/html
+
+	# Examples and extras
+	# mv some files that get installed to /usr/share/pgpool-II so that
+	# they all wind up in the same place
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+	into "/usr/share/${PN}"
+	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
+	insinto "/usr/share/${PN}"
+	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgpool2/pgpool2-3.7.8.ebuild b/dev-db/pgpool2/pgpool2-3.7.8.ebuild
index f4f989f9a38f..770c9d221c60 100644
--- a/dev-db/pgpool2/pgpool2-3.7.8.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.8.ebuild
@@ -10,8 +10,8 @@ inherit autotools postgres-multi
 MY_P="${PN/2/-II}-${PV}"
 
 DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-db/pgpool2/pgpool2-4.0.3.ebuild b/dev-db/pgpool2/pgpool2-4.0.3.ebuild
index caa0de63f44b..e2f26a68101a 100644
--- a/dev-db/pgpool2/pgpool2-4.0.3.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.0.3.ebuild
@@ -10,8 +10,8 @@ inherit autotools postgres-multi
 MY_P="${PN/2/-II}-${PV}"
 
 DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-db/pgpool2/pgpool2-4.0.5.ebuild b/dev-db/pgpool2/pgpool2-4.0.5.ebuild
new file mode 100644
index 000000000000..a217a62435c1
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-4.0.5.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{4..6} {10..11} )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc libressl memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	net-libs/libnsl:0=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	!!dev-db/pgpool
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	postgres_new_user pgpool
+
+	postgres-multi_pkg_setup
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}/pgpool-configure-memcached.patch" \
+		"${FILESDIR}/pgpool-configure-pam.patch" \
+		"${FILESDIR}/pgpool-configure-pthread.patch" \
+		"${FILESDIR}/pgpool_run_paths-3.7.10.patch"
+
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	postgres-multi_foreach econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+		$(use_enable static-libs static) \
+		$(use_with memcached) \
+		$(use_with pam) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	# Even though we're only going to do an install for the best slot
+	# available, the extension bits in src/sql need some things outside
+	# of that directory built, too.
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+	# We only need the best stuff installed
+	postgres-multi_forbest emake DESTDIR="${D}" install
+
+	# Except for the extension and .so files that each PostgreSQL slot needs
+	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation!
+	dodoc NEWS TODO
+	doman doc/src/sgml/man{1,8}/*
+	use doc && dodoc -r doc/src/sgml/html
+
+	# Examples and extras
+	# mv some files that get installed to /usr/share/pgpool-II so that
+	# they all wind up in the same place
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+	into "/usr/share/${PN}"
+	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
+	insinto "/usr/share/${PN}"
+	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 839ce8a519a1..1e3475f6c7e6 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -5,12 +5,12 @@ EAPI=6
 
 EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
 
-POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+POSTGRES_COMPAT=( 9.{4..6} {10..11} )
 
 inherit autotools git-r3 postgres-multi
 
 DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
+HOMEPAGE="https://www.pgpool.net/"
 SRC_URI=""
 LICENSE="BSD"
 SLOT="0"
@@ -51,7 +51,7 @@ src_prepare() {
 		"${FILESDIR}/pgpool-configure-memcached.patch" \
 		"${FILESDIR}/pgpool-configure-pam.patch" \
 		"${FILESDIR}/pgpool-configure-pthread.patch" \
-		"${FILESDIR}/pgpool_run_paths-9999.patch"
+		"${FILESDIR}/pgpool_run_paths-3.7.10.patch"
 
 	eautoreconf
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index f4af5a5a9b1d..851aac982aa8 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -16,6 +16,7 @@ DIST postgresql-10.8.tar.bz2 18958913 BLAKE2B d2e1664a53c5b2f24b412f497769ffd33e
 DIST postgresql-11.1.tar.bz2 21263173 BLAKE2B d762b6e8b0e7b08b16ed252687118a0a4516172e38e8940879fd050f72d19ff045af949e72977a62c2ce0a788af7d42c9bde7748347566bec3694e337bba6f73 SHA512 35d00984e9f5f063a5b96e97aa1b40381ab76d07b2336bda5981fd80bef1324f56eefca5069ae78770ecd6ece5df85264e599fdb3478ecb71d4fdd0d7b6becca
 DIST postgresql-11.2.tar.bz2 19714229 BLAKE2B 459674c08a0435363da29428bef7ec49a012b534b390ce6addafac000ce58ad0ad7ba4e1522f5279da29535399836971c61536827d481af766322935d7c6d01b SHA512 dae00a543fdeed36bc338abd4ccfd9fe9a8b6b2b7eaa00b1078e4f27802de75a461c27da2800bc9dd64e658681e5787bd03764bde79940656cae1e8c8716f011
 DIST postgresql-11.3.tar.bz2 19718775 BLAKE2B f56686bff4e70c2b6333554a620a5c2d5c226654a1d61de43b4493c44a14e2bcd9c102dba420994878d328af52d933885e4948cd002f14b693aef1416697a0ea SHA512 03269bb88f44f3a81d5e3a8ca2fe59f63f784436840f08870b2e539755629cbde8ac288e0bb4472ee93294a88b37b814ddff48444254c1a3f7a10b4bb64f7133
+DIST postgresql-12beta1.tar.bz2 20589423 BLAKE2B 622f936524bca74c20e27967b4cfcec31ba4ffc3132af516fc6dbb89843d688df41b72b7febe7060d2eb6716d64228124b4bc9831e9b11601be0fd95b7727710 SHA512 f46017659aa88141b056fc1852280c92ffbc3ba52d1cda2e3e302d3ec6ba478cc2a8ab04c87f10774b0401e8284fc46bb387a3e0e594a26a30ef7a4cf79b1de3
 DIST postgresql-9.3.25.tar.bz2 17067593 BLAKE2B fd9ca5685e5511dcaa72da882b674846dcd5a16227e5b33ae06701fe7881df71847666c37925033c6cb01c916111a8f76df134491645f4d1e1dd48a008bd2831 SHA512 319e12b73853b74f5ef2c520d64795bb586ffd495ceab6518f7844de6e0a054aea821976c470108d346f8090c7d3949920d9c435432e33004b7caa7a77a5cdca
 DIST postgresql-9.4.20.tar.bz2 17905682 BLAKE2B cb65228f8e78dc8b6303a06480a68de58ecac1fefa1342e4563f2c4051c9f5506b366b36c2dbd54207d25ae497625f8fc5e3e771174a6b3ec33c3c19d2c9ea08 SHA512 664c6e97979f38d263d1dc75a7db442f193a230435cad43ddfa2afcd42ac0d73b2aef0e846fddcc9008cd6d89cba2d5c0a4db93b111665646d3ff4d8f6fbe1e8
 DIST postgresql-9.4.21.tar.bz2 16871522 BLAKE2B e6b8957f52a95d5fa56bc39756f1de83459882e40eee07c3ddf9e33eab39a0d61ee492864a920e7714ca1914a772dcc9048bc34072349197597cfb116aa94422 SHA512 850d1f59369457d9a8a42de8f0e4811f60e9164d2e7d7605fdabc04cc5ba2e3794d51e155d709419d06b8e070f214f7d3ef2328c6d37f125264ea008ca18ff5a
@@ -28,19 +29,20 @@ DIST postgresql-9.6.12.tar.bz2 18759442 BLAKE2B 067b307318f65616651ee4502f420a84
 DIST postgresql-9.6.13.tar.bz2 18767279 BLAKE2B c1ec780a7f938f878425cbd6556145e60a613135129daaacc52e9a699cc448a22481b01fac20d0c09373ea6a026f39bc58234aae4f1126333b94f621981a8135 SHA512 65cc70410ad4a1a738b92855b92eecdbb9efbbca0eb9a45a138d47b696c8f9c9cd19073fbfdf5c80eea7633d0be29b4ed8acbadd38724acf8f18c90bb30f9b26
 EBUILD postgresql-10.6.ebuild 13809 BLAKE2B 8d423f5493ffd745207a96fc9e2c39dfd875c87711b89efc500700986afee687fce8df9612493f3d1c665d5eb819b438e89c225889d354bb3b5b04b57d97320f SHA512 b63ecae0488fc4527c525dd7134af9dea2862128829a9f0670c5924582b8820b9d2f2a9262de56e28f0f996191dcc898ee692f629b40f4988b41982441294dde
 EBUILD postgresql-10.7.ebuild 13811 BLAKE2B fe7a6df33550d3212db168c3e194a122e54e2f46c76f2cb77b52cf91865d2bea6631172c5f7579fd700986925ef9bbc31ef65fdb29ff0361b638577c068cadc1 SHA512 bb742bd0323ea763a9b213ea5331882969554949ab386b9cc8c5a70b8a94261d8c792027e779a9d1306c632b240d20261c5c363a66f3fb511b089319145e3736
-EBUILD postgresql-10.8.ebuild 13815 BLAKE2B 1c2c0c250c92d2c651cbc4c9fa6d59bf35e1aaf00aae3d3b7ed6cfb9a0a5084e4376acbc583bf2db98122dd503727af619a43f7fe72beab5b982a7e092f5030e SHA512 9cbbb56587d5e5e185a0c862fce9e7d0742ca996c85f6fc4214357cef6569ab115366cc8adc683d9286ced1f2a85f75f4cd949bb6170383c116ae4c3cfc87f70
+EBUILD postgresql-10.8.ebuild 13812 BLAKE2B 7ef2622f933b20f3b31bb87768ca5dd52dd5b3574399c660a68bca5f89573e9c13ada65a1328733895a84f9413d71660a3bc1d1b4155c5edc23026ec66ce3304 SHA512 ad7639e57f7bdc75d11d879c05351c5dccb9c008ea271cfa067d699487ba82a3499f42ab3bb1b1b9be670e23d248723b56b75cffb6e9df7abceb2f06e5e559da
 EBUILD postgresql-11.1.ebuild 13830 BLAKE2B eda10e9ae1ce6404cf75b1c1cdff44638fcfd2e73f0584012e7c3b62d467f3149645fd9c561d6b584cbb826f1f982378acb3a1903bec07334d80d291ee91af56 SHA512 703b35c39a4c0421bddd625ab83ee032174b5cc0944dc709fb22a591ccc4d1d8bb8e1acbe6ed288e0f0448c0529201b6f5061fa62d42bf0b25147c901a4029c6
 EBUILD postgresql-11.2.ebuild 13831 BLAKE2B e56079a7e2f0492e5c3889a4b7c5f21b70c33f4b20329ecf84bae8e5a7cb2b2d0defb962b2802de881604291da7f7ab0c1517773e64f5c2fc948f1ec23986e8f SHA512 c585f3dbcba20b1fc20cad583e9a763cc6f8170c91825e10eb23ee568a25db62d8c0d20363383c6ff8c21abb8ec95e188daed5907c1d36489d253cb71c863fd5
-EBUILD postgresql-11.3.ebuild 13836 BLAKE2B 5988a299a63ad2a5ce3bca5d5bc89eb860b36a42b850bacfcfc1987e67a8f78f6035ea53dc291dad02247718b1e5099fe77ee043fa2d0567591295570ae7bf84 SHA512 c29f6492c13c2dba9467ef8362c8e43fd19fcd2ebe347cd07c0af10049c4174a9054104cbe5ceca67b9770942ccd8533a2ccb0f95bcb688178aaea3f899eaf3c
+EBUILD postgresql-11.3.ebuild 13833 BLAKE2B 586239f6b3cdb4bd37ca6984e6736ec78717d936a276d8921a25ab3e9af0722871332f34cbcc114fd46db05ed0a2ec35b8e303ba5fac6f8149d375d97197283f SHA512 e3fbedd37960ee810e93cea7221c2f9dd08c794030657fac313488931a894dc22d28590f9afb3c9e32c482fb5970dafb26334cb24dcf4870d76f03266588cb62
+EBUILD postgresql-12_beta1.ebuild 13816 BLAKE2B 3d9ad621a0c4423334268b5d11f3959ad0d89e030bd164582ca784a9ec0c762acd36e500d7debaa82e232bbbc4fa3aae9a55499c8434111420ab089679f3abaf SHA512 ee7cc2f53f650b4679e95b9a112253589f3cd05bad47f8a3d4a9bfdcd29ff0d72614a7b645f617e60db827a9eafe0bc2e070454e7641948470ed9833863524e5
 EBUILD postgresql-9.3.25.ebuild 13558 BLAKE2B 336b83681269f6c8254a5cbf9177451ff3681d76316b63a365d91f4f03c37aa9b34f1043161a1ea389c74b745012744d2df16ad5285b501552c896033461dbcc SHA512 9998f7d66b38f3b8e060d089757790cb5bb5f479cf4997238324322c1d23bf48584d2ff4dfff8b3c6c3a709a4c12def05fff3584eadcd028f91eeeb4eed72e91
 EBUILD postgresql-9.4.20.ebuild 14368 BLAKE2B 2c6b46d98d0cb9f9b4e2063d86b7b1b353c3edffc5386c3f1225dde7430633e539714d98b8ec179b13a612dbbd2cb8a32b2aa321a4cf60e74e64c6b793a1a711 SHA512 6de69907fce6835510de53a961d54cc2dc7e0464d48115c29195d3384ba7447ba472d6b89946545c02b4f42cc2e778f4dbdee75728d212ffc651f75076f59ceb
 EBUILD postgresql-9.4.21.ebuild 14369 BLAKE2B 32c03b7b3e2b71cc4e347a451d2ab814ed01a51ac7d7324b023123b045847e51a54a3190d5d54903b573516e18031ab9ea119979b785269a2ddf8d694ab76433 SHA512 c8fa0a053847fbd78e928be1d8789cf336ca5c2b067bb01d5cb245560ff5dbbf44e01b5dd34e11d878150d64a76bb1d58aae5e99dc5aca1f7c00d7dc87dd5df3
-EBUILD postgresql-9.4.22.ebuild 14373 BLAKE2B 4b74f6cad1f44a69da49097018ca3a42e7cc348c7cfd6ef5869987c3e701dce7acd6578bf6780ab0eedc9cf66f49ce9a01271c88f47672c38abecf4bb440ef12 SHA512 dbd5b2a8ac59d6e8acafa5913a7542db6a56fcfc99a99657c026a5ca2926202bb605bf95af9086dc382243041f04efe790ab4495164e5a631093d665a0c682c2
+EBUILD postgresql-9.4.22.ebuild 14370 BLAKE2B fb8188dd31061cf24b8e5408acf34f3158e8ef2ac5591173a3ea4ca709b78e5ab7c287a21a162d06cea38939dacea718fa1cae7b1fbae5ad184aa75451457215 SHA512 b5cf47eb16022ec78584ecf19883de572939994edef56098a77eae08a371a7afee8c3c7809d706d67e4dfc31b9fca1ee603396fbf8df883a64131693d08bb6c5
 EBUILD postgresql-9.5.15.ebuild 14596 BLAKE2B f12b4c612d4360b93f363fdd0a7eda9285db0122a7e663bd7bec8222289e2a2da0bfdaaff9ed2398a154976cf1f13cd9e2e717b23accc7e528f76565942a5976 SHA512 9e9a7aa496a65e036d1fd4528cbfb06f5014059dd96b581ebee38f3a3e65faefad222cb5f2e54dc95b640a89f362275ce0f3d942a092ceeef50973f2937686fa
 EBUILD postgresql-9.5.16.ebuild 14597 BLAKE2B 6767d2163fa8dc5435c2271e3b8efbea3b57cc1d2d2d3c0884fef6fc3d750758cc045f4f423699de8fa89ea4570e0ca445b3da7285ad3669faea7f799e31a72b SHA512 8ec5f2768290b43119e472fccc5951832772a137eebb056c57bbd9c25565ef004095aa2a0ed9c03df90f3ea1faf9d26a5ec9ffd6d5c82d31826fd1052a90605f
-EBUILD postgresql-9.5.17.ebuild 14601 BLAKE2B a36025f69cb256f140de1fe878c9c4949e7058314c492a9f10449abd219ebe55757a77d0f9f7ac59f58218787d083afb21209c3fd9653ea99d89ef6382aa055d SHA512 cf3e07fa1699561ef7ef890ffabcad04f081702e0f697e608e78ec23ab053941d0d9d55cc7e260c7ea458fa223fbf953df2889ce4d99c104580492a27763fdda
+EBUILD postgresql-9.5.17.ebuild 14598 BLAKE2B 639a31ad1d730abc71b06a692e3d6071944306217ffaeed4c232113f47b0517f4605ef19a241e0b6fda03b24f453268b618a58101bfb3c4d5eead56b3d4097e5 SHA512 5b3c4c2d46464029eb2fe4f5d5ff41186ff77f0e5047f9e40a1dc72457e2d23da1c42e9153afa828126a9771f9dd0caa51ee398a68ddd70c50d5ef77f4c14e17
 EBUILD postgresql-9.6.11.ebuild 14829 BLAKE2B fffb2f1e956b93a561d289f657cf678f4e414e21787c73d1ebddf7182aba7b8374307e878841edb25de82feb866f88d79b89ed115bb4d916b8ed929c1a30b5d1 SHA512 c8c70732f1390285906e45cbce8afa3e3435814210c53e092bc0c2fa9f0ebe8d86b3f782e6eaed989a4c2a9a766a158232623e203e2d4917cfa95a05ab88d213
 EBUILD postgresql-9.6.12.ebuild 14830 BLAKE2B 700d0b13f1ff5f35185a9413a1a030c6e3b8c8822ab4c465c3d212a6aaef34f0bc9dd62d4bd6d7d63e410a1927c3c5ccd08c39e3e27abf5ecf0b79fe7a9951f4 SHA512 7e2e661e9981443317704f38227476da0860904234104e5cc1f126acb93acd07cac655fce2d9eb2f7756699874e6afe037fce93ba2d57fda0ec2180bc8362d29
-EBUILD postgresql-9.6.13.ebuild 14834 BLAKE2B 1aac68311e60f262c64e8091fc28f56d21b4f08e5e96cbda7f2a2dcc3a07fc1fdb185390b442d98bff1b8cc88491d46155f7d214ba398035493e7adde12e67d4 SHA512 1aa7ea2979b7542781b9e4cb749d9c46bfa845c37f083bef417fc4f29a050c34beeef87e4fa569241ffabb95d1466a99a5bf5c3b88f81c19d7d235d164e74c24
-EBUILD postgresql-9999.ebuild 14257 BLAKE2B 778b681890ef644afbc1406fec240d9ce61df01e878f50a2b68242e0c3b04104c5bb82967f1f63ca02d30aa7774f252fe7c64362a8184747c4229afc85879bd8 SHA512 67cab8401cbb88b4aeeab0eb03fda9ea3c68c5f3ea567a100a17732757143d2f4e54ab86645fbf2a9786906b138fa8cbe6a3d5957f7f75e218ab6a0a0a99c62c
+EBUILD postgresql-9.6.13.ebuild 14831 BLAKE2B ab7f08b9207114faa35201c90ae1767108de19907a0c6163cf278f7ee89d24b008e25b63e3fae4fca58a50a3f5d059b8edd960fe6ab641c8d65d6ae81e927904 SHA512 273bd355784f2e1fa7474e74a85414f2fd5bd73bf4f58a82f60f00b15eacb5bb421073196359dbae9035061b327e91eb9c8fc796212a0a4cfa8dea72a87e1716
+EBUILD postgresql-9999.ebuild 14257 BLAKE2B da2d4497d150a674c6134eb73e607e428e223e3a49cec79910ce0165b532a76ed540693708297ca7cd8196ddfbad1d82612665361af9de1022ed4fd9587275c4 SHA512 4b299249169603e125704e1675370d2d1cf4f5b5109ca7be1eac73da914519e7bd0e49f94e0e4d891f637aaa797a4529480f1772d1c539d8e7cd80b13de4169b
 MISC metadata.xml 715 BLAKE2B 59ad51ae06a697fe649054d9fe13040423f425b95abdcf3797e1d0d5abba8c62d54cc8c1afb0be0d0a29d1a39d379912bd931925b5df480fb0bb9b238c36e598 SHA512 03027757eaf95313a6825710b1054a9671aa8396381789397006dfe2f66cd41e85cde418e792bf7d71d7db2413905816ff39685774219c1ea5e8b8d35c5cffd0
diff --git a/dev-db/postgresql/postgresql-10.8.ebuild b/dev-db/postgresql/postgresql-10.8.ebuild
index d219d79ffa53..260642e26385 100644
--- a/dev-db/postgresql/postgresql-10.8.ebuild
+++ b/dev-db/postgresql/postgresql-10.8.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n 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 ~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-11.3.ebuild b/dev-db/postgresql/postgresql-11.3.ebuild
index 7d4f91a7a66c..7f38e0a3f32a 100644
--- a/dev-db/postgresql/postgresql-11.3.ebuild
+++ b/dev-db/postgresql/postgresql-11.3.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n 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 ~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=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-12_beta1.ebuild b/dev-db/postgresql/postgresql-12_beta1.ebuild
new file mode 100644
index 000000000000..bea7f351ec92
--- /dev/null
+++ b/dev-db/postgresql/postgresql-12_beta1.ebuild
@@ -0,0 +1,460 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
+		 zh_TW"
+
+inherit flag-o-matic l10n 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(get_major_version)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="doc kerberos kernel_linux ldap libressl llvm nls pam perl python +readline
+	  selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? ( sys-devel/llvm:=
+	sys-devel/clang:= )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+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 flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls nls "'$(l10n_get_locales)'")
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.4.22.ebuild b/dev-db/postgresql/postgresql-9.4.22.ebuild
index fccef3a3d6d4..c3aa3d92ac10 100644
--- a/dev-db/postgresql/postgresql-9.4.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n 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 ~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.17.ebuild b/dev-db/postgresql/postgresql-9.5.17.ebuild
index c87954d1ae59..6d619e7de510 100644
--- a/dev-db/postgresql/postgresql-9.5.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n 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 ~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.13.ebuild b/dev-db/postgresql/postgresql-9.6.13.ebuild
index d40e99651710..b7dd8fbf3d44 100644
--- a/dev-db/postgresql/postgresql-9.6.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n 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 ~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="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 2342910ef474..e90d6a96bf13 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -15,7 +15,7 @@ inherit flag-o-matic git-r3 linux-info multilib pam prefix python-single-r1 \
 KEYWORDS=""
 
 # Bump when rc released.
-SLOT="12"
+SLOT="13"
 
 EGIT_REPO_URI="https://git.postgresql.org/git/postgresql.git"
 
diff --git a/dev-db/rethinkdb/Manifest b/dev-db/rethinkdb/Manifest
deleted file mode 100644
index fa392a74b12e..000000000000
--- a/dev-db/rethinkdb/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX rethinkdb-2.3.5-gcc6.patch 1588 BLAKE2B 01770dbba244a9f8b914ca25d97aec97c733988c563b1e6438d42a901bfd35e9df7c9713d3f9d8dab23acc832d15a1954c7d1dbe69fbcaabf49a13954cf2cbed SHA512 ac902b1eea3dd5d5c2c76bf9aa1b513553624cccfbda282e9be50589f9f74f01cf4b9968f08b22c139af80e92f4e5a4930364c4af2977359ee95b7587c8f292c
-AUX rethinkdb-2.3.5-libressl.patch 4365 BLAKE2B 83487fb920acc136e37d0823a52de943f629560f37b2b8434ea4599fd4d02e4c548841da3d892da168bf50b640a5562b335252f532cf65e5ac359d9228e87bf2 SHA512 ec18f3916def1f76ef58fcb1f077c8f405e86b3bc0ab660d547d5c4b4e7132495d35b4003d21ff019d660d03a14b205b74d1defb7e69f359903b4a9004f558f8
-AUX rethinkdb.confd 606 BLAKE2B 5fae810572fb4edcc55e0f20fb2c2c8e933fbcb6221ad6a398f74e24f099787f924f489c0185bb899b10e365f8e7d1384f00ceaf61921e88138dbaec5d1b0efe SHA512 3a07f9c78ef96b2ca37fca508ee14a644d3c08612f662ba5260182fbfcceba064d20253f1261f56dc0a2c28d1a4d5e2320872c3c4e7595cb7ab4e202eb28ad42
-AUX rethinkdb.initd 1645 BLAKE2B 762589fe4c4b4a73b88f0777f092c5e4b6746c4da3ac9bb738c114f2dde1bb6457d7d29e3ab7c1097faea72a18e379684d862da8d4cac537a0983caad9353203 SHA512 4449b8a4d25232a1d8f375f161d3801d67d93756bd9b3e2f33b58a87e8a257e2e94e47f8aa4a74b69df3da528ffc349f15198a939552c3b5b9ffaacc18a096a9
-AUX rethinkdb.service 261 BLAKE2B ac1f760843ebe249a5066031b5637c1375f84ee63ee23076dfcd68c3baafcf89e468bae3632e38a07fa49831f48b4751e9190e510ce9f649415edc4a332e5bf2 SHA512 70389797ae79481b7d47b45f1676bd0531bc830a2f2daf7baec87533a7a6a0e67177572bab7d42324fe719f8a056899babc5ab2358a679c6a59899ed1272374b
-AUX rethinkdb.tmpfilesd 43 BLAKE2B a294bf834c883ebca33fb289328007e144d14f0fd9c685f3f10bb209af01100347334d21e49243e83f0cf6d5ac1bcc07f49071dc2017f2606f06c9304f67e296 SHA512 5996f72b8e08aac80285373e8e1b5a664177e9d0e8d13e5638c6b821fe5b7a0368001fbfa9ef3f6709dabf0616abcabea40adc4808d176572f8f99b7a3255bae
-DIST rethinkdb-2.3.6.tgz 76787356 BLAKE2B 291f5ff7f2574329e3c96a838a2b4a5f801fae5221612f97d9c6ac250f07e8b8495ce55e9b59fa6085328ef9b9061f63c90db088175458102d2ab319b08c3be1 SHA512 653177750f7439fa1d61a121e488d578be1eab90f87c7d17ad52b9793d8543f22bbe98f8d501c2ab2d7048c65118096430fe7bde945d87c7a3228905af801af2
-EBUILD rethinkdb-2.3.6.ebuild 3887 BLAKE2B dbc1ed84b0c50ac172d9b8e2e36f2f75ce831f1c9043de5e654908a4a2789442e4c25dede7cf07c94bf4b29002c369e750834edce8596c2605e29898085fce57 SHA512 593edaccf511e503382a40cfd2e637a49706b3cb9f5235fdcb93abed619987042e785fdae795eae97d06b8ca9c630a15b3b79de2b58d3020b26b76660953e5d9
-MISC metadata.xml 479 BLAKE2B da42cd39b5a97d717bbba5d640794b8620783464226a641bdbcc3f9f89861051a88ad0789bd43ed606d4955d8265a148dc038e3f2d2851042e6f9080885cf845 SHA512 927c6fb7c435c6ebd562dd581a392cf36f48ac20fec63dd0c090efdadaa68fcbbd28d6aa8c5c2f24822d0453ac74847576dcb45fd93a3c6ece648c17b6abba7c
diff --git a/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch b/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch
deleted file mode 100644
index e3d5eac88a45..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Bug: https://bugs.gentoo.org/594220
-Commit: https://github.com/rethinkdb/rethinkdb/commit/871bd3705a1f29c4ab07a096d562a4b06231a97c
-
-From 871bd3705a1f29c4ab07a096d562a4b06231a97c Mon Sep 17 00:00:00 2001
-From: Etienne Laurin <etienne@atnnn.com>
-Date: Wed, 16 Nov 2016 04:17:41 +0000
-Subject: [PATCH] Workaround for building V8 with GCC 6.2
-
----
- mk/support/pkg/v8.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/mk/support/pkg/v8.sh b/mk/support/pkg/v8.sh
-index dc339ad0715..97f4d336c03 100644
---- a/mk/support/pkg/v8.sh
-+++ b/mk/support/pkg/v8.sh
-@@ -44,8 +44,10 @@ pkg_install () {
-         arm*)   arch=arm; arch_gypflags=$raspberry_pi_gypflags ;;
-         *)      arch=native ;;
-     esac
-+
-     mode=release
--    pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= $arch_gypflags" V=1
-+    pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= -Dv8_use_snapshot=false $arch_gypflags" V=1 
-+
-     for lib in `find "$build_dir/out/$arch.$mode" -maxdepth 1 -name \*.a` `find "$build_dir/out/$arch.$mode/obj.target" -name \*.a`; do
-         name=`basename $lib`
-         cp $lib "$install_dir/lib/${name/.$arch/}"
-@@ -56,7 +58,7 @@ pkg_install () {
- pkg_link-flags () {
-     # These are the necessary libraries recommended by the docs:
-     # https://developers.google.com/v8/get_started#hello
--    for lib in libv8_{base,libbase,snapshot,libplatform}; do
-+    for lib in libv8_{base,nosnapshot,libbase,libplatform}; do
-         echo "$install_dir/lib/$lib.a"
-     done
-     for lib in libicu{i18n,uc,data}; do
diff --git a/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch b/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch
deleted file mode 100644
index b79850b0b6b3..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-Bug: https://bugs.gentoo.org/594998
-Issue: https://github.com/rethinkdb/rethinkdb/issues/6336
-Patch: https://git.alpinelinux.org/cgit/aports/tree/community/rethinkdb/libressl.patch?id=146fb0d67a1b861d5c776d97f533efe0bb26af7a
-
-From d52a694a806c1a8b6dd4d7d17d0671a96240449a Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 4 Jan 2017 15:31:40 +0100
-Subject: [PATCH] Improve OpenSSL compatibility
-
-Refactor the conditionals for openssl 1.1 support so we avoid multiple
-if/else and add a check for LibreSSL as well.
----
- src/crypto/hash.cc                 | 13 +++++--------
- src/crypto/hmac.cc                 | 34 ++++++++++++++++++----------------
- src/crypto/initialization_guard.cc | 15 ++++++---------
- 3 files changed, 29 insertions(+), 33 deletions(-)
-
-diff --git a/src/crypto/hash.cc b/src/crypto/hash.cc
-index 4427dfddeb..e035f695fc 100644
---- a/src/crypto/hash.cc
-+++ b/src/crypto/hash.cc
-@@ -8,27 +8,24 @@
- 
- #include "crypto/error.hpp"
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define EVP_MD_CTX_new     EVP_MD_CTX_create
-+#define EVP_MD_CTX_free    EVP_MD_CTX_destroy
-+#endif
-+
- namespace crypto {
- 
- class evp_md_ctx_wrapper_t {
- public:
-     evp_md_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--        m_evp_md_ctx = EVP_MD_CTX_create();
--#else
-         m_evp_md_ctx = EVP_MD_CTX_new();
--#endif
-         if (m_evp_md_ctx == nullptr) {
-             throw openssl_error_t(ERR_get_error());
-         }
-     }
- 
-     ~evp_md_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--        EVP_MD_CTX_destroy(m_evp_md_ctx);
--#else
-         EVP_MD_CTX_free(m_evp_md_ctx);
--#endif
-     }
- 
-     EVP_MD_CTX *get() {
-diff --git a/src/crypto/hmac.cc b/src/crypto/hmac.cc
-index 2ac4314e24..0e3f91a0c1 100644
---- a/src/crypto/hmac.cc
-+++ b/src/crypto/hmac.cc
-@@ -7,43 +7,45 @@
- 
- #include "crypto/error.hpp"
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+
-+inline HMAC_CTX *HMAC_CTX_new() {
-+    HMAC_CTX *tmp = (HMAC_CTX *)OPENSSL_malloc(sizeof(HMAC_CTX));
-+    if (tmp)
-+        HMAC_CTX_init(tmp);
-+    return tmp;
-+}
-+
-+inline void HMAC_CTX_free(HMAC_CTX *ctx) {
-+    if (ctx) {
-+        HMAC_CTX_cleanup(ctx);
-+        OPENSSL_free(ctx);
-+    }
-+}
-+
-+#endif
-+
- namespace crypto {
- 
- class hmac_ctx_wrapper_t {
- public:
-     hmac_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--        HMAC_CTX_init(&m_hmac_ctx);
--#else
-         m_hmac_ctx = HMAC_CTX_new();
-         if (m_hmac_ctx == nullptr) {
-             throw openssl_error_t(ERR_get_error());
-         }
--#endif
-     }
- 
-     ~hmac_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--        HMAC_CTX_cleanup(&m_hmac_ctx);
--#else
-         HMAC_CTX_free(m_hmac_ctx);
--#endif
-     }
- 
-     HMAC_CTX *get() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--        return &m_hmac_ctx;
--#else
-         return m_hmac_ctx;
--#endif
-     }
- 
- private:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--    HMAC_CTX m_hmac_ctx;
--#else
-     HMAC_CTX *m_hmac_ctx;
--#endif
- };
- 
- std::array<unsigned char, SHA256_DIGEST_LENGTH> detail::hmac_sha256(
-diff --git a/src/crypto/initialization_guard.cc b/src/crypto/initialization_guard.cc
-index ba0503efc6..f76ffd96da 100644
---- a/src/crypto/initialization_guard.cc
-+++ b/src/crypto/initialization_guard.cc
-@@ -14,16 +14,17 @@
- #include "arch/io/concurrency.hpp"
- #include "arch/runtime/runtime.hpp"
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define OPENSSL_init_ssl(x, y)     SSL_library_init()
-+#define OPENSSL_init_crypto(x, y)  SSL_load_error_strings()
-+#define OPENSSL_cleanup            ERR_free_strings
-+#endif
-+
- namespace crypto {
- 
- initialization_guard_t::initialization_guard_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--    SSL_library_init();
--    SSL_load_error_strings();
--#else
-     OPENSSL_init_ssl(0, nullptr);
-     OPENSSL_init_crypto(0, nullptr);
--#endif
- 
-     // Make OpenSSL thread-safe by registering the required callbacks
-     CRYPTO_THREADID_set_callback([](CRYPTO_THREADID *thread_out) {
-@@ -49,11 +50,7 @@ initialization_guard_t::initialization_guard_t() {
- }
- 
- initialization_guard_t::~initialization_guard_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--    ERR_free_strings();
--#else
-     OPENSSL_cleanup();
--#endif
- }
- 
- }  // namespace crypto
--- 
-2.11.0
-
diff --git a/dev-db/rethinkdb/files/rethinkdb.confd b/dev-db/rethinkdb/files/rethinkdb.confd
deleted file mode 100644
index af65794a44bd..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# !! IMPORTANT !!
-#
-# This file is ONLY used to override some of the init script configuration.
-#
-# You should NOT use this file to configure your rethinkdb instance,
-# see the /etc/rethinkdb/default.conf.sample file instead.
-#
-# Available init script modifiers :
-# - config_file : the configuration file to use (default : /etc/rethinkdb/instance.d/<instance-name>.conf)
-# - user : the user used to run your rethinkdb instance (default : rethinkdb)
-# - group : the group used to run your rethinkdb instance (default : rethinkdb)
-# - run_dir : the run directory for your PID files (default : /run/rethinkdb)
\ No newline at end of file
diff --git a/dev-db/rethinkdb/files/rethinkdb.initd b/dev-db/rethinkdb/files/rethinkdb.initd
deleted file mode 100644
index 9f55aa49c8e6..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb.initd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-instance_name=${SVCNAME/*.}
-config_file=${config_file:-/etc/rethinkdb/instances.d/${instance_name}.conf}
-run_dir=${run_dir:-/run/rethinkdb}
-
-command="/usr/bin/rethinkdb"
-command_args="--config-file ${config_file}"
-command_background="true"
-pidfile=${run_dir}/${instance_name}.pid
-user=${user:-rethinkdb}
-group=${group:-rethinkdb}
-start_stop_daemon_args="--user ${user} --group ${group} --wait 2000"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
-	if [ "${instance_name}" == "rethinkdb" ]; then
-		eerror "You should not run this default init script directly"
-		eerror "Create a symlink to an instance name"
-		eerror "and create a configuration file in /etc/rethinkdb/instances.d/"
-		eerror "then run this instance init script instead."
-		return 1
-	fi
-	if [ ! -f ${config_file} ]; then
-		eerror "Missing configuration file ${config_file}"
-		return 1
-	else
-		# respect configured directory or set a default
-		directory=$(egrep -e '^directory=' "${config_file}" | cut -d'=' -f2)
-		if [ -z "${directory}" ]; then
-			directory=/var/lib/rethinkdb/instances.d/"${instance_name}"
-		fi
-		checkpath -d -m 0750 -o "${user}":"${group}" "${directory}"
-		command_args="${command_args} --directory ${directory}"
-
-		# respect configured log-file or set a default
-		log_file=$(egrep -e '^log_file=' "${config_file}" | cut -d'=' -f2)
-		if [ -z "${log_file}" ]; then
-			log_file=/var/log/rethinkdb/"${instance_name}".log
-		fi
-		command_args="${command_args} --log-file ${log_file}"
-	fi
-}
diff --git a/dev-db/rethinkdb/files/rethinkdb.service b/dev-db/rethinkdb/files/rethinkdb.service
deleted file mode 100644
index 09645c2ae6ab..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RethinkDB database server for instance '%i'
-
-[Service]
-User=rethinkdb
-Group=rethinkdb
-ExecStart=/usr/bin/rethinkdb serve --config-file /etc/rethinkdb/instances.d/%i.conf
-KillMode=process
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/dev-db/rethinkdb/files/rethinkdb.tmpfilesd b/dev-db/rethinkdb/files/rethinkdb.tmpfilesd
deleted file mode 100644
index 694501e8ab55..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /run/rethinkdb 0755 rethinkdb rethinkdb -
\ No newline at end of file
diff --git a/dev-db/rethinkdb/metadata.xml b/dev-db/rethinkdb/metadata.xml
deleted file mode 100644
index 48fd46f66002..000000000000
--- a/dev-db/rethinkdb/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>ultrabug@gentoo.org</email>
-    <name>Ultrabug</name>
-  </maintainer>
-  <use>
-    <flag name="tcmalloc">
-      Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations.
-    </flag>
-  </use>
-  <upstream>
-    <bugs-to>https://github.com/rethinkdb/rethinkdb/issues</bugs-to>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-db/rethinkdb/rethinkdb-2.3.6.ebuild b/dev-db/rethinkdb/rethinkdb-2.3.6.ebuild
deleted file mode 100644
index 3c1b8ac0ee83..000000000000
--- a/dev-db/rethinkdb/rethinkdb-2.3.6.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit python-utils-r1 systemd user
-
-DESCRIPTION="The open-source database for the realtime web."
-HOMEPAGE="https://www.rethinkdb.com"
-LICENSE="AGPL-3"
-SLOT="0"
-SRC_URI="https://download.rethinkdb.com/dist/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +jemalloc tcmalloc"
-
-# TODO: rly need some webui libs ?
-DEPEND=">=dev-libs/re2-0.2016.05.01
-		dev-cpp/gtest
-		dev-libs/boost
-		dev-libs/protobuf-c
-		net-misc/curl
-		sys-libs/libunwind
-		sys-libs/ncurses:=
-		jemalloc? ( >=dev-libs/jemalloc-4.0 )
-		tcmalloc? ( dev-util/google-perftools )"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="?? ( tcmalloc jemalloc )"
-
-pkg_setup() {
-	enewgroup rethinkdb
-	enewuser rethinkdb -1 -1 /var/lib/${PN} rethinkdb
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-gcc6.patch
-	"${FILESDIR}"/${PN}-2.3.5-libressl.patch
-)
-
-src_prepare() {
-	default
-
-	# don't use predefined configuration
-	rm configure.default
-
-	# fix doc and init script auto installation
-	sed -e 's/ install-docs / /g' -e 's/ install-init / /g' -i mk/install.mk || die
-
-	# default config for Gentoo
-	# fix default pid-file path
-	# fix default directory path
-	# fix default log-file path
-	sed -e 's@/var/run/@/run/@g' \
-		-e 's@/var/lib/rethinkdb/@/var/lib/rethinkdb/instances.d/@g' \
-		-e 's@/var/log/rethinkdb@/var/log/rethinkdb/default.log@g' \
-		-i packaging/assets/config/default.conf.sample || die
-
-	# proper CXX declaration
-	sed -e "s/CXX=\$(.*/CXX=$(tc-getCXX)/g" -i configure || die
-
-	# respect user CXXFLAGS optimizations
-	sed -e 's/-O3//g' -i src/build.mk || die
-}
-
-src_configure() {
-	local conf_opts=(
-		--prefix="/usr"
-		--sysconfdir="/etc"
-		--localstatedir="/var"
-		--static=none
-		--dynamic=gtest
-		--dynamic=re2
-	)
-	if use jemalloc; then
-		conf_opts+=(--with-jemalloc)
-	elif use tcmalloc; then
-		conf_opts+=(--with-tcmalloc)
-	else
-		conf_opts+=(--with-system-malloc)
-	fi
-	./configure "${conf_opts[@]}"
-}
-
-src_compile() {
-	python_export python2.7 EPYTHON
-	emake VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" VERBOSE=1 install
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners rethinkdb:rethinkdb "${x}"
-	done
-
-	newconfd "${FILESDIR}/rethinkdb.confd" rethinkdb
-	newinitd "${FILESDIR}/rethinkdb.initd" rethinkdb
-
-	systemd_newunit "${FILESDIR}/"${PN}.service "rethinkdb@.service"
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd "rethinkdb.conf"
-
-	use doc && dodoc COPYRIGHT NOTES.md README.md
-}
-
-pkg_config() {
-	einfo "This will prepare a new RethinkDB instance. Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_data="/var/lib/rethinkdb/instances.d/${instance_name}"
-	local instance_config="/etc/rethinkdb/instances.d/${instance_name}.conf"
-	if [[ -e "${instance_data}" || -e "${instance_config}" ]]; then
-		eerror "An instance with the same name already exists:"
-		eerror "Check ${instance_data} or ${instance_config}."
-		die "Instance already exists"
-	fi
-
-	/usr/bin/rethinkdb create -d "${instance_data}" &>/dev/null \
-		|| die "Creating instance failed"
-	chown -R rethinkdb:rethinkdb "${instance_data}" \
-		|| die "Correcting permissions for instance failed"
-	cp /etc/rethinkdb/default.conf.sample "${instance_config}" \
-		|| die "Creating configuration file failed"
-	sed -e "s:^# \(directory=\).*$:\1${instance_data}:" \
-		-i "${instance_config}" \
-		|| die "Modifying configuration file failed"
-	ln -s /etc/init.d/rethinkdb "/etc/init.d/rethinkdb.${instance_name}" \
-		|| die "Creating init script symlink failed"
-
-	einfo "Successfully created the instance at ${instance_data}."
-	einfo "To change the default settings edit the configuration file:"
-	einfo "${instance_config}"
-	einfo " "
-	einfo "To start your instance, run:"
-	einfo "/etc/init.d/rethinkdb.${instance_name} start"
-}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index b8b74e513cf1..1e93daa170d0 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -12,5 +12,5 @@ DIST sqlite-doc-3280000.zip 9421770 BLAKE2B 695eab96f718307a7aff8a171d9e416ddb4b
 DIST sqlite-src-3270200.zip 12248529 BLAKE2B b3c79b85bbfa376b31ebb4ad33aea3f0b60c1f6d1e6505e02758cffff41e44ea0c5b8c24892f0757502ed6213c0f97f00957632ddf0e5ffe25e9f8b7f62c6e9a SHA512 52f61e2fa54558b953dba62b27961eef8563f40e6b4a62638087cb22c7d1fdf2c915ea1071939e2e98f3ce6041da2c9bfb1bdbc1e8b8b4a049b8148e878a4e5e
 DIST sqlite-src-3280000.zip 12477204 BLAKE2B e62e0f36f0bebf89990f8ec91cb1e508a5ebc92bb212eaf9c80eb0febecb5623f5938ecd31c210837314f1f9aab19a18189824f82a106799384d8184ca5f65ab SHA512 49c35c65fa686a2326e13218db583c54fa5fe8f48f0caddd11a942601803b3023f7d32ffbab16641e0d72dc9ed288ad26eaa7226c865ac54e1f181859125651f
 EBUILD sqlite-3.27.2.ebuild 9949 BLAKE2B 2f377a97be15eabca01ba031906aea8a05ad8c19c3b88aa00fa18b3fd8ae875478210471e83b8e670d7ff3da0f8cafd5419810f8e178d49fd79d514b9da3af2f SHA512 8b6bf4e9b9120b7bac35382f6bb4058be193e8295a1d21f18c2d1c6ebbdcbc123f02a398cba01e0100091c760ca0a4137110b66a94993cdbad78c555428654be
-EBUILD sqlite-3.28.0.ebuild 10127 BLAKE2B e1bd35f25a1899e7ce64d3fab52bb6e8f1bde759d41e82bf702889b0ef91d89a3f0cf9bc67922312fb52b58a3cfd432d71cb82b3dd71db64ca44dc498c66a220 SHA512 7c7feda96ef31589c733179a84c0c6b78ee45f2e4270e7d63317417f805d673009ebb84453a83f92ebfb7b5af2e41ab41c4dc101be508cb2905ffa942f3d841c
+EBUILD sqlite-3.28.0.ebuild 10125 BLAKE2B 995abd8fccdb417572ed57027a4e4eed7d4c9ee0014d54b5dd0fd8180f61d9104b8c2134f0d3b9d5003be0d102500ad0efc22502a954fa4c66303887209fdbc3 SHA512 106a158606d090f03418bd0cc8cba68a61dff9d8adc2fb528e70d29ce59f76598c54f945ab48056fb9d8c0f3ace2c6b5a55bdd0ce247bcac8e0f7105af2517e1
 MISC metadata.xml 723 BLAKE2B 8866fbde770e7b8582de27303c72df047db80e0d70b1a1ceca0951a05b51bb704452071ceb6c29ecf3704d523888351615d1798aaab092e6b7505d4c6e3698ad SHA512 40616710b1d4edd3e24b5ac0797c1c9b606aeacac9f9543722bc9529e7c2c704a0c10b0ca68a5ba6e0a0ee8bc605212e8a49a050c8687afbdd7dbf28d6d4506a
diff --git a/dev-db/sqlite/sqlite-3.28.0.ebuild b/dev-db/sqlite/sqlite-3.28.0.ebuild
index 268cf2bb10c8..db4716a06b48 100644
--- a/dev-db/sqlite/sqlite-3.28.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.28.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2019/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index c56c64944857..ef44e090f28d 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 0baf0872a098..23967fe32038 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,7 +1,9 @@
 DIST esptool-2.1.tar.gz 68974 BLAKE2B 4aaddc9bf22a624de18e7d58b35a42f6fa27cf8bdfff119a270b9531f1e19ecb3f4d7eebad319a799068a19941bf0c843fc464fd5ae891d8e03e1a2bad54dd68 SHA512 be657df04a345d2c91bbe3a9cbb93cd7bb0bc68e61388ff4d134c88d514c74fe3f2c5e7c64f4100264bc5973b1d3e66251cdb16a77894fb9e116d9c6a54a8dc3
 DIST esptool-2.2.tar.gz 70585 BLAKE2B ea4553d7857987233d1488e6db1993ec687ce10c9c810c7a5327043283fab19b10863106ecf8bfac6d7585a8bbf2823b90d7e225dd4a27bfb784f183e86c796a SHA512 a84b61875a8f227b8103fcc546eb1323547159fbdc962d0577eb6498126589c9fa3b23ca840d33ab2636d7c05de3eb048bdfbdbd86d895c8e37f9bbc169a4caa
 DIST esptool-2.3.1.tar.gz 72312 BLAKE2B 4e44a2be2a72ab25e85af9b380f5f80896a84490f30180a98ed20822ac087d24511613d205bed04c8c92d1effc6b2074c2208d4ba5f72b6b661aff7c1b4e02b5 SHA512 8025e1e7a378c0fce27c5ea2d3290cd12e7f657039f0fed6b4bd938a10d971739b678714c2f19f0d2edab3d2215e7975ba685604f870d45a18d60f3147c643b8
+DIST esptool-2.6.tar.gz 4336261 BLAKE2B 1da9ea1ed24d1bf91e2bbac079016c4813012946977ca6da7f6b4eac52ea77f501f4185efca39a636cab438720f0a14ca2faf49920228656fcb4786690824208 SHA512 dd2e1815df07a491d5b41b709aafecb642f5b642c83b11e309986ba0ad827257e6b7bb93f4decd7ee37fd10a1ee7b36c836598c0c2e1e60118bf96397c187dfd
 EBUILD esptool-2.1.ebuild 736 BLAKE2B 041a3feb1e25f49b9374eb7400d0c44a53fda0da2b7c637f68cb3fb467ae731752dd24333c7ed7c41cf03e2974d9258cd6708caf10a49ab7a2eef1a070338fff SHA512 7fade88dd6bd6f1614dea002034d02988486c2adc11d3c69139d0ac5ba5e98aee934b0177d2f2c36900e6e605f5ad6619042f1f9f93fbd93efcb14c8bd207232
 EBUILD esptool-2.2.ebuild 727 BLAKE2B 6bf88ce9d4d68bec4b589f89bb52456c2757058e9cca0b682a1a586c5243f44e48a6144bab63b8ef153d3c2fb50dc4f6e918fed33829fa0a3a207fdb1f441a6c SHA512 8f58ab45041fc241ffbdcb6c1ddf46c334abd001b3aeeeb9f246b0e33015c4211aec5dd3ea84b8df0a4c617179d5864cb645583675919b0f12e44847af3eb0e6
 EBUILD esptool-2.3.1.ebuild 737 BLAKE2B 2dc29c9215371927c29518a9c8f3cea3a2d52c3c487060e036bb168f13e8c5ddec01c30ddec6a8502326fd9a160e1dc6a174fb57b0622ee5e3331ac0bcff0338 SHA512 e6d90310c3069c4b44575ed9a593cf911e28e205d70e665b861a7a32d996273f7e071cc901da1ddf24916d769188995515142a4559bcbeeeb58045c65d1d587f
+EBUILD esptool-2.6.ebuild 902 BLAKE2B cbaf5875ea8b230ae4ec47cbd2aa5731aabe46d6cd5d5456b3537da52f5553d5b47bc2bf7168a0db9b3b2fcae26c512233f15d8f82ab0cf12c63bf1fbd56d827 SHA512 04d089065dec17ee8198621033b5dbbfba6b7897222caec9e29502457506387ca173453ecbd1f74de9da2fd499ed3818326b2183438c85db8628319e07a90356
 MISC metadata.xml 449 BLAKE2B 517225c4d9d06734745bf749ec6cf81f325146bab22eff7a0577fdf16d005d82f12dc3f426c71f902558c9725506a13e0b60fe1f7ec00818ec5e3a902a15e8c8 SHA512 67e5139fe841bd608087ee72ab5e25e688abe48892a8cf9e18ebcd61223ff16de03840510fe2e4eac852ad8e0c0da32df2edc797cb1b77a7a48639c2a3d16e10
diff --git a/dev-embedded/esptool/esptool-2.6.ebuild b/dev-embedded/esptool/esptool-2.6.ebuild
new file mode 100644
index 000000000000..f4ee0dea6fd8
--- /dev/null
+++ b/dev-embedded/esptool/esptool-2.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
+HOMEPAGE="https://github.com/espressif/esptool"
+SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	test? ( ${RDEPEND}
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	${EPYTHON} test/test_imagegen.py || die "imagegen test failed with ${EPYTHON}"
+	${EPYTHON} test/test_espsecure.py || die "espsecure test failed with ${EPYTHON}"
+}
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index 6fd807912543..a3ebd02402f5 100644
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index d8045e0ce941..374c1086df9a 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -7,7 +7,7 @@ DIST fast_tls-1.0.7.tar.gz 58069 BLAKE2B d454f85e0ea010a564d5e88ded505c1a30f80d0
 DIST fast_tls-1.0.9.tar.gz 58299 BLAKE2B bc4c45b0fedea79f90644989c6ff734a85b701c2dab3121ad55ae548563ed92046add91780be172e2531dc5ef757415673aeda1215900db84aae178d707328eb SHA512 ed45a5b262d05dba23887e4bf391740f388079afe9a297221de2dae22b62c6dc51b9b739544a54501ee4aebdafce789290764e963218ed3c0095623b407bf0ec
 EBUILD fast_tls-1.0.11.ebuild 600 BLAKE2B ffc71b6e16de4c113317bb87a80262f1d724a1d91df77836e8bd07f8a03cd6ec814227a17588aa14b3858937975d653f710c335abc53a612e0ab47850766e420 SHA512 f33145c9e71f85dfa64364b53f10371fd8900c122ac6068ff32e8644cc5299b7ca1221caec38e900d81834e1adce177c7f29124cfd2b4fb60d625e0e6031816b
 EBUILD fast_tls-1.0.25.ebuild 604 BLAKE2B aaa476e6f79630217bdd37de024d38b097bab024ef79e8b38965289bda8e8895e7cfc0a6bce2f35e249f687412d6638effde2d8d46a773c13aaecbc83dd69a36 SHA512 6281b49e0bbb7ba91e786d48444dd39dd6173bc94b5fe66ef03b456e49942c80b48bcbbcb65cbc5620d6106601437b509821871016287545dad70ed2cda262a5
-EBUILD fast_tls-1.0.26.ebuild 604 BLAKE2B aaa476e6f79630217bdd37de024d38b097bab024ef79e8b38965289bda8e8895e7cfc0a6bce2f35e249f687412d6638effde2d8d46a773c13aaecbc83dd69a36 SHA512 6281b49e0bbb7ba91e786d48444dd39dd6173bc94b5fe66ef03b456e49942c80b48bcbbcb65cbc5620d6106601437b509821871016287545dad70ed2cda262a5
+EBUILD fast_tls-1.0.26.ebuild 599 BLAKE2B ec64d292160571ed7435dfcb269ae308e7fc0793455661acb253811e035645db4b3bff889b029d4276b44f7c1f387181b44a5c61e7f969b2fe31a1a51018bad0 SHA512 68f55bbf5afa259ef9237aec75efe3dc0a4f4088d417dbbe73974de3254bb1068683ff8a62a3e31c094a8b5b8218ed4d33f358a26ef26b043273efea17d159f6
 EBUILD fast_tls-1.0.3.ebuild 532 BLAKE2B 4e67cd6b566be9f381af043f411c5df8e5cbc3fbb6fb6016201256f1eaaca3881e4ce947cd78e7ea77b9616ac064050bdf205a85cce32382b61bdc2dca563186 SHA512 14ae845928c88e7efbb4d9a693b9b61e301b2fd1edea60d01e7072c490c74aaf09b42fd6341047cabee49812f85110465aa24a8c9929e1276af6eee39f342c78
 EBUILD fast_tls-1.0.6.ebuild 602 BLAKE2B e46aeaf9df9d5f7ab938633175ba55901b9d894068f9463e6508b32cc379e6c198fd00e61d8b94b434aeb909e405bfd7674214902397cca2dd115656a557c226 SHA512 c920da9c247e00e8d2e2adb424ecd6bc2f31b9c363ffe8a2a5687cde527964918f89d7804c05269c1642788603bc2242789f4380d6d49c6517ba1c0e1b88a03a
 EBUILD fast_tls-1.0.7.ebuild 600 BLAKE2B 4b4d052cbdafd438f45968c4813be7e2d58a7e70698f4ab5f483fee137bec7becca997d2d6acc3947479f3c9f6364a0afb998eb65094702545c77501b53a6cdf SHA512 1428618c39ad08f6a37e28ff0b4793a384c196bc577b22ed3f375cd99587ff851816d2c5b9b310f3130a39375a17533cb615dc9680f5e556d514882cf0dfc4ab
diff --git a/dev-erlang/fast_tls/fast_tls-1.0.26.ebuild b/dev-erlang/fast_tls/fast_tls-1.0.26.ebuild
index 43413ad8829e..18a65fd93756 100644
--- a/dev-erlang/fast_tls/fast_tls-1.0.26.ebuild
+++ b/dev-erlang/fast_tls/fast_tls-1.0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc ~x86"
 IUSE="libressl"
 
 DEPEND=">=dev-erlang/p1_utils-1.0.13
diff --git a/dev-erlang/p1_utils/Manifest b/dev-erlang/p1_utils/Manifest
index 75255f64e2cb..13c10671d4c5 100644
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@@ -4,7 +4,7 @@ DIST p1_utils-1.0.5.tar.gz 44167 BLAKE2B 1863ab382557e6ec453ae868688f8bd9d648648
 DIST p1_utils-1.0.6.tar.gz 46271 BLAKE2B 9742785528b82e5f7359d01e79f1f7e2bcdf33a6f9c177e3d5a21457bcbfaf768f3a18637f7a0ccd9368801f62d8d6794145bbda367d32bb75e45cac6b673ee2 SHA512 8944e8317358701a4bd5f266b32a8d07ac80e144c768a5118d67dea21321f01bdcc2bd13a8175e306313c8a117ebd8876fdce8fb2b52bc098341cd72ce041c29
 DIST p1_utils-1.0.7.tar.gz 46312 BLAKE2B 31e79fbf30f0ac90ff2319129f12df908243bdcd7b33310b975dc5a1d74fb2df590fc627f9ffd2d11ad9ff8be121cf79deb3b4672ca5aebb248c5758a21276bb SHA512 1a60ef061d543e688f22bbccafdd7d0aa749c23646546a55702eee5f8d6c8fa80f0c3b3a0b1054ea0b00bd76eb094473554fafd8d48f4785975e73e9c7dd4fee
 DIST p1_utils-1.0.8.tar.gz 53349 BLAKE2B f936b3a26b90c263f2b5e67e8b17e989c0be4270205eecfe3dafea27f704c3bf67c8914d104cfe14bf8ce06ff3e2352eb31a07bde956bee88e579a6d1e388436 SHA512 675439bf8872bc79a603032683eb322636b4c8687ac18d4bde2cd526bd86539c342024ef8aed5717083d9638f69f409bfd2f255d49267f528f67c42d7ad1e43f
-EBUILD p1_utils-1.0.13.ebuild 495 BLAKE2B 05b28afc1defa5ad9a89f5f30225e47d0c58540f11f9a5db7e78cd87224a1bc5ad6de43eb9e91b8b42e0917dd2c03057d8d8585780b4b3984d12f2987027d5b9 SHA512 ddde32486d70baa05752c5351012d0b92cb1bceaca64fa6eaef37dd5010804c75ac87e033d020a1a37534a93085633fd237ff7a7e414e5c6d6cd9dbda64b5050
+EBUILD p1_utils-1.0.13.ebuild 488 BLAKE2B ed5c41e937d6fa607934425175739bcddd8bf2b4bdcb5ffe31be6a886231b55fe8f9bdc84ffe10d58ae67a2221474dd56c41ee7650d8468ada7559bf5ce6bbba SHA512 eadd145c84a2e4d3cf64f98db7088d9490ec4103d92aae78f04dc2cee1cb32d80fcb4a6a144c8054871cf388611c59829a9760c1683a319779acc71efe7e0e85
 EBUILD p1_utils-1.0.4.ebuild 478 BLAKE2B 5009f8c618248a139f5c804a4d3854f041e4987ea581303cabae693bd8f789e7fec33d07213b046ed7cf26be0a4ac21787397f64beaa7e55417b84fa97e3e8b8 SHA512 cef6f78cb649a4fa1187dfe7762b4427d9f3e9ccfbd321cf7a39c11710ed8fc5d1c530d9712e62562a2b35547bcb61731c49cbb11be2710bd2165e88df0ce015
 EBUILD p1_utils-1.0.5.ebuild 478 BLAKE2B 0b77490421344acf82169ee6b536b2b94cfb113e79ea4290b54404049ad4c08b30628679480be447b8562016571dc2c46ef70ef990dd1092027b91829360690c SHA512 737e0078fa394041ee50a18f2fb4a31610decaaacf0da60043a7c71be0bef18915098e99cbafe4e7ffe46fb0286ee77e8c89a52a134752b5a3011a2cab660f32
 EBUILD p1_utils-1.0.6.ebuild 481 BLAKE2B d14873f33df23defd0472aa9c77ae57a2c677742039b7b0cdd2e1d455654671c5402f94b04915c6185cee6f050a1a82e21fd386279d039ed17d6d45df92f3233 SHA512 e2e73bc6e528c443c5387c9fcf21efdb9021d701431f4ace69f34056d77a440462862aa414fa51eec8b90e6884b0cde054053525b3a07d4b4c94e77c0b9ce56c
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild
index e0a8a9e30c93..b8ee0a7f9fec 100644
--- a/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild
+++ b/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc ~x86"
 
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 3d4237faba57..7a9a3e669db4 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index d68638c818ed..eb74cc6ac440 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -2,6 +2,6 @@ AUX physfs-2.0.3-zip_seek.diff 535 BLAKE2B cfb10e446d6370c0365071d38c2d9ebedf238
 DIST physfs-2.0.3.tar.bz2 560628 BLAKE2B 8e3e8497463886678aaa671269133513f08aab1e49a6397f61cd44a5139030326ae0889e795401a967b0641f680f353dfaa39d7102502c2b8e0680c0a5d158b5 SHA512 47eff0c81b8dc3bb526766b0a8ad2437d2951867880116d6e6e8f2ec1490e263541fb741867fed6517cc3fa8a9c5651b36e3e02a499f19cfdc5c7261c9707e80
 DIST physfs-3.0.2.tar.bz2 194888 BLAKE2B 67b6b04e3822c2528a31a2c60345238cb5f25ad031e32a6c3416b91bad6347af9f02dcfb8dc29a71c2bfc2b7cec7f0749ffbbd0dcadbc35703576ad895f568d9 SHA512 4024b6c3348e0b6fc1036aac330192112dfe17de3e3d14773be9f06e9a062df5a1006869f21162b4e0b584989f463788a35e64186b1913225c073fea62754472
 EBUILD physfs-2.0.3-r2.ebuild 1434 BLAKE2B e90dfa9de136d2d0c6df7247b7681cfae7dec40f5c9cce97b089c4edbdd6a82cd220e75726b63c6c1d473f1203812e14ca587cf04131a6cbb61d963159d665b8 SHA512 543e02d9f4c5653c385295beb92c3e002cfb153fa968dfeb386fba205523197f35d0dbb9e57e82960583ae5ded4232001a91a39628ceaf2a195c3215ac6ce6de
-EBUILD physfs-3.0.2.ebuild 1401 BLAKE2B 2f0d1e876a515e6d09ce9441dbf0c67d62ea0cb7a773f2a9c668d6c2e88226b9d69991df44f2f8827fec4466c7a193370767d17b4d019414d578ce48380d0b5a SHA512 6f4f3619d3705b5d355d288e2673e066ec9ceec32c9a549495c87fb317f85646b049d05aaf8fba4ad81be99b2d387e5ee891dd43c32ce86b4062e25d6a3dd920
+EBUILD physfs-3.0.2.ebuild 1399 BLAKE2B 179e615df2bc1b22d1f6843cbf1be6d4d8fad5c517840b4e5773fa48b690b6b8fbc9d9262908c3c97ff5045edba89cf449b477b8b7f0d1859c3e635201a9389c SHA512 2e7f2aa60917c72006fe1858814a5555f0c1f035aa9d8fc49c1521ae4d9c52b9224d2c6bc722196ae2d19963ea6dde62c8a6947bd1e1b5f8a08c078407aa8f50
 EBUILD physfs-9999.ebuild 1401 BLAKE2B 2f0d1e876a515e6d09ce9441dbf0c67d62ea0cb7a773f2a9c668d6c2e88226b9d69991df44f2f8827fec4466c7a193370767d17b4d019414d578ce48380d0b5a SHA512 6f4f3619d3705b5d355d288e2673e066ec9ceec32c9a549495c87fb317f85646b049d05aaf8fba4ad81be99b2d387e5ee891dd43c32ce86b4062e25d6a3dd920
 MISC metadata.xml 2046 BLAKE2B 0bc4d4b847a4749f128b4a01d9a956182cd6b3b8bbb7c523ec62e4d9ab727e583e5265ea49fc835c32c3a43b4561d204b4fd07b93d2f09d5b6c19dc092734554 SHA512 93ef7139120382d372585bf5b9584c13ab9f8d40c4d99ad51fbf413490ca8451c12fae5be99e1740bf589401e49f2bddc9e804072f3b1bba9b3bee2fa91f5b80
diff --git a/dev-games/physfs/physfs-3.0.2.ebuild b/dev-games/physfs/physfs-3.0.2.ebuild
index 91229a1b6d98..8bb871f8cd89 100644
--- a/dev-games/physfs/physfs-3.0.2.ebuild
+++ b/dev-games/physfs/physfs-3.0.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EHG_REPO_URI="https://hg.icculus.org/icculus/physfs"
 	inherit mercurial
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc64 x86 ~x86-fbsd"
 	SRC_URI="https://icculus.org/physfs/downloads/${P}.tar.bz2"
 fi
 
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index cdf8ce2f1975..d3731a594f52 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,6 +1,7 @@
+AUX simgear-2018.3.2-boost-1.69.patch 669 BLAKE2B 76d25e88ebc6b47ea60ad59771d95b1f676a781424bacd9ce3e56ff41810fea000437bdd9dea6bad176cada9a70d1f0c6105f9394461cd29c3fa603b87334661 SHA512 92387eec8cadacfbb6d3ed3e827abdba49a6f9699dad665eac17ec3099423bb38e3ae28894ffe92670f9e823020ee88279f8f96f71acfcfff03f9502f76d8636
 DIST simgear-2018.3.1.tar.bz2 1330322 BLAKE2B 5b350ddce726d8ea15c4a1a64a28b9e4307647378c52989231daa7b4a0e53730dc754c239660d0f5ec33189ece6629448b37f61ca7578c21c3aa4147d4565a26 SHA512 673ee76e9f4f9c9adb25a2523bad5b70a079d821391cb8fc9f9e651ad6c195356ac9a8ba18a65df365dc66990406de287099fb249ca23eefc111ebba884f7289
 DIST simgear-2018.3.2.tar.bz2 1329982 BLAKE2B cc4ee90e0a76db5212ca3bb8f422376d9fd91c261c4aaee1aa0c2dc7438ed589866bdde009fd44c727ae87d7365d4aea67da0cfd32ff26d47e81eb9c027ddf0b SHA512 3f60df34f22ea84bdb3e0aa0e2c0b73b2fddf15d17ea985aee254bf4c269b7447976629a7e4b022c460c7c406940d0b2669b723c6b899499d064cfe91546f0ba
 EBUILD simgear-2018.3.1.ebuild 1287 BLAKE2B 24ab62ed87377e3768837df1142b60a7b4643aad77997f2b58499ceb9451258aa4e040b603deb14fd3281e27286c0567663a958cf558c576481364f405a094af SHA512 3fe5d0ee5312bddc9d943ba565222834611fbb64446ee3f2455e03f389876586e2f118d4077a3c859320018db2a4879fc7ec48a36b225c5ac82ea377eac8936d
-EBUILD simgear-2018.3.2.ebuild 1473 BLAKE2B bfc47edecae046092dd64493fa574961c274cfed77b2ffe23821ff741407593b83e49398a4b8b85a0de069e90e31478eaa281ad4de6ad0b45d9efc79565d42d9 SHA512 bec365a0b3dd69204a5d66ce74254d4a9b1869f5f4c5712dccfb2312a74ce034ae52455bc0f1096b36cc78146e6b022b5bc403a6db49a7d75a9c7b2c33ca934b
+EBUILD simgear-2018.3.2.ebuild 1522 BLAKE2B da14df468a2b45f76db471237ea0e2cf4d3ec717f97b9bd4acf875d8f2857c6be01ebc71301ca4c589a80c0d16e21aa42dd2b59667856206ebeb5c00c43cfcc5 SHA512 b8f4ebcef5fa3f63837d77c1d318e93805c959a30e4305849eedf9ded103325520e16d3be1b5c7a0f229d679b5becbb733000198e137fc951c4c8ce4f7d38bf3
 EBUILD simgear-9999.ebuild 1535 BLAKE2B cabc0460fe4527432239370e2e9e9c4585071a9efb2771a8d5100fda599e07d7a2b3351932eea6d82ee54dc4e43b6fbe233adbbeebe12c39f643920b3c498b7f SHA512 2b0998e84aca57859e563e823161ef1dcc7e1079f0363d7a9a18517439ae98160dfdf754d22365cfacb65df5803d83ffa1a0da73eee37c255be550d449d7d225
 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8
diff --git a/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch b/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
new file mode 100644
index 000000000000..2372c8c58adf
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
@@ -0,0 +1,24 @@
+From c1ac1fb93dace81b2a60f9d1f5d6d20298c8b9bb Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice@bellet.info>
+Date: Fri, 1 Feb 2019 09:29:40 +0100
+Subject: [PATCH] fix for boost 1.69
+
+---
+ simgear/nasal/cppbind/NasalHash.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx
+index aac672fd..2ee7d044 100644
+--- a/simgear/nasal/cppbind/NasalHash.hxx
++++ b/simgear/nasal/cppbind/NasalHash.hxx
+@@ -23,6 +23,7 @@
+ #include "to_nasal.hxx"
+ 
+ #include <simgear/structure/map.hxx>
++#include <boost/core/enable_if.hpp>
+ #include <boost/iterator/iterator_facade.hpp>
+ 
+ namespace nasal
+-- 
+2.20.1
+
diff --git a/dev-games/simgear/simgear-2018.3.2.ebuild b/dev-games/simgear/simgear-2018.3.2.ebuild
index a65b51665aac..ead30a3c496f 100644
--- a/dev-games/simgear/simgear-2018.3.2.ebuild
+++ b/dev-games/simgear/simgear-2018.3.2.ebuild
@@ -31,6 +31,8 @@ RDEPEND="${COMMON_DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost-1.69.patch" )
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 7e144784f587..93e7dc95eb7f 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,3 +1,5 @@
 DIST tiled-1.2.3.tar.gz 16848125 BLAKE2B cc2ab2a2ab14a575da1f47a415e1c544de9a80417ea5a081684893bad253fc742f89f5e17739bfe0617f859f6921ab214c2e8bdefe321545008b277684e654b1 SHA512 0c9e818872b1e8de67ff8d943dc47abb63667bc45917b29dca959b0a32594be4ffb156469375c0f5c4a4fa71ee85b05c018c58a2f581a860405cbb12c9c0aac5
+DIST tiled-1.2.4.tar.gz 16875074 BLAKE2B 19d9e000949a889af90f48c31862aab8d00cbd968d518bc48e58775763ff2b293d5e82f10b8ec45dda936bf81b177f88aa4962900c7b70b01ce514fabf717c46 SHA512 a16fcb3fcceb11397cc981f10a558215264cf2c340639fbc001d384cfd9bc138c05ed40894a03d103af8a7d629c0be9fa6d5a4058fd9c563806920efef8e2cb7
 EBUILD tiled-1.2.3.ebuild 1281 BLAKE2B 317a129e11a98236de269a835fbbb19f07f89910a434bc9563b31bd4709bb3904389b1e734b7f1c636adbdabcd05f15902c68b9ce28277f3b1546e21b9be2608 SHA512 468eae31ce23e157dda0434e17c1b3a06b1a3351c9d552f99605b78c5a9ac39e412b6f36a3850fd2f1de5081c1e3be266601c65162f10c09cd76c4f076be4ced
+EBUILD tiled-1.2.4.ebuild 1282 BLAKE2B bf8237182f14bb63c4108d9b17d28ffa1976b25984839df9989d788f11475a5fe18b446833693ace31f41107617323e575f932b6563e28ad1a83bdf9e189529b SHA512 a609f4f85a6bc015e16d79abae91d5731ba4c8fb8b3ac572bce7fceb6fff3910f4c34ad2329ed42cc74b5be4692bee63049ede4b0fbe0681aeccd1e90f63a10a
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/tiled-1.2.4.ebuild b/dev-games/tiled/tiled-1.2.4.ebuild
new file mode 100644
index 000000000000..56763ea7c4f4
--- /dev/null
+++ b/dev-games/tiled/tiled-1.2.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit gnome2-utils multilib python-single-r1 qmake-utils xdg-utils
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.9:5
+	>=dev-qt/qtgui-5.9:5
+	>=dev-qt/qtnetwork-5.9:5
+	>=dev-qt/qtwidgets-5.9:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 932291c1c695..61067e4ad229 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/async/Manifest b/dev-haskell/async/Manifest
index 98cf4349d1be..bcf73dfdef81 100644
--- a/dev-haskell/async/Manifest
+++ b/dev-haskell/async/Manifest
@@ -3,5 +3,5 @@ DIST async-2.0.2.tar.gz 8565 BLAKE2B 8bda599c7a5bd30b67d73de87f136eae3535619e3eb
 DIST async-2.1.1.tar.gz 10565 BLAKE2B a379efe6df6c58d1962d820b0f1370c87af487b61f7c3ed32fb22398d77be8265a9577d44793624fd8b0d41c930c2f94106511d816df9600e7b7a17b897641bc SHA512 85a878389f019df0038f7b0ea82e8619f30eed97cc5c53438dbcaef128c08cdf5658afa203605434a2e1eb885fc28515a30c83341cb1b77331362205d521972b
 EBUILD async-2.0.1.4.ebuild 832 BLAKE2B f9960f60231759f3935221703e7aed56148e2273df5d1ef61b06cf41bd9364ba1aa2e4ac7812158ebf71f18a3983c4daa0159aa6f1b00c118c452b956f42a370 SHA512 3582d92b5d21906c92cb6ca7b642f4edf86391f4dc301312230f526f4bf076ad109d18faacf473a523394d23a91b2cfd0fbb657cfbecde7956e8641b4b6fb1d4
 EBUILD async-2.0.2.ebuild 755 BLAKE2B f8f75b6b534ee323a579fb2a37ae8e294390a45c5222f899b943675983c9da32a65d56f0f3893388d26a2cf7e3f1ca4d77aa36b73fc3cfa660e00a4737c23eca SHA512 6d2fceed548b4673b799b04f3c8448bd8706520a9f7f60af11f1c0613e3d0ef62a3e176a3b55ab511025e41d3c16ee54cfa5656d71ca588e792a417498512648
-EBUILD async-2.1.1.ebuild 756 BLAKE2B 8e75874e7b75aa157d176edf261a79705747130d60908ced3269d2e95f98d5ec45fa8570bb09b1cd8580140e5f6dd76cf253b2b8a33bfc2e89d7361260173f61 SHA512 e9a8e214d78534f3b56fdf6b72f34240b60acfe779a1e34160f0523bd00be1bb526b5eb093f8acda2a36bb2ea162e87676434c22e20474dce8d8a387e9e500b9
+EBUILD async-2.1.1.ebuild 777 BLAKE2B 1d57e083e378816fefd45f393d2c27a6170372df3b3eeb3c75e560b5cde86a305486eba36368e4551e907fb90bf55e75b4f4f2a08f148b790f6be22504135dbd SHA512 0d0c679e3e33258b8f99b36c38e8118a28c5a9501059f6e91694a4e88a7bde901785729ae80a8dbc87c9e759b59480d6ac843d844bc9618fb2630e14a76e97cf
 MISC metadata.xml 1591 BLAKE2B e513dd2e93240046dadb6412fa548d7a7390700a80d241a4fc00a8204220541fec695e82fdd64a122dcf923f6ec91c8ba67c627c6997386cc09b24956364d3f3 SHA512 9fb7bd1b705dc30c1e8bfeedf6cb4f3ce0391b60dc0eb362536615e7e693cfff0917fa74c1fc725811db1017d186782994b3aeb106059fca5852c1232f48080e
diff --git a/dev-haskell/async/async-2.1.1.ebuild b/dev-haskell/async/async-2.1.1.ebuild
index 3827b4ce1cb8..d9da91ad9fe8 100644
--- a/dev-haskell/async/async-2.1.1.ebuild
+++ b/dev-haskell/async/async-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?]
diff --git a/dev-haskell/attoparsec/Manifest b/dev-haskell/attoparsec/Manifest
index a63d6f6c58ef..4a83f4495aba 100644
--- a/dev-haskell/attoparsec/Manifest
+++ b/dev-haskell/attoparsec/Manifest
@@ -9,5 +9,5 @@ EBUILD attoparsec-0.11.2.1.ebuild 868 BLAKE2B 4809812dd155a2aa57cee13fad607ad1cc
 EBUILD attoparsec-0.12.1.5.ebuild 968 BLAKE2B 26e6e88f7273ad5f83ad3d7b9d9d45c525575ec62e8c36b2b08a8bca9d1cc4dc5855881dd3b98ef5ea572e03a33dc4e240ea9acbe18669c9bc7a7f99f5779b4d SHA512 4cd28a39120993cc46e1f3c512541b0fdd9689ef5cedb232a20463a37862bad02df683dc9d81e931211e6c271b3168404b0a91106ef8df21ab3f7f2ebac352ab
 EBUILD attoparsec-0.13.0.1.ebuild 1009 BLAKE2B 11bcffc02d7f02b6943558fe73b708ba32f5a1fde155e697b5c6e52708daecf3dc619289a65bba6dfdf5f019235c95f60c1226e8e1479464c075faa81501278a SHA512 e2c3fc90378d3f6ec4db233ddf509d59f2b90ded3c0ea622c2df328c5add22bc342550a1997099e8abc6665057b97200bc9300d49e6e8e4a147b995393106edd
 EBUILD attoparsec-0.13.0.2.ebuild 985 BLAKE2B bcbb404882b94d2fbfe40624a9362ec1387de6be8c70692367ffe06fde2caf8b355e03ec7d9beb341fb5b81ed37195b53299f6414f8d796f22dfd48ddc97a9d6 SHA512 9a1d331c4d08515dd3c0eaf7ba9cbc8288c6bf97c26618409c75b469c70fc31a0b557c8486d62d843bcbcb390382d44bf777707cc15d7c05b9f60f4a827030eb
-EBUILD attoparsec-0.13.1.0.ebuild 1107 BLAKE2B 0e1bb93132b8a9118cd7b0b016603619ebc83e37f1916254c16c11d01abdbe6f4ae81e1ae7567f7a29ab7abbd1547005b4275a41a14277ed3a117a94da08d13a SHA512 39f2cc6a5737dd570bb148df293773991527dc87cf08d03e55dc16cdd896f7aa4d28dd3d3962891c1df4574d547d569a06cc9d47c771038815cc5ccfb9ddd336
+EBUILD attoparsec-0.13.1.0.ebuild 1128 BLAKE2B 2a857e97bcf496216b9e551d2debc17643499e6a5e9b1f7609f95d94b3ad4c1b64c1c1a13c9d9ffc243e247f2a180309a0d1316f56729e364cc7ad922c10725d SHA512 e6eab0a52d2358592cb6cd41bb3fbf74d30c35e039b895227866dfe6d6d63fb409e360ababf92333800e1c28f882077b0aa750f3e48987a52387e22cb9455318
 MISC metadata.xml 514 BLAKE2B 551631ac80f8d13c6993b532a7ccb86b3749ee0e63e580220fe8413b9c89627ac9da347ff69e49ecdc957733d03f9af431a814370e2c51b77417d25291ddb437 SHA512 77aa3fc771b12645bc64d295637eb3d6470fb1aa2ff6c12b37a2056bc554a93e150db3db72a20cd3cab9d162f8fb7ea2a3605a78c3fb53d48cd509ae85552aa5
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild
index 0170701c6b19..dd173cbce7ca 100644
--- a/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild
+++ b/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
diff --git a/dev-haskell/base-compat/Manifest b/dev-haskell/base-compat/Manifest
index 20efa194896d..2d9c451cf022 100644
--- a/dev-haskell/base-compat/Manifest
+++ b/dev-haskell/base-compat/Manifest
@@ -7,5 +7,5 @@ EBUILD base-compat-0.2.1.ebuild 617 BLAKE2B 7d01be9e7df4a567ebe7d75548176d908cfc
 EBUILD base-compat-0.4.2.ebuild 672 BLAKE2B db27a9815d52dd3d9b6959b0af8083bae982bf912fddc663f411e30fff15f296dbc21d7aca4ca6000083e17d6e6afbd1f6cb28d56954f3d3c8ce7635e88efd91 SHA512 fa27c8ccb7c5137f0c91102beeed49eea9d352359df780017d0479e1c18facfa768c658b24325d8982dd2472cf984e047cbbdaed1e40103ae84ee862981c7fdc
 EBUILD base-compat-0.5.0.ebuild 699 BLAKE2B 03ee5b422b4d8c66e38b192bdd234f056f0e94e20479ccb5b1bf9d2eb1b968b4fdc20c0e966831835b6f49cb96c199b85186c18dd0abdeaf34ac1a7c36f11119 SHA512 3d23c1772dca4adfff253b420c7e8f8289911ab21553bcccbf83832e7044f8d0854c77b5b762e236fc3f02406b20d152a15e4ab3c1e6e5d51815b4cb583087de
 EBUILD base-compat-0.8.2.ebuild 619 BLAKE2B 0dda4fc1e5cdcbe37127cfdacb8ec8cfc1bc1ab51577007e60de14d4b482eda9087bade26b2699610001d4df81c8f3f2e00ac51e27fbe627b84919b24d6ebe85 SHA512 24c6d88d9c32318063cf100f27c26cf224a7fc6524903d9fb05d13525385dffd6bd23c3b7cc51e3ca034f87bf56b22feb1b2b60b76037f1ad990c737cf2caada
-EBUILD base-compat-0.9.1.ebuild 617 BLAKE2B 02b21d4ce6fd5e0c0e714a39da99a1ff792331879c6cf179798a887d7bafc22268eae59a31a2a43469027ae2a3221bce0a684b5859f35cddd71f7411b932b0b2 SHA512 d53999096c63e813fc20fc26f0386f1cb32773f74dabdff46c448aa3f16d4be877e8c8a9c3ac26c794135e725aee089b3997508dd09d8aa8fbbbc2696b870954
+EBUILD base-compat-0.9.1.ebuild 638 BLAKE2B 579a76280e1f8abed4265aa0eea061fa28590cbcfa4d35c9a03cdf7a5924b1695bf296af4b18e8a2e45bf1979c3d48c0683b72534f20b65f18ed525e183bebe0 SHA512 035f586100a0a65ef66dac9742577aa7f6fce11228cc80c16a66126b266c580ccfe123f78c3617cba142747ce8b67b098ae6281c505eab301c606f8d000f0629
 MISC metadata.xml 403 BLAKE2B b7e17297a4bcf642f6a31cc8ea90ea70139a8d7df7be9efeb813dda8e89117011e4104e3fd70c0546e0c9dc6d550407997803afe3448df7bf3125911145303c6 SHA512 03dc1ed3064ec0cff1d67ea3559d124e78b639d9eca9304b9864384cdd9bf51547a73d6569754fe5da74fc204e4ac1317bed92847f6a0ef14033eab3f4e7bfcb
diff --git a/dev-haskell/base-compat/base-compat-0.9.1.ebuild b/dev-haskell/base-compat/base-compat-0.9.1.ebuild
index 7af9e2d14aa8..c58a014ab4fb 100644
--- a/dev-haskell/base-compat/base-compat-0.9.1.ebuild
+++ b/dev-haskell/base-compat/base-compat-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base16-bytestring/Manifest b/dev-haskell/base16-bytestring/Manifest
index e5709c1b6063..3f6d1634f438 100644
--- a/dev-haskell/base16-bytestring/Manifest
+++ b/dev-haskell/base16-bytestring/Manifest
@@ -1,3 +1,3 @@
 DIST base16-bytestring-0.1.1.6.tar.gz 3694 BLAKE2B 81ea5573cc853a6fb55400b28b7a667ba175a6ae65547dd7ae8b450a72d950c4513bf464f1646c4f8167a2e477974180d85a1884a22b468c5646a5c8b6da2186 SHA512 699bc1f7819a1c0cea0154626f8799301bc9360bc997a5e9313a605ec33ea04d77219b100693021fd43e01d8d979374db07e6e3fabef5301c411f335e30a8cba
-EBUILD base16-bytestring-0.1.1.6.ebuild 570 BLAKE2B 24c66610bed392bd4fecb91cfed1e48173ffb262ac65ddeb7241b1a3ba4d420bc162064fccc923c66720fc6f0f1a32c0ace747f5eec2617602ec479bcc4e8bef SHA512 9ce22cc454d6779ec00dc8dfd3debf84a8d80aea9f0db42afb8f53258feadb055989576b53b9d0fb3b655b3365243a2c567b4282f5450a8c1a19bff8b22d43bf
+EBUILD base16-bytestring-0.1.1.6.ebuild 591 BLAKE2B 20c3c5df026c28ab6584f8f8bc18d2a58a5ff492cc0ceefda637074e0c6115b8b2e4810468fca849a657a13045f69a6ff13bf2cf2f0ebab221518aa2e5e4f72e SHA512 f08d463f9eadcbb6389d0ce25f50cf5b148c35c8fe996b6540f30f0732dd364debdbe532e87f08b3a8d4d4fe020def306a2db99e5886c42e80f7dfac40450ff0
 MISC metadata.xml 432 BLAKE2B ab9f02333bb28e9548718c71824efdbfe2e26a00b474383768d5cae32728fa8a9ee5f3777b367469bbf26bfe0d304617a345cd10bda4833662639cdc977a420c SHA512 01711bdf5dc977130458d4e9181ed0985c35c1c6fd0da1d1367233a0fa2a2c8c8e584599bc5492f037845856dc8b1e163314c5d1519ba5b1a18c67448b370e95
diff --git a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
index 3610784beb00..90540c7115cc 100644
--- a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
+++ b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/byteable/Manifest b/dev-haskell/byteable/Manifest
index 2095665bf733..cbeafd90acab 100644
--- a/dev-haskell/byteable/Manifest
+++ b/dev-haskell/byteable/Manifest
@@ -1,3 +1,3 @@
 DIST byteable-0.1.1.tar.gz 2400 BLAKE2B 0da53566faeb934ffb63623dbc58f6f3b2e4499f6a5547ff6707b034e8e5ea097c4dea600d83421f7da47958cc54c0377d4f53e123480aba464ab5fcfe7780bb SHA512 f2e6225390be9f35ee6a4ce981aaa8c2683f1627a8401386b1abb7fff5fe1474ae0fa07e71a0c83694d7a18ca793943fe36b844d868c3e9c3387ce1a7b2bf54c
-EBUILD byteable-0.1.1.ebuild 542 BLAKE2B 306bbe6f065a665143e4f6ec5fdf1c3fedbfb70667442eafb2f1fd9a56487aa43d6c39ca0239f27f4d0c58dc27434988aa585615cd37eea5cde9d9955f3cfbc9 SHA512 c6db6ad6a6388ac96dc118fc7c83c8ed8fa5f91b7cf29bff9dbac95c0b358034b36cacd75cb913c8e0a53fbff8909c3f2453380d2cae1dc505087f3f335763ce
+EBUILD byteable-0.1.1.ebuild 563 BLAKE2B a6396d2452f2d42ae31421529d4e87ade789127655d3c520929b5ab6570da31189c01a10c1c7c0141478038538a946ea4c24fab583e9a0db74c7a424371f9185 SHA512 ca6e213d4ef41f399a01b4cf43e4550130bb7d259a184412ae72741c1a0c939afd16fd54089896b21508514ce160dda780d957956ad92414123d5477ad9ee902
 MISC metadata.xml 643 BLAKE2B 0b7d1cdcd4ab0cbf6bb5188d998fd2f41ced93612c8040e1ef21a00223a3fc165593de53ac413baf9bcc31dcb5dfc4146fda3c41c93d4ed70177e175dff26828 SHA512 e13e4ca680397e42cc6b852af77fb8d48f55238bc9c5ff58469f3ae8815b3b2db8cf9055cc42c2f8f965e699301ee39dfce56b2fb9859a8aa06f64225bd4f0da
diff --git a/dev-haskell/byteable/byteable-0.1.1.ebuild b/dev-haskell/byteable/byteable-0.1.1.ebuild
index f80dc3aa42c2..b575115de433 100644
--- a/dev-haskell/byteable/byteable-0.1.1.ebuild
+++ b/dev-haskell/byteable/byteable-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/bytestring-builder/Manifest b/dev-haskell/bytestring-builder/Manifest
index 7cba91a1af9a..65fc461169dd 100644
--- a/dev-haskell/bytestring-builder/Manifest
+++ b/dev-haskell/bytestring-builder/Manifest
@@ -1,5 +1,5 @@
 DIST bytestring-builder-0.10.6.0.0.tar.gz 44593 BLAKE2B 8b3834ae207f527e20d2cb32e125029196b8f7d3ac2bcf65826617ade820fbde3e9a43ee0a322a8632d1ab8a15548856b1e445ffc08bb62db13b8adf5a30f607 SHA512 1281aa8ef2f77fcc5a75a9cbb54506fb207e4fc9f6296213ab6a6389c83a53f6e08a6e929d3c456b7f099e18106e228416ca6d6269215f3e3c72cb29eb39bbe3
 DIST bytestring-builder-0.10.8.1.0.tar.gz 43904 BLAKE2B 220e323b0fc7b56b9cf984d268eb66541eac06202cd699107a9350a5edb6d57a388583c245a06a65c1f68e21a7de21d74388a39f4778ee5288af0eeff7ec1da9 SHA512 f01d440e55426b5f2836cc68087d367156adae7447409dff19ca334a8509c8731ce32539b76dbe33d1c9809c3e196dce9a1f3e00b1eff3bb177953cabd23c9b6
 EBUILD bytestring-builder-0.10.6.0.0.ebuild 545 BLAKE2B ab7d1649de6a19730d176035a6e0c639a67996b18c9a4595eae6e89330f71192278ddb8211e3914bdcc493419b7a466d2089339bb9ded86d618c04d17eece0e5 SHA512 0feef52b99088809a2d898b08194d2ec236a347866c9f695a3446c4982c99d15c344e38a27e1305951e7340cc045d7e19b347af91a8c0c87cec4987f8fcc234f
-EBUILD bytestring-builder-0.10.8.1.0.ebuild 550 BLAKE2B a8fb2ccecc0528da4811860c4c7c68920db2eb78f6a0860886510d9cf5b117e92aca3779b347454bcd50ec12720fce4c5178f754f9ee6529a6dbd064ed1e1cf9 SHA512 8d8a60b054eb588b2f8807e03b6c30ef24cb16ef79df8d22aa276731a09f1caf3a7143491459efb4d54ae07396a74a6f6467b73efe3b69553ebce6657e6af7ae
+EBUILD bytestring-builder-0.10.8.1.0.ebuild 571 BLAKE2B 824d610418c95f6f3b3e5b6e8925ef302661bc54a2ff104f2723bc7ae14a86f752f1b9aecc523c4e7e92e9cb465a29108f8f749b66f6756835527da73197d47a SHA512 0f2298daf9f60714f1f24c0e8365745a7abfed550cd2be93b980027a2164a6ac0971f4a6e5473442c23c6eb51260d8f8087099300bd60cfe491eee5ddcfa4dd9
 MISC metadata.xml 1612 BLAKE2B 25d3bd6bf77c1253da3736dd3c9731a7613c392c2c9b1eaee6829fc01c492127408eb69be113cca4353441abe939dbf449e3a629432d01dadd391f165d08dbe0 SHA512 98c65c411de64a52485367b4263905b0893bcd358ca8c27398216df8ab6adfbd6fd85be34bae2fbe9583083e7ca4ef7838fe35c1ddf35f293d5bdb26dcead5bb
diff --git a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.1.0.ebuild b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.1.0.ebuild
index 22de4e5642d3..d6cf601a4b21 100644
--- a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.1.0.ebuild
+++ b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/colour/Manifest b/dev-haskell/colour/Manifest
index 4f6c1eecdc7d..374e25b870d5 100644
--- a/dev-haskell/colour/Manifest
+++ b/dev-haskell/colour/Manifest
@@ -1,3 +1,3 @@
 DIST colour-2.3.3.tar.gz 20392 BLAKE2B c0ac11ac27c4ba0e4501f2177e35389bbf297e72678b07cbaa9bc43ee6d1b7f2583228e6de17f98320a266c29d9a9472567be310647a84704fa3dd961f1926f6 SHA512 3498215698c3c4010a2bcb6ef87ad263f5a5425167751730919363a0e6806a5c8c2ba82b403b7898addd74feaa756c9df339a37a2b2f2d727680c14ffc21ccf8
-EBUILD colour-2.3.3-r1.ebuild 1176 BLAKE2B e07b776905dc0d24b716b86c9a693626b9ca16afef0ed35a47cffd1b7994e98197b35e8c7a04ebbd10f7a2e52fb9c7b3b2fa8bbdf5b8ea319f9e996097c5efcd SHA512 c401a838fc1093e23437858bdaef4f69d6b0637fb9bf8a04ea612d2b0e91aa49747b74714c455f33dde31b11d9e86855c51d7fa075e47d72c3b3f04b373dfdd7
+EBUILD colour-2.3.3-r1.ebuild 1197 BLAKE2B ff9683ba90b06de32dd5f857ffec52ea79328460cee782eaa87f76ca8856f0c958c6b4e0b9eb039916071d81f50f15e17bf3b657b916e2347b45358bca0e9238 SHA512 3d05ec1addb6abbfdf16bcd5b66109f50a73546ebf847cd831b770c260f219e849b3a757c0a6e4a266ff85bbea5f7af3eeb47d4a8c6d8ecbd0c4c79df1c1151e
 MISC metadata.xml 494 BLAKE2B 3e64417d61195a8ffdaf511f43813fd558933fc983f637f0da4cc7c33843f5cb965451164ceb906e317b1dce823535f1c970e0c88b552e5d2d61fb88ac7d439d SHA512 32e07ce3aceeee92cd07819b05b61683492e0ab0805ca94391d898d589cfbe47aa468c84a7dc36f2410e6b24c7120dbd062cf5170e1eb55fe42e747175736caf
diff --git a/dev-haskell/colour/colour-2.3.3-r1.ebuild b/dev-haskell/colour/colour-2.3.3-r1.ebuild
index a6b0afa005c5..cbf63a109f0b 100644
--- a/dev-haskell/colour/colour-2.3.3-r1.ebuild
+++ b/dev-haskell/colour/colour-2.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/conduit/Manifest b/dev-haskell/conduit/Manifest
index df9cdd79bcc2..a32b0b2ef5dd 100644
--- a/dev-haskell/conduit/Manifest
+++ b/dev-haskell/conduit/Manifest
@@ -6,7 +6,7 @@ DIST conduit-1.2.6.6.tar.gz 48854 BLAKE2B f42a0a78808f29535d058d02a615af51613960
 DIST conduit-1.2.8.tar.gz 49406 BLAKE2B ce99d20bc0001b7ebac30a37f7e75e6ec1796b534ed1d1b0595df7b734d8685e8e0d566915a21041e703d8867c35fde380958d3c195c796b0d6fdc02fe3a7712 SHA512 a181bc88291e761921a2be60e21efca47f7cd029fa4026d50131d49be0d91e75ea082e8c009aa621c44707eb61ea6b117af4f588b8e9251a381ba55f26124161
 EBUILD conduit-1.0.15.1.ebuild 1350 BLAKE2B 39de59cdc551d3eb83a2ffb25373a0be3ff8aa5f9bedd28e4f7b108bb38543916c34cc2d58d1102ed64db61feabdcc5ee49690ec9eac8c5a93f07967e4865035 SHA512 2453457fb62b24ccce380707a2ea6f38715ff8255bc7936c3987f53155cdb3fc56037fb739eabdda0f2219b5bd4f154ec026a326df887ea852f0ab1c8ceedecd
 EBUILD conduit-1.1.6.ebuild 1174 BLAKE2B f7ce57a1b3a7bf9ca880a3f705513b3e703b9f2207422875ece2805e6c2f57a279ce4fbaee708b730d116cb80bd8f00846ae509edab9d7fd2b8cd1b6d0a8a79b SHA512 7955576e0c130ae217185c96b2477dd4f5aadb164bae997e9b42b0edfbd5e0b50ebe59c3a0ab45cf9d6f1eb126a58a752a7df4437f76027650539fe26a2b0a3b
-EBUILD conduit-1.2.12.1.ebuild 1158 BLAKE2B ab153bf059e14108b137db38d9d16e91bccf9f2e83811f47b4e63cf83f4781e5d2d60754216e34a16b38df302c217beff84d69360ccb41398ff4781b9ee9fc41 SHA512 691e3898d02efc06e376ce45abcd6c6d78601b5a802a95a5f45f5647499b26ba4b9ab8c038b4d8e081f5073bbe4d9733823bc51c7e2a572ed66a8eec85abf9b0
+EBUILD conduit-1.2.12.1.ebuild 1179 BLAKE2B bba40f37856d469c9a0b6000b649eb1bb9d9d57efcd0cb4dfc36af3337e734a94852f00a43052e08e5e5eb616f2af5ee49e9f9b9c32f0bd51e2ebe812a69dd33 SHA512 1b6ea7d0e19d044ca9d9ebd0e37195aefd8f16e40ceaf34e2a69dd20107333eed8534e5ff3210c3e3f178e1f7dcb91b3f4859af5bf29b8d5f3037ed089e77507
 EBUILD conduit-1.2.6.1.ebuild 1086 BLAKE2B d34fd45a9de3715f4bf5fd02fd41b229233990471abbf9e245b1139855b3df58d5f3dad6d986c1f8323facf8b4af952964ca3803961b9546e3a9ae7dc8e5c251 SHA512 739460b701e083a19e9e602f9da5b9b0274b977c2409bb21ea0a00ac7445e4654c202ac98dbc89dbb9e93d83ab72bc5745da79755ee7e063518f38f9232ec27f
 EBUILD conduit-1.2.6.6.ebuild 1040 BLAKE2B 6b9937993a2ed809a982f2092fa0378df306156608961b120d8a9cae9e4d327bd48069144c9f7ea038a6577ea107d59e4105ca55f653a1e081e12216c43aa2df SHA512 576238d7bca888e8e41b3f16801bb2f456aa7362d385b9c970039fcaeb69e6a074e16999b0c1deb8d9d0e1f3a6b46c875e4e030aacd9348054cc646c36ff81de
 EBUILD conduit-1.2.8.ebuild 1038 BLAKE2B 0f7cf2e0b31982da36baf425edd3636d812685b2a942a261c11c873399321dbce2f7508a8f93fa9fb5fea44fe4acd997e5c02fa96c425455b641e805b64e42b8 SHA512 db95539741f66509490fbaeeb2ab97e530f66a4ff2a6164ba8b40b3d158eee37a11ecb85901f8c87513cc0ae98614f0b0557060e857024533bdf90d0b97ffdf7
diff --git a/dev-haskell/conduit/conduit-1.2.12.1.ebuild b/dev-haskell/conduit/conduit-1.2.12.1.ebuild
index e1a68a014cda..cf64d52702c3 100644
--- a/dev-haskell/conduit/conduit-1.2.12.1.ebuild
+++ b/dev-haskell/conduit/conduit-1.2.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
diff --git a/dev-haskell/cryptohash/Manifest b/dev-haskell/cryptohash/Manifest
index 129a2aca8e5f..0ec7ca9f73fc 100644
--- a/dev-haskell/cryptohash/Manifest
+++ b/dev-haskell/cryptohash/Manifest
@@ -6,6 +6,6 @@ DIST cryptohash-0.9.1.tar.gz 64991 BLAKE2B 86c26a40d1c5b77da226bc3a58a8bc19dd1c6
 EBUILD cryptohash-0.10.0.ebuild 790 BLAKE2B 0c3bdde156b686caba60848c7a41b1230c1174ce22c8952cd6661f438612d653e5d7ec5d34cefd1814abc468476bc21be17dd5cc51a1a73b2a04067164ec547c SHA512 3642e0d0f79dbd537a8f3c470004cfcc715ea2f6d9026ac53715b60856205f55b3df620ba509552a0d3e177b111074fada0d3c313dc8968a0fa0e5581434f686
 EBUILD cryptohash-0.11.1.ebuild 790 BLAKE2B caecb36013b2960f2c9716031de832fcb53229c12046f0ad012944bafbae860ce2f81557a428635324765d14d9a4870b44c86ed57e5e235afd33857fd1802b89 SHA512 7a580a0a6444871c008c245b7d1ff6f5974e4c1ca993038242faa89a54c1dcf2b7f82c5e8c6b38dd3a1b3c8f0ef74ae6f00a71d1af6e6044e520f9dce8bccae8
 EBUILD cryptohash-0.11.6.ebuild 747 BLAKE2B 0730baf3ada81cd40cf52282461a67167abd6203ae2affee7fdf90d284ca2cac39f30e48b8e36291663e58b773895884e8cd35b1387cf22e61568ab93f34f69d SHA512 1c056141514db8e2269db2350a59a8496014025229ae9f8bd64423fe7c83cc3b2dcbbf147d7342559b248359b3da206d09f6717e05f87d99b4210f79988b2b72
-EBUILD cryptohash-0.11.9.ebuild 822 BLAKE2B ab904d0e70d1836d13cbe66d74f8004d556bc2a9fc56be3b314bf7a175887fccc760f9c80b19a93781dec99488279a1a92b11fbde7f2a0b6bf52577f9d246d8a SHA512 5d56d22e49f7b0630babc04dc9f087dcf226e894756e2e01a8a3c5d53bf96ad4a03c3bb970f912f40579feed6a33049e65b30a614a019edd5b3bb52fce6f1b79
+EBUILD cryptohash-0.11.9.ebuild 843 BLAKE2B fe1699c4cd51173e3d24624312d763cf9d3e2517fde277151a78b54cd92729848a9824c7c6c870cb27438a64a9dd7ecbb19ec41fa345b432ca90068cdbf32bd5 SHA512 dafc3c03f109b9fca15df885a9514da8acfa13b929e68f4aee225afb8f4a3c33de9ce30ca7bbb9079bdd8da6cc6701e7f8523c88234f90dcc48b5b88fc3b9428
 EBUILD cryptohash-0.9.1.ebuild 1037 BLAKE2B 571bf2be365ff8405d9cf20dce256630b226434e73ae138d83ff6a2eb7833b14231d97b0d2569803e308c04f0fc74f445337c4fe82cc24f26ef850e3252112ad SHA512 d0bd2fe152a2d468df6bfff9db5dd603a4f79a8f94b6d998c22d3539e9a2ca40092d9e087363372abc86622594126c36936d7aec090fb0fecc905d98798b4e3f
 MISC metadata.xml 724 BLAKE2B 145f7888fa1e53a8f5ba21a14d1e132b9a7853f9eff8b65e8049b8c0b23199ffdfd8049094f42acb751da804a38e03871897794e76d2ff35dbc74598f99d7d25 SHA512 d6e1c6786e24d3bcdb829064b898002f5d2a5d874fac1c842c01957cad6dc0a32fc0e224abb0f38ddd229227af12bb9fca51480ca84114a5908915d9d89a5a4a
diff --git a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild b/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
index eced9c7e4297..5c315756f4e1 100644
--- a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
+++ b/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/cryptonite/Manifest b/dev-haskell/cryptonite/Manifest
index f61af31673b8..de986ab7a4cc 100644
--- a/dev-haskell/cryptonite/Manifest
+++ b/dev-haskell/cryptonite/Manifest
@@ -1,7 +1,7 @@
 DIST cryptonite-0.21.tar.gz 615850 BLAKE2B df5f0273fa40b5401e4bb5df7c4cd5839ab87fdff3d2cef6be80c977433a1adbcdbf1c9d42f79987e4a7a590f8179fd998f93017af396116e10554108566b028 SHA512 7f04ad5f7411bf90f343c13b71438fdd0e1e40cc5c9a5f1553c1f396a278f81cbe3a548ee8bc03b3b63bc66485ce36dc9a93c3dc3e5884f601bbae49efa98cc3
 DIST cryptonite-0.7.tar.gz 324734 BLAKE2B b0eabfa2575ed4680de541b5acafa1cc7d95ed5e7faca3ea53dddfdeea98a69ca76d7ea65e6117a8f6faf3c43a0b8f3a39c200e975279a78366140d80d663aff SHA512 077b181b1563087c6c04816a36bfd2efd7a732f72b02e5277f3d987093954ca8e420814b547c7c985418e74e8c838a3c8381b4821f3ed6fa8412b63078fade0e
 DIST cryptonite-0.8.tar.gz 325531 BLAKE2B b62d1330de4305e2a7c48063f1745d8f47ef176d356c07b2d533dbdfe02d4d76bd5699f8dda0f258108b2c16b2cf4bbe8228f4565620125839101e721310a05a SHA512 c393e7a93f8d4368ae9ee3130eb44cbc0a4937fdbe27bb918a8900716d9946bae39897717b1c2b3c2531ce69562df3d3260177fa76a6f90ee53ace206fe382a3
-EBUILD cryptonite-0.21.ebuild 1285 BLAKE2B 2722a82dafce4913a9d2d79d23e870a0bb52f4fee220412b65a97dbb0ad5e23c53f756715a7d0e45f75890c78776b7b3e5fb03869d989ea4fe691287a33c2aeb SHA512 baccf65be74a4062d24b662275770536966198c6ff700bc582a717b83c54680e43bd8ccd7a7fad235091b33365c52d877445934bffd5c5d79e988246c6d45cb8
+EBUILD cryptonite-0.21.ebuild 1306 BLAKE2B 300965d26a5ff5ebd169a9e16de8e6e2cedc09e2ab1c066469f0d532df21ef3cef6655deb757d82b07ada46d0a5b58222541b260b499c2db12f29c026dd22f79 SHA512 bfc2c1788c96fbdfb9756e0a7d276c1857846106dd10c8bddff3ffb83b05bdaa844fa9e8c2039d61caa6407c30a34150da6d11d4526772236bcfb40c2e8db808
 EBUILD cryptonite-0.7.ebuild 1109 BLAKE2B 0248cc967d6ffad48a7941933b80f5bf246413ca75ffa74b088d06074a2b4b53cc9663c2cd0d808346caa6a79da9d8ed8595ca789d97f4022d77167b01baecef SHA512 68b9c87848b3c64ca0834d9ad4b1f67e668029f16a0ac41f6b7d9cbb3a44ecfa44ed98d0cdd6fab86a17bc32d4b2f4be410cf4936991433b72867d04c402289a
 EBUILD cryptonite-0.8.ebuild 1114 BLAKE2B 05cad9a54436b5c59c465365c2100e7b4c8c191a8e9e578d1ff3dd8c3f9fbbc1f64712c2b4089107b87a74184d7415a7213d92ea56c775241d8695c0622af0c4 SHA512 f470ba4e7ad2ef069da36b531f70d323fa661c8d48e9f93e2d62710db67ac9dc586918e5f0f29a5ec3e8f78d19f0aca03d9cdd2ed4b382abf8ecd8f60f13a126
 MISC metadata.xml 1742 BLAKE2B 69dc6545e0d61413e5d719fb39384815586d24a4359becfc388d3e4654b5998c59dcabfa3617846047ad467ba385b575f45e5089e8b98039778b42d20242e15d SHA512 f1dcfbb9a816fc6c7a418fb38b98f3de6fc240b694e44a3d1a5a44f06e79d1940be46ac2712e32e1fc3af29942f8a100c0a4795d7e803d28c2e76c103b179d13
diff --git a/dev-haskell/cryptonite/cryptonite-0.21.ebuild b/dev-haskell/cryptonite/cryptonite-0.21.ebuild
index a4d474225be7..773ab90c605c 100644
--- a/dev-haskell/cryptonite/cryptonite-0.21.ebuild
+++ b/dev-haskell/cryptonite/cryptonite-0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+integer-gmp +support_aesni support_blake2_sse +support_deepseq support_pclmuldq +support_rdrand"
 
 RDEPEND=">=dev-haskell/memory-0.8:=[profile?]
diff --git a/dev-haskell/data-ordlist/Manifest b/dev-haskell/data-ordlist/Manifest
index 90d2ba7e5d1e..652431ea08d5 100644
--- a/dev-haskell/data-ordlist/Manifest
+++ b/dev-haskell/data-ordlist/Manifest
@@ -1,3 +1,3 @@
 DIST data-ordlist-0.4.7.0.tar.gz 8906 BLAKE2B 7bea3092bad04fb9defc7331e32dd997613dd4d43c5df82360c61831bec936eb03b178130f528eda59f2c5142ca579a76369afcab62638d4b037fe65a0fdde24 SHA512 a34ed99ea8eb34b29727a210f7a56c80b18a881e2da90fff0ae056b7c56b1f37212413a1daebc0b0118c193eb579d3d43bd426b25944da9044e8152eed80fa8b
-EBUILD data-ordlist-0.4.7.0.ebuild 556 BLAKE2B 5f8009c4815bc95ca264e09ed24f327492c9c7625f4773e5f460665351d24702b8e3d0391e7805ad757b071fc7e2d67aeb1badcefe703d445284c92eaed46026 SHA512 ad80aca11c55d3153a30adb64de00b0dcce44505731542cda94272971c5a3731111ab3222b72b0311ebc26ab4fc3369863f0d07f8df72fe3893dc8114903783d
+EBUILD data-ordlist-0.4.7.0.ebuild 577 BLAKE2B 57b0810c5099cd1b5e2b043eef6a00fbd6d3af11a0144e54f6693c2dfae9a3b1dce0649e3520e73aefcc5f4e3c694e0a1666fb0e1ce9306d9adaa60a5c51855b SHA512 09d93f69f9839aef4842efbced328f43757cfd5175755360fe9f0cc3a54002d52ebeb46fc820e4c7cf6b1df52f0bea5264d651c227366267d34e91de4de96e0f
 MISC metadata.xml 357 BLAKE2B f746bb517e5c1237dad57bc299421899b8ddd82f6d7b104d0481cf37b1f2f8dfc305b0cdf2b76a3a89c3eb8044063e15654bee1f3687e892b149e93394ca048d SHA512 a4cc167182a956937c9acae5bc06af9aeb10ad92c4760c01cc3c831779660a46381d1482808ad5df150fce2ccd421d9a0d9b4cefbb66dcb2e79505aa727fb148
diff --git a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
index c98454a032d3..8a5b4684f1c1 100644
--- a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
+++ b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/digest/Manifest b/dev-haskell/digest/Manifest
index c0953098dd1d..3cac36ea7cbc 100644
--- a/dev-haskell/digest/Manifest
+++ b/dev-haskell/digest/Manifest
@@ -1,3 +1,3 @@
 DIST digest-0.0.1.2.tar.gz 3790 BLAKE2B 6fa19f1967dc6c8597d0ce2a1b29d3fecc8e47b0f652ca1319e4a7a10d3e9f8a299869ef43df2307f822568e04e109d946abe481aebd2decf8f72cafce4d6446 SHA512 f7961c098677c0e75561e3706446b073f60c6a8646aca6d139d6559952b2cba189221ac8af59f2dc6e4da65ee4a789f703e2ebbcf1e9c3df3f98167409bdf7c9
-EBUILD digest-0.0.1.2.ebuild 633 BLAKE2B 45ce64cce93911b4a548fa881f3cb359694b8b54510f2e526b57fcb05997cda3069bc80923ba6485e12d185fac3318c7f0983b689a445615a6b0c2dd6576bb59 SHA512 70bcfae92c12e52d59904e0b08cc70e698c64a838f78a0ccb0875a93e02c90a18e72063f090022a06c95bf76cf0b88bbf44d81d3b8f851c74f6d6544f1511a1f
+EBUILD digest-0.0.1.2.ebuild 654 BLAKE2B 3b9155d9792b7a96ec7ba2b58004c3058b518981f7326881d5d32b8f0a91144eed7a75c7dfcddc76721c9e05d7d007833d1ae6c0996884e6fa05cad228312b88 SHA512 a34e8ee5ced778a85ec3dbe4f9d4f17acc1b9e0047b75fa57a4ffdd95d1d29b10955f467546928c3e3ee24cbd2acac85ac64ce99c5884b997586ace7a747d528
 MISC metadata.xml 502 BLAKE2B 5e0e3d7246769ff38f7e8b191a133bddfcce9bb11ec8cf0359e83d10312d0417f1910e3b8d5a23d2cddec5a2cc0ae75e547fae2817275634b57303ea91b5d868 SHA512 167cc744a0303b3dff08214d9ce6fbf451120a8e1e6b286cca26b8dd6daa22803cf1e78294e7d5e177390bb3477f5e53acc43b06154ceb574735b3df88177b8b
diff --git a/dev-haskell/digest/digest-0.0.1.2.ebuild b/dev-haskell/digest/digest-0.0.1.2.ebuild
index 8f5d4067a0b4..174920a008ff 100644
--- a/dev-haskell/digest/digest-0.0.1.2.ebuild
+++ b/dev-haskell/digest/digest-0.0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/exceptions/Manifest b/dev-haskell/exceptions/Manifest
index b5e6a04287cb..158c1b708915 100644
--- a/dev-haskell/exceptions/Manifest
+++ b/dev-haskell/exceptions/Manifest
@@ -7,5 +7,5 @@ EBUILD exceptions-0.3.3.ebuild 949 BLAKE2B 9b57744d46c26292dfa905facf9a8fe4f1fef
 EBUILD exceptions-0.6.1.ebuild 956 BLAKE2B 7f5d164bfb1f88f30473b0b97c2cc11ee599b451b7a36ee3765b858193d2ffb35836a8f16fb9465ca549f1c78910d81e62a60c0f89b30b1331d8047551b8bcfd SHA512 77f7c35bcd7c23ff05b1ae889ffe5318dc577d74183c523aabfe1caf53b83f2f40819ef7eeef2fa52b1c8f5111503f952de59b68c55862e84e7da7ffb236e84e
 EBUILD exceptions-0.8.0.2.ebuild 1200 BLAKE2B 6fbc4d33db96456ccd7c420cc652a584355c5b7bee98c95833c6650151b64581ce63381eb184f5c95ac90dc926a06074b3e68a7b4f1c281b9318f6f636ab27c2 SHA512 78b0bc5baea3735b09419f895b01cbee9304a5e386d74f2b0d772b0bdf746777ffd6dd42b0206900eae658bcf6baa0748fba120a98616697d92db752b01055fd
 EBUILD exceptions-0.8.2.1.ebuild 1101 BLAKE2B aa33b56b94b7a0c32672983c2fe259437e1b4faa836c6a2df125681a2d2ec83155cf03fdf3fd87165b3389519ffe3762b167d8652ac1813d42eb74724f24978f SHA512 672e03ebda6a0b7b2d7b69d379d92691c0225ae9ceda9d269d4ee43c504c54bc9d87cf368d804205608bb325197d64a310d758612017562b8dc32b5875b67a2c
-EBUILD exceptions-0.8.3.ebuild 1100 BLAKE2B 199e14a96818254ff7af83d800005df06f71ceebb48e880edc6e3a1b166d71ae4279ac995812e9993acc675faf77870f16f813adbdc8b710e75b25fdcfdd9444 SHA512 17ca03a64eb1ee2cde569186899728e9cab9ad2df8567b689ef308e452b4d4663447818d455605ae3e41eccf6406d4abc5fe25e84bc1fd794ac74f3ae6b7798a
+EBUILD exceptions-0.8.3.ebuild 1121 BLAKE2B 9cf820d69481195c5ae2d8acae9d16ff1c33cad8ba9d088135f34a1bb60cefe543c89619e5f8ba7c7b43e8cc84a13897fdff144c272abde99e7c79e371cdc286 SHA512 1ae6a9921e7d9400553e43ee45787f699459f581ec10cf51baee4ef8b557a56db76b333d27c6f4f408d514d84fca87c0e06e92f71853e583b169f565351f7641
 MISC metadata.xml 410 BLAKE2B 852ade6928809b3239450dabbd5d9303f26b0ebe15d724894cf98d72e2a6e1c6a8daa61b2aa04139cb800ea07f941fb30e3801dc7f94ffa565e6895ab44ae144 SHA512 8897b25beba9a4eb2305f352f171cb57079928cb5faf7d236c1ce41815665af0a1e6bc037e55bdccf1102b4065997df240e94a72de5027d7628830b3c3ac0ff3
diff --git a/dev-haskell/exceptions/exceptions-0.8.3.ebuild b/dev-haskell/exceptions/exceptions-0.8.3.ebuild
index 08e17f628f66..7ad8f6964019 100644
--- a/dev-haskell/exceptions/exceptions-0.8.3.ebuild
+++ b/dev-haskell/exceptions/exceptions-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/fail/Manifest b/dev-haskell/fail/Manifest
index 7b5004c14f03..006606f415fc 100644
--- a/dev-haskell/fail/Manifest
+++ b/dev-haskell/fail/Manifest
@@ -1,3 +1,3 @@
 DIST fail-4.9.0.0.tar.gz 2416 BLAKE2B cad36efcb3b93245dd3f90643694d85e6797fce5ee1866c6e8691d9b2845774846b99a7436f854c26daec985f07a9700fe4b2c1a467f2d33bd8a8fa0e6d3058b SHA512 0b4e6111387768482ff10b8ee55ff0b3b04750d8def057b7935bef814902de4536d0825e18b95a342722735b29cf88aafec21eb3b2a75eb4f0c55aa7c6b80108
-EBUILD fail-4.9.0.0.ebuild 599 BLAKE2B d7e56c4da73f12f25255c7de0d3dffa1f852a062299a0bf9627bc920aa77b7187013ddc436c0a8a4755494fe323447bf84908e13dfded214e3a282a6165061b6 SHA512 67d054854a3bcb5125f93697615770d01cc970445136a9434462caaf86d23cda57a96581728bfd978a20b30e9b19d44d1205fee85fb7756db6073acbb041f670
+EBUILD fail-4.9.0.0.ebuild 620 BLAKE2B 4556c1f1d01052dfa66b8eb635eb8e2c627ba263d6095260498e73d207dbd3358752cca03e142a0c61696af1af0d269676439e1ce9f8b11211c8df03b058e9d5 SHA512 474bf075b280c0f21cb5a93b1d8e65b7e3c006196767eeee99eb91c9a3103dcd29494e8781bacb2c2cda5b97a539361c3261676a48951f46ce8b8550052dc1a8
 MISC metadata.xml 802 BLAKE2B 3233af197b69239c6cec5f3711c9b6ef976fc3a71251298515866d786afb360c02bed95e4d0b614828f91b2fce9ae496c72072423468fba2453f898c95f7f141 SHA512 45b162d2aafda8927d5fd066b5db9340830998aae3093717910e5d39863c329060741e7318312c5f26c0115dd0b583fe77c89a82eca7ad15ac54013be29835c4
diff --git a/dev-haskell/fail/fail-4.9.0.0.ebuild b/dev-haskell/fail/fail-4.9.0.0.ebuild
index 9bc3a0e08a03..ecbbeae5d407 100644
--- a/dev-haskell/fail/fail-4.9.0.0.ebuild
+++ b/dev-haskell/fail/fail-4.9.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/fgl/Manifest b/dev-haskell/fgl/Manifest
index 5e19a7171ce6..b840fe5d7fe8 100644
--- a/dev-haskell/fgl/Manifest
+++ b/dev-haskell/fgl/Manifest
@@ -6,5 +6,5 @@ EBUILD fgl-5.4.2.4-r1.ebuild 633 BLAKE2B b7e050ac7be758d58e1ce1ce1a977e8c395e404
 EBUILD fgl-5.4.2.4.ebuild 618 BLAKE2B 4adb2e351972f844a0f470b9236ec5de275b3d051fcde03936d44c093905032c653262c37f9c0273c0d0cde7838033cd04f355e275b9dfee9d0b78664742605e SHA512 11b0ec91b1954fbab7fca64838cd53f8450eba840b3e5d8020d07000684a1ff410283ca7fc803460b33416db95f5eea9caa9aa01b305dc5814be347cb3dda5cb
 EBUILD fgl-5.5.0.1.ebuild 623 BLAKE2B 08ac8c8978b4f020eeb99e4ba6483cf6cd9fa8aeba7005cf343f73567c0275ed25eb64a752c016f106f82d314384128f71282d4d912039e1d4da074c6d739f41 SHA512 fa1dbac762685684131fdaebc1ba105b7a44a9bd062d9423565cbaf8b04b0d05b8b227720f4f7695991bee3aa3e7ee09e0b9454158861c44252030b5b9661684
 EBUILD fgl-5.5.2.3.ebuild 715 BLAKE2B fca385f7a170f3e508152c9d6856f5c32bb8d60f9b21fbe0e0e4a53713f04228b2b839d1130e251295139d1f5794df157e7c7bd3520edaae44a6eff79c5cbf21 SHA512 93e0865fe53506b6ddaa8f6fbd5d846b86912b73c775abc9d9acc50b33cc3e27e9e2181708a9f1c1fae8833c35f0da63d0483a5bef70d10093f13ef8126a154f
-EBUILD fgl-5.5.3.0.ebuild 714 BLAKE2B 7e75c1053aa41695ba9009a35ddf327873ff015ec1b3f7c549d44ca05b8e8fc5ca26978814643a5295356ded5d4d5c5c64d3c30567495491da26c379812b1f93 SHA512 5ed464760505b3b7573f09557011b7773f25229efdc4f11678236eb9e52432a7dd7a83227eebd1f3079c636d29aec72a27f2a01f11222c8e16359045a70e6dd1
+EBUILD fgl-5.5.3.0.ebuild 735 BLAKE2B 73cb7f47982f39c382bc8c5f6a5dc2babfc8d0e271a0c29cd696c25e571e6a2245085df28a22cba0a3845405e51f09f74f26df49bd99e6d0ca233cc68fe2f860 SHA512 3d43d90e8deede24a46b8f1e01e1d0c87d19452241ddeee4ff1d193514621d07fafa0f1b4f40045446654de1db0ad78ea2a251365280d4976bdbff852c00d4d1
 MISC metadata.xml 330 BLAKE2B 8f25b35230273f76d6c2dde245293cf8a1ce77d924ea68058d85e0a6afc15c016877c3b3d3abd4653620719e78f26e214a7232e5b64e4e3a49bd1b42392a9846 SHA512 1520b8d184e9a17712ebd3417fceb326f6e974baebc7e1c96fe8b253b825086b6a022fd537a7a229823d935714347498a50ccb677034e6af3a80f05da3dd44c3
diff --git a/dev-haskell/fgl/fgl-5.5.3.0.ebuild b/dev-haskell/fgl/fgl-5.5.3.0.ebuild
index 91bec359c2d6..830b832ed1b6 100644
--- a/dev-haskell/fgl/fgl-5.5.3.0.ebuild
+++ b/dev-haskell/fgl/fgl-5.5.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/transformers:=[profile?]
diff --git a/dev-haskell/graphviz/Manifest b/dev-haskell/graphviz/Manifest
index 0862905ecc5c..90692fb53399 100644
--- a/dev-haskell/graphviz/Manifest
+++ b/dev-haskell/graphviz/Manifest
@@ -1,5 +1,5 @@
 DIST graphviz-2999.18.0.2.tar.gz 223908 BLAKE2B 2f425cad55622a519ae6d6641bda6340c0dca63ea800fdd77a2c66bc4f4ad06595499089c3a7857cdc02be1f031bd91b94a9eb025e206990942ded6ee22745a4 SHA512 8b27a81af2d31780801534f785bfda1dfbd127e176fa2c4bada2b33a7c80166fbb0efa67706296201bb19d201b8e2ac56453be0d8fcb488b93feb95d2acd8a09
 DIST graphviz-2999.18.1.2.tar.gz 222546 BLAKE2B 43acbf090a0396041398e54461627339b914c590fcb10421ac3299d68805b4aaf2637a65987d6c9a1e45cc96e2e536ecf11eb88ac6a62fe92a56c1fd503e4bae SHA512 1e0bc5b72b934febb923c13052f83db12270954e37483f46c64db8a23eb7ea3894b72c8e2cb303cde6bec30f75a28897c53d81e92fe9489ec21a4589e648dd3f
 EBUILD graphviz-2999.18.0.2-r1.ebuild 1464 BLAKE2B 8aebdaae26fc398fe7b07e46ea3e19382d9c78933391527458e50be136076033d82d29dc3e18fcf030c61f872a63ba22dc4c05832b03bb0a074a41165179e3f1 SHA512 3867142bbdcbd996b1229896c702adbb34f8701092d630ce80421f1af8f3d0c85fad029aedf90c380b057c99f474cabff28f3ac2d5ca0a1f614eb0ab1d30a117
-EBUILD graphviz-2999.18.1.2.ebuild 1391 BLAKE2B 99ef760ce058254be811e6dddbba4a4f565fc2165ff833192917132e4fb6867aa3bef61a219b94de5da3259729fc545e3dfb0ccb5b482647abaadbb7942b311c SHA512 43d0d81c76c4f21082c5013d02fee5dc98b42e2aa3a5ee7bb215fe3523170a3b52c1d61a183e898b21efa98e5facafc43c75f80cfab1b80f4e2ff4c1348f3b10
+EBUILD graphviz-2999.18.1.2.ebuild 1412 BLAKE2B 44a8015e97bb3cf105209e7108e8a37ff9fa5d3ed9cd175d33c0c416ddfdedd1b353892c2f2ce16aa68d631b6d0c42bec560e07d022104e8785c7dbe9b721d79 SHA512 d54c49788a314e531960018cd0ad26cfbec60fd2dae2477117ab1e1047ee331ef08c3711ab4eec7cb7bdd0fbcc4d6b033ee7795918a4d2abfa05b527d1ee2407
 MISC metadata.xml 1323 BLAKE2B 1054a4262b89ba33309d2c0c2d499008bc2965266055b431ab552776a67e390ef8c83eb5485ecfdd0f878c6643ba79f1592c8d18bca6fdb132c2d52f39adc2be SHA512 a87c0ffc1693ecd616f5a97d673ac93830543757edbcf6a59f6343bed2910218175fecddbb1e81a5d97464a0d9a72a4fdef7d29d16625aa9a3eecd1cfb86c9ad
diff --git a/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild b/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild
index 13485cc9e6e6..d1c7a9856295 100644
--- a/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild
+++ b/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?]
diff --git a/dev-haskell/hashable/Manifest b/dev-haskell/hashable/Manifest
index e9c6674b1872..ff5aee14d1b9 100644
--- a/dev-haskell/hashable/Manifest
+++ b/dev-haskell/hashable/Manifest
@@ -1,5 +1,5 @@
 DIST hashable-1.2.1.0.tar.gz 22389 BLAKE2B 62b883954ad22e25ace7b267e79e2a62be35671dc14d04c9ad12675d9a350b829088bb3c79b254cbd4783953ff46543f68d71e002b96cb1ba272ec808b17eaaa SHA512 343f6b9eb40d089f0f2187427af7d7b5dbe15884649ddc8e0b140db129f21fc44f6bf41a262a3b2a0c74d967be6f603799472802d835e48a442f836dd8142607
 DIST hashable-1.2.4.0.tar.gz 24491 BLAKE2B c5d3fb061a2e4fbb7c85f00c24818e708d8511c547588eea024240611d427f982633cacecd35d9a8f4306377ef0b5f75889271cd6bbeabfd0d1f837cb3b4b8db SHA512 992027ce617e347414e328e05afe69b8621fb1af21fef58836761d2002a1f9f7f97c981ff3c4fe8699a1da124771df575717ed4e3fd0bbe5c62d81be1322dbf6
 EBUILD hashable-1.2.1.0.ebuild 1153 BLAKE2B 1d11b8d60aecf111b015fae950f427d10f49c5e846baf7d46cb1856072ca0a73843feea0777b28b1a8aa3ff321b9e46d437ab37993daeb14c8b7176c26435870 SHA512 4f3f50820b1f6bace2c00e016f51585b581ed7f19943e0e8c736ac0aab5429cb11b221d325b302a9bf4828c38a4ee36080d31c99c42e60c66c1fcc303bc0df00
-EBUILD hashable-1.2.4.0.ebuild 1140 BLAKE2B 831b6a786a9d0e8f5914fd4669a9bd8b28c7f113a128d1e802662a187dff72b35a27cdcf8dd5448878ed113dd36c282ee6bb36eefe43d96b96fe115c3a333416 SHA512 8c07cd754ce0034ea1e939944d095744f6bcf7280efe1983a244e327aa71cf7a60d03f320a45b720278cab51463a6ee28f2e61c6330428dd78bd60569680cea0
+EBUILD hashable-1.2.4.0.ebuild 1161 BLAKE2B ed49538d6cb0bc142ff1e032e16ca33c77f44d28e69add7481ac4febc04c0188f230cd65e66733e443e4c3ec4e92c05bc227c1e88ba591d406f09defb42abed9 SHA512 594f345238b1e9984f2f813a43f5c5c563ed9a9d984ef6beeb85d714775723b51ce4a8bb96e2c7e173cdd434f086da2425e58ef4562663194ca17d546dc69414
 MISC metadata.xml 619 BLAKE2B 0c13ff65442edc8bf2e0234b9eb861f11ed9e678062aa2823ee52c9f6be5e0ae671efef678af09481e3fceb07107b4d8c366f1e7f4d5ec873dbad5a03a5bda86 SHA512 d87a8b83ce7d1ffe5024aef8d884b8c6dcd1a01b8c8ae255ddc42848a6f37130853b13bd9a21d8dce2352c6fbf4406fc8286ebaa25d9986764fc668ddb7be050
diff --git a/dev-haskell/hashable/hashable-1.2.4.0.ebuild b/dev-haskell/hashable/hashable-1.2.4.0.ebuild
index f2a3ae5e0d11..1121091cb2fa 100644
--- a/dev-haskell/hashable/hashable-1.2.4.0.ebuild
+++ b/dev-haskell/hashable/hashable-1.2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
 
 RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
diff --git a/dev-haskell/hashed-storage/Manifest b/dev-haskell/hashed-storage/Manifest
index 3fc7ef43ec70..afec2129da27 100644
--- a/dev-haskell/hashed-storage/Manifest
+++ b/dev-haskell/hashed-storage/Manifest
@@ -1,5 +1,5 @@
 AUX hashed-storage-0.5.11-QC-2.8.2.patch 657 BLAKE2B 1833133a0a6fb4b360e2d5b3db20ecdcb09fe5f8fba36f06f8ac7c792a834d597b8766504a3d25d17bca82092565fe3de7d85a3e69ade5f2e0d352c9fba36ca4 SHA512 2a563cbe79d1c83879786fb642a6b2656b2de2a397e5e60d20d5e6fb14b0285611885500dd2d49b96bfd7d12f38864fe2b42c26488cfe06602fda11eb709f6f9
 AUX hashed-storage-0.5.11-ghc-7.10.patch 321 BLAKE2B 354ac2d1ecb01eab3c2cdd007d4759ccce0226d7b951bb8c990f7fb298d0b5ae31377a8458bd481823d051844116e74ea310a3bf6878061a44ee82e5dad13f1e SHA512 94c405cf1c000f77922832c8b96fb14f8c3dbe410fee4e26d84f7d7183c92f3863fb64773e391cfe730deea6b866625060827b7e86dd6b0ce06cc4c09fb798f2
 DIST hashed-storage-0.5.11.tar.gz 57315 BLAKE2B a97a706446117dc049810b054cad25e62b75be905a0379ef935deb2c1fee6c2de0dece3bf74917bf7bb781f6a90a989ed8b164b3d871768c6c4e9182ffdbf488 SHA512 11bfc05ecb2de5adc5a46116d15d969207a310583e7183e2a21ef767a23eabc55622c84ef351ace81a29800a544358c604b4a255800a713af01266331bf321ba
-EBUILD hashed-storage-0.5.11.ebuild 1503 BLAKE2B 1879d69ad95602b5dfe4d054ee3936cd7f1522596891a263f6a9f74e06095a0665bc7d24e2077e830d706c74b0d1c3c34ce9ccabf03ed94751d08668fdc57920 SHA512 ad87a3db94b4e9d35083fffd10f15c4dc8b16c7a4588e5c7722e3ea0d742e357c10bfd34a3f1172235b622b107b249da8a1dfe5fe47d23d93c23d36c203e2e4d
+EBUILD hashed-storage-0.5.11.ebuild 1513 BLAKE2B c344231ffec4b629108bed14116618eb77f35066b637c2fd595c2a1209e0b64d63303b49cb8b392469282a541a894f3dfb11d992177f358cf0ab2138a47586d3 SHA512 9ccdefdb22d35ebb3d30d2b45677dcb70ed9926d0db4871d8abd87cb81fbc79b76257b986f4b53bcc0ca0e32987afec34ef6140401989e04ecfea0f3541bccbc
 MISC metadata.xml 828 BLAKE2B 533f7903dbedce03eb8a87c0c9cf2fa6303a8d4f35e4e6d24f7f76b365ee2f87536185673c225d489bb868501e3baf175b52273adc549313f8e0ade62ec52f09 SHA512 772db545db082c105a75a491cc735c9f5fff87816f48c6b9433926a8b23431e2dfc8cf2e99c27ce4989e0b7da505a2281a8bc34f519623ab6e15f3636348bd0e
diff --git a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild b/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
index 880b1a53be72..101fab1e29d8 100644
--- a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
+++ b/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE="diff hpc test"
 
 RDEPEND="dev-haskell/binary:=[profile?]
diff --git a/dev-haskell/haskeline/Manifest b/dev-haskell/haskeline/Manifest
index 08fcb68009bc..c06cf3cc95dc 100644
--- a/dev-haskell/haskeline/Manifest
+++ b/dev-haskell/haskeline/Manifest
@@ -5,5 +5,5 @@ DIST haskeline-0.7.2.3.tar.gz 68332 BLAKE2B da80d367102c61775956c5c07906ef4848df
 EBUILD haskeline-0.7.1.2.ebuild 1151 BLAKE2B a4a422d784bd46885970cb0b0fa2a73eb521f93126c1e867ec1847af1f47449af5a4e2a5cb598414dafc79de58e14956f1cb2a77c56b63ad6eaae59769b3124f SHA512 c3c847153e2dd990ad42335dc367f25f0e9b0a364b68ce089072215f1e7123d45de8db10fddeba2c4891f512c2fc7d4acd097becf8ff63b0f17f7ea5ffad1133
 EBUILD haskeline-0.7.1.3.ebuild 1117 BLAKE2B 774fc28091bdedc1fb38d921b2397774292993873778b32f612d7b0c5973f715ac7418ecda496af98b3e9fd1963f14cd770a54e3286c89ed1fc4081b3b3692cf SHA512 e26e7cc0dc82c0dd633d5a0c7ea069bbd7ee166af75600b740b846f5a5716d2464325f01341ebcf46ae7505ccacf1db89b2b0e62b4b84c86125a098fe047c211
 EBUILD haskeline-0.7.2.1.ebuild 1263 BLAKE2B 9f943e6beddc2b4696d7bc40eccb86a3591c17bdc56b99c44f77c1614b2c88c0f41608fe3f62951eb3ad7159f7501626942afdee3c17f62658a608900b92288a SHA512 f817ed4dd7db1a3714f0c9c1d5375a8dd3d1e9e73051fc4f423601945b793fc7a75fdda70369c700f10242bd3dfe421a0d7fdb0141e9da31fe58b3c5fe575a02
-EBUILD haskeline-0.7.2.3.ebuild 1268 BLAKE2B 21aec9ec90e1107c5517aff4cee59a28ce8ded32fb0ea70c8f2ea9d11f1514ca577213cfd39aa7e1af1f1a688b8e1c4de4cdbad8dbc583dcf3f259d2f7f98de5 SHA512 04d611adfbb21c2263770d66831012754ee526a7e916bb19a04068f8e728a8d03a9f22c05e69483eca04ba7758d56582ef17e5a9dd71465f5361952500baaded
+EBUILD haskeline-0.7.2.3.ebuild 1289 BLAKE2B 0be2e9a96f4ad88573855f87ce175947bfc8ab99ad0bc57824e40bd0fb4584dbc040f6f1ec3e94b06f9628b24902f34a16d920e68de44f229d1965da67861d61 SHA512 0e07e7a88755d33ec5639a9405c4c19bf155647a29d5a951564b63f77bd18ec30d66a0a58348b5f8602b7f166425413aefef7bbf60906d729e28da8af37efd5f
 MISC metadata.xml 946 BLAKE2B 160e58571e6f868f90e507b4309ea26c352515a4ca67071a8fe130af4d1f2807aa5b123f7f1f0dc2dae4a1a5a3d3ceedce3ab63e65f9da711b522d079e64fded SHA512 dfecbff217817c7e7588112e7fcc36f95c8520423d7b023f979c1316bd314efc62e2d7cff8aa7ca9716bf19ad98d205529ef11b56c4557e2a40624a1c0656e18
diff --git a/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild b/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
index 1cef462a5f06..8aa3dd9cc81d 100644
--- a/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
+++ b/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # keep in sync with ghc-8.0.1
-KEYWORDS="amd64 x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="legacy-encoding libiconv +terminfo"
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index f21e0efac0e5..043b773f15ce 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -7,5 +7,5 @@ EBUILD http-4000.2.17.ebuild 1605 BLAKE2B 9642a031379a966844fdb797ad291a4955b63e
 EBUILD http-4000.2.20.ebuild 1829 BLAKE2B 8676cae4b3b415495808f4d1fca1c7ebed22c7a866910f3ba5fb031f779d8d8b9fbe80886a2a94ac02f777bba520819c514fe3f8b621df48ace818e38d49b10c SHA512 04a97a46a66ef0f435aa94221b23562e9a25ab3797fa12fc87acc41254a3cb65d6b747fababfaf3d782fd104280910706d01dcbba68faf9179a35bd1e5c1cf2d
 EBUILD http-4000.2.22.ebuild 1835 BLAKE2B 98531414bb3241d5b7f930c74dd86d20e1798b43950130bbac6dcfdaab4bf11c7ac8c9ca90eedf5e9ba6b9722bac3ecb5e3ca63bd859f33fc070cca418909ad7 SHA512 e1b8c402980e3d28f527586dc97cbca46aba7c65ba1aa66074232ecf9b9dd8c98ba8886a3f751eacc0eefa9095c9d016227f8e311ab16b8ed9def0636d70dbc9
 EBUILD http-4000.2.8.ebuild 1628 BLAKE2B a4b6800e259d5fc4412518c484f8bf535ab2c94b1287922055dd10d8e70ba35cf4b142fd85f91aa867dad22ff1b33708adb994a7806b8a5be12ab12425c697b1 SHA512 65c51c363f70fc5080ec1aeb8daa15e02f9d08e13e11e314ccdf7d495f8435b5a927f92f1c7dd4b482551827d41963ef6701d710e265ef603ce1ed9adfc7064d
-EBUILD http-4000.3.5.ebuild 1737 BLAKE2B 1b4d0f3fcd9be4bb8cd4e9d90f44a87e362942eb68506bbd103467d7724cba20a16102d9169388087d197dde0ef897f84ae904de117f8c7847123c59a766c965 SHA512 b4ff0796663bfb1db530cd4f53ff2b5357d9c4bd65f1a9aa5eec2fd4730e0e9bccbca20e148bde2cb983cfc2654678a41095682307be54ab94603bbaa61d92d4
+EBUILD http-4000.3.5.ebuild 1758 BLAKE2B 5fac22c8c1f1a2aad458b94968ca6c359c2cbe91d9628c0710f0e4d4af92ab2727b8e4a6ba9debe570bdcb9ca1cd5d7c7a6af9600c91a30d1cec5f66ed3b5d50 SHA512 796774a2cd245790b19d525961576dcdfc6555f1027b5d983594165ccbba1ff80242afba5102cf7c273ca895d133fb14a5aa6798081a8b48f722ebd340356e19
 MISC metadata.xml 2129 BLAKE2B fcca60629e838303b2e2a690253d81709730e1b2db996f983e083079aa7beec30d0885d2b1066c335e5ed1032f9c11bddfd1d0de11014a9f1958a0c6b1d4c714 SHA512 f9571e122a4ba9ca247f51c7900621dae1831fe15f6dd298b8592291c53fbe4dab61caf975b3c4ff7d0e12991904d5eb298c5c5f3e1d2294a80ade4e93455af3
diff --git a/dev-haskell/http/http-4000.3.5.ebuild b/dev-haskell/http/http-4000.3.5.ebuild
index 1d66234f0d61..b5c0d4c06819 100644
--- a/dev-haskell/http/http-4000.3.5.ebuild
+++ b/dev-haskell/http/http-4000.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="conduit10 +network-uri"
 
 RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/lifted-base/Manifest b/dev-haskell/lifted-base/Manifest
index eb7e491c96e2..ce3012174fa6 100644
--- a/dev-haskell/lifted-base/Manifest
+++ b/dev-haskell/lifted-base/Manifest
@@ -1,5 +1,5 @@
 DIST lifted-base-0.2.3.10.tar.gz 11779 BLAKE2B 786abee9094b999472586b01025d3fb72149f1dff3cea2b495d3e6e95e4edf0a30bf6b688d76320e511d5f77079b74b1f2aeca767d58ec34e1f9af1cf1628d94 SHA512 f4251e0322b2802c6eebf7ee2f1d7b0bc8cb89464e710373ef66868c657bcdf9a5ca9a1c0f0b1c9d397c60fa25dbfe78e925820acdd2520633877dadea9c6370
 DIST lifted-base-0.2.3.6.tar.gz 11613 BLAKE2B d013fd232fbb4afc1a335e775c14d5e7f258540643e14e221ac9a679c02fbc464b5ed511f8cb465416f144001e454481e0ebe262747cee857e7b15ff333315ef SHA512 7fee2208c9043cdeccbea87d0ad44bff82505c10f55a539220484fe09792cd61562a94c9f6fbc2c6f360dd25e8d39ed139972432dbdb748fc2e1f2d47be8a658
-EBUILD lifted-base-0.2.3.10.ebuild 1257 BLAKE2B d5c47faa9d5fc7bb73fc94ded14af4d310431fb834665d379c03090dfed8348260d87c5725c1873e259f43862c335cd3fcdf5fd1b40ec46d58375df9061eb2f8 SHA512 ce5c0736d75dd8b5b672119c4816e2202c7dbf8114ff3164d9b8e627c749fec566a487b42e35448e314d28f7205d16168b3834edd82556e67b07e49947cb6bc8
+EBUILD lifted-base-0.2.3.10.ebuild 1265 BLAKE2B cca60a45553809758a12d326d4a9601a71d088d724f843bc0659de58535098955bc9c195fdf77b0828c8abd7d8ca6096110358365cd023bb479a71a53f9a837b SHA512 424cb762ec85f749dcf816727b103de2380469f411e73a9b92838054883bf446b3f00d4b247dfc046a2d0eb4edd9444dadd958005872774a9b428f945406b29c
 EBUILD lifted-base-0.2.3.6-r2.ebuild 1490 BLAKE2B 1fe8630fb073edaf2f1ae6bba0cea71fda1ba45838a25e2cf54f15f9b833d47fd480dd03a338260522f418576bfc84aac617fa55ee0a82955a8638d3fd449819 SHA512 452d67af6210307479e072f8bd6d6942facffd44adafe8eefeaba2e3d98151f43bbe0f47d7a9cb44d3153397ac6b3fe22e882cb29427f4a3d52e4d31a21f32a5
 MISC metadata.xml 800 BLAKE2B 14585201ea8e30f102afbadbb0ed16cdd7a744e86e8c9e3e98cae7931da75d0e129226a95128d0fd6fa9774a4516c67a66c04a02371a1cbf53fad7b41d5cdcd1 SHA512 5f2f2b72b93eac28f68a672504de3ed30d0c0499618961963b8a45813b2bef2cd0d8e93e3f14c813fbee465b96900c0e6653b4da0111e55fb96b829b6f0af699
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild
index e0bbdc5a1c91..dbb02f842707 100644
--- a/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild
+++ b/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
diff --git a/dev-haskell/memory/Manifest b/dev-haskell/memory/Manifest
index 3cb89e3e4737..10a2fc055cdf 100644
--- a/dev-haskell/memory/Manifest
+++ b/dev-haskell/memory/Manifest
@@ -2,6 +2,6 @@ DIST memory-0.10.tar.gz 35039 BLAKE2B bca8342ebd866c53fa2fe476b11fa3ecb75ac8383a
 DIST memory-0.14.1.tar.gz 35928 BLAKE2B 6ac85e5f9cd41ea4058abdc168bd094e7632582fb234c00aab9e6a3359a87e0695907e3821a684ca8c1ad6259c7343e8d0dd38a8fc3e4e85dd89efa09fcbabb5 SHA512 12f8d8f3d14dc060b5da9950ddef398ac55464cf79438c501ba8eaa222817d474c191463fd5f97ed460f5ca4af6d3b643363eb2cca278c583cc14e442fe669cf
 DIST memory-0.7.tar.gz 33072 BLAKE2B e29aac80f99121c2ae588b8b4e2db468a83e19583aabd524384b7aad43a210147746bbad3e05c682a5226dae163d39a9724fcd38b5b813889620ec7c918b9aa4 SHA512 5df9d3ff6ab1fad7760a34d22657af255d7ad57019e8b61bd81dbd09b5df6da83d93e667989c10ebea2910a3399be05ef33d298aca0b09764b0e3a855fba15a8
 EBUILD memory-0.10.ebuild 806 BLAKE2B 7fd0ee29a5548003a37370084e3a165fbcbfd7b812f403d9949bb35c77b35ccb2bdcfa69aab441c78d1aa1d9a9240e52a3f3069230e4832e2aa9812b2bd792ee SHA512 037aad607deb75f993d86abcc9c0d26bbd13d6ce0a7c7f695d55247e1e11fe6883c725cf81a1db9e82c50bb4eb66a7e710ce0ed8dd70c4ab9fb961baf4930c48
-EBUILD memory-0.14.1.ebuild 804 BLAKE2B ca1de0edde0f90fcd9bb554c2ab71143674728c97ad759c635f6685d683ba33d34cf3f6d8d18dcd87af3045d5cf7bf4fe32f25383bc6d1fdf10d5b46f0cd0be0 SHA512 8de9561031386551c6b155e1287e55b02dd2787678166ab11936240796f99fb072cb9d43556f1d601312438f65cd20ea69b993ba2b9e31cf3f9a6e0b03378759
+EBUILD memory-0.14.1.ebuild 825 BLAKE2B e01462a216ebd3b26677575b37c7afdcad40897399d8a0b419e5de41a1870b003d31b6f411f1cab498fa60823df01b29e7df915ea2347f2baf79636185d05bf1 SHA512 9e86a66f2da21f43b2e301d64a31708fa92ca0519832649fe39172c09bffa617c7a875aa878894f325ac616d1b5515ff0105d770a482e62fbdedc7203dd50091
 EBUILD memory-0.7.ebuild 805 BLAKE2B 77f09bb2e9c76e13cf763509c397a4b2b34cd4899e252e6df663b018a1008dbb926a1b5549b09c0b75d4262fb4a1bb11a2c5ca77c3a0634bac9b76ea39fda04b SHA512 c649475039a1657749ca84ca7daf8c3961474dde56b913ae301f27f01d1b85ae2171bb0124c95c5b7c9b48f5d02e5b215d30340f75be33c7d89a7f07206cf903
 MISC metadata.xml 681 BLAKE2B 6b8c4a5aeac640ecddecedc449873e35327c9162a9f36c64246dfd0cdb28741c953e75b46a61c182205da8b9bdadab3338954ac7eb2b4a77f5d71d7d3a1e589b SHA512 174440b555b9b8dba3344dc534ffac79a7c2d9863174315733f041db89c9f0e0a055dc5b15af7d2e1880b14584998749ed6906d1dacf0e30ac36d00ddeb8222d
diff --git a/dev-haskell/memory/memory-0.14.1.ebuild b/dev-haskell/memory/memory-0.14.1.ebuild
index e7e09c60911a..f7008f45bad9 100644
--- a/dev-haskell/memory/memory-0.14.1.ebuild
+++ b/dev-haskell/memory/memory-0.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/mmap/Manifest b/dev-haskell/mmap/Manifest
index a49f1ce6d758..e0b7d98dc125 100644
--- a/dev-haskell/mmap/Manifest
+++ b/dev-haskell/mmap/Manifest
@@ -1,5 +1,5 @@
 DIST mmap-0.5.8.tar.gz 11657 BLAKE2B 875557d3f28260028368a8979f398f13e501be507ebdb5bc098935c1ef3dff05fc7b7d7abbf29e632f0368e19b952b466ee7f192cb3cf4f4944009fa525ab7d9 SHA512 6c8b526ec9fedba195ce021f86eeb3fa35f7c95b9299d17503ad7d7e91b9485b3d9980e0ccbdc3876ec465ec8aa07cf9d0521c62e2c8a652a36df11b9badffb5
 DIST mmap-0.5.9.tar.gz 11731 BLAKE2B 1a2133f487f9b214c8a4be3aa91a38ee849b40649b77eec8e656fbd99d32c31761d1daeb474a56e9e0611db631a22828ab20171c6522f324e278ace0de0dac2e SHA512 3b9ac1150050ac9d8e7870610923c8303b5fc74a4fdd796d7b6b411e2ba836111ae8520e16ad345aaf93b4dbcd27abd4c359a89b27d854db8dbd252b90a5298d
 EBUILD mmap-0.5.8.ebuild 1154 BLAKE2B a168ed8c3c9567713b6844ec4b106295ad7e55af383c12e4f98bfcbe811537fc59c185cd576ad7b2d0e876e05f00b77ed8c11e525f611bd552bc8b0f609fa751 SHA512 7fad85981cdf441c8110fe9354c974b72634bf01a4de44d76cf507e5e79a1f5381efdfa4bb297704355162bc2bac820eb8b97fb2ca5d7ec741bfa4fb1405890f
-EBUILD mmap-0.5.9.ebuild 1161 BLAKE2B 7b63379bc5bda55de663645222666a926598d7c6699e673f91092f2892a07a4556e978b1f9db4fac1263d0dc766cb88e52606cc47bb323d8424ce4ffaf6bfa68 SHA512 d1051077bca0f907fa3c1b12e900082ba097092ea8da35ccc7181e7e4787fd4925f500ab7c9113e1486a9f2eeaa0c5fe06685ce6443f27daf597f182472da20e
+EBUILD mmap-0.5.9.ebuild 1182 BLAKE2B f71daaad056e8149989a735af332e50aa651fdc8fddb9b08686b8e869157e765a4a6f64dc64a837f3a262c2c54b2efbd48600be0ab91d72d3fc0730c41afd326 SHA512 9f437bf915d669f09adcb89b0f0a68ad05ffd8c19a6a2e3b087062b8ce9aa7ac5298375785ed2800e8c5c994ffba772d02668bdb3281937ef58fc7d004a20d62
 MISC metadata.xml 569 BLAKE2B 132fd4404bb9c963ca46ab92df1bd4bcff4bd33bb493f079154aaa44d9cce5b8accc3c44dca3605db23f2b92093ec4835dcd085a4f44d748280313e3df6c0409 SHA512 6e13722dae998496bbaafe7f1d9b93e041452d0adb0987ad52ab141923217f06e15430fe873041dfe247ba3d7bee6e4a0c2539e1f623dff4df75935fd8528c80
diff --git a/dev-haskell/mmap/mmap-0.5.9.ebuild b/dev-haskell/mmap/mmap-0.5.9.ebuild
index 07394084092f..5198186b1ac0 100644
--- a/dev-haskell/mmap/mmap-0.5.9.ebuild
+++ b/dev-haskell/mmap/mmap-0.5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 # IUSE="test"
 IUSE=""
 
diff --git a/dev-haskell/mmorph/Manifest b/dev-haskell/mmorph/Manifest
index e78a8bef4969..0bab9745bf5e 100644
--- a/dev-haskell/mmorph/Manifest
+++ b/dev-haskell/mmorph/Manifest
@@ -5,5 +5,5 @@ DIST mmorph-1.0.9.tar.gz 6497 BLAKE2B f30af26a16c4a573cef8bd95301b481cf83f12f87c
 EBUILD mmorph-1.0.0.ebuild 623 BLAKE2B 4d7c8425ace8abb13ffc23e68c5d65a7eb017a4cb9a0b65667c8baa664b7512c6f6b446f282e1d1cacf438e8f105fb42d94a6ead8f6a203004d84bd2366f9f3c SHA512 65054f8c9f0b2084a5c5af261c97237c080c72d80a8a9aa878193f49b01dd72a2139974364e3be47c37006ad421d364c774dc3283f8928a75a53a4511bb13967
 EBUILD mmorph-1.0.5.ebuild 622 BLAKE2B b01e3c82b34df61106b9a659364f1d85fbcbf62cdd0ce6ba2c97edbf5c8d80dff4c5b80295b64980b2f9ffc854a0b5b291bffd925ab538e62bc6d65e5fa0d39b SHA512 488019412d3c2a26b02bd5874f1a8eb30f2e8a59f923ba317c7e27227e78f3784d2015b73502c7f44ded8d1ef6aae794fd2b58078c9ccec3627e686771206a87
 EBUILD mmorph-1.0.6.ebuild 790 BLAKE2B 9d3ea32adc7d9256c4c403e61197884f939fb8dfc6f71a1f09df24433e7d00f768714f2573271cfde2b54b6d5bbecee1875e2ba13d68b3c36e500cf07044e1c0 SHA512 c1fab921056e790dbec412e2dc4dedff7b505dd414efdbfdfedfc0d1d6ef7388d91ed1fa8753f595b20ce2357ed3d88ed9e3b1740be4e56ccc21b7cf948b2b8c
-EBUILD mmorph-1.0.9.ebuild 703 BLAKE2B d94eb28aa2a070f70c7f993d3e792d48ef2c6f4ba8b2e1ffacf25cdc8310d1beb2be6be42bced070fb206a101bdf29e4272059b32e20226572921f4ee49929de SHA512 65448464925fe78571dce1b59616f577280eb7ff787313c6cd0ffc9df075e86af12054142d537d55eb8d942632bd68f4a3d9ba837e571ff9d96aa8f22981f0fb
+EBUILD mmorph-1.0.9.ebuild 724 BLAKE2B 76e4b6c8c654b0411295e19b0b38703de1cace3a3bc1bacd8b65709cc7ac96cb97b69a705b0a5354d6627e3ef83414a4665403cea44323790de431bdc2e8cebf SHA512 c9e231a059c6be473c43d6ee3cc746afdd0b5c1133e0d66e66da56e1cbb518e1a267c45c8f2007fc9a892b6c63b59d0a02c36de5bff42c3281f44392c1cae94c
 MISC metadata.xml 402 BLAKE2B f07de9bee342c7809272f9d3014293d11f02c8281c45ff7225114d243e2c082ea6885584ffc073c87e810ce9587c814aef28ea04cac4a4d9f48e6a2fd7d86e84 SHA512 e5025034e24baca4f12cc5b97bcf6b355b5e63a88796c0b0520c8f51b2a1cd5fb0f8f3363e04ecab17fd52989a66f2d7a5691b4c9aa54c32d0af2aa83c5ffc76
diff --git a/dev-haskell/mmorph/mmorph-1.0.9.ebuild b/dev-haskell/mmorph/mmorph-1.0.9.ebuild
index 428f2d788eaf..2b9b27092510 100644
--- a/dev-haskell/mmorph/mmorph-1.0.9.ebuild
+++ b/dev-haskell/mmorph/mmorph-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/monad-control/Manifest b/dev-haskell/monad-control/Manifest
index a9dfa492c11b..9c3438ca80a6 100644
--- a/dev-haskell/monad-control/Manifest
+++ b/dev-haskell/monad-control/Manifest
@@ -5,5 +5,5 @@ DIST monad-control-1.0.1.0.tar.gz 11115 BLAKE2B f11ebe4f3dd1060ac9a852646c52ecbf
 EBUILD monad-control-0.3.2.2.ebuild 996 BLAKE2B 5a095d57aae3f144168d02ee51b3b2479c90c03d0f4dbb28d8dc55e2e458d3f9ac542260b0b2f3bd33c88388179c5278a1a3369bd2661381b692ffb3ece218a1 SHA512 e1bfa36871af616047520ba96e129b383df0873a933170015f197c30e99cc9642a176021f89ad14ccc4b88f4f2bd5dd6f0c729258e0d765ae3a3e411808b7e40
 EBUILD monad-control-0.3.3.0.ebuild 894 BLAKE2B a5de93a4e72ab331354fabfe9636e944274efb745deeb89dff6b2a074b70a2d88512e0a9aa3cd69d24dd2984368a520b73752eb527e265c1cc5aadbe2db8a323 SHA512 ea6190016c5a5f2bcd625930b303ae4bae66087f0a08357f4524aa6709f4ff3e1041173d3989e62b561f9c382703a469284884528c5e33661af5df16226d25d2
 EBUILD monad-control-1.0.0.4.ebuild 954 BLAKE2B 76d2d777ba0cbfc60a21c3af93c0674c317fdd17550fbbe3a9225068e595af08638d6b5f0693d0d6b2acd748cc05e44ed347b22401a9178dc065b8ed8b0854bd SHA512 313c36d8b20adf7f8b37bf2559e08e41b1bedbc0e36acd2af4db2b69d112fd97390b16aa17577a3ae641629c5691921043af2d9651ccb742853a3a8d46e2435f
-EBUILD monad-control-1.0.1.0.ebuild 952 BLAKE2B ea85b4d1846c221a0cc2e419965d79a04dc0601c4b246240a3344947709f60e72308f88ac56e73d29c283d6f8907179c0d5b14544cda7ced2970f79f238019b9 SHA512 9c3bc34434f7f9052c9071eea7183ed4beff0dd5ff48102898085d113870b0dd56704af10711e0c95ac707a01d675dbe2c21803a6522c66d714395f4f57c3175
+EBUILD monad-control-1.0.1.0.ebuild 960 BLAKE2B 410479fc7786b13d34ba12d92b060abeb9b9c5b4024d8966a8608952b7dfab34c290301aaa3aba189129cec57dcb2c8fa0f8596664d234ab1c126639b4979dbc SHA512 b763e41c6b88155130a6b6003049a2d3ea09d94491e7a25af3a577f8b1bff8c166529730a2d3db73b0d9587a3b628304e98f5d4ba58cf3429c051ec40f37016c
 MISC metadata.xml 1773 BLAKE2B c4bfe6f561321644ba050f51897b3034f5fa6220327de82658ebee603965eb420cfb47180f89a512762f91e208da004813032125cfe1478a8b510cef3cb97b60 SHA512 40ad4d1ec82c40f655a3962b48bc53de5e2429102d5cfa2daf435a38e81a17f2e2d1a97b46cb1102ffe9f6c3799c232ffb0f758f0cdbafbab639a3a696dce373
diff --git a/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild b/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
index 7552b509f020..3fa014d464c6 100644
--- a/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
+++ b/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
diff --git a/dev-haskell/nats/Manifest b/dev-haskell/nats/Manifest
index e7cea353b2ae..3bd1197a869b 100644
--- a/dev-haskell/nats/Manifest
+++ b/dev-haskell/nats/Manifest
@@ -3,5 +3,5 @@ DIST nats-0.2.tar.gz 4740 BLAKE2B 9300e1834feec441d35246377314c7c302c16c76548498
 DIST nats-1.tar.gz 5768 BLAKE2B 1c8e08ce3cefade9103d4d16202d68eb1efae526ec1a4595768b121b15ee55ae5e071cfe6a1923219422a33278d53b290ec0aeee47c4eb8a7c6aed319dec0628 SHA512 a53b8890d3b9f9f799d0af25626d23a570b7d3f227968d4a1033385d87e4502120e26f8623a3c5c0c21dc0db98a000ff79565cbab0298fd9c17a917ea8e11edf
 EBUILD nats-0.1.2.ebuild 549 BLAKE2B 9f4cb10197a1c245b86f6a363bd09a911dd42c65ea56dddd7488051e9bb1fcfb6ec9a944c7c0a5411e7d2c5fae7c5ad73a45382f63503845efa464c69c490ca1 SHA512 27003be2e6c2f1cbd16d831c0985b66b6b98a7872033ee0d65936c59cfa03e8d9d55b6ca674db58788f868e628588d0671de7a58778cc271dcba4cf575dcc09f
 EBUILD nats-0.2.ebuild 723 BLAKE2B b3a01acb8b93191fba49d52ec09f8f6a9cfb7439f8e8246b0e4d1819a50de1be3d2f1fea550dfd951db751207962cea536e13e62e40aa065b8ff9887384e3050 SHA512 359222ca82e11e451b9e1e608ee31759e79e1d604dd584ee99fa6b3bd6aad1aff63f2f4b68f4d28693667cdfd95a80e29dea799f5e5e631aa24cd6debdb5b4b6
-EBUILD nats-1.ebuild 707 BLAKE2B 5dc4414f0fdea168a86bdb78e928013370fb2027d5b1a2dbe6dea12579c86ca894361305fdfc071661bc6a5434cf31e3485dedac9ddacdebd9c965a1267ab9ff SHA512 31d4b2e6b9e7e2c6127d198e63665fdca151e1755b2519415740e3c0ac3e1292912b43aafa1a5f8c481b247154be53faaf700b09f82aa3cbe3a8bea186d38c1a
+EBUILD nats-1.ebuild 728 BLAKE2B e41dd0d513c25f0eb36b21fb00b87f395b167fb78a7e4f870698ec9e4cceaf4f23d1f294ebc67477e13ba215bbfd685d0360cac2dfd4cae8ca78f4b150edcc03 SHA512 63a9848e79acec9b15dc99f5dbfba2c9cdbfaf7f612f6603cb6d19bfc84d527dcd1a7521aa31eb9821a3110a5df440a6c5fe503f02599c51af82d0056ff9bcef
 MISC metadata.xml 703 BLAKE2B a3434d123064ec0470602448e541cf91d65d32c06dbb25bb1287b43a606792789cd6be1942d7558a35297a4a31da86e082343541ec39d9c58946544f33550c64 SHA512 533f3697500bc5cc931743a82562816555c0b6f17a9e552f394c2f0286d12c1a4e8e0447b708785d2413f2945e4432ad3853d49190ad11a0a8632bffeb1915d7
diff --git a/dev-haskell/nats/nats-1.ebuild b/dev-haskell/nats/nats-1.ebuild
index 68a31f45648f..01a757924c46 100644
--- a/dev-haskell/nats/nats-1.ebuild
+++ b/dev-haskell/nats/nats-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+hashable"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/old-locale/Manifest b/dev-haskell/old-locale/Manifest
index 7905fadae992..4fc58eace043 100644
--- a/dev-haskell/old-locale/Manifest
+++ b/dev-haskell/old-locale/Manifest
@@ -1,3 +1,3 @@
 DIST old-locale-1.0.0.7.tar.gz 3384 BLAKE2B 338edfdfebca9e6658a814199b48ec16b9783f487ec9ba5746c9785d4c7032a7402de8b30c8b1c938695bef9026b8fb842a273f4fb61d79360d7fbe41aeab238 SHA512 34d018cb040de9adce3ddb8cffabe2a0610f6cd0ff5340ee721b7076671bd5cc3e830f58d16e73240df4b068510f7a24fd1995efc38f002b52d228abc4581d6a
-EBUILD old-locale-1.0.0.7.ebuild 758 BLAKE2B 14377167a23b06a948597abf9718fa3d17de8dba6b43b76e33cc7510f591f256f88710820fb0259ff4303c14ef1e88b5040e66611f1652322b8b7caf3a2b4a73 SHA512 0166665288ca5d395ff5ae2349ce47a1f9fa7a4c92f97b1ac9d9b03d44e3dfe55733cfaeb3603c474874fe60e168505515847968e13fd890d4080af0252d054a
+EBUILD old-locale-1.0.0.7.ebuild 779 BLAKE2B 1350ad6e765b29559e75498c161be71b053bb2654ceba9972478c51c960f0996d80e246c87dd3a2037aaf03d9e4f6a80c25e6daffd56e6d70bdba2bce7e3c448 SHA512 c196a04ec4391b377e1ed8bd1a4438bdb2e5705fc57c72952c2916813104ceb272ca8340f75b5552bce6c6ec1e227de5227ea9053d27e47a8d2f4116907def62
 MISC metadata.xml 388 BLAKE2B 074104122b929fe61bfcb49c703017947ef93715c19594cdb7b0bb28c099565c37c703a40da7440b1202ddd355b7335f43f444b52e55fcd2b9a346cbd1175eb8 SHA512 0ef6e366f38c2426e2b1ccdce4519cb1fb23415567d32f60abf2a413d26392e7eef31b0712cecece23ebd930a36bbce318da7985b7c9691797278077c5d25a15
diff --git a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
index 1e5896221474..ca81a37488cd 100644
--- a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
+++ b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/old-time/Manifest b/dev-haskell/old-time/Manifest
index 207752bf8afd..8ada41d607ed 100644
--- a/dev-haskell/old-time/Manifest
+++ b/dev-haskell/old-time/Manifest
@@ -1,3 +1,3 @@
 DIST old-time-1.1.0.3.tar.gz 74219 BLAKE2B e0f4e6fca5f92fdaf1aec8fbb02d339020e9547acbe23d5b5a00bed3b38e4267653331e4b7fc58f0d62f6158e51d78867f4e3bdd29591dffeab7a132d03f3d6e SHA512 a701c62266f9f3c6dc60eba970b6c25a61bf82b6b8bb6b0073e0e44908598926fe7813a7ae1b1f9da98e4861a8f0565d0bd025cb97307b71c08cb9b0b2e321bb
-EBUILD old-time-1.1.0.3-r1.ebuild 852 BLAKE2B a3941ba5a1748735b3447a84c47cde6cec4f228c8db319d6788cf8c591bd40470a508d995101ff53c538986ac4b476e5a2b316c027fd9fbd5aff273efafad2f4 SHA512 4a6a2dee6507a30c5cafa11aeadab865bd5a353ed3a8d2875093d3227fecd8d0ed353fd7eb0c950f3eeee811d2d56176f5cf5966ade47fba5e51add1f6d08cd8
+EBUILD old-time-1.1.0.3-r1.ebuild 873 BLAKE2B b47eed758e6c2c68ef327e38d2184738c03a9e60853df7db902bdb9d43d8843e5c39bcea9ddb2b7e23c45202876f977e3ae1edc0f1281e62cf9ea2145678810a SHA512 009dcd56537bfc2210cc993ed0bcd3d6a50a2c1aebf502a25d4df03314ba9564ff4e9c4e6b4613399c3d9c5e4879035ba81040a2c0eebb386be85e2c7d69b0cf
 MISC metadata.xml 448 BLAKE2B 34d0199dadaa1847b1b54ad5663e05bb29098eb8541cfa4dabd8ab85d114927d0123fffd5133653823bfbadc7a4f263785c56fcfa0f8dc55189d19002d215b3f SHA512 06c860a7effc26f89667d44037c2f386a867b7f3d27344ab5638040f7c55367b03b298891351923555f717c89c43bcc98d44695f06fa0914094ff456eea9b4d5
diff --git a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
index 6d908455b678..7f5c9e70dfdf 100644
--- a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
+++ b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
diff --git a/dev-haskell/polyparse/Manifest b/dev-haskell/polyparse/Manifest
index 8924a0e6ffd3..993cb3632ad0 100644
--- a/dev-haskell/polyparse/Manifest
+++ b/dev-haskell/polyparse/Manifest
@@ -1,5 +1,5 @@
 DIST polyparse-1.11.tar.gz 22978 BLAKE2B 22154655fb090234223189f9f25e871c73f478ee3681313654d737930d594c9a378fa1d259ff4cdbe93d2df5a8ac79104ee12b9efed7e9fdf1caf6ad269ab988 SHA512 b2cecc633596caaa2b8a00ceb16f141cd69de9ec697ce53cd827a17c82cac70ffaf10bc1d8669156ed4d28589b11ac56820b5c02905c8a6bdcae65112126fa5e
 DIST polyparse-1.9.tar.gz 22256 BLAKE2B 01f2280db5d966d86450b4a3ae352e1ba911c1d7b116e6e94cd182c6d49c4b43e6d52f264097b4e8c87867bd535140b18c04a445ee9ab60f9296e1a15bcdeb0f SHA512 80f7cc269c7082d256aa273ce668a8fd9f58b4827fa69e390d749a622d667d5c01b7ede3719d52408d3efa35de66928a3fa659f3798826a2d53222d8a8d9d7e6
-EBUILD polyparse-1.11.ebuild 632 BLAKE2B 5c1ae3477b3f87dcecccf200cf0eeebc0394cbfe3d0f7e4837875828720a5d3e38b84c56cbb14023762d4a2d84911a26edd4c79f51ca3dd73af8b4f3ebd615d1 SHA512 642dcec362c56822d2cb47a0d4ef5f4611c5459434ca7a5ca0dcd7f77b838a1e1ba10e5b3599a16be67d4e25cb6bbe56e10b6199e056447771752700b66dba97
+EBUILD polyparse-1.11.ebuild 653 BLAKE2B f9a7be457dd199a4d4637afab62ed528b021b41a797a27b16f32c7826aad23d27e8f5b6a7cd17232d3ad478cf67d33917315f4e468e5b008fcdadea3e9dab158 SHA512 d7201efffa4c8d11970959e26bf87436b7dbad2d899c70751a68fb7655ef1117586739ed00a65db503299c1ef4cc742e2eb8fe40dd7011af506c0278fda37fd2
 EBUILD polyparse-1.9.ebuild 626 BLAKE2B 04c98538575bd0a1112c125f96bdcc7d5f89d76f5fe8287642a2c74e6dc746c0aa142a8744141472e2030dc8786f48a1a6df1d38965f3d22edd0b2cb3e9c0713 SHA512 82e2221975f8c460d21183ebb2efe04f0bf2b2b8bb931a5aaaa9b043a92b7b74ff598ab0cd1a857674fedd76a958765566e7e8de075ab2eee1815125d9e72a5f
 MISC metadata.xml 648 BLAKE2B ec7679bb8dec7212a08a306a1b57b796aa6037f642cbedc234a42da09de700a7a7faff3219e9d8019ff6ae0641260e07bbdc7cd78352940f195bc300f6e2bf6b SHA512 ec7413b7f4fbc51776411fef7a21be4bfdbfbb52640d3b21467177b09903c0cdf860c201c7450e9f2dbcd87c918676fd69969319afafc29e75d0f989b4e7963d
diff --git a/dev-haskell/polyparse/polyparse-1.11.ebuild b/dev-haskell/polyparse/polyparse-1.11.ebuild
index d2762f3798da..840b2ca60dfc 100644
--- a/dev-haskell/polyparse/polyparse-1.11.ebuild
+++ b/dev-haskell/polyparse/polyparse-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/regex-applicative/Manifest b/dev-haskell/regex-applicative/Manifest
index d0dc861b919b..ae4873ce828e 100644
--- a/dev-haskell/regex-applicative/Manifest
+++ b/dev-haskell/regex-applicative/Manifest
@@ -1,3 +1,3 @@
 DIST regex-applicative-0.3.3.tar.gz 13834 BLAKE2B 690d9fe8b44d26cf2332f5474bd1faacec9bae68d72a9dd04836e7bf3519e2dad6a9277f96c9f3dd908091d90408a7dad8d654e60dbb29831267489169ef5192 SHA512 02358efaa912efd232654a404ef5f7cf825b8852bf2c59fd59122047044fcab5ae28bf26de6818b337d917c594fbe165eec917d88b02723e0b181fe2b57ffbe8
-EBUILD regex-applicative-0.3.3.ebuild 729 BLAKE2B 789f11ed150d6e6af536e214d4e9c53ccee294fe4af9eb68d8cf466e15e8661d43f8e9516d5368bd65397c99136f361710003a6efccff756f3db911b1d3b6ec0 SHA512 5cb3a34dfe9ffd92b9013bb8d86d41f17f62e0e8d42b918fcd0fe23099b7b44af989b96c1b2a8a13afd416504c2d2140b793dfdfcc3de245ec1f489d94a9064d
+EBUILD regex-applicative-0.3.3.ebuild 750 BLAKE2B df5646845ae5f2cb3916da388d7bd492665580990313bbf1a58ace92945c94362b8f8a379327c62c993affe8f969edbeddaa1a35b906e5403b20847782a5eef9 SHA512 2759f6b8d7a521e07387dbc79245d4867bc8d31cd14256a06f80d6f93cae63c6c992183c0a927846730f242f4a29134d7e8de92a7add0306aa7c1c1dfe2f7f2e
 MISC metadata.xml 512 BLAKE2B b507deb53b3f4dc832954d0ab59f0d2544d66f32272566dee429fdd4a0a241eae1b39e54fa90721f60e1d437234c20ad43b606b66433bd4eca488527264c9f88 SHA512 f13a38cdc4aaaeb47d1e7f3ab579e69431e9664c9b44b823bc4b8cf327eb7356a938aefee219238410ace03089acbc67fbb4542dac0cdf099d5575d6f37528b0
diff --git a/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild b/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
index 8661c88a2cb5..07038d611f12 100644
--- a/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
+++ b/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/transformers:=[profile?]
diff --git a/dev-haskell/regex-compat-tdfa/Manifest b/dev-haskell/regex-compat-tdfa/Manifest
index fe3353aefd59..5ed9a746b3c4 100644
--- a/dev-haskell/regex-compat-tdfa/Manifest
+++ b/dev-haskell/regex-compat-tdfa/Manifest
@@ -1,3 +1,3 @@
 DIST regex-compat-tdfa-0.95.1.4.tar.gz 4146 BLAKE2B 1749307b8a7bfb1f0a0137febf425191d225bcdfbb0517034ea31e11e648eac128f16cc1951f9471e9f22efeb296c1c32344a375c16381ef823e0fc4674e730f SHA512 7e387a7713ff8e43cfce4262b1288b85f8b60729162a842186bf6a7e1078dfb9e26013087ff7e9bcf81521f8c352926873bb280b9df57b016aef2ca4ce70aa14
-EBUILD regex-compat-tdfa-0.95.1.4.ebuild 665 BLAKE2B 663f8cf1d19a13c215f8a985289d109a80e1add68486d46aab9b29f6d57ea31b6067b6b099efabef01c213ac99d99148566b469eaca8a1492428c35fde0114e3 SHA512 0a34409ccdebe7a173a534f261549070e2fc16951390e3769bfa3ebcd47604d49feed1541c53177b357d665a0ac2e191f9331f7f4918045f88113e42fa803d62
+EBUILD regex-compat-tdfa-0.95.1.4.ebuild 686 BLAKE2B 508681b55480a469e8836b0fc9b25c1915adeec2b1e7f7e882fa331db4c9163624ee6f55a83a6aa48b2e7a1fb374b276a73306707816a2af40440f5137e7a852 SHA512 6bdd823b1dccbe661f2854848aac578b606c7a7abf97f95d0b2243b1dd7f7b85e570fd4e3f55a51e243b27673dbc2c3fff33980b1f556d90b24767cf8af39c86
 MISC metadata.xml 549 BLAKE2B 511813338e5239e4654ef23d0eb6c138567ced27e54732fd4d38da52c2f212b6ea8f708581e5d3bab0d4bb216099778422e486e23a3bcda95496a97b97d8cc93 SHA512 45610a989f730058dbf3d330daceea8d71f5ce57a9fa2ce8af56dd97d4faabb58e09d92c493bf7d7051a085f53eaa14dc03fef51b14bcee5e0e2bfb337a2fb6a
diff --git a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild b/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
index 6804316e4152..fad1fa8b706a 100644
--- a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
+++ b/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
diff --git a/dev-haskell/regex-tdfa/Manifest b/dev-haskell/regex-tdfa/Manifest
index bc5dfb59c782..d21ed89019fe 100644
--- a/dev-haskell/regex-tdfa/Manifest
+++ b/dev-haskell/regex-tdfa/Manifest
@@ -3,5 +3,5 @@ DIST regex-tdfa-1.2.1.tar.gz 66108 BLAKE2B 105b048e48b98197b776249d99b60ccdcf6c8
 DIST regex-tdfa-1.2.2.tar.gz 65969 BLAKE2B c533dd7fd39e973ccf73d1bced6c35e65ce3a57a543e3e6c15c191748c2073c7d4a230f995168a2c52f4eafe152961950edcb28fa72c064a70bd058a49a28896 SHA512 86241b9bfa27351302e4ef18fd2cdc8a58341d6a8fa12c92e3ebb11cca93e58e5a69b97b545c61ce704bd6e2ac0b7a7c1a3555f138ba5ee9cf9728175f43d26a
 EBUILD regex-tdfa-1.2.0.ebuild 844 BLAKE2B cbacb22f8c3a4047ad257464fba45026fc52d504172997d5641cc52f09f3b59ce7b2b135126636ae43a15eb88c844e1d70dc4e9714851c35a70f7aeb2ad0f2fd SHA512 b72542b7363412b534e7a890090cf4601e154cec5b1cf4889f5db1a5d7bac2215f7d99d186f776a2a3776dc4216f5dcea7857e7942c9074ea4498f9158fdbde6
 EBUILD regex-tdfa-1.2.1.ebuild 846 BLAKE2B 50b9bdb480e20ea89ae817c1ce590eb04082717fa75bc38192036a9415288c258d55e6134a4844530ca57c3b47a037f2a3bd7facb908759cacaef7ac795a2573 SHA512 29b70c7a3cbba14294776278af652ac85934f4f0f4a88fe84fa5718a903cea2a9b6eaddd24e1b4cf7b24663f88df93e4b68def366f79237e17808075c6cff91c
-EBUILD regex-tdfa-1.2.2.ebuild 766 BLAKE2B 4f28641cb8e155abfce8a59540b8f4dc076465c7eb56464fa464fef9b54a8664d059214708e872a862709036329b5093ce3c3fd5d41adcda18ce92c48945aeb7 SHA512 049d931847f800117202e2d217f34f804bac9beea1dbcc79243b220d138e40ab7908bd39734ec9d9c613cba598a4c26fc641cc7744dfbce9f12ed1e7cb75f565
+EBUILD regex-tdfa-1.2.2.ebuild 787 BLAKE2B 3fb9fe09ad4d7639d10090757bc98a2c805ba2a6fe973f8c29578d4ca113014be2e27bb083f8d6de335b7a1cf939fcaebd5a92b5c7301fc540183b878c45d4aa SHA512 987788a2faaf6652588772697740eec099491e65a897dbcbb6fa7b9ec3178e4fee701709b689e40f166eaa74303d27a9f611d5d74e4de85d8ce66773a3f223f1
 MISC metadata.xml 444 BLAKE2B 0d14326afe1d69dec62f60c7b41e77ed8dff408f212f638f4a2f5eed25adc1865df2a6994c71e25b6a7394d6fbf4c40e75296bd08869e509f614362bdea3ae5f SHA512 6b72b58d486e2613a573d36ec714244b8bb9b23cceefe0714a4ca3778522a9f6435c4055b442d7ec465b4b89d6c5edb61890250b98d4d077d11638a84b711937
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild
index 65a4150ca7bf..5d726a4e15d6 100644
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/resourcet/Manifest b/dev-haskell/resourcet/Manifest
index ca4dc3c45e6a..178a47146f0d 100644
--- a/dev-haskell/resourcet/Manifest
+++ b/dev-haskell/resourcet/Manifest
@@ -9,5 +9,5 @@ EBUILD resourcet-0.4.9.ebuild 1031 BLAKE2B cc350eaed33e9f1cf9e104a3674bd6080732c
 EBUILD resourcet-1.1.2.2.ebuild 1073 BLAKE2B 5c1bb11b08e4bb9f36df1ee6f1681a4edc24fa0f876adaf69c9d48a746397e420cbe0e060850887aec1bd5248fd1081d173394d006d132b5dd7327f2ae5b5bbb SHA512 3a1e1543063740b8fb01420c14e220f1544c4fd4da6aadfd523087bf108b64818e674b2738609d2088b9305af52d26b858be98e2d4998ab9d2c42a81364b19ac
 EBUILD resourcet-1.1.7.4.ebuild 1124 BLAKE2B a862823cf5e6a5de4a024b412d2ee50a4212d8e98bd5f6beacaa5ddfc9eda30ef12cd08f1716b0d7577b43ed9f7753eb8216e4ae58298e961fc0e5ca325acc45 SHA512 0b11bbd74d5c2356219a6771b23a13cfe587754d94f9bd24d12b91ba6e4eb5bde341beddf972d75c62b8d793c29e31e765077a569c93bee60c8934d0171c0d16
 EBUILD resourcet-1.1.7.ebuild 1170 BLAKE2B 6ba68ba8f342e2b81b55d8d4296419d4589468a1e502da3b594fdc644fbf42b7d28f3838e4eabd9fefad474742e0c4ed8fd6f3e326e63644589bb675b50bbcfe SHA512 c8a990dabd627e3f8dc170ca2722da52bbae42750f3d6c5b599bd6bc901b6b9c3f18d213349e340a91eb2edd587f39ad6f22b2f2830f2973e158ee1f6369d2f2
-EBUILD resourcet-1.1.9.ebuild 1087 BLAKE2B 6d6b99bf9242c366c1879be50c646ee85646917d7f2a6c6c1e1bb54125479eb8e1e50f2f06bd0eead0ce479bc85d7edd774d84ddcddf352c4a9af45564426238 SHA512 ae4c1ef46e08bfa6ae2d2c5226b4fe304da651e66a34b833f2074546facc1e1986126a3578335af76186a43232fdba78a0d95f9eeb82365a39cdbe86caba425c
+EBUILD resourcet-1.1.9.ebuild 1108 BLAKE2B 8f6a102be0eb5eb6e3ac586a988d78efc72f42731f075fa02a60f1e1f6136be2fdbea090ad8370d42fe95032a201d64dc2fc2290b74ad6de44a7bb5c39ce8463 SHA512 6fd6862b0778c08fe118d9472ca498b26c07b8fa4d0f2f06371d0b12e6038a387153390ded40e28c2bbcef02533c134c762c2fa4a5a1f10a00619e9faab43d36
 MISC metadata.xml 544 BLAKE2B 394f5029f5accd2d702704824311737801c868f568dff2f63ec5566466c75e3c7dceaca1351a4308d6fbbf7d410904727b6f7f93efa1d1a6a6a93ecc1dbcea8c SHA512 ff84b8460fab34313f1f38fbab60bf5a228465c79eee21c52a83bd5621334ae50b2fb4a69051c452e6ed206dfb365744d3083938b7816c46c4cd4f40c0d42093
diff --git a/dev-haskell/resourcet/resourcet-1.1.9.ebuild b/dev-haskell/resourcet/resourcet-1.1.9.ebuild
index bccf52351dc9..7d9878ab0bff 100644
--- a/dev-haskell/resourcet/resourcet-1.1.9.ebuild
+++ b/dev-haskell/resourcet/resourcet-1.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
diff --git a/dev-haskell/sandi/Manifest b/dev-haskell/sandi/Manifest
index fcc601aa8177..79daeac59e45 100644
--- a/dev-haskell/sandi/Manifest
+++ b/dev-haskell/sandi/Manifest
@@ -1,5 +1,5 @@
 DIST sandi-0.3.6.tar.gz 18463 BLAKE2B e480b127b08edf6d83504b06732f4565ee4e8c8438110a7fea6092f28a552ddda19b1fde93f021400272e9ebd1b5184cc09c902fdebb1fffc9bc2b1b426a736d SHA512 8a730f63e72fb648e2ae478a3785ab364b437a319735acda80558639cc0a43027639ff01dd2b630277348ebc31a4a5fe30ede8f4208229c1c8810f78d350bbf2
 DIST sandi-0.4.0.tar.gz 19319 BLAKE2B 87727c706832e4020f4e7794fa9c562415711766b5d37c4090f4f8ac3b71dfa840ae788b077b49c967ea885b2b915e16a7bd7845e62f46cc3c86fddcd1ca1005 SHA512 8d67d4630940b2bc75eba74e1aea169d604f27701015a19ecba6dfece9a2dc8a215a786991bc9ab1fc6de8c91c3b608144239b83c4cb01be0620b3ddb12ee8b6
 EBUILD sandi-0.3.6.ebuild 1034 BLAKE2B bfc00b61871ec3cc3901bec87db201ea386f40fcc251b6496abdd060d347275bf62223a187ce79124d9f7b0510572f6ced722c887fc1cfda77f8edea02ea3be6 SHA512 1fccafd015bcddd5bc64b114e1b0b5020b6da16368c086e94d4aafe26ed926ab3d516693a37ad5212523a8a0aef4faa80b82678fa8c3d40778e7e5fd611a0958
-EBUILD sandi-0.4.0.ebuild 1045 BLAKE2B 4e140814db7c90213bcb672f4ee343aa2f5ea83309c30c7bedbc5730802e090b79202a4edcfe7dd5c14dd98ce5cde0f2b556759722e7871a0516456212f0996d SHA512 50d4aa5fcd78d6d5e2caf77659d83b88c4360d9ec544d11f7423be07bf39e129c92c0846c2d2d1abdb41cb50024640d52ca52cf8462bc26d60cde84b969a3821
+EBUILD sandi-0.4.0.ebuild 1066 BLAKE2B f059d6228115ede5b8aba3009a407b90f6a9ac14646c23cb66211289e8c9d4f899ff83683a1c8f369475817d07db246b7491fcbb52baf711ecf1e3fa5ae325a4 SHA512 59f8cb5dafc51d20280a5f1f30fe3d1c5b861640c02c20d6edf12973634bbe5d8c3bf7a055f292bff3e3eca6388b66ab342a7eed52eb68b827a2a519402d0c09
 MISC metadata.xml 398 BLAKE2B a71e1c70366bebe2a04bc69c27ef2130c588992c31931ec60923e94ad7f7831138f090a1c8f234d180f31a1baa3bf5d5826f0146fc91762e791b9d3be534295a SHA512 4f801519f877ab3ae401c93f45d2ff8cc902e737cb5fcfadce21db337eb1d9ae3426df32acb8ce2ee5cfbb9f28df673444f16479970c7a13bcf4d936625caced
diff --git a/dev-haskell/sandi/sandi-0.4.0.ebuild b/dev-haskell/sandi/sandi-0.4.0.ebuild
index 050a3e3385d2..70e3824b28d5 100644
--- a/dev-haskell/sandi/sandi-0.4.0.ebuild
+++ b/dev-haskell/sandi/sandi-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+with-conduit"
 
 RDEPEND=">=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
diff --git a/dev-haskell/scientific/Manifest b/dev-haskell/scientific/Manifest
index 2b88f3058981..6fcc787c353b 100644
--- a/dev-haskell/scientific/Manifest
+++ b/dev-haskell/scientific/Manifest
@@ -5,5 +5,5 @@ DIST scientific-0.3.4.9.tar.gz 21932 BLAKE2B 5f0f900b5b51d8b4720bf73d4f2ec4911df
 EBUILD scientific-0.3.3.8.ebuild 1290 BLAKE2B 1a59a844723557101a6550916fa4a559b3e371d9e75db7fb33cc7e5510a4b82aa90aeb495751372498bf8b8306503586876caa51050f7fa59fab5b34423cdab9 SHA512 4b9e617275ddfe0f85e8ab40951c3880155680ac21fc4f14f99490a6d30386ec60400a33dbd9c123d1be285604e0212aef6c957c6bae7d8e31f6ea1f471fef82
 EBUILD scientific-0.3.4.4.ebuild 1443 BLAKE2B 45e5ea5ab95b7a3973dca248da1982e723ac0ebe04caacaf4332dd8bec3d26968a0d1bee506334d597391aee44ff3a65bc18b38ff4eea8463aa11f23ba424736 SHA512 ccc23fb4fde3cc8ee9020c8b7d726837a1ed7ea36bd96f8f10e82f0fc11dc84e88df7ba17e870864c7bf529ecb74d37d7e47e766dec80e40414a2813a04cc733
 EBUILD scientific-0.3.4.6.ebuild 1443 BLAKE2B de6e2cd0d43e4e9b1394cbf34f42e736beac2a8d254232ee3e52ddfdabf6549a49f15a3c71db8ae0c6e01b02632c67aa32ab3d49c2dc09f3926ef37192cbea2a SHA512 d2019d14b4a6cee040a838be4619e72a528bd94acdace20abf4dceda3938fc8251d416d710f979d202ef247f424f67fae9bf777d0e19a9e0922c927b51862d8b
-EBUILD scientific-0.3.4.9.ebuild 1415 BLAKE2B 2484d7d34b3cbf3b8eaeef16fce6acba4188fa98e8c766a2e9954ed1c490c24e81380b3eba7ffd8b43d35d5579ef49cebae0ba8c1a183ad47c56779f8f101cea SHA512 b90db3510d69635f2a36f18bad1c415aa5897b9c4a46019c5d70cc2d149604faa463d05a1ad6d024bed6ec9b1febe64702c22a560740ba3676b514fdd6fb681f
+EBUILD scientific-0.3.4.9.ebuild 1436 BLAKE2B bc18de7580cab505fbdd86c6efa71fba803639d1d661490ca206d3cead4743a8ec37db3cdc4134dc66d09e3719f50de3f11323b856f79dcb90c2b989b5727492 SHA512 2339f52b666645ee4de19239f844b630b59443a7ed6a5d219859900e7f534bd94c8642cb088a22a8d8d245ecce9ee9ab26f58312a3ce9c77e3c22cc8e07855eb
 MISC metadata.xml 1019 BLAKE2B 199c5a43e898b24760454aa88076485f8615506c4feda7df63dec16a907f1f9a645039ce7c4a5c4bd85f642cc1aca577edfc3b714c8632eae99d0f827fbaf8e5 SHA512 954d114b29202a451e82be2dea78c68db8b23c52d46a2dbc59b7cbef7d500d91edc0e23dce702f36569caa7ed3c85ee52bc3cc314d18e9249218635390252963
diff --git a/dev-haskell/scientific/scientific-0.3.4.9.ebuild b/dev-haskell/scientific/scientific-0.3.4.9.ebuild
index a42bbdde38a3..ef2dadaf373f 100644
--- a/dev-haskell/scientific/scientific-0.3.4.9.ebuild
+++ b/dev-haskell/scientific/scientific-0.3.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?]
diff --git a/dev-haskell/semigroups/Manifest b/dev-haskell/semigroups/Manifest
index bdb86ac5a79a..f6eb330267e7 100644
--- a/dev-haskell/semigroups/Manifest
+++ b/dev-haskell/semigroups/Manifest
@@ -11,6 +11,6 @@ EBUILD semigroups-0.12.1.ebuild 852 BLAKE2B a3608936f68d00f31a1b7064a5badcfc5132
 EBUILD semigroups-0.12.2.ebuild 850 BLAKE2B 398b6353cb4476b4fa86a2d99464594597cb733aa842718668b920a2566afcd5625bbd2d59965675debb1f60e144cc154f24e0e70fb7776efdcc6ee632379a36 SHA512 ea3164af5f0d5bd290e994f80fb90ad995cc2f39a475601d1ccf9d9dc27b5627f1fe9824b83cf6a0676dbd39baa9c1a24c34631968183fb61533a15ce87d0c30
 EBUILD semigroups-0.15.1.ebuild 1276 BLAKE2B 06d2985ea97062146aff8e32d3ab4abb581e666625af7f4112cefa06872cca02cc16a37539d41f8491a57e22f57350776ce22742a8912121965994c040ada43a SHA512 d5bff85bfe9a77ab598c35153bfdc7c8086215d6380253fc9f6935c752b6e24e1c848733de1be4ce61257c2aec0b6a077a08282bf148272e5ff32e7fceb59175
 EBUILD semigroups-0.16.2.2.ebuild 1259 BLAKE2B f793e2e83bd1b53244f8bc9400a96f8393ca5c5609e7e080ef113f85868dce7920bc56cfc3b9c1b0d1764f6b94b2dcf24f3510564c2841b9a5359710867bf74d SHA512 c1c7b13ee126b8360ece559fc7f7e2c68274879d0fd703903d30835f81bb874fabe6cc2299f19a1801d2934fc361f8dca2061291997ecaec0b2505766423af3a
-EBUILD semigroups-0.18.2.ebuild 1561 BLAKE2B 1f7f7eecf3fadc385eb8c9c2ec5929d3c3549c4067d514a5572f58779c51d441e0bbedba0ba7620a256c23574c076272f24e8289fa2dc369a95fee7c19cd0a11 SHA512 99eea81e3920a525ffe41921c634bc7d5f210e00f1026bed462f7fad68fcd7bc751187416300100acb77f24cecaed1090b6c479974847c7f87d618e0ad9c3289
+EBUILD semigroups-0.18.2.ebuild 1582 BLAKE2B f8d008197cbcdfcf4a70f70f88e446c3eb1f57255a2c10f3db17df4b11f337dd7e2ce65ad70bf6937c24bb3802b237a1f58c0566223d3b6d7fc8e85155d83126 SHA512 17b45251a6c4c0cad6a3d91b6902441275c59e8549d35d81dd0ba347218b0b077785afa34d594fd94b40c5130bcc620dab067a64ae8995fffd8603a85d0f6b2e
 EBUILD semigroups-0.9.2.ebuild 568 BLAKE2B f07a33e696acb226f965b5e5c10eb11119212ab0e6a37298a7fa4301b65f11fb88395c4008ce382f5f177519ebacc66b41dcacc17bd1080aa04cc61d7893c80a SHA512 fd6c7b502e6ec70c0a6f01201b9c3794a338105a36d9f59f2f6f6993a7b7453ff7636f18c846018b4ed804d6243419eb24a8d62ca381782cb71cf161e05e9f47
 MISC metadata.xml 2414 BLAKE2B 5205548612df4c16ac0a5d789cbc28c65e2d1f0a17eabb3dd43b2f164cfd6d71e472b6adf154fcc90a668b0ef1880f846cbfa738c2096b3d27f2fff081e529f4 SHA512 b92533ce71503fc7367f82cc9e9cfc9e2588bb342ea90aaf109906f344302e501b8f877a013dd576151ea272d9766e6bbc125e9f5aaa35411c62d84eabb0de0b
diff --git a/dev-haskell/semigroups/semigroups-0.18.2.ebuild b/dev-haskell/semigroups/semigroups-0.18.2.ebuild
index 67cf33ee379d..0d80b3c43d6e 100644
--- a/dev-haskell/semigroups/semigroups-0.18.2.ebuild
+++ b/dev-haskell/semigroups/semigroups-0.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+binary +transformers"
 
 RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?]
diff --git a/dev-haskell/stringsearch/Manifest b/dev-haskell/stringsearch/Manifest
index 153ad9352a71..e079b62213a1 100644
--- a/dev-haskell/stringsearch/Manifest
+++ b/dev-haskell/stringsearch/Manifest
@@ -1,5 +1,5 @@
 DIST stringsearch-0.3.6.5.tar.gz 38994 BLAKE2B 3e20c83315f2bbff08f4117e4741e30e1f196a6329813be68f48fc0a990733bfeb852294843d210f1d50daeacf2351a76f959fd7a78053bcca0db966f76b7107 SHA512 73f41f09d589f737e79b22d62c034bb9ebb5145ba0179fd4a9885c345ff8bf296e3d2f624a888aa8cd481d3f3c90c7b8a8380e345b8e710bcc83a2c3f821cd27
 DIST stringsearch-0.3.6.6.tar.gz 39679 BLAKE2B 78302abf1f7eba7c3eff4452b0f0187b43954001d7be868ad952e6fb58b80d84b5e08b369a9721e06708d0b7fca49ee39dc2cca3a31ccf151f0ce8a5a86bd905 SHA512 a642934981318b399a7fcfbf0134d5d02d8d072591bcfed7abc57bf6474b86d6c7bc6cf11f44ace6db579a0297877850fd9049be69b61f4f9964cd72455b14e0
 EBUILD stringsearch-0.3.6.5.ebuild 569 BLAKE2B 9e3443d75c23407cc0170e1b1af4e117113f75bb223c6ad033c36817a89a6284d96ace6af2649047fc6f0ec7fa2417582a6c1a875fee8a92abaea8e618c13c94 SHA512 bce8f128a1f10838702744dc8e5fff4d3274c6787754e5ff8769997dc96f9ecd89a3eec2844d13c4c0f60efa0e3fac7454a307abf785079b10bb95426c2a2686
-EBUILD stringsearch-0.3.6.6.ebuild 681 BLAKE2B ea4728347f159ef6560e59e62823583312b2b52d5d0c40e3dd2fec6dec47c59fe467e579836c4e973cf903a2b039680543ed7aca422f2827892d9cf67a7ac31f SHA512 ab2abfc0210d2718641d22101ebbc77179988a92f533952ee561b14cacfc0da1fdeee97e459145edbfd7591a67f47b27b878fd1bd3290f388a3c13566ebb6497
+EBUILD stringsearch-0.3.6.6.ebuild 702 BLAKE2B e2d19052dec21e38e3799e23a4e6dce90b349ed8a62de3faba0d7a1564a086e933579e7d9864978b5be84182299fbcfca8cf7e28514d3de69d85abe1d6437f03 SHA512 c5a4abb54b8caa0c9713c6e05e28bf0334cf336caf258536a7ef6b1f02835c0474aeacee15c0cf301521d708782c416e699ae99ad43d130b1291b37d1288c4bc
 MISC metadata.xml 813 BLAKE2B 82fdc42a6a0096b932c1c3e29767faaeefaca15e67bd71a70477f47568d4d85fb911f320b84eeb0da44c4807aaf727bb6e030a6a11e0795c74b7ae9724975bb0 SHA512 abfeeef6e5cb1c21b3056d2a7ddb5127f10678f213eb3ab4444bf644b0463b5a7c7c2084c860e8882f19d6a24eb86d67bbc4de6e6eda9d68e82211ef69dd185d
diff --git a/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild b/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild
index dc5bdd7f4b92..49bcf52d8752 100644
--- a/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild
+++ b/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/tagged/Manifest b/dev-haskell/tagged/Manifest
index 8d67679d4305..d8c1042a34cb 100644
--- a/dev-haskell/tagged/Manifest
+++ b/dev-haskell/tagged/Manifest
@@ -5,5 +5,5 @@ DIST tagged-0.8.4.tar.gz 10055 BLAKE2B 30cb546f6e65b7606c2630eee1ef1585d5d2ee88c
 EBUILD tagged-0.6.1.ebuild 571 BLAKE2B e21ac2e9f8aba290f69e9f4250c8902fdf6c4162c18d5e5059a72d06d04dea8d9ad2be9d1cec13a8ad6d6479767869993354609a1b3c467671368f0c423e13ea SHA512 3d567b8a68252f928559c3118f00a8345f41b56ea183a9554209ce17ec4c42eb7a584c640bf0455d7b0d25133a5f98dd0939a514e6748c4364e087ca5c3a5ec6
 EBUILD tagged-0.7.3.ebuild 591 BLAKE2B 5820dafb984117134f17dbc19ef101a933d03241bab7393f748bb61fb697db14e445784199e09824f39cdc1769fe64e1b53eb3ee4d7347d9695b9cf9621ab5c9 SHA512 1da38efa6acf70a3476331c2a6470b5ecaf2c2d863f267557b4f658cd995b9c12c3a587d9d15b3e5c8240ecde4e1c99466ff4c66277c060260fa2eb912c1f98e
 EBUILD tagged-0.8.2.ebuild 699 BLAKE2B bc307bd93d22a29cc7af831cdd24c49497f55fc1633502653d4524240c800701214214c435bc8a6bc3cb841174e8fb3607f8e9d72d7f7c5cc34c12305a67624e SHA512 6ccb88b320bb40296f1482e5f1b37a190c09fcdeb65d0e0aacadb07c6667b6c98370f809f4ffcd2f09bfe436dbbc9f6ad03d6e5659a7bd85d7955aec105b34ad
-EBUILD tagged-0.8.4.ebuild 697 BLAKE2B 0149f5c5cb9770eeb1b29c0554d35fedf1233d0cfe8be9302f25d27ce39406d6ac813fcf0923150a6f72f7a0b0b17459fa6f09e9bf245ac3f83b9fa9b73c43f7 SHA512 ba5bada286b39b6fbf75154cdb8286198de88de1ff4879df579c4d3f0e67d4a94c83c651057b2cba42ce3030fdaf54d4310bd296bcb0c50abe19fc7f3f46f35e
+EBUILD tagged-0.8.4.ebuild 718 BLAKE2B e2f1e736e330b8e335bed7eed5567688b52728863879f1a3867dd54c0f429057c3d027d11c87f332bba3d62ad49262edc314508deecd34fd83551bbebda89834 SHA512 ca9610ec9e050a47527682273b204babdf52394ffa808023a404f5623e57dcfb5adc34136d956db65c981a26f61a74007caee89d7ea9f2eae7797c700e16dd3c
 MISC metadata.xml 454 BLAKE2B 3c97a837cfd34e481b2a07d5bc797648c2805ee2667d795a67992fe25be834e54403d7d062c7b33b6879011a44b8d1314e9158b218f5239946203eb07fd20c27 SHA512 016998bf11394f7fc147d93365d9b3bf7fcd688d8baec4ed9c3b072139330dd89a4a99efa04ee564622ad9aad06438688cbb9191be8bbd63d84d55b58652e9ea
diff --git a/dev-haskell/tagged/tagged-0.8.4.ebuild b/dev-haskell/tagged/tagged-0.8.4.ebuild
index be3f84b6fbe7..1eb2ae51f7cb 100644
--- a/dev-haskell/tagged/tagged-0.8.4.ebuild
+++ b/dev-haskell/tagged/tagged-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
index b3d06bc44f81..bd62849a5bb2 100644
--- a/dev-haskell/tar/Manifest
+++ b/dev-haskell/tar/Manifest
@@ -5,5 +5,5 @@ DIST tar-0.5.1.0.tar.gz 39271 BLAKE2B 7867fb111bd5f7efe93899116fa9f36dd52e61089b
 EBUILD tar-0.4.0.1.ebuild 608 BLAKE2B 4dacbca714d4abcb8844b769ff476380c2e2ee23bbaf468f4f59b6bbe4d39dc6c37f767854ac0ce1d0807ce555d043f48ce7a10e66a2669136c75d7409ac0634 SHA512 0417fa428e1e4d3f294da9769c1f7593cbbc2e62c728e21bd79e7696518c7311df20fba6f811ef4e1fb8a514b4d9b9c078b048d139877171e088efa33de8ef66
 EBUILD tar-0.4.2.1.ebuild 796 BLAKE2B c322813955ea964ba8a0e09f4c1f474525ec39156feebdb0378337a769d3befe9ae022766bb8985b3189c86dbbf5e4dd4a1468bad7d34631786d4697f10cef41 SHA512 6ad18c09a720e87bf5f715f926fd9312fdcbad303032dcbb6e1108ac0e5f92665d90f17f2a38c9f07cc6b093b496f95e627b7e97048b488553ea4a07f9a127c5
 EBUILD tar-0.5.0.3.ebuild 878 BLAKE2B 8a5393b7f57d309e0fe3f7417f7a3999321fbd3691eeacbfd1663909a3d612aeceebf62215fc758947e64400b774405a5856baa1c41d9c8a7160b299a6b88cdb SHA512 3c35a18d10d536993f37f2aee8f54ad4c60d0742ebe6914cc5c4831319d716e201c4125a792dcb5000beff7b5d37a39f0b675fa872f2186c351c3e9291f73d0c
-EBUILD tar-0.5.1.0.ebuild 1247 BLAKE2B 9743ea931ae67bc9a2d7f8ba9ce1bc58ed833136de090862ae2bfc1cf47446044e432a793ac2988fa1b69c82085c0cc00a7e9624a9242c63e6eee22621a78e72 SHA512 bc53c4fe0b91d90a0228da6999784b8be67fd58c697c02c5ea4646136b9df3110cf54c5b1c8b0bd2d8ef666cf1cdd3802eed77b0e695362615a83e1dad03b3e4
+EBUILD tar-0.5.1.0.ebuild 1268 BLAKE2B f0a473b319622f6030809a853be68bd55849d2f94ca1797badee09cb5f74f6e2dc62700e30b62728a8ca6ebada72c7da3a2a78026caef3a1ecbd6c8c4fff17fa SHA512 91f89364cc6fe763f2348f6e4a2b51039f73f61a0c8ae122919a9e34006e5781bb04b627c970ac1306f09f413979a4449170ceaabe9317188a6ddfcdf13775d7
 MISC metadata.xml 636 BLAKE2B a60075b9bfcde03162a7f5a8a2a22ddecc9906c2305408aa3596763685ae5a65cdbebfe7251f9fbe70348a6045183ec840678a00efe338d0354d06cf0757cba1 SHA512 2088e0e13c3cd3539be718360a10145e17083bd135749b8ed3374cb51523f53bc0bbf4a441c879f95982ef235f18243bfb49ec822ae70ea4fa8e684e96fdde20
diff --git a/dev-haskell/tar/tar-0.5.1.0.ebuild b/dev-haskell/tar/tar-0.5.1.0.ebuild
index 1937fea5f724..4584561bfb83 100644
--- a/dev-haskell/tar/tar-0.5.1.0.ebuild
+++ b/dev-haskell/tar/tar-0.5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 #gienah: tests pass for me with QC-2.10.1
diff --git a/dev-haskell/temporary/Manifest b/dev-haskell/temporary/Manifest
index 72976e79303e..a40ce151fbe1 100644
--- a/dev-haskell/temporary/Manifest
+++ b/dev-haskell/temporary/Manifest
@@ -3,5 +3,5 @@ DIST temporary-1.2.0.3.tar.gz 5308 BLAKE2B 5c570641d27bbda5f28a1f0eac65a89377310
 DIST temporary-1.2.0.4.tar.gz 5347 BLAKE2B bf1d5740510248d993159aa4e1fba4c023efe1f64e8160c4a6ed33c2f8529907a406600c096f9ea0954f8f635955d2ba47968346f4c62eb3037f6748c862a9f7 SHA512 cc8ba1c43d3e75f13450cbbbea081b5dd42d4a8c0fd33dd4ca9cec636aa91c2cd5c6edbcd86bf7895d6672a46c3e2c8edc57bb2ce88f61fdc05ec75e62c9373f
 EBUILD temporary-1.1.2.4.ebuild 650 BLAKE2B d148fe04fd272df2cdb4af4328eb5248405dac2e5ba51be9731e6f08d75ff4c5f02021581063d9807cdfe35c02f481f84644af0ff89ef6fe3f96ebf10e832c4c SHA512 e80d3c394f33e818c42caae879b9a89a1c1760a83ebde9a07741bd012b3514e1cebd70cd14f4752061317ec21298f0ab83297c1e42484107d70201d4152f15ac
 EBUILD temporary-1.2.0.3.ebuild 676 BLAKE2B e767bca5c6c0c219c4b36e510d446d57c5e6b86c948fe57c8a85b8476a756932621bd4a8d34369838e184e68a24327c34cc54dc15aab3e3a4a8d78a02fe3011c SHA512 492b214479997007fa45f7736d64c6a4f41fd64be5e51e81cf0d95680397366129c4b2cd9802a272bd02399f394f19fd1a4accc3bab5f8ab706f403db591d71a
-EBUILD temporary-1.2.0.4.ebuild 667 BLAKE2B 02aa4b3a69afb2e765fed5a4aae9a82617c748ae2db0557573bac7b81d2b81dde172e823cc64ce0e798ffb34d0011742c48698f0a0fc93ac81e41b93a5cc5e01 SHA512 4e541c0df10580c33a651dcf52ce7e7f996ea1a46fe475b5ea93e9a450e3936122357a1effb71635f37bf7fb958d7e5ade3ef8c65b6ad06dde378728fe5a58f2
+EBUILD temporary-1.2.0.4.ebuild 688 BLAKE2B 512cd6b1a428519ff810d2540877c0ffc7fa60595071ef4bd9fd01089dfe2c66c0e02db9ee5d827c70711f8ef8a4daf2b4e46177a0deebfef11db885e752159f SHA512 89dbefb25616225844f465423095458399d331354c9cbcfa4099ab5e4b3b99af6e56b8b3bed3df5723945a5f76e6cf3f8a99c337f6848a3f1847fbcfefd62d4a
 MISC metadata.xml 760 BLAKE2B 657f8412b7add619d5d8827d13da1aebe29087a9334a6bb48271450138710c89e4227ff19f1348426531b3d189d750501ae343835ea9ec77d6e5a8b1e20b8a43 SHA512 bd5b25179a899cd867b1655df9e46e12d7a4a229edd3b1a13eab4688b6018757894be8c0a857231646e39260af604d762e8f7de5727d2366e20026908b3b3ed0
diff --git a/dev-haskell/temporary/temporary-1.2.0.4.ebuild b/dev-haskell/temporary/temporary-1.2.0.4.ebuild
index ed2f6be03c8f..aad84a9559fc 100644
--- a/dev-haskell/temporary/temporary-1.2.0.4.ebuild
+++ b/dev-haskell/temporary/temporary-1.2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
diff --git a/dev-haskell/terminfo/Manifest b/dev-haskell/terminfo/Manifest
index 09e26a5ea299..a5fbe580c22d 100644
--- a/dev-haskell/terminfo/Manifest
+++ b/dev-haskell/terminfo/Manifest
@@ -3,5 +3,5 @@ DIST terminfo-0.4.0.1.tar.gz 45615 BLAKE2B e763301621d9d55e250ac822b2dbf1a9b652d
 DIST terminfo-0.4.0.2.tar.gz 45511 BLAKE2B edf4fae3dc4d6550941f60c2e87bfd2a81757e54e4198cd39751a651b6a09671d5dc8e8199bc25c5a06ae5644d7c30a299cf3aaa1b6256850ea24f64002f038f SHA512 eda799218ee1b1a765d909e9723fbf7e2de33b2946fdaeb92141bbf056a20a66bebc4b72359d1f5bdd5d188a10a3701d73818cee65170e0660daccf8c295897e
 EBUILD terminfo-0.4.0.0.ebuild 677 BLAKE2B f20a78c82242c74c84ef754d049b4990e42a94de8386294cb782248fb11f8482c34d949ca83dc9d8879bace497c0c454b8c731639a55d87bba9aabc86638379f SHA512 255a8012534c401a8e9c24faf11d3b72b63f36187e666464a026ec3109fe7e9121fd475d3128d928024d929e478108f2eb2922fd38e1c9ba95832ecedce62ece
 EBUILD terminfo-0.4.0.1.ebuild 685 BLAKE2B a0f27910d3980b841ca3a46b56b39e35b37e127c940debe7991cd3b8a38bf3fc2ee9e76104c3c72ff1028e1fb911cf8d65ed4dd574e844693683871d352b6fd4 SHA512 426699938bb783a6073adfb9b7ee723df25ce4e578e2b1d6808ec70e28159d316807c1d15c2cdb3ff8116d00dec285124af45f842e3647b5ec2e5f29c6137607
-EBUILD terminfo-0.4.0.2.ebuild 724 BLAKE2B b6ed177c37ca5a9fb1bed107aa4f9c650f104066bb2b473d4bd4bc4e5c21c7192bb2124ff299205fca63564ae94fe846686ea59b213e89d0489ca623c29641c9 SHA512 2fea571492f9f2d4720777cc2d36d7388a1130a120fb22919554ad5277ecbf292a5b8f1c2be282c8b1c166c6fa506d113bc9ebf90700f474c078b5bf33d0b893
+EBUILD terminfo-0.4.0.2.ebuild 745 BLAKE2B 2142818114e3f126bd13fb60534c7b998158cbf643eca9f40f975e0dd3a55586bdf19c5da6ed530f6b59178aabda67073fe5eb6cf1c2d7b8d321b7aab4dced26 SHA512 7939f979e4885adc70a90314d5e8a4157f69386e5a7caed5eab19a0e689d4f8cc24f4769aebc2550a1a1ff21c661a25435dc450f337d068b97f1c3798bd51988
 MISC metadata.xml 306 BLAKE2B d582705c23d944c9c5e719cd7e5bd3ec21d51c972a9a6d1745ce7ffe7be67a02cce445aceffe320deceb2a3bd14e259e0f5d0a106f320abb7c8ab8cb6479a3f1 SHA512 265a8a424b9ec088d8f4f0902c294e336b1265a1cb538bf7aca854055a88a2aa2a33c22843b4a98007ff84b6699be0d0e68d7b9e943462a673580f5afd39047b
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
index aaf7baf83060..0da700147cba 100644
--- a/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/transformers-base/Manifest b/dev-haskell/transformers-base/Manifest
index a961aa78bd05..5cd3ab632bfb 100644
--- a/dev-haskell/transformers-base/Manifest
+++ b/dev-haskell/transformers-base/Manifest
@@ -1,3 +1,3 @@
 DIST transformers-base-0.4.4.tar.gz 2550 BLAKE2B 39bb717561d9cd44737787c6770fd3306726caf6fca50b74015f6b28b47ca330edcefbd3ab2f1131875b3d918d1df6d44890463119ada422fd84f735046c4cb5 SHA512 5dbcbb321c7dc07a70af426cf3426433e9000e94278449ecbea025b79ec14f49cd9c8c35ea56ffa2b18444798c088a9db05badc2c819739b6ddd583c04114ea5
-EBUILD transformers-base-0.4.4.ebuild 822 BLAKE2B e025c709735207f838e7c6a5cd6ea9e6e46fdb4d62a0d2baf1bee7617c31528754d5b8cd5e5bea62576e9c442b278c7fb5079e205e72612c803284d835a8d986 SHA512 a3f168222021a622affd68f3f3681fa4a15b027420df924b789efc02b78de02aeb4a49a360e7f322adf722fa4e1da51994858377fdfea6a7b9e9e57921826e87
+EBUILD transformers-base-0.4.4.ebuild 830 BLAKE2B 69d1d9c4ce2bb0026c37b83ed38d47de0dcdb0c7e15c3b7af7a70a38f8bac5a163117803239dac8f83e631fc71064c54952f32016d80bb28c7f440f4aa2f1935 SHA512 830ab1255c62c1efefe47190d1fb840b0f59780d44ddb26350c661ae54690d0b7aa0073c78d7f7f2f55ab37a3c5ff9cbf5c2ddbef272ef3f97e2508f5f7e31b8
 MISC metadata.xml 565 BLAKE2B 636eb3403e0f9e00e87d4f1136dd524a1be1afddc18fd6a550d67266a2e3a50f03de43d1c398e3cdfcae4b2ce292fb7454b06d192fa49b9d15c68d940c75b7a7 SHA512 b965edfe8de254fd4968dd092f9248521a2089da39469206779ea841f45655d39b496bb20f37f3e529e71b5fb1ce8f32cc569ccdc0577f108cdfd137343705c0
diff --git a/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild
index b91c24043d57..58841eaa5d4e 100644
--- a/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild
+++ b/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+orphaninstances"
 
 RDEPEND=">=dev-haskell/stm-2.3:=[profile?]
diff --git a/dev-haskell/transformers-compat/Manifest b/dev-haskell/transformers-compat/Manifest
index 72b187c8fcba..a8cfc75f583a 100644
--- a/dev-haskell/transformers-compat/Manifest
+++ b/dev-haskell/transformers-compat/Manifest
@@ -5,5 +5,5 @@ DIST transformers-compat-0.5.1.4.tar.gz 18574 BLAKE2B e08bbb9b6104a9e46b17478b15
 EBUILD transformers-compat-0.1.1.1.ebuild 620 BLAKE2B bdb7a0b053435d90f4768aba82b56f6e68f04e9b2a3731f225fa7f2378b34b9b3e4735583f7a9386b329ae9e538c1c3eac1745d09155675bf5402322b699be03 SHA512 585ac47a41de68d35cdab0cba76b2bcd37eba1e8294f09b534ba934d84b945c8efc38a2ebfe5c14a632e2eb77ab0a088f16b6d718b1e7770f19241862806fc63
 EBUILD transformers-compat-0.3.3.4.ebuild 913 BLAKE2B f56bf3b4261d29773965825293371d858057241d94764c67f9adedb929f6db02e9fa5f621267b9118de6e547c3bc354679377217c5e19b04466e28565b15b81e SHA512 475cba97dcd38619e717c0a8d5f558313ec2d4cb1a06ad1529cac824f68b9833b8c5fbd62e06be6de203967cd5a98ee175cd2997c6ee0da6b300eab4f63cb020
 EBUILD transformers-compat-0.4.0.4.ebuild 1014 BLAKE2B a1f82bb3e1341b9aee310c83d06a9609b1f8320c0c79a3e5661255974729d88abfe962f0b73cb11adb9cefb1e7e94f23d658d2b1a0064283214d507a9a27e14c SHA512 675bb11bdd28c309c65199c0c76e00eb704d185a550a55e2da379b4bf639b60baf069299faf77d2be939850398d3b462f97cb3e8139452e3ed96f39f37d20b92
-EBUILD transformers-compat-0.5.1.4.ebuild 937 BLAKE2B cca317e0d1bf498c6c8dbaf630aea6a777847511ef4a5306f25d8398229f4b312cea7fc23c7a540ef3f7f2107f9bceb55ba7dff5d3a78358eccb6dbe3a7f7e9a SHA512 80dac56f2569bf97aaafe7b446f17132094e0a9172275397d12ff61f9fe2f6e33f94d8ec7114df4b154744eb4e085a3444633d5f4e310d6cfdd39310d2dcec1c
+EBUILD transformers-compat-0.5.1.4.ebuild 958 BLAKE2B 5629a55a9ace7a60f7d93fed28110d030a64a8a77e2c1fe03dd63adc50b7a45c85615db4dda79b91ffd8b5a0715cb5caf8af423d056c83ce5c67c24a32b2e7d0 SHA512 d609494c3534d24adde05f82b428f28f6adb4c7a7c4a8f0711898a9e5cdd463f636e80902569e57e26b7b6c58907884fa5e6001e2302cb9d3ee5eb712ea531a4
 MISC metadata.xml 876 BLAKE2B ed51724530e82f2003a7ad612a2f18f22cc89879610b0bdf269461c1c72aab6ddb62e8a4154852e941859ea7658b095af3681e74b11b7f907f0c91cc30c35fe1 SHA512 f83fabfaa75fe7598f14e80ae17846a9f525cf5fae8b407d6ef45ca7e7816b3b04fc0c6ad02f9b2ed0c5cc4ded499d7b9afab922943991fb96d630597a9f4adf
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
index 48796375b7da..9c3ad9a5f09a 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/unix-compat/Manifest b/dev-haskell/unix-compat/Manifest
index 85b82e4511d4..e863e02b3046 100644
--- a/dev-haskell/unix-compat/Manifest
+++ b/dev-haskell/unix-compat/Manifest
@@ -6,5 +6,5 @@ DIST unix-compat-0.4.3.1.tar.gz 13152 BLAKE2B a2fc2d7ab23c0b26349181cfcfa98d8649
 EBUILD unix-compat-0.4.1.3.ebuild 662 BLAKE2B 8ac829109b656884692a8578c35dbba4d5b9798c1b82e035c7e738bc6747b0f224d6e65987075918f454faf5b8b6cb69edc856eea33bdab0fff333ea127a3b15 SHA512 4442542443409cdfd5a94e78e220e3ce56aa0c9c5a45c875a64e87eb001a0678057fff2adcdd35e1ea915d1664288c96f2b9a422369ebd5c70282706de86e6d5
 EBUILD unix-compat-0.4.1.4.ebuild 669 BLAKE2B fd8d1aa3a1a0095661b2c1be9974ebe9e1709064e068e16e950d398184b5351030ce64bc780b9adc6f09e198a4333a84b6dba682123701d76d5422cd56d27e70 SHA512 38113d9ada373977625304bda66843977bdf2465f9011e3c09157559af9d7effd3c42371581015635edf0f20483da4c7ca74dea21e0c5772f856cf5e97980df2
 EBUILD unix-compat-0.4.2.0.ebuild 667 BLAKE2B 391e0351e618dc5ae5f75b45cb7d8514db757666c6d891f77c5a9a0e3b1152798da3bd6b20fa208dd577263fe8b66b9971a354249fbe71173fe6da197c8ae99e SHA512 edabb7d0f4d9492299c9a557f0384d400c6b0d1bf16a7a2746ef83498e146b277638b67564e5e3aff8ad4dc02480319369d57d12621772183010ce3fe5212d9a
-EBUILD unix-compat-0.4.3.1.ebuild 716 BLAKE2B f27653c9aae8ec3c533fd6a2447cb63f358ae16cd780ff6464e3a6f805fad69b40674b8faf8d45ede69b950e9c27dfd8fda081871cb1c06b0bc4e48e007d61b5 SHA512 410c4a3f6880b3412d64df9955ca9f0de7f286d9e734207a84a33bdeb07679539d0a3ad61e83002fa2ac936f983ae5b062db1a7b0b7c1c9d450947604f0a7102
+EBUILD unix-compat-0.4.3.1.ebuild 740 BLAKE2B c7f8ccc731d191f2c9d5a47f4b3f95f440c79b04bfda66103aff96394032524bae66d2fa6bf2ff67336139c0f9347f6bd764fadd93a7e826fddc740ff9d0f357 SHA512 99a224f77b395e73c8c9e0e53d00f4a491397991c5fe7e992aa673f01149668a486a7de73616577c028b5ce9a4cedd1a03bf04957d02021e1d50570ed7644620
 MISC metadata.xml 650 BLAKE2B 99476ccce782fab6a1f6c8a571e49cbec4ed9f97738669a0654a567868a7d3106dd0d36c562bbb232dd2763ef4e5504fc56bfcb39fa1eb8dbe7d74d8843ff037 SHA512 7ffb0c501a229a3e3bf2d94f72d9c63ffd7b11033392a8fca8b90e180fd299f97902d5d601402754608654930f2611ec05a2e9df0622d3c2ad6dbfc2cc9435c1
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
index 326d3365b9a8..30a8f8e1bde3 100644
--- a/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
+++ b/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="old-time"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/unordered-containers/Manifest b/dev-haskell/unordered-containers/Manifest
index c1a435640beb..6db7abc7ed25 100644
--- a/dev-haskell/unordered-containers/Manifest
+++ b/dev-haskell/unordered-containers/Manifest
@@ -7,5 +7,5 @@ EBUILD unordered-containers-0.2.3.3.ebuild 909 BLAKE2B b3f86ce28efb8f77a5b9ec716
 EBUILD unordered-containers-0.2.6.0.ebuild 948 BLAKE2B 858281fe7745b7779db2d6654a27e98822025ff4072091eb0137031b2f96518842632a4b82cdc3ed9fcf9c5b2d1b14428567db7cae796523f0581eb68d35ed5f SHA512 e70725c922330a5cddba8d4037aa709238c60ad61e640193604e8de0e4a9024e72941ad832e4669e9dd04bfbcd344d04d9141b2a0950a8661550594d4d46e98d
 EBUILD unordered-containers-0.2.7.0.ebuild 946 BLAKE2B 78d1f79257b479232812f62a891845da371c1d3fe0365cc7b5dd4ef964b4fdde8924d6138e868225f888618572af6dc003428ae29e81d2576baf6ec32894dff3 SHA512 cde60d3175d8c5eeb906942e5a3b51d605d8f34c41bd731e2a90282773cc7f663a7afb68e987454a73ad973b1097484298aa8444f9a291ed80a4df8b23cc7551
 EBUILD unordered-containers-0.2.7.1.ebuild 946 BLAKE2B e6cfbef05d77539becc0820408d828fc9a5a25824fb81b2dcf22a52763e4ba457ceecb448fec8df193c104845670d09b225f7a48f4df1fdf663b93b2f60a387b SHA512 0b8a68bb9acecbf4fa181d66755265f43c8e1a9a7aa3560502f13bf0fe58c9f596ecf417c88d307ddf12870271fbf5f944e22653e83dc700d34f96c3654875ed
-EBUILD unordered-containers-0.2.7.2.ebuild 1053 BLAKE2B b4077a72ca2f094ab5b9440fa04c9ddbd62ad91813fe18e272e5f6f09058bb59757b4673e57fcac392f90e756c763dac85a2de1afbdb7f6656a91b27284f26d5 SHA512 b90141b2b61ec20f09a490d036ce4d41f0ca8a9a62e5c922f5db8f656969145513fdd94d70cc167647b6f91570ba1e8e04f48f3a9527600d4f567f65d08283dc
+EBUILD unordered-containers-0.2.7.2.ebuild 1074 BLAKE2B 105c790688c43e1e5f4af40155e9f9b754f39885a69ab492bf1035da8455283d6fc87acf3921c40586fb0e0b9a97128b49aebd8e663d15b7c0d536743616961d SHA512 5b576ec61715296015fa853c6a5de39d052de340ca00f1e73bc61dff1bd592e1f8203a8f6dc760f84e3969cef7c5f4fd1864ec8810a3c1255787ba80384790c6
 MISC metadata.xml 674 BLAKE2B 6ca653344cf995547e0bc05cdfdc151e6873e2ac6f73a969eb65e9c01b15ba94dcdec3f5d3a73195000cd8af7b5bbb18eaab01b2c6439f0c367033e12bb4400d SHA512 55f0804d9c89984a7ba7132c9e58329d82124adf9029e91eee7587ffd3e3fb3be12a18aace8f616411e21b5236892482e7710dc625e7fdf27214a94575333677
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.7.2.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.7.2.ebuild
index 2c8096cc219e..0a6c6571de05 100644
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.7.2.ebuild
+++ b/dev-haskell/unordered-containers/unordered-containers-0.2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RESTRICT=test # circular deps: unordered-containers[test]->quickcheck->semigroups->unordered-containers
diff --git a/dev-haskell/utf8-string/Manifest b/dev-haskell/utf8-string/Manifest
index 124194df93f5..54951598d4a8 100644
--- a/dev-haskell/utf8-string/Manifest
+++ b/dev-haskell/utf8-string/Manifest
@@ -1,5 +1,5 @@
 DIST utf8-string-0.3.8.tar.gz 9129 BLAKE2B 9ee624a9a1258b19134ac63e6b15fbb71a17e03e78be49c464c3c76eeaf2f052c65f8df360900a1e9badb31d7f27059aa33642e6244bd665e62519abe663065a SHA512 70f6ceaf4d9d6e6fe7b787facbb733f276ac5ba10c49c43e0da283b481f0579e0933f6343f5158973a6f0aac342f5b76258281dbd0c420bf652ad3c3787eb1fb
 DIST utf8-string-1.0.1.1.tar.gz 8667 BLAKE2B db2f899e0f78e44700cec859fd71982024e05f971ab5fef36071410c207a23dce1fa7430ce6cdeefdb5b2c28509eb5848946e2207e046ab7a4105c56e25fce16 SHA512 2dd647625478c9738b3af5e23e1e5ff92968449ad74e6d53dc308fa0f2b08b63c421a1cbe5491dd260b9b32770ec626843d320a09b80eb984211dba53934b965
 EBUILD utf8-string-0.3.8.ebuild 691 BLAKE2B bfaab36dc35a91e2411de2bf2776d558bbaa182d931749fc684dcc3c0679d07dfc6189ad5ba67410cd7db1a2e96daeeb08dcded0ff5f8819f0067211eb30632e SHA512 49789d1ad0591842a25882a56e77a8011e146487cf3677226cc9b793ef056758dd84028ce65d8783a5e9dcdeca438f498d4adb99eab3267e6938666ed5398ba6
-EBUILD utf8-string-1.0.1.1.ebuild 704 BLAKE2B 65cd6bcdd233920b1770287469f5a92d2dbb0c39cd03465b39e5388d39ff252c285a47bedc143e1df37ea2167d571e7252ffd593bfae54732350d7ae8e0b1821 SHA512 5a76578650b05a51bd653134d867f79704707e40366167a26f4e0b537104ad3d6f7ebc3f22704511f7bb2e4c4d8fd01927a0ff35c79dbfa278e0d150e3cd51c0
+EBUILD utf8-string-1.0.1.1.ebuild 712 BLAKE2B eb3a00bbaa34c019cc530888a532259225949d9983ff66fb5ec268871ea0a9d77637a010f938366a973cff722e74b26efb91d946f170f51ec64ed2ab075d1300 SHA512 4e3ec0a9c47d660cdcb77e695b88c14aafaf021ac00292a9a415ba9d8da5221591c789b648bd5a52b887f5da651cdc523ff6b9f35bd47a3567f9e86da0542311
 MISC metadata.xml 309 BLAKE2B 41ec5100a1fe355f798d48894322ecf00bc7802fac10222f95e96674335f9537e23f04c37bddc1e1cdec7728b33c3a6d3781dbaf2be464fc5643b0468e1ec4d8 SHA512 ce8b570dcd924d3409d3dd5c2d27601799b30ba8a166f502d262b66d02c63f5110bbcf92fb5ad5a610a68d4a97cd55a70bf5730d17a2a590a0df83d4e00c2deb
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
index 3435d32f2ec0..6cd91dd78365 100644
--- a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/void/Manifest b/dev-haskell/void/Manifest
index 166f6de8efb3..708aaaa0569d 100644
--- a/dev-haskell/void/Manifest
+++ b/dev-haskell/void/Manifest
@@ -1,5 +1,5 @@
 DIST void-0.6.1.tar.gz 3807 BLAKE2B 649b810bdb0d4ff1e670dee0d4f2feeb131eec09e10d4aeef1094b06dc0b2e4ed67ee3867c3a39d3efbd14ffea5479b54ea81e928a3bb345cc1b823eb35ef922 SHA512 9158e201547b43e97d13112d87ab27b7dddff90fff11727c880bbd03e50faf2755ff27c03710e7bd634325a2c31f07e70dae61e62d925fa1f31b0b66e3927c48
 DIST void-0.7.1.tar.gz 4103 BLAKE2B 194310d0aa555d7524fdda5e57be6e56026dbdf99a299cd03d20863027e3e67f86521d62cbfe56b5126513c0f6c06ef793fa537d190ca532bd965252f0d7bfce SHA512 15cffa3ad31f365ffd276d962ba6c401907d5f4d74deb0b2635a8dc9b516519961c7b5d44751a816cc3480d12bd84be4a81b05703e31d4e796a58c4205e4785c
 EBUILD void-0.6.1.ebuild 712 BLAKE2B 76678a4e3c4207f3c5671a964e95ddfbe3c3c54b8d4caab4ec6dcbdc84182242dc843c831e8c9e18b2830e2963bf5f08859e3bbddf900d1e3742c5362f1dfb94 SHA512 77a6a1a0491932f9a5997416adf3b601683bbb3b23d26e875815d101bb5fc15fcf9ac5826dabe329d9219eb7aac5d90f37dd5d78cc270ffd94104a39e22d1bcb
-EBUILD void-0.7.1.ebuild 711 BLAKE2B c95af54543e843926bbfdda093a390b48d52e2cfe2424378cb5af997b6e32d2e839181b98f33ef81b899999d42c135f4a634e8e270c98475153c5b0077a51c28 SHA512 ea269b40ae883665cc9e2971b289a68c698db8dc2de8cab0c10b09db50d474390f0766e1db0f33c6bb216af8ff6fb529e7800d528fb66f7f08ae02f368cde212
+EBUILD void-0.7.1.ebuild 732 BLAKE2B 614a61444486fb41cb727280330eff9cc72090355a8a782717334ee330037e7a87f75a176db770de38251b093bbbb4ca0b62ab2a6684c48d18dac9e838cf5b95 SHA512 94ef29dcc0630a014993adc83b70d8a0059d62a20b6449688ce560f174df28aec4bb2038386c9602d3758010a2d6e1b1c17ec207a1fa35d395254f9575419959
 MISC metadata.xml 547 BLAKE2B d9050b7cfcd668512098f65236813cd5b045b39306d4b872feab05a9ec160b8a2368e9db0b61d9ae9c0cc9fb2904129f4f597cccf4acf14e5574136986044f9c SHA512 e6fc6b0ec727f8c5aedf5f141719cd225d3799c47947e69b2c4b0b7b26052418bbe4f8198c737dccc823a919f03d3b337c468f7f8cd152cc0dc2f8c343f1f71e
diff --git a/dev-haskell/void/void-0.7.1.ebuild b/dev-haskell/void/void-0.7.1.ebuild
index 375b57b76ab4..f8b00609186f 100644
--- a/dev-haskell/void/void-0.7.1.ebuild
+++ b/dev-haskell/void/void-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="safe"
 
 RDEPEND=">=dev-haskell/hashable-1.1:=[profile?]
diff --git a/dev-haskell/wl-pprint-text/Manifest b/dev-haskell/wl-pprint-text/Manifest
index 7cb50d224599..a6d36ac5d33c 100644
--- a/dev-haskell/wl-pprint-text/Manifest
+++ b/dev-haskell/wl-pprint-text/Manifest
@@ -1,5 +1,5 @@
 DIST wl-pprint-text-1.1.0.4.tar.gz 15140 BLAKE2B c2c7739638098180394c6ef98e435ea52d2a414da4d629db2ebc0ae9f01414c4a33eeaacfe0c8b733e89914ce308885bc434a71797a3228d94ae5fed1a32bdc3 SHA512 17116393deea2b0ff9b34d6df411e1edc219803bc3986ef105e4bb6bf03f193c622e54be998712a777605bb931a322e828ffee7d150a8787d41480672ea178f5
 DIST wl-pprint-text-1.1.1.0.tar.gz 16575 BLAKE2B 9e90e0d58fa9bf099cdd03446e35ee933890428f2e523978e8addb55af6a8d31642da5989a8a1703b67e82d29fb93baf84a2471e493a4433dc2024a100799d7a SHA512 16a265846b6f116b8e53b691875afab2e40c6c75dabd6ed74d2bc23aab8241208236aba880cb1b45b15dc2d3b0e1654f0187d8492145147922ee6ff4a36009fd
 EBUILD wl-pprint-text-1.1.0.4.ebuild 644 BLAKE2B 0bf68ed579937157592628ebaab545009a90c78df92e17ec54bf387b51bff530a3bb09e88768a6609a335d1b7e3f0d94b1b30bd51f3959f2b30cf3f277fb9e77 SHA512 388aa15472e6089fb2a265ac9d59072edeb107b423374b7fc780076f477c4641666dcab6749f24d1b14e44e647da9c7238d0f7e2d707e9a474d3f788abeec74b
-EBUILD wl-pprint-text-1.1.1.0.ebuild 731 BLAKE2B a3344674613f21a639e6a965e54320d28436e559fb599fa175fd652909defe6ef5d67afde56a010b949407ea7f9b2ac1722b63faf7dd93989c1fba4c903d74db SHA512 4d74284126fcfbe4a661f158a59117a156e8cfaac92c3c9bdd84ba9f13b4c9a722a89cb554e0fed7e5855329f18421214d0bc7b56c3dc718a7e056b355f0a28e
+EBUILD wl-pprint-text-1.1.1.0.ebuild 752 BLAKE2B 42a4734dacee2f16b481fb4107eb2ec6cb737fe20d08459ec80798a67f44b81a3795368868f6ceee7cb50595c047ac378a718251a19ee2ff67f2c708f82f51a0 SHA512 abc30e2d388c8b5be2735562aefdefa2c796fc9c9c3074a41303cc248b1279c1bd58b4e0e0c374da0ff3a2b7ac27cfa27fad54dcadb2c033cb72d0beb86b6b20
 MISC metadata.xml 342 BLAKE2B 7d8903aa4189e9e42195c98c30e92cb25bc5e59bbcae5598441ee58fdd0893c9c367981c4f6cdca3a3735f39d6f955472484bf42cddae4ba0a78d998e7b111cd SHA512 be2a9a24047f85b40a42ed9db8784a5726949fb1c4049ed32d2403bb3a00b3cbcee8e0602842e681b75208374d1be142ae36cb2510d7d77450942549ba4eca2c
diff --git a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.1.0.ebuild b/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.1.0.ebuild
index 969f634806df..0003c4e288be 100644
--- a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.1.0.ebuild
+++ b/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
diff --git a/dev-haskell/zip-archive/Manifest b/dev-haskell/zip-archive/Manifest
index 2fd138c1620d..c8770559ceb3 100644
--- a/dev-haskell/zip-archive/Manifest
+++ b/dev-haskell/zip-archive/Manifest
@@ -1,5 +1,5 @@
 DIST zip-archive-0.1.3.4.tar.gz 11250 BLAKE2B 830cce7d1600b66833e53584da68b07bfbb0417e9a752bedeca02b436e287ce187477851660d426104f392b6e508409a79abb70b0c781523100d7d547a155e4a SHA512 8476041bd3674a42c3777c54243037162d3fdf6f8e0c0bcb9577a4cd76a41d6d9dbdddc482845256858b284bd2bb6ad06cce8208c5584e60553ae659386f8165
 DIST zip-archive-0.2.3.7.tar.gz 12902 BLAKE2B a9b5563034cebb36c604752691950577996bf04e33bafd449019b08532f99635959502b4147ecf8e282d5a9379e6f09d2d2fe730579595e4d2991c152dcbe836 SHA512 3849a9ac806d69b496bfd2973ba8908b981cd72f900565fc9aea8a2b4080ec7c6fe8c579158c22da0ddc398faecf77a7ae1793eecf4d3054d0bdc06fde2aa7cc
 EBUILD zip-archive-0.1.3.4.ebuild 940 BLAKE2B 4b14c4be3762f89da61e6b613a3bbeeaa86734caabf5defb592e536d40156d586be89d58da1dcf3254025407e2f3e62643aa405ac8de16d406f119aaa03d29eb SHA512 e2207e5097df551220c3c23fc333aa6bd0ff7d0f2eb9f74aad7bf19757dfdc3b8aa5fdfbd5a61a442412fcd7c78ad4f9761ade5b9c76083f38decc86592db497
-EBUILD zip-archive-0.2.3.7.ebuild 963 BLAKE2B ba2ad5b538786e6dc7d08ca984ac0cba51ee05965607695412e1a58f34175b2a9957db9f85d5721461279bbcc8e7c5589edde0c3d59d705d0a6228d305d11a19 SHA512 93d51a4aca842cfed74abf13386a22ab19904f9c6486477c343912bbc2be13d5581ba1df999bf44448e5fd9ecdfc7f4496da2a09fd2ea4c3db5e2e38399a190a
+EBUILD zip-archive-0.2.3.7.ebuild 984 BLAKE2B 04c5434bca1d1b658012985d394d539d3bcff01c09843302aacc767d14b48e7756ea91c6e09aa5039200d5a93b4ab60efff0ee47c90fcff92cb9059802812cd1 SHA512 3e4a415d260aa93979b2aaffda6482cf0ee3731bb39daa702bbe368e76f2f587dcd4d1d2cd6cbe0ca71409d5a0603c418e2619232bfea17412472d865c969347
 MISC metadata.xml 554 BLAKE2B c174354f44b6718bb8fe11bd45e5ab1474362828356539197f38160104c2589fcfddd691d120294d65f14a1a7659c5777f018e96b1cbddb9aa952e688c3c119d SHA512 0dd9cdbf572293e8e8aef46bc393c2cdb672b09170e383bc1a18100275061369abb875d38a8d00a7da5a7babe45ea827d551e19e49053649daad9fdd4201e5cb
diff --git a/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild b/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
index 8b1de9acd6b8..20568c27d17b 100644
--- a/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
+++ b/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="executable"
 
 RDEPEND=">=dev-haskell/binary-0.5:=[profile?]
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index dd3623e5d89a..23788b1aa1b7 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -6,5 +6,5 @@ DIST zlib-0.6.1.2.tar.gz 142413 BLAKE2B 3dac7acfc11b9e8dd00e7e9b35daa420a34f9cf5
 EBUILD zlib-0.5.4.1.ebuild 642 BLAKE2B 3bf6476fa848fe2f94121fa756f7e6f378b1ba1979018dfe8371ff7dd4f6bddbdfd02c4cbfbc6b60cb8898d054f3324b8db3e29545ad24fa06ad13459ab549e2 SHA512 a678ee02dd6c7f8df8b5676f3183b2a4f6d890d22d8b5308f716df6e4f8770111669e84a5486ca01c4ae3c705cf92c066eb75a1a0d7920bf921cb67c3940094b
 EBUILD zlib-0.5.4.2.ebuild 646 BLAKE2B 65880f2421138767fafc5a26a2c6bf59508ebb1a46ace3bbdcd52b88261dd450d71006482ea3721ef4adcaccbfb66e2b5121c7b97839b731ad81327c28daab4e SHA512 6add183c13a576819362ad63cde8607c77e426b3bab7c85845c5233e8538f3a6940346e1a8a224e79331ddb0ba566d6c741c07e3dff73418f7ae5a3617097d26
 EBUILD zlib-0.6.1.1.ebuild 836 BLAKE2B 180ce9439859841de82fd54bf633e3d25e3a20b05bb6263ebb501f6982e6a18e9dd3345f650135c3e59b81bce3a39b3e2299a2d554b7894bda2e6160a5dc5bb8 SHA512 79d014a5314aa97918a3a907624ea911be608a9b67d7b9590c5a33c6cab4b2099d55cc3be31457a9e25acbb7b7c8f22b46873436aee97c26f753f80e0b20ad23
-EBUILD zlib-0.6.1.2.ebuild 1030 BLAKE2B ae3dcfd2bb31d38e03507f1d3f84d84a00451c999a1d1d1ea0329e5303602883891c9cf417ff91b220400c0a490866e2e5703f0b565e29f5da930800cf0d3a96 SHA512 aae054c5f08ba245e7ceba341e810edb8023f18841270f36dce97cd61374dcd7f64aaabc660c3923e2abd3ee42cdadefcee4edda06d4aa12445b9b8f9fb5a5de
+EBUILD zlib-0.6.1.2.ebuild 1051 BLAKE2B 6c11c70024ecb4d18a717af71b83bfd34e54aa4a87d819d2245f76d8f0869628a93bdc65de6211af6733d861aa39ea0da8ec65b2d041e3ee9e7bbe57e0f6be1e SHA512 0a676d0d788d2df3ae0fdb071343525e1313c71020808f3773c73b4978adc02cf2d21fa81fdb74d528f2d9f0be165a13b411bf61d2aceb33644dc9eb79112768
 MISC metadata.xml 824 BLAKE2B ea99ec3ad9a549c70455e91a59f38b6937da780e406c2bc18d039f93ef3cfdd08f600fb8854173c54ccbf029125204693f0da1592d30eb4554d479357299a7bb SHA512 c291a8088ad2d586390dad8cc2bb80a606fe7e558f4fdbba5c5168024693ea400f6d3a2795144f2c5af6cea51b90fe9097759027377ee8ead929296a4b4f26de
diff --git a/dev-haskell/zlib/zlib-0.6.1.2.ebuild b/dev-haskell/zlib/zlib-0.6.1.2.ebuild
index 4187ff78db05..43da6013dea4 100644
--- a/dev-haskell/zlib/zlib-0.6.1.2.ebuild
+++ b/dev-haskell/zlib/zlib-0.6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="non-blocking-ffi"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 80b618f57baf..00ba933a4f7a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 8f27b18f99ff..1b202550c6f9 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -6,6 +6,8 @@ DIST icedtea-bin-core-3.10.0-ppc64.tar.xz 54444136 BLAKE2B baa42a8a5133936f6071c
 DIST icedtea-bin-core-3.10.0-ppc64le.tar.xz 54511716 BLAKE2B ab536cd53c696828e3edee14b7bf589b332243d6cf3fba3502aed3cf5863fb62d946ba57479c7bf64c7b5a2b8e22eb571aa86a1ea0f134e6c066c23957bb7296 SHA512 d78b9d06232d2e09d2b550b9ce750190b5340254381ccb9801f437e4af73ec99f09a64d2b6a2ba2a33bcb1e0983e8bac918a3573147a448b54cd29f71871e9cc
 DIST icedtea-bin-core-3.10.0-r1-x86.tar.xz 61580012 BLAKE2B e334e6589f7603fcd881f9fea8c2178804502f83c898274e53f427752ad8f284f5ca1ba9f6a87546e4a21284a30226551fc7047ce7f84836af3f3a815e2ea50c SHA512 004a16e67804eb01d56ba9c36b67e60547198943bb086a19fd161f7f348cea774deb6a806814f6fbddefd111e59e7e98d934d895b89db2bfdd5a836b6aa4b483
 DIST icedtea-bin-core-3.12.0-amd64.tar.xz 62006904 BLAKE2B 826bf190b8c2a20d953c3eb7222020006d8101caeff3e57b5cace7758cfa1ea70ffa5aad8001f7ca6ea8e10cc71830f239edbfd1179ce5a88b691b1921548a14 SHA512 0771b8f92102086eedca945bc2d1e2f77477bda5318e5c7a4e05d43ded588df29622fa6b92f57a821f3f4e599db8f97098cd796dd5821b62e48824b806bafa76
+DIST icedtea-bin-core-3.12.0-arm.tar.xz 58065212 BLAKE2B 4a317018ab941cafa3a6d98ab6bfa376df3f36150832f3e4e081802215f2d295225faf4cd71be492bd1e4e245d8c7fde7b2fd032c899d1bc5bc6dc53f80d7653 SHA512 591194495eea10aa2802f53f11222c03fec46e05668f004723aff7ca1923dcc9bd8eb929b9dde900e10fa779d09eae003c280de21bf1569fa3129acec8fe5cb3
+DIST icedtea-bin-core-3.12.0-arm64.tar.xz 61721616 BLAKE2B cec7f5d11f0fe3688b3e10c274ccbab1c7d6667a85cfa74a053822d223d364dc8dda6ea7114c551ab76612cecafd26333da140637a0b1aadd4136e391f4afb94 SHA512 d2020d4984b84bffe9bb642070377ae0bf4ff04ca3770a59d5553bc31a294d0f9ecb6398c8e1ee245455548f2f255c0c7a2268debb1e7c14dae16646b4e39c8f
 DIST icedtea-bin-core-3.12.0-ppc64.tar.xz 55033784 BLAKE2B 57deb4a82576b34d615ae06ed588e7304564a784d7ff8bc08597de4715c24b918716ef92f0172e9f0e9f57d4d422e21441b2adb1df4403f579fe0c0f5c1744ab SHA512 83738080c431a9b7d4dc840005ad9e1938abf2164d4cb01e2f12f81d9adf24c715c1a0306108fe4c8d0d190fe80688f158fe8a37ae9b4f5927277a4ea3609f68
 DIST icedtea-bin-core-3.12.0-ppc64le.tar.xz 55129328 BLAKE2B cb4d7b5262ed7c624ba8ad0b536dadf25fe29c8848636614c8f53fd722e3ed37bcc0adfe82f8997c1baac9610e8aef112b137935357fa623f19189bdf0c2ebca SHA512 f6711fecf9305478ece98311c13b577317f69b4c7d15acb7c8e230ef3acda3d5032067c2859f0fc6b3000e09355a1773b6caf803c4d269655dd00977ce80ec2a
 DIST icedtea-bin-core-3.12.0-x86.tar.xz 61446708 BLAKE2B 0d5790deb0092ef590eab4c631028f58fdc86df97d4e8b7ccb83993980781d7b2313c7c97bb2663e8ce43f71b7c8761a6972ff7f0c096c4fdf878f178ca8ecfd SHA512 cb5db79e955a3e7f292ece7bdaa6e3f1a0be15c1982b904bcf299699b88402390fd2b343ed95b8855ede242729c7943c6dc25befc785d153018c5e3f8dcecdcd
@@ -18,11 +20,13 @@ DIST icedtea-bin-examples-3.10.0-ppc64.tar.xz 1852168 BLAKE2B 90202d9960ad99e14b
 DIST icedtea-bin-examples-3.10.0-ppc64le.tar.xz 1854000 BLAKE2B c6345b3202b581a60ccbecf5dd593ccddb0ad3079e03794c4a55412bde53480651e9e3dab8714759f342eefb752fd3b509a3eab42e7e21e796aad0771aa2e1e4 SHA512 1de307b0e3230936ddfd57cae1f0a44d890d6e5cb61b6634c55abc5979c930784eda21d52a705968e59b5fc3434869693e54f61eb33dcbeeea837c99c8414128
 DIST icedtea-bin-examples-3.10.0-r1-x86.tar.xz 1863128 BLAKE2B 12002c655df6ba2228453840155495090d09b3e1fb49241f0b8d558b822f8d9fbf5395aaf0e391635034fefc170828489e5bb24470a8d98ab9b052d82f51069b SHA512 d6e7ad0c7b400acaf4bf7bdb8aa85de0028e5fcf349d04c1bf06c3a645727c2f9fb266e6f6578b6451121dac04d7d5957b717b9e97ac56079593cb42c5384da4
 DIST icedtea-bin-examples-3.12.0-amd64.tar.xz 1853616 BLAKE2B 48267b2783c402bafd1ec5988d4284a30175635035682e3761aeb36feb962977ad90130f91e55768e52eff862fd3e2c4bb1b123ec3aa629f07acd50e60335683 SHA512 6dce1b575be9d8b1e9171eb6d4724c096c8ef18508c03ba581be7b1427d266595b8fac06eb02db5583399b2763d641b712aec4cb391772c444368c79c0067ca6
+DIST icedtea-bin-examples-3.12.0-arm.tar.xz 1840952 BLAKE2B 7da7e1a79f5a0a846f0a48ade5bab975d841699598101308e2fd7f66b4884feecfcacead940905b839920ddf567c6bfec08704c1d5f880d6094e73d4d7821951 SHA512 b78cd2f61da91e644185b0b2a4595fb9645ac753f3fad0bd5bce3416ee13566e99863b7fbd7acd9ad5e53d0def1e2081622f80ff62fba1a50fb5a2e940c6f9f3
+DIST icedtea-bin-examples-3.12.0-arm64.tar.xz 1850652 BLAKE2B 21620780ec47d588dcde464b1b1706d731f569fb52225b46e27d21910f1c4b49345eb45f436623347068413eb48af5ec332b8346cd53931425e523573500a1fe SHA512 b7bf955188f192be9614d4d768af2cc93b123c3afd1db121ea4156793209ea4badd37504854a9d15e6f8387517b7bf8eed0e49b8b56124ab8281540bcd4c8c27
 DIST icedtea-bin-examples-3.12.0-ppc64.tar.xz 1864952 BLAKE2B 8fda5731a39e36347adec379db562700392c2c482447ba2775b129cb323ccfa101b4f845baeb30a016158204d1565bd2b5e0b7cc1c597f4738848cbf1d2d2816 SHA512 9cbbec98b68437924c3cc2c81a6c341efec533d61f5e3c6df99b46222a3df7824c47e37baa99a4f23e5b868f788b4501064d52b379e77ea523592a7c493629d9
 DIST icedtea-bin-examples-3.12.0-ppc64le.tar.xz 1867256 BLAKE2B f8110bffd2d1b30fa62ebfe3ad18da02ada4d6f65b6016e939ec18cf0ab7970199edc7b9c3b2d8f2edd504db8334c384f49fb423c2c2dec13f761588cdb5c4c5 SHA512 88d9b5070676fbe14fd43fa35ff01a7e1e34002271411befd6bd6b5b69b8136e742fdc6461d58970e2ed06bc7beaa12631c2b150452edd3995faaffe7afdbbb0
 DIST icedtea-bin-examples-3.12.0-x86.tar.xz 1859900 BLAKE2B 44ea53632b82e1bbcc7b569d3aaf9f3f247c79b465ca4f4e54f70f3e3fe1752b1f5d9c84ab40328270e074be6da13b34af3803fa43584df16c9f22898b77265e SHA512 1aa895aa3e02081ec45f7b3b250605ce914c7f06ef4e9c37aaa6d7f2b084295ab48e490174fa443b419d37299f88db217407d81651c08996aba1af91401629ce
 DIST icedtea-bin-src-3.10.0.tar.xz 45755380 BLAKE2B ba6fd20de7d21e728108ff1d30599112ddf7ac24135e30891ae0d033bf77d52238c81c5c7fc7375e062ad4e8bb9492098cc0a20d3ab8486a4a02f20efa1f06a5 SHA512 0693cfe83a80d5e9e86be394b142b23097b0cfc1193f68f0fd07045ad4792b38bffcce47ea764f934d3dbfc568bdfbf5017725e7f35fbe1175b48498d53b0c5e
 DIST icedtea-bin-src-3.12.0.tar.xz 45776320 BLAKE2B 97ca4172ed8eadbcda0e20b598083b6948cd3a90705653716f1b6a9e65e150a1ef7d9e9ecdd3ad5ea90fd972ec9f1c3fe20ace44e4d2a0ede8e6d491991f7f9f SHA512 f6e7efa0962632d52032cd22a6b8de50bc2571a5ebcd18314b9aa01fb23cbd8d134eda5d1d2a6bb7fb1e26decc8a5740dfa60318019b920eb3f0498c2a9e9784
-EBUILD icedtea-bin-3.10.0-r1.ebuild 4387 BLAKE2B 59c2c959ea97b31698aa0ccd14ef299fee806f396cc16a460ba71eb81982b1fee96f249189dedb2ea5aac8bdae463b2dff55dfbba5a704c46fbba5dd514c4018 SHA512 587fc838632fbaf176ce377c2e9ac0fe162ff45b2d9750799bdd216c11d3e3d643856298c2effa2e55223bb3f417eca6d5dfcdcaacadbd1f3659d79d0094e7eb
-EBUILD icedtea-bin-3.12.0.ebuild 4549 BLAKE2B 77861e6ee5c4d6872243c3f74cb52c81a7bb7192568a5e9436de0320d1cbd9c688d4d690e1c8a3d5ba976e1d63af95273cb310c92a672638c6de8749c10b0683 SHA512 24582891626aa33f30a94a001ff1d759e74904ee19b0fd2613e9f72a8fa5eea7e6a3a16cb9400554d3472d2daa5ed53156b880bd6d00d02a099b5f29f9b4e27a
+EBUILD icedtea-bin-3.10.0-r2.ebuild 4394 BLAKE2B ffc1c96d61a6eb5afe2ad5677f493f0eeb4e84467a9426bc6b58a6f5440d14fa07df05edbeb828e36010dc58b6d57041cc9e03f1977a700e8ce2a869f159cda2 SHA512 8ff85806b905a1d2e8817d37ceefd1758b40d0a8a7824721fadb833bcd71e0aee6180287940fe0b77eb704086dfec6941479db6a8a581c85a7dfb08bc39bf7cf
+EBUILD icedtea-bin-3.12.0-r1.ebuild 4603 BLAKE2B cb8c562671f44895ac6984194295b63bd348452b7a071925ea40878b7a18cf3185b55df5874bf008a4c7022499f638956b931509a35429d59ee3b569588b63cd SHA512 a8c8a4b72d79d47e70de1afe83a0155e55259986ab102f6547b3736e07ab351b7f51c8a29e537a713646924d15a1a858a367b5120441f978f987d88c83c22860
 MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild
deleted file mode 100644
index 9dc6568062cc..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Don't block arm. See bug #600134.
-#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
-
-inherit java-vm-2 multilib-build toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
-			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
-		)"
-}
-
-BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
-	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-r1-x86.tar.xz ) ) )
-	big-endian? ( $(abi_uri ppc64) )
-	!big-endian? ( $(abi_uri ppc64le ppc64) )
-	$(abi_uri amd64)
-	$(abi_uri arm)
-	$(abi_uri arm64)
-	$(abi_uri x86 x86 1)"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="8"
-
-IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.42:2%
-	>=media-libs/fontconfig-2.11:1.0%
-	>=media-libs/freetype-2.5.5:2%
-	>=media-libs/lcms-2.9:2%
-	>=sys-libs/zlib-1.2.8-r1%
-	virtual/jpeg:62%
-	alsa? ( >=media-libs/alsa-lib-1.0% )
-	cups? ( >=net-print/cups-2.0% )
-	gtk? (
-		>=dev-libs/atk-2.16.0%
-		>=x11-libs/cairo-1.14.2%
-		x11-libs/gdk-pixbuf:2%
-		>=x11-libs/gtk+-2.24:2%
-		>=x11-libs/pango-1.36%
-	)
-	!headless-awt? (
-		media-libs/giflib:0/7%
-		=media-libs/libpng-1.6*%
-		>=x11-libs/libX11-1.6%
-		>=x11-libs/libXcomposite-0.4%
-		>=x11-libs/libXext-1.3%
-		>=x11-libs/libXi-1.7%
-		>=x11-libs/libXrender-0.9.8%
-		>=x11-libs/libXtst-1.2%
-	)"
-
-RDEPEND=">=sys-devel/gcc-6.4.0[multilib?]
-	>=sys-libs/glibc-2.26[multilib?]
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-java )
-	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
-	!multilib? ( ${RDEPEND//%/} )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# I wouldn't normally use -f below but symlinks in the arm files
-	# make this fail otherwise and any other approach would be tedious.
-
-	if ! use alsa; then
-		rm -fv */jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if use headless-awt; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
-		   */{,jre/}bin/policytool */bin/appletviewer || die
-	fi
-}
-
-multilib_src_install() {
-	local dest="/opt/${P}-${ABI}"
-	dest="${dest/%-${DEFAULT_ABI}/}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	if multilib_is_native_abi; then
-		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-		use doc && dodoc -r ${P}/doc/html
-
-		# doins doesn't preserve executable bits.
-		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
-		if use examples; then
-			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
-		fi
-
-		if use source; then
-			cp ${P}/src.zip "${ddest}" || die
-		fi
-
-		# Use default VMHANDLE.
-		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	else
-		local x native=$(get_system_arch ${DEFAULT_ABI})
-
-		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
-			dodir "${dest}"${x%/*}
-			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
-		done
-
-		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
-			[[ ${x##*/} = ${native} ]] && continue
-			[[ -e "${ddest}"/${x#*/} ]] && continue
-			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
-		done
-
-		# Use ABI-suffixed VMHANDLE.
-		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	# Each invocation appends to the config.
-	java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
-	if use multilib; then
-		multilib_foreach_abi multilib_src_install
-	else
-		multilib_src_install
-	fi
-
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild
new file mode 100644
index 000000000000..84c1107124c6
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Don't block arm. See bug #600134.
+#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
+KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
+		)"
+}
+
+BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-r1-x86.tar.xz ) ) )
+	big-endian? ( $(abi_uri ppc64) )
+	!big-endian? ( $(abi_uri ppc64le ppc64) )
+	$(abi_uri amd64)
+	$(abi_uri arm)
+	$(abi_uri arm64)
+	$(abi_uri x86 x86 1)"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+
+IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.42:2%
+	>=media-libs/fontconfig-2.11:1.0%
+	>=media-libs/freetype-2.5.5:2%
+	>=media-libs/lcms-2.9:2%
+	>=sys-libs/zlib-1.2.8-r1%
+	virtual/jpeg-compat:62%
+	alsa? ( >=media-libs/alsa-lib-1.0% )
+	cups? ( >=net-print/cups-2.0% )
+	gtk? (
+		>=dev-libs/atk-2.16.0%
+		>=x11-libs/cairo-1.14.2%
+		x11-libs/gdk-pixbuf:2%
+		>=x11-libs/gtk+-2.24:2%
+		>=x11-libs/pango-1.36%
+	)
+	!headless-awt? (
+		media-libs/giflib:0/7%
+		=media-libs/libpng-1.6*%
+		>=x11-libs/libX11-1.6%
+		>=x11-libs/libXcomposite-0.4%
+		>=x11-libs/libXext-1.3%
+		>=x11-libs/libXi-1.7%
+		>=x11-libs/libXrender-0.9.8%
+		>=x11-libs/libXtst-1.2%
+	)"
+
+RDEPEND=">=sys-devel/gcc-6.4.0[multilib?]
+	>=sys-libs/glibc-2.26[multilib?]
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# I wouldn't normally use -f below but symlinks in the arm files
+	# make this fail otherwise and any other approach would be tedious.
+
+	if ! use alsa; then
+		rm -fv */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+}
+
+multilib_src_install() {
+	local dest="/opt/${P}-${ABI}"
+	dest="${dest/%-${DEFAULT_ABI}/}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	if multilib_is_native_abi; then
+		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+		use doc && dodoc -r ${P}/doc/html
+
+		# doins doesn't preserve executable bits.
+		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+		if use examples; then
+			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+		fi
+
+		if use source; then
+			cp ${P}/src.zip "${ddest}" || die
+		fi
+
+		# Use default VMHANDLE.
+		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	else
+		local x native=$(get_system_arch ${DEFAULT_ABI})
+
+		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+			dodir "${dest}"${x%/*}
+			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+		done
+
+		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+			[[ ${x##*/} = ${native} ]] && continue
+			[[ -e "${ddest}"/${x#*/} ]] && continue
+			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+		done
+
+		# Use ABI-suffixed VMHANDLE.
+		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+	if use multilib; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib_src_install
+	fi
+
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
new file mode 100644
index 000000000000..c5065d63effb
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Don't block arm. See bug #600134.
+#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
+KEYWORDS="-* ~amd64 ~arm  ~arm64 ~ppc64 ~x86"
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
+		)"
+}
+
+BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
+	big-endian? ( $(abi_uri ppc64) )
+	!big-endian? ( $(abi_uri ppc64le ppc64) )
+	$(abi_uri amd64)
+	$(abi_uri arm)
+	$(abi_uri arm64)
+	$(abi_uri x86)"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+
+IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.58:2%
+	>=media-libs/fontconfig-2.13:1.0%
+	>=media-libs/freetype-2.9.1:2%
+	>=media-libs/lcms-2.9:2%
+	>=sys-libs/zlib-1.2.11-r1%
+	virtual/jpeg-compat:62%
+	alsa? ( >=media-libs/alsa-lib-1.0% )
+	cups? ( >=net-print/cups-2.0% )
+	gtk? (
+		>=dev-libs/atk-2.28.1%
+		>=x11-libs/cairo-1.16.0%
+		x11-libs/gdk-pixbuf:2%
+		>=x11-libs/gtk+-2.24:2%
+		>=x11-libs/pango-1.42%
+	)
+	!headless-awt? (
+		media-libs/giflib:0/7%
+		=media-libs/libpng-1.6*%
+		>=x11-libs/libX11-1.6%
+		>=x11-libs/libXcomposite-0.4%
+		>=x11-libs/libXext-1.3%
+		>=x11-libs/libXi-1.7%
+		>=x11-libs/libXrender-0.9.10%
+		>=x11-libs/libXtst-1.2%
+	)"
+
+RDEPEND=">=sys-devel/gcc-8.2.0[multilib?]
+	>=sys-libs/glibc-2.28[multilib?]
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# I wouldn't normally use -f below but symlinks in the arm files
+	# make this fail otherwise and any other approach would be tedious.
+
+	if ! use alsa; then
+		rm -fv */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+}
+
+multilib_src_install() {
+	local dest="/opt/${P}-${ABI}"
+	dest="${dest/%-${DEFAULT_ABI}/}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	if multilib_is_native_abi; then
+		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+		use doc && dodoc -r ${P}/doc/html
+
+		# doins doesn't preserve executable bits.
+		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+		if use examples; then
+			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+		fi
+
+		if use source; then
+			cp ${P}/src.zip "${ddest}" || die
+		fi
+
+		# use system-wide cacert store
+		mv "${ddest}"/jre/lib/security/cacerts \
+			"${ddest}"/jre/lib/security/cacerts.orig || die
+		dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+		# Use default VMHANDLE.
+		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	else
+		local x native=$(get_system_arch ${DEFAULT_ABI})
+
+		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+			dodir "${dest}"${x%/*}
+			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+		done
+
+		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+			[[ ${x##*/} = ${native} ]] && continue
+			[[ -e "${ddest}"/${x#*/} ]] && continue
+			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+		done
+
+		# Use ABI-suffixed VMHANDLE.
+		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+	if use multilib; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib_src_install
+	fi
+
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.12.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.12.0.ebuild
deleted file mode 100644
index 00bb6c4eb2ee..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-3.12.0.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Don't block arm. See bug #600134.
-#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* ~amd64 ~ppc64 ~x86"
-
-inherit java-vm-2 multilib-build toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
-			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
-		)"
-}
-
-BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
-	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
-	big-endian? ( $(abi_uri ppc64) )
-	!big-endian? ( $(abi_uri ppc64le ppc64) )
-	$(abi_uri amd64)
-	$(abi_uri x86)"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="8"
-
-IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.58:2%
-	>=media-libs/fontconfig-2.13:1.0%
-	>=media-libs/freetype-2.9.1:2%
-	>=media-libs/lcms-2.9:2%
-	>=sys-libs/zlib-1.2.11-r1%
-	virtual/jpeg:62%
-	alsa? ( >=media-libs/alsa-lib-1.0% )
-	cups? ( >=net-print/cups-2.0% )
-	gtk? (
-		>=dev-libs/atk-2.28.1%
-		>=x11-libs/cairo-1.16.0%
-		x11-libs/gdk-pixbuf:2%
-		>=x11-libs/gtk+-2.24:2%
-		>=x11-libs/pango-1.42%
-	)
-	!headless-awt? (
-		media-libs/giflib:0/7%
-		=media-libs/libpng-1.6*%
-		>=x11-libs/libX11-1.6%
-		>=x11-libs/libXcomposite-0.4%
-		>=x11-libs/libXext-1.3%
-		>=x11-libs/libXi-1.7%
-		>=x11-libs/libXrender-0.9.10%
-		>=x11-libs/libXtst-1.2%
-	)"
-
-RDEPEND=">=sys-devel/gcc-8.2.0[multilib?]
-	>=sys-libs/glibc-2.28[multilib?]
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-java )
-	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
-	!multilib? ( ${RDEPEND//%/} )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# I wouldn't normally use -f below but symlinks in the arm files
-	# make this fail otherwise and any other approach would be tedious.
-
-	if ! use alsa; then
-		rm -fv */jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if use headless-awt; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
-		   */{,jre/}bin/policytool */bin/appletviewer || die
-	fi
-}
-
-multilib_src_install() {
-	local dest="/opt/${P}-${ABI}"
-	dest="${dest/%-${DEFAULT_ABI}/}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	if multilib_is_native_abi; then
-		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-		use doc && dodoc -r ${P}/doc/html
-
-		# doins doesn't preserve executable bits.
-		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
-		if use examples; then
-			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
-		fi
-
-		if use source; then
-			cp ${P}/src.zip "${ddest}" || die
-		fi
-
-		# use system-wide cacert store
-		mv "${ddest}"/jre/lib/security/cacerts \
-			"${ddest}"/jre/lib/security/cacerts.orig || die
-		dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-		# Use default VMHANDLE.
-		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	else
-		local x native=$(get_system_arch ${DEFAULT_ABI})
-
-		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
-			dodir "${dest}"${x%/*}
-			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
-		done
-
-		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
-			[[ ${x##*/} = ${native} ]] && continue
-			[[ -e "${ddest}"/${x#*/} ]] && continue
-			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
-		done
-
-		# Use ABI-suffixed VMHANDLE.
-		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	# Each invocation appends to the config.
-	java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
-	if use multilib; then
-		multilib_foreach_abi multilib_src_install
-	else
-		multilib_src_install
-	fi
-
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index cce0bc33579e..89fdd9b60708 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -3,12 +3,10 @@ DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5
 DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
 DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
 DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
-DIST apache-maven-3.6.0-bin.tar.gz 9063587 BLAKE2B c5acab74168061ef8216cf6d085c25ce3e1eb941724bf0d4bbbe1a69a2da3c255c8233233a5bef800469b7363fa34ca1c4a4717c3f18b8eb2828fdd5d5762bcb SHA512 fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
 DIST apache-maven-3.6.1-bin.tar.gz 9136463 BLAKE2B d630ceeb1c35f742eae324a025c3385fac0b7aa58e0bd3fe239a2027138127604a076958e5f6db6bba4f1e99bc524f0c62643bc4ab4d570378e93e8f72c234c0 SHA512 b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544
-EBUILD maven-bin-3.0.5.ebuild 1265 BLAKE2B c7942c23734722f217b7d5dbd51168f8e170417337ad336d36bca1d1b2cb0d894f8a183fe5c8d442754e223c3b3d3ce0d136d04dd6340b63349996b00439e543 SHA512 c22ddf526763e7162be557c0bace6ce4ea33edc7786a1d6fe7dc1297700821c6a22d387874e0a9f8b566d5582bc6be149a93d03e3ce60e0a263542ca735ae1b7
-EBUILD maven-bin-3.1.1.ebuild 2274 BLAKE2B cff19f6b3eba70d6e5890f30cb7faaba15a89777c8b35c35be85fb214e2413ac66b49376902a19a85ff8fb955445eaac50d8d2eab105bdd779289b1917c6c8fd SHA512 287cbbdbdbf3c7eb8e029bc35a26b86b9d19bbebd5bb878dbdc4ce03a88f194f8acdb72932040fd1c5574a1fa0eef7aaca07f69478e46c7bcbea6939da2edb03
-EBUILD maven-bin-3.2.5.ebuild 2279 BLAKE2B c94fc09f4aba4b15ad52b300460794d35a213b1218761996dfac0c81be3c71c4103e504ffff9948959c92da75099b5cfe9b9d5160de28318170bb6174012a84d SHA512 e11a7cd2b3620754966cfd6130baec3dbf7b3f8875506c9c80a329e125d0cbe4d360dcd519d62a8fb574b62fae92ffe085c041b3f8da0678d11ad187194f08c8
-EBUILD maven-bin-3.3.9.ebuild 2218 BLAKE2B dff6966b08eef11aebdff6858203257ef76dfd24e79c9360b19b1f2203c176929b1909582e0c0588ca6a811f6ae80d1c0948b3f3e3440e12cda0ede68bd62d83 SHA512 5a73c301485e47b68aa5e5868e8c2ecfdbcd345a4c54a8638db2bbb3767b803308ff726ef9975d146249b6d58a7509989cd97592d74219dfc4e57cde2da80007
-EBUILD maven-bin-3.6.0.ebuild 2218 BLAKE2B 4692451547ef9a1d71f63a974f0a9bf86e43f101874c7f0690be0d3b0d7903fbbf87477cd64994e0e11b8b05f09923caee1a9971dfd0138cc822789c1b2b0890 SHA512 b444131af7c1bf8376a985c88a313a7515aab30aafb69aa4984c7421f0769480c7ed82ce59e811cbd160a42ebbb8224cc7e76414fb67671c9eae2068db9463aa
-EBUILD maven-bin-3.6.1.ebuild 2218 BLAKE2B b5ec30cc9313106e0dec93cdf7bc810673bfbb497912f4329005ba0b87cae08e24723517234af4194ae704b7f83925838eb350a9a0403137f15a0ee41cacd461 SHA512 3de59f5d3bbea858a19d03d90c7deba4f901b8916455dc52849fab7d8251f1d8988f00ca183814a05d1b3354bea6e9a34b3d95011cf6c5330ed312326d6cc9a6
+EBUILD maven-bin-3.0.5-r1.ebuild 1288 BLAKE2B 5df56d1fb434fa78f2e31b706923a954f3eb544287ef2f2c903972d1f12b107c166b1415a04f9aadfaac0e1bd5d9c57b9227ee3eb1da8b950f4d3925f6f375d4 SHA512 d661caf7691165fceddb6b469d36ecc533b52dc2ee376cbc3bc1d158e5ea37f37c07212d6c6f79269d5101cf953c1b025b81703fc1a6493ceb88ebcefc9d652a
+EBUILD maven-bin-3.1.1-r1.ebuild 1234 BLAKE2B 4e3435b9bbfb4661f36cf1375211fc2818d0fcc937319bd918615c9ade29ad913ce570bb2ba3bb32a76bf52941a4e45c02c08a5617eac6f5745714ab1620e6f9 SHA512 d02c484ce95bff8e37d9c360ad49a987796e1332a7a9a33dcf69a7d472db4b50bc2f7f715c48786238b39bceac7ee707f690f47091aee290885703470b6ef114
+EBUILD maven-bin-3.2.5-r1.ebuild 1232 BLAKE2B 7e0fc95a813cd06342c77aef9aa137e06ac50f9dcd7089f175ece037583085f8d63fbd4e6cbdb3a0e779ce5eb018b19b6b6139aa8fa8dc80eaacae6561bf1862 SHA512 66a6e136376517e82b862bfca3033dcb92366bec865b51fafb19ce27a4e8d50e97ebef916b39b4c8438a69984698c71e8a146969cb16aa6a2d963675a054c992
+EBUILD maven-bin-3.3.9-r1.ebuild 1236 BLAKE2B 9641f5146ef168f7b1edb7616940f492011adc2d96d5c9852ec22171f2d3ab45452ab0ff2801348f82c726fe12c43160f2056b06d973b05c2d4f871e13d4fc16 SHA512 fe144d82cde207dca1b10cb072a747e8bc3649e493301bc9f45280e767a0ff85946f3702d1e86ea047a430fe8d088d2adae28a651e2c04e16a7f78e06c5f5b62
+EBUILD maven-bin-3.6.1-r1.ebuild 1236 BLAKE2B a18fa4ad369338ebd818f894414e084b895df52c9fd2123db1136133b1b71f3e11b2f2bd2f0cc76847c1f0998416317d7ea9b44f65336369ef5456a57e1ddd7f SHA512 ed8e9bc788d03e581e3d802eb350fce294034c726294e9929465d5a574900845cd003cf94251dc6f3b7739cd9b2612b3a044c705fdd48f0e678dd47054e96ace
 MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
diff --git a/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..c17509652106
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_P="${MY_PN}-${PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+src_prepare() {
+	default
+	rm -v "${S}"/bin/*.bat || die
+	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
+}
+
+# TODO:
+# we should use jars from packages instead of what is bundled.
+
+src_install() {
+	dodir "${MAVEN_SHARE}"
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# bug #342901
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.0.5.ebuild b/dev-java/maven-bin/maven-bin-3.0.5.ebuild
deleted file mode 100644
index c8fd2a500821..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-eselect/eselect-java"
-RDEPEND="
-	${DEPEND}
-	>=virtual/jdk-1.5"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v "${S}"/bin/*.bat || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..22a30f299033
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
deleted file mode 100644
index b75f0e64b4d2..000000000000
--- a/dev-java/maven-bin/maven-bin-3.1.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-DEPEND="app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
-	dev-java/aopalliance:1
-	dev-java/avalon-framework:4.1
-	dev-java/commons-cli:1
-	dev-java/commons-io:1
-	dev-java/javax-inject:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/juel:0
-	dev-java/osgi-core-api:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-	java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
-	has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
-	has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
-	has_version dev-java/log4j:0 && java-pkg_jar-from log4j
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild b/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..1c7cfabd20fb
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+# TODO: We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
deleted file mode 100644
index 74e3ef2b4a48..000000000000
--- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-DEPEND="app-eselect/eselect-java
-|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
-dev-java/aopalliance:1
-dev-java/avalon-framework:4.1
-dev-java/commons-cli:1
-dev-java/commons-io:1
-dev-java/javax-inject:0
-dev-java/jsoup:0
-dev-java/jsr250:0
-dev-java/juel:0
-dev-java/osgi-core-api:0
-java-virtuals/interceptor-api:0
-java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jdk-1.6
->=virtual/jre-1.6
-${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-	java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
-	has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
-	has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
-	has_version dev-java/log4j:0 && java-pkg_jar-from log4j
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild
new file mode 100644
index 000000000000..966eaa23b60a
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.3"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.3.9.ebuild b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
deleted file mode 100644
index 45c967a5d4e7..000000000000
--- a/dev-java/maven-bin/maven-bin-3.3.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.3"
-KEYWORDS="amd64 x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-CDEPEND="
-	dev-java/juel:0
-	dev-java/log4j:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/commons-io:1
-	dev-java/aopalliance:1
-	dev-java/commons-cli:1
-	dev-java/javax-inject:0
-	dev-java/osgi-core-api:0
-	dev-java/commons-logging:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:3.0"
-
-DEPEND="
-	${CDEPEND}
-	app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-MAVEN_DEPENDENCIES=(
-	juel
-	jsoup
-	log4j
-	jsr250
-	javax-inject
-	commons-io-1
-	osgi-core-api
-	aopalliance-1
-	commons-cli-1
-	commons-logging
-	interceptor-api
-	servlet-api-3.0
-)
-
-java_prepare() {
-	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-
-	# Link deps.
-	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
-		java-pkg_jar-from "${mvn_dep}"
-	done
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.6.0.ebuild b/dev-java/maven-bin/maven-bin-3.6.0.ebuild
deleted file mode 100644
index a7e55b1b599d..000000000000
--- a/dev-java/maven-bin/maven-bin-3.6.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-CDEPEND="
-	dev-java/juel:0
-	dev-java/log4j:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/commons-io:1
-	dev-java/aopalliance:1
-	dev-java/commons-cli:1
-	dev-java/javax-inject:0
-	dev-java/osgi-core-api:0
-	dev-java/commons-logging:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:3.0"
-
-DEPEND="
-	${CDEPEND}
-	app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-MAVEN_DEPENDENCIES=(
-	juel
-	jsoup
-	log4j
-	jsr250
-	javax-inject
-	commons-io-1
-	osgi-core-api
-	aopalliance-1
-	commons-cli-1
-	commons-logging
-	interceptor-api
-	servlet-api-3.0
-)
-
-java_prepare() {
-	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-
-	# Link deps.
-	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
-		java-pkg_jar-from "${mvn_dep}"
-	done
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..46ef90466cd5
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.6.1.ebuild b/dev-java/maven-bin/maven-bin-3.6.1.ebuild
deleted file mode 100644
index 4a6edff4651e..000000000000
--- a/dev-java/maven-bin/maven-bin-3.6.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-CDEPEND="
-	dev-java/juel:0
-	dev-java/log4j:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/commons-io:1
-	dev-java/aopalliance:1
-	dev-java/commons-cli:1
-	dev-java/javax-inject:0
-	dev-java/osgi-core-api:0
-	dev-java/commons-logging:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:3.0"
-
-DEPEND="
-	${CDEPEND}
-	app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-MAVEN_DEPENDENCIES=(
-	juel
-	jsoup
-	log4j
-	jsr250
-	javax-inject
-	commons-io-1
-	osgi-core-api
-	aopalliance-1
-	commons-cli-1
-	commons-logging
-	interceptor-api
-	servlet-api-3.0
-)
-
-java_prepare() {
-	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-
-	# Link deps.
-	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
-		java-pkg_jar-from "${mvn_dep}"
-	done
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 5fc15ab3ad8a..5e06f5a878c8 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -10,6 +10,7 @@ DIST openjdk-jaxws-8.212_p03.tar.bz2 2540937 BLAKE2B 53c2793d9071f408a3704dacc4d
 DIST openjdk-jdk-8.212_p03.tar.bz2 46720739 BLAKE2B af515701052ede8b6cf828cc74f1f5938dad0874a12ed3c5c3f7b03be1f43108fce5e1820452a87e098c3469922227950f6f4fea33306f7b426487b48cc4b993 SHA512 9b3342419c82a8f243d2a7523d83b395c89629820fd99ba387991656e5754ed067877bf12b7e780368dd4bdb6eba10be09e63b1301bcbc0aa29e86e84ec394a3
 DIST openjdk-langtools-8.212_p03.tar.bz2 2393112 BLAKE2B 96656795114bad1d2e5eabace5d1c6568646084421fbaa43045ce0ec8d222f1a7e8629e4b86bdd5ff8eb51e90ea1eaafab3e94f34c41932754249f17b2e447f8 SHA512 15b931432cb14cf60c73627bd70e66f6d18ff25763a7b8758109cf8746d278d6c2b5d945a9f0b948a76c0813b5f42c988a3d10ac13165ec12e0f4d9eab98f369
 DIST openjdk-nashorn-8.212_p03.tar.bz2 2854888 BLAKE2B 3e5a1867d8a5db301fb3512ebdc4dea8f8226fe3308142d6f3f616795c9cee0d598a257ccd7e790ec440c966339399776d1118764dbf882a46a2daa32d81ddd5 SHA512 5c7fba1d567aa1d0602ef045b24a8624fed9ced72b3bae030ee15ea133ed2223e402cc08c996ff253c4792570da87b7713f351c84704b12556466349f6452f74
-EBUILD openjdk-11.0.3_p7-r3.ebuild 6580 BLAKE2B f585ddb24bfed4927e4caa947afdb28d62149f9d2bb15e41039a54d55958328c1afb52a7bcd277cdf81fcb008bc4167c711ef4998d1fed57176a187adebd35fe SHA512 a66032f37b6129eeb147bc0572d64b5f90eb96ffd20328d4a29278fa39e26c74cd0291263d133beaf8dcd54e144be83a896ebd3e8b1887029ac719f0e4260f19
-EBUILD openjdk-8.212_p03-r3.ebuild 7267 BLAKE2B dbdfaddfdc2e66a19cff88144f5d1bbe46698f100766a229df1c1497fca1bd60e0f93d2907429671d6875e5ad8909a154aa8ab01adddaa897dfb811239d1e4b6 SHA512 b74b6c4a9ba9961c6b8050e5778ab3efb5b6a4498dbece6f7496ab3e7e2ba93d7f96a93549dae2e72ec6a46126642af33d606e1ab6d62585cc85602318a55bcf
-MISC metadata.xml 1263 BLAKE2B 10b2f20ba3d3627539ca0d3ed16dc6036b6966811582a6d333c90fbcdcb7ba8997c0b8dd4f0a14b58824e46d9afd2ef95f70faa2e67ae7ea4cb20d03dad3f5d4 SHA512 23416f1799ab40e2d12f96f6fc3f09a8c5e4e6896f6eef40a88f403cf51b12813992b3052ecae8bb715cafc0fc162bd065422774991adbf32dac97c8bac61461
+EBUILD openjdk-11.0.3_p7-r3.ebuild 6633 BLAKE2B 544ba95a98184a8ebcc8afbed6df35bae6ebc915d85bca14cd4372a455a993870b412af3a523776b12ab098959893722679225894c3d39cbd81142701b41e85a SHA512 3f977211e70ae9cbeb4d14880e844aa93ec84ce68160a1c2a9a684ed92fc1fb4ec7ae7be3837b6549f59524420c5ad0b941efba5b5e782f7a21f3e1c9b61a13c
+EBUILD openjdk-11.0.3_p7-r4.ebuild 7389 BLAKE2B 26ef9976d264502a77c83f37bb6c1e2fbc17da768f5abfaadf83408598f8e23eec8f3f2adae63801d7972bccd72fb7b7a2f99a6aa8f9b674aa0b1eae1a1af520 SHA512 2d9aa129b5d161b5d42c07767d24910cbdf4f563f477a4b4b926229ce06b572c169f7e352c9d91f03fee06e4edcf49b5dcb67ec598202267a8a20479e41ffa0a
+EBUILD openjdk-8.212_p03-r3.ebuild 7320 BLAKE2B dc4a418d885c1db666dee134dd5fa73a041772dac925fe7249a24531ed7e38e29c8f1f8ea4d7aa41dcea7173cebb1ef110b6ffe8cffc8bb7b0166751e13e8c2b SHA512 c6b402eadf629322aaa9207cf8ebfcacbd3bb702ee565372200b2f74be8d26b4eb41ffdfc85feb945e8dc044c7f4c5c650172fe27cb59deb32daaa95be3e1063
+MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index 302f56980357..c9555ad9e77e 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -20,6 +20,7 @@
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
 		<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
+		<flag name="javafx" restrict="&gt;=dev-java/openjdk-11">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag>
 		<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
 		<flag name="source">Install JVM sources</flag>
 		<flag name="systemtap" restrict="&gt;=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag>
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild
index 960d7ca146c6..3a4668d70da8 100644
--- a/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild
@@ -115,11 +115,13 @@ pkg_setup() {
 	if has_version --host-root dev-java/openjdk:${SLOT}; then
 		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
 	else
-		JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-		export JDK_HOME
+		if [[ ${MERGE_TYPE} != "binary" ]]; then
+			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+			JDK_HOME=${JDK_HOME#*/}
+			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+			export JDK_HOME
+		fi
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
new file mode 100644
index 000000000000..ad003801a229
--- /dev/null
+++ b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap +webstart"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	media-libs/libpng:0=
+	media-libs/lcms:2=
+	sys-libs/zlib
+	virtual/jpeg:0=
+	systemtap? ( dev-util/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	javafx? ( dev-java/openjfx:${SLOT} )
+	|| (
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
+	)
+"
+
+PDEPEND="
+	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+"
+
+REQUIRED_USE="javafx? ( alsa !headless-awt )"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+	java-vm-2_pkg_setup
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+	else
+		if [[ ${MERGE_TYPE} != "binary" ]]; then
+			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+			JDK_HOME=${JDK_HOME#*/}
+			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+			export JDK_HOME
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	chmod +x configure || die
+}
+
+src_configure() {
+	# Work around stack alignment issue, bug #647954. in case we ever have x86
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Enabling full docs appears to break doc building. If not
+	# explicitly disabled, the flag will get auto-enabled if pandoc and
+	# graphviz are detected. pandoc has loads of dependencies anyway.
+
+	local myconf=(
+		--disable-ccache
+		--enable-full-docs=no
+		--with-boot-jdk="${JDK_HOME}"
+		--with-extra-cflags="${CFLAGS}"
+		--with-extra-cxxflags="${CXXFLAGS}"
+		--with-extra-ldflags="${LDFLAGS}"
+		--with-giflib=system
+		--with-lcms=system
+		--with-libjpeg=system
+		--with-libpng=system
+		--with-native-debug-symbols=$(usex debug internal none)
+		--with-vendor-name="Gentoo"
+		--with-vendor-url="https://gentoo.org"
+		--with-vendor-bug-url="https://bugs.gentoo.org"
+		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+		--with-vendor-version-string="${PV}"
+		--with-version-pre=gentoo
+		--with-version-string=${MY_PV%+*}
+		--with-version-build=${MY_PV#*+}
+		--with-zlib=system
+		--enable-dtrace=$(usex systemtap yes no)
+		--enable-headless-only=$(usex headless-awt yes no)
+	)
+
+	if use javafx; then
+		local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		if [[ -r ${zip} ]]; then
+			myconf+=( --with-import-modules="${zip}" )
+		else
+			die "${zip} not found or not readable"
+		fi
+	fi
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		myconf+=( --enable-precompiled-headers )
+	else
+		myconf+=( --disable-precompiled-headers )
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	emake -j1 \
+		$(usex doc docs '') \
+		$(usex jbootstrap bootcycle-images product-images) \
+		JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	cd "${S}"/build/*-release/images/jdk || die
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	mv lib/security/cacerts lib/security/cacerts.orig || die
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	# must be done before running itself
+	java-vm_set-pax-markings "${ddest}"
+
+	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		insinto /usr/share/doc/"${PF}"/html
+		doins -r "${S}"/build/*-release/images/docs/*
+		dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
+	fi
+}
diff --git a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
index b10d08e19c72..2f13332849d1 100644
--- a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
+++ b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
@@ -122,11 +122,13 @@ pkg_setup() {
 	if has_version --host-root dev-java/openjdk:${SLOT}; then
 		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
 	else
-		JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-		export JDK_HOME
+		if [[ ${MERGE_TYPE} != "binary" ]]; then
+			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+			JDK_HOME=${JDK_HOME#*/}
+			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+			export JDK_HOME
+		fi
 	fi
 }
 
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
new file mode 100644
index 000000000000..a1313a5f4f7d
--- /dev/null
+++ b/dev-java/openjfx/Manifest
@@ -0,0 +1,17 @@
+AUX 11/disable-buildSrc-tests.patch 534 BLAKE2B d1cb4da89602fa9a48e5509586d1909d10b9d62e167bdd4d57b9615f2896704dd0ee925d14a86753bf53182f85fc9c21f195c3f044a0c6d38c960ee4f5494332 SHA512 ffbc3d671cea448ffddd8d92e4a4031a941008c067d5a7acb358fb82ed217c9388ef1916aa04cf4693ff2a83e0bdcf3fc5bdc919196a6231d57c8341e44ddede
+AUX 11/fix-build-on-gradle-5x.patch 1214 BLAKE2B 2dd50897a5a83773c452afd57ef87e0cbd065e2f53ccf931c00f81a0521791f43e5933e5209f8f6133f855bb3327856ddae109b357da746da72128b60c228031 SHA512 e7c737d5329e872ac104ea229f74bc05447ff7d11bb88e1e3ab0ea5d108195b2af9139650566eb9b18dffedf9141123ee808c71ba01eabe1d1a2f47c2258358b
+AUX 11/glibc-compatibility.patch 547 BLAKE2B e63e83d708765dc7ad5013ff3a5bf0885fa426290e4fa164684739c15e7c15652c41256b98e9720c35682193086ec19c0225dd202fabc9bd9c9f99fb0fd6d5ff SHA512 abb08198b94e38fe8fb16229f506e2cad78869ed9c4fcabe22490a87884b1851373ee4a92ae4d7dbecaf3fc9a784911d932fad2457b0611a102e63a983113981
+AUX 11/respect-user-cflags.patch 8604 BLAKE2B b4455f5580a9b310e013c0d58ba39a3d9ebe15e7ed30e75a954c1f6ba36107f1c1a5b6bbc88e5a0e0d21f21d275214ad66ed012088f8fbbf81a6384127c8edfe SHA512 3547c711515714ffdbfbeaf84e538fe0103bc8b38ebe2fc5493414af6eb95bb3a956a7e3fe28936019de4996a62f705e1e28e8ce7eb3a5dbbda6f93f058a5089
+AUX 11/use-system-swt-jar.patch 608 BLAKE2B b0083c54f5f42e6c0069812913c800c9366073e34a401187e90c498ee9cb67b619baa87b7d140cda5a1330076c3b04ff3114898cd264cd51ec4b99498acfd894 SHA512 a700c33639603a26d21b89a4f8a9299cdf42cf7f7a0dc082ec9cd4c9c2235184add1685b05d2a62f3a52bd2251b4c133476e5944471092a2c0c269c973d2604f
+DIST ST4-4.0.8.jar 239543 BLAKE2B 72d257c6d0f1b3bde0afce805128dd38d8520b2073377bbb995fed3b4e18a3ea69d508d6d7554755ec68bf50940082b896ed89998a5178272d24376404b389c5 SHA512 9877289297cd5b15ad464a19467699387f57c510fe8a476e07e9d2334bd11933f9bdb9c6caa4972d4d4c84b56740c6d885cd39300dd7ce35b7c5bde536238086
+DIST antlr-complete-3.5.2.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
+DIST gradle-4.8-bin.zip 75885015 BLAKE2B eb6592afe122690f5e013abec2821beabac070563556ceec67ce02506582d4d9ac9c5d9f97ad2c464e442446f26ff90e9ead2c04e462a564411259564e3332c6 SHA512 4b351c9c5b0970bafb3b2b9b9e2ec9f37ff681cc3ac30004852d712cf8bb83061211a58e5b1f101813cde6a0aec914badf4ef0a806eec603418b851b64a06882
+DIST gunit-3.5.2.jar 287425 BLAKE2B 86e759c5bb164758b689d93bef4b6a0bcb39eb9fee28d2a8dc113a4c97e5e8516b55ada87c27738ffa0fc512805caa338d8649f6f5c9ba36490c4c3ebed86fdd SHA512 c9f14dacec2f22f62b7d3849d1c0e9d626b3dc20eb74a85b32f1901f6279b7b84af095107128bcbe80c49ac05448a713309b60d0c3d2f88e0bca8a14690292b2
+DIST lucene-core-7.1.0.jar 2779248 BLAKE2B 9edea1cfdeca2f2ec9e5c014e575774dc32fa5cf12ba02fd419fc252da10c03cd9f6cda989203211de4bc2ffcd2e79e8b97914e9792951bb0877a203760f07ad SHA512 0cd96016de2bc7ad94779e30348c443cf6028119fdae42c6f29e33d84495876a7519640f20680762324ea40c42e21b595f79cd606a6142b9875501f1e9179678
+DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60c57489017985448ddff46bc8c527b72e615e5f28d0301c28dc8119f0e6c75f4e8a711df3e6aaa418190b8ac8d1857 SHA512 41a85eafde03718efba7cf22598a430efbc6a6a68cf68058988f9eff648d19faa6cc4cf68293fe6e39783a7636eae571f27e04006f4607250dd9f6642184c61d
+DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b967243289d9bded5e9768cb441a35fabbe63641d00b72a8c14aace0bad402df49c21b853f620bf81bc1e829dcecdb SHA512 34df5eccf0577ed037ef347adc9c2552c49d57e35dbff629fdbb860926765be48f8b06fd693bdacfc2edcd9c6ad711c13fe98e5317cb1d1f2157dcab938e34ea
+DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
+DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
+DIST openjfx-11.0.3_p1.tar.bz2 63272033 BLAKE2B 574a622b2b2587fcdc64c91cfef0fbcc6d97baa7827e84a540bf1c8493b9fbc3629bd131e5c0972fb82687d194ceb527dfdedd6c2a00edc16d9a76850699f9b6 SHA512 8f8e07d7588b1a5fbcdfcc2837ae0389fefea3a1d91f89fdd4aab03e0bc6f5b9a1e66a824ae9388b777b36e76beb19cb6c69c963c7d904d36cad40f36c5ef0c7
+EBUILD openjfx-11.0.3_p1.ebuild 6377 BLAKE2B f3382411d65c0b93b8c53c617d0c3aad57457e8352f22948d3f421b92bce258a456887870781959e99173291cafaba9804f80aac4d55b7f3ae534c87b502cb3e SHA512 3b24289b423f9027374d53cd47aed78c62ece77529edc14fd198b312fbb0caa34100f348610f74ba01bef255a11429c106fa3f53ba6644c651886b918aa45476
+MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/files/11/disable-buildSrc-tests.patch b/dev-java/openjfx/files/11/disable-buildSrc-tests.patch
new file mode 100644
index 000000000000..39e247107992
--- /dev/null
+++ b/dev-java/openjfx/files/11/disable-buildSrc-tests.patch
@@ -0,0 +1,13 @@
+Description: Disables the buildSrc tests to work around a Gradle bug (UnsupportedOperationException: Cannot nest operations in the same thread)
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/buildSrc/build.gradle
++++ b/buildSrc/build.gradle
+@@ -81,6 +81,7 @@
+ // Java 7 but when we switch to 8 this will be needed, and probably again when
+ // we start building with Java 9.
+ test {
++    enabled = false;
+     enableAssertions = true;
+     testLogging.exceptionFormat = "full";
+     scanForTestClasses = false;
diff --git a/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch b/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch
new file mode 100644
index 000000000000..51fde6ad39a3
--- /dev/null
+++ b/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch
@@ -0,0 +1,23 @@
+From 2f74649395f0242d08b95572b7b30246457b1d6b Mon Sep 17 00:00:00 2001
+From: Ty Young <BlueGoliath@users.noreply.github.com>
+Date: Mon, 3 Dec 2018 20:34:07 -0600
+Subject: [PATCH] Remove final from HashSet instance
+
+Removes final from HashSet instance at about line 107 which causes build failure
+---
+ .../main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy  | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy b/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy
+index 10a85d62d1..13d573fe6e 100644
+--- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy
++++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy
+@@ -102,7 +102,7 @@ class NativeCompileTask extends DefaultTask {
+         updateFiles();
+         def source = project.files(allFiles);
+         boolean forceCompile = false;
+-        final Set<File> files = new HashSet<File>();
++        Set<File> files = new HashSet<File>();
+         source.each { File file ->
+             final Map fileData = dependencies.get(file.toString());
+             final boolean isModified = fileData == null ||
diff --git a/dev-java/openjfx/files/11/glibc-compatibility.patch b/dev-java/openjfx/files/11/glibc-compatibility.patch
new file mode 100644
index 000000000000..e7e9b173bb4d
--- /dev/null
+++ b/dev-java/openjfx/files/11/glibc-compatibility.patch
@@ -0,0 +1,15 @@
+Description: Fixes the compatibility with the version of glibc in Debian
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: https://bugs.openjdk.java.net/browse/JDK-8211399
+--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h
++++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h
+@@ -25,9 +25,6 @@
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
+ #endif
+-#ifdef HAVE_XLOCALE_H
+-#include <xlocale.h>
+-#endif
+ 
+ typedef locale_t xsltLocale;
+ typedef xmlChar xsltLocaleChar;
diff --git a/dev-java/openjfx/files/11/respect-user-cflags.patch b/dev-java/openjfx/files/11/respect-user-cflags.patch
new file mode 100644
index 000000000000..2339f905b7fa
--- /dev/null
+++ b/dev-java/openjfx/files/11/respect-user-cflags.patch
@@ -0,0 +1,227 @@
+From a28f9aaab759d82384279c16d86bb98ab47412a3 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sat, 1 Jun 2019 00:12:55 -0700
+Subject: [PATCH] respect user cflags
+
+---
+ buildSrc/linux.gradle                           |  7 ++++++-
+ .../gstreamer/projects/linux/avplugin/Makefile  | 16 ++++++----------
+ .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++-----------
+ .../projects/linux/gstreamer-lite/Makefile      | 16 ++++++----------
+ .../native/jfxmedia/projects/linux/Makefile     | 16 ++++++----------
+ 5 files changed, 30 insertions(+), 42 deletions(-)
+
+diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
+index 7a7cbc72..6705a0f3 100644
+--- a/buildSrc/linux.gradle
++++ b/buildSrc/linux.gradle
+@@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String }
+ def commonFlags = [
+         "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
+         "-fstack-protector",
++        "-Wno-error=cast-function-type",
+         "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
+ 
++commonFlags.addAll(System.getenv("CFLAGS").trim().split(" "))
++
+ if (!IS_64) {
+     commonFlags += "-m32"
+ }
+@@ -61,6 +64,8 @@ def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
+                  "-z", "relro",
+                  "-Wl,--gc-sections"].flatten()
+ 
++linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" "))
++
+ if (IS_DEBUG_NATIVE) {
+     linkFlags += "-g"
+ }
+@@ -294,7 +299,7 @@ LINUX.iio.nativeSource = [
+ LINUX.iio.compiler = compiler
+ LINUX.iio.ccFlags = [ccFlags].flatten()
+ LINUX.iio.linker = linker
+-LINUX.iio.linkFlags = [linkFlags].flatten()
++LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
+ LINUX.iio.lib = "javafx_iio"
+ 
+ LINUX.prismES2 = [:]
+diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+index 450b55d3..f27b9479 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+@@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+ OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
+ endif
+ 
+-CFLAGS = -fPIC                   \
++CFLAGS := -fPIC                   \
+          -Wformat                \
+          -Wextra                 \
+          -Wformat-security       \
+@@ -29,13 +29,8 @@ CFLAGS = -fPIC                   \
+          -DLINUX                 \
+          -DGST_DISABLE_LOADSAVE  \
+          -DGSTREAMER_LITE \
+-         -ffunction-sections -fdata-sections
+-
+-ifeq ($(BUILD_TYPE), Release)
+-    CFLAGS += -Os
+-else
+-    CFLAGS += -g -Wall
+-endif
++         -ffunction-sections -fdata-sections \
++         ${CFLAGS}
+ 
+ PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
+ PACKAGES_LIBS     := $(shell pkg-config --libs glib-2.0 gobject-2.0)
+@@ -46,11 +41,12 @@ INCLUDES= -I../../../plugins                          \
+           -I../../../gstreamer-lite/gstreamer/libs    \
+           $(PACKAGES_INCLUDES)
+ 
+-LDFLAGS = -L$(BUILD_DIR)    \
++LDFLAGS := -L$(BUILD_DIR)    \
+           -lgstreamer-lite  \
+            $(PACKAGES_LIBS) \
+           -z relro          \
+-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
++          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
++          ${LDFLAGS}
+ 
+ ifneq ($(strip $(LIBAV_DIR)),)
+ INCLUDES += -I$(LIBAV_DIR)/include
+diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+index 1e58d4d3..627865f9 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+@@ -14,7 +14,7 @@ DIRLIST = progressbuffer       \
+ 
+ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+ 
+-CFLAGS = -fPIC                   \
++CFLAGS := -fPIC                   \
+          -Wformat                \
+          -Wextra                 \
+          -Wformat-security       \
+@@ -30,14 +30,8 @@ CFLAGS = -fPIC                   \
+          -DGST_DISABLE_LOADSAVE  \
+          -DGST_DISABLE_GST_DEBUG \
+          -DGSTREAMER_LITE \
+-         -ffunction-sections -fdata-sections
+-
+-ifeq ($(BUILD_TYPE), Release)
+-    CFLAGS += -Os
+-else
+-    CFLAGS += -g -Wall
+-endif
+-
++         -ffunction-sections -fdata-sections \
++         ${CFLAGS}
+ 
+ INCLUDES = -I$(SRCBASE_DIR) \
+ 	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
+@@ -47,9 +41,10 @@ INCLUDES = -I$(SRCBASE_DIR) \
+ PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
+ PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
+ 
+-LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
++LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+           -z relro \
+-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
++          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
++          ${LDFLAGS}
+ 
+ ifeq ($(ARCH), x32)
+     CFLAGS += -m32
+diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+index 5baa30a1..ddf0e521 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+@@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \
+ 
+ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+ 
+-CFLAGS =-fPIC                   \
++CFLAGS :=-fPIC                   \
+         -Wformat                \
+         -Wextra                 \
+         -Wformat-security       \
+@@ -51,13 +51,8 @@ CFLAGS =-fPIC                   \
+         -DLINUX                 \
+         -DGST_DISABLE_GST_DEBUG \
+         -DGST_DISABLE_LOADSAVE  \
+-        -ffunction-sections -fdata-sections
+-
+-ifeq ($(BUILD_TYPE), Release)
+-    CFLAGS += -Os
+-else
+-    CFLAGS += -g -Wall
+-endif
++        -ffunction-sections -fdata-sections \
++        ${CFLAGS}
+ 
+ INCLUDES = -I$(BASE_DIR)/plugins                          \
+ 	   -I$(SRCBASE_DIR)/projects/build/linux/common   \
+@@ -75,9 +70,10 @@ INCLUDES = -I$(BASE_DIR)/plugins                          \
+ PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa glib-2.0)
+ PACKAGES_LIBS := $(shell pkg-config --libs alsa glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0)
+ 
+-LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
++LDFLAGS := -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
+           -z relro \
+-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
++          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
++          ${LDFLAGS}
+ 
+ ifeq ($(ARCH), x32)
+     CFLAGS += -m32
+diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+index ecbd859f..5881cf53 100644
+--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
++++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+@@ -17,7 +17,7 @@ DIRLIST = jni                \
+ 
+ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+ 
+-CFLAGS = -DTARGET_OS_LINUX=1     \
++CFLAGS := -DTARGET_OS_LINUX=1     \
+          -D_GNU_SOURCE           \
+          -DGST_REMOVE_DEPRECATED \
+          -DGST_DISABLE_GST_DEBUG \
+@@ -26,7 +26,8 @@ CFLAGS = -DTARGET_OS_LINUX=1     \
+          -DHAVE_CONFIG_H         \
+          -DJFXMEDIA_JNI_EXPORTS  \
+          -DLINUX                 \
+-         -ffunction-sections -fdata-sections
++         -ffunction-sections -fdata-sections \
++         ${CFLAGS}
+ 
+ CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
+ 
+@@ -56,21 +57,16 @@ ifdef HOST_COMPILE
+ 	           -I$(GSTREAMER_LITE_DIR)/gstreamer/libs \
+ 		  $(PACKAGES_INCLUDES)
+ 
+-	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
++	LDFLAGS := -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+             -z relro \
+-            -static-libgcc -static-libstdc++ -Wl,--gc-sections
++            -static-libgcc -static-libstdc++ -Wl,--gc-sections \
++            ${LDFLAGS}
+ else
+ 	CFLAGS += $(EXTRA_CFLAGS)
+ 	INCLUDES = $(BASE_INCLUDES)
+ 	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
+ endif
+ 
+-ifeq ($(BUILD_TYPE), Release)
+-	CFLAGS += -Os
+-else
+-	CFLAGS += -g -Wall -D_DEBUG
+-endif
+-
+ ifeq ($(ARCH), x32)
+     CFLAGS += -m32
+     LDFLAGS += -m32
+-- 
+2.21.0
+
diff --git a/dev-java/openjfx/files/11/use-system-swt-jar.patch b/dev-java/openjfx/files/11/use-system-swt-jar.patch
new file mode 100644
index 000000000000..34b4245bf0a0
--- /dev/null
+++ b/dev-java/openjfx/files/11/use-system-swt-jar.patch
@@ -0,0 +1,25 @@
+From c7a04feac8281cd3e53c8d0215a229bb6cd4fce8 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sat, 1 Jun 2019 00:36:04 -0700
+Subject: [PATCH] use system swt jar
+
+---
+ build.gradle | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.gradle b/build.gradle
+index 1e414b7..3d967bb 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -2477,7 +2477,7 @@ project(":swt") {
+     commonModuleSetup(project, [ 'base', 'graphics' ])
+ 
+     dependencies {
+-        compile name: SWT_FILE_NAME
++        compile files("__gentoo_swt_jar__")
+     }
+ 
+     classes {
+-- 
+2.21.0
+
diff --git a/dev-java/openjfx/metadata.xml b/dev-java/openjfx/metadata.xml
new file mode 100644
index 000000000000..3ae082145524
--- /dev/null
+++ b/dev-java/openjfx/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		OpenJFX is an open source, next generation client application platform for desktop,
+		mobile and embedded systems built on Java.
+	</longdescription>
+	<use>
+		<flag name="media">Compile media module, based on gstreamer-minimal (does not pull gstreamer)</flag>
+		<flag name="source">Install JavaFX sources</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
new file mode 100644
index 000000000000..02d8964eaea0
--- /dev/null
+++ b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+EGRADLE_VER="4.8"
+
+inherit java-pkg-2 multiprocessing
+
+DESCRIPTION="Java OpenJFX client application platform"
+HOMEPAGE="https://openjfx.io"
+
+SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar
+	https://repo.maven.apache.org/maven2/org/antlr/antlr-complete/3.5.2/antlr-complete-3.5.2.jar
+	https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="$(ver_cut 1)"
+KEYWORDS="-* ~amd64"
+
+IUSE="cpu_flags_x86_sse2 debug doc source +media"
+
+RDEPEND="
+	dev-java/swt:4.10[cairo,opengl]
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/freetype:2
+	media-libs/fontconfig:1.0
+	media-video/ffmpeg:0=
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/cairo[glib]
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/pango
+	virtual/jpeg
+	virtual/opengl
+	|| (
+		dev-java/openjdk-bin:${SLOT}[doc?]
+		dev-java/openjdk:${SLOT}[doc?]
+	)
+"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-java/ant-core-1.10.5-r2:0
+	dev-java/antlr:0
+	dev-java/antlr:3.5
+	dev-java/hamcrest-core:0
+	dev-java/stringtemplate:0
+	virtual/ttf-fonts
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="cpu_flags_x86_sse2"
+
+PATCHES=(
+	"${FILESDIR}"/11/disable-buildSrc-tests.patch
+	"${FILESDIR}"/11/glibc-compatibility.patch
+	"${FILESDIR}"/11/respect-user-cflags.patch
+	"${FILESDIR}"/11/use-system-swt-jar.patch
+	"${FILESDIR}"/11/fix-build-on-gradle-5x.patch
+)
+
+S="${WORKDIR}/rt-${MY_PV}"
+
+egradle() {
+	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
+	local gradle="${GRADLE_HOME}/bin/gradle"
+	local gradle_args=(
+		--info
+		--stacktrace
+		--no-build-cache
+		--no-daemon
+		--offline
+		--gradle-user-home "${T}/gradle_user_home"
+		--project-cache-dir "${T}/gradle_project_cache"
+	)
+
+	export GRADLE_HOME
+
+	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
+	unset ANT_HOME
+
+	einfo "gradle "${gradle_args[@]}" ${@}"
+	"${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
+}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+		export JDK_HOME="${JAVA_HOME}"
+		export ANT_RESPECT_JAVA_HOME=ture
+
+	else
+		if [[ ${MERGE_TYPE} != "binary" ]]; then
+			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+			JDK_HOME=${JDK_HOME#*/}
+			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+			export JDK_HOME
+			export JAVA_HOME="${JDK_HOME}"
+			export ANT_RESPECT_JAVA_HOME=ture
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack "${P}.tar.bz2"
+	unpack "gradle-${EGRADLE_VER}-bin.zip"
+
+	mkdir "${T}/jars" || die
+
+	local line jar
+	for line in ${SRC_URI}; do
+		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
+			jar=$(basename "${BASH_REMATCH[-1]}")
+			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+
+	local d="${T}/jars"
+
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
+
+	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
+}
+
+src_configure() {
+	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
+	#FIXME: should we enable webkit? doubt so
+
+	# build is very sensetive to doc presense, take extra steps
+	if use doc; then
+		local jdk_doc
+		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
+			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
+		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
+			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
+		fi
+		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
+	fi
+
+	cat <<- _EOF_ > "${S}"/gradle.properties
+		COMPILE_TARGETS = linux
+		COMPILE_WEBKIT = false
+		COMPILE_MEDIA = $(usex media true false)
+		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
+		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
+		BUILD_LIBAV_STUBS = false
+		GRADLE_VERSION_CHECK = false
+		LINT = none
+		CONF = $(usex debug DebugNative Release)
+		NUM_COMPILE_THREADS = $(makeopts_jobs)
+		JFX_DEPS_URL = ${T}/jars
+		COMPANY_NAME = "Gentoo"
+	_EOF_
+}
+
+src_compile() {
+	egradle zips $(usex doc "" "--exclude-task javadoc")
+}
+
+src_install() {
+	if ! use source ; then
+		rm -v build/sdk/lib/src.zip || die
+	fi
+
+	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
+	doins -r build/sdk/.
+	doins build/javafx-exports.zip
+
+	if use doc; then
+		insinto /usr/share/doc/"${PF}"/html
+		doins -r build/javadoc/.
+		dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f025e16597b3..793b626b9b1a 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index 4c871f8b784e..1d0321d19a0f 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -13,32 +13,16 @@ AUX crystal-0.27.0-gentoo-tests-network-sandbox.patch 2028 BLAKE2B ed1fa244adc61
 AUX crystal-0.27.0-max-age-0-test.patch 632 BLAKE2B d41416f4045b23d0a9c4e11e525d8537277090ee316d01cab9cce0373b07583b9e80a495c8f4db997fc4f1b15b17c080d590f8cb8b6f454dc1c0d1d48015a127 SHA512 7608cb37850e52af406fab0378f0748af7db9239f878720041d56751ce36e0f5874a79b1a971fdc6f261292d23868e3e35c9ddb0d3c10c2bb987767954a77988
 AUX crystal-0.27.0-tcp-server-test.patch 377 BLAKE2B 47e9985c9ecc93483bc0d7e970ebb62648ec5778924d055c345ef2ceadb19f07e23c63767ccd62251df1e63bcaca4cf270730b32f24bfd7a6422939911edfe8a SHA512 7c5f0c97b80bf9cffe0b385a02ea2a8573fa88c174eda49a4adab46376e0ef9c957b16c72ca77386f8b88a98356565a31976113f2a78fa3b7bec85b16b692f58
 AUX crystal-0.27.1-verbose.patch 771 BLAKE2B 556cc08a2aac777e4c7a4ac93b8cf5e14c3f2a39977fd2d182862ff4ede15160e68d229f1c02ab07267b868e327eea29c1bfcac85e57dfb88c547f77c3b00c6a SHA512 75390816c5dca49ce12ef6d2f0dd81e7e56ceac41b3389f0459ae26d3de41b51ffa06f083fe75e7e1d9fbc207e5ecee5c4a2722536bf71f9220d527d5558aaa0
-DIST crystal-0.23.0-1-linux-i686.tar.gz 18498501 BLAKE2B 7a8e4e5a2b1425b6effe0a634b74b28c340c4d23c4bfccc0abac4e5d47473e10421d025e68e1fb1fa5b0ba8296108e36cd17d393fb143b8012168d595e5852f9 SHA512 8745114c4824d2859c569ed1bd1057d6d649d57b10d41d22c17627f623704eb98ec2e3ab2bf06622de624906f53e053975a6b9d852aeaafeae4f43585609de28
-DIST crystal-0.23.0-1-linux-x86_64.tar.gz 18729061 BLAKE2B bfca07702b2f7c7d6b11aac864475316cabe86bdba90b1819ecd5cb45769b2b7fd9fb4c9f80e46301785209cc5b35fe39bf689163b9376a32b24f8a685a6281b SHA512 6a4e427b4ab3c3be6efcfaee5c1a19eff04eaf00db949d1e1ba8f29c3277affe96a7aba4273d93fd05251453d5b5b937aa792bc448ff2f6d6aa7f2b17d175f75
-DIST crystal-0.24.2-1-linux-i686.tar.gz 17667007 BLAKE2B 73104ce088e161f03a7b4a191bb6dcdd86d0c65fe4058bb81f1177c6b7162aa48ca7732fbb410de8d3c9ca58830774913acdad9a89d8420a62e6526ecd309a2a SHA512 af0019fa1d140e653812a5d8a4fbb129ccf5d66ae55aa1a4e94ec3166058eb47abd2dd429a9d72a4baad4a6032abdaafc07bc22ca6380ac85e9d1c7168d7bf5d
-DIST crystal-0.24.2-1-linux-x86_64.tar.gz 35022853 BLAKE2B 5b101a27fef0dfbbf61920d826689a45f400c28afe7383320b69f8887512bcab65cbfe8a2cf35b0c598b06083d1ea5e338f4e2b910db03226ba05195483e4c89 SHA512 21d8e7fc34fc24ccb7e8e2c7aade0c3d6fe17e385f0f00534bb91e886788da0b27ff8276b634f7ae13d6342c7e22c6acd609562bcf1af8fddfdee5e256e1bcf0
-DIST crystal-0.24.2.tar.gz 1745462 BLAKE2B 8f3d5cf9e274558a5622aae44c6f7d54d0b3042d08810ddc650f181b91a536a3d0cc2d8fa726b677cce1f8a946319a55b803823596cef0d4d3e63832bfcea720 SHA512 db9fb973eeb2bc72ef91bb894b7c5aea73e727ff46e739aa431d68e556238f346a688a7a43de284afb4667b49366afce3ca423a523bea521180fa8f19ba6862d
-DIST crystal-0.25.0.tar.gz 1957613 BLAKE2B 4c2467e39a9bc6745b74c00f755490a2f726e775c2a0d15562af27d2a6771c95c44f79e6b59ad45f61a59566529854d75c980c55a6886538fa98663879477258 SHA512 20f2864919c7710e5aee8112e1c6ab54a2e50b244ac63d374edfed41ab659b11c062f76dbfc38e763a08bdbea9e0a39f3b5cac5e00bf453be3a31d3b0a023917
-DIST crystal-0.25.1-1-linux-i686.tar.gz 39882213 BLAKE2B 35d0045a72ced6ba7348105c9b88e564f85b075af78decd52c40b47b338cd1c7c1b01565430f9aa21251cfd1266041268e037eb616a24475acfa22b1b8ae1448 SHA512 79601b6c586184e064798c4daca3de77f7c81fbc4d0062a558824533f9272f04899c0041b17dce072757f20f7940c99303c6ff1143448b6452e8216ca4bb43dd
-DIST crystal-0.25.1-1-linux-x86_64.tar.gz 38004788 BLAKE2B 580ccad2227e6467c4c61ce9adf4aeb99c55f694c71a02b9d959c31deba66e428f5c5e7d920dd42d01524ccaef04b9eae3b068f2c6ff16414fa3fd36f462414f SHA512 ec33781b767f8f9f0a6d00f73109fbe9d683a23fca9cc8b462acda3eb024fc970d0daf8c36fb2239297f77510d2e3f544f58ec1cf53d08ea856bc6307f81d1dd
 DIST crystal-0.26.0-1-linux-i686.tar.gz 39814913 BLAKE2B 8c73e33b52a7c5d9ae24ead5d5adbd038f63fc76f904b20ec8dc4da1b1ed6f53283970b06ec7af7ecac7f58c55dc911fe56bcb9897a44a86fc88deb43249a5af SHA512 f0ba602a07b608ac7b3c0f841cbcc70b44d42ce87f405ce9d1a09df7b8c1764e13bca9471b2499a51d22cebc8228e949086893fd3c946d17e7b36ae4e8ac4f75
 DIST crystal-0.26.0-1-linux-x86_64.tar.gz 37986465 BLAKE2B dc8e05519653f82d09d8bd3a84fedd9f4720880bc61a110709643850bbcfa95738292cca8168a8c5c550abe9b178ce28fd59321c66862a1cc81007cc1cb22223 SHA512 c252d2d585fe49c755397b8f8c7965c855e8f8102598b34a83cc6e5ae821a22f3dccce8b7787dd0f00fa39fad3d2dffc23c6105c9cefe525da7855550c790ab2
-DIST crystal-0.26.0.tar.gz 1992091 BLAKE2B dfc96e3e9a71dbec07235a982bbb34ea81bb3adbb39f6c8f8c9bb855ac97e5faf4d47d4a78901317798941b84117399aeee6af53c6c06ae21b9504ca617a2899 SHA512 45a62a2496d477cd72666e98b36bdcbfff958a8f5f0e71f04101f2ba72fc87117d53c8c098a72edb55e9be192b68b73529d5f76e4c660033332ed6e88a372519
 DIST crystal-0.26.1.tar.gz 1994987 BLAKE2B 2292fbdf119e181313000e035802581ae206083aa5c9651a01e131d74e701ea75dc713b44274769decfc9f0f300d8fc2e6c24a94f60380b79c3cdb1a10e73369 SHA512 5e020b0f262f9bedaaae60010f669d7987a77d3416bf0dd057e29eb11adbe8fceb1c4f55a822e623d32e302a01ccc99218d2c3fe474d4ce0dde4312c196ccfa6
 DIST crystal-0.27.0-1-linux-i686.tar.gz 39751745 BLAKE2B 22adf22a2e423f4b0fddda1d8d9bbfb68a4b51f18da9705b6515a500610781251561577dd25c6509aa2b6860b1b329bc7e3d213743330b91206b50239e053a89 SHA512 4fb819a67f3e2c965b454af53cf0bad9606a6a13f85f1bfbe59057291ea293099892344cd31127f5b35e3b25fc6e3f591bda508587fc32f5ef1433aeff0ca706
 DIST crystal-0.27.0-1-linux-x86_64.tar.gz 37933811 BLAKE2B 76bb57b556f14ae8ce219ef490e58ff03571f36fcb4343672ff10ddd6e275e9c5c26a028d63f0592c1a081f2f5dc8241106d8a99add1a7936f52b9e3a57f96e6 SHA512 c403c4080830b928621da07f409ba5433109ee0fc81589f87e79d2e04fcbce8facfa205b7e8c78ab9bb772b4444c938b3bcf691596ee0b2d54c3f3d97150e008
-DIST crystal-0.27.0.tar.gz 2025777 BLAKE2B 0a5cc02a516586b033c65efd8e28a13ac0ed67fddbd1a1f0a88a484dff825bec8f6b03b16938c750e99e0c7c1c12a3fd3fc87e61d038b25b7707e0e7f2913fae SHA512 02b0e1d43d699d1dd91f4b979c8ab8909264e5f1fcc344f6110bebb808c0ee764a943368cce9d33a258adb9631ed4f445e1f771d5a9e50fcd337fc8b319616cf
-DIST crystal-0.27.1.tar.gz 2061304 BLAKE2B 1776525925a25f72cf83f1a6076ab8b2bf1602c9d8c6a1fff8869c200faa35de008655f046ff60fb3733c8c3577f3544184080ee39acedfde006b9fd63d6c844 SHA512 8c6dd9489aff5d4b3e119ef6f531a3248c20f3da97c44dd3febe551adc67f5d87aa4f7679cbcc0dcde0374f3f5a3c523da6dff32a7ac95a9db1406102e980822
 DIST crystal-0.27.2.tar.gz 2061466 BLAKE2B 49f4d2c33412589e7ea131460508a8716d10285d6e248d4e6f9287acc559a864737af2317f2a50332b68704d9d0bf6d3e4d13ad5e5a66e433dbbdd1bc8e523bc SHA512 dcb5948f373d4a7b17e6bdd45697a43e86ec7eb38bdafaade982df9adacbc5a24f2b08f327e41b853bb8f6ec8272411d14defee4e510c430c5dd1370afca42ae
 DIST crystal-0.28.0-1-linux-i686.tar.gz 31888259 BLAKE2B a2f72a5e05abbcc7f4a6003f22ad059e07de59660f114d8e5d0fa225ac51d2465174c41cc81dd7c561f52832ffd9203a0a1cf5606e8633e36fcecd3899463775 SHA512 bc0fcb199abacc068e907f0e8fc8feeecfda4e5312201b4a6af96e76730df3130f6d9f40141c3182c9e99c0600455124cb33ef60194fb4e47ea3826d7090e755
 DIST crystal-0.28.0-1-linux-x86_64.tar.gz 30088308 BLAKE2B e12b0cc9aa5ef354e0f06423a8d3be54ba42eee358cdfd7c6632d5ea08c2ed7e441eb4e162224cf8780bd3ba33e02916f1a7d061a48577d8a4d0eed4578723b3 SHA512 13b7b889ee6d17b905375883baa883fc4d631f6a22c2399aafba1020142e96072670f46584264445b531ece87c6f4b3e89367c62b0c2587c119dd6242ec06762
 DIST crystal-0.28.0.tar.gz 2108702 BLAKE2B 75b743c65ae2063ecbcff7514a3fac53ecc0e25866dd91a34368bdb1bf2a72e9b8e9b6c8325f1b0589693efa78c93bd246f1e764569307519375f7d7429bea55 SHA512 ea0d0938fa90db1b8e395e1daf777c36be5366046c1df7764409e14cf490b4e5f502c62a567e1cf1375684fac58afb71ccc39a5d5974eb29ef9bb5be59fa0a10
-EBUILD crystal-0.24.2.ebuild 2374 BLAKE2B 62f5e228fc38ad340d2e77ee1817410a5ef418405a09ba42c52f6067e5d303cb6836694ecb5b2d59b2cc00022ead788109a98ac6a124356d72783f926526c2fc SHA512 5812f5e4174c3320601684f3ac2ef235eb4aca4dee5632fc243839e8c61fa1c738086db17f840b68300887244ea6232d5d990725c1d85021d1a934c8a0560e92
-EBUILD crystal-0.25.0.ebuild 2369 BLAKE2B 2146aba6dedff0c3fcbcd8d018c8c15906eb7050e9cea358fe2c70de8f1a76242de583e798c39769e6a89832403a6c5eda8b50bfd882889c9a80a638919482e9 SHA512 48a19dd3c5bd501dbb00b44f4eb2e3d934e835bac4361f2f1dab9aab2812aa40a8e19b6838db006ee4735cdf09d720206120b730fcd7af79e1745866a7422ff7
-EBUILD crystal-0.26.0.ebuild 2437 BLAKE2B a2ef50459ec827303b1ffcda38110b096e42252f85364b0199bcf2d9f64747b51ad72a35ff54d1ad48ac442a912a5db34f825dbae3e96db1f38f6b14d19dd281 SHA512 ac9c8d35211d41be615cf7a9c46181b4b83334d2da975cd621ee0480665c8130d18299d3d62f45bf60b95c35a02c6c0e1aff51a14e1967a7d9228c2107c987b8
 EBUILD crystal-0.26.1.ebuild 2696 BLAKE2B 820ed8d2957bd9b9863115318d3041f3428adfe60295d8fef170cb636a5135492c7abf9ff98fe67a537f3d4289040d61a892fe9074ded3ad1bc306f74327f568 SHA512 1a7f2c3bd31ecc7ea09943dad6b6a506a659dace59382075ab4ea628cf96550e71b4f659f47e7c55da86b9c454ef47a67b3cef1f3f85d23fcc120c6534ae7115
-EBUILD crystal-0.27.0.ebuild 3125 BLAKE2B ec1bcc46d303723566f9c90d8532483b1de2113ba7d105f7d6b8d413f23261feb61b6a46dc0a6bb461d4d436f8175f6f2576fb97a2d154852a434819f66164c3 SHA512 1e7a4ed435535b1479f7bf972258159a264275e43c300b2864ef96601bebd9a5772f26f70e1c04fac13766cc984786030e8d7cafbca313972484c3f132e2f2c8
-EBUILD crystal-0.27.1.ebuild 3062 BLAKE2B da693c76e1948477b0b1c630017c263363c2269b833e525c6d35a3722600ad282c4a0bf198fc3e36827a19d1b9ce67bc1273f2a9d1495ff09111d69eaef988ec SHA512 7cdab42df495f2944a79384744f99da21c9f6fb6c7acb154cc1e34065db8fa7dff7dc0364e859f09601a62c95ebcdc6885a0920e4214b6b43f062809e066c674
 EBUILD crystal-0.27.2.ebuild 3110 BLAKE2B 34c672cb96386852cd05db8e7b2c7df70080af78165be5c7bb18e9003d98f035e0ee88e5534f5e751d3efd1ddd415deaa43aaae05353248fe489db37813d0b3d SHA512 05fc51ef67d0b1fc7e34ac4aeb7bd74e9d48441acf4fa69a078f6235ef5945a7e500b9822d41ae8102bb4c77d6f6b6f03b0a7d9738ea02e136f89946c3ffa7d7
 EBUILD crystal-0.28.0.ebuild 3111 BLAKE2B 395b3d382c1578834daef033e091e6f1f2491e8a4df611c1913bba4cc5cefec2c6a5b3981f972e9545358db47e2dbc40fa8a9bac3914389b8b4d2f98a0c5de34 SHA512 1b33728ebab77a8e32016f4415515cd453874ac8504b0cf14d27143a3e8aa8d69c9835f5640e49f1667b229ba9567ecdc75ca95d93052c40c4a2de7800062394
 MISC metadata.xml 995 BLAKE2B 00f6cfc63cec16ab8c6f983316f5872e63573f2d680da810b9b97d88c2ff6e21c15327a1508d62234e324f7145ca248a9ce1aa7286b0e34d9ee3dcba1481ff25 SHA512 da6a6f834b0d961477b95045756c539df7a968fe240f9f0c1c8183eef3052dddefb8d20547d668b07fece74c96b94bbf18baaac59e7328ff322355227d1adf02
diff --git a/dev-lang/crystal/crystal-0.24.2.ebuild b/dev-lang/crystal/crystal-0.24.2.ebuild
deleted file mode 100644
index 84884cb69fb6..000000000000
--- a/dev-lang/crystal/crystal-0.24.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-BV=0.23.0-1
-BV_AMD64=${BV}-linux-x86_64
-BV_X86=${BV}-linux-i686
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
-	x86? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
-
-LLVM_MAX_SLOT=5
-
-# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
-DEPEND="
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	dev-libs/boehm-gc[static-libs,threads]
-	dev-libs/libatomic_ops
-	dev-libs/libevent
-	dev-libs/libpcre
-	sys-libs/libunwind
-	dev-libs/pcl
-	dev-libs/gmp:0
-"
-RDEPEND="${DEPEND}
-	xml? ( dev-libs/libxml2 )
-	yaml? ( dev-libs/libyaml )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.24.0-verbose-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-0.24.2-gentoo-tests-sandbox.patch
-	"${FILESDIR}"/${PN}-0.24.2-gentoo-tests-network-sandbox.patch
-)
-
-src_prepare() {
-	default
-
-	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
-}
-
-src_compile() {
-	emake \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
-	use doc && emake docs
-}
-
-src_test() {
-	emake spec \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV}
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crystal
-	doins -r src/.
-	dobin .build/crystal
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/completion.zsh _crystal
-
-	use examples && dodoc -r samples
-
-	if use doc ; then
-		docinto api
-		dodoc -r docs/.
-	fi
-
-	newbashcomp etc/completion.bash ${PN}
-}
diff --git a/dev-lang/crystal/crystal-0.25.0.ebuild b/dev-lang/crystal/crystal-0.25.0.ebuild
deleted file mode 100644
index 2dbfe3e736df..000000000000
--- a/dev-lang/crystal/crystal-0.25.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-BV=0.24.2
-BV_AMD64=${BV}-1-linux-x86_64
-BV_X86=${BV}-1-linux-i686
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/}/crystal-${BV_AMD64}.tar.gz )
-	x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV}/crystal-${BV_X86}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
-
-LLVM_MAX_SLOT=6
-
-# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
-DEPEND="
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	dev-libs/boehm-gc[static-libs,threads]
-	dev-libs/libatomic_ops
-	dev-libs/libevent
-	dev-libs/libpcre
-	sys-libs/libunwind
-	dev-libs/pcl
-	dev-libs/gmp:0
-"
-RDEPEND="${DEPEND}
-	xml? ( dev-libs/libxml2 )
-	yaml? ( dev-libs/libyaml )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.25.0-verbose.patch
-	"${FILESDIR}"/${PN}-0.24.2-gentoo-tests-sandbox.patch
-	"${FILESDIR}"/${PN}-0.24.2-gentoo-tests-network-sandbox.patch
-)
-
-src_prepare() {
-	default
-
-	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
-}
-
-src_compile() {
-	emake \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
-	use doc && emake docs
-}
-
-src_test() {
-	emake spec \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV}
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crystal
-	doins -r src/.
-	dobin .build/crystal
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/completion.zsh _crystal
-
-	use examples && dodoc -r samples
-
-	if use doc ; then
-		docinto api
-		dodoc -r docs/.
-	fi
-
-	newbashcomp etc/completion.bash ${PN}
-}
diff --git a/dev-lang/crystal/crystal-0.26.0.ebuild b/dev-lang/crystal/crystal-0.26.0.ebuild
deleted file mode 100644
index 59268e937a68..000000000000
--- a/dev-lang/crystal/crystal-0.26.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-BV=0.25.1-1
-BV_AMD64=${BV}-linux-x86_64
-BV_X86=${BV}-linux-i686
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )
-	x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
-
-LLVM_MAX_SLOT=6
-
-# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
-DEPEND="
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	dev-libs/boehm-gc[static-libs,threads]
-	dev-libs/libatomic_ops
-	dev-libs/libevent
-	dev-libs/libpcre
-	sys-libs/libunwind
-	dev-libs/pcl
-	dev-libs/gmp:0
-"
-RDEPEND="${DEPEND}
-	xml? ( dev-libs/libxml2 )
-	yaml? ( dev-libs/libyaml )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.25.0-verbose.patch
-	"${FILESDIR}"/${PN}-0.24.2-gentoo-tests-sandbox.patch
-	"${FILESDIR}"/${PN}-0.24.2-gentoo-tests-network-sandbox.patch
-	"${FILESDIR}"/${PN}-0.26.0-gentoo-tests-network-sandbox-2.patch
-)
-
-src_prepare() {
-	default
-
-	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
-}
-
-src_compile() {
-	emake \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
-	use doc && emake docs
-}
-
-src_test() {
-	emake spec \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV}
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crystal
-	doins -r src/.
-	dobin .build/crystal
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/completion.zsh _crystal
-
-	use examples && dodoc -r samples
-
-	if use doc ; then
-		docinto api
-		dodoc -r docs/.
-	fi
-
-	newbashcomp etc/completion.bash ${PN}
-}
diff --git a/dev-lang/crystal/crystal-0.27.0.ebuild b/dev-lang/crystal/crystal-0.27.0.ebuild
deleted file mode 100644
index cb040059d964..000000000000
--- a/dev-lang/crystal/crystal-0.27.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-BV=0.27.0-1
-BV_AMD64=${BV}-linux-x86_64
-BV_X86=${BV}-linux-i686
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )
-	x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
-
-# Not compatible with llvm-7
-LLVM_MAX_SLOT=6
-
-# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
-DEPEND="
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	dev-libs/boehm-gc[static-libs,threads]
-	dev-libs/libatomic_ops
-	dev-libs/libevent
-	dev-libs/libpcre
-	sys-libs/libunwind
-	dev-libs/pcl
-	dev-libs/gmp:0
-"
-RDEPEND="${DEPEND}
-	xml? ( dev-libs/libxml2 )
-	yaml? ( dev-libs/libyaml )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.25.0-verbose.patch
-	"${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch
-	"${FILESDIR}"/${PN}-0.26.1-gentoo-tests-network-sandbox-3.patch
-	"${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch
-	"${FILESDIR}"/${PN}-0.27.0-max-age-0-test.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-network-sandbox.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
-	"${FILESDIR}"/${PN}-0.27.0-tcp-server-test.patch
-)
-
-src_prepare() {
-	default
-
-	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
-}
-
-src_compile() {
-	local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
-	if [[ ! -d ${bootstrap_path} ]]; then
-		eerror "Binary tarball does not contain expected directory:"
-		die "'${bootstrap_path}' path does not exist."
-	fi
-
-	emake \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		PATH="${bootstrap_path}:${PATH}" \
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
-	use doc && emake docs
-}
-
-src_test() {
-	# EXTRA_SPEC_FLAGS is useful to debug individual tests
-	# as part of full build:
-	#    USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
-	emake spec \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		\
-		"EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crystal
-	doins -r src/.
-	dobin .build/crystal
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/completion.zsh _crystal
-
-	use examples && dodoc -r samples
-
-	if use doc ; then
-		docinto api
-		dodoc -r docs/.
-	fi
-
-	newbashcomp etc/completion.bash ${PN}
-}
diff --git a/dev-lang/crystal/crystal-0.27.1.ebuild b/dev-lang/crystal/crystal-0.27.1.ebuild
deleted file mode 100644
index d1888dfde89e..000000000000
--- a/dev-lang/crystal/crystal-0.27.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-BV=0.27.0-1
-BV_AMD64=${BV}-linux-x86_64
-BV_X86=${BV}-linux-i686
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )
-	x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
-
-# Not compatible with llvm-7
-LLVM_MAX_SLOT=6
-
-# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
-DEPEND="
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	dev-libs/boehm-gc[static-libs,threads]
-	dev-libs/libatomic_ops
-	dev-libs/libevent
-	dev-libs/libpcre
-	sys-libs/libunwind
-	dev-libs/pcl
-	dev-libs/gmp:0
-"
-RDEPEND="${DEPEND}
-	xml? ( dev-libs/libxml2 )
-	yaml? ( dev-libs/libyaml )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.27.1-verbose.patch
-	"${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch
-	"${FILESDIR}"/${PN}-0.26.1-gentoo-tests-network-sandbox-3.patch
-	"${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch
-	"${FILESDIR}"/${PN}-0.27.0-max-age-0-test.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
-	"${FILESDIR}"/${PN}-0.27.0-tcp-server-test.patch
-)
-
-src_prepare() {
-	default
-
-	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
-}
-
-src_compile() {
-	local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
-	if [[ ! -d ${bootstrap_path} ]]; then
-		eerror "Binary tarball does not contain expected directory:"
-		die "'${bootstrap_path}' path does not exist."
-	fi
-
-	emake \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		PATH="${bootstrap_path}:${PATH}" \
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
-	use doc && emake docs
-}
-
-src_test() {
-	# EXTRA_SPEC_FLAGS is useful to debug individual tests
-	# as part of full build:
-	#    USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
-	emake spec \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		\
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		\
-		"EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crystal
-	doins -r src/.
-	dobin .build/crystal
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/completion.zsh _crystal
-
-	use examples && dodoc -r samples
-
-	if use doc ; then
-		docinto api
-		dodoc -r docs/.
-	fi
-
-	newbashcomp etc/completion.bash ${PN}
-}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 79530a47c67d..9bc282e07559 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -3,6 +3,8 @@ AUX 50erlang-gentoo.el 134 BLAKE2B df2da5c0c4be3e6855b51b820e3304f5c212a92d13ec4
 AUX epmd.init 537 BLAKE2B 8b7c45ec9820d37b01cbbe824e0fd13f4651ac280383f8830dc42037f76f918569ce68c00d6c880ab34a95f5c2831dfb3edaf62e13112e5a1c0e77534fd9239c SHA512 231eb48c02eb183eac7aa2f6ec811b0934098e04faf49b130d5f6e184d351f3c1d6484ff5330e5c8d707473be79f220247a9b7076cf3bf27fdd659b1ccdcc111
 AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab557e3f71cab48baf59b5a9533a4dccb2cb61a4434e3a51d44eae06010718dbf9a732d605c40f73 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28
 AUX erlang-20.3.2-dont-ignore-LDFLAGS.patch 1337 BLAKE2B 7272c96b1ee947a98f0a5b1f3bd1fce11e8d02f121348208196ae60af965dfde7fac15263ca0a58df96dff21785a1a63f4fc10f7e7e10c0f68a618e760e5ffd7 SHA512 59d39b1680ac3406e4c37f81a0207588208a873279920258235af54700f80bd67584c3e55c9278f893cd7813573bbec8b13195e47ba00101fc578d5a2b40fa34
+AUX erlang-21.3-lto.patch 5277 BLAKE2B 32bfdda0c1deb8bd7d2403ad6810b6f8cd8bf6ec3bfd54d02ab4637d800ef0fe77b4da883877ba3c08a9c24596c7af09069aab5449fc22627d811ccc6257f18c SHA512 fb3460e4d881e8c9bc256840d62f8ba988456abc581c01e2b8c43d1302549cdb59b179f613f65139bd89b6e1fb8395e74472ba0a000ff0dcf8af84c4593dac03
+AUX erlang-21.3-pgo-loop.patch 420 BLAKE2B e0ad61bd592c7a3ddf2410ecbcd38a3f72ad34a58223af9b73eba586cc1970b289886c71a7d7e23a69318d86bd2bb220c21bb4b7e5db1984586ed5bd81990159 SHA512 97f7239b729e9f809a4b6226a4e69a833db94cdd4f5d937b26b33ae432663ceab1c0bab7c3168ca729bd8eb3bb5ead2fbf0510ef88bb124a44541d6b18f0d0f3
 AUX erlang-add-epmd-pid-file-creation-for-openrc.patch 2359 BLAKE2B 54a3148144bcbb9a4dd68e89fd609a09a9e9a0a9c7a71a4e9eaafc12632e23da44411d72c1590e482fda73d5464b1071386aa564b8d9a73b032b62c474d20570 SHA512 301aed1980a8638a8cd069ecb6e968e5c15d3e82b38580861a0ed6a2fc7a9505d99525a53a6ac19c2d9b786703aac6bf51751275a6a7fafd8f530c07ea0c7e8c
 AUX erlang-custom-autoconf.patch 398 BLAKE2B c99d3bc311bbca379786b9e4d29ee4983354a069508328c95e99a62bdfb8d15dbf372124acdf66c603f64acd9cabeb146e5bd5ec1e1ffd09af125fc4a076abdc SHA512 b82e09d0cd686c07b9d370e397edda10bd96435e70f4a0995ec06638e237e3b8fd0e1195ecc036b51367ffa36a0b4db5a2b1fe5d389a0b97e19d32aec51755d9
 DIST erlang-20.3.8.10.tar.gz 53511918 BLAKE2B 5f430bda415a5b59e9dec3222abe311264277ee91b2e7e9e69dba1016169492dc621df314c057e39f16b7bfe01686f405b9ccde362f84c5c2f0ffde68a923ffa SHA512 0d5ab27d17ff203d2c719fd5a03d843e3046037240e97ae9ad59d9f0690cf46cfb5fac2569590ce68f62169b1b2b2bc693e9a9b82f6ab0371693c5324bd3288b
@@ -32,5 +34,6 @@ EBUILD erlang-20.3.ebuild 4826 BLAKE2B 80ccf3e15c5cb5fc585c4b014b8093ce2306222d6
 EBUILD erlang-21.1.1.ebuild 4429 BLAKE2B f873d7d5af5207811e314d640f88fa0e0d8bee9012d5ffd17d2c77910d2c2e68869e58d7cd68ddbde07b09c101e32f44f7dcfc6770d9a9fda7504c26a722c96e SHA512 7d8d3261811ce9f3fda2e51d24d24015ac1780100a1c7550d2606b5da6ae8cf10014cb3af109aee3b138e1fa4c9072f2ede50b4cf3beb139f7b861f805cdc597
 EBUILD erlang-21.2.6.ebuild 4434 BLAKE2B d0a694be6cf620a6034235d8fa0a8bbbc9a419ba44ade3d3c946e2af662aa11fb26c1fb6b58d4541c805bcb979c8f8390374a1f423c54101f180d803e5e4a059 SHA512 734b4ca60ed34ffabac86fc4f5bd5d32c8b22ded33a12bacf9c76cfbce62590a4e8faba2ec0344d69ec6d58613ee02e9f73dbdb8eaf927d452f97421b01ea0ef
 EBUILD erlang-21.2.7.ebuild 4434 BLAKE2B d0a694be6cf620a6034235d8fa0a8bbbc9a419ba44ade3d3c946e2af662aa11fb26c1fb6b58d4541c805bcb979c8f8390374a1f423c54101f180d803e5e4a059 SHA512 734b4ca60ed34ffabac86fc4f5bd5d32c8b22ded33a12bacf9c76cfbce62590a4e8faba2ec0344d69ec6d58613ee02e9f73dbdb8eaf927d452f97421b01ea0ef
+EBUILD erlang-21.3-r1.ebuild 4511 BLAKE2B 2c6845a8bb9ed75313108397a7231188904f27c92fb711da841c04a57bc0559724b6f9b0c761149f8801efb1d778f55e4f3bcf5576a05edd7367b788372b65e8 SHA512 f6ef4c7613150745520302652d4a322e7a333e480c9b41838b0b83545ba6b8d89691208fe18482ec5636de3d7c0e9a91af490ee52bebe14e475f032a4de88c0b
 EBUILD erlang-21.3.ebuild 4434 BLAKE2B d0a694be6cf620a6034235d8fa0a8bbbc9a419ba44ade3d3c946e2af662aa11fb26c1fb6b58d4541c805bcb979c8f8390374a1f423c54101f180d803e5e4a059 SHA512 734b4ca60ed34ffabac86fc4f5bd5d32c8b22ded33a12bacf9c76cfbce62590a4e8faba2ec0344d69ec6d58613ee02e9f73dbdb8eaf927d452f97421b01ea0ef
 MISC metadata.xml 767 BLAKE2B 7b4e24e035cc581418aa0509baad9913b3abb195414f2e91136510a5910b69a186853b352557f1e49280aae7871cc2e033b6e2ea6f22b3b73c88d78853937309 SHA512 c816f414d07fac9433a22bdfb083db600200f45cc0fcc0eb06389056df4ccdfa31767ff0a25b8f7caf1b17dffc303ff3f766a642cfd263c0c723623c31c5a716
diff --git a/dev-lang/erlang/erlang-21.3-r1.ebuild b/dev-lang/erlang/erlang-21.3-r1.ebuild
new file mode 100644
index 000000000000..ed159555d82f
--- /dev/null
+++ b/dev-lang/erlang/erlang-21.3-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit autotools eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	tk? ( dev-lang/tk:0 )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/18.2.1-wx3.0.patch"
+	"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
+	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
+	"${FILESDIR}/${PN}-custom-autoconf.patch"
+	"${FILESDIR}/${PN}-21.3-lto.patch"
+	"${FILESDIR}/${PN}-21.3-pgo-loop.patch"
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	./otp_build autoconf
+	find -name configure.in -execdir mv '{}' configure.ac \; || die "find failed"
+	eautoreconf
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+		$(use_enable hipe)
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_with odbc)
+		$(use_enable sctp)
+		$(use_with ssl ssl "${EPREFIX}"/usr)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(use_enable pgo)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+		--enable-threads
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if use pgo; then
+		# disable distcc and ccache
+		export DISTCC_HOSTS=""
+		export CCACHE_DISABLE=1
+	fi
+
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init epmd
+	use systemd && systemd_dounit "${FILESDIR}"/epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/erlang-21.3-lto.patch b/dev-lang/erlang/files/erlang-21.3-lto.patch
new file mode 100644
index 000000000000..c41e89f42c6c
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-21.3-lto.patch
@@ -0,0 +1,140 @@
+https://github.com/erlang/otp/pull/2194
+https://bugs.gentoo.org/681778
+
+From ed751968d8dc4c0b58210247e94409a8a52cc501 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Thu, 28 Mar 2019 08:38:56 +0000
+Subject: [PATCH] stdlib: fix re:replace on LTO builds
+
+Fabio Coatti reported elixir build failure in https://bugs.gentoo.org/681778.
+The minimal reproducer looks like that (from otp git tree):
+
+    $ ./configure CFLAGS='-O2 -flto' LDFLAGS='-O2 -flto=8'
+    $ make
+    $ ERL_TOP=$PWD \
+      PATH=$ERL_TOP/bin:$PATH \
+        \
+        bin/erl \
+        \
+        -noshell -eval 're:replace("a","b","c",[{return,list}]).' \
+        -s erlang halt
+
+    {"init terminating in do_boot",{badarg,[{re,replace,["a","b","c",[{return,list}]],
+        [{file,"re.erl"},{line,362}]},
+         {erl_eval,do_apply,6,[{file,"erl_eval.erl"},{line,680}]},
+         {init,start_it,1,[]},
+         {init,start_em,1,[]},
+         {init,do_boot,3,[]}]}}
+    init terminating in do_boot ({badarg,[{re,replace,[[_],[_],[_],[_]],[{_},{_}]},
+        {erl_eval,do_apply,6,[{_},{_}]},{init,start_it,1,[]},{init,start_em,1,[]},{init,do_boot,3,[]}]})
+    Crash dump is being written to: erl_crash.dump...done
+
+The failure happens in libpcre2 where stack overflow is mis-identified
+at function entry of
+
+    erts_pcre_compile2()
+        compile_regex()
+          if (PUBL(stack_guard) != NULL && PUBL(stack_guard)())
+          {
+              *errorcodeptr= ERR85;
+              return FALSE;
+          }
+
+The stack "overflow" detection happens in
+
+    thr_wrapper()
+        ethr_set_stacklimit__()
+
+because the stack usage code relies on the fact that ethr_set_stacklimit__()
+and similar functions don't get inlined into callers for stack growth
+measurement.
+
+Before the change inlining avoidance was achieved by putting functions
+into standalone translation units. LTO makes this technique inefficient.
+
+The change marks functions explicitly as __attribute__((__noinline__)) on gcc.
+
+Reported-by: Fabio Coatti
+Bug: https://bugs.gentoo.org/681778
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ erts/emulator/beam/global.h            |  9 +++++----
+ erts/emulator/beam/sys.h               | 10 ++++++++++
+ erts/include/internal/ethr_internal.h  |  2 +-
+ erts/include/internal/ethread_inline.h |  3 +++
+ 4 files changed, 19 insertions(+), 5 deletions(-)
+
+diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
+index f9bbe4167f9..4c8d3d3dbe6 100644
+--- a/erts/emulator/beam/global.h
++++ b/erts/emulator/beam/global.h
+@@ -1216,10 +1216,11 @@ Uint64 erts_timestamp_millis(void);
+ 
+ Export* erts_find_function(Eterm, Eterm, unsigned int, ErtsCodeIndex);
+ 
+-void *erts_calc_stacklimit(char *prev_c, UWord stacksize);
+-int erts_check_below_limit(char *ptr, char *limit);
+-int erts_check_above_limit(char *ptr, char *limit);
+-void *erts_ptr_id(void *ptr);
++/* ERTS_NOINLINE prevents link-time optimization across modules */
++void *erts_calc_stacklimit(char *prev_c, UWord stacksize) ERTS_NOINLINE;
++int erts_check_below_limit(char *ptr, char *limit) ERTS_NOINLINE;
++int erts_check_above_limit(char *ptr, char *limit) ERTS_NOINLINE;
++void *erts_ptr_id(void *ptr) ERTS_NOINLINE;
+ 
+ Eterm store_external_or_ref_in_proc_(Process *, Eterm);
+ Eterm store_external_or_ref_(Uint **, ErlOffHeap*, Eterm);
+diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
+index a6312293cc8..24b6738e082 100644
+--- a/erts/emulator/beam/sys.h
++++ b/erts/emulator/beam/sys.h
+@@ -63,6 +63,16 @@
+ #  endif
+ #endif
+ 
++#ifndef ERTS_NOINLINE
++#  if ERTS_AT_LEAST_GCC_VSN__(3,1,1)
++#    define ERTS_NOINLINE __attribute__((__noinline__))
++#  elif defined(__WIN32__)
++#    define ERTS_NOINLINE __declspec(noinline)
++#  else
++#    define ERTS_NOINLINE
++#  endif
++#endif
++
+ #if defined(DEBUG) || defined(ERTS_ENABLE_LOCK_CHECK)
+ #  undef ERTS_CAN_INLINE
+ #  define ERTS_CAN_INLINE 0
+diff --git a/erts/include/internal/ethr_internal.h b/erts/include/internal/ethr_internal.h
+index ac27ff2ed09..17ec84c52b6 100644
+--- a/erts/include/internal/ethr_internal.h
++++ b/erts/include/internal/ethr_internal.h
+@@ -90,7 +90,7 @@ int ethr_init_common__(ethr_init_data *id);
+ int ethr_late_init_common__(ethr_late_init_data *lid);
+ void ethr_run_exit_handlers__(void);
+ void ethr_ts_event_destructor__(void *vtsep);
+-void ethr_set_stacklimit__(char *prev_c, size_t stacksize);
++void ethr_set_stacklimit__(char *prev_c, size_t stacksize) ETHR_NOINLINE;
+ 
+ #if defined(ETHR_X86_RUNTIME_CONF__)
+ void ethr_x86_cpuid__(int *eax, int *ebx, int *ecx, int *edx);
+diff --git a/erts/include/internal/ethread_inline.h b/erts/include/internal/ethread_inline.h
+index 8e6bcfc4a8c..f25ba4ae721 100644
+--- a/erts/include/internal/ethread_inline.h
++++ b/erts/include/internal/ethread_inline.h
+@@ -62,12 +62,15 @@
+ #  define ETHR_INLINE __inline__
+ #  if ETHR_AT_LEAST_GCC_VSN__(3, 1, 1)
+ #    define ETHR_FORCE_INLINE __inline__ __attribute__((__always_inline__))
++#    define ETHR_NOINLINE __attribute__((__noinline__))
+ #  else
+ #    define ETHR_FORCE_INLINE __inline__
++#    define ETHR_NOINLINE
+ #  endif
+ #elif defined(__WIN32__)
+ #  define ETHR_INLINE __forceinline
+ #  define ETHR_FORCE_INLINE __forceinline
++#  define ETHR_NOINLINE __declspec(noinline)
+ #endif
+ 
+ #endif /* #ifndef ETHREAD_INLINE_H__ */
diff --git a/dev-lang/erlang/files/erlang-21.3-pgo-loop.patch b/dev-lang/erlang/files/erlang-21.3-pgo-loop.patch
new file mode 100644
index 000000000000..82add992a448
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-21.3-pgo-loop.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/686786
+
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -682,7 +682,7 @@ elif test "X$PROFILE_INSTR_GENERATE" = "Xtrue" -a "X$PROFILE_INSTR_USE" = "Xtrue
+   PROFILE_COMPILER=clang
+   AC_MSG_RESULT([yes, using -fprofile-instr-generate])
+ else
+-  if $enable_pgo = yes; then
++  if test $enable_pgo = yes; then
+     AC_MSG_ERROR(cannot use PGO with this compiler)
+   else
+     AC_MSG_RESULT([no])
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 4e55420b7732..d5cbc1ecce3b 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -83,7 +83,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 21670 BLAKE2B ad406c6fe4ac067b365b059fea1621799a322489ed783d7d76b877c64d84625fc4cb41d2e0c5f9d5c67ebc7dc780aca5a095c76f7260694355bfba128d2a7241 SHA512 82d5dcc2c7e6cde053687d1d0c541584d00c56bbc03495728ae46af7d805a37f1c0caac9b60a9989462b60dcd4faa6bc8fd2b89c4def4b9b2619dd2701ffc21f
 EBUILD ghc-7.8.4.ebuild 19817 BLAKE2B 3859f27e1efea97faad71e3d1e00c43bf334736d51624a2c9e148b482d92f6ad813e2323f6980ce39f9f05860ab5a5311930070317e36660392f57ec87a49d90 SHA512 5f5a55dbdec9abd6cc92a48779377227f3fbdfb99db5e7e5d57daaced1ee2ad8b5395ae59456c837bb70c1c0096cd0db1c9fe7d3439bce9ffe8b21222d0a83d0
-EBUILD ghc-8.0.2.ebuild 21544 BLAKE2B e57a4c97d2231248abef1295a4b825b7cb2d8e2ee9fd6aaa5f3bb554afa6c75d4cd602f33826f3852839804c8fdbd155d1a69782f972095dc41a0f845b0ffc11 SHA512 a6ad1d4f5f2f9156ae1deff8c49090f47e815066f7bd420389421789aa3fb580a63d70653d682a09808eed9be655617864da24d50db3f3b65ad6cca677169dcf
+EBUILD ghc-8.0.2.ebuild 21587 BLAKE2B f73f153ad488af3d44be9b1bce3ccc3fa46a8cd514c20cf3b59e61b2add072ca80d417a1b069dde190f41c73549fce9862331b268bdf269e77c034126abf3a9f SHA512 86769a7bfa47c49e3da70e6899cb14f48d12a784c2f064d0d58579f77646e8c850b3a2ab181897981b4bc77bce82014d30aadca0ce82dcb52bc319a6fec5550c
 EBUILD ghc-8.2.1.ebuild 24814 BLAKE2B d008223cf21b766701bed924421930e5825c00fad2b6891a1c72149e988fe7cfdf5a7325a32104ce1c0f18cac3db4e35403fe9dd3842135f06111c08ec276287 SHA512 8399b7280bd3f125e54623cdb6ad1d1c14fb353982693bd0b94b25a41b5cfc8e68ef28681c0273d5ffd8434cdf1de6cadf180669e1983424693d0365b9e3c875
 EBUILD ghc-8.2.2.ebuild 24783 BLAKE2B 7759ac0a512d2503d4c79925ae4d72f957d786a70fbd5e7c892e1f9756ac8460aacdf598f1ab9c8eb04a14d7be419a1bcd69c0c3cb09deb56523134f5e2fe9a0 SHA512 8c96d6515440ef176efb4cd7ba70d01e65ab742f094334e31444334cfa6bed590fa103877d3d10f10fdaf146c46aa0d0ba168c27e30681005248cc7ffc806885
 EBUILD ghc-8.4.1.ebuild 24601 BLAKE2B 09e125fb16efc35e009e063c499f984915a3bb358b4b2a4d204bff5cf638bb64e4b41f18f3203e4b81f2c2fdb0eee999f3dbc34b2c5aa6233716b993d95c36f3 SHA512 73e62c14d4c83c8dbeaaebc07605dcb446b6d6bb2ffc9c135cb0a9f327cf107a3716a4ccc32a8e8e038be6cb6b9b6c0131732dae9b78f35526ac74bd5071ac45
diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild
index 6e573c0fff30..48eb8d91db6e 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -293,6 +293,7 @@ relocate_ghc() {
 		# but then USE=binary would result in installing
 		# in '${bin_libdir}'
 		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+		bin_libpath=${bin_ghc_prefix}/$(get_libdir)
 
 		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
 			"${WORKDIR}/usr/bin/$(cross)ghc-${GHC_PV}" \
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 434aaa808b79..436db117f447 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -13,6 +13,7 @@ AUX gnat-gpl-2016-ustat.patch 1389 BLAKE2B a52707196c5caa9e025a900adfd8109d28a93
 AUX gnat-gpl-2017-gentoo.patch 4510 BLAKE2B 468059269978e5bbf85d09f2d4086c5fade1f7cdb4c14e9a12b596a96b3cf93e0bf894cf77ef2f81dd56b3aa2e7dc65c8642f7b688ec7cf8514152051e33564f SHA512 48ed94e3e5a2473f98ac6877640f64fc5e5a705a95e0c92a2d19b6a77597e49e77ed409af15302fba0c2403b38c13847c6eeb1f4626f57bc3c128f542dfaa893
 AUX gnat-gpl-2017-ustat.patch 1363 BLAKE2B c5b8fb511e84e7df9db96754e5f966d08626c300cdb6de0b124a69e0c9c32158a19669e60bbc649ead0f2ce85c3c6ae8bb5aae11297d164d0c2bce618ea43881 SHA512 4c71913303b8e2bcaeded7303be198b9aa898968da365e6e2a41b555ab144485a55b57ad9949f5c7c07c400fa577795f2b7219006ce553ab6ed3109cca74d67a
 AUX gnat-gpl-2018-gentoo.patch 634 BLAKE2B 949911111848fd4834de4b3a0d93d6f617b4ae05f9911564a01ab377c5715dfe21ec33c94c5d52815ad2a636809ce01b617cd8a2f132783b084bafc6c4265ead SHA512 f4a541780b6d00af32d38b71ce6a39516aff9c2df15429c40d297ebba03ab148786aa0f1218b90aedb36eb36a9c4a490b52883e3830a5e58bfc5d22987c00ece
+AUX gnat-gpl-2019-gentoo.patch 1408 BLAKE2B 5234c542cc33af3c1bcb256fbe266613ec2e9f0b21d143029bf527ee03b4b363b2de7467eb79fadf4c8e8d3f39e589cfa3c0fadee1723e87938c74b8547d5ecf SHA512 2b9f0081d7aae5c71f73ebf43683fde033966288a937769e9b49e21805f31b5f0b4190e31431def58fcc93cd09f9b0e061096cffe61616073612f53d7e3e724b
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
 DIST gcc-4.9-gpl-2016-src.tar.gz 76361760 BLAKE2B 681aac3dd2e04110f58637cc9fe1eb663ce55af16a929a446eb59ce338bec9357e65517890f7fa01d61eec9c5041336722b2b94a5fea27a55ade686fe1fe9fbc SHA512 da1e26b4dbbe0ec634eab4e64d1cdb2632300c24f0885bc72fb57edba6ce29ab92b04eaedd8f8077ea623f1ef1428f53616e8c8d6630328d9790d968b60c67cf
@@ -24,12 +25,16 @@ DIST gcc-6-gpl-2017-src.tar.gz 88045488 BLAKE2B 5df712eadef723df9057653e49d215ce
 DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f28153bf959da1e54307909383efecd2bf0e7e0cc9d9b27529e5f00b2e27132bf5ff6afd2129d061d3b111f9cfe732a874 SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c
 DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
 DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 2f79137e176bff04c4fb17ab863302943588226d5b599dfa1acf0e495111be1c581f4e130f911c312916669c4f2707eec5218601db090d5060248b2fe481d710 SHA512 79f06deca5753251de82a703f4a9698c117706290df779291a5405edb06f1c225d1d2416bda0e67dcd87cc308bf79504e89d4bd8e22aa0eedfbf06d88bc37f33
-DIST gcc-7.3.0-patches-1.6.tar.bz2 11313 BLAKE2B cdb823d73a66949cd73f9ebff50cf1cdbb59f04b439a700c239110d36982d70c8acd219402ce8aea26f848d5067856d9aa54470ea683678bbfe9fe08a9f592d1 SHA512 7670deb57e07a83a05f54d962c0faa36d91d8cf43f9f023d3231983e98768d9f90f2a3c9a95f69853086012474fc336bc47fc4af4ab9337b69c89415ce61c1c4
 DIST gcc-7.3.0-patches-1.8.tar.bz2 14435 BLAKE2B 3e5c1abad56ccd6e0aa7739cb7cd651ec07ef9bf25be554343f1fa0444f251de41bde5fe6f8bb9e85e3f7a5cf8b2b83515647d93d62f338fa7843581fcaff2f8 SHA512 4d9d76b3d47f1af4f23cae15278d165b22065a3d1512323d1e31b5e0cb47e4654733dc43fa11906a3bd18e827621c9a5ec62b73563f8e5ead663c29f7d0d7345
 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
+DIST gcc-8-2019-20190517-18C94-src.tar.gz 95266904 BLAKE2B 8dc1983317517e9d7221ffd3d1c804367c98a7142b3964e6382ee037da2cfebc9e044640549c77905646727e97ba108445b00f36916a65c326e862230608a7dc SHA512 50933d7eab927a2d118e01c5cb85336203544f6fbc3f245a148e952320d6f8452fcd5d355019a144e8af03357d129bb145397506db0a62fddf1f746b6671e7fc
+DIST gcc-8.3.0-patches-1.1.tar.bz2 14430 BLAKE2B c702fbdb18c3c952cdb9adead3a193c948d78a4cb4b041beaa51a06b907fd357bb10a2f8d47d55978ebb08590fd7c9a6ec3df8e7a007173e20a55d251d947c72 SHA512 9e2284f597bab6f78ca24ead358b1f50495aefc9e0a416ace24c94723db7b2fb82d48426876138d00c82bcaf9c2f8b4674885988448dcf16dee1b764face9af4
+DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
 DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd
 DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a
 DIST gcc-interface-7-gpl-2018-src.tar.gz 339461 BLAKE2B e6009c0b287b1cd8f055226e6919c12f2ba08f8ef24101608691b05b70a7fb0ca708e2ecd126499fb84a126436d3841f1a13be0b6d3442ef3bd3871391f8e1d5 SHA512 9dc942a39dd983778756be2951b4c66ac3835bf456dc389f80ffbafdacde4ebcb80720ac9eca8fef8734d6d052c061db37c88dba642d85add10940164d120381
+DIST gcc-interface-8-2019-20190510-18F59-src.tar.gz 352408 BLAKE2B d08867737fd5a2e8aa87e61efff47757b587baff67810eb9193fe72b68578bcb130f0c1491599588d130663d908b9c6c9a604b1352aeccb79e9dd3bfef4b9f61 SHA512 c4a048725517e674cc43b7b72e3b1bdb4f1cf9d81fe3b84dd177a2fda8c7af11c3135e883072b640c8aa351625f49573727c859064683e8b5f096fdbd3990c38
+DIST gnat-2019-20190517-18C94-src.tar.gz 8950160 BLAKE2B ce6b8ca0687b3d345db72a8b3216e67ba706cfd7f6ca98f45ec2ae356d9c5b3a42a4b3aac5e89285871157ddaca3aff1b970934de88f8190d84aff060bf1fc4b SHA512 4d57c97fc1f3d5274e0c4ffa536ec056e7c3f1619010affff008cd07a0bfa638d18fee1705a5dd76f12d168baef85677cc34ef40f5e52fd5292ac886c0d4c5ee
 DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2
 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
@@ -37,6 +42,6 @@ DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a969
 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
 EBUILD gnat-gpl-2016-r3.ebuild 5905 BLAKE2B 421c328830738c064bc1fa5654b82eac90f2abf0204b6699f01721de5f1446c3cb988288e73c338aad5ece6616ce067e9e7e1ff15116a472a0946555b4e31ed8 SHA512 62d29d412290e76a491f24330878dc17cbeb92ddda8693f1ce4bd240947d3e0d3361e05b4973f8b91ff4f1fa06f48f63ea6baa89675782b0363d267a2ff4bda8
 EBUILD gnat-gpl-2017.ebuild 4976 BLAKE2B d1bbf049cc17f778a3d0260fb2394898085415ca87fa59a5f1c349b4c3b62bb5a049214057ae76c75bae57df9f5ed6bd59fd55bf816a4e6a1683a90964b644e5 SHA512 3dbb26da721729e5c65ba905ddc41e8993feaa928546124a0079118435013555b9afd9422f2029ff6ed84ab613e5587c98b5a58d19a691cfe12c73a46cf130a8
-EBUILD gnat-gpl-2018-r1.ebuild 4999 BLAKE2B 3c9bfaaeab7166d326a87301baee8c151462726fcf61af58dbd9921cbfc5dafa78205c0169e2a54f14a568ce1d958980b2d20113daa65ce10cc7a60328ed0d1b SHA512 4daba04ee89a83dbebb325955dd47c54468fd5a33c56370be432553b47a0fd27df408d62b70af4321bad69b9e51463d4e6cfba7f24480704bf4c6b30d01c971a
-EBUILD gnat-gpl-2018-r2.ebuild 5028 BLAKE2B 9bfb2bedb7722c3546d75b98537c99eec45631b5848071756c57e7bb6356ea4af01bd4a26d5d97e3695654a76c109efe660e151e4dc01e01f09bd99cb0b286e6 SHA512 4cb31eeb0346b71d43df23230c69bda628b4ea860e14c08aece33de37af803ee6e7392776eb5c59145d10c57e80adb595e1a81f5f64a9401638fac59559c2578
-MISC metadata.xml 1928 BLAKE2B b1caee350b6656a838a0f83698760edfa7f53d0715a3ce18f443c5bef26827ccf9a858a918a8822b89a2fa70e34cb282ddcd9f0746691a0f10cbda4b368ac1ac SHA512 bd0b8cb4961903f004fb2d5fdd260e6b15936730148d192edf4e59b04c5f1dc991940069edc02b38f859ad1470e16e028c122403043a4f99ba7af753085867fd
+EBUILD gnat-gpl-2018-r2.ebuild 5026 BLAKE2B 5a0c28a977f923aae20af0adc2643797e5e12e9960c263271bc09bf7683d9fe0f1848cc4079a831171d5e18e2a4aaf4bc31d1b5e247a84f9771aba327f0303fd SHA512 f626aaf0b5fa3abdd1e25b781e124692b5aa419d888bf59576c9c4d97d02676ee032fbc77296174bfa30d1d391426030fe530d9f713efe92e3ff75c9b67fec82
+EBUILD gnat-gpl-2019.ebuild 4893 BLAKE2B 4063f84d350626777942a4e7551f2c838283815f020ae4e783b2c68310d0df62c3a4c06a7e556a39216e374c1d577560650d4bbfd930e870888d9d43843254bb SHA512 68444095e4f48240314bb556468e16894cb7e6d1105bfb2fd0065b917b4ccf669d09acd25e0ade8ea96ede2e78ac55da9d249bcaab742dfee00b4b8b2f9d840e
+MISC metadata.xml 1997 BLAKE2B ae2e0322765ddd545865ce131fe469fd871666d318f0774bea45dddc02319a7508702214a4ffeb0a10cf5be64ee2ce304aba2c559ac59960f9de80abf9d2ff36 SHA512 a7f75583b2337680a28b2d9d4761744c3c30d14de25cf4e3f5b337ffdcea3e255a025e2894d2f1478436f7823b9264f8df6ab2c490ce3a44b028d5c6217be6d6
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2019-gentoo.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2019-gentoo.patch
new file mode 100644
index 000000000000..36befaafc0f8
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2019-gentoo.patch
@@ -0,0 +1,42 @@
+--- a/patch/15_all_disable-systemtap-switch.patch	2019-05-28 09:25:40.556754095 +0200
++++ b/patch/15_all_disable-systemtap-switch.patch	2019-05-28 09:25:00.731426775 +0200
+@@ -42,8 +42,8 @@
+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+    lt_status=$lt_dlunknown
+    cat > conftest.$ac_ext <<_LT_EOF
+--#line 18451 "configure"
+-+#line 18453 "configure"
++-#line 18497 "configure"
+++#line 18499 "configure"
+  #include "confdefs.h"
+  
+  #if HAVE_DLFCN_H
+@@ -51,8 +51,8 @@
+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+    lt_status=$lt_dlunknown
+    cat > conftest.$ac_ext <<_LT_EOF
+--#line 18557 "configure"
+-+#line 18559 "configure"
++-#line 18603 "configure"
+++#line 18605 "configure"
+  #include "confdefs.h"
+  
+  #if HAVE_DLFCN_H
+--- a/gcc-8-2019-20190517-18C94-src/gcc/ada/osint.adb	2017-03-10 21:58:02.600710156 +0100
++++ b/gcc-8-2019-20190517-18C94-src/gcc/ada/osint.adb	2017-03-10 21:59:38.033983293 +0100
+@@ -2229,14 +2229,11 @@
+       for J in Start_Of_Prefix .. Name_Len - Prog'Length + 1 loop
+          if Name_Buffer (J .. J + Prog'Length - 1) = Prog then
+             End_Of_Prefix := J - 1;
++            Start_Of_Suffix := J + Prog'Length;
+             exit;
+          end if;
+       end loop;
+ 
+-      if End_Of_Prefix > 1 then
+-         Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1;
+-      end if;
+-
+       --  Create the new program name
+ 
+       return new String'
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
deleted file mode 100644
index 997ac8068954..000000000000
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.6"
-
-TOOLCHAIN_GCC_PV=7.3.0
-GCC_CONFIG_VER=7.3.1
-
-inherit eutils toolchain-funcs toolchain
-
-REL=7
-MYP=gcc-${REL}-gpl-${PV}-src
-BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
-BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
-
-DESCRIPTION="GNAT Ada Compiler - GPL version"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI+="
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5
-		-> ${P}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7
-		-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6
-		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
-	bootstrap? (
-		amd64? (
-			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
-			${BTSTRP_AMD64}.tar.gz
-		)
-		x86? (
-			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
-			${BTSTRP_X86}.tar.gz
-		)
-	)"
-
-LICENSE+=" GPL-2 GPL-3"
-KEYWORDS="amd64 x86"
-IUSE="+bootstrap"
-
-RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}"
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=sys-devel/binutils-2.20"
-
-S="${WORKDIR}"/${MYP}
-PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
-
-pkg_setup() {
-	toolchain_pkg_setup
-
-	if use amd64; then
-		BTSTRP=${BTSTRP_AMD64}
-	else
-		BTSTRP=${BTSTRP_X86}
-	fi
-
-	if use bootstrap; then
-		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
-	else
-		GCC=${ADA:-$(tc-getCC)}
-	fi
-
-	gnatbase=$(basename ${GCC})
-	gnatpath=$(dirname ${GCC})
-
-	GNATMAKE=${gnatbase/gcc/gnatmake}
-	if [[ ${gnatpath} != "." ]] ; then
-		GNATMAKE="${gnatpath}/${GNATMAKE}"
-	fi
-}
-
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	GCC_A_FAKEIT="
-		${P}-src.tar.gz
-		${MYP}.tar.gz
-		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
-	if use bootstrap; then
-		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
-	fi
-
-	toolchain_src_unpack
-	if use bootstrap; then
-		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
-	fi
-}
-
-src_prepare() {
-	CC=${GCC}
-	CXX="${gnatbase/gcc/g++}"
-	GNATBIND="${gnatbase/gcc/gnatbind}"
-	GNATLINK="${gnatbase/gcc/gnatlink}"
-	GNATLS="${gnatbase/gcc/gnatls}"
-	if [[ ${gnatpath} != "." ]] ; then
-		CXX="${gnatpath}/${CXX}"
-		GNATBIND="${gnatpath}/${GNATBIND}"
-		GNATLINK="${gnatpath}/${GNATLINK}"
-		GNATLS="${gnatpath}/${GNATLS}"
-	fi
-	mkdir bin || die
-	ln -s $(which ${GCC}) bin/gcc || die
-	ln -s $(which ${CXX}) bin/g++ || die
-	ln -s $(which ${GNATMAKE}) bin/gnatmake || die
-	ln -s $(which ${GNATBIND}) bin/gnatbind || die
-	ln -s $(which ${GNATLINK}) bin/gnatlink || die
-	ln -s $(which ${GNATLS}) bin/gnatls || die
-
-	cd ..
-	mv ${P}-src/src/ada ${MYP}/gcc/ || die
-	mv gcc-interface-${REL}-gpl-${PV}-src ${MYP}/gcc/ada/gcc-interface || die
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	rm patch/91_all_bmi-i386-PR-target-81763.patch || die
-	rm patch/93_all_copy-constructible-fix.patch || die
-	rm patch/95*.patch || die
-	cd -
-	sed -i \
-		-e 's:$(P) ::g' \
-		gcc/ada/gcc-interface/Makefile.in \
-		|| die "sed failed"
-	toolchain_src_prepare
-}
-
-src_configure() {
-	export PATH=${PWD}/bin:${PATH}
-	local trueGCC_BRANCH_VER=${GCC_BRANCH_VER}
-	GCC_BRANCH_VER=$(gcc-version)
-	downgrade_arch_flags
-	GCC_BRANCH_VER=${trueGCC_BRANCH_VER}
-	toolchain_src_configure \
-		--enable-languages=ada \
-		--disable-libada
-}
-
-src_compile() {
-	unset ADAFLAGS
-	toolchain_src_compile
-	gcc_do_make "-C gcc gnatlib-shared"
-	ln -s gcc ../build/prev-gcc || die
-	ln -s ${CHOST} ../build/prev-${CHOST} || die
-	gcc_do_make "-C gcc gnattools"
-}
-
-src_install() {
-	toolchain_src_install
-	cd "${D}"${BINPATH}
-	for x in gnat*; do
-		# For some reason, g77 gets made instead of ${CTARGET}-g77...
-		# this should take care of that
-		if [[ -f ${x} ]] ; then
-			# In case they're hardlinks, clear out the target first
-			# otherwise the mv below will complain.
-			rm -f ${CTARGET}-${x}
-			mv ${x} ${CTARGET}-${x}
-		fi
-
-		if [[ -f ${CTARGET}-${x} ]] ; then
-			if ! is_crosscompile ; then
-				ln -sf ${CTARGET}-${x} ${x}
-				dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
-					/usr/bin/${x}-${GCC_CONFIG_VER}
-			fi
-			# Create versioned symlinks
-			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
-				/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
-		fi
-
-		if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
-			rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
-			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
-		fi
-	done
-}
-
-pkg_postinst () {
-	toolchain_pkg_postinst
-	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
-	einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}"
-	einfo "Even if the c/c++ compilers are using almost the same patched"
-	einfo "source as the sys-devel/gcc package its use is not extensively"
-	einfo "tested, and not supported for updating your system, except for ada"
-	einfo "related packages"
-}
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r2.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r2.ebuild
index 68a8127b6a55..7dfa7ce108dd 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r2.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r2.ebuild
@@ -36,7 +36,7 @@ SRC_URI+="
 	)"
 
 LICENSE+=" GPL-2 GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+bootstrap"
 
 RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}"
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019.ebuild
new file mode 100644
index 000000000000..9299976fecff
--- /dev/null
+++ b/dev-lang/gnat-gpl/gnat-gpl-2019.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PATCH_VER="1.1"
+
+TOOLCHAIN_GCC_PV=8.3.0
+GCC_CONFIG_VER=8.3.1
+
+inherit toolchain-funcs toolchain
+
+REL=8
+MYP=gcc-${REL}-${PV}-20190517-18C94-src
+GNATDIR=gnat-${PV}-20190517-18C94-src
+INTFDIR=gcc-interface-${REL}-${PV}-20190510-18F59-src
+BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
+BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
+
+DESCRIPTION="GNAT Ada Compiler - GPL version"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI+="
+	http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49
+		-> ${GNATDIR}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049
+		-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50
+		-> ${INTFDIR}.tar.gz
+	bootstrap? (
+		amd64? (
+			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
+			${BTSTRP_AMD64}.tar.gz
+		)
+		x86? (
+			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
+			${BTSTRP_X86}.tar.gz
+		)
+	)"
+
+LICENSE+=" GPL-2 GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bootstrap"
+
+RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}"
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=sys-devel/binutils-2.20"
+
+S="${WORKDIR}"/${MYP}
+PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+
+pkg_setup() {
+	toolchain_pkg_setup
+
+	if use amd64; then
+		BTSTRP=${BTSTRP_AMD64}
+	else
+		BTSTRP=${BTSTRP_X86}
+	fi
+
+	if use bootstrap; then
+		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
+	else
+		GCC=${ADA:-$(tc-getCC)}
+	fi
+
+	gnatbase=$(basename ${GCC})
+	gnatpath=$(dirname ${GCC})
+
+	GNATMAKE=${gnatbase/gcc/gnatmake}
+	if [[ ${gnatpath} != "." ]] ; then
+		GNATMAKE="${gnatpath}/${GNATMAKE}"
+	fi
+}
+
+src_unpack() {
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag"
+		die "ada compiler not available"
+	fi
+
+	GCC_A_FAKEIT="
+		${MYP}.tar.gz
+		${GNATDIR}.tar.gz
+		${INTFDIR}.tar.gz"
+	if use bootstrap; then
+		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
+	fi
+
+	toolchain_src_unpack
+	if use bootstrap; then
+		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
+	fi
+}
+
+src_prepare() {
+	CC=${GCC}
+	CXX="${gnatbase/gcc/g++}"
+	GNATBIND="${gnatbase/gcc/gnatbind}"
+	GNATLINK="${gnatbase/gcc/gnatlink}"
+	GNATLS="${gnatbase/gcc/gnatls}"
+	if [[ ${gnatpath} != "." ]] ; then
+		CXX="${gnatpath}/${CXX}"
+		GNATBIND="${gnatpath}/${GNATBIND}"
+		GNATLINK="${gnatpath}/${GNATLINK}"
+		GNATLS="${gnatpath}/${GNATLS}"
+	fi
+	mkdir bin || die
+	ln -s $(which ${GCC}) bin/gcc || die
+	ln -s $(which ${CXX}) bin/g++ || die
+	ln -s $(which ${GNATMAKE}) bin/gnatmake || die
+	ln -s $(which ${GNATBIND}) bin/gnatbind || die
+	ln -s $(which ${GNATLINK}) bin/gnatlink || die
+	ln -s $(which ${GNATLS}) bin/gnatls || die
+
+	cd ..
+	mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die
+	mv ${INTFDIR} ${MYP}/gcc/ada/gcc-interface || die
+	eapply "${FILESDIR}"/${P}-gentoo.patch
+	rm patch/27*.patch || die
+	rm patch/28*.patch || die
+	cd -
+	sed -i \
+		-e 's:$(P) ::g' \
+		gcc/ada/gcc-interface/Makefile.in \
+		|| die "sed failed"
+	toolchain_src_prepare
+}
+
+src_configure() {
+	export PATH=${PWD}/bin:${PATH}
+	local trueGCC_BRANCH_VER=${GCC_BRANCH_VER}
+	GCC_BRANCH_VER=$(gcc-version)
+	downgrade_arch_flags
+	GCC_BRANCH_VER=${trueGCC_BRANCH_VER}
+	toolchain_src_configure \
+		--enable-languages=ada \
+		--disable-libada
+}
+
+src_compile() {
+	unset ADAFLAGS
+	toolchain_src_compile
+	gcc_do_make "-C gcc gnatlib-shared"
+	ln -s gcc ../build/prev-gcc || die
+	ln -s ${CHOST} ../build/prev-${CHOST} || die
+	gcc_do_make "-C gcc gnattools"
+}
+
+src_install() {
+	toolchain_src_install
+	cd "${D}"${BINPATH}
+	for x in gnat*; do
+		# For some reason, g77 gets made instead of ${CTARGET}-g77...
+		# this should take care of that
+		if [[ -f ${x} ]] ; then
+			# In case they're hardlinks, clear out the target first
+			# otherwise the mv below will complain.
+			rm -f ${CTARGET}-${x}
+			mv ${x} ${CTARGET}-${x}
+		fi
+
+		if [[ -f ${CTARGET}-${x} ]] ; then
+			if ! is_crosscompile ; then
+				ln -sf ${CTARGET}-${x} ${x}
+				dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+					/usr/bin/${x}-${GCC_CONFIG_VER}
+			fi
+			# Create versioned symlinks
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
+		fi
+
+		if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
+			rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
+			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
+		fi
+	done
+}
+
+pkg_postinst () {
+	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
+	einfo "The compiler binary is ${CTARGET}-gcc-${GCC_CONFIG_VER}"
+	einfo "Even if the c/c++ compilers are using almost the same patched"
+	einfo "source as the sys-devel/gcc package its use is not extensively"
+	einfo "tested, and not supported for updating your system, except for ada"
+	einfo "related packages"
+}
diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml
index 1e9066797159..f71e77219b25 100644
--- a/dev-lang/gnat-gpl/metadata.xml
+++ b/dev-lang/gnat-gpl/metadata.xml
@@ -29,6 +29,7 @@
 		<flag name="regression-test">Run the testsuite and install the results
 			(requires FEATURES=test)</flag>
 		<flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag>
+		<flag name="systemtap">enable systemtap static probe points</flag>
 		<flag name="ssp">Build packages with stack smashing protector on by default</flag>
 		<flag name="vtv">Build support for virtual table verification (a C++ hardening feature)</flag>
 	</use>
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 180007086f56..72b12c75f166 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -10,24 +10,8 @@ DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 BLAKE2B 7a28ec5a381369c4e9415c8
 DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324bbb30a383d599e31a0d2093d24797dbcd0e799a662a3589dbb87d2f5dd16df07c4cf8f1e444e87b540ec732746bb025dc9271f8 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
 DIST go1.11.10.src.tar.gz 21113259 BLAKE2B 2dc704ea092fb4f4bb6c379ecb5104eb9dc5657750fb046810f210f38191d494c926e7a3661f67ea09c3d4090676485ba346daaa6dfe9eebbf3d69acbacea3b8 SHA512 8fab3b96d1c47b8f75b135da9d1a104c485098f6f42041b69336216a57cfd49c0785c8cfa7b016020ded5f0aadd279d7a76feeca33038321a4930139aee28cc8
-DIST go1.11.6.src.tar.gz 21113406 BLAKE2B e7372e9bf6190295176c66a328b3e31f9201776f16f1165136e24bdaf5c514d7895dd5880514fa054ee958ed5ff96814de9a555e47b3f6dddd388d1e57c0d05f SHA512 bc29df69a08a4e9e703de72b5eda5f2d63b78f18f3e7a1173eae5c6dd767f29f1b865a2fc3f692e15277df2d45e74ee17875b275eb3fc50aac2b88082e618bf5
-DIST go1.11.7.src.tar.gz 21113223 BLAKE2B e58a947a43e8dbabbe6d4dc1384239b01160e4d9cc88ed866c8d6e5a0ef66dd89203b9fb95c14c5fcc50ad47f75b17440cf1df34cb793a435d7744e630845307 SHA512 26bc2a3ab51ebe1179cd83897dae6ca17f30126189bf2c0b60060a25f3f22e72bcda383055825a9151948f074a103a177ab5550f5c2d088448bdf5455448061e
-DIST go1.11.8.src.tar.gz 21113433 BLAKE2B 272ef36664a180640f14afba18d2f715d5a335134b33cea449d14fd3b568c2322bbbac7aab254987fbd7dcf3d486dc8b1f62f14577ae2e57b21de1720d0f29a7 SHA512 00b57b0ebbbf53f4de718bf40e5dfdaf57cafa9932917d22e9723b5a33a62d335013ab49753d98f8fe30c71daca95c7addd921825fe0c3885942b342773050cc
-DIST go1.11.9.src.tar.gz 21113156 BLAKE2B 330ff9456dbffd3254187ea37a1801b9abacbec2033e9afefbf09d0554e640de68861aedb0229199ac81211316c080a7a98bad641a13bc7f106e2a3f0c7e8a05 SHA512 97593b382ae49388dfc1178dd2438888dc24fba27d3267fd772ecbe10c35f44b1cd3a0987219cca3dd38dcc23ce2c9669fd7da26cc2e5719e2ce77650f877156
-DIST go1.12.1.src.tar.gz 21963082 BLAKE2B fd9c0ca19e6bd285c52034a88df1a58f96b957483362fac2e0c0f2a9dddde0543e7569d76fb93eff473774d152db361bfe9bdd354d80412c71ee5c4162010346 SHA512 b3fdfb874e6e0e0b50458085724fbd8e8b9be212df3f777b97db340aa3b80f32ee08d646a57a8a7d52ff6f19657d884dd25018c866c6173473aafa20a58f1975
-DIST go1.12.2.src.tar.gz 21965624 BLAKE2B 9f4fbe62b37ccaf62517b2e5df3e1ada0155b7cb79067c2a74100df6d96ba89b0e372b5f1b1037b0cf98ea9f52623de00055793d011e5e39e92773a0cd87e41d SHA512 f7b8ffe8d3de7b456ba595deece5b092db8645e95d901826c33428af0151731921437222dcb5d52c9d937da4ebeb3192c30aa17052aa88c9e425e96cac2d79bb
-DIST go1.12.3.src.tar.gz 21965718 BLAKE2B 226b1028eb47cee8ccc0b72130a098a65211cf0e54030fe626b6b9cf1c16993e0a9677a443c07abd997e0f2bfbc1711c703a40869ae1ecbb8b8dfa0fbf31c0b2 SHA512 bd33e958f2e8550da14afc0576928d00d2b8ecac569ddcf3551e44a342ce78ad3934e36109cbe6c15d31c55448ccc092f6e1fbf82685d6702402ab67106a1424
-DIST go1.12.4.src.tar.gz 21965966 BLAKE2B 6a6d2712769d9195795ca14a7c33a4e025c572317c0a9118f4f610c56f907e0eec99d2ecca37cc6e2005a42b842080d93895d4dfed206f23db32f3b848c9c57f SHA512 45ced5fc23a2786a652dbe66de7bbc039efaba29d884d797d6d0a6eaffb61dfb897905f0733ce74704f8760b1fdedb9963e26c1d9d8dee4a4676e74da5df8792
 DIST go1.12.5.src.tar.gz 21971348 BLAKE2B 7de8db4a6c4cd9e1883fbf28357fe99ad9f43f3e015b2063347b1961df128760b720c0dd5549997c7080e6cf0036406430419d4bf033323f26017d3629ad6067 SHA512 ce64105ff71615f9d235cc7c8656b6409fc40cc90d15a28d355fadd9072d2eab842af379dd8bba0f1181715753143e4a07491e0f9e5f8df806327d7c95a34fae
-EBUILD go-1.11.10.ebuild 6449 BLAKE2B cf4db759cb9cd1f825344f2255c813045bcc25e15155d64c7765891ed6f674ebe707b4c25301a96f3c1f4c06bdde93ff7e0ed9a9aec384dc8e1fccbc8c0a2b8e SHA512 0cc8cdd9ec1acc54a40b6bb3382c7f7f900790378ba34d073de54d6c4e59126fa21abff090469a5ff7db0921376a2de76c8ce53588c6f89e64a0cb48fd3237e3
-EBUILD go-1.11.6.ebuild 5963 BLAKE2B 11728beb9ff7ab042631ff558e14e3214b62a3eef6f4f7fd6671877904c8e58046ed9e6be6b91d486002e720a9e175ca7339aac599a41f05dd3d587ed69da179 SHA512 6f7dff5a3ed05a56ecb88121cc94d350b8e9cf8535727e83dac06183dfe8242b1a6bb946491e3ee01232aeb942bd65caac95d2920dd11ba09653a04df15c0a23
-EBUILD go-1.11.7.ebuild 5966 BLAKE2B 3c8cdf22159162824418120e5807e703918d19b4791fdf08b9b7800978b251aecd8da23517149ce88e73cbc23ffed1141afcd10de690eba9b24e52e4302c8505 SHA512 f13b7ae8102a1bf9a7dca556a3405ee1a9b314d36953718cf110f14e3060dadd8b9703096b56f42c98bae7dc18fabfc22f0e128deec8a43af02c4114026d440a
-EBUILD go-1.11.8.ebuild 5966 BLAKE2B 3c8cdf22159162824418120e5807e703918d19b4791fdf08b9b7800978b251aecd8da23517149ce88e73cbc23ffed1141afcd10de690eba9b24e52e4302c8505 SHA512 f13b7ae8102a1bf9a7dca556a3405ee1a9b314d36953718cf110f14e3060dadd8b9703096b56f42c98bae7dc18fabfc22f0e128deec8a43af02c4114026d440a
-EBUILD go-1.11.9.ebuild 6449 BLAKE2B cf4db759cb9cd1f825344f2255c813045bcc25e15155d64c7765891ed6f674ebe707b4c25301a96f3c1f4c06bdde93ff7e0ed9a9aec384dc8e1fccbc8c0a2b8e SHA512 0cc8cdd9ec1acc54a40b6bb3382c7f7f900790378ba34d073de54d6c4e59126fa21abff090469a5ff7db0921376a2de76c8ce53588c6f89e64a0cb48fd3237e3
-EBUILD go-1.12.1.ebuild 5963 BLAKE2B 11728beb9ff7ab042631ff558e14e3214b62a3eef6f4f7fd6671877904c8e58046ed9e6be6b91d486002e720a9e175ca7339aac599a41f05dd3d587ed69da179 SHA512 6f7dff5a3ed05a56ecb88121cc94d350b8e9cf8535727e83dac06183dfe8242b1a6bb946491e3ee01232aeb942bd65caac95d2920dd11ba09653a04df15c0a23
-EBUILD go-1.12.2.ebuild 5966 BLAKE2B 3c8cdf22159162824418120e5807e703918d19b4791fdf08b9b7800978b251aecd8da23517149ce88e73cbc23ffed1141afcd10de690eba9b24e52e4302c8505 SHA512 f13b7ae8102a1bf9a7dca556a3405ee1a9b314d36953718cf110f14e3060dadd8b9703096b56f42c98bae7dc18fabfc22f0e128deec8a43af02c4114026d440a
-EBUILD go-1.12.3.ebuild 5966 BLAKE2B 3c8cdf22159162824418120e5807e703918d19b4791fdf08b9b7800978b251aecd8da23517149ce88e73cbc23ffed1141afcd10de690eba9b24e52e4302c8505 SHA512 f13b7ae8102a1bf9a7dca556a3405ee1a9b314d36953718cf110f14e3060dadd8b9703096b56f42c98bae7dc18fabfc22f0e128deec8a43af02c4114026d440a
-EBUILD go-1.12.4.ebuild 6449 BLAKE2B cf4db759cb9cd1f825344f2255c813045bcc25e15155d64c7765891ed6f674ebe707b4c25301a96f3c1f4c06bdde93ff7e0ed9a9aec384dc8e1fccbc8c0a2b8e SHA512 0cc8cdd9ec1acc54a40b6bb3382c7f7f900790378ba34d073de54d6c4e59126fa21abff090469a5ff7db0921376a2de76c8ce53588c6f89e64a0cb48fd3237e3
-EBUILD go-1.12.5.ebuild 6449 BLAKE2B cf4db759cb9cd1f825344f2255c813045bcc25e15155d64c7765891ed6f674ebe707b4c25301a96f3c1f4c06bdde93ff7e0ed9a9aec384dc8e1fccbc8c0a2b8e SHA512 0cc8cdd9ec1acc54a40b6bb3382c7f7f900790378ba34d073de54d6c4e59126fa21abff090469a5ff7db0921376a2de76c8ce53588c6f89e64a0cb48fd3237e3
+EBUILD go-1.11.10.ebuild 6448 BLAKE2B c7196c5172a0aaaaa707b4557caf4bc093241d76b14ffb22980f130c47dfb9abc041afb6bb6a22660d0699464eff630a4c9974aac7756d7e6514f2b22e7cadcb SHA512 aa8993afc41fa784ad67e2e8bab4a3edc5c178eecc66fd2b14285b739235c9eac0b44abee85de004c835df9807be35799fcfc9cde1a92d32bccc75c2e73f8085
+EBUILD go-1.12.5.ebuild 6448 BLAKE2B c7196c5172a0aaaaa707b4557caf4bc093241d76b14ffb22980f130c47dfb9abc041afb6bb6a22660d0699464eff630a4c9974aac7756d7e6514f2b22e7cadcb SHA512 aa8993afc41fa784ad67e2e8bab4a3edc5c178eecc66fd2b14285b739235c9eac0b44abee85de004c835df9807be35799fcfc9cde1a92d32bccc75c2e73f8085
 EBUILD go-9999.ebuild 6089 BLAKE2B 38d7288bbc5cfdf11a6648a0386e600a67564424c782d736fbe4880a13ffd5bfb5eed075a5f6355d0dfb338d4429745b5250af56fab64c9ad9f25dde0f4a87e4 SHA512 8b31e38038d3315f3aea7d0d364f661de247f434dc80abb1feebe3e3418b03c47fbf565384417a4316239991cdb2059c4fe542e4d4c43eb4dd251f53e4e81e6f
 MISC metadata.xml 663 BLAKE2B fc92966e1b4a155b4d442842988d0404c0148b029d187ab7294d49dabad771296d63ca3184128ac27cea4e74e7d6cfc8852084ca8f1d15a1d0755586a0bf68de SHA512 f67b7e312cfb2a896552ae73e835d53ffbb0a7c71c30f0a7cb44c65e2753055e185e7a5c48e2cfff33a42609629cc3c32ee56a9d8f61d8429798c1e8424e36bf
diff --git a/dev-lang/go/go-1.11.10.ebuild b/dev-lang/go/go-1.11.10.ebuild
index a53df7c09567..b48fe53d64d1 100644
--- a/dev-lang/go/go-1.11.10.ebuild
+++ b/dev-lang/go/go-1.11.10.ebuild
@@ -37,7 +37,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-lang/go/go-1.11.6.ebuild b/dev-lang/go/go-1.11.6.ebuild
deleted file mode 100644
index 292a2af56193..000000000000
--- a/dev-lang/go/go-1.11.6.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_URI="
-	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
-"
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
-		# The upstream tests fail under portage but pass if the build is
-		# run according to their documentation [1].
-		# I am restricting the tests on released versions until this is
-		# solved.
-		# [1] https://golang.org/issues/18442
-		RESTRICT="test"
-		;;
-	esac
-esac
-
-# If gccgo is not being used to build Go, there is no way to know the
-# architecture or operating system of the build machine, so we need to
-# download all of our bootstrap archives to allow this ebuild to work
-# under crossdev.
-#
-# https://bugs.gentoo.org/671394
-SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo"
-
-BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="
-	usr/lib/go/src/debug/elf/testdata/*.obj
-	usr/lib/go/src/*.gox
-	"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-}
-
-src_unpack()
-{
-	if [[ ${PV} = 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
-	if use gccgo; then
-		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
-		[[ -x ${go_binary} ]] || go_binary=$(
-			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
-				sort -V | tail -n1)
-		[[ -x ${go_binary} ]] ||
-			die "go-$(gcc-major-version): command not found"
-		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
-	fi
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.11.7.ebuild b/dev-lang/go/go-1.11.7.ebuild
deleted file mode 100644
index 4cb21b53d193..000000000000
--- a/dev-lang/go/go-1.11.7.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_URI="
-	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
-"
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
-		# The upstream tests fail under portage but pass if the build is
-		# run according to their documentation [1].
-		# I am restricting the tests on released versions until this is
-		# solved.
-		# [1] https://golang.org/issues/18442
-		RESTRICT="test"
-		;;
-	esac
-esac
-
-# If gccgo is not being used to build Go, there is no way to know the
-# architecture or operating system of the build machine, so we need to
-# download all of our bootstrap archives to allow this ebuild to work
-# under crossdev.
-#
-# https://bugs.gentoo.org/671394
-SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo"
-
-BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="
-	usr/lib/go/src/debug/elf/testdata/*.obj
-	usr/lib/go/src/*.gox
-	"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-}
-
-src_unpack()
-{
-	if [[ ${PV} = 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
-	if use gccgo; then
-		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
-		[[ -x ${go_binary} ]] || go_binary=$(
-			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
-				sort -V | tail -n1)
-		[[ -x ${go_binary} ]] ||
-			die "go-$(gcc-major-version): command not found"
-		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
-	fi
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.11.8.ebuild b/dev-lang/go/go-1.11.8.ebuild
deleted file mode 100644
index 4cb21b53d193..000000000000
--- a/dev-lang/go/go-1.11.8.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_URI="
-	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
-"
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
-		# The upstream tests fail under portage but pass if the build is
-		# run according to their documentation [1].
-		# I am restricting the tests on released versions until this is
-		# solved.
-		# [1] https://golang.org/issues/18442
-		RESTRICT="test"
-		;;
-	esac
-esac
-
-# If gccgo is not being used to build Go, there is no way to know the
-# architecture or operating system of the build machine, so we need to
-# download all of our bootstrap archives to allow this ebuild to work
-# under crossdev.
-#
-# https://bugs.gentoo.org/671394
-SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo"
-
-BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="
-	usr/lib/go/src/debug/elf/testdata/*.obj
-	usr/lib/go/src/*.gox
-	"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-}
-
-src_unpack()
-{
-	if [[ ${PV} = 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
-	if use gccgo; then
-		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
-		[[ -x ${go_binary} ]] || go_binary=$(
-			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
-				sort -V | tail -n1)
-		[[ -x ${go_binary} ]] ||
-			die "go-$(gcc-major-version): command not found"
-		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
-	fi
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.11.9.ebuild b/dev-lang/go/go-1.11.9.ebuild
deleted file mode 100644
index a53df7c09567..000000000000
--- a/dev-lang/go/go-1.11.9.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_URI="
-	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
-"
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
-		# The upstream tests fail under portage but pass if the build is
-		# run according to their documentation [1].
-		# I am restricting the tests on released versions until this is
-		# solved.
-		# [1] https://golang.org/issues/18442
-		RESTRICT="test"
-		;;
-	esac
-esac
-
-# If gccgo or a previously installed version of dev-lang/go is not being
-# used to build Go, there is no way to know the architecture or operating system
-# of the build machine, so we need to download all of our bootstrap
-# archives to allow this ebuild to work under crossdev.
-#
-# https://bugs.gentoo.org/671394
-SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )"
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo system-bootstrap"
-
-BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="
-	usr/lib/go/src/debug/elf/testdata/*.obj
-	usr/lib/go/src/*.gox
-	"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-	[[ ${MERGE_TYPE} != binary ]] &&
-		use system-bootstrap && ! has_version "dev-lang/go" &&
-		die "dev-lang/go must be installed to use the system-bootstrap use flag"
-}
-
-src_unpack()
-{
-	if [[ ${PV} = 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack "go${MY_PV}.src.tar.gz"
-	fi
-	use gccgo || use system-bootstrap ||
-		unpack "go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-${BOOTSTRAP_VERSION}.tbz"
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
-	if use gccgo; then
-		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
-		[[ -x ${go_binary} ]] || go_binary=$(
-			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
-				sort -V | tail -n1)
-		[[ -x ${go_binary} ]] ||
-			die "go-$(gcc-major-version): command not found"
-		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
-	elif use system-bootstrap; then
-		export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go
-	fi
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.12.1.ebuild b/dev-lang/go/go-1.12.1.ebuild
deleted file mode 100644
index 292a2af56193..000000000000
--- a/dev-lang/go/go-1.12.1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_URI="
-	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
-"
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
-		# The upstream tests fail under portage but pass if the build is
-		# run according to their documentation [1].
-		# I am restricting the tests on released versions until this is
-		# solved.
-		# [1] https://golang.org/issues/18442
-		RESTRICT="test"
-		;;
-	esac
-esac
-
-# If gccgo is not being used to build Go, there is no way to know the
-# architecture or operating system of the build machine, so we need to
-# download all of our bootstrap archives to allow this ebuild to work
-# under crossdev.
-#
-# https://bugs.gentoo.org/671394
-SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo"
-
-BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="
-	usr/lib/go/src/debug/elf/testdata/*.obj
-	usr/lib/go/src/*.gox
-	"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-}
-
-src_unpack()
-{
-	if [[ ${PV} = 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
-	if use gccgo; then
-		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
-		[[ -x ${go_binary} ]] || go_binary=$(
-			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
-				sort -V | tail -n1)
-		[[ -x ${go_binary} ]] ||
-			die "go-$(gcc-major-version): command not found"
-		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
-	fi
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.12.2.ebuild b/dev-lang/go/go-1.12.2.ebuild
deleted file mode 100644
index 4cb21b53d193..000000000000
--- a/dev-lang/go/go-1.12.2.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_URI="
-	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
-"
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
-		# The upstream tests fail under portage but pass if the build is
-		# run according to their documentation [1].
-		# I am restricting the tests on released versions until this is
-		# solved.
-		# [1] https://golang.org/issues/18442
-		RESTRICT="test"
-		;;
-	esac
-esac
-
-# If gccgo is not being used to build Go, there is no way to know the
-# architecture or operating system of the build machine, so we need to
-# download all of our bootstrap archives to allow this ebuild to work
-# under crossdev.
-#
-# https://bugs.gentoo.org/671394
-SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo"
-
-BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="
-	usr/lib/go/src/debug/elf/testdata/*.obj
-	usr/lib/go/src/*.gox
-	"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-}
-
-src_unpack()
-{
-	if [[ ${PV} = 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
-	if use gccgo; then
-		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
-		[[ -x ${go_binary} ]] || go_binary=$(
-			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
-				sort -V | tail -n1)
-		[[ -x ${go_binary} ]] ||
-			die "go-$(gcc-major-version): command not found"
-		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
-	fi
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.12.3.ebuild b/dev-lang/go/go-1.12.3.ebuild
deleted file mode 100644
index 4cb21b53d193..000000000000
--- a/dev-lang/go/go-1.12.3.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_URI="
-	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
-"
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
-		# The upstream tests fail under portage but pass if the build is
-		# run according to their documentation [1].
-		# I am restricting the tests on released versions until this is
-		# solved.
-		# [1] https://golang.org/issues/18442
-		RESTRICT="test"
-		;;
-	esac
-esac
-
-# If gccgo is not being used to build Go, there is no way to know the
-# architecture or operating system of the build machine, so we need to
-# download all of our bootstrap archives to allow this ebuild to work
-# under crossdev.
-#
-# https://bugs.gentoo.org/671394
-SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo"
-
-BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="
-	usr/lib/go/src/debug/elf/testdata/*.obj
-	usr/lib/go/src/*.gox
-	"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-}
-
-src_unpack()
-{
-	if [[ ${PV} = 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
-	if use gccgo; then
-		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
-		[[ -x ${go_binary} ]] || go_binary=$(
-			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
-				sort -V | tail -n1)
-		[[ -x ${go_binary} ]] ||
-			die "go-$(gcc-major-version): command not found"
-		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
-	fi
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.12.4.ebuild b/dev-lang/go/go-1.12.4.ebuild
deleted file mode 100644
index a53df7c09567..000000000000
--- a/dev-lang/go/go-1.12.4.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_URI="
-	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
-"
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
-		# The upstream tests fail under portage but pass if the build is
-		# run according to their documentation [1].
-		# I am restricting the tests on released versions until this is
-		# solved.
-		# [1] https://golang.org/issues/18442
-		RESTRICT="test"
-		;;
-	esac
-esac
-
-# If gccgo or a previously installed version of dev-lang/go is not being
-# used to build Go, there is no way to know the architecture or operating system
-# of the build machine, so we need to download all of our bootstrap
-# archives to allow this ebuild to work under crossdev.
-#
-# https://bugs.gentoo.org/671394
-SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )"
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo system-bootstrap"
-
-BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="
-	usr/lib/go/src/debug/elf/testdata/*.obj
-	usr/lib/go/src/*.gox
-	"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-	[[ ${MERGE_TYPE} != binary ]] &&
-		use system-bootstrap && ! has_version "dev-lang/go" &&
-		die "dev-lang/go must be installed to use the system-bootstrap use flag"
-}
-
-src_unpack()
-{
-	if [[ ${PV} = 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack "go${MY_PV}.src.tar.gz"
-	fi
-	use gccgo || use system-bootstrap ||
-		unpack "go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-${BOOTSTRAP_VERSION}.tbz"
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
-	if use gccgo; then
-		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
-		[[ -x ${go_binary} ]] || go_binary=$(
-			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
-				sort -V | tail -n1)
-		[[ -x ${go_binary} ]] ||
-			die "go-$(gcc-major-version): command not found"
-		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
-	elif use system-bootstrap; then
-		export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go
-	fi
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.12.5.ebuild b/dev-lang/go/go-1.12.5.ebuild
index a53df7c09567..b48fe53d64d1 100644
--- a/dev-lang/go/go-1.12.5.ebuild
+++ b/dev-lang/go/go-1.12.5.ebuild
@@ -37,7 +37,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 1d75a9176c7c..bf7667cd7e53 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -1,5 +1,5 @@
 AUX jsonnet-0.12.1-dont-call-make-from-setuppy.patch 387 BLAKE2B 8c0223b10cf1b61707b10361cfb96a01f492d234b3318554628dfc51a49728022db2f6573cf78d66a38cae0f59e2054e985e189268254563c0bf9e6854b3c129 SHA512 287a17a6b3aaf8c9a971874ff2a507c8d301caf84d243bd1d063d58e21e93bbecc2b417767e0d56d87f300cef9811f7aec0caa8616292950b11eb3103f7bebbb
 AUX jsonnet-0.12.1-makefile.patch 1609 BLAKE2B a896703a118b194ed97a3c487e8e8a3d6ae1ae0f3989183cac0540b4ad09aeb5a4f2508b8a6f455f7eb077e4378cedaee5538e22f05a07844ea998f39825d93b SHA512 4f92e11f42ed90dcac5e55f12e50e6ffba305d3d691da79282d72059f18223aabb38d9f1420ce586de5e16e735b85174fb49b2ee48739864c47c292690030127
 DIST jsonnet-0.12.1.tar.gz 21839349 BLAKE2B 8601a35263003723b435d0075fe60f5301a49bddf63cdd55958df3eb7474569c28dbf54e0ba9d07fb6ade395af725193d1432b2c43fb2b271531af179e850df4 SHA512 25523dd19b4209a5ca39275ab3d3726b934442dd83a965ab0b79f0c67bd8ae85c438b2a63990b8eec921b137f908f946696be331b08cef92f15b6b8fa548cb0d
-EBUILD jsonnet-0.12.1.ebuild 1183 BLAKE2B 3045b49d0a2ad935379094183a81f7816702013d9a1ba58075d8a1a446db86812a96c5ecc64f125cb034c3903fb0950af85f8414782d8f004212420ad791b5da SHA512 7808e39dff7f80eedfdfb780ce334a026b69b662e8b994009c65a07870fd5822b4842ecfa3e1f10dc8c6ba3f7ad4d8c33679800902951e1d54c3e92f7aa55881
+EBUILD jsonnet-0.12.1.ebuild 1184 BLAKE2B 2e9d3004f0bd47aa490a89730cde004eef708c5fee45d9508a436d2690166e5b4551842b41296fc3f14c987dc4a6ecccb79a2656a649498a5ea6cf4f8dbd8419 SHA512 9d2a5eb1cefdae88af4ecbdf40f3316958e92b3d53727e87d38661f8610765bf5f44cb41cfb081e80a5eabb8aa730c49db66529785deda9dd265c43106844b2c
 MISC metadata.xml 453 BLAKE2B 826e11d7714e4630a4d23ba46313ef7412af5815b39b60db8c4161d71ded81e023d8c605c1cc86ef0622dd3e2d97ca6b276ae1ba146458cfd20d5c4a80caf3bc SHA512 d621bb14cfd5106fb4e5f88d20dc84aab11c078348b4b605a0a3019b8fa09b55e011062a47fac55e3c8e5383770ca696807b4c97c1ae372b8b909c4bf25af024
diff --git a/dev-lang/jsonnet/jsonnet-0.12.1.ebuild b/dev-lang/jsonnet/jsonnet-0.12.1.ebuild
index e021db68f24d..ba69cbeb09ac 100644
--- a/dev-lang/jsonnet/jsonnet-0.12.1.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.12.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_6 python3_7 )
 inherit toolchain-funcs distutils-r1
 
 DESCRIPTION="A data templating language for app and tool developers "
-HOMEPAGE="http://jsonnet.org/"
+HOMEPAGE="https://jsonnet.org/"
 SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE="python"
 
diff --git a/dev-lang/julia-bin/Manifest b/dev-lang/julia-bin/Manifest
index eb35fa1374ac..510bd632ba71 100644
--- a/dev-lang/julia-bin/Manifest
+++ b/dev-lang/julia-bin/Manifest
@@ -1,11 +1,9 @@
-DIST julia-1.0.3-freebsd-x86_64.tar.gz 79521844 BLAKE2B b635bd6d5bca4800433956c5be6151d34165c9780a55fa491298cfb1da97ec99e6108a44b0fb5fe79f48cc4342344bc480a3afe44c0abea7367670978fd10794 SHA512 36037443b53f1412841d6a56fc8fcc6b979bcc35b2f2de29984bd386d89f64daaf7d18512f8ac04dbadc531bdbc1a8966c1701008878792a10608cccb9b59635
-DIST julia-1.0.3-linux-aarch64.tar.gz 72764975 BLAKE2B 148a434f0867bfb55be7417f85e539e6bb48c6a91d24951e983986091b3d418688202c7f2e6169c1f4b85328e3066d6418e8ec50093a590c26294a72f92a93d9 SHA512 a6a143c3709646ae30e9ca66a714b4226340f6de8cdd18e2b2d0f4ae612fec5136097f69b40554c4a39486a6c1222fba192a3bd304d195263e92152c20df0714
-DIST julia-1.0.3-linux-armv7l.tar.gz 78956998 BLAKE2B 53ccdf59a5d9e898dc9310411e1d127b2acf8da89e8d539409a3c0e9df0eb804dff83116a4627e7883752f462834ad7a88973b787cb0f9360eb652f4f86414d4 SHA512 1e0145c2ca58eac5f5a1b92e5f7a72b04b468acb073e92635a6d3e7921431da1aa5ad01ef07d5df2bbe7637870a7e9986faca4f1d9fc815cf880ec85b1be630b
-DIST julia-1.0.3-linux-i686.tar.gz 84731342 BLAKE2B 455c88880eb57c5fecb38393664b922478f2e289024004e184eca8adee1093a64e88f1d281bcdbbdde1f29827ccc81b394487a4aa9761dd4922e0c774db5ebac SHA512 166c563f41750cc21329791bf55ba52a12a10dcdd54aea6d8d67e763eba6237042cde03fdac404684b7952602212dac66262dba4703eba9921b86813b76110a3
-DIST julia-1.0.3-linux-x86_64.tar.gz 88732284 BLAKE2B 616f483804394ae17e1845835b2a49f862c9c9144f4deee38696b56e3d5d26ceee41503c6b1fc9c9fedfa5275bc36c2ddb67e31faee9312a10e04a7c563c9898 SHA512 925b16dadb9c6be1d074b929be74815d38451efcdcadf94748edfe572b8f91c0bec72c4c8440673bf3c75987bc14970e6f4cb9799f0386b0e30fe4628e2cdeb3
 DIST julia-1.1.0-freebsd-x86_64.tar.gz 80298415 BLAKE2B ec07fd0ee0504b744891b102ee936aac0550656cea96d2b342f39382a3df899a9fb3c6426ee18ff6febfe935ac595d6c66018a7e05f0bc091da3f5e166ee45fd SHA512 75460446a6278e56cf75e056ddcbd71715bc35b762d88199ef4065e29b101756ea386c979962b6243df549508b6618364203f48293012ce0b147987b94f0663c
 DIST julia-1.1.0-linux-i686.tar.gz 85843858 BLAKE2B 574001002297a94b8a26fe772c11312fe8fdc6bf09ddb969f291f604288f941a151f356d9f22f2a953822a290a49977e8fb76cc4d74c819e0572fcce8ae218b2 SHA512 e2465e20024f98e1b64ba5c799b1825c24f88c4a9b6e8b07b9214722389bf9dd8a59a2b624fde75439dbcdeb437743903da7c86e721e75bc69b0d7a5ed8457e4
 DIST julia-1.1.0-linux-x86_64.tar.gz 89632491 BLAKE2B 11987a54e87e167747ba2bc87d359981084fb1c91eab32e7498ee554b485c75fdc85e126c4d706fdf2e203bfbf143fba85e2f4e4bed81aeedbafbd2f099741c1 SHA512 bc47fe1ba304b6f083ba858c0d0318f684a19902b4c4937901d97f1a19ba19d60a6145a143ef742159fe6b40810ac39978d7574bdc29446da38c61d26ff8ef33
-EBUILD julia-bin-1.0.3.ebuild 1270 BLAKE2B 7f276ab4dfbc78529e9147061401143c3a326717538642e6862d080d3c81e11f4b1ac7e7ab5af6d5284b1faf922df24c8d2920a3823fe435a5420efc7f634f17 SHA512 c578f0a3609d42ad8c55496295506cd7151a7651ec8361f848d83618f8b109a47490b7ea226c803d8184abd8d42ae55fab80ff2dd3a06b515c11fc2043391461
-EBUILD julia-bin-1.1.0.ebuild 1013 BLAKE2B 52b5ba96a5e38123b7fd0d032155964534ddc726b170cbeaed4bd0e7f562a1b8159edc897653c417bebdd65366c33430518cf2a0b259155752296954a953e436 SHA512 c2e8cb6399466500942cc2963f9ca4e27f01df6215ea715140e24db41a27facafb186bab2be0cebf09c33bb1703d8493b3b6bc776091a2950577b44d0d0f32a4
+DIST julia-1.1.1-freebsd-x86_64.tar.gz 80831400 BLAKE2B a9c542609323ed295b74ac6caab5bf9bf0f007958212b2100329b5b1925fc14c4af80df9cc292e20b418a76373dbbd543f1c9a212a5389a6ccf0836b21cca287 SHA512 22c4e1cf90fb098c109db3e1b1179d9fc7b136e7b646b94e7b2d241881c4a94bf1ccd0fcc807fd3100aa55451b36c816e93a4eff66bdd33bc1be131ade88577f
+DIST julia-1.1.1-linux-i686.tar.gz 85968698 BLAKE2B d92311e80208ce12004317a01fbbbfe6f2edd65ecb805d7102786cf83448c594f46fcb9a2b6de6e82f7b056c4c8c904a4f61ee787bb8e95b3c0373b1cf075b7d SHA512 3cba94e3d94c4f6206d17b8314e1fe441a32084183ec5a7496b4b78a1b3bc4c8d03f0a37937870a09bd020900a56707b9e10329ec86fa2225948baf7fbad26e5
+DIST julia-1.1.1-linux-x86_64.tar.gz 89727957 BLAKE2B a1176ab1fdebfeb212520e9d47fd438f16f1edf247cf22a6f56264ce73f234568453cb6040be7c1f3cdfc4ce34e0d8ea4d3b1e147d143b3076f6d9019d496653 SHA512 b3fdc71379c81399a1f77395287ed833fd23edb5eb9bab3e3dc68381b6d79641e0bd93fa0dedadb551f1761fee3efabcc7f426d0505aba751ae5fd147e0b7bf4
+EBUILD julia-bin-1.1.0.ebuild 1031 BLAKE2B 9946d972fde4352c57f2f371de4b68b71bdbcfd7ae636f35b9259c58eeb98aa993b3d1c4e212f36477c9b8bc60308e71c47f3d1f02b06cbf8f046811fa740261 SHA512 1875d4e1010b50cd2d746d8c11fb10064167dd855baaa20dca84011865cd52ce4e1c3bd0bb8c767ee676275045f2cc4551a4896e3e2e6028edfb71cd0cba11da
+EBUILD julia-bin-1.1.1.ebuild 1031 BLAKE2B 9946d972fde4352c57f2f371de4b68b71bdbcfd7ae636f35b9259c58eeb98aa993b3d1c4e212f36477c9b8bc60308e71c47f3d1f02b06cbf8f046811fa740261 SHA512 1875d4e1010b50cd2d746d8c11fb10064167dd855baaa20dca84011865cd52ce4e1c3bd0bb8c767ee676275045f2cc4551a4896e3e2e6028edfb71cd0cba11da
 MISC metadata.xml 1269 BLAKE2B c7ca56d7660c41df452725bae9526d587d79754a3e7b0cb0584bacc588b63523e4fbae113b26f48290d874bc49fac1eb2ecfc97946e516212cc511346f876e26 SHA512 8e0325b241bc76162b843b64e2fdac98873cba21e8e39d2ddd439647466d94e163fe315eeeae78435398db17635d3447ec9c713bf53d894487ac6acb67c5afdf
diff --git a/dev-lang/julia-bin/julia-bin-1.0.3.ebuild b/dev-lang/julia-bin/julia-bin-1.0.3.ebuild
deleted file mode 100644
index efee49f0bbee..000000000000
--- a/dev-lang/julia-bin/julia-bin-1.0.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-MY_PN=${PN/-bin/}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-SRC_URI="
-	x86? ( https://julialang-s3.julialang.org/bin/linux/x86/1.0/${MY_P}-linux-i686.tar.gz )
-	amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/1.0/${MY_P}-linux-x86_64.tar.gz )
-	arm? ( https://julialang-s3.julialang.org/bin/linux/armv7l/1.0/${MY_P}-linux-armv7l.tar.gz )
-	arm64? ( https://julialang-s3.julialang.org/bin/linux/aarch64/1.0/${MY_P}-linux-aarch64.tar.gz )
-	amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/1.0/${MY_P}-freebsd-x86_64.tar.gz )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
-IUSE="elibc_glibc elibc_FreeBSD"
-
-RDEPEND="!dev-lang/julia"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto "/usr/$(get_libdir)/${MY_P}/"
-	doins -r ./etc
-	doins -r ./include
-	doins -r ./lib
-	doins -r ./share
-	dosym "../$(get_libdir)/${MY_P}/bin/julia" "${EPREFIX}/usr/bin/julia"
-
-	exeinto "/usr/$(get_libdir)/${MY_P}/bin"
-	doexe bin/julia
-
-	cat > 99julia-bin <<-EOF
-		LDPATH=${EROOT%/}/opt/${MY_P}
-	EOF
-	doenvd 99julia-bin
-}
diff --git a/dev-lang/julia-bin/julia-bin-1.1.0.ebuild b/dev-lang/julia-bin/julia-bin-1.1.0.ebuild
index 89f0a6273154..67d0217f741a 100644
--- a/dev-lang/julia-bin/julia-bin-1.1.0.ebuild
+++ b/dev-lang/julia-bin/julia-bin-1.1.0.ebuild
@@ -21,6 +21,8 @@ IUSE="elibc_glibc elibc_FreeBSD"
 RDEPEND="!dev-lang/julia"
 DEPEND="${RDEPEND}"
 
+RESTRICT="strip"
+
 S="${WORKDIR}/${MY_P}"
 
 src_install() {
diff --git a/dev-lang/julia-bin/julia-bin-1.1.1.ebuild b/dev-lang/julia-bin/julia-bin-1.1.1.ebuild
new file mode 100644
index 000000000000..67d0217f741a
--- /dev/null
+++ b/dev-lang/julia-bin/julia-bin-1.1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN=${PN/-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+SRC_URI="
+	x86? ( https://julialang-s3.julialang.org/bin/linux/x86/1.1/${MY_P}-linux-i686.tar.gz )
+	amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/1.1/${MY_P}-linux-x86_64.tar.gz )
+	amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/1.1/${MY_P}-freebsd-x86_64.tar.gz )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd"
+IUSE="elibc_glibc elibc_FreeBSD"
+
+RDEPEND="!dev-lang/julia"
+DEPEND="${RDEPEND}"
+
+RESTRICT="strip"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto "/usr/$(get_libdir)/${MY_P}/"
+	doins -r ./etc
+	doins -r ./include
+	doins -r ./lib
+	doins -r ./share
+
+	exeinto "/usr/$(get_libdir)/${MY_P}/bin"
+	doexe bin/julia
+
+	cat > 99julia-bin <<-EOF
+		PATH="${EROOT%/}/usr/$(get_libdir)/${MY_P}/bin"
+	EOF
+	doenvd 99julia-bin
+}
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index ca343d1f0162..52649b1e2eea 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -2,11 +2,13 @@ AUX julia-1.1.0-fix_build_system.patch 1651 BLAKE2B 62123d16fe25bd6d77ac7af05297
 AUX julia-1.1.0-fix_llvm_install.patch 680 BLAKE2B ca0d95c503b8f6e76722d54147f7a64cda5781cefc6e05ed7cfc631b356c3131d43ce6703da6c61b791da08836d9a6b5b494556c2a0ecba8960f8a9395b2d66a SHA512 4d474c1ab1d74aeb98367d55ec557e22e43a3e3d35615b7cde20fb9a194b94f24237735ad431800ded6e120beae9d2d3706b778ea7f26409790e3649ba39117b
 AUX julia-9999-fix_build_system.patch 3345 BLAKE2B 0a8eeaa3590beb0215c9f696a7dd1d6c614238dbf12f72cd2ccc81a36bfc3bdaae22afe45d95b1868bd211a67c3c483889dfa2feae86816054101c0a6865394f SHA512 edc7fdd6f6844a359368e2356dafabe951304a7b3f144d4a5181003de8f3f2eefc9b8882db6dcd65c049226a2505446d900eda3056e3c6bbe45fbaea3bd3a647
 DIST julia-1.1.0.tar.gz 7681396 BLAKE2B 2038901132bab1ae5ea634e15de2e18771e250c77e967228858f078a6e44e3f1900c1ea464b5db762842f65c4ad8590b70ba6b0b267bf955e86fa7f16a812696 SHA512 da546430df5a9207926faa3fe7b1d2c193a1223a379ce1ff25219c6f4f2d650497d1b0e9091f1cd542fa19bfcf7bf1ee74a52f7d45a06fd8ab4441a5ac4d4a46
+DIST julia-1.1.1.tar.gz 7691742 BLAKE2B e41a62ee170c1b8f38a64c762998c12c04d00568e9261f6fea984fb10950da45143a19be723c271901bd3d96cf69f8d97c7a9737724b9d571b841143b3c8a3b5 SHA512 16dfb0b0f6e6f3f28432b71f78a3a584db939ea0e82afaad43e2e8145206aedb5355ad6fcec67223ccf59e9b04c89d49573e27b5746b879a6cb5d07043701463
 DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
 DIST julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz 1555710 BLAKE2B 31ce57d23765c142799dd985a5511751d63238cf7e082fd1ad5574bf62201e9d6cb53b8da5dcc724765ccb4abd63da3ca6d6cbd45e078310c2ffa3859d09b8e4 SHA512 c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98
 DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
 DIST julia-llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz 156361 BLAKE2B e5e1485b758e959ed78f7fde8b211376da2365e5835708042de57c091b10b59755e1203a9f88c0d761687bf3d166207410de6ec203d80fef4dbdf06a50404cd1 SHA512 1c80dc6e71fdad187b142d02e561dfe1880857baaec08d36240ecb2f275d1bc5467aace84eebe5a10fd3f4c40b0035e65a5db3ec2a9ee6940920b0aad6221c55
 EBUILD julia-1.1.0.ebuild 5311 BLAKE2B bb91bb9f04f2219968c7b7c03519cd37c8a4cb463291462ac643858df768dde1a3de55c7734fb04b05363ac9543a55bb7cdcfe4a67f4b470436c9126f55924f0 SHA512 f44bf3ff372223a677c26ebdefe57925ce5cf560454473cae9d31ee55f25a1008011e00b2d42d77279a9386a3d0eb511783968703505f8f693b5a052dbc2700b
+EBUILD julia-1.1.1.ebuild 5311 BLAKE2B f9838644a59e48f6ec7a262fc7bc6a97b23036984dcb3f86be2f992b1fc8e5d4e1f4894075b512d0a4e5e5d2f5a0d4e0428389c58fddb59675bbd362d8deb0e2 SHA512 24ad8efb5511d456a22aa20fff0d5d0e87a7911f0b24daf7514fb758aa3bb3e67dde0c026a7620c63f3290d95b357cf4f5cace604bdf7e1bfcf09d692739fa25
 EBUILD julia-9999.ebuild 4089 BLAKE2B b38fb0ae040da02961650abdaf40ec17632899cd63aeee83f0b1bb67a760d68ea80a251e29baf594b15b944017ae894db607a4179ef025fb18fb5fbaecae53c3 SHA512 dfb930b357f61479cb28d4d1c5f08fe264ac8ebcd4cd41a0da4c947209b6318cad25bf011e45ea1db3575dcf667f694119a8b40f7ad181914309cd0b93467729
 MISC metadata.xml 1291 BLAKE2B 98782d71b9f74e628e4e6dc5264b7bcddfb61f4ce42c4e3baa0a2ec0cc6e2ef6368d1c2b1d755972b214823533c3935b4558c79bd920072649d9072b985efcd4 SHA512 0bbe350eef4d0daaa4a971b843b4359d2513dea5e2dc9e8a3b6241ff403c043f605634615c39a3fdb2a4d090851a19d6b20ebd5c7b3886f009ade3b5c16dfaaf
diff --git a/dev-lang/julia/julia-1.1.1.ebuild b/dev-lang/julia/julia-1.1.1.ebuild
new file mode 100644
index 000000000000..96611cec9c27
--- /dev/null
+++ b/dev-lang/julia/julia-1.1.1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RESTRICT="test"
+
+inherit pax-utils toolchain-funcs
+
+MY_PV="${PV//_rc/-rc}"
+MY_LIBUV_V="2348256acf5759a544e5ca7935f638d2bc091d60"
+MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
+MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
+MY_DSFMT_V="2.2.3"
+MY_LLVM="6.0.1"
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+SRC_URI="
+	https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz
+	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
+	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
+	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
+	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
+	http://releases.llvm.org/${MY_LLVM}/llvm-${MY_LLVM}.src.tar.xz -> ${PN}-llvm-${MY_LLVM}.src.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND+="
+	dev-libs/double-conversion:0=
+	dev-libs/gmp:0=
+	dev-libs/libgit2:0=
+	>=dev-libs/libpcre2-10.23:0=[jit]
+	dev-libs/mpfr:0=
+	dev-libs/openspecfun
+	sci-libs/amd:0=
+	sci-libs/arpack:0=
+	sci-libs/camd:0=
+	sci-libs/ccolamd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/openlibm:0=
+	sci-libs/spqr:0=
+	sci-libs/umfpack:0=
+	sci-mathematics/glpk:0=
+	>=sys-libs/libunwind-1.1:7=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
+	>=virtual/blas-3.6
+	virtual/lapack"
+
+DEPEND="${RDEPEND}
+	dev-vcs/git
+	dev-util/patchelf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch
+	"${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	tounpack=(${A})
+	# the main source tree, followed by deps
+	unpack "${A/%\ */}"
+
+	mkdir -p "${S}/deps/srccache/"
+	for i in "${tounpack[@]:1}"; do
+		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Sledgehammer:
+	# - prevent fetching of bundled stuff in compile and install phase
+	# - respect CFLAGS
+	# - respect EPREFIX and Gentoo specific paths
+	# - fix BLAS and LAPACK link interface
+
+	sed -i \
+		-e 's|git submodule|${EPREFIX}/bin/true|g' \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+		deps/Makefile || die
+
+	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
+	libblas="${libblas%% *}"
+	libblas="lib${libblas#-l}"
+	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
+	liblapack="${liblapack%% *}"
+	liblapack="lib${liblapack#-l}"
+
+	sed -i \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
+		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
+		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
+		-e "s|= libblas|= ${libblas}|" \
+		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
+		-e "s|= liblapack|= ${liblapack}|" \
+		Make.inc || die
+
+	sed -i \
+		-e "s|,lib)|,$(get_libdir))|g" \
+		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
+		Makefile || die
+
+	sed -i \
+		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		src/Makefile || die
+
+	# disable doc install starting  git fetching
+	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+}
+
+src_configure() {
+	# julia does not play well with the system versions of dsfmt, libuv,
+	# and utf8proc
+
+	# USE_SYSTEM_LIBM=0 implies using external openlibm
+	cat <<-EOF > Make.user
+		USE_SYSTEM_ARPACK:=1
+		USE_SYSTEM_BLAS:=1
+		USE_SYSTEM_DSFMT:=0
+		USE_SYSTEM_GMP:=1
+		USE_SYSTEM_GRISU:=1
+		USE_SYSTEM_LAPACK:=1
+		USE_SYSTEM_LIBGIT2:=1
+		USE_SYSTEM_LIBM:=0
+		USE_SYSTEM_LIBUNWIND:=1
+		USE_SYSTEM_LIBUV:=0
+		USE_SYSTEM_LLVM:=0
+		USE_SYSTEM_MPFR:=1
+		USE_SYSTEM_OPENLIBM:=1
+		USE_SYSTEM_OPENSPECFUN:=1
+		USE_SYSTEM_PATCHELF:=1
+		USE_SYSTEM_PCRE:=1
+		USE_SYSTEM_READLINE:=1
+		USE_SYSTEM_RMATH:=0
+		USE_SYSTEM_SUITESPARSE:=1
+		USE_SYSTEM_UTF8PROC:=0
+		USE_SYSTEM_ZLIB=1
+		VERBOSE=1
+		libdir="${EROOT}/usr/$(get_libdir)"
+	EOF
+
+}
+
+src_compile() {
+
+	# Julia accesses /proc/self/mem on Linux
+	addpredict /proc/self/mem
+
+	emake cleanall
+	emake julia-release \
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
+	emake
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	# Julia is special. It tries to find a valid git repository (that would
+	# normally be cloned during compilation/installation). Just make it
+	# happy...
+	git init && \
+		git config --local user.email "whatyoudoing@example.com" && \
+		git config --local user.name "Whyyyyyy" && \
+		git commit -a --allow-empty -m "initial" || die "git failed"
+
+	emake install \
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	cat > 99julia <<-EOF
+		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
+	EOF
+	doenvd 99julia
+
+	dodoc README.md
+
+	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+	rmdir "${ED}"/usr/etc || die
+	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/share/doc/julia || die
+}
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 01e8c10e2f84..80a1673dbfe3 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,4 +1,4 @@
 AUX mujs-1.0.5-flags.patch 839 BLAKE2B 843d1bf60167dfb91a5736ee936098c8f6b716f7a70118512d102adb3dc00223d5a3f1fb8da3a57b89797d5b26ebf8120cc1ef2013162aeff288be07cb99d99f SHA512 35681b868e129edffe27e41b793ef073b9ebeb5842212116f9740257515a3fb0d2f00d828a72d96b630c7632184ff9340325a5d79503e5a4c5a52892bd26f4bd
 DIST mujs-1.0.5.tar.gz 119353 BLAKE2B 48f1b598e50d5804b0d64230cdd6b4d3f719187ea0906f45c9f45baee2c8df59c6fd09dc25afc9e1ce4e20a9866d158d16a4632bec552fddd8fac70b20e2363f SHA512 c1c59b5e80e0e5f580f30dfc0b4707b6a1e44a73c746b9783bb24d91429ddf8ed670a7663478300cc568cfc15a511720b6d18be2ade40a3a66fc7ab8f3933c2d
-EBUILD mujs-1.0.5.ebuild 1168 BLAKE2B 2c1b76e41c4bcf7be1223b93621fbb79924c893e5c227df50c07dd033f663b0a3869aa730ab48e11fd556a01e788c8db360af2ecf4f0e4fcd2c8f3d0c06455dc SHA512 a3e75c4aff2bbb8d26ba00573d1333e9be50bd9e3ad022861669b635e0be23348c1e42e48c5cd71d5f505188e65f2251f094d8fe8fb69c571b97cb01588072bb
+EBUILD mujs-1.0.5.ebuild 1160 BLAKE2B a627061835dad0972519ba6cef5bc08885fed4d263176f916564453abd092d91c79a9750eca6d73bb2a916be96a59b1c948db7daef1760dc18fdf9a324b1171c SHA512 ce54021cfd9c6c9a469082bef45fcf4e977f20dc939be818ff388e265b94621cd4c31b83994d29221d2a39eeb58cb4661ff2dcba2a849dd480a57b8e1f11a962
 MISC metadata.xml 555 BLAKE2B ea6b447ad19ed256c8a8f4b81b51ad3b336824ea357e746bd9194d7a30dadceae89ec00630e7dc5fe15435fb6f85da65e4d3a22363f5ab40365afd157b2e9302 SHA512 cb5e725aad6542f1d1c569fb82a79973d1e528f3c43251e3f60a8cb2af229747cc6c7ead5fa8b39e46a50498251a704453c90b9863641008b01317b1d8b89bc7
diff --git a/dev-lang/mujs/mujs-1.0.5.ebuild b/dev-lang/mujs/mujs-1.0.5.ebuild
index 44e1a3160d87..31ff801dd68f 100644
--- a/dev-lang/mujs/mujs-1.0.5.ebuild
+++ b/dev-lang/mujs/mujs-1.0.5.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An embeddable Javascript interpreter in C."
 HOMEPAGE="
-	http://mujs.com/
+	https://mujs.com/
 	https://github.com/ccxvii/mujs/
 "
 SRC_URI="https://github.com/ccxvii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 5458ecbe66d6..61fc5cdad77c 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -11,8 +11,8 @@ DIST perl-5.28.0-patches-1.tar.xz 17128 BLAKE2B f16843d9ecf27fa7d42dd59e1591d618
 DIST perl-5.28.0.tar.xz 12410536 BLAKE2B 620cca33c6d354b8b200bfff43dd155e6f89b9fe318f530d38c853a2b66fe67cc8410b6e5ab2a793d7ef578f2295a6fc4872483f81b5439d8573d75c5239fcfb SHA512 de701e37371b81cecf06098bb2c09017bde9cebaf9537d58838d0adf605ac2ecf739897b0a73576a7adb74d4cf65591ec4d2ed1f94b7191e695f88cb7e214a39
 DIST perl-5.28.2-patches-4.tar.xz 26268 BLAKE2B b32485a4ee0c23ab197641279915d1d2ff0b5fb46dad4e65b0c93a9b38025c5b4fdae2907b3f6aa5e1b6b5f80b5391b149613a0d3759519330c16f9b0e1dff91 SHA512 0c560ed52dcce2e9332192fead7bf0da416e5241616c2ee889cb9ca6fc3a133edb75e63e6e1217b8790c77611b92f57979491b4ffb02364c3f8361745f59c225
 DIST perl-5.28.2.tar.xz 12374448 BLAKE2B 82a49fcf3c29ff7241fae7ffaa1bf9f99d8cbfa6d00d5fd9ff7c3c23a461287322e12acba318c8de8507092e33b05549142bc5194bdb4b516994c9cdc0cb3f92 SHA512 0f2e4f7cb5d8cf6e00054b3842907e29b6c85902d97fb881d5bea65edbc875fef4e15e064561fac7c8db4939586576dd76a225026c7cca9624261c887b1fdb08
-DIST perl-5.30.0-RC2.tar.xz 12404196 BLAKE2B c75c9a0c00718e11e00171f8796a9c039bc639e21f755d6c23b396f08e3ec826226ddb7b2a78f73645774c798d564dc65b8800d841178ec072a1d256d94ef1c5 SHA512 5f11ad9951fa1a94553f71eef560007f700b8b4a6d5067896582c7abfe7afc406f504c26e67ce0da222ed7b240f7368537ceb6006dc6e3c7483c64280ec2679b
 DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4
+DIST perl-5.30.0.tar.xz 12419868 BLAKE2B dbf64d4cb1995475ca5a84e487ecc81a422f835180fe96d88b5095e9bc6eff62863b0789d98f0f3d1265c8683b812839bff1622cfb90470f02a1863b0f827c7e SHA512 68a295eccd64debd9d6a10f0d5577f872a19ad8c2d702798f6b0f45b8c3af6ab3230768056e2131e9e2e2506d1035b27cfd627c845e32263fe448649c4b98ae9
 DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed5768ca8db61b5ac092ad6c0067386597875d6613c75671f026387ba474ce8c28789d6d77b9dcfc4cf4bf7227126 SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0
 DIST perl-cross-1.1.9.tar.gz 102939 BLAKE2B 438ea75a14c4d60fdf3cb2f3671c736d229a83af210ba4fe6e79b989c6c4b45500d0221ec65bc71e1d43d234ec1daa20b3a19be6ceb01e638810900dbe3664a7 SHA512 002441012bd31f1ea71341707d91f89b76266c187c9d28f947ed5eddbcc6e3155e8dfd4b1814331561c3557764fea25bf6a938f08bcd4adfb5895361ad5a269a
 DIST perl-cross-1.2.2.tar.gz 106073 BLAKE2B c4eaf5d60dd0ac88a9653cea399f5583a699d35f94a69a36ef9d3cde0017901ff68029f12a3af6e0fd34d46accbb6be009167fadb790da8065f6b85115f1c9b8 SHA512 49dc190018b891daac68a954e2a9bab6294920f02b585c530dcc47af03e8ab51d402455202d45121fa206ee743986ddd50323658c179d2c15cb6af7a2eb0958c
@@ -20,8 +20,7 @@ DIST perl-cross-1.2.3.tar.gz 106861 BLAKE2B 1fd23ecafd1450010c6703e43fb84da68f73
 EBUILD perl-5.24.3-r1.ebuild 17393 BLAKE2B 999d7df269e15390e4f7d146ff94eda5301981353083c933dd89af42a9ce0cece3f6e87d8917572cd38141f0e25e9c864660624fa4c4459940d0dd190527d53f SHA512 61a2760d1a17ffe0ae6cde23b4b707876822aa2355fa834b23a878a3df3d5d070e5b0a74a991d617ad1e026c0fcc3d2a05609d575567edc57b2cf101bde8e0bf
 EBUILD perl-5.24.4.ebuild 17363 BLAKE2B 84744ba06ce9dc0cab51aae3da10917679a20b5997f13154c269285173a6c6b0ec20ae365b059daa52f86f2addcf97dbe8866a29cd2c9c32ee51030de9a44bf7 SHA512 d393349752cfcdb53bd6d99559ad1eb5385e716f772bc4377e07bc3d7064a293e5cc0369feca2094513e710e8724c2a0a82fcf342ad68c4e1d2c1d0d42200071
 EBUILD perl-5.26.2.ebuild 20018 BLAKE2B 35fc87f0fd3d14255553214e5d16a15390469265e7a1dbd9942668d96ffea825228da4c63fdddbfa70df869746559d7966b81dd1343c1bcebb1c87718bb1a3b3 SHA512 23672000c34668a207d3ec6629950310542996be5225271500f52d42779e6b77370db02a32c28953cfc7d479153d418af8ad6ddfb90ceb6437fdd4086b5a5a92
-EBUILD perl-5.26.9999.ebuild 20031 BLAKE2B d6e3d8053ddbe6b3bd6fad32c2453b996ac5aea5d854354540bf3de7bd55cb2282f6c72122928d037318c5f6d54755b45f56a52ea8704c3fc4824f70a2776b9c SHA512 11d55af2d0f4ea7546b0633e4056e2cc3699b75061c4ba80e0bd17be358c9ea4900b780089853bef21718f6101257b0a9f9e15624b609332c10831d8f02bdb44
-EBUILD perl-5.28.2-r1.ebuild 20162 BLAKE2B 325d36858d865d5fd64ab333134ff94136ab54eb4fe1aaf1224e6584e00bfeba83ad797ca6e8b7e4f9fdeab1750e4447bd49037730cd5f1eb4f193bc7cd339d6 SHA512 76d6d4e5c15dfc1838877d2e005fa79b7a6cace62021961b5dff4f2902f2f51a9bfd9bd9ef4e937bfe93ea1bc70d0d255a4d8cfc7912328076fefd879403b0b5
-EBUILD perl-5.28.9999.ebuild 20133 BLAKE2B 36b745ad7deff1f87e608b490e99487ed88cebc2bdc92f9e0bd6c0f86f451effffacc6a2d0c6bda910114b4a4643a932adf9e58c75d95da920643cf277bc5d4c SHA512 9ba6380e4de7cd0e58a26496225728ac5891b9a55729a966af85f393e3082e5de47747000dd1f8bba19f716ec877c64e139fba066e6661a8bb69305d77cd1e24
-EBUILD perl-5.30.0_rc2.ebuild 20160 BLAKE2B a4602f60e21c9bd2c75ff5660b615066f35f2e2c0bfa11ee0b042109c98e6ab9a09f57e97cbe8eb09ec9728f56119a8c908ab85515925be50c64e9f51fcb538e SHA512 1fc5ef9869dc1cea9289ae17e79b1610a43d5f0082c232210ac0b0ba475b4ae99d8e9b79efa60d5dc611764c706da4d694d27d250bed44a80f3b5c7d64a211c9
+EBUILD perl-5.28.2-r1.ebuild 20154 BLAKE2B c76cfdb77c4973a345810a0f1c51b1c222222cd7562f532366c00d2c7f30aaa5edb24063c4701fb515f788bfce99e9539e8d8b90b53850832cd08522e868fafc SHA512 90d34571f8d89fd36feb6439a83acdc90c05413dcf360cd5f8fd9b088f95054a00445ff8ff2a279e01338efc46f9a9887a34a675efb60617ef5e066866a2ec88
+EBUILD perl-5.28.9999.ebuild 20136 BLAKE2B 6d8f6a6c78449cb40996c32c4e72ea5d7679b0e998857d6abfe6b28874cc40c135330d4d1ee9429ea3c1fc819c3695323b803ade4c25feedfc155ce694295d0b SHA512 d787969c98d92df22cb158b3cc6885fa2937e42da0df67168cc9757ac1fa28ca7156570042e941cfdebe4b4fe6e2befcf15dcf43d93f856212db65f9578391d9
+EBUILD perl-5.30.0.ebuild 20331 BLAKE2B 915d0eb8b798f273a0abc9b9506e1b2c1ffcd71331d7c1c72d3396a76e398d8955340dcb3abf73978f07be497a13b14147524aaf71963fcc6b19c1e312cc2b29 SHA512 9e32fdd048664e2ffdb2916d44cdad728facd79b8d85f400b0a938fdc3687f7084bb053bba548b30deb81c2b042d8d40e9b4e8192fbe1348f3451e3d53630ea7
 MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild
deleted file mode 100644
index 3efe8267e5be..000000000000
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ /dev/null
@@ -1,646 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.1.9
-PATCH_BASE="perl-5.26.2-patches-${PATCH_VER}"
-
-DIST_AUTHOR=SHAY
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN="5.26.1 5.26.0"
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.26.2
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	mirror://gentoo/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~kentnl/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]]; then
-KEYWORDS="~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
-
-IUSE="berkdb debug doc gdbm ithreads"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	!prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) )
-"
-PDEPEND="
-	>=app-admin/perl-cleaner-2.5
-	>=virtual/perl-File-Temp-0.230.400-r2
-	>=virtual/perl-Data-Dumper-2.154.0
-	virtual/perl-Test-Harness
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.240.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.180.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         5.960.0       shasum
-	src_remove_dual      perl-core/Encode             2.880.0       enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.240.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.340.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.74.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            2.274.0.200_rc   json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.201.804.142.600_rc corelist
-	src_remove_dual      perl-core/Pod-Parser         1.630.0       pod2usage podchecker podselect
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.0       perldoc
-	src_remove_dual      perl-core/Test-Harness       3.380.0       prove
-	src_remove_dual      perl-core/podlators          4.90.0        pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.90.0        /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-interix*)   osname="interix" ;;
-		*-aix*)       osname="aix" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-	PRIV_LIB="${PRIV_BASE}/${MY_PV}"
-	ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
-	SITE_LIB="${SITE_BASE}/${MY_PV}"
-	SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
-	VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
-	VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_update_patchlevel_h() {
-	# Copied and modified from debian:
-	# Copyright 2011 Niko Tyni
-	# This program is free software; you can redistribute it and/or modify
-	# it under the same terms as Perl itself.
-	local patchdir="${WORKDIR}/patches"
-	local prefix
-	local patchoutput="patchlevel-gentoo.h"
-
-	[[ -f ${patchdir}/series ]] || return 0
-
-while read patch
-do
-	patchname=$(echo $patch | sed 's/\.diff$//')
-	< $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
-
-	# massage the patch headers
-	s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
-	s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
-	s|^Bug-Gentoo: ||; tprepend;
-	s/^\(Subject\|Description\): //; tappend;
-	s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
-
-	# post-process at the end of input
-	$ { x;
-		# include the version number in the patchlevel.h description (if available)
-		s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
-
-		# escape any backslashes and double quotes
-		s|\\|\\\\|g; s|"|\\"|g;
-
-		# add a prefix
-		s|^|\t,"'"$prefix$patchname"' - |;
-		# newlines away
-		s/\n/ /g; s/  */ /g;
-		# add a suffix
-		s/ *$/"/; p
-	};
-	# stop all processing
-	d;
-	# label: append to the hold space
-	:append H; d;
-	# label: prepend to the hold space
-	:prepend x; H; d;
-	'
-done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}"
-echo "${patchoutput}" >> "${S}/MANIFEST"
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	sed -i \
-		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
-		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
-		cnf/diffs/perl5-${PV}/customized.patch || die
-
-	sed -i \
-		-e 's|^lib/unicore/CombiningClass.pl pod/perluniprops.pod:|lib/unicore/CombiningClass.pl pod/perluniprops.pod: $(CONFIGPM)|' \
-		Makefile || die
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-src_prepare() {
-	local patch
-	EPATCH_OPTS+=" -p1"
-
-	if use hppa ; then
-		epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die "Can't exclude libnsl patch"
-	fi
-
-	einfo "Applying patches from ${PATCH_BASE} ..."
-	while read patch ; do
-		EPATCH_SINGLE_MSG="  ${patch} ..."
-		epatch "${WORKDIR}"/patches/${patch}
-	done < "${WORKDIR}"/patches/series
-
-	src_prepare_update_patchlevel_h
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# some arches and -O do not mix :)
-	use ppc && replace-flags -O? -O1
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Fixes bug #97645
-	use ppc && filter-flags "-mpowerpc-gpopt"
-
-	# Fixes bug #143895 on gcc-4.1.1
-	filter-flags "-fsched2-use-superblocks"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$(
-			find "${EROOT%/}${PRIV_BASE}" "${EROOT%/}${SITE_BASE}" "${EROOT%/}${VENDOR_BASE}" \
-				   -maxdepth 1 -mindepth 1 -type d -regex '.*/5[.][0-9]+[.][0-9]+$' \
-				   -printf "%f "  2>/dev/null )"
-	fi
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$(
-		echo "${PERL_OLDVERSEN}"           |\
-			tr " " "\n" 				   |\
-			grep -vF "${DIST_VERSION%-RC}" |\
-			sort -u -nr -t'.' -k1,1 -k2,2 -k3,3
-	)"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$(
-				for v in ${PERL_OLDVERSEN};	do
-					has "${v}" ${PERL_BIN_OLDVERSEN} && echo -n "${v}/${myarch}${mythreading} ";
-					echo -n "${v} ";
-				done )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT%/}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT%/}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT%/}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROO%/T}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT%/}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT%/}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		myconf -Dinc_version_list="${inclist}"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${myconf[@]}" \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm(){
-	dual_scripts
-}
diff --git a/dev-lang/perl/perl-5.28.2-r1.ebuild b/dev-lang/perl/perl-5.28.2-r1.ebuild
index 981dadb521bb..2eae9534112d 100644
--- a/dev-lang/perl/perl-5.28.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.28.2-r1.ebuild
@@ -51,7 +51,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]]; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 
 IUSE="berkdb debug doc gdbm ithreads"
@@ -308,7 +308,7 @@ src_prepare() {
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# do NOT mess with nsl, on Solaris this is always necessary,
 		# when -lsocket is used e.g. to get h_errno
-		sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die
+		sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
 	fi
 
 	einfo "Applying patches from ${PATCH_BASE} ..."
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 7617ca59c9c2..88f49401029e 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -306,7 +306,7 @@ src_prepare() {
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# do NOT mess with nsl, on Solaris this is always necessary,
 		# when -lsocket is used e.g. to get h_errno
-		sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die
+		sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
 	fi
 
 	einfo "Applying patches from ${PATCH_BASE} ..."
diff --git a/dev-lang/perl/perl-5.30.0.ebuild b/dev-lang/perl/perl-5.30.0.ebuild
new file mode 100644
index 000000000000..8f0c0cb48d1f
--- /dev/null
+++ b/dev-lang/perl/perl-5.30.0.ebuild
@@ -0,0 +1,660 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=1
+CROSS_VER=1.2.2
+PATCH_BASE="perl-5.30.0-patches-${PATCH_VER}"
+PATCH_DEV=dilfridge
+
+DIST_AUTHOR=XSAWYERX
+
+# Greatest first, don't include yourself
+# Devel point-releases are not ABI-intercompatible, but stable point releases are
+# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
+PERL_BIN_OLDVERSEN=""
+
+if [[ "${PV##*.}" == "9999" ]]; then
+	DIST_VERSION=5.30.0
+else
+	DIST_VERSION="${PV/_rc/-RC}"
+fi
+SHORT_PV="${DIST_VERSION%.*}"
+# Even numbered major versions are ABI intercompatible
+# Odd numbered major versions are not
+if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
+	SUBSLOT="${DIST_VERSION%-RC*}"
+else
+	SUBSLOT="${DIST_VERSION%.*}"
+fi
+# Used only in tar paths
+MY_P="perl-${DIST_VERSION}"
+# Used in library paths
+MY_PV="${DIST_VERSION%-RC*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+	mirror://cpan/src/5.0/${MY_P}.tar.xz
+	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
+	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
+	mirror://gentoo/${PATCH_BASE}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
+	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
+"
+HOMEPAGE="https://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0/${SUBSLOT}"
+
+if [[ "${PV##*.}" != "9999" ]]; then
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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
+
+IUSE="berkdb debug doc gdbm ithreads"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
+	app-arch/bzip2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	!prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) )
+"
+PDEPEND="
+	>=app-admin/perl-cleaner-2.5
+	>=virtual/perl-File-Temp-0.230.400-r2
+	>=virtual/perl-Data-Dumper-2.154.0
+	virtual/perl-Test-Harness
+"
+# bug 390719, bug 523624
+# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual      perl-core/Archive-Tar        2.320.0       ptar ptardiff ptargrep
+	src_remove_dual      perl-core/CPAN               2.220.0       cpan
+	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
+	src_remove_dual      perl-core/Encode             3.10.0        enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.340.0       instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.400.0       xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.84.0        zipdetails
+	src_remove_dual      perl-core/JSON-PP            4.20.0        json_pp
+	src_remove_dual      perl-core/Module-CoreList    5.201.905.220 corelist
+	src_remove_dual      perl-core/Pod-Parser         1.630.0       pod2usage podchecker podselect
+	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
+	src_remove_dual      perl-core/Test-Harness       3.420.0       prove
+	src_remove_dual      perl-core/podlators          4.110.0       pod2man pod2text
+	src_remove_dual_man  perl-core/podlators          4.110.0       /usr/share/man/man1/perlpodstyle.1
+}
+
+check_rebuild() {
+	# Fresh install
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		return 0;
+	# Major Upgrade
+	# doesn't matter if there's multiple copies, it still needs a rebuild
+	# if the string is anything other than "5.CURRENTMAJOR"
+	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
+		echo ""
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl the installed Perl modules"
+		ewarn "have to be re-installed. In most cases, this is done automatically"
+		ewarn "by the package manager, but subsequent steps are still recommended"
+		ewarn "to ensure system consistency."
+		ewarn
+		ewarn "You should start with a depclean to remove any unused perl dependencies"
+		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
+		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
+		ewarn "Recommended: emerge --depclean -va"
+		ewarn
+		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
+		ewarn "remaining rebuilds portage may have missed."
+		ewarn "Use: perl-cleaner --all"
+		return 0;
+
+	# Reinstall w/ USE Change
+	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		echo ""
+		ewarn "TOGGLED USE-FLAGS WARNING:"
+		ewarn "You changed one of the use-flags ithreads or debug."
+		ewarn "You must rebuild all perl-modules installed."
+		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+	fi
+}
+
+pkg_setup() {
+	case ${CHOST} in
+		*-freebsd*)   osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*)    osname="netbsd" ;;
+		*-openbsd*)   osname="openbsd" ;;
+		*-darwin*)    osname="darwin" ;;
+		*-solaris*)   osname="solaris" ;;
+		*-interix*)   osname="interix" ;;
+		*-aix*)       osname="aix" ;;
+		*-cygwin*)    osname="cygwin" ;;
+		*)            osname="linux" ;;
+	esac
+
+	myarch="${CHOST%%-*}-${osname}"
+	if use debug ; then
+		myarch+="-debug"
+	fi
+	if use ithreads ; then
+		mythreading="-multi"
+		myarch+="-thread"
+	fi
+
+	PRIV_BASE="/usr/$(get_libdir)/perl5"
+	SITE_BASE="/usr/local/$(get_libdir)/perl5"
+	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
+
+	LIBPERL="libperl$(get_libname ${MY_PV} )"
+	PRIV_LIB="${PRIV_BASE}/${MY_PV}"
+	ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
+	SITE_LIB="${SITE_BASE}/${MY_PV}"
+	SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
+	VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
+	VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
+
+	dual_scripts
+}
+
+src_remove_dual_file() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
+			done
+			;;
+		setup)
+			for i in "$@" ; do
+				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
+					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
+					break
+				fi
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i}{,-${ver}-${P}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual_man() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
+				ff=${ff##*${i#${i%.[0-9]}}}
+				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	for i in "$@" ; do
+		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
+		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
+	done
+}
+
+src_prepare_update_patchlevel_h() {
+	# Copied and modified from debian:
+	# Copyright 2011 Niko Tyni
+	# This program is free software; you can redistribute it and/or modify
+	# it under the same terms as Perl itself.
+	local patchdir="${WORKDIR}/patches"
+	local prefix
+	local patchoutput="patchlevel-gentoo.h"
+
+	[[ -f ${patchdir}/series ]] || return 0
+
+while read patch
+do
+	patchname=$(echo $patch | sed 's/\.diff$//')
+	< $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
+
+	# massage the patch headers
+	s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
+	s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
+	s|^Bug-Gentoo: ||; tprepend;
+	s/^\(Subject\|Description\): //; tappend;
+	s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
+
+	# post-process at the end of input
+	$ { x;
+		# include the version number in the patchlevel.h description (if available)
+		s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
+
+		# escape any backslashes and double quotes
+		s|\\|\\\\|g; s|"|\\"|g;
+
+		# add a prefix
+		s|^|\t,"'"$prefix$patchname"' - |;
+		# newlines away
+		s/\n/ /g; s/  */ /g;
+		# add a suffix
+		s/ *$/"/; p
+	};
+	# stop all processing
+	d;
+	# label: append to the hold space
+	:append H; d;
+	# label: prepend to the hold space
+	:prepend x; H; d;
+	'
+done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}"
+echo "${patchoutput}" >> "${S}/MANIFEST"
+}
+
+src_prepare_perlcross() {
+	cp -a ../perl-cross-${CROSS_VER}/* . || die
+
+	# bug 604072
+	MAKEOPTS+=" -j1"
+	export MAKEOPTS
+}
+src_prepare_dynamic() {
+	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+	ln -s ${LIBPERL} libperl$(get_libname ) || die
+}
+
+src_prepare() {
+	local patch
+	EPATCH_OPTS+=" -p1"
+
+	if use hppa ; then
+		epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# do NOT mess with nsl, on Solaris this is always necessary,
+		# when -lsocket is used e.g. to get h_errno
+		sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
+	fi
+
+	einfo "Applying patches from ${PATCH_BASE} ..."
+	while read patch ; do
+		EPATCH_SINGLE_MSG="  ${patch} ..."
+		epatch "${WORKDIR}"/patches/${patch}
+	done < "${WORKDIR}"/patches/series
+
+	src_prepare_update_patchlevel_h
+
+	tc-is-cross-compiler && src_prepare_perlcross
+
+	tc-is-static-only || src_prepare_dynamic
+
+	if use gdbm; then
+		sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
+			ext/NDBM_File/Makefile.PL || die
+	fi
+
+	# Use errno.h from prefix rather than from host system, bug #645804
+	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
+		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# set a soname, fix linking against just built libperl
+		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name (soname) not to reference $D
+		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
+	fi
+
+	default
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+src_configure() {
+	declare -a myconf
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# some arches and -O do not mix :)
+	use ppc && replace-flags -O? -O1
+
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+
+	# xlocale.h is going away in glibc-2.26, so it's counterproductive
+	# if we use it and include it in CORE/perl.h ... Perl builds just
+	# fine with glibc and locale.h only.
+	# However, the darwin prefix people have no locale.h ...
+	use elibc_glibc && myconf -Ui_xlocale
+
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+
+	# Fixes bug #97645
+	use ppc && filter-flags "-mpowerpc-gpopt"
+
+	# Fixes bug #143895 on gcc-4.1.1
+	filter-flags "-fsched2-use-superblocks"
+
+	# Generic LTO broken since 5.28, triggers EUMM failures
+	filter-flags "-flto"
+
+	use sparc && myconf -Ud_longdbl
+
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=${EROOT}/usr/include
+	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
+
+	export BUILD_ZLIB=False
+	export ZLIB_INCLUDE=${EROOT}/usr/include
+	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+	if use gdbm ; then
+		mygdbm='D'
+		if use berkdb ; then
+			myndbm='D'
+		fi
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	use ithreads && myconf -Dusethreads
+
+	if use debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	elif [[ ${CFLAGS} == *-g* ]] ; then
+		myconf -DDEBUGGING=-g
+	else
+		myconf -DDEBUGGING=none
+	fi
+
+	# Autodiscover all old version directories, some of them will even be newer
+	# if you downgrade
+	if [[ -z ${PERL_OLDVERSEN} ]]; then
+		PERL_OLDVERSEN="$(
+			find "${EROOT%/}${PRIV_BASE}" "${EROOT%/}${SITE_BASE}" "${EROOT%/}${VENDOR_BASE}" \
+				   -maxdepth 1 -mindepth 1 -type d -regex '.*/5[.][0-9]+[.][0-9]+$' \
+				   -printf "%f "  2>/dev/null )"
+	fi
+	# Fixup versions, removing self match, fixing order and dupes
+	PERL_OLDVERSEN="$(
+		echo "${PERL_OLDVERSEN}"           |\
+			tr " " "\n" 				   |\
+			grep -vF "${DIST_VERSION%-RC}" |\
+			sort -u -nr -t'.' -k1,1 -k2,2 -k3,3
+	)"
+
+	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
+	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
+		local inclist="$(
+				for v in ${PERL_OLDVERSEN};	do
+					has "${v}" ${PERL_BIN_OLDVERSEN} && echo -n "${v}/${myarch}${mythreading} ";
+					echo -n "${v} ";
+				done )"
+		einfo "This version of perl may partially support modules previously"
+		einfo "installed in any of the following paths:"
+		for incpath in ${inclist}; do
+			[[ -e "${EROOT%/}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT%/}${VENDOR_BASE}/${incpath}"
+			[[ -e "${EROOT%/}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROO%/T}${PRIV_BASE}/${incpath}"
+			[[ -e "${EROOT%/}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT%/}${SITE_BASE}/${incpath}"
+		done
+		einfo "This is a temporary measure and you should aim to cleanup these paths"
+		einfo "via world updates and perl-cleaner"
+		myconf -Dinc_version_list="${inclist}"
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	# Make sure we can do the final link #523730, need to set deployment
+	# target to override hardcoded 10.3 which breaks on modern OSX
+	[[ ${CHOST} == *-darwin* ]] && \
+		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
+
+	# Older macOS with non-Apple GCC chokes on inline in system headers
+	# using c89 mode as injected by cflags.SH
+	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
+		append-cflags -Dinline=__inline__
+
+	# fix unaligned access misdetection
+	# https://rt.perl.org/Public/Bug/Display.html?id=133495
+	[[ ${CHOST} == sparc*-solaris* ]] && myconf "-Dd_u32align='define'"
+
+	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
+	# Prefix itself we don't do multilib either, so make sure perl can find
+	# something compatible.
+	if use prefix ; then
+		# Set a hook to check for each detected library whether it actually works.
+		export libscheck="
+			( echo 'main(){}' > '${T}'/conftest.c &&
+			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+			) || xxx=/dev/null"
+
+		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
+		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
+		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
+	elif [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	# don't try building ODBM, bug #354453
+	disabled_extensions="ODBM_File"
+
+	if ! use gdbm ; then
+		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
+		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
+	fi
+
+	myconf -Dnoextensions="${disabled_extensions}"
+
+	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
+
+	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
+	# allow fiddling via EXTRA_ECONF, bug 558070
+	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
+
+	myconf \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix="${EPREFIX}"'/usr' \
+		-Dsiteprefix="${EPREFIX}"'/usr/local' \
+		-Dvendorprefix="${EPREFIX}"'/usr' \
+		-Dscriptdir="${EPREFIX}"'/usr/bin' \
+		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
+		-Darchlib="${EPREFIX}${ARCH_LIB}" \
+		-Dsitelib="${EPREFIX}${SITE_LIB}" \
+		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
+		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
+		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
+		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth="${EPREFIX}"'/usr/include ' \
+		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Ud_csh \
+		-Dsh="${EPREFIX}"/bin/sh \
+		-Dtargetsh="${EPREFIX}"/bin/sh \
+		-Uusenm \
+		"${myconf[@]}" \
+		"${EXTRA_ECONF[@]}"
+
+	if tc-is-cross-compiler; then
+		./configure \
+			--target="${CHOST}" \
+			--build="${CBUILD}" \
+			-Dinstallprefix='' \
+			-Dinstallusrbinperl='undef' \
+			-Dusevendorprefix='define' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	else
+		sh Configure \
+			-des \
+			-Dinstallprefix="${EPREFIX}"'/usr' \
+			-Dinstallusrbinperl='n' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	fi
+}
+
+src_test() {
+	export NO_GENTOO_NETWORK_TESTS=1;
+	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
+	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+		return 0
+	fi
+	use elibc_uclibc && export MAKEOPTS+=" -j1"
+	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
+}
+
+src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+	emake DESTDIR="${D}" install
+
+	rm -f "${ED}/usr/bin/perl${MY_PV}"
+	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
+
+	if ! tc-is-static-only ; then
+		dolib.so "${ED}"${coredir}/${LIBPERL}
+		rm -f "${ED}"${coredir}/${LIBPERL}
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
+
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
+	fi
+
+	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	dodoc Changes* README AUTHORS
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
+
+	dual_scripts
+}
+
+pkg_preinst() {
+	check_rebuild
+}
+
+pkg_postinst() {
+	dual_scripts
+
+	if [[ "${ROOT}" = "/" ]] ; then
+		local INC DIR file
+		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
+		einfo "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+
+	fi
+}
+
+pkg_postrm(){
+	dual_scripts
+}
diff --git a/dev-lang/perl/perl-5.30.0_rc2.ebuild b/dev-lang/perl/perl-5.30.0_rc2.ebuild
deleted file mode 100644
index e2165b86d03b..000000000000
--- a/dev-lang/perl/perl-5.30.0_rc2.ebuild
+++ /dev/null
@@ -1,655 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.2.2
-PATCH_BASE="perl-5.30.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN=""
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	mirror://gentoo/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]]; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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
-
-IUSE="berkdb debug doc gdbm ithreads"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	!prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) )
-"
-PDEPEND="
-	>=app-admin/perl-cleaner-2.5
-	>=virtual/perl-File-Temp-0.230.400-r2
-	>=virtual/perl-Data-Dumper-2.154.0
-	virtual/perl-Test-Harness
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.320.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.220.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.10.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.340.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.400.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.84.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.20.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.201.905.200 corelist
-	src_remove_dual      perl-core/Pod-Parser         1.630.0       pod2usage podchecker podselect
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Test-Harness       3.420.0       prove
-	src_remove_dual      perl-core/podlators          4.110.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.110.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-interix*)   osname="interix" ;;
-		*-aix*)       osname="aix" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-	PRIV_LIB="${PRIV_BASE}/${MY_PV}"
-	ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
-	SITE_LIB="${SITE_BASE}/${MY_PV}"
-	SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
-	VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
-	VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_update_patchlevel_h() {
-	# Copied and modified from debian:
-	# Copyright 2011 Niko Tyni
-	# This program is free software; you can redistribute it and/or modify
-	# it under the same terms as Perl itself.
-	local patchdir="${WORKDIR}/patches"
-	local prefix
-	local patchoutput="patchlevel-gentoo.h"
-
-	[[ -f ${patchdir}/series ]] || return 0
-
-while read patch
-do
-	patchname=$(echo $patch | sed 's/\.diff$//')
-	< $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
-
-	# massage the patch headers
-	s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
-	s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
-	s|^Bug-Gentoo: ||; tprepend;
-	s/^\(Subject\|Description\): //; tappend;
-	s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
-
-	# post-process at the end of input
-	$ { x;
-		# include the version number in the patchlevel.h description (if available)
-		s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
-
-		# escape any backslashes and double quotes
-		s|\\|\\\\|g; s|"|\\"|g;
-
-		# add a prefix
-		s|^|\t,"'"$prefix$patchname"' - |;
-		# newlines away
-		s/\n/ /g; s/  */ /g;
-		# add a suffix
-		s/ *$/"/; p
-	};
-	# stop all processing
-	d;
-	# label: append to the hold space
-	:append H; d;
-	# label: prepend to the hold space
-	:prepend x; H; d;
-	'
-done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}"
-echo "${patchoutput}" >> "${S}/MANIFEST"
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-src_prepare() {
-	local patch
-	EPATCH_OPTS+=" -p1"
-
-	if use hppa ; then
-		epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die
-	fi
-
-	einfo "Applying patches from ${PATCH_BASE} ..."
-	while read patch ; do
-		EPATCH_SINGLE_MSG="  ${patch} ..."
-		epatch "${WORKDIR}"/patches/${patch}
-	done < "${WORKDIR}"/patches/series
-
-	src_prepare_update_patchlevel_h
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# some arches and -O do not mix :)
-	use ppc && replace-flags -O? -O1
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Fixes bug #97645
-	use ppc && filter-flags "-mpowerpc-gpopt"
-
-	# Fixes bug #143895 on gcc-4.1.1
-	filter-flags "-fsched2-use-superblocks"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$(
-			find "${EROOT%/}${PRIV_BASE}" "${EROOT%/}${SITE_BASE}" "${EROOT%/}${VENDOR_BASE}" \
-				   -maxdepth 1 -mindepth 1 -type d -regex '.*/5[.][0-9]+[.][0-9]+$' \
-				   -printf "%f "  2>/dev/null )"
-	fi
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$(
-		echo "${PERL_OLDVERSEN}"           |\
-			tr " " "\n" 				   |\
-			grep -vF "${DIST_VERSION%-RC}" |\
-			sort -u -nr -t'.' -k1,1 -k2,2 -k3,3
-	)"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$(
-				for v in ${PERL_OLDVERSEN};	do
-					has "${v}" ${PERL_BIN_OLDVERSEN} && echo -n "${v}/${myarch}${mythreading} ";
-					echo -n "${v} ";
-				done )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT%/}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT%/}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT%/}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROO%/T}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT%/}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT%/}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		myconf -Dinc_version_list="${inclist}"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__
-
-	# fix unaligned access misdetection
-	# https://rt.perl.org/Public/Bug/Display.html?id=133495
-	[[ ${CHOST} == sparc*-solaris* ]] && myconf "-Dd_u32align='define'"
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${myconf[@]}" \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm(){
-	dual_scripts
-}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 1957a8d56ade..74bcf4186b30 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -7,18 +7,26 @@ AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae7
 DIST php-5.6.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc SHA512 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329
 DIST php-7.1.27.tar.xz 12219868 BLAKE2B 9de4902504e50b53aab28eac2252aa79302541352b1323a17e68cc58e22cd3b6108b3f7d6ba4779a7f87a561442cf3c44c5660418a354d3b48b6df270a761f8b SHA512 a7019788b02f624e19f804cb0c34578443fc2e0a582a32e72d1340f3cd7bb866631497fe61d18f31f92bad5aa7667847e21bd3916fcdd6f04a3b8f88c805f544
 DIST php-7.1.29.tar.xz 12221984 BLAKE2B a07e7e5ee58f9a74437d865bb7ee9a4458fde52cf3e678128fb4c2d1cc076da0d37dc16c8908011ed542cc37f492d56a6565e06315630d2a213e2a42accdc4f4 SHA512 97575ec588fd3ab51360525fc02058254b95e89e0a36c74a2890ae7619adda1a5489f3675fa83754f8f693af463cdf17232db071351b6ace9f83d4c3c643f682
+DIST php-7.1.30.tar.xz 12221980 BLAKE2B 7b2550e8f1c3cbd40223d9ed1d3e9e7a32550a057ecf0c83ce105a5e17805a57266130830adf60adeb4bbcd4cb787539a04783b0588d84e9771ce036de8b176e SHA512 7c6654e118931a8dab4896a7b62221b863b5a235a9bbce3e0c09abf5e55b964f86b1d2b2c96683b09254829c2569e72620f4d8d50cd05153ee56617e62ad37c1
 DIST php-7.2.16.tar.xz 12166372 BLAKE2B c59ac69b717a8ee88f229baa94c43f9ee1d9c7161c767a95c3a9719ee70cdc9b61aaff75504aca09bba10d224d9a717cb7c985060b6912491857a003e6cbc349 SHA512 cd2ea3c68d7ed20317800f4b838b0dd9ae2fde508c79662b296dacdacf6c7e35b6ef30a6564516d7b22e82749a6e9e2ffcfd95b05cd79a9f227fbfaf9e25bc31
 DIST php-7.2.18.tar.xz 12172696 BLAKE2B c23f4dffe60ad48b53de1c565ecb4f378f5d3daccde98ec8d9bddcfce8bd1a48a75061a72d0094d0db6719a3c0a96cae25ce0ef0fbfadc28fbeff27b332c8107 SHA512 b38034aa13867496009903ba64e4e8bf3216307a9ff1dade60a1477671ecf7bceb5062b349f6997d9af414d58d46ea7bb3f9855e372c230f4a6cff26ad9985d6
+DIST php-7.2.19.tar.xz 12176404 BLAKE2B 2ca4ffaa525bc4b3c52b394ab667f99e1657307e11ccffe7a01f9a3b2974b69edf3039b52d8b3ab4509265c966a1d4722d60d281245136b57fe0dfb7aef72bab SHA512 debf42e35ad4884efbe54095abd1f067ddbb4b1446a7b168cb5a08ef61400f5b59844b29d51bd5fa740bf24bfe822c94c5889b4be1bb159eadb3751f77e37ab7
 DIST php-7.3.5.tar.xz 11981356 BLAKE2B f0ea69358519458d1e48f598f3af808f560d824f417995ea80fc63c8610fb04144a471cee7941802b29eaf24b233b506baa4fff390e57292335f88c434b8dc46 SHA512 3231947b01333987568ec3304bebf0c089a23cd6bc4a7139683bd36b2490fef13ed494108b645d40d5ab55f65990004445ba04af48393a9a508cfa7379ba81d3
+DIST php-7.3.6.tar.xz 11989392 BLAKE2B 3aeba998f05a93f21befc1356365586bcf51186fd356948ca15016569b4d4838b2c9079975df45147f017af775cd870770ffa199682837b4b1b3b8b3938f2083 SHA512 940085bd4c53b11751d962426c73ba3bc30ffa22ac3b4380465d0d15e383ed68f83fa4f22b1246fcdc4f68b46e59512a52966453463c60fb9241c34d8a340ffc
 DIST php-patches-20190307-r1.tar.xz 20796 BLAKE2B 251f0d8b222e4a6a339a3b1d4aff39fab8bd7203ec34295b7316a366a7d0015bb9e6665614005949da9decbca53aa9ac0aab63845638a6b4d3d462eabff4ea35 SHA512 d7a412ec1bc6002c458c6bc3cb53faf4e95a852a6cdad337f6a81a978dd56ba72801cccbe866857d6c5b7e95dfe558878133e44a4e9f9b6efd38e679acc82af9
 DIST php-patches-7.1.28bp.tar.bz2 27464 BLAKE2B 4babea64a2a24f31299997d6a962b3b7506ec1bb77b8e8b4532cce50c1a9eda73829820c2c7883ea97c1a860bab4220e2c576bdd14d8dd80c8e6a3af808c4c52 SHA512 171a8e52c70283dee12316ff8449dc7c7d3bf37c803724b63c7aa9bb12468a795de286075af317ba69080a5e1c3ed59a2f5b3891b35fb1e5045ede277d48e56a
 DIST php-patches-7.1.29bp.tar.bz2 28709 BLAKE2B ad9510e5f550407895371c615db9dc3329c725e9dc61c7a4a2b3bf92ca96040d720cceb333e5c5cc577a9587530da2b0dca5e5466c2acdb0c12f6395927334e1 SHA512 d41fb828cd00473abb9d6d8c8a5f0f2783146874de27c6c7d329437dcd8cc292574f4762e64738d4e7cc584db59d33396908d54a9aef238afda5d445d062065a
+DIST php-patches-7.1.30bp.tar.bz2 30698 BLAKE2B 74bbab7e3d721ce823f1820b9fad1dd61c9b109e50392ae6cf08f9ae1f6b813273d50edad2644913b016b369f6fc32ff5bf1abe0687c23876596f3f18ec20e1a SHA512 832f97636a346c88089190dc0a0d98d39ef69244b441e553a7775da602227338f1f4a6cb90295b4f5fb117f6c64b259120840dbfe0da7352819d94392aff9fd6
 EBUILD php-5.6.40-r1.ebuild 23648 BLAKE2B 1f8cf8f5f9a1584029aa8bae4f770dba5bf721dbe2b9a0cca943056e4cfa362b9e9d199a9eec18e11776235c0eac847b4bc6ce458a8c3cef7efe233f49596c5c SHA512 ff1bc6fdf20b143dccf95862329291c7d38dc29871ac7715ba2ae79e738ab1e80e08005412b47a98c6a427d0b09cba3449c86f10cbf61420a3eadf7807fe50f5
 EBUILD php-5.6.40-r2.ebuild 23035 BLAKE2B 63bae4611a9db68154201cecf202e7182f3c0ac6afe328484c6b345db1d80cfc157fe9f704956767c473b9ae9b52360febf2ffbcb9808fcce690c31730fafdc5 SHA512 6d2683374baaa01cbd03a5504d8fcf561dd0c92b89ed516c3bd7f3c32e039123a0801ee7fa00637361138108d39461721c5077dca56384b262f1dedcd6d534be
 EBUILD php-5.6.40-r3.ebuild 23067 BLAKE2B 0e133da9d0d3879235b0208096e5c99f257f0d93686935d1fb0648efbd92fddd71f579ad59c09368844a251b956fade71aff7d88be2211e2c5832eb2f4b713c2 SHA512 c53b2549a14b55dc16b2d3b8f5c7617ef5deeb30db19606b582126cf32dd040b51b86ddefb3472573c3b11c14f8b72bf5064a0edd37e39b5e9139f2dbdd8e798
-EBUILD php-7.1.27.ebuild 21986 BLAKE2B fc3e3d38972dd2a7d4ab83cbca37ab8e18c6b6859a93beeab4ba9a1495aa9f8485c7b5d0609626ff7360b6c4d9c10f4050c338ab07d10738063ba76f3f48d43e SHA512 65b84a7e5b1dfd8a1a45833f9277d69cb085a13c8b38fb878c0c44c8865cfd6ea41d850171a6d6bf6924c3d05c634d76341405d08518ab862e4e2290ce87e8e1
+EBUILD php-5.6.40-r4.ebuild 23003 BLAKE2B bab714b2a639dd2d5fe0e6aa7722651feeb5dacd9bda551720135256f46443a908d62d83c7fe4d90cf4a1dec98bed9b49f2b25f6bcc42ce7079259b8d1de08ec SHA512 8f24b3011d1532f778dc2899889a8da650cf301a7c8a19c332538885576ee6c18a01b3c7c27e9e3b4866c3c028f19b1b0c33d493f8a19eb0269316bdec7b6202
+EBUILD php-7.1.27.ebuild 21985 BLAKE2B efa2ce2469a2bc5b52d46550506687284c150c95362a4b8c458ca3a54eb09b8b12d6b2a82175ce8ba8c717dd8a9d78b37339a568a7e3e99b9e884da48a0a726f SHA512 dfdc5fd44f04cf7f481a4bb7da30417ab2c9b48f52024dfdceafbd49da614ba682dd58516732b12be7bd91cdf128d4fb86f239c71d8e7c1c098dbbc7f4c4f385
 EBUILD php-7.1.29.ebuild 21995 BLAKE2B 6ce17a7b0a7e41922199ceeab72e05a4327105da6b97bc9af0f5a9014fd4a4a872491c810d721e97e6547d3ee5cb6d235ab842eb8293eb47c7c5e6cde1d2dabe SHA512 6801e4ac7755f816311530a3bbaa08bd48477c9c402eeb37b007a689dd946b716be86aa7ed9c7dd53703bfd073287087f88e75099b58c6dab6558563e48f67ef
-EBUILD php-7.2.16.ebuild 22517 BLAKE2B 3ee1c7b07bc61f650510639324ef7640f2aba8d60e5cd6f535fdcd4492b0359447baf3a181693fb90a3cfe7dc7af893e010c8faa2d53f7dcaacfc2311ddec75e SHA512 531f59496f45462d1c05c3bf5c9c1f0cbb7d2978d4026636ed6efa4b1b4d64d4e44e7a6d6d2ea5bc5aed0c8534ef254a8c32b4ea188d875d5a4847a2003b8b42
+EBUILD php-7.1.30.ebuild 21994 BLAKE2B be6a36e1311a74a8be13ee94d115e88cc071d16e0a2415fe4681fce581d0521316150ef43386d22b74171ab32ef4029c3ecfe98b6dec2006349233a6c0acc8d0 SHA512 f6d039dee7d460eda25e8370de18eb1c9b38887bc77ccd1413f3cfe40769713553109685c59dd8585074fd57695b3578c0f4ce6e8a83cfb2bc3cf3ccc091d659
+EBUILD php-7.2.16.ebuild 22516 BLAKE2B 8a3fb93cb898be7ac86793c8066461b45b5f35972469ca0729ae0c14e5855d06b268c64475015e3ac4c2018cb6a7860acdb9acbda5488656b2625df5fe4868c9 SHA512 dba861469d79acb5769eda7ef1e5f689f6b199a6267e6e769e2e660fa0540a3de73918c1e74793082e66fa8eb8d0cbbf9ef7b99e881751252c236e08090ea2ec
 EBUILD php-7.2.18.ebuild 22526 BLAKE2B e31a0ae6df4fc5b632b06d76e83709fb0c098b6f98a384911ebe7ca2c1873106670221d6506f73a5a163beeb5c43dac7685efa1ba4e3c8746034a7ba779b4483 SHA512 7808dc20a216b8418986464b8bd571c093d1b02fda1dd4d48a4580f6c4632990dc8a0c5542f2786608b0951068ad20fce842b40132c239853a17d41b6970eee8
-EBUILD php-7.3.5.ebuild 22538 BLAKE2B 1fa1a354c598ada995c907fd6aef0e12e806e66fd72275c22729252c1f83b7cbe85869ce60de60034e42fd0c8492a98353c924919743e246e50d93168e2f5ace SHA512 b69f9613f6901fc45a2659d3f972560709ebd9d13ccd75ecc95e130d4e913b7a67c4f0fbb9e93f56cf65fb3103d053b0ede1a6917a791506697fe1d36a477a2a
+EBUILD php-7.2.19.ebuild 22525 BLAKE2B 14c95141789b6715cc032af8de0ff490f8a8520b28ed8c370ff0893b172b1dd88ed0fe766d995f475b51ff6905fd76451c43ab068c24a97bb11f7799fe3520d5 SHA512 17fbbf1728e36d195611f74535847952166ba552737cf0e43bb5337f252e589083da3ea9ad76ac6f8beb43733419d9cf6c13e20f7fbdbb37a315c8d978efe48b
+EBUILD php-7.3.5.ebuild 22537 BLAKE2B 4c042d9e887e578814f716b965ea37f834f5cfe3cc464fcea62b6d0b966e776a2b8b567485ae32b9a7c56705231e9ef2de69b0d93eee4cab5ea874df0921310e SHA512 22ffc7d082a370f3d84271bbb005a03d6faa4c82ab941d3644c57cf80c1b66e960f0a27030ddb26d7c5d52145705e79873e0eda2217311b73fb6fa2e65f00bda
+EBUILD php-7.3.6.ebuild 22538 BLAKE2B 1fa1a354c598ada995c907fd6aef0e12e806e66fd72275c22729252c1f83b7cbe85869ce60de60034e42fd0c8492a98353c924919743e246e50d93168e2f5ace SHA512 b69f9613f6901fc45a2659d3f972560709ebd9d13ccd75ecc95e130d4e913b7a67c4f0fbb9e93f56cf65fb3103d053b0ede1a6917a791506697fe1d36a477a2a
 MISC metadata.xml 3268 BLAKE2B fcd85522c4dbea03403eee66cd3be945f4f998d5eb483ac9c47bd2be2f5f2f4be8586ecc58d50ced7798fdd63ef2136e56d559fa06e870d242239127a97b7b76 SHA512 c44c7fdf1592ba4c0b2cf6f29a97a4a214d2193cb164dcc90454e4a762860a5f3fa67908217543fe72811d403c2ef3b15d2f80f2657f09c1e078d31ef35c12f4
diff --git a/dev-lang/php/php-5.6.40-r4.ebuild b/dev-lang/php/php-5.6.40-r4.ebuild
new file mode 100644
index 000000000000..f5be206db416
--- /dev/null
+++ b/dev-lang/php/php-5.6.40-r4.ebuild
@@ -0,0 +1,789 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic systemd
+
+PATCH_V="7.1.30bp"
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz
+	https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-${PATCH_V}.tar.bz2"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib:0=
+	) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib:0=
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/libmysqlclient:= )
+		mysqli? ( virtual/libmysqlclient:= )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+	)
+	unicode? ( dev-libs/oniguruma:= )
+	vpx? ( media-libs/libvpx:0= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib:0=
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	vpx? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	recode? ( !imap !mysql !mysqli !libmysqlclient )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	sharedmem? ( !threads )
+"
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	local patchdir="${WORKDIR}/php-patches-${PATCH_V}"
+
+	eapply "${patchdir}/"
+
+	# Copy test binaries from patches
+	local ext_src
+	for ext_src in exif iconv ; do
+		cp "${patchdir}/${ext_src}/"* "ext/${ext_src}/tests/" || die
+	done
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
+		|| die
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	eapply_user
+
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+
+	mv configure.in configure.ac || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with mssql mssql "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_with truetype t1lib "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+		$(use_with vpx vpx-dir "${EPREFIX}/usr")
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib)
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.1.27.ebuild b/dev-lang/php/php-7.1.27.ebuild
index 84292498c638..3be3c0289627 100644
--- a/dev-lang/php/php-7.1.27.ebuild
+++ b/dev-lang/php/php-7.1.27.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.1.30.ebuild b/dev-lang/php/php-7.1.30.ebuild
new file mode 100644
index 000000000000..36163a52adc8
--- /dev/null
+++ b/dev-lang/php/php-7.1.30.ebuild
@@ -0,0 +1,737 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( hash || ( mysqli pdo ) )
+	mysqli? ( hash )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+	"${FILESDIR}/php-7.1.25-intl-use-icu-namespace.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.2.16.ebuild b/dev-lang/php/php-7.2.16.ebuild
index dc25d150df81..30968e0621d4 100644
--- a/dev-lang/php/php-7.2.16.ebuild
+++ b/dev-lang/php/php-7.2.16.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.2.19.ebuild b/dev-lang/php/php-7.2.19.ebuild
new file mode 100644
index 000000000000..c1a7fb009fc2
--- /dev/null
+++ b/dev-lang/php/php-7.2.19.ebuild
@@ -0,0 +1,749 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( hash || ( mysqli pdo ) )
+	mysqli? ( hash )
+	zip-encryption? ( zip )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+	"${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.3.5.ebuild b/dev-lang/php/php-7.3.5.ebuild
index 1e66c720846d..e8bbeb8dbb09 100644
--- a/dev-lang/php/php-7.3.5.ebuild
+++ b/dev-lang/php/php-7.3.5.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-7.3.6.ebuild b/dev-lang/php/php-7.3.6.ebuild
new file mode 100644
index 000000000000..1e66c720846d
--- /dev/null
+++ b/dev-lang/php/php-7.3.6.ebuild
@@ -0,0 +1,750 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( >=sys-libs/zlib-1.2.0.4:0= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	zip-encryption? ( zip )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 0a2e09c33de0..dac15b93a2c1 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -18,7 +18,7 @@ DIST ruby-2.5.5.tar.xz 11459832 BLAKE2B ced1105a87e7df8f82a65ca8d1d329d5a9d110d2
 DIST ruby-2.6.2.tar.xz 11889840 BLAKE2B 817919c078869c2ad8d5c9d8c8b7ee77e8b0e3339c2ef662a94a666a859f762fa63c6f8534027abd368e91fe4e3e1fe68fa984cbf12f76cff8c0c66f0114914f SHA512 13f7d7b483a037378eac4bf4bebddc21d69f4e19e6bbb397dd53e7518037ae9a3aa5b41fc20bf1fe410803c6efc3a6a65a65af47648d3a93713f75cfe885326a
 DIST ruby-2.6.3.tar.xz 11904360 BLAKE2B 8113e5a19b967cdf995a3c8d3c83aeab3bf89e975d3b039c64259e97f20dbe9ebd96ada093f9d330516d16ef78bb0ecbbac8f3facd467aa13f1f70b23b992f82 SHA512 959a613f5cf5b3185a1d7a7ba0e1921166b3930f30461b391b1c9fcfe396f56dc3c736123dfc7b4e72c32a97dc5a1eb1fd7f09bcc3793a3c5526f6644ba421c8
 EBUILD ruby-2.4.5.ebuild 6638 BLAKE2B 60776351e5ae33272a850e56380e97e31e847ecc2465af1fbd248412420fd059d64d874b405def2a27cdb0607338adb26d23832370a3bd2570e2997b14a75763 SHA512 8dd3dd6f0eed58577c126da3b6d2a777b5b31b1d445acaf887cd5f47e6ce3cb65317903a895bf0655e4c82f2d1ac8aec4bf6d72b818cbf788de844818839f2ca
-EBUILD ruby-2.4.6.ebuild 6653 BLAKE2B a62d8e82bcdd8dc0fe40b23163a202789df2345a237905180c3f1a87b48664d959492cb9b488125b363d04f3d5e69398f260c4cddba14d6c19587445e6a56dcb SHA512 878744fca945aca6dd9a4a66c4030b52868da3aa44256974131ddbe0f4aefd2916388b389b458bd58e670114a32c01e2024084dde2e5cc472344508c8656112b
+EBUILD ruby-2.4.6.ebuild 6645 BLAKE2B d8a0bf25351cbf8dd58970b2d4aec10579f5a161f1638c7a2d1960d42fe5a5d40044647714fb4a211a4c8707684ef6e403a4621d5f42156a97dd23698618b3a2 SHA512 dae928dc3ac23c92e8572a58cd4a6e7d2366c9614bb8259615923ec25f7d5e46d3c6234dc3739f17a3559d80cc9c893306862ac3a6c4785342254aae9dc76068
 EBUILD ruby-2.5.5.ebuild 6441 BLAKE2B 97c692de717b9d44e0d9b8d103724ec38d21dff92abf72cadd0d71be84a06571de25e03df7b7504d5454d2a285d2e4d35111d86b0243d4e5c354e08286160af4 SHA512 f92219d85d450f8a4fbc6a234bde80e697a5227039648a57cae6232072311298f9f347ee38cfb7bc3a3d05d758fce3a1e19de367fa40b1b3c545f5c4895a7957
 EBUILD ruby-2.6.2.ebuild 6890 BLAKE2B 5e5ad0a30bbdd407d02c00ccca1aa8c70c9be01eb24dd82cc79faa9b2b80fb34bd36440bf80201599f99a1272dddd41f474bdfc2b860349f5d0fdcc2424d0591 SHA512 6235530ab7b7d9640875b1362c971325e481d5d50175c1dda17eb0ad26a10d323a43cabec8f7d156aac050e554b24626af3ef2bfd0d19879fa5323efabc88a55
 EBUILD ruby-2.6.3.ebuild 6890 BLAKE2B 5e5ad0a30bbdd407d02c00ccca1aa8c70c9be01eb24dd82cc79faa9b2b80fb34bd36440bf80201599f99a1272dddd41f474bdfc2b860349f5d0fdcc2424d0591 SHA512 6235530ab7b7d9640875b1362c971325e481d5d50175c1dda17eb0ad26a10d323a43cabec8f7d156aac050e554b24626af3ef2bfd0d19879fa5323efabc88a55
diff --git a/dev-lang/ruby/ruby-2.4.6.ebuild b/dev-lang/ruby/ruby-2.4.6.ebuild
index 04e38de79d98..689901541ea7 100644
--- a/dev-lang/ruby/ruby-2.4.6.ebuild
+++ b/dev-lang/ruby/ruby-2.4.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
 
 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 static-libs tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 3c0b277d8c24..01e1178bf9f5 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -82,6 +82,19 @@ DIST rust-1.34.2-powerpc64-unknown-linux-gnu.tar.xz 125735384 BLAKE2B c25d43fa63
 DIST rust-1.34.2-powerpc64le-unknown-linux-gnu.tar.xz 129619832 BLAKE2B df76b7c08941ae2cb512ba656b09a7b87e1e656badbadf58d64ab5f9133e7248a63873675ac44f16207107a0f68da6089706b46af94154c0bd51aed655f8b578 SHA512 3c881e7bcf622237f279855ebaeb544f4df9bfe5bc1f74578093d67befed8f027692ea56dc773c653bef8a124e9ebac2544d0c197a0e3a1ec8da63ef9d434412
 DIST rust-1.34.2-s390x-unknown-linux-gnu.tar.xz 134376720 BLAKE2B 3eb1452bc0f5d6cbe5547f18ad039c54d4fee44e8c24e35f3399272755cd293df008db2c7dded32c7853944e43de7a4d337b7408835445a4916dbf55d14a7b3e SHA512 181f58b00cdccb205be853f5d00fc0a0c939b7e4dc801717b21ece0f714a8f3b501f1196eb2e3f3081932a0417a6218763c3d095cdd036e9f202cc41291876a1
 DIST rust-1.34.2-x86_64-unknown-linux-gnu.tar.xz 157279864 BLAKE2B c25fcb6168e16a4deb19a8ca9b3d91966194f4c8d2e60933226fab015b64a819f6e56a6b51b6e9457ce80efaf5bf71f2eed2f3e6e39bef5856524e33d0a5637b SHA512 64d6b7da08ffd877c10d819605a37b0bc178c4ab80e2f7449f3d5ac9254a438e148da3729408b4c9429ed499d7f142c9d2926f5c916e0a32bebaaefe4b0a09a6
+DIST rust-1.35.0-aarch64-unknown-linux-gnu.tar.xz 132705960 BLAKE2B 134e71195a69f891d7b60bd2ad24468beb0796480d2a48707058b085a6f9255bc092578015be89dd29cebbf1b5f49221735dcedd0cb79a1975220531e5f4d364 SHA512 9231e4acf26dc19a31c6c9623c939eafd0fdefc18debb8569baae36d3ad3410e21097ae2306b5adc48bc5e219da1dc1df38569e1d0ae9b0178d5a2e815c20db8
+DIST rust-1.35.0-arm-unknown-linux-gnueabi.tar.xz 134286432 BLAKE2B 3cc7e664e4d59f0a7ec5153b67c95ccd78c40b2d32a30f2082d8c8370d9e41a47d9e60b0b1182a4e4f8d0e81fb276a16092e4c7911da4479ef0998b0d36ac273 SHA512 e16a4484e1788b4b2cd14482c7717fbc3cfc0b38cf0a483ad4d1bba174ba8b9e631cb6a04fd442e05ee6c9c8291dc344c64b0ced10e342bf75c9ad6b63480723
+DIST rust-1.35.0-arm-unknown-linux-gnueabihf.tar.xz 134633256 BLAKE2B 0487f81ea9635c037a601cce5a55dc4f54eb14adef5056e3e2e83086fa0a4384e92179cbe3ae476d0b9a7e0860a718265fa0261f6dd762444812e3263037e18e SHA512 229d206f30387109649a434c23a8b9af14c2942691cba3a22ca3d76ca76942bd0ad44e0660dd72bdd9a00214a9fa6c140691bd5dd879af35cf2abf9f4a7cbac8
+DIST rust-1.35.0-armv7-unknown-linux-gnueabihf.tar.xz 136384068 BLAKE2B db8ba39772e150d829cb9c86f20c89c09b1c6a2c996fe5300e265704a0557e8cd879690ede2f03e4ba03d5201a368c65b53a471d581e7ae95646b50992fd4fa8 SHA512 4d80fdc7483566999d8c38b6772c1f1c6cf0f537f68bff9dd9ed68931afab569e02fc9d5ed2999fb1d3478113527840676d903630f93c3d79c30fdba0b98a2bb
+DIST rust-1.35.0-i686-unknown-linux-gnu.tar.xz 173765732 BLAKE2B f55ffa1742bc68c733d8392cafe592a937f0a07e3dd50b63aa7479839c0f18d1eecabe897d962635f5dca669053a7a28b5dc2c7d736f581dad9d7ed508bf5ddc SHA512 33a603f638ced850c4572cc81041b1ab47d95a062c66ea24695e449cca7ac6353757c794a85af4a15e43e0ce091c7cc47dbd01fd30e23e1bae6ced194a08a667
+DIST rust-1.35.0-mips-unknown-linux-gnu.tar.xz 126071936 BLAKE2B d0c34edac3e3a36e096efc51116b5073dc7bbbceee6373c2c9720150fe64a6d1e19450590f63b89111f7e93b72af3cc838215a153fbd069d6a66236ce65265f9 SHA512 a70490da14da69c7700c446925875babd8bf6ba0f81c4bf3b838676439a88be1d7cc49290b265f56fad84c8d31fc95c90a46164feeed5b7853751eb71678ad5c
+DIST rust-1.35.0-mips64-unknown-linux-gnuabi64.tar.xz 135622404 BLAKE2B 63c4334c08a774a47712ff5781ebebb0ecef828ad26542f22e96a74ae31ca2ac946b02f835403596bb00ba3d6d4bd7b736a34626e97d43aef631b936bdc0d467 SHA512 cd5525846129eaa09ebf8c91ff5ec098241ba3c75539d09d415b09945c18d60cafacce6263def1c3c647cceb28750fac7f2210366a8a8f3e8b30c4e4dd79f96f
+DIST rust-1.35.0-mipsel-unknown-linux-gnu.tar.xz 128447920 BLAKE2B 896586031be5be6cf8f2b1d9729a594f99b42c8af72ab1e91c45b2716dd70279c6126290209262175e26ba12a9644fc7007f640155aebc226c568684256113c7 SHA512 42a3828eb1124fde0026be35885034dbcafedaa0ccc02202778f488e89dc4c3f5085341f5892f46f74f4dd2c541c579470ca25ba7315c2316bff7e7a293f2340
+DIST rust-1.35.0-powerpc-unknown-linux-gnu.tar.xz 128414412 BLAKE2B 4bedb0d572c615d763a0d2c21aea60b59b985193cd43c4d649b8c945728d65606ba3f40f4a0a2fd0524bbe8a4895787efabc6fe4517b070e321f2a2588b06740 SHA512 ea9b908f3ddc1b659b1dcdfa937bda410a2778f2133c797258eac46b73b7f44a0ab12d99a02549f8dd4de243bf3ddbe4279f132a8cb66389ed30af3cf7692652
+DIST rust-1.35.0-powerpc64-unknown-linux-gnu.tar.xz 139462276 BLAKE2B b99ee8f5f0f372f975e1f690a9e2dea67840220a3f893189672e004045332cecf1823fba3d155348a70c200649a8ff7891bf08fe2f726e69003a71165ea8dfa5 SHA512 a89094b58ffdb4940e51c4c2e5f5efa094d7d6c1a2b2382397dbfb05eeaf99e9329a8e7c51da602a6b8935ebb4f6df475a1873748139d9f9a97b8bd40c49849b
+DIST rust-1.35.0-powerpc64le-unknown-linux-gnu.tar.xz 143826544 BLAKE2B ff5f814515034b382faf40dc0d95623ec57c4f063ded1bb89364594736269744f5409c978de24fa29f6a061d1489179456a90847f5ce8de1f684df22fda68b75 SHA512 3b63dac50a92693d13066aa6e96de05fceb2da6c07834adfab8c12e6a78f59051dfa008062b1d2ad410a009e2164fc716d689231e552379e419161d1620d0066
+DIST rust-1.35.0-s390x-unknown-linux-gnu.tar.xz 152808372 BLAKE2B 96a1e2b96b6a1faf5a3125494b17c4d5f95ea618a5ff8f7ddb7506ebef4fd6cf7f9a2ae961657b7b969a5f3cbc870c805c6634163e7f5fc71e058ea4528e19a0 SHA512 11539eb25e474bbaa8e57f21c3f64506859bc86baec74df24bb4aaf5361745840b82ff715fc54fbd6ba654a8f7fd4f064af0538b983dd489cd69498bd70d1bf7
+DIST rust-1.35.0-x86_64-unknown-linux-gnu.tar.xz 161491264 BLAKE2B ed336829cfe4199750798352e4e338f307033ea0eb5db9ab68f9cf7465d86edbd1218d3e929c775822fd5db3d73a5d75c6e9b5ca45ed6b474bffe403f39f71a0 SHA512 49976ac2fbac5b1709c4a7f3785eb99ab827464ec4d99ee7190df16c3be23e98de606566b57df2231a15097c7fe984e0d19496ce7478ccc1f0f2c7aeb32ecb04
 EBUILD rust-bin-1.29.1-r1.ebuild 5626 BLAKE2B 7d27715a7beb483ccf7062437993a36d05a0ed427d8f6774301575b93135382f97edac7fd2bd449e6d6ad6a98793cb09d5d8f27cc037e85c76712a5e1226c071 SHA512 75d18f6228221d9d465dbf32fcccb06246dc93bfddc4f7e54a50871e67f7bb5282e6b2fb1939103572969ea04cff51470a9e44093f5d9aff442ae493489082f2
 EBUILD rust-bin-1.29.2-r1.ebuild 4713 BLAKE2B a68d944fcf5c107d1af181d3549423505d65897a2d3ddd2e041f14dceceb3b99e1a9b4552df333b20c7356279befbd5992e41188c4a4351438c5221aae821060 SHA512 befff3078c9a71be9532ba8f0b59899de2bf5c3a3d44189b4daa7cc8f27f7620d010f5e4590ebd663090a5ca3f2bf6bf2016e6b8a392b8f1ea39cf0b7a71afff
 EBUILD rust-bin-1.30.1-r1.ebuild 4462 BLAKE2B 46e87d76b2f80c9cdf25d32fb8923f47b2c54b3522a5f19df1317e3b0c167918e5eb17aa8ce6c4341c1e020d632d80b1d1389b2b45ecb7c9e38cf29d218e974a SHA512 a677a84aa5a8e588c7218b709eda7dbdb69453da6e6135b3c419257662e96cf30be17eac5336ac5def27c43871cbd4245420403816b2f228f74b5b0c318400e4
@@ -89,4 +102,5 @@ EBUILD rust-bin-1.31.1.ebuild 4450 BLAKE2B a4c35b3a113d18c684b63831ef241b3cc7611
 EBUILD rust-bin-1.32.0.ebuild 4856 BLAKE2B b7099ca2e312bf344a609ad0c13a2c8662aa954f4c28941014309d7a942ce4dee5b7baeb76b4220f414997c444bb79642992e1247046b78dff1830f65cafae5c SHA512 98153414cc7bbb78e38060af97baaef9dfc67289dc5338eeee9618a219c25fb2b9ad2f25e786e7cc277e87faa96912c0236b9720a60d4fc2c9ba1d0bb1027659
 EBUILD rust-bin-1.33.0.ebuild 4856 BLAKE2B b7099ca2e312bf344a609ad0c13a2c8662aa954f4c28941014309d7a942ce4dee5b7baeb76b4220f414997c444bb79642992e1247046b78dff1830f65cafae5c SHA512 98153414cc7bbb78e38060af97baaef9dfc67289dc5338eeee9618a219c25fb2b9ad2f25e786e7cc277e87faa96912c0236b9720a60d4fc2c9ba1d0bb1027659
 EBUILD rust-bin-1.34.2.ebuild 5534 BLAKE2B 4d1f3d796fd88cefd636e2b8f6b7d7df44b4ee680837d41d3889dd5675bc6f301d96d4266d53ce8707e8e998aab43cead6542de32aa5e62b5a9c6c1bf98a225e SHA512 cf9589e45fbbbec01c77a0e49a61e56b09ece71a3d00d045854df776099ea8b60cf7e2af2371f5128918ad4c83b08b0d52bc0fa6aca02738bc5e5380f7f85c9b
+EBUILD rust-bin-1.35.0.ebuild 5154 BLAKE2B 854c0c2fab097a229e19ed660a4428c2eacdaadbca23316fa4fdf468d76eb6fe8a130462d5925e8c4e2bac87496805974744c756a06fb4fd9cd912765c62e5a9 SHA512 f5a0006b0c23443c5c8b4f680da3619126260933b56d14aa2c7946814e3f9b123afaca24aa8fc2f4795f5706ee30fd4d49d15894b7b87e10b20f8d896dafacd7
 MISC metadata.xml 435 BLAKE2B 5725f771e138720715bb1a5f317bbe0757d981da2059320e5be70583c3a98dcc4fc23141a3b489cdcffa2a53dfaf621b0ee0336a3ca6a05bf7bf8db1b06cf0c3 SHA512 af938d75754d54ed33a87410cdac16fe4b74614e3c5e352c2c1f906137f0a3e96a2eb1036d0aa7b2a17b629b05d44fdf44348b53f7720c770c6e6cae2a715f16
diff --git a/dev-lang/rust-bin/rust-bin-1.35.0.ebuild b/dev-lang/rust-bin/rust-bin-1.35.0.ebuild
new file mode 100644
index 000000000000..3d416cb7b4ee
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.35.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 rust-toolchain toolchain-funcs
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt"
+
+DEPEND=""
+RDEPEND=">=app-eselect/eselect-rust-20190311
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libssh2
+	net-misc/curl[ssl]
+	!dev-lang/rust:0
+	!dev-util/cargo
+	rustfmt? ( !dev-util/rustfmt )"
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+	opt/${P}/bin/*-${PV}
+	opt/${P}/lib/*.so
+	opt/${P}/lib/rustlib/*/bin/*
+	opt/${P}/lib/rustlib/*/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.rlib*
+"
+
+pkg_pretend () {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+src_install() {
+	local std=$(grep 'std' ./components)
+	local components="rustc,cargo,${std}"
+	use doc && components="${components},rust-docs"
+	use clippy && components="${components},clippy-preview"
+	use rustfmt && components="${components},rustfmt-preview"
+	./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}
+	local rustgdbgui=rust-gdbgui-bin-${PV}
+	local rustlldb=rust-lldb-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
+	mv "${D}/opt/${P}/bin/rust-gdbgui" "${D}/opt/${P}/bin/${rustgdbgui}" || die
+	mv "${D}/opt/${P}/bin/rust-lldb" "${D}/opt/${P}/bin/${rustlldb}" || die
+
+	dosym "${rustc}" "/opt/${P}/bin/rustc"
+	dosym "${rustdoc}" "/opt/${P}/bin/rustdoc"
+	dosym "${rustgdb}" "/opt/${P}/bin/rust-gdb"
+	dosym "${rustgdbgui}" "/opt/${P}/bin/rust-gdbgui"
+	dosym "${rustlldb}" "/opt/${P}/bin/rust-lldb"
+
+	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+	dosym "../../opt/${P}/bin/${rustgdbgui}" "/usr/bin/${rustgdbgui}"
+	dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}"
+
+	local cargo=cargo-bin-${PV}
+	mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die
+	dosym "${cargo}" "/opt/${P}/bin/cargo"
+	dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
+
+	if use clippy; then
+		local clippy_driver=clippy-driver-bin-${PV}
+		local cargo_clippy=cargo-clippy-bin-${PV}
+		mv "${D}/opt/${P}/bin/clippy-driver" "${D}/opt/${P}/bin/${clippy_driver}" || die
+		mv "${D}/opt/${P}/bin/cargo-clippy" "${D}/opt/${P}/bin/${cargo_clippy}" || die
+		dosym "${clippy_driver}" "/opt/${P}/bin/clippy-driver"
+		dosym "${cargo_clippy}" "/opt/${P}/bin/cargo-clippy"
+		dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}"
+		dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}"
+	fi
+	if use rustfmt; then
+		local rustfmt=rustfmt-bin-${PV}
+		local cargo_fmt=cargo-fmt-bin-${PV}
+		mv "${D}/opt/${P}/bin/rustfmt" "${D}/opt/${P}/bin/${rustfmt}" || die
+		mv "${D}/opt/${P}/bin/cargo-fmt" "${D}/opt/${P}/bin/${cargo_fmt}" || die
+		dosym "${rustfmt}" "/opt/${P}/bin/rustfmt"
+		dosym "${cargo_fmt}" "/opt/${P}/bin/cargo-fmt"
+		dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}"
+		dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}"
+	fi
+
+	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
+	/usr/bin/rust-gdbgui
+	/usr/bin/rust-lldb
+	EOF
+	echo /usr/bin/cargo >> "${T}/provider-${P}"
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	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 24c127f96aa2..9dadca937728 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -7,6 +7,7 @@ AUX 1.32.0-system-llvm-7-SIGSEGV.patch 1521 BLAKE2B d5595ffdba23e41ea299605968f7
 AUX 1.33.0-clippy-sysroot.patch 3090 BLAKE2B cd3c11669e63c6fce527910b80add322bcdcfefb45f7936fb8b73750b81da445839669b6e973fc14730766c746d1da6906643183375af275070606e3ba716be8 SHA512 f54b8f1ad74ab0bcb7cd579385980df0fd986b03290bba2dd5f3c78a1994e3ec64a870d77e6c2a9ea83a113d972b8221f5e3e2131b23be9aea882b08af512b0d
 AUX 1.34.0-doc-build-fix.patch 17719 BLAKE2B 9fa2ce19c51c5fd6fdbf113f22f16db741ef97323d2d0807ffd66d5ffe52e1af1c8fe663fb3f24797b427f6689bbb624c2b4ea7840f17ad50924b21c84e06176 SHA512 5b5098b4c2110c9f5272015dfc04756ee9a9fb1c52763ccc2b3c1349146ebf2e0cbe5ef7fc5d30860024eb626a645409e78da26b9d88c25d8fabc5846905e786
 AUX 1.34.0-libressl.patch 7747 BLAKE2B 6c977bf710049a14333ae2e05ac051b117cccbc6b2e42f041ec9538ae523d2014255e95c997a01de60861e136ee465bdc4c113c395df12e0022bb340070633f1 SHA512 6a6405faadec3f7a483adc6f61fe312f5779e66620fe307fc27414aa1721ca6cdfc57ab153cd2d00ba0e37bc4aad8b6cf3ac29f43190a8367b9fd22204c40344
+AUX 1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch 4921 BLAKE2B 58cb6e6bf7dac8cbd4fb8cb60de61235ad9fbb105172a830a8dcd26661f5a36b50f386a858b319a014e17841349c186a6f760c5776a7848a96af08c39de0e370 SHA512 7d253aff433807453f3d02b3791ac68cbca36937de0e09ca03b429ccdaf9bf8f89578435e2d2901320c371491c08826b29ed665085ca70bff3ae904ed19cd999
 DIST rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz 98937652 BLAKE2B 836d3dd4e583fa50dd317c3bea56257e6ea19defdb38c16be6debb2854e147c8a92c4832263e4ac314136022a176526fe7d3774a3c5a84cd8d364cd2a1532860 SHA512 8d9acbc90ddaa1e0de0234a21798b19b5365ea371a12f9a143c6ebacbb48f57344da6e827e867513be502bce2801de27a0dbbacdf8618c653aeb58026b6c469c
 DIST rust-1.28.0-arm-unknown-linux-gnueabi.tar.xz 104676648 BLAKE2B b26b23c3605e6584c51e0e914dbb3be60996e079e52ff2d4850ed43c1f1f7cd5ac575b40dbe852f927d36654f5ab7e384548f3a92b3466bfbb1cda7f9f069bcb SHA512 a1eaf1d7826ebfe222d233cabd8b88073ca2c8dd42a0b870e324dfc63e7290308418222c56802bc421c9bda119dc7c5f3e225ff33cacad5776b79cbcc1a877b2
 DIST rust-1.28.0-arm-unknown-linux-gnueabihf.tar.xz 104992084 BLAKE2B df97766d7abf73f668a2936834bc0f35739289eeeb5395276a2fdfd5b6c0baee3ba1eee1099f19d4f4f1cbd1a33cf62ad888dd3d1856b613ac853c6a17650741 SHA512 3b58b83f38bf8d8e841ae6614d72bb6e6faf75fb7c19abc5451548b0e6de0ef3b64dfbc70481a1e40f74074bfad701aa7a58296b4a0d07957a418bd3cd769917
@@ -85,6 +86,19 @@ DIST rust-1.33.0-powerpc64-unknown-linux-gnu.tar.xz 126030216 BLAKE2B b1d1b996b8
 DIST rust-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz 130922680 BLAKE2B db63d859631703e845efac57074e0f33f80a3b52b2e9dc8707b81892eee8fc922fa5a7d4b7b1f45fb5f19ea4d7f6fde9212f1c6e99e7e4c30dbc02aa87b0df7e SHA512 393c808e93792cf2b126d6111834932a55cbf18339942ac0d20fc4a3692b0ac08c21a3c8fd393795f7aafecac5a2c5d7c9415c18017a7453f759f746045f5144
 DIST rust-1.33.0-s390x-unknown-linux-gnu.tar.xz 134441220 BLAKE2B e6f0a6e54e4e1fde10f54f66615d44442b7cb5eb5bda43d55ee791328c7ecd61505b3d84719df82b7c5c7ae473b7041512f2cf346281518d7d78d0e22112fa05 SHA512 755a0203e2c143386cb3729faada4d2c38b254dfa7e6eeb722ec9847d6319a1d3d289c7b77a2bc478d79dbbabfcd826d8b015acd29fbdf5acb591feae1876205
 DIST rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz 155298128 BLAKE2B af5bc628bc054bd354d5af78e53cd2ffbfbdf2c2d3a3e58eeb593f148c54024fa5905aa53a69c514d6d41e48688697e1ce8adb866817c77cdf541399f6e7956f SHA512 b7f3087f34e99517cd729f5ff1f8cce3f3254cb36c734d5b90d878293e4406934c2f597bf7e2941e9257046f62c9274eb4769a64dabfbc5f0bbf2a1703f7fef8
+DIST rust-1.34.2-aarch64-unknown-linux-gnu.tar.xz 120868188 BLAKE2B d843cce81338b2b3765c973f06dca83161fefed129efefe94efad663b5ddef54aa092bf5977ba7bca74519b008796e60486cf8b193ec2a2dead3add66295d41f SHA512 7103362b8840d094661a16053d8f07eba413c369bf3a2b686313875aa97c30b35697fceefbfc90dffd5cfd4de946e7f848f2b791736443639b30bb75709b7122
+DIST rust-1.34.2-arm-unknown-linux-gnueabi.tar.xz 122563056 BLAKE2B 05e73de7d58723affef3f272e646245a97b17373cc960d5e1be0365919ad3879e08bd9012126e41235b97a758bb57fa4e67fcd11e2f29322af9ab039fc3e2dfd SHA512 d6c055e8ba0fd494797a55d2a6df1eec2a6361c0b081e4b7cb06e42a03a644e4de49c7b17dc8cb6484f3271517f2bd50935bc72ead486531b5b370a1c576b12a
+DIST rust-1.34.2-arm-unknown-linux-gnueabihf.tar.xz 122858592 BLAKE2B aebe65fb64044c342f525749eb5d67217f459712aa72d49497062af461901a6e92d21b00e05439bd0753228b876f521198a8b005b116b5121ec3dd812df4bec8 SHA512 5cc2612988182b68d9b220d6d7620fc0b064a9d347825d4677959b7e43820647ff25651427db3a5c72401ab8d0c14e2976921d71ddbe0a5b540cf045241cd727
+DIST rust-1.34.2-armv7-unknown-linux-gnueabihf.tar.xz 124601212 BLAKE2B 7ab258783070d3ba1e27431faf36a8c75d0afae935bc4ba08bf1e6b7f080d56cb3a9ac3de8b91ff9885e2df2ccebdf29de80b99548c610ea30c157103b920434 SHA512 fe5be9a345d10ee2b3a47986977be91cd2dd94f2076571f810ac21cea36f79f073eb16915c090861cf46c6835f86db64c2ed1ef036f911b3be829d7927ecb747
+DIST rust-1.34.2-i686-unknown-linux-gnu.tar.xz 169581332 BLAKE2B 75f1fc4c52e81cb9c7f95d18d9aff2439bfc698444321d92f09d5a47e493d693f2cae3d8ee56ccff59ca967a0a2a53828559eefce1398a2450fe39c95397e3e2 SHA512 056243d226cd9a36dfcd266f2aba88adde58dbcfa87f20613183c5dcc514bb413e25f6d6963494dc141f4e91649b17b1db91e6a9d313af7ef7b1893b64337c33
+DIST rust-1.34.2-mips-unknown-linux-gnu.tar.xz 113493608 BLAKE2B 10df3e2eb9fd9200bab1ca94eafd80f680c94bd21589f72fd660e9d819a6615cc83e47ac70df87712e252946f58df30824be992f16ca707b72451898e1884e99 SHA512 ec100071fbd8373baf41f0f517497b9923a77ebea8257d2fdcc9a4488d7ec6d59c0b517f4d922a0f7f699d701510d32d49c1e699c69a94f571f73ba46fe795f3
+DIST rust-1.34.2-mips64-unknown-linux-gnuabi64.tar.xz 119118112 BLAKE2B 8ba04a90e82bf7d830c750350570dde8cfa0646f1ea10c583927cc6c7ceeb935fb4035248d8a3ac4a477a858a32d3753811e2893220b8b3919e882213dd63373 SHA512 bb3c5e8ce24895a07984059fca53f4737777a78d350312292877b8e1c21a7a84320f1fee4d64c9d684d14be5fe500494d38ef3f5ab4e4f0e84cbd3f3d30a8586
+DIST rust-1.34.2-mipsel-unknown-linux-gnu.tar.xz 115776696 BLAKE2B dfe09e60be47c6cbe183e4f4bb358cd6d1fe0872114d6a663ee95cd063155f99688bdf23b5c7230b626351654da8f38c7b763099b8d6c2707e185449267c137c SHA512 91348409dfdb63b82e6b6a3097d181485f05f0dfb6cd3bd80785da2eea23f493a90a4e07e660dbc14e9c887ff7e27bc0d13203c78feece5aca219e439a9c18cf
+DIST rust-1.34.2-powerpc-unknown-linux-gnu.tar.xz 116817940 BLAKE2B bd7fcc7e0e8844d23e73bb8bc07f7454d234d4fc96d6549399c399845af147debbfbcdea2c53d1ad5a28126d6c9cc20178634290fb837f0537947f64d688df75 SHA512 b8009e9ab2e9167cce8e1911ec0bebc9959a89bafcb645637f2a55af15a2f4f5d4fa20d6b38b7ae572480f3d3817392b8c6386b6ed589b34dd0a02529da2a459
+DIST rust-1.34.2-powerpc64-unknown-linux-gnu.tar.xz 125735384 BLAKE2B c25d43fa630e9b95692bcb493064f592a12ecee700538671192f04cfdf443a5d046493662c88d91f62cc1eba94e80ec9b6bed9949af9a8bc83788521832336d4 SHA512 d1ab37d68c0b52e3780ea133f8ba4d5b823c7f874bbf15f97f304c21405b1fdbde3d28e83381f08095fca8e2ea615f46accad725ee854ad9db168ab4629e30a3
+DIST rust-1.34.2-powerpc64le-unknown-linux-gnu.tar.xz 129619832 BLAKE2B df76b7c08941ae2cb512ba656b09a7b87e1e656badbadf58d64ab5f9133e7248a63873675ac44f16207107a0f68da6089706b46af94154c0bd51aed655f8b578 SHA512 3c881e7bcf622237f279855ebaeb544f4df9bfe5bc1f74578093d67befed8f027692ea56dc773c653bef8a124e9ebac2544d0c197a0e3a1ec8da63ef9d434412
+DIST rust-1.34.2-s390x-unknown-linux-gnu.tar.xz 134376720 BLAKE2B 3eb1452bc0f5d6cbe5547f18ad039c54d4fee44e8c24e35f3399272755cd293df008db2c7dded32c7853944e43de7a4d337b7408835445a4916dbf55d14a7b3e SHA512 181f58b00cdccb205be853f5d00fc0a0c939b7e4dc801717b21ece0f714a8f3b501f1196eb2e3f3081932a0417a6218763c3d095cdd036e9f202cc41291876a1
+DIST rust-1.34.2-x86_64-unknown-linux-gnu.tar.xz 157279864 BLAKE2B c25fcb6168e16a4deb19a8ca9b3d91966194f4c8d2e60933226fab015b64a819f6e56a6b51b6e9457ce80efaf5bf71f2eed2f3e6e39bef5856524e33d0a5637b SHA512 64d6b7da08ffd877c10d819605a37b0bc178c4ab80e2f7449f3d5ac9254a438e148da3729408b4c9429ed499d7f142c9d2926f5c916e0a32bebaaefe4b0a09a6
 DIST rustc-1.29.1-src.tar.xz 61937676 BLAKE2B 6a60249538e1ec62471f4d0e3fc31c0a648433aa6f85ca7341657ea07772e338eb92a629941685808f4b80e84cb025d78aee9d0d6fa71c6635a1647c61bca9bc SHA512 1ded651b4c460e11e5e44c26de88a80fb13c2000097de2ee1e5af89638e12a7e8f43dd756689d4cc4fad45c52d4d43a3c70dd6a3ae550735b9dad5f8defea6a7
 DIST rustc-1.29.2-src.tar.xz 61888912 BLAKE2B f59b0bf45caa6f6136f92ffbaa612bbc6a340c8694ec69d75aadace9180c36753f985641915524388b52cc108f8f5b71840ee3a6c0b1fcff6decb61d2d8a161e SHA512 d8fa9501764348ace8f60f2069bcd016925abe56c8bbc2b87fb52ff796e4bc7284c1fccbb1671416437bb82fde7d9240eeae875d6099914e27e75cfe050e2d38
 DIST rustc-1.30.1-src.tar.xz 96086232 BLAKE2B 170767b64efe670086e7c4e73838b489a155a72c703148f83cad29d401a825a94a1def3aa462ba527e1bd08181c7a9be0e404c25f012906541c3d739eb57e9e5 SHA512 e466db81b9a82239670c48b876dc7390fcdda28c6390308691ddf2e0c12a39b57bd5ddb18322d1b4cd58165f69a666c7d83bee6573049da3b94e401657459bf5
@@ -92,11 +106,13 @@ DIST rustc-1.31.1-src.tar.xz 96915864 BLAKE2B bedfe1d56e2f99bb43b4b652d540aedf0a
 DIST rustc-1.32.0-src.tar.xz 99602696 BLAKE2B ab26247e3ecb75dbe373254c1c49f46c00a5a4db2b9cedffccb30122ea3b7de2761d6995b5423d0105caf85cc9542b4c21d487385faa34c835398c3320ccbd3b SHA512 487c405fed6430f62d2d0c38b65f6223b1c5074c7a0d3734dc8b3bb72fca255f5727e49541749569713a0c3e9a67eff574ba5698e8dceca6f0ef20b50f99aa42
 DIST rustc-1.33.0-src.tar.xz 100635400 BLAKE2B 1fe8ffcfab8324a93a07b9b9ac9cd050fd9d660fb24884761e8ce5e5a67ce5b6df8513e1440090b39c3ced9cb5ced43f07cc9b0337d39625d2cf4aa9e083cfef SHA512 3291e4e19f75f44c81e6fcf4c01edc7c9d326eca43722381231abcf2e99f4314059ba59a29b79f5511ad9421c358c45e8fe18584d6954d17fe2aabad0f9d9147
 DIST rustc-1.34.2-src.tar.xz 95048792 BLAKE2B e81e4bfda87ddfb09ab8a74792346970aa440c678d2bb1279c329db4929282f761ada6fea9d81ceeecfd513613025c8e636487626fc36bd0b33559e045bb1b15 SHA512 f1bd2b226d90aae8a4657e6117b9a8451d4ce8129f79cc0fce0da7613a3b7800e690bc0ede8fec20a2f5f32c13fa8e22ac97d3838e0d36936793535a75d9c381
+DIST rustc-1.35.0-src.tar.xz 96543548 BLAKE2B 0291152f2b7aa8b50b22d74afbd9c7654bab8ae7dcb76224dbff43bc39a3b918ff86bfd20f408a9a16da8b20b08d9f0289bb63620f093d25d9fa008de57f52c3 SHA512 477c10b780bd54776be7ecbda0ab970416253e4a87c3e701825a7d07bcbcd91601b8e61129c5d04d4259e89c2e81e87cdbdee853375a8de5c9cf8372be2c9129
 EBUILD rust-1.29.1-r1.ebuild 8002 BLAKE2B b1c0f7bb8607faab03876b472224d5f1c2dadef67441fe834a9765d0aa5c483c027af028719407ec9acb3d4a4337c78ababf1afac8a9421a70519e9e90dd6d9c SHA512 c299357f8423c140a41ffcd178c2fb6b9ff46df11403df31d5bb3d039c8494284c73f706ba94546ebebdb6f82e22c5fc5e07a213feaab078e7a94b72807fe2a0
 EBUILD rust-1.29.2-r1.ebuild 7534 BLAKE2B 43c508d7642a46035317595c7fa937316cca0f8807beea498d82c1f16e897d4703d3623b0893034f4807de6ab7a9ff9f8e899e33709f545b64eb9ab5ee56e4cb SHA512 3d49193701daf987d23463c62f8d7ba2e9a53c5e04d1e1c97fbd21e344d03ed0adaef3bffc8062db0dc9492201270ded01f1b270b2e9ab7168b57c8bf550c5af
 EBUILD rust-1.30.1-r1.ebuild 8159 BLAKE2B 9f043b855ac382f79c1d13bfd1cd9c3f8d64db937b6045108a52d987cad5fde152981643d5d67b5796ecdc6637735d877259c116574aede69c9e360be2465f9e SHA512 66dc471dc91a0510cad0bc91b0df688a90ed4fc75cb3bd3846dac9f40e718f51e0e47c884be31586772248928a28b84fe62b0c43e764a3eed3c1e5086f2e4b4a
 EBUILD rust-1.31.1.ebuild 8157 BLAKE2B 0b22f3e299c6ba5530426630b85cb19d3a2d6065690d48c02a76c849983f0f4fd9dc1019e1ed650cb31dbc2f384112b46e4d937901c695fee8378df220c94d46 SHA512 0a64c18d348481dedb5e9165e34c86aeb8f52e6091b4fc3a3ae7d86fcd15854aaa5356eac133b25aba5ab3687b71d6d1a0ec5a6187b06ce2cb755c0f04586063
 EBUILD rust-1.32.0.ebuild 8624 BLAKE2B 22d0f2cd85ed5a96edad7442f7bcb02e854e63d57d94facc0e0117759b3d91119ce9680a456507ca29738fb08efa14626419dd54ce18e161cbab1597389870f5 SHA512 7398e026113a40f222327c0d077216e0b03d7a4db625ff7d119088e957b57f105647f9ad80e8e86cd257d360f5dafbbd0e098030584f5d7fc7217607d3426c0f
 EBUILD rust-1.33.0.ebuild 8706 BLAKE2B 3b06f3fab34fb5cb3e367dc819ca7f1bfbd659c07697ddb2550174afbb6ddb3f19c48fe3b3c96102204b2287445cdb1e808fe6aa4a457fadb368f00201fd34a2 SHA512 2f7af5e0d7eb14f72792b576d72a6b02131e1ca660f435ca950743be9079886aa3879640de289d3d4b87251bd969960595ffd0732283edfe53775e2a2646f45e
-EBUILD rust-1.34.2.ebuild 9011 BLAKE2B 8406478b47236fe8720419378b9cd76c71a90476c98f60933c91d1a9d4297568024fe0c6d95e073b331fc73c1c0aa72f83d3e66dd90ddfb72d4175ca66bb7743 SHA512 096bef12f766f5e13170b67d65a6640cdc0b362a6f27104d8a3cc2909a8ac04d0ab1f37930fbc8dfbccd86ed0f6b423d063006fead1a5ac3b89787bcba5bc552
-MISC metadata.xml 634 BLAKE2B 394e75b1b5b5d9fad1d87dca27d7807bfce9eb723bc339dbb7c0630dc5abd3669e9469a9e75da74925d16d63c78971b0e7c84710db9b2cd15e87d81f49968903 SHA512 9e02acc0ad17e2f502c6082b5df9aeb6b9655783892a85d67855b3f6a79ec36dca610170bb002116c354626d44282c4e35e30cdf6b5e49745cfc6a990f55731c
+EBUILD rust-1.34.2.ebuild 9515 BLAKE2B fc8bc404d3c2305bcab018694df4e9f24b32b42166d2c878d6d784d32b658003c8b1f35176399923a862631f238c174f61c5bb0d402362dd130c8e48bd158dae SHA512 473a5d99a422c9873cf44661d6641211b2a107eab9869baefebedfbabb53287628e2e522963d5a294bd9330032c0f6d5e434b0f8e259593f4410e33e514b1328
+EBUILD rust-1.35.0.ebuild 9764 BLAKE2B 1b3b476cb514a7fd0cfeb525932ee20eedfd030f05efbb9571870891ecbc368341b891cf762dfa1fddaf51397452ab3d45854c6a3139cd09c300358d74c0efce SHA512 a5ef739e070f54b78e0490df279908ace7aefc85d96df0d256e358fc6da54d4c4c109d1e98b100d8750624914bb16de897b0de6caa7396b48e9271aba1677ec4
+MISC metadata.xml 612 BLAKE2B 071fd13c4632b3025c351abcce8c72af70e0a2ed07bd3f8c01ef7ce7c5242f519bb0f27df0545eebcb22cbfba5641d3dd6399b2d33db2e5e1bdb18b89a3f39e7 SHA512 aff6c3f8708c0dbc0b61ae9ce6e9505aadcadfff71145fab0afad7034464c3452312aaa890156d9eadcb340e981b785a0855d3b3b8bd0ce1a5270e49f0d90518
diff --git a/dev-lang/rust/files/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch b/dev-lang/rust/files/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch
new file mode 100644
index 000000000000..1c6c8ca404d9
--- /dev/null
+++ b/dev-lang/rust/files/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch
@@ -0,0 +1,117 @@
+From d6bd0a479ceaf6abdd696c3b955a56f66275c562 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sat, 25 May 2019 22:21:16 -0700
+Subject: [PATCH] revert commits triggering multiple llvm rebuilds
+
+this reverts the following commits
+https://github.com/rust-lang/rust/commit/105692c3ad281c63bf0f75a26a66bb9cff5b4553
+https://github.com/rust-lang/rust/commit/975ba58f42b34ff07cd7c2bd73350daed2057186
+https://github.com/rust-lang/rust/commit/e1daa36ba7df88788c2684bbe5ff6eb37f1cda69
+---
+ src/bootstrap/llvm-rebuild-trigger |  4 +++
+ src/bootstrap/native.rs            | 46 +++++++++++++-----------------
+ 2 files changed, 24 insertions(+), 26 deletions(-)
+ create mode 100644 src/bootstrap/llvm-rebuild-trigger
+
+diff --git a/src/bootstrap/llvm-rebuild-trigger b/src/bootstrap/llvm-rebuild-trigger
+new file mode 100644
+index 0000000000..0f18c6a4ac
+--- /dev/null
++++ b/src/rustllvm/llvm-rebuild-trigger
+@@ -0,0 +1,4 @@
++# If this file is modified, then llvm will be (optionally) cleaned and then rebuilt.
++# The actual contents of this file do not matter, but to trigger a change on the
++# build bots then the contents should be changed so git updates the mtime.
++2019-03-18
+diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
+index fde40b0d1b..3babbc9e10 100644
+--- a/src/bootstrap/native.rs
++++ b/src/bootstrap/native.rs
+@@ -67,40 +67,30 @@ impl Step for Llvm {
+             }
+         }
+ 
+-        let (llvm_info, root, out_dir, llvm_config_ret_dir) = if emscripten {
+-            let info = &builder.emscripten_llvm_info;
++        let rebuild_trigger = builder.src.join("src/rustllvm/llvm-rebuild-trigger");
++        let rebuild_trigger_contents = t!(fs::read_to_string(&rebuild_trigger));
++
++        let (out_dir, llvm_config_ret_dir) = if emscripten {
+             let dir = builder.emscripten_llvm_out(target);
+             let config_dir = dir.join("bin");
+-            (info, "src/llvm-emscripten", dir, config_dir)
++            (dir, config_dir)
+         } else {
+-            let info = &builder.in_tree_llvm_info;
+             let mut dir = builder.llvm_out(builder.config.build);
+             if !builder.config.build.contains("msvc") || builder.config.ninja {
+                 dir.push("build");
+             }
+-            (info, "src/llvm-project/llvm", builder.llvm_out(target), dir.join("bin"))
++            (builder.llvm_out(target), dir.join("bin"))
+         };
+-
+-        if !llvm_info.is_git() {
+-            println!(
+-                "git could not determine the LLVM submodule commit hash. \
+-                Assuming that an LLVM build is necessary.",
+-            );
+-        }
+-
++        let done_stamp = out_dir.join("llvm-finished-building");
+         let build_llvm_config = llvm_config_ret_dir
+             .join(exe("llvm-config", &*builder.config.build));
+-        let done_stamp = out_dir.join("llvm-finished-building");
+-
+-        if let Some(llvm_commit) = llvm_info.sha() {
+-            if done_stamp.exists() {
+-                let done_contents = t!(fs::read(&done_stamp));
++        if done_stamp.exists() {
++            let done_contents = t!(fs::read_to_string(&done_stamp));
+ 
+-                // If LLVM was already built previously and the submodule's commit didn't change
+-                // from the previous build, then no action is required.
+-                if done_contents == llvm_commit.as_bytes() {
+-                    return build_llvm_config
+-                }
++            // If LLVM was already built previously and contents of the rebuild-trigger file
++            // didn't change from the previous build, then no action is required.
++            if done_contents == rebuild_trigger_contents {
++                return build_llvm_config
+             }
+         }
+ 
+@@ -111,6 +101,7 @@ impl Step for Llvm {
+         t!(fs::create_dir_all(&out_dir));
+ 
+         // http://llvm.org/docs/CMake.html
++        let root = if self.emscripten { "src/llvm-emscripten" } else { "src/llvm-project/llvm" };
+         let mut cfg = cmake::Config::new(builder.src.join(root));
+ 
+         let profile = match (builder.config.llvm_optimize, builder.config.llvm_release_debuginfo) {
+@@ -251,6 +242,11 @@ impl Step for Llvm {
+                 channel::CFG_RELEASE_NUM,
+                 builder.config.channel,
+             );
++            let llvm_info = if self.emscripten {
++                &builder.emscripten_llvm_info
++            } else {
++                &builder.in_tree_llvm_info
++            };
+             if let Some(sha) = llvm_info.sha_short() {
+                 default_suffix.push_str("-");
+                 default_suffix.push_str(sha);
+@@ -283,9 +279,7 @@ impl Step for Llvm {
+ 
+         cfg.build();
+ 
+-        if let Some(llvm_commit) = llvm_info.sha() {
+-            t!(fs::write(&done_stamp, llvm_commit));
+-        }
++        t!(fs::write(&done_stamp, &rebuild_trigger_contents));
+ 
+         build_llvm_config
+     }
+-- 
+2.21.0
+
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index cd1133751de1..210155e50b10 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>rust@gentoo.org</email>
-    <name>Rust Project</name>
-  </maintainer>
-  <use>
-    <flag name="cargo">Install cargo component</flag>
-    <flag name="clippy">Install clippy component</flag>
-    <flag name="system-llvm">Use the system LLVM install</flag>
-    <flag name="rls">Install rls component</flag>
-    <flag name="rustfmt">Install rustfmt component</flag>
-    <flag name="wasm">Build support for the wasm32-unknown-unknown
-    target</flag>
-  </use>
+	<maintainer type="project">
+		<email>rust@gentoo.org</email>
+		<name>Rust Project</name>
+	</maintainer>
+	<use>
+		<flag name="cargo">Install cargo component</flag>
+		<flag name="clippy">Install clippy component</flag>
+		<flag name="system-llvm">Use the system LLVM install</flag>
+		<flag name="rls">Install rls component</flag>
+		<flag name="rustfmt">Install rustfmt component</flag>
+		<flag name="wasm">Build support for the wasm32-unknown-unknown
+		target</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-lang/rust/rust-1.34.2.ebuild b/dev-lang/rust/rust-1.34.2.ebuild
index 6a8ae98793bc..c0d1a001cbc3 100644
--- a/dev-lang/rust/rust-1.34.2.ebuild
+++ b/dev-lang/rust/rust-1.34.2.ebuild
@@ -266,6 +266,18 @@ src_install() {
 		   "${ED}/usr/${abi_libdir}" || die
 	done
 
+	# temp fix for https://bugs.gentoo.org/672816
+	if use x86; then
+		local rust_target wrongdir rightdir
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends"
+		rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends"
+		if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then
+			mv "${wrongdir}" "${rightdir}" || die
+			rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die
+		fi
+	fi # end temp fix
+
 	dodoc COPYRIGHT
 
 	# FIXME:
diff --git a/dev-lang/rust/rust-1.35.0.ebuild b/dev-lang/rust/rust-1.35.0.ebuild
new file mode 100644
index 000000000000..fb6e6ecf2739
--- /dev/null
+++ b/dev-lang/rust/rust-1.35.0.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+
+inherit check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain 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.xz"
+else
+	ABI_VER="$(ver_cut 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
+fi
+
+RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).2"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
+	$(rust_all_arch_uris rust-${RUST_STAGE0_VERSION})"
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 9.
+# 3. Specify LLVM_MAX_SLOT, e.g. 8.
+LLVM_DEPEND="
+	|| (
+		sys-devel/llvm:8[llvm_targets_WebAssembly?]
+		wasm? ( =sys-devel/lld-8* )
+	)
+	<sys-devel/llvm-9:=
+"
+LLVM_MAX_SLOT=8
+
+COMMON_DEPEND="
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libssh2
+	net-libs/http-parser:=
+	net-misc/curl[ssl]
+	system-llvm? (
+		${LLVM_DEPEND}
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	dev-util/cmake
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-eselect/eselect-rust-20190311
+	!dev-util/cargo
+	rustfmt? ( !dev-util/rustfmt )
+"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+	wasm? ( llvm_targets_WebAssembly )
+	x86? ( cpu_flags_x86_sse2 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
+	"${FILESDIR}"/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch
+	"${FILESDIR}"/1.34.0-libressl.patch # bug 684224
+)
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "$1" true false
+}
+
+pre_build_checks() {
+	CHECKREQS_DISK_BUILD="7G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="10G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+	python-any-r1_pkg_setup
+	use system-llvm && llvm_pkg_setup
+}
+
+src_prepare() {
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
+
+	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
+
+	# ugly hack for https://bugs.gentoo.org/679806
+	# we have to keep it until we switch to 1.35.x bootstrap tarball.
+	if use ppc64; then
+		sed -i 's/getentropy/gEtEnTrOpY/g' "${rust_stage0_root}"/bin/cargo || die
+		export OPENSSL_ppccap=0
+	fi
+
+	default
+}
+
+src_configure() {
+	local rust_target="" rust_targets="" arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
+	done
+	if use wasm; then
+		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+	fi
+	rust_targets="${rust_targets#,}"
+
+	local extended="true" tools="\"cargo\","
+	if use clippy; then
+		tools="\"clippy\",$tools"
+	fi
+	if use rls; then
+		tools="\"rls\",\"analysis\",\"src\",$tools"
+	fi
+	if use rustfmt; then
+		tools="\"rustfmt\",$tools"
+	fi
+
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	rust_target="$(rust_abi)"
+
+	cat <<- EOF > "${S}"/config.toml
+		[llvm]
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		targets = "${LLVM_TARGETS// /;}"
+		experimental-targets = ""
+		link-shared = $(toml_usex system-llvm)
+		[build]
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		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
+		extended = ${extended}
+		tools = [${tools}]
+		verbose = 2
+		[install]
+		prefix = "${EPREFIX}/usr"
+		libdir = "$(get_libdir)/${P}"
+		docdir = "share/doc/${P}"
+		mandir = "share/${P}/man"
+		[rust]
+		optimize = $(toml_usex !debug)
+		debuginfo = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		default-linker = "$(tc-getCC)"
+		channel = "stable"
+		rpath = false
+		lld = $(usex system-llvm false $(toml_usex wasm))
+	EOF
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		cat <<- EOF >> "${S}"/config.env
+			CFLAGS_${rust_target}=${arch_cflags}
+		EOF
+
+		cat <<- EOF >> "${S}"/config.toml
+			[target.${rust_target}]
+			cc = "$(tc-getBUILD_CC)"
+			cxx = "$(tc-getBUILD_CXX)"
+			linker = "$(tc-getCC)"
+			ar = "$(tc-getAR)"
+		EOF
+		if use system-llvm; then
+			cat <<- EOF >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			EOF
+		fi
+	done
+
+	if use wasm; then
+		cat <<- EOF >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "$(usex system-llvm lld rust-lld)"
+		EOF
+	fi
+}
+
+src_compile() {
+	env $(cat "${S}"/config.env)\
+		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
+		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
+}
+
+src_install() {
+	local rust_target abi_libdir
+
+	env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \
+	--exclude src/tools/miri || die
+
+	mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
+	mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
+	mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
+	mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
+	mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
+	mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
+	if use clippy; then
+		mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
+		mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
+	fi
+	if use rls; then
+		mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
+	fi
+	if use rustfmt; then
+		mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
+		mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
+	fi
+
+	# Copy shared library versions of standard libraries for all targets
+	# into the system's abi-dependent lib directories because the rust
+	# installer only does so for the native ABI.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		if [ ${v##*.} = ${DEFAULT_ABI} ]; then
+			continue
+		fi
+		abi_libdir=$(get_abi_LIBDIR ${v##*.})
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		mkdir -p "${ED}/usr/${abi_libdir}"
+		cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \
+		   "${ED}/usr/${abi_libdir}" || die
+	done
+
+		# temp fix for https://bugs.gentoo.org/672816
+	if use x86; then
+		local rust_target wrongdir rightdir
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends"
+		rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends"
+		if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then
+			mv "${wrongdir}" "${rightdir}" || die
+			rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die
+		fi
+	fi # end temp fix
+
+	dodoc COPYRIGHT
+
+	# FIXME:
+	# Really not sure if that env is needed, specailly LDPATH
+	cat <<-EOF > "${T}"/50${P}
+		LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}"
+		MANPATH="${EPREFIX}/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-EOF > "${T}/provider-${P}"
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-gdbgui
+		/usr/bin/rust-lldb
+	EOF
+	echo /usr/bin/cargo >> "${T}/provider-${P}"
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	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}."
+
+	ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
+	ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
+	ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
+
+	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/sassc/Manifest b/dev-lang/sassc/Manifest
index 87cde2b0d5e1..ac0117702ebb 100644
--- a/dev-lang/sassc/Manifest
+++ b/dev-lang/sassc/Manifest
@@ -1,4 +1,5 @@
 DIST sassc-3.5.0.tar.gz 25834 BLAKE2B 69bb085f537ca2fba70aa96326e49f756cab52a8cac631dbe0dc88459a488c65dd856deebea335d4b3539b30658b327c3d32d1e79dae1021893a0627508ceadd SHA512 9c94056f66688016dd8eaae9cc791be4b397406b89f1289946c4481b5e1904486878d22fd65e695ed89f9b41a9f902932eb4074e7b0923ce3d4823ea3140334f
-EBUILD sassc-3.5.0.ebuild 699 BLAKE2B f7180d7e093ac26946cdbfe790e5634c69b170f3a47ff51d6f506f4730b3817a595832117315b39e49fd7b826f927a13dd67012cfcab58eb2d93e1bc64e1e965 SHA512 c0fe197a9c74ea7a43be9861f14006f92250b54f1261022df364c416893654f3d0ef82f6c724e0adf70f78743e2be9c4c7d8ef16350c414ceaba3d46bd672592
-EBUILD sassc-9999.ebuild 680 BLAKE2B ed360105f73bd870f5cde3b8df5a05a5b0cdd69909ee7621923d9930d50e797ebdca188fca46ab3fed61579fa7cc92ea12892462f3cea808613624c944ae589e SHA512 7a2f9ffa9074dbf0715cf7583e50629faf8c6ed7b43251ed0fb5b3f9d1860ea39495303bc30403aa882cf07e2fa9000945072a6ac1258ca0624261c17c9d5c9b
+DIST sassc-3.6.0.tar.gz 26111 BLAKE2B 91d634bd652607407c48f141aa39260739357f6eeb4bade1fff1bfdd4e4e6e0757712501395c913ef1a8944ec9174649fa5ce657af4afec6f9f0eb7f804e1ff2 SHA512 0d8de651b1587f4994a5da85ad09ec2ce6e240213dbaa567c6b9baa612fe82e337061d9a5a8a3a5588e4c366c1178b6fd04e9d699a0be3d83c68f98bac774527
+EBUILD sassc-3.5.0.ebuild 698 BLAKE2B 1d7011f786cd8f09c8f5c49f0468e7260edae7af9a1f0692b3c687ccdc0abd99d3c7efbf0a913f44fc585f04572cd527fbcf6339d251feb11dfd9332c23e8d79 SHA512 473c1c7b4db1860e6af40ed3e99ee907fe85bd596171cbcfbea92650807dce4c0837c5e230d681d8c2a4e70d3fdefda090c221cb122dc8e6de02ae24693cd662
+EBUILD sassc-3.6.0.ebuild 496 BLAKE2B 5747cb389a0a3439373ebf9733f7f4cec391c1760fcdf3103d0bda5673ee36ff8ae0f45fba890f556225f5573e891eca4e3f6c9aba39bc8d9c47394261d16d23 SHA512 d4630274cad550b73af8584887ef3ad6464bfef751eeb0a04e62d3b86cbfa1eddcb538957811f3435d2a0abf9b2a093039c503a4e4a0698dd09210f46ead337e
 MISC metadata.xml 561 BLAKE2B ef70ae66272d229a95a709562e8deadf49d5f167c996bbff5c3c20e4e6f3c7ebe22dbb2c56e2f96cbcd05b1c7b5b36b78586c5a1bd64845036fbefe8a91b4cd9 SHA512 fcba87ac993d0ad1748f7ccdd8f7dea50308edff7c7da9146083f9b24e6c876051bec08cc7f117af3215690fbe3516c1093a8db1c5ea4a2eab8b937cf2f3a434
diff --git a/dev-lang/sassc/sassc-3.5.0.ebuild b/dev-lang/sassc/sassc-3.5.0.ebuild
index 4d47986fea7c..d4a8b4097e10 100644
--- a/dev-lang/sassc/sassc-3.5.0.ebuild
+++ b/dev-lang/sassc/sassc-3.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A libsass command line driver"
diff --git a/dev-lang/sassc/sassc-3.6.0.ebuild b/dev-lang/sassc/sassc-3.6.0.ebuild
new file mode 100644
index 000000000000..bd5bdc6e9bd3
--- /dev/null
+++ b/dev-lang/sassc/sassc-3.6.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+DESCRIPTION="A libsass command line driver"
+HOMEPAGE="https://github.com/sass/sassc"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/libsass:="
+DEPEND="${RDEPEND}"
+
+DOCS=( Readme.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/dev-lang/sassc/sassc-9999.ebuild b/dev-lang/sassc/sassc-9999.ebuild
deleted file mode 100644
index 847d2e349e3a..000000000000
--- a/dev-lang/sassc/sassc-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/sass/sassc.git"
-	inherit git-r3
-	KEYWORDS=
-else
-	SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="A libsass command line driver"
-HOMEPAGE="https://github.com/sass/sassc"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-libs/libsass-3.5:="
-DEPEND="${RDEPEND}"
-
-DOCS=( Readme.md )
-
-src_prepare() {
-	default
-
-	if [[ ${PV} != *9999 ]]; then
-		[[ -f VERSION ]] || echo "${PV}" > VERSION
-	fi
-
-	eautoreconf
-}
diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index a28b992dc618..1bef57d1b0de 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,5 +1,3 @@
-DIST scala-2.11.8.tgz 28678231 BLAKE2B 3e75e941112afb094e99be76fa7d039b27a32b1cedd645bad43b776ee9136f6ac3951eabe7c7182280f442050a3c7c658d49906b42004965128dd048d2ad73d2 SHA512 c00a0eaa4317c3ffbdbbd9c817f06c5262f0549f22bd7f1886cc22643e34e8909648bbfb58f3a63c453baf045381a52128ff0b18b7a39274ef03aad7daea9fdf
 DIST scala-2.12.4.tgz 19741785 BLAKE2B e782a4ac000ffcebc2faaac077cbb3cc13f8cc56deb9b3a78f1bddd3d0e6fd282d70f10cfef0780e4ab6a13e8d51b0401f84829b7974bd8823aecab54476ab02 SHA512 e6a9e11974d3bacc5f5dcdfdb379bdd1b430b1682141bed688f02f8b49395aff7c55cdb8da3319dff55da7bd7cfe7545e9b26db9558316ac8b3e29f6bb2c6d74
-EBUILD scala-bin-2.11.8.ebuild 1865 BLAKE2B e089d8a18f217868eb2c063ff237a6eb80aa32f13a5f919248451a02af617c32acdc6468f5f8d7147c0c61477c678d93dd2348a6cc1cdcc8553cb46a2efcdd90 SHA512 84067265c0ae7f7b7edb92994f56b0e25bc889d5f44ec00dab32497d34a84707cce6a46685c46613cc872748080ee782b139258caf3f1ab5c8463c64fbfa81eb
 EBUILD scala-bin-2.12.4.ebuild 1482 BLAKE2B 1f08b7ae9966682e14958090b42f5b45efcf1e80593fdc31aaeda09a100b46041a5b2a5d601feb52a829188ada9eef20038207fb028c8ab61adb7a51988bbbad SHA512 95bdf1e5108e90739d464d26c45b3c3a6c8949bbe8c8ae82afef56c583b4ef3e65571d798ca6786bea05ee45d8932471e1789cd4df5cbaa420fafbe8be1a9c37
 MISC metadata.xml 317 BLAKE2B 47b0d918ff9d4f2287fc0c43a022b978a816aa0d96362cf449210cd6b13810ed1352dbe69c5bea8281cdd3f3d03f4dcf714589e414b27abd5cd8c648e3d64994 SHA512 506fab7ebaa9e1caf96f239d6d85978171b98282ebe22a4948f61df62ce05a4c22772d81159cec9a99dd9a127b602e7593615204142e295d88835f9385a64bc8
diff --git a/dev-lang/scala-bin/scala-bin-2.11.8.ebuild b/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
deleted file mode 100644
index 83f4905b76f4..000000000000
--- a/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-*}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/"
-SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	!dev-lang/scala"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	ebegin 'Cleaning .bat files'
-	rm -f bin/*.bat || die
-	eend $?
-
-	ebegin 'Patching SCALA_HOME variable in bin/ directory'
-	local f
-	for f in bin/*; do
-		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || die
-	done
-	eend $?
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	ebegin 'Installing bin scripts'
-	dobin bin/*
-	eend $?
-
-	ebegin 'Installing jar files'
-	cd lib/ || die
-
-	# Unversion those libs
-	java-pkg_newjar scala-continuations-library_*.jar scala-continuations-library.jar
-	java-pkg_newjar akka-actor_*.jar akka-actor.jar
-	java-pkg_newjar config-*.jar config.jar
-	java-pkg_newjar scala-actors-2.11.0.jar scala-actors.jar
-	java-pkg_newjar scala-actors-migration_*.jar scala-actors-migration.jar
-	java-pkg_newjar scala-swing_*.jar scala-swing.jar
-	java-pkg_newjar scala-parser-combinators_*.jar scala-parser-combinators.jar
-	java-pkg_newjar scala-xml_*.jar scala-xml.jar
-	java-pkg_newjar jline-*.jar jline.jar
-	java-pkg_newjar scala-continuations-plugin_*.jar scala-continuations-plugin.jar
-	java-pkg_newjar scalap-*.jar scalap.jar
-
-	# Install these the usual way
-	java-pkg_dojar scala-compiler.jar
-	java-pkg_dojar scala-library.jar
-	java-pkg_dojar scala-reflect.jar
-
-	eend $?
-
-	cd ../ || die
-
-	ebegin 'Installing man pages'
-	doman man/man1/*.1
-	eend $?
-
-	if use doc; then
-		ebegin 'Installing documentation'
-		java-pkg_dohtml -r doc/tools
-		eend $?
-	fi
-}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 5059e21424f3..913030d900e6 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -10,6 +10,7 @@ DIST swipl-8.1.1.tar.gz 10378521 BLAKE2B 5753ecb40c7e1877bc369ced28b3e0d13a3ecc1
 DIST swipl-8.1.2.tar.gz 10433753 BLAKE2B 0137be404b855ee470ad4a96e74833fda83370a690baa6793fdc5ba6a0180694b494da17294a44912228630e0ab2d0042fb54152dd9a4c11298dc6ffc0f48f01 SHA512 c700275529e9f43568f2698fce7d65d017f47fa738f9fceba6ebab9f35a7dba1e1a0251c240b8ad3a313bbe157a7e586c45025985dbd7f92bf1b55cf83020f8f
 DIST swipl-8.1.3.tar.gz 10507142 BLAKE2B 6171eba64a70e48517287900346a43f90fbacb7e409a5331188647423997c700bc44c0d2d714af49ab38646da224295148a76bee700753c365952819b051dc2a SHA512 cb698684cf6e98b01c9e466514be82ceeea5d308dc483c5ddb4d539244e7e8787d0ccc473eebbfd708e0e25d34402256f3f943740e559a462199977469f93c59
 DIST swipl-8.1.4.tar.gz 10547608 BLAKE2B dc6184e35e9ddb2b82579262c33abae64de53e690209940223176182c6e6120b1a4869829e8da299cbff1dc6474ffd2bc142c58da332b7e7e28c1b65245e04fc SHA512 e425d2d3bde8c3d375870bfaf1c70e143c4ef7596c2441f66a2cab7c1e6081c1d1e49e4c2f65c2f0cc181a0c0bb87c859430e38e057c713f4bdff979eba95153
+DIST swipl-8.1.5.tar.gz 10547299 BLAKE2B 2fd158ed21da8ca20cbd6a593f384e4ba362b493e338012c6e6c410dfdc64861fa8613fba33e6553cc26ef360d910ce708c45df6c020bebca756b3df5a0a777e SHA512 992f3d8deacce5bf9b5277ec30f79bff0c8d765ff891b126d9f30a7c2c0a3dca7448c58083007a677f162d371143a6936e08e8395b72f6ddc2efecd16b56fcef
 EBUILD swi-prolog-7.4.2.ebuild 3398 BLAKE2B 368ef93ceb17042a28699f9aa469e6b5c39aa29154b810e43fd050ab3bc1079f83680cfac8f4108c7c297a51e9bdd28357a0b6241c08faef3ea5f81ab1605558 SHA512 76d094f62e442ac86d32eaf467179fdcf4d4edf6034f711104e91f8a01b7e343208ef0b6e492ed18c8c0605b96a48f1adef8f3903f861c716e882cb9695b0dd2
 EBUILD swi-prolog-7.6.3.ebuild 3395 BLAKE2B 6445c399d7a7518bcd4ce05b9ea0bf50c7d0297d5a24d9ef84a48c36600077cea8c8b77b010d28e25dfe0766e12d1f560f42e5597a602f6bdfc7351ea6e0fa62 SHA512 830766267d3e4b60897dfcdab5263cee600ccfa2cd80f970ef3b4c3695cc3ddf9989ae85527f45cdf124898210f108a98a32a613de2543a8db813d42482b0687
 EBUILD swi-prolog-7.6.4.ebuild 3456 BLAKE2B 55d9eb2b52f47dc7fd5df9f2743775e7aabd4f070d93e31f51b038f278604909f1f48dbb4cbd12ba96614f8619923712c465d424eb224874ba158f1670d615d5 SHA512 cf64a47e39b21557915fcd6e88ac5bb01fc56bb26afebf81dedaa087ac12a3c5952383a55594dbe22de8885c6a3afd47858963a4c0c68f705be20045a518d12d
@@ -20,4 +21,5 @@ EBUILD swi-prolog-8.1.1.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb0
 EBUILD swi-prolog-8.1.2.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954
 EBUILD swi-prolog-8.1.3.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954
 EBUILD swi-prolog-8.1.4.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954
+EBUILD swi-prolog-8.1.5.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.5.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.5.ebuild
new file mode 100644
index 000000000000..b986aa50d899
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils flag-o-matic multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="versatile implementation of the Prolog programming language"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml"
+
+RDEPEND="sys-libs/ncurses:=
+	sys-libs/zlib
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.7:= )
+	uuid? ( dev-libs/ossp-uuid )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	)
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXinerama
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )
+	yaml? ( dev-libs/libyaml )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+BUILD_DIR="${S}/build"
+CMAKE_USE_DIR="${S}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	sed -i -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" CMakeLists.txt || die
+
+	eapply_user
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use debug && append-flags -DO_DEBUG
+
+	mycmakeargs=(
+		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
+		-DUSE_GMP=$(usex gmp)
+		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
+		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
+		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
+		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
+		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
+		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
+		-DSWIPL_PACKAGES_YAML=$(usex yaml)
+		-DSWIPL_PACKAGES_SSL=$(usex ssl)
+		-DSWIPL_PACKAGES_JAVA=$(usex java)
+		-DSWIPL_PACKAGES_QT=$(usex qt5)
+		-DSWIPL_PACKAGES_X=$(usex X)
+		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	USE_PUBLIC_NETWORK_TESTS=false \
+	USE_ODBC_TESTS=false \
+		cmake-utils_src_test -V
+}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 3e529160c4ea..55e4f2bcf436 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -6,8 +6,8 @@ DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a26
 DIST vala-0.40.15.tar.xz 3406020 BLAKE2B aaa2967a140fae94b4609f4b54f2e37c71fe79453cb3ea30568ee018d2227d1c45061440ad632bcfc53650fbe4dba2f062d8095f95936623a49efb5e97f2c2bb SHA512 abb918b00afab7a85586f9bd26b78be87e19b725752cbb77dd428da2e6241b1f3d4aaa70e3e6daf6f373562d02f1ff8016e6c9107e2bf088d9b84334adecdda2
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
 EBUILD vala-0.36.18.ebuild 798 BLAKE2B 6def4d1f13ee1fd84f2405da15b6cab064ec882b2ba4fd497636966414308dddefda9357d0559b052277476becf2856ca923f62007f0a319ea90cc3a0fcf572d SHA512 2bbd7d899f35cfbe72ee2c9304ff2d68e87babb06fa6f8c2ea94edbe95cb3b039e33e565d5af6cda978cf6e8517cc5cd51f763dcf6f9963c5c5ae30ae434555e
-EBUILD vala-0.36.19.ebuild 805 BLAKE2B d1e2fae71c5009adfe901fe0f1cd56fd32f417f69fcd98901e933a5c394691cdc4301d7c4f1bd01aff7dc5d5dc9a5db01ac7fe123240b629bc8bd5dbf9702765 SHA512 7b021166ad34977a3aa25321e41917f5a6542f055f702a1695b78fba5c8cbc00015a8625be16986696c5b40c6bea2e1ab588d66253d27b20985bb7698ef39de1
+EBUILD vala-0.36.19.ebuild 804 BLAKE2B 208f6ee381eeb8b60bb67538b9004f51bf65142f1add23c1f404479fe95157cacb45450dfa5074d38ac3abf747360a3c2c67572309c92a831b7f2eb4186d4132 SHA512 0186e1cf0dfe553f6c502d1b33e63348357a4103a508c4da0e4cd4f6dd569abfdaff70dd48558bbaea9980fc45007c8167c3c57ded1fa8d05642e1863b906838
 EBUILD vala-0.40.14.ebuild 1185 BLAKE2B 1cb8b3efdd6f010c5524aabced06132f9f90920d3345e216df0dcb555ab2d4c10afa196271b2623d71d5b4dc57ce2705677275c1da7c0099925e82d5cb1eac26 SHA512 5e271726a2e71902440df5c03897f9c1960d83bb6eff5d2f4a1213d791190a2f34a81fdefb165427c9ca3a92aacdc801c5bb4be5b98fca27ed0b9adafc4d5158
-EBUILD vala-0.40.15.ebuild 1192 BLAKE2B 26f7ebf1955a9396baf32e789eade714101ed82f56b6d475c838489c8c2731cf22cb4316e3a31fe04f13320f7b9d4d751eae140a86f4f4c3a3a39943fe38ee8d SHA512 2d2f80a104a733935c602bf5d2cd2ef9d0b9a61e8270c4ec4b814303742c02289445fb6dc31e5ee47da5e66cd4e1bee0504b3aae896899505ae337cb90787fcc
-EBUILD vala-0.42.7.ebuild 1191 BLAKE2B bb137b4196e723ab329a8aa6a6dacb2d567a28944997027ae64072ea50759bbe05cf4e3568db56b036fe5f7124077e56eac04deb420e6d1ae377065ea47a9b12 SHA512 03b727370367909af869a658a6b6197dc475a08c24777fbf3f555fee264b8af9efb22aa1d675a68e46fd4da34636ac2820b8421d9eee10459163fe9dafe9db7a
+EBUILD vala-0.40.15.ebuild 1191 BLAKE2B 1a3a2902d4daae423932ba4ef6aa2e7dc5264b12b7a581567726f7a47424f2de60ff32fc8b319852a4a3aaed3ea3231684dab342e6db45452e690736e42c9067 SHA512 6fdac52c1395d439d3612abd74865f4df7420e81c3089bb07b71f320d5d2401a0c80a40275652b97658134bd4fdbf4418349dae9bc18ac521c28607c0c161ca1
+EBUILD vala-0.42.7.ebuild 1190 BLAKE2B e88bed17f88950dcc9bc14b8ab4ec5b25a51fe652db873988c01236127abe9f310404cd4f3c1029c1cd6afccc19f7ab737e5e01bd1f6e7a268a0a8244d42d230 SHA512 bf1cb81ce39ccaa2f5ca5ccd1e3eb8f636f9e74429ab2d56e48b192d9a6f7b4256e779abd81a4935a642551ca5c145dc90c51edc04e694be5beda2a52487281c
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.36.19.ebuild b/dev-lang/vala/vala-0.36.19.ebuild
index f21ded3c27a4..5fdfe5ba6247 100644
--- a/dev-lang/vala/vala-0.36.19.ebuild
+++ b/dev-lang/vala/vala-0.36.19.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.36"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-lang/vala/vala-0.40.15.ebuild b/dev-lang/vala/vala-0.40.15.ebuild
index 728f726e7e84..680b76597a8f 100644
--- a/dev-lang/vala/vala-0.40.15.ebuild
+++ b/dev-lang/vala/vala-0.40.15.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.40"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="test valadoc"
 
 RDEPEND="
diff --git a/dev-lang/vala/vala-0.42.7.ebuild b/dev-lang/vala/vala-0.42.7.ebuild
index 7dcbcd726b17..9631eeca9959 100644
--- a/dev-lang/vala/vala-0.42.7.ebuild
+++ b/dev-lang/vala/vala-0.42.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.42"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="test valadoc"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 49446fe392cb..b12983a1ead2 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 2ef680abefb2..e1c9f7a46839 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,7 +1,6 @@
-DIST amdgpu-pro-17.50-552542.tar.xz 549501204 BLAKE2B 37dcda126a3bda4e87b64ce260c7e4b65a1b864363c51f06e3152f152b83a60074331e6a0bf7b831c059a50192dea8add9b38ed16971c87293ce0e56ddf26bb2 SHA512 060e96609cf1a013fddf10db9bba4b512750e5188671a669e2582c28a03213b40d073031e35a617b982374d9d1cd4078f43b27053ee34be7c83873c0814ed196
-DIST amdgpu-pro-18.20-606296.tar.xz 230733856 BLAKE2B 21a498a894a9712d9f0277fae7f704413be0cd01cebbe427008fa3d181d03b58268e74bd3cdaf0dfb9aeca2871dad82b4aa640bbce690ca461e3f3e4acf01ffd SHA512 6575bf963e5714657914d9116de4d9b1835851fe0609b1f072b1fbdf73c068da77aba0eca1c9cce6e05e6cd8f2c1ed6b4bd6ab4ef334be5ff796ee6a3ad73831
 DIST amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz 229474380 BLAKE2B f589aad71f093b74e37de40ac7c45ebbbeff93609b2fff1baaba711347a4641ef17acdcbe69d371372510a48bd48262cf6269c1f4d05e264023d52a425a423f2 SHA512 240e701acfde4ebe665cf69c8bd3710d036f450822aeb7ee2a21caab289af44167afda1d3b8d0dbe2c46c4e63d9b6fb5e96778311f342c26f334dc7beb4a2d5b
-EBUILD amdgpu-pro-opencl-17.50.552542.ebuild 2306 BLAKE2B 60c131d8af09f855dee725590f6645bf6d77b10b80240bfff768ecca2713da7703264e156f04f1224ba19fc6d349d936c4a10cc98f9d029e9978b9e484cdc297 SHA512 38eae62aaf48c0f36e92d369f2621721c57d2757b68c0b6a4961c3eeb9a4d72b84b2a2be26eaaf359e450b56a9de36accdcab94b1a130754f92d8ae6979b6215
-EBUILD amdgpu-pro-opencl-18.20.606296.ebuild 1818 BLAKE2B ecbe7a9283eb9af7cd006064ec5d564689e507b8f648b0dd8b5932bf14a6bbae4305c14dd6b164904660615cd7bafc74a782b08075ac178be1ced1f44b3aec76 SHA512 b59a92167c53b8fcf2f3e4fa31337874ee085e18bb8cdb2f97ce8d33f393ef8096668e3b8d143d3eeedb765c7b98a3af3e450b65fd8ac7eee850fa8131454797
-EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2337 BLAKE2B fedd53526d3ce08f6a2d31a7a896dc4e5e7b381df91d4beaf87e3102ce79c0a860bd3e3129809865c10407046f48b22a8e84ccdcbe02b7ae42625539c139e4bd SHA512 a6f2d145343a6083fef02020d2ee6b61fc1be77935f9c9c091cb4a2ee75230db6d760f6450f70d7feb3d403b8bddd44e86d7b156600d8da8c720895fe198d71e
+DIST amdgpu-pro-19.10-785425-ubuntu-18.04.tar.xz 243520380 BLAKE2B 8c775feaff685b18b6df2f6f17667dbadb3da89f58c823f5470113342b585ecb436fbacef6ba26b35fe05bac53530cfe334d79d933afee303651e1375654da85 SHA512 d9c214134bf220c2ab4a306f5d83ce5718adc1f3e93165c724e70b99b4b5bcd8e703299ed70fe79f1d2db5f4f69cae2e1036b5a6238696346710c88f7fa6b3c6
+EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2332 BLAKE2B 20a692a7666997d60c1a2f4ad0f431d016a7a0a75f0f9c898603793d5c481fb662f002f5875e0435f75bbd94b5072f6a30b884eb4e797c64b29681dac35ae69c SHA512 acb6b04711b83787b394fc2ef6b6621ae7e45d67359d4ed6ae39826704660874170babedc15b6e4d69f3bbddb0ce4ba405e7b15ae633fbdf423dfc7358b65a40
+EBUILD amdgpu-pro-opencl-19.10.785425-r1.ebuild 2985 BLAKE2B 762a240cf6365c046367e982d901be8307160b71928077e81b07cd9ba153d5a20ee528f8293b47ee0c2f4306c52dc6ebdacfa65cec6ba9d94a30902838b42824 SHA512 7ceb9aed7b1a75dcbc9cff009035527312dd8318f323967766e6545972f2a4c2e174c9728fbf7c434d404272d9d2706d2339286cc7837bf30a9e8c54c42ad2f0
+EBUILD amdgpu-pro-opencl-19.10.785425.ebuild 2945 BLAKE2B e726f111998e748151e074f0b2810cf9bf1c67de2087f63c8c54d216ce3aa15aa600ef3bd0f892349bb4e801062b1da3a06573dbfc03b3f84f082863836c9392 SHA512 32589484e64b9083446768aadbb1d79694c53511a1bc6b2c7de2ea54e3c63005f25d20d4a338f2963604b80e35a66be5a6ce21d172884bdcf65b6af1954e2b7a
 MISC metadata.xml 536 BLAKE2B 788d99a058d77cc3992b953dd8761a224575480b29dd37bc6fc5a5f914fdc03a7c9a9eb70d9d9cebf79394f6e21d966e273ad27a02f93ca887ea48f491b797ad SHA512 912ff2f26e27d5c20219a26505f3a4545409773f1f761de4591cbd7086cd1ff241fca18d7ae5081ed12e04c1b5dc46deeb02b4a68e2a3787d1d20739a818325d
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild
deleted file mode 100644
index b9f388b4b18e..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(ver_rs 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-with-Vulkan-1.1-support.aspx"
-SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-COMMON="app-eselect/eselect-opencl
-	dev-libs/ocl-icd"
-DEPEND="${COMMON}
-	dev-util/patchelf"
-RDEPEND="${COMMON}"
-
-QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
-
-pkg_nofetch() {
-	local pkgver=$(ver_cut 1-2)
-	einfo "Please download the Radeon Software for Linux Driver ${pkgver} for Ubuntu from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed in your distfiles directory."
-}
-
-src_unpack() {
-	default
-
-	local ids_ver="1.0.0"
-	local libdrm_ver="2.4.82"
-	local patchlevel=$(ver_cut 3)
-	cd "${S}" || die
-	unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
-	unpack_deb libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
-	unpack_deb ids-amdgpu_${ids_ver}-${patchlevel}_all.deb
-}
-
-src_prepare() {
-	default
-
-	cd "${S}/opt/${SUPER_PN}/lib/x86_64-linux-gnu" || die
-	patchelf --set-rpath '$ORIGIN' libamdocl64.so || die "Failed to fix library rpath"
-}
-
-src_install() {
-	into "/opt/amdgpu"
-	dolib.so opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
-	dolib.so opt/amdgpu/lib/x86_64-linux-gnu/*
-	insinto "/opt/amdgpu"
-	doins -r opt/amdgpu/share
-
-	insinto /etc/OpenCL/vendors/
-	echo "/opt/amdgpu/$(get_libdir)/libamdocl64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
-	doins "${SUPER_PN}.icd"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		ewarn "Please note that using proprietary OpenCL libraries together with the"
-		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
-		ewarn "for support in case of problems with this package."
-		ewarn ""
-		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
-		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
-		ewarn "has become officially supported by Gentoo."
-	fi
-
-	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
-}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild
deleted file mode 100644
index 03574c8b01e7..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(ver_rs 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-Release-Notes.aspx"
-SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-COMMON="app-eselect/eselect-opencl
-	dev-libs/ocl-icd"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
-
-pkg_nofetch() {
-	local pkgver=$(ver_cut 1-2)
-	einfo "Please download the Radeon Software for Linux Driver ${pkgver} for Ubuntu 16 from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed in your distfiles directory."
-}
-
-src_unpack() {
-	default
-
-	cd "${S}" || die
-	unpack_deb opencl-orca-amdgpu-pro-icd_${MY_PV}_amd64.deb
-}
-
-src_install() {
-	into "/opt/amdgpu"
-	dolib.so opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
-
-	insinto /etc/OpenCL/vendors/
-	echo "/opt/amdgpu/$(get_libdir)/libamdocl-orca64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
-	doins "${SUPER_PN}.icd"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		ewarn "Please note that using proprietary OpenCL libraries together with the"
-		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
-		ewarn "for support in case of problems with this package."
-		ewarn ""
-		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
-		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
-		ewarn "has become officially supported by Gentoo."
-	fi
-
-	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
-}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
index 739777fa05df..ffc46c93b615 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-16.04.tar.xz"
 
 LICENSE="AMD-GPU-PRO-EULA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 RESTRICT="mirror fetch strip"
 
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild
new file mode 100644
index 000000000000..12086b373c16
--- /dev/null
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit unpacker multilib-minimal
+
+SUPER_PN='amdgpu-pro'
+MY_PV=$(ver_rs 2 '-')
+
+DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
+HOMEPAGE="https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-10-unified"
+SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-18.04.tar.xz"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+BDEPEND="dev-util/patchelf"
+COMMON="app-eselect/eselect-opencl
+	dev-libs/ocl-icd"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}
+	!media-libs/mesa[opencl]" # Bug #686790
+
+QA_PREBUILT="/opt/amdgpu/lib*/*"
+
+S="${WORKDIR}/${SUPER_PN}-${MY_PV}-ubuntu-18.04"
+
+pkg_nofetch() {
+	local pkgver=$(ver_cut 1-2)
+	einfo "Please download Radeon Software for Linux version ${pkgver} for Ubuntu 18.04 from"
+	einfo "    ${HOMEPAGE}"
+	einfo "The archive should then be placed into your distfiles directory."
+}
+
+src_unpack() {
+	default
+
+	local ids_ver="1.0.0"
+	local patchlevel=$(ver_cut 3)
+	cd "${S}" || die
+	unpack_deb "${S}/libdrm-amdgpu-common_${ids_ver}-${patchlevel}_all.deb"
+	multilib_parallel_foreach_abi multilib_src_unpack
+}
+
+multilib_src_unpack() {
+	local libdrm_ver="2.4.97"
+	local patchlevel=$(ver_cut 3)
+	local deb_abi
+	[[ ${ABI} == x86 ]] && deb_abi=i386
+
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	unpack_deb "${S}/opencl-orca-amdgpu-pro-icd_${MY_PV}_${deb_abi:-${ABI}}.deb"
+	unpack_deb "${S}/libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_${deb_abi:-${ABI}}.deb"
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	local dir_abi short_abi
+	[[ ${ABI} == x86 ]] && dir_abi=i386-linux-gnu && short_abi=32
+	[[ ${ABI} == amd64 ]] && dir_abi=x86_64-linux-gnu && short_abi=64
+
+	into "/opt/amdgpu"
+	patchelf --set-rpath '$ORIGIN' "opt/${SUPER_PN}/lib/${dir_abi}"/libamdocl-orca${short_abi}.so || die "Failed to fix library rpath"
+	dolib.so "opt/${SUPER_PN}/lib/${dir_abi}"/*
+	dolib.so "opt/amdgpu/lib/${dir_abi}"/*
+
+	insinto /etc/OpenCL/vendors
+	echo "/opt/amdgpu/$(get_libdir)/libamdocl-orca${short_abi}.so" \
+		> "${T}/${SUPER_PN}-${ABI}.icd" || die "Failed to generate ICD file for ABI ${ABI}"
+	doins "${T}/${SUPER_PN}-${ABI}.icd"
+}
+
+# FIXME: is this right?
+multilib_src_install_all() {
+	ewarn "FOO $PWD"
+	ewarn `ls`
+	insinto "/opt/amdgpu"
+	doins -r opt/amdgpu/share
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Please note that using proprietary OpenCL libraries together with the"
+		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
+		ewarn "for support in case of problems with this package."
+		ewarn ""
+		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
+		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
+		ewarn "has become officially supported by Gentoo."
+	fi
+
+	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild
new file mode 100644
index 000000000000..21ba2fc29539
--- /dev/null
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit unpacker multilib-minimal
+
+SUPER_PN='amdgpu-pro'
+MY_PV=$(ver_rs 2 '-')
+
+DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
+HOMEPAGE="https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-10-unified"
+SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-18.04.tar.xz"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+BDEPEND="dev-util/patchelf"
+COMMON="app-eselect/eselect-opencl
+	dev-libs/ocl-icd"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+QA_PREBUILT="/opt/amdgpu/lib*/*"
+
+S="${WORKDIR}/${SUPER_PN}-${MY_PV}-ubuntu-18.04"
+
+pkg_nofetch() {
+	local pkgver=$(ver_cut 1-2)
+	einfo "Please download Radeon Software for Linux version ${pkgver} for Ubuntu 18.04 from"
+	einfo "    ${HOMEPAGE}"
+	einfo "The archive should then be placed into your distfiles directory."
+}
+
+src_unpack() {
+	default
+
+	local ids_ver="1.0.0"
+	local patchlevel=$(ver_cut 3)
+	cd "${S}" || die
+	unpack_deb "${S}/libdrm-amdgpu-common_${ids_ver}-${patchlevel}_all.deb"
+	multilib_parallel_foreach_abi multilib_src_unpack
+}
+
+multilib_src_unpack() {
+	local libdrm_ver="2.4.97"
+	local patchlevel=$(ver_cut 3)
+	local deb_abi
+	[[ ${ABI} == x86 ]] && deb_abi=i386
+
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	unpack_deb "${S}/opencl-orca-amdgpu-pro-icd_${MY_PV}_${deb_abi:-${ABI}}.deb"
+	unpack_deb "${S}/libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_${deb_abi:-${ABI}}.deb"
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	local dir_abi short_abi
+	[[ ${ABI} == x86 ]] && dir_abi=i386-linux-gnu && short_abi=32
+	[[ ${ABI} == amd64 ]] && dir_abi=x86_64-linux-gnu && short_abi=64
+
+	into "/opt/amdgpu"
+	patchelf --set-rpath '$ORIGIN' "opt/${SUPER_PN}/lib/${dir_abi}"/libamdocl-orca${short_abi}.so || die "Failed to fix library rpath"
+	dolib.so "opt/${SUPER_PN}/lib/${dir_abi}"/*
+	dolib.so "opt/amdgpu/lib/${dir_abi}"/*
+
+	insinto /etc/OpenCL/vendors
+	echo "/opt/amdgpu/$(get_libdir)/libamdocl-orca${short_abi}.so" \
+		> "${T}/${SUPER_PN}-${ABI}.icd" || die "Failed to generate ICD file for ABI ${ABI}"
+	doins "${T}/${SUPER_PN}-${ABI}.icd"
+}
+
+# FIXME: is this right?
+multilib_src_install_all() {
+	ewarn "FOO $PWD"
+	ewarn `ls`
+	insinto "/opt/amdgpu"
+	doins -r opt/amdgpu/share
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Please note that using proprietary OpenCL libraries together with the"
+		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
+		ewarn "for support in case of problems with this package."
+		ewarn ""
+		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
+		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
+		ewarn "has become officially supported by Gentoo."
+	fi
+
+	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+}
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index d0dde9f45915..4d1d886dfc8c 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +1,5 @@
 DIST appstream-glib-0.7.15.tar.xz 2240040 BLAKE2B e1b58e0ce6523354490e529381302aa603e4ac1886c37e9c261ab612f76490ae4ea8fd22eff9c2bc1981d5ceb77ff8c4f8279e091dc62bd4df39d2c32623c1ea SHA512 bab0c73e54d90fbf22295f616d4a09332f94b90a3fa0cb38f1b654c6d9a459c9557dd81c677f486361dbf4f1dd23651306fe34b1cdd15254694269a8c9e8a927
 DIST appstream-glib-0.7.9.tar.xz 2245728 BLAKE2B fb6f54329bed91f1acaa6218b111fd4527dff7ed412a89cb44a6e4f6cdfb7e0fe4e6f9fb37b6cdc2efa75164dccef323b6d7428a63b08369b941d36b0b9071f0 SHA512 d78cb6f11cad01d67cb33f16e987485177d20b78a8b21cfbabb64ce7b18b813c0d2d1de2faeea199fdc31d12633e899a5596a6cf133cb831a4377d641f79eb7d
-EBUILD appstream-glib-0.7.15.ebuild 1643 BLAKE2B e4dfcf72682c21ab765cc8571beac003c1a79df323b8f8779b2484142356e7ef1642aae07b9b0e4e8aa3f796cf4564aa8f477c82b79a58805eec85924b757775 SHA512 1b6fd974e8427ad7796d47d91f34c5ac6c057c97052609543de08c334342963c1aa357d5bd85e2e013928355c1cb13334e97447c413543ae70edaf0eee756ff0
+EBUILD appstream-glib-0.7.15.ebuild 1642 BLAKE2B 55ad57e62fd47a15f0b8c8206b77a25b4d2023ace1d0c796774f133de8606b2dcfa2cc4dd0c586dd46b4f56417cd933a8bec07c433719b230b15dd48bef49def SHA512 80c699280cd18d7fb9318c5039a23b88c881b937cb0f632f092256d04f6c7ed56bc2cd92119c60ad02d4310d7f769787464cb2dcf2a769847045b5d975f67a94
 EBUILD appstream-glib-0.7.9.ebuild 1623 BLAKE2B c66d8dae417e53b8fcc0be7afbd2cc06aee3df35254ea1e204dd00feacd37133b702f39ca1899e91c9fea5294e45cbf35a31df7b8e30370be76821301f47dae0 SHA512 d865778c663bbfcab9e99473f66c4156c5d887fcdd1e4402bacc9bb7dcaf073656a624b8d0e2d78883b180512e31ecb7553cfb5ca0733d369d5bb745b5141bf6
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
index f91b1ef7119b..9de2cc8807f5 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 4b2ae3a22d67..8be08e6faa63 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,3 +1,3 @@
 DIST AppStream-0.12.6.tar.xz 1953604 BLAKE2B 28b03a935b8c203f2ac2c52c1de8317cc899f2b81b00e83e2eb858dbd185a985ce608ba3f6b1c35f084b4ee91946a4870c89d6b0c0a4c6fd32a938558e3997f1 SHA512 c19cd89ba39aff5afa2ff6d5fca72581a8624463c33011b11036526db98392ff5aa6c0f599682e90fdee29b8732538cf96c20b66965016b96f60b3f899d722bb
-EBUILD appstream-0.12.6.ebuild 1578 BLAKE2B f49c8b79d6f8bf133d1d85f711cd5c31425cd10428f87bbcc0660bf8ea7b748b687bce5838895d46245fe0204e538f1c602520a5667debd23a65a788adeba82c SHA512 17ee9c6aed9b5abfe4bbea349311eab42b75e0b101ea74151614b51d9bac49d11839d1ef6bd28f3535606856b9a22431d85a36f91b72787e709e2b138c16a067
+EBUILD appstream-0.12.6.ebuild 1577 BLAKE2B 068254a2aaf873f8376cfe229596319a462a636137c74a90109c36ef975fa6022fc63bdd7c1469981731cb1e3712740506acebb74756de81502c92127a1be3bb SHA512 1f1c5a1d307e42ddb273c4ad77cc887f913f2a74392ff25050a541403a424981baecd95e1a3c127877888ab9e910307e4a6070821a7892583e5a853620c421b4
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.6.ebuild b/dev-libs/appstream/appstream-0.12.6.ebuild
index d45c21e89008..528e7d9d8092 100644
--- a/dev-libs/appstream/appstream-0.12.6.ebuild
+++ b/dev-libs/appstream/appstream-0.12.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	MY_PN="AppStream"
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 06c505db9ffd..78a7dc6f80dd 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -4,5 +4,5 @@ DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 EBUILD apr-util-1.5.4-r3.ebuild 3685 BLAKE2B 6de15972c714d4077aeeaf62771b0427c96d7022ffbe8f639576d1c422562806ac5daf93b6d6841f581f0d8e2419a33692abe392bdb583b1722ae3734865af9c SHA512 576d513d8716117cbbe854d14e183c13060408f187a22b000e5e21f2f6b71c8774bf197612ae27080a3d97ea0bbbb078579db2551c54c12a6a1b75dd63fb2c7b
 EBUILD apr-util-1.5.4.ebuild 3214 BLAKE2B a90ae943aba394503d08cfad961e603c5aaf1460b28f040e35c0a330ad59ea333606cc909e6d8543f1c24a4a0898492dc50d988cfcf6e7ea681dd12207870838 SHA512 a419670fc4df0a4b7c7f1c2d07b67428dda3d72663e45ab1c2cd72268c33100a4d9319398086666530d69524f61eae196198e4622f0dc889f7413b763c3ec5c2
-EBUILD apr-util-1.6.1-r3.ebuild 3750 BLAKE2B 4809d994a0892f89751ebca1ebbd06a754d88b8099251f63db81d6d254c2f697c45e62951f7474aff6595c113f8524072487b5ab1ca014028bb7aa3866063dcd SHA512 ce15fa08f7040d9433f06a9eec2c00f482a003143f582d95182a1f3e6d72233b3ce1f71a2f7684be9713c67e8f535ac3c2a015e59bf8dd9e2e7e0f957d36fa2e
+EBUILD apr-util-1.6.1-r3.ebuild 3749 BLAKE2B 8ecf1f4437c01f14476224dc4c9fa2db85c6a47151bdeee212e7d4f50ebb1dbe17dc14d1cef4f2015cbc2c44af18da588d9e67c62b5356a60a7ee8ae10e37716 SHA512 0a3cbaf9475af0b49e95a1a3bd5fd0d67376608e82b213dc2329af1863faff391621cae045fccb493dc064f3a242cdaefdcac4c839275607d092fe47c3bf4561
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index a4d3584e8c93..f5a1fba08fe7 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-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 ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 701093a292da..4878f85e8256 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -2,5 +2,5 @@ AUX atk-2.30.0-use-basename-instead-of-filename.patch 2528 BLAKE2B 7a81c6ed9c73c
 DIST atk-2.28.1.tar.xz 712508 BLAKE2B 71aee8bc937e1e37d40e6a9820d0002bcc763dbf87385ede2484ec6fe17a9924d5753d74dc3a769602746c915d0c46da8eea78cc80c706e3c38faca2e5050364 SHA512 aa61e7718b3f4d9c33ec2b4747e35f894a51550ef39ecc4a7af5705811c029645bd3c728071f446b075a0b7aef0c35c1b73406a210cd30171838f24a8dfc0abb
 DIST atk-2.30.0.tar.xz 290264 BLAKE2B dec44abf3bd4937f417cd0b75bee32fdd073ccca1e44d883293d060afbbc30909aac483007e293231fafe0c5481df94d1113d287a0002a823f4e9c8e7bd647c2 SHA512 03f311378fdb91442f27ed542fa36edd2c9c036837c9f25ff37468bf7f743277d0b9253621563d15894e0da9d37e8df0a0e2c0e47e6aae33a38b13744c3b8b8e
 EBUILD atk-2.28.1.ebuild 1441 BLAKE2B c1283a8624ebc62e5bebd5d7593413be5030a7dc3206440e07630f29b0b06bcb93effe354fa52552706a557e5a965396f8c0a800322595589137ab56208d9f3e SHA512 04ffcc74623d10bf92d3401deec43395bf4cf8c3093481af7d46369df7e0e563ae91655be7fb78a6a232e76dd4fe0cc43d7330af3b3147e9aa6f12dfd8ce2513
-EBUILD atk-2.30.0.ebuild 1254 BLAKE2B a00dc265ca6e607af431804063cd6037fd1991be6ee0243f37781e22cb0e2da99ccb7c78da16b7c1a5913053bb22213101ba4d052add0d8670b7ca6356e61be6 SHA512 111abd759cd1c949531b1f78439587d080030db2124c318577f38e533756f06e53a126e378f0490f92026ec7eeef09b0c695a940fe3e10e153be3a4366b7c4a9
+EBUILD atk-2.30.0.ebuild 1253 BLAKE2B f54d156b3c432954f800300f71c62a33222ae2815fcf710e8f6d1b3dc954c49de557148c86ee72e498af9159fefcae05e5725c88e64040130263c9fbebb83586 SHA512 b7c8231f15edea969c89dc6f8416ed198fd45ed7b3b566e4d8a9000042b2d9746b6bf9828a865786594e9150b48cff6d8d6ab5f6c886b5e459202096266dfc0c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.30.0.ebuild b/dev-libs/atk/atk-2.30.0.ebuild
index 7dc5cfa6ce85..dc7bd71ee6b5 100644
--- a/dev-libs/atk/atk-2.30.0.ebuild
+++ b/dev-libs/atk/atk-2.30.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 53664dc53feb..724524a852ff 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -3,13 +3,11 @@ AUX beignet-1.3.1-oclicd_no_upstream_icdfile.patch 564 BLAKE2B f90bdf1c1a795007e
 AUX beignet-1.3.2_cmake-llvm-config-multilib.patch 950 BLAKE2B 9028eede7ee68dfd539bb268914c354eeaac8a9d26647c6dfb030078199e749cf67d2c396305ccaa7a139f10fcc8eca7b36657d4425439137e7199a4e62c4d13 SHA512 9a9a0348b39f0f9d256166141b48e255ccbc03e4d5150e660cfad2c23af8ff67b75049361fa84f2c2c26be2be914ad07efeae5e150f4f390ec7d5503c49b1c74
 AUX beignet-1.3.2_disable-doNegAddOptimization.patch 2536 BLAKE2B c07e063686e80a0b3f461475345582616ee59b8e195f90a87c2338a856cb3ebb04f0dd70595d901f10ae3645b9c33cccd5c0fb9bfd60052f76067f415eafac64 SHA512 d1d4f7ba2a44ee2c6255190189d141fc8adadeb6f64935501d5ce41cff1eb31e64b32664aee3edb2203f0d267fc776fbe9ed761c344fb23d858d91d6690af086
 AUX beignet-1.3.2_llvm6.patch 1039 BLAKE2B 990a653b7ff52ec89ec1204cc5bae1d0b041ae51da4a16fd1a459abfe083be1e5647e9fdac3b336284fcdb6c460dbd9c151d5818c084d49c0c2d68fb56aed905 SHA512 634ddb79878b017be984c0327160affc06d7acaf17b1030e55542d2d2cc873bebd3808638f0966538b0dd7bca763eda2263f22f818dd0b73167a4ba3f5933aaa
-AUX beignet-1.4.0-oclicd_no_upstream_icdfile.patch 726 BLAKE2B 4d182497c099e174a95524b4bd7bda66c03e128cb089b7536716afda442d8959beab19f0e6015173fbe761f1f569ce065fd1701545ebfdd0680b070644a4d9c4 SHA512 3a77f85cb8f28096b21a77e70f901ccc64291e7439c5e4ae6d7259c30531ea550604f54d0cf910e4482089ab5782f50dcb1940e5df723b0457fdafd550b2b537
-AUX beignet-1.4.0_no-debian-multiarch.patch 862 BLAKE2B 54fb9124832e57b3466c11696cf311d32863bdc36d9f4f4e946958233884f95ad9c212bf63f598e52ad054da79f453fb5a3208958de48e45bd9f21a010309edf SHA512 6760b3b7038ba0dc125998de65ec688b5eb840d8a41543ab35f6d6b6084a877fe0e383bd44b6947695ff835b391794547d7eec21bf787548e6bb03ccf2b73587
+AUX beignet-1.3.2_llvm7.patch 4805 BLAKE2B df959c8e482e1810b2257419088a4cd283bfec8984a774865722de5fb21e8e29ea4d66b98ae535f4d5a7ccb0a6754a1c683709dd9f6f535c4747822fccea2ebc SHA512 0e72053db39fb06fd14b4660109702fc917493191dfad1c1fb4afe7e8533df371dd6a048833175de247ba33aab7ef56dc0cf6449f37b432cbf2e6086391da663
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r1.ebuild 2731 BLAKE2B 28cf32641aebc20518c7f1d9c7443a6d70df6586bef1d44f7412e9df9d385db05799ad4abf4f47777724e5627fc98becad0c0e9ca35996b3949fd30382b1e140 SHA512 2804dc211c9ac1b2ad59c0fcb94c0b254ab4cc38491f439f8113da9b0125edd008eafa598d1b03fce3bbc5294086254e31a121fa5485d55a064022e65b8d06a8
 EBUILD beignet-1.3.2-r2.ebuild 2959 BLAKE2B bd67d958a8ab72669c924c28fcd487d677098370c357045cad33b4fc627a182c41bc8037388255d16215a9ad7d73663f36d91bc4ad1bef32fffcdbce29de551a SHA512 64ebc3b96c4a9e41fa36f1c5260a9ef47779c11f9d8dac83deab2777ad8a9cdf5259348d67b2ce2fa8e41e2a093dac85b073580b70827729498fa4febcffd56c
+EBUILD beignet-1.3.2-r3.ebuild 2855 BLAKE2B 760d63a15608ea0ffcf78fa42db32d64ca690794ff5d0d7f79f7b70b10b1de4064f777ca8c3c9c3c29a0f03abcf38fb045983f28c140cd97407f985e9d1f2f70 SHA512 71dcea5162e2c039971959030a49c5e64dbf02524665bd63722cec4d79e03bb5f29ebca0a3a8012c0469ad2d49d768a8218f0fc5b1472321cb1cb8f76b58e6f5
 EBUILD beignet-1.3.2.ebuild 2673 BLAKE2B 8edf3cb1b0dfe6201405afe50117e79172e20f9d5aafdecaba72cd85301c01c472a9be024d0b3a8a2c723b84bfd4a72c631d76bec3f08dc8412aa9d6ebd8f2dc SHA512 bf959b3ce52019d83e4a8bd3871155386c2e3c5de4f241044d77a1282c56c9837be6f12a78ca648833b2e21b533f42ba85de31d16027cb66cb47d52a985ac8b2
-EBUILD beignet-9999.ebuild 2495 BLAKE2B 71c35c38df5b0c3492510bc19f79ecff277488e9be8ad2c8f08e36b9569de28e005172256984618417a9aecf78588766bc6aa7974fb7e458d3c71b15f5db007e SHA512 d60e4b39d4a078bf7ee0958536a37f734faa578884ca79b329496d852b28727961f9f20f272a6dbf47ff910e4eff677e1ed2701331184dfc1efe46a9bae925bd
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
deleted file mode 100644
index c7cc20e5302c..000000000000
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-CMAKE_BUILD_TYPE="Release"
-
-inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
-
-DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="ocl-icd ocl20"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
-	S=${WORKDIR}/Beignet-${PV}-Source
-fi
-
-COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
-	<sys-devel/clang-6.0.9999:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]"
-RDEPEND="${COMMON}
-	app-eselect/eselect-opencl"
-DEPEND="${COMMON}
-	${PYTHON_DEPS}
-	ocl-icd? ( dev-libs/ocl-icd )
-	virtual/pkgconfig"
-
-LLVM_MAX_SLOT=6
-
-PATCHES=(
-	"${FILESDIR}"/no-debian-multiarch.patch
-	"${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch
-	"${FILESDIR}"/${PN}-1.3.2_llvm6.patch
-	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
-	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
-	"${FILESDIR}"/llvm-terminfo.patch
-)
-
-DOCS=(
-	docs/.
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc; then
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
-				eerror "Compilation with gcc older than 4.6 is not supported"
-				die "Too old gcc found."
-			fi
-		fi
-	fi
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	# See Bug #593968
-	append-flags -fPIC
-
-	cmake-utils_src_prepare
-	# We cannot run tests because they require permissions to access
-	# the hardware, and building them is very time-consuming.
-	cmake_comment_add_subdirectory utests
-}
-
-multilib_src_configure() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${VENDOR_DIR}"
-		-DOCLICD_COMPAT=$(usex ocl-icd)
-		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	cmake-utils_src_install
-
-	insinto /etc/OpenCL/vendors/
-	echo "${EPREFIX}${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
-	doins "${PN}-${ABI}.icd"
-
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
-}
diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
new file mode 100644
index 000000000000..820fc50e9a73
--- /dev/null
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+CMAKE_BUILD_TYPE="Release"
+
+inherit python-any-r1 cmake-multilib flag-o-matic llvm
+
+DESCRIPTION="OpenCL implementation for Intel Sandy Bridge, Ivy Bridge and Haswell GPUs"
+HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
+SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ocl-icd ocl20"
+
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig"
+COMMON="app-eselect/eselect-opencl
+	media-libs/mesa[${MULTILIB_USEDEP}]
+	<sys-devel/clang-7.0.9999:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	ocl-icd? ( dev-libs/ocl-icd )"
+RDEPEND="${COMMON}"
+DEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=7
+
+PATCHES=(
+	"${FILESDIR}"/no-debian-multiarch.patch
+	"${FILESDIR}"/${PN}-1.3.2_disable-doNegAddOptimization.patch
+	"${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch
+	"${FILESDIR}"/${PN}-1.3.2_llvm6.patch
+	"${FILESDIR}"/${PN}-1.3.2_llvm7.patch
+	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
+	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
+	"${FILESDIR}"/llvm-terminfo.patch
+)
+
+DOCS=(
+	docs/.
+)
+
+S="${WORKDIR}"/Beignet-${PV}-Source
+
+pkg_setup() {
+	llvm_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	# See Bug #593968
+	append-flags -fPIC
+
+	cmake-utils_src_prepare
+	# We cannot run tests because they require permissions to access
+	# the hardware, and building them is very time-consuming.
+	cmake_comment_add_subdirectory utests
+}
+
+multilib_src_configure() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${VENDOR_DIR}"
+		-DOCLICD_COMPAT=$(usex ocl-icd)
+		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	cmake-utils_src_install
+
+	insinto /etc/OpenCL/vendors/
+	echo "${EPREFIX}${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+	doins "${PN}-${ABI}.icd"
+
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
+}
+
+pkg_postinst() {
+	elog ""
+	elog "Please note that for Broadwell and newer architectures, Beignet has been deprecated upstream in favour of dev-libs/intel-neo."
+	elog "It remains the recommended solution for Sandy Bridge, Ivy Bridge and Haswell."
+	elog ""
+
+	if use ocl-icd; then
+		"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+	else
+		"${ROOT}"/usr/bin/eselect opencl set --use-old beignet
+	fi
+}
diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
deleted file mode 100644
index 735edfd2e512..000000000000
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-CMAKE_BUILD_TYPE="Release"
-
-inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="ocl-icd ocl20"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
-	S=${WORKDIR}/Beignet-${PV}-Source
-fi
-
-COMMON="media-libs/mesa
-	sys-devel/clang:=
-	sys-devel/llvm:=
-	>=x11-libs/libdrm-2.4.70[video_cards_intel]
-	x11-libs/libXext
-	x11-libs/libXfixes"
-RDEPEND="${COMMON}
-	app-eselect/eselect-opencl"
-DEPEND="${COMMON}
-	${PYTHON_DEPS}
-	ocl-icd? ( dev-libs/ocl-icd )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0_no-debian-multiarch.patch
-	"${FILESDIR}"/${PN}-1.4.0-oclicd_no_upstream_icdfile.patch
-	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
-	"${FILESDIR}"/llvm-terminfo.patch
-)
-
-DOCS=(
-	docs/.
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc; then
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
-				eerror "Compilation with gcc older than 4.6 is not supported"
-				die "Too old gcc found."
-			fi
-		fi
-	fi
-}
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# See Bug #593968
-	append-flags -fPIC
-
-	cmake-utils_src_prepare
-	# We cannot run tests because they require permissions to access
-	# the hardware, and building them is very time-consuming.
-	cmake_comment_add_subdirectory utests
-}
-
-multilib_src_configure() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
-		-DOCLICD_COMPAT=$(usex ocl-icd)
-		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	cmake-utils_src_install
-
-	insinto /etc/OpenCL/vendors/
-	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
-	doins "${PN}-${ABI}.icd"
-
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
-}
diff --git a/dev-libs/beignet/files/beignet-1.3.2_llvm7.patch b/dev-libs/beignet/files/beignet-1.3.2_llvm7.patch
new file mode 100644
index 000000000000..8990f0f0e48f
--- /dev/null
+++ b/dev-libs/beignet/files/beignet-1.3.2_llvm7.patch
@@ -0,0 +1,124 @@
+commit e1b2419a0008e38ef2d9d255d9e9c74e9fba084b
+Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
+Date:   Sat Jul 21 20:05:54 2018 +0100
+
+    Add preliminary LLVM 7 support
+    
+    This is preliminary because LLVM 7 has not been released yet:
+    it was tested with the snapshot from Debian experimental (svn336894).
+    
+    1.Change linking order, as clangCodeGen now links to clangFrontend
+    2.Pass references not pointers to WriteBitcodeToFile and CloneModule
+    3.Add the headers that LoopSimplifyID, LCSSAID and
+    some create*Pass have moved to
+    4.Define our DEBUG whether or not we just undefined LLVM's
+    (theirs is now LLVM_DEBUG, but we never actually use it)
+    
+    Signed-off-by: Rebecca N. Palmer <rebecca_palmer@zoho.com>
+    Reviewed-by: Yang Rong <rong.r.yang@intel.com>
+
+diff --git a/CMake/FindLLVM.cmake b/CMake/FindLLVM.cmake
+index 5457f248..f882589d 100644
+--- a/CMake/FindLLVM.cmake
++++ b/CMake/FindLLVM.cmake
+@@ -113,10 +113,10 @@ macro(add_one_lib name)
+ endmacro()
+ 
+ #Assume clang lib path same as llvm lib path
++add_one_lib("clangCodeGen")
+ add_one_lib("clangFrontend")
+ add_one_lib("clangSerialization")
+ add_one_lib("clangDriver")
+-add_one_lib("clangCodeGen")
+ add_one_lib("clangSema")
+ add_one_lib("clangStaticAnalyzerFrontend")
+ add_one_lib("clangStaticAnalyzerCheckers")
+diff --git a/backend/src/backend/gen_program.cpp b/backend/src/backend/gen_program.cpp
+index 274c99c7..41592349 100644
+--- a/backend/src/backend/gen_program.cpp
++++ b/backend/src/backend/gen_program.cpp
+@@ -454,7 +454,11 @@ namespace gbe {
+ #ifdef GBE_COMPILER_AVAILABLE
+       std::string str;
+       llvm::raw_string_ostream OS(str);
++#if LLVM_VERSION_MAJOR >= 7
++      llvm::WriteBitcodeToFile(*((llvm::Module*)prog->module), OS);
++#else
+       llvm::WriteBitcodeToFile((llvm::Module*)prog->module, OS);
++#endif
+       std::string& bin_str = OS.str();
+       int llsz = bin_str.size();
+       *binary = (char *)malloc(sizeof(char) * (llsz+1) );
+@@ -545,7 +549,11 @@ namespace gbe {
+                                     &modRef);
+         src = llvm::unwrap(modRef);
+       }
++#if LLVM_VERSION_MAJOR >= 7
++      llvm::Module* clone = llvm::CloneModule(*src).release();
++#else
+       llvm::Module* clone = llvm::CloneModule(src).release();
++#endif
+       if (LLVMLinkModules2(wrap(dst), wrap(clone))) {
+ #elif LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 37
+       if (LLVMLinkModules(wrap(dst), wrap(src), LLVMLinkerPreserveSource_Removed, &errMsg)) {
+diff --git a/backend/src/backend/program.cpp b/backend/src/backend/program.cpp
+index c37c5951..b36f7b4a 100644
+--- a/backend/src/backend/program.cpp
++++ b/backend/src/backend/program.cpp
+@@ -794,7 +794,11 @@ namespace gbe {
+       llvm::raw_fd_ostream ostream (dumpSPIRBinaryName.c_str(),
+                                     err, llvm::sys::fs::F_None);
+       if (!err)
++#if LLVM_VERSION_MAJOR<7
+         llvm::WriteBitcodeToFile(*out_module, ostream);
++#else
++        llvm::WriteBitcodeToFile(**out_module, ostream);
++#endif
+     }
+ #endif
+     return true;
+diff --git a/backend/src/llvm/ExpandLargeIntegers.cpp b/backend/src/llvm/ExpandLargeIntegers.cpp
+index 8515dc13..4aec44ee 100644
+--- a/backend/src/llvm/ExpandLargeIntegers.cpp
++++ b/backend/src/llvm/ExpandLargeIntegers.cpp
+@@ -99,8 +99,8 @@ using namespace llvm;
+ 
+ #ifdef DEBUG
+   #undef DEBUG
+-  #define DEBUG(...)
+ #endif
++#define DEBUG(...)
+ // Break instructions up into no larger than 64-bit chunks.
+ static const unsigned kChunkBits = 64;
+ static const unsigned kChunkBytes = kChunkBits / CHAR_BIT;
+diff --git a/backend/src/llvm/llvm_bitcode_link.cpp b/backend/src/llvm/llvm_bitcode_link.cpp
+index ef56e4c2..4c3e20e4 100644
+--- a/backend/src/llvm/llvm_bitcode_link.cpp
++++ b/backend/src/llvm/llvm_bitcode_link.cpp
+@@ -340,7 +340,11 @@ namespace gbe
+     /* We use beignet's bitcode as dst because it will have a lot of
+        lazy functions which will not be loaded. */
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 39
++#if LLVM_VERSION_MAJOR >= 7
++    llvm::Module * linked_module = llvm::CloneModule(*(llvm::Module*)mod).release();
++#else
+     llvm::Module * linked_module = llvm::CloneModule((llvm::Module*)mod).release();
++#endif
+     if(LLVMLinkModules2(wrap(clonedLib), wrap(linked_module))) {
+ #else
+     char* errorMsg;
+diff --git a/backend/src/llvm/llvm_includes.hpp b/backend/src/llvm/llvm_includes.hpp
+index 184553af..ffccf025 100644
+--- a/backend/src/llvm/llvm_includes.hpp
++++ b/backend/src/llvm/llvm_includes.hpp
+@@ -89,6 +89,10 @@
+ #include "llvm/CodeGen/IntrinsicLowering.h"
+ 
+ #include "llvm/Transforms/Scalar.h"
++#if LLVM_VERSION_MAJOR >= 7
++#include "llvm/Transforms/Utils.h"
++#include "llvm/Transforms/InstCombine/InstCombine.h"
++#endif
+ #include "llvm/MC/MCAsmInfo.h"
+ #include "llvm/MC/MCContext.h"
+ #include "llvm/MC/MCInstrInfo.h"
diff --git a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch b/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch
deleted file mode 100644
index ddffcfc8aff4..000000000000
--- a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -214,14 +214,6 @@
-   Find_Package(OCLIcd)
-   IF(OCLIcd_FOUND)
-     MESSAGE(STATUS "Looking for OCL ICD header file - found")
--    configure_file (
--      "intel-beignet.icd.in"
--      "${ICD_FILE_NAME}"
--      )
--    IF(NOT OCL_ICD_INSTALL_PREFIX)
--      set(OCL_ICD_INSTALL_PREFIX "/etc/OpenCL/vendors")
--    ENDIF(NOT OCL_ICD_INSTALL_PREFIX)
--    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${OCL_ICD_INSTALL_PREFIX})
-   ELSE(OCLIcd_FOUND)
-     MESSAGE(STATUS "Looking for OCL ICD header file - not found")
-     MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.")
diff --git a/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch b/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch
deleted file mode 100644
index 983ba61ff38f..000000000000
--- a/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,15 +33,9 @@
- 
- SET(CMAKE_VERBOSE_MAKEFILE "false")
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
--INCLUDE (GNUInstallDirs OPTIONAL)
--# support old CMake without GNUInstallDirs
--if (NOT CMAKE_INSTALL_FULL_LIBDIR)
--  set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
--  set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
--  set (BEIGNET_LIBRARY_ARCHITECTURE "")
--else (NOT CMAKE_INSTALL_FULL_LIBDIR)
--  set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
--endif (NOT CMAKE_INSTALL_FULL_LIBDIR)
-+set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
-+set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-+set (BEIGNET_LIBRARY_ARCHITECTURE "")
- 
- if (NOT LIB_INSTALL_DIR)
-   set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index cc014efdd590..5e0ab74359cf 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -2,6 +2,8 @@ AUX crypto++-5.6.4-nonative.patch 1011 BLAKE2B e8f8245dbb1ce9a0011c0e73ea1021ab4
 AUX crypto++-5.6.5-CVE-2017-9434.patch 1728 BLAKE2B 0cfd25fca89d59486ba9c49a87f04d90f0b5bff524aa817a46dcb1c3fd005609a938e08007d71bf407bd8ef0c334baa2054b44c2aac58c15817314223c7b0a2c SHA512 42566d3e67c6b253b65587877652112691ba91e554db47843256a9c2af8a29d7950266a508358356f008462ec51cc1dadf4d0e9dbbd33a33a5a94d029eebc1f9
 DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
 DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
+DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
 EBUILD crypto++-5.6.5-r1.ebuild 1530 BLAKE2B df7d53463e39d86aa3eb905911e5ccdd6cd6ae435b4a51059978b68109c3448c555bbe91984f285671856d5ab7c98232cf2b171d154a01a97655d5aea14cf94b SHA512 f8065ac14fcffa77b75a439edcad34214d62a40184c27f79b073d4f788b2ef3b8667110ef9766d901ed69a25cb1f1639d494f4a0ad2e97391879821569b5a06b
 EBUILD crypto++-7.0.0-r3.ebuild 1077 BLAKE2B f6fda1242e5f9c5379b03793d1652a62596f8f3f97a507c19c7399e8418128908e82ca92494b485eff40d195e16a84009377208e9c83c49feb69d8b338a40edf SHA512 0088c1bc6c4a3e573955f14dab24da6e077699c147de1f3b18c3d76ab0d4073d20ddfb169691f2fee9c459a88d9662cc69d519224434c327d8c4b1dd36f6951b
+EBUILD crypto++-8.2.0.ebuild 1085 BLAKE2B b7a1484da1c66f5fd818dd5e04c23299ebc305a14e65cd13609618ef1bb737b2af066ba3f2cd46d3dc4aaae93c8ece2b613a369e8210767c1ff4553a2d82dd8c SHA512 90e2946803f7351f9242005909f4dab4e67d22b7c432f67efc1c5074f1e93c4c4117344e62b4d295500997e8d4d724159923625dab8f42700d3d0993f5d6d2f1
 MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
diff --git a/dev-libs/crypto++/crypto++-8.2.0.ebuild b/dev-libs/crypto++/crypto++-8.2.0.ebuild
new file mode 100644
index 000000000000..be40704c5f30
--- /dev/null
+++ b/dev-libs/crypto++/crypto++-8.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="C++ class library of cryptographic schemes"
+HOMEPAGE="https://cryptopp.com"
+SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
+
+LICENSE="Boost-1.0"
+SLOT="0/8" # subslot is so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="+asm static-libs"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+config_uncomment() {
+	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
+}
+
+pkg_setup() {
+	export CXX="$(tc-getCXX)"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
+}
+
+src_prepare() {
+	default
+
+	use asm || config_uncomment CRYPTOPP_DISABLE_ASM
+
+	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
+	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
+}
+
+src_compile() {
+	emake -f GNUmakefile all shared libcryptopp.pc
+}
+
+src_install() {
+	default
+
+	use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
+}
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 75f0931b52a3..1e596a6c950b 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -8,5 +8,5 @@ DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc
 EBUILD ding-libs-0.4.0.ebuild 492 BLAKE2B 56a1412b2906d75ba6623c7e3f57aff2829a95c4fbdf8b21f3127754b5950deeaafaad6e918e6f97a26e44ea5127b7cbce2e58b4a2d16faca17a85bc9791eace SHA512 169e8d203a8aac008017dd1d61e7c160d75b97f90f4874ab6e6321c61a6c58b7bf04817520b081d33598290dde2069cad8e4e60c785bebde332a611783fb252f
 EBUILD ding-libs-0.5.0.ebuild 548 BLAKE2B b85dc9940e7d1249f3d729f8b2aca392ebccc4a8af068712fb68c31f7996dd1704eac4cc9247bc447715b9f8aacc5a0dc32d7bd37ffab00f5bc8a811fedf454e SHA512 ece4b10606274a789cb9a6877b7cad4fc87d7a011c48b7d0791fbd4a1a9b8859acb800c0c1b95cda542edf1abf63c364dab01ff6c149ca0fba742eb70138705e
 EBUILD ding-libs-0.6.0.ebuild 598 BLAKE2B f0212d264f319d4ac2c3204e8e187b0f00b35359a69987814eb1a2242e5ab4234aef0f16efb244c262f0bfe2e745d32ba3c9961cc8f01cc0c81573f59d39a515 SHA512 5e13b98a2defd0fcbb2c0e6ca17b06981ddaaf0ee09b83095f6c63edcf4f9f4eda0d1049f03705c9c677935d601f25e66acf36e3b3e7bdadf9b034a86c3b84d7
-EBUILD ding-libs-0.6.1.ebuild 802 BLAKE2B 3239136179d46f0b395bf68c3673996c7f2c307ffa3eaa261feb7f6d3ff6f7db1cb09467a2848328765ed9ec03b3b71fe0fe504be40531af961833db8a24ebb6 SHA512 c72fb6dbfdb36de0d12c35d3294f150dd05b9ddfee17bfbf9917f4174ce430b397ad543e8b954b9c4ab294e55b70483f9e625b101ee4bfab1766837cfc5c25c2
+EBUILD ding-libs-0.6.1.ebuild 801 BLAKE2B bb44b255ba41dea53fa1efdc27f67a8c611b5ad1c4c1ac3a68054cd5ad171c46c7f766c67ec1f6810ecf3bae83603228e1fd6977a2e2cfcd3233d416d7a551f3 SHA512 c48f4aeeaa8bb788f0d4682d15d0e73faddb6ab20a60a082490f2c4fb33a458d68acd871f90c995c7ba8ae04c2fe17d4b17bcd1300c15eadf684e5a8b4b4cf6e
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
index 88d34677f297..ad1d696f0176 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 4c6970bdb34a..81dc7fa20352 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -2,5 +2,5 @@ AUX 0001-CMake-install-to-correct-lib-dir.patch 1957 BLAKE2B a8139d2c7474b96526b
 DIST double-conversion-3.0.3.tar.gz 7019705 BLAKE2B 65d7729b55dbb9fd0cf31b258738f3e9f3350b4ecf0204d3d2d23de24cb24651788e844aa1a10d6ec452ca6484c43ed1d218d434fc18be7bb1f15bf8ba97102a SHA512 3a8e956da485195753508c90cd6fa3d9fde42103291a8e65a0d95488faa02e98dddff21935625519c0ce49d8911d66d0773ddf6012264094f3edd851b461f62b
 DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
 EBUILD double-conversion-3.0.3.ebuild 1345 BLAKE2B 054cea2fe264a7f76cd26b48a72718eb806c22a89e47b697b8163618c62dd4c6c112c9030aef9bf42487c63c004413ca86faef3cc99b00132077de4755dc694a SHA512 5f525223d86923f672e0652effd7b30dfcbffa4b507ab4c5151d00b3b427e45619f50eaa4f80ef4750f02041440f47360636436ce4ba19cff6fa2f0b1e19a1e4
-EBUILD double-conversion-3.1.4-r1.ebuild 1404 BLAKE2B 40eeda349953ad21fd945c661c5916e3f122e52e168b6932d3f70a3f4d0dd0c35638e397a215401ad32dc87300945e028f27d2e8c1dcdc286bb1731629fc4429 SHA512 5245089830a68a8aa56af1795deae6ea64de4bd7a01eef72ebb566e1eaf7350d89cf927759e7c018a55949978ff4a3bb7160800ab3f1a8d7f3a4e41697a3cc21
+EBUILD double-conversion-3.1.4-r1.ebuild 1399 BLAKE2B 41fcdb92091dffbad28efd3a25f5425e933f0aa44feb61c15ae154201d86e4d974a2616bbc6cccabf9adc525e6d72548986d014ce064700251f7b0cd9c5e1a94 SHA512 6d9f7c9ee007f7166c62f0bc723c2f8f6028ea9e2d1e3ea49785c758bcc7b0b50f089f28059798ba0341c3d6fd8e50323896ba35d443971bce1d38ba68d0854f
 MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
index dd31effe733b..9497111c5428 100644
--- a/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 PATCHES=(
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index b44eb2de4391..9c4dbde2c989 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,8 +1,6 @@
 AUX efl-1.21.1-fix_evas_preload_segfault.patch 381 BLAKE2B a4b8afbe06cd44154a41766fcf12775369c2243325eab17647423a3d2b78cc3646361c0a4884de71fd876698defb9816f50343c46690b595c3701a6295a95040 SHA512 90901ab26915a6d2aba80deb610eb8bb873cd4cc7210888a4f062057891024d4e0b3f051be2fda39680d2267301251abbfbfc47072cb5c22ba6eba8f9d9567fc
-DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
 DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
-EBUILD efl-1.20.7-r3.ebuild 7708 BLAKE2B d16c5185d86e88f6cf202ddf864c1608dc42f5c5e6c93f2b2100c69d587be3f88274b8dda345beabedd8d1118bfa3833cbbc0cb543c243f95015d820ff8a1c72 SHA512 dc55ff7bf0bb0d35194bb804679284ef2ea6fd290cd54cf3c85b1fbda4f325fbf617374b7bfb33fbd7311927c1f4939601b38c7109ffa92c49db12402edcb218
-EBUILD efl-1.21.1-r3.ebuild 6631 BLAKE2B b127f01247ea7ce5b1c925b14b8d2222d3b2f837dea2cf059ad14b554de5cb8d0ff8e146ce2af8ecb6b338960ea38393555cb09304c9bb2ecc8cdb4510189413 SHA512 46c9b081cb79c0b39c026787ada23b50aef90e4ca265915c4d48516154caeccef5a3ecdc667a47ed0fe7ac5aaa978c71ab1b0951a68d3b30e27178f172cdfbf3
+EBUILD efl-1.21.1-r3.ebuild 6637 BLAKE2B e8846787fa6d2a5767468468625492bb0794fd76a53ae8b08a204c3ce6d2950a96ce15fb7fb2d7fd7f98313f7c06124ce97638909fd34e8d8c979e3382110f77 SHA512 67874905f334701605d886c5f75a82b027c4c418c87f8e495b1449b3d3b79d544172b5be8a180098656ee620eeb46eeb805695dbeaa242d2301a8ea0f8c4710b
 EBUILD efl-1.22.2.ebuild 6879 BLAKE2B f6d0200b055bfe235b08053982243b64e4cdaa5290e91c173e86918a839a69a45385256651b0d013f6c0a854ac9d7dfd6281c9d8a529ba175d54e410081b2f10 SHA512 914afb7338f7c9889a35fc1e72bf4699439496e3c37aac13b83635a8cade901abcb17b45ebd0fd899fd7c725d546d767fc2e0b7db6ac42e2a64bdadd380f4f9c
-MISC metadata.xml 2123 BLAKE2B 73aacd157b7dfc9bef846c985a550179c6fc2d479f578edbaeb11e005249c51bf73b94e8d6988cc1f4e9256f459f646f800389e9d0255b6d7c045763fc0efcfa SHA512 7125edb182fb323470e4604f0829ea635b1eaa966100b767427c5dd43ffeb6a99f9183512b739d18a47d070e3c3d9a7bcc667100d73bed3f642ccf53e3a0d3ad
+MISC metadata.xml 2006 BLAKE2B 38ab4b1c584a3e44389d22fff8e44111f8c60555f6de2110e1689c5fdb460e5fe473c4e688a9807313f839c64f5689487fe4082c33c816fa8b1e7267b4f06e80 SHA512 f9b09075773de10f6ecb37a5e470065fdedf3cbdd9067289299d10d78b98c96c95f2bc6fef868ae211787ba15b10c1ea4d24a7555d8fd500220a71eb7686d9af
diff --git a/dev-libs/efl/efl-1.20.7-r3.ebuild b/dev-libs/efl/efl-1.20.7-r3.ebuild
deleted file mode 100644
index eb9d5b8d1fa2..000000000000
--- a/dev-libs/efl/efl-1.20.7-r3.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="avahi +bmp dds connman debug doc drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent"
-
-REQUIRED_USE="
-	?? ( gles2 opengl )
-	fbcon? ( !tslib )
-	gles2? (
-		|| ( wayland X )
-		!sdl
-	)
-	ibus? ( glib )
-	opengl? ( X )
-	pulseaudio? ( sound )
-	sdl? ( opengl )
-	vnc? ( fbcon X )
-	wayland? ( gles2 !opengl )
-	xim? ( X )
-"
-
-COMMON_DEPEND="
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib:=
-	virtual/jpeg:0=
-	avahi? ( net-dns/avahi )
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib:= )
-	glib? ( dev-libs/glib:2 )
-	gles2? ( media-libs/mesa[egl,gles2] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:0= )
-	libuv? ( dev-libs/libuv )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( dev-lang/lua:* )
-	nls? ( sys-devel/gettext )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	pixman? ( x11-libs/pixman )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( >=media-video/vlc-3.0.0 )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		media-libs/freetype
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		gles2? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-			xpresent? ( x11-libs/libXpresent )
-		)
-	)
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!media-libs/elementary
-	!media-plugins/emotion_generic_players
-	!media-plugins/evas_generic_loaders
-"
-
-src_prepare() {
-	default
-
-	# Remove sleep command that forces user to read warnings about their configuration.
-	# Back out gnu make hack that causes regen of Makefiles.
-	# Delete var setting that causes the build to abort.
-	sed -i \
-		-e '/sleep 10/d' \
-		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
-		-e '/BARF_OK=/s:=.*:=:' \
-		configure || die "Sedding configure file failed in src_prepare."
-
-	# Upstream still doesnt offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-		configure || die "Sedding configure file with unwind fix failed."
-	fi
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-		--enable-image-loader-png
-		--enable-libmount
-		--enable-xinput2
-
-		--disable-eglfs
-		--disable-gesture
-		--disable-gstreamer
-		--disable-image-loader-tgv
-		--disable-tizen
-		--disable-xinput22
-
-		$(use_enable avahi)
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable dds image-loader-dds)
-		$(use_enable drm)
-		$(use_enable drm elput)
-		$(use_enable doc)
-		$(use_enable eet image-loader-eet)
-		$(use_enable examples always-build-examples)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gles2 egl)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable hyphen)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable ivi wayland-ivi-shell)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable libuv)
-		$(use_enable !luajit lua-old)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable physics)
-		$(use_enable pixman)
-		$(use_enable pixman pixman-font)
-		$(use_enable pixman pixman-rect)
-		$(use_enable pixman pixman-line)
-		$(use_enable pixman pixman-poly)
-		$(use_enable pixman pixman-image)
-		$(use_enable pixman pixman-image-scale-sample)
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable static-libs static)
-		$(use_enable svg librsvg)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_enable vnc vnc-server)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xcf)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-glib=$(usex glib)
-		--with-js=none
-		--with-net-control=$(usex connman connman none)
-		--with-profile=$(usex debug debug release)
-		--with-x11=$(usex X xlib none)
-
-		$(use_with X x)
-	)
-
-	use drm && use wayland && myconf+=( --enable-gl-drm )
-	use X && use xpresent && myconf+=( --enable-xpresent )
-
-	if use opengl ; then
-		myconf+=( --with-opengl=full )
-	elif use gles2 ; then
-		myconf+=( --with-opengl=es )
-	elif use drm && use wayland ; then
-		myconf+=( --with-opengl=es )
-	else
-		myconf+=( --with-opengl=none )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if host-is-pax && use luajit ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-
-	V=1 emake || die "Compiling EFL failed."
-
-	if use doc ; then
-		V=1 emake -j1 doc || die "Compiling docs for EFL failed."
-	fi
-}
-
-src_install() {
-	if use doc ; then
-		local HTML_DOCS=( doc/. )
-	fi
-
-	einstalldocs
-
-	V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed."
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild
index 5d68d8ef7d72..0efdcf3a7234 100644
--- a/dev-libs/efl/efl-1.21.1-r3.ebuild
+++ b/dev-libs/efl/efl-1.21.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+bmp dds connman debug drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
 
 REQUIRED_USE="
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index f3a7227c4bbb..5920ddfb2a91 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -20,11 +20,9 @@
 		<flag name="hyphen">Enable text hyphenation support</flag>
 		<flag name="ibus">Enable Intelligent Input Bus</flag>
 		<flag name="ico">Enable Ico image loader</flag>
-		<flag name="ivi">Enable ivi-shell support</flag>
 		<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
 		<flag name="luajit">USE <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
 		<flag name="physics">Enable Bullet physics effects and support</flag>
-		<flag name="pixman">Enable PixMan for software rendering</flag>
 		<flag name="ppm">Enable PMAPS image loader</flag>
 		<flag name="psd">Enable PSD image loader</flag>
 		<flag name="scim">Enable Smart Common Input Method</flag>
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index f15784d66569..59220b7f5bea 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -2,9 +2,9 @@ DIST ell-0.18.tar.xz 439368 BLAKE2B 9e65ed73119f322fea7177771d21e46ce9ad7d4060e5
 DIST ell-0.19.tar.xz 439472 BLAKE2B 9d29f49ce401c686b2e2262310bb00552d703455dbe9190acbb479e8fa2be7a03e732250ed63c9721f6079a46841a7bbb954fd0943edf520893eccb1a4fb9b6f SHA512 f7a22d0c385d45661b7c630d39f31b67321d20635c938ef5ad3ddce7194501652381a6bfc39a1b9a404a59108977216e24e2c32f6f30fc00972a0ebca909fcab
 DIST ell-0.20.tar.xz 443196 BLAKE2B 35daff12e43a27b44b60ff0fd0f10c8d6b8ba122a5825ff705394b2bfb401a90174133f63e6673690461ce2d56595186593fc65783dff2f795b83a461c3aa4b5 SHA512 91200ac000dc44ae593618c21012174af2614be0e7b33bd979aefb248e42d7bb0282f0a7ba256514dfb7657231b5fec29969c874417923f413d34c38500d4d97
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
-EBUILD ell-0.18.ebuild 1041 BLAKE2B 1b3c2cda4f13a795f1bbb32208ea0fd4cf62bcb593d42255e523173825ee535193e6691961033b533c4926acee864f82f6c2b82c2833e3c809f27bc238bbf349 SHA512 6daf4baab54fff7c33c1de37c82282887ab9b9cd1ba1692701496b877ecbda3b6615eade0ef9dc2fe0a1bbaf5714573e8e3e137e2b44c137e2c829b320a16bbd
-EBUILD ell-0.19.ebuild 1034 BLAKE2B 7ea489d2db90a5695631236ccca9fd0c58ded12d93e50ddb1b0ede685a53f8d916550598dbfbc770fc38e7c9375cf998376bdd0076755b583e1ede66f474242c SHA512 7458c2f805911724e443f3b57a05b71adcf10c142402214e38dbf388cc21cffc174b09c1b9c4a9bac910c947fd0b38b7f4718a8fd8bcf11e11cda15296a663a1
-EBUILD ell-0.20.ebuild 1041 BLAKE2B 1b3c2cda4f13a795f1bbb32208ea0fd4cf62bcb593d42255e523173825ee535193e6691961033b533c4926acee864f82f6c2b82c2833e3c809f27bc238bbf349 SHA512 6daf4baab54fff7c33c1de37c82282887ab9b9cd1ba1692701496b877ecbda3b6615eade0ef9dc2fe0a1bbaf5714573e8e3e137e2b44c137e2c829b320a16bbd
+EBUILD ell-0.18.ebuild 1048 BLAKE2B 8ed9e487df2b5ccd7df7f149f1c99aa2a609dc85388934546df2a44ac93ca426d4a7bc51984043e8e105a7a5512aa0af2c6703d2948b57b2bf98f25a345b0fca SHA512 da14e4f50826d2cd3acc8d6132bb0a95ed5db2b83944a320fe2c6f44fa5c4aecbf0666d1d3d1fc4aadd5cd691b8e858391968e36ee3003983acad5fd63191464
+EBUILD ell-0.19.ebuild 1041 BLAKE2B b905509fb7bd9b0aea24f76660368d5326aa4d96668b7079fb1f2eb09bf92f3202e143029b1c72093a21ec4bd74043f719f703836a506ed8d8436beda7eab24f SHA512 e8beded1f8f51021693b3605c773be7d5c71074438b3da94e92fcc4b29b016a17e4930b35c360f3dc05d23fc61631fef785f7ce73b7a62724b3e84f340115bed
+EBUILD ell-0.20.ebuild 1048 BLAKE2B 8ed9e487df2b5ccd7df7f149f1c99aa2a609dc85388934546df2a44ac93ca426d4a7bc51984043e8e105a7a5512aa0af2c6703d2948b57b2bf98f25a345b0fca SHA512 da14e4f50826d2cd3acc8d6132bb0a95ed5db2b83944a320fe2c6f44fa5c4aecbf0666d1d3d1fc4aadd5cd691b8e858391968e36ee3003983acad5fd63191464
 EBUILD ell-0.9.ebuild 821 BLAKE2B 000640e99b5e0c1e1a328014a8edfe47cc197201757fc6b4e71ce3c9efe27d7ea3f89c7171c2366605374624b4282fbf2859b1832d3f5136e4c713ccf0530391 SHA512 9d497dbe091631b7863b8f403e2ae138cf30c38a1b1eb7e98b775275649fce9c67717599f1ca38ab705dd7bb33e8bc406035c2102c368fa83a15c13069c0b79e
 EBUILD ell-9999.ebuild 1041 BLAKE2B 1b3c2cda4f13a795f1bbb32208ea0fd4cf62bcb593d42255e523173825ee535193e6691961033b533c4926acee864f82f6c2b82c2833e3c809f27bc238bbf349 SHA512 6daf4baab54fff7c33c1de37c82282887ab9b9cd1ba1692701496b877ecbda3b6615eade0ef9dc2fe0a1bbaf5714573e8e3e137e2b44c137e2c829b320a16bbd
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.18.ebuild b/dev-libs/ell/ell-0.18.ebuild
index e067c9ec27f8..ab4f6b336c53 100644
--- a/dev-libs/ell/ell-0.18.ebuild
+++ b/dev-libs/ell/ell-0.18.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.19.ebuild b/dev-libs/ell/ell-0.19.ebuild
index 75a8368f5c6a..95be6b7404d0 100644
--- a/dev-libs/ell/ell-0.19.ebuild
+++ b/dev-libs/ell/ell-0.19.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.20.ebuild b/dev-libs/ell/ell-0.20.ebuild
index e067c9ec27f8..ab4f6b336c53 100644
--- a/dev-libs/ell/ell-0.20.ebuild
+++ b/dev-libs/ell/ell-0.20.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index b2a10a71d57e..a85556fffdd1 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,3 +1,5 @@
 DIST flatbuffers-1.10.0.tar.gz 817750 BLAKE2B 1896b01afbdb8527836fa684980169890b1d5f1213d64cc88310f819c5fe7bc2a7e0a87e1abc2565ca165a0406dee9c814af382d2c8f08718ae5d9173530f98a SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2
+DIST flatbuffers-1.11.0.tar.gz 894944 BLAKE2B 8eee7165f2dfbed6ee0b0cfbec0df995bc6e8a19600ad42ac70788714635ba90d72f2dc24d0e1edd5ac6a1cf6148948f625245d3079e75861d29117f6fcf34fd SHA512 cbb2e1e6885255cc950e2fa8248b56a8bc2c6e52f6fc7ed9066e6ae5a1d53f1263594b83f4b944a672cf9d0e1e800e51ce7fa423eff45abf5056269879c286fe
 EBUILD flatbuffers-1.10.0.ebuild 710 BLAKE2B 51608ad4b42cfc506656c5289a869e23c254c8b97d12c39aa7e0549c330d260cd7e0523af380da6ab3b3e3b1592049eea736fddea1f847f154a2fdcf9be11a99 SHA512 763f697f453ef44323228f32b01d237ab8c240f51614c1665aad5bea4716e04cc885f2ba76af8607c4eb5fa7acb8cfffc5a0f8feb51700b0e36d89b4c61e9b14
+EBUILD flatbuffers-1.11.0.ebuild 684 BLAKE2B 8525aa20aee9e50955b974bbf0ecea3685fdae34d94bfd6bc302376943190e4981273279d3e30017281bc74380e608109441cf3a5b84455bf3c4379921ea37ff SHA512 380cc971f22e68278b0fdf46c72768fddf01fddeb7d237b89f1fce68c006c0e5b1e74ad29f7164ac09c5f1800398129db754d60d35b0b767fb57b3601b52b1d3
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
new file mode 100644
index 000000000000..2bf8b35e8ddc
--- /dev/null
+++ b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Memory efficient serialization library"
+HOMEPAGE="https://google.github.io/flatbuffers/"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+DOCS=( readme.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
+		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
+		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
+	)
+
+	use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 42e55bd2f192..8b19a75dfd23 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,3 +1,3 @@
 DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d
-EBUILD fstrm-0.3.0.ebuild 816 BLAKE2B 60fea1160338a0739b23885d3a6dc9b068758f668643c865adff569bae7b5ab282356aad4c6ae6532b0c9a2371500208f5669f185cfe4cf83a97c0bca6995ed3 SHA512 aa1d1dada3b516874c2983c3a86a9481146731097e1616e46aa0ba2edb68ea2eeeb964d51fe3995b6f0b72ee34cd774a7b8276855682784a2e2e5090592ccb4e
+EBUILD fstrm-0.3.0.ebuild 823 BLAKE2B dac34f78cf5c4b564f771a001ebbf4dc52a42c06191364ab1a1efe3f4b0353968db7b560b6987b9df26287e6ce3a4e80e764e1df3e6107a7cf1d2740eb1d1174 SHA512 41c8067e339e22a0f0360dec9a2677b860edef39e888bee37a66cbe89cb6fe27302464f59bee83f14b25f8a06df177d1436c433e6af7746af0dacee1d1b73033
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.3.0.ebuild b/dev-libs/fstrm/fstrm-0.3.0.ebuild
index fdf4025a8936..4950eecace42 100644
--- a/dev-libs/fstrm/fstrm-0.3.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/farsightsec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="static-libs utils"
 
 RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 94fe92f30692..d5b3907c9604 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,5 +1,5 @@
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.54.3.tar.xz 647704 BLAKE2B 792225afd9828755ef67b3e7221d4c53535d79d879e0aef0c7c56f06e02313a966776b5dddf9876649984a1599eb44a27d6288f9216bb929a66ad9e14cb632e5 SHA512 f19e667963fa3feecd23a9e4cc263a55d9d1311de7d10905969966f74e26ff982839c192c555cbc059e4fd65ff7c89d18944ca6bf8ffbb65ec91081036d19505
 EBUILD gjs-1.48.7.ebuild 1548 BLAKE2B 47a474a7958d70ed915b8c1a2a973f1e72f99a7bc4459e98a687503122d83d40dc0733dcd3e7fbefc42304049520acf80b3ad609cda1ea5c8653e0ba215f19f7 SHA512 4a976754dcc518a188fa3ceae85ec61aa20b0abfe6c9c5ad248fa72ea62820935415451cb8f6659931b6b8f4044dee2f5a20be8c08a6d1a3df0d526b24b8695f
-EBUILD gjs-1.54.3.ebuild 1561 BLAKE2B 9f4065981e8c9f33fb9a095dcc4591b9f7d92df6ad76cbb30369bc5caa3921ff70abe9a2f3e6d45a10e7461b26a6f72a89aaecb8026611f87e04adac00615a6f SHA512 5b926f35e873415e3af09aa75b01be67a25fb04df9bee5f0a289bb861cc76d5158ecf4e5fd7f99111ea697af89c64c0bc6499863ec3c6a2ea85a4d306c4008ad
+EBUILD gjs-1.54.3.ebuild 1560 BLAKE2B 2d5618173f551bc0b86fd1bcbf0c13c4d3029ceb02a9a3b3632559b0b1a7aba9e5f7f1d6330150121d4213b58cfa91cdcc99cbac78f526c46ba81def69497418 SHA512 c405c244a64236a0064f7cf794b5b2582b62dbb6226f012e5ada86efa90fee08d2c3e48916c1769a038916f07a228edfa88584c8fafc3fd98fb5c4c9c45fa327
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.54.3.ebuild b/dev-libs/gjs/gjs-1.54.3.ebuild
index cf81bd1fae3d..6482015e0fda 100644
--- a/dev-libs/gjs/gjs-1.54.3.ebuild
+++ b/dev-libs/gjs/gjs-1.54.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline test"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.54.0
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index c1f9cd2210ef..f9eea2885965 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.56.1.tar.xz 1397812 BLAKE2B 070597f3bd6e4e58d1ae1964cf6e8d7881daa68aeeddc5e9b64bc410fad6d435f2041171f4dfc2a6b477d39f2d7e9181b9917d1244fcb45b3a37491726381649 SHA512 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
 DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f6d343312d4967345cc202ef137f29690fbd7a35fa9310f87b134fbdfd4fd753b68b47203cd306689d9892eccf17e303d1e7bcccd4 SHA512 0811cd08e224975b3aa55ae89d648fc65f3105cae8a077a5671593d84743b1db28e9fbffe53fc86a2b3e82ea98c35f3daae033d3df07c7020cc3bf8b5d94f796
 EBUILD gobject-introspection-common-1.56.1.ebuild 1019 BLAKE2B 8f1d42b739389066c17614960bc214c616a9717d51e845b98ff0dc59fc10d484bda878a4149b358615568544d5b05259e2a788dce281bd4d5a70fe590373f4ea SHA512 db776369d3eb5af2c664aad6bd52a19f3d0371f9b84221c9cf65359cb625089e54b9b1aa9e3cf926b250fcd89e303a7fcffb34c0e5c58893583c82237a0c16f2
-EBUILD gobject-introspection-common-1.58.3.ebuild 1026 BLAKE2B 9725d24590ece7d0180e25dac5411f5b0d8791cd0e0c0f9f11dbd38cba7c2f9d1e55d71f3e3442791daa662911e32ed38b4f265a0bd436c84fcb8abd53c78da1 SHA512 27ab7c4963e2d93463fc7f625e0067b05e6a898f623e15ea296581285bfa7a6251a8bf375ebc9fbea27b052f52c0f056b07f3ddf3ffb3424e015e8a8b3b8163a
+EBUILD gobject-introspection-common-1.58.3.ebuild 1025 BLAKE2B 9864a56784eceb06e677ff0220ba87fdf4ddcee9aa35edd3ce2d61fc46e0b30cc6315d336fdb56c93428bf58e39951a067ca410e8584885865ef55d38496c5d9 SHA512 c8214171bdbe020ef8152facb08c59f3cab0bb286137b242dac196efa28cfcc981e2687bd3424fe0afcc039198ac8c551aa4be273753598d63fada90bf117dc1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild
index 3b87a9d78717..bd8514e0f016 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 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=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index a3074603eb14..374614cb7f64 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.56.1.tar.xz 1397812 BLAKE2B 070597f3bd6e4e58d1ae1964cf6e8d7881daa68aeeddc5e9b64bc410fad6d435f2041171f4dfc2a6b477d39f2d7e9181b9917d1244fcb45b3a37491726381649 SHA512 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
 DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f6d343312d4967345cc202ef137f29690fbd7a35fa9310f87b134fbdfd4fd753b68b47203cd306689d9892eccf17e303d1e7bcccd4 SHA512 0811cd08e224975b3aa55ae89d648fc65f3105cae8a077a5671593d84743b1db28e9fbffe53fc86a2b3e82ea98c35f3daae033d3df07c7020cc3bf8b5d94f796
 EBUILD gobject-introspection-1.56.1.ebuild 2123 BLAKE2B ee5a7866e95a1a70b74e2313e51a0b443ef2effa47aa9a119bb3c06442ba98e54e45c0d2fad34ade22fd0e1a8c9f4bb54fa4182f9acda62d0570ac30685f9893 SHA512 0e4c52cecf5cd72848f62a89402207c97bc6073472af2b0a3933dfc0f44170d06969f0bd9a0bdb692b3fffce4a1f4b40aad3b55fb9e932dc3dfa90637b9a28dd
-EBUILD gobject-introspection-1.58.3.ebuild 2206 BLAKE2B c0c3ebc9b9241dbd90c5ebda1ad2eb915b8294ad3427b7a0fd820e3cd7e45dbafcb50129d1a5548eb4050947b1f15adbce1916b47fc7cd769ce67884e69336b6 SHA512 3c01633eb4b06ebca70d9df74f161d38a9174ff69213cea5c31a611ce916ff5edceb261b1e3436620aa942dc3408f236f23b9d19c69dd29d158128544f602a3e
+EBUILD gobject-introspection-1.58.3.ebuild 2205 BLAKE2B 4d4da0466bdf6f653a9818b231bfee1722076ebeaacdd5d59c988c0fd1972fa3aa7401617a558d9e11857d14347efe12e1b9910d221b89a3e1989e4947e44cf8 SHA512 55bfb6c57dbfc32b17921ac24a704da0cb0194d4da6bbf26198eaa493a0085466fbfdfa989a2f1bc4d5ddbc0aaa64376d4561ec0f678ae630e8946bf4e5a758a
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
index 1a090d5df94c..5bb84b126cab 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-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"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and g-i to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index d4cadebfa750..1a1b61479aff 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -2,5 +2,5 @@ AUX grantlee-0.3.0-nonfatal-warnings.patch 695 BLAKE2B 74d631feb939a6bac5045d151
 AUX grantlee-5.1.0-qt-5.13.patch 778 BLAKE2B 01c0c1fb6a3a9830134cc0d1bc19ead874d526a452dfb08ef0d4f298d979ee40ca70742ab8d6ad823982d80ff19bb695aa8e4b66ff90500f4f470d7eaf83554f SHA512 03b0168b886ec7a394bdd06acb98908dd002b0e9fb8763f71fee3f022fd1726c09da895154eb4022ea6e114b6f7c1b37f90f35ff77521e6f8272371961ff54c9
 AUX grantlee-5.1.0-slot.patch 1616 BLAKE2B b395e361dee3120f7cc0bfef36c5fc0ec2b7a3c8ea714fdb21a93a34cd309407d07488c926f6a67d921a5767d06c05b620d24fce7c253aaea93bb2ca20aa92e1 SHA512 62ec0d0e510fc7aaecfb2eaf9e52b395070833732aa840ff8fc4b4bb94b6716fe59765a7413263c2a6edb073cc379141955a99860c0fcf592d6f5227493482e1
 DIST grantlee-5.1.0.tar.gz 1175380 BLAKE2B 6468c0131a334c3ac52b841a64171093a41605686e4ec2af1a60bbb829f652d388fb48e501a0c1f5eef54ff3253c10b0d6ebd5a4439ed2852f8746188011f9e4 SHA512 2b806a0770b9c6d02f207d5b4939ae8cae325de4fa01901320ffef5c8442ef0f1c10dd799966d0bf0d223e6541f93db8568aaf922ea1b334bcb2f85f6373a936
-EBUILD grantlee-5.1.0.ebuild 1234 BLAKE2B d1b4736a8d0ef07704bd386a3942039ef2d2f2d9003e3a6994871a530337874f017ebe49a287eef08cfe40e1b2ef9f0ca672636226c88a2fa7320920307eae45 SHA512 ecb833915fe40e5259870c6c38e59ebac879f610b6cd6340da26de3bd6911083a2c245af733ce583bc5f43931f37878d4d7f528490d5e6deb47e8b9f1042491a
+EBUILD grantlee-5.1.0.ebuild 1233 BLAKE2B 73032b4f39b8ac3514b5740155e1b6fafcf11fc86bd3d7bff29f57acb292b02721aec25a2d3cf43a908fce5101e899363c26d49927992c21c48b90fc89f359d9 SHA512 e8285340ef1a54323e9eeace82841b64ad3323d8580eb98c76bd151c4c706308d2e77e9a9aa5b5a71501170379b1f36a82c155f4562567ab0d7364d71ec1b2ab
 MISC metadata.xml 331 BLAKE2B 6dab7a95213e13aa8367317827224739d146430a1dba20837be5469221ba7e9403ab6edf7e439511fee5082d10d5fd883c3a25c871b4ff4aae7c24399d1f1cf1 SHA512 073a759e22f25e29be31689015b96dd3c8ab4748d59c31fabfc6a7c43cea6ca2a0a0f48ae49b36cc2a835d97fc2ea5a2f2a790a3cf74fb4d16e1e0f5d771b1b6
diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index 59e9f458582d..d8de4e45a9f6 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 0e3421cd6ddc..4d5808d02c84 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -2,10 +2,8 @@ AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a6
 AUX icu-layoutex-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6aba8808829ebdef16978fc7130bb4fba80f2bcc7886bafe3c944ff83f56cbf5f02860a35cb0a655722ce305e5e6b05dae15d5254 SHA512 3cf34c7ffaa200f841d605f11ee8145d70f2975be2ae5282a6de2fb5caf6bd8ae67e05cf652b0714023087fa145b4e5fdd4e4287dc331334ec347d957674d291
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
-DIST icu4c-64_1-src.tgz 24013136 BLAKE2B e577bd4c9b822e5ef3a101b3ef46b7b42ca18077d6e05fca543ff1eb702261f017981fb22dd3970662397530b390f648d4417c84dcf3d6ed0d298dd7a8c38897 SHA512 5eca8342d8bdf902689243506643e04512744b33962687e118f6810af6f7fd073678f67b991d2ae9139d257713b63abb4222b96687234df01ad5ff62df16ede0
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
 EBUILD icu-layoutex-63.1.ebuild 2525 BLAKE2B 7c45a83f8dcb5035d44c676edbeed9cb971eca673172a8ab5642589fd63c04f05d6c26b0346ea9caf5da340e5d29d5fc085a4e9e17390c5cbb358926f03257f5 SHA512 0f27c41556ab551538f95c086b39c85539138254d160284e6579a0ada90d93485a9ad41670518d7f27e9b93e9029a63bab484727101c5026d4d1f52e44536588
-EBUILD icu-layoutex-64.1.ebuild 2509 BLAKE2B c5f9d5cf312a3ba8ea2676845bcd423dea004b86b84be36162d0ddb09ff603e534559c064bfcf104b16889c4c7acdb512dcf42b62c6fe22bd05f5d366efd2cbd SHA512 745dd1f5f94c0aaf8d1c9a7ef0436a2ebefefc4cbdcec4e957d7d691b377a460aa89cb953d6be90bac98b843334333a3e666f96b8f86cf758d63b7acce7096ec
-EBUILD icu-layoutex-64.2.ebuild 2565 BLAKE2B c359dde14778eb9039ff2ee65f8e522d8f16ac796e2855e18b581110625020c3cdd0abe97f5c07e9ba973cf1a539d6bc26d83fc8f62c4983c092320238e1ed5d SHA512 710052ca72a6e70e3b072424e0d8b3633363cf3978ac6b0ed77e93c47f71dcd59eab6219c26327b0c842e4bd5e204216dbd8306a9100cf85671772a8ff7f5442
+EBUILD icu-layoutex-64.2.ebuild 2562 BLAKE2B 52ee1fd8e360a9970319ba7941770dfef3efaeffeecbb2ec66d053b8f988e68596dc5ff67b90ce2cbe13bc9854bef75a0bc4fdee323487019e8c4eb7c3cd71a9 SHA512 b4413e46715babae7b05668a00d157b0813191bfc2108d23aa955070fbc5f58bba5b5bd0ec1f03ef53b7adbc04ba626ab6af044e1d945fd1b63db138e77b7909
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-64.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-64.1.ebuild
deleted file mode 100644
index 9f738852cf9d..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-64.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
index efe008f99812..48222c7d4dd8 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-s
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 6d0ed3cac588..ab6bbe6c1e9d 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -10,10 +10,8 @@ AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef395737
 AUX icu-64.2-extern_c.patch 29978 BLAKE2B 398f371d256fd4e60fc069949d0d861e363c43889a762c9fffad176cb1164b069209a295475748c08a18a83b43abb561851f4d74359fc3fd683b97eb0cef2e50 SHA512 d45a8da416a573b69b76a615d11bf99f852cb1703cb0fd4ba35fe96411134fda97a29cddf3d14a23900a5099a930c32ff9d1865f02d07314268974c306832409
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
-DIST icu4c-64_1-src.tgz 24013136 BLAKE2B e577bd4c9b822e5ef3a101b3ef46b7b42ca18077d6e05fca543ff1eb702261f017981fb22dd3970662397530b390f648d4417c84dcf3d6ed0d298dd7a8c38897 SHA512 5eca8342d8bdf902689243506643e04512744b33962687e118f6810af6f7fd073678f67b991d2ae9139d257713b63abb4222b96687234df01ad5ff62df16ede0
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-63.1-r1.ebuild 3321 BLAKE2B b8e6b6ea9bb9379f0b09195382db18e7758fc919d626f49240f9b8a75b97c84833dc2741c528788348d090749229b18d610bcd5bb196506fec03803d3a78af3f SHA512 0efd9eeac3944f3ea14e20f99c3d3bf0f9a2ed22d62074a1d1342c8fb04f4bb76c30d51ca173a09a59abb832cdb134bd1120b065ce0c63536da08839f4abd2de
-EBUILD icu-64.1.ebuild 3338 BLAKE2B b79f6248fc64eafd37d25fdd58ba9752b038e1677c97d009bdcb925c2a665172bbf99a44c1c23b9fb1b0b38f7db057aeaea2833316d079f9e0444727fd578c53 SHA512 58a5dfc85fc423b9c81132c1df1cd9c6e3338e8e3132681c68fb13d729bf63fdd6662cb6457855b772de19eb03481142dd92d7592f953eff7752ce0de2cfcf0f
-EBUILD icu-64.2.ebuild 3406 BLAKE2B 9b091c1333d4c7545a0f0d7003b74099162258a10c252b82c93719c96ec5c0dc0a608d9fb631fc5b255d6604aa1e5b77d597ef5b1bee8d41292349db2c99d224 SHA512 c9b0d0e951513e36559eb4d2db19941722150c42ff8c092e80dcc7cb599a2d60fdf056bf8b481436d52be4e44216addae462d13e48afe7fabedfc564c007dae2
+EBUILD icu-64.2.ebuild 3452 BLAKE2B c155821d71318f0cc7f9d109f274e3bebdfde38cda04ec4278d377d47a65b8c65ff705c1db7f3475161b9eb1a1ac067467d76b952c72d90bb40d606ac00137d8 SHA512 add4911b736ecfcf00f56a9dd706bb9abb33e18725e295ace2fcb7f6c6b3d960823bc32487289f31385fff1deb0eed9482a51a2f19c532035a0381ffa8eeed31
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-64.1.ebuild b/dev-libs/icu/icu-64.1.ebuild
deleted file mode 100644
index fbe419ce9732..000000000000
--- a/dev-libs/icu/icu-64.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-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 ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-58.2-darwin.patch"
-	"${FILESDIR}/${P}-guard-memory-include.patch"
-)
-
-src_prepare() {
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/icu/icu-64.2.ebuild b/dev-libs/icu/icu-64.2.ebuild
index c0d84349895e..51285878f756 100644
--- a/dev-libs/icu/icu-64.2.ebuild
+++ b/dev-libs/icu/icu-64.2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs autotools multilib-minimal
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
 
 DESCRIPTION="International Components for Unicode"
 HOMEPAGE="http://www.icu-project.org/"
@@ -13,14 +14,12 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
-DEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-BDEPEND="
+BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
 "
 
 S="${WORKDIR}/${PN}/source"
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 72703a228b6a..2a5445ef929d 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,6 +1,8 @@
 AUX ivykis-fix-segfault-glibc-2.28.patch 929 BLAKE2B 7bba4bc43cc07221bcb57b4302dd01a1649263541e1ad0f330442f2b1dba61310304c13600e291692134c1f30ecd18c04c792eac491471e3408b7b96e9ef4d15 SHA512 7119f12154810cb1a898c83931d74e207ff0902ff4e4d97d06ebc374a78fb2e22b1f676bf9cdc7321b259cb9558b574e3cdd7cddcd5512992b4a83c57e643469
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
+DIST ivykis-0.42.4.tar.gz 656775 BLAKE2B 9b85dacb74eae99907999d5181029a824c5f0d6aabb41d892353723318f9ff6fc1a2a6296224c7ee407510f7354f2ee934d40b9627a0fd13489bf53b8ff7f115 SHA512 26f4fa28582555004cbe1d80cb042f93deb42b195c7d563ce4048ace25c74bb558455d98d2d8e0e59534fabb2dff6503aff16d0feb7a05fd835b63432f080286
 EBUILD ivykis-0.42.2.ebuild 402 BLAKE2B 9fe4f5097ce2060c52b99c925cd12a9e79742396c7bb3ae84a7a89a1d7d082fc88152a4e06032ad988366f4323a2c10a329f6ff690a2278d0f6bfa4c3f5a6c09 SHA512 ca5974208c11a02c33f7a66c2336e64e054be78b9ed1bad43b55de065ab9a4b939f893c3286544dd87965dcc9a0b1e02a1435b36d02f8b657c41fc0a7c4e7da0
 EBUILD ivykis-0.42.3-r1.ebuild 709 BLAKE2B c101007f21a5ff3c1bbfe36c2382122a571f723e714f50eeb2ef43991c7d2fe622938711d5a80e5eb3a97a0d28297f25aee6e2216bbb867793bf3d9a822f5478 SHA512 a96143d639e6c8165e6e6ecde0cc5c650bdde5ae77f7b05140e02babeddb88b8e4148d9755d53d8983ae94f116a4abf71a291dcde37bf89a579637487ffda9dc
+EBUILD ivykis-0.42.4.ebuild 642 BLAKE2B aa3d880a84f192c2b8977f25aa265b14bb57d647724cb51f505f29b7ba5b7bcff72e8a98472c42970c58913ead43b92e8fdd51b2ac8ef0cf62bdde10c9b59fb6 SHA512 a859e9efd7caf5c7bf7f7902df8ee0d2b2a6becf629d35941250be5b6941046a777e077ddc94829d8fe0f504bda47af8482fa7f3eb6f51c43de5fcb98dbf8789
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.4.ebuild b/dev-libs/ivykis/ivykis-0.42.4.ebuild
new file mode 100644
index 000000000000..01d96ca954e5
--- /dev/null
+++ b/dev-libs/ivykis/ivykis-0.42.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library for asynchronous I/O readiness notification"
+HOMEPAGE="https://github.com/buytenh/ivykis"
+SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index 5d9fb5bdb90f..9fbb812c2d6f 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,5 +1,5 @@
 AUX kdiagram-2.6.1-fix-horizontal-bars.patch 4650 BLAKE2B 4063f8dbd92621f7d05d9b771650e9094eb3caa175a601b3ba51066853e4b222ceeeb6ac006c78a6ae12e70e5b0b4f192a004bb07437c296b5d4c9907f21c681 SHA512 8e0a94c65249f7a8b52e0c6261e251a7bcc07103e5f2bf21c1fc06b171d60a8d726f4c475c91a9114a1b129443208a95340b1aad07f2d31b2be0988f7f1611c4
 DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
-EBUILD kdiagram-2.6.1-r1.ebuild 782 BLAKE2B 25cb3f928da97936bfe38caa7b8a68b9e8081092141ae9443ca4c49109070d005c233323e4e8c8a68da2b2e9cffe051735adb6fbcaae1b0b648d7a175e660c3a SHA512 8c7db0341f06fddf09951d3c487b31f7220a9aa3f0797d80a8b2a4a7fcdb32ac94a33b1c2a475628c54c44d4ca58fd070e2e3ff06c206916e18a1a767b66e3ae
+EBUILD kdiagram-2.6.1-r1.ebuild 781 BLAKE2B 87027f52dd286e85dca1b418c07d63b1479d9900a61eeb175cb5d5fec26e4813b1e3f0fcbc53f023e0c850b1fae5ebb3d0f5b64d49c29511715ef74ef5f13a17 SHA512 8ff4ed92a236f8e1b0986a8c226e1e0b3520112aef6d39a1c944dc98cfbb404fedad79af275976001880e453bf57a642c2dd2ef8f61f4b70899583325857f9f1
 EBUILD kdiagram-2.6.1.ebuild 654 BLAKE2B 107e745348aa6492db244419f2ab596e9d4f95970ea2c7bbb798c53347bffec9b993c61976a489da293abfd2f46e7fd606c6a3d228da22a01cb5eb8d387d186a SHA512 9b035287ab682100ec8d1dc5616439c3ca695a7c45a35bbd3593fdd12563babfa5b06dff799bece565bf75091a82c3d84345631b6304f3b2beefc0feedb7adcc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
index 6e88b0a90514..84b8bfdc1cc5 100644
--- a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 fi
 
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index 2152cf8949d3..6ad9c2f4cb80 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -1,12 +1,17 @@
 AUX insecure_tmp_mktexlsr.patch 602 BLAKE2B bb2dd2178a515431e643f4a3e91a4b30fb8e63e860e6e0b6c13208b00642bc88a672b1dc9ead8277c593c2ef333f0581af24c821b6f3c84841a750911d4fe909 SHA512 2b9e92665482403b7a153c27ad8aea5ae5f05ef42c994c899ee4987d39fb4005204c7abbb464d7c0ec1b48a7630d34991d6fea3076cee1f50d9c4855c7a908f1
 AUX texmf-update-r2 6017 BLAKE2B b9ded4693768342c6fe9a0d99b6836e74b3d8b9a5bb3d335d8ecbbe5c2a45967ac880ebfc2476c04e461ca2dac3eb02ee6c41ee34a050ba94b54d9d731853ee0 SHA512 924c6a53d778b1a05252830d914c92f8d1a8d1c479cd8a065b861bf1f263d6bb529c42c365134fea19ea1d9bedf68a943d609cd89abf73912f90bbc3397fb14f
 DIST kpathsea-texmf.d-8.tar.xz 11456 BLAKE2B e631ebcae97494b963dbe4bc03d7ba19ce0a38392dca8c171a40738cd7c6ea46ee821f993ab3ce8f4beb068cc485cb1c84adc7a07dd13c58c68bf9a0c17dff5e SHA512 496ef6e3134f1b0507b15729416de86d72f41b518f4d382c78c2f39b0d603d3d44f8c8befdab2351d38d2a26fd87e5a73570a67b11dbb3f307b006f409a6f036
+DIST kpathsea-texmf.d-9.tar.xz 12120 BLAKE2B 80069cdb1c8e1edf8ae0b5af2de825afdf234840f9365c0033d7fb080a1e5e5692ae9ba4c191b83422724f35523a21551102ef91e8642f5cbd4df9e251357b11 SHA512 5718ef60d33013159b5913f198330f9ecb098ac4333dd536068e8c48bf6eb208039a9b29afba331b3e4942c0c77c46e6add1c116d273f1f53550116ac06e69aa
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-module-kpathsea-2016.tar.xz 30696 BLAKE2B 066f5586c93b07db1c07ee0e9a31465e24564faa30b0abf40e31212a1048527a54c58d516c5af139931df2f7d32b6c9c679080acc93f71f05245b2c4f0bb9530 SHA512 330254cf76fd30bf3686dd48710f21c4804f2f6ea9b14e6033b2741c3e6ba627e51efe96da9a1089120d474e36aad1c052285a7ea394b76ee2d4d335b86095fd
 DIST texlive-module-kpathsea-2017.tar.xz 30956 BLAKE2B f9f7d70a6d814996a211a5f3d9c6ee1f477497f84e4716af915bf1171018243094f11d131d2f51930575129b6e16e5fe5e907c0d74be1a182ba7e573be0eadb5 SHA512 df4bc2175394bb6e9726b2c09ccf04e2787f73d584dd6944a25b3aab1eb6e8b4bdcd14ca043b7fe4f6e240ede1bd7e9003b83e34dd3df8c685658b8dcddc83c9
+DIST texlive-module-kpathsea-2019.tar.xz 31480 BLAKE2B 897ceb8cb536f2d4a54ead2529da891eba83e4480b9ca527ab99337ed030f680bc25a12d4286e101965d146567720e3bb5fb8ff18a240365be9eeb7471c970bc SHA512 12676ea4b26af792c1abc2a3189c103357b6af4994d3131d8d98e507af24f5d9666bfe4d8abba0ec984eec1ba8c99ab7a6d35813c8e053c79c82a7baa88c973d
 DIST texlive-module-kpathsea.doc-2016.tar.xz 1128872 BLAKE2B e3b2e5c2c14e2d67fba3c89d31169b2af13bd6767983302ca302369ee8cf790655b248cc1069cfd59e4044562627eb83bca6ffe368d5c1b38832e08fcc53b678 SHA512 1cfbb4b5a8647bf5da46b04c9bc911091aa3322b154d65544aa3a1163e24b6906d7e5420549ab0ba023250e6dfa90e75d3a20dffd2e7360fba068a5c3cece885
 DIST texlive-module-kpathsea.doc-2017.tar.xz 1128868 BLAKE2B d1f6bb2f9a893616cc9e090671a7a3c2aaab0f942eed0824a60826b75ee0a62ded33cad197d0bb953100a02ecead1f8d84bf7374889bdba9fc36a26b23440a9c SHA512 af829f666c815da49b59bbe678a2c1e9fe45cbc528f484dfb6e43a1e52bbf0245a4e571505f5be2cc7cf7f5ebcdb06b862ac6e9f9b5390489f0fab10a11fd997
+DIST texlive-module-kpathsea.doc-2019.tar.xz 1068236 BLAKE2B 19ecf7d3e5dc1c7a537f59ad45188bb2cd23127682382e719d8bfced05a7f46704606be55c1ff3fe1374587b99866f441b67cb1b555dbf2e33f332d147e30dda SHA512 bd13bb8a5740df0abda5d5f546138504bf3b6bd54caa95e5f1758cc540af4bbbd055e3868c494f65e9bebe108038205d8537fcffbc821a8f17bc51119e5d479c
 EBUILD kpathsea-6.2.2_p20160523.ebuild 3274 BLAKE2B d028c3c47209c2505ec27054c2b5c7526fa548649eda49a2f58680389cbf2261e5d06a0014de9176c6f02ab7cd3df4e2a47b28fcce2fca01956465ad7f644f45 SHA512 2593e50d9d773406fa17dd4583ad02d837ede26de6140aa8b4a593170693b0c49bebe2e025b50356165b1c9ce8432b99e4e341c2f1874c000861c901ff1319ca
 EBUILD kpathsea-6.2.3_p20170524.ebuild 3287 BLAKE2B a33b736ea9ff4701aafd847ca262e2211de48ab992665666daa0f093de1416ce608a98051f6a42e4d7f1e17c01e471cc58a8e6ba97e5816e97bdf10a29295210 SHA512 a5cbe9f1986f60ef7c65c541a84f0dd7a4685094df88d6542777c64138b946dcb4d39b9ab0e34d9ec466ec898c0513599178c11bb3311e97494c3b0641990193
+EBUILD kpathsea-6.3.1_p20190410.ebuild 3189 BLAKE2B 761cc74fd9184ded8deaeec80f1d0ffbbf4db6cec5d4487438646b4436004a85ea47b6ae0d45416961805470024fd56f2a1e795f0ee9f23af607b080f3420f5d SHA512 bc438b69f2f77c877346ecb4758655455b14b8531d6b2331e5240ecec0cc7a10aca227b0392601e6a66b221164bba7f6cf615ec0b0dfe3d62e0955fbf0f0275b
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild b/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
new file mode 100644
index 000000000000..bb7bc257e980
--- /dev/null
+++ b/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit texlive-common libtool prefix
+
+TEXMFD_VERSION="9"
+
+DESCRIPTION="Path searching library for TeX-related files"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
+	mirror://gentoo/${PN}-texmf.d-${TEXMFD_VERSION}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV%_p*}"
+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 source static-libs"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+TL_VERSION=2019
+EXTRA_TL_MODULES="kpathsea"
+EXTRA_TL_DOC_MODULES="kpathsea.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+src_prepare() {
+	default
+	cd "${WORKDIR}/texlive-${PV#*_p}-source" || die
+	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
+	cp "${FILESDIR}/texmf-update-r2" "${S}"/texmf-update || die
+	eprefixify "${S}"/texmf-update
+}
+
+src_configure() {
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #347798
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+
+	# Disable largefile because it seems to cause problems on big endian 32 bits
+	# systems...
+	econf \
+		--disable-largefile \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" web2cdir="${EPREFIX}/usr/share/texmf-dist/web2c" install
+	find "${D}" -name '*.la' -delete
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	if use source ; then
+		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+	fi
+
+	# The default configuration expects it to be world writable, bug #266680
+	# People can still change it with texconfig though.
+	dodir /var/cache/fonts
+	fperms 1777 /var/cache/fonts
+
+	# Take care of fmtutil.cnf and texmf.cnf
+	dodir /etc/texmf/{fmtutil.d,texmf.d}
+
+	# Remove default texmf.cnf to ship our own, greatly based on texlive dvd's
+	# texmf.cnf
+	# It will also be generated from /etc/texmf/texmf.d files by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/texmf.cnf"
+
+	insinto /etc/texmf/texmf.d
+	doins "${WORKDIR}/texmf.d/"*.cnf
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+
+	dosym /etc/texmf/web2c/fmtutil.cnf ${TEXMF_PATH}/web2c/fmtutil.cnf
+	dosym /etc/texmf/web2c/texmf.cnf ${TEXMF_PATH}/web2c/texmf.cnf
+
+	newsbin "${S}/texmf-update" texmf-update
+
+	# Keep it as that's where the formats will go
+	keepdir /var/lib/texmf
+
+	dodoc ChangeLog NEWS PROJECTS README
+}
+
+pkg_postinst() {
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index fae9c60ab559..cfa11d832c65 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -14,7 +14,7 @@ EBUILD leveldb-1.15.0.ebuild 1230 BLAKE2B bbaa78014b6f36a8c6d8e5a71ff56995b95f9f
 EBUILD leveldb-1.17.ebuild 1720 BLAKE2B 683381ebc3ae11d8844e52fb2c7161348a6495f4f83bd29369f991d4169619d526ae6bd1ed878bae9269715da5a9d7f80efc298253fa78c35aa1c7eea9b98bd5 SHA512 a59df720d900c7da98a4e0c9c865f5cb962b1843461289cd0a4e78cbcb5bcfff93b0d4213fde486df0a9f5d2dc7bfe86ecfec757c83513932fb1ab02859feb25
 EBUILD leveldb-1.18-r2.ebuild 1878 BLAKE2B 8a31c57e1e5e6015b549e55b83277c47be0b882f695f3af8f2295ea801380cb02ac0e0691a2a9113bccbb39e4a505a9ceeeaa2c0f9be3644afb1eb4c5949d7b3 SHA512 865cc8d9fa5b956e3b31863d3ce4d18624bda106aa06c0176ff514c7cc3b7016edb0dd34dd5724b5fe4a9ef231ceaf2b59ef47ac9589c66ca4979254b4703075
 EBUILD leveldb-1.18.ebuild 1647 BLAKE2B 65c40aea5784964fcdf7550ff41f20980b61e3eae2e69ea790d1e1db1c3b152abb18c7ec679bbdaca21c2c91ace348e7b8a8bee53fa5c39528f1b0c1ac76108c SHA512 5a8feaeca45690fbb5d6f7ecfe7074e176532765900cb343107da542b32e61935bb0832a6682550d57a7e74bc20fec0469a7b0b20a1de9636f628fafd3de4193
-EBUILD leveldb-1.20.ebuild 1736 BLAKE2B 51041f0f5685af26fcab70362ecc3c3bc7b9c99ed4334facb66f8c6f0a323e0260d90f85c1a8fa529c6468fe6880380a7dffd08d51924ffd971b482a5988197a SHA512 9298f80a533896f38fb21edb077e97a7ece2f3c1fd2ae720a554cc82a53d98e50829b8d7b5bc07097d0dd7ef724fa24ac72d32cd8f89dd2524b125c6bd593632
+EBUILD leveldb-1.20.ebuild 1735 BLAKE2B b4f0ef8f4ddd61fd24a8ad649081085a5e7c55b708a13f45f13ddd5fce339f6fdee478913a09d56cfaa34667fe4df673c8e6b37867a892f23e284407b8e569a2 SHA512 61f2a35428c9dd6f76092d46d742179e17e48eb4281d36c96e527c6b7d800d1dee9d44c4032e1efb400b100bbc952e40aa492f3082da904a172d5f653055f170
 EBUILD leveldb-1.9.0-r5.ebuild 1223 BLAKE2B 7bbb2958034b96f22b3bb5e55fd9f1383e2cd01b7a523dc32ead090b31cefcf4299d581e85430dbec267746ded520ed21ddb89a5fad9c40a1f6a652677961ecd SHA512 a97ee6357c3e37208d7900f216e4d4270bd7b6c9add1449e3a0c52d49755a1be88f6008e9ae9bb6a021d3345fa57db18e3751073a63ccc8e4270e7ba684216ea
 EBUILD leveldb-1.9.0-r6.ebuild 1277 BLAKE2B 9e581129c37d33f46037eeef50916c5ce6916e6f671f01144b9f0f7cffed096dff724076f36261d552df6cd8f396a38725ee476258211a1cdbf42af9bef6b289 SHA512 ca4965119338028813e0cdb5d1b303c88ef2e2450f471f4d58e16a276485fcb001d6c4818097f5b0c47eb66ce1b23b561ad37809415654c4cee771d0ac17137a
 MISC metadata.xml 487 BLAKE2B 33632d0f2ef6a0ed11b059a6245ec9582b1e977622a9a755e4ae98cd1f8dd8f853c0ed0aea919b11451c57c576699f4e9a22bd1303148eacec6fc2770f47492f SHA512 61c9350d750209e948d6aa51a3594546837e425c49dede490c0171771e7ff5a2e03932f5052ee90b36e477a20153bde3c265036839e2723703677414bd77d0d3
diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
index fa326715485d..ce1166ec824c 100644
--- a/dev-libs/leveldb/leveldb-1.20.ebuild
+++ b/dev-libs/leveldb/leveldb-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # https://github.com/google/leveldb/issues/536
 SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+snappy static-libs kernel_FreeBSD +tcmalloc test"
 
 DEPEND="tcmalloc? ( dev-util/google-perftools )
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index f1d3afa3ab32..f95176c51889 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,5 +1,5 @@
 DIST libatasmart-0.19.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
 DIST libatasmart_0.19-2.debian.tar.gz 6511 BLAKE2B d283dd1db988b95436a99cf804790b6c9b22d48b41d561a6fd2b9aff0948241ab5e775c5c35691692103acd5e73ad2e46278b9d37f886cd48c91cc69353a1564 SHA512 78e86b0c1d2a56dddc8d9ac97ee325871e319ad2226f1fbd5a048d792cd05e5d8162d282c1f767086da5329cd1ee67b37fbb5a2fd3c950f84e9efab11abcf754
 EBUILD libatasmart-0.19-r1.ebuild 947 BLAKE2B 073735d386281eed2d06473756dc5c2320c630f682c5896961fead7384c9b015fe998d18fc10481f3989ad28fcdc34efb0f2d4b6f7dc0da1b18e75debfcb0d98 SHA512 9f01383cfd7db79cfa99d76f9a8b8c6fd2eb91d329c1b99ef32103c107fe731286b6103fa4748e304787ef16ff41e10d16db2b29788966b1854a19e7f6e478b0
-EBUILD libatasmart-0.19-r2.ebuild 963 BLAKE2B bfb008fdbeada89ef36350dec054fbd5d4085153eab95c87cac47fb82579c687a7fa3de8373f58d58977f0c4691e242c16332ea7b888a04448415c3c6b6e19da SHA512 cf2249decbdf24d67df1d55017703607b1d392f1047a19eff6de791bad27397a682aa75b7ce754319fd93a1fbe456696fe613f9ff6f85ceac9d6c94b1206fec3
+EBUILD libatasmart-0.19-r2.ebuild 962 BLAKE2B ee87912f6b870e8ccb660802d46708d171bc057ec404c04f814483feec58e6cd65c0afe358e52a5868a5331ee25989523579b17b6dae814655066b560739d8f1 SHA512 d6ea6bd3d6982e89fde7189312757e1bafef524f8ee8e69074291a01f35005d53d433454a289a635debc723be4fd1a1e071269cf9d41148c6afbb759c5e3c304
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
index 2117666652ca..059a6224249e 100644
--- a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://0pointer.de/public/${P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libudev:="
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index a3218419636c..1ac3056277b7 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -3,5 +3,5 @@ AUX libbpf-makefile.patch 655 BLAKE2B c601e3c6de94a21569e7ca8def5e798484e8a1f945
 DIST libbpf-0.20190311.tar.gz 110782 BLAKE2B b660b2677abd3068aa37f390e817c755ee06cf683e357cad6a9537d8e509d53f24ac66e472148f5b66cbcdca7849db10fc34ff8e6f85bd54a0570a52846ff933 SHA512 dbac8efce3b4c6d4faf40b22de6f71bee630fc8b71aa96e13692ffff0474ed7aa5f66a3c1f5871ec1c27dc71b87bec3ce5138096590fb9238d4d696a722f358d
 DIST libbpf-0.20190404.tar.gz 115495 BLAKE2B a159d75163cee051e7784c20018020e650d88e3b011928b1a748199f88b22de713000d3557d083cbbfc3450b6ded9b891d0afb487611044cf2af93fd5691ff8c SHA512 724fe12c9a028a9b6d5a05ee679a3c7f687a32f403bbee3c90730005dac20e0a5e9e6c21df02780d329a88acf4ec525411e448f537b49ce2767de8eae6012661
 EBUILD libbpf-0.20190311.ebuild 1505 BLAKE2B 18e4884b9b82382eb00535941150a09d34ea2c0d7dca8119336f4149cab42eb0dc2cad35dadc8cf93090febde32d966e5392fef9644fc80e76ec79d7e9554f28 SHA512 4b68c327b79792445a8f4c11d8422a07b04394bb1a99d9b822f758aa4e26e39b558b2492ff0f6b9ba2c73dbbdf938fb33d1beccb99c5d82f994c7a6502df0507
-EBUILD libbpf-0.20190404.ebuild 1495 BLAKE2B 5ca8a9a8ec7830d60db8b3fa1f6870fb9d70f335bb226b2fbdee0fe424b6879c5e062d82931c0b19576152f613baee25e016d9762fae48e97599d587f7be4a45 SHA512 7394a76b1e54ba01bcc743e933a2920bba9347babdcdfe76e8a3d80250e2cb859feaa797ca5e81f4ec9efb7d79bec63d26edf685bc184c6aba28c84e7e85f690
+EBUILD libbpf-0.20190404.ebuild 1502 BLAKE2B d71499b6f3621ef6e6c355336869937fde76c8b43b06b731064b29976173eb80ff0efd3a144ed1b861e01668d5c19b8923eed5878bfca9f5d85a05eb3c1dc6ff SHA512 84cee7bf1a93d32d5aa78a55bf85b6abe74e446b59c73c77b5cd8871b10f84a3e08589c8bc50528220b42665e7c2f48ebf068ad387848a2ec32c7ceb1d1ca4ed
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.20190404.ebuild b/dev-libs/libbpf/libbpf-0.20190404.ebuild
index 2ffb199b195b..e26002cb967f 100644
--- a/dev-libs/libbpf/libbpf-0.20190404.ebuild
+++ b/dev-libs/libbpf/libbpf-0.20190404.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2 LGPL-2.1 BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="static-libs"
 
 COMMON_DEPEND="virtual/libelf
diff --git a/dev-libs/libcaldav/Manifest b/dev-libs/libcaldav/Manifest
index 6f3202bf91f1..e57cfd660b44 100644
--- a/dev-libs/libcaldav/Manifest
+++ b/dev-libs/libcaldav/Manifest
@@ -1,4 +1,3 @@
 DIST libcaldav-0.6.2.tar.gz 513852 BLAKE2B a8916bec69cd23ad9b7194a55222e7defe8bed7ba005cf3ecde186b843c68089bb0ad34f10d161ad8f3d11fdbfca9fb4e599188cbb65e80e430f2646871b8599 SHA512 a6d9c70f0cb7699644504e88934f7942b0840e81e89304ada50200d778e51e95dca08d0a0748636455295a03535a52559a07f58a15dd5ef1d4520dd3b0fc1aba
 EBUILD libcaldav-0.6.2-r1.ebuild 562 BLAKE2B a5407cffc101400fbad13f22472cfae89f45b36352a0def26977fa7916a73d23a2c4798b606ce9d480cec9a9efda79fccff8b2fb219939082b1702a3121e4f5f SHA512 8ea08cb0c7b6db9adf1357dd038ac1d6a4d61990f46ef870861c5abcf8f0db0171bf333a4ece37642ab6e954267bb5b0fabc3f86b413964d90ac9d065aca3a69
-EBUILD libcaldav-0.6.2.ebuild 576 BLAKE2B 94fec557a5973adb52ea50851823b6c4c2eff493e07f83b39f921cf2056b40556ba48b6504e9df5313e5a7140db1e0e06dcd556be15a5aaeb73dcaa3640d2c15 SHA512 9abe86aa121ad3f842c19921735564a100f5501a14ce51630311d232b5370b81e8e0326f4eab1995206d023e1770ccfcba7d82d9bd925a2a83c98a76deafd271
 MISC metadata.xml 246 BLAKE2B 023099f8ff9f7e2013c6a2cf92a1fb7f53e230affe07573b212f09d5a5b42012ef2cc7e91beadd8f29f410e92ff4b3206ea11ffa6737b1a30529692e01c5621d SHA512 021025439c733ffdc43f0714b191e86090b768b1c0913d71019fa8e7973d3dbfb79cd82c66a7e0a6870e7a04a8bf042f6d94a2fe1d48f7d32fb7f96f25aedce2
diff --git a/dev-libs/libcaldav/libcaldav-0.6.2.ebuild b/dev-libs/libcaldav/libcaldav-0.6.2.ebuild
deleted file mode 100644
index bac33cb7be75..000000000000
--- a/dev-libs/libcaldav/libcaldav-0.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="C library implementing client support for CalDAV"
-HOMEPAGE="http://libcaldav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libcaldav/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/glib
-	net-misc/curl[ssl,gnutls(+),curl_ssl_gnutls(+)]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-	)
-"
-
-src_configure() {
-	econf $(use_enable doc)
-}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 7718466eadbd..fef090309896 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,5 +1,3 @@
-DIST libclc-0.2.0_pre20180915.tar.gz 170385 BLAKE2B 43a90347936be5ad383fe4e4b06523aac455596d6cb1fc58038811ea19b4f6ab2091ffc345e68ff2ad7f7f1615713085000711b31b9d1ad3911a85bc0db93d5b SHA512 5b8e68f7683d72390d8f9c263e15a54b4b4613b73eff2bf3881d7a35d6480468693a62dcaed159fd8421ae80768d6aaebcd6c33163b082c0a2cf15581d37dcab
 DIST libclc-0.2.0_pre20190313.tar.gz 176803 BLAKE2B c9ecd5053685c2de89d92ae4e9cc9e9f8bee24ca05e5ddca6fffd0b45356b7d4a96b54d9bebf316624e0a49594a33ebb156ae6c4b963093bdc6c1067548b2bd0 SHA512 22813bcd76e77c018acbdf2a3d3d300c2996e169c17729726ae8a93c39f85033cfa1f6d43907a7c026451bcdfcce6fbdc64a202961492aa951ef1b818c3f9335
-EBUILD libclc-0.2.0_pre20180915.ebuild 1919 BLAKE2B 46b75b65909ecebed20e357e44929b861cf54a9838dfd05a33cb85f30794e4e92393c4b2cc86ed4113254c31aadea22c7bf0cc8e0375db77a99f8ac0979fcf34 SHA512 c0df7667b61caaff6cb607873fd691739bd3999e82862323d7c9144b076cb95583efd5f3ef4f744b7f26d5bc6f93e99498786f5cbb60bb682b6ed4993bbe664b
 EBUILD libclc-0.2.0_pre20190313.ebuild 1934 BLAKE2B 07b17d62e8e3b11a3a117bf874d5bcf91428b7865fa9893b557c39868fb202b406c1ad61c086af6c32d8d43e912f56ae678bf18256ffa9f9253be89c92fae642 SHA512 b8b1728446ce23bebfd88f559fa6dee45a31460ebe8d992039f4c0dc092ac63b29437de121e96df3413f71c8dd28c61891ef926574be887455ae6fe8a4fec759
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20180915.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20180915.ebuild
deleted file mode 100644
index fb844443dd38..000000000000
--- a/dev-libs/libclc/libclc-0.2.0_pre20180915.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-
-EGIT_REPO_URI="https://llvm.org/git/${PN}.git
-	https://github.com/llvm-mirror/${PN}.git"
-EGIT_COMMIT="dabae5a2afb78cba0320a86e3f5f0b5dc83e077c"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-else
-	GIT_ECLASS=""
-	S="${WORKDIR}/libclc-${EGIT_COMMIT}"
-fi
-
-inherit llvm prefix python-any-r1 toolchain-funcs ${GIT_ECLASS}
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="http://libclc.llvm.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://github.com/llvm-mirror/libclc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-		${SRC_PATCHES}"
-fi
-
-LICENSE="|| ( MIT BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-IUSE="${IUSE_VIDEO_CARDS}"
-REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
-
-DEPEND="
-	|| (
-		sys-devel/clang:7
-		sys-devel/clang:6
-		sys-devel/clang:5
-		sys-devel/clang:4
-		>=sys-devel/clang-3.9:0
-	)
-	${PYTHON_DEPS}"
-
-LLVM_MAX_SLOT=7
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify configure.py
-	fi
-}
-
-pkg_setup() {
-	# we do not need llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use video_cards_nvidia && libclc_targets+=("nvptx--" "nvptx64--" "nvptx--nvidiacl" "nvptx64--nvidiacl")
-	use video_cards_r600 && libclc_targets+=("r600--")
-	use video_cards_radeonsi && libclc_targets+=("amdgcn--" "amdgcn-mesa-mesa3d" "amdgcn--amdhsa")
-
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	./configure.py \
-		--with-cxx-compiler="$(tc-getCXX)" \
-		--with-llvm-config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
-		--prefix="${EPREFIX}/usr" "${libclc_targets[@]}" || die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 57f7849a9be2..55e32ac95918 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -3,5 +3,5 @@ AUX 0.6.12-CVE-2017-7961.patch 1437 BLAKE2B 8678147cc24ff674b067691a3eeae42a5731
 DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081ca8b0787db577062e36487d23cd99b384ca3269421d26aff9825725b262fd6a3e48be73448fe984548ab3eb080b SHA512 af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6
 DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
 EBUILD libcroco-0.6.12-r1.ebuild 1442 BLAKE2B 9f5c7428459553d93c099cb6ed0c1f6b3e0fe0bdeafec490f0e709f08f50045761748639b4b9df2e58fd4ad78e8bf2e30152b5654b2cc277d3467639b4f556ec SHA512 c25781b12bcc99c38e4a55e4dc03b8c27171e60b84c8095313c3b705446e2c02cdabc0d7206bf0aa459296dfc687f3c7b573513a4cbde71b5f9df088c8cd4846
-EBUILD libcroco-0.6.13.ebuild 1351 BLAKE2B 9ec7c78a33dfbd4b0ec31fe4156485fadeaf94b6c22896a96c26848830b6de9155d011ac4b8fdf1bf27c7f3a8854870e30bf700be32726f31e1db9e7f4e9b9d0 SHA512 2f0caa7d03c36b1c2eadb45e33ea006c4fc5842f2aeebcc09f986fb017cceb9f0af778a942cf0da97ed9aa73710caf0878a3fb689255472c0ff6472f7146ad94
+EBUILD libcroco-0.6.13.ebuild 1350 BLAKE2B bd0e2a92a24fe8732b85e31ba362ad6485c3e51d4c0032269c800de9fe23b8b4a0e32799c0cfad378c1ed71169ab3ada2ab9248f9f25550764272eca35a2d112 SHA512 f3cca1321fe2768004f28cff88a62946e1b36dab65e5e9584b6b8aff855e80b2114782a067bcbf20f5f0cadf87dda191032c35a792074235113085273768de53
 MISC metadata.xml 597 BLAKE2B 93f85899d5ecfde37206061e57a03b1eaa181d9e2c105999621da011bbed2b11efaae603c2dbba0b405917653adc75cf849e92682e798e9514984e5577fee90f SHA512 9161b1cf0d796d0aeb681374b278be7938bc551316d6d7fc4fc1e19bfff4477f6b12bf606df0eb17c57e08ecb257f358f579a232ce6dbd6cc2f838aee4e2b9bf
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index 7681819641bf..8c2bf5067848 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -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 ~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="test"
 
 RDEPEND="
diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index df52d9c9e399..923c56184f23 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,5 +1,5 @@
 AUX libdbusmenu-qt-0.9.3_pre20160218-cmake.patch 7959 BLAKE2B feef71cd51c36607b60104d0ca24eadd269e79ad22a633625b1b855137f97b8da645e15b10a374911bb5e9ea33b71e17d9336211233f4f12155f3dfc5f28b685 SHA512 00db7fd1c5d90f03f0963abb413349043ef215cd7a9f41f78e4233ff53590a9b9854ad500b9899f7b344ce9853d8d8200abb31565fda855793e1edd6e76800c0
 DIST libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz 46438 BLAKE2B 66b1fa44f28b5f4d5fa09afa988ca793ae892a7aeab6290b1650876a992e27a15af5a6a999080aa4c499295e2fa3de768fe5f185b5df2af36b957766508c1804 SHA512 dfaba59cedd320e6a3b5a9c0a5e13fb9e0952224e39cdd6ee3b32b03d95ac850a533e2a73835a7c0ead93b2283b9c235472bacb84e3d761ebe9e9398345314a9
-EBUILD libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild 1256 BLAKE2B dc7097ea4dbbb176a5b23aa4785f4b2c6a9afa759ab05fd751d2c37f170a54e772ea1ab61f429f1495a2ab0e39f04ade2375d45670f6a98029f3070dcdaf1e80 SHA512 f3e6d70dfe14ffd3f5188c60bd224a1b3614353181b878e034374a55c38adbf294b60ad8b0376ed12784628c978b395255925157967be7bd7779a68b1a45ec3e
+EBUILD libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild 1252 BLAKE2B 3d9a6de479e080efc8edcb71f4924d809aafc594acf26783a36109ef0520e2b1b715205a386e3ec346b9cec6217c644d2f5f67b45edb5a6f70cae99db20b651b SHA512 e3f51b2c361eef3658ac1ebebc65e3179b2498b024aa6beef7f881be5c70cf6a4668bbb550d44d0f6a3a9aadff4487f33c5bee772b86141c43592b41ea31f47f
 EBUILD libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild 826 BLAKE2B 8a6322d0553d41cd185962c00c895e93f108dba609eba9bfbd3eeb235482ea80715ed3fe1fdee23baf34bda86bd3c96bed497bb8bad54caf5102fcb85eb60e4b SHA512 4b51ccc17e42e9ff0f56b1fbb2e9fd37cfe3bb0c76df4f7ea20744efa3a653fdd06e02291cf80937fa77972bbec04adeb6df1cf38d2e9b530b3141477a9085da
 MISC metadata.xml 323 BLAKE2B 02dce303163a2303c73bb15ae09358e93077a751333d7204c2372ed7cf7667137ea4d633250b39ee5ee032316433cddedca5b80ec01ff8300d8ac221793bddbe SHA512 290f7befe52993609acc464791369b56b20c1584e4266166073d504dd0ea66a2e2f6f786fcc56e1928125b37dd3f7461ab29b00e17e012ef2ea6c34321f643ba
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
index 32db4c0a9192..94932495e000 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
 if [[ ${PV} != 9999* ]] ; then
 	MY_PV=${PV/_pre/+16.04.}
 	SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2"
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 601d14dfc1c8..eb0922f5404a 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -4,6 +4,6 @@ DIST libebml-1.3.6.tar.xz 57764 BLAKE2B 554f9d4d162d02ba05e2b1eecd688a6c25a4c727
 DIST libebml-1.3.7.tar.xz 69460 BLAKE2B 53cb7ab3c553cc533b025bdf1953c1de33108e506900e8df0ecafa5f88bc43b0a54611c69bd169401ddea162a1e669bde0e93dc38255b8ea24d04dd41fae9599 SHA512 ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1
 EBUILD libebml-1.3.4.ebuild 834 BLAKE2B 11fe2d8ebf1fa93a7fd9c866a9bd556d00ce6da0553be6e39b85c61e711a8277eb3f27e212c00609cb092f16e7fb403285ad29623f7e8941a7bc7c96443becd7 SHA512 edc8bf5f0137d8fb44335b0ceb64a66c98d2eb88bde15b93f7350fdc2b80077006c5e31c8ea567b0ef6050f08789a1566ccdeafb8f6ef98e3559d344f85047b4
 EBUILD libebml-1.3.5.ebuild 833 BLAKE2B 63ffb0503ef6995d4317638ddb15d27fc3a29acc173db763fb792ffc240c9678b787f6bf6cc9e50575e47ff682d262163268a80cd3c8ae40cf5ec12dc384e778 SHA512 e4157e6a8d7b5b4c1ed559a474cb9b9511ab7eb76d8238eca97278bf694a37fa00114b0ddd881984886636e2ef65becff655374a4d91b8e66297e91e1b65852e
-EBUILD libebml-1.3.6.ebuild 626 BLAKE2B 3cfdb8b9660b70697007c66ebc7864155db2c893e9a93742352bdee482e61118ee951fd0c38d12bcc6113f1232c6422930c8679507c261d066f1960e3ecb337a SHA512 763f59c043e232c7ecda4bcb21618a75f895ce18ddf6858e772a7fa7b5f4d7f03369c266b55726937f9e06322271eb2ca5b214e8bf9fef60a74f72e8ea554215
+EBUILD libebml-1.3.6.ebuild 625 BLAKE2B e55976f6a05f7bd2633d38dbaab9b959a282e24bbf3ff8c8820406bf0b26da99574ce48fe0f67967e26db49e1fbc9b9fd7e93ea392a6afca03aeecbec4ae0d22 SHA512 6826cedc2ff765cfb5ec03f001dfdb17947791dac98a994333446c8b8beb3ff393ecc93fc11b3f7afde74ac092648a4df3a0feeba5207e81f6835f38ac6804e2
 EBUILD libebml-1.3.7.ebuild 635 BLAKE2B 5805ef9b68f9391dd868c94a44d2841283d61488e74a44ca0676d6f6fcf9f04a975cdda45f31c22cfdc428b7b90bc2ef904dee8f2a504afe9f3fee4cbe26a7c3 SHA512 7dc35d4f04ae4b0b9920bc86d765642896559352278ed5e14a3290bfb935f89297498e6a2822a7026325f4b87463aec64cfa04970ded60893dbab6e0d3dd3f77
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.6.ebuild b/dev-libs/libebml/libebml-1.3.6.ebuild
index 18a43c86b94e..77792f6ff04d 100644
--- a/dev-libs/libebml/libebml-1.3.6.ebuild
+++ b/dev-libs/libebml/libebml-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_configure() {
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 9d65f752b710..1410370bd646 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,5 +1,7 @@
+DIST libevent-2.1.10.tar.gz 1074897 BLAKE2B 15c86f9d82a54912dc8ebde54192e77dc105a9b7fab215a3ba0b85de31e9caccef8aa02ace0172e22ee394cff0e7b5a4e8ff2a8c5c3e472378630f66b1c0d33b SHA512 2a449b60c5bba0908f693d3169a2941f0952b462ea18cf3c7a7288cd902592f35a42c76096af502f04259ffce2567233fda3586578c2ac53fbfce6e00d35c086
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
 DIST libevent-2.1.9_beta.tar.gz 1067050 BLAKE2B d59f424995742e6a57df74420d91c8a1614d7dbb6e3928a3dd666269f7c2f4876d6fedd649e4e947a6db63c15f69c18866bda9997c3bb3571452a8dbf126916a SHA512 672bff332292ec76503bc0ccb9462058e093f1867740fece51f77bb666c77c85e10271730b32b36d6faa9ab2ccee0433879457e201bf94b6bf704dba2c066051
+EBUILD libevent-2.1.10.ebuild 1679 BLAKE2B 6fc0538071b7ed07bfd223f25297b33059c3003cdc06e9ab46f6cd7a0725fecb809888be078c3f0dec80b12ea786b49aac9945a18e65f443f1ca4f4ca8bb3783 SHA512 c7ea1349503ec810f61cb3c6569ed34763bdbef0c4ccbf2959cf1faadbf9e2033a97161802742e287e1d7c6f9e2f924647919e66c37474dabf8ad2d027a25c77
 EBUILD libevent-2.1.8-r1.ebuild 1723 BLAKE2B 07f20b57d7ae3fa923149fde4f47dc299ac5f638fd784f7fb67d2fd1f500875d462a98cd6f23050b223e562c2b3b326e99162c9e21fa4aa596f1d4b368d2d82c SHA512 042d0843a134418417fa521a86316fd4001c23615c9b6b36990da1222175bff8e750e3c6d28dc403201e1cb157acbf74e6019ca5dec01e11fd726a3f0c22a373
 EBUILD libevent-2.1.8.ebuild 1705 BLAKE2B d483a5f882b40db3891d48f3e7de7f7b4916c45711e60e83d92249988f6afdece6808c71a7212680548d45f58ed3163cad4bcdbb2ad67d2a8a62df5ea66658ca SHA512 b44f94eb5db73acad177149232465f1dd11eb2bd37fb3680e4ef050ef5429d49080f978046e9a8af7aa203fa0504580f24dae9d51ed7b624e6a6aeca1bde1f3f
 EBUILD libevent-2.1.9999.ebuild 1304 BLAKE2B ca5125cb04834e449294880d988eee53abbb0818c46d46aead9feba8ba5fc92b0bd88c47906e40322b47104b9f964f6ab4dfb03b71fb7249d19e0fa9353aa4a3 SHA512 e39b9eb34693d1fd59c1ffbad2e784c3fb0ee752378c00c0c884837134d03fa8018af27a436a5b95b103f1b109e05a81f629eb06eb51f15719f21e5129907b38
diff --git a/dev-libs/libevent/libevent-2.1.10.ebuild b/dev-libs/libevent/libevent-2.1.10.ebuild
new file mode 100644
index 000000000000..d8985a9c4837
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.1.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="http://libevent.org/ https://github.com/libevent/libevent/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/releases/download/release-${PV/_/-}-stable/${P/_/-}-stable.tar.gz -> ${P}.tar.gz
+"
+LICENSE="BSD"
+
+SLOT="0/2.1-6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="
+	${DEPEND}
+	!<=dev-libs/9libs-1.0
+"
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/event2/event-config.h
+)
+S=${WORKDIR}/${P/_/-}-stable
+
+multilib_src_configure() {
+	# fix out-of-source builds
+	mkdir -p test || die
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-samples \
+		$(use_enable debug debug-mode) \
+		$(use_enable debug malloc-replacement) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_enable test libevent-regress) \
+		$(use_enable threads thread-support)
+}
+
+src_test() {
+	# The test suite doesn't quite work (see bug #406801 for the latest
+	# installment in a riveting series of reports).
+	:
+	# emake -C test check | tee "${T}"/tests
+}
+
+DOCS=( ChangeLog{,-1.4,-2.0} )
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 042d8bc1b649..3c3e332a8082 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -2,5 +2,5 @@ AUX libgdata-0.17.8-disable-demos.patch 1941 BLAKE2B e8c3b0b558d3c446f3e383268b7
 DIST libgdata-0.17.8.tar.xz 1464812 BLAKE2B 787b5d6e4a62e70f76ca4080fb5c3ff1e7d68745f388be646dd980ef8be18275997bca46a1f3639c9457c8310f9c3f4cd34892be88db284a9ee5e5f43e9723fa SHA512 dfc4c825a7053a6fd7659d04c7077bed8539b4cf3ef3da1d5ece4da3ce17941900e960a300a50b284010ed890dcab87e4c4726403f04481c672832fd34b975b0
 DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
 EBUILD libgdata-0.17.8.ebuild 1641 BLAKE2B 8bab41b7e782b93b1c0be447f60aea096d9b18284c4e684034cf7475be39db2751f34c9c80791396c39a95ce3df16da72573bc979c18ee21793306a1f1c5cb6d SHA512 7bce4dfccc02a77a70f0d1ecd8e1c6d121016004138917fa5505aa2cdc33205e5665c367aee3b3b45ee7524ffe041c8f3a561e8c11e835d213fd01f2a2910b6e
-EBUILD libgdata-0.17.9-r1.ebuild 1725 BLAKE2B 2970ed7bc2a1f2a4f4c2ceb1024a8b7a53fb53aff7e92654f451f2718692d5060376738a9e2d7d7402769432100523282a27da34f2757bacda4bee0aee7e516b SHA512 5f3a09447b175cb31e23f9334c9e117b884782d5b0a1bf42043bb314205528dbbe1512a65281ff717224e36cde008240524aa671582159743a9982c42e11077f
+EBUILD libgdata-0.17.9-r1.ebuild 1724 BLAKE2B acff62b19b2ae1a914eb25407c341ec68b7c508b83ef7379738da389f89f3559216c39f14bd4c457b2e5bdb1bb79d8b2f694b236907fac5c47d8688c5c6e4679 SHA512 5d4efa0f573bcf7b770720345111fa610d0029fc92866ac98c74bd40caec81a8aa17134d198933f9297769bb0b5e755ee67f48b9b628394b377fcf41d7b79e79
 MISC metadata.xml 362 BLAKE2B f10a4dba3d98334e8c3092595559b1a0e9036388c3d9b72a53fd1dda5935721198ef7c751efd2179701c4805b6116b3f61965fb5037fe63ef9bccfcb8b37bdfb SHA512 00513b8910b0cf0f0c42b1723c8e22a93c95a702ba3ba9f139ba8e2a25a6c408f1e8f97302ee300189ea534717b1f7d21a909cab0ebf6ba8d6cd19d38df2f30d
diff --git a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
index b6640ef1664b..9ba514674752 100644
--- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 "
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 28ff4abe1512..6df903799519 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -3,7 +3,7 @@ DIST libgit2-glib-0.26.4.tar.xz 138492 BLAKE2B 725c14076fb940186faac079cff1ea87c
 DIST libgit2-glib-0.27.8.tar.xz 137796 BLAKE2B 4dc6d9b435a662acb3fb51bd7349b9c273bad68073ca05d1c27fa59148a39549036e5e8786ef502e1c5758596bf58a80c7153837c6a5956c764d69d71b860531 SHA512 abeb530971edcdc3e813d34ebffbb5d2edfdea527372976e6495f9370a4a7f63c7f34e61bdec02a602a8b5e687960e33f77dc6cbc8f3b65accee7c195b03b593
 DIST libgit2-glib-0.28.0.1.tar.xz 138928 BLAKE2B 708523bb5a723f59e51501675c046da072bcdf18b3ded94920ce9eb181854780d6b44759531c8e949199a889578515994299facd14d10a07958019f6af0b6aba SHA512 6ae88bb56052461a9531016140edbd8517db8d5c0e5c217b4e8918ffef70b92652e4a95493c4290112068d0b793bff2b894f136b79929924fb7347926e3a8f51
 EBUILD libgit2-glib-0.26.2.ebuild 1297 BLAKE2B 9cae857d1b8eac43814de33f157d257fdc88e7f7bc7ee68a5634904cedc03692db12b7b2c91f48cff91cf84585e9b2ff3a5d8e6525ba080e679924ce26ab5ad0 SHA512 2c4edfe78cdfd7c7a0505c465dfe4011059095d24e0ea152ce7366b86a194bf11c2b761007eae492afb15e288b6726b89b713d0108f8cfacd103e01ee4d810ea
-EBUILD libgit2-glib-0.26.4.ebuild 1322 BLAKE2B 9e2e100561fb42e6ac64ddcece2b694f64169ee9dd455c985a2b948bec77fac3d9ad400d1093545a201bc8f4c7b98aa1dc90a0971ea6fbfeb9314f155790a631 SHA512 06831fd60154a5c14aab34a9280a6dc1e20de1dafa2aaacb39609bdcfff554a89fae3c498075bbff35d0a9298ff448d6089a6f0f9bea7a2ff19aefed1385dae0
+EBUILD libgit2-glib-0.26.4.ebuild 1321 BLAKE2B 3f9bb5fa640ea2cdaa2ce6034eec6a45e1e78b0ec83b8232b8f833bd554bdd659a0439c7ad3613253ef4d0f0687f40ae6be3a9c90e4d2923598fb7f9729f9f75 SHA512 d4e465ed497daa0a47077a07ff01ff7065cc1f0ba48d8660a7fbb97d6e983fdc9c0d2a19dc5acdb5f7ac382cff7d9fa8527fc62f9e0be116e7b6681a6ea30ec4
 EBUILD libgit2-glib-0.27.8-r1.ebuild 1262 BLAKE2B c4698febceb4823b5c67ade03fce33425c82cc0ae1283b3beebf352b7beb5b0962f7b17db4722f6aef2ecd82a69e833b411cdf1c65a4dc3a0227675777c1ae92 SHA512 9858b1c3edcd9b36f5e091aacf6ee5cf32640c4380821bd4dced070e8424b17c642d34d2d9f70d50ffe05ab8050ef4e633b648ba0a231cc8127f42c2f3fb39c0
 EBUILD libgit2-glib-0.28.0.1.ebuild 1262 BLAKE2B c4698febceb4823b5c67ade03fce33425c82cc0ae1283b3beebf352b7beb5b0962f7b17db4722f6aef2ecd82a69e833b411cdf1c65a4dc3a0227675777c1ae92 SHA512 9858b1c3edcd9b36f5e091aacf6ee5cf32640c4380821bd4dced070e8424b17c642d34d2d9f70d50ffe05ab8050ef4e633b648ba0a231cc8127f42c2f3fb39c0
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
index 21f9ff2f08b6..d26630c95978 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="python +ssh +vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 21b75c5f5104..0429e828a8b7 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -2,8 +2,10 @@ AUX libgit2-0.26.8-disable-oom-tests-on-32bit.patch 1775 BLAKE2B 4c3df3edfa76a57
 DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e
 DIST libgit2-0.27.8.tar.gz 4783928 BLAKE2B 0f0f79a43de3e869d593dafc1b506ee0894143d2daedf2fe56683ad8f2edfd7d87bab784354b9fb1796fa8e08a36b9de88af65c7621a90d537cb585c89118197 SHA512 53ab69a0687afd315029fdbe0ce8192b7e88f7f1ff6bc9c4875718e638cecd64755a9942ad605e6c388c58c6b892b351d54c5405de8e0d5ba90406055a25ffaa
 DIST libgit2-0.28.1.tar.gz 4987204 BLAKE2B bb4f32b0b78a9faed3e5204f40cbda15d032719dfd581948cf175bc17a30356f97f20545e1f64ff6f3cd1dc4ff483af99edb29d7a10c56349ce74976c186886b SHA512 5a1bc5c6af6ad25cb8b2c446e75a774d2a615d4999ec3223d681c7b120d83e7cecd94f1ca549bac0802f5324e27e73cc5a6483ad410636c2f06f098b30b1b647
-EBUILD libgit2-0.26.8.ebuild 2051 BLAKE2B 4859872a3feb9ca22bd344e39470c0f6b44fcf08e93ed7cc63a39c5ed02640c1e2dbac66c1eda916fd450830e504e8040ee41d43c4a85d293fb71641232febbb SHA512 675efffc1836dfa802ffeac98a218c2e0e4e0afc5d0e5974883cbc616f9e56a07d90a0ee26f838048663627d6d96dd7ff9da97138895681c17b1d93a6c8b9cec
+DIST libgit2-0.28.2.tar.gz 4987586 BLAKE2B cf791adb173050b4b153062ff5fdc923289462677ce34af1077d228a95c4d9d7e9b836aee44dc79f079f42c910c4b4548241ec7ff16665ce49e319ccd38d4c7a SHA512 0879c162e2e1dc00eadfbda22cd1f9d3a95b4ec2b653c108983f37c2f695140882de4d50d7cbc04ced247125a4e9fe6df16130e1267891aecdb2411d920db5c6
+EBUILD libgit2-0.26.8.ebuild 2050 BLAKE2B 29ba7bdeb65ca0d274b97240ca81c732e8f5505b64856d61124a8726791ae6c4bfe1fdba88c62dec9a35a4f9ac0d43df3884f978814e7bab9ce1f8a573f7c1ad SHA512 ce1746610579ddb076cd7d8c4f97596142bc73e9d454f7188962a940693dba7e0f8814a551b9512502c0c1ece2d1392e963747208a3bcaa5f1af6d9d376f1a0a
 EBUILD libgit2-0.27.8.ebuild 2053 BLAKE2B 177c2d0f6514cff1b124755061c8be28c01deb4af54283ee56c79057428b36a61fff1a09deae180cef474701803fc8292671cc77537cc8659bb27c89e0cad0a0 SHA512 519816e85e64f933a15ea076dd92f6460225c962b556c379ac4830802920c4e1dcfcff39d7ce6fd3fd12302ef29cf92b0f2572e779934032d61a4a7f0df67658
 EBUILD libgit2-0.28.1.ebuild 1687 BLAKE2B 125a6d27dd61f165f6e5f6c94f1e46944cea35192944088b4b67bb7eb5afc3f9f52d5587ea16599c61424bde6d4cf8a7f1deefd969e59e20cb8ae06aa41f711b SHA512 b2862ca2cde1fb26962f72978a929dec46a098c87bea5560931b769177ab47704fb156ae5969a149f48f377612f3f806a93f1f3f71b6943f52aa16b7a08e65e9
+EBUILD libgit2-0.28.2.ebuild 1687 BLAKE2B 1776bfc14b35eb1593e6d9159f58c3c9ccdac6c25419e1d57028ef6ef832fc638fd8782e5fdf46b9e65f4caaa744660f2b87c73ae421c4db3924514c476068d0 SHA512 46079c16b630c677bd97592bfe3244c1d6943178da84ea9d862c1e58552b8267f0185102fbca573d831de67098027ffb95ba82e4f944a42d6391ecdca4031da2
 EBUILD libgit2-9999.ebuild 1664 BLAKE2B ca592e3b60a50ee0ad16da964b1e9df3095e235d78aeec683582b38fd2b70395311778e453e59bbee913c2976e341f5bc947487ed58defc60d78ca63307ebd18 SHA512 ca41454b876cc379a6aac038b00ab48e01cd2fc728ba79e9164e144a1cd5b2fa7f563b9243d0af4c8d7f1538baece44cff31db260b137f265bee8ebc35050aca
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.26.8.ebuild b/dev-libs/libgit2/libgit2-0.26.8.ebuild
index 89674ff077fc..715f0172be33 100644
--- a/dev-libs/libgit2/libgit2-0.26.8.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgit2/libgit2-0.28.2.ebuild b/dev-libs/libgit2/libgit2-0.28.2.ebuild
new file mode 100644
index 000000000000..89a49f8ac99d
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.28.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils python-any-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/28"
+IUSE="examples gssapi libressl +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P/_/-}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake-utils_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 0486e8352b37..4e61a0f0b6cd 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,5 +1,9 @@
-AUX libical-3.0.1-pkgconfig-libdir.patch 1228 BLAKE2B 34bae335d1889d0090d02b72a61ea5fc90940210cccb2d09e3ef6a01464579f2fb6bf83b6e9dbcd35950227f0f1c830bbc0b77d1fe3eaa42fd649edfef4f3181 SHA512 556e3deadef8bbb210dbd3bf918aa9cbe0f8a1cfbbf8ecbeeff36a74f134cdebabad96f6ad05f6a1e2afcde669bb145bbea6ab83efa6f7b90b4637f7f761fa49
+AUX libical-3.0.4-pkgconfig-libdir.patch 940 BLAKE2B 2b7748bdaba3ae14a83305aba4a2620a6cd85d679b736b5ad9890104f5ac1042cc39b50506f1239ff35d9f98408f4feee1a384943b855c83fb4519785bf19a48 SHA512 492def0e87c6abc9c7c3e4a69133b54bd4c5a05ba42be554bf3ebe170d846b6d5ec5d1cbfabb9289b5ea82693e1b2af60a2cfe07ea5c36da5ba335e29df9a1f5
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
+AUX libical-3.0.5-fix-lots-of-params.patch 898 BLAKE2B b0fd85229bde64bba92ee93171766e3e6d99748c873cbbf2e213c8196555db06a82b113d75c7512eb8f75e3beadeedc5529755ed9ef593414b272fcc43eacc12 SHA512 4d5559d147a3ce51697af24c13e2eca0575f4da16bea5db3066e00fad09b6d58d16fb2401e44e9623b9db9b939d4ab115989ee1f8bad2cfe59118e2cf626ead5
+AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
 DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
-EBUILD libical-3.0.4.ebuild 2040 BLAKE2B a40362cf9984fb4a562a9b3a93280c7a9923d53cf9571e15a3937f60bea81239f4c6958e05e00a285dee81ebfcae716ffafbe3fc55cd1bd03df993e358505818 SHA512 9be3ec5d8dbd56306eeee4c74ccc04f80ceb5b56a0746d7eba88645be4b2e781ed8812b01054a4beb39a9e463dac048ecbccd68b114d0d68f7321473fc5df01e
+DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
+EBUILD libical-3.0.4.ebuild 2044 BLAKE2B 74e2578c8f33971566f608ff67695a97c935217746f9a4d4222fac1c0558803fcba89fa8e9f3107ed210aec7d89ea863e475c840bd49163c582696d798e3aa8b SHA512 8cb6f316e299b25f1477aa3191e5a541061f5d1c5e327caaab252c46a429a2c85173e36015c0f7aa787d962e0c8a55c8cbb2358d61660842574eb319aef87963
+EBUILD libical-3.0.5.ebuild 2117 BLAKE2B b1812c771a9a96e3264d83cf1006a164f997ec914c27c977f09587d21a99eae820c5bccdb0c78e79b41ad847d41d74eb429753640b2fc0f6e5983a39d01390ca SHA512 8d1f1dac9762c8065d3ea2209790cf83302a570e1da4fede045df3fc5724c685e76df52f4976d6d2260215d88f8b542e4aa8ec97e56e3499f7f12b8c38041c8f
 MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
diff --git a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch
deleted file mode 100644
index aae02abc537d..000000000000
--- a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix pkgconfig libdir paths.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -336,7 +336,7 @@
- set(VERSION "${PROJECT_VERSION}")
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "${LIB_INSTALL_DIR}")
- set(includedir "\${prefix}/include")
- set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
- 
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -8,7 +8,7 @@
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal
-+Libs: -lical -licalss -licalvcal
- Libs.private: @PTHREAD_LIBS@
- @REQUIRES_PRIVATE_ICU@
- Cflags: -I${includedir}
---- a/src/libical-glib/CMakeLists.txt
-+++ b/src/libical-glib/CMakeLists.txt
-@@ -233,7 +233,7 @@
- 
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "${LIB_INSTALL_DIR}")
- set(includedir "\${prefix}/include")
- 
- configure_file(
---- a/src/libical-glib/libical-glib.pc.in
-+++ b/src/libical-glib/libical-glib.pc.in
-@@ -8,4 +8,4 @@
- Version: @LIBICAL_LIB_VERSION_STRING@
- Requires: glib-2.0, gobject-2.0, libical
- Cflags: -I{includedir}
--Libs: -L${libdir} -lical-glib
-+Libs: -lical-glib
- 
diff --git a/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..1ef0817bce7b
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch
@@ -0,0 +1,24 @@
+From 111ee5ff9daf7db21ad0b6874c4b7cc05baf4703 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 8 Jan 2019 22:13:47 +0100
+Subject: [PATCH] Fix typo in libical-glib.pc.in
+
+Missing '$' causes compiler warnings about missing-include-dirs, due to
+the {includedir} not being properly replaced with the variable value.
+
+Signed-off-by: Allen Winter <allen.winter@kdab.com>
+---
+ src/libical-glib/libical-glib.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libical-glib/libical-glib.pc.in b/src/libical-glib/libical-glib.pc.in
+index 42f1ffe5..e164cfb5 100644
+--- a/src/libical-glib/libical-glib.pc.in
++++ b/src/libical-glib/libical-glib.pc.in
+@@ -7,5 +7,5 @@ Name: libical-glib
+ Description: A GObject interface of the libical library
+ Version: @LIBICAL_LIB_VERSION_STRING@
+ Requires: glib-2.0, gobject-2.0, libical
+-Cflags: -I{includedir}
++Cflags: -I${includedir}
+ Libs: -L${libdir} -lical-glib
diff --git a/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch b/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch
new file mode 100644
index 000000000000..187a5de0cd4b
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch
@@ -0,0 +1,24 @@
+From f02ca493123b7c8e8eaaa758d787e9e2753fd9b8 Mon Sep 17 00:00:00 2001
+From: Kent Sutherland <git@ksuther.com>
+Date: Fri, 17 May 2019 13:26:52 -0500
+Subject: [PATCH] Include invalid parameters in the maximum number of allowed
+ parameters Fixes hangs when iterating lots of invalid parameters (valid
+ parameters already have a cap from f6c64896988644a7c6d4d5060f6ab574c2a62fbf)
+ oss-fuzz issue 14809
+
+---
+ src/libical/icalparser.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libical/icalparser.c b/src/libical/icalparser.c
+index 99803418..fa71e8bd 100644
+--- a/src/libical/icalparser.c
++++ b/src/libical/icalparser.c
+@@ -1098,6 +1098,7 @@ icalcomponent *icalparser_add_line(icalparser *parser, char *line)
+ 
+                     icalmemory_free_buffer(str);
+                     str = NULL;
++                    pcount++;
+                     continue;
+                 }
+             }
diff --git a/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..a3a80e9f76f5
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
@@ -0,0 +1,44 @@
+Fix pkgconfig libdir paths.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -336,7 +336,7 @@
+ set(VERSION "${PROJECT_VERSION}")
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "\${prefix}")
+-set(libdir "\${exec_prefix}/lib")
++set(libdir "${LIB_INSTALL_DIR}")
+ set(includedir "\${prefix}/include")
+ set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
+ 
+--- a/libical.pc.in
++++ b/libical.pc.in
+@@ -8,7 +8,7 @@
+ Name: libical
+ Description: An implementation of basic iCAL protocols
+ Version: @LIBICAL_LIB_VERSION_STRING@
+-Libs: -L${libdir} -lical -licalss -licalvcal
++Libs: -lical -licalss -licalvcal
+ Libs.private: @PTHREAD_LIBS@
+ @REQUIRES_PRIVATE_ICU@
+ Cflags: -I${includedir}
+--- a/src/libical-glib/CMakeLists.txt
++++ b/src/libical-glib/CMakeLists.txt
+@@ -233,7 +233,7 @@
+ 
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "\${prefix}")
+-set(libdir "\${exec_prefix}/lib")
++set(libdir "${LIB_INSTALL_DIR}")
+ set(includedir "\${prefix}/include")
+ 
+ configure_file(
+--- a/src/libical-glib/libical-glib.pc.in
++++ b/src/libical-glib/libical-glib.pc.in
+@@ -8,4 +8,4 @@
+ Version: @LIBICAL_LIB_VERSION_STRING@
+ Requires: glib-2.0, gobject-2.0, libical
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -lical-glib
++Libs: -lical-glib
+ 
diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
index 2dbe0b25537d..3e1efabd39b7 100644
--- a/dev-libs/libical/libical-3.0.4.ebuild
+++ b/dev-libs/libical/libical-3.0.4.ebuild
@@ -41,8 +41,8 @@ DOCS=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch"
-	"${FILESDIR}/${P}-tests.patch"
+	"${FILESDIR}"/${PN}-3.0.{4,5}-pkgconfig-libdir.patch
+	"${FILESDIR}"/${P}-tests.patch
 )
 
 pkg_setup() {
diff --git a/dev-libs/libical/libical-3.0.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild
new file mode 100644
index 000000000000..5503824d60d6
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+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="berkdb doc examples static-libs test"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( ${PYTHON_DEPS} )
+"
+# TODO: disabled until useful
+# 	glib? (
+# 		dev-libs/glib:2
+# 		dev-libs/libxml2:2
+# 	)
+# 	introspection? ( dev-libs/gobject-introspection:= )
+DEPEND="
+	dev-libs/icu:=
+	berkdb? ( sys-libs/db:= )
+"
+RDEPEND="${DEPEND}
+	sys-libs/timezone-data
+"
+
+DOCS=(
+	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-tests.patch"
+	"${FILESDIR}/${P}-pkgconfig-libdir.patch"
+	"${FILESDIR}/${P}-fix-lots-of-params.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use examples || cmake_comment_add_subdirectory examples
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICAL_GLIB=OFF
+		-DICAL_GLIB_VAPI=OFF
+		-DGOBJECT_INTROSPECTION=OFF
+		$(cmake-utils_use_find_package berkdb BDB)
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DSHARED_ONLY=$(usex !static-libs)
+	)
+# 	TODO: disabled until useful
+# 		-DICAL_GLIB=$(usex glib)
+# 		-DGOBJECT_INTROSPECTION=$(usex introspection)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile docs
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+	cmake-utils_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libidmef/Manifest b/dev-libs/libidmef/Manifest
index 320c24a84e44..820cea67466c 100644
--- a/dev-libs/libidmef/Manifest
+++ b/dev-libs/libidmef/Manifest
@@ -1,4 +1,3 @@
 DIST libidmef-1.0.3.tar.gz 1321584 BLAKE2B e2fc6e542e96e4d00aafaea7e0817937adc33c4a0c5f824b58f8db683e9020434778fb993ea70c1548f7bae61e6c85d280eb4cd2e83ac7a25c8e6da1129da8dd SHA512 5f21c50efffc52b8008c979b95fcedd2add7e4355643626043880105f96b4086cd9cda3c9532ddd6745f6236e2edf15a20324bdfb932e63cdcf23c8104b03dc5
 EBUILD libidmef-1.0.3-r1.ebuild 509 BLAKE2B 50ebcf5876c6804a35ca1b6c2075cba09db3e1b6f842750d13b43d805814c24203d341de6a117692f68d35725b1409cf92fc43a06c7277038aa6f2e01fb393e2 SHA512 a3f94a84735fc35764ca6e199411f5ff8414712a6872fdccf037040350b3bbb6f863125b775ac9c39592fee37916a4dc6114539ef48f92af6930d16f605f3db4
-EBUILD libidmef-1.0.3.ebuild 577 BLAKE2B df2af93cdf5947852001ab8fb173c9cf7989e9124a9f9bcb6c3deab08b3e5ccb405af94cf8b9647955b49e80777b17a89eeb89dd68dafa8ec0baa8500e68a783 SHA512 190e241d7dfc6f4cff482d9da6c0bd90d2ede1c8c1bd65a8f05a3faa0a4f77c6dfcb67c136180ed905ff85958045d695c59c9aa3b5229110b7979bc68d946566
 MISC metadata.xml 245 BLAKE2B 4cfef53cffd85edb40ee51c0c30272e372a646b1e4639220cec2552954194f7c9da9c694810b86764ce4d944a5b5f62bfbda6cd257d7edc1f123f768f8680218 SHA512 535c6138c251977440996f4a7638ade914f83418282b233749cd37c1501225ea80469cdccba901584c05fc0a4400cf3519e6743ecf79ff91938f9718e8bd00a3
diff --git a/dev-libs/libidmef/libidmef-1.0.3.ebuild b/dev-libs/libidmef/libidmef-1.0.3.ebuild
deleted file mode 100644
index ac0b722c6241..000000000000
--- a/dev-libs/libidmef/libidmef-1.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Implementation of the IDMEF XML draft"
-HOMEPAGE="https://sourceforge.net/projects/libidmef/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
-
-DEPEND=">=dev-libs/libxml2-2.5.10"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README TODO )
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index 08aaca6aa597..92b48fe92dab 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -1,5 +1,5 @@
 AUX libindicator-ldflags-spacing.patch 298 BLAKE2B 2d0fb361e2980d429beee418d9bf8d2f786de0d2b337b6775f9457158aa30d02b4dcbccdc488fa79236f04bf766aad49df732d25f48f1ecba923c46a4e239280 SHA512 fa283a8d6b88da0e2b6f5d0711ebe8a5cc0d4ab87cb07c3cecae9974dd68be751169b89503ae66751bca6cd73df2b2a262ac55a667c5c8e00e129d51f4452c67
 DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
 EBUILD libindicator-12.10.1-r201.ebuild 1207 BLAKE2B d69e47daa9bf13333d31fdfde8f00e5dc49bb0ab8c3219ccc5e88698fdb8b12c3089fd1aa221e46452515a39bc938eb0127db19d927db57622df701d6e9730f4 SHA512 aad48d226c41fd1a282e4349a1686ffc2aa5c556a7d849ad40ebce9dcfe6fe8b2dc5d5ab60bf54d689fca4a579b3c3977bcd5bf9da2c0edc2156a540d573a355
-EBUILD libindicator-12.10.1-r301.ebuild 1182 BLAKE2B 2e189f65164fa1eaebdde14487088b0b9513a4bcf8ae7671fb506802e175589469bfdcf7e24d045d406fa98fbc42e87cf848d139fe0eef0e64f0dc2ffb5062a2 SHA512 c39f24ee8f1ed913f37d25a0ffcc92fb284a042ede3ec10e3cef84c7c18013eb0acc6e21de135956550c177e0a119cd4dc2e223f637f9f96de82d88b2492cf68
+EBUILD libindicator-12.10.1-r301.ebuild 1181 BLAKE2B 6302ce3ff7ab26163fa5720f512d07c038314ecd18686493e5823d2d11f35dd38ec9fc0523c797e2aededc1b5a83fe195af56e5981d6628513bc159d27c4baf6 SHA512 16cfaf47444b8f2121b645bcbf5624cb8f3c36eaf3c29c7937a76787f09ca6b2f9f973427b9fa78202bd51b74a3877bf9097ad274b37fe52bbcd6a191d646508
 MISC metadata.xml 247 BLAKE2B 216107f32a44b828d5bd65432dbdf2f3b71d81e96ee3580fc551392310b9ee554715698dfcba215fa2181a90f361564b6d04546c61848c3a2d176f3590602f69 SHA512 f24203e0188dd8311689fc59007368585764703b92f6fde9b4ea01666d37304193fc728a9f99b7f6c936f5a5a51a58a8402a101dc4eddc0bf2bf09f221bb0054
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index e624f40f5466..c5c2badc6db5 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index b39602909ed9..3d96ce87fd01 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,4 +1,4 @@
 DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
-EBUILD libmaxminddb-1.3.2.ebuild 558 BLAKE2B 45c955b5d811592d173a63e1de01b8e4dc2539fd5fe1ffdb3f508065ece45ee63011a0be7c858805d2d1041bee2b43cd1aa934ccb977d47f5fd5ffef595defb7 SHA512 5f036ef62451899645b197434f80254e0684b3060fdfd6d921522660713fb06e82a26f17c03620c3e2ffeee685ebb5f709dc6cd13e373d47844c0f51f112e126
+EBUILD libmaxminddb-1.3.2.ebuild 557 BLAKE2B 93ef4c923139c9e52a349637b02d6e501e268249df408505b9a5eecc733525b8733ec33d365b880e358c699ee406d363998f5fc7f09be5a121014a214bbade18 SHA512 7ebb98508508ab81ee3a25301e7285c95de607ce5602e4d93757db7b9268f05866b1a62e5efdbbfd962cf081e965dfbd2a544421d6b9f8b95edb57beb30b464c
 EBUILD libmaxminddb-99999.ebuild 534 BLAKE2B 17a96d2066900a4c310b913932bf72ccb410e13ffe150e8044bc9db80bd8af2ad82b9b5d6385b676ba5c723c0219b5001e552ce8a1c52f5529af6d949937aac9 SHA512 74e11c6417593375ae978788fc7b3790d0568229232114e5966505da839f7971ff6b77452a7649f7d430883781f39ab950f9cad4fc255fc84f1b12b8911f55a5
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
index 1deb5b3020e5..d8f75bc7ce1c 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index 1f4253d155a8..b9bffd0d334d 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
-EBUILD libmcrypt-2.5.8-r4.ebuild 987 BLAKE2B c47fe43082b47b45a1f4fd6d6a9c58cefcea0d0c2bded5d38d8addfd03d20d976607209258829c773be8f78188a1882b4d5a566b544d56e6ec399b18310bdf5f SHA512 31a2245e611d07d50f8272447f168f6f94fd1ff8af42ffcf8afcff8d9d60dedb0368fefb8a1b368ce19e828af5d24b47c1adad0df2fc2f11597be77d4990c3a4
+EBUILD libmcrypt-2.5.8-r4.ebuild 983 BLAKE2B f08b0c18ae10a344b6f470af6bcdc94afd1fac606266f5027cb41b427faca0d52cf539fc56ae79813cfa2858854050f1212fc6854274110596a938d194e7ce65 SHA512 1f289aeec9ce3a6a736dfc0c0c2a39f053c407462efb3889a2deef751531aefd5974f8819ddc0a892572d18f53eeb23f62f7017cf479937f8faa7e01710342b8
 MISC metadata.xml 326 BLAKE2B 7815b2e4462f847a84c902df0c20b993c2a1cdd77006da029616096587e07003b2bba50499144d211c8ad0880eef53f0a3a9ce23af69f6320c427d6352958384 SHA512 a5d7a15b6084aebe038f38dc8003040c42434d415ebdb33b225e2772047950d35b2328dba5a7194533608b74ec47ca6a1bfccb56540f3a67308b499b04774207
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
index 328252c5ac32..cda8c0fb3658 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 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 ~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 ~x86-solaris"
 
 DOCS=(
 	AUTHORS NEWS README THANKS TODO ChangeLog
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index a3d59dc6c757..c66cd2b6e6a0 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,5 +1,5 @@
 DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8b499b226fb02d4f38833747e5e709054473267a1e139e1bef29222220e7f60cf2f472ac58ca67b52dca2c5661 SHA512 b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5
 DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
 EBUILD libowfat-0.31-r1.ebuild 994 BLAKE2B e93ab5d7746de5c071b55a8dee7d2415f64f623aa98c543cdebc0a6007dff1b6eb362197f5143e7ec2f0ff97ff07e46d6298afe255af0a9ad2d2e5db1d626ab0 SHA512 070b2af23d5f88a2295c34674f86af39c68ca88480ca5882f79bc4c9a4b75f3a6f7a99ddc4deb85e4d3d20f8ae7dd04c336aced617eee63417f128378b1d05fc
-EBUILD libowfat-0.32-r1.ebuild 1056 BLAKE2B f8dd579ba5ee32da9c40b5ab144632858c82f6d19c93d3e407357bc04074214f7e7d5fc52bf9cfba2adea8cfe131e106445411166c30a1e944df311a6a83665d SHA512 ec93260fb04e37047d4a02aa74a02c02ab657fc98c6008e66f7a21e6a02b3543cbb20d22b075dd4a88d1a7d15862751174ec2f5a50ce2eadcf97af1b0ba06cb5
+EBUILD libowfat-0.32-r1.ebuild 1055 BLAKE2B 9cb834bb413232dc3a96ba6c03d75193b06b50bdafc6d1407819722ab694ed4a31fdb64686ab514c1b4cf9dfe7aaeaf71f4e55dae8901ee900f8f96cd8b3da22 SHA512 1282bf87ebd5cd46c15e435a4d4482b7e3b374b815786402d8e07b0dfb59ede787e6af01040006a1612297431ef3bcbf73e4bc1734cbc7003665252f8fef5af2
 MISC metadata.xml 430 BLAKE2B 16b95e09cd79b1b22a0b391fbd70b3ef51b08dd5d92449613f21e8e1ac85f16fdb5e0bde3a298aa7b2c740439c909836a3a71dc55022a1322746f2078522ed78 SHA512 83ef95906f9aa9e0a88eb9241dd1245cd6628a24acc06fc99d97028ef9d82e4369fbed5643d88d51ae514dedf70dde032443a1523d335ea0fb1f96cdd9149a79
diff --git a/dev-libs/libowfat/libowfat-0.32-r1.ebuild b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
index 875540792621..622656e3a5f3 100644
--- a/dev-libs/libowfat/libowfat-0.32-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.fefe.de/libowfat/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa sparc x86"
+KEYWORDS="amd64 hppa sparc x86"
 IUSE="diet"
 
 RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 3756c431268a..f85a4d892c3a 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -2,7 +2,7 @@ DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676af
 DIST libp11-0.4.4.tar.gz 450709 BLAKE2B 4424c8dd8ee1f581c179c36b47bc03269f1c6b38bed2517a1209c8eaf2d8c2ab62da928b4cd20f1355b56dfbecbd2bd695118f7690c3eba2f5c188c6c4b5b169 SHA512 12d1e39981e62d758dc12a39c2ed5b6967a6e8c1db706c491db2c9aa0394fac278fa47dd4c64aa961e3b5ea98c1799b4ef7ef617ac076a414d88a6e29d5f0c4b
 DIST libp11-0.4.7.tar.gz 475538 BLAKE2B 81d36f0795cae00a20be935790441b46257728cc5b1d9eb16d6c5df2609a795a68e12d0dc6b34b0348107fbd8c136d27dbadc42e0bc8970d5e491529e1903091 SHA512 8142b32bee9e6763b506b93be788a4df2b28ae8cb3ad6e11fc53ba3db770d77bdcc0362661c2f906cab1b5afc2828019f3d0f0b9d898414c0d6266201b7e08e6
 DIST libp11-0.4.9.tar.gz 492083 BLAKE2B df84d9303e6e143fbfeaaf2e8d0b57f3c4cd63356b15d629ab210196611ab42e396cf7efa69392ac81dd9fd591aea5580e0b38f545bf9bad9ec4748d08da90d2 SHA512 0c4a76ee7a5d98ec144dac1de8d4f52ad2515e6c578b3ee9705ef861bc06a27477b6ec42cf1d96944844f006992aef449b579b430b2e32d367f29d1a0d82f8ee
-EBUILD libp11-0.4.10.ebuild 781 BLAKE2B 6985770648eba34bf70e4eedd489dcf97992c68fc9918ede4991d8ca35dbcd96ce4243b3b7d90c7188481d4981f84c1b68483e67332bde64024f766a0ddb2702 SHA512 cb99ab0be8cbef9dd8b70c561adf72eae3c4d549a6fe090e6c8af34c65230eb7dd0a8eb505e4f316181fd480baef378d9abaaad2183e3cf99ea97869456aa819
+EBUILD libp11-0.4.10.ebuild 780 BLAKE2B 81d859abc6f65ca3a0a388ced3f91b37505b97d33e2a5f18e088dff0d4e74851aea55beb1ed427fda9b04648d13edfeb3762667c041f3a8ac92af5bfcc33dd21 SHA512 ad72e746e165f1261f0c0ea4a080d5d5b0c2d53c687461156ca691cbdf5cbda6b0c7c0d953975063128a734f87a6cdacdd4ad352876c547357806b7d4698c50f
 EBUILD libp11-0.4.4.ebuild 782 BLAKE2B e2ea80c9b0a6c514806ecf69da143c3bc0f981cbff1aca891c7ca9ce1a4e36314b26a23166e8a6b0af141fb288244dae23c4e610687af39301403afc6b51f12e SHA512 6dd12ffe649c25f7320f1d5809d7b792fd3efd46725306193ed5fe92b246441e54e662fd9a2ac657c16977dffb146947f4a8a15fab2e1934711a7088ab310604
 EBUILD libp11-0.4.7.ebuild 786 BLAKE2B f44f40db44fd3455989171a60014fca0128b43741123a57c7d7418d626c716431e992809e175f6b8f6e71c2686b214991c5d6f7c793568915a4725418521f3d2 SHA512 9a934922c8731336e4b950ad9543b07e90b303d164bef57d4ff41dc99a2933e008613113a8f302d1e0a1324bc3e0d7a01590208a45428816b7a8bbfc023f92e0
 EBUILD libp11-0.4.9.ebuild 775 BLAKE2B 8605353f5a55c1e0ee467ec751bfcf5307c963f735095a9630201f230308dba02bc10837812f01d6735a912a8b7114987a452ac7980574d0985bfa4e24f6d24b SHA512 0b53c57f47b1f29d239f54f870b98fd010556b41a26d6f6213980dc3d606b5b7156eee3cf89685b361d546fbeb16fa67ec9f9af8db6886af310e7727bc31e802
diff --git a/dev-libs/libp11/libp11-0.4.10.ebuild b/dev-libs/libp11/libp11-0.4.10.ebuild
index 1dbbb76d9c31..7df1bf7032dc 100644
--- a/dev-libs/libp11/libp11-0.4.10.ebuild
+++ b/dev-libs/libp11/libp11-0.4.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="libressl bindist doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index c3dc9b969e05..1d01e3711e82 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,5 @@
 DIST libqtxdg-3.2.0.tar.xz 67736 BLAKE2B addc2636a9bbaa0163c3d344337eca9f350ffb38f4d0e785ade9775fc7d3e38c6f7a3c6c8d8d05e7b491f0cf2c34f5ceb8d51d34eb05b56e4170e190a5b5ae4c SHA512 1a52e79e97cd148c9f406402134d6feaa6ccb8d10cfa7c0e2a3fbf728690e193c05e444012b87e38790ce0570d1cf71c6c2cee7105f11d43923040543e0dd143
 DIST libqtxdg-3.3.1.tar.xz 66004 BLAKE2B a676f22144ddbf67e02686fc25b381a911e5d0391e2f735c6d85914362433aad20ad0a3740ea7101d26b5b5692d0504c3798489333b1bf9585c3be88f6636beb SHA512 f0fdb95f20ee49becf770455a513178bb3ce63ee460e8bbaac8d40f50ae47a139ff518021c8fc19254bbd777b67bc7f2754302de7e2bb6cdf929bc559a1b51f3
 EBUILD libqtxdg-3.2.0.ebuild 898 BLAKE2B c53adcda19dc7700d4023a8edf956b86b78b6c61dd3afb8fe42028e9da196f9c9d68c7d1278d357edef9a4b2c52d1b2b9f88a77a86c04192ac661a68e773aceb SHA512 6d80157a0164728ccdbdd129426c35aa91b24796eb7657475cbaf0659c048378f9e4bb37f1c519c120a98f9ae19840d1ab470d15f8785b061463f7658e3a0aeb
-EBUILD libqtxdg-3.3.1.ebuild 947 BLAKE2B c12194fbb6571c708241887052f19f88e4ea6d3359734ba938c157b26c8c873b1d33a09b682b98c0b2e7e9295cc315c36245ab153c0bd1bfef6f908bb9f91eac SHA512 5f31b7105b3b124a3eb7bfcbaad307be0d23c09f06ed00ffa1fccc4d04c30a6b6a31191c810c331357018ed69c305676eaa2d660b370d1a85604a60236f55830
+EBUILD libqtxdg-3.3.1.ebuild 945 BLAKE2B 6d2d8add873c6a95d6492c4b930ae23116a24ce0bf0875fbd5c026389556edf50a6953edfffb89a8b9a915f26abb6a0d8853a59df1b365597c0f1595737c76e7 SHA512 a7ec712996a2cd6eb195845bba8cf27cd6c8ede78fee0f0aa15dd97064b4e5abbc62a90f147d72b1ba81148e2ea03bfa3c0bf925cb4f86df0b68aaf452b1ce05
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
index f01b33214f82..91b64f8020e3 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index b39e18306b12..21f5ddffb555 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -2,7 +2,9 @@ AUX librdkafka-1.0.0-remove-automagic-on-zstd.patch 967 BLAKE2B 1df3c82dab189ab7
 DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
 DIST librdkafka-0.11.6.tar.gz 1994337 BLAKE2B 7b61e6ba02c5ed58c20e604d6765f6a57ff63ab0c61f2a4c64eff55bfb6c854ef089ac9eea9acc6d44b6abdb6d1425ff23e9d4e6037c733bc5719d6b69c74ae0 SHA512 9657dc53220bbff3eb44941cff2f50ab7f71a82f7486d64ea14f67eabd4abe8c67f225a752cc1f0339439a1cc512e99ade6536d087857979cd198c0102015718
 DIST librdkafka-1.0.0.tar.gz 2465603 BLAKE2B 7006dc421ae5c2c991853f4ede9d99e7dd308b49372a7c2c859ecc0e6ee7aa3b6cda9af7a71a5813610630b564bd65c6cf18ecaefd1a1880545838d7758aea88 SHA512 15ac1e4c9042debf8d4df602ccdc5eccae3a37b305be24d724fcaffc3d1d0aafa708fc8e29d6af51f51ed6c7daf74b3041b8b9b0444e6702cd73479c8078859a
+DIST librdkafka-1.0.1.tar.gz 2466259 BLAKE2B a391d57b21711853ce7df338070512f715f3a49ead2b4f7eb1fe5500699c1891821e6bbd4b87d3debea6852eb85094aba161cb3ca95aee3c592a38be4933ecff SHA512 094599e974236814c03e688eaa5e39d817cca110ff691501826268c45653fcd6b21b60e741140a1f7ffccd49902247f08fcec82475be2e9f85feaa4340b32d4c
 EBUILD librdkafka-0.11.5.ebuild 1249 BLAKE2B e10b7391be22a1b2fa32af02872ffa2e813ae0a387e7a31005900b63c9d2d3ada9cd47ca2e7a155f6178267b3a2b258f7eb9f8c7a2470be8ad61256d7d207a38 SHA512 41f0086bfe66d0a12f2ab448d842119bb3afe4e3008662b0fb0ca5bc99ef36fe81c4c4d0c8de46ff4eeb6594cd4253ef5f0895beb45235f99b195d3b13476953
 EBUILD librdkafka-0.11.6.ebuild 1249 BLAKE2B 038b73de2adf38cf66b95a470c1bf4e82b4d30c50410ba8ddbad3d59cb6ec323dd28da6c9deaa162049cb26c4d38f1456459fb309f01ee7d2b7f7d826825ca99 SHA512 e3d82210e7d6caee61bece6eadf2098144bb7dc7f1fe3c19e6e0ef154e0f36acc2b60017d8fc044f3a63ab7c83a7e1f5c8c732c39817904d31fec3b47d1f20cb
 EBUILD librdkafka-1.0.0-r1.ebuild 1369 BLAKE2B 0217f4996dd3904f871ccd0fbb300f681c1f2cdb9c4d08bcfb494ea99b15828c35712cd635c371daa776ec8f8dfa07dd70f4f678827393e9c45d3731e321ed70 SHA512 af7fd02a7f5c56b903c57f2f986a417ed9b31c956afb201b2c0523a452c1fced34359722e88d34e06203c1941101c0fdf56c4768397cd37432edfb309a13ba8b
+EBUILD librdkafka-1.0.1.ebuild 1376 BLAKE2B 6042b6b5ff4be42cca0a4a2703e66474b169bd2098eb9f98b29db001f6c5caf478bfc7f2996b42fc13efb56af7efdf7c0e797ee8ea8b1d28a0ca9d988821a705 SHA512 22ab80e0f1fca1b2dae08fc2dd3fc6fb9f9a2bbb8bd3b3fc02f82f86a027ca4aa820cd5e823eee8cdc2945a5eb122043b99b98073c258b9f94228311421485b2
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.0.1.ebuild b/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
new file mode 100644
index 000000000000..7ffc8964e5ea
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+RDEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(-)?] )
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? ( dev-libs/openssl:0= )
+	zstd? ( app-arch/zstd:= )
+	sys-libs/zlib
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-remove-automagic-on-zstd.patch )
+
+src_configure() {
+	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+		$(use_enable zstd)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	local DOCS=(
+		README.md
+		CONFIGURATION.md
+		INTRODUCTION.md
+	)
+
+	default
+
+	if ! use static-libs; then
+		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index ed8a15d4d5e6..78d3bcbac2e7 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,9 +1,12 @@
 AUX libressl-2.6.4-hppa-asm.patch 2236 BLAKE2B 508555aa87f763c7cc39cf1cbd2ae5692d7c33315b08e4527db61a878cb5373e6856669e8185b7c49ab82e3f7c01034c1496c639d3a46d605c39170f3f1ce32d SHA512 b49da63109f4b0d471402c07df927b1aba60f94e263376919206fac9a4dddb9a10c4c0004836b2c00a560eb59dcde71bd6b4aba45d966a3e0b2fba79f7277a3e
 AUX libressl-2.8.3-solaris10.patch 1928 BLAKE2B e12372c1fba9c586e5d8c4ccd7af0c3d888dd42f4456e28091424f8c1f0ec0362f9558957752a30fabb7b06e35929cad8fd582deea58d48da4759ee0aec12b08 SHA512 39ab3dea9af735f2485108aa88e7d951563ffbdeb8a002eb76560617583df58c84d5af83a1e51d0a6f71e9709d1f1f83265b030740f6024e5d45aaf0d98290b5
+AUX libressl-2.9.2-non-glibc.patch 981 BLAKE2B c9d208dac68fbe7205617ca667d111d00ab9d2324ba0c91c36f05efba9372a97ca76d844144d886814798e5be29c8e6a1bc0ac0341ee420660282d6d5267970f SHA512 5672b69a6c4ad68eb02e7e2b43dca6b2c557e0b74c29fcd249f46e65b284c740d9979e43fb36a7784ad41e7bbfee79ce18242990e62ecdb80d1a44cf1540dc8c
 DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d
 DIST libressl-2.8.3.tar.gz 3366196 BLAKE2B e32c097b31998d68a31266fbbf3624d5ab8ca716f8c53e423bcf09b3a8ab3542c92a99e259ded7b86f99b45cc199cd44791520a609f18c35d150365de5768eec SHA512 3967e08b3dc2277bf77057ea1f11148df7f96a2203cd21cf841902f2a1ec11320384a001d01fa58154d35612f7981bf89d5b1a60a2387713d5657677f76cc682
 DIST libressl-2.9.1.tar.gz 3607116 BLAKE2B a4542d7fc97bfd213162fe908e28b27d52329e2b6a5d77e0cb67d1a6732c500ca772d0c5735c9fcd036c477e6ede330305b4675bfcff9f72fd7886a781f30015 SHA512 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354
+DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f094a7e5dfac85878191070e2c196753162532efb921fab582481aeda3705fca9a2b48921cba82465192f2c1eef95 SHA512 b43e73e47c1f14da3c702ab42f29f1d67645a4fa425441337bd6c125b481ef78a40fd13e6b34dadb2af337e1c0c190cfb616186d4db9c9a743a37e594b9b8033
 EBUILD libressl-2.6.5.ebuild 1450 BLAKE2B 193d943fb6ceec65937ff2d47d2f1b677b7e643962c277f045371e9029af3ea7f0aecac2498b0bf74f1c4d7fd0160846ae3ab757bdbe24361f3304faa6f740b4 SHA512 42d2263c867c290d42c08379778b13f36eab1e185d8dff69d8970e09766596bc162d494d2ba3ff9491d2cbe781ccced9e1e4813eade213a9d94ddd22e7e3cfa2
 EBUILD libressl-2.8.3.ebuild 1545 BLAKE2B dc63614ba49a5d077e4be5fbc830fb3a20e7a34b403560f0b803c3eb7c761610eff701b1e79ee0a495eba310726518638951f66ac5f890f1b881ef5edc9a0d5e SHA512 d342dd4eca89a4db529c823161d49ec9292d7d8d98cfa5a10f18e88b1ebc4ecd4cf935269bbc3ad9a5d44a4cdad40929ea5e31830cb40a516def5de71dd51ee6
 EBUILD libressl-2.9.1.ebuild 1679 BLAKE2B 62ac39e1a95e996b33a84551619b4f642c733f8ce4708dd1a4620dd9ef047303c99fe6d9539b87b88bc18ee0932f6724c389eff27b61d6026328ec1f9f8d813f SHA512 cfc4b9b8fdd259d65905035190f29efb273b6e3a6317619d4d7e86413cca8259fe87fd16c1ed7f4e98e0f7438376fb82a1b912a7672aaffca79765a5eda37d42
+EBUILD libressl-2.9.2.ebuild 1720 BLAKE2B 2197ad603e93db34acfecdd0e3bbb649ab8da4f6c0ea6805cc4b1bf9f90d3760117ae9bef2057353501df889b7e176eee7db9dc62aa2ea703a1b383de1865eeb SHA512 ef2cf1984782adf4eb17bb67a0c103b17e9fb6d8d40a21665dd594c68460d8ddea9842e52d5e8ebb1d92e6d3753c94ef2ee1e138929632bd450392f11694237c
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/files/libressl-2.9.2-non-glibc.patch b/dev-libs/libressl/files/libressl-2.9.2-non-glibc.patch
new file mode 100644
index 000000000000..b00316d88141
--- /dev/null
+++ b/dev-libs/libressl/files/libressl-2.9.2-non-glibc.patch
@@ -0,0 +1,32 @@
+From a9f0b2143c3154da34b8798127263f6f11f61bd5 Mon Sep 17 00:00:00 2001
+From: Ishimoto Shinobu <47295761+protonesso@users.noreply.github.com>
+Date: Tue, 21 May 2019 22:41:05 +0900
+Subject: [PATCH] avoid glibc
+
+cause problems on musl systems
+
+Upstream-Status: Backport
+[https://github.com/libressl-portable/portable/pull/529]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ crypto/compat/getprogname_linux.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/crypto/compat/getprogname_linux.c b/crypto/compat/getprogname_linux.c
+index 2c89743..4e7e31f 100644
+--- a/crypto/compat/getprogname_linux.c
++++ b/crypto/compat/getprogname_linux.c
+@@ -26,9 +26,7 @@ getprogname(void)
+ #if defined(__ANDROID_API__) && __ANDROID_API__ < 21
+ 	extern const char *__progname;
+ 	return __progname;
+-#elif defined(__GLIBC__)
+-	return program_invocation_short_name;
+ #else
+-#error "Cannot emulate getprogname"
++	return program_invocation_short_name;
+ #endif
+ }
+-- 
+2.21.0
+
diff --git a/dev-libs/libressl/libressl-2.9.2.ebuild b/dev-libs/libressl/libressl-2.9.2.ebuild
new file mode 100644
index 000000000000..7271086d9ba7
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.9.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/47"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply "${FILESDIR}"/${P}-non-glibc.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 75f8542a8c95..f7e3c78f24c4 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,6 @@
 DIST libsass-3.5.5.tar.gz 327298 BLAKE2B 4127722343394bca4ed054987eed6113788e10dc4d03a869778c10b56135406c1fcd72dc101bfe405c96267b628735e8ee74d3812ab392f097dc941b78bef882 SHA512 dcb73a5080c00023b60a19ea037ba5af481253a7b47492bd7114bf45ab78ed931c7b207fa8f12ed200a39760553d72ae92dbe4eb80b826b59a6201fb34008fe5
 DIST libsass-3.6.0.tar.gz 332747 BLAKE2B be4ad469aa55f89ce54e6cf1cc5cf0a72f4727610bf2d5aeca7321fde4e4cbc009f59bee46c1e5e5b88825d5bd2f3b4fa427ab3cd535584956f7541c16339f1d SHA512 9665e50ee964ca3cc323f26c2b8322677102d26a7a102558ffbc5bef7a4c4ea44ca5096a967e4044dac1404bfa343a37d846f22d1e1adc27592023d5d4ac40c8
-EBUILD libsass-3.5.5.ebuild 1122 BLAKE2B 85c70cd6516cb1509ee83d391550d29b8f593ae84cc78636dc7acde24207f0d3056685f9e5b0f2fd3fb16dcbe178893133e4b65422e27ba617e41925ca1945f1 SHA512 f8438c8e839bd133d80b4bf9a7f294a6d167fb6da3e2cdcbe9d6e34e37c3151527cb801cf4a891b9dc6a18e97df4dc9651acff43fe4f1adc99976ad5f3415ab6
+EBUILD libsass-3.5.5.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
 EBUILD libsass-3.6.0.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 EBUILD libsass-9999.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 MISC metadata.xml 635 BLAKE2B 88705faeb11d0f69615b94933da84ce8784e73c5dcf36bb248fd1e3796a17da347d005c8c95a9f4cc0b591d208718e347384531cad60bb3d9ead910456eff621 SHA512 794b10c517680dc0b460208eea733891cb7bc8b65875f5617d086f86eb8b08e436c441c2ad00dba80bb643090182a42a77484b5934eb1df2e36f2119a1c5fbdf
diff --git a/dev-libs/libsass/libsass-3.5.5.ebuild b/dev-libs/libsass/libsass-3.5.5.ebuild
index 675522074df5..1ece89467a74 100644
--- a/dev-libs/libsass/libsass-3.5.5.ebuild
+++ b/dev-libs/libsass/libsass-3.5.5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libslz/Manifest b/dev-libs/libslz/Manifest
index 239e30034b9e..f8b0c6d04ce7 100644
--- a/dev-libs/libslz/Manifest
+++ b/dev-libs/libslz/Manifest
@@ -1,3 +1,3 @@
 DIST libslz-1.1.0.tar.bz2 229577 BLAKE2B d05b619d0b7b76c2777285ecaf976b75565b50c77e00a1ce042f5a28ab8d527788a75d28d70357a32ea9a98267ae621d5a6e4613e4a7e4f52767e68c77765bb3 SHA512 064e2e8e7091adf863653981e5b677bdb9e64901f61cf3b68f098cf7957a4c32e19cec7d41b8dab61098017119d6ea562350c7fbfa10b5e922f52ac0d6066948
-EBUILD libslz-1.1.0.ebuild 1167 BLAKE2B 1fbad459b2d8205f2f3001e75201860472685366b5e04df4be95176caaf63492e76cc81e501aae3d745e4e7fd1b8f2be6dde48cf4bb186f414b5d8611a599bdf SHA512 8f0252966bc7705e8eefc38638c7fbb8b635517a6cccffd555561c338b4fb99da2c0d885ba3555ec01ce0ddf555bd71d284f51303cd81c80edfff0353402876f
+EBUILD libslz-1.1.0.ebuild 1171 BLAKE2B 198e5fca5067778136ff7a2b50b990879186b073095906e4ac134922386780822f5d6a6d52b8f9122f3a793944c19ce560ac77c24b429f50be1f28607b7d89fb SHA512 4d2e6f3c7b54edd926e9bbe275e999314fb3e7ab577abad77126ae88fbf477b6c2d98a0282d00cdc435228271cd8928eece3cb56a069fccd3d7fd69636a9feb4
 MISC metadata.xml 1176 BLAKE2B 912f2785a4418e9dda2014a1c7d9d8a47be8d38ceda9b56c45b5ac9ad05f5b0aa0793891d8436823ee1bb3a14f7f1239b15daa4ba1ee6dcf35c42a95e1b910bb SHA512 fd49087a1691173da56b6669a410d0db911b999fce1fba2536832ff13a8b4c7a304410fa5ba0f87b7587bdffab216b620ca5b8549936cbf21375139a402b771d
diff --git a/dev-libs/libslz/libslz-1.1.0.ebuild b/dev-libs/libslz/libslz-1.1.0.ebuild
index bf812e97c808..dfda44e0c7f4 100644
--- a/dev-libs/libslz/libslz-1.1.0.ebuild
+++ b/dev-libs/libslz/libslz-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://git.1wt.eu/web?p=${PN}.git;a=snapshot;h=v${PV};sf=tbz2 -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="amd64 arm ppc x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="static-libs tools"
 
 DEPEND=""
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index b56ba35158d4..96e90d6219c7 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,8 +1,10 @@
 DIST libuv-1.20.0.tar.gz 1180231 BLAKE2B 8ba258477c685acc1ed5486211b65719419757f6dec5dda863d622d4190552a2f5968f3b05519ec5574a5963cce99a9b92c224b511e0f9e70aa099d47f4fb4ca SHA512 382309cb6e54765b956b03357cb754f49d93505ba0e0122a77f33efca07d7b87966c993a5fd9f9503edd1bcd0f49ca42bd9cd9264cce94c847aebca77d237ba0
 DIST libuv-1.28.0.tar.gz 1218769 BLAKE2B 444881479688144b36559a258f998e99e663d856c349086f74a21c3946f8d48d0fd9ed0a7c64c76c18b47edd3df037936fd87c4d47e9ae7c5639bb6e289e026d SHA512 5f49b980b69011897bbb7a00d779fe0e71528d106626bc13fc130cd09afb7c8188007f354cd6320b1eba67f77c938ae3e83f3bd4a3ef5b9ea65a3adf51f66a53
 DIST libuv-1.29.0.tar.gz 1223722 BLAKE2B e4e7e3e3c0668a573a29bd90b0bd63954fe0c03a195c420df5d7997fd79475f997117d09bf81aec5b58a57482aa8b3ad50cd7892249697e256340b36a720fd6b SHA512 19f1f25ffdb287a755f773488e3da5fd5b5b43c333e3dfb019bbac430ccd77456da96dbf60c38b97c87880f90f08438366e29bbcc8d81a28f777f39fca8af529
+DIST libuv-1.29.1.tar.gz 1224127 BLAKE2B f116b0e0df9c2b65bafb8ebe0259ac1e1702232e751e015dbffa9be403f39727d255a7abc560b219279caff1bfab9528f38e32dbd2cf42dc0274dbaa57727861 SHA512 7e1ed1bc500bfaab44858b3ff4685ec3d2abce412718ad144d642f7526f6dbcba643ea9a623bb129d545599570be64ed9a498d85485c1716c4c365bb7ab61898
 EBUILD libuv-1.20.0.ebuild 1167 BLAKE2B 822424c522ba27df7624d2b3e1fabb522e15865b8eb8a56127f6565da3d1ae55f519d47ddfe7cb7cecf406626487fba48d77a164a67e9d48be613cc2e36bf93e SHA512 3eb698ab1c3e9d31a90f79293a9484cf7a27e7a7945577bb241b74e6390bc4efee13e43b28de51c38c5fe3b921ca886f0ea8d26c752ea5f0437f5a4d0ab7bfd4
-EBUILD libuv-1.28.0.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
+EBUILD libuv-1.28.0.ebuild 1217 BLAKE2B 32d99f6d79e589f0b068d8fab8c9cba584a26e002d7c047308ef02478838a84fdd57192d16ee3be61aca6fec1390afa8f018ce5a84983e91f2f73b29f5c2923b SHA512 410b9743d1e98c1a16a31a2c737d8944158dcb846a9a33001747bf67a7fd72af5ccad1fe1c477b4681ba1468d03bd98b42e4445245f1db1a56a6b52e2692edf4
 EBUILD libuv-1.29.0.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
+EBUILD libuv-1.29.1.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
 EBUILD libuv-9999.ebuild 997 BLAKE2B 1d82e7c3acd3715c580dda78f0aa6db97f217cdcd1dd58ac04963e43dd077cd62c798e2d676a098c69471bed2b4d035a63da335abe427762097de1bfe947e624 SHA512 d1ad9a68ce54465945cb795d28312eae4615e839889f8a7dadfa6ab54e580925c15781d00fadc99edc8d3dc5b54d18351df17b1de096fe97ab06bdae21fd9870
 MISC metadata.xml 1337 BLAKE2B d054e429ce7e3a6b94910693123645ab6dbfefcb8921b37b57ae156aeb5a25a4b100b45fe6714c498a355015dc3cc37c98852a14be651bd3f55259b8ab78e2dd SHA512 dba39812f31549539955d26ab8e281b4a1a372b8b41f29e68f0ae63bc10d18df5eef106936b31a13344cc11705192bafd4b32a0aca1f16e7927244ad049278ca
diff --git a/dev-libs/libuv/libuv-1.28.0.ebuild b/dev-libs/libuv/libuv-1.28.0.ebuild
index 6fe68c68f88e..fe2b4e41346e 100644
--- a/dev-libs/libuv/libuv-1.28.0.ebuild
+++ b/dev-libs/libuv/libuv-1.28.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-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"
+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"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libuv/libuv-1.29.1.ebuild b/dev-libs/libuv/libuv-1.29.1.ebuild
new file mode 100644
index 000000000000..6fe68c68f88e
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.29.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+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"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 75860c47d226..b2b0a4ef445b 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -6,6 +6,6 @@ DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f5
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 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.9-r1.ebuild 6791 BLAKE2B 8442f05e04f430a6f779b968d0b04fff41a550ccd29e0819f18d88388f205176f2bd8cb7eed80ddb3cc5642d8115da58e3b97713742a11aa1d721e37b54061d4 SHA512 5ddc1ac7bdf54ba9d518d0bf69f25e1ab87371550027596556dcb5a0b5ee7cdc010b147466aebeb15a4f09817d86e1b79eae9e9b12dba6cf83156d1f3a85e985
+EBUILD libxml2-2.9.9-r1.ebuild 6790 BLAKE2B b857c2d6c9d29714d7172a6f18ecfd527c8126dfb867f8de1c00f0b218ae3efdacb850ccc4613263dc60a5a1a431b843225a604ec322d2a7cf4786f9d30dca95 SHA512 fe7ea18196ea969722ba2c9730f101f725ebbb13217878db5f519c898fd9336bebac11cb5b0d31dce04cd49db9aef47364a279b24b9d7418a5875475cdea710c
 EBUILD libxml2-2.9.9.ebuild 6531 BLAKE2B b4b9d5c06f04316bb31aca3aeb1f60a9c0ae045ecc9e04d863c517120c4dbdd580c5bb7d88e85f16cb63b0f8a8d0751c5d9df42bf8fafe6a3af185292149a11a SHA512 63e8a73380c3a1798af17075f9e5ff5821b53b4d3e782dbf51dcca6d604ef8315b3fc3b5f6d3bffbb0336d4418e47e5f4c220d4798cf20042dde8cd766924f7a
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
index c69d53bbd17b..e61c1fbe63f8 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r1.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 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug 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 12cad11f2dbe..a5b19aec153c 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -4,5 +4,5 @@ DIST libxslt-1.1.32.tar.gz 3440715 BLAKE2B 8d5dead5788d8d09ab121d6e33397ee8ed883
 DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948
 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
 EBUILD libxslt-1.1.32.ebuild 3275 BLAKE2B 8c62899c0f9744559d7aac7be6f73ae599303b848699eb89f9276ab8e72a038024773a5754c5ba08f223ceab334a5a22c91137343b0c89a5b3bebd56d59739c6 SHA512 7fc90253308d84200aac763dce0e4fea507c0d43ab36b07d55bd40bcbf4a2365c496977ff963200b68966b892646b05680138c1e94e790def07f3fb5d4f4ac95
-EBUILD libxslt-1.1.33-r1.ebuild 3477 BLAKE2B e2da111cc7fa50aeef897aee961095b2aeb87c30cee5e246f63c46f290b07e0c2bc9c9a8da56cfbae92333a58ec73aab12267b0c0de0d574bb5e79ccc6f829de SHA512 1edc25d0c9305f0829fcec04b3b08eb77297151433f36d38999f90794c34a16e6dfd73c856fda85ec88533ebd30c72e2d623a093f1104d53a5c0e20015464133
+EBUILD libxslt-1.1.33-r1.ebuild 3473 BLAKE2B 704ddda02fd3eb1338b18c529acc3ac41518948e206c113659dc64a5f6df020d35cbae4355d2a734b095697965855ed780715ab7daca94a4768442e24c6f7bb5 SHA512 20cd0332110acd01a34e0499dfd0cecf001077347417183be0c0319b7518ea39c6c99b7972d4bffabaeeef7f8865e46f5bb78cbfa83d35d06db5cd5f037ea69f
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
index 16a917a37f50..8d3e53d37f01 100644
--- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
@@ -14,7 +14,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 ~riscv ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~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="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index a004bc5ad6fd..833615f7bfee 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -3,6 +3,6 @@ AUX libzip-1.5.1-options.patch 1297 BLAKE2B d2394b095b59d484269bc29cbbb311c5c585
 AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc910522e38dd05546c995d90d5377cd0419666e4b724448cf6d38110faa640191d98b06bbe08610ae947340658f0a SHA512 e8af90b4559df0a6b2c8d0d1b7797833d0f59c4827082cd5dd8459d57ac1557249030510dcdad5f31a84a99cd79e30bb7b9293b1f19303be750faa40be2892cc
 DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
-EBUILD libzip-1.5.1.ebuild 1902 BLAKE2B b877e4b304f3047f326a9c6d316412615fc7cc10827bf4bc4d9dbf3888e52f3b1ad13f97cf25d1ec7b1067530be1a9e9957870c4aac7aab62c40ee58e396550e SHA512 db79cb9cd92e33bb7500a7cb336018babf86726af2b8ece56da12e75f129eafba021f24de7486ec9cdcffa5d910b6f8650200151188344864b6311aa7e23083b
+EBUILD libzip-1.5.1.ebuild 1901 BLAKE2B f668410b13077d0cc6e36e2b539070fb1172424623082053c71fd0ffc1533545c3aa5abe50030e6b62c0cd7690332eac3198807a94e41eeb9af709ca79166578 SHA512 00692e68879b5c76936f632f32c5ccf2759f8022bf13802bad8c6c3931a2d984ae5b976115f2b11f65fd0bf732b02083dea6c91dc7c69483d16e8fab3879dc3d
 EBUILD libzip-1.5.2-r1.ebuild 2287 BLAKE2B cd489ff9474e34b75a1df7ec33757bdaa4d7fb9af8fcf05478457cae249c7a50488274b88504145548d78dcbba787f49b1dd399be85a29bf6d6fbd6df1eea8fd SHA512 7e5b7aea06ecd54984bf54f79ebefc5e03d210580395f1acad093c87fcfc859a746a4757e1f21b2553902cf1945498b60d6cadbc549f48faba796a79ab14ffb2
 MISC metadata.xml 440 BLAKE2B a69b3d641d9262e897f015c91fc0a4aa7a7cecc73889d24b479101674f2de16825844c9ad6c10e42968a22279bdfef71b839f50289aab5457efb0164ae5fd1c3 SHA512 737e1fb7de749b2e38f5642dff624daf6521183fa974f9cc2831580aaa1b8532fdf8725ca3166bde8ef8faa492b8a2298f542fb8bd15d89b1ab983885756282d
diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild
index c58ae4a73832..95c3608bf77c 100644
--- a/dev-libs/libzip/libzip-1.5.1.ebuild
+++ b/dev-libs/libzip/libzip-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 doc gnutls libressl ssl static-libs test"
 
 DEPEND="
diff --git a/dev-libs/log4shib/Manifest b/dev-libs/log4shib/Manifest
index d33b29061c78..ce8d067bf832 100644
--- a/dev-libs/log4shib/Manifest
+++ b/dev-libs/log4shib/Manifest
@@ -1,3 +1,4 @@
 DIST log4shib-1.0.4.tar.gz 487529 BLAKE2B 8ba4dd17e2f35c6566ba4736b5450c41fab1c5506ab6e994136b97ccab4d399281afb32fcf13935c25acd7ba063d2ed6595bab564614ffbb0d944074b68a5bba SHA512 af31bb436393e1a6a2674c0f4804148dea4f4081bb07b78f158f4109157bef4ed40647a3e4da7ec5eef0ed38b6286aee6d8b8a3320572c2b55df2998850d5245
-EBUILD log4shib-1.0.4.ebuild 699 BLAKE2B f35f4578fdf625bd2d743ffe732c09a6f22e0f9bb8660d08bd6183a86dd7fa3655de908fc395409604b787038b25c1dd08d1d85e3059aa888807a7a83e0e1f47 SHA512 7b4a9b2a52c72161c281f9b78b4ccca40f9919af31aa2c9429d3ff861affd2dcab690e2181e2d74c7a8c35bfadd973dce237c5c9a5cf86499293b3854ddb9745
+EBUILD log4shib-1.0.4-r1.ebuild 581 BLAKE2B 51b45b8a80d953e3448bcbac424fd12b272f1e6bb39d1d9110b4ead6f6d1cc3db5b2661e6109f5f312a21e6808b522a7324bb2e667129e2d0d1d2b4787e58277 SHA512 faf1af7b515951198162af69c5aa5c12c908033f313f093416e4346f4a8f6e278aa6592291c9035c8145adc49e100bfe962e8d087a540fd6af65eeb279957e4a
+EBUILD log4shib-1.0.4.ebuild 687 BLAKE2B c8c8f8627b01f80b257234b9704b7020991d9306baeeb18f684700ae44ae1eb947fb4ebc2fdda3438401a2481f2cfabefb538cfd3ad5f57b0311b9b1479cdf89 SHA512 66e2918cfdda48f56c551429cf9c656fd34575d1e405ae99c533f000038b5d0a030ddf81c0c48aeb050658f60d629de558f7d0531c572745742cad16de12035d
 MISC metadata.xml 396 BLAKE2B d9c3e97cacd4d4d4e9b26f9e78a9a56293ab4569232c63e599c89376723af4b8dd250c9a8642d835d1bc4eb7b53eb5a6b78a80eba1c95fec7f5edc11f8b0efbe SHA512 4232880b47191b4e89f07dc4987e8f24833a0f42a21355f943b03f88487f50f2401e1a51aa7a150ad27659e7ebf9d61509fb232191dc4836d8ee4a9c7345df70
diff --git a/dev-libs/log4shib/log4shib-1.0.4-r1.ebuild b/dev-libs/log4shib/log4shib-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..63ac7a704a4d
--- /dev/null
+++ b/dev-libs/log4shib/log4shib-1.0.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Internet2 version for OpenSAML of log4cpp logging framework"
+HOMEPAGE="https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib"
+SRC_URI="https://shibboleth.net/downloads/${PN}/${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug doc static-libs"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	econf --without-idsa \
+		$(use_enable debug) \
+		$(use_enable doc doxygen) \
+		$(use_enable static-libs static)
+}
diff --git a/dev-libs/log4shib/log4shib-1.0.4.ebuild b/dev-libs/log4shib/log4shib-1.0.4.ebuild
index 6e744c15a904..bc6707fe0f40 100644
--- a/dev-libs/log4shib/log4shib-1.0.4.ebuild
+++ b/dev-libs/log4shib/log4shib-1.0.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 
 DESCRIPTION="Internet2 version for OpenSAML of log4cpp logging framework"
 HOMEPAGE="https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib"
-SRC_URI="http://shibboleth.internet2.edu/downloads/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://shibboleth.net/downloads/${PN}/${PV}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/mm/Manifest b/dev-libs/mm/Manifest
index e5b2d1d786a1..e91900341d7f 100644
--- a/dev-libs/mm/Manifest
+++ b/dev-libs/mm/Manifest
@@ -1,3 +1,3 @@
 DIST mm-1.4.2.tar.gz 344903 BLAKE2B 5fec1eeea52e9ff77f94081f4e77dfd627c356cc94591169fa89f5564882e2e3a4712c90c3f1e133024ef0adf095da8063916145159e5023c4191748bd622c6c SHA512 dcc12676453cfaf19560f99fa97e905428051d72b46aeaf574300f51e64f689caa70c81b619b8794ad604e8a2efe6bde1e486a2e315263b5694d6eab1cacc182
-EBUILD mm-1.4.2-r2.ebuild 702 BLAKE2B 17eb838eb0e56f535a854d151deb697004184be5f3db2e2b30c40ecbda7a338b257ec9888d893bb5c8f6a13b08776a867eda44401561944f1483d14398c1bb90 SHA512 464cac6439d28dcf16c8f5a279a8b1f356516cf356ab974c401d94fbe20fdb96d91c8c939c954cbcc7c83eceee47c9e72bb56aa66ff2da70a5e67f17022472d4
+EBUILD mm-1.4.2-r2.ebuild 701 BLAKE2B b2a46936714bc79e40c46cf11b101da99fbab3b1a54e7b37d7ad88576e9e0825627b50ff9f61e446cf92a0ebca00a0f4960c84f0e6f782b9a5560d83f42934b1 SHA512 d5bc3051c69a6ecea8b76fabc1475be5988584535b69420e1766f65e0d429ca259b2865d35ad99f19937b7d5f0166c030b415053833bb862cf014f82a8b1e8bd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index 84e891c31927..51290880bc5d 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
 
 LICENSE="mm"
 SLOT="1.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=""
 
 src_prepare() {
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index af06d91b1505..9d062b3be388 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1,11 +1,8 @@
 AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca055c02f6ff2d807dc36fb15c15e67c2aa5d3ac4ae11288e710e6e0e4830dced12a0817e395fcc2331547228eb8 SHA512 6f3a68b75fae6693ddbb47b88f8ede4a6994daa4476b3ca472b3ec62db26e36785e3bb7fe7375a9e78ffd0761a4d82351f5d02c30f8ddd55fa5648257526e98f
 AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313
 AUX newt-0.52.15-makefile.patch 403 BLAKE2B a7d85c4d99961894b21d051bb143059c6efbcd29fcf187de1e37344850d545ad98b974346483f2f1aadf1ab029d9d9a0fd64416e6892188cbd2bcfb60a64bc05 SHA512 146430581aa1811ac2f5aa03f6da6f193afda153eb3c3efd8576631f591f3671f05d9479182f593faedc79be17fc91852641259df93faa1231d3eda5e9dfd73d
-AUX newt-0.52.15-snack.patch 797 BLAKE2B 6335815f32ec21d81956f411822ad2dc9ca7dfcad43b30bfa916f84458f35c6259d3851552c8759c915d3de5eaf60c09bd7d1e6fde80f27968fa48c7a9a64829 SHA512 3a7a706c74307d5fc1d10ef0ec64f2d6cc086630b5620ffc3a679770adde65212fe0b5fb9529dea43565f0c8d40bc57a8b8fd67b106ab2279be8f8a9bde1c56b
-DIST newt-0.52.15.tar.gz 183171 BLAKE2B e6fac06b28232c81d683b9fe613f8c75660543a1e1f9f7583ce27e2fcf8208e2695e94c190757af8da443c0b1fa30546ce8dc77630ee88464377d563193f52d1 SHA512 f93798e8e9e33b4bc1bbb6039d94ccdf55be76a0e0f918eb32a241fe527ea61121a8fc35ccd699e3f6202eb367ba4b4025b30264bd9b0face7c16782f113051e
-DIST newt-0.52.18.tar.gz 180425 BLAKE2B 96c10d6eb63b62a51cd75f3cc34671954abd8e0c528972cb555422065dd074bab7360b226fcc4278caafafafb3b53c6eb2c395b83cc18c3fd02efcf053480311 SHA512 223b4fba9568d7ddddd9292f52d5e556a24403642d1dac97b58c8ede698bc182ce7d5afd31df2cb1c5b8a8850529b50ce71d8ad84856be8d42fad0f1a33a48f8
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
-EBUILD newt-0.52.15.ebuild 2009 BLAKE2B 60893c4f48b7e26939b65cca8f47047fb4d13558b363fc2ce7be362b77c9c3a2bbb0a833b15c3bd3a44e93a75f6bc3e8bcd2529aefd78e28c5ffc1b9dff2cf01 SHA512 342cc64da9f59c34785897b768e48687dc700e9f66c4bbf9ec0ddff1ef53eafd7cfd90971df67d2cf1c668712f793a75583ee61ae07d4dae5fbb44c2fa5c1d4f
-EBUILD newt-0.52.18.ebuild 1946 BLAKE2B c94b8d8ea555381f8a5561a983de9dedbba63eb36c76bfb7550351947f044ef4df7b3bb7316e213adda862a235ea816a5450fe1ec06a28f6f7e7689786327465 SHA512 8914e08dce91d768dead676763eccbe41ba6cea208d28348e80bf0b5e7bc5f1cb70f54c382f14642726ad64d2512edd661af18172e37577c2fb1176a76da5a30
-EBUILD newt-0.52.20.ebuild 2023 BLAKE2B aacda586a62bd92bcce19f3fb5fee0e9e05e63e71271ea7d8a281e6cf0121eb039a69851d283be8db82d1ea063e30fbce9b9ffcd9a3e571378a858eccc82f445 SHA512 4e76bac8a02b000c06bf9d522b209e3746899750b30627287a6297f840ec382e108bb25f51c50ebec56040b5fcb8f3e9eed4e76a7eb04e4bd7c69aa4cebd9267
+DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
+EBUILD newt-0.52.20.ebuild 2022 BLAKE2B ee8fed9342ee68b4548c8a95726894e5ee9f3de9902f7537e8b8458154ba391e46090a70518450bc7a51e330cbcfe81f7423b49de0de79a8406914a0e7d01007 SHA512 2945fcdd40fd57b502da9aada6273022a961607ae40a30730d8935791ea409aab96efc14181c6a2f4d07ac2a9752d677adc09bd99ab4489866fdea70d49c3e2a
+EBUILD newt-0.52.21.ebuild 1989 BLAKE2B 5954f0985a18ea0b0c12fbd297e5d4c79494feb9cef088c2063eb8f74ce23f6a246ffc1eb9a2e85e014d871f0bfc3b539bd20b77d886410a3780c7d93a43760f SHA512 7deb7b896bd8a3d406f9005aecf77e7f0a2eace68119dcb94485e417abcdeaf4ef9668189cc07f522725993b95ba0ca52954d12e6ea4bf214c614b1c20b3cbfe
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/files/newt-0.52.15-snack.patch b/dev-libs/newt/files/newt-0.52.15-snack.patch
deleted file mode 100644
index dd2627538e6d..000000000000
--- a/dev-libs/newt/files/newt-0.52.15-snack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 75764e1..ca95bb6 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -90,7 +90,7 @@ _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
- 		PLDFLAGS=`$$pyconfig --ldflags`; \
- 		PLFLAGS=`$$pyconfig --libs`; \
- 		echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c; \
--		$(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c; \
-+		$(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c; \
- 		echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L.  -lnewt $(LIBS); \
- 		$(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L.  -lnewt $(LIBS); \
- 	done || :
diff --git a/dev-libs/newt/newt-0.52.15.ebuild b/dev-libs/newt/newt-0.52.15.ebuild
deleted file mode 100644
index 7ba8453d0433..000000000000
--- a/dev-libs/newt/newt-0.52.15.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://pagure.io/newt"
-SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="gpm tcl nls"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/popt-1.6
-	=sys-libs/slang-2*
-	elibc_uclibc? ( sys-libs/ncurses )
-	gpm? ( sys-libs/gpm )
-	tcl? ( >=dev-lang/tcl-8.5:0 )
-	"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# bug 73850
-	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die
-	fi
-
-	sed -i Makefile.in \
-		-e 's|-ltcl8.4|-ltcl|g' \
-		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
-		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
-		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
-		-e 's|instroot|DESTDIR|g' \
-		-e 's|	make |	$(MAKE) |g' \
-		-e "s|	ar |	$(tc-getAR) |g" \
-		|| die "sed Makefile.in"
-
-	local langs=""
-	if [ -n "${LINGUAS}" ]; then
-		for lang in ${LINGUAS}; do
-			test -r po/${lang}.po && langs="${langs} ${lang}.po"
-		done
-		sed -i po/Makefile \
-			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
-			|| die "sed po/Makefile"
-	fi
-
-	epatch "${FILESDIR}"/${PN}-0.52.13-gold.patch \
-		"${FILESDIR}"/${PN}-0.52.15-snack.patch \
-		"${FILESDIR}"/${PN}-0.52.14-tcl.patch \
-		"${FILESDIR}"/${PN}-0.52.15-makefile.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		PYTHONVERS="${PYTHON}" \
-		$(use_with gpm gpm-support) \
-		$(use_with tcl) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	building() {
-		emake PYTHONVERS="${EPYTHON}"
-	}
-	python_foreach_impl building
-}
-
-src_install() {
-	installit() {
-		emake \
-			DESTDIR="${D}" \
-			PYTHONVERS="${EPYTHON}" \
-			install
-		python_optimize
-	}
-	python_foreach_impl installit
-	dodoc peanuts.py popcorn.py tutorial.sgml
-	doman whiptail.1
-}
diff --git a/dev-libs/newt/newt-0.52.18.ebuild b/dev-libs/newt/newt-0.52.18.ebuild
deleted file mode 100644
index bb64ecc2c13b..000000000000
--- a/dev-libs/newt/newt-0.52.18.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://pagure.io/newt"
-SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gpm tcl nls"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/popt-1.6
-	=sys-libs/slang-2*
-	elibc_uclibc? ( sys-libs/ncurses )
-	gpm? ( sys-libs/gpm )
-	tcl? ( >=dev-lang/tcl-8.5:0 )
-	"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# bug 73850
-	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die
-	fi
-
-	sed -i Makefile.in \
-		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
-		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
-		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
-		-e 's|instroot|DESTDIR|g' \
-		-e 's|	make |	$(MAKE) |g' \
-		-e "s|	ar |	$(tc-getAR) |g" \
-		|| die "sed Makefile.in"
-
-	local langs=""
-	if [ -n "${LINGUAS}" ]; then
-		for lang in ${LINGUAS}; do
-			test -r po/${lang}.po && langs="${langs} ${lang}.po"
-		done
-		sed -i po/Makefile \
-			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
-			|| die "sed po/Makefile"
-	fi
-
-	epatch "${FILESDIR}"/${PN}-0.52.13-gold.patch \
-		"${FILESDIR}"/${PN}-0.52.14-tcl.patch \
-		"${FILESDIR}"/${PN}-0.52.15-makefile.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		PYTHONVERS="${PYTHON}" \
-		$(use_with gpm gpm-support) \
-		$(use_with tcl) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	building() {
-		emake PYTHONVERS="${EPYTHON}"
-	}
-	python_foreach_impl building
-}
-
-src_install() {
-	installit() {
-		emake \
-			DESTDIR="${D}" \
-			PYTHONVERS="${EPYTHON}" \
-			install
-		python_optimize
-	}
-	python_foreach_impl installit
-	dodoc peanuts.py popcorn.py tutorial.sgml
-	doman whiptail.1
-}
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
index b0fad196dbb6..b272773647d3 100644
--- a/dev-libs/newt/newt-0.52.20.ebuild
+++ b/dev-libs/newt/newt-0.52.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/newt/newt-0.52.21.ebuild b/dev-libs/newt/newt-0.52.21.ebuild
new file mode 100644
index 000000000000..8af4c46bcaa8
--- /dev/null
+++ b/dev-libs/newt/newt-0.52.21.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit python-r1 multilib autotools toolchain-funcs
+
+DESCRIPTION="Redhat's Newt windowing toolkit development files"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gpm nls tcl"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/popt-1.6
+	=sys-libs/slang-2*
+	elibc_uclibc? ( sys-libs/ncurses:0= )
+	gpm? ( sys-libs/gpm )
+	tcl? ( >=dev-lang/tcl-8.5:0 )
+	"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# bug 73850
+	if use elibc_uclibc; then
+		sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die
+	fi
+
+	sed -i Makefile.in \
+		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
+		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
+		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
+		-e 's|instroot|DESTDIR|g' \
+		-e 's|	make |	$(MAKE) |g' \
+		-e "s|	ar |	$(tc-getAR) |g" \
+		|| die "sed Makefile.in"
+
+	local langs=""
+	if [ -n "${LINGUAS}" ]; then
+		for lang in ${LINGUAS}; do
+			test -r po/${lang}.po && langs="${langs} ${lang}.po"
+		done
+		sed -i po/Makefile \
+			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
+			|| die "sed po/Makefile"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-0.52.13-gold.patch \
+		"${FILESDIR}"/${PN}-0.52.14-tcl.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	configuring() {
+		econf \
+			PYTHONVERS="${PYTHON}" \
+			$(use_with gpm gpm-support) \
+			$(use_with tcl) \
+			$(use_enable nls)
+	}
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	building() {
+		emake PYTHONVERS="${EPYTHON}"
+	}
+	python_foreach_impl building
+}
+
+src_install() {
+	installit() {
+		emake \
+			DESTDIR="${D}" \
+			PYTHONVERS="${EPYTHON}" \
+			install
+		python_optimize
+	}
+	python_foreach_impl installit
+	dodoc peanuts.py popcorn.py tutorial.sgml
+	doman whiptail.1
+	einstalldocs
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 602131f5798a..73c06e91c181 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -15,20 +15,36 @@ DIST openssl-1.0.2r.tar.gz 5348369 BLAKE2B 9f9c2d2fe6eaf9acacab29b394a318f30c38e
 DIST openssl-1.0.2r_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2r_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
 DIST openssl-1.0.2r_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
+DIST openssl-1.0.2s.tar.gz 5349149 BLAKE2B 46c72dcceb5b473b129be0a895f3d6c25a24ee852a31dc369ccf0e44319259d8694d3571b8cb698efb8bce89dbe31f4fc9f82753cacb24cbd3d50fa2ab9b6e83 SHA512 9f745452c4f777df694158e95003cde78a2cf8199bc481a563ec36644664c3c1415a774779b9791dd18f2aeb57fa1721cb52b3db12d025955e970071d5b66d2a
+DIST openssl-1.0.2s_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
+DIST openssl-1.0.2s_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
+DIST openssl-1.0.2s_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
 DIST openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch 3001 BLAKE2B 8f0ac4be6409b4ec50bec171697da2aebe2688e8ae06bd0dfac8b0c74661d38ebeb0a12bde0ef941b213eee9b85965262213b140636060285dcfb02a3bd14961 SHA512 ec6710e9669ac19e4c6f1286c89a383e7d276a773a2740037f98a8f2dbf18305614e7d30d9ed530923a0e7d10a3776fea2ca77229adc25df13ecad55589a3673
 DIST openssl-1.1.0-ec-curves_d2ede125556ac99aa0faa7744c703af3f559094e.patch 5311 BLAKE2B e9ec985adf6f13eb04412158a05da7cbe10be7d64bce73b899152ea379336ece7b7069089ef46993ac301ef850fd46fd0352898e249b2ea9fff5baf20896e5b5 SHA512 c38c4b05195f2b323a07efd8d17335ba2a168a16a59d7941da36568081f1c043da8d2216b7084b0617963635ded9bafeee736ecddbfa251cf0a02e4cba64cdc8
 DIST openssl-1.1.0j.tar.gz 5411919 BLAKE2B 0fbd936f38d30b64bea717a67cd59704c5ce44ee19f377a820f89ba66b9e0a7509cf39e0fb00c104ae6440a6bd811e388239b458ffe685d8601235bab2afb2f1 SHA512 e7d30951ebb3cbcb6d59e3eb40f64f5a84634b7f5c380a588d378973f1c415395e3ab71a9aaff6478a89ec6efcc88f17f1882c99c25dcd18165f1435a51e5768
 DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457
 DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b
 DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
+DIST openssl-1.1.0k.tar.gz 5287321 BLAKE2B fce40a399f5a08d5fe183dfcaab11b211d982885fb9888b25fa41bdd9919ecd203fca6f573363cfb42c9a0776ae69ea50b0f144227a3f28ca0dbadf878d396bc SHA512 65f41a240a97d79504c0e1391fde8ac8692f0993437cdc35e4bc964ecc36e5ef75a62499c4c6cb4ce63f892135e06dba2d3594c8869d935554296fa3c6ccd822
+DIST openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457
+DIST openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b
+DIST openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 DIST openssl-1.1.1-ec-curves.patch 7265 BLAKE2B 04725d226c430132cf54afbfaa30a82f8f8bbfd3608823d1d0cd42c3c13f417e90762759da3134d7b0c4373e531925db337b681340f2f284cb2f16a4caef22e3 SHA512 de4d0f1635740c57217836a476c420141c0d34a5f90cbf7957aed7a80e7ac9ca036de2d8448e6bf4c122999e308730575899f61cea6e51ab6825dd04890d75a1
 DIST openssl-1.1.1b.tar.gz 8213737 BLAKE2B 7ad9da9548052e2a033a684038f97c420cfffd57994604bcb3fa12640796c8c0aea3d24fb05648ee4940fbec40b81462e81c353da5a41a2575c0585d9718eae8 SHA512 b54025fbb4fe264466f3b0d762aad4be45bd23cd48bdb26d901d4c41a40bfd776177e02230995ab181a695435039dbad313f4b9a563239a70807a2e19ecf045d
 DIST openssl-1.1.1b_ec_curve.c 17938 BLAKE2B d5cbde40dcd8608087aed6ffa9feb040ffadecf0c46b7f3978cc468a9503f0a5ad0a426ea6f8db56f49a64474a508bebdf946e01ebf09adc727675f3b180bcdc SHA512 ec470f6514cb9a4f680b8cbbe02e2bbe71639b288f3429d976726047901d9c50377dfb2737f32429da2fb0e52fd67878a86debb54520e307ee196d97b5c66415
 DIST openssl-1.1.1b_ectest.c 35091 BLAKE2B a9602255ab529751c2af2419206ce113f03f93b7b776691ea2ec550f26ddbecd241844bb81dc86988fdbb1c0a587318f82ce4faecba1a6142a19cf08d40fb2c5 SHA512 7813d9b6b7ab62119a7f2dd5431c17c5839f4c320ac7071b0714c9b8528bda5fda779dbb263328dca6ee8446e9fa09c663da659c9a82832a65cf53d1cd8a4cef
 DIST openssl-1.1.1b_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
+DIST openssl-1.1.1c.tar.gz 8864262 BLAKE2B bd157b244bedcefb8e646a743732945119b267236789ac69c38856570318aca09299bdaaea3f20294863b633e6fd4dfe124820597185b3b7461cfdf094daadb0 SHA512 8e2c5cc11c120efbb7d7850980cb6eaa782d29b4996b3f3378d37613c1679f852d7cc08a90d62e78fcec3439f06bdbee70064579a8c2adaffd91532a97f646ff
+DIST openssl-1.1.1c_ec_curve.c 17938 BLAKE2B d5cbde40dcd8608087aed6ffa9feb040ffadecf0c46b7f3978cc468a9503f0a5ad0a426ea6f8db56f49a64474a508bebdf946e01ebf09adc727675f3b180bcdc SHA512 ec470f6514cb9a4f680b8cbbe02e2bbe71639b288f3429d976726047901d9c50377dfb2737f32429da2fb0e52fd67878a86debb54520e307ee196d97b5c66415
+DIST openssl-1.1.1c_ectest.c 35091 BLAKE2B a9602255ab529751c2af2419206ce113f03f93b7b776691ea2ec550f26ddbecd241844bb81dc86988fdbb1c0a587318f82ce4faecba1a6142a19cf08d40fb2c5 SHA512 7813d9b6b7ab62119a7f2dd5431c17c5839f4c320ac7071b0714c9b8528bda5fda779dbb263328dca6ee8446e9fa09c663da659c9a82832a65cf53d1cd8a4cef
+DIST openssl-1.1.1c_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
 EBUILD openssl-1.0.2r-r200.ebuild 7981 BLAKE2B b8b41046e8754f64427bd1da2557d654939e8b16f5be96be731e56c26c23a338807641858712ddc589001e5f7cd20c167dfb6e459b1c1086c7cdfb9d3bc253b1 SHA512 530f96ce8e8543cad92138abc6695b0546819d9eaff26d08ebcbf9fd6b1075e777f395af174087016530bd4ed29f067fbb1c6bbd7647354cb87f6ec600811728
 EBUILD openssl-1.0.2r.ebuild 10261 BLAKE2B d69c02146d892718a81ea97c6d946cdbef7fbefdfdbccc1590b961d1514d0c21e5b3f9d52a07465d0848cba20b9d5773092680e95dafb2233232b607582f9834 SHA512 8e5c8ecf64b9684047106fc07d9529f64f34782129975e1dff7777104dd18de66800a75f2cc30dea3d2079e2387843fa742fc470319f53c1bf6574798ddd8630
+EBUILD openssl-1.0.2s-r200.ebuild 7981 BLAKE2B b8b41046e8754f64427bd1da2557d654939e8b16f5be96be731e56c26c23a338807641858712ddc589001e5f7cd20c167dfb6e459b1c1086c7cdfb9d3bc253b1 SHA512 530f96ce8e8543cad92138abc6695b0546819d9eaff26d08ebcbf9fd6b1075e777f395af174087016530bd4ed29f067fbb1c6bbd7647354cb87f6ec600811728
+EBUILD openssl-1.0.2s.ebuild 10274 BLAKE2B 449fe8da38c842deb7d1bd36cadb4f5090b7b969c33ed65279d3aaf6ce8f9082457ead493d203e0497d589834fddd80b20474d1b70af633596bdca334d58099c SHA512 cd1afc4d90d76aea584040334fe354bbe830090259343c82639ca5cd767b450e4f92745b4e7e18e85035f5af14bc9ee29c9f92dbb6a7281f40c42772aed10c8d
 EBUILD openssl-1.1.0j-r1.ebuild 10046 BLAKE2B 13160922f67effce50f1d73e7233c9d2b2373c1dcc2a63a33f92614395620c2dae18c9694c6398cb4cd247ed044c310f6472bd5bf9becef2ae54a81b7529d634 SHA512 6bfc16c20ca75c4c150c5e2899c15ff67e0e11b1f9450b55344f69d56474d7e8f50220f8e808d4160331aa3ae1ca0b0548e4e230ce93454f7e82032b289b3b81
+EBUILD openssl-1.1.0k.ebuild 9998 BLAKE2B 6a7f3c750f34cf1e7d202d739cca5bef55cbb1851ac3ef2ae333c0cbdd82b49e00a8d2f79fc4ae52c1b2f3321a38fa735cf54847174735d574e7b4adb055c84d SHA512 ddceb95296e5906cb999c5652cf1f64edb5de7f3093c1eb36d16385882ec759fafeb768937d9c3449c1483f9f61b21c9633feb3aa78ae5181dcf793d846b103d
 EBUILD openssl-1.1.1b-r2.ebuild 9593 BLAKE2B 9fc53267f4c5059ea12338a666d8bed60462a23461b79ba3e7e4fbc65d50e2cf9fa4923af8827d67b8fd37ecf8ae7b3f0a332aa12db3b4d9bc9a5acf2beb309c SHA512 fe9b503331830c33fae862fa19e384aa5db198525bbc96ffaa46d4bd807e198d2ae8209345707392a4e5e0e209506b87257e1fafd4e694c6bfc385f2d7675a9a
+EBUILD openssl-1.1.1c.ebuild 9525 BLAKE2B ffe3df0bc527dbaedf30e2026f8c976ab2f2d5012e9b5897276288f05165a70c4ff91b5bf5e17762d9dfbfc2bf6d1d6a94268c75790da0f6c6feeb39ea652e9f SHA512 b5539566f093d5c21a3607ef8722c554936a17f65d1035c72530d0d0b2a9d10776b4c7ecd4666f3acc6b700dfdde19551c1e052c694b1ccd7c571bacd943f27a
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.0.2s-r200.ebuild b/dev-libs/openssl/openssl-1.0.2s-r200.ebuild
new file mode 100644
index 000000000000..44b9547d141e
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2s-r200.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="1.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	!=dev-libs/openssl-1.0.2*:0"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+
+RESTRICT="test"
+
+# Do not install any docs
+DOCS=()
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+# These are ported instead
+#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+#PATCH37=openssl-1.1.0-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f25'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
+FEDORA_PATCH=( $PATCH1 $PATCH37 )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
+		for i in "${FEDORA_PATCH[@]}" ; do
+			eapply "${DISTDIR}"/"${i}"
+		done
+		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX%/}"/usr \
+		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake build_libs
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.${SLOT}
+}
diff --git a/dev-libs/openssl/openssl-1.0.2s.ebuild b/dev-libs/openssl/openssl-1.0.2s.ebuild
new file mode 100644
index 000000000000..57280189ad1b
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2s.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+# These are ported instead
+#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+#PATCH37=openssl-1.1.0-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f25'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
+FEDORA_PATCH=( $PATCH1 $PATCH37 )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
+		for i in "${FEDORA_PATCH[@]}" ; do
+			eapply "${DISTDIR}"/"${i}"
+		done
+		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX%/}"/usr \
+		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED%/}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED%/}"/usr || die
+	fi
+
+	emake INSTALL_PREFIX="${D%/}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED%/}"/usr/bin/c_rehash || die
+
+	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
+	einstalldocs
+
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.0k.ebuild b/dev-libs/openssl/openssl-1.1.0k.ebuild
new file mode 100644
index 000000000000..f5af55a9879c
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.0k.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+PATCH37=openssl-1.1.0-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f28'
+FEDORA_GIT_COMMIT="d2ede125556ac99aa0faa7744c703af3f559094e"
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
+FEDORA_PATCH=( $PATCH1 $PATCH37 )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH}&id=${FEDORA_GIT_COMMIT} -> ${P}_${FEDORA_GIT_COMMIT}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH}&id=${FEDORA_GIT_COMMIT} -> ${i%.patch}_${FEDORA_GIT_COMMIT}.patch" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+src_prepare() {
+	if use bindist; then
+		# we need to patch the patch but we cannot patch in DISTDIR...
+		mkdir "${WORKDIR}"/fedora_patches || die
+		for i in "${FEDORA_PATCH[@]}" ; do
+			cp "${DISTDIR}"/"${i%.patch}_${FEDORA_GIT_COMMIT}.patch" "${WORKDIR}"/fedora_patches || die
+		done
+
+		# now patch the path, due to OpenSSL change cb193560e0da17a41b40ce574a2349f1d4d59ed1
+		sed -i -e 's#test/evptests.txt#test/recipes/30-test_evp_data/evppkey.txt#g' \
+			"${WORKDIR}"/fedora_patches/openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch || \
+			die
+
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${FEDORA_GIT_COMMIT}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
+		for i in "${FEDORA_PATCH[@]}" ; do
+			#eapply "${DISTDIR}"/"${i%.patch}_${FEDORA_GIT_COMMIT}.patch"
+			eapply "${WORKDIR}/fedora_patches/${i%.patch}_${FEDORA_GIT_COMMIT}.patch"
+		done
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+
+	fi
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		eapply "${PATCHES[@]}"
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# show the actual commands in the log
+	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	# Fix quoting for sed
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+		-e 's:\\:\\\\:g' \
+	)
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED%/}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED%/}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED%/}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED%/}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.1c.ebuild b/dev-libs/openssl/openssl-1.1.1c.ebuild
new file mode 100644
index 000000000000..f4e635b13b6d
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1c.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+PATCH37=openssl-1.1.1-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f29'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( ${SOURCE1} ${SOURCE12} ${SOURCE13} )
+FEDORA_PATCH=( ${PATCH37} )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
+		for i in "${FEDORA_PATCH[@]}" ; do
+			if [[ "${i}" == "${PATCH37}" ]] ; then
+				# apply our own for OpenSSL 1.1.1b adjusted version of this patch
+				eapply "${FILESDIR}"/openssl-1.1.1b-ec-curves-patch.patch
+			else
+				eapply "${DISTDIR}"/"${i}"
+			fi
+		done
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	# Fix quoting for sed
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+		-e 's:\\:\\\\:g' \
+	)
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index 27158e81baf7..76fcb23ca260 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,5 +1,7 @@
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 EBUILD ptexenc-1.3.4_p20160523.ebuild 1316 BLAKE2B 5bfb94b2c8768f015452935dc3cfab18f49c37c2de9b1adcc077509a99ab654c6f91bb379ca022805aef2bc79cb20c2554ab313566252e25f5ed4937d3b9c4cc SHA512 e3bb57562cb7215109bddafa5182e8636cc32aa0953d98f33b88cd692df4598c85bac94ee9787e6820779607fefd3c2f09c65a77498bb5ae2fd4cd00e409bb09
 EBUILD ptexenc-1.3.5_p20170524.ebuild 1326 BLAKE2B 4eee0ce2d875623dfb4385543c37c29c65b4c5d8eb1cd78ab15cca2f43f33b7a5c2886b3a9b006dfb0e9c0a36a7c657a7ce90147edd3b0b2408161da1e8c939d SHA512 73036b3d92f6f25a1293257bf64a953e1cc5dc38894a87bc7099e868cc2faea056cf818038fe8bd967195e9ed09575ea2ee33b97d385f320d9c54e9f058cb027
+EBUILD ptexenc-1.3.7_p20190410.ebuild 1313 BLAKE2B 7ea95d47df84cf821c6d41f18e8381f83ac344bcbc62a77085740e485ba4aec3d0a59e5707037f361c2d73d15357a6073182d44d51443b27c3c8ce3fbf82c4f0 SHA512 3c05399a1f3606948e4c0d8d456147b54593d077d697e7d521dbdf385a80ea17b7bb55dd07f2b163be4844a61f4d019032f002f872d1005b453663ab6d378f80
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
new file mode 100644
index 000000000000..2539ee1a51e8
--- /dev/null
+++ b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="Library for Japanese pTeX providing a better way of handling character encodings"
+HOMEPAGE="http://tutimura.ath.cx/ptexlive/?ptexenc"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+# http://tutimura.ath.cx/~nob/tex/ptexlive/ptexenc/${P}.tar.xz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="iconv static-libs"
+
+DEPEND="iconv? ( virtual/libiconv )
+	dev-libs/kpathsea"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_prepare() {
+	default
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=377141
+	sed -i '/^LIBS/s:@LIBS@:@LIBS@ @KPATHSEA_LIBS@:' "${S}"/Makefile.in || die
+
+	cd "${WORKDIR}/texlive-${PV#*_p}-source"
+	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
+}
+
+src_configure() {
+	econf \
+		--with-system-kpathsea \
+		$(use_enable static-libs static) \
+		$(use_enable iconv kanji-iconv)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete
+
+	insinto /usr/include/ptexenc
+	doins ptexenc/unicode-jp.h
+	use iconv && doins ptexenc/kanjicnv.h
+
+	dodoc ChangeLog README
+}
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 8fd0aaecca7f..1e82c594959d 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,3 +1,5 @@
 DIST quazip-0.7.6.tar.gz 149029 BLAKE2B 7eb99f550dc06d8d2911b22214294accaa5126657598bfd60614267715ea968790f470cea2820e1a78a8581ab0d4b75c90589c0da1ae815067e083e389020762 SHA512 4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1
+DIST quazip-0.8.1.tar.gz 150584 BLAKE2B 4a1d61b65b01eee06e1292ee88b543675c77ac922d0fb1726ac0afd447d74e8c8154db82da0ce95c2f2c303c036f2795e8938a412dc22e921ee09a0ef99278f6 SHA512 d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb
 EBUILD quazip-0.7.6.ebuild 1128 BLAKE2B c688ed7a4574358ea89fbeb4965e23e3c25ed78a71dae0f202d98274322a1752f35a10e3a4a9442fd28676b96885037c3b3b71ce988a01d8301ef74586cc804f SHA512 56358d0d23a4b366cf9819a09b71bc494af7368b7825d1a328f1c638d012308507e3c26db6bcc0775d9a32e50da6a2e0a5a5a84b9fa4ea42ce668d6af9fdf072
+EBUILD quazip-0.8.1.ebuild 1137 BLAKE2B e6a8b68e60282463a8804c257ebfd24d0fcd2ceb6431be79572ead0bce48dc7a156a1b1c4a6dcda6f155f9b95a98a2be3e2879c9184b0d45c47170088b45f803 SHA512 8cfe8b24d963f3cc4e22783c09ce7da8a5173c29efcd58ac7f8c19693ce2e1daeb4f4e0fa309ab6809b872e9538a63e1be119ea34c5ef3f88c65e81076dd4c90
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.8.1.ebuild b/dev-libs/quazip/quazip-0.8.1.ebuild
new file mode 100644
index 000000000000..69667b006a02
--- /dev/null
+++ b/dev-libs/quazip/quazip-0.8.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic qmake-utils
+
+DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
+HOMEPAGE="https://stachenov.github.io/quazip/"
+SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${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"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use static-libs ; then
+		sed -e "/^install/ s/quazip_static//" -i quazip/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local -x CXXFLAGS="${CXXFLAGS}"
+	append-cxxflags -std=c++11 -fPIC
+
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DLIB_SUFFIX=${libdir/lib/}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# compatibility with not yet fixed rdeps (Gentoo bug #598136)
+	dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
+}
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index 5cf535be7217..e20cea7a4efc 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -2,5 +2,5 @@ AUX rapidjson-1.1.0-gcc-7.patch 1393 BLAKE2B 71affc72ebbf714788e243b75f9157e9423
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
 EBUILD rapidjson-1.1.0-r1.ebuild 1072 BLAKE2B be1b8ab17394ecf0383dd8c7da4a814b881683e7c33a36a24dfd60dfe56f0c751343f67af703c9365d279ba0cdd79d54b129b4316552315789199556a46ebcac SHA512 6bd802f9e22115b54afafa5f8a9b37090382c66717b3e2153c75bf2200c6261c54a02438d644026568a30fc5de361c44529db48eed914816d8f0dde9b1c5ec8a
 EBUILD rapidjson-1.1.0.ebuild 883 BLAKE2B 9ef8ad122d007cf254f5b2ec2f0a19c5f2d79ef0b0d6a210e0f97131caa119a00231d165403c5040fa920e9d88b847474858278923f4bad30f6d28e848defa90 SHA512 622cf41a55c0a773125638e63f7b99d05bebd6e2ad6a20d3c553e37186753284f5ec75e77235519539856817b9c443fb97e5c568da0b1701e4f8d5bf3ca507c9
-EBUILD rapidjson-9999.ebuild 1094 BLAKE2B cff09abe29af443755e68fff426bc46dca4ea08628f663bce079830a1772ccf515eac0c026c742b8cc4549a22206030c8e81d11bb1ec4d7d31c162a7deea9c31 SHA512 c292d6654d312145d45a803f1df4124b9d90e00188c54e9cb117ae63a27a1ff9e4e1284894d372c9cc2c837500dedacb825538924890d0b8e98d1b6610401462
+EBUILD rapidjson-9999.ebuild 1049 BLAKE2B 65bde54b25f8f8813a18ed589f871a763817872781aeeec033d70d68845c4bb6bb8fa735c9554a93d4b680c3cca0fb36efc7a34718f71474503f650184e03390 SHA512 00c021a40bf9cc989a28582c320186f1a8553cd8c441e980df9506e5c7d0931a71078b4462cf4bcc037044dde32503b4f1ac20336c73ec62c930f93b5ad6c7d5
 MISC metadata.xml 395 BLAKE2B acf0adcc9af1a50757d72f4b52d73c2481fda7bb48ebf2b71e7440c81788e1633b45a4af9ee0adbc1984b0667207706d162e1bdb7177ce8f4e85b819f789b708 SHA512 678196ecc89abed8aa3c1699844573b78103f1ee77dd193b68ad1ae1d5518cd46469b0a5850b00a201c41be381c730ced2aec79f8d4230cf61419b3a20a88935
diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
index fe37df29542d..160fb5e9d92f 100644
--- a/dev-libs/rapidjson/rapidjson-9999.ebuild
+++ b/dev-libs/rapidjson/rapidjson-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,10 +30,6 @@ DEPEND="
 	)"
 RDEPEND=""
 
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-7.patch"
-)
-
 src_prepare() {
 	cmake-utils_src_prepare
 
diff --git a/dev-libs/rasqal/Manifest b/dev-libs/rasqal/Manifest
index 1d32240d5595..de87024d3a6f 100644
--- a/dev-libs/rasqal/Manifest
+++ b/dev-libs/rasqal/Manifest
@@ -1,3 +1,3 @@
 DIST rasqal-0.9.33.tar.gz 1595647 BLAKE2B 87bca86b2f0dceb0801f5a34dae9ae1f87d8a7d0dc1e03fdf04998a0d4885ed76be2719d3e01489a5510a26715bb093a75ce194cc42f3cedff88f64161d6a2fb SHA512 05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522
-EBUILD rasqal-0.9.33.ebuild 1711 BLAKE2B d99e0d6bb23ad11e15bdf1812d91e6ba765d115ee003ca99b60458c69825ed2685bd27fdf8876d829e873812818e305547cde413c56a4c9daed38d4fd3c486ff SHA512 577e77820ebb1df1254f6ad559e4091e4f4ecc6d3dc543d9f1378c79ac262a33611ac5fba50fcb9a0b1ffd6fd39e46d4309a28ee11693c4fb82d59a372f26422
+EBUILD rasqal-0.9.33.ebuild 1710 BLAKE2B 365a304af6df2fb79d4681a71d9e750dea17d9cd96c480dac9574a53a17f5a7613bbfd1f0a6a1a5e6e3237222894788a4493eefa2add952c9605e26e9be70f8c SHA512 80d9fc9f59d034033faddec7807f9524cd9d981abbff8124eb9a0417282061e46d227f395be0a7f98395d6ca25e7c5a02ead93155fd29dbec65548d1d92bbfb1
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild
index 9707a9ad8aa7..92686eca94aa 100644
--- a/dev-libs/rasqal/rasqal-0.9.33.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
 
 RDEPEND="
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index e07014279b21..550eb1dabd96 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -8,5 +8,5 @@ EBUILD re2-0.2016.05.01.ebuild 1202 BLAKE2B 0594d59305793044b9fed2d0570a6c68c538
 EBUILD re2-0.2016.11.01-r1.ebuild 1305 BLAKE2B 8bc950fb1337eeb4f811b3a3a7435b28dce8ec9dad238095a2b19457eced7585ddf64e32844e7970e50b87f3fb913f5dcc9d7529094055e4e1a299ed75950c75 SHA512 a5ef7207e94fc73bcbc4fdd809fa3ed580c9ec0880e073124986a4bdbca7e726be0c122fe7b6f384db8a0ca654645c9fadfb16e3f035e78a1c74e6bca80850c9
 EBUILD re2-0.2017.03.01.ebuild 1305 BLAKE2B 8de6b4e1d07af2677a77755753ff474d818373c0be13008c326972de4cb02b949eb923b1c0353dc0130753d563f6deef1fc54104d32bbcc2c16f676c3afa27ad SHA512 bda266f9e96eec73858ad9c7e0f91f327c216e3d6044bd07abf58dfdf822313e6e7f7b9129b852e0b1ca4ae2bc8ad9c4a38e89e200bac433efd180fc2e7abf60
 EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff815933859635e6296570a5783d03b02b221f560ccce8582e2635614f29c379f34e2b375480c06e0d14fe114aa43a15d2b SHA512 c4af6a5638e487c3ce981649ef8ccb30dbf4cf59cd21f06dfef2af8ac0bfa69eb13d11bb9b64b9d575adf15d84fd57163a37dc439abb15086924aad6b54a821d
-EBUILD re2-0.2018.10.01.ebuild 1346 BLAKE2B b5078682c1e7244796aa2f9e1bc63a2af8e6627d110cfd8846c129881998d93daa66d830d7d3553e725ada19c5508e21b6e7f0a8fd0d658d3e397ca642dbf623 SHA512 30de1552eb499ac0c1f25b4f06feb319d1eaf64868e3b782265868b5e7ce670df688138a99331590dcedde9f3843cfccfd1b4a1eb8831d59057791f314ad3d4d
+EBUILD re2-0.2018.10.01.ebuild 1345 BLAKE2B efa3dbca54f7d8916ef63e41091daecd85d829a0641877fb82e0ad9251d179a247c5fc69127945a7aad4537d83da7cb93abc1576e223f1bb83527187cffa2795 SHA512 d3c6e9cff14639ab4e8ac01e90e896cdc671898f718444009e32750fb392b35836e87e3a2394b55313d58b652cd6b1822a49211dd3159f7fc867c3dcce6815a1
 MISC metadata.xml 337 BLAKE2B a584c0de18fba97bedbfc3589eb7e35d2f9f794946f8161c50e807e6ed8dc90631b9aecf3f20b6e04bc27b4b5f92e9044221a50a92f8ed61052794392a0f68e8 SHA512 5dbef91cae8363700badc73e352829c4e4e8265bdb96104136c3759d1731148b7260840b4319116ceac00aa9ba17de6eafa2cf9684878b7e9f032469b6f2fec0
diff --git a/dev-libs/re2/re2-0.2018.10.01.ebuild b/dev-libs/re2/re2-0.2018.10.01.ebuild
index a7536bfa74f4..8e3f95ed048d 100644
--- a/dev-libs/re2/re2-0.2018.10.01.ebuild
+++ b/dev-libs/re2/re2-0.2018.10.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="gentoo-2017-03-01"
 SLOT="0/${SONAME}"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="icu"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index 8f026475fc09..d336141fc443 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -1,3 +1,3 @@
 DIST redland-bindings-1.0.14.1.tar.gz 792557 BLAKE2B fac20e9e2fbf9a4ea7299ef0b4a656ea3e5f1cbf436cd31c80e81be40dc95e074e557925b32ecf24091ce3cfe882d681318ae8402e14baf1e0966ec8a0a892ed SHA512 5e037a96f857c95bf4b9277d98c7de1fa41c4ba7e49e199eeb516458343587c796a10e857679c889406b22bca8617828a2bccd07c31b73f2366cdea39cefad15
-EBUILD redland-bindings-1.0.14.1-r2.ebuild 1333 BLAKE2B 534ac7ecfd91b4bea0ca1f8832ec38e8e06fcc762ef2bed1ce75ee25ccfa5d492f3b56947a74df2cc1518893701659d6e472b9a00906001dea4c04a79ef730f5 SHA512 ac3108971da8983313f0f2d4cb9242fba85bc2c0af5c249f8757e68966cb8a657a87243902e67c16dcd2a05e10072c796c40d3a4f8868822bd202b70ccc745a3
+EBUILD redland-bindings-1.0.14.1-r2.ebuild 1332 BLAKE2B c48d7f1237b06b03b5e8316a9cbf13dc76ec086bea96342fd7d7dd558389acaa2a0c26f2ea5e3c90b583521aeb5c9164f5cad2b7b141f0a124a2225587548d8c SHA512 1096a3e2c3df6c3523926145db63dab3f334a4e46d35b364dc51ad8913705af0e737d5707c9223e6412f823d957f7782017f3a1b8d6ce619d12ee5291c5febd4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
index f95cfbb27738..b113ecc582dd 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos"
 IUSE="lua perl python php ruby"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index cba9d48313d1..440b5021a962 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,3 +1,3 @@
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.17-r2.ebuild 2500 BLAKE2B b7e0d2e37bbeb79ba79218431056d5afd65e04d825b9d4f409c9ba1400fe1cde828350e2bc4ed9434dad7e1dca65d7e68eedc7e432e4c6ed1e423d0bd930eaa2 SHA512 75bf0cb44ea5c095b1ea248bbc776ed84a6abbb0ccfdd5804626b570d7e235dec1b0fc03fb008fabe8842c5f90992ae617169484ef3a7b281322c646e5829d06
+EBUILD redland-1.0.17-r2.ebuild 2499 BLAKE2B 9c594b2c2bf208302bfe4b36470c5d74e9cbc4e2ab19c31d7883e32f487993b23f17081b4d917982051cc7c430f1b4828513f93b463e485804feb6385664537f SHA512 e3c520b1228c6eb57aeb7f906b59150cdbfaca57bd4215c2390972af0a818649b969b6cc568ad60781bc1b1294427aeb2eabc93fc801fb6b1a9b6f2af83dcfbb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index d7fa804dcef5..987b257ff816 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 91ff0eb305bf..6d9ca38b7587 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,3 @@
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
-EBUILD serd-0.28.0-r1.ebuild 1123 BLAKE2B cdc884e5acd464322ddf4d5640dab58d812abc06fde01ca8e489a78a4f189dd9622871053f80930bce9060bf01846adbd69c74434907875a194453a17381d53b SHA512 72880352428cb4df6bb15a970474d60402b2dd17cf953d84c0221f7210527fdadb31774beccb3e4e16bdc6faacf34ea2bb247428fd24772e3ff010f6309b0be7
+EBUILD serd-0.28.0-r1.ebuild 1118 BLAKE2B 33772236a29b1d08cd24dd73e5a3029211fb8e7de8708c246054b5e08fb0783e3a177bc00a3c4136b75695c6c3a3b4da0bc702f3881fe6d9fe5a22e8d0740047 SHA512 aae05966d1d890be9fbf40ff94306342836537153a2638acc2bec6026ed0f3535f9bb4e3d007f23aae59b8c14b1377a84bf020ec027880e8e237744df8feedc1
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index 716194bf0d93..d945053ae450 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index 145ce455a601..0cb608af3847 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -1,4 +1,4 @@
 AUX libstemmer_c-shared-library.patch 850 BLAKE2B 864f1f7f34a35b04a57899f0ac3dd743121c4f6270ad1f5cd127789d79e2f70fedab1cbff72d492b7e0f7a048609650e2315b8cebef013fb711f812deeddf32e SHA512 36f96bf9661a71d7aa77619202d7c4d48cc494da6287ecf5a24ffa9963aefadf9f825ec52058534aca908e6c2641af71bfc1bf14ab880d9ba480add7a8cac12b
 DIST libstemmer_c-20140325.tgz 129506 BLAKE2B 46040a864b8111bcca1c858a16081542a9900e435e6154582e422e1687b8230b0a5f63c7e349e1ef47128eaa898891df7b87fd2a4d97d0c1304fb8af7ebb627b SHA512 938eb12d4fe9e229f21536a6cb8a4322e0b664a7fbc15685e7ad46b4a6ccdfbefc55cc484f86bc738791d6f3e6d1b61ba777a4332a62cf76a8b0a5efd2c2762b
-EBUILD snowball-stemmer-0.20140325.ebuild 1414 BLAKE2B c65a25acd7c95910c740740713117da1247ffcdff6cd5298363f651ea38174aaae0301b3ad3a459f423f293aa2cbcb19d3c526c750483b185f5fe575fda3f42b SHA512 41fc47e3fb877dc3be8a3d1f8acd75569bac4806aa4b67fb3f655a963c973dcb307b62b1fe05256800609b0f2df288aea6e17f87185318547294af43b20335ec
+EBUILD snowball-stemmer-0.20140325.ebuild 1413 BLAKE2B 872cddc7506ab1d3d6af32271aba2f2214bb9a185a03a0babf05798367fc49925b2b42a30cc01a39fbc3b13129aea241812df7b1d244e149af6f9b0e15061254 SHA512 28b6f45099a8a93631e259ebd2bb8c2a944079fd30bac898149b327f360f79a96b0d68f3e7c3b0531bb470cce74c7c0923862dccd98dd5f7a2f242b0c15b9a9b
 MISC metadata.xml 215 BLAKE2B f7ca08c496dce81653514ebb4de27022bfa50165d664a6ecd7201dae8a9914470fb4f2909cff468fdc235772b0ba86ba3f80cffa4f9051484992a0d6ae3e4367 SHA512 e92f7c910939f1ff7b7cd5df19679d7c08f9b62d58a9dd1dfda4e97d14772ea23a569d822bce780cc09d407165ea203a872f6137f00c1b2ec0147df7dece0829
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
index fe6fcbcaf303..4eb1aa6c4305 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/libstemmer_c"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 
 # This could be used to package both libstemmer_c and libstemmer_java together.
 IUSE="static-libs"
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 657a0294c108..5e4ac145f5dc 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,3 +1,3 @@
 DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed7158223ee685821ae80b18b61f5db82f804ee6a32236143cf8287ee875c3b3354edc6ccd1d4f25eaa3a04c785b SHA512 e18c6de62f2cbffedd4c200f6452f4fd37f719aed764ccc1b77c8da04a0f3394d47e8b57e19eefd6d600770926f505fdfa5da91564bbff5f4ead49f1adaba249
-EBUILD sord-0.16.0-r1.ebuild 1125 BLAKE2B 1d9ceef0ddb0a470d528943c6d135de64d516bd6e727c4005c3fca44d32578cce8deb339f12f592fddff90f621831a9890af3bb4a5f59cfef67b7ba044ae645e SHA512 ee35c6fb723232babbdeef2adc8f3243d85c652a301e4a0cc312af0325de0fb36ac4e84bfbe8c6203aa9a0fcab74e688bb9b9b5a99c63694791707f5e43ef12d
+EBUILD sord-0.16.0-r1.ebuild 1120 BLAKE2B 04b8f85abad3de3ac22933009631110080c3707d23dbc978acfd95faee5cbee20b85183fe8302d74f2f5d059cc6b7b1fea0ab7539e2eb107bc4fb11652185bc4 SHA512 d2ffd2687e261cd6fc2ecd44e6b3b4eb841bbdb923fbb6977fc2b28867cb0ae877fb7e8322589f60a2536bd3c5d30cb5f2ca98a9a81401a52d5545dad87971ce
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index 6e8b08b93d41..d65bb3b73170 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/serd-0.28.0-r1"
diff --git a/dev-libs/svrcore/Manifest b/dev-libs/svrcore/Manifest
index 2e7a0b04e7be..671be72465ac 100644
--- a/dev-libs/svrcore/Manifest
+++ b/dev-libs/svrcore/Manifest
@@ -4,4 +4,4 @@ DIST svrcore-4.0.4.tar.bz2 217076 BLAKE2B 1d5b1c6d397552f299554a19c21a81d1df8f44
 DIST svrcore-4.1.2.tar.bz2 263891 BLAKE2B 4d546406e18099857c1d77d479123332bdc721b51f5ad6bae74812b77704d3d6f8fa2ab67848355be7050fc3ee161c534fc7ee1692811fe9829da513f7cba29e SHA512 9d148ec9c568f1183e44006fec83b4e43b0cef56d5a04fce122fab1e9a0c0bfe39919de81c5a4d7adb2258fb7f16b4d327da20cdb4d948810e968c422d62ad40
 EBUILD svrcore-4.0.4-r1.ebuild 837 BLAKE2B 309d9419d26117395c0bb618537c978dbc9c61672633d9e928632b01e491eec61ecd28fbad36c4f3ac9af70047c6918e69737e40523de60877e8fd9ba48be153 SHA512 7c10b47f3270b6149b99881a969e889743bce88cad4f1b09cd1519b7e38a77af51a5ec3e073e06132ed24e2f2e1bb23cb4c941d6bdd2d7aaad4a66c5cb121dbe
 EBUILD svrcore-4.1.2.ebuild 692 BLAKE2B d4a2ef8b78ffedc502a6a666dc16fa555d5d012aedf7362da87f6b4092f7274a00d3c06d643919ac6532e3700265ee244c0424a000c73fd41394f50c5041ae33 SHA512 105c0e603d9acace34ad5ab9705eec19822cedfacc85fca1940409d652a2bb3eb1621309f690efdca8705ace076ae0e45d63f232da4e6e98d31c3bd21dda103e
-MISC metadata.xml 351 BLAKE2B faa373d9030626334fad91404fd3a3cf322eb37e044224088fb98d2fac1ee8f002e3ef0b4ca5d098ef1ef59b00ab91589a7dc9d1f4b6dc320ee3c758d8cd12a8 SHA512 6ce6c04a65b242413c57a5d034faac7a94fc2d3a3318b0a613f3a0b27de5968ede9203eca46a0d68c0be8915f7d3e5faf10e64778d086978e2a1f6ea889b42c8
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-libs/svrcore/metadata.xml b/dev-libs/svrcore/metadata.xml
index f7f7b9686a7d..585b0dc75dda 100644
--- a/dev-libs/svrcore/metadata.xml
+++ b/dev-libs/svrcore/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>wes@sol1.com.au</email>
-		<name>Wes</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 605c7d3f8f98..24bae9a8e1a6 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,3 +1,3 @@
 DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
-EBUILD totem-pl-parser-3.26.3.ebuild 1914 BLAKE2B 958f0d5a553afef0dd039fc49e53c92dc2a8b16e2ba424da615791e5adbbb7490e1f6d75ce6258f3da08c27e410e60e9849b3b9894efb50bb906c73cf066b551 SHA512 817f2a12ea42e3be1d4571336422dba6ae88a839b6feeb59d108f1470203eae5a01d0f8f235e3a98bf7c03b28e6201aadcc3d972f4c46f84f7b2e5a0753e4249
+EBUILD totem-pl-parser-3.26.3.ebuild 1913 BLAKE2B c250404ca3ad515f325550ee89f01fc80a88bd6133b3079a8acba60e7a398daa03a9a918ac035d55421606a2739f3acbc798a1222fcf485962f2c10372601cfd SHA512 cd406fbb1a0956500546c32225e0c467e996e7760726118d24f601afe816e8cd9a5822b00928264bf8cbe0705ee9e0c6a24d9d19fed706bd419d648ebc10e11c
 MISC metadata.xml 522 BLAKE2B 733f895375a3a264b84359f121bf92fd602b62eb562a37e5c5cf8ae7947e8138b32067d276cdc13f7a98f8941130fe93f0a5cac7d8f02ee3238ea7ab5cae4266 SHA512 07c6a9bf474a64950ba6e557b3df879e9c8399c0b09a9e7f585821ee540ea40b7459ad8b7c3af728e8201fbe50193417b3298f186c9caedb1b89b538c7c70206
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
index 39531d0cccb1..37f9fb14ce9d 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
 LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt gtk-doc +introspection +quvi test"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index e43caa03761d..929e607b4f2d 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,5 @@
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
 EBUILD vala-common-0.40.14.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
-EBUILD vala-common-0.42.7.ebuild 2524 BLAKE2B 678ebbd2039eec4e6e3d5ae3a7cff41fe78e4b372daabbdd6750c1c27ca2bc2c80d0b72a63bb6b1986e06867ab86620c4733f43666e7012aa4a3e5af9a96f697 SHA512 0d50c061d01fc6fc1d6e022b521eaf0daa8e1f5fbc1ad1bece67294a4f0e3ba02d3758ce15cd28e0b0730ac71850542b20a67bb85d1345c042fe8a601df55351
+EBUILD vala-common-0.42.7.ebuild 2523 BLAKE2B 2efdafda35a260c3a7e0c90af861712787aac0c4b61c1ead2b442c8d0b91ff86028314c1424aaeeafe2e8b67a6f78e06ec52c1ac59ac37a792dd55f5d744c619 SHA512 0027b4ee9528113a78a44506e94cd4fffed6ae38d13edbba2f4ca38432e5e1f54e7097f30285a34a7d846c11075c47fcd436ef3650b7b4e8be023d276bf10a16
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.42.7.ebuild b/dev-libs/vala-common/vala-common-0.42.7.ebuild
index c5c75b595683..dea39516a265 100644
--- a/dev-libs/vala-common/vala-common-0.42.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.42.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 5af7689743f5..1eb1fe9a4cc0 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -11,7 +11,7 @@ EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B d1b5198ecb2c78befcf92017ffc74e2626a4575
 EBUILD xapian-1.4.10.ebuild 1944 BLAKE2B 91d5dd19c21679b7b68691f90981c330be0b81f65887c90b0e781ee3943622067a91e850910256378bc47b832589be92115163f65d6ae64f5428a024b9c7d1da SHA512 47329f8de89aa602baeae23980ed3d3d7a23532c1102d5fc25b43e38ebe2f5029ad775adffc99759ceffb403b112809bea2a76c0e16556179b704b62b404b43a
 EBUILD xapian-1.4.11.ebuild 1910 BLAKE2B 0d5fac58808ad36c8abe25fdf09cf5879fe90312fe2ed04549060fa0f71914f24c18ca5846fa4c8ba2a3e9378a8f7b003bb82ce6fb97c7149b2e5334d3a77513 SHA512 87a01a8b23e26ed0a780293090ae5e08d4948814114ced9b41443b6b4b6a5b22b0688cdf8381b659308ab2b8fd68cfbd33ad154fa733ee0b2b844334d51f17eb
 EBUILD xapian-1.4.5.ebuild 1936 BLAKE2B 76f950ad9162610700da01eff6d6f33ab694d1e09b55b08592912323d70f67d09cdec09bd4f1c8316761c4b31c40e978eef683222cfbea90cb21b41cb9444f8e SHA512 6add7e80ac66f69ebbffd464d782ceefe23919faec529dc33fe53fbdc3b9cd17bfaa5be8b8580f2046601654fdd17e611d4395e262ef4a4cfe97aab85dc5844c
-EBUILD xapian-1.4.7.ebuild 1938 BLAKE2B 4be0206ef6d9b5861223f8caabf3369ceb4606566b7e69976508808aec3e373a88fc55f3fd3aa412462301783d2077cba254cbb89c2cd100d0d8aa3ab7b1fa58 SHA512 f49bfe603b15cb6ac73e7931171f6b5feead411be80b5c7580a1968b380e81573d33b5b3d3f4d3016977e4579a46cac52275af6cfb1536e96d9fcce70195929a
+EBUILD xapian-1.4.7.ebuild 1937 BLAKE2B 64996a418dcf2969c826deadfdf8b62474189cf1c32c9c017c1baa1d2ba2b18fdbe0175ff4f7d92347a21e78d4557dec0ac28abb50f7e432486aa52ff9373f22 SHA512 df6f4147fda42057fa70e9d144055cc143472657e5f5767bb2a27aacd95f09cec3e321c75501fe0cbea568141e7222d58990f85ac11141995045cc64aa065a11
 EBUILD xapian-1.4.8.ebuild 1944 BLAKE2B 6cc1549770b5283f153665c3b015264cd5ca3f6a173f3bddc509c09f14735293fa39ad4da9e761e92708cfd54c5dbadb3b056f4327d646b15af074e3757e50af SHA512 d33a78e9db80b47f09c372ed1141db6cda833d333d978af14abcd0026918217e8b7deccf42e286322a25aae04c5427e33595b93f38ae6e2787f09b8bc62a923e
 EBUILD xapian-1.4.9.ebuild 1944 BLAKE2B 6cc1549770b5283f153665c3b015264cd5ca3f6a173f3bddc509c09f14735293fa39ad4da9e761e92708cfd54c5dbadb3b056f4327d646b15af074e3757e50af SHA512 d33a78e9db80b47f09c372ed1141db6cda833d333d978af14abcd0026918217e8b7deccf42e286322a25aae04c5427e33595b93f38ae6e2787f09b8bc62a923e
 MISC metadata.xml 995 BLAKE2B 819460521f02526c8eed62539408148f86c76c0bc33c0104c5c3b52b0006c4396e7cc6b6458521398cd412a8e2e7f6bc34136e2efb2ac5effb6a854bb8642e03 SHA512 ceb0b1563cd98457eb65b42f39445d95a18b047e21bd9eb665caf5a83b23d7798727f0ba49042553e6b8e9a4ec88a2a4d7622c9adf8be50278bbb80aa0948fe8
diff --git a/dev-libs/xapian/xapian-1.4.7.ebuild b/dev-libs/xapian/xapian-1.4.7.ebuild
index 850489cd794a..799618ef9132 100644
--- a/dev-libs/xapian/xapian-1.4.7.ebuild
+++ b/dev-libs/xapian/xapian-1.4.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index f9a32582b86d..13c7c8d4a28e 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -3,5 +3,5 @@ AUX xmlsec-1.2.28-test.patch 2418 BLAKE2B e5cf92fd7f72be16d95fe67da99c96fc8e1bc8
 DIST xmlsec1-1.2.27.tar.gz 2013651 BLAKE2B fa46a25e3aaef432134d1c98a0e7bf0aba83f2ef6d1aff3774d6d37c5f6f392d1c2c11a0fe433ee910c39b56400c96b74ab061577948622b14a1116fa1ec2947 SHA512 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920
 DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480
 EBUILD xmlsec-1.2.27-r1.ebuild 1566 BLAKE2B 07937e208f8d123a8bc02efae6e83a0da1dc3c89bf8046e8e0f3e1b4378952e1071c71f2ce26230c97058ca4e828769565a5771d528ff20fbe648a6eac7fc6e0 SHA512 fe3ec7050c90a5edd33cc9ed6a8ecb7c03c8bfe71641897aac9f8aeab720bee92a565d51bda30546eb9cb603d399bcc654cadf832da78821e4f6de5dc772f126
-EBUILD xmlsec-1.2.28.ebuild 1374 BLAKE2B 36628d848821c460a3b7ee77822cc78219ac8471a86765783c90a1fce2ca74984ba2ae109db90170567eea5ebf6d5d51586fa81e426d546ec0d2818b4b628cbd SHA512 1bda6cc443d6fa8927755628bd5399be02e589722054acd76586d40f1e9e25dbff627934834b9795762139dde91e7178c4602dc474ece99bec3cc40d03b0cfec
+EBUILD xmlsec-1.2.28.ebuild 1372 BLAKE2B 6694591d9ead51d34ba1701adb642cfe14009032a8e04fa8bcda9a89afff7ed0dd6beb0a4c17e00d2ca0e67db2bc72c74f54295d777622d8cf833c7c1486d737 SHA512 7c4c195d528d89681930054f9433e18aa9772396274858d5fef10afa01ec6906c3ccdee99a7a34dde4a0899d0e51c8adec1ac4e46aa9dd04f44cb68e703e5bce
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
index 5f02c714f9a4..ff93864ba19a 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 7769c04db911..c566989e38ab 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -2,5 +2,5 @@ AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
 EBUILD yajl-2.1.0-r1.ebuild 929 BLAKE2B 3056d21fbf420a21a5fe3e8ba091b5d1509c5c270dd559faf6ba189c1770f5eae18adb40efc9c67bdc5f662eb94594e593943ec5c9938eb90370007f394bdd70 SHA512 ddf6476d025c541b62e831540a97c16a89706a51c61b1207afdfe52bd04c1175360e67351433158237cb17156e41446a81702e50ede4078a2bb67f08618deb61
-EBUILD yajl-2.1.0-r2.ebuild 971 BLAKE2B 9dddec9de04be2b2b7faad1ca29f5d80f9e8e9e21fbebd8a808b9941c967b458341e7f7bba3d2319622a27975d8306517d09a9c5c54fea0aba6a1fac72e38d18 SHA512 dd1c43e5126d0ec0bb42e18c44ce1acf03677a526c5cf533d0ddcfc1642d71dcdc741bafcb6e84f1f8db8b0382b535f373793cc84287126b56d7cb4b9ea74fd0
+EBUILD yajl-2.1.0-r2.ebuild 966 BLAKE2B 5861f88f62a9ce2d6725e5ac971d1a2cb6934cc5d6f2567460c76aaed3cf399c6b88284b439641b2f6e6f8164b33e630a1190f3a4c1a4f6bbd836c5ad83964cc SHA512 07922ebe0057094df5d077cd6cf068ef77558e7b4b74fa8dbb410d251d443492750cbf2b83681f5c65464abcf8169c5dd1d610e8d8c989d1040348510040087c
 MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/yajl-2.1.0-r2.ebuild b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
index 0e7ec004ef21..d90b251ae72b 100644
--- a/dev-libs/yajl/yajl-2.1.0-r2.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 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"
 IUSE="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch "${FILESDIR}"/${P}-pkg-config.patch )
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index d4c1ec529217..869bab2e673d 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 634a7a3d4c93..216d9cd2b790 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,6 +1,7 @@
 AUX bsd-sockets-test-1.2.11.patch 14240 BLAKE2B c9b9989c6dc484ba72877e5cfd4b69ded30b8801334b5cf95a4ff8544ef814f6777147a3d1d9e9285fd1a145c842fe73fc1f98c3b3d96d810346350efd46d4a1 SHA512 5da3fcb4b0e76abd218716b14d5deb1612b100761672216330105afb591c83408910a5de10e99e2f6d9372036c7f6897b889a9241ef84b0564600eddfba83073
 AUX concurrency-test-1.2.6.patch 1069 BLAKE2B a802300284267942da91ba205ce1a002da3731a7220b0b10fa77b8c347636ee2c2660b590bb18af565a083fb2235b9d3eafd66ba8796d6b7357d032403fb6115 SHA512 6969cec62ee9ee0ecb2aff34c854f51fd93b52f768ed1e1bf7cb3686c370c6e6b1d0691159b5d404f8d5e12e90a1447e6098ed83b0bb1ff4dc7f454f7052ec53
 AUX concurrency-test-1.3.15.patch 967 BLAKE2B 220bdd3ac1c40d2921440fb1ea67ec99f7766b6c33d014be57201502ed122c8cf12875be0ccd5c74fa14d0280a5ece8f63100971eca2f9ffb7a35dac1b7f17b2 SHA512 628429eacd8c513190229260fcfc8ce403072fb7b4bade10c3b65e30a3fc60f1057b018b7043590a205626f3e2f05b244ffd48afa864911d350d37aa84eb1a98
+AUX concurrency-test-1.5.3.patch 944 BLAKE2B 834a87327b4f414ed71b059416b7a76b6657a7696c4dd5daa9d2f72009e0593d9e77914240e02a79e2ff2fc2d5763f3fab1f80ba9e5bc98447a88e7497ec8a9c SHA512 f1ce896ce87878b054b5ea6a73b0980ddb2ab67cfaad5dd44e1c6fa8b6b67fe9cd4d165271540a136276ba5f327de8f9a1a30d7321406a06b5fc64b85bba21d2
 AUX gentoo-fix_install_man.patch 399 BLAKE2B f0f04de59f5ddd69a54fcfa5feb4c8038e7e37c923d8ca93d061b642cd01a39b9d1a0f54b00a8a1fbc654788d0224b4949bf225e97048fc73fa2196969ae3496 SHA512 bc5118ddf2fd851dcabf773cc7443fa0d3f5a5b83715173110f9164c631faaf8c2d6b247f7ac205da23bb388ff459eba228deeaa2a45202870b7f97376564030
 AUX sb-posix-test-1.2.15.patch 1325 BLAKE2B 051500de2167bb963c6b20cf8f57a03e9326e9e8c79ce249fb23aa7f041c62384717d545f2e6aeefac900af9c27f640218543a218bf902081bcec69968108df1 SHA512 79fd75eb5c44630eb6669b1808029420c7031cc1ba367b8687d7433bf0d19016a7912df0ab21c90aa7e709417ec9784c846c7dcefbc1308a059cbd8b3209dd27
 AUX sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch 1024 BLAKE2B 73899d54f3951347f3b1d340f1333fee2480816ae601299bebd3341598d98d7cecee1de246e1084427c97863b66cad8ce4dd88a4a0ef1390871592adce3baca2 SHA512 a09efe91a082fd2bed9dc30652f3e5ed51e416697b7b2fee4d6c5f90db0ecbadca7adf652f532d79869fde9186e9d16855f5fd81321cb2a82e1a158d4cde9e97
@@ -33,8 +34,11 @@ DIST sbcl-1.4.8-x86-64-linux-binary.tar.bz2 10353701 BLAKE2B 5b56f46fbdb87f015ed
 DIST sbcl-1.4.9-source.tar.bz2 6051607 BLAKE2B 8abcaf73233ea1a23d47987b16554636dcf94acfbc7ab731f0730fdb4a8176593fb3ab52d9b25b3dd56753cd984f7e0eddb1585a142eb7ad1aa5e3e03d7b0ca9 SHA512 e0248f460f9737d47653dd520732062d2637813b550df356ecc90aa6d21fbdd74f03182d1e890c09c1da742f7d57b4fbd04a4e6dc36999aca51bb6c2952ac236
 DIST sbcl-1.5.0-source.tar.bz2 6257355 BLAKE2B bbdca91c5baa28e4522bf37be041a2f7e8237d15c700f49960516e578ee7509fa3959022df3a7c3a4125bc2893f99d0a839a02ad484d5061cccffe900a078baf SHA512 c09fb26ec7abdb5275165806c61000bc258281d9e745eafe67ac5a6542fcca2741395de5f39aebaf140d2ec9a58327e883fee8a6c4f320f4cbbd204806b7b5c7
 DIST sbcl-1.5.0-x86-64-linux-binary.tar.bz2 10487197 BLAKE2B 48e87b24ef0681cbeb9306c8b28516d312c076ae9c2cc0f6e9c0100a24a445b0884ce23e06868783b9166dcd89bf2d0b0670b375967beb2fcbd4d2a203db428c SHA512 072fee950131d0327a6d44a2c808a03eda6a4ab36b8ed1ef9b9ca48662fe11ea62662b007d5e579d06b84424db8db682d831013f68fe028111d32085187160c1
+DIST sbcl-1.5.3-source.tar.bz2 6343923 BLAKE2B c7b04fbba5563270037d3abcc3c4a2def210721cf7fcf8da9a3133f8079fb4a512b01f32c47d22c9abce27f917350ef9cbaacd897a32a30c5f74ee55db91191e SHA512 022af0fa74701c530d98816b0696f5db4e8fc9a47b10fad17952239f77f160a1bc6791bf2f18e02ddbe249ab379d458ee8cee817f66dbc26dcbbcc855cd3ee21
+DIST sbcl-1.5.3-x86-64-linux-binary.tar.bz2 9920503 BLAKE2B e22750a5258c6a31378487ed20410d689c05792f906d37d73501ccbeac236f1296479ca2dec2d1ad40e38a00a3e3f3ff27a352e96932d89a76b426734bca0213 SHA512 9ff183529cfeec6ab7a1b5fb9f727463ad497333d1f6a75d1501c251d19e0510490743ddd8a3075d73854160fa5c07ce9b6e29011c6991a7851ba35593b0c735
 EBUILD sbcl-1.3.11.ebuild 8382 BLAKE2B 7df1cb22c53debbc4f972fd230bd4cef1132f234946a06309d6bedb3bc9a8c51b582ccd2e671895bc270985e3ce82b4aa56ef21a4a31ca1b91e98318e560f2b4 SHA512 d6b00cc75cc3bc55be589d4e7690469e1ae8d8c00174ec67d83eff42f977e0840a97c22550be732ce0335b38d38b0429f0a47d9cf4de25402d91ea7814c3c351
 EBUILD sbcl-1.4.15.ebuild 8712 BLAKE2B 655b61ca34a0511f7231e4f755cdc3ea6c5926a29ab2f38334bc5185bf36409a44305d4cf4192016474300d16d18f3dee91530a91b176e61d3e87246f0be594b SHA512 5a26bfb7ed4d28d7b7c3556b8bf00b11d268a9437cf2323e779dfb5333ecf4a1b06f2cd17f76bd4737ccc95dcc58d4985d8d34edf1383e9e5aa57ef0e267cfd8
 EBUILD sbcl-1.4.9.ebuild 8663 BLAKE2B 1e8a9d0fe96a4640e7b69b55c087884bd084ab2dd1ca2ce57eede21e7c4b0b7ca91174ff1f2ba6abf565bd3c485e06ec0de7678104dd56d72b60eee35bdf5152 SHA512 db38534d9f54e92ae630f87751cbd7150ba1f6dac79df203df432b0edddb61a4ed8096d471e05f011cfc6be68b12777a1cc624927c35e0942c6bea2ce0c10e91
 EBUILD sbcl-1.5.0.ebuild 8666 BLAKE2B d2caabd151b38082ae4ea653d4cd68b1e89415b3faea7a26f4e0ed448420acb12c40547554a28331348c8a8ef0356b83c94246692b1dc8af4b2a4e294953f2df SHA512 40203ae05cdf24c23c4f9f1c9a6339fb47352031daea35504fcdcb30ddd3d9d17dace353fc376fe41bfe2d0c455dad9736f640d2363a14e503657bb6b7705fce
-MISC metadata.xml 1545 BLAKE2B 6ac4ec13b49c7cbbeb17685711c51c0cbcfa2be86062380dd72f78c05edf1e61880f41d5ea3c38c2f08f643be40e38e3a63a1da538f2c6f578877811ecf5f41e SHA512 a1099403e6672d31e2769d6e90fafc9f31258daa53f4838c05e1ed6be035a192f3f6357065426f24c34f996ff759e2285b66a6786baaaf725896b37bde66943e
+EBUILD sbcl-1.5.3.ebuild 8665 BLAKE2B 1b7c9a542bdc395cb8c5d869b005e261276043abe1a87e9f5fba10e65413e54dcceb0e4e918e8a2cfce63d04ca174b40029d3c572ab9df83e29f5a9377fb10da SHA512 fd58ffa6aa58ee8b3bd059317e4ccd4728150b09073b1b11d66b27c58e50a837d06d80148ef4c440c71e036dd5bfc8dbf44f32711badfa6cd57366b554093288
+MISC metadata.xml 1312 BLAKE2B a03042bd9d39465fe7ae45d6b749571fc4d22cf9d7f81d3cd498b155729576ec1f2ddec03c2c662ecb23abfd19a627ba2cbe9798960009e998a8823902062118 SHA512 3c4463de4a8871ab56fe74c286977fda3037e953d5fa26162d07976efa00b0d99bc98295435a7c5233c43b27369e31eb5d1c0b4c66600477a307aa1a7a322e1c
diff --git a/dev-lisp/sbcl/files/concurrency-test-1.5.3.patch b/dev-lisp/sbcl/files/concurrency-test-1.5.3.patch
new file mode 100644
index 000000000000..8c2e89fccfc8
--- /dev/null
+++ b/dev-lisp/sbcl/files/concurrency-test-1.5.3.patch
@@ -0,0 +1,17 @@
+diff -r -U2 sbcl-1.5.3.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-1.5.3/contrib/sb-concurrency/tests/test-frlock.lisp
+--- sbcl-1.5.3.orig/contrib/sb-concurrency/tests/test-frlock.lisp	2019-05-27 22:03:04.000000000 +0200
++++ sbcl-1.5.3/contrib/sb-concurrency/tests/test-frlock.lisp	2019-06-01 11:41:21.260384857 +0200
+@@ -26,5 +26,5 @@
+                           (read-count 1000000)
+                           (outer-read-pause 0) (inner-read-pause 0)
+-                          (writer-count 10) (write-count (/ 1 *minimum-sleep*))
++                          (writer-count 10) (write-count 5000)
+                           (outer-write-pause *minimum-sleep*) (inner-write-pause 0))
+     (let ((rw (make-frlock))
+@@ -89,5 +89,5 @@
+ (deftest* (frlock.1)
+     (handler-case
+-        (sb-ext:with-timeout 20
++        (sb-ext:with-timeout 240
+           (test-frlocks #+win32 :outer-write-pause #+win32 t ))
+       (sb-ext:timeout (c)
diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
index 6e4e604220ed..031c80402d9d 100644
--- a/dev-lisp/sbcl/metadata.xml
+++ b/dev-lisp/sbcl/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>bugs@cddr.org</email>
-		<name>Stelian Ionescu (fe[nl]ix)</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>common-lisp@gentoo.org</email>
 		<name>Gentoo Common Lisp Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>Steel Bank Common Lisp is an open source Common
 	Lisp implementation. It provides an integrated native compiler,
 	interpreter, and debugger. SBCL is a fork off of the main branch
diff --git a/dev-lisp/sbcl/sbcl-1.5.3.ebuild b/dev-lisp/sbcl/sbcl-1.5.3.ebuild
new file mode 100644
index 000000000000..35e36b9e41a6
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.5.3.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=1.5.3
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.4.11
+BV_ARM64=1.4.2
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_PPC_MACOS=1.0.47
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+BV_SPARC_SOLARIS=1.0.23
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.5.3.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch
+
+	eapply_user
+
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 96b25ee1d9a5..1af04e854ac8 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/busted/Manifest b/dev-lua/busted/Manifest
index 7231d0fa2856..496cb68a057b 100644
--- a/dev-lua/busted/Manifest
+++ b/dev-lua/busted/Manifest
@@ -1,5 +1,5 @@
 DIST busted-2.0_rc11_p0.tar.gz 48368 BLAKE2B 3e4534795a4d6bd816b9879d447b82e144f738f3601856e5c9fc5419a6b8f3cb57a78a9ce6ad90990c1abe9fe0974b809d10a942b5f4930b4120f98d34de0dbe SHA512 f09cd5ad2be05b37254e9d602433639340b020e0670e8a435f1ee1d312eced37e284c2f5a398d7a0403fac0023851b74dbe659373e495c5354f48baed814c4b8
 DIST busted-2.0_rc12_p1.tar.gz 52404 BLAKE2B 51f12aea26d6b0909fdbf8953b316814ff8cd76d39358a26eb785ac7541acddbfde1b19d2e41c9e966a604f8f00b9517181f87264a76a4ac7f9f8d6008c87692 SHA512 0cb1f6a66110514dc3675b2e667cca676e6672e895b57ffba438e89a1e0a7f4f8f941cab54ead905758987be15e9885e1eeb82baabc9d18bf29ea56b832b89b1
 EBUILD busted-2.0_rc11_p0.ebuild 1021 BLAKE2B 6be1c981d3259907dcbd7878c11f6eeb9894ebddd9eda8559881c087bec7e4a1f7d8016765920148defac4644bef46f82b107b4136866e1377c7465f184431cb SHA512 47e1e443cbce25838a3647d2aadcdf244219abff50be7a4cac51906a65ee8dbe2b122145de4c84cd18384c5aa1c4b818d308bb733a4af77e16bff9cf15b16ffe
-EBUILD busted-2.0_rc12_p1.ebuild 1039 BLAKE2B 56d68e801602c894b362319de8af5156cd3014f23590b3e44051c29ad7e899f93caa48302bbddb8812b45430bb8871506acdadb67f43b3d1434c818801039380 SHA512 3c40cfeef20cc074def0da6f6cb64053c23c359d90c1a4d6e40b84e113d9b2667c6acd69a301eda3c0ca935289e33c055b70a2f25686906af151b23311dea6ab
+EBUILD busted-2.0_rc12_p1.ebuild 1037 BLAKE2B 51659b876392952b2a23b9dd99cca97e1b7ef48b0e23760206a0f282a4e4892afe93f743b611732a95096431627c4196119115af8fd3f7c3030b3588744ecbf7 SHA512 af2b746bb71fdd39e34d82c6b056919665ae63abbc1d7fbef35610a2b65e0a9300a905771f15cb1b9a512b14737c1c524a3aba19d3b4ab4d4d29c4758ed59657
 MISC metadata.xml 652 BLAKE2B 97daa2438be52bd6aa462673572d6b1efce6331e9dfbfa5d3b2915619661ec2b359c6687c5aa294d66eb089e152e93c24f1c2f00dd8ad9dc9d13934fe8170883 SHA512 7b07510891c5df25357c17f05de4bcbf1ea54f44f9ce06507de70ae9ddd835bfd20d1cb4bd3787ffb9ffeb88b238bc148b5c5ffad7abb1853ed0517b03a7d122
diff --git a/dev-lua/busted/busted-2.0_rc12_p1.ebuild b/dev-lua/busted/busted-2.0_rc12_p1.ebuild
index badb36aa0024..baef07948bfe 100644
--- a/dev-lua/busted/busted-2.0_rc12_p1.ebuild
+++ b/dev-lua/busted/busted-2.0_rc12_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-lang/lua-5.1:="
diff --git a/dev-lua/dkjson/Manifest b/dev-lua/dkjson/Manifest
index 3e9adda63b9e..6726cb103c6f 100644
--- a/dev-lua/dkjson/Manifest
+++ b/dev-lua/dkjson/Manifest
@@ -1,3 +1,3 @@
 DIST dkjson-2.5.tar.gz 15799 BLAKE2B 25cf9aa3d00d87b367096dc793984766d7777c98ec9e97c5bd72961fb0141bb1ae94682f3719d11bde52104a755636de546fe8aece0fbf7147045175ad8bcea9 SHA512 ec9a226c3a94d7561f8f51bb0e6c92a64385b0d8baf83de862cce7e1c302d900bff723be23e4b5b4c3c2accafaf8d75d4b0842e14b2e41390a3f9761d46a38af
-EBUILD dkjson-2.5.ebuild 644 BLAKE2B 2d5d932b9228ae1e5f805f33c1ebec98ffce56966881f21feb7bee51b75b9ab877f65eb8cc549cb55c851f2d3540fad8e1d068f66261ec001b9f5779b1311d47 SHA512 cb4918107c9329a5b367644cc52d1995ae94c311214f310193f4a9eaf9469d9e3ac78c77a62b926db4ed5c2dde33fd706f686435c7cab21811ac62ccc038fcb0
+EBUILD dkjson-2.5.ebuild 642 BLAKE2B e759f543433a80f3628c02c963f0310981af35a26ec825fc3f0f787db50971433c1f4c9db4e923ec5c50eb141a30a7d3c2d9bcfb8a033bd39f1ef5bc5400decc SHA512 c45e0b133fb9e7c49c29dedf66a5655ff5972a79251ffe6f321d072ad35ade068ee64737ab3d7dde28234dc545d25ad35a14f3755c5938bb32520f7978f03be9
 MISC metadata.xml 620 BLAKE2B 4285a62df1f275147f5b5a40d83bd570d2458b8f8bd4c32957b9a52364b6bde7f471e4fd6ab58ed80bdd648e5c28fea4038ae63ced6ed7dc9636ba11d3c44f8c SHA512 e224d3462b86cd9c66705a3ffdce9861c03f3cee050e851c8f9064c19a6257ef1f5f18c125b7349d495a343fb9696b408523cccd09cd99be6ed599d9cb45238f
diff --git a/dev-lua/dkjson/dkjson-2.5.ebuild b/dev-lua/dkjson/dkjson-2.5.ebuild
index 5a85310ded6d..84633d383c15 100644
--- a/dev-lua/dkjson/dkjson-2.5.ebuild
+++ b/dev-lua/dkjson/dkjson-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://dkolf.de/src/dkjson-lua.fsl/tarball/${P}.tar.gz?uuid=release_2_5
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-lang/lua-5.1:=
diff --git a/dev-lua/ldoc/Manifest b/dev-lua/ldoc/Manifest
index fa497e81174f..bc5afae7d3de 100644
--- a/dev-lua/ldoc/Manifest
+++ b/dev-lua/ldoc/Manifest
@@ -1,4 +1,4 @@
 AUX ldoc-1.4.6-mkdir.patch 230 BLAKE2B 672617f3a20ff6f74be02db5402288b4900f2d9d52a433ec9085f2fd2ce629609b9803732c50da6da252287efc7280895c2d3ce64ad4a30cf017e893ea2c5638 SHA512 5c047b48c987d107cf810dffc615ce29e5f2192b927fa91260dacbd2daee92c9aac5eeee0bfbccd9972d47d57928c37a867b9c2d453a7c845793cab0ac01385a
 DIST ldoc-1.4.6.tar.gz 126080 BLAKE2B c43a79141ce557a54b9aed3c7523b206bec85602d858c72373d650a70e1741b545b2b9bdd462856c7e16af97f6a5eeeeea26375832f678b52d9e9153547076be SHA512 bcaddba4e462a4fb0aa0d8fcff390de3f195fa5cc569d8f05b84ad0fff900f5ac945be7a2eb15cf5ca60cc462f02c874579e4a19e33776178a04104ef9d944af
-EBUILD ldoc-1.4.6.ebuild 522 BLAKE2B 881d1bf65fd3befc836981f9e50c8f3c80c0054dbae4ba00f1ea38744bcd384e9855c6a6be59f6fa7d9ccca712fb8e9cc6592ca5bf91946c8d13063a390403ee SHA512 b5e290b87ff96172b25b6bb16454c5d1a91a1acc610a1ed431b97ea3fdcb18888d22d8180de2048a1a9af5a6b99eb3a4ad16daff3a87e2ccd6393062485df028
+EBUILD ldoc-1.4.6.ebuild 520 BLAKE2B d0a7c5899ea580532d48e0e2d9cede5ef4daffcbb20f08d26bdec60df9fbfebf911c8a9c7700a69df58714f4756c22be724b62c8bf1be4900389fc6c5750e192 SHA512 75e0c64c039f66ef5adc12d1e61b641306672710fcdc279178648a28c8e2d03faee636c8fdb0963fc137023685f6c5944822078cd71e4e710a6dd4422d733b2f
 MISC metadata.xml 359 BLAKE2B ca63526d6602c0350130c45c2865b1ace204ca51f8b1a0d181b40ec8a7271108909224b87a73fab4f0940924221c6daccb5b9d5598a8ec7ff8ae68cbb604935a SHA512 b37aae3ec02e9f6ba8c2b0b75ed8442a9d96cc8f6e4933ed96f15b1f8310b30e7a34d9896d4168d6aa1e5e79763a62ed59d0c23f8a5f5cda9e220399a0af4891
diff --git a/dev-lua/ldoc/ldoc-1.4.6.ebuild b/dev-lua/ldoc/ldoc-1.4.6.ebuild
index d7606c55a136..3dae07be9ce8 100644
--- a/dev-lua/ldoc/ldoc-1.4.6.ebuild
+++ b/dev-lua/ldoc/ldoc-1.4.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/stevedonovan/LDoc/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-lua/penlight"
diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest
index 594578fa4c4b..011a1985aab3 100644
--- a/dev-lua/lua-term/Manifest
+++ b/dev-lua/lua-term/Manifest
@@ -1,3 +1,3 @@
 DIST lua-term-0.3.tar.gz 3752 BLAKE2B 6d42129b60278a4bf756195bae28529a9a22688945ecf6c5648ea490645de363799e4fe5a188069e3739557c3b45ee83e28e315cdd69e987f022f28e3a673cb2 SHA512 e91585994c0337d4dbdc36f51cec9f66fe7319212e82c56752ed724bbbe273e4dc67977bd13e7963545bb075f23f69a448dfc4cc4d6c3c49e96af99cd3eb59e7
-EBUILD lua-term-0.3.ebuild 1048 BLAKE2B 624ffed02686227eab957c640b76e15578d1739054327d24c5c73a928d627728bed87237e43220a06a0f00b64c8ee4b2ed66b749e12403b9c07fe56d23df09bd SHA512 2cd7eb69513ffd956d6b376a7d4555d97e05ba05c054792161f3fd00ab10bbfbd4de322de38ad78e6c005238c3619a69549b1328e1752c313ff83249a6cc5834
+EBUILD lua-term-0.3.ebuild 1046 BLAKE2B 77c1acb0eaf7cad9e72c6d4e09e52a60078ffe2e8da1d8d119c5083d6fe3b0c493cee7aba008562dc56997ebda0f1713151354ed633dbd7d27389755bfba841f SHA512 060e77c10f7a78844361be521ffdd0996b090bf7a7413b8c85dcf8f4488cd3cec1c1d61991a64c6f3d64e22c092aa5cbac00b465c91f8b2c06a2791daddc7f39
 MISC metadata.xml 329 BLAKE2B 53838f32093f301c09eca7e323feeb35d9ceee5a2a38fe0902bafd8893afed48e8b7f8b4bfebfa183cdcabc63d654b983658ae69c08c640cb97239c5f15ea4b9 SHA512 927fa93e0060fdb183c77425cf3716dde54c4b2a6a4fdbfadf9a8bbeeb186b55ac93589003c8259382d3985075e9ef4239c3a7be359bc704cc6d3febc3c8f89e
diff --git a/dev-lua/lua-term/lua-term-0.3.ebuild b/dev-lua/lua-term/lua-term-0.3.ebuild
index 3889582bc2c5..2ec69903c2c6 100644
--- a/dev-lua/lua-term/lua-term-0.3.ebuild
+++ b/dev-lua/lua-term/lua-term-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/hoelzro/lua-term/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-lang/lua-5.1:="
diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest
index 3dade8e70a3c..93c585f184cf 100644
--- a/dev-lua/lua_cliargs/Manifest
+++ b/dev-lua/lua_cliargs/Manifest
@@ -1,5 +1,5 @@
 DIST lua_cliargs-2.5_p5.tar.gz 19513 BLAKE2B 25cdfd9e96fd0cf5d600394c47ec53dd80e619dac8a37a40e22366e1090ffc9f9f250d71683140959fbd33b3983a759c931c3ac70a3f14e9556005fe5f82f72c SHA512 7c4d490f5d86b07bdf299c976b99bf83c9ba86fabeb321f348587f8ad207983292e3e9268ef72f3cc6ff9d6e32a43669de1d3c21c47499852f971c2cc2a4e746
 DIST lua_cliargs-3.0_p1.tar.gz 29904 BLAKE2B 4cb3e33c0d1331cb9c6cef9b8db67c12cfd3678277e11b6218d56ae38e4678dd48472d65dd959b59bb44d5c42c1e64697fe4e54b67e80933ab706d9d2b01c79f SHA512 2bdcd3c790a82351df598cb3d289de980fe771222ebd9715036678eecdbe51b7563d24629afa4d286b900d722bf844004d12f2330744a1e644d9286ac44b4dbe
 EBUILD lua_cliargs-2.5_p5.ebuild 876 BLAKE2B ba627334a770918356cd474f97b7b8f39bad574cd26ecc7de552db033920797a709d78285dbb7940c4800a690133a06d239b618c9635ecde5c2e2367b65c651c SHA512 00571f5fc51ba97a5affd68efa419c47e8646e9cb0ae1d99f085b0a0032dcfcf42b58e4405b7143a7f4bf114b136013ad5e8e5a7986537439a3517a2fc3b98a0
-EBUILD lua_cliargs-3.0_p1.ebuild 908 BLAKE2B eebb4c29f5f329880cbaff9ab08b0b73974c5d7ab0e13978fc372051f00ea9d72f920d6c97d63e5d7676aec52a0bb14ebaaa59479ee9e46bc729cd4324a85853 SHA512 4507c655e5b4d70751ac0d23ec961e21586f9fed25c27c4388965277ca64c95b107a10ffdb37030f44184756fb499b2320d848615f77e8d93e64f56258c0e035
+EBUILD lua_cliargs-3.0_p1.ebuild 906 BLAKE2B 8e1c46a73b29fd61fb06a5fa8fcb202d91df30748e6ab0fa24b2e3befb930c051c451aecaff0847f4156c68b82dc26a87c55dc61a25d91eedf84fb3e3dd451ec SHA512 24b3b938bf998a0c12a48854356d6854c40ce06c73f9dad9c276f1cc69cbee7cf9612440ec045e8584bfe0b7908dafdf6c49a216ff2febbd6630c3d2bbb684b2
 MISC metadata.xml 561 BLAKE2B a38b859e36bacd5481ca588a97d39f3353aedeae25b219c7b6e24353979c659407088e9ef16b71d642c19e26ff628f314ec0fab72ebd55a7fa42d0f0f32638d4 SHA512 da9b4c1e00524c0cc7963b0339a18f0b2fe254338269b8fc77e790ad26704ef92f450859838d7e0730cceda34ed34548c367659fae27302fba02252636537c59
diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild
index 290638a54981..dd6a99c24ac3 100644
--- a/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild
+++ b/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/amireh/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-lang/lua-5.1:="
diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index 911272040993..6f8cef1ca6da 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -1,3 +1,3 @@
 DIST luacheck-0.20.0.tar.gz 132693 BLAKE2B d485ef841c00241023a9cb9bd0e1f994da3b5e79dad01281e0203e1561f788f8d1e8db97910d3a82ab3daafb3dceef1fe2897beee9f16e71350fdff27eba7fe0 SHA512 08b1a64849b329e6ad71b1d7011fac0833de068641270adaa009e9a17139968ab73add3786a508a8787ce1fcfe1f028a35b5434221e4f1f62bea56833e0e65dd
-EBUILD luacheck-0.20.0.ebuild 1030 BLAKE2B edaeb123056b1030dce4eed8570c8c55e5e41fddeb778260997fd4f52741b4aab1b139da4722da21e9cff729213756e95b481371250528ccd081fb531c0a7834 SHA512 141ae64d7e4b95185ec9e77b3e74162cf50e74f310deb2c55092083c66d43a557be4a79fb059397331ea34fdc134a78257ce12da3ef301965924ec8bf3f71107
+EBUILD luacheck-0.20.0.ebuild 1028 BLAKE2B 3ff126a0cfdd152b870cdf538b1ae753a677f362643345d0637878d4b56ca357bf54dc3b34724d59d9d70f182a99684cb707c8a68cfb153da59b2f298d3a957c SHA512 d9d09fa295c310992f96386d1a79aad975b857598de688dbff826e8148f8d884da07630deafc3200f051858a58d196a806ca0bde6c8ddd0adafbfb52a1fa4c8d
 MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-lua/luacheck/luacheck-0.20.0.ebuild b/dev-lua/luacheck/luacheck-0.20.0.ebuild
index c0b0ad1d0974..0122b526457b 100644
--- a/dev-lua/luacheck/luacheck-0.20.0.ebuild
+++ b/dev-lua/luacheck/luacheck-0.20.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="doc luajit test"
 
 RDEPEND="
diff --git a/dev-lua/luafilesystem/Manifest b/dev-lua/luafilesystem/Manifest
index cc14b5f1090d..dd4ef673a32b 100644
--- a/dev-lua/luafilesystem/Manifest
+++ b/dev-lua/luafilesystem/Manifest
@@ -3,5 +3,5 @@ DIST luafilesystem-1.6.2.tar.gz 27886 BLAKE2B fa13cc529f3ff2b5c5bbf082c5071d066d
 DIST luafilesystem-1.6.3.tar.gz 30389 BLAKE2B 412d2893a59ccde2eb8912523bea4d06d4f140dee2f47b5e8e9795d1ca950a4be93a32eb5632775277ab2c2c22a9229c9f33d062e0d1fcd5397178962b96bae9 SHA512 47a2637903c9d42ce3ab7cf3e27b6457845aeed7ce90c0fee964ba9bf9eabf6a6eea940f960713f6b982f1b64167dbd5da8f217281284143c89e3cc5488b8404
 EBUILD luafilesystem-1.5.0.ebuild 791 BLAKE2B 6a7afcc5813045631d933abf2932d123e15c457bb014eff30c8c0a464a3be60ccadea38088d2d491f2bcd69d6d8ef1cadd1c3dc63653237d4634c9a266bc33a5 SHA512 687ca25601f8fe1822576be9c3724ece8562cca30c79c37f01da4378f7faec59731ddf7364ee10a5f4674c9d2c16a6ae440836168dbe77b1c1cbf1f17f220291
 EBUILD luafilesystem-1.6.2.ebuild 768 BLAKE2B 3493601326a2813f4ee4d7678d3bb27e28be66754fa5afc311e06a1d6710cc6df0da558e55d107577f9bbf73600fb43d8afe7a2e461180c2d4791fcd90bbf8a8 SHA512 36bb54693cf2d0dece4a8e704ac43cc18a58b9b9b0e3b2eefec074a1e7be6d34e1069f004afbc1fa806196714f29ffb6ec9eb0f9c054526bd880d31b95333aa1
-EBUILD luafilesystem-1.6.3.ebuild 1143 BLAKE2B 35e59e33233f133f324aa93be56b2c52d007f7864de43fe63646024db8f5c6fa889a134cae2e213a3e00abdbcb25adef638731b1a1fc82f3ac0b2861afbe3f36 SHA512 bd4c6f0d72e0a3a48a85aaf67615abf15fb445c4d8b463c8ce3396c65400e674ceea6c6cd01f11b373fb53f1cb86b50c9e48d8597643edcbe7dbd85dd807e530
+EBUILD luafilesystem-1.6.3.ebuild 1141 BLAKE2B 49cb8e2a0d2d12326b638fff9802906862890b7aa6180fd2048736f2f19d7959af4933448c26e4fa7cc4a0d1a4c44165b14b91bd9af6341fd968b25223d64752 SHA512 85cbb7038a8783cb9de11d3ca0bcdc1d4b27461c409200e5734d70c3acf1cdf6d9ead1bd2896e30d790fc9b53f61cadfbd9c1c863627489cc3b60062130c960e
 MISC metadata.xml 526 BLAKE2B 0c439a926e2d4658ac91b70fde013330186edc0978772dd636d88cc332fd536c38ebe26f4d4ccaad0a3397434d699bc55249cf0feb199546681540379a69ee14 SHA512 4625115566950198cede510f5db34531fe6c0ec55d449868f5d99ff524223a5bb0d666197ffdb3bd22c887db26041022956d8cee361e2bb31a2add67c4902a22
diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild b/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
index f1c996243aa9..7efb3954a6b5 100644
--- a/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
+++ b/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/keplerproject/luafilesystem/archive/v${MY_PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86 ~x86-fbsd"
 IUSE="luajit"
 
 RDEPEND="
diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest
index 52398f6ce9ca..6b618254f346 100644
--- a/dev-lua/luassert/Manifest
+++ b/dev-lua/luassert/Manifest
@@ -1,5 +1,5 @@
 DIST luassert-1.7.10.tar.gz 35789 BLAKE2B c9aaca445272957a5d67d09700f6dc4c1c6c191d3ea274b97afe874f2f5ea1dfda051bd5674d33b9c040e55aed05f2c7baf01431d762223db57cd05b1c4a68a5 SHA512 2d5ca354b5f7b971f0d3420c305d921143cd7f9e1a6f4559cb466b833886a00a045e7b7c594bd9ec3c929b3d5bb8a7a4a6de75a6599e5cba7614b7652061bf05
 DIST luassert-1.7.9.tar.gz 34803 BLAKE2B bcaacff85ddd1c85b39241dbd2c7eef28f3697318e2a942521dd60eade5dfc9da9f0c69d570f5a9556b49609f1bb79250cec9ba39a98e4a65627d6479f9e2f2a SHA512 4e1257bf7adaa9002af7c6ac15f2d042c9094ceeae9ce065c51296c663a99fa239ac8d37f106151100478cde8c68d3290b42588553ac681d183e7edef288414b
-EBUILD luassert-1.7.10.ebuild 851 BLAKE2B 9197497573093e3b63a8f9ee1b520802e8496b6552c7625d2e9864b13fc692fe4af0b8323facb41e2834f07fae14010459408ee8a84e020f06a9375697c14092 SHA512 1cc85ed10b6cfd755581570e60d37221e1827491190d1924ac017f0e62fc8d82ca75b07aa2f8d800d37251e049dae5f212efbe7c522cfe2abf6b51f4bc4df6e4
+EBUILD luassert-1.7.10.ebuild 847 BLAKE2B 9e997a860b78e541b3056f5d0ab5b68ee02826b78177fa84c06dfbbf81d4ae530b4c0321542bbba3586177a81b0bb66fd3149ef2617ae0641a6b89f9e68f6dda SHA512 505494a5a586c0e0d61c49282d615452b5a7002b2d461128ae0cfe0d039f5371dfa101d8c1c6cb84491ea36430ae15684e119d984f41b4e6c5ab7114a3c15ac4
 EBUILD luassert-1.7.9.ebuild 609 BLAKE2B bb29a2069407537bd1e0bb9dc7561951c4615c6405108d11f83fd8132d032e0696f16be288e365a0b4201a41e45dda36e8b360313d58d1b7b0b58628b0c62b59 SHA512 920ca16cdb8eb819218d6eeaf97fcfb18777f68963cc79249622e856b7ef35cc8231e7436c8cb84a673ea50ce20dd95960834be0f19d71c2041e827a3f51bd9d
 MISC metadata.xml 497 BLAKE2B 009bcaf2379e9d29771f83aba63ad50ec2e9e02a328e9605a8d2e171e43e59025aab51ba876206d58f86fd7d0e51a28e9d0d1851f0cc4d87c2cce02e11b048a6 SHA512 8bb0c5cc23259fd9e259620ecde2b377220b3d8062b5229777d811b3827a36d770c2518245009be328f932a5fe6f84ecb719d7e9ff604d7cb4524d9a59811f6b
diff --git a/dev-lua/luassert/luassert-1.7.10.ebuild b/dev-lua/luassert/luassert-1.7.10.ebuild
index 4491944cca6a..8a27ae75e261 100644
--- a/dev-lua/luassert/luassert-1.7.10.ebuild
+++ b/dev-lua/luassert/luassert-1.7.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Olivine-Labs/luassert/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="luajit test"
 
 CDEPEND="
diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
index cd149a033705..62599e94b990 100644
--- a/dev-lua/luasystem/Manifest
+++ b/dev-lua/luasystem/Manifest
@@ -1,4 +1,4 @@
 AUX luasystem-0.2.0_p0-fix-makefile.patch 829 BLAKE2B 03d7eae8746d38837056b2d990491da070a6ff24a78c6eb1bb86ac583e93a32c4576b956fd06836e0088dafcffba155ae254eb3273230bf84cfaa90e70464d45 SHA512 7123c427527788034cd2a5f759f5924bd00dc2ca7a2071d986152f535a4da641887e75131ae7d6afe39d82b4c71c84796cf52a451603db50a21ad99f061c746e
 DIST luasystem-0.2.0_p0.tar.gz 8058 BLAKE2B fd29eaec7fe2f49e933932a436be75678400fc55a275e412379e05ab5b9cfe2036dfc9e61f960caa29d3c4ab1d439f9ede7ff3cbe14a61287270cc3707660636 SHA512 b8c7ba30470cbf100cc3f14df31729778cfb0aabebe4d27ce42c19581a2585f878d86a29a2f73fd1bef4e5861e2a604d3c396a73f131fa99ae14a17cba52c336
-EBUILD luasystem-0.2.0_p0.ebuild 1047 BLAKE2B 858896c4042a5538567064cfdb879af1b3e348fd690da7a50d87425ba3ade2ff01f3a62e9ab71f94923d60154995f5e2e667bbc8eef5e5454f20c3d3246d1bc0 SHA512 27ef944966a27de7a60ccd13439d404dacc11cdb90ebc5f5858c74470c5146b148d0b24d0248d8800452ba75b4f8bfc12492bad5d2816c72921335161fa6bc8c
+EBUILD luasystem-0.2.0_p0.ebuild 1045 BLAKE2B bddcd603cf07dd6c03882ccd6896b335ac577e81b48e6db4d1677ada1584814d58bfdc72a7ea0bf1e0049b83e703ee372cfbb037a0fa9c59b82796fbe4828bc2 SHA512 227b1b052f15138cff17e72dfae7f4a04100afaca4932cd91fb526d3c8658ddbd32895b953f0a34e24139881d427b2f1375f21ddc205bc1b1391529595f8ead0
 MISC metadata.xml 331 BLAKE2B 8878c677de3e97ca867c0acff719fa5c949149e77f09649e4792927f33abdc971156809f0f1cec4caae2e619dec8f686c92cfade7a4fc12bc5b575305533a6f0 SHA512 f597f3af9c0e0422e49e8da76ecbb645b02cf6b0dd2ff3420c8923aaa173160610a9edd8f7aa5411479e1c1c2e2805f9e5a36b637e3fc42d2b48caf9033796aa
diff --git a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
index 47d6584b37e5..182cc6ca66dd 100644
--- a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
+++ b/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LuaDist2/luasystem/archive/${MY_PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-lang/lua-5.1:="
diff --git a/dev-lua/mediator_lua/Manifest b/dev-lua/mediator_lua/Manifest
index 45af8cf5784a..1dbe7f878755 100644
--- a/dev-lua/mediator_lua/Manifest
+++ b/dev-lua/mediator_lua/Manifest
@@ -1,3 +1,3 @@
 DIST mediator_lua-1.1.2_p0.tar.gz 5809 BLAKE2B a14cbe043cef72cdff35f92c5e6e420e94ab9930235ef71c31749f6371ef3a9a55c104ebe0a82ad86a95ddb5913ebe69f600e16393b6c5ff532802ace7bd7597 SHA512 116d08a96fa0bd540ac4d3cac61a529a634cba3621c6f2e917b405462bbc0e2ab5b170dc6819e470105cdedf958a382945819eaff4affa63bc057824c163c8a0
-EBUILD mediator_lua-1.1.2_p0.ebuild 791 BLAKE2B 5de119f283c5cf2abfeaf5f43bb10a5e4dbf87fba1ca20972c925ea534c69952fcf46eb35f64dc2732a7823d46e4d771d41853da3cc40f00ccb1567a0e4d1db6 SHA512 8196c638ddea0528598cd76bf55c48b9610d302d18a9e75c2b052c21b3a706938c4a9e4e96462025e3d854544decfb4917792384ec7921f2887b47740d26aa24
+EBUILD mediator_lua-1.1.2_p0.ebuild 789 BLAKE2B d47c91ea051797b91ceafc9ef5c6a357e3d74873bbf7f09d564f575731da6ccdd961ce53b5d92d7f52f53f3fc05a18f9919ab7b8b6665e3c2759f79cd21e1276 SHA512 ce25a50ae8ceb75c2ec422deec9fb8db8812443c96f8da19cc9c3d16f4fe9367881ac20c1d0cec8e476ad8aed55df26e2eb4aefb9b26ce4499e8b44098e9d7ca
 MISC metadata.xml 623 BLAKE2B f6e574caf2544132e811d3399dbec685c535e6a9ca63833ecba15d5f3df3faa3f0d585ae5a923aef9455e4d2489a1065e1aad577ee849488b3f982e90beaefd0 SHA512 52bea35c9427c5f7a81b7690447698137215cb1ccfeee60a4733a6a5512f204aef0a258e71701b4565bc2696e491514391c82140507f45ebf72c23a01156b6fb
diff --git a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild
index 3a9c7408948a..4e8abcb12deb 100644
--- a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild
+++ b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-lang/lua-5.1:="
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
index 874108561352..da49bc141ee4 100644
--- a/dev-lua/penlight/Manifest
+++ b/dev-lua/penlight/Manifest
@@ -1,3 +1,3 @@
 DIST penlight-1.3.2-core.zip 116854 BLAKE2B c653a51cf8ea286c849e1a2c68968ed767c350b1461dd11d9a2e99c81295461c67044175c7bf99c31e8040118e6cfce85f8613d4b6c49e726d31393029abcbbf SHA512 01ba35e967e255f6f39afff9c2238f4921de9e52850ce0d2ec0c9068029fc61a241c82bede680a28fda46c4504582784fcd2241a2eef0bef95c7c389c4042d02
-EBUILD penlight-1.3.2.ebuild 655 BLAKE2B 33b9d8874deba751c51303fd3bb0ea8fd6f239ad20f2354675aaf4d7d4653c7a09e69556c1edd8b46604f7b379e2df08e4381da520d3c1575b2c00cdf1206f50 SHA512 8fe4f633e04a91794fbc578efaf714d36595339a71261beb9f8e911033521dd2124256b1ce651349f59de2dbd1eb2f6eb07448722fb5ec7eabdd9e7bcbde159f
+EBUILD penlight-1.3.2.ebuild 653 BLAKE2B ff029eaaf0cb3d19c04840e8cf4fe05b6456e8467a2c5452ed2064d5c4ebe7e14418d2f1ec349729ac6733e212f5b8030d27e25c289fad72a03cf5c8c2a6a39f SHA512 14aaea5b639507e25b2ebe5eba54aa10e268cd9147961e03219e389ee11b64c71a65650c719062f617335fb0a42d9defebda748b59da057e5321b29eea744db3
 MISC metadata.xml 523 BLAKE2B c9b7340d34bfa27978dfedde2becbb1ea65d911986be0868c76d16796285be730c073da63cd05e46d7ec58af155a09cd6fe635360324a8e252210eb47e3097a7 SHA512 c4a0a69c82dc2dfe49d9f5145847e952f466fd6254baef24f20cd122137071c5731643202bc7bfbb20934ae955454d077fdd74eb30f9d14f67823eec8b089cbc
diff --git a/dev-lua/penlight/penlight-1.3.2.ebuild b/dev-lua/penlight/penlight-1.3.2.ebuild
index 69610242974f..3c04e0e5285d 100644
--- a/dev-lua/penlight/penlight-1.3.2.ebuild
+++ b/dev-lua/penlight/penlight-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://stevedonovan.github.io/files/${PN}-1.3.2-core.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-lang/lua-5.1:="
diff --git a/dev-lua/say/Manifest b/dev-lua/say/Manifest
index 1f1cdc3c2249..0354e8ad345f 100644
--- a/dev-lua/say/Manifest
+++ b/dev-lua/say/Manifest
@@ -1,4 +1,4 @@
 DIST say-1.3_p1.tar.gz 3667 BLAKE2B bd99687a71129c5038749b0a2ea48411a411cf05559793cc0c4802a5b7aa620fbf4fd15ed9ab661b33c7b9f94468aaf9e292d177aca4d1c7cd29009601d015f0 SHA512 8d4a360bf0731c2a70c23edb9e6e81cab1e7d9b861aa35103a5c6e521633410860d76c46dc2ea62a06ac8ab3b522bc71c11143d6fe7e26e7fa24dd3f5ea1e5f6
-EBUILD say-1.3_p1-r1.ebuild 857 BLAKE2B 286a96537b49362baada767ec8f21f2712b7c2e1bcf8f75683bbba906a0023e1b32d2659e938a5b73f3d91ea79694853493fd5b1bb35bab9cdb08342fbae745b SHA512 c7482521f4198ba62cda51c501c8e3f47f9153a751ec89b52953bb6dfdf198ae3f31212a5ecad875b7f876c26f64c1cd53b27947a414845cacccdd7186ddb2dc
+EBUILD say-1.3_p1-r1.ebuild 853 BLAKE2B 511ab4395d3053d38eda08b0f026e9d81b1392fb11978e86349b3c63a4fc7ce2e6e441adb0f2014f48fb38e89cd944956495dee5511845520e5665a06fb60ee3 SHA512 eb0cc5c84b0e30b7a71d686efa71330b0cb0d95053cb4b65c8ec6539db7bc9f23dadd1b6ade88c5ae0531f12369bb208a7f22433ff7d721e20c5ce96517d790d
 EBUILD say-1.3_p1.ebuild 664 BLAKE2B 23a1ec3ce6ae91d6ee0a79f2b882e49c75b25ac2b6dd45cbbe6c46a44e088f9050120cd21e90b0222e6f7029521a79a3040b4500687fe6aca625cfc0abd287f0 SHA512 348ac3a993aeee0c570dabdf7fc632c8532801620ce384f1b1b8f18b75ee20b6894f0ac1fc0a4d646e6be38df6136f88631f37e26a79275c6f27d8314a486ba8
 MISC metadata.xml 413 BLAKE2B 3d56347a7a9b9dd6d404078d70b4f775c982f957a53f6b49f03392bf814a08ff91b8b2ac8409bdb56b1a343f2bc04eb81578b0297eab33f37459430f2fe37bbb SHA512 c0cd2d55a07c8d7338a274a3a8204bf2c63ad46b4d9b78f720766120af4b28482c3c68df18c1e7dacfe99d3898b4bf680b9692097939cdc820ee5aa9fc11a928
diff --git a/dev-lua/say/say-1.3_p1-r1.ebuild b/dev-lua/say/say-1.3_p1-r1.ebuild
index 091a5ea1378f..e6570c902c37 100644
--- a/dev-lua/say/say-1.3_p1-r1.ebuild
+++ b/dev-lua/say/say-1.3_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="luajit test"
 
 RDEPEND="
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index f922bd43fdf9..44257ca69c13 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index def81914b7a3..d1a1ffddaa10 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,9 +1,7 @@
-DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
-EBUILD llvm-ocaml-4.0.1.ebuild 2800 BLAKE2B 2d8d5a7d6c13eaece0f0b98251bb28b5cd2c8257c2057a00810cce6e1f76ce0f1caca21e9ee00419bf335098a32dc7d748699f8032fd54e4e5cf843889129e3d SHA512 9684444e4c92601e7654520fb13f563f7c9f886f9f50363f470b023801d14179c542fdc1fc5a519ce73b33774f7a2180b1109f03eb43d7035a79ed2e5387e08e
 EBUILD llvm-ocaml-5.0.2.ebuild 2984 BLAKE2B 723a1e859c8e35f2ece65cc8dd6fdd4ef13017fa0ea8ded0c2c1e343a996828194097389b6db5fb2fd5f6c62fcfb9f443e72def7c6549037ae51816c3c7d9f64 SHA512 ba6033dab81c3abd7d9fe2e664b229cfa7f2674193287794ac1cf106a31f35db8d31795362787567d6f0703cdd216f36af3997055c594301dc29e93bd7336615
 EBUILD llvm-ocaml-6.0.1.ebuild 3148 BLAKE2B 08a61098a9782694f57d4a56dd450200abdc1fb117ff327e4005c8f81d1b5cb861bba0fdadb19e94e3d4c409b1431a5ce361bc77b0ce590c69b855b1d866e1f5 SHA512 b0cc43ae38254cf01688e4a5b375452c8d17e9a8cae89a43ea1635383516d217850f16e605de3c45c8cef993ec9c95fbcf98f4333e27770000cae6899615e631
 EBUILD llvm-ocaml-7.1.0.ebuild 3145 BLAKE2B 270cccdb5a50fb12485660336195c89de92c3a2f93defb8bfe31dd28ea155ded54a8aebffa14e5b5f31e2121da563a2269dfdec4a726c1f18c39552510c8a8ea SHA512 6f14a6decebc23a4631a4b17ffad1b5e6d342514cf9f7dae72a7780792089b070851608c0a0e4162f441fc395ea3583e0236c23794d9272b30a04e1bb3eee65e
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild
deleted file mode 100644
index 5eda59e817ee..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-4.0.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm python-any-r1
-
-MY_P=llvm-${PV/_/}
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P/_/}.src.tar.xz"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,}]
-	!sys-devel/llvm[ocaml(-)]"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-ml/findlib
-	test? ( dev-ml/ounit )
-	!!<dev-python/configparser-3.3.0.2
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S=${WORKDIR}/${MY_P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DWITH_POLLY=OFF
-		-DLLVM_ENABLE_ASSERTIONS=OFF
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	cmake-utils_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild b/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild
index cf2637c44aaf..cc2bf6282af6 100644
--- a/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild
+++ b/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Per-line Perl profiler"
 
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc ~x86"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-perl/Devel-SmallProf/Manifest b/dev-perl/Devel-SmallProf/Manifest
index 435796f5cb1d..80bc701caa12 100644
--- a/dev-perl/Devel-SmallProf/Manifest
+++ b/dev-perl/Devel-SmallProf/Manifest
@@ -3,5 +3,5 @@ AUX Devel-SmallProf-2.20.0-perl526.patch 1992 BLAKE2B f0766b6f32410d17bdeba10d20
 AUX Devel-SmallProf-2.20.0-perl528.patch 1308 BLAKE2B 944973ed509d0752eb92bc02bc36a67e81659da9fdb403a0a9d551781a500af9e029c28a8007ad6a3803351703066116d33bf9f6d9323af93a4b1550810919d9 SHA512 2ab4fa1f17a50b9c59126b7e6cda0e498f78f5c94c6b5e3fedf112d0a25a18659a5a602bed879b101474a1a61dee4353a55b8b59d710f9558bafbde0c1fc3294
 DIST Devel-SmallProf-2.02.tar.gz 9367 BLAKE2B a9c058469d5fe80fdce61d080e3f4c90a443ed2cc8decee4ed28047b49d52de5f89abc52bb77085297d310183a59b299aa23ce911747cee26a9a149e41ac324c SHA512 f97ccacf3668feaccb5eda8e451c0c00a434df4051f9f2cb1c2f85cb9285e98c9f1198789467c21cabaddb667ba09b4fb56073075e9307881c7a71a820607743
 EBUILD Devel-SmallProf-2.20.0-r3.ebuild 419 BLAKE2B 332218655dd3169b0ae0bc74826dcdc8bba3a37162a0b059d35f87bf669e0added3b33f12a861f5de199885fc30bb6d851b89715f56c29b05c0fbe233131d49d SHA512 6496121f14cfa329d5a224dc12593a30560242a3b8097c4370a2f27f7b8df462186cc6dee8bd10d61761b123958f8042694740cef14f82c765a2e3a60663700a
-EBUILD Devel-SmallProf-2.20.0-r4.ebuild 452 BLAKE2B 18e2f299c94a04f415cc1a5c8fd89f93cc7db3eab77984edd5113d9dc9b33c1ad7eb002d6e71d46a74e5771fc9254839b44182b58f548ce7708a39b00ed0731c SHA512 18c241dce6ac465cba4a8fbad7adaffab6c82b554a92d14da741f87d568d21b8a019e80687983dea2d20ea33df72e1df1effd2cfd143dc2c1d59a6d55ad1891c
+EBUILD Devel-SmallProf-2.20.0-r4.ebuild 451 BLAKE2B 77886003e7519aa33b6884b8ab02ba6b1e69bad996b5b3ffc34f043bd1be393288783fd22447549a12f7bb13b0475829ee2faf37429d3fbe9683933caaa24b77 SHA512 6a369c1753f5a03c5c38c1d0a892cb85de62a35721dc1e76dd50e4c95404dca70b71d71dd50e698bffc8c68f49838343a6fc2adb712cfdc0656b1011fcb1ba42
 MISC metadata.xml 451 BLAKE2B dc54dcce9a8a34acc65d7f5ddda92ca6317bcf12271792b9705a607ffcd5534019fd5720496e8886ade3c45b8f24b8a9a3a5784b93e6bb3e47929b3a7c8591fb SHA512 0b8fcc223fb2027ca143df6c813cc31de5ac5a59c62ccb7cc8dff4d081f86e129a2c1efcbdb747711170cdb6625a12700852b0d12c22ab36879b5805404d0fbe
diff --git a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild
index 5d6f5bef35ac..a868245219f9 100644
--- a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild
+++ b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily build XS extensions that depend on XS extensions"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/ExtUtils-Depends/Manifest b/dev-perl/ExtUtils-Depends/Manifest
index 383bfb5e152a..c37b84b6a808 100644
--- a/dev-perl/ExtUtils-Depends/Manifest
+++ b/dev-perl/ExtUtils-Depends/Manifest
@@ -1,5 +1,5 @@
 DIST ExtUtils-Depends-0.404.tar.gz 18207 BLAKE2B 31da4c8c131939e7a5006c70305fca64f01a96e94cabab95ff394b29662e4ce39a75123621af2dbf7a530797ce1187f424eb0c2cbea0ffdb7975e18a0eaf88f2 SHA512 b316309eadca551c5302b20b28b1ec2e2264a47524fc9a1a9763b59517dfbe84d22e86a76235fa0d0190c3348f49b913c40da60076ac6d01c51a98f7c0c5b783
 DIST ExtUtils-Depends-0.405.tar.gz 18122 BLAKE2B 94470f7d35d72942b65d4b1d56b748a6e68e1315cb734228d0f90ac2b6c7452d1aa1c244c246bab7a0b97e1393d2973d35e8926568b695b4f2432f290d60b403 SHA512 b9983ad763ff0cb81c899bc24f3152f13c69e608304b6e4446bd07b9b13d039650f3f87544c0bdd29c67246ea2973f04a1ce0fccbffb566fe89fdbe0bb03f11b
 EBUILD ExtUtils-Depends-0.404.0.ebuild 555 BLAKE2B c6b58b241add6d344774326135ec6ef0709a77689c4a6b3e398062fec16ac1a9e84a1879b9a372530fa44d0ea1683a776a7364b0bb5ea9a49bfadb6b84fcf8a4 SHA512 6e1aeadb7d4f467f95220669546ba13af71549723fb759ad9b8788ef490a780617f807562b42f42df2b14c38de7b06c6f61e11986402a2caa834a68115fc5029
-EBUILD ExtUtils-Depends-0.405.0.ebuild 669 BLAKE2B 849e5b3028184d1cc1cfb10cf43c9f7bfed6d105770e76346be88bc0cff4d4710b3cd5edb4654755113fb94ec6e5e7e4e84655836d2633ffe3f355d7fe9c1c86 SHA512 67821dbd88164b1f9cce6fe9a5400394e2544a14c6994690bfcbe2dad375f95cf400c6fbaa2479d42b00c2f45320be2295d37cb044bde88d054e85142056ee33
+EBUILD ExtUtils-Depends-0.405.0.ebuild 668 BLAKE2B bbe2dea0a22978545ec9b14db360eeebd13b740ea9e8d40641cff255044f897474e5bd7a9b6b76157d686de380637325c428d2cec0d01ee28eb1705bfaa83363 SHA512 84f2352802f16ad5f64d55b137393d6c89501cf80a12561e04d56fbd08c04f24466199e390745f3bc5ef2df62642b50896b02f6bf9eac132aaf578c565ceaa09
 MISC metadata.xml 404 BLAKE2B 93cebeb39d2fe8da303c39e4ca965f8d801581aae1f7c7f53341a5a55f2df8cac89c22845f57355ee187b5c527e848cb9ffa8e41bd98bbc47b2f2e8d9851003e SHA512 a39e7e1c1a4173b6fa2c4df6616a91a52e83fca6bd481be52ff49a4e29076eb38866e27fb62c8eee49d39a0b681ca796eeb65243cc6bd35511e54f4a962adcba
diff --git a/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild b/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
index 728bd9d99236..d0c7a5173855 100644
--- a/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
+++ b/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Simplistic perl interface to pkg-config"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 
 DEPEND="
diff --git a/dev-perl/ExtUtils-PkgConfig/Manifest b/dev-perl/ExtUtils-PkgConfig/Manifest
index eb4a3e7d7a5d..e30424569b3e 100644
--- a/dev-perl/ExtUtils-PkgConfig/Manifest
+++ b/dev-perl/ExtUtils-PkgConfig/Manifest
@@ -1,3 +1,3 @@
 DIST ExtUtils-PkgConfig-1.16.tar.gz 10144 BLAKE2B b10ce776abdc3fe03cd9a6bbd3085863413f099debd95aea3b8f37fa6368da296c09c4929cc7d0f24a1e7d62c14256e2dba0a21c388a3136c67f5c10de935ac0 SHA512 a872fd54aa5bf3137ace9c44457dfc047ea6d283accc453e824b609b6996a8e2fab685459f38a8236419155df01a18421671426a7237639a47ab32e18c9b4191
-EBUILD ExtUtils-PkgConfig-1.160.0.ebuild 539 BLAKE2B af1ccb2c2815e88a8df923353f961ce27143d2fffc2c6933feda47eec1cb17f71a43c826965c26b9edd11a80e8ba27adbabbcff1ffba89046243b3b9a3b0a47b SHA512 bc34fc2c21410da02d885323bd5c41ec53c70b155b7a59fce35e5e5c59f3582bf0f6d033006ea341042d56653eca1441fef3545d01bd0a95e27de36af18027fc
+EBUILD ExtUtils-PkgConfig-1.160.0.ebuild 538 BLAKE2B 08ec3f1a0c769e43bd11a1c388ed7958f5f9878e9f537b44a93fde4cb25fef246e1a75d565862723d9b9979f86ff3de4144ac5e748e7c5c3ea1838d65d981d34 SHA512 2a74f93881106af0927f8bccfa9076f2df240aa0be2484462978b9bbd63f971c5bc09b132ca4cc85aba8cce0db019d7a500c54a8111545be6e754e82706e51e4
 MISC metadata.xml 408 BLAKE2B c84416ebb49f43a8c80f0581ff126f9ac022284e65490619358546f09c6e1d079b7054e6e918e666aaafe5bc30600fd68d743c12bd2e8bb9ba2184030ffb67f9 SHA512 c592743a123e32345d7fc1aa31474154fd8619846afc8ba40afe5a2e25e2cea5b0cd167166f2ca6258b860939eb2fb109bfd664383db77d426934acac3bdc351
diff --git a/dev-perl/GD/GD-2.560.0-r1.ebuild b/dev-perl/GD/GD-2.560.0-r1.ebuild
index c4df93414b3a..7541e8f80413 100644
--- a/dev-perl/GD/GD-2.560.0-r1.ebuild
+++ b/dev-perl/GD/GD-2.560.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Interface to Thomas Boutell's gd library"
 
 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 ~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="animgif gif jpeg png truetype xpm"
 PATCHES=(
 	"${FILESDIR}/${P}-rt106594.patch"
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index 39361b4c158e..2c0e10ae62b3 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -1,7 +1,7 @@
 AUX GD-2.560.0-rt106594.patch 1253 BLAKE2B d7d05d2c492782a90e877932dd9a12aeedc5d206fa41a4bbf35b871c6d3fd27557f2d9e0606f39cddee92f4b132e6d57f0f83dc90d0c82689b52f36ae7ec5c6b SHA512 6bb62f4dd24076f1d99a99e6adbba8daba6c94366ac6e0bdd5a9c18758f7090d6a387d1405b8402fe0463a25825542100d46768f56f80d64d05f34a0b20f0881
 DIST GD-2.56.tar.gz 273441 BLAKE2B eb8d27a1a18f3ee8474138c82d1305b6bc8248e6b4ba4ab0bc4470d070eae0207a837e54e8f02c8f6c06e813663396561c0ac2d191e9884ea1f0ff65d23bc166 SHA512 51c4b46b199625a12ae1ad1003cafe4e66913d1e0c0b51d9bccbc7c14a86dfe29144caefbeca2927a66a44d4ba8b134550ee4a63eb86aceaa13513c46a4e71f4
 DIST GD-2.66.tar.gz 253000 BLAKE2B 1a1d5374c06fcb07849e504c8c5c6f00443890cfb728fd02b4c94838d754c2f04bbda80cfa8e2a7b08a3c07cbed32aa6a499468dfb044865f833b3486965d2b8 SHA512 37d3da70f4e0b89b0166488a1f8a48c508ff5e515653fe1b10602cb708ae0ce713c617dcae21c48ec795799fb0e061762696e6a65bb8ba359859223d15677c61
-EBUILD GD-2.560.0-r1.ebuild 1400 BLAKE2B f6453b677f0e2e0f2d587ace85cb2f19416c589a93b2bf0373e77c6fcf2e3ece7cd8d486eb20c6bcea3f0c56e919622cf565636e24984b5e38c08d77da8e7069 SHA512 b496fa5d38fc26b33a0252a5b752414134e8af27b8264bc1be4c1dbd049068f6d11c2b50438a0341cf728b432c554631005a079a82522f3352d7f2550544d5f9
+EBUILD GD-2.560.0-r1.ebuild 1396 BLAKE2B 0a8e99500c6c6c7b213d6761c5f366beed09406d20a095d7b1fd034b97517adadafe4aa9e20766b7e39d3f40388095e00adb735ab664c06beaa0b6569e32175e SHA512 ef93b9903f710b9a90e6664dced741caeafa4acdd4f0dbf0d3e00ba54f6d0bdd3199f580877a870df7916dadbb0bfa4ba04c935c4adafc23409b5b191132bd8e
 EBUILD GD-2.560.0-r2.ebuild 1488 BLAKE2B 45c6b2078e79dd93bf26348d7ff7697d1053f45415c1efd32c4c93024bfc9465361802c40ea892cbdbb878c0603bd07a6a97a8f1937c72935cb2a4de6dfc4de1 SHA512 ab2616acfc2d466f98c8272cbb22eff269bd527cc06da45783e9d40fc5a03932efac31f1b03f3864482745a197312346f461a7aeddc2fd7b69280d487570830a
 EBUILD GD-2.660.0.ebuild 1517 BLAKE2B f712e46495d11359ab865b20355730a178862bc7214298f060e2f781d4be5b5754d4ce8f63390f033782047931a96185c4486743c51886041a8049db1c21bcf0 SHA512 5bbc50f783d91c015fa2bd7673c7121c380865d6013ffeab16b6576cf6227a0f9cd78accc1a6405b8d928579c3b2022531b8bd348df5ad872beaae933f081812
 MISC metadata.xml 852 BLAKE2B ab7abbcbf4d6d62266365794525899c41cb9119ac9173363eebb2573e682671c3e7b7cf032d450d90c19a9ba692915f2cbf706e2a90260c80f8e8eb251cee763 SHA512 7b5fe91b323a991d33efaa0b4eb5e4cb96ae8b279035e72a9d9937e08d64cfc7ae39d6ee720becabaa434d55088f05bb4352ff57e7abd63abe0c1949771a3f86
diff --git a/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild b/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
index 23c740365497..9ce315a8d922 100644
--- a/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
+++ b/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A general logging framework"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Log-Agent/Manifest b/dev-perl/Log-Agent/Manifest
index 3b4a5dc60a9b..eebf8875392e 100644
--- a/dev-perl/Log-Agent/Manifest
+++ b/dev-perl/Log-Agent/Manifest
@@ -1,4 +1,4 @@
 AUX Log-Agent-1.1.0-no-dot-inc.patch 4048 BLAKE2B 8e5f2481524d0526f4469c32b16e234f8224546d348597a8309451dca0cff2a1972602a9aa87905ef7ff98342882b6ed3752594b1a8f5f5fcb891b206534a33f SHA512 4aca7bdb2eab4405028bfe7e8a1fe2fbcfc7db7f4b0302d9a753944586c5558bdc4c4c161a557f2e865d27172b0c78a685c74b5d9c38d4097c83038959b8d970
 DIST Log-Agent-1.001.tar.gz 56215 BLAKE2B a73673f718233dc915f6e3cb4ef6a7a8455ad196190ae378abb20db31eb848a8c41069d069ce69fbf25aad75fb3c6ebb47d80694dee5cd97364e64b778be0545 SHA512 b8d3a15e40129add73bb4967ecc5daf37c0fd8a17eb75ed86fe338a9eb228b37ddd56b9bbf9bdef91f8453eb1b53d7fe303a96f68cbb0834820f2354fa37b5e7
-EBUILD Log-Agent-1.1.0.ebuild 647 BLAKE2B ff9bab373d43493066f2b9a5360213ff8df1f8359b08d320472bdfd4f2b8927f802d49d570df7a48e89a965bdfa8d16d4fce175f2eaf5b7eb4239c993e5f14f3 SHA512 1b8ddbffce7f46be7f483f5f8ab98855f0d1d5a49708f4ca2eedfedc5a4c4bf624d4642817302fc4a3c4712c30466ea8595ebef3825677f31e240aec04d250ed
+EBUILD Log-Agent-1.1.0.ebuild 646 BLAKE2B a5b06012df7ed38f6720e423443f41c2b6e0144da9cfc9f6d70061d88e8c46dcb33406ad0ae88ad44ee45119bdb6ddcc592d206535533dc2cb74622150b4a49f SHA512 96c135e7c915fd598c275e57471fe7d6bb96ced1e702053e54ae42d84054f64448ea377d6c7a0f12ba3e51b341cf77859e06726017a2465d56f3e49b9589abaf
 MISC metadata.xml 2136 BLAKE2B b74238e39f7a213eaadd5db4f41768506e31af780d85a7ce1bd3bcd087c043d8fb674b5fb2da6fc96251583420ad61e62c4d3f4781ecec58b9a8eb21fa725421 SHA512 1a707e2e4710a690bbc44ff37f551b8e03e5b88c270d219dc5da5d5604599c93d5d14880956d3ca3df1b83e434ff8fa5264121880e3319dc78b963cc8f8c82b2
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 405ad485f42b..16b41ecdf61a 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/XML-DOM/Manifest b/dev-perl/XML-DOM/Manifest
index 253528253f5f..0330d5eb98ff 100644
--- a/dev-perl/XML-DOM/Manifest
+++ b/dev-perl/XML-DOM/Manifest
@@ -1,4 +1,4 @@
 AUX XML-DOM-1.46-nodotinc.patch 4213 BLAKE2B ff995ec9374859789db0283818d942b24dfec33f949ccb90085b86cbfd9397fa3166f355d8c2934033edacf921155e61e367b1488812da484015804d588d3810 SHA512 72390cd8cc2aa9d1bb4f397006db37ff32ca16b4d5324265b5f7ff20234819fb65eadd89ef849bafccf732a7b91fe44fb79aa5da7561061b3a34d5c57d2e67c7
 DIST XML-DOM-1.46.tar.gz 117291 BLAKE2B 5cceeb851a052289d4eec061703c6467d0500e5d231c8652e9b3763773c6468ee41fae0aa0308e7db61ba14635bea09ebe866753710c781c89d9573e64f7aaee SHA512 0fc96571996262bb0a99bd5f85e5d9e0f9c71c604c46c74129f0f560aa2749f7b945c591bfc13b9178d2b8d83826d5306f4ac71db33b51c55ce4d76398bab13d
-EBUILD XML-DOM-1.460.0-r1.ebuild 718 BLAKE2B e429abc7fd16d2a4c781c5c4db8ec981492495e72c691f28e3524b5d54b8d9f8f6c12886d39b0efb5bf31003894d15e2a6286de7638b0c7a2d266cfc147707bd SHA512 f655803d45412b59ef8532088caa5bfa3e652b29740cfddb8148b3ac8645d13a6ffd34794e811b8bd2d1e57aa79b3d7acc8b76a070f1cb711e54e1f5b9074466
+EBUILD XML-DOM-1.460.0-r1.ebuild 717 BLAKE2B 25482e8f238a6c0070e13431db1caae4bde8b2cfecfda0d155b9a11d69e2937c53ccb544772300f5e1c84bb205a0dc7a5f4ecc99107ea29ecd62d3df29058350 SHA512 d03fa1adf7b7ccd543af562df007d15908e0ab7f48d3276cfc8b797836ba15dcc209d222a2273a4379616e2a912a5275e04f754696c54e6dc61d4f0e267e25c0
 MISC metadata.xml 2325 BLAKE2B 5a5fd11575ca8146cb7798ae8852a0290d29f2d33168e04de8fbdd13cd3104d21b7ab14621eff9e5d14331a6c9a3f14cc0bf4d8ee2354c853d743fdaa9a48359 SHA512 80b933f9a5569530b77d63f9e710e6fd5011dc0c9227fa574e2a41c0880c65f8a1f030efe6684a6f6b2f8b7586ab864d3311aa71724ac4fea15876a2fd3905d3
diff --git a/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild b/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild
index 40a566bae540..6c90faa90322 100644
--- a/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild
+++ b/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for an DOM Level 1 compliant interface"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-RegExp/Manifest b/dev-perl/XML-RegExp/Manifest
index 418d16074af8..b3b83f7da0cc 100644
--- a/dev-perl/XML-RegExp/Manifest
+++ b/dev-perl/XML-RegExp/Manifest
@@ -1,3 +1,3 @@
 DIST XML-RegExp-0.04.tar.gz 3601 BLAKE2B 97dd764f72c1bc6ba69b710577beff8bbfe7fab2d68b86702e343ef66f218acdc8d11283a9e2c12092c2db91b6c0186ce84fdad8c6b26b3d0aa7a59b5686a466 SHA512 f0ade105a35944b7f91b85fb9e2735d4860eba04402a02e8531b546d8ea49990d9c2a56f113b4a291050fc8aa51eeee9675d49b4d9a69aa5da25fa7f3e3c9802
-EBUILD XML-RegExp-0.40.0-r1.ebuild 538 BLAKE2B b502acea04588eac611b3b6a97710851ef45e2a013376cc6fea01dbcfd3145d98b30e67b016a17918c80c1b505b972af10f6c7daebb4d2abc41704458e5989c9 SHA512 fb12c32f16ccc8a7b73c077ce5687fc33707986cfe7c5dfe90cbd1e4a61cef2f0f462ad229ea20358341cdc71a516bfccefc2a99c98ef6106186a1511f85b94c
+EBUILD XML-RegExp-0.40.0-r1.ebuild 537 BLAKE2B 69b2e155caea3d46dbc10d0fbf02eb375ab7818e2547715509b1087eebd5adc9ffce82f0e40c37795de6e071275612428c03a11aa8b2d3eac15841754d8d427b SHA512 901df7d845ab28327fc414b62b28e6a8f924e2bc29a4e10726eceb9acd73bd470b16c78a0ebaf6ca84d9f4e5d72ad8a68694b6b3815d25e7948fb4c9d578ff09
 MISC metadata.xml 650 BLAKE2B 397e439fb73c4c0e1e647c38e1a343b44d1466cd1b34c86398d100f66e7d843b37c6807b92b56f45022b39b8b5130ea293d1adfc4508791d00b393c65845e1ac SHA512 79ae841eff5aab4eeaffa565e3e44cbebfcc398f846fabf8bfbb5b0e33c067ed7a45be69a9eac12c75db316f92395d5c89b0c1ff4fccf3e4a842581868121f8b
diff --git a/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r1.ebuild b/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r1.ebuild
index b8a78d5af567..de74c89a03c2 100644
--- a/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r1.ebuild
+++ b/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Regular expressions for XML tokens"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 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=">=dev-perl/XML-Parser-2.29"
diff --git a/dev-perl/glib-perl/Manifest b/dev-perl/glib-perl/Manifest
index cff6d07c9b74..445e082f2d46 100644
--- a/dev-perl/glib-perl/Manifest
+++ b/dev-perl/glib-perl/Manifest
@@ -1,5 +1,5 @@
 DIST Glib-1.325.tar.gz 297456 BLAKE2B debdb538602c763e6a69da31f2a32eebb7eabbe306caef30282310da7e86eb124884d14ef49237c4efd2eac0c5db5eefa289df555c8851397b3196452cc2915d SHA512 f4d2d23d4c702ba7a3058494bdfba4d725bd2310ed55bba7114d5abab15f4c8d8f4b40ef6eeec3e733da659a572a6601aaa8ce1964b9cf549e4bed734e016f70
 DIST Glib-1.326.tar.gz 297125 BLAKE2B ea49571a5c1c1d0a48a72914f52d3d2bcf9bc4e0d59c2759497f7a069e091d20365f443cdc6de72ec349a82723f938a9cea4a06f5f7c8d531394220401dd8df1 SHA512 28f4f6d544389b7bedd5ccfce17659759e0996cdfea4f73e140de336b6395f5688bbb4707e3cf3e29b39f840eb8db9fc52dcbdaeb51154ae8fded2975ce9308d
 EBUILD glib-perl-1.325.0.ebuild 803 BLAKE2B 50bbd61982abc78bc114078cf78f25d37afe8e077d3413a5db5e8f080bac1b9ab1099f5fc3f07712392dda8ac6a4105417fbe264a8326ecd327961a0794cd988 SHA512 711360dd3a41428a8c1f084d6dfaa345da8f04642ec6ae2f2560886a2da34c92f8dd48cba568a851bdd155b4fa4da39f8af3ed60f9fa249676b7970bb747382d
-EBUILD glib-perl-1.326.0.ebuild 878 BLAKE2B b9dc699e8311f530c0fc08603f731edad993ffde922ac2861c27f396708b40b3fa68c5a5f4fb86bd23115b70c459783de3321df146349cb2a688d4aaf214d500 SHA512 4f05346a380aca10abac84bc06ca8e10499951e5f718eb3f7d2908aae1a9f48261872b922a6f80cf5e3236b22855650864d0264c826e78ac7279730da41f48a3
+EBUILD glib-perl-1.326.0.ebuild 877 BLAKE2B 41292b3ce98d479e014e4c6dee2225576f971cdbb43ed8e0c328e3f35d3f1f44b9ef1d0f8f0b4350e757bc81e4bd9433e68e0e13c086682ff5df237f462c7453 SHA512 d3f73f9bb11f907db58b1b875c7a93a013214b5a290ae4dbf60a2d8c0e1af7c5383160f40b0759108539176d6acc8af75007625f0fb5c114d194c069a6e9b5df
 MISC metadata.xml 1365 BLAKE2B 4d2fd978585574009f27a294d7b5129203884d61d4da4b7283a5ecdae0f16c625223f2db26b6ac210a38e6d1307dd64e912d9acb4d3b2038a4ac7611ae0be095 SHA512 0432b79471db1629a75a8d8cbdec17adf89388466e213f1525cb571504d97bb844edc5191c8695d8616d659e8f99619dd0357d86d00206ae345045feff3cad5e
diff --git a/dev-perl/glib-perl/glib-perl-1.326.0.ebuild b/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
index c87113e2fb30..ffbae7a5e719 100644
--- a/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 277dda02410d..24449abbe478 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index a9cf53ed88ce..5c725e2f3f17 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,6 +1,8 @@
 AUX pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch 462 BLAKE2B 0dd7b445b3e896fce69522eca802cbe6731535d19ed931a3e2a9e4195bf614503fe827c36726f24ba80824c007ccc063cdfab64d74bec67c62e5fa125ebe8ef0 SHA512 4774244f09152d4542dff8841ebabf7a7370026e0d61b397d69e2766562fea16a2fa93cdf92c778ae289c04daecf3ec2353ee3d0a773893ad89445d0ec52c4fa
 DIST imagick-3.4.3.tgz 245410 BLAKE2B 778c3b8ad3ad5e698044a832d71409eea220a82041544abeb88b59370d4b719388ce13b277d7aad84e67e40fcbbfa06d66a2458d4d9e8d33bb7358ab46368230 SHA512 2cb2b856cf83a78d3542cdf7c69554dcc063a0541e9092b24e5e1fbd8928066a4a3de154049d0202c35addbc5055ccfbb5910ae92f2f13da80ddfc025340ddcd
+DIST imagick-3.4.4.tgz 253434 BLAKE2B 73ce21547881b60733dbc19ae83cd2e60135dbb4052ea723f1ee10b3759ce12065a0cab2a7e4923b78e9e68b12fd7b875c7d1bd7b2a14ce4e4d7ff5b9c7fbc06 SHA512 73145a1f095849c32760db2dfc4acc13c57d99a037d65eca9b0ddf8f8e81cf6d28a50f2614e44bae1d90b4f881a2e9a64926e0e3b9403e491fd903ffeb30c4b7
 DIST pecl-imagick-3.4.3_p20181129.tar.gz 260443 BLAKE2B 43d30514f5faeeaa5894e2eb51d5b2ebbe2940728c7770eec60c41c9f01f86f7423d87a71a9ad2068e388f3994c31e499940c2042994846a6b6ab66542c7ea53 SHA512 7f3719118849857d19b9a35a63de68d4e992780fd41231a041d6d152ab2f0abd3d8215ab2362a998f8fe6a733c087d3c3e5d09fa826480d621739e92f5aeabf2
 EBUILD pecl-imagick-3.4.3.ebuild 619 BLAKE2B 346a2b31b3bd66759246937d2145c00f14af2b86aa8bdb0eae1909c5e94f4627c1429b729f0e2396fbcb65cb69ebe5c9b8edc2dac998bac6a36976250fc2b1c1 SHA512 945955dfa61d5ba5e936a2f8780bdced9e03ec02b2f9288eb3290106e4cd47a80cb55f82a2b31a493bdc1bb849dd8db03abeca02dc98e8bb6f65177dde0eb8c4
 EBUILD pecl-imagick-3.4.3_p20181129.ebuild 958 BLAKE2B 18e4f43fdd2c29b7b51aa964641f367386a5ac3f0a2ce550fb9c473448b6c4245c07740c8f20edb94c7b4c2207caba870617e043d510e2f99fe79a13c2edf6c4 SHA512 74b1927651bca3be6310ac75790e209cb6748bba7754e059a6d4ca2d51ec9919517d84260318f60ce03faeb17f57c8883d4e94ebad471a349ecf5273724ca10a
+EBUILD pecl-imagick-3.4.4.ebuild 701 BLAKE2B b3a375516798cfdabeb74b2c7cca99ea45a4be6836b17ee0a4356fa0756114447eb3f410670d343e5c15875bc6fecb9802c6356f7a4b8a560fcec67bed8fe221 SHA512 7888403c8d897039e3c9d072f077560071b291c216ea7e3693b6741144f5601db94d232df3aaa9442263e0a121847d3681eab7fb6e7790deb95a2dfb96257937
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
new file mode 100644
index 000000000000..3e6ae079e530
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="imagick"
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples test"
+
+# imagemagick[-openmp] is needed wrt bug 547922 and upstream
+# https://github.com/mkoppanen/imagick#openmp
+RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
+DEPEND="${RDEPEND}
+	test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] )"
+
+PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX%/}/usr"
diff --git a/dev-python/3to2/3to2-1.1.1-r1.ebuild b/dev-python/3to2/3to2-1.1.1-r1.ebuild
index 4f850563c501..9297c84877eb 100644
--- a/dev-python/3to2/3to2-1.1.1-r1.ebuild
+++ b/dev-python/3to2/3to2-1.1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Tool to refactor valid 3.x syntax into valid 2.x syntax"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 python_prepare() {
 	# https://bitbucket.org/amentajo/lib3to2/issues/50/testsuite-fails-with-new-python-35
@@ -23,12 +23,12 @@ python_prepare() {
 	sed -i -e "/test_argument_unpacking/a \\        return"\
 		lib3to2/tests/test_print.py || die
 	sed -i -e "s/Exception, err/Exception as err/" lib3to2/build.py || die
-	distutils-r1_python_prepare_all
 
+	distutils-r1_python_prepare_all
 }
 
 python_test() {
 	cd "${BUILD_DIR}"/lib || die
 	# the standard test runner fails to properly return failure
-	"${PYTHON}" -m unittest discover || die "Tests fail with ${EPYTHON}"
+	"${EPYTHON}" -m unittest discover || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/3to2/Manifest b/dev-python/3to2/Manifest
index 49138d765b65..f3274ae25b9e 100644
--- a/dev-python/3to2/Manifest
+++ b/dev-python/3to2/Manifest
@@ -1,4 +1,4 @@
 DIST 3to2-1.1.1.zip 78779 BLAKE2B 441e74bd06017c84bd382c32513d84f42b8bc35f46aeb62ec1e3f5b9876573e0a76f6e04f4ca529175761af6f29e10ee0c4d4114ff0bcafb066d2d6344b1d885 SHA512 7580f174409420556f89ae78eba07cc95b95aee9d062586d0862bd41980ae31bf4ac82a43855e160eec745fcdd3b4aff614f68e77da1bfc5f9f404413cab1492
-EBUILD 3to2-1.1.1-r1.ebuild 932 BLAKE2B 27f414a3567d5c27c86ced5559854a9149be18d7f827edbd26604cfba9bf4c02ce7f8eec0eca5e18731a6a4e1baa3fa4f658cab2f79feda3e6acadf8e5ec66f7 SHA512 46239f8cd96b23c026db9146aa5aaaa6be90cec19aa2e39d16692fe74d5afd312656b604d97c199a474f961a7fc3dba075b8789c86ecac96930360e6c22d64db
+EBUILD 3to2-1.1.1-r1.ebuild 938 BLAKE2B e82f635615cce525c61ea754a63a90c088818d4f38b7d291e227f7c1544f2ac4445e4964ef6279d06d5cbefa9de32c9c650091f3f5af2259d7e1da837731c55a SHA512 c7803360442d06e5404e486a33620960cf8b3e99216aaecce4cba770828e2c044ad382bf609aed513e1058c19a36cd54ad7a29e98b176704754f741000792618
 EBUILD 3to2-1.1.1.ebuild 595 BLAKE2B c0223c8bda0a43b0a31311a1971345a5fb73b05516699fb2d446a118fee8dab1cfcd3329cbf26a8b4ad3876fe899a0e58acc1725fae2210288158ad5a1dc9e85 SHA512 1e58c8e8ccfcf84091295f186be9db8a41c9ba011702e9de44aea636e230b6419a65b3a3d5e29949ca0cdae80ac4865816e98bf882f7024802ee6bd5101c8f44
 MISC metadata.xml 433 BLAKE2B 4f1b66cebd6b0b9f083d0896f702cc2f882d0d05a28634fad2d83af9802ccdfeb237e8d1eddee71c5a18663ede779085c28c81c3586b4ccfa2274c5dd8a9e1cc SHA512 fbf01ed6fe0bfdf49ba985e62e8694d7152129e0d46a3701fe39dd11ed7d48641efaea848694a271f39b9ae7e6b805b0ac535945cf33d455e0745d1f66ad3c04
diff --git a/dev-python/ImageHash/Manifest b/dev-python/ImageHash/Manifest
index 3d6ce6edb69b..ad93d183b2d1 100644
--- a/dev-python/ImageHash/Manifest
+++ b/dev-python/ImageHash/Manifest
@@ -4,4 +4,4 @@ DIST ImageHash-4.0.tar.gz 296405 BLAKE2B 1623d679c0f10eb18d20f7cccb0a87c2584535e
 EBUILD ImageHash-3.4.ebuild 674 BLAKE2B 5868facf6856eb30c0ef7740ff835f52c7dcebf56148e133c7c006848dd8c7664131d033384884e874e56ee1efea61ac36094b772db61d602bdd8257eb87b02c SHA512 a853a7a4e8eb454976b60e014d540e623a7da3e22471cd289a71d27a88fd7c603831106d5baa35fefd0fb886e7bc9eb6a590b934490419c8641711c0ce2295d2
 EBUILD ImageHash-3.7.ebuild 674 BLAKE2B 5868facf6856eb30c0ef7740ff835f52c7dcebf56148e133c7c006848dd8c7664131d033384884e874e56ee1efea61ac36094b772db61d602bdd8257eb87b02c SHA512 a853a7a4e8eb454976b60e014d540e623a7da3e22471cd289a71d27a88fd7c603831106d5baa35fefd0fb886e7bc9eb6a590b934490419c8641711c0ce2295d2
 EBUILD ImageHash-4.0.ebuild 678 BLAKE2B 5c7598b9921d6704092db8124b98d5320286eb6158e0e57252123cbbaa2c53b92bf323e8bee1d310b1a1c8c3cd4b9d5e7fbf284134f60b56689b53c20606639a SHA512 c856bb8005bebf05312a905d8051ee2890eb5e8569247dd800177a18fa489f643d17fea522e43c397fbe2b49321883ddcfafdb3a39192f629c665a69600fd4e7
-MISC metadata.xml 706 BLAKE2B ab0d81756c67a0937dc22a79c3bcb3ccbd0f90362ba3dd3a41c96ad92ba3861cd8b08dea737781be5aba843928018cc8853f45580a1d8385e771f38146bb0d0a SHA512 289175e72c831818e13e1011c2a4908b6bb60ae5f2cdb91b81765f4386215283648694a7ef1f293dd91f11f9b5177156de9617cb081f1e31d42e6c1ff3f5ddf5
+MISC metadata.xml 591 BLAKE2B 3b4b5c4b552696dce9aa4272c11453fa2d548ddcd97df84b392dd849123828cdce8aed16f5a78e51361ca728645b3f13d454a667169c1e5a3478a6ad44387a55 SHA512 8cdc106ca017b178f325da5e3fc1ba887a45e921e0917b82099e2c3987e49d35394890bbda5abb977563a290855a6dab9884361d095699db62001ee97fb544e4
diff --git a/dev-python/ImageHash/metadata.xml b/dev-python/ImageHash/metadata.xml
index 5a0f60123ed1..22613607affd 100644
--- a/dev-python/ImageHash/metadata.xml
+++ b/dev-python/ImageHash/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marbre@linux.sungazer.de</email>
-		<name>Marius Brehler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 57ed46dc8e5b..c169eab083cf 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 36a06ff7540f..6d1d6d70f914 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -3,7 +3,7 @@ AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d3
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
 DIST PyQt5_gpl-5.12.1.tar.gz 3147086 BLAKE2B d5a018f1fca401b9f70dd16e2a28ea380c8a83f5e18dc8577e317dae5904a7b95f8fe979bf7f574f95e71222c514565fbf051b1de87f97cd2ab70c09d04e86ac SHA512 f8c440bd5e804b9f5fcabbdf1290cee3176f3d676d150c705b64136d2116ccd7b09233672674fe97a4aa521974c9355d44daf7a244b6cda7fa55757332c08e67
 DIST PyQt5_gpl-5.12.2.tar.gz 3147205 BLAKE2B ad0b09548521ceff869bb44cfceb0c2cf31338f46c76da23582f7949fdcc0e8feee3cc0dc0610e8152dfbc701c3ac765eea7898f5061775a92e2601c5b7ea8ca SHA512 dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666
-EBUILD PyQt5-5.10.1-r1.ebuild 5790 BLAKE2B c75e543814d465ddac56368ab5398aa37c1c49b6985bbbaf0b739893023a00aabf94765715e30309a5f511fdae853b69057e4c4f50bf2854126e311f8d96d884 SHA512 9c242c66aac8d2d9ab358ded73ea2defd4a8e562c919d01af02d1f104becdea0532d7a228790f9eb73acd2de4c893f0be7f25d0a64b2c4f0bc5218452035b33f
+EBUILD PyQt5-5.10.1-r1.ebuild 5789 BLAKE2B 0c5209887d90e42e69acf97227950d3b6048d7f3f0c0198a5a15fae632232fb626431e019809dc9d6c03cecd404f69df0fdeff22489b55e7acd2d81191ffea09 SHA512 981f6dcfbdb1f5a29eb32796013e6f8daf3e4a5d370d7f66d62198ad287538ed77cad62fc0aa9c8f8d9f6d1d8a23fd79d420108739fde990c5dd47d7046de738
 EBUILD PyQt5-5.12.1.ebuild 5851 BLAKE2B 4df140ee298f0b6978de8efbe0118ad8526fb9ca9c76da79392e1687430da18b04f6508d2f4a26790b5a14450b7baec9167a06c81c1c80a27a3775bcc24f046d SHA512 82f32da1d670326cd3b08ac7fdc0a44da2bb383f0e82407dd42dda527f0f486cd880e5a211743a260d73c7040ea712c53614df26ba5564d8b92d677bb800eceb
 EBUILD PyQt5-5.12.2.ebuild 5908 BLAKE2B bfc735c4c3606d2247a5486c8eded9121bacd4af52f8d73f87f054ab17054c30e8be576a935e3c618362e71225d6311c7e37b743717c7c08d32819742f266719 SHA512 9fcf1fcbbd30288f06b268a9819263482868a3f4bb100754d7db9fbf76f9d65bc4506b9d5c3c5db098e80973586b2c9e67fbaddb097155fa796e9ad599f3f8ee
 MISC metadata.xml 2594 BLAKE2B 3c8c7159c42e050e4e4487ea8c24bd8d7213f9590656c3ae7152c0dcf151d4db99f07546636df0b7142107f506ae72e8d8c31a34aeafbdd325001030088a5493 SHA512 41e4d7e868a9b101d2bb41e8976b20d460544b1d103b3600b5b7cb5fbfc456538027d4b02283587aa747fd1789d7e675e5ce832df71f3dcd9b22eb095087328a
diff --git a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
index 0378fbb04cb8..304c6df9ec8b 100644
--- a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNetworkAuth, QtNfc
 IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 2d86708221d0..e94895baf988 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -8,5 +8,5 @@ EBUILD autobahn-17.10.1.ebuild 1905 BLAKE2B 9f39260926ebd7685625abc8d7e3658b5028
 EBUILD autobahn-17.5.1-r2.ebuild 1898 BLAKE2B a738f87af9bc2d11d307fbe3633b38a1f8bdc3c1615806f71116ed2c4eb9d0e6e3f6d861c5167417f63bc541f0ac6bfab41392007e2ffa598e054e7f50ae6ba5 SHA512 aec7c1838be2a21f3ae0d331ddb78a3933fa2421257b4b52b3c015b3af56ff706f70414fe7cfca79f4c110d9366e13970154a2ce6f1a259825dd03d79310a1c3
 EBUILD autobahn-17.9.1.ebuild 1905 BLAKE2B 9f39260926ebd7685625abc8d7e3658b5028b5d95b146cce27a318daf11757f9c45d53c95dfb5595953c8486870bdff1cc6b58efaba194dfbe53bb1e8f028ca6 SHA512 7fcb18f912454a08e4e54abaca48a55fff8489a247e6fd4e2042ab8ced54df1cfcde0b393d06ab1bffa4fdd086d0a21a571400c257b9a06cac989514ec28d31e
 EBUILD autobahn-17.9.2.ebuild 1905 BLAKE2B 9f39260926ebd7685625abc8d7e3658b5028b5d95b146cce27a318daf11757f9c45d53c95dfb5595953c8486870bdff1cc6b58efaba194dfbe53bb1e8f028ca6 SHA512 7fcb18f912454a08e4e54abaca48a55fff8489a247e6fd4e2042ab8ced54df1cfcde0b393d06ab1bffa4fdd086d0a21a571400c257b9a06cac989514ec28d31e
-EBUILD autobahn-18.3.1.ebuild 2166 BLAKE2B 174b6f3b346adad5b0c810e1e538db9b57c7ad9d130a3646803527c32a3d0a037059b96a59517a9674dfda0c2baa2b12d11328413a45d2d2c17070c781fe6556 SHA512 53365c45264c53a34d8777cf7458b51b5906be3080f3aaa71b50e0248a6c927e4d210dc306838ba78ea716889c5b31a5106bb0dd12039752521476b9532ce18b
+EBUILD autobahn-18.3.1.ebuild 2173 BLAKE2B c770d1e9d78ac69d0b71b4e7f3bf80371fdfad479ab7fc7901ae08ac05c890cdd49fd7dcdc2340c4bfabf0087917eb53a4fcfee01eb635e5444a4942a0d07596 SHA512 2dc92ac4a522652cd16482332ab08d8201c6d61489e6a8740fcc4326abfd51c638307e78bee45301ed96c03a68fc22558df5ed02722f92f13f8a4f4691bf3c70
 MISC metadata.xml 321 BLAKE2B 2a222ee5e7e6a2a90a44b834a4b7d430938813786c7179fe3fe273456b501feba4c20da2fe3b9671092085a991fd35c736a5b64c179a08f54fddd029ac5bd731 SHA512 fd00829f66750d3d54b7bfb472179639fbe453840e7c3056b406af546acb952d3fb8d4552973a68ff0966f25bead8dfd4501888cbd68721e54207b5a7628ac36
diff --git a/dev-python/autobahn/autobahn-18.3.1.ebuild b/dev-python/autobahn/autobahn-18.3.1.ebuild
index 05ffb8659958..2ba2f23aedf8 100644
--- a/dev-python/autobahn/autobahn-18.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-18.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="crypt test"
 
 RDEPEND="
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index 061c5e036804..e0bbcf4fdf2f 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,9 +1,7 @@
-DIST brython-3.6.0.tar.gz 9310837 BLAKE2B 616874f2a9c303e910a3fd2910aad6ffe360f87e98d009d66e85fd8c05d61c5d96c1a313214c08b69b5d073a23008b23d882a607af0d54f7d2942fcd2b6861ff SHA512 c59cee89634a2439a6fc64d3397966762aa508c6c00d05186138acce25fcf6597230511e30a261217898bca3d86a11eea92516cfe630c5d82cb271603dbecb2c
-DIST brython-3.6.2.tar.gz 9314999 BLAKE2B 809b9367eb42e723aa58dc22f1d1186144258135bf129de6d28be9a3d86f5f039c2c566e897ed6e8b436ee1ddd80ea2950c6053e366e204255877a777bfe68db SHA512 3edc603bb06a3ce5a383f6e86023e3266cf3ccc916c209fcef0ee69b4cb5445aba820034b5ce33b7c828c5a9a50f48c1226bcb69724967ec438c0702558c7641
 DIST brython-3.7.0.tar.gz 10334976 BLAKE2B cbbd3b77c1ef4cb5459621e33456ea7e1999428c0aaf2e52f60f4c1a3c737c84649880dc7e06d9f5b19fd4a172982ee3c1bd8df4f2e264818d6e5cac0908bdb1 SHA512 38f42c5c4399317c9a75af3159776d15047d6c09fd89b3f4d244f9077684cdcb3aec2a33304b6fe0005c129291b2b1ecfb0274f766da6005c0ff215751660df0
 DIST brython-3.7.1.tar.gz 9898874 BLAKE2B 2fbdfae401662878138c5315fc821de77125476d1567dcc395b018891282ca3880ec63e377d9ab8381060e54b6d4947f036f75a518ef363b2549d29a12eace78 SHA512 0ab073cd12ae5f2c45a205b37d20d68a996d6ba7247e8a3b8e461158147070294bebba46368c6618771b6bcac11d5a253d63be02cbab1241c11d74ae56d0fd17
-EBUILD brython-3.6.0.ebuild 737 BLAKE2B 388ec69293a20ca8ee9129a7e607a9be66fffb389f83c9afd46395fc926d89a1a7fbb0fd6548fb65fc34f4714166113c230dee79d98a718deadca6f02316db97 SHA512 9b1a57bb0cc4e0c1517fa1aeef31a6ff2874ff8242e3ffbb423128f9d38ec7939d77b6e64e27d2728111e7ad370ede61d9c90a515140477e22cb21e474974c95
-EBUILD brython-3.6.2.ebuild 741 BLAKE2B 48eaff3ade0815638ffa2993fa919ff9d3cd956849035fd79fa2799e9b898b9f37ee365aa58e5e71681bc3f94f8292f8f8f05cf81175082b45387720574fa0c7 SHA512 8013d341e474f2ebc39f5b6d47a70c669ee59176ac905e7943dc2c5555f2cc9599fb5e50fc6fe1282a60d96a7f5b93c3dfded839d15f3ebcf3257ec360938793
-EBUILD brython-3.7.0.ebuild 741 BLAKE2B 48eaff3ade0815638ffa2993fa919ff9d3cd956849035fd79fa2799e9b898b9f37ee365aa58e5e71681bc3f94f8292f8f8f05cf81175082b45387720574fa0c7 SHA512 8013d341e474f2ebc39f5b6d47a70c669ee59176ac905e7943dc2c5555f2cc9599fb5e50fc6fe1282a60d96a7f5b93c3dfded839d15f3ebcf3257ec360938793
+DIST brython-3.7.2.tar.gz 10403203 BLAKE2B 1fb7778a961c68a873033321fdf7a5b24f422d52195ff1f0606384c76007ab87a1949ead2ffcd7b660b544a9833acf90b254a542ea8856510579bacd0be8477d SHA512 76bdbc005832b4980e38ff4bf2fd705291eb06ee6b9f0c4b25a90df9ab4e6da6638990abb37ebf526d064f54823a9b4ff387edd919db69b1eb3bfc8ed27d6290
+EBUILD brython-3.7.0.ebuild 737 BLAKE2B 388ec69293a20ca8ee9129a7e607a9be66fffb389f83c9afd46395fc926d89a1a7fbb0fd6548fb65fc34f4714166113c230dee79d98a718deadca6f02316db97 SHA512 9b1a57bb0cc4e0c1517fa1aeef31a6ff2874ff8242e3ffbb423128f9d38ec7939d77b6e64e27d2728111e7ad370ede61d9c90a515140477e22cb21e474974c95
 EBUILD brython-3.7.1.ebuild 741 BLAKE2B 48eaff3ade0815638ffa2993fa919ff9d3cd956849035fd79fa2799e9b898b9f37ee365aa58e5e71681bc3f94f8292f8f8f05cf81175082b45387720574fa0c7 SHA512 8013d341e474f2ebc39f5b6d47a70c669ee59176ac905e7943dc2c5555f2cc9599fb5e50fc6fe1282a60d96a7f5b93c3dfded839d15f3ebcf3257ec360938793
+EBUILD brython-3.7.2.ebuild 741 BLAKE2B 48eaff3ade0815638ffa2993fa919ff9d3cd956849035fd79fa2799e9b898b9f37ee365aa58e5e71681bc3f94f8292f8f8f05cf81175082b45387720574fa0c7 SHA512 8013d341e474f2ebc39f5b6d47a70c669ee59176ac905e7943dc2c5555f2cc9599fb5e50fc6fe1282a60d96a7f5b93c3dfded839d15f3ebcf3257ec360938793
 MISC metadata.xml 467 BLAKE2B 06e617c5b2362ad41950d7d90d2f3ef25a2858f6c4b88df6edfd6ee01aeb32d1988d30bb66c0d9b0f3c5ed771596678f03aa5c707f016dd1d01259d11f1acced SHA512 a9c3c34e617cc5a3ea80f30c8de8964712af694d8048197662ce2c68d521279761751824a55c68bde5b75444495f176cbcc7d867c46924729391d3488fc3100a
diff --git a/dev-python/brython/brython-3.6.0.ebuild b/dev-python/brython/brython-3.6.0.ebuild
deleted file mode 100644
index d035d0287952..000000000000
--- a/dev-python/brython/brython-3.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit webapp python-single-r1
-
-DESCRIPTION="A Python 3 implementation for client-side web programming"
-HOMEPAGE="http://www.brython.info"
-SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	dodoc LICENCE.txt README.md
-	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
-
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
diff --git a/dev-python/brython/brython-3.7.0.ebuild b/dev-python/brython/brython-3.7.0.ebuild
index 447c9b9ba91f..d035d0287952 100644
--- a/dev-python/brython/brython-3.7.0.ebuild
+++ b/dev-python/brython/brython-3.7.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.brython.info"
 SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/brython/brython-3.6.2.ebuild b/dev-python/brython/brython-3.7.2.ebuild
index 447c9b9ba91f..447c9b9ba91f 100644
--- a/dev-python/brython/brython-3.6.2.ebuild
+++ b/dev-python/brython/brython-3.7.2.ebuild
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 4bf7d7f2513c..2965862ab1c8 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,5 @@
 DIST bsddb3-6.1.1.tar.gz 450571 BLAKE2B fae21052d3422e6e837f21a0e5f65aac063cb4c03b4c833e8b74fdd7da929972f81c3eaf5e869ce0990c1d55454d9f5964c3d526a44c047124d12da2afd78361 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01
 DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
 EBUILD bsddb3-6.1.1.ebuild 1940 BLAKE2B cdaa1ed8bdb037f43efdd6e40f2f2c4bbd412ac48420164fd431b637dbaea03df4aecf0a5623595846d50fef7cfb3d291125f7d25ef6552734d087d1bf12df1e SHA512 085ba98fe0374aa5349a7812b935476a150c2e92fc2cf5c8d0ddb4e8ad430d99b0a78d639e42bb1b46aaa1f1ead234f964ff41307994d43c7c10256e8e225ac3
-EBUILD bsddb3-6.2.4.ebuild 1940 BLAKE2B 6e6b62ecacf8aab999f64a17d9a2e28969f55b79c0f42b667a3820787e4ec3a7dc01cbc6f6c5fd3d05d3f96e16ea7a5b33ad2ef2189a5a75e72ef41d783d0fe9 SHA512 7f99c5273ce5da06811359d3f07d81fea1d890444c1bcdcc7d65f3c2e5ac18ea1a42d704508afae6570d6956909dcad6a98c0552795b383b436ab37303440c97
+EBUILD bsddb3-6.2.4.ebuild 1939 BLAKE2B 8f787fb2c77b737117424cdfee3786934d6eccdbe89200d6bdd59939a84cbd37d3a90cf74b06b75bb6542a7181b60cd98bc376f5b26964919fd1e0c1913d6f63 SHA512 8f9278aae23784d90ae23d7ff4ad3289df730a231666bdc41f0cd6a28c8654ab0c71e46e024cd0f2d56b754da6e4dddef64cb1b16d32ce9ca230069b4cf6d762
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index 484748d7ecdc..0b0b57a9b3d1 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index b7381dfecf2a..f9205849c807 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,5 +1,7 @@
 DIST cachetools-3.0.0.tar.gz 20513 BLAKE2B e6fdfe2aff22a9ae35d19acb7a678410c5c06d3147cfc3d57725d942c3e4ce00d5aa8bfce7f8ee80960751643bc655d5d2226382e82c1c5c1eda746cb34a556a SHA512 7211e4d1525b94f5a74a89571a1a3696719d1cb15246f4b8158408082cc59ef03935ba82ddd78a34dbb31b271c234dab6cd82839c13b23159b80264bd552bc51
 DIST cachetools-3.1.0.tar.gz 20664 BLAKE2B acb9ecdc1a9ca4bfdea7b9f593aedd6c8db9f96c703b71fb3007ec6e255d4d99d53c22f6b61ba25d53ac9a3bdee8de7303d18ba05115017bd6ee63c2bacf1fca SHA512 1d03cf42b56857ccc1203a658a8c70fa3c0a3be2ecfa3b9501c14ba674463d4ffccf8a8a9daee13084545a5072ecd7757174a4b074d33b0619020f7ec89515bc
+DIST cachetools-3.1.1.tar.gz 22055 BLAKE2B 9141adb9cff5e7f76a370666c24664de09b1562a9e40636b8103157cc65b146dca96ad871065191618e2d458078cb7da30c80da21b4fded73097bda7916f4819 SHA512 23a7d9c91f97727984585745169dbf94922288e464196d5c05f442226cbff4efeb3588ed463f481bd75892824188bd3ab8031f4f2f8e52924c74428b1034714a
 EBUILD cachetools-3.0.0.ebuild 604 BLAKE2B 2ee50629f0ef6f39666b407ef0aa5c1f096d8d09015a1796711a528c983e3ea07e6bded44cffda9e39081f6e91ab475e183659a5598e2dcfd75a406a4534d860 SHA512 c1b5c0bb6f6e277d0fdf3b14e9b32f8b1ff8c7dceaa53ee3de970582415b8d71458703f5cf2036cac474ff2b44cb544aaefaa75c6b0508ace443df219f8efaef
 EBUILD cachetools-3.1.0.ebuild 606 BLAKE2B 9752544e0328123ecbae39d783147a423be6a043476648474ec5eb6f052f12481a18b849a8afb3694fb83da1d048744220ad70429f48cf9d800fae0179fc460a SHA512 ce7d28be334824cfd888219ce4868f60f8659f16ab1a1723203c2637edd4e082d4aa0e206ad7c4c6c6863b9c913de34fb0220f96f1f12c5830f561e5a86bd726
+EBUILD cachetools-3.1.1.ebuild 608 BLAKE2B 659b231464beccb378959b1bdd44a8a370e363ae4e4f7a01cd6227096acc417c06f2fedfe8acbb76950e959b6f4783deaa14f5ae3f675731060351627e3e6214 SHA512 12a75e69359ee3d1d31da2f410deb9525d5e27b72b2cc961b73bb8017b1a95c078d0a1295dd0553a94cf2f1b478b5de2860bfac12b307dc15a65beb0469fb2bb
 MISC metadata.xml 327 BLAKE2B 13db1dbf3081379704678e984732303e85da30996b4ba48e58d3145ffcf3dcebce27b26a140ce121a4303980ce0c41c7b164c9d0e141f4c208d74ce27f262987 SHA512 7eb94b86c09ed93f498beb76dbdf7217a1bcf48ac817c44ae197e20285b18a336f7cae113ab48a52900eb214be133cde6b52760386d10b75ad8810921a127a7c
diff --git a/dev-python/cachetools/cachetools-3.1.1.ebuild b/dev-python/cachetools/cachetools-3.1.1.ebuild
new file mode 100644
index 000000000000..507ba0de8cea
--- /dev/null
+++ b/dev-python/cachetools/cachetools-3.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.org/project/cachetools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index a93895df4821..1f2a9bf46c50 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,9 +1,7 @@
-DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.0.src.tar.xz 12868468 BLAKE2B 3cb96c95c4d9713feb7011e4f1ca24be3e7f6c9b458f6cd9e6905f99737312ca44cb701ed5871e47dd583145e5898d53a65c4cda6456af3d4ca31b670ed84409 SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
-EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.2.ebuild 1072 BLAKE2B 19d846f9e6dc2c1671c816f70ef0a1b766cde0ac96040032cd16d0dcdcc9996849725442981e2f6034872ab043dc8f952126852366b1be34a056dc1335aa5a26 SHA512 31dc85d0fe65832a62aa7097661b8db78e9689a627225f9634755a30bfaec9827fc8822365d2c7e29188224a6c4e3347ceec2e3b925e40931872e8b697cd6231
 EBUILD clang-python-6.0.1.ebuild 1090 BLAKE2B c98cb3a9f8426a3ccf544884459a6e551ae22d51ae45843aa63daa10cf0da9bf4d22f9a1ec635e0dbd045d3d93a9349e79d8dea840bb846285ff07619215278f SHA512 0b274c8efda44e4d1a3f9de7cd5b8fac5bb0a60ea5b1878fe8c07df098abdfa9b8a2700debaad7f425951c4b5c4c336fc8661acd8bdac6da4ac97e152e6c13fd
 EBUILD clang-python-7.1.0.ebuild 1099 BLAKE2B 28f23947826044651ab666dffe31466f1c7f8000eec9f5f3fdaaaa6c5380400d144587c305aea974da935938e1c4921e434442cf5d57a8d611bc93b0f7e7c791 SHA512 3a05a76fe779227853c3ffaeb453b2980bc290b238527d89b1a1b3f5be07610b082369d7e42b3e09b26e8408c9db08b55236743dd3f36dfa26398a6bba6c2953
diff --git a/dev-python/clang-python/clang-python-4.0.1.ebuild b/dev-python/clang-python/clang-python-4.0.1.ebuild
deleted file mode 100644
index c77ee951ec2f..000000000000
--- a/dev-python/clang-python/clang-python-4.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/cfe-${PV/_/}.src.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/cfe-${PV/_/}.src/bindings/python
-
-src_test() {
-	python_foreach_impl nosetests -v || die
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
index 953501bcf56e..045fc9c7ab74 100644
--- a/dev-python/click-plugins/Manifest
+++ b/dev-python/click-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST click-plugins-1.0.3.tar.gz 7950 BLAKE2B 4ed7d15c37b2eb127faac6179c06467507405d4fd3eb55d93e2210df0eae124167e0206fe9996298abbd7ee26edc8849d5c4062875db12ea92937f225408b4e6 SHA512 1eac03d57931bdf8e2f387164490436b3b921738936ee6cd9a58246e05e84133e77c47dd606a00d1b3e238a806bf83ffe7dc7c758a92d789cc229a94ed26e17f
-EBUILD click-plugins-1.0.3.ebuild 504 BLAKE2B a0dec96108abea202201c08be14d5db6108a54ad57fa1055ba398c6bef8b2c9ac0d9335cb85c0558340b404f2fef2831cabf8940948c3bb95d0112f15e580851 SHA512 921a3dcb6184608731243036ca4077088c7ec7e064363cc390203e1ec67fdf94c39427887151d38df3e73fbf3bbfdd26e3ec93830230a4ef6b12851f427ab685
+EBUILD click-plugins-1.0.3.ebuild 511 BLAKE2B 798d667bb72b5f44c87815bbbcae51352c01ace868ed7bf9eb2a0f135c92993acc0a0129eed969eb31b3b40c7ce79d2781d180f895b962c8d4dbdd4ad5e038e9 SHA512 449e41eb7c97966e8a9e7ffa4e3776547bd3914d676807e4e8a5f79e82b5d695962ad1db5ea54b94416e5443e91467f0deba951b43ead3249e8a741325df2f83
 MISC metadata.xml 299 BLAKE2B 86d5b1fae7081c68356c3991a2b423a2d4326fd29d7db97f3371bccf74ad772f5e53ff22c6fd07fc4442215ff4c36401b0d6c7af59a9584416c4f04f426c1bb4 SHA512 b37fff24719eed45df0c672912037dff92cd7c820316fd17ac532d8aa3d6b04103c837fa436fb4863b4dcaecde2fab4fb35b0e86e2f7c083364be723dc979e61
diff --git a/dev-python/click-plugins/click-plugins-1.0.3.ebuild b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
index 93fa2316c1e4..e0e394b4eedf 100644
--- a/dev-python/click-plugins/click-plugins-1.0.3.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/click-plugins/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index fa948d7dfe5c..905d182b4591 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -8,5 +8,5 @@ EBUILD click-5.1.ebuild 1213 BLAKE2B 03d408ca41c1d8388774e33e99256cbac1e6a5a1e76
 EBUILD click-6.6.ebuild 1200 BLAKE2B fb5deaa2c1ac14b0f4653835afd3e22718cb4f44795cc315087ed61940993597d0392893e20c0c0ad262a68e50a09712d2b1babe6c21ce671cf5b1fd0d196172 SHA512 d33eb4ffd768d1a26641a62f7ed035b7bcd53a838e9ec413553f3951261b82e37c4905accaa3beeaa09ae6b52dbaaef6d923febc19de75320f1149d2f9be9ea0
 EBUILD click-6.7-r1.ebuild 1419 BLAKE2B 6dcb7b0998d5e05082260d3ef13f86dc8b4794675cf2c24e447c1b9c97787b842ac5a8f5135870f7764be2b3a167e7f7b91ed84cff9729299bf78e85e9d2e4a1 SHA512 6fc30acbbe305fca880f4a192568039d3ebd084ccfa0858d17dc07e11010c97132dff9df7d2f492190d080d6f7dc09c5056eab0371bc348cf51f41468bf6d691
 EBUILD click-6.7.ebuild 1307 BLAKE2B 2f13b521b88d734b69b9be4fc7bbc5cdb5aaf761121fafa9eb4c3fdd5f1f382844b543900a63e0af803dd43d46031018abbd8c73c52557126a3547ade1b2192c SHA512 ea837a3e2d42cf681efe634352b85ce8e63f568289f335dce6d42fe6fd5bd2f576fd52b70835fe4cd58e073013bde5e6ed55b8e29fcf352c12e3f9437e26c617
-EBUILD click-7.0.ebuild 1193 BLAKE2B e7e6d032a9f4d9007722fe4531c06e6cdca61099fa3fa6ac32a34d79b1edce6847bde3eaa13935bef768a18db7126efb32e93914b0c63d515ce5ce4a568b0123 SHA512 a6aaaea43ad24c9d8e6ef020ff70ba6de918227e6b31e3b94b194baec6876f365d66f8de46163d60b2faddafb185cde19d9e4746706ca87d6b5a8f76e5cd7659
+EBUILD click-7.0.ebuild 1200 BLAKE2B a25d0932a8c935ebb3632138392f3bcaa9eaa27b9f72ef7ac9771bc7a40b0cabe5010ed3a43c97fbd0bee160f20cf947740924ac319604ce492b06521bd68f0e SHA512 0533ef18ebdf22e11b0430933da21aea643abade42fc89a86869c3bcdc131007e0ccb23a50a4deeb494e31e078a412db6bf5e2004b604cd899a177e91a2ad569
 MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
diff --git a/dev-python/click/click-7.0.ebuild b/dev-python/click/click-7.0.ebuild
index 32314ed99fe5..3f5b491c7586 100644
--- a/dev-python/click/click-7.0.ebuild
+++ b/dev-python/click/click-7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 6552bfb6ab26..c72108ad3c6e 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,5 +1,7 @@
 DIST croniter-0.3.17.tar.gz 17362 BLAKE2B 59887df1cb1464046612fd87bf82575355361b9baa934817d92ea17ded6a440100015168d7622952a218d96d6f8d3a568ebdcde85f2a7ddbe8a31a44b201b3b6 SHA512 4215fc7461843cc2c62fca05424d5eb7d0c80c21cc1e637f5ce3c4891da458cd609d6ed501fab7fe244bbb234e9834ec8a12b76289eec10808ed6c30c1b4d45a
 DIST croniter-0.3.29.tar.gz 20276 BLAKE2B 951b9f2e998be496420dbf08e06a60a0eb3eb8538d9e63bf11182bc449bc49eaec36c1d1025269974fd0ff24430e16c3cf410d2b50873498d077ac22e0b52fb8 SHA512 0333e8d801aa7453ea6bc2b49abcabb24390535eecb5af2050512cf69410d21179405ceea14b8037c8f107321ee53a10c6060796c86c9b24ae48af65068e9b87
+DIST croniter-0.3.30.tar.gz 18122 BLAKE2B d15e19167eabf935ca12ad2b277b9b97459248c3a47982346070b4500b45f8296beeabf76c5ceb9bbff579ab2d713392c82446b234a6f4b4f6e8317adc67613d SHA512 1e7f5da56991281a16919abbb386a20a8437604bbe0e57d12726d5f19c1c038e9b320a900471b1d4dad9f5dfd0eeb85ced17232a4907e50025592a293a5a8ad1
 EBUILD croniter-0.3.17.ebuild 705 BLAKE2B 334c85369f1742c53af673b644a8fea6ad2a9610431c5b32cbb741c207aa9a61f3988d818d7838e76f9f5329a23b873270c39b2507b55bcf22cd45192d85b844 SHA512 64bbcf594eadf1ee101dd2c959c79665c42a31eb69ff419c72ee22a913ac2b3977382558131d3ed5850b07b62a9150ebd4cba71090ffbd5c77a183d50edb5a44
 EBUILD croniter-0.3.29.ebuild 707 BLAKE2B ab0d3248a765756c0fff00acf15fabcc87b5921a7537af27c17049a4755b06cd0f7f9b279f3880cee8cb43346761c27b059facebd1f8f453fcdd7592419baa7d SHA512 0a74da3662de834545fbba5de8d6b9ceb2f4a06745b9d0a74cf6348980712c60834406e66a23b6447382ea19bdadb6b96523bd7c44c94e5f0efec47ab65b18f2
+EBUILD croniter-0.3.30.ebuild 709 BLAKE2B 7e780000b3e15366d15467805f9ec8ab3cf70322561212aad92bab87c7019ea0dd518370b7528c32a69fbba724e326c6e760ed3fdd22b0c1283f63e92f82d504 SHA512 5349f4d0d96aa8b6a597c7170446de0b69316262e23855509527be9174216661c1b72e557fd63844241df165d62237a2c20c554fcb37f6969b3a1679d6e867d8
 MISC metadata.xml 344 BLAKE2B 1e0acd7a1c4fa483433385eb74da9459dc1348f00cc2bde0d8f5b98a0e298f943628252e15d60b1a3c1b2858358ac6a7683394c51f0e06f3467accaab2af6ce7 SHA512 13584ced1986613a6ab7550b050531bb5049b8f0bafc6dd59045620744513d785635aef91f5300cf9eb302b385e6049107691201a866d51061ef2411a24e9a2b
diff --git a/dev-python/croniter/croniter-0.3.30.ebuild b/dev-python/croniter/croniter-0.3.30.ebuild
new file mode 100644
index 000000000000..7bc1326df135
--- /dev/null
+++ b/dev-python/croniter/croniter-0.3.30.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
+python_test() {
+	py.test -v src/croniter/tests || die "tests failed"
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 6f8f4d3ee8b4..20b3e598178b 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -4,14 +4,12 @@ DIST Cython-0.25.2.tar.gz 1703315 BLAKE2B e458604d0843afa128c6019244220bd6b3dd66
 DIST Cython-0.26.1.tar.gz 1725133 BLAKE2B b2c0433e8154ad76d921677608cae42a793326015ff320d8cd61818e5eb5fb4daf73ad4e72760d84f4cdaa2386b87d719cf9cd41584b781d4e2021e377a58422 SHA512 cdf31afaba78209c37a224345471c5c822b78c6d26c51583c46669b6b2b57b4952b33a839a51d06c3330fdff889345ac611fbaa2b2f17498cb02f3b5675f7948
 DIST Cython-0.28.4.tar.gz 1880943 BLAKE2B a97314147294c95fa0bd6d3fa1a1315d81f8abb46a1f2196009c1ef6f0dd7f47f81a7b31ab81d1fd00e8de37878a18a22d225055181ee74ffe4cc8105d84cd75 SHA512 67d2da2d776fc02193cfe98c8942e93905ec5e30bf4e0f9d5c965d930a034936d4c29c8248fccefff5db6d4dee054ec854994bea63fa3f64ff65df7550997c29
 DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
-DIST Cython-0.29.5.tar.gz 2045488 BLAKE2B ca809728115865b7d28100943b358d8f5236382e5ae5a43d557620c3bd856407a9f52b756fc910564a6c041d64b1439d60776c90c6970614f74ee2d03f94665f SHA512 4bbf54b248b9a08b9118d751a6bb5dbb81ae7a8238c8a3124d94bf7be67f15b68820e6ce5470903fb5d5ff5c3c213e1580f1c57a8cda33b356263f9ab46e8851
-DIST Cython-0.29.6.tar.gz 2047021 BLAKE2B 32fe6697ba407a75dad79f08fd2e33ba11b083c65f69e09cd269c8a9f445d183a8cf36794fc8b2abb5e98b9626f0c62a099367359634833f36273c7681835572 SHA512 bb8095b438a7d2567b8b831628fbb32c02299c866e41113da62fb5a5d4982dc0df947a9f723a82c52086806435d8f3518e78a803166149d476f81e042a12494e
 DIST Cython-0.29.7.tar.gz 2047944 BLAKE2B 79a2dbbbeef2c87e523d1222c1e3b62a63273644a0295a08fed3909ef01f2167baf15c0344a64ec168820e21c5c99b0accc083c8dfcaca7f1c0cb8c4b23677cc SHA512 1c2fd2185d65445318118d917ff6f8b4b958b0a036bc3ce1587dcb8fa94ccc750901cece27e4d0d39c53db68c3a620edf2dcf9424d7a6df58a0275097b90fa6e
+DIST Cython-0.29.9.tar.gz 2049206 BLAKE2B d81cc4be6d99e8be025167700517880c3250feaf929f84a9de76e2c9f1ac5eb8018a7cb4609d95c01112e35ab54070eb373157004621d45db3c347ea2b585bb5 SHA512 17ac97eaa01e3c6cd9c7d597822ad25ef5cec2354055304a2999a0a0d969fa0513640470260cf0d88c8d9a7c331f02d1ebf144245a6c45de47e26e7fa73b0ae1
 EBUILD cython-0.25.2.ebuild 2136 BLAKE2B 9e80d1abbe44ecf401f9fa6f2c013e02373c294ca654272b3d44d2b39c7e42fb0e890efdf047eae693d3df9ab960b9778266c1bed7295adabf1ea6c858f448ef SHA512 ed871f7d255fbf7e112fcc67247264005f8c38cd4a9c8be0183e7f2edb6817cec0a47ab858133aa32f5042003fcbcec424ef7c6ef930e1e0060b0f2d73c1a0b2
 EBUILD cython-0.26.1.ebuild 2080 BLAKE2B 0d61c28232f347c0646c5585b3d868f0cd490affaafe70b3e3cefe14ca64dd734d36c4e74745acfe49eeb3f28ad8cf215c3059229c5e7059bf0fa5ef63600abe SHA512 1c1a079f24d7245201a069b757e1b490c7ffc8108cf72ae00cae8b128953a5b910aee4be6c1e78750dfab809b0c3a76214a21dd81785655453aba68f9298af40
 EBUILD cython-0.28.4.ebuild 2196 BLAKE2B 05f6e26da211e42cb46b6a182bc017077bd1e632b4c963cb4a0c48a64dde5926866a47195f235ddbf0143fdd35a588d4651181c1ab9443c67975a4abc0bab5ac SHA512 979bfda159eb6dc89cd7a790166926201f0e74ce8ac3f887a5a40a6ee023e5cf4e2fc9d803cc5e563fb32ba3f7ba9d4447fe47e38c5b7ce6f3292653d9f0f9fe
 EBUILD cython-0.29.4.ebuild 2163 BLAKE2B c91f6b96e8efa825c19d1cb2bb228ba3d5143847c7bed4b089ad5fdd4cda6e48667b2c392f64054b96ac50e43296bf69e842c2080e6e4c49569fbc74b174b75e SHA512 388f4f9b56a58235bb832ccc7fd321256112663f02c63d9708ece8263d712c8e6dc3a72bba25c660cdd2dc732686b94e7f4a5690dee9a3d50987c53b5ffad6ee
-EBUILD cython-0.29.5.ebuild 2209 BLAKE2B acfa7a196a677da67ea43d8c392db746be319f5609fd34e24fb5a3de7ad83b57549f8473528d8b9c217f4de84d96acfbee3b828592dae4dc183cd00b5764ef21 SHA512 564fb57372436ab89b195bde9cb2f1883ca9da6b7ff576a6fed81ac1b205ecccade33ad5364180f8bde4d3b5c4fdfc1628ba7609d467800ca30c6853492eb4d8
-EBUILD cython-0.29.6.ebuild 2209 BLAKE2B acfa7a196a677da67ea43d8c392db746be319f5609fd34e24fb5a3de7ad83b57549f8473528d8b9c217f4de84d96acfbee3b828592dae4dc183cd00b5764ef21 SHA512 564fb57372436ab89b195bde9cb2f1883ca9da6b7ff576a6fed81ac1b205ecccade33ad5364180f8bde4d3b5c4fdfc1628ba7609d467800ca30c6853492eb4d8
 EBUILD cython-0.29.7.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
+EBUILD cython-0.29.9.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.5.ebuild b/dev-python/cython/cython-0.29.5.ebuild
deleted file mode 100644
index 186a24979823..000000000000
--- a/dev-python/cython/cython-0.29.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( virtual/emacs )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_prepare_all() {
-	# tests behavior that is illegal in Python 3.7+
-	# https://github.com/cython/cython/issues/2454
-	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.6.ebuild b/dev-python/cython/cython-0.29.6.ebuild
deleted file mode 100644
index 186a24979823..000000000000
--- a/dev-python/cython/cython-0.29.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( virtual/emacs )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_prepare_all() {
-	# tests behavior that is illegal in Python 3.7+
-	# https://github.com/cython/cython/issues/2454
-	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.9.ebuild b/dev-python/cython/cython-0.29.9.ebuild
new file mode 100644
index 000000000000..3bd1896df64d
--- /dev/null
+++ b/dev-python/cython/cython-0.29.9.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+SITEFILE=50cython-gentoo.el
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_prepare_all() {
+	# tests behavior that is illegal in Python 3.7+
+	# https://github.com/cython/cython/issues/2454
+	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index c235b3c57ca1..08d16e1dca91 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -4,5 +4,5 @@ AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea53
 DIST dbusmock-0.16.9.tar.gz 71014 BLAKE2B d1c0853cfd06848f1d10afdd8de764814054a44080b44e1ac2ef3a1658a538f1e4c7f5936d65658c16da33ccbc2e94f35d2746f200fc6791f645e1eccc55f6fd SHA512 3aa91f6ede054ed3d3a69f68f3886094e881d266a8f09c7d08a34d10b080a77facde8aae01e75232472c2e643574fe897dae2c3588f5ad9ecf4ec4e67f404f54
 DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
 EBUILD dbusmock-0.16.9.ebuild 1066 BLAKE2B 9df8f24c4231843c9738982b1836135f8852774bbe5de4b102987594973d5b9d8d23694aa36447cd0246d415e2aa9d4c17db0c423ad2255f2dda55445baad209 SHA512 63c6f73a03800b347c54dd6fb1f060d942e260a9230fec805344ad486d2443d39fb8983427dd8e41cf59048599d95e5ec7d0c65f6766f8bdeace873e2bfc328b
-EBUILD dbusmock-0.18.2.ebuild 1049 BLAKE2B cde48334778f85cf75d6889c690c424f19c31c18a001f01f4d3da40187c7f8b0e6861686be9362c6d1e24df3bbefa814e4068cd9b0d9bd6629b25c3d5748559f SHA512 2c2563e7a538b8e833609960ba73addd28259b3f098538969cfbef30b083a9e1ba108cd06a8c70056562b65210f75b18d04217d1dd9ec06f7e3d705df951f10e
+EBUILD dbusmock-0.18.2.ebuild 1048 BLAKE2B 63f0a8d82f52eda473bbab08ca5c8a9ca75b1c98546c37649c2a690288f86571fe9d2519a51a1d8e9943388a7e279074b4a039e772581cf52fc423c812ae9e7b SHA512 db90c3026f33a1800b50fc2e8e756d4e3df236a8f982a2be4c485c5a5ffadc0b1af12a3e9a76cca0661607a69d09719488f70fd34910f91e50a60eb422b7468c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.18.2.ebuild b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
index d6f08eb0071e..94c5aba6777a 100644
--- a/dev-python/dbusmock/dbusmock-0.18.2.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/djangocms-attributes-field/Manifest b/dev-python/djangocms-attributes-field/Manifest
deleted file mode 100644
index 9d8ca544e0b9..000000000000
--- a/dev-python/djangocms-attributes-field/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST djangocms-attributes-field-0.2.0.tar.gz 27958 BLAKE2B 23828aa35cab8830cbdab04033335985bb36b27e28fe469c68990775fe379f99f5ba339a7e7cf0f17d9df116a85131f8009068eb76f113b9b785b50f15c9c696 SHA512 2afb7ee05db12573d7f0a174334168ba9e9a9b96f8ac940d01694573f4711845d87995e60ba00af88626eb244f9fee7287328ac3a297c12a2a5d1d90425d897b
-EBUILD djangocms-attributes-field-0.2.0.ebuild 599 BLAKE2B 6357c3633c1b7f222be57002fa17de6207223654b85edb9603abf080f5a7520587fab6f609be64a69975566b35c4e0b5f7d4b78bc02add2a299457e564258caa SHA512 68ed933cfbe3c9d8034857820d1e3895a66b06d7b416810b6500c9d789adb2b7f5c4b6f7e7842d0bf3c5ff20f72dbf6d9fea69937368b979649a4a972d623f50
-MISC metadata.xml 386 BLAKE2B 9bd6228ac5e963f3e4af054380f9f0f70efa8e1c30747de7f304a0ca6543d470bf45a7006b338d80e22fe9d94944f072000df6022a696172364d7cd82949b6fb SHA512 2ece860c10e6999cb835fef57b20352c441a60f53993b77a830db6b2c131727eaec3e864fea4f7254c3f7ea0ab63d61c5238ed9db80de24ceb38fab4a32ef21f
diff --git a/dev-python/djangocms-attributes-field/djangocms-attributes-field-0.2.0.ebuild b/dev-python/djangocms-attributes-field/djangocms-attributes-field-0.2.0.ebuild
deleted file mode 100644
index 863ba36d69ec..000000000000
--- a/dev-python/djangocms-attributes-field/djangocms-attributes-field-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="File plugin for django CMS"
-HOMEPAGE="https://github.com/divio/djangocms-attributes-field"
-SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
-	eapply_user
-}
diff --git a/dev-python/djangocms-attributes-field/metadata.xml b/dev-python/djangocms-attributes-field/metadata.xml
deleted file mode 100644
index 1e23483f3d05..000000000000
--- a/dev-python/djangocms-attributes-field/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-attributes-field</remote-id>
-    <remote-id type="github">divio/djangocms-attributes-field</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index b8cee5ccdb7a..4621dc9f47a1 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,6 +1,8 @@
 DIST docutils_glep-1.1.tar.gz 6753 BLAKE2B 93e7fa03e6e5b4f7d7d338b04d906eac630d2a8e179af14c0c3f0d5f9926cc3705dcec84d2b9b2b7b3854bf9de178256ad2c4ef4bc567c6ba0d95d2abc32b8ac SHA512 7b06cbc7bf7a7f9002e1d61fbbafdb7ee6fa804145e7ce7edc547384f22cac8f9a9072bc137e201ab08a49eedb5e4f2ea8a1f02bd806d7d01525bdedece4afb8
+DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b921125c20913134500dd53ae04b0962141183cbcb9bd17af904196ead2228e4c80a6e256576b715ae6323afadc30 SHA512 696412447120893c198dcd9f13e042d20b35465e83ef8b488ee2f1c184b5fd3928ddbf10ed4e78886c4c72dfe1f9fa46c1f75c7997990afcc04353b5d59ebf9f
 DIST glep-0.4-r1.tbz2 4667 BLAKE2B 34041a972c1edae500d973a2002719a3208c84e042bad231746f83cde99e9b72db835dbdaef536c50bc73c6bbb27e4dc61fe7563bc520b006a04defa6a952c83 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3
 EBUILD docutils-glep-0.4-r1.ebuild 1153 BLAKE2B 1db9e9c166a235e4da1e5eddbc767f10d9381283b20169a47fff45d1d2ed39c382412f71929e23b49966c97803cefc67bbde254e2f0cbea0cb24beb7ecb5b235 SHA512 7a40e104bb60ef53a9c3c6df65d6a58331b5d1f671b759e42faee518dad584692997b063b8cee47a0db3988dba08b51177ed7c29cf924c94fa9ebb468d0b48e6
 EBUILD docutils-glep-1.1.ebuild 834 BLAKE2B b489e6691c62e197b4e2728fe05436a7c753a48a1dabe70a46b7a0007d324fcf94b2785d7cdef01dd411029bd10f1b0aca2f5cad8faecdc6b71f8bdd08441776 SHA512 d92f970556aa3c6fb264d36eb1520b00195c6d9fa12837bfbcb49f5ed52f2fa41697fb853b008fd3a2e5b0a5241562f02da93df3cbb4cf151d0fd41c6223d69f
+EBUILD docutils-glep-1.2.ebuild 843 BLAKE2B 7ac03898d5801779ff289088c61c3431fa0307867583e0429bf1e6bc512f0acec9abad604b4ae6ee2ee5ba4f7b6e3912d88056c8cf7f0b861657c98a577c20c6 SHA512 ddbb1853bd1ed2f56074d5bc9391ebd1dae28de5c6672388751927ffab7449a11903131f78448b8c946d0b3e9ecff88e1748b3d4d8c60cdef543916f455c01a0
 EBUILD docutils-glep-9999.ebuild 570 BLAKE2B cb654f71ce1c806d6a99796f7e8384d9c9e9c4b71c9a2a50cc900e5c9b7dac6774f5698f929fef77ea883bc75c219f6ad0e5273a98a6dafae4222c1398b75dcb SHA512 b4542db1a99d274ec73f9ec9d46e0bc4490091d7dcaff07173b401f28e1371f6a80356e33e0158fa1785d5ab949e05c7e7a0822b76e0a5eba437dc22ddd1c5f3
 MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
new file mode 100644
index 000000000000..cc7630dcaa83
--- /dev/null
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Gentoo GLEP support for docutils"
+HOMEPAGE="https://github.com/gentoo/docutils-glep/"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index 63134df19447..aa08b7b20a2b 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -2,4 +2,4 @@ AUX entrypoints-0.2.1-init.py.patch 243 BLAKE2B 79706eacd51f9eb2b9bb319befc01c44
 AUX entrypoints-0.2.3-setup.py.patch 614 BLAKE2B cd5248f366546bbba8c068d8a27f5853ced0757528f95f082473ab086dff5145f7735d48bb29da92237e1d1f31183726a0da4f7a8a405d1635c23ae634414c79 SHA512 eff2b655b0b0efe32fba265ee7816e6618062a665f86371104862cbc2e1ef79bd6ded749084ef18c09c6a5a43f572daff4c3377b6fa39b6b46d926de5bfeb42a
 DIST entrypoints-0.2.3.tar.gz 11219 BLAKE2B ae7745a075d564b3cc25a0580ae9f30f6e1a0b4bca7315c4fc3700408e4ab3762831212a451eb937ab94096d1db5c1478980b216dea7cfb95a8577d6337534a0 SHA512 dbf8085652e50cbdbe137ae655ef765cff58bdaa6beefebf1383dcd96dfcbf9c92580c09e9a58de7893aebdd7b2a701ef8d13a56ef0fa9a3d9ef7a5bd1d9b11b
 EBUILD entrypoints-0.2.3.ebuild 1294 BLAKE2B 9ca193f90026ca4c1eff86509d7285feb791a6bdc8df963ebd8e9206e72662b240ee110c3e1b5e809223a4ce579040a8c37b555e0853083eb43d71def2196ce4 SHA512 10fc02f0393cab09261d8b1a02b0ee2e07f701be086c8d1bd7034b707d12f6e44a7de8656df7a4075dee2b9e8139b5ecd0a891479f982b8fc46d3bbd62cd8164
-MISC metadata.xml 742 BLAKE2B 0d40b3569d09f83f28d5207a9667ea7029dce119d4fbebc474ee93191effe6c587b3e37423dc1deaa1a205089a6150a8c07d486487577b8078fa398ba411d90f SHA512 0588e7b73f038771ca8f1a6aa637f1d2a67ee1ea8bb35b73fcad109deaea11d7e57b61314a088c82d923de66e9fd8fc8ff5927dfc835ee587c819367f1f4d68d
+MISC metadata.xml 623 BLAKE2B 997ce85b64d32c5c365c929f73349582978e299e71b2e304c54e37b0886b19d468270a63d2d766ed7ee52de4a9fc45eb02d11e3289154b03769dab99306d0940 SHA512 0cba95670dc165b6d6d173947a0a6bd567db198cdc6f10617ed68eeb55f3ee4392e5f95fdd136a6a1886a2f9b1e33b0ba8e098ff8c07f7e11b2374ae544ad506
diff --git a/dev-python/entrypoints/metadata.xml b/dev-python/entrypoints/metadata.xml
index acbfe4f76fbe..7cb364b31780 100644
--- a/dev-python/entrypoints/metadata.xml
+++ b/dev-python/entrypoints/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>marbre@linux.sungazer.de</email>
-  <name>Marius Brehler</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index a56602d79ed2..5d151b9a974f 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,7 +1,9 @@
 DIST fido2-0.3.0.tar.gz 125907 BLAKE2B 95054f258c775ac3b4f65608fd3b62ec4165a568c237064ebb66da1ca6ae899a3d88b5613e9dd4be87c05068ebd698be452dd3467800317e5894092216196e12 SHA512 c6ea83e104d77350413156eba4c1aa2635b77ae00d157dce61e5a8539c65aca4dd1dfc5303f9d408359582eeb98ae558aa1e2043a9b1dfcb23415eb8bc9c6a09
 DIST fido2-0.4.0.tar.gz 141714 BLAKE2B 3d57ef1598d2c84cea8a98e75cdef96b77807d4eb5951515560b43655a48bb0816c4e05ef39314b13b6bad84509e09145aeab5727a9fc6cba65ddf42f588b007 SHA512 4eb95a95e1f5b8b49267bc0a11e5501bd041a211ac8a6249ff9cc26ebb0b155b9d16494c18391a14feecb197d61dc50c8530b2ab38ba7e9dc600276abd6f8bcf
 DIST fido2-0.5.0.tar.gz 161562 BLAKE2B 20d4f6c4e54366a26d5a56a84a6ff84bec0f0e22107aa612db721df8a5186a2129373ae609fb58a27008dc700b4b92d607fc2bf16aab7ac6bff8d9e7219204aa SHA512 fa83848e179b9208e2a701a3330faa1dde75e5e23133540eaec896145dbde376bc424a5e59865d3cf90c5765882e22530e96df2491101d2b5dcb22cfc4bcbb87
+DIST fido2-0.6.0.tar.gz 163137 BLAKE2B 3a30d4267a1aae00eac8fa8c05065163f992b72895097aca95dba72300bd9c30373c7537a867e532949af779e8e7528e1a3aad8f04cb0170678675294757b5d4 SHA512 1fb8e591480ac2ac9c405e4fc74895d55d630e462626f849952193c3ae6720104cca1da47af1f89adbcc026034f69dba12fc38577b00f9802434db2162d0d1d5
 EBUILD fido2-0.3.0.ebuild 815 BLAKE2B 47d151f3b6815c8e4e1d1b1b358a990740de87fcddead0faf1e1b5af7a65f25605f14ff187552966639556a590339c15b9ee07d65a5c534d2f73e00c7aecbf84 SHA512 d362a8541aa7d38fb48cee5aedcf3d19f6cdaca0abcad46a4570fe878d5e87d4d54f4804fabf48945e69359242508ba64f5f5feaf65e27a7267bf20cf162a14f
 EBUILD fido2-0.4.0.ebuild 1105 BLAKE2B 962bd3af7f775bcf36789d49b5c38351f4e011ec6353b18efc7bb20ea87420499bbb04917c2f1dabca1315c4b4518b47f8eba73c94871d8a6e3f2c4ff67b227d SHA512 bcdf8004248851758b7ee65a7bd1ce50ad0ccb185c9ca00c11276096e1f75a370e34fe582bda443cfac6bb247ab2c0072b0c40aad53e1113afab570fa44485a5
 EBUILD fido2-0.5.0.ebuild 1108 BLAKE2B 3236a27d2332a0a7a8aabb6fb378ee154fb3f79be7573b35be91dbfc9455b0ff2f5eb610665bc09ad81b5aec1b3270bc6b6b84ec9fcde80f8f7b7139be3a5323 SHA512 73c2a5bd2063a5a08cba6cea1860f4e6b8b2d94e5363672d8155a6ab1a954eb0bc07aafacf67d7a113e0a05b45188efe312818d4151c15f7b0b6393e7cd4017f
+EBUILD fido2-0.6.0.ebuild 1156 BLAKE2B 3d8346c8709265241373b9c4b55efb19417f2d86f650f23693a28ec02756cd1958860bdd3c6a6ca04f280ab3222ac57414a3a1338a10a1dfa6d99576c7321b82 SHA512 a6b08fe75c9fb85deb6249eb6418e2f5f9153e9246d088ecf81c5cecab6a9f5382efba38cfcb46765a62a67e6b69be91824499a5749e9f5b8bc54d5261f25cf7
 MISC metadata.xml 516 BLAKE2B c8d1710daa727f863e8936fcd4d2374c174ba6f1224d7c66d498bd9353e165b5659d3239d730bf406cd18adaf0acbe1446ebd3d2e3d0baf4fe28e512ac70fea6 SHA512 18f926acaf096999fb70f2942e81ff76effd0f769defbc975653992282ede547c2403df64937edb4d183dc3e218c0183ceb39f343349502f6ff9052db1446090
diff --git a/dev-python/fido2/fido2-0.6.0.ebuild b/dev-python/fido2/fido2-0.6.0.ebuild
new file mode 100644
index 000000000000..59d15dc14264
--- /dev/null
+++ b/dev-python/fido2/fido2-0.6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python based FIDO 2.0 library"
+HOMEPAGE="https://github.com/Yubico/python-fido2"
+SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="test" # Tests partially fail due to stable openssl not supporting ed25519
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	examples? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${S}"/examples/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 3b2aa3e3aa2e..7eeb445b2059 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,8 +1,10 @@
 DIST graph-tool-2.19.tar.bz2 15147961 BLAKE2B 93f4220d6f86ed5e18619a4300272185673d54418b6b73eb9cf2264d698b9f66589f22fe9906082c5b6360e037115c6df7c52871e33c1dcb8ec64c3596b76bda SHA512 dc0bd93ccf21bb6616035dbfe33b0d9406eb894791e615795d486dc8f9d9991a6b93cf835cf4e59197005c14faedf105f3384cccd42db544104840cf857b2a84
 DIST graph-tool-2.23.tar.bz2 14998733 BLAKE2B 5eef201f9751ba0ee64d3f3d0694631b23b8ee7799d0e0a1a52125b3b355ee30bb59400665404cd040df29ab2534dc0fdf940d2f3abdb1ddfff0894fb150ed3b SHA512 bd7e493806152d004ed8fcd5cd93f8a27200b0acacde07026ad6f83e8b9a0cdbdedfee79f5ff4c41de179ea3293a1d100571501e8791dad2ff608ecb424a9e36
 DIST graph-tool-2.26.tar.bz2 15000764 BLAKE2B eb4db3d6753b4af8e38cbd9a71e5e5a6368e30556b83f8b9b9a67d8ede2fea9789bb959eb405eb1896c69c487915f18849146bc5fbd95bea1b7910c7c871d577 SHA512 97f51f777f45383780f765277d1af6ae4879ec39243e9b5c11a5c8f58e952e34c301d51e4ce86a0de1bb7b86bf7150d85ef182693e99f319a19a36d2cc25742a
-EBUILD graph-tool-2.19.ebuild 1841 BLAKE2B f13e4b7c6964ecc45ea006c704f951d9d8f8c26e3a31590f4752964439de34cedf08d2c9475dccbd2a513b9385ac1bcf0f3e5d66e4ad4ab0ab196827683c0dd5 SHA512 a48d35efe8a4334cd68ee4e8b50b979c26a28eb22c93fba77773fba7d71132f6a42f7d8cc400c8814147a54eec28dd804325893d71c27dfec1d64bcc9e9fbf21
-EBUILD graph-tool-2.23.ebuild 1826 BLAKE2B b5d2945c8a72c143fb8f14b0276c1c87e84ae54b44688db2a76e25c90d64d429f6def85accd5ae633dfcc070f73a4249dbd6d2c6f795aa6f9bce0161bbeb985d SHA512 79f24d5b86153d62a91ba440a9809202e251daccb63f6053290308aa3d31d395be9270aa78878f8238497b590eb93a5ae86accb504daef15c20cddb01b2feeaf
-EBUILD graph-tool-2.26.ebuild 1827 BLAKE2B ab12d6856d360d2154525866986087a5e1fc673c901f1fbb93908f6d17af2b17ae1f418ec2e17932b0fa498858115874f0e4aac058d7afeedf1eee4a8842fabc SHA512 336f4ddc81de2746678360f6be8d0ff594550c13919da72cd24ef5d7084c64d657dcd05c390f09d017bb4821b6c5060b68e5b66c02db5052a26e77537da85abb
-EBUILD graph-tool-9999.ebuild 1827 BLAKE2B ab12d6856d360d2154525866986087a5e1fc673c901f1fbb93908f6d17af2b17ae1f418ec2e17932b0fa498858115874f0e4aac058d7afeedf1eee4a8842fabc SHA512 336f4ddc81de2746678360f6be8d0ff594550c13919da72cd24ef5d7084c64d657dcd05c390f09d017bb4821b6c5060b68e5b66c02db5052a26e77537da85abb
+DIST graph-tool-2.27.tar.bz2 14989318 BLAKE2B 1fc307f33fc3e4642e91c20cc4988915cae61306ac445be070f19c263e2d2a74a241d651dd9c4b6b78d5f28fc8cde00789cf90db53cbae6db0583cf216824301 SHA512 39ea5e76a91f03bc2475d80df6001c87fc47517d279e27fdab413aec8982146993d3c4a370f85cb28a53e5c974b0e90b0fb22538f3d66ef9cb635abf6188d434
+EBUILD graph-tool-2.19.ebuild 1847 BLAKE2B 586f2f7ea0af6a41ef67ed1717c914b6f54978b1e28dbb01fe272fbef49d73747f352ee73eb5ff3c6e7a3ba9d83afbb920ae433ee489a0ea0051128f596f317d SHA512 2fd9c982640b48cb13d198bf9b29bc14b9de9c4145d80c585903b4744a00a00a6f4d619938c0b40a2432516fae1fd1a1115599d63fbd22f5c28bab8658f33f54
+EBUILD graph-tool-2.23.ebuild 1832 BLAKE2B 39d685863139deba4614e2279f71b8ba74db7950fb4ebeed35dc334ca7d1b57fbb69d031fd1350625f4f29fc07eac7e7d723a102340871aa3be2202bff49d399 SHA512 2a5986c429a9aa2ed1c1470bc2dd71a5485e80b19063b0f9862a1cfffc265d3ead53eb76126202923782ef5c95a327fcf98dc60d8a21ff2f75a5f4efd9bee762
+EBUILD graph-tool-2.26.ebuild 1833 BLAKE2B 0a6bac1cf32f545ccaf626f00726e8053958aa026bf6f9ca7d12f62fc9e44b45af85e8c4071751f6b4473196b7fa0c8e8250b2535078b5fecadd938bc05c5458 SHA512 bebc147f099d820e1c5c3c4916e20915ad9612b442a82762c2a7c644258c096d37624c5b62d20bdf5dc79b1522b9cc8a6b5bd2a26b714de82da6d15e23d4c100
+EBUILD graph-tool-2.27.ebuild 1769 BLAKE2B 4b3e95b50104f32abc8290859a0d6e31b0911baebf87b9293a97dd9820315b2002583cccb6567ccc6315f274cdd8c9e418832726c3acab61b219f5119e5c6ac2 SHA512 8281f1260a758166f2496be1c744332acbb429b492d53d01e271f307870af49bb5c6bf5594658f025c178c1ceb31e0cf649c3a17de9c21a425233352e9c3e47b
+EBUILD graph-tool-9999.ebuild 1769 BLAKE2B 4b3e95b50104f32abc8290859a0d6e31b0911baebf87b9293a97dd9820315b2002583cccb6567ccc6315f274cdd8c9e418832726c3acab61b219f5119e5c6ac2 SHA512 8281f1260a758166f2496be1c744332acbb429b492d53d01e271f307870af49bb5c6bf5594658f025c178c1ceb31e0cf649c3a17de9c21a425233352e9c3e47b
 MISC metadata.xml 354 BLAKE2B 7b0030598a6adc4b25abaef5beb3a7cbf24142a41f3272ded30dd4b9d8ac1e0ddfb0747affefead95b2ecf2a7540308a2e1e9c3dffdee610a2542054e9ad82b1 SHA512 4f8b73df8933d138d1d86ef9436bca38dc449b035701b51ea1d3ab666f3348a21fd3ab09817358d8e6e15a9189a7e61edc3d9af42755e4de472f1acc59852f51
diff --git a/dev-python/graph-tool/graph-tool-2.19.ebuild b/dev-python/graph-tool/graph-tool-2.19.ebuild
index 25260b09ba80..23f0806166cf 100644
--- a/dev-python/graph-tool/graph-tool-2.19.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.19.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	<dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/graph-tool-2.23.ebuild b/dev-python/graph-tool/graph-tool-2.23.ebuild
index b42f702c4c8b..68411e981641 100644
--- a/dev-python/graph-tool/graph-tool-2.23.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.23.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
+	<dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/graph-tool-2.26.ebuild b/dev-python/graph-tool/graph-tool-2.26.ebuild
index b3cff09874f7..70694fddaf91 100644
--- a/dev-python/graph-tool/graph-tool-2.26.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.26.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
+	<dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/graph-tool-2.27.ebuild b/dev-python/graph-tool/graph-tool-2.27.ebuild
new file mode 100644
index 000000000000..722d8632350d
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.27.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit check-reqs python-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="https://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
+	dev-libs/expat:=
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-mathematics/cgal:=
+	cairo? (
+		dev-cpp/cairomm
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-cpp/sparsehash"
+BDEPEND="virtual/pkgconfig"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	configure() {
+		econf \
+			--disable-static \
+			$(use_enable openmp) \
+			$(use_enable cairo) \
+			--with-boost-python="boost_${EPYTHON/./}"
+	}
+	python_foreach_impl run_in_build_dir configure
+}
+
+src_compile() {
+	# most machines don't have enough ram for parallel builds
+	python_foreach_impl run_in_build_dir emake -j1
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index b3cff09874f7..722d8632350d 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit check-reqs python-r1 toolchain-funcs
 
 if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
+	EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git"
 	inherit autotools git-r3
 else
 	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
@@ -25,19 +25,19 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
-	dev-libs/expat
+	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
+	dev-libs/expat:=
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	>=sci-mathematics/cgal-4.9
+	sci-mathematics/cgal:=
 	cairo? (
 		dev-cpp/cairomm
 		dev-python/pycairo[${PYTHON_USEDEP}]
 	)
 	dev-python/matplotlib[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-cpp/sparsehash
-	virtual/pkgconfig"
+	dev-cpp/sparsehash"
+BDEPEND="virtual/pkgconfig"
 
 # bug 453544
 CHECKREQS_DISK_BUILD="6G"
@@ -58,15 +58,12 @@ src_prepare() {
 }
 
 src_configure() {
-	local threads
-	has_version 'dev-libs/boost[threads]' && threads="-mt"
-
 	configure() {
 		econf \
 			--disable-static \
 			$(use_enable openmp) \
 			$(use_enable cairo) \
-			--with-boost-python="${EPYTHON: -3}${threads}"
+			--with-boost-python="boost_${EPYTHON/./}"
 	}
 	python_foreach_impl run_in_build_dir configure
 }
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index b20414f26b61..8873228d3431 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -3,9 +3,11 @@ DIST grpcio-testing-1.17.1.tar.gz 12422 BLAKE2B 015a756c04db0d6a67b954c36c7d725a
 DIST grpcio-testing-1.18.0.tar.gz 16603 BLAKE2B 6f6170211701b56d5937947ef227cf9199ec1fc7c5fdfd140a222dbdee7db7d352e95fbe2d50be8e01895c19986b858c9dc2ee2ca4a6582e484cf05b148e0a6a SHA512 1f855129b7b939a1b70105e68c1ad78b3dc32efac66657a985d1f21a3945a2077d80c70fbe5bb0304fd8f85d69c1a75478b13b7a824c9e66a0563c1730c13f83
 DIST grpcio-testing-1.19.0.tar.gz 16355 BLAKE2B c4b88f4fdb358ca121593b1628faacf269e02ce1de8693401197883aed94005ae1903da9b92f77b77afa92f05a74ec6f65fbea22e6f16b7acaeba90283890b88 SHA512 82522447620ab0155cc3e4a159897942da15726ea7e29a0dccd76fa39e718539c8f05353b718729c87f77864873ae51f2b28487676ba6f26ccd9851a17f1973e
 DIST grpcio-testing-1.20.1.tar.gz 16553 BLAKE2B 5ea6a92238cc086a030c23666340f32bb00941518f0507a2db306feccc568263813be6819d4bcd593f7e52575f79b1ef29d3024e591227b530815a95211a2c73 SHA512 5cce728015466ae6f14c28258abc71e73ef0b195ba2a874999d3a18f9f8e45450b50a3b4d3ee72f07d8c306a324de60383bfb0e12e5331968fe28519e0f2cb08
+DIST grpcio-testing-1.21.1.tar.gz 16879 BLAKE2B 4595b99b174db549a2637c9e203e7de0a799086c0119751927b7d57b3837958e296671cbc7b6dd5598d8ea10fedbb23380de200604367308186c03ed77e607ea SHA512 3556c21f0d51a5b4cbfcf8eeec2b383b1aca5056337d3ee8f46a5dcc7c7fc4507b858d2309232e982650495a83d1d80f6fa251f25f77a6b180817fab8d4c4527
 EBUILD grpcio-testing-1.16.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.17.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.18.0.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.19.0.ebuild 522 BLAKE2B df149020fd4d3b66348cd08db83e3669cbfadb8c62110efb0e643af2737be7eb2576ed04217722936cff8eb6f11fac521edcdf22aebd46245f845ba0ffce6410 SHA512 90ad1fbbd670eb50c52d02a51963aec60287d8b803d99df335c84436fe7476a376c312ec1e1d68f285838ef7bcbf4719516879ca806283e1dc8d49a833ef4a7d
 EBUILD grpcio-testing-1.20.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
+EBUILD grpcio-testing-1.21.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild
new file mode 100644
index 000000000000..0f6ea5237441
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index a1c82d540408..efdcc59cdc31 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -3,9 +3,11 @@ DIST grpcio-tools-1.17.1.tar.gz 1900052 BLAKE2B f84f9b7f52eab6758321d50aeafc25cb
 DIST grpcio-tools-1.18.0.tar.gz 1925482 BLAKE2B a8a97e3a6204593bcc0e96d392652d31d1b1d545c91922222b124dc250d020327ed81fcc1c5feb02115517da34141651a4b24a13df825fe352dfed7715724768 SHA512 5c581a41804eb5dbad34829c9dd32253849484dc6e92d0bbd43b816ec3b45b741b23bffeb9969bf2dc3b7183cb05135f6dcc20f5b260c07f7173b9688c9852c0
 DIST grpcio-tools-1.19.0.tar.gz 1920614 BLAKE2B 00d3a702071d33a51fe47aea6ef47d58e2901df6b55cee8fba1c382e45695fce32e2fc20e438d48b5024b7a80373bea76466f2981f58b106192016078f2df214 SHA512 f9832237a0ec3e1dc8550dce5c0b06bfe43d1bd164b251c1bf9b8075ee647f23c8da31f90c84cd7f047682832876616ec5c73b495cb4a1fa2d83982cf368eee2
 DIST grpcio-tools-1.20.1.tar.gz 2018570 BLAKE2B 9c2ba04b06df9883ac79726aafec6eb129c338be93c61d49cafea29d4849bd497bd45da106431b7e17ece281037cfb0a53ed33ca7078306b727812fbce9df9b4 SHA512 2888e5c3ec92733b43b6bd115bbbfc2bace99ffeeff513a8c1c98fb670853a4407de41a5449613f88d8586fc21809d5a0c6de953dc211f3108b32198964db2ee
+DIST grpcio-tools-1.21.1.tar.gz 2032788 BLAKE2B f26e94c92ebe076496a8738dcbdf9b67dedd5fd60426632589ba88bffd3943cd094881d61b4c67e25660902ec10887a0ed154dc9e6e33d97460313514f4d5eb6 SHA512 624f23bf9d7d6787d4b65e60d948feb88548ed6963443cf8cb1a3eaeaf03dd2ca9a8fd9e8a6882137b781b737b23934b84e3a922df95da95885bbd5f3de873b5
 EBUILD grpcio-tools-1.16.1.ebuild 678 BLAKE2B 08cf87936b8367382223332522d1ef2f36d4bccfeb63ab9b57dcf45072aa0c8cb62fb3fcdadd8c57d0f84426e9c66988e5a25524222d40b553f5a1fd614e485d SHA512 3c6602867b69f2a6a99a467c5472076fa8bc1ec7ab6bd56418756fccf9f059559b130aaae82183456a6741a5d43f11c46f01634f2215ef8b4e3b9c379f903acc
 EBUILD grpcio-tools-1.17.1.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
 EBUILD grpcio-tools-1.18.0.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
 EBUILD grpcio-tools-1.19.0.ebuild 759 BLAKE2B f6e127ee9d8d8a98a5f810ca27ac3bf15041a58d95abc247e6c79fc1d7045c71919a29a92a8e54f08707ca16d9cd069bb2c114ea900aaa1f042682ca6f9c261a SHA512 124ebbaa082a3acfb3a033d1ac8210c6f7d22a79b99494bbe6da518c22650d65fa5866b514c9b420640a23e3e1d6b2a065f0a97d956e76dd07f27bf3d240b6e7
 EBUILD grpcio-tools-1.20.1.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5bfd0d9c5afa0ca5674f6e3f05dcc52f8d477f1fddd2ff59765b019c1cd72da5044b1f816209942c8399532599425451 SHA512 0ee07931ac0f0c54fd445e0baf0b64b3fc56651011e731301cc99bf4fbc747df94f226c1310c6d0e8de48c27986749be76190ce8638fa38e8721d848f370ebfc
+EBUILD grpcio-tools-1.21.1.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5bfd0d9c5afa0ca5674f6e3f05dcc52f8d477f1fddd2ff59765b019c1cd72da5044b1f816209942c8399532599425451 SHA512 0ee07931ac0f0c54fd445e0baf0b64b3fc56651011e731301cc99bf4fbc747df94f226c1310c6d0e8de48c27986749be76190ce8638fa38e8721d848f370ebfc
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
new file mode 100644
index 000000000000..c9f032bd7710
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	!<net-libs/grpc-1.16.0[tools]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 95109b3a65bd..9e3ee7ceef6b 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -3,9 +3,11 @@ DIST grpcio-1.17.1.tar.gz 14563233 BLAKE2B 61ccfaa967ee348f02f5a201e4f36f25d4fa0
 DIST grpcio-1.18.0.tar.gz 14601124 BLAKE2B 4dc57243759c573b960e841def6af335f490fc6aa285f88979b4c66365b104a84269688c589ed7ae797527b04124a9997937f5bf33b179978077b2b680e515f5 SHA512 da791a418e0f6f3a7be921e107586837edcd2020dc8dab1107712372ebd4896b6b94e00d7501ed957e4ab0d5f7d6a3f2b57477ff33c55eb5e4ad7828b2f21624
 DIST grpcio-1.19.0.tar.gz 14621509 BLAKE2B b756ba60d317baa089b8ee57c458bc68fb72e61a87150f1ef3366fea23456ca8d5bd443ba1579d1bef5d0049f249fc8c2c6e7c7cc0967eb58c102fb03d783103 SHA512 620459dd1a22cf60cb6bccb1b7dd64175f1efdfc098152cfa1889ad0a727b7a92b72f9de28b57e9a45cc8d2c22e2fc36307af8ab52ced454a91aedeaf7158273
 DIST grpcio-1.20.1.tar.gz 13882426 BLAKE2B 4211d9dedc7ba858a5124798f17b3b158f255d055f32f5947191fcb5fd45cca9c97aa3f8c4966e7195add5289ba3747a77b2f0c01a35762ffbeba6938c76046d SHA512 0ac126d8b2c25204bb03daccfc9b17016bc18dd31f89f6e208f2ae39d7e6fd17ae04a8178367a5334421d959b14fd3d31ac71a692b48a060d98f983553fcc3e2
+DIST grpcio-1.21.1.tar.gz 13919484 BLAKE2B dcad98da8db4aa588facc30d1b010ec1e4d5f8085751422277631329f1c4949ba3e2c3882829354025a845992ba9972df1c48a277df93caef9015969f9423aef SHA512 0ea20490ce5e776a6253d4b89dd9d9091afb7462d6bd6bd9d2d3329979d61360a3e31abbd043b90d0908512cf7ff2668bb21cb472fbf0ad5a3b5963073850dd7
 EBUILD grpcio-1.16.1.ebuild 921 BLAKE2B b6299a97f90c14a8fd60c148cbe6449a8025b391c69a7f3a9fa1201e06317a687982c873437b270ddceaa5470d5077cc840cc931c65a6e7cb442ad7342f75c8d SHA512 70b3fd83bc2bbbbd2e1cfd93624a5f6a18e2a126165ec5d2d1d946e5f77a672ecf2a2ddcc3f21e29d14e0d3e65e97edb89f98034b0b81644adf516ff3ae48259
 EBUILD grpcio-1.17.1.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
 EBUILD grpcio-1.18.0.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
 EBUILD grpcio-1.19.0.ebuild 1097 BLAKE2B d9eec593595d99eecc5ca5e127f1ab24b015715bfd76b19013788c793aea428732daddcd6458889142a1ec542cc82bbdcf1f74d6b0f158faf4a4722efedf5d36 SHA512 353cad322f66ea4dd434f8c26b29220b5911a66e53228b6f87b34fbb6fa143e9f13dd78be15b9e1aa60b912837e73c7e0554a015c6c788cd8421b416962a9b7f
 EBUILD grpcio-1.20.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
+EBUILD grpcio-1.21.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.21.1.ebuild b/dev-python/grpcio/grpcio-1.21.1.ebuild
new file mode 100644
index 000000000000..095bde11b67c
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.21.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	!<net-libs/grpc-1.16.0[python]
+	sys-libs/zlib:=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 01c743e488be..e1750299bf6c 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,3 +1,3 @@
 DIST hcloud-python-1.2.1.tar.gz 63592 BLAKE2B 9a6d2dae97ff405ebd9b92bc833c9d953c13840e68be4eb43fed375a60e55cf4bf9b4b742b26fb03401f631b7f7127815961861cb673adf4839c829141c8ed00 SHA512 cb70d190350457fc3c6e474bc6c943070102762595dac2f386041956f64255f390a928a2f2411be861645cd65b015ab9e0c931b36aeed0076b06d9f67ac72d1c
-EBUILD hcloud-python-1.2.1.ebuild 1057 BLAKE2B c8fda044b354b74e8a282868820a70160ff64ab607e0b0f3ef8da7a5c4e7257863bf125318e30579cf444dcfe85140ee5ce53e5b1f6650b27c10709b7f2108e9 SHA512 ae66456a47e8d72a8c6c5cd2e03ed333e5da3b66ead7aa42aefd4d4bc11c0534f9ab16fc0bd32934bfbf24ac3566470cc048452333993780f378460139250ddb
+EBUILD hcloud-python-1.2.1.ebuild 1057 BLAKE2B e3e150a586a21f819202687513e4cd98cf80a38f017322f99cfaea2fb1e57c9b3dd13b6cfae24b53ca1ed50a70689a26c47253e8f62d80d32fc7b3ba3de0b3b4 SHA512 c1c34c485aeddd153d4ea714e15d31d34b94a3da28a026b9e6648382ca52c5c0cfa8ab6fa56801abcd0fe6cd142efbf57b9fe3d455a986b808a9d5309279ad18
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
index 79c12ac6fa46..e9d98103d9c9 100644
--- a/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Official Hetzner Cloud python library"
 HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v1.2.1.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index db2af269eb4b..12cdeca43b7e 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -2,5 +2,4 @@ AUX hiredis-0.2.0-r1-system-libs.patch 746 BLAKE2B 5819aad60d449d6516587855bfe1d
 AUX hiredis-0.2.0-system-libs.patch 899 BLAKE2B d84ddab512839d0901b0f14d649970252e3cb00716871f26a68206a54b60e4b015f4e8498211727b0de7d72981e4171ae5517258ba8630678343da02ac0f3c7c SHA512 fcfd8b3bdc4e987bc82d461babec71b7f35c50aa9a9032784821dc782cb45ae714c2f199806f84449aa5e8b9a5d4480b0ca76ec1b4f1cfbb869a5ada7486951b
 DIST hiredis-0.2.0.tar.gz 46113 BLAKE2B bb0479f99f5f705488846ff5e7b52d6e8a5c34519936aa747027e8a597271d3ba70efc2455f54c24248091a4477ac2a307cad7d89a03c96cb7d331e6b6e82a30 SHA512 9eb18ec089517340043d14938a213b139dc948dc9cf2f9c65e632bb4694ac22543b87a5875c1cea083e2bc8e303103c749047889cdb3e9d5680b586d34330c86
 EBUILD hiredis-0.2.0-r1.ebuild 613 BLAKE2B 85b60462fba3c0008a66822f4a80d966cf3f9700bc8791dc76791c573690e662f8c9d33ddc91c0cd764d2633e117605238322def6a5630c8bc5c6365c1189155 SHA512 abc9e2e0d5778abc443499ed17ac6a9e5975d3c7f70ddc90dc700dd222bd3911dd9440bef2be45b24723cee0c97e10a5bd17e78bc468499791011b4b52dbc8d3
-EBUILD hiredis-0.2.0.ebuild 607 BLAKE2B bd77f99a7b594c7d4b3bcba2424a3c742f77c5edf6cde7ba6c20646f4d7639fee0562fbd9c4f355ebdd5d5fbc856c678e97462164d297d41f6eada8ab3f9dfc9 SHA512 29813ebd778e854535dcbe41b770f0a32f5159964f2f60c0339458306131d0cb3c0c582cfb026a9e3223061c39135002c35e5c7ab39f5147eb2398e55d8639a9
 MISC metadata.xml 494 BLAKE2B 066e1d365169e3818e9b5d37f7a2c7812af63ccd2ef79ce1e8dd224b2aa4d110792441762e769791d2c93f5f90349390cb04671ebe4cd199117df20f6fa7d8bd SHA512 f378121293d91d941dcede71f7e7a1a3e6fe906aa5963bd2388f8538d4e696d0bdb16c4f44126105b43ec81b1ee9e36e9549e7557d76c6a032c1cae3a4103265
diff --git a/dev-python/hiredis/hiredis-0.2.0.ebuild b/dev-python/hiredis/hiredis-0.2.0.ebuild
deleted file mode 100644
index b403546673cf..000000000000
--- a/dev-python/hiredis/hiredis-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-DEPEND=">=dev-libs/hiredis-0.13.1"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-system-libs.patch )
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-	distutils-r1_python_compile
-}
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 58ed0fcf9470..5470ee2cdc5a 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,3 +1,3 @@
 DIST httpbin-0.4.1.tar.gz 88101 BLAKE2B 3df333ba92d50e065a598b2dc51ff3355eb94eb4b3a3094ba79cbe95fc11424e05f187e434ac299023dfbfd790b32db070a37e08a962ac19d803de4405603bb8 SHA512 feb519ee909c5115971f4bfd488ec0f9e987cd473464721f4e343e09b9d8fc592cf48b50ff3a2960bb67310521d865091cd766ed351ebfaa2dc8193115e9f052
-EBUILD httpbin-0.4.1.ebuild 888 BLAKE2B dd2b79e54dd79a64944de8af4e333980544ea186d5bbea1ece7ebf6914ab3f5f27ad6e2e4e50fc88432faa4d67e4a2bb9e5f99cb88eb0382c43af21238da9e7c SHA512 dfc4b2617611b7f9d2fccd6d7762ab33a8afdb7581d96fd7361103ea065807eecf8b76dd551d171e8f5efe0b2e6b39bfb15de4a0bd146bb1355539812b263f7a
+EBUILD httpbin-0.4.1.ebuild 895 BLAKE2B 4c5c5ec61394a4f13f81d1f240fb8967469d863c734c36ed1bd02370c3d5e533b885d8a7aaa64ae19ead1afbc6fcb67d9b0ac42b8fed3f0660ab4dde4e41b9c0 SHA512 49a277badcbae212f365d58afdf744b03f6c32b42837a93633b75f4564464e14872817f0ff0c104f9b5accb33563df4b82b29595f6efe3da317966269ebb79b3
 MISC metadata.xml 500 BLAKE2B 1270abbd84e19a72d75a2955858c49c6b33a8c92da7f86fb7853fde55968a840d941fe9f7cd1ec2718e8cbcfede6166c412aac7fc40e483043330935720dd898 SHA512 014a5e115d2cd225618e78ddf226dfe4f8772815efc3e9ecf49883701127335d9cba5e216daaba3f15de2944074c0041e5fd6eaf26772f0892da891570f841e1
diff --git a/dev-python/httpbin/httpbin-0.4.1.ebuild b/dev-python/httpbin/httpbin-0.4.1.ebuild
index 50b502713c17..bf83eb39831e 100644
--- a/dev-python/httpbin/httpbin-0.4.1.ebuild
+++ b/dev-python/httpbin/httpbin-0.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipynb/Manifest b/dev-python/ipynb/Manifest
index 52b1ef2a1da4..3a4eddf41fbf 100644
--- a/dev-python/ipynb/Manifest
+++ b/dev-python/ipynb/Manifest
@@ -1,3 +1,3 @@
 DIST ipynb-0.5.1.tar.gz 50890 BLAKE2B 57c7d680b467b67baeef8b36f741cd1f396c716b20efe2bbffdb889a1e78ff81ce10dd52bcc01450279bda5bdf17b39a0ebd4d014e884fa61a8c884d9042c04a SHA512 30e4755661795401b6139e79b8046cf1d157660cc1effee4c19fe62fb1b0daee4daacbea3a6e7cf0c16d7efa6d82d83becea11894bfae6557a1d6cb04efd18e2
 EBUILD ipynb-0.5.1.ebuild 468 BLAKE2B a25b40b88a141a006610ebd3757407233f3c8a85c60ac3481ba5713a6b204080224a8400f4bf8f6f158c0bf550fada898b24132fdc2c232d17579a502cd84fea SHA512 5de722c9117db581e72959f9699548f717fd788e4620542ca1fc24b9dda9ae4c4089646f24f34701d097d82223967eced38a019c61748bade6aa788ba7e540f0
-MISC metadata.xml 667 BLAKE2B 5a5af7df22273f550e9d2bd7eebf7f2bf4a00903949f3d0be67f38d57896a86051595ebde9310cbf4bc25d103c3be8b1d7388efbc3b72faae51d835329bfc027 SHA512 d248835afd2ab8ae67ef01fbf340ad06739c962efe9efa2a64565d7e189422d8b435514ceadd848ed4d70cc086b14f4b7ec0ea5c0e5cd0da306fca7e924bcf12
+MISC metadata.xml 552 BLAKE2B af3199bc2d1056f824ea7af9d2028e279f9137914df7295fa095795b472ac32cca48712c53567220d22330478c66af505020f17f1519c2bfaa7ae851bb461192 SHA512 dd576715c94368f5e15a3433f3f1896e7630cb91a6247050ca4519c6eba4086df52f9198d5dbce26ffe7de31413f6e46b4b7cf3eb637077d92ffc99ae5868a29
diff --git a/dev-python/ipynb/metadata.xml b/dev-python/ipynb/metadata.xml
index 580977109cb1..aa8b7a52a645 100644
--- a/dev-python/ipynb/metadata.xml
+++ b/dev-python/ipynb/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marbre@linux.sungazer.de</email>
-		<name>Marius Brehler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index d353dbc4e295..c9c4b31ab7ad 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,5 +1,5 @@
 DIST isodate-0.5.4.tar.gz 27691 BLAKE2B 91c05cab9a9d7313a4a98bf6843c4a6baceae86e2f030c684d0b7046d6df9e446124fa7704fe2c4689f2ab10da6c3ae96922809742cb4efcfb04a50f48bfc610 SHA512 ef5fd27ffa61ad10abf499723c452fd8fd6c2f08a0d5aca6ead88857e5d159f50a3d01769b9fe0aed59a57b0f89a70b359135b0d7c5e6a75d023daa824e5d80a
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
-EBUILD isodate-0.5.4.ebuild 625 BLAKE2B a185da6b5c1fec9af8e0835eb405f9c7ae40d9479057a7045d505cee0ee2c32d61da9fa798a161cfb3609267d039d0f2c963b5e7116c1b3f24951de5af3abab4 SHA512 e44e18aa0a83b7777a437adb58e5417a0f7abdd877fca16e2aa2ad06c239911a562acc5259b41776441b9cc4c9e7ad4b4a591dc6fcb4061531b48967bd81f58e
+EBUILD isodate-0.5.4.ebuild 631 BLAKE2B 11a0983e72bb75eb1dbb8fba754f17528c726238aca5fbf013e08f17df361e0419ee1b1721f91b33da90f2c0ab4e17d45315d02072d554a0ce0c40c1dcdcae3d SHA512 ec54c6f2e42630d7670a6c281321e8a8b0bb5e4eccf9ab9adf0e8b12defff39971b203fa4880d93e9fb054d0fbe85b1dec2eb8594c39eefe7b53867a45b8da20
 EBUILD isodate-0.6.0.ebuild 716 BLAKE2B b7534068c13ed318559b37ba90dfad4cb4dde84eaafae10f882f5a04ae8bdfbf63b16e2646d4f6e38c2042b5dfd335920d3bee8d9c524b3151c445e497ec81e4 SHA512 43fb55262b99543f132aad40bac447c64535180d4a74fa7a1bb4fcd32676f6d322140987eef1e4b40903f32a76da63e298e39329e7c6cd167ee0a2cb7dee0449
 MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
diff --git a/dev-python/isodate/isodate-0.5.4.ebuild b/dev-python/isodate/isodate-0.5.4.ebuild
index a2bf29a30cfc..ba76f79c7163 100644
--- a/dev-python/isodate/isodate-0.5.4.ebuild
+++ b/dev-python/isodate/isodate-0.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm 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=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 46c31a161cf9..6dc62d67aa5d 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,3 @@
-DIST jellyfish-0.5.6.tar.gz 132177 BLAKE2B f5d3ac95c6057fc890705c7435c4d79ce81de4684cecea89001c00f785bc85c316587a85ffc5e3334d239d1ae6b375525924fcadb32d5159925d0217e488465a SHA512 12f09e877dd2a9386adc336a56c8ea6566179e5ba333045ad70604c17c288fa61fad2aa9735c76c58d69dfba95f99876e608e2d05995085f970834132fb8504f
-EBUILD jellyfish-0.5.6.ebuild 986 BLAKE2B e454eaa31fb23bb8482808b0abd8d08193ee3cc37e13398668246ca347080274ad74b7d3912043e795229ca8109bbe5ebc00bde564d7b10566865d5a75e94810 SHA512 eed0ccd59ebd849e61c2d49b0f5b8556a7ea27c95c1b58633f4f382f6d81c5f3fb0a12d3fad6af28b8ab649abb5b4172419d4c7945e17fac2210c2e7941989e4
+DIST jellyfish-0.7.1.tar.gz 131122 BLAKE2B c494e38d3101b1a7bfd295b80957d834bc3e475dac72bd9d81669466eb395e293faa41a581953250133d455d20ca71959414cabd73d5c3dea444ee39e4e8f973 SHA512 c8464171cead812f6dab8c61c74d83afafbf6451e7143e5be74400dffcf895be925a3628ac4fff47467b6dbf70b6d068daaf1c141b1846e53d5d19bed1617ca0
+EBUILD jellyfish-0.7.1.ebuild 982 BLAKE2B ea3d45e98b2cc9c132eb52b57b1087fd77d480cf7e073dbe34e13d6e551c5fcdc9a4872bd01fc22944bc22d1e7274558e483c489dd5108ecfcd1b6c6963a3975 SHA512 384a979f24a1e59bf6d06a8c473b49108297b0b194bfa41c8e00fc6186fedc896e34c5ba472bc3f1e13eeed7a3d0662259dbea5daadb3bef3f12aa1c76a90f16
 MISC metadata.xml 503 BLAKE2B 5233c8c8b58779463d926f276a3fac04e25f70ed8992e75aaa4963a259de9d525b3dd4f040e0fd2aca83efc5bbbce73b7eb86d5b59cacb81f9aa1f82c7949850 SHA512 47e552f516be95767e3dfe9b5b43ea36b02369cc426cebc25d66ed6c3e449c1041d6c79351669d80ac13d19a45f699a719a80130073d02d14459c4630c87736a
diff --git a/dev-python/jellyfish/jellyfish-0.5.6.ebuild b/dev-python/jellyfish/jellyfish-0.5.6.ebuild
deleted file mode 100644
index 9e60204d8f18..000000000000
--- a/dev-python/jellyfish/jellyfish-0.5.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unicodecsv[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( build/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	py.test jellyfish/test.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jellyfish/jellyfish-0.7.1.ebuild b/dev-python/jellyfish/jellyfish-0.7.1.ebuild
new file mode 100644
index 000000000000..f3bfa9346a12
--- /dev/null
+++ b/dev-python/jellyfish/jellyfish-0.7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
+HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/unicodecsv[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile() {
+	esetup.py build_ext --inplace
+	esetup.py build
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( build/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	py.test jellyfish/test.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 5957643afa4b..bbf3249f247b 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,7 +1,7 @@
 DIST jinja-2.10.1.tar.gz 267828 BLAKE2B 0cd7e2880f1d41f3a6aafa0878343c2ff017099de6b2ad607baa3c9cba9d58c9241e1ba65cc23ea16244a1b3ea8720933f45f1061811e5f1abdcd881c4017bce SHA512 71c90be0b2aeefaa80279cba55f7827b5a42455f9dc55de9ca7e9e3e363678caa357426955267542f3c8a9b775e61aca55e439af192ed0a67f592be4ef91aff6
 DIST jinja-2.10.tar.gz 267508 BLAKE2B 3872a073bd3954a079aee74fb2f23815f75559a88a8ab6d849cc9855e158d096a1ac62c219ae7f48a54d082c3073e83749c8536439248c80494e882f6a18995f SHA512 bdfd3c4d01b39827c128cbd7f6ebc0ad1434748be41c5037ba1b23156eea1d28f805ffe2a051b4e9b5b38938615c35c8876095b0bf0bed2c139cf5ea49ae2420
 DIST jinja-2.9.5.tar.gz 486763 BLAKE2B 680b8d58056b180295b52998a573da2fe86ac8b117a942e647626aef16d42c7af89a0ba7f5ab098fcdb29bd18940e316144fea1882e15d71f67bda945b4a6ab8 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121
-EBUILD jinja-2.10.1.ebuild 1651 BLAKE2B c76d9e3bf03394949f2711cbe09d56474c4bc9355f8a46e4e6e34d2555df526ab04c51d98bcd91a31cb52fd6068906cec73bf9f157fe1b680e9a3564722fa6b3 SHA512 62618c1ec2161811ada2997044abd257aee2201b1841990a48227be00e4075d279abbf4bee020bb8228b5e9bd1d023f2b7616fb45b76b2da1757ae92dc2dae1a
+EBUILD jinja-2.10.1.ebuild 1646 BLAKE2B d2eb73bab2dce7041bdc9124e38eb45351da9ce1e22361b4bbd97723f69878af4979a1cbaa60d5a703b455a5cf471c7afa895b59a5190bceaae13b5901804fb5 SHA512 f32df86711c6daebffbe74b1bc0671301c53749b6a93da06a959c36c7087a2b5ebb6459248df0d188212eacf9ddb66928ede1c3266bddebc7a7d43cbf033d9df
 EBUILD jinja-2.10.ebuild 1644 BLAKE2B 5337458f20455b9fb20d96a207ff87aa29fb8b418de76e4f9d953cf61b79137ff780dcf41fbec99a15b19350142653cfe9f61fd3dcb0ff46fcb92deade13f140 SHA512 508948d814e81917f8575a1b5d83c78f0636fb2350acc2f5909d07bb09eb544c3952d994cd82f6788d20184454e69bb1cab18b63c8ebc0839486af2dba63ce55
 EBUILD jinja-2.9.5.ebuild 1735 BLAKE2B 25d70d81701a93dd526eb0797c7b30bf737692e23182e03305e2adcbdb96ff980a6665aa00eeb1fea856ec3415becc7781e00c38ca6026553e5238bd3ca8a05d SHA512 8ad076186716fc63577f992000629cb546e0bed4bb378f51cc881059be529b4764e66f62c19c66d8a046c4386a63df50ff628f07d2d0697b1795af9572d6e17b
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.1.ebuild b/dev-python/jinja/jinja-2.10.1.ebuild
index a5a156d90816..a101e331f803 100644
--- a/dev-python/jinja/jinja-2.10.1.ebuild
+++ b/dev-python/jinja/jinja-2.10.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index 528a0d3a39ea..951fa41cbd69 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,4 +1,3 @@
 DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
 EBUILD jmespath-0.9.3-r1.ebuild 593 BLAKE2B 668709a0f0ab19eb3abbcb3b941346aeb24b7199970cbe1d8825e0980eadf3db5f65bbb1517835b3d52b4d257ff8882e134ab3234d46c3086c40e282b10139f0 SHA512 1119ff6db0942c5b9f0dd1f886cc2ddac9fe492c3082b04c5288d798489cdb16a444fa751215b9c29da857ede677725338dbea4203bd70a18da16865e4f691ab
-EBUILD jmespath-0.9.3.ebuild 589 BLAKE2B 9c2d982769fedec2d472173cf504bc9b44378704ec3a6cebd1191eef3c435656589f2a3b630d538a968c01f00532468facdec0a0007c71f8091cf05a65908336 SHA512 e834d3f8c7eb73d08e121c950a60f332ba04d0351001d55dea70a3973180e74a81d5dc91ed11b08cadf526406b8345ef072089499f34d99b3169e178777818a4
 MISC metadata.xml 570 BLAKE2B a6d5d0e838a59de2031b7df52ac683dbc5a7d692ed96a6334bafc5e76d0018f32990913a49539e7d093f195f548ef4ab55e8cdc93c1fa1779d87140336e40a8e SHA512 dc7e96be59813dd79d3492c619d3080c0858711b948843a12a2b9043b853b99885b780b130425ed0f437d2f51139e0024c3f37623cc7c4794e86568995bea36b
diff --git a/dev-python/jmespath/jmespath-0.9.3.ebuild b/dev-python/jmespath/jmespath-0.9.3.ebuild
deleted file mode 100644
index 115fb480368d..000000000000
--- a/dev-python/jmespath/jmespath-0.9.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="JSON Matching Expressions"
-HOMEPAGE="https://github.com/boto/jmespath https://pypi.org/project/jmespath/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index b3b12c0e589c..874f69d32142 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,6 +1,6 @@
 DIST libvirt-python-4.9.0.tar.gz 191922 BLAKE2B 272f0827faa7083e4896b34cea81554505e38733313df556d608fbf0e2ab935088ec5d57e9678c7679e172ff99a619939abe8cbd828b49655de70daf11d20efe SHA512 7d1345693c87f11be9dc751212820f4c4a519a467703f0ea2fcafd0e66d39941686cf7c84c2c68e8639889da1bfbc9176a72cf1059c87d76a49b2c74a7b05c0e
 DIST libvirt-python-5.2.0.tar.gz 193270 BLAKE2B fecd1a07091746779a91e0cfeb9c3068048ee7e51d2f79064b4ee529a19b78d04ba53a5abab68182a1fa9c4a82f459fa9e971c33fcd10b42fe7011be17f7c6e2 SHA512 afee2dcaf08d530e6298fdf2db674af217b9e4115941258b5815aba00087d96db6eb421c9854d7dca0f9dfe24069df72aadd969c924545e72be216f01bc173cc
 EBUILD libvirt-python-4.9.0.ebuild 979 BLAKE2B 845bea170e3514ecdda19b74a1e3ca627cc272cf6c39c5527f06f036c8eb67aafe67c4ac2432a060c158898a214e8f2ac32faea1dd70652b059f214f451e9f41 SHA512 ea87646612370412b96a6c276de497a2dfcdf2898c33b74b000f60769d505c8042306a5f8e2880b80354d4e8fd494f87c29d8a63a14fd4e9551a354cb56fd102
-EBUILD libvirt-python-5.2.0.ebuild 976 BLAKE2B 06eb6d379d697c684a5aacd4548a8963990812ffd58879258294f1d3a31b2d1adc5e1032272ca3c69204f555390b5c2b33ed65dcc1686c98a6e46dc74592f0c0 SHA512 9f74217106d897d42ca04fbed2b7db7d0349de2ff5286751f661cbc645ea1e97f3a9c7387a8f9e7a166aa38bc2b37a974768a8be5986073c8382a3cc2ee82091
+EBUILD libvirt-python-5.2.0.ebuild 979 BLAKE2B fb91ea46f10a7d83215fae5c8557626ca99e16d893f3c3ab27b2b528bf1e85e0473eb011d43597ff63105b8cffe5d9de28cd22688893715f8a13cb05c16b2268 SHA512 af012b0e554b13c1de26c9ebf67a384d553b03ef30e96f90253d441e8064a2b9cf586af9375f82339a2b16225fee326bbfaa9633f6173ad248d4f7f23673d6cd
 EBUILD libvirt-python-9999.ebuild 972 BLAKE2B bbeeecd0e48f373b22ec37ca905ae23cfcc4754dadbec45db91f76e5f1bd06c51979fc1e583169fb400f3218bfd8e3ae7cbb7424741e67f329e9f80f85c52991 SHA512 63357b3802f1989965ca7fa33d6bccf9a49f80ab42f83fbff365f86837e5bc4bc19c5add1183485a10040fdb55bfe32b4f5f76b653a453678419fa3e863fe8e7
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
index 5059927ccfdc..b0d227f81e12 100644
--- a/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index ec5a314ff4d3..2fc01bb31098 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -3,4 +3,4 @@ DIST line_profiler-2.1.2.tar.gz 83131 BLAKE2B 0f61d7dbab24988a50c1c0a9dce528cf79
 EBUILD line_profiler-2.0.ebuild 666 BLAKE2B bd821ac106ac082cf97baacf9277b6ecb4f7966b0a0a9b4ae01d7caf8f40a9c915cdb8e67c81bc2d51cb83d6d9a2983dc1bdaa35b6b5765533f82a8842491d26 SHA512 09fb5fe8f0a1a93a6bd9a505de127777fbfd377f56eeac2f688671a8b1d34b95fb7d533f851df40052be4cc67f5ccebb794a3c10e1fd7c5325581d369565bded
 EBUILD line_profiler-2.1.2.ebuild 660 BLAKE2B e51c717b7a97571329ab7b482a5b5752933f09b8b00107d6be71606232d16ed7f3aeaf53492d62fad32a12acfae0f9d2c79effe1c30474cffd63e698298e6202 SHA512 18d2c73433fe2d98545b15508667680b3f99df2dffdc542ec0bf11698a426625d9ab90a0d8521fc041f67ebbdb087ebed96c093404d88ac3e861076e740c6734
 EBUILD line_profiler-9999.ebuild 579 BLAKE2B baaec954a604fd884acc5419ff69a407603c037f43de34ae37a4e122c53b389cae6ea29b6bf0a445c10fb885b06ac81f389353f5de230bf17de3734c3a51fa3a SHA512 ef15aefb6bac771e193a50f9d6eb93b5fad33ca557e3187917cf15fdb7f0ce0cddc5bc362a3daa4b5d57444660f130dadbd4b3263d74c602012b1b14f6c5855b
-MISC metadata.xml 948 BLAKE2B 98a4791e0201690c210cd9460be2c17378a360c9dce1502f3293e26468f94aa0c20b28844e41e6e43acd049152057726b4e12f4f7b2a99e0ad38a73296d12403 SHA512 bc38bde3c69ae03dc884b60a55eaaa0b039119d31a552083d22baca047f102f7519606ca2219578b3a9ed3dcf40a68f6aa0dc8508e7258f0a6a993b2ab7a0461
+MISC metadata.xml 689 BLAKE2B 115e811feb48f966543319af1851acd8f7392dc0065d3216b469abeb470b45828481e2969346fa29e5486ca86b29e7efa0fbdc173358ca59824ef787bfa1bbf4 SHA512 28daebac470f3dbcb3eaa2de42c159d001184dc87696394f7ed78b984addf886432278f78b601cc8673c6a6583bc8dd479aa696354260443a6959c3b96f72fc4
diff --git a/dev-python/line_profiler/metadata.xml b/dev-python/line_profiler/metadata.xml
index 646d50c3d2b7..9039f4a31310 100644
--- a/dev-python/line_profiler/metadata.xml
+++ b/dev-python/line_profiler/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>marbre@linux.sungazer.de</email>
-    <name>Marius Brehler</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Gentoo Proxy Maintainers Project</name>
-  </maintainer>
   <longdescription>
     line_profiler is a module for doing line-by-line profiling of
     functions. kernprof is a convenient script for running either
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 02aff1977c16..cead763fb53b 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,9 +1,7 @@
-DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
-EBUILD lit-4.0.1.ebuild 811 BLAKE2B 6a11590228ab794a2da32f75b8d72edd64a6a394640230a0d524b5784b21caf710fe6085fc913f48671e1812365d9665ae2dca3dca8697636b5149f69f6163a1 SHA512 583bb3c1a0fc61aa0e8fe1ba2beea9c4910f7af699b782b038ecce78e509cc2ffd219f8b63b8c83edd475eeee54c46c4cca4dbe602c6e833859fd784649d0820
 EBUILD lit-5.0.2.ebuild 899 BLAKE2B 688966a355571c6ee01e56dc980df5ef49f966ccde9edd85143d7d306ccea6e2217dd4870ae3210fbf4c615ce8f57950a3aa34d44b98bcacd4a18d617bce79d8 SHA512 f5f36aef2a795c4b7d5c241810bf4e441b5271c3edaaaffe2a3250fed2f08bc1bc4907cab20303747d1c970d74fed16b55fd48e919b741f3cddf6fb1b27e12d3
 EBUILD lit-6.0.1.ebuild 1009 BLAKE2B 6e468d6a7274031b8e81eaa7c0827ae991e8e11f7daeb20d86fbaa56d26b2462a58e58f3afc75369bcd04c229d3c7644c06f97c08e0eb0fb5b04441bf190ea3a SHA512 63870e81d534e9995d2476934962055c6193522dfff741d2a99155ac83d15ff7e7ea81bb89af14e8d3b09e9dea9f6f593f520f062e4af80738bc1afb3183f58c
 EBUILD lit-7.1.0.ebuild 1012 BLAKE2B d1cf0e9cc017dbc69a9bf3af33072d5aa100fb6e3b331086d297dcef9eebc865d443fcd2e0c5905669a09172965a5ad99b2c3b1a44e9e169f766a50f6f621076 SHA512 e8aebe61958a11aacd8c30df491cdcbbf4fd0fe762ceb7e25b80c1276f8ec9d41e76d480a0f86a546787bf9f8b4b1401f50265d4c59cf805e17c72720b76bc53
diff --git a/dev-python/lit/lit-4.0.1.ebuild b/dev-python/lit/lit-4.0.1.ebuild
deleted file mode 100644
index 4e620171d645..000000000000
--- a/dev-python/lit/lit-4.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-MY_P=llvm-${PV/_/}
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.src.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}.src/utils/lit
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# Tests are broken in this version, fixed in 5.0+.
-RESTRICT="test"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-python_test() {
-	./lit.py -sv tests || die
-}
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index b844c5f2b2c9..5199fd7b4163 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,15 +1,11 @@
 AUX llvmlite-0.15.0-use-system-six.patch 1274 BLAKE2B 366bc8425139e8b56d4bae78e21088b49d1bab059c2a246497f45ea377aefd3df1bdfe3dbc9692eb5d00538466aee689118b907d01a45f211ea26ed6c7215992 SHA512 5db6b819e0a9e0d6b7963272ef7fd9c9fee778cb4c2d577325de6602e7a283a98752e870b83df4978d063c84b73045e2f65bc9aeb482dd487255efe24792db69
 AUX llvmlite-0.28.0-llvm710.patch 2095 BLAKE2B 78b009a935b9014da648fae3a077cba7db8f3469d2c49509bb8d5f97f139bcf5d91b9c727ee74a114e191bcf79ea2d848953fac45a07d19e1bcdcff83107e819 SHA512 d09485b7e93bc9cf3bcf89dbe734934ff4fbc634142408ed54544d0c3a0b7fe3700dd227bdad2d3fa4585898c60da2e46c097877b9620838678bc40d3bf0034a
-DIST llvmlite-0.20.0.tar.gz 96753 BLAKE2B ec9cfa554f44162c0d6e755628603c9afd85642998f56ed49c2ff29c3ef975ef4ce14c6555382ca282b70d71a1ff7347c0b773b339b14345e10d3b9ac96ac55e SHA512 c2e0918e7acfba68922f60889180ec660da13ea199c9e8dfb3ac075c295baeb8c90784a6acc3c463cdd696f8f61c42226548d38db5bd8c4397a23cfa7c7ff764
 DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a SHA512 633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
 DIST llvmlite-0.26.0.gh.tar.gz 175536 BLAKE2B 6736e94c13974bb79bcda08ef58dd6d1e67d07a0173b5f2ab1b2fcf9a6e72b2a0b8737da5598023fa0c6db85cfd84f2d429f6077e1342a15b500376addd03c69 SHA512 e6bf76b209f44624fe21551971d422bbee6a6dcdfbd2c42607904be32db1b94cfcb185e70198fced5deadd938208d66d94eed4cea31726ae7f4779d58b57eb48
-DIST llvmlite-0.27.0.gh.tar.gz 186891 BLAKE2B c7175beeb5c45b6fda62b78b23352d1c22111a37e7fdb89897409c6ab245dab23aa4f799fd5add1bf2199e8f6783d6094101aa29c4afefa2a3dbd48d735b418a SHA512 6c3230f23fec53ddff077c885bc0da4a773049d0226817142e2b7ded9fe6a665dd5cf8c6468101b342ef8e3b394bf2078cf93fc513e46fe451cd75755111448b
-DIST llvmlite-0.27.1.gh.tar.gz 186904 BLAKE2B ee3af4b3ec03799ea6e643e0ee0a793537c46427d239fb3a26abf4a719b68432f403367321345c30a95758ce1bce411495bc48273dbf2452a872a1edd67dc9a4 SHA512 365ffd95050a39269d9f806d3969657437111b8e999db6cf03d0d99fc5bcc024dbc08f1d379745572317f8d4384d7f86095216674695c34f463a0b9bf48a8be7
 DIST llvmlite-0.28.0.gh.tar.gz 191141 BLAKE2B 23c86c28311a4e8c7f9c209a7ed7816ad5002c26f9fda7a47cf2b54c4578db28ed0781b54a716726db8a7c1abce79a79a99c3f5bf4be2a61d547eb74d06cb507 SHA512 c00c767c80a507975a055088ca4328766c992e7267219dea54376daf5eb11397532b243352976d3569185149007650d5e94839b61aa55502e1991f72b1ba492a
-EBUILD llvmlite-0.20.0.ebuild 1279 BLAKE2B 74c0c77df7d55ba0c356801545c1255482f30789a4a371b7a2d5f42184ed4ac8d03195ca9abb9930f8517c3b55e514b49d327ea84fd29de9d6ec0a00d7c1d17a SHA512 4236a97bc7270456208a59e550f2c86bae8716f93d262286bbb93bac3cdbd20879ac8adaf0196fe734465906f1745c206014719f79296b2bf9d5dd665159e0e4
+DIST llvmlite-0.29.0.gh.tar.gz 196507 BLAKE2B d4870ca042d446857b7409c0c50c370458747ee744c24611e88da4bc8780c26125b2e8db3db7fe9d4f553f9aae5769b62effe1ac94cfaf234bab54d43c8086e9 SHA512 8735b46b1a3053b89306bf6e05c8c6c375d15371d33635f1d27e5533d7a78a85f773e04b7ed8d39ebab40a892c374839e1324665d81459cb797f760d6d2c81d1
 EBUILD llvmlite-0.22.0.ebuild 1353 BLAKE2B df1cbe7e93bead771f9abc130fc053caf9eb249fb4da0340df9a1e3dc0b5cfb429634ef6c0eaeb68e72ceaf5f981c2ec62697480d3173f47c5c94f82c725b15e SHA512 7bba6a546721e5cb4a023a3332439d789977134cc7698c40cffc455925ca294e20085d2e605d8e2466c69b2c2b718785dd531cf802c17f21eefb5f20594cff80
 EBUILD llvmlite-0.26.0.ebuild 1501 BLAKE2B 93d3c40675120ca291a8d4fa90d84f484982a110f06707e1f93ec281d7dc2769a34427db467f976d82b9740ddd469b3550488fb00f210db570242cf74a12a033 SHA512 6ddc17275c10c8690e8bcd686dffbb86a6f60dd45e9ac73fe70d574ce1226e3292d9886fbaf9b96b916af9cd7437522a071a7506692285ba9c48017a3090a2f8
-EBUILD llvmlite-0.27.0.ebuild 1492 BLAKE2B 9dd18224c52fa5c67c6938a1bd91d21027594c86fd0b8350f59331b95947faedfa34f1bd22c50af83eba176aae2918ad9ea8a3a7b5bf9a1c196fbd310efb0c56 SHA512 d87c9739206de53f080b9b566fd32749b61ca72f7b1edb8d4cef5cb1c892cdeeda9a85cafc114935e3da60819b381ddcc7b86eae0e5d83a32ccba996af3e69c2
-EBUILD llvmlite-0.27.1.ebuild 1492 BLAKE2B 9dd18224c52fa5c67c6938a1bd91d21027594c86fd0b8350f59331b95947faedfa34f1bd22c50af83eba176aae2918ad9ea8a3a7b5bf9a1c196fbd310efb0c56 SHA512 d87c9739206de53f080b9b566fd32749b61ca72f7b1edb8d4cef5cb1c892cdeeda9a85cafc114935e3da60819b381ddcc7b86eae0e5d83a32ccba996af3e69c2
 EBUILD llvmlite-0.28.0.ebuild 1541 BLAKE2B 2d6575051c5c5fab37a40a4a9164ad2b739d1f18164836f4b68d7e4a2dc03a4fa1999b41afc1d3beb39d20e71356d76d68dee157690082cc3c74e63c6bb089cb SHA512 2337eac3c683cb2c7deba8a24556c5f5830b54e156ba589b8896aba3a2676841bc79e7c143a8e998ea53e8a0b871bfd40154a2586d1c15ccce1d6bcade47410b
+EBUILD llvmlite-0.29.0.ebuild 1499 BLAKE2B 32a92d4cd70f01ba504ab6c5449e9462974d57663cbe5eef712e9109aa7e3a0161256755ca33c3dfe6cf93c0b9df7b60551b175f5ab4a5de389b59189e50e19d SHA512 95479a9f360dc199cee279a1e2cc8dff7558cabc04edb179b535e8cd388cc9d1bb777c1aa07ba7d6b02a0288854e486aae09be9fe1215ae2a7c1344e02ab5697
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.20.0.ebuild b/dev-python/llvmlite/llvmlite-0.20.0.ebuild
deleted file mode 100644
index 4114a4b5a1f9..000000000000
--- a/dev-python/llvmlite/llvmlite-0.20.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LLVM_MAX_SLOT=4
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-libs/zlib:0=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_prepare_all() {
-	# disable -flto, we do not force it against user's wishes
-	# add -fPIC, needed to link against shared libraries
-	# plus use those vars to force our CXXFLAGS/LDFLAGS in...
-	export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
-	export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/llvmlite/llvmlite-0.27.0.ebuild b/dev-python/llvmlite/llvmlite-0.27.0.ebuild
deleted file mode 100644
index 0cb1efa94f0a..000000000000
--- a/dev-python/llvmlite/llvmlite-0.27.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LLVM_MAX_SLOT=7
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-libs/zlib:0=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${P/_/}
-
-PATCHES=(
-	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_configure_all() {
-	# upstream's build system is just horrible, and they ignored the PR
-	# fixing it, so let's build the shared lib properly using implicit
-	# make rules
-
-	export LDLIBS=$(llvm-config --libs all)
-	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
-	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
-
-	local files=( ffi/*.cpp )
-	emake -f - <<EOF
-ffi/libllvmlite.so: ${files[*]/.cpp/.o}
-	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
-EOF
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/llvmlite/llvmlite-0.27.1.ebuild b/dev-python/llvmlite/llvmlite-0.27.1.ebuild
deleted file mode 100644
index 0cb1efa94f0a..000000000000
--- a/dev-python/llvmlite/llvmlite-0.27.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LLVM_MAX_SLOT=7
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-libs/zlib:0=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${P/_/}
-
-PATCHES=(
-	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_configure_all() {
-	# upstream's build system is just horrible, and they ignored the PR
-	# fixing it, so let's build the shared lib properly using implicit
-	# make rules
-
-	export LDLIBS=$(llvm-config --libs all)
-	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
-	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
-
-	local files=( ffi/*.cpp )
-	emake -f - <<EOF
-ffi/libllvmlite.so: ${files[*]/.cpp/.o}
-	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
-EOF
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/llvmlite/llvmlite-0.29.0.ebuild b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
new file mode 100644
index 000000000000..f8d70ec09ca5
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmlite.pydata.org/"
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=8
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${P/_/}
+
+PATCHES=(
+	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
+)
+
+python_configure_all() {
+	# upstream's build system is just horrible, and they ignored the PR
+	# fixing it, so let's build the shared lib properly using implicit
+	# make rules
+
+	export LDLIBS=$(llvm-config --libs all)
+	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
+	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
+
+	local files=( ffi/*.cpp )
+	emake -f - <<EOF
+ffi/libllvmlite.so: ${files[*]/.cpp/.o}
+	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
+EOF
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index 08f8f5f0e94c..0774744cb4d6 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,3 +1,3 @@
 DIST lmdb-0.92.tar.gz 155720 BLAKE2B fa991dba144e636d395e264c70de61bf6e1391bed589b8e67075eb604ad3cde7bc1593f596f884e13ef4c744efddac93467eb0e9d7e79d445a71e21e1f5541f7 SHA512 5177abe0c441fb9067ad84de0cafda960113042404507eaf36194efe614fbc9fda37668b9d8a07d4a7f674b0c1a267194ddfb241834a3b1db0d8026f53841cf2
-EBUILD lmdb-0.92.ebuild 569 BLAKE2B 7ba3e5ba101b3bccad8b8210e76e1e1803a9495acc7063581543e26c5aada7b972a06e01eeaa22ba6304fce4812eb8c6f9818de05e0287b1e8d9e598c16e210e SHA512 de208ef33c852ba7e4b895fe1566d8ac57c39976cab8f157eca3f7a820305cd6f52c937035d8bb07b9d36767dcb4e46a424d8260c495cf7f99b1ab854bce0bdf
+EBUILD lmdb-0.92.ebuild 576 BLAKE2B d4e7fbe6c97538e281da2fd1aedb00645b9400637b2abfdaa9b1f6438d6d8d505b945085015b78329d6882f851f58511f39288b1b40cf5f98d23238366261001 SHA512 450fffd40d12b8c5feca462ee881870893c828038711160ac30ca715678d43e568f852d2ff092570b8c170661b0c22b006346d24132722dd8668d69efc2a5fb4
 MISC metadata.xml 369 BLAKE2B 753c2fcd809cb0b69b60f4581421e3d2abb40158dcf3931a70c2c2adaeaf22f5558707a6dc39ec2b9d8724d9fa3bbc370cf790a8bb550d00d59e10cda643ac88 SHA512 4b2ad4e50acca757e8a1ff4e659ae99c8c42788ba6cc1e1d503cb371cb897443e6fbe3b7c2f7f8ca0b6409da9e7a7961a644aaf615d306da8172687caddff3bd
diff --git a/dev-python/lmdb/lmdb-0.92.ebuild b/dev-python/lmdb/lmdb-0.92.ebuild
index cf82f2ee3ffb..c2d5b696e55d 100644
--- a/dev-python/lmdb/lmdb-0.92.ebuild
+++ b/dev-python/lmdb/lmdb-0.92.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-db/lmdb:="
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index 8bc31fc563de..be28bbb3fc69 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -2,7 +2,7 @@ AUX test.py 269 BLAKE2B d0b9ff664ca4a954cb8ebf227a1b1c80f1eff8a9bacaf1cebf2f359a
 DIST lz4-0.10.1.tar.gz 92068 BLAKE2B e581540036d1008c5efa008a1b980c1bd612bab94635b7a506e230921bd17c534fb99272e3ea09bc5be4faf09e0a8f701224c433df1615b4e708d620a23e1149 SHA512 538880742257e08b027c45c33aa29e12d7303826f63817d1f6d316ea9b69dfb20710a4f573499ce141cffd12fbac701305405521cb815e2329333934e7e1f2c9
 DIST lz4-0.8.2.tar.gz 30818 BLAKE2B ec51d733ebd33fcb00d3d3b634d11be39d92b14741a595139e23b5b067955a43ca325a0a655233a5ae3a62e18a1cf70cc21787d443703fc1a56ab7a765d5e2f4 SHA512 e516d5c3309f214fa422b040a0aacdda079395624dd4f5548ed7af637b1594012aac75b309cef260b41c10a623410f815fc089b54ca5d80955d5f2ead12841b1
 DIST lz4-2.1.6.tar.gz 129066 BLAKE2B 1a739c54946150441ddd4025b4ce8bf79a718d64a714ca5cfeaf8712c73fa88c47e1823a08ec7ad50acd31cba5bc10292f4c9e0905d8b5965b789944dd6eca9f SHA512 e37f9576f182adab263d8248e846c9f7d8a0260b2d2c5f94d74ebf3c2e51d91ba07d4bb0bf8a7560981a930fd380a2a3f5c4d21f4de5be3ae066d44a2246e9b5
-EBUILD lz4-0.10.1.ebuild 575 BLAKE2B b342cc061468d31e84f7e189985275f0e17be22d913a19a17d1b74e418fb760f51246f0681f2bf8ae4109896e4d5ac5d480c56bb7b44b1ebb51e67c4fdcb79bf SHA512 eb8ece7e95fa1734bd501cff0f1c704a49bb0b346730fd37fc8b31d3d82e31b71f715fe231ef1f5433d0d6d99371c8d02feb986277e358ed13a6e7e908fd8b22
+EBUILD lz4-0.10.1.ebuild 582 BLAKE2B 83dbb7e6a0c7d2acdfd0f32448d61d02b0a3a16336d451ff6947fd2d9ceb9e99c9aed301d6edabc87bc40ba3dae3b31a60ddc3a50dbe4ae66ad7be332d75c13a SHA512 4076bf4828477ce12ab628f6a2642fb0c06b8b099dd40c20d5da1955a32d6dc6e73972bf8102a31d503fd140e53f8fc66c68d3c13177ed5d660841e2c113b0f1
 EBUILD lz4-0.8.2.ebuild 807 BLAKE2B 9457224581e67fb0b012a4de1b987100a475a0e079402df80418e15f56407150d5e42a810b0ed6432bba4f215fc2390bec7a4356794a533c5ab63e3d8daf3389 SHA512 9164abe156afb8c869670d2caddd96c1aa225a3b65062b506209f7c91749a81feb09dc1f6b0005db389efec7af937ff2572ca22aef0adfcdaca4a45f50aa3bcf
-EBUILD lz4-2.1.6.ebuild 561 BLAKE2B d52facd97238acecec9a0669f57241a5f1d961ee1efbb7e9b3380482898d22427863e87b47b5ab0f1c8e77b7b0cb746bc73b8c5cb2a404fc27eaf46ff563e9f4 SHA512 5638db74ff6dcaac6115644b277d8a543a7ed1196b67f9f80d97b1854472e5b1ca75e330245f36e45aea4d05072ce4d2e7544490247da0e89b4f809383f19a8a
+EBUILD lz4-2.1.6.ebuild 565 BLAKE2B a6d3fce6568d91b5f71ed181554dbdc2eec90e8a160c245b83caf80bcdf9df1295417c7acd9beff3b072cd2a2a0087f808f9999d3771d8cedd1bbd21cd8219b8 SHA512 9f26c892c3cfa5bc91c3a9769ad12325772c6311cc214f22546996997daa7675d25356e7f9ea7614361ffbd10491db630e28dfb011a1539ce6f9ee80fdc3f1fc
 MISC metadata.xml 465 BLAKE2B 3eeb9b063e836d19b4ebfed81a89895f9d4e650b1788ca602f77f4cf3b5ad94cd6af93788293b9656baac1bce29a90a957c8d4afd02ee25b2aae42aefe211a37 SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91
diff --git a/dev-python/lz4/lz4-0.10.1.ebuild b/dev-python/lz4/lz4-0.10.1.ebuild
index 6ae6d5e12c56..622d03a2b10f 100644
--- a/dev-python/lz4/lz4-0.10.1.ebuild
+++ b/dev-python/lz4/lz4-0.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/lz4/lz4-2.1.6.ebuild b/dev-python/lz4/lz4-2.1.6.ebuild
index b1f535b1d153..3e1188a0b8e8 100644
--- a/dev-python/lz4/lz4-2.1.6.ebuild
+++ b/dev-python/lz4/lz4-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/lz4"
 DEPEND="
diff --git a/dev-python/matplotlib2tikz/Manifest b/dev-python/matplotlib2tikz/Manifest
index 61fc860877ca..9059ca690f80 100644
--- a/dev-python/matplotlib2tikz/Manifest
+++ b/dev-python/matplotlib2tikz/Manifest
@@ -1,3 +1,3 @@
 DIST matplotlib2tikz-0.6.18.tar.gz 527262 BLAKE2B 370a1e088a17a98afd29e1e465c93b98b10100c85a277be3130f5c39bc236a9efab9241f9edffdbd430f9645cba4ff00ebda73dddeda024e3f545b21e548e786 SHA512 e12db2dd54a2145e1d66e19158c8a9305243beea60add0559959d801d319c43a28aa779048764d2adf29f878f7ccca9b2363bbc5034135a9d9002a8815fe37ab
 EBUILD matplotlib2tikz-0.6.18.ebuild 950 BLAKE2B 02f1a30decbcc32b424ded1909c1e320af3fb7ffbc104e19bc829937b19776074bc87ffc957a05d25e8e0d0a8aaaa4fd712b3d094608d5cd77ee81e1e22fecc9 SHA512 03826bcd979c899dfdd1b147ce36840218dd3ff8e3da7e7e1f47bf9b6dcc1f45c512900b159eb99f24f99dd3f1320aa5ecdb77178775766e8e552fb2551a6316
-MISC metadata.xml 1108 BLAKE2B e2f8648c239f0f117db6f046e0a8fbb006ad25530e791987f974fed0ea105d626bbb867ddcbfba05b1fe041be751c7737fefe241ea31cb6acce89f9d0fc0c115 SHA512 ffd5556daf5c3903437775b6da6bda2623fe8a9d8d6d8a8ce2f3537c3c50bc57353fbb0151a40c1a7ed113fc0732b64b231a38b69f10a785f4e089d94c1507e1
+MISC metadata.xml 861 BLAKE2B 3a77e5f5055cca84ac21709c19a530ad3e6cd33b4b76b55516c8df06236fe6e5d3eca2847aeeaef836ccfad3c2e90a4e391670215957a03b73cc943dd324dc47 SHA512 7d654d1c7d3370364278b9c4722f4c1233203dd0196f6ca7a4fabf4ea0f7708dac8b105ef26ab6b3574cfa5c019f2f6574a10afe0cf42702a4b1d26c931b7c2c
diff --git a/dev-python/matplotlib2tikz/metadata.xml b/dev-python/matplotlib2tikz/metadata.xml
index a4fca97ba72e..1d946eedff04 100644
--- a/dev-python/matplotlib2tikz/metadata.xml
+++ b/dev-python/matplotlib2tikz/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marbre@linux.sungazer.de</email>
-		<name>Marius Brehler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
 	<longdescription>matplotlib2tikz is a Python tool for converting matplotlib figures into PGFPlots (TikZ) figures like for native inclusion into LaTeX documents. The output of matplotlib2tikz is in PGFPlots, a LaTeX library that sits on top of TikZ and describes graphs in terms of axes, data etc. Consequently, the output of matplotlib2tikz retains more information, can be more easily understood, and is more easily editable than raw TikZ output.</longdescription>
 	<upstream>
 		<remote-id type="github">nschloe/matplotlib2tikz</remote-id>
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index ef84b1a13680..edf8e8ad0e8b 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,6 +1,4 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
-EBUILD miniupnpc-2.1.20190210.ebuild 748 BLAKE2B 67ab0e95d689347412b7c08b9949a059adedd4c62b0705c8cebba7347bdae1727fdaab0138200457289ac1a7eaf425163894b850e69268e9bae55cc660784b1c SHA512 bc8300b2f4df692141a7a46307858677ae37c57b64655f21daad9ded09d51c7d9bd28e861482d08b7681fd4758a3f65ac169a150a0bfbd29be464b567a176ba8
 EBUILD miniupnpc-2.1.20190408.ebuild 748 BLAKE2B 67ab0e95d689347412b7c08b9949a059adedd4c62b0705c8cebba7347bdae1727fdaab0138200457289ac1a7eaf425163894b850e69268e9bae55cc660784b1c SHA512 bc8300b2f4df692141a7a46307858677ae37c57b64655f21daad9ded09d51c7d9bd28e861482d08b7681fd4758a3f65ac169a150a0bfbd29be464b567a176ba8
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild
deleted file mode 100644
index 454bb7265340..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index db535d883272..c84d9e829282 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -4,6 +4,6 @@ DIST msgpack-python-0.4.8.tar.gz 113641 BLAKE2B d22efe13302e28d0701b95b2dc4cf479
 DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc13f034e60ce0ef2f72161bd4ccd0cd1ede27382bc1f365f268557c8ffe503fd12de66eb5840e79760d818e7e2f67fdcd SHA512 e5172e20bb25d2e12ba34ad2805ba4ea0776397986e8bf8e26d21353f57a2dba59a9c6669c817e4e91d5801558a50f95d81e02343f8f0292a01ec5d822fba61c
 EBUILD msgpack-0.4.8.ebuild 764 BLAKE2B 9a5e5880ef71e89506c316880316f56518eed8a3e4abf21c4553235d39801d9506cfbc5cd55a5eaccbaee2d0ed904ab5897aaea4515b7e2679d8d7fe23cc0471 SHA512 c9b4bf69484031066719ed6c2c9db56826c8ec560fe3525332cb20b76c9110fac26d100f5069705ec2f2b5f29999737cde4d8bfc7df2cd12f2bf82a38f48559c
 EBUILD msgpack-0.5.1.ebuild 763 BLAKE2B efa206b2e0c07a00a3e42c03d5d82b3812c7f5273916863bc3e22a14445df5ad0ee8be023d44b323dbf8a29150c7ee2da9eeb0dfb5613602e80e5971f7a979ee SHA512 57a1785ca05eec1a783638552b463a87c102bed67cfe7cfdab37a9b0a95a2d5e5f60665e8c0df44ff932d43e1b5a07276076e1d6a93e6b41ee4fa43dfebc92fe
-EBUILD msgpack-0.5.6.ebuild 1053 BLAKE2B ef21e6f1cdd6ea6be2fbeafd26bc9244457f1fad0ff890b598269e46c823b39e2be5050aea67f42dea84e7dfbabe3c81cc4d29a99eb2f50288e692b8e815cdfa SHA512 930ad02507b145d18cc0a02869e2623da54382a23b77a4bdf5f8b37c1e2a3c030247419c269f2d29f666fa193d8194300da1d1328e9713ee29a62618cdfad476
+EBUILD msgpack-0.5.6.ebuild 1052 BLAKE2B b27200d6ca629b2cf9f332d822c00c4b9e58945a2d1badb54f6e00dde80bb87e5b15b5dd63053ffde9051653efaeceffdab4ce0e4497a825f0af52619ac6ca93 SHA512 b53e7f4eda98a6a19c58fa9c8c9bff46f72ba58277d7d78290dae815c412205e11661d441a99bfeecf80742484a6121b23db97cd276b682e730d73ac1ae6bda1
 EBUILD msgpack-0.6.1.ebuild 1059 BLAKE2B c491ff8283bcbfa389db530623971a6f89c7f0ac7354ca9c65acb2a0fc537c41ce6f45036e7b8af9eb96825da453650b6bd38779b9b68f4816cb07e8b85eecf3 SHA512 6b83b84ce6aa1fa56a7cceb86ae287075905bc30a7d0b33637e75ccfd851a2645a32df4ee3ec03bb95a388166a2c9c4fcb9656c5b09789fb1f43124b99b9dfca
 MISC metadata.xml 550 BLAKE2B 6627bc6b0f417157d1728bac9f8bbf3cbd69eaa4f2b5ba25ada62f01295342ddf5231563e1ab7210acaca476cb807572208a26a20674aaff79bd8c4a47755d92 SHA512 519d1c9d2ce1825bc350fe4b1338246c37d38cfead466989976da6dceca8d033ac33b135b94d9feea79fc555017d681031f414aeb6a09de302ed9f11b6e35416
diff --git a/dev-python/msgpack/msgpack-0.5.6.ebuild b/dev-python/msgpack/msgpack-0.5.6.ebuild
index 24376918a280..9f7a775db5d0 100644
--- a/dev-python/msgpack/msgpack-0.5.6.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
 IUSE="+native-extensions test"
 
 DEPEND="
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 27d1dbc1baae..a6c47f7b4b10 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -2,4 +2,4 @@ DIST nbdime-0.1.2.tar.gz 3864624 BLAKE2B dbf51b7eb07d08870fe1c629aa294b784fd95c0
 DIST nbdime-0.2.0.tar.gz 4139079 BLAKE2B 1e6994009c8ac291272a297fe583f79123906c9e05ca2afd345c6e230e3c476259c4919e2161a049e46fa28f4490122c53d0a2bc94661683652d226a78fb39be SHA512 c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
 EBUILD nbdime-0.1.2.ebuild 1352 BLAKE2B b2ebb2c82b4ee8d84733a9d165512394515300f956f4061bb8abf1ad9d1e554573f57d7c815e7ba08ec7b51332528d76e332553e316a1b87bd873479a4ce096a SHA512 9fc47ca242ef87508bac7fb2fcf672ca83eef16f4dea3efed44b6b61726a7585d2c055dc8d5585baee85333421168171f62a049f12250cc019b9e06cdf1b42fc
 EBUILD nbdime-0.2.0.ebuild 1604 BLAKE2B 5512035cfd987f67ecaabf154c884e4387dde2281867b616f554c4433b820decfc508b158d2f9f71ccd202029bf745f37b1ddff51826c7fbbe98699618c076eb SHA512 c4870bc67feccd91116ae3c99f480e1ef140567426aac8a8891e58509774fe2530790564ac914d907a819fe0e4184f3b7ee0064b784ab1a161fd6ccdb2d5190e
-MISC metadata.xml 722 BLAKE2B fa4bd130e775cecbed839354417e50c931edd2fb00e24620ab90b782429ec2902bb32b7a0c683dc47986ef271a2485e6d9fded7d9a18e1930f1efc071924784c SHA512 0f319098fdae96681969217b5deedafca1908b8bf47e9603ca3ecef75c4461c61e64ce0fe20e7356713d2256de8267f4abf4162be8c0098930865f464914f59d
+MISC metadata.xml 601 BLAKE2B eeec61d75fb90ef3e0f0dd13264d7864a204f560c047dedf6a3ddb5a2df0faffcd344127d8a7bafe8a1f2d0b6382081d56901c6f8c5e0b9e94c8d52088f29442 SHA512 27deefa922e39c76bf3b3ea96aa1f1b5ef478a0b5cf6bbc9832977cf35bce6f9c0f38bb69fd54b0a27877087aab719c34b5811a6063890fdfebab28c57d6ff94
diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
index b2a229dc3754..9038be08ea0f 100644
--- a/dev-python/nbdime/metadata.xml
+++ b/dev-python/nbdime/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>marbre@linux.sungazer.de</email>
-    <name>Marius Brehler</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index a628f14d6322..77a262d719ea 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -2,4 +2,4 @@ DIST nbval-0.7.tar.gz 51805 BLAKE2B 3d1089cd480832847ca8ab5c64b69781216d4fbf2b33
 DIST nbval-0.9.1.tar.gz 64476 BLAKE2B 299f6cb9a1e28b80b2e27a74f2b6614e83e5b571b1dc27d0f6829693dd0f6c2b59845543c91487615a8621e21ac2cbc2d34e60e62b7a646914283e23649d8bd9 SHA512 8ab0cb4e09907d99f898b148b635f0818660d04417c1c809beb93680862a5ecab14b606ecc3f90eff85e5f01de7dbf10954f1edf3629a1cf8ddac00556d4d6e7
 EBUILD nbval-0.7.ebuild 812 BLAKE2B 8a11e61bed06702ed5a51e042e4c30fe68cacb8621605cdff9f3ba2e6d61f9054475624cdb56aae768f98c32fa19969a5aeb89dc344bd60680af17874e11948b SHA512 1962987f0c468f5be769780419b2bb7652af485cac293122530725cbbfc690a4a021de40b2038a3b7d7269de0299577ea9944adad5d3f540df0147781e4ab63b
 EBUILD nbval-0.9.1.ebuild 721 BLAKE2B fd7bbb8291fb5cafd403f19e1432d84db91d0594914d5e5cfb6f8f6f80e7f21be55059116b65fc0f4415070bf2698e1a67bd96815ac80d40bcb250739b785297 SHA512 0989c72a0bb2b2fcd39185e19bbd6768fb31a71d82dfa95da154efbc0e5291c4e8fa878e3b323fb16c28e3b6ede81b99409fe005cca7dbac0a5f5e17081265b9
-MISC metadata.xml 1206 BLAKE2B dcac4a50dae5beebee0b8af144a0666c87f43474464d06a7ffb5a3c5f02501f760d346f9c10768a7065e6f5a054f2aa8e664a6f5f259306a6db691d90446cd53 SHA512 2408122c980076cea7021853c320bb48b93bae5cf20b4101c07681ee0ddf8e741ca39789b884ed04f9ab0ccb2817e9610387e6efc1dac512dc05c9c9126e2e36
+MISC metadata.xml 959 BLAKE2B a6a44c85198fd92b1b26ae2b110ee4f1803d8e6e7dd55860f9aef67f57b29369c31d26d85f27de5a028551d8ce7c502a82189cd0ee2ff127491a05f0d965609e SHA512 63debd61c5149c3d9dc97a10fb4e40aaf2debc480608319158fcad3a8aa39a7f0623470fe906a78ed66ce844894780aab65d4b7a3a4afb5fbfad8dd06acd7af2
diff --git a/dev-python/nbval/metadata.xml b/dev-python/nbval/metadata.xml
index 19121442841d..30a2a59d768b 100644
--- a/dev-python/nbval/metadata.xml
+++ b/dev-python/nbval/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marbre@linux.sungazer.de</email>
-		<name>Marius Brehler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
 	<longdescription>
 		The plugin adds functionality to py.test to recognise and collect Jupyter notebooks.
 		The intended purpose of the tests is to determine whether execution of the stored
diff --git a/dev-python/newt_syrup/Manifest b/dev-python/newt_syrup/Manifest
index f9698be9abbb..b0597b2073ff 100644
--- a/dev-python/newt_syrup/Manifest
+++ b/dev-python/newt_syrup/Manifest
@@ -1,4 +1,3 @@
 DIST newt_syrup-0.1.2.tar.gz 14283 BLAKE2B 3169f4caa309f5fcf5eceb288555800835a946cbe7bcbacd772c641c484ed0af1c237f01ec921a7ac440c16a88da516347aa9c9e0a3e9e2949c64f5589cf8765 SHA512 8e9db226f2f31eea5656d5bea0acd287fefb4699816e8328471685952d6f323037665bf3908cabaff4e2d0359996989ce8e03ce8c8933c995f13c1a5f035ef0c
-EBUILD newt_syrup-0.1.2-r1.ebuild 502 BLAKE2B 38e319fc37116257c0ca9d327de0306e7345953b3b76ccbd1e9a35b70711a79c04726887ab810ec5809b3ef441badc69104761d78a8fc566e6964fbd1cc6e236 SHA512 779e97837d725a095ec18d06b594f5cc9578be5603c8d78340dbe7869214313208dd0ca143a30cc685b4062306f71eae6a56d3250e97708aa821936054e87343
 EBUILD newt_syrup-0.1.2-r2.ebuild 500 BLAKE2B e333d3eafdfbf3e3ed99a47fa7d979c1edf60f83fc74674e156c549756c0e17ba149185bae12889a3f4eae021d1053a1a4d7a6d1371575c409af23498c6cad0e SHA512 1b09ee0aee2090f0f1f3e111cf91576d0670864f5f2594d95abb4a178c6d449a728957234f380a7cc76bf561ae868c656b83ca4b66625a5e4f1c09b0b9b921d2
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/newt_syrup/newt_syrup-0.1.2-r1.ebuild b/dev-python/newt_syrup/newt_syrup-0.1.2-r1.ebuild
deleted file mode 100644
index ef7b1d14ec13..000000000000
--- a/dev-python/newt_syrup/newt_syrup-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python framework for creating text-based applications"
-HOMEPAGE="http://fedorahosted.org/newt-syrup/"
-SRC_URI="http://mcpierce.fedorapeople.org/rpms/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-libs/newt-0.52.11"
-
-DOCS="COLORS"
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 2c0de6627faf..25eaf660e7b4 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -4,5 +4,5 @@ DIST paho-mqtt-1.3.1.tar.gz 102133 BLAKE2B 905a51824d487cb125e06114bcba6b1ba862d
 DIST paho-mqtt-1.4.0.tar.gz 108278 BLAKE2B 0569f3cb5d262b3b7f6ae68261fe138d839afcc6fe91f880e29de24d5cf8e2491af81a30eb82c27fe63eee90114326eb75b06a32e05ec2fffed27b92d9601902 SHA512 2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c
 EBUILD paho-mqtt-1.1.ebuild 492 BLAKE2B 1f71471c32b22b4b0c069bc6b0146421957238ebf69e04f8ac05966abbc23a604d083cf27cd8c55aea4a4dee84be4770b9a3d97aa426b5938130548ec1b1dd75 SHA512 a3f7f041312079a2761be6306689401ee94fe7afb18e744b8e9fded6e70f694a427e143411862f9098e8c1776db2a1152de40263bb02beea659299445c6c4cc8
 EBUILD paho-mqtt-1.3.1.ebuild 828 BLAKE2B d6607b3246b2a558f48cef712d4c1a043dad250379306b5dab3eff1c704083e65f0ab6c16c2e793788264cd527f403e8693f488067ab60870d65356f41b34621 SHA512 8ddf020fb22f5a390fc751e467a3b562bbf68b8d269f7860895e51f1b0469625c57d1918b80392c06636ef638791a37ee8eaad4e0a2f46c9afcf63d598eb689e
-EBUILD paho-mqtt-1.4.0.ebuild 837 BLAKE2B 04be1247ec9aa08e4c6a56a50e7c172de5c6e52505971bcf43147fad23eea96555b8888187e7c9d72598b64714ecf2028e38719b001e6669e74703da47d4c8d8 SHA512 46a29c929118d7719167060c0eac90fe03745cdb97490b94d83d41fdbef0b877e383b1145026a691d7749764026d22d298d50c7e186eb05952f53c0b3367576c
+EBUILD paho-mqtt-1.4.0.ebuild 844 BLAKE2B eb9da92d33054ce9c8844b8bbb0f1e0d32dcf40d32982b25121f623abebd797383bd3e0375662f181a6fa079dcd530bd49ba32e70ee7dabb8f863da23ca20cac SHA512 288e004051b739a9775de094a614fe1e732e5591442014970427d1113a7b1d209e3ab9229ee0e72e7f7b1b51de42e4a1ceb3d65fe8edebdd652ccdef69888cc2
 MISC metadata.xml 461 BLAKE2B aafc02224eae792f2800211f291493df079437667e706879cff3d8f7e895f16b8b778fe623280434f36ee878db2da6edefb459ad7b59b3fe5ec6e4dc8e3c7b36 SHA512 a9b6ab584e14070bcc2087a7027b1e36bc91706124039938a7bc2eaef5c14247afbe3c4827a22a3899c8e3c527f0d0ca0e394f1465b42e759e2fd26cf965297c
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
index 7b8c7c8b7dd1..75e216ddee17 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index f95ee933e1c9..f37bd2f2d058 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
-EBUILD pallets-sphinx-themes-1.1.2.ebuild 652 BLAKE2B 368a7eea0e15bc1c732842790557eda0450b3c8871d06109f7d02d848250680eff4c8cb195e9cfc8fa74155477114f57706420b9b74c90e3791bcdfb111afe1c SHA512 28d01b954b201dce3366d7e3b9a8019f5af2c9d1bbace302ef93b8113f8d51ae0d00b82e829306a9a3b53f2a0da12905436c7b2a26aa153be52b839f3c03b994
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 659 BLAKE2B 5965d91ddcf7b9891a0e64cfcbc45f80952ce97f3de123d7d11d0725a9e0de8a5fd8106a74c0bd0e3d33abf07586a6de697c91089b86592fc8df68448599fe47 SHA512 8ecd69afd95a32140b21338bc2465895aa7c34ecddd38a4148355ce1f5c940e22e1a19a3a17700b42b8036cd5014cb1b768f5bd447f2ace651d7417e85ae9dcc
 MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index bbe9e6d166e8..574582349bf7 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
index a3e7c4bbe3ca..87e90af96107 100644
--- a/dev-python/pathtools/Manifest
+++ b/dev-python/pathtools/Manifest
@@ -1,4 +1,4 @@
 DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
 EBUILD pathtools-0.1.2-r1.ebuild 457 BLAKE2B 391e40c3a83cb8ff9a448439837920461263a0812404128ba299897afd4ee0ccc383874085b11f5a5c6fb3b89412ec805cdbd5ffb2c4e107c01f5d679ca1ce3e SHA512 751a4a38380b1899cd7a566302c58e8f33f6f1fc7cd90d060ca474b0f57445a9881eef6c9d89e7d93ac4088833b5cbc46c413a30ec8c39e3339839a8868854ce
-EBUILD pathtools-0.1.2-r2.ebuild 461 BLAKE2B 345097e4a45d386ad28d927ea0c591d0b7a40037ec7b0413d8ea823dc72f7dd8be524009bea78d8d534d39da3373be5cc0d91c3893e317794163f0d9f15455f7 SHA512 14705156ce3613b4190ead4b644275f2e4728c6c85f399b49ce72d6e4e7ed126902195f26e9a207104de891facb76a14268ec77444354b1eef0efd18b283ea22
+EBUILD pathtools-0.1.2-r2.ebuild 468 BLAKE2B d88dc6de0870989d92ee5e206acaeadd7712be83c19395733c2709d1e1aad864477ef75ef3277c5a2f0efbae14e464d031a0beca11c42c2fa57f6dee8ab0b956 SHA512 85fd10027beab21dbfb962ec59af6616a046aa9e347a6d432767fa78c8de033404f17fa1bdf2d7a0bfb91e771ab8a3ecb25b5c6651aed7a0ac0ad281e1a1c9a4
 MISC metadata.xml 312 BLAKE2B 655db0f4e05f6f22057f5b40c38a0790aa4878190ba1f2eddd703c2a13a1d8010282517cc827bdf2f48597024c9069ddff7be23a4f914899d5c432115d150c57 SHA512 f1187bfa80d1a0e64b04e3d474d8d805fa73f7c23ad412fdde4a51f347268c764d1f808d9c9b1f191c661e777dcfe6aaf0966bf13ce7ea9e8c02f6a8e5249851
diff --git a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
index 0e3f3ed85709..d7c7d2612789 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/pathtools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pep257/Manifest b/dev-python/pep257/Manifest
index a0d6abdeb8b7..1ed0321ac4ea 100644
--- a/dev-python/pep257/Manifest
+++ b/dev-python/pep257/Manifest
@@ -1,3 +1,3 @@
 DIST pep257-2.1.1.tar.gz 55760 BLAKE2B e470b006b5db04c4bed5c3145b14b949980c71d1dd91dbe34d49599063aaf1cb1d0842dfb992e5d471436446455bde2d309ee573826c039540fa99adba3f828b SHA512 f23939e0350094c67565613bab4ddf285dda5a7379e6ac2493953d6e60ab75588143fd374715765d2aa0728e7117d02e91312dbbe5a9cad28aa8e8e7f68e3bc4
-EBUILD pep257-2.1.1.ebuild 721 BLAKE2B a836a2c55c622e51d4bdd769b85aab43800c2c94e6a6d15b8b9cfd7eb45bd1e4b46915ecd9178cdf7dc4dd8c7998bfbefefae56d599b16c87d6982228c1c891f SHA512 11bc89b864b408b4337116aa4b0af17c85feae4a93e93a472a2d1f4aa660b8167662335318bcf7011549d3795613b5af00d5c3999b958c3c440bd0777a2e6a6f
+EBUILD pep257-2.1.1.ebuild 716 BLAKE2B 2c5504078fc045d383a194fc4894ed4d86188ac0732278d93c50b9fa0e4941782858001426716b57b79d8a8da9d59e005498f13f87260abb80fca6feae68f5a3 SHA512 246290e89e5ba82fb0a4648b1a0352a3b1354a44659d87acfffe66896f838650ca6e7361fed7584265861213fae51094f71b4125a627864e4a676b1293cf4d46
 MISC metadata.xml 464 BLAKE2B b427cfba180d91335b6cb1b632d0f5cf2f2d468ffc31917cd1cf03248ccb8baf4359357b2a8f6018a663ee973e8c4c125a5cc19a973b5f017420c1a929a980c3 SHA512 07dfa48f689377623d1a3f0fc969b7b6377d6623937449ad4bd67003583a218a309b229a5815d93adb57bb97edb8a02a90321e29520ae291663e7fb75b9bc2fa
diff --git a/dev-python/pep257/pep257-2.1.1.ebuild b/dev-python/pep257/pep257-2.1.1.ebuild
index 38e682f3d835..3bde0267c0d3 100644
--- a/dev-python/pep257/pep257-2.1.1.ebuild
+++ b/dev-python/pep257/pep257-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/PyCQA/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 3b80d01e0f8a..fa531e3e46d7 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,5 +1,5 @@
 DIST pkgconfig-1.2.2.tar.gz 5305 BLAKE2B 39fe5e05489e4eb8fefce66f23820d96039f5dfb82148e8ac2d691644aa2d4f1205bfa483f9fdc69837b7956834d1525d85281ba6aa0a0c079748336d47708c7 SHA512 88cfb27755297871c500f37c422da5d4ae30a14e0b9974afbe63f22c59746be0d175b65d9e3d2ed315b4d942046e7c18be062aef914199c99070a2767699848b
 DIST pkgconfig-1.4.0.tar.gz 5915 BLAKE2B 17ae11783b6642f6c8e726b42b725b7904ea282829b4527f92daa1e6ea43c3c126e6ef7e29fe5eefc89b40f3b69799087a46df6ac5695a593903dab9dc247c04 SHA512 8a270449b7b8b850aab9cc5774d1d6c6b68254f00157b66530c15697eda214948d3a71a75725067d63b906a9c3b1d789a775ac15a1094ff5ba3f227bcd666528
 EBUILD pkgconfig-1.2.2.ebuild 697 BLAKE2B baeeee40cd76fb9c3a0980cc20f54d7fc7c265c1d9b3fb1f6118cfe6d809a64a45b8b9a3aaff2d6d44e0dbbfa235f89ac8f4d32ad4d005e1533455a79af3291f SHA512 89e12ac6cbe334139c6aa9169d096abb4ccd35e82bb2ec6d395956b884cbd507df1c639c4d4037f9d90db662a6f71742de7271fb3dfd50a515dcd63bd15bbe9c
-EBUILD pkgconfig-1.4.0.ebuild 754 BLAKE2B f7ac1fbedca3d3b904e590fc6750dcd0c8876ae00717c06b17e9f4d4cab3ba561e5297a6a1b8fb884c5eeb863783a68a915cf97fc3fb7d48fcca4be16b63824a SHA512 534aaeb1e7abd4151a5c6fc3735ab21e9ea2bf53cbebb7d4b6a85d13b3482b6bfe2ba3b3b1d3a469ab3e0e59bb7ae769d1323b088dacdfa780ed8e8afb11bd23
+EBUILD pkgconfig-1.4.0.ebuild 761 BLAKE2B 6c1435ae04059e9eb9d968a361ab6cf8e4bf88ee3e255331b59ca5b9816622b3afb1290f959181eee30b562cfbd9c4d87d37736c92ab2bf2bd190ab76fcce659 SHA512 ab39f94fc6d1c6b7e8ae480d2ea112a648c54985a4d4f5b7f69c5ab0fe5b32ecb8dd010ad6404288af8dc7ee5a5cb2b74597e95078f30c9b05f906679e49e6cb
 MISC metadata.xml 379 BLAKE2B 6d974351e99e999b08f6c18b48ecd4dcafb45452f724d6d038a2307a205ca00f300bf1c60761bc9e63726426f499c2622673dd677afb263c957fb398f264504f SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4
diff --git a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
index 1823ef123659..f41c378e86f0 100644
--- a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/progressbar/Manifest b/dev-python/progressbar/Manifest
index 2f7365f395b2..523d1609c8e0 100644
--- a/dev-python/progressbar/Manifest
+++ b/dev-python/progressbar/Manifest
@@ -1,4 +1,6 @@
 AUX progressbar-2.3-python3.3.patch 2646 BLAKE2B f381950997463c466fd65b9bf9b3155e67172488cbc436c13e6a64744e92aa41d5c7b592ce9a3028ef066c9cdce886f1736a573ca4f4d8bb5176f6327d79eae2 SHA512 8f6816119c01809f3116ade0d52188cffa86e59fec516343937e6a624fc077dd75906325a88f514568b0e61d262435bf9c743807df2a4099991e8e3bec804b50
 DIST progressbar-2.3.tar.gz 9420 BLAKE2B 025f2d42fb0ef11a2e4b974ba6a8cd44c48a7f828ec40a08347492d393acac46fa9c29962d39fe296af655e94ab2075885c73ed6953e2d739aeb6f5f0c0aa13f SHA512 06fdc8b6664642bd864be8023355316fba23bcc4deb0c5877c5dfa91da5d233301a8f39342f133cbb63f37a20de7b8b24910ac8073127fcbdf43b5200d60ed5f
+DIST progressbar-2.5.tar.gz 10046 BLAKE2B fdbef570f48a0c61659bf02b3cc4e0f64d9e4e2edda970edb79fd4aac5fe2cc1bd0a7421458100cab7cbfd3d9d8cf905774113e336ff2d687d5e06b04a4e113a SHA512 86a56a573b903b947baac98b26f88e40072603007fdf5cda3e4a7e797fe4c4c42fd1a4b1ddb1c9ca9a062659d3647c428e33949e2df9e20b0f56a9a4099de51b
 EBUILD progressbar-2.3-r3.ebuild 560 BLAKE2B 918a634d4bd12a573725d3f7248690462957024822c50d801448dda65d9cbacaa77ef78db5bf5b9d2b890ac5dfdbca156b056c475f78c120fef4c9210b6a9db2 SHA512 ab797b3fa9b12ed0e37b667a60d10b520f564b1b98ef4c1cfdcab301ab6bd6f7dc21e1951aca1d24aa986adbc48f570c5e497ace18a50384de0e7f7786b3ab14
+EBUILD progressbar-2.5.ebuild 516 BLAKE2B 7d070850bb68d6e93930ed2abf885ed7899637a507a14e4ee0ad776fd2e52bada8464581ca6186646d479a1f0123ac1dd65b82357831ac394e73269e3389cab8 SHA512 62d2473b9c22087d22aaf55b66a4f55247471918f0716c1edcd9e0398a09e00bedcbad30beb1c35171b77af21a5da3a6214a8333362faa485c6aa9594a089b24
 MISC metadata.xml 324 BLAKE2B 28c39259d7567dc383b5f8e80cb81deb5c235fe9431a0a8dc90c7e35a80ff058c541c5f27236db96d5ecbd905071d8ad60a4a6232e31ef99786a0d847f674a39 SHA512 96cd08f27e9f075bacf7c3aa012b69642d245dbf7b99ced6a6cab24c2183c6304cef7bc25a44392319638d20233f9bb6256990f08c6eff60846815de35ed100b
diff --git a/dev-python/progressbar/progressbar-2.5.ebuild b/dev-python/progressbar/progressbar-2.5.ebuild
new file mode 100644
index 000000000000..1aa5f92eea07
--- /dev/null
+++ b/dev-python/progressbar/progressbar-2.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Text progressbar library for python"
+HOMEPAGE="https://pypi.org/project/progressbar/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${BDEPEND}"
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 38d8a0e4868b..5c4075ef1ed8 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,3 +1,5 @@
 DIST progressbar2-3.39.2.tar.gz 131723 BLAKE2B d8ff04986e125d17b67d86399308c4f7ca55c1dc744e2cd42042fb61ec0b93e61f6af1308e884e24e1b423a5ff66e3074b30ce75c0fb7af85acb700288a7bcc0 SHA512 efbf08a09665542fc361757c2a649ecc3bff0077e68b2669f4dfe1635e7730cf3cd0c6a3ae13e059adada31dc77b291098c21746ed9b5e0929260d2788345d6b
+DIST progressbar2-3.39.3.tar.gz 131839 BLAKE2B 2cbf1ecf04947b3a393b5cc473a696528cdaf38f132a1b0faab5e45dff76aecdee497ca1b2810b9ec5e3b180acfa8e2af1d195e5804c058a7d8880fc3b0a330f SHA512 b8944b319f1133fe7abdd256bed8803e9f426208af5ddc58935121845e81b9f65878e536bd5a1e4810eaa6906b24d114e8681dddf1f77c1bf96cb231f6473a5e
 EBUILD progressbar2-3.39.2.ebuild 556 BLAKE2B 073e66325c9d00700696df54aee11abaf845724e78a37cf39f9b374072daad0e7ac4cd511521acfa91417e451d5ae5582210b84116073a9652888fb020078dfc SHA512 b98e73280be33ce98731a66ef34fba91ee75ab80658b3bf0c04640cebb127c46233906c30bc0a20dc1d6014b805415a479cf0cb7941f919654495c802668e928
+EBUILD progressbar2-3.39.3.ebuild 562 BLAKE2B 9255c16381c00dd7d2ed22dfa9e14c477b9e8bffc850f4c98f1ab9f799f50b6e52154961e5fcad2dd27ad445b0035173c7dfc440c23214f4b0743b9ab5d3780e SHA512 1b686452f4ed1ac2cf969276bcbaa6a78bf754c2a2f1cbc5b335b39566b080773d6d86b2f583cb6ef3fd7b9954ef6368c05873d41d4f46441143edf88f995fe9
 MISC metadata.xml 321 BLAKE2B 91ed0719ef7b045724e73976e54e9e99d289ff410fb04207bd51ab9e570b5a03f799487183eb8180813e370d7dd34e779db641e7d228674e32fa14f89046b744 SHA512 51998db2ca2a1835c61326b8f7cd3c491238ccf8853b636d6fb768243785f74f74496092f3e076c485293363da6cc317110d754dec17dd8973dd89a4f57e556b
diff --git a/dev-python/progressbar2/progressbar2-3.39.3.ebuild b/dev-python/progressbar2/progressbar2-3.39.3.ebuild
new file mode 100644
index 000000000000..5e98c5dd5bf5
--- /dev/null
+++ b/dev-python/progressbar2/progressbar2-3.39.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Text progressbar library for python"
+HOMEPAGE="https://pypi.org/project/progressbar2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="!dev-python/progressbar[${PYTHON_USEDEP}]
+	dev-python/python-utils[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}"
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index d632fb1dce59..cba2b3573da2 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -2,6 +2,6 @@ DIST py-ubjson-0.10.0.tar.gz 44653 BLAKE2B 91c40aab4cc66200d863fb13e4f0b64f4b190
 DIST py-ubjson-0.11.0.tar.gz 45473 BLAKE2B b74bfc20b30a2a45fb4511aa730d51245e6810fb8b00980dd61ae5bfa7cda1f60397de8c9d914195dffc48e4ec9582f839b9e133b98dd897b0a47a03abfbb67d SHA512 2c5dd111ea91fff1cebd722c62b312422e198bb8cc614e1254a3913067f72124efd1cd9879bd83ff88c2fc12ff2ef17fcf350ef7a3d6587c96a58c8b9e8ca547
 DIST py-ubjson-0.9.0.tar.gz 43338 BLAKE2B 8bcf61d1329931a2bfb7399cc27e72b14f9641fe902f0275ae190b1b256c67d78fe9b436aacf6b33912ef0e29a008e4e7b05a12b10488714ecb5b31451c1e69e SHA512 d9f061e548405d16a22d235f487740b3d4abeab8b555f9684b632cdb5e2f655ba8413a207230f90e7f3f352fa3289b16bb9a56b623c0cc5fe02f61778a8f78a2
 EBUILD py-ubjson-0.10.0.ebuild 433 BLAKE2B 8400c323d203cc5a59cdd7b2de731ae2619cf75087b1d1cd1795f76a2d8095ee88d2f0534265b47d7213c01d133c5e5da82198d16f0a2b4dd6dcc4261d55311d SHA512 fcde8d7440caadd017485c7528b16d9ff5f32b221b2b378553e86494c193a034f0fda54a477f462526b110cdef1f101fffc5f9e79942d0c44dd930a2faa148b8
-EBUILD py-ubjson-0.11.0.ebuild 503 BLAKE2B 195e033be2f02c7bc59586a6d56b8445103c9549d6f89e77093ea803ce7223a3433e5275aa2c74fc4dc2a946156f2a3e345355be2b47b1442b2eff901480f6a1 SHA512 03e2b5c14607ed280f0c58990d32bd82fad2e27f29947bd0a72506a30469f5b2ad50aa3f2cffbb631370e1ded5e435aac1ee0b97fee4303a78d827e3d12951a0
+EBUILD py-ubjson-0.11.0.ebuild 510 BLAKE2B fcddf93340771e6831bb5d079f262e1871816912203e986f6ca7120e99357c0880a739007a40e983ee1825fbb0ca81a876e0f180ea0f17e02efdef093f47d8a7 SHA512 632435fa402ac659f8b8b2cf0a0996d127e45935a8a2b9b48343d2e56a0845732631f402bd78ad997ab55879b7af8c123f37e6f444d29f32dd15989c41249c12
 EBUILD py-ubjson-0.9.0.ebuild 461 BLAKE2B 207179e60d31b7c6801bc379a85d017ec20c526163086241bcd8ea4bbbb71b423db2bc675bfb8801333db7bc0e38c28befd3861a7c202e618167e5cf7b9fa653 SHA512 e584775f50d56fcf17fa7a9535e74ddede873fa8594085c5a6a7a5d6c81413b3681fb6a5c8b5868fb161484356bd16ffb79ac6206fe57b2c06f6b1b0bd099e94
 MISC metadata.xml 712 BLAKE2B 69ca065a27809d3112fccb2a0e812fac18a216d88afca7ec654df0a181701be32365863a41f1339a42260d551a3c8aac678451ff7d9ab6c58d8b4eebb76ab33d SHA512 18ee84822f59b8a2b8172c4703d0ed93522a9997013ee0d533acfb4e23343ac2df70f719d8b161dd40604e5875d4c74f1243880ad0725726b445cfb84398a767
diff --git a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
index 8b01915169d7..9d539e717e1d 100644
--- a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index 611523b3cac0..e68fe0ee8730 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -2,5 +2,6 @@ DIST pycups-1.9.72.tar.bz2 52687 BLAKE2B 37d2bf2afc71b4feabbd5aac0c4dab49142a580
 DIST pycups-1.9.73.tar.bz2 52732 BLAKE2B a6c9750970548ba85cdef4041f716491e9b0cf4273cb5381bca8e57deab457affaa62eccf74d36eb3f8b047e5142c952e56e7e624f85ed7959a769f568824f26 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810
 EBUILD pycups-1.9.72.ebuild 1255 BLAKE2B 4568166dcf0935cc900039e6344e8df2ba984c447c75e301d535faa06bf04a2e1651bd69b75e606b3235305ac370848fa4a5631ee8548e89014af6d77f058d1c SHA512 9533c094c3cacfecd5124cdd313a7d4e5e9cd63b94f0f745873dcf2918dbc9723a5fc52c9517352eb7a30abeb3322a6cfb4616c88fd13b6535662d84b41f6560
 EBUILD pycups-1.9.73-r1.ebuild 1419 BLAKE2B 4b86b07a1fec179c8e23f428316251fb60650469e4b8a4cc8e927b01c563fecb721470861b090360aab3b3d2698d569e588cbfeab7ce9a98f9d4c990c56ddf07 SHA512 84ebc4a6664d1ccf5769ac04eac5acbeaac7745a69849d5d706c7d550906c47bfa40784cc861ac64233e3580925f86d7aad2ece7d51b3b57a93def40f9490e47
+EBUILD pycups-1.9.73-r2.ebuild 1432 BLAKE2B 9f259400876aa1443d4f976b665d1b2ba3194855a4659d640a3be8fe9ade3908dcdd6040e0b0655d71214e7960ff68723fbc2e1c0f06a51c23f70a1be9084808 SHA512 9c91124e782689475a5fa47a377b6b565e2beff60941ae3729d2c874fbe9c0fd6e4484bff6bb89fad8a39b27d60303f9de0e80e419d14a61e403f66f043a7a94
 EBUILD pycups-1.9.73.ebuild 1327 BLAKE2B 4c7faa8943c4e091cbadb1f039668b0d477570adfc70a57e8565bdfb342ccad308dbef8648abfe193513580ad66583b3bb4024b67fc96afb789aba64f296e1f7 SHA512 445e2fd1524f8cb03867f24deba97dac67156643feb7455aa699442bb100dcb7c713716a4ad8dbe901a4ddcc4341d27fdfdbc0884bc50bb094f51215f9b00b30
 MISC metadata.xml 456 BLAKE2B ea7d7af9ed2baa3cb5270b3da9c5e1c6dc64d1391e0b280ddd1a6e3e8f3317808eb3906e1c9551615ac2218b89685b9ccbfb4d4656e80eeb54cf2d8dec2149c7 SHA512 c8318d150b07e8a369037201bcb9a99a7bc8c406a2a2889f4a1af62166313d4db740e8546f78f0de1e80cddf774f8818e49a4d3e99e906456ffc2f46a562e7ea
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
new file mode 100644
index 000000000000..2476fd0819b3
--- /dev/null
+++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the CUPS API"
+HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND="
+	net-print/cups
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+# epydoc kinda sucks and supports python2 only (it's dead too),
+# and since we're dealing with a binary module we need exact version
+# match. therefore, docbuilding *requires* any python2 being enabled.
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )
+"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		# we can't use Makefile since it relies on hardcoded paths
+		epydoc -o html --html cups || die "doc build failed"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index 24abd27f9f98..7b61dbcd1395 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1,7 +1,7 @@
 AUX pygame_sdl2-6.99.12.4-mixer.patch 1513 BLAKE2B fa0134e7e4c458caf720169bdb655793e2caebe746e04c5204c210b3535830afa56e8cacf2972fb27953500c4e82dbcc5554fbcbbc20a098d7a325b4b30e08d3 SHA512 4c7fb5b9f55e8f4bfde5ac911bda4f83be535a101eeec80595f70a290228cbdddf2686595901aca25c429beac34ed4ee906c92ddb0522b4c73ce48c1e1556b31
 DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9f6a08be1a3ae929db63e358c53b7a05a16cda73d6e3625a7d522dd5dfc972be978f330f26bb30dc70f4657501cd5e5a6d44c1f6b81eebe3fa4 SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754
 DIST pygame_sdl2-for-renpy-6.99.6.tar.bz2 133501 BLAKE2B 6d23b9bad3fad1b508525bdc7b18dbf0801d7c7e36e15b843104e763b5946c79e22663bf705e071b35c8b4742e3f8e59bfaa0345dc95b18f91b9dd186e6d4df6 SHA512 de1a40f7e8acdb46a7e0b13250c7fffdf848bd44c07408928aab6214afbc741aa77e1e8314d9049324328d9ffc645cafe077a468457a721f36e49f98e5217d53
-EBUILD pygame_sdl2-6.99.12.4-r1.ebuild 998 BLAKE2B 3cc813056970486d9377058ec681b68f98c8e9c0ea616319c1a2d14027820946d6a56de07436580d44cce5685185ebc427ac34c10ad4d3657dc36afc2eacb182 SHA512 241acabb95ebe15ba09fc71cc4eeb48e6f2e9758170fd9e72caa31b7eb21f360b3da6bec75d9c46864765e5d4792bc0c6cb8cff20bf29ce3a1730f64aaf43b34
-EBUILD pygame_sdl2-6.99.12.4.ebuild 915 BLAKE2B f87331240d935019fe7316f84c68785e16038f8abb0cd1024170b70788b9d5984a41d74f0cb5d84b4e1214f76fdebde99a60128a3d3cccdb4f99efc907649fd1 SHA512 7cc69afdef18143d62f53927e38739c77bb75586226e612e781c8367dcbb70287f2131e7d43f309e63cdfa077c672b35ec42b36b19cd4974c1e61ff41968d531
-EBUILD pygame_sdl2-6.99.6-r1.ebuild 722 BLAKE2B 5333eef00a447f48ff8b0fa950bc0b257a951c60a97f3db73e248cf5c937841236ea8ea51bec2b1946999acb8ea3283dee178dda9767766847872b9b1634aebc SHA512 ec791b201767f3703eb855be55cac4d0c6a2d240e527a9aa051c823bb24bae48e7e6f8fcdc9200e28a386d83af5810abc5506e65f54692a950c4b23503a239b1
+EBUILD pygame_sdl2-6.99.12.4-r1.ebuild 917 BLAKE2B a4adfd1c5d45af36f7f215cd7c8343fb47bc7d2dd212f26466289d989779274a6e530e61ffe97916e02406c1fc6ae8261f4092e4e06d6a04e2aec80b0b0e2078 SHA512 c1199dd62a0ffe7e09b58f1ca14a28e9a53cb71340beb1faad1cde4fc37ac8857d205f4a1823d0a8a131ca87f667690ffdf3c50edc97916be9e42ffff9b57dd8
+EBUILD pygame_sdl2-6.99.12.4-r2.ebuild 997 BLAKE2B 3441c35728da4023a2c814a4c82e0b5955608764f740bedcc63a22c3e32112f793d84968a56a46e3e4410c337e1aee90464b244085074dffa366121c2f1cd14f SHA512 70bda9acded801f03cbdf69579f67a4afc3fbb9a152bf59adf8d6554f357b817c601194ab66f05d980f71d40371a06fa89122dee6b69176ff163bcb55c99ffed
+EBUILD pygame_sdl2-6.99.6-r2.ebuild 731 BLAKE2B 396464cf4ecffb8ed6d289b923c53b2cb9ab23ecb3e24dd7f95fc2c340af2d92b4fea7dcb0efbd869d4938442044f734cb26e53c1fd7fdbf5812ab269092a01b SHA512 e7490cb3bd973f474e0380bfc51c32dad8ac1726f145158eac6ea447dd7109cd85d4aeb93f43523c7ae983cdba9acf24f2a78c253c6facf6e7a308d24255cd1a
 MISC metadata.xml 332 BLAKE2B 3af5bfcb689c906453097e4bcc7a7b87ccec6bb1f1f8c43766d4ae5c473f9e220314b8591c63ab9b4ddd67eb411a27400a431a043ca5f696069fc4bf31291ffb SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
index 2c7b47dbd37e..dc01aea24405 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
@@ -14,31 +14,26 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-DEPEND="
+RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libpng:0
-	media-libs/libsdl2[video]
-	media-libs/sdl2-image[png,jpeg]
-	>=media-libs/sdl2-mixer-2.0.2
-	media-libs/sdl2-ttf
-	virtual/jpeg:62
-"
-RDEPEND="${DEPEND}"
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[video]
+	media-libs/sdl2-image:=[png,jpeg]
+	media-libs/sdl2-mixer:=
+	media-libs/sdl2-ttf:=
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
 
-PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" )
-
 # PyGame distribution for this version has some pregenerated files;
 # we need to remove them
 python_prepare_all()
 {
-	rm -r "${S}"/gen{,3} || die
+	rm -r gen{,3} || die
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild
new file mode 100644
index 000000000000..8f6ab7706900
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit distutils-r1
+
+PYSDL="${PN}-2.1.0"
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[video]
+	media-libs/sdl2-image:=[png,jpeg]
+	>=media-libs/sdl2-mixer-2.0.2:=
+	media-libs/sdl2-ttf:=
+	virtual/jpeg:0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
+
+PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" )
+
+# PyGame distribution for this version has some pregenerated files;
+# we need to remove them
+python_prepare_all()
+{
+	rm -r gen{,3} || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild
deleted file mode 100644
index 372e1a7f714a..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-PYSDL="${PN}-2.1.0"
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libpng:0
-	media-libs/libsdl2[video]
-	media-libs/sdl2-image[png,jpeg]
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-	virtual/jpeg:62
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
-
-# PyGame distribution for this version has some pregenerated files;
-# we need to remove them
-python_prepare_all()
-{
-	rm -r "${S}"/gen{,3} || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild
deleted file mode 100644
index fbf4027ae86e..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="http://www.renpy.org/dl/${PV}/pygame_sdl2-for-renpy-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libpng:0
-	media-libs/libsdl2[video]
-	media-libs/sdl2-image[png,jpeg]
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-	virtual/jpeg:62
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/pygame-sdl2-for-renpy-${PV}
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild
new file mode 100644
index 000000000000..8312566925b3
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="http://www.renpy.org/dl/${PV}/pygame_sdl2-for-renpy-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[video]
+	media-libs/sdl2-image:=[png,jpeg]
+	media-libs/sdl2-mixer:=
+	media-libs/sdl2-ttf:=
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/pygame-sdl2-for-renpy-${PV}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 12a222378bf5..fa305321e162 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,7 +1,9 @@
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
 DIST pygit2-0.27.4.tar.gz 479157 BLAKE2B 5b650c7916127219ba18212f035793bb805adda570dd4a89cc7fcda8af581c7aa3916d2851117a5efe7b434dbe2e9ff103e37e69de5d158d0a58162b15f1e18b SHA512 046e8830d403d869418a8cf7f22549293e336fa1b8fc108489c3c2299316838724d1eebc8747005d594e1c6c3596aafa5192dd64a1f34e0a2d080c83214324da
 DIST pygit2-0.28.1.tar.gz 496243 BLAKE2B cfd9ddc8b1e5665016a2743bb0a2f6f5821e08a5173f7be4d99b11e1bf5bc0ba97a9d9fce7eb560f6394f30f23f7b7ce69abc5968ac2d566565c6b06b06f0f8f SHA512 46bb9d6150b7413311f26ea1aeae15cdcd22a2d5c4cafa17bd8a1c02dbf0c9a630cf89583e77a07be5c74334ac28a672de31290ba986476ded25e8a19abf7f3b
+DIST pygit2-0.28.2.tar.gz 496469 BLAKE2B 1173401d4555f6f40eaf5a27d9c0e83214b66afa609f15cc4d689e8c58cc0ae3865b4e6ebb31808d354ecef56f3a74cc777fe42314ef348c39f1f61d82655bc9 SHA512 3f742cdcc9d603c9cc9ef2e0a545da8bcfb555a0bdeea1c73c53a284b43d40ad6b28c87a029578ad7b1c8f2bf56ecd2859dac8dd836474bfc66223ff4af9e8f0
 EBUILD pygit2-0.26.4.ebuild 621 BLAKE2B 12689ec100e542aa3bb628e1395f1ccd8b3423812985dfe09414c0afd29c69881433355b5a8941bc8124e4ce02ca664084d18fb68cdba44dec0b9ade23356df2 SHA512 c13efaa6f3a1686f2fc6bbbbf0e9a67c004675cd5f07352b0bb2ccdb5875ec1acbe557a28631a2bbd6f8864e41f72f3f80741280bd1e54a07e8942626e2aa0e4
 EBUILD pygit2-0.27.4.ebuild 838 BLAKE2B d93bd63226b8428103d17a5870d7773aea35155c2b8eb73f5df573a4f72775e5d60878e131a31b32ff5ef1a4ee41d6c8483c860638da1f25328e350b619559e2 SHA512 db19631909b47e7895dbae8b2217522b1640623dbd31cbdaecbba7a2a96bc431a2f224426afdd4bd45b29f9ae0447a2570f6e231619f507942313aedbc5323fe
 EBUILD pygit2-0.28.1.ebuild 728 BLAKE2B 4aabbded2e54267b53fa5a234c09396b76017ec703d3979a63e2527bfc673e24f430aa84f7300348cdd91a07fd9271fcf0fec44d5c697fdf10761b8ec78aced8 SHA512 b5fc02a1e0b71c5fc7e0c9c2ea5212b9bfcc1fe5a56324fdee087227fd8bf275ec5e5834caddb4d5c532f7fd3be907d187c0d41b57667d0c91d6c49893a5d23f
+EBUILD pygit2-0.28.2.ebuild 908 BLAKE2B 1c9e89d18d2a5a61c583bed417c294f4573bb69a52ebc319411d1690bb26423a296bb7e790b4a549464f452216d97f6de91fb4b3bdf8ff0b1b00c8535bce69ce SHA512 45de481b1c50545466ccc866f5e22b0945289d41c54fdeac4a0b8958723d46e0b00571987ea08da36a7fb5f70bcca24793c03fb9f0bdefa2b47caedbf711d416
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.28.2.ebuild b/dev-python/pygit2/pygit2-0.28.2.ebuild
new file mode 100644
index 000000000000..edce720a1fae
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.28.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eapi7-ver
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	=dev-libs/libgit2-$(ver_cut 1-2)*
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# we need to move them away to prevent pytest from forcing '..'
+	# for imports
+	mkdir hack || die
+	mv test hack/ || die
+	ln -s hack/test test || die
+}
+
+python_test() {
+	pytest -vv hack/test || die
+}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 059a0e6ad70f..bf1d0269cdeb 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -4,5 +4,5 @@ DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23
 DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
 EBUILD pygments-2.2.0-r1.ebuild 1617 BLAKE2B 12203987ca08ccd71d28d8bbfcf1a5bbd4a91f2c9ba2418f6cef611b1735e4a42815d63d731b8d42b5bf6e0104f9078662bef9e03394e62a190a5a954dd5ba98 SHA512 a5a31baec8484f8a30aa29207f6f7ed5ab3dd9819510915a396a624426305d2128fb593e611bb984d18a8a6471a1c151341492d7a5f8d15436fb0854dd4c41ca
 EBUILD pygments-2.2.0.ebuild 1768 BLAKE2B 09ad9ac25d4879a54c59ea4dbdbc2699229d2bb150d81a4ab6a8ce6ec567ede12c5f2a341ca69532459c8510324612da1d4a77b2e7bf2132f7b09084b5b1bac7 SHA512 cf4bf9e7785589231cdc8c31e5ec86714b99c65bb8c71dd0c6defbc2e75d3be6f84429562c727e75e3d5a0149f13c300e442aec19d255c00c57a3312dc111186
-EBUILD pygments-2.3.1.ebuild 1441 BLAKE2B 5771f02ae454b9581469af484ca3a2633950ec7e758397df3dc791a943f7f5795f632db7011b3ff909f2b43f0fc08b52b1888cc3af2a940e79afae617dc26cce SHA512 e4fac61e3f4763d2ceab443696ce83711aca80e4dffec68f411b7650c716297c601cffd599d63943ed9ebb608aee78e0f299019f263e748d028a0f56814cb322
+EBUILD pygments-2.3.1.ebuild 1434 BLAKE2B 2cba0db1c7f2e382ed645ccc63f5d71dd1cf158cf2fb86932c89151eec2b911359213fee534175d82878d607df82d517f0a31a00f9573097e1d1d974d7068b84 SHA512 9b5e9ee99553424cb1dc2aa60bc15e6e3f4b5f50b00904636f62ef4ce38af8a80d784c631e6ba9c732f6367afd82ee3d54d2b0dcd3b88ba35be37a3b8c850847
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
index 9f067d1aa5e1..af22fcf8f760 100644
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ b/dev-python/pygments/pygments-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 1d87804c0c25..b3ecb234f7b3 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -13,5 +13,5 @@ DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd6
 EBUILD pygobject-2.28.6-r55.ebuild 3537 BLAKE2B a5b8ed9f09176314ffd8584203f5688399c9aa4320379765c0867c4605e38d2fdfc51986b58960465506e36b70260afdf48e68d4de385b4ce0d0113a20309d40 SHA512 c605ab80a65d3a8e71669c22675b4cf54cb94fefad28126df05504e84b0d867bb5608952c0b0e161df4c8895c159159035622919b9321d81b1f26b34ea677b0a
 EBUILD pygobject-3.28.3.ebuild 2781 BLAKE2B e61485d38a4ecb0fffab6b2be57ab6eb7f73b7b3d93a3dc5b6053a590b3dc5b8808e015ee799e97e385af58398312c9d4eaf3253ea8edd443e68d7240ee681d5 SHA512 26d77d8707389f991564abcf4367cd8219d41161eff8a8e0a780d40fb678e204ad8873e25813b20fb797fd7a07ac41b32cf2e6f9fe7fb6551ea5628a47bac6b1
 EBUILD pygobject-3.32.0.ebuild 1799 BLAKE2B 30ce722d41ec0cfe78a21bfae59657bbb7c0b247e23ab33753f69922ad236d9939fadb5a51f6d30009d116c5eae973e180bf6ba4d06755e8ad2edd084730ee96 SHA512 3ed9eac4109e19cff59c189da5c04cf53f4ea7f63dd828b5a95b91bbd306f1c5b41eda1cde0a68361cf58da9109d2a9c5f3d0547409e83a4bb92c041a2e65f35
-EBUILD pygobject-3.32.1.ebuild 1804 BLAKE2B 8da0454c953e0576212e530e471af82a61cbac27c980acf5bbb85acd5c40059de5d70845f35a5b0abcc8b9735f11fd4c90e315baad9df9d880bfaf8bc1285c8e SHA512 ea267d822fd997a0652b0cc5584925be69e35e4997caba63bc17df8f2b8cc55896634a858275b0620256f6c6630b78b8d99ad106789c6e839bb2f64437e60259
+EBUILD pygobject-3.32.1.ebuild 1803 BLAKE2B 6dad28e0d82d5d5d4873d271f55a5ad0c6970dee30b281391a8afff013bd982212197bd6a6cc7cb99ce8b0c4b0cefd9a02522a31bc70d7b52d5155e0aa599a8d SHA512 c5fb53da9c4af1f80d542f2a6cd3164e64ba92b5e2342fe41edec6edd1400839e421a61935581040e841cbbb2b4eb95657d3c7f1b5f820c15ce279f89dfe37f6
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild
index cbfe2c87a06b..9f4d6f5c2cb1 100644
--- a/dev-python/pygobject/pygobject-3.32.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygpgme/Manifest b/dev-python/pygpgme/Manifest
index 6ae7535b55cb..05644e787b34 100644
--- a/dev-python/pygpgme/Manifest
+++ b/dev-python/pygpgme/Manifest
@@ -1,3 +1,3 @@
 DIST pygpgme-0.3.tar.gz 50100 BLAKE2B d55ddc79a569ddf007552909a142836c54f97f6a5e9b503dec0405d1df387a9aac04f0424b3700cf35bb5d1bd891f0b90f2dc3fb7cc88435da83944adfccdaec SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736
-EBUILD pygpgme-0.3-r1.ebuild 532 BLAKE2B 9b66b4f2dfc6c8376dadcb5aa9c2c7ff157bc5f0ff35d3bccc3598cbe6d8df7449ec8e21cac6520ec61002a4fd57a153757de7f8271781a008643001d5b3cdce SHA512 3e6d8eb352dfa7389de75cde464c8696e9ee8435d78a30b2f5cafe436e098d1aa13055a046941bfd59da657baece5ab28b8cf9d7bcf0682285af4ec93b34ca0d
+EBUILD pygpgme-0.3-r1.ebuild 536 BLAKE2B a368f68dd7267f52c37dc3979a61b4d3674e709ed19c7de38cea6c4b08ae0772b0b1281d806b81aa6a4ff98327747ba39a379dcaa81bcebc2e358c2039856e0e SHA512 8d63765b3d25d084a020812c09f37f73c8a0d227d55ab32c6a95c16e905f28c48dba5e274c4012e46f7f0aeeb4f1119c1ea39604ae891a39a0107da6f9ed3b4b
 MISC metadata.xml 665 BLAKE2B 4d0fcdc592cc195fecf65d0f7498d562235ba978b7e9723bc7c89786fb6800ca69415e3a80139d7257054e2532b902528cf2862352e3044c5d23d65267844a10 SHA512 1e9974929cc266d7dae9f6f9cec2b7dab4f105765b87b22f675a62ebb75743dd2043bfba3bf8732e4edeb9d18f6301d54324815cd90f3db53821ebd2713702c3
diff --git a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
index f29924d4688a..4d0ee94c2aca 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 3f3836fcbd40..717ad3e0abd7 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,8 @@
+AUX pyicu-2.3.1-testSurrogatePairs_workaround.patch 1474 BLAKE2B 7b9ab4f4c0021f8e987830966551cfd2a128a0dc964f0c45c80d74a171c6093d2cda4b9a18baddf40c264bb66c2d8765e1d78603a75db4be1af4044b817be767 SHA512 59f54524b0d8dbe6c146685901db30f50fe04f2438ca64c824cb97e737eaa74c831e736ec90f376b66a1d8c69e0cdd76d0743a940a374dda342322e70210246a
 DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141 SHA512 b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
+DIST PyICU-2.3.1.tar.gz 214761 BLAKE2B 6571f1c10b6fa15b0b6fde76c16b2e1a1fa99af83db615aa7f7a172844183ca2a818747749b38e36162ff297c3e99311cd3328333880374c1c151955fe983f78 SHA512 edb60320ffe649f257d4d691ad9cc8287a7611de6a970d33a25a6e12a14c1faa591023d99d0b10619b0860bba70d1b67af2eff5cf146381afcaa872f0af1be29
 DIST PyICU-2.3.tar.gz 214710 BLAKE2B ef676cce089962d16a88193e7aa2ffec739086e5bbef201c8779a372a5876bbb1e63e5e92a7c89c879b91f063e90d4fdb16a1967dff5f2ef658cde95f9fdca6c SHA512 2bdbc7fb7c83e58c9d0d53dadf8fef92d8dec02e9eefebc75bac43c19f008ef2a3219d41b62c426c41a055bb4530b2f7ef567162660d6021b8d2bf9e99090f94
 EBUILD pyicu-2.0.2.ebuild 798 BLAKE2B b014a5d1e6f71ba326121adf1456622a6d0747725a799dea851b5dbcb6be25b0e20164f7c6d39ea760004578969b636c25c37d4b853bde377484dc7a3634e36f SHA512 4f76c7e878bffd3976c8e2395208ec065b80b7c36fa35a159ae5d8d09db97c0fec23c91e804fdbca7561401e80e8de5a6bdd5f587a456b2da5f45b47067bc669
+EBUILD pyicu-2.3.1.ebuild 759 BLAKE2B c61cb5f74a3d86f9dd7e3a854684a272ec74a4c11f8c407ee566a3c1563ad2c127a1d37cd26516b94f96faffba65998ce2d86143168149f582d65b670be310fb SHA512 10c0654ae29ab091b0e496010b13a82f1960094a789d9d6d0cbc161e84cb0540afa4d3b90e50f01866044895d62cc20b6191cc6b019ed4d1257127cdb45f4b8a
 EBUILD pyicu-2.3.ebuild 821 BLAKE2B 67d8621c6f96db9580ecd62123fd2c41ef127b6042856d473a2d2ae911a6d9126f4adace4ddb2d32abd71332c0f0fa4f1fbfaf94eb6299c823f598ad9b89dc62 SHA512 c67f7bd407977b46b83bc2f0c76db926a1dc87da9035f4c666185464574c6e6b8bf61b08e362fc13f4b0349089c81e302253b722215c579a9e49e9af31f38ab6
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch b/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch
new file mode 100644
index 000000000000..3525cc16e966
--- /dev/null
+++ b/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch
@@ -0,0 +1,33 @@
+--- a/test/test_Script.py
++++ b/test/test_Script.py
+@@ -40,12 +40,16 @@ class TestScript(TestCase):
+         if unicode_32bit:
+             self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
+         else:
+-            self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++            self.assertTrue(
++                (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++                (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+         pairs = UnicodeString(pairs)
+         # iterating UChar, not codepoints
+         names = [Script.getScript(c).getShortName() for c in pairs]
+-        self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++        self.assertTrue(
++            (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++            (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+         # iterating codepoints not UChar
+         names = [Script.getScript(cp).getShortName()
+@@ -53,7 +57,9 @@ class TestScript(TestCase):
+         if unicode_32bit:
+             self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
+         else:
+-            self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++            self.assertTrue(
++                (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++                (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+         # iterating codepoints, not UChar
+         names = [Script.getScript(pairs.char32At(i)).getShortName()
+
diff --git a/dev-python/pyicu/pyicu-2.3.1.ebuild b/dev-python/pyicu/pyicu-2.3.1.ebuild
new file mode 100644
index 000000000000..2e9d029a29e4
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/icu:="
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest
+		dev-python/six )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+# This will no longer be necessary in the next release
+PATCHES=( "${FILESDIR}"/${PN}-2.3.1-testSurrogatePairs_workaround.patch )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index c54a42a63acc..928d69b1bfb1 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -5,5 +5,5 @@ DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb839
 EBUILD pynacl-1.1.2.ebuild 860 BLAKE2B 9e00b4a7a68828c4729194110f2124d11a1b29e78158dc14d4787a5ecc555cb1ca731e41918b1dc2ffca31db9585277f327850ea378412b0d026fff179fc90a6 SHA512 454e4595cf84bda0a3d0da5a121d4fc468b5a065d40d89b1f7d5c38b7ca1f8454089625091aad753eb8943bb3487a97bac49ff6548dac7d8b25e341d4dd84d41
 EBUILD pynacl-1.2.0.ebuild 856 BLAKE2B 56c28a21c37d39eabc4fc27189c65a0938b00f43f5b4a18a3e73ce7b698196026f315bc30978fd9c4150ab9da3771b20d777753a576473260578515f5be9b160 SHA512 c11694426a8cf630346c546085b969fe903fee4421d688f3a8732e8545d2866c57b4533db3c050bdadfd3f7b8441a33662a554b691816ee1c0f40400453c3ad4
 EBUILD pynacl-1.2.1.ebuild 1002 BLAKE2B 56b041a58dc7c03d1076fe281e61c0efafd0bd78052980c0837342dea22fd93fd9452ebb0a2fce5922564db8bf5736c0f576bd06e2c53e85ac3cb78138c75727 SHA512 ad89ae2a1112ca2fcd930fdb9b1d70318de20076d97fedefbcaf14edd30fbccb023a59d1d9a3c342fc66b3bc5ec3d6fc73ff25275b568849d9b16d68c077c488
-EBUILD pynacl-1.3.0.ebuild 1011 BLAKE2B bf8c8f5c08dce8a17c234a64adf265fbcf58a4e10e78b735389a82b844bc8ef3bba0c532f614054b4ce32edca7ed460e08b79ebe76c309dafcf2fa45940dfab1 SHA512 b828b2a156a3ed430f6e527e8ed164fc8a6a29cbdc70181d6e595adccc67ecb48ed3bb37bd9ec728d2c17e385d62c514d0ec8ef35877413e37ec11343f5ee2d1
+EBUILD pynacl-1.3.0.ebuild 1018 BLAKE2B 725de06eeb53b2c7d0a48a2e57d8429566782ebac223a108ea2af4d0c2e5b2140b57f6f05e79678384fbfa56e604e3f6db9b58989028de56281f72b7341a764b SHA512 6e5038698c439d3c8c4237b0e3a4e8b44502ad062e2450648a2db2820549d41c80784f9ddb02b0a5f85b9039d580ac1d8c36828e6605f30a6e1aeabd5e14e62b
 MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
diff --git a/dev-python/pynacl/pynacl-1.3.0.ebuild b/dev-python/pynacl/pynacl-1.3.0.ebuild
index c0afe300d433..0e882379de60 100644
--- a/dev-python/pynacl/pynacl-1.3.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 99dc0db4ec12..945726cf95b4 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,3 +1,3 @@
 DIST PyOpenGL-3.1.0.tar.gz 1172688 BLAKE2B 9865a10e8b5d2756192077b4b079658c680b9f47bdaccb33285fb1942bc678b29f6a69359a1486ec023b1a73d714a7e0209b2f57776fe8b5e4a5e2d0803dba4f SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb
-EBUILD pyopengl-3.1.0.ebuild 839 BLAKE2B ecd4baa91c8072a9e4ca33c58443abc62db6e51800d9329f3da8a12aa387fc34834ee8382de6a8f2d5416ddab0fcc9990e2046f475237a233142824bdcfb822b SHA512 62ee99cf7ca78edfab8572e365e62f7b47f7f985c2139828564d9913eac483b980ae99d8fd3f461d668ff0309b350132800d41cb8d93b8f412ffaaef92af63de
+EBUILD pyopengl-3.1.0.ebuild 838 BLAKE2B cc3fb237d206eb3346e63c5acde5bff031e0c94fa56f67084ea35603e3be6778d49129a582dd8e19df23ff0ef19dbe02da3f61d19f491be622e65d1121ba73d6 SHA512 5792368802ce1b94f8a9995521d302b488c428ac43cf57d0a32cb537cf5fccb15cb25d083c1cf1191c55fb2f63442e9e9031ca2784ef0496aca900e2914fa6c7
 MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.0.ebuild b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
index fef5d98a6f79..fd8c5b9341ea 100644
--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="media-libs/freeglut
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index c433289155b5..5e6fd4e60e29 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -5,6 +5,6 @@ DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf06
 EBUILD pypax-0.9.2.ebuild 1093 BLAKE2B edc30b3507a0ec1d074b0728d7b03eeb984f9116a20cb6628c7760e0a28af15c0a3f9943dc4eb5d558ab7e2a7ce4cd2f6e006f96ae72da316f42c6f9ed1fd26a SHA512 b3b58e205a537029380179d1bded45d8eb248adbf5d3df52bcda42e0b3e47d2df9c6116d2c57065729ab0cd7e09a7c6090cb46f6655deb97f9af2bd7b130a68f
 EBUILD pypax-0.9.3.ebuild 1097 BLAKE2B 015ff94c5122e918715eea10f161271e5b2a3e36b8dfec1482e0fe4d0236f563b324eb42b701a87521b06690d49b3e6e22828fed79d684b68723197941611ed5 SHA512 5b29aa8fdca22ea0b7d459df3256d711deff11fe75560e9eff10bc1aa373f4673e6055b0543e3c6dc495a09e3c273686a596df41c7f7aa40218d92c7e692db8e
 EBUILD pypax-0.9.4.ebuild 1092 BLAKE2B d893dad6067d2aee809c8f6c8121ca7f1557d564a66c9b116b6493d9e324a4ec368e9f9f69ac5eaf08ddac3678c881094e6e67bfae88877935fd2934a83274ef SHA512 597dc17378266e61ae28b0f26784c7e0b010b34e08a2ca0caefcd546d70febeb6cd0d8aefdcd01e9fa6bc989a9652fd4627037f571b330a813ec58bbe5484876
-EBUILD pypax-0.9.5.ebuild 1093 BLAKE2B bcc8ac8e28db05d8731f736ed9e14d57df13ff5c937bee8eeca3e16120d5bb78f9e4f9bbfeb929f048b33c2f56f4d60292baf5c56cff70b1773b1fbd63c0000b SHA512 09c2145a62f778f540a69b3ccfdb5349ec03a39a4b3f26d561043fb573df7fadf275ed9856f777a99409c21d88979051fc89f35356d4ae6d63d5302aac67b98b
+EBUILD pypax-0.9.5.ebuild 1092 BLAKE2B d893dad6067d2aee809c8f6c8121ca7f1557d564a66c9b116b6493d9e324a4ec368e9f9f69ac5eaf08ddac3678c881094e6e67bfae88877935fd2934a83274ef SHA512 597dc17378266e61ae28b0f26784c7e0b010b34e08a2ca0caefcd546d70febeb6cd0d8aefdcd01e9fa6bc989a9652fd4627037f571b330a813ec58bbe5484876
 EBUILD pypax-9999.ebuild 1102 BLAKE2B 3602425ccf3b84cdeb301509b502ed4b699d1f8f1246d89b2504d377feb64f22c3c64c15ed19240dc114df2d9d2895c6b34b5524636511a5836ee936b8257ba7 SHA512 1ca8235f4e14576ec1299dadcdebbed2741236475340e2f771d42eec39754d18b3ef49b4247615e6f7dd3103561bb924a9644562c65e7844913649490180c6a2
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index c1d8e2b4c85b..78e6e089582d 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.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"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index 11dc2f256dff..5437caaf7387 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,3 +1,3 @@
 DIST pypng-0.0.18.tar.gz 377942 BLAKE2B e27540cabc4b872af5779a128b3213745ff173fd4c0c94ef7b7e9868b84a58beaca40e0ec6c5886a6a6f8652118bd792a0b61275920e1991cafb1568af8a5312 SHA512 3e44b0c86c3ff042c7e4bf03e82281c6807c4eae432c45b9bf4bf9fc844e24031a17245410e9060e6912ef77a30b9ea956422a3d9aac4331e7e81323da632e47
-EBUILD pypng-0.0.18.ebuild 441 BLAKE2B eea32f7107e69232ae3626377f5031e967d35793577dfb4844b3f694f02aa71681479e8b3595828aa0bac4f99d6615160365bfe286f5ca37a4fb222ca3fb7d34 SHA512 e3344c90b65e919ce9b634b489c2e9297866e7d00b208934177e3e9e6aa8d872c2be6b792d97fd008a134ddd17c9bad771539eab3ffbf7870a2d3ab03e676942
+EBUILD pypng-0.0.18.ebuild 448 BLAKE2B 2bc92aaee92de07e3a91902820d695a9eb68f8ded7b6bd447f2c57b9c4080e971850af8b540c6b12dde7bfb1adde9380088557a848d9c6d11d9b8fcdee4445bb SHA512 95476613460fb3d9b50f276e48b334a932d092a50376d731542959617d4a4bd2606e47cabdd2e5c8a152f2fe43f4d71893fca2321a7347ed6e74e48481f63d45
 MISC metadata.xml 640 BLAKE2B ac4ad29886e66226f2947fb26a8778d0b2cc8641a7e9b5d250eca4fc3757f7cd92745ecc095fe7b456c2c3846f75e17cd729f6247690e38e760fabe56a3df38f SHA512 04ff397dd9d70ec906ed9181c7345f297cbfb7a00739519d150f2bdfdcfe5f1a6406d16cecd09dee95bed5e06d8443eb62b04e63496a265bd02c2acd91d04e94
diff --git a/dev-python/pypng/pypng-0.0.18.ebuild b/dev-python/pypng/pypng-0.0.18.ebuild
index b0f4c0da85d8..232bc136c3b9 100644
--- a/dev-python/pypng/pypng-0.0.18.ebuild
+++ b/dev-python/pypng/pypng-0.0.18.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index e9dd9507fc09..555180ec8e05 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,52 +1,6 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
-AUX 4.0.0-gentoo-path.patch 1915 BLAKE2B edc8656d4bed771124c22d45e130aa7ef812ae7a4829091216222fa80371cb7a4100850f366e5065b565f27542bb7e4e599d06cca6bdfa2bf189905e2c498ddf SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz 13018301 BLAKE2B b851ec3e73d4203a4c1eece2cf81dada7cc2b8f7047c9f4e06bd4f24008c1650d95fbd29697fafbdbed953d19595c8e77143a7bd9c8306ab3a15b2c62be48bcf SHA512 8edaf5fdad14886f4120358066fbb09be17d2b7f10dd7600f256a3f3d4b66c90502b85e8a500a70113135ce408ae2877296e1a9cb82d06ae0d031db26e09066c
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12940199 BLAKE2B c3790050d17e98a0fc78fa12218267aea62580287fef06559df136b15fbbd791b43ad191f4a91865ceb4e6f0954af40676beb89182a0d6f720644d4aea98f439 SHA512 967a2332439ae349d47713c33518e88f350769c4ba2c8191f63c145b4d036b53308232adcbf08199e0111ba1cf9bb9df78beb16f6933f9b377f617f34af4dee1
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.ossl11.tar.lz 12981891 BLAKE2B b098e2ee15bbdfbeab5b9ab0b2b818f24160badadc8d7e3e8921eca85251a2246a595964ec491e1d23f84150253f2db23642038b476ebe930129d1b9ad170ff8 SHA512 65202d2970e52df83e206068d66079e7fd3254c9d6fa3e410f23f379b3accf324af09fd3da4c13a483c00b9de523485b8f3008f4160f134b5935948f05028c80
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz 12916168 BLAKE2B f23aa0800c48d976f60d6826a424703fed1e1a00b0eb1fa09adce609cd1379f47e42df4669dad6edb59270d708f145049a7342ed73971d33183fef80dbd00539 SHA512 0ec4acf8fa2fb4b7ea409eb21a5dc0dcf14fb5616b8cb11d7892fd99aea6aa0984d0951ac474fd1469fe362e841a684d2292cafe6f69c078d003b90f224f2780
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 12932560 BLAKE2B 97693b27ce350dd35103cf6176e7113503f790de1fc498810bfd23ed70f324fb148f801ec3d5ffcc1c578d49098ff7c4353da10509c0d56a2f3c6c4dad0a0dfa SHA512 03db8101a5aa288eb59b73d849ca0767a2b6cdffe1bfecb5f4ee5a70ceb7d73c4e1ca9be06424e18e62c2939b07c152bad1c762a9d209faa8bac9b91c48b4317
-DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.ffi7.tar.lz 7546991 BLAKE2B d4e84d839dfa106a4e9b3a60327bae1fa96c326bf219b4f8dddc9dc968412b4be67e80ed1009120cf6a8b14aeede83ebb863bee1296eeafdae95a01ef0efd1eb SHA512 e3775fbf8e2a28d30a90f5bbde84bb03007aa00a6b778834db067d470d97b87c6e15ae792996d801b96d1486aecceff124854f0bd2d2bd8e353c0ee1c12662d4
-DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7466895 BLAKE2B e199b8330dd4ac2acfe668fd19b2900843c96de961b3ea2fc418ec71c289c98d9c505cd42581e726179441dc877feb7eb57b89ee63c8ec00895302dacb039fbe SHA512 560886744633197abf14c21fb872f41d3d614427861045d6654c72b940e7b16996af4077ef9d531cfecc28c3e65dc64e2db149fe23c370aa8ee446dd5b0359e8
-DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.ossl11.tar.lz 7525252 BLAKE2B ccb34328f579a61070d6021f59fb948a80cb11803479a7960d6459cd4df861f125057982c4b051b7e9825ce3eb4c6ae3308b9639c9ed91dac1e042c76af1bd68 SHA512 a2439faae18ed12e1c8d2693471f665c08c29163957f94fe1daf240844e932b012d6cec6d1e70c9b14837ddb800359dacde44ac1444af56b296ab913fd541d44
-DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz 7558174 BLAKE2B 62dc408c958c18d9751466b24c5dde46bc8705634e7312593c996c9517cc36bbaad7278aa09b179bbcb962c4124399d27647b82356c79e20e13434153b8c79b9 SHA512 8c232c7852f3e8d9e3b5bfcc3785e171ea64c63d3e1658662d9eb0340a21efecd4fa037b15ede155015b262e2f60e4fa0e80d72beb18d5e4b01dcb3e003a516f
-DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 7547568 BLAKE2B 713cd16e54cdab7e25c091db931a760f51de990bf53e566b711754c5a705507257f1c54abc5f85aba7b2449f6d3967e820d14f55953a3880e7bac3eb028db203 SHA512 e8efb0af8e8ef89c95e5fe73b177f34b9120a172e0af7e52990e428e498e3b84b31eba3dfaa28bffcb121625b5494eaeec71af2a2fa46d6b888c148ca162836b
-DIST pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz 9857459 BLAKE2B a125f68fe7ca8259d614c1d375029df776944a8f14960528d5b96125a1b46c7c014894ca3f952157957cca654dc8143033d04f4db0fdef182a6915304b630dcb SHA512 4fa02202d2ceee6cdbd2473e8f3028695a73577504053eafd87464dd75116028a3b2129be16d422fbac5372cd7623c0ee4d9ab75b87a1423dac9470eecda1227
-DIST pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10268326 BLAKE2B 0f0c9b9f9a586b7dfc1099a9dbe28fe56d49c808ffd2e632f428b8992d39db3db7f70fd4f2fd0fb261d8c85202ab4ec2febc35b1bd4dc86f38ab8fba5715541c SHA512 40986918e0ea94053b3adc5594a21acff34d4f18b0f4827ce9cb2646d3ddcda8fb6b107ac17869c2c44f99f153a2829fc3ae89e8d4caf61ead4c4a4c9b8e963d
-DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.ossl11.tar.lz 9877659 BLAKE2B fb017132e28f9249b4cf1878694cde812fb53c26e58e66156d0c7512a66baa8c4961d7aaf5358d3f2acdac9aa41c6abfd9432d9c7e6fc199cd80ade911db3790 SHA512 516f7290ea2f36c9fa6c62464c32bf80f6f15b4d94dee50d1f153400f0b1fe9c12afef517cedee014d8e88f254985c70cba08a0da29250d78057d222b4e529f2
-DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz 9859596 BLAKE2B e76d456b931bb9ffd5f5140cf4125ed1446ec81432785a97f7a631adb3b97c7184d174ef928df0089e6327a1818ce70072e6835561877a6a6398bc6c6ab6705d SHA512 80895434011f8ba14cf04cd060e6b022f8f7a92fc11b3005bf92b20c267200aafa98f114eaa7b473ce2a27a44f22882ed20b59b7bff4d1b1eef3540b9154e1e5
-DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9857367 BLAKE2B 48d9271213dfa04991fbefab294cf3ee1a8d69d954315b0b3e543bffaae2134f0ce1e5f3da09e45041b988b0e08359c68b49acaf14c8bf26913cb540ac1928f6 SHA512 deeabbf19d95a6e6e55dea59cb0ff06fdf1ce687d6cd9499ef010d90445e05102056b5c8bfe9f44528cf86f087e4a2b1dee00fb5df1f7526673333cf73d5c8ab
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz 5940394 BLAKE2B 4f83e1bd745e686999c39fc8976c204a95b1e2e2f6a4ec23020e136f0c1046eed4ba4e8327c7bd6c2f11d80abb398fa46fd57ea18f9e9a7ed24577c67e274e7c SHA512 7007867780b9dd8f0501d278a651e0e6e82bdfcf40e66344a4d194ea71d311e0efdb8ac00a7bc413d796cadcbbe10b603707c371bec4fe12f1b090da81e11226
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6301309 BLAKE2B 8f8e16bd05da671fbe3e762dff33f32b1c50f3ce866432d3bc039724d025192a7116d6aa2590007e3adb52e5b3dd3ad9eadbc7c8f388bc7e02b049fcd980e3f1 SHA512 e6d32352ecb3a17e614f4ddac600f7dafb0a39fa807ba2fcce506eae881ee5c8f959e2d797f8126bfea74b801b76efbd9a3df86dc03c8521ec320fd06d05659e
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.ffi7.tar.lz 5938624 BLAKE2B 218e2a75d601cad1346d4513f01e8b9544cf2d8e0de68e43e6645758efa94e8f770e06c73be16e53964752e2a747414141a99137e7f6820f33ea1d7f3463736b SHA512 c2d17b21de8fc2658c4ffca3ca02138d2446503427c7fb4d488a2a58e1e0b0bcc1eaa0548dbe176cd7a668cdf296ffdb3a0356b27dbfbd7b6be44d2224779358
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.tar.lz 6290475 BLAKE2B e51a49ee9cdf7e2b9194e00ec9480cef3668e7c1fa7e632eaff0b7f1ba415096bdb2a2a4322ae25b611e4ffab28f00d15a4429142bf7a62bf0d32ba4a157ed79 SHA512 258404258f7bb96fc55cf4bd8a086d598e0b583a62b282ed6809af740c09792dd854efe4a3780b85d7b84ff1c8b0169875dae38f271f95db76db494d63f0774b
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.ossl11.tar.lz 5947112 BLAKE2B 9153940c44f99fa0c9e911e3a815679f93413fa4be46cbd965b48e8ffe68a1e7ebfc6e872bd7d59e4d0e0ff9d02fbd5c30b1e0d9db1521448c0b0ffb89cbee7c SHA512 435d33f8ff36f424c162a450f3a9c8419bb46280b34b9d2370bc18f961a78f144128aa712dba094755e7d350cee97f395a9b61fdcc6f0d4054703dbd01d29c3e
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz 5943737 BLAKE2B ba39bff2fcccebed496c12ff85d95ea6f7d6092661b251673b53c061fba831eeab74b1286d4fb3873bbd5daa6f4ad5af2cef2c9db561afecd34285b806e0b794 SHA512 8c6a6dd5adb6a0b80c1ea3cc461ff2316084319e26b3f0c531ccf67bf518f603156624596d94f65a2b307e462cc97cef39dff33d662f847a20620103b78fcc5e
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5979890 BLAKE2B 8f47c34f88b7f4900808dfcc8b22920c8053716dd8f46382d5656a15d742be13d5334e40cfca86dac663695bbd7b6ada58546130ee4936ca87c916713d069614 SHA512 498478f91302312b54cec3f42a03f817ef02b4d3bd66019c9bf9e0398b58a791202bbbdffd25778a20ae5d49bbc34d956f2f5bbd5d132c098e979357f8ca5e59
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.ossl11.tar.lz 5940234 BLAKE2B ba4133f9c261c7b8d7c3a5c04de61398f48c1d34d146009535c5445dd8abab17e914fa675c6c9f4717cafb1be5ee8defcb6d1ecb20cda60223677bf5c2b22db9 SHA512 afe12fcac3a93b8b139a0cbbc5475edd23eceddf3b6e58e5d425459dbc51056ad10459133adee3f7d282c403e881fa0d4d1f9c30955163e580c87be7e1b7825a
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz 5939972 BLAKE2B 86ca6f1dd9f00d993986476fbeb253b2a7efb862dec7c8b90945c32e9418d52460d3d305fd0e182e9351e6de148928cf786f461cb3174601d84f5604ca1ae132 SHA512 4d14693ba0bcf3d6f56c9e8a45959d84ba5aacbccee0a643a8c713569a0e5de1449e726e7c813a93105c8dd145f1be6a7f78eec22bbb5c5a8aba31f15cffdbe5
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5941591 BLAKE2B 45a4c150e1403fd5a579c3d452cd09f4954238fff18702c5cafc1b23f12134f07a05c1aa9277b76b5d8c4e1da48d64699a2540feb4000b6bd1c285ab59b6c4a1 SHA512 3a69284917e0c233ac27fd96707b43499a5d9e05da946cad21f89fd605d34483454703887efc1049abeeb1d503800061027794d277123ad874583074203ce3a0
-DIST pypy-bin-7.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 13183739 BLAKE2B 41e95be3e48f0b53425ce9777b7bdb998dfbccb054c369cfab9b15f3835649d1520ed6ff6bb746feb96517b608b711678e3efe2cb8b70012c29347cfcbeb144f SHA512 974b438233bb9fbc3d3b9979a4f7591ae9e6b5a36795cd9a86c2a9b45e2288aa478811433b62696e33aaa4f8c9d3579b909554a4bb0a2b53975d01357fdb0b58
-DIST pypy-bin-7.0.0-amd64+bzip2+jit+ncurses.tar.lz 13129901 BLAKE2B 9966e298e25d3a40c78f5d729c61e57c82423dda7415b692179131289bfc64506dc347586b7ef0da3a134398671657d89281e35c217d422a343505492dee0081 SHA512 0c00195abe6481ace527bb0653f6f0df1e3b431246948f76d608dc5ea606a1f7ec9bfc014dff8070047c607648575d29356e44b1768c8fb7d07b50be4feded04
-DIST pypy-bin-7.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7650838 BLAKE2B cded65d6d3791f36f8bb61909555bc85110cbb2550336b2366444217d55ed6c615bbd58d0797048e940bd67dd049df063207bd46858e69c7f1ac70dd6c6eedff SHA512 db2d2aff65662dd1cfa2cf42d9bd588f6d7c6f031608931807435c31b4c2b53277e56b517157e8234b386eab2299c51828980817e3d730d946288571f11ea733
-DIST pypy-bin-7.0.0-amd64+bzip2+ncurses.tar.lz 7652033 BLAKE2B c2a8d54ae2ea6c727ee686d5c2e6b612c940c61ea335596ed8fee0397396a0d7a4344e4e03ebc4f3c50fdf311ea6932b93b7422ad2147c5ea6ec8ac1ff8b7271 SHA512 fc39e427fb1b73136d8786d9f594fa355e8d93cebf01a4f5b319e0506b9d6843ef2332086eca569ff694bfb64a9808eb65c727e96b9c7d998f28cddb35717dda
-DIST pypy-bin-7.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 9985530 BLAKE2B da9155481b466ad6f3b28764c01c49fa397a728ec6646727038cccb84fdaac9a5808ed73aecebad7d8e1b436932554e5f65e1078547b96dc82c6e6cc1f4b44b8 SHA512 2c378a47473152e464e2f497f959c1f0bad9f5237d18e83969643e267123d1819c2a551892279800b0b810d6ebea6b0e769f9ee6f2077bee5e92dc3c2c80df3e
-DIST pypy-bin-7.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9981851 BLAKE2B 75d89b10e9220c2f8b507529404849d24a88678c0884ce1c8c0254306165c5a6782c4a6efef63228e813a4f42103d7ef33a514dda8726e4ff72c3ff1fbf5f127 SHA512 e09f4f1d7c4e12735d2a4529dc603bcef43c76e97ee6ad7b4505675c7fcdc2bdb3d6550f45b8b731dd7c4f0813ad25a0c503084b4822c44d45e1c6e9aac23171
-DIST pypy-bin-7.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6050854 BLAKE2B a8fb831c82f7056d30b5ad2c7829be82e282008a5840ba32edea97394819845281825ec88885daafc0097bf11e572ea6021249ca424f00d6133ed274b3fc990f SHA512 3fe84c10c7f8e5775137d154dea45aefd2b101acd10da38f70935fd4cd69000d64656a96f1452c76537dd7297ca45fcfdc5be2b383fd7fdd3ce0d4848c6d0a81
-DIST pypy-bin-7.0.0-x86+bzip2+libressl+ncurses.tar.lz 6010259 BLAKE2B e841ff1809424a06b018d8ca219aa57d6bc0942e2bfdae545bed548efbca0d19e84365d5e9d0fd3324904d9ed8c5e50bee5b87ffa9742af7d23af84abd11ce82 SHA512 1f736593a1ae0c49e6929498a655bf778a826cb104908356c1ce13298c36fbdb55d4a8de0e39571d74d9ff3757815e81249b301983d6d3efa8cdd21497781603
-DIST pypy-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz 6023604 BLAKE2B 07a218bffe485e6b39bea2f901a2de473ce7f6e334739bcc8d9fc9aff1e83cd2fd72aeb420a61464e69bfd9eb9468ae8401a597e8b8251bbdeae5b5644dc44ac SHA512 e74a868e6e12e266d75feeeddf4df700eeb84be70d6f259efa1a5effb0c9c0fe5d228c16f5015b2b993540f17e3b2f45644f6b1ba0356dfe71b778358983e2a8
-DIST pypy-bin-7.0.0-x86+bzip2+ncurses.tar.lz 6022022 BLAKE2B 26f7e87cdbafafe956e143bc5b6814ac9db2e1a3a53a5dc7c10ed436192645951e2a4966514081df94fb918b871a15b68afc55289e611fa04339591a81d3f90d SHA512 47a8d1ae2c3ba5caf7b0c08c37b01f7ef7dc3b2fd44ad2f61823305e02cdfac551080b80958bc1dfbe738fd5da960f43a37bec318e2805b8bdf90dac4dfab5b9
-DIST pypy-bin-7.1.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 13185942 BLAKE2B 74c7478c8869b12d78c0173494eebd563fc704ee79a2b2eccd177b714efe1e96025a198cdd916e6a18f7ddeb14c34737198a323c85b7715e9f53363ad64f784b SHA512 ab390b0b9edd4707c96eb68369c5c7d2de6c71dcc2f8f34bec0f9c9aec6b85106c81cd3cb101ba756dc369ac45f109a93e14bf4f5037bebf108577f7686a316f
-DIST pypy-bin-7.1.0-amd64+bzip2+jit+ncurses.tar.lz 13079893 BLAKE2B 6818a3282569ed3c3b0d462d5bc3003d4eae31dd811f863ec78b11c1ce6242da9a7c7af8c1b75b677d3b0fa0c4845a3bfb8a964dba21d1d050b5c25396168a52 SHA512 38a66d4143d4b9de0d735a1131f72bc259ba2128e4bad1786d56288bcc28da49df588d790514b29c9ea5a8cb45523a853690ff0637941fe47d7be1be96633e02
-DIST pypy-bin-7.1.0-amd64+bzip2+libressl+ncurses.tar.lz 7683507 BLAKE2B 1c7ab3cc128f40499740978cd2edd6c9dcb3a92df1c3dea398c4bb759afda15c04539c39b487875a70a7982eba91b55ba8966398a53d79f3c6b41dc7f09b303f SHA512 abf5e8d084d3270b1658564af5a5e786ef3dc5296b5379671dfbccd56d231d2b43da7482089b0877858d9e04c99f86e09db0b22c3735e4d7a2f44f62026d2a46
-DIST pypy-bin-7.1.0-amd64+bzip2+ncurses.tar.lz 7765738 BLAKE2B 3e535cc65a4bf3c61cdd7dd34dd4fc9ce731c762aa2d85aa5efed82f78bb69b55ba6f92e5cad83e8123c1fc60e0be43e9a86a8c429f45d435ed84c1610c726bb SHA512 31f103e95a8e8878dcdfdd0f5b8ec1546f866c2aee8dad4a3bb66e3bdf1a3933ad5c844b2a4453477c5e69a8a869962e2325dbbb5c23b529f7d57d27b99762a1
-DIST pypy-bin-7.1.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10015037 BLAKE2B 3dd9612f2329eca5816dfd08fd2a82cdfb0b8461cbcafb5abc0f270b8ef686bd69d87d240e0368e6a69681f369c99d350aac4fd300330b5c2038ad139b737585 SHA512 a593a3b3ba48f97ff531ac7d6539d7e52e56bbe3c766ff28e7380bf2661e6bd2282d588fe31765cbcd589254dd1c239da468487a846647919a8dc7c2aa03a998
-DIST pypy-bin-7.1.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9986329 BLAKE2B 19eba48891da80bc4922a6d3fcd8278091a045a4f8371b4bb1a787eec1cdd7668f8ca78039bfc2df4c2164dc3256b3c3ead5b342bbfc42491dd2ea7709e6fe71 SHA512 1a6c57b559458094ee1867cf9f4547004f31f928e340684145be9f598470bddaa7e0c94354fb3de8d51742ab666893437238ab0f81337ad6d137eddfe279e660
-DIST pypy-bin-7.1.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6093992 BLAKE2B e9cc966e4fe6a3c2d2cf4193abc0e3d8b81b5353e690ce3b11ff199cfc30c3e1dceda2d26d04cab1848a04e49c62c91912404d002624b94408e81ac667680d47 SHA512 0bbd040e7e9161209a056136a508bd3befa123f3086f165b0de05d404996fabda9fb0ba360be31bac2d80056e5b8d7081a9d47433ee5b1386a859c8b97aeb544
-DIST pypy-bin-7.1.0-x86+bzip2+libressl+ncurses.tar.lz 6090777 BLAKE2B bcb332825409a50c57d09ac67c21104a88c58b237b84ce4c31484c3b81afeb783dc140123773fe5702df41002eb44b403bf29dbda1c66a40ef9aa037d6ae6217 SHA512 3a65faf263085abb2f1652b58e6da1712dc8632f27944bdabec1d9ddcd21065babc30967942717d7ca179ce449f94175b0d03ca44179afaed55a32d11bb7e9d8
-DIST pypy-bin-7.1.0-x86+bzip2+ncurses+sse2.tar.lz 6093175 BLAKE2B 31a7e0b517370bb5f77372361205e5f24d8e129004af3430b3d2e3b2c58f455eb7fb2e88f86419d498724202349777189aea40cdf90eeec73b83a37a185aa653 SHA512 daeef87f64f5efd77e178fbdc6a85c0170db3d351c6951439c74ab3cef1641db8ab9266ac3d1e2b8e0a1efd2d2b1b90a1576ee21c069d8fe62fb1274ed49ed24
-DIST pypy-bin-7.1.0-x86+bzip2+ncurses.tar.lz 6089713 BLAKE2B 8e733f4bf527fc5ecff06907d96dc8a8462b3f92cf5e328e8e232f54e7ad26303fc38b127d481ad70dccd406ef0b752619899ba45b18b3e1ad9ed692e6529a18 SHA512 b8b66a23c8b03b2840d721291b7ac39a9a0617acc7e54e3da35a930a37f8f64b95eb784c0a010513575972ad7477751966360dc0de10659f4b481d9ed275dafd
 DIST pypy-bin-7.1.1-amd64+bzip2+jit+libressl+ncurses.tar.lz 13220880 BLAKE2B d4b45f757069405f5641ed9b70ce8e94970b1a67c9ee2865fe4250c4c85b8dd44268c5e3aeb7c852fbb8822df4c0326d4d9fc5f77cc8db1dfa4eda749b6c1122 SHA512 b8d4b35ce8b1119fef4dc624cd28c71afdb13669e9c44f380440cd6275156f7f2a1ce240a855038bc82638152f69d1f27191d4937c23052e0a9b0ca4a4efa215
 DIST pypy-bin-7.1.1-amd64+bzip2+jit+ncurses.tar.lz 13081888 BLAKE2B f693f6148eae1583d4fcfcffa48cdf2317d99d4839ecc9e592868285f789e74a88b5aad1c842dd22e8c4b3c43a897fedd2ad95076105e95bf8cab53a27cb8308 SHA512 db4ac8050597da6a727b7cb4ee9549697796a1452b786888c9e9fb5cdd218817edcf4b3b6317a39716b589df140d831539185b6120eb516f80f472e8d7acd0b4
 DIST pypy-bin-7.1.1-amd64+bzip2+libressl+ncurses.tar.lz 7737448 BLAKE2B 02c5aa5227bc6d2fc4087b4767c63737378d90f222a7402b20fee166f36c636fae35855dbf1df9c63984df5624c6ec052e1ec598ca4eb367a6ffccec7c397952 SHA512 ab2b274b3aadf04d55dbc9e4df5ca59ea97ec7df4dd1f8bb24feee4d46d7c02d9c72d55fad784d7412382e0803f172e871f01f82deba2cc5155b97e5139602e9
@@ -57,16 +11,7 @@ DIST pypy-bin-7.1.1-x86+bzip2+libressl+ncurses+sse2.tar.lz 6092434 BLAKE2B 71141
 DIST pypy-bin-7.1.1-x86+bzip2+libressl+ncurses.tar.lz 6060032 BLAKE2B 660d834c3a76ed699170b7c13d36f6dc00df3b4811a09c5dec161af7f9b0416c7fda461ca04481ad656bea39b6ed25f5220b8d38c8ec02c9634a025e3b3d6cfc SHA512 21baa8cd6bd255a335c67a1197ccef856553987740f517e1b33c27758e57b61c22b8274419b445a257ad32511d3c07901d4550151047e04adcd39c9cbf20058e
 DIST pypy-bin-7.1.1-x86+bzip2+ncurses+sse2.tar.lz 6091202 BLAKE2B c173cf6890143e27677e6d6ee68b2a1f55ec97897817622559c25f2f49ca5bbb5a0a2c32785a3356a6bb8f4899ff19164e550fd2762003ee018faadf80227c95 SHA512 a630e380177da78daef288e69f15a4cb333c4ef1ab2da8b4b6cf76ec139c1961d692873c7ec119e54f596ef4e1435a6c6b3ef933edca2b0b5cd6fc24963d3b0d
 DIST pypy-bin-7.1.1-x86+bzip2+ncurses.tar.lz 6088838 BLAKE2B 555bca61d4693b3e5d3c8344bac3781cfe06acc4a50bcd74add2d122c68f177258ef438a7801ca4633a006e8a001500110287934f232ceb52789f3cc72b9b34b SHA512 0748e14e903b0863bb2a067b558826f47cad2063c31c935b84249eee2a9cf96cfa36a5d5ef92f0facca61356499f4b9cfee6496a6cc3228bae7729e50edf6be0
-DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
-DIST pypy2.7-v7.0.0-src.tar.bz2 19811330 BLAKE2B 38089896934d79d2b3f5813cc9dae23b0534d9d312871b22336a277d5a15b82d748f66f896558cfdb45a23004944a648436e89ae36fadc107930e7b99963e12b SHA512 7fb5682ee4226af51008f50a81c922e44c231410fe36b7656efa20f22c855ba30a01bc96ee897b4c7a02941d37a405c922b09855977313878e34aaad6bf023dc
-DIST pypy2.7-v7.1.0-src.tar.bz2 20032490 BLAKE2B e916d63d7915959c87830509630d8b2ab993d012d314e88c7cc84bed4c595957c3fc575f7b57fac7c24aaf1492797ca43b146e457357b6e73d9772724461de66 SHA512 fa7c1a6669686dbd9c0da627dc2a06ad696f20274218af9602f91d73f3ebe0ede380c6e1a50534f53dee8f075eaef5a403c7c5b5bdbfff25e679ba30522391bb
 DIST pypy2.7-v7.1.1-src.tar.bz2 20027876 BLAKE2B a411d7312ed3b9be9297e7ff4cc569530529272156117ca037bbe29ad477e7ce3b8903d13c6a5a35e9867a8ccbfaa418061a7b37317b4b713508c429a41ffe9a SHA512 f998931ecf4f9aeee24f0fed95589716175971816c00e50bc53de6de0cfe2a8537b89c1aee636d15faecf91df8c29943295485686185f5247a3e0913fa514f48
-DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
-EBUILD pypy-bin-6.0.0-r100.ebuild 6329 BLAKE2B c2533c30797562a60c8db615279cbf110c3b7756a8ea772da095936fd6125da948d4fe625fb9edccd5c255610287b09280059d3b3c5a324de6030f4dab1b0dab SHA512 644af55ab278e7b4d5441f5dc8adc1b0b91e9b5a901aa32c2eb0979ad290ea5164844e78bb073aa303d9c90847352f158aa9b53da6fac7e39fefbebb79a84356
-EBUILD pypy-bin-6.0.0-r200.ebuild 6493 BLAKE2B 2b6bbfd1ec9f0828ef30765a6e8b1c5f3ac59a296f1b3174136ba74b3010a1727a5032f9ab27d282e453dbdfa9ff8d377d26f7248a1e1b6204dcce43538a58ee SHA512 69d360de30278f0d4048ccd66c604b005a1174b8d46d98c5ebc6782cdc5cc65ece9ee913046230e58ed85f9433a8fd6a8c152f30190bd40f85bf7c3339e25cc6
-EBUILD pypy-bin-6.0.0.ebuild 6277 BLAKE2B 87ff3104c49ddaa0ecdfe85433ab8e258de55487f025dfd849dc48cd6885e4d3365b398a6ec22fa53a71830fbc206bd87270233f355cf903600acd7a0cd0c8e0 SHA512 2158d69a46abb87bea0f7f006ee6ce6a681bada8ca532042416a5d1797e241293988d5070ada0f6cac02ffa822a08397aded11e8009d7c56ef8e7cb9cf4c0bc1
-EBUILD pypy-bin-7.0.0-r1.ebuild 6282 BLAKE2B 0f476e3f5011de66e0b783c0d0af329940e5874dedbf2fbc278f1ba580dfd1bfe3a590b0b25f26c9df4ff94fb98a58b8dd0fba9cfce052c3cb1f863f089d328a SHA512 e5642c50817bb249bac279e40ed195eba6f3def312a334256b3ad7a02e9d35fdcc410f05492d5c9479b23a572f6bfbb19985e963fd4499e209debe2155e29d51
-EBUILD pypy-bin-7.1.0.ebuild 6282 BLAKE2B 0f476e3f5011de66e0b783c0d0af329940e5874dedbf2fbc278f1ba580dfd1bfe3a590b0b25f26c9df4ff94fb98a58b8dd0fba9cfce052c3cb1f863f089d328a SHA512 e5642c50817bb249bac279e40ed195eba6f3def312a334256b3ad7a02e9d35fdcc410f05492d5c9479b23a572f6bfbb19985e963fd4499e209debe2155e29d51
 EBUILD pypy-bin-7.1.1.ebuild 6282 BLAKE2B 0f476e3f5011de66e0b783c0d0af329940e5874dedbf2fbc278f1ba580dfd1bfe3a590b0b25f26c9df4ff94fb98a58b8dd0fba9cfce052c3cb1f863f089d328a SHA512 e5642c50817bb249bac279e40ed195eba6f3def312a334256b3ad7a02e9d35fdcc410f05492d5c9479b23a572f6bfbb19985e963fd4499e209debe2155e29d51
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch b/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch
deleted file mode 100644
index 4d394f9340df..000000000000
--- a/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
----
- lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
-index fc43951..fed5218 100644
---- a/lib-python/2.7/distutils/command/install.py
-+++ b/lib-python/2.7/distutils/command/install.py
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -476,7 +483,11 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.6.3
-
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
deleted file mode 100644
index 66d1c991e75a..000000000000
--- a/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils python-utils-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7"
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.ffi7.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.ffi7.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/0[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild
deleted file mode 100644
index b36272792bac..000000000000
--- a/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils python-utils-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7.ossl11"
-BINHOST_LIBRESSL="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7"
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.ossl11.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.ossl11.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST_LIBRESSL}/${P}-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz )
-			!jit? ( ${BINHOST_LIBRESSL}/${P}-amd64+bzip2+libressl+ncurses.ffi7.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.ossl11.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.ossl11.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.ossl11.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz )
-				!jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+libressl+ncurses.ffi7.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild
deleted file mode 100644
index 2330fd7634d4..000000000000
--- a/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils python-utils-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/0
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/0[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild b/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild
deleted file mode 100644
index 53daf3ce27be..000000000000
--- a/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c
-	usr/lib/pypy2.7/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild
deleted file mode 100644
index 53daf3ce27be..000000000000
--- a/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c
-	usr/lib/pypy2.7/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index d7aec4d28171..4ae219960ca0 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,17 +1,9 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
-AUX 4.0.0-gentoo-path.patch 1915 BLAKE2B edc8656d4bed771124c22d45e130aa7ef812ae7a4829091216222fa80371cb7a4100850f366e5065b565f27542bb7e4e599d06cca6bdfa2bf189905e2c498ddf SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
 AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
-DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
-DIST pypy2.7-v7.0.0-src.tar.bz2 19811330 BLAKE2B 38089896934d79d2b3f5813cc9dae23b0534d9d312871b22336a277d5a15b82d748f66f896558cfdb45a23004944a648436e89ae36fadc107930e7b99963e12b SHA512 7fb5682ee4226af51008f50a81c922e44c231410fe36b7656efa20f22c855ba30a01bc96ee897b4c7a02941d37a405c922b09855977313878e34aaad6bf023dc
-DIST pypy2.7-v7.1.0-src.tar.bz2 20032490 BLAKE2B e916d63d7915959c87830509630d8b2ab993d012d314e88c7cc84bed4c595957c3fc575f7b57fac7c24aaf1492797ca43b146e457357b6e73d9772724461de66 SHA512 fa7c1a6669686dbd9c0da627dc2a06ad696f20274218af9602f91d73f3ebe0ede380c6e1a50534f53dee8f075eaef5a403c7c5b5bdbfff25e679ba30522391bb
 DIST pypy2.7-v7.1.1-src.tar.bz2 20027876 BLAKE2B a411d7312ed3b9be9297e7ff4cc569530529272156117ca037bbe29ad477e7ce3b8903d13c6a5a35e9867a8ccbfaa418061a7b37317b4b713508c429a41ffe9a SHA512 f998931ecf4f9aeee24f0fed95589716175971816c00e50bc53de6de0cfe2a8537b89c1aee636d15faecf91df8c29943295485686185f5247a3e0913fa514f48
-DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
-EBUILD pypy-6.0.0.ebuild 8186 BLAKE2B 5f77473fd6044bdf93b23420c3905e55d6b225c63124fac1815563580ba495cd7dc1dee9b402564f541bdf0a2318ccf306219a9b3ced13103bfa729193456e16 SHA512 c99870cbacaa963c3d94ddeb22c2da64c552e3de7d7603205df53c6eccebafbed89a4adfcaa1b2c7a509a7e5a6011ac7435b840690f2a4a1f91782c247a07ccb
-EBUILD pypy-7.0.0-r1.ebuild 8171 BLAKE2B c9e84ac1b80219632d68e0f43fda967f29ca0a737810baca1f112acccb4f92e8977fe2a34717c45cfb89b38cb8bcaa026a9b611a428e873fe850d8603c312e0e SHA512 815c3aa66c6a84506f1226f075e4b28b3278816ed3b818aaa507b63a446daabb67b7ef011715d6b72fe35732b78b6eb5d366ceb334e95160dd4d31e31d3c9312
-EBUILD pypy-7.1.0.ebuild 8171 BLAKE2B c9e84ac1b80219632d68e0f43fda967f29ca0a737810baca1f112acccb4f92e8977fe2a34717c45cfb89b38cb8bcaa026a9b611a428e873fe850d8603c312e0e SHA512 815c3aa66c6a84506f1226f075e4b28b3278816ed3b818aaa507b63a446daabb67b7ef011715d6b72fe35732b78b6eb5d366ceb334e95160dd4d31e31d3c9312
 EBUILD pypy-7.1.1.ebuild 8171 BLAKE2B c9e84ac1b80219632d68e0f43fda967f29ca0a737810baca1f112acccb4f92e8977fe2a34717c45cfb89b38cb8bcaa026a9b611a428e873fe850d8603c312e0e SHA512 815c3aa66c6a84506f1226f075e4b28b3278816ed3b818aaa507b63a446daabb67b7ef011715d6b72fe35732b78b6eb5d366ceb334e95160dd4d31e31d3c9312
 EBUILD pypy-9999.ebuild 8181 BLAKE2B 65fa3643a8875871015f6878898cbe57c9f2f1f7568140ea74fa6b28dfac8bb07939ce50d22e623b43f43a9d1aadcc28a586f8a6b1ad21488d3b72405566724c SHA512 bb089f9837f9b2e4a0cc501c337f7b837a5900d4aee414a83c9b0cff027c8190ec7ba22d344c98cdc17f22e20831bec40299b811ed1240e0833a8fefcb91c1a1
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy/files/4.0.0-gentoo-path.patch b/dev-python/pypy/files/4.0.0-gentoo-path.patch
deleted file mode 100644
index 4d394f9340df..000000000000
--- a/dev-python/pypy/files/4.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
----
- lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
-index fc43951..fed5218 100644
---- a/lib-python/2.7/distutils/command/install.py
-+++ b/lib-python/2.7/distutils/command/install.py
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -476,7 +483,11 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.6.3
-
diff --git a/dev-python/pypy/pypy-6.0.0.ebuild b/dev-python/pypy/pypy-6.0.0.ebuild
deleted file mode 100644
index 3f036775348f..000000000000
--- a/dev-python/pypy/pypy-6.0.0.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-python/pypy-bin
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy/pypy-7.0.0-r1.ebuild b/dev-python/pypy/pypy-7.0.0-r1.ebuild
deleted file mode 100644
index 7a956b9f4a0d..000000000000
--- a/dev-python/pypy/pypy-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-python/pypy-bin
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy/pypy-7.1.0.ebuild b/dev-python/pypy/pypy-7.1.0.ebuild
deleted file mode 100644
index 7a956b9f4a0d..000000000000
--- a/dev-python/pypy/pypy-7.1.0.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-python/pypy-bin
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 9e3431c8613c..7e82c91b987a 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -1,41 +1,12 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
-AUX 4.0.0-gentoo-path.patch 1906 BLAKE2B 0f09d41b6f2b26881e5f69059877d9c555a4adafe47a5b2fb269b32d7b0978b996bb1aeee9d1ddcf7dd2097a494317851408c6c9bc56a829a77126376f5c7853 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747
-AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909bf4f73514ef1e9034f5a15cde7756f30fe6c4337f5c0fd254c1869758c798b9c450cd3044cca768ab8f654b19dc6c73ae SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3
 AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B 060cdfaea2c4b0e607b7f9548a161e0df8d741d8a70ece28eeccc646aaf659b8ae6f425089380b908a588e2a0ca2ed521995ef3f3aa3bfeb58ecfb0083b3584b SHA512 e67c0bb96d3c66ceecdc11a3984dbeb65a4473020ee2d4e5b093fe987f1540dd7a5cc6982be6303e7e8c49a53e02883277597d00342312a0f8144a84ff132bae
 AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
-DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz 10697120 BLAKE2B 3e368d0fb6b875472d79b531bef926bedddf73c1f2bb25e00f56cd41c4349be119281d2c2d52239bd2769f3f9810280f8c00d9332e02b8664e46de06f2c112d8 SHA512 2e9c405212d35289a8add374cae185bf9096a46604c4e2935f1a58bee51aa756b311e5b611098e917da7fbd10194706fca809249f627b7d4b8c628bf9b38aa54
-DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 10674209 BLAKE2B f9e00ba0cdc113ebe156212c5497e122a45bc9544cb242ad02273e06210eb691f930aee7faf1d4ed3a7b14080905a9cb6d30b309c38a2c3795f2183750b4469f SHA512 52e615e2b51a43a2c91f9a2a8f0cec16a6090bfd230ef08dda462bb530da9ee66acec9c449e77f299e0b3363d6bcbc7150b14e7adbe9862d36f4738dfc6be1ca
-DIST pypy3-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz 6710567 BLAKE2B 239badab3e3f4cb17116f2d2b3cbf58f7a481bdbc78d813563f5a7c2c67002cce598de70ebdbdd8d5dc348ec5db07559a2f35e712ebe46d1f472f2b2ccb9fa05 SHA512 ae3e76c2df50a2ec39e8f447fcacf913a1e9a3cf1268324ddc303b35e8a7a07413278e313e92579c311238ec185cb61d3d97fcbf6e972846859dc423792f55f0
-DIST pypy3-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 6703329 BLAKE2B 64ad2b2ae1580833735dc5ce4b821f79458c98c5f761d7c9834624aff172204ac16e23582e3a776baa85accd221a9fd2225c22099de1de9c319b4f29b5f15071 SHA512 57b2e2f0ddc8d6f78beff6c049adb0a8d316db1d9f7bf5e07e4e593fa363e5ced37d212f549c0a5305459207694ac5a6aac9698a1ca3a4bf56a4437899b7e97b
-DIST pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz 8253376 BLAKE2B 6ea95d691a5ccbb89bfd5f9351199f3d3cd4cb855d44937db58ac6327b80b71ed5d15f5dcbdc961ccf5ea1fa945ba31917716a3b9ff79327f4db3a99961569c2 SHA512 e68722eb0004680df884ff98bda906e94a5252c4e6b3ca55fe2df48a5a18d9dccc0218906c6b71a579a7a97da3a4633bb42317a276ee2640a16a9d31c1939f8e
-DIST pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8268406 BLAKE2B 8200d7cfc5bd813cf3138017c96cace1c07bc031f68d5a9df2f71cb887a5dd3bb979dbc67d395389c965904037935a518bf6c1492b04ce5a9f21a9bb3bb5504a SHA512 4c09c454b25faa51024c5319ba5e91f4b1883bdd25f504694f83011ef1faffe7aa28a51369d3c5c6bb9f0d8eb53d1292d57608343b731c67ceeb99f41736b044
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz 5384351 BLAKE2B 952676b1ec9c71b5ec477011ec4c5020512508f7c40009d8715972726469319bccb30546105dd68be22a02572f6646f06057495442da12d889ac9695a1b14537 SHA512 c4b4289b9348ad35f79f0581e2d3a8cf1109a3edfb52cccf8e04a0089c706ae12de819d901f875bff3a439680694a98c85605c1b9abfd7fd4ff825846c2c89e3
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5363942 BLAKE2B d53b89ef73c2d4ee2bc00360a0c4a791fd8b6ac2d28dfeeb7510a465e6302f79c378aacebbaf4993b6ee55dbc6d85876149fe3f5a0d689713f029c928d93a729 SHA512 ce72d84200dd275841e691810dbf402423883b282cacbe8bbdae9285936869d40b3d43d053b0f3d4904c7ced72f35480d1780358180a1c98e8111852fef1f77f
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz 5384380 BLAKE2B 7e452d0b163f401d0741e95aa2f55e84eb223eb3152f0299b365d1dd53268d315496977d988149c29e0e3439834d7283bfa9a9e05f2d7a8abb3f3d65aa05e567 SHA512 d743c4275abfbce1ef1ae2949e93097faeca8377e38761183ff7d0cc23b92d93700bf370d1511c968743e769a0b41acfeae01543885cc55bef8cdd2c6817af0f
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5366917 BLAKE2B 338a9c221048dabc548250edec05256be64dd5d1aeb5b2fff839d7d5e8dda29e7d4e0a03b1fc0c9cd418685c558bb47598c625e2d28cd4caabc45e21eee9f4f8 SHA512 5274535d01564a9087aea486320921c8784cabcc7bde3634c27b9006988fdc745e6e5e5c2fb8e7b0318fd5ca6fda3fce208743cfa079a7474ea44277237ea873
-DIST pypy3-bin-7.0.0-amd64+bzip2+jit+ncurses.tar.lz 11042296 BLAKE2B 3717c92b3e3a0239c3089cc86434db42725f7e42891fcf5c46f7234aca09a6c693ce662a8bedda4e5a9f646f3266ebd16f25668068d6c1d9df30b6696627ec42 SHA512 5108388bd322c5af4e3d411a4c59a4d8b8b4a75e4ad1e53e90ddd9f76f64868b2c31210d8ac5b0d8222402441ca58c781264742e74e5ff872189ed6c24c2707f
-DIST pypy3-bin-7.0.0-amd64+bzip2+ncurses.tar.lz 6873174 BLAKE2B 6ed19040d3af0dfd6614441e6fb838328b687c44415e1444f27e74f3db4bd3eeb7c077f0cc95cafcacffaabd396d68f6ff481fdfa44f9e6b26f83f1e61e99e30 SHA512 dbdd3e6a21b4553060804eef1036698324743e5eeb4b9e2933785f93871a750ae98daf5a1ef7061238d6161a6df8d18c590b88dcd0ea97ae4ab742aa4df7dbd3
-DIST pypy3-bin-7.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8484244 BLAKE2B d23b84aa9f045e46c2461a4d26383e4fcd0c33283f54e11d0693faafec2d3792039534c9a93b418cb78f3e4d45b98f1377cd0555a20ccb2fdce5b9b2e17a133d SHA512 4c90ee87585a448466883aa47ebd4a3f92438d54fceb6cf752fd638746f1c0f2ab7a3145b310555ab19ba53838352523e981485904c4092bc457c7002931ab59
-DIST pypy3-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz 5529689 BLAKE2B 038ad3c9132d430268dad3ae7b1c2b6ca507743f3b2f7a3aef8b7aaa580b070287767878d2b528297c152ecd0a440aaa6a47e32f7aa5400bfda2703302c583fe SHA512 8932dbdf49f7a227e9108bcfd0e7136cd1287b036eee7665bf16868a0e322ca841eb6daa6a18b8a57e4184b8878abd20de9616f90845c0dc76d5382f7f53f3a3
-DIST pypy3-bin-7.0.0-x86+bzip2+ncurses.tar.lz 5537714 BLAKE2B 49cdf63c1f94899ec4642d395dbf8ae6fe44fe9fc46e7f64b31e30d20f9e1dcc5d40b511d582f6c902724f5629e7b3b8e1090d76a3bb1a789b32b1c29b533e87 SHA512 42c8afa8fea5474d5b2c7c7192b2a79d8a3eb8d832038aad68edb011c056d6efb3903e67084f423ff167b1757804a5d796fddfa6f6f077966c855a1e56eba9cc
-DIST pypy3-bin-7.1.0-amd64+bzip2+jit+ncurses.tar.lz 11031092 BLAKE2B 9e9b530ff356aeeadd9da18853ece9f7e292412db427e70e4d93e58c57523a36594131b9d5185ca5f00e19da2b4843e7fa1fc79ec6ca2cfb94abd8360775486c SHA512 b002c6018335481e6960fbfbf75fdefcb45093687491b591e9db2ef870201b33ed33294a4cc975128aae8d8df4d186309c748c620255337b688d21683b653861
-DIST pypy3-bin-7.1.0-amd64+bzip2+ncurses.tar.lz 6917379 BLAKE2B 1be91d0001a09574e970c53cfb156f04b84149d6fb4f78e7713d26a44edf03cf3c4556900343d36e59edd2e273c1e626faff443ab097481c54d6e3dc353867b1 SHA512 dcfc9cc25df65bb477bc0e62f2b3dd5c723d928b2b3a7ac96e6583cbba25162681f736eef13ba3fee637f27326015e32832a2e7f021051c294efb4c7d26d0fca
-DIST pypy3-bin-7.1.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8510623 BLAKE2B 91bbe4286d82d90d05c3a4280c285bfccee3ae8661cf974554ef8c96f3806f95187cae1767340cc1e17f65c37f380dc9a4636cf3388a3c4bd2664ea4d61b63b8 SHA512 f5aa0efc4cbff57c0eb49504a46aac8b03bf298e5b996dd2264d923fe514543736df2f856d841b15a4386cd84809051ce6b29840c47fc32cdf7482d53d52b755
-DIST pypy3-bin-7.1.0-x86+bzip2+ncurses+sse2.tar.lz 5546135 BLAKE2B 7ce2fe3c8b662d808ec63c96fe7ba42b78210d5cd1828050b139616d577feb41cca65c79c291d376b3f53d54feb157894700fda705d067fd536af3bb0a4e9d72 SHA512 87fd9091e30a60f034d96cefa3a192801ab5c8ebf76d8e13741cf5f18317b4751e619b1b1e9ddf9098767526c119761208885744c08a4ce131915f3758e198d0
-DIST pypy3-bin-7.1.0-x86+bzip2+ncurses.tar.lz 5540259 BLAKE2B dcd4e666c66d5bb711e5b95431fafe19a81a8b8458af2fdfe1f2272ff05214f9687b9f88d8b58ef6b05272252db4b308b32cfe4778e0f224825bcca9609313ed SHA512 8a9f681b998189b6871d85fbef00289b5c258ec67805fc2bf3179fa4650655051c33b7715845dde8e93c5ce9884a36cb1501f653804328e4104099ddcdd1763d
 DIST pypy3-bin-7.1.1-amd64+bzip2+jit+ncurses.tar.lz 11031375 BLAKE2B e01ac298d3c8ed06742429b36739223fd0dbf87a9df4d302349401aeda06dbaf5cd8b972ebe997a1e4130a378d63ab69ed25b3ded4b9608db5d59fbaef8d04f6 SHA512 e5ccf27683dc81a683df52f04092167774f3a9c9dd3a38347dc9d5cec181148885ed342165b16689d44533511cb58bfcfa397a5e51869649086fa362a3bebc98
 DIST pypy3-bin-7.1.1-amd64+bzip2+ncurses.tar.lz 6915836 BLAKE2B 0f3f2210e7f6e73872d32b2c01a911b52ad2a8c8987034709d9e4c72cfe11e422eea7b6522b19b3717876307d9fbbfbdfcc008dc2e3771dea083eeb61c202e6e SHA512 7fe6a19f56d7cdc142b368154e17af8936b8b730102c4a1c8a6b756a13b643d1375a51f45a0a3d345f7a8a23b75a81d35a6aa810129d231bf2091e156f69a914
 DIST pypy3-bin-7.1.1-x86+bzip2+jit+ncurses+sse2.tar.lz 8540485 BLAKE2B a7de0db24e4bc56d54cbc03d618f8e08932e23a1fe5a1ab227600c244e222a6dae723c72fbd5cdd059c3e3f52bd355c4c9ee18506f6b39961bd1473358d35bd3 SHA512 f3355109bc073e220a33e8763c2d2ccf152d223d3850bb85aac71c19170ce4b118a84f258a829c486209f3c3014264384b158de17c9a0156c24afcf5b130a8e0
 DIST pypy3-bin-7.1.1-x86+bzip2+ncurses+sse2.tar.lz 5523574 BLAKE2B 44f760842b0f232f7f5fb7a2fe3f60ff1f832dec3b0c16d1fd27ab36d09c12d6be8aa6727a880c3400506ea415317ddfb982439c1a581a03909099eeb6ea8cf6 SHA512 df664a7afa5bdd329d19046c81e362782c4f9358add2b7e54100df10a23434b9a341ec504ac1d49b2b017917937ab23ffd3cf723f86b65d7080789f795f5a4d3
 DIST pypy3-bin-7.1.1-x86+bzip2+ncurses.tar.lz 5545191 BLAKE2B 2afc40968977cd6956cb305a829811640e8437f0a811435a20ec694181286c94c820fd4148e3b6323a014ff391400d5265a7c1ee8b918c3db91ac02b44f3d585 SHA512 a1dad750491c5f524217986817a046c5c7a97b2b250a1d24b6a077d2d8067e249966cd331a5336fa2960a3d317c1aa83196c3e3b2f4a0734d79fe43cd9b55032
-DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
-DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3 SHA512 3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2
-DIST pypy3.6-v7.1.0-src.tar.bz2 23167216 BLAKE2B 12a085c2d4820289643818d8bc1c17304e4cf4f4687054452d878c6f26fd36802bbbe5baee73f0ce2f0322e126dbccbcf7b48ca6569bb7eb8d59f473bd80d4b1 SHA512 1a0a9e9de31c63114c0537747c4a718504a28b780a2ef1f76bff6051a1ec68b496b574989f0b729c07611cd81e199135dd268834dfa6f9664e1e119db8ae20e4
 DIST pypy3.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473
-EBUILD pypy3-bin-6.0.0-r100.ebuild 5574 BLAKE2B 8cfade201d213feccfd71ba3ea86afe43c7a659a9fc3a2fab7f584f5e05052a4bf07ba8539484bf135daa96623a816ec704420aa305fafcf803655ef07eaa425 SHA512 7b5fb47a68cf3b9c64ae0cc6ae5309b671dea4d8fce026c16240652d0778ebe0bc76f2fce34686c0a29f9c91f8b3e6aa9c5a864b4d9273a864fbf98805a45894
-EBUILD pypy3-bin-6.0.0.ebuild 5547 BLAKE2B 27f7df0cb40c23e17bf1bca4d350f42fd5583a4c034cf79b8b6e213137089f1254c38f90a81976a194ca908c9046219646b4326a4bd1acfdaabfd67b275cd215 SHA512 23523b49c740d09b4e871e8ecfbf72e40a929be0500153398aadaaf8b17ee9ef92f3d03e8b3ef7d189ad2c377e4ef03dadc4d68716fe36e797c0f360a19962e8
-EBUILD pypy3-bin-7.0.0-r1.ebuild 5486 BLAKE2B 4536a0fbf064472be4a1ee651f38ccc47fd027aad1e941cbaeef67abb88526646f463b025179825ea719247be07be2370d5658d9f05b5fb2a46ce6066d99e47b SHA512 d0baa35e4a58c89a0309c099edc3a6ccd60b52c263fe9016534fefdffedb1c0acdaaf63d7f0f9d155d8989273576c8a74ce7455661105cb80d915047f8a15475
-EBUILD pypy3-bin-7.1.0.ebuild 5723 BLAKE2B 5b65d80f0bae857db38ac6ba36f55fdece5c8f833504f4ef896b012434d5469a4228b4b790c4735ecaf66c6d0c733db6321f75814d3dff230bc614241588225a SHA512 d70f254db7483b55ff7addc62bda682cc0b4ddfb526b3bc93442100e2109d028fd0355eff759899b7b9fd3a8aad6ac3b475d23bfbfd68cf98d8aff09f29c719b
 EBUILD pypy3-bin-7.1.1.ebuild 5723 BLAKE2B 5b65d80f0bae857db38ac6ba36f55fdece5c8f833504f4ef896b012434d5469a4228b4b790c4735ecaf66c6d0c733db6321f75814d3dff230bc614241588225a SHA512 d70f254db7483b55ff7addc62bda682cc0b4ddfb526b3bc93442100e2109d028fd0355eff759899b7b9fd3a8aad6ac3b475d23bfbfd68cf98d8aff09f29c719b
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch b/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch
deleted file mode 100644
index cf96d3fb2a53..000000000000
--- a/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
----
- lib-python/3/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
-index fc43951..fed5218 100644
---- a/lib-python/3/distutils/command/install.py
-+++ b/lib-python/3/distutils/command/install.py
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -476,7 +483,11 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy3'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.6.3
-
diff --git a/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch
deleted file mode 100644
index 5d89ce2711cc..000000000000
--- a/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 17:42:33 +0200
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
-
-https://bugs.python.org/issue1222585
----
- _osx_support.py                | 10 +++---
- distutils/cygwinccompiler.py   | 21 +++++++++--
- distutils/sysconfig_cpython.py | 25 ++++++++++---
- distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
- distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
- 5 files changed, 100 insertions(+), 45 deletions(-)
-
-diff --git a/_osx_support.py b/_osx_support.py
-index 13fcd8b..0525be1 100644
---- a/_osx_support.py
-+++ b/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # configuration variables that may contain universal build flags,
- # like "-arch" or "-isdkroot", that may need customization for
- # the user environment
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
--                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
--                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
--                            'PY_CORE_CFLAGS')
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
-+                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
-+                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
- 
- # configuration variables that may contain compiler calls
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
- 
- # prefix added to original configuration variable names
- _INITPRE = '_OSX_SUPPORT_INITIAL_'
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
-index c879646..a6157fb 100644
---- a/distutils/cygwinccompiler.py
-+++ b/distutils/cygwinccompiler.py
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 raise CompileError(msg)
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError as msg:
-                 raise CompileError(msg)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc -O -Wall',
-                              compiler_so='gcc -mdll -O -Wall',
-                              compiler_cxx='g++ -O -Wall',
-+                             compiler_so_cxx='g++ -mdll -O -Wall',
-                              linker_exe='gcc',
-                              linker_so='%s %s %s'
-                                         % (self.linker_dll, shared_option,
-+                                           entry_point),
-+                             linker_exe_cxx='g++',
-+                             linker_so_cxx='%s %s %s'
-+                                        % (self.linker_dll_cxx, shared_option,
-                                            entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
-index 573724d..0a04f33 100644
---- a/distutils/sysconfig_cpython.py
-+++ b/distutils/sysconfig_cpython.py
-@@ -173,9 +173,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -190,19 +193,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -211,13 +222,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
-index a0a8dec..aa97c4e 100644
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -72,6 +72,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "cc -pthread -shared"
-+    g['LDCXXSHARED'] = "c++ -pthread -shared"
-     g['EXT_SUFFIX'] = so_ext
-     g['SHLIB_SUFFIX'] = so_ext
-     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
-@@ -156,36 +157,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -194,13 +211,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
-index 254b22d..c9cacc1 100644
---- a/distutils/unixccompiler.py
-+++ b/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError as msg:
-             raise CompileError(msg)
- 
-@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i += 1
--                    linker[i] = self.compiler_cxx[i]
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-+                    else:
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
--- 
-2.12.2
-
diff --git a/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild b/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild
deleted file mode 100644
index 6a1c7f4db7b8..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Test runner needs Python 2.
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}.ffi7"
-MY_P=pypy3-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/60"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy3/pypy3-c
-	usr/lib*/pypy3/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild
deleted file mode 100644
index 262971abd21b..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Test runner needs Python 2.
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
-MY_P=pypy3-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/60"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/0
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy3/pypy3-c
-	usr/lib*/pypy3/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild
deleted file mode 100644
index adbc9b5b3fe2..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Test runner needs Python 2.
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
-MY_P=pypy3.5-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.5 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy3.5/pypy3-c
-	usr/lib/pypy3.5/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.5
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.5/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.5/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild
deleted file mode 100644
index 0f8954a4f842..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Test runner needs Python 2.
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
-MY_P=pypy3.6-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.6 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy3.6/pypy3-c
-	usr/lib/pypy3.6/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop curses syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	einfo "Please disregard the import errors during CFFI cache generation."
-	einfo "They come from modules not built yet."
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 7c08fb04ef1e..0f0d0d42fd53 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,17 +1,9 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
-AUX 4.0.0-gentoo-path.patch 1906 BLAKE2B 0f09d41b6f2b26881e5f69059877d9c555a4adafe47a5b2fb269b32d7b0978b996bb1aeee9d1ddcf7dd2097a494317851408c6c9bc56a829a77126376f5c7853 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747
-AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909bf4f73514ef1e9034f5a15cde7756f30fe6c4337f5c0fd254c1869758c798b9c450cd3044cca768ab8f654b19dc6c73ae SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3
 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
 AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B 060cdfaea2c4b0e607b7f9548a161e0df8d741d8a70ece28eeccc646aaf659b8ae6f425089380b908a588e2a0ca2ed521995ef3f3aa3bfeb58ecfb0083b3584b SHA512 e67c0bb96d3c66ceecdc11a3984dbeb65a4473020ee2d4e5b093fe987f1540dd7a5cc6982be6303e7e8c49a53e02883277597d00342312a0f8144a84ff132bae
 AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
-DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
-DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3 SHA512 3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2
-DIST pypy3.6-v7.1.0-src.tar.bz2 23167216 BLAKE2B 12a085c2d4820289643818d8bc1c17304e4cf4f4687054452d878c6f26fd36802bbbe5baee73f0ce2f0322e126dbccbcf7b48ca6569bb7eb8d59f473bd80d4b1 SHA512 1a0a9e9de31c63114c0537747c4a718504a28b780a2ef1f76bff6051a1ec68b496b574989f0b729c07611cd81e199135dd268834dfa6f9664e1e119db8ae20e4
 DIST pypy3.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473
-EBUILD pypy3-6.0.0.ebuild 6921 BLAKE2B ab3d2be852a4687f570f9eb5aac9c04679c5f23fa01b4fd41932fff060307c81fd8b1627aafd9e9a905473ed9bb408accda15611d3377c11c4d8fe008a42bda9 SHA512 b0e217e44bcc83566ffe7bc0bcdecc76e86103abe9fd7fa268b5370915ba3f929963bdce600ddd9857cc66936da4452aeb6aabcabfdefb87606ff645378e34b1
-EBUILD pypy3-7.0.0-r1.ebuild 6849 BLAKE2B 52cec3fe80dd34950bf94dac99979ce799e878b7cb3f77d43331742e2afcaec7554a852ab225d9449940c83df795142d20cb72572c8d41c0cbdd9679f2f3b43e SHA512 6cfc17e8f0c0d4cf77d3b2b217b434c3b36e662e900a0e2118af8a4cc0be27cd54e1644419862b31381b4dd416d1d5a0cbedd272e43f56a5fc7ba285c0dc81ab
-EBUILD pypy3-7.1.0.ebuild 7086 BLAKE2B a185d362ad5041db8492f77d4dfd12aeaa955c2605af0ea63af622033f5aa5c4fe26f163ea90485545fb9f9eee4e14c84f64ece10cc8aa859b839ea9bcbdbe13 SHA512 2ad980acd2913543f7e9dfa83d78a2e266991fcdcfa396258ac7866e594c4622baee2373733d852c4d3af50850895b2856440c618978bfb965c1915a8477cc25
 EBUILD pypy3-7.1.1.ebuild 7086 BLAKE2B a185d362ad5041db8492f77d4dfd12aeaa955c2605af0ea63af622033f5aa5c4fe26f163ea90485545fb9f9eee4e14c84f64ece10cc8aa859b839ea9bcbdbe13 SHA512 2ad980acd2913543f7e9dfa83d78a2e266991fcdcfa396258ac7866e594c4622baee2373733d852c4d3af50850895b2856440c618978bfb965c1915a8477cc25
-EBUILD pypy3-9999.ebuild 6899 BLAKE2B deb7ad2878e9774c6f5d7c78ef8c6041849b87bd18cc85be058d1d713331f5988e129072510c84ba90172cdc557366ef57a113890b17a3ef1e502d172a8ee047 SHA512 07ba00e030bdeb26f764d0fc0ba6435c0522054b4e401757c3dc742cb833061a49ca89d19d83c5875749285b1749e54a8c616adad4edd693630bb23be1247cab
+EBUILD pypy3-9999.ebuild 7136 BLAKE2B 64bf74462e19ed816e362d30bf8e1c3dd75f8a7fcd636cc7980dc46503872c53a63baff10d355159b102ff1d09631672ffc0e30f86d60a1559d6f280bbd7a6e9 SHA512 c63a47bcbfe5f8e42188579b8478ff45231ad7498c0c1ae497b924f387685b99cd04295c022c171f655c44c9698fa61472e553c07fa0bdf3e82566ff0fefa73c
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy3/files/4.0.0-gentoo-path.patch b/dev-python/pypy3/files/4.0.0-gentoo-path.patch
deleted file mode 100644
index cf96d3fb2a53..000000000000
--- a/dev-python/pypy3/files/4.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
----
- lib-python/3/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
-index fc43951..fed5218 100644
---- a/lib-python/3/distutils/command/install.py
-+++ b/lib-python/3/distutils/command/install.py
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -476,7 +483,11 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy3'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.6.3
-
diff --git a/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch
deleted file mode 100644
index 5d89ce2711cc..000000000000
--- a/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 17:42:33 +0200
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
-
-https://bugs.python.org/issue1222585
----
- _osx_support.py                | 10 +++---
- distutils/cygwinccompiler.py   | 21 +++++++++--
- distutils/sysconfig_cpython.py | 25 ++++++++++---
- distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
- distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
- 5 files changed, 100 insertions(+), 45 deletions(-)
-
-diff --git a/_osx_support.py b/_osx_support.py
-index 13fcd8b..0525be1 100644
---- a/_osx_support.py
-+++ b/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # configuration variables that may contain universal build flags,
- # like "-arch" or "-isdkroot", that may need customization for
- # the user environment
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
--                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
--                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
--                            'PY_CORE_CFLAGS')
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
-+                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
-+                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
- 
- # configuration variables that may contain compiler calls
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
- 
- # prefix added to original configuration variable names
- _INITPRE = '_OSX_SUPPORT_INITIAL_'
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
-index c879646..a6157fb 100644
---- a/distutils/cygwinccompiler.py
-+++ b/distutils/cygwinccompiler.py
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 raise CompileError(msg)
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError as msg:
-                 raise CompileError(msg)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc -O -Wall',
-                              compiler_so='gcc -mdll -O -Wall',
-                              compiler_cxx='g++ -O -Wall',
-+                             compiler_so_cxx='g++ -mdll -O -Wall',
-                              linker_exe='gcc',
-                              linker_so='%s %s %s'
-                                         % (self.linker_dll, shared_option,
-+                                           entry_point),
-+                             linker_exe_cxx='g++',
-+                             linker_so_cxx='%s %s %s'
-+                                        % (self.linker_dll_cxx, shared_option,
-                                            entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
-index 573724d..0a04f33 100644
---- a/distutils/sysconfig_cpython.py
-+++ b/distutils/sysconfig_cpython.py
-@@ -173,9 +173,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -190,19 +193,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -211,13 +222,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
-index a0a8dec..aa97c4e 100644
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -72,6 +72,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "cc -pthread -shared"
-+    g['LDCXXSHARED'] = "c++ -pthread -shared"
-     g['EXT_SUFFIX'] = so_ext
-     g['SHLIB_SUFFIX'] = so_ext
-     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
-@@ -156,36 +157,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -194,13 +211,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
-index 254b22d..c9cacc1 100644
---- a/distutils/unixccompiler.py
-+++ b/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError as msg:
-             raise CompileError(msg)
- 
-@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i += 1
--                    linker[i] = self.compiler_cxx[i]
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-+                    else:
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
--- 
-2.12.2
-
diff --git a/dev-python/pypy3/pypy3-6.0.0.ebuild b/dev-python/pypy3/pypy3-6.0.0.ebuild
deleted file mode 100644
index d32be15922b2..000000000000
--- a/dev-python/pypy3/pypy3-6.0.0.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
-
-MY_P=pypy3-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.5) language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/60"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy )
-	!low-memory? (
-		|| (
-			virtual/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		--jit-backend=auto
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_ssl": "_ssl_build.py",
-	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3/pypy3-7.0.0-r1.ebuild b/dev-python/pypy3/pypy3-7.0.0-r1.ebuild
deleted file mode 100644
index 87ce4dbc2489..000000000000
--- a/dev-python/pypy3/pypy3-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.5-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.5) language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy )
-	!low-memory? (
-		|| (
-			virtual/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		--jit-backend=auto
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_ssl": "_ssl_build.py",
-	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.5
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.5/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.5/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3/pypy3-7.1.0.ebuild b/dev-python/pypy3/pypy3-7.1.0.ebuild
deleted file mode 100644
index f0f7cdf74a2a..000000000000
--- a/dev-python/pypy3/pypy3-7.1.0.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy )
-	!low-memory? (
-		|| (
-			virtual/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		--jit-backend=auto
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	einfo "Please disregard the import errors during CFFI cache generation."
-	einfo "They come from modules not built yet."
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 236616d1f286..ca7aae03fe83 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -7,18 +7,18 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 pypy )
 EHG_PROJECT="pypy"
 EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
-EHG_REVISION="py3.5"
+EHG_REVISION="py3.6"
 inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs
 
-MY_P=pypy3.5-v${PV}
+MY_P=pypy3.6-v${PV}
 
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.5) language"
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
 HOMEPAGE="http://pypy.org/"
 SRC_URI=""
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71"
+SLOT="0/71-py36"
 KEYWORDS=""
 IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
 
@@ -178,12 +178,18 @@ src_compile() {
 #    "lzma": "_lzma_build.py",
 #    "_decimal": "_decimal_build.py",
 #    "_ssl": "_ssl_build.py",
-	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
 	use gdbm && cffi_targets+=( gdbm )
 	use ncurses && cffi_targets+=( curses )
 	use sqlite && cffi_targets+=( sqlite3 )
 	use tk && cffi_targets+=( tkinter/tklib )
 
+	einfo "Please disregard the import errors during CFFI cache generation."
+	einfo "They come from modules not built yet."
+
 	local t
 	# all modules except tkinter output to .
 	# tkinter outputs to the correct dir ...
@@ -208,7 +214,7 @@ src_test() {
 }
 
 src_install() {
-	local dest=/usr/lib/pypy3.5
+	local dest=/usr/lib/pypy3.6
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy3-c libpypy3-c.so
@@ -217,7 +223,7 @@ src_install() {
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
 	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.5/pypy3-c /usr/bin/pypy3
+	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
 	dodoc README.rst
 
 	if ! use gdbm; then
@@ -239,7 +245,7 @@ src_install() {
 	local -x PYTHON=${ED%/}${dest}/pypy3-c
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.5/site-packages
+	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
 	python_export pypy3 EPYTHON
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
diff --git a/dev-python/pyqrcode/Manifest b/dev-python/pyqrcode/Manifest
index ef23a38bd0dc..76681ed020a4 100644
--- a/dev-python/pyqrcode/Manifest
+++ b/dev-python/pyqrcode/Manifest
@@ -1,3 +1,3 @@
 DIST pyqrcode-1.2.1.tar.gz 36989 BLAKE2B 88d5274a503abd78d0b8cab462d12be0af925a5eee2a6ad2b47a276559710eac40643a8aec99f26a9579f94e9084182894163e7e71f0abd486c5c2913e510080 SHA512 784262cb15c10f3581b0caeac6bba046686b35b8c0709ee78684b805b6cba49f4250a004dc5f7d393cc25929cbf815c6c3a94e284a77d20ff7224a8dde3a036a
-EBUILD pyqrcode-1.2.1.ebuild 663 BLAKE2B d3596def2ae5df9653c893a7c5cee3d156d211b32de4ba85c0fe9e05f6115d2d5b38b5c6ed5b4ff206c7aae5c46981ca16d405cdd118fff8afb7ec7f7b842e12 SHA512 c79bc12288a44c272ac9c608fcdba8470c0776da33127b18c582a9d4cc9964badc0b2804c4e1ce57fdc2b4aa00f25def31cd44b1c34e0826364f51b49f1322f1
+EBUILD pyqrcode-1.2.1.ebuild 670 BLAKE2B d716f2e29f55fd482b8819b22de1c930eaea7cefd8ba4a5f8eecd4fd23ffd5137d859a808768f68e0f3a705cc90fc2d73a5b430c45df814e6f5849b553ca11cd SHA512 1915bdebe4cb5a8cf8382c717774af2462a6a0f6d9e3244e31a76aca5bd00791848329cec54d550340d86f37fd57775f5db3e122bc33c11a388ec0fe22327d0f
 MISC metadata.xml 763 BLAKE2B 8145476a3c29c4c43388021c2100a87c233f5b67f28ce84de8ea1fada589b82be9e0ebf62b92a623ae74ba7d1993e9141bf8fb88b0100d65cca32ad3c2a5184e SHA512 de826d98aa1166e3a5746fbc363b14b9700b81f36cf5cd4e4446b3db79143650cc11e50c1af92e6a6231d85b0812cb109b66e8cf06eec560557cf949b7566f1d
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
index 647156c27c0d..5cddca1d3c3b 100644
--- a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="png"
 
 RDEPEND="
diff --git a/dev-python/pytest-flakes/Manifest b/dev-python/pytest-flakes/Manifest
index f19ea2e8a06c..80fec4f22b04 100644
--- a/dev-python/pytest-flakes/Manifest
+++ b/dev-python/pytest-flakes/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-flakes-4.0.0.tar.gz 7138 BLAKE2B e3c43df60484c664672f8b9ea92f8d4e25ae33e0dffc9cee200867220a3c8840f7325be28a4bec44918a9b44c1d73d3b89517db8dfa9bb982ed92a34c3b09674 SHA512 e74fe78e713040e3e85f206e8d26f5b8d8ef27dd94c2afccf3cd0f1f982c5e6c30c5966f2cdb774c7a2a8052d1a5cb324626b1997a9e75f5a7bb7d4a5e99376a
-EBUILD pytest-flakes-4.0.0.ebuild 605 BLAKE2B 2883167d473850c9ddc930fc0f243949896bc9189b05395cee3429a052793080aebc5d7d4330a2b592968a4f8c928a3e4c2c14c0a8b793eae62229e2721c50e1 SHA512 48f35fb5793d905e18ecf056ff290ff2d8f2e778cbd561edd7f75553440ad710d82f6459ced8bbf4ae5a5eb75722bb814ede7ebcb614d202eea8b087dc71dcf1
+EBUILD pytest-flakes-4.0.0.ebuild 607 BLAKE2B 0014526cb142d2762ebd6476e6d0a9d5800ba6845ed33a80d082bdb0307c93536b3e4b02399ffec29b44094dd267943235d5c9ca0012680ead383abb73465cf3 SHA512 061f40f74ccc943643fe3a423128c95166612d6d425eda819d3ff702aec542eac98f403adcebdfb132816b6caff51b9f0784a2f758c85834c36b7bbefa4444c9
 MISC metadata.xml 322 BLAKE2B 4f4573205a169edb1b0883546480cf852d1eb0a9b5f99c7326a55e4f6002345c06961d8394e7de26d13616ec78f8744cfbb122964b40ce5215920749f92bdcc5 SHA512 129a0bb37ba1cd528848d3c537a7a776b7526eded473f97e986307a9a185b4337d60f6f5f0ed1beac1d0f18fee6d9023753b9cb89d77e3b3a06576104701273a
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
index d273097c8000..adbbf8912f9a 100644
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
+++ b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 50d32bd09d58..683dda9d60e7 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,3 +1,6 @@
+AUX pytest-xdist-1.28.0-strip-setuptools-scm.patch 926 BLAKE2B 1943edbd4511b40b137ffbf27b67ef42218dce9c740c7a98e0c203a4688fbe8bc98bd3c15578dfc7c39fb5d4bb0aae7ceb4efa55dd8a633ab3bf3a80e69fbdde SHA512 43e6e52ca5e436b292f966d36c7276ca4d3dbc6f94c58eee014a357f18ce35a3ed8530b69418028f51311a465f4904c4ed52a279c910b1bb8469352238f162dc
 DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
+DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
 EBUILD pytest-xdist-1.23.2.ebuild 1030 BLAKE2B 989b87f68c288b535533c9a00f5b797c4b81b90ee2635b9f85e6366d165723a5f57c56400c501bca6c3326d8374ddc7f3aa5bbca6cc761e4c65ec0e910ddb90b SHA512 39a00470970930c6efad4db30661ca0aa6268540b4fae4a4116f31cd84e8fbb447de5a277d0479eed66881d963ee99b42e87378dac53532acfbf1e76e726b692
+EBUILD pytest-xdist-1.28.0.ebuild 921 BLAKE2B de88052bd65ac5c8dd9623bb024aa5ea3efd430cf1e7a20fac16412434d5c9ba73409bb0b83a642a2fc690bb6496be2de4707da16cc1511d6bf7c71453be77f5 SHA512 207b7bb0ab74e9eba667107372c3df2e18b6f11326d7bcb16adadd0d814dc072e8ae3b8dbd87e0befa2ae7fa2ec4fcd69a3019d8fac104a556e7f3e43c65f022
 MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch
new file mode 100644
index 000000000000..8ef0272d2b5b
--- /dev/null
+++ b/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch
@@ -0,0 +1,27 @@
+diff --git a/setup.py b/setup.py
+index 17abe9a..81422db 100644
+--- a/setup.py
++++ b/setup.py
+@@ -6,9 +6,13 @@ install_requires = ["execnet>=1.1", "pytest>=4.4.0", "pytest-forked", "six"]
+ with open("README.rst") as f:
+     long_description = f.read()
+ 
++import os
++with open("xdist/_version.py", 'wt') as fp:
++    fp.write('version = "{}"'.format(os.environ['PV']))
++
+ setup(
+     name="pytest-xdist",
+-    use_scm_version={"write_to": "xdist/_version.py"},
++    version=os.environ['PV'],
+     description="pytest xdist plugin for distributed testing"
+     " and loop-on-failing modes",
+     long_description=long_description,
+@@ -24,7 +28,6 @@ setup(
+     zip_safe=False,
+     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+     install_requires=install_requires,
+-    setup_requires=["setuptools_scm"],
+     classifiers=[
+         "Development Status :: 5 - Production/Stable",
+         "Framework :: Pytest",
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
new file mode 100644
index 000000000000..9564d7976934
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/filelock[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.28.0-strip-setuptools-scm.patch"
+)
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
index 199c6dbc809f..3634fdbb903c 100644
--- a/dev-python/python-axolotl/Manifest
+++ b/dev-python/python-axolotl/Manifest
@@ -1,3 +1,5 @@
 DIST python-axolotl-0.1.42.tar.gz 53869 BLAKE2B 045d19b38478404b19717daee431a4fc36d187dc511d42ee950b37ef257d98aaee8ba42633888d596265c0d64bfc33f2da9307d45feb4189ec04c03d69687108 SHA512 db9e1cfab87d690619a672b1782942a18b12b17af555959c17bcc3e2581e9c689c57becc0ea884a1129df9dace17684ba03de38b81f8c8c65cab27962ebdb6c5
+DIST python-axolotl-0.2.3.tar.gz 52139 BLAKE2B 8539f4ff6d9d7e57965cdbbd510f499cf344490091fe56b013d1ab60986092ac8a7a76248624993692077020043ea21c1d9448ecf9b76a698b43da4e014f37ab SHA512 1a10dc9df2f95d19b49909d4d136b5266aae19e24ac84f8b263ae7d4de18f77353c737616ac0648b600e05699a90d348f95c6c1659849986becefb4a0277fc80
 EBUILD python-axolotl-0.1.42-r1.ebuild 677 BLAKE2B 976d2b5f03f5325e838d418ffc0b71e119b560eeb7d0928d40d4c54314080a2bf884e22168f1619490f4b90c7bf4e3b9679fa05fcf68bb650b2679fbc0e1e90f SHA512 c9589aaaf25abe0d810496ff41fbd55a34b3cf63d60c81ccca6fbd561c305c2608122eea8782a7e626610dc1f1492466900ec1a00b590a4848544bde1ab5a7ea
+EBUILD python-axolotl-0.2.3.ebuild 678 BLAKE2B 2805568d113a0c17f6fb0359e7c7e4e2d47ecd0479c040c813b3384f886f1a5f2e2fbbb4a3d53a5414ac6839756aee666887650bcb346e1996b5bc474ad8dab9 SHA512 085a6ccb8893f2158e2291141641e377660bc88ac829c5af3b52550326c5b6efc379f602aefac6454fbfb3e058605a47e1cce23702b4b1f34992d7fb851a0db7
 MISC metadata.xml 734 BLAKE2B 86bb0a6b6c1c45e41917d6ed44a49d6b72acb3de3a466417967b3b7295543af235d958ecc1057b9ae666a96152f9d56e2520d48fef45216024662e9eef07eedb SHA512 b779e5edf07f64d7ec266051a76ea3f3011808811f542c43582d85221e988bd7dbc97581ff59d7b115830a7e4d101306dda24d39f24acaccb3f4f54884e6b3ef
diff --git a/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild b/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
new file mode 100644
index 000000000000..66e74fa421f5
--- /dev/null
+++ b/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module for the axolotl protocol"
+HOMEPAGE="https://github.com/tgalal/python-axolotl"
+SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-ethtool/Manifest b/dev-python/python-ethtool/Manifest
index 3468245fd4dd..8c801225e812 100644
--- a/dev-python/python-ethtool/Manifest
+++ b/dev-python/python-ethtool/Manifest
@@ -1,9 +1,7 @@
 AUX python-ethtool-0.11_include-net-if.h-for-IFF_-macros.patch 622 BLAKE2B 94c1de49912575ba542824a800ab9c4095c0eba768678f203f1cef2548f665675ff0e34b9802bf7aa983ed01fa6f46bacf1e1b565a2d5605a47ce11f46d66d48 SHA512 796beab89f476138fbe799fb296631d912155227b4d40118eef20ea69ca244d272756a63c1afbb42f2941243425994428d82699e1026c4c52a9bb4616fde5839
 AUX test-skip-wg-dev.patch 1023 BLAKE2B 564aa0fc9250041b181aea79d14af9f10c2d298f34f15ddb33b25e00e138c3e8a21729cbd0fc4b3c724c89349bb700563c568f27fd0e3d47da2736c2e91d2664 SHA512 fea83748b18b646d4acfe6fdbf204c0aa5f7abedb122241e54dd29f01e0e7862c5166f1199e20606c991305bfd9aad9ee1022c05e9cab800f2c9e980e034d4c6
-DIST python-ethtool-0.11.tar.bz2 34487 BLAKE2B bdb5eced32c508a593bbbc80fc287ece547c34504bbdf36877f4b62dea1239a33c5ea23dcecdd8b0f8104eea3ec7d5418a3ee5a1697930ea24a51da42f3ddc24 SHA512 b260e608e1024c48eedb72327b704b01fb42396219ca3d942fe42f22d3e8018fc74bfeffd96e37abd4efd2ce49a73915e0e2af5841a537a02e247d4ba5548f20
 DIST python-ethtool-0.11.tar.gz 37326 BLAKE2B b2345f5aece60c3b418d9fcd61220ab77fb49b9995a23b0ed6d97135dee61e4ffa177059869a8702430703b9f6518ffdcb8d690c868d0f8338ab16fdc36c58ea SHA512 227a9248dfdd36a9018a441d3ef4680691c23dac52972fe1ecc67ff30991f3de4cd71af0e48669ca382d6f177d1b3ebc97596e5a5ae4b4c80371456effe637b5
 DIST python-ethtool-0.14.tar.gz 41945 BLAKE2B d83e40e79481ee5f91f7e097dc4f6f0eb541f88ba83e13c13b3129ece2196ee999f9110310339ebbc2343b814a3b2c80405a3b4ce6931110509a54281b370cd8 SHA512 57a3f2d60dd8309192fc858614645d4e7533c90c03113ffc1eeeb810b86eb71b0a80b4eb209d3452c7624c5318a853de50d9d716d41334bf079e6e3e2490fd4b
 EBUILD python-ethtool-0.11-r1.ebuild 659 BLAKE2B 06540784fb06c039affead64ed7e298a6a064ded756fb9d5bdb8fa7275a3aba1e0f4cadd3537991c8f0bd599dc78dda2a5f0324cbe23848426537b82729a0c69 SHA512 f1e89637bf687d42025910326a5111bcc057606d693d2cfe87a6704d1366e38cdcf71895b8fb284c36fb3f4defbe74af5f1ef0c13e5111f5d8efb636ffc0f207
-EBUILD python-ethtool-0.11.ebuild 593 BLAKE2B 638119c63aeb9778562572e9da397a054a7f73d4155ed187a093135d813d6bc1f4f521801663ef524da412708603f3b0035d390e09b15543afe0c52d8bb36151 SHA512 23549771aaf54681276ef107417de835b13d5326818a3f45c94a1cde391930ebbce15fd033571ad63ae5cc6aa0344ffacf7aa5268ae5e2a90f47782e8f36e271
 EBUILD python-ethtool-0.14.ebuild 726 BLAKE2B 6e16d3c432f65763263eff1f95d9dce9c3bd1dfe8a75ff7b28bd5f33e5e74dc9356035b4427c175ee272ec6283308745da70af198c57508a7a510cb27092ec50 SHA512 fa6d487c3e392e3125aa814fc4eaedaeea50cb67fea967b7a2cfb9219a43498f18d7e45255d13122cec8754764a13031a9f03d971f56dddbfe743e611cbc08f8
 MISC metadata.xml 464 BLAKE2B e4a3eeee039ad5e3d1236e0067f72df7e73638bb550185f21de32977396c5457a3bb8d9358b65f3dad4696ffc1d818dcbd4ee6ca7f1a9692b3da0b7e56708b36 SHA512 26faaf69c1bcd592bfd2687b3e805ac9d5ecd155ad86a4d1d92875e96d24a2e21603d1a5a581fdb05bfb9883ddc9ce8bf86a5ca464d7521db65d271b5bc5485d
diff --git a/dev-python/python-ethtool/python-ethtool-0.11.ebuild b/dev-python/python-ethtool/python-ethtool-0.11.ebuild
deleted file mode 100644
index 54f2ce406b6c..000000000000
--- a/dev-python/python-ethtool/python-ethtool-0.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-# TODO: install scripts and their man pages
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Ethernet settings python bindings"
-HOMEPAGE="https://fedorahosted.org/python-ethtool/"
-SRC_URI="https://fedorahosted.org/releases/p/y/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-libs/libnl:3"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_include-net-if.h-for-IFF_-macros.patch"
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-rethinkdb/Manifest b/dev-python/python-rethinkdb/Manifest
deleted file mode 100644
index a54c2a962cca..000000000000
--- a/dev-python/python-rethinkdb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rethinkdb-2.3.0.tar.gz 116289 BLAKE2B b75dcb5792d7c0b9af89034dc7e44e2f42ddc7d2339a686db159a20186538778a4e5364a4c65e68671353f5ce5b4137bae3cecfdd18d6cb504f1fb4f065ced29 SHA512 1e710bde31ce45b5cda7463ae0a328c073bbf68544ad790d331163de188855b78257461a5b7367eba7becdaae329f19df545d7dd9834a095c6d01cd2710f481b
-EBUILD python-rethinkdb-2.3.0.ebuild 550 BLAKE2B a066650f84015267c71d5806c1495f145ec02de828d2bedad9b3bd89cd9dfb7cb9e184b351f2cffcf003bbeca1dc09c2723a9601ee63a70722dd8e5adff39943 SHA512 dad66f607376847dab1311ac24e7a6b6ce9b1ad110a4b5523a233ce49b7c8a2ff11c9a80fa5494b11b5ab911844057388994120ed2b3802625acb49cf6702bef
-MISC metadata.xml 316 BLAKE2B 5f3708493822de89c413d902691c11fdd363d088ce7547bd1dc2eb5d8f3698589efd4f28d86c6a45a372b549c3c8be40fc4d094b3718ec00c818df23cf361f0a SHA512 a04ce39c38775134396eaaf7a057251b348d9a60b60bdfd0c0df0811315b244518bb5a3e49e628d3da5848e3746e0e56f5461e52ecb427ef16a52853016b0fb9
diff --git a/dev-python/python-rethinkdb/metadata.xml b/dev-python/python-rethinkdb/metadata.xml
deleted file mode 100644
index 072edc1ad4e1..000000000000
--- a/dev-python/python-rethinkdb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ultrabug@gentoo.org</email>
-		<name>Ultrabug</name>
-		</maintainer>
-	<upstream>
-		<remote-id type="pypi">rethinkdb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-rethinkdb/python-rethinkdb-2.3.0.ebuild b/dev-python/python-rethinkdb/python-rethinkdb-2.3.0.ebuild
deleted file mode 100644
index 699f4a4bd9d5..000000000000
--- a/dev-python/python-rethinkdb/python-rethinkdb-2.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-MY_PN="rethinkdb"
-DESCRIPTION="Python driver library for the RethinkDB database server."
-HOMEPAGE="https://rethinkdb.com/api/python/"
-SRC_URI="mirror://pypi/r/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-# no tests provided on pypi distribution
-RESTRICT="test"
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index f91b3be6700f..fb86f49725f8 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,4 +1,4 @@
 AUX python-utils-2.3.0-pytest-runner.patch 461 BLAKE2B 245e0a6a4c76a4286616e0ad1115a718b482de4945d0321eb9b008699df1ff518b0ad7e6e2f9c5ee743fcdb283bac3dba73423b889a8b62951e004433f343894 SHA512 6ec873a2492166ba7d592ceea96e3ccf5851ae88c7577fded1803ad2ef49bead549cbbcdaedc5a8565228c7cf885736ed402b85ee0890f61e91891debbd14c2e
 DIST python-utils-2.3.0.tar.gz 19384 BLAKE2B 1746deadc8dbaf49a6499fe9c79d25c2b5cfea68e2d1b7ab6f88aa72807eedcdb338058e24a7822c6360dea36f1a044145572443c57f43f4cfed765a76e48f0b SHA512 482ccf9c635a0cbe603b69488a364d9033f8b7fada279d901725b5bf91ac13b1cd4a6b7e8d5834a9355d97d8b0803397d5e13da2b7ba72f8d8e2f7f39fee027a
-EBUILD python-utils-2.3.0.ebuild 847 BLAKE2B f68bc2a5924b7970b305b3e717fb32e89c24b4beaae548abcb74b7c6591ca1075794aefe6f7e7a89b44beb6f639ac5edf357aa2b0bbd1430924224cd0b1a0ebe SHA512 9c659ef20a0175a3790bb63553c2fab1ebfec7e27f2139064b542dfc0eb93e119639cef533d28584d9a4add9e597903f3869bc2797fe30cf0b476666740939ff
+EBUILD python-utils-2.3.0.ebuild 853 BLAKE2B 6fc6381d8f1e039965f621bfc090e9a08a710d752893ecfcbc03100b9b96f9531297da5c8eade01719e07baf00223ce72c4c547c9a49499fd059deab3eb7fc0f SHA512 f55de8a922fb2b772035939ebfa0754cd93995c8ae96c08d31e06759263874c164e31de63741a9576a43a7701467ae5f933963a54a1479263b1f33ee054e355e
 MISC metadata.xml 321 BLAKE2B 7baf4b7d0dbc6064c0588cae9708d10df7d571cf178f6156124938d4786a6560263e9862d23d53bfd17f6e098f58dc24188a9b02642765dbe4aa9d1628a78c66 SHA512 3073d2409eeb35e53d4f55a774ff737496ee360204832c17e178a2d8d0288416cf09fef68ae66bcf5f66a30f6644b364721b402e9bcedf7bb4f1663f302641cf
diff --git a/dev-python/python-utils/python-utils-2.3.0.ebuild b/dev-python/python-utils/python-utils-2.3.0.ebuild
index bd24410195be..9aa6daa7f23c 100644
--- a/dev-python/python-utils/python-utils-2.3.0.ebuild
+++ b/dev-python/python-utils/python-utils-2.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
 PATCHES=( "${FILESDIR}"/${P}-pytest-runner.patch )
 
 inherit distutils-r1
diff --git a/dev-python/pytrie/Manifest b/dev-python/pytrie/Manifest
index 75de9c5c47e0..5283b0b6ed2f 100644
--- a/dev-python/pytrie/Manifest
+++ b/dev-python/pytrie/Manifest
@@ -1,5 +1,5 @@
 DIST pytrie-0.3.1.tar.gz 94678 BLAKE2B 12631652ea33d2f1575f86bc8c42982543f8fa146debc9cb86e1139ff089f0657e04e50bad97b9bc344f4a270d102ee98e03fd389eb2c56ba3baac32b2288670 SHA512 72cb4ffff53d01545658b27b6c0b798736404f95013bfe34586c51c8823cc923ac4b3a8e874a938b26e3045784ce98ce2d8e51ab70dc435ff50075ffaf9d6c51
 DIST pytrie-0.3.tar.gz 228709 BLAKE2B 84c415722a724ac668624b3da29bfe29998c2ec8662ad21ab0035bb2a694e94759e9d09de980842887972b5c1690d699e43de41bf9f62e84ef3fbee86477d0a2 SHA512 f1dc6f810e51385fa4dcf2cbec76cf7fe5c184208f8d6dccf6212d43260591580126095e68d28ab6c8b01a631e6e16b275fa088643ae81568493ca231dcc6161
-EBUILD pytrie-0.3.1.ebuild 591 BLAKE2B ff8aa57bc45382f3f2a00cf0b0896e8b02a3a5562df2cff65001caaa2bf5cf0b88980e6b42051490c7d8321f8cb6c056e4a85d5095da796f9aac78f19e41eb9f SHA512 263a405e73e2daea81fdd274adfb6ea25760e2f106437d70716a2a0820f06284c7f689d5def361559561d629e7fcac844888d3aa33a0db849586314d79c817f4
+EBUILD pytrie-0.3.1.ebuild 598 BLAKE2B 4222725494f7a381ce122f1f3f8ce0c483485229d989624f621a54b1d41aab1d834b6fb4cab8d98a3ad0b8627f5e5d4c4246d8ea2c0937dfbb5615bf78a3e3eb SHA512 0627366cca1658439b508fd347a6e9438f9aa69a08f33b5050088500935387f20effd2cd10db41e17f3bc499caa1564c3cccdb5b915fd2ccfc51a351e4827b86
 EBUILD pytrie-0.3.ebuild 595 BLAKE2B 862638b14fd5cd871b5f241bb3ccec1e57afee8f8fef6b8c04e372245c02fa78ffe8fa3233d9a64288a32b1ae4de569bd06c06638b0adde7374594b95c96f75c SHA512 c45e370bdadbdc262d7d2390baac51dd3860804f67b52eafce89dba3c07d0791e3cfa1aad4dec211421b42218440ebb7ed658cfe13e21b14b84fd35a11b50b34
 MISC metadata.xml 964 BLAKE2B 9fbaa7700117c0416ae610f5f4d15078276cd6beb5fa6064b7a2649b5e1410b3ea957db671a6fbf7b3c387df22493df21246a5dc0ca563fb7f74c4a62d05a822 SHA512 cb64560edf2a771b3bfb856db54b4a6e41831a8ef51e6f2d9e045dc4e01db3a79a670d5c39a3ecedec4ed3c3f57473ca1ba5057b1e45a0d76f22275b888000f7
diff --git a/dev-python/pytrie/pytrie-0.3.1.ebuild b/dev-python/pytrie/pytrie-0.3.1.ebuild
index 72cbe7cd1866..2193998d888e 100644
--- a/dev-python/pytrie/pytrie-0.3.1.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index d149a8714a4b..020d43df6380 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,7 +1,7 @@
 AUX sec-patch-CVE-2014-1624.patch 1867 BLAKE2B 7345af45e863876b9c0f11c0dedb2dc124e53448c532bcf622f085e3a4c3040c9308352414e173c6adf74cb1c55efaac1824bb99fc8013f63dc8cfd3610989ea SHA512 f0ff5255108b7a5774d376a8892f1120f5056ec92fa543af7e5aabe3792e7ecd347ac78ff5c04ab36db35bba513a412f6aa06fe718933317a903264bd184b712
 DIST pyxdg-0.25.tar.gz 48935 BLAKE2B 8feffefff37da1e560040b36cc1ccb4ffdc57642b4de92f7a937303a02117ffe263a5dfc91bb6e85112ce60bc19509c21e7f8f859ef3ca5fca0e8c87a61cb128 SHA512 86cbf3a54fb8e79043db60dcdbb3fb10013ae25a900fa3592edc8a24bf3f440c19bc04626c7906293c785fcb56eab9d87d209b723b5baa872376ba1eb86758b6
 DIST pyxdg-rel-0.26.tar.gz 68435 BLAKE2B a95948db17da9909554e82c0ccf590c3f94ec26d1e34d5ba335868233a649368c08ef30cc19e878310ef038e5bdb6d18cd0e15e9413d9c54b70931f25844ee8c SHA512 0c11bccb74b8c0d98f3c63c318d35d08e1c3bbea128bf7b82792e1bdc0a60c8c4d6414b0612b19296cfb48f7951dfc6dd55ac8d23238e370e7faf6c4f64d1fb6
-EBUILD pyxdg-0.25-r1.ebuild 748 BLAKE2B 94692935906f8036871eec7773e2c95f6c344feb737d4c31d2905dc5cc260faf8f586118ef656bc7d728fc3dc28bdad78bcd3c79f42b6058edc44fa8737c6299 SHA512 b7fe667f7a3a9d72e1d41bd84535f07b42ebac0de6ed0937bcbc7bf93f724a40403338e839b10b72f015f7a989f881c85fed3b668b425718a8752cfd7c33b321
+EBUILD pyxdg-0.25-r1.ebuild 747 BLAKE2B ace34b0bc7b5361992701508256b56880ff9b69d6430cc562ff67549af259cedbad739e1482ef01df1e407b347522a48d8a72c0c408343cb23ed90834fe77077 SHA512 c72ad12c502665aa7dc89acd0507e6590cda651a53b87b8a275438bbb7ee7b767d040f40786a115f29350996d27a39fa18f674ceda1b09ead0356f33e51ba091
 EBUILD pyxdg-0.26-r1.ebuild 775 BLAKE2B f6d819f1a0d4d28c92bcfc18b66843f6f95017498f05841853f230a48888e6382f74cb9a3280d5ae70dfb6a174a9700adb7ac1cd8cd1007e6f2511b47cc3988c SHA512 963ebcbe2e69ccfbbd73a35178c10778c8e935917817ce15edb9032b1746f6c4c07bd959aa9af8f391003a9beef1b164df3b9b77f692d43d3a926abc2fc201ba
 EBUILD pyxdg-0.26.ebuild 771 BLAKE2B 432500bf9e766b0a35b0b58ab38b8e3f4c872a304ef8a160127ab53bd2237756cf5b1c31902634fb41aaaadf5191ed0cc5a652e79cbd47792957135437c9ab66 SHA512 1322abade539c088a416a487cabc23c3d14dae3d81f32bdaf1f2c8f111e962f9c941c006b149b29248db4e3ddf06a636764da94bb8fc0fa893ce9cd8556594f6
 MISC metadata.xml 487 BLAKE2B 4967a9b3c1a439c3cc53208ad2095031b08c4848ade6f2bb08a69aedbef5f5046f28764db62bcf3cac4c1c33c68958a7d2aba03a3b4cb7b7a407e41eddfec5f1 SHA512 f00421023d46b9aa32d8038c5ba8bfdb1b60a732932d64f7d11fe6f0c163b734182e2162dde2ba663d7c74ba8c754ece721dfbfa0b8fa3081be622dfff3949ea
diff --git a/dev-python/pyxdg/pyxdg-0.25-r1.ebuild b/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
index 89eb6d186218..370527c910ca 100644
--- a/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.freedesktop.org/~takluyver/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="test"
 
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index a71c3641f23f..caa16451f840 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -4,5 +4,5 @@ DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052
 DIST PyYAML-5.1.tar.gz 274244 BLAKE2B ea8cc4b56b9fc70bc7b01f8c654ceb8b73c82dcc936c939cba3c3654df04fe32fc46c7df322a38869d28ad5a58f6134b35cbe43924df3b4d5f3e54e33700dc73 SHA512 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd
 EBUILD pyyaml-3.12.ebuild 1068 BLAKE2B 75d565e4f368a85bcdc8f7a0b505c0969edaa8835480d09acd58e3a714c9502b085f419851d5bd15bc773f359a355101179fdedeee4d8468dc4adb0c5d5ca2c0 SHA512 7c839298eeca6ac9ca443cfa7e15e6cb1151789985391eb6b0eb81ec40c0e48dacd5c1ab0c7aef541f96312efb67b48e7cbb201c68278fb38a84dd7c272ce661
 EBUILD pyyaml-3.13.ebuild 1070 BLAKE2B bf3e7dbc8fcfbbf12bb5282ee012c9c1c83197f5573351181965efdc75a022f5b065181b975680240016b6c84f6259528e7010dd6645152b6f9b35bf66ea17fd SHA512 803c12130e4996bb868d71d8fef7819ae1f6f4aa44818bc68d6599c0e7a49b551c368d62370544811535c9bbe2126f3f190e1974148a727dad3a5adb52aaf79c
-EBUILD pyyaml-5.1.ebuild 1164 BLAKE2B f87df52805689e30c5847724007248dec8738730bd1b946f8d8a638a1926114aacb9c900637c8136dc4ec6d634bfb0328c1b9c2be08291bbb34ec024dc728e08 SHA512 6c86d2f18acdc962a4968f654daf35e2bf53fb2301f84d99db025b7bca912980df18ada76d0039a1c4b4df4878ca344d77b8c9feab3142b05f1ca88344bc8c67
+EBUILD pyyaml-5.1.ebuild 1158 BLAKE2B cf3796c5f5b7be00826c56d59bb641e63d44aa1d4b315be44944ae753c2318eb7bd497e0e9211e511fec8342726709b00fb9755b6b9989d53cfb483a8f6dce72 SHA512 ec6d704959496033b2c6407021758d30191f2e624eb264c094623af6de267c0ea8823d4f2df1a08a9c8aed8c6e3e8b3a3fa8795e8e79bbc373dc2c6d08077eae
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
index d23042797045..b0343bb7d8e2 100644
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 4762b119391c..6526b84ecf3c 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -3,5 +3,5 @@ DIST rdflib-4.2.1.tar.gz 889467 BLAKE2B cc5f675646ca7a55ff40d4d98eb138953d8763d8
 DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c
 EBUILD rdflib-4.2.1.ebuild 2677 BLAKE2B 709ecd89e9e7a13a40e52aa34dd69f432b5137d885356b01a559126ff58fcbdcf91c47cc311569322e94e16c71986dcaabb55f5ec2ec92df8b5e8de95191101b SHA512 fbf1d0409c293a053e9d7e89c9ceca81daae3f5018a6b36b91a39c0e64637a4958d464cc38cf50a09378337e694e09c5378fdcc7e5d17911fbee7e47517bd99a
 EBUILD rdflib-4.2.2-r1.ebuild 2929 BLAKE2B c83f419cc4bd6ae6234196ed4e9bc8c66544dd5b53774f0e1789aebeda2309a4b9d08869e1633624f81c76a083f058e03c160bdc605cd00e90a8ff444897521e SHA512 b406b89fe031309f0591192c625d18a812f7556b783b8dfdd7188d60425d26af3c24948a32ad8b989ca34bfe2dbeb3e0683baebb5c355a4241d39af7dc20b7d9
-EBUILD rdflib-4.2.2.ebuild 2716 BLAKE2B b694b69fa2e394b14cfe54c50ee2303c8d0fcc8d6ff4d942a8089600f3a9fda25aad6eb7cbba30a17e6a920fb5b68ada72797d86fcd2a341d0aeafd4ef866aa8 SHA512 7a11fc1d1e5b60c3513c5d6cb4fb6cd44a6c876bb47a98ae5b8116788454ca96c57063c4740b28e40730560b4c6dde31e288000896d72c341a518dcff2ab39d9
+EBUILD rdflib-4.2.2.ebuild 2715 BLAKE2B d41f8b35c8418a8c0b803f9066f066ed997ba8dd4a599b1a47d649b2e286edfba9b82978e487995322c7444fab45063d02a93d63c49b89b80c974f0c1545295d SHA512 116dab6c72ec55f353a8ffd5eb75f373e6e4a45b993a039229209c1b0dbbf72643f6694ea24b0e64a09a6d4d28746762da8bd6c7771115b2bb4555cbe2e1abfa
 MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index f7f636a1a267..32f070a4bb51 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 8f9725582620..c15d2f92dbdb 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -5,5 +5,5 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f
 DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
 DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
 EBUILD reportlab-3.3.0-r2.ebuild 1654 BLAKE2B 75324010068f8d97897151151776bfef87401dfa7859fa7b825d59b667843dde3e5e514e4039893534f7c5a6af5c38a937ab18ad48629c43f7f9a67c28671646 SHA512 a80631147edfc37e13fe28dfb03953e343ce26dfaa8769eda29809c0cdd0c5c39e51e3605e682a15a957268a6a80156e6edef5f9a2eac4949a642fdce8b260d1
-EBUILD reportlab-3.5.13-r1.ebuild 1528 BLAKE2B 074ac325a57601ca16383a326665aa772d5f6c02b95116e1c4259aea52d2c51ac50b13f0449e8e4d8fe0d93930fb8bfd54e7d340ee022f5863aa9aa8d97d4c40 SHA512 e2853dfa9f9ff29432dd33264b71c7799aea478c27685235993a1afad226d634deb17ba24103e16ac2a1d906b5e5a072bbb31fba624b982b4f71baae006435eb
+EBUILD reportlab-3.5.13-r1.ebuild 1526 BLAKE2B 1206706873e9036bc25df3226a973e4dadfd437e9691ac0825ae77019ad0a4c2c7c9a777d3b339c6793e504b27c416054570012e56cac8fe2cf4c8905c7be1dd SHA512 04e4dfdb6a565eff076006c68b08cf35708b87024e5585920fe0fefce606d51b02fa252d094fe3eb57e16360303773f011fc36d13f24e1177e6a58e8ac08073f
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
index 553a9746286c..976d22338f89 100644
--- a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/repoze-sphinx-autointerface/Manifest b/dev-python/repoze-sphinx-autointerface/Manifest
index d5e0a79c90ec..ca1fb212c60f 100644
--- a/dev-python/repoze-sphinx-autointerface/Manifest
+++ b/dev-python/repoze-sphinx-autointerface/Manifest
@@ -1,3 +1,3 @@
 DIST repoze.sphinx.autointerface-0.7.1.tar.gz 7892 BLAKE2B 8c7ca3faed9ede599c4d1a7c36cfb6fc2666d2a88ba75d6d903bbad2306bd6d5f2ff9c39a149a2a9e9171a4bba23a7211a3e8d4c9620f6777928e032e030881b SHA512 e2b2a41647a6e349bd33df8fcc08d2560f2a58b94a054bfcc9176cdcd97513ce78cc31945c7c12fd14f7906d21b23ba9c3fac0a06ed0c92ad7b89f73b5bf7ff4
-EBUILD repoze-sphinx-autointerface-0.7.1-r1.ebuild 971 BLAKE2B 7f6167fef0420ba2a124ad4748d8609be276b48224fa7548fa5f3c4cee80a3771e498da5c6dbf01dc5f203446990e0437c22dc5897a018fe151baad2aca37bc5 SHA512 1df58b45d939eca3dfe9ad42700893f4cb7d42e7108bed7eb7ebd87563eaa5d50067f152548937ef2d312b44fb3d447a92253b453481a5ce631ef7264889e9b4
+EBUILD repoze-sphinx-autointerface-0.7.1-r1.ebuild 978 BLAKE2B 9a3fe1eb06d010ea9bdf3f93ed78880016fdafc69c76062158f928dd4fbeccb108cdc2fb8a4201dbaabee980fa3457435c7d279abbbd715af9b678515f6dd31b SHA512 1828ed67d167cd21c3b2844be3f14ccfe6fcdc4c49e6d7b1bc005d1cea37550f673427de1cbccaf1b1a3466a9630f685816139c7795b0a07aae3c9fd2d8651a7
 MISC metadata.xml 330 BLAKE2B 62f755b2a31b7e0aa7889cdee9c2ae10fbc4f3b8f054a9f6658f4993e82e4ab55e139eafd1fa5314a071fc5ccfe50af0d26012c044facd4227a73566a812d7c6 SHA512 bab37e80962b4bbb37100966f20a648ecc5761dae56d01d09a140b39ee2662a91ea93a8c3e8406c285e94df572645a104baa810c941cf4913e73afe34ca185a5
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
index 25b4a305f5a0..2b3450e358e5 100644
--- a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/namespace-repoze[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index e8e1d5627ab1..688c8f6dff9d 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,5 @@
 DIST ruamel-yaml-0.15.35.tar.gz 344241 BLAKE2B 3e77f5da4e2a7f64099da1d79a108adfb093c5e47baaf11611462637ec6e29091924088e0ce261b21283a0ab07123da45a1ea7b0c522692d1e96cdcc27502541 SHA512 9e335d627db20b85ec0384f16d7ea03c310c01e84517e7b9bced1af9289fe542b87eb31da8ad960b17d26f35f2cc33a87a5a5b976e0e5ca587339b21b4b53fca
+DIST ruamel-yaml-0.15.96.tar.gz 399206 BLAKE2B e17f25d9501dad9fd17688b003d33fb0015b700f3c51d405710ccc0635263ced7a86140a3ed7a4aecaaf9e2e73f2eff17b99e96fbd9d9c1be3e9110c28758a62 SHA512 be76a03c46ce8826eda365791e212783243b64781318a998cc48c201bafb9af6b318e7544241fa10ce211e25bd6b26d3e57ef6a1fcb0c1be6dc4552c341e5492
 EBUILD ruamel-yaml-0.15.35.ebuild 1086 BLAKE2B eaba5af40051c8a044e8a0f8fefcfc09902e7d9aa85d0c2c4c76ffe0aa338bea3d86e8efd3e843d007abfc87ebebaefd88fd607afa4060a3aa8b7716dfefe704 SHA512 684a05a511949ad7ecec491cf454065d5f6ae442e12020a2a3b8ac966bb5045f7ad4cabccba3ed8d2c75b75547a634cd8cd3267e53b990941fdb70a646a56a46
+EBUILD ruamel-yaml-0.15.96.ebuild 1087 BLAKE2B 63cad1654b1e8e61ffb3a551157624b127a27534e95848fb1d4818e3de85c6755503257510c69844abf8da8ca06b8c3c89080d867abc249b81d829371f205d78 SHA512 3805a9192505c37e533a8978e6757d98dc0b2a9ca28bc6ab7239302d8cc12e49821daa067bffb55fcf79e51b97f1be4bb5319194328fb980c931b2447a63db83
 MISC metadata.xml 487 BLAKE2B 3564fcb4d8426e84f8e597771f9d5c8fb89a770ff6324f1af2112ca4e589cadd4f83503c9b9151ba5fb983b3afd837403fae0b0144da9ed3fb9677c0b5cdbd86 SHA512 d0db6519618ae2dc134a7ed8840a7c1dbf1e49c43fe781ccabf8ff8508ac6dcc7fab92e61b8e6cc6179f30aa5bff2c772721ca09fad15d57734a16d372c6f0fb
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild
new file mode 100644
index 000000000000..156a753c41eb
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://bitbucket.org/ruamel/yaml"
+MY_PN="${PN//-/.}"
+SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)
+"
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	# This file produced by setup.py breaks finding system-wide installed
+	# ruamel.std.pathlib due to shared namespace
+	rm "${BUILD_DIR}/lib/ruamel/__init__.py" || die
+
+	py.test -v _test/test_*.py || die
+}
diff --git a/dev-python/runsnakerun/Manifest b/dev-python/runsnakerun/Manifest
index ea369d87383e..8d3e0505c889 100644
--- a/dev-python/runsnakerun/Manifest
+++ b/dev-python/runsnakerun/Manifest
@@ -1,3 +1,3 @@
 DIST RunSnakeRun-2.0.4.tar.gz 447278 BLAKE2B ea5d8adc37249ff9338f319fe9d9aed4cbb9cf0f78d12266ce02bf47010c543f0f245b98091dc59164333a41983865a6d5b4d51e0db23d4329f119285885afc7 SHA512 2338d44ea57e7e9610e85dda5b2d806795d259e4e33e57e15f0ff8c938ba3dbcfc6df46d69f2fff3558879dd3b14725fdb7e0da939bf803776dc6bc95618ec24
-EBUILD runsnakerun-2.0.4.ebuild 560 BLAKE2B 2eb2a18262eef793f335b87b49b339edeea66d772b480c1e401acdb0dbc29c5005b2fd4137d068c498f0e1fd543b654b4bb683504163c2bd9c9593886331413f SHA512 2b2ba37867e4393d74b427219b1918ff04a689e12399943df85b43abb37416c872522043a7ce4548a9d05e3b8b5d797540d9f5c5eb5e52a0a004f2ed11f4bb40
+EBUILD runsnakerun-2.0.4.ebuild 561 BLAKE2B 29d791fef3e6bdf960035c3b3bcf519c75e03f5a4c9e7147e0c010e325786391442408ed78a59be88fe704816a6cc2a44de7aafa20f9bb6a4234b4d51d15fe20 SHA512 9268f185fdc510723424e00c5ec9f0277cdf706da602a64c7471353401d36740060506995b846cb2c3288b49b35c9162c3a161f1b88fef733ec31da02d86b704
 MISC metadata.xml 438 BLAKE2B f4942e9e7f6229a67d034ff203df14e9fca5ca811f4310c0f41d0306e65b3c0507828b1341965141b8e736b5a06ac62a496055c24b71a9ca811b02e44c1b4e3e SHA512 1c42c0f4bb37c94af1675e60392efa46284a89e381372e26f7038b2c782882caf4edfa2be2f836e36708fe3f838ffa7152db637d161191d80e1b94362e1291ac
diff --git a/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild b/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild
index e99e600ade39..4638198dacf3 100644
--- a/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild
+++ b/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,6 +22,6 @@ IUSE=""
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	dev-python/squaremap
-	dev-python/wxpython"
+	dev-python/wxpython:3.0"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index db54c470f019..9f2c37d44fc0 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,5 +1,3 @@
 DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
-DIST scandir-1.9.0.tar.gz 33315 BLAKE2B 70c0cb0819f205b3cee37f471f84be2bddb565cd7341e5a28b9f1263f3176450cd5f2edacd63130e4f3f38940d0d3e1a01239f4729ac05e5cf5fd0005e712f8d SHA512 41dacf42734ac9a53bb5bd5d783023236d68bb4883c853fb2ee34224206c577a4a277d4a8cf8f9be6fd5a8b59d9b4fe4568a0c815a62ec84ce99ded933961ec3
-EBUILD scandir-1.10.0.ebuild 672 BLAKE2B ce62b8a1d9db95f8bce23c8d733a4c0681814589e94b59c3a45181e8fe60f29f7e94d2e55638302b6c5e01fbd531f3225f90160938283494191d2fd383b7e184 SHA512 45e126da273f8f843d6b919867926dd8b00560bd91958e09f1d0867502a4bdf57d6d658a2c0de0f2bccde304081793e4a00646e467034cd48aafd305a51e1f0a
-EBUILD scandir-1.9.0.ebuild 661 BLAKE2B 3e0dedc7c98feba5239b30b9550e092cc293466ce1a90b72a37c66e29bf6c2c9cd0203426e7ba370f22e37e17981f50aa54a5d5cac839cd79c91be03b96f8d97 SHA512 d40bb14f4f9e949bd79bbd57241da8eae2502771eb8ce3b2edf95a04d26bbe5fe17d48de683e6187c92a871d76403e0a37c01e211abf522de78f551806db02ad
+EBUILD scandir-1.10.0.ebuild 661 BLAKE2B 6f8bb77204dcdaf34324adbcbee83af8247d4a140ebe3dfa05783d63f4dd4adaa74e7126bb94eeabfb49ea06f3d442a76a58bd2e88f9f664ece49e826e9f2d60 SHA512 8429f49140d45e5830e0faee535258db16752dcc896d7d0f2db9e01e8e54780a0ad5f82c2787d987680cc984c109e724ede89ebcf7605273bf6eb68c2c0e6eaf
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.10.0.ebuild b/dev-python/scandir/scandir-1.10.0.ebuild
index c61b7d21593d..49ca8d12b077 100644
--- a/dev-python/scandir/scandir-1.10.0.ebuild
+++ b/dev-python/scandir/scandir-1.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/scandir/scandir-1.9.0.ebuild b/dev-python/scandir/scandir-1.9.0.ebuild
deleted file mode 100644
index dddd1a1b74c6..000000000000
--- a/dev-python/scandir/scandir-1.9.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A better directory iterator and faster os.walk()"
-HOMEPAGE="https://github.com/benhoyt/scandir"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} test/run_tests.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/sdnotify/Manifest b/dev-python/sdnotify/Manifest
index 6c3457fc1e19..3260089d689c 100644
--- a/dev-python/sdnotify/Manifest
+++ b/dev-python/sdnotify/Manifest
@@ -1,5 +1,5 @@
 DIST sdnotify-0.3.1.tar.gz 2513 BLAKE2B cbce1d3c2bae3b3a02102cfea9ac104e7c2839b784a78309cfad0a66fc8b13bba66ae4bdb8dcf1d2171378e04f2c18e3697b22545a3e3f0593edff8adcc19dc3 SHA512 765e75e727ad5128269bfffd4d3f64666df654adc50965a54f3cd622933aca583faee5453f7fec3a23b6f754f4475522dd96a86ba643984cd72a575ec082709c
 DIST sdnotify-0.3.2.tar.gz 2459 BLAKE2B 1d1846e37889c36cfa7242d14e4040ebb9b73d3e53f5a3423447ae1a4912373e4249faa7803ac212e3c7d64371d1fe9e1be2d56f8604791cead2cbe22e422053 SHA512 f7e7d38c8d7f56ebad8b0343361a0bf6177208b94916430343a0a392015622d7bb62aa391e17956e5aa9a0d7189c79268cb86c46bb52b36488df5aebca5cfbd3
 EBUILD sdnotify-0.3.1.ebuild 525 BLAKE2B ea191361136f0425495192d4ad6f7a58345f7d4a65fc2d9762541e0d02e13889162e5375cf765f18bce4431ff3f07d3a2c0103f4ad6fcb7656cc53c263a6a302 SHA512 696a2bec9d82f030fb2977ac5bc5f8b62cb822a3be68dd5d521cbf44fd76ac78d875abf0ca8e29a17fc6394b3313c0be9e795897aade9d67a0d57f4a7a62dae5
-EBUILD sdnotify-0.3.2.ebuild 523 BLAKE2B 088afb25dd52c9b35ff1ec9dbf1e5e7ffc43fd67bf0bc223f276e5a33ac2a99a8f36059920ecf9419700e7208227ce582130a2399e91b9889330c20a1cdeec49 SHA512 162015e6b2b42663c36b00eb08ab739b43073664c4a876aa873c82527925c171620d29e7550b60481942a3bff1446f3ff5511c626162cc5ccb58c76610ba40d5
+EBUILD sdnotify-0.3.2.ebuild 530 BLAKE2B fbf928b6bacfb44c00524ae1b0970a7eb65884d5737840fc28d8a5ff8b4d5c49872435400a004b5bb3b4901b468798835611a312caca7254d6ee11ce15bec77e SHA512 8fe18da0ec205647ac447df1020bed7e1effe52565b13fd76fedccce305138ab3d33dcdacdb9d7dc5b373095389ded2c8e113cbc16003ad4d0fd1615c510c00c
 MISC metadata.xml 850 BLAKE2B 0673df4f05a46bc8b09c95d748c8d895635f2787ab7b6158d6ed8aa3abd0aae4d493198f0ba1a89088624bb74b66eb37e4638ca0e1121d4d3fc57ac3257fb466 SHA512 208120e5365d7553aa685ecfc1168fc58b215367c89d9a186b6183091bf736b05cc145cf121257e9c7b9571ab517eaf1a7bf7573bddb7d7a8a5c030f903288a5
diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
index f6cc282c1fd0..877af9d028a7 100644
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/shutilwhich/Manifest b/dev-python/shutilwhich/Manifest
index dd298a37cee5..076f92dc1ec3 100644
--- a/dev-python/shutilwhich/Manifest
+++ b/dev-python/shutilwhich/Manifest
@@ -1,3 +1,3 @@
 DIST shutilwhich-1.1.0.tar.gz 2300 BLAKE2B 0b510fe364991bcb1b2a627368e0aba23550a60dd0c8f892dbf25b5f23696f49ceedec487d91cc6a5acaffe28c29f635bacc633cc3c3377799fa8c75bd8bcd4d SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21
-EBUILD shutilwhich-1.1.0.ebuild 510 BLAKE2B 24629636210eb0c09dd5f7bac804c75e2fd405b3482999595b99e9e59c37364870d422e30bc447c96c9c243edebaa846edfaf9561b6789d28482e00aff25dc3d SHA512 90b6e439bb7e9e2897abed7ac15198aa6a24b5528471e222e6007892da521e344ea76cab571df4646fe316fd5aabf3effbca269fb10fbec0a9d921810441381f
+EBUILD shutilwhich-1.1.0.ebuild 517 BLAKE2B 8f559d0044422b7ebfcacefd51a2abed640b815b34c85bfaecd19f74794d38a13eebffe81c525ac15feec2f65f97c7043f88866f2c0eb13422cbd8de94e0fa96 SHA512 a2123cf69adf89a95714d1015cd49682dd1d2d44cf43afea4df405e5bcaca051f56c56aa3a8bc0aad6b1bb87be4adda38ec3bb2c3c43500121c3d223b30a0504
 MISC metadata.xml 711 BLAKE2B cf4caeca6cba1b6211e4910618287135ca84240d348595c91389578a2e2f887c1f88ebabcbf3960d0d6472169cd1b65455d1d8a4b58fcfa530662f75f29ffef4 SHA512 69223961a781434b4877e7648f9f2897c1dcb110a559e64dfcdfb6c26a696f8aeee4be1fa211e07baa01f1c9bf57f3ef44d43502a6635841e14e45ae524169e9
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
index 6b16ecc60155..97ffcae4bc45 100644
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 85fd0b35ea88..38999d2c5222 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,6 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
-EBUILD sip-4.19.13.ebuild 2891 BLAKE2B 799512a3976f954dcc293bdb0255522b101ee7cad9b1a9973d76cf1edb2671da8ad275490e86e2d3fa441191ddb7305d36deb8c14f23dcbec0fa80bf457fb75e SHA512 045a51bc5eb0ccc44fc6a1f232e0fcc32e02844f97faa69fe047262e811bfa4b10aa11925c53614cf8bdfa6f2d251348f6554ad5f30c12b583712b0b1d11b3c1
+EBUILD sip-4.19.13.ebuild 2890 BLAKE2B 7e98f818a312f0f2f7267974687fd565785d55f52766dbc0f7112f8d8e0bb27d7fcee86093f1d791317002009750c9883e1688f56b7275f09046ed07c8b22d18 SHA512 71c635af1a2a9e9e05fe52e125e15e1e52e4e261d868617d0f4f2fd48f3049b138b966e7db13ec952f3efd50d6054fd5841c95ae9169e58c1745e19ddeb6cf59
 EBUILD sip-4.19.17.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
 MISC metadata.xml 648 BLAKE2B f49eaeae5e37d91c569b93fdadc4401e478c54a754290ce37dd51d1d03340ead54f4d0f52389d87b91801a2c1ad0040347e629068a6c0ffe79a9e3442498e4f6 SHA512 1a2a4fb4e7fb35fb6177d62d5c866a5c65c1915ff38de5815823864fb6d9a90beaa8897e28a65f79770a621ccdd83755c682df29a25bf00a76ffd51b215dcdf9
diff --git a/dev-python/sip/sip-4.19.13.ebuild b/dev-python/sip/sip-4.19.13.ebuild
index f27df670d4ab..412ce176ccf4 100644
--- a/dev-python/sip/sip-4.19.13.ebuild
+++ b/dev-python/sip/sip-4.19.13.ebuild
@@ -24,7 +24,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 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/snappy/Manifest b/dev-python/snappy/Manifest
index af5515f64a11..bdf0efc0205b 100644
--- a/dev-python/snappy/Manifest
+++ b/dev-python/snappy/Manifest
@@ -1,5 +1,5 @@
 DIST python-snappy-0.5.1.tar.gz 15252 BLAKE2B eede689d51123968bdea64b8c89dc1fcb7f700fcd4e5869339717657ea6db88cacfcdaf59f00899773c65953c16ae271c5a6e03d6a17be16ca1e3dddf2b37cd3 SHA512 95a6389c58790aaeff61419bb9f183a29ad801733cae8144a67eb6203a8ebf6c6790bea7c025b37588dc98ebd2fed20f37857d2f30199f507f52653d2475c16b
 DIST python-snappy-0.5.tar.gz 12495 BLAKE2B b4456e4b5f2264122787a44e1871dd2cc74621bd6911ff9608b9a58215cc0020079080937b8dc89e1bd7a62834823beab5b9258c53122cd47c6e50c22e2185a4 SHA512 0be15ea133e3a47c6cdb2a340061bf2779d4aae4b34848cd60e6657c168a76970c41f2bae4f57993862bb65c75baa7cf6a562fcbff4c81e22fe7bac69e7d73b1
-EBUILD snappy-0.5-r2.ebuild 613 BLAKE2B 02b3ae508bb39e8c94e3268415dba49e19b848c7e6ee1a03d20f6e9c03af59aeb4426bfb65b333ec02dbc695ded19168f4670e9175108f25ee85b0e4d71c345c SHA512 f94e7a95c740ee8b3583d2ed729ecd8f1463734868e3fc34d986fd3e30d5176c9eae179aa421675f49066b6e4bb3969a35a6a37285b4adba5f4ff98fd4e86e09
-EBUILD snappy-0.5.1.ebuild 688 BLAKE2B 1c741dbf8aff14342547d598cbfd004378b08362e40b7e55d29d35b18c67ad9467d6e8c191c0ea3ad7484cb337ecb82dc0e81ac9562394171d780a81be3e87ec SHA512 27dab4d8380c5fc92bf8d4b1085ff39acf644fffaf470879f7293f0ca08022640a9d7d95791bc1eceb7e238ebf41978656ffdca44de4b136f0fd73e5740f05f2
+EBUILD snappy-0.5-r2.ebuild 620 BLAKE2B 8e66295a06a699e8564a8763bcb8111ecdc11579a85e5d75d4ddf1f34bc4ec5c653af94c743583b8ea38fba6ad5f13dacbe0f103df82de10c6ecb053a2fb6053 SHA512 65e109a895b2cdc630f4004b62a1dedb8a7749c19687eac25db1e47a0eabb6cabe99364bf65204ff25225540bfbd2276277fb607759eb14e96ac3583e2d30ad4
+EBUILD snappy-0.5.1.ebuild 695 BLAKE2B c07845e42ad17bc653082dc251ffaadcc3dc0ddfbf2ae919bc5257a446e7740d1eaf9bf5129dc2f3cccb9a3c3e9052455d9694cd5e84823b45deea676544514c SHA512 800cf4206616c54b57cc7834ca7af9bf763faa5f73eb6cdf116aa0af7d4a1edb8515a5b4000adc8447bb2abd51903d2328c64f6a553a281a941307619cf30429
 MISC metadata.xml 376 BLAKE2B 534d91b9ba78233f6fdcfeb7ae6c8aaf426a4848c111ba297f3814671079d3aee1ae505a93c024f3682dda2042907c424db70e3b0a40f7902d020332889e1a0b SHA512 6760eff3990221e541650ff83fa59902230892c992209ab707ac1e8da67be6c097e50b80496500938073026ec4f81ba4016a7b43a84ddfa0f07f3171163fc1ef
diff --git a/dev-python/snappy/snappy-0.5-r2.ebuild b/dev-python/snappy/snappy-0.5-r2.ebuild
index a3ae4a9d6532..0b2aad954b05 100644
--- a/dev-python/snappy/snappy-0.5-r2.ebuild
+++ b/dev-python/snappy/snappy-0.5-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pypi.org/project/python-snappy/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 SLOT="0"
 
 DEPEND=">=app-arch/snappy-1.0.2"
diff --git a/dev-python/snappy/snappy-0.5.1.ebuild b/dev-python/snappy/snappy-0.5.1.ebuild
index 4654ab7ea6a8..13ca53a22ff2 100644
--- a/dev-python/snappy/snappy-0.5.1.ebuild
+++ b/dev-python/snappy/snappy-0.5.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pypi.org/project/python-snappy/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND=">=app-arch/snappy-1.0.2:="
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index 24cef9a5aca8..2d3adf4dfe4b 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -2,6 +2,6 @@ DIST SPARQLWrapper-1.7.6.tar.gz 26597 BLAKE2B ef98640257d06e1814d57812864b2fd23c
 DIST SPARQLWrapper-1.8.0.tar.gz 28775 BLAKE2B b8ef5d3e2d52f4e17c47a7a398d01037dac3f6b62722faf92b6b76f37f2ac7e242ebf3cdfa93788744f632e58caf95207d1c37c462639151e20db74a94f4d69f SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907
 DIST SPARQLWrapper-1.8.4.tar.gz 56757 BLAKE2B 1d181a4269d4d2eadfd860e014f31f9134b500d4df437ab548804166821c574cfaedbe011c6b24328a40296da88378205b45839d225ada2b4afc6ffe28360f2a SHA512 301fce7f58b369009a13988a11d782fce6362d73472811a07dc4d962062097b48470c573f5bd1dc337532db467e75936f9e89fcc64dde91930077ce4a1657179
 EBUILD sparql-wrapper-1.7.6.ebuild 597 BLAKE2B 3adadab7edf7687f4374eb178c3e5e90490b5970cc66d8c265434643fc8049a73d2550612c162f3207fbf42c4fea06aa462a85f604e4617b61437341f26d13bf SHA512 94a99e4200137e0eef68b1a80768d807dae5e0d3d605307d5bbd84ecc0cd00de19ba50aa494337a39805e8388cddae320fac16673eb303176558aae0331e6534
-EBUILD sparql-wrapper-1.8.0.ebuild 616 BLAKE2B 725fe0d64cbe860202d75208725d3b102176bd70b76144bcd247f423d5a1f47af04ad4b2841d17ceb5687b4ed892b2c0aba6fd6a5d176f5bc83bd544effb2508 SHA512 8bec6ed2eb9659c7d647c0e732978519fd2fb6957e36163bb4f5fe7407d313eacbc6717da9516cdeee25038c7fe2281fd20febb217bb746b13e1f6e562d8e5f4
+EBUILD sparql-wrapper-1.8.0.ebuild 615 BLAKE2B f24647b564f2603a415d548a59301f2bde94344fd9df7c881a820215f9126a8709f680b2f553216271a04e705075818b7cb7c6761488fb58229925d72396e3b6 SHA512 0f2897f897cd1515ff2bdf8b9bdb0d9feef23ed17cbf0695311e94532974b77fd340a393266eecdb85d24e03531cfe540806b62a91a433a784c4781fbd55b764
 EBUILD sparql-wrapper-1.8.4.ebuild 622 BLAKE2B 92098e305f4b78f6e8605aec839e770fe87732b67cf4a2549a9acd85846f7ca5b8e1e6d8cf32186bfafb0702159217d3245f2234c3babc500c61e4d1e6a640a3 SHA512 17c64f4fcb1277052a6e9a7558306d3df978e9bbc7f509d0d42f9b99a6fd7a632cc0df4e30c164acc8a9aedf7520a1615da0c49efbfd2408d2cf0ce9be785e89
 MISC metadata.xml 326 BLAKE2B 0c3bfdc601d5e93c90d7966cf8b7de667f7c71b2353ea1a7c28ac0c52028999484f4cee8601d346d78e963055df1bfb115a1acb79bf0a07e8de6df600b63c83d SHA512 9cc7b41b1ba7fbcde0ecce7638a3b2df50d6290d65d9854ae6611ed144220d9b292235ab8916330c828a4f9a1c5605de6d0d71d1a08fb0f6ddf37f7302c03e40
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
index 25329b886ad2..eb170d9b9d64 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index 020d55301f62..ccfe07e26d23 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -5,4 +5,4 @@ DIST sphinxcontrib-github-alt-1.0.tar.gz 3213 BLAKE2B b2449c0b635769735a23187f42
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
 EBUILD sphinxcontrib-github-alt-1.0.ebuild 916 BLAKE2B b36fcb43ee0d39c34e3a732b549efa601424cd92b0ea6f4cd6b0ccbddbc0e9d75e8a420d76751c8819c3af7488d7930f7d915995e96d63ec71943fb250d3cffd SHA512 ae16c8fcbcad046ce034caf6490e4f4dcfdd31c5911aa2d9809bdfcc415d64e76d84825f76bef1107c29bc0b40063b4b02f4df512622ad98f9b67fa6d8b2f550
 EBUILD sphinxcontrib-github-alt-1.1.ebuild 878 BLAKE2B f8e85d9d37a0d5847c0057366ca60f9d85795ef8a4741cc929135a65a625c01771998ad8bf53e9ece6a21e07a62655597d4c2d44895f3964a011357c2d7df2c1 SHA512 7e4740ce48e88277005751b6bfbf118c7d1f51928e736f00902f99b9645d9e6129e7868b42db16eb2edb3b3294d6dc7797a51369aeb93af02c6ee00672691be2
-MISC metadata.xml 659 BLAKE2B 60579ae24985d8227bdde8c0fd62b1deee92cc7e20875c1e20b54815e0f4c987040cff79c8bc5dd0ad8e0413d70bb4401b696c70626f217c0f637886855f1745 SHA512 4daa112e2ff34c558e96bf4bb6684df4a49ef670d6fffb9176ee2a9370ad878a75041aea9eaf8222794e53bdca7f16201c9c68623c53a43af5f4e80c8426cf3b
+MISC metadata.xml 412 BLAKE2B 2cd07799a32942d97bbc9aaca814d37fa7a02eb748ba60da3740f6d9b37ede1abcdda4b7d36f68c5df26e9af0befa1741b0e55a3b7289e986aedafba98ec703f SHA512 6453593682ebdefbf75a1818ce26347827e3be0819bdaf7d6f407eec24394e45275d3bfec3e1cf254216b17fb6f642b2ddd06b5d92d3488706dab78a03d632a6
diff --git a/dev-python/sphinxcontrib-github-alt/metadata.xml b/dev-python/sphinxcontrib-github-alt/metadata.xml
index 33f8e973dab4..169949de27c1 100644
--- a/dev-python/sphinxcontrib-github-alt/metadata.xml
+++ b/dev-python/sphinxcontrib-github-alt/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marbre@linux.sungazer.de</email>
-		<name>Marius Brehler</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index e9cf00db2599..3de3544b5b2a 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -2,7 +2,9 @@ AUX sqlalchemy-0.7-logging.handlers.patch 466 BLAKE2B d29b41491882359d22219da425
 DIST SQLAlchemy-0.7.10.tar.gz 3541639 BLAKE2B 641532caccb6fea333198ba0c5064f7714ff75348c00dc762da24211fe6ff210c9e335a5b31ad5429e14b26804bafde6d597203aacddbd98d949d1315851d348 SHA512 631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367
 DIST SQLAlchemy-1.2.18.tar.gz 5675143 BLAKE2B 2e0a54d16b64801cb60b619c39dfba64d3b1705ac43a89f6a3873c9fd1bb9af02d38d1026f309eb3d33ad20265da8b3731d7d7092bec8fa035e4d696d74f1d5f SHA512 a3074e0f7b9a307937f02ad030811413f3c92b7edcc4f1c6eda7c94c1178708f8c920840385a9b33c7952e224fe46dc73223aee00123e863abf6d1d446aebdb2
 DIST SQLAlchemy-1.3.3.tar.gz 5864870 BLAKE2B d109e0daf0afdeaba946c4b18d14428c108ff15041876c9a35cf8e5783f9b9a1896e69760b249c53af35e4575e66f4b59c855b4a244d7f6569fadfb52c5a400d SHA512 f8e0f580ba5cc7eaed985e5a3af8cdcc2dddddcd64bdf02b247242eeab542b5666a93d46166b5edb4b28af3b89df44bccfa92d5bf94cc0e173dbcd369ae6487c
+DIST SQLAlchemy-1.3.4.tar.gz 5877278 BLAKE2B 1200da89ce6ad077cc93c58a4e41f856a2222618b3570badf3bd8543d70659e0313e4add0ef779e98654dbd60f8445ae6839830ac15e72d9c0fa259eac328251 SHA512 6f29aeeceafcd996bbfc781b79dcbe0bbc681f1214cdab2d52b140bbae8492a633defa97dcc720db7a6d423b062834b0805e965e6183f88f99648a8f8f8a73dd
 EBUILD sqlalchemy-0.7.10.ebuild 1580 BLAKE2B 6860bdd76eef99dd397c69450f1fea1af0ec7b1c6b07088b35887342161dfe6a67052a2ff8514ae00f1f5e4323766a8235af2cdb1b4739967e32c8334845e219 SHA512 9c405ee96b959895ab7eb155352186ea5a49a263053a819369cc672f2c835dc64a06d6d41d2bf2ca5a245e986a788d9cc80b679674e4f6f16988e88d7bcab876
 EBUILD sqlalchemy-1.2.18.ebuild 1801 BLAKE2B 6672f802ecd8d243ab6e8ce1426667ad2ca97a73f6b5903b4a599101fec127dfc65c9cf51ce8393c84879c16f4603bd1504acb39e3ae20ea4022eecb91657611 SHA512 4dd721d58adf5969dfa13b8e62be73ec3ab0e445a70f67602705399fcd6b3d3a96839616c14d5fdec966f2d29437e0a600c4438bdc9af53d46b7c333b40d34f7
-EBUILD sqlalchemy-1.3.3.ebuild 1636 BLAKE2B 3f82484cfbcae857d6ec8324d60730766819d88ed21fab915e6beb03b2054043db9edb0e1f09c011b1cadad7cb029aebe4146fe0fef9973feb7c8c0b54cc7a2e SHA512 83b3ae34ab2396f7da75bb1ff349bda530885037c15c5c5b987bc8ad22739e416d71f82da04ac326a69c13e09b73ad2e8cdb0bc0d3034b21d195dec2bd4ecc49
+EBUILD sqlalchemy-1.3.3.ebuild 1634 BLAKE2B 69130eff7b0e67609a1ae606f0689d5dadc55c549c2173a54f9e659a45f5a69244d284c573369388d1f17b8b80e4dad0c6e51686855192e32870a574156ec4a4 SHA512 b1d60c89d643a2e863abaa5ed281021671e2e6d20498782d2d73f37e235404a692bbfb357347c0e9cecca086f2122e7a4091cfd1538460c2003a7258c1f6bc1d
+EBUILD sqlalchemy-1.3.4.ebuild 1644 BLAKE2B f830a971ae3b2aa5885e86eee9dd242cf64e7fab1b1970d9133db7c9a9f6eb7f8181a09b11c565542adc1138fbacbea4960667991b376e86873e40b2fbddce65 SHA512 7699e4f58f7e6fa891f715dc5cb18a552c7b5bccbc95b0b034cebb4c780ee782d335808f440dec70d8d1271d180e3abcc18e24cd7ebe5fda0b8c6065cfeffd20
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
index 0a6116f1b314..0cd3c5f17867 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x64-solaris"
 IUSE="doc examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
new file mode 100644
index 000000000000..6f47c9c20bbe
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pytest -vv test || die "Testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/squaremap/Manifest b/dev-python/squaremap/Manifest
index 56f45f01dad1..d29895073bab 100644
--- a/dev-python/squaremap/Manifest
+++ b/dev-python/squaremap/Manifest
@@ -1,3 +1,3 @@
 DIST SquareMap-1.0.4.tar.gz 7439 BLAKE2B 34b5e5eaf45c597c4591eec291f0fa2e001f6df432eda0a3b98f8e596af257f1261d083b25eea25fedd9d415e00cc20e318f94fe2ce85b3abd2c20ccd51f2d3c SHA512 d01e61697571360b58e762787237bb8533b3de238f26323380a8b0b90d72d2f00e2a43e7f6742fbbb3483573493b0d83568e0651cbf9bdd463b911d09bf27e76
-EBUILD squaremap-1.0.4.ebuild 536 BLAKE2B 89663e62039a59b811c2566aa54d439853737f935f07a95256d3ada660ae6520dadc56d10ab1af0ed8582303b4104da7c0131a090c78dbc27c875b964b37601d SHA512 b3c52da42ab368d7afaec6c02caaa7b85c1cc8049b8bb48e0c0be7a5480586e908008dff5165d04bbdce1ed5618c21ef52dab5b0a749c4a881d878fb8387f20e
+EBUILD squaremap-1.0.4.ebuild 537 BLAKE2B 98963d7f9da7b85457eba69c9eca16b33dfff89c322e32ef40aa57671adb859e40def138c8b674ffec25e69036b554c0b82b927dce25fa4bf691ec12a54272f6 SHA512 552229f07fa551813bd1ab1a29d445de42415b5d920129b02ce52687e8177815be1a3c5259259bb88c4305b69938f234888606eda92fb6cd03af474fe82a2a79
 MISC metadata.xml 436 BLAKE2B 18282b39ca0f1b7fc5982d2f29b65148f6333de3a509a478374b86b2f078aae8d0f2d200cbda0616d7d4018cbcaaab3fb03ce13889d3419fdba14a52c245d0de SHA512 dce36b184260ccdea3585f5f688006a438347cbe18b2358d95fce4f96f3675d5f0f9a8080a814ac56bc58332d901dc9272f00b6085b8e3e0f0ccfeb9e25f497e
diff --git a/dev-python/squaremap/squaremap-1.0.4.ebuild b/dev-python/squaremap/squaremap-1.0.4.ebuild
index 70cb764465fe..0262a588d836 100644
--- a/dev-python/squaremap/squaremap-1.0.4.ebuild
+++ b/dev-python/squaremap/squaremap-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,6 +21,6 @@ IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	dev-python/wxpython"
+	dev-python/wxpython:3.0"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 474194aebb17..3ffb468703f3 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,9 +1,9 @@
-AUX tox-3.10.0-skip-broken-tests.patch 2725 BLAKE2B 112b5be6c97c27ab531f88c01d4ba13452cf25bc46515bf6c6751951595124d257f85083d9a99c9cc8956370f0390facd07abbe1e9f21c627c531bff639eeef1 SHA512 67e93d9ba10c464f66170342e8bc20f48e57505b72b845effa7e8defb34eaef90ff4b3495847dc7696d5b50359ab032d207ea88dddcf669b3d315bed31e73b29
+AUX tox-3.12.1-skip-broken-tests.patch 2766 BLAKE2B f2776638f48909c18a14c0e556d7646584b382eb62d17bd0a72e6d10011f25818de0886df79eaa4bada5fb9b43797505b1c8df4fc7d97398741d2f719143c4e8 SHA512 cc14794264ce0d9ca4c36de868e823a46e84bea8867e6bb7b37f5e13723d3ec84af41bc0cc7586789cc14b4f6844a68d2c5057cf77d36950c2fa2e8152e1be61
 AUX tox-3.9.0-strip-setuptools_scm.patch 699 BLAKE2B 15c001c0523420c2ae22013cc6729b34b97f1a25f7cddcde53f752dc11e1329d66522eeebbbda00bce58781c96b622ce4cd22127902b5ddf34b43e5197577792 SHA512 6c23dfa907303a826595cc7ff897212272841b151b574596d401b87bd441d26599c12b36bc08a5659af3e6639c20773c866df7b53c4230bb3eea86986253eb07
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
-DIST tox-3.10.0.tar.gz 279571 BLAKE2B 7aa77dfee2fe3141626d13f37f2c711cd0891ae7b484f7fe6ab7731d35455a898964c52cedc954a6d4108137e2d73fe9628bb893aa7a337d8e69da15b8516811 SHA512 a1cadf3f8de494b5c7f2e8ae1be11fd42f29ae805b5761f6a22763c303625c860475c5435aaf437e6f2d0213be1ad826d9b6a0950aed21c054a94d492cc85047
+DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1307 BLAKE2B f9523dd73e57889bc345f1e6d9e47a70b5c63727bd029fd0cdeeba79ca0e6c523248c845270035d4e26d70f31ea788fe94e2d69529bb99625db2a1f49880553c SHA512 09987e74d9cdf82fee990dc7e1813ed8df54a8ffbc157413c6fa0b61763853640066c108b78556601d16f278bdd303d572f4721dcc8dbcd7f4183187f4fe4692
-EBUILD tox-3.10.0.ebuild 1422 BLAKE2B a5a50dbb389b09a6d65e07e24ddf0c6b35d41dd4e18d24312a07e29b823ff7ba1bcf50c6798e873727c764e87a899de49c05d7d80907e19221b69f0f40b3625f SHA512 9f6dd4aad20846936bc8937502e475fc17dd90a7c2d439a1ed6a43f2dcf6d21aae023346dcaade87e8fdb46c0be85dd54f8d7a41b0e8442bfb4f2fcdbd8e327c
+EBUILD tox-3.12.1.ebuild 1413 BLAKE2B e1e77b0c5a69bd9b03939d3ef4772cccc1f3fa1c2610f3e5d019bbd3c43db3f3ccdae375e33826f57ceb1ee1f2952ab7ed92148cf2b6545dc8643bedbbaabb41 SHA512 358fff5b4132a1748afce6c1f78d01f9ececee57853fa154d6169afd0a8a64c25ff8a6e753e2e2f5a46c718d3586541e3f8841318ff57b08de97cb0154662434
 EBUILD tox-3.2.1.ebuild 1953 BLAKE2B 20ef7befbe5fced2de522b65745e159fdbdc323c887eaad5feeda601bc68180651716913e8c84a5fe778a52ce3dcd0db2b7ee76309cd3e7583c2b90914c0ad74 SHA512 255146b77fedd2a709cb6b0bffeac1469811028d7dd806219107139bc27a171826dee2cb0d65672e8e206cd8c0d37fa5d84dab8d81b53aa6b5627b39a9e0e376
 MISC metadata.xml 465 BLAKE2B eba47520bf4a2f615fbfad7c26ac19af51d6b9c0ef8dff0212a6723376b34a0d17386f05b3f4dd3ab715b9af867fabc038c300fa8df357c648dedb03efbeed88 SHA512 9bcd58c451d7196c9870a04b76a504090ec217c7c88f47f17e141c5c9519fc41d24dfc83d97eb48b935d90b621a0ada1ed664fafffd7880e91627e56259b3c76
diff --git a/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch b/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch
deleted file mode 100644
index 56f692948d36..000000000000
--- a/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/tests/integration/test_provision_int.py b/tests/integration/test_provision_int.py
-index 6a8ac18..56dbe95 100644
---- a/tests/integration/test_provision_int.py
-+++ b/tests/integration/test_provision_int.py
-@@ -43,7 +43,7 @@ def test_provision_missing(initproj, cmd):
- @pytest.mark.skipif(
-     "sys.platform == 'win32'", reason="triggering SIGINT reliably on Windows is hard"
- )
--def test_provision_interrupt_child(initproj, monkeypatch, capfd):
-+def xtest_provision_interrupt_child(initproj, monkeypatch, capfd):
-     monkeypatch.delenv(str("PYTHONPATH"), raising=False)
-     monkeypatch.setenv(str("TOX_REPORTER_TIMESTAMP"), str("1"))
-     initproj(
-diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
-index c64ec1b..b16a4f2 100644
---- a/tests/unit/config/test_config.py
-+++ b/tests/unit/config/test_config.py
-@@ -1886,7 +1886,7 @@ class TestConfigTestEnv:
-         for name, config in configs.items():
-             assert config.basepython == "python{}.{}".format(name[2], name[3])
- 
--    def test_default_factors_conflict(self, newconfig, capsys):
-+    def xtest_default_factors_conflict(self, newconfig, capsys):
-         with pytest.warns(UserWarning, match=r"conflicting basepython .*"):
-             config = newconfig(
-                 """
-diff --git a/tests/unit/test_interpreters.py b/tests/unit/test_interpreters.py
-index 1eba27e..af7930b 100644
---- a/tests/unit/test_interpreters.py
-+++ b/tests/unit/test_interpreters.py
-@@ -40,7 +40,7 @@ def test_locate_via_py(monkeypatch):
-     assert tox.interpreters.locate_via_py(spec)
- 
- 
--def test_tox_get_python_executable():
-+def xtest_tox_get_python_executable():
-     class envconfig:
-         basepython = sys.executable
-         envname = "pyxx"
-@@ -84,7 +84,7 @@ def test_tox_get_python_executable():
- 
- 
- @pytest.mark.skipif("sys.platform == 'win32'", reason="symlink execution unreliable on Windows")
--def test_find_alias_on_path(monkeypatch, tmp_path):
-+def xtest_find_alias_on_path(monkeypatch, tmp_path):
-     reporter.update_default_reporter(Verbosity.DEFAULT, Verbosity.DEBUG)
-     magic = tmp_path / "magic{}".format(os.path.splitext(sys.executable)[1])
-     os.symlink(sys.executable, str(magic))
-diff --git a/tests/unit/test_venv.py b/tests/unit/test_venv.py
-index 0523112..3db5416 100644
---- a/tests/unit/test_venv.py
-+++ b/tests/unit/test_venv.py
-@@ -445,7 +445,7 @@ def test_install_command_not_installed_bash(newmocksession):
-     mocksession.report.expect("warning", "*test command found but not*")
- 
- 
--def test_install_python3(newmocksession):
-+def xtest_install_python3(newmocksession):
-     if not py.path.local.sysfind("python3"):
-         pytest.skip("needs python3")
-     mocksession = newmocksession(
diff --git a/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch b/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
new file mode 100644
index 000000000000..382bf2b158eb
--- /dev/null
+++ b/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
@@ -0,0 +1,61 @@
+diff --git a/tests/integration/test_provision_int.py b/tests/integration/test_provision_int.py
+index 6a8ac18..56dbe95 100644
+--- a/tests/integration/test_provision_int.py
++++ b/tests/integration/test_provision_int.py
+@@ -43,7 +43,7 @@ def test_provision_missing(initproj, cmd):
+ @pytest.mark.skipif(
+     "sys.platform == 'win32'", reason="triggering SIGINT reliably on Windows is hard"
+ )
+-def test_provision_interrupt_child(initproj, monkeypatch, capfd):
++def xtest_provision_interrupt_child(initproj, monkeypatch, capfd):
+     monkeypatch.delenv(str("PYTHONPATH"), raising=False)
+     monkeypatch.setenv(str("TOX_REPORTER_TIMESTAMP"), str("1"))
+     initproj(
+diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
+index b814b7a..fe7ebe3 100644
+--- a/tests/unit/config/test_config.py
++++ b/tests/unit/config/test_config.py
+@@ -1897,7 +1897,7 @@ class TestConfigTestEnv:
+         for name, config in configs.items():
+             assert config.basepython == "python{}.{}".format(name[2], name[3])
+ 
+-    def test_default_factors_conflict(self, newconfig, capsys):
++    def xtest_default_factors_conflict(self, newconfig, capsys):
+         with pytest.warns(UserWarning, match=r"conflicting basepython .*"):
+             config = newconfig(
+                 """
+diff --git a/tests/unit/interpreters/test_interpreters.py b/tests/unit/interpreters/test_interpreters.py
+index ea6f65d..e4f0e92 100644
+--- a/tests/unit/interpreters/test_interpreters.py
++++ b/tests/unit/interpreters/test_interpreters.py
+@@ -28,7 +28,7 @@ def create_interpreters_instance():
+     return Interpreters(hook=pm.hook)
+ 
+ 
+-def test_tox_get_python_executable():
++def xtest_tox_get_python_executable():
+     class envconfig:
+         basepython = sys.executable
+         envname = "pyxx"
+@@ -72,7 +72,7 @@ def test_tox_get_python_executable():
+ 
+ 
+ @pytest.mark.skipif("sys.platform == 'win32'", reason="symlink execution unreliable on Windows")
+-def test_find_alias_on_path(monkeypatch, tmp_path):
++def xtest_find_alias_on_path(monkeypatch, tmp_path):
+     reporter.update_default_reporter(Verbosity.DEFAULT, Verbosity.DEBUG)
+     magic = tmp_path / "magic{}".format(os.path.splitext(sys.executable)[1])
+     os.symlink(sys.executable, str(magic))
+diff --git a/tests/unit/test_venv.py b/tests/unit/test_venv.py
+index 0523112..3db5416 100644
+--- a/tests/unit/test_venv.py
++++ b/tests/unit/test_venv.py
+@@ -445,7 +445,7 @@ def test_install_command_not_installed_bash(newmocksession):
+     mocksession.report.expect("warning", "*test command found but not*")
+ 
+ 
+-def test_install_python3(newmocksession):
++def xtest_install_python3(newmocksession):
+     if not py.path.local.sysfind("python3"):
+         pytest.skip("needs python3")
+     mocksession = newmocksession(
diff --git a/dev-python/tox/tox-3.10.0.ebuild b/dev-python/tox/tox-3.10.0.ebuild
deleted file mode 100644
index 586d4e574d5c..000000000000
--- a/dev-python/tox/tox-3.10.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		<dev-python/flaky-4
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-	)"
-
-# for some reason, --deselect doesn't work in tox's tests
-PATCHES=(
-	"${FILESDIR}/${PN}-3.10.0-skip-broken-tests.patch"
-	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -v --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.12.1.ebuild b/dev-python/tox/tox-3.12.1.ebuild
new file mode 100644
index 000000000000..95e8d9f9534b
--- /dev/null
+++ b/dev-python/tox/tox-3.12.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		<dev-python/flaky-4
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
+	)"
+
+# for some reason, --deselect doesn't work in tox's tests
+PATCHES=(
+	"${FILESDIR}/${PN}-3.12.1-skip-broken-tests.patch"
+	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
+)
+
+python_test() {
+	distutils_install_for_testing
+	pytest -v --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 101e131f7e60..86032ff09c39 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -5,5 +5,5 @@ DIST treq-17.8.0.tar.gz 56439 BLAKE2B 3e39c84453793baf3107c38b656c8968e593845fc0
 EBUILD treq-0.2.1.ebuild 1035 BLAKE2B d7500eb9eceed48f7371482920a71246eab25bbf788be4f25fec1535b8ce88746b7b4edcfa742638206f3e24897bb1805993c4a897a90c7efa240f8475c75461 SHA512 cc3fba0a27c6823ed4552d8495af667a92eb9b10466689bc512066f564bd64334fb296009f2a9bb8b605145dbd97ac89d23d77be9febd0bc4373664657725955
 EBUILD treq-16.12.0.ebuild 1227 BLAKE2B 09bc21da5d1621b544d8bbb011d52a7ae8667a4cc6f9418814a532e102b24174b99edfde6878a4ab70612b05a881a6716e4d1848510c24269ea6d69481fe3b80 SHA512 160d07a1f2ac977907081667c7f248866cc1013776df3a8133b40df7ea7989524daac24e4573a8789fefaf9ac1cea33e001a184ce978e7fb9f745ede190ff313
 EBUILD treq-17.3.1.ebuild 1530 BLAKE2B 4855721f694e126158dd4ef784a5800b393c08ce81a2a759d57ddb8f6b2be94437a558b834a849ac8545d4dda5756b41dadf093df590e12e33afdbe4c44434f1 SHA512 1b80227ed035e6da681fc4115ade6d1654a799e99a6ff2e63ab2af1a28adb89f5f7e4f5fdcd506bddb6defb006acbc734e365e813fdd3c382b2e5418f3fd9169
-EBUILD treq-17.8.0.ebuild 1641 BLAKE2B e71de66ac43d52ad765a4daf7e21892026b0eb702ca60ac4e2fb792602c7d7bec1d40138e04319486898adfd4da8e48fe87d91eefc8620bbebf82e86d6a8f1bb SHA512 1ba9cee9250cacff838d371ead284c48725065aff96f35fe5f4854cb4134365a7e1991c2dd8cff5aabb0cdbd501558bd92193245f4e64fa132688947b7074d88
+EBUILD treq-17.8.0.ebuild 1648 BLAKE2B 9a858c462b850a8233a41ce279bc0f03742beb7c88ecb49cf225fcf96881a99fa6ecad1a66019cbe29cc42115e048979642cfe62a01b0fbc4b2695c8dd79bb7e SHA512 0c0390438677091614e756d78f58e6837432dc923cf3a13e3d8bf8d4f0ce0ea4047f53669282d584002db5e41d5c38c3e8eb8e8bd2dd045a6b1c5731686df7a9
 MISC metadata.xml 651 BLAKE2B 4f61decc98382728f07f30be0ed88039223933a85bf5b838c40c9c47cc1828fd7ae742901b149f5bac870ca89e2485e126ccb195934f35848b0be19c3f5e0894 SHA512 ef37d01969116cb7c54e92840aba9ea8b1e70d49fc0ea512853ad3db2324289c331123f7a1b3026bf32daa2c8cad7c84e80eca189d3c2721329740017b6bba38
diff --git a/dev-python/treq/treq-17.8.0.ebuild b/dev-python/treq/treq-17.8.0.ebuild
index 28ad28fd8287..4498125e41bd 100644
--- a/dev-python/treq/treq-17.8.0.ebuild
+++ b/dev-python/treq/treq-17.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index 93d48f0a159f..fe3dc079941e 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -4,5 +4,5 @@ AUX util.py 977 BLAKE2B ced53147ac1b8153d0b891b07514cee5692372bb630797d172c5b7da
 DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a53c322444a95651f4dbb502443bdcc1d0da0ba5db8f9a832ad90b3c6dea06ca688d7120857854d3eb7c17e SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
 EBUILD txaio-2.7.1.ebuild 1810 BLAKE2B 09527c0ca4e9379f8a2f8719121d9365d08d39146d6515723d896fcf13e84c58328427555f64c973485a1df497b042de1d27e14c49f2a24027547be468f364b9 SHA512 074f40c0ff1522b67766e8bdc727e21039351cb41e08368f468f342fab8a791d812e8b1808cd0bfbfc608fabdeccc0753d84844d259751f50c15af8ad5c2f79c
-EBUILD txaio-2.9.0.ebuild 1409 BLAKE2B 0e38cab483bfe350cbf1d433c666754b2d6cc67d4d868d38e8b9eb4af1374de61a66a285e2fa0edc766676bbad93c197eb0d95a3b2a6ffcafccf77c53c032e23 SHA512 0a5b1c568edb904eaf3674d7622ec0d285c7976c22652b45c655cd61bdbe096b33d6ba23fce513328dfed7607cf6ed8b1ff5463595c81c34745bd1bccdedcf34
+EBUILD txaio-2.9.0.ebuild 1416 BLAKE2B caf7eaf4cff6b555b159a8ec4acd7c7a62d3b98df420fe79f69d49e003802e5b92ededdccc9699bb4e93c70182e4032c11d2f6cb4b3f87fcdc5f35201477cbfd SHA512 89bc32881e5c70caa604041aff58a69bd26680a0f225147e8dcc1ac3334a37de6f7f0a1cac19bc95b6a412c3e00bdaa3994b3b423e8117fb8c2ca75cb176622a
 MISC metadata.xml 565 BLAKE2B 6ac243a37d1d168acb5af08993ea9ebe89003b5d1de5cc123f00f8bb09df9d106164c6b6fef4ab4923ec85b756efc175ad6ec5235bd0985f3af214003b27a33a SHA512 65e8db68004013282e5db56040eb37ec7d1016c5057accc2a1f512b72d66e0de1967cc6ec2ced38cadcd700e21a2c1b2c0206004eb72c26f2bd4b134eda9f77f
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index 78ce128bfb47..8edd4804382a 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest
index 2f9ecf80d2f0..1f3f64f99f82 100644
--- a/dev-python/txtorcon/Manifest
+++ b/dev-python/txtorcon/Manifest
@@ -3,5 +3,5 @@ AUX txtorcon-0.19.3-Removeinstalldocs.patch 1755 BLAKE2B db819619ede7aec946226cb
 AUX txtorcon-0.19.3-Removeunconditionalexamples.patch 964 BLAKE2B cde8fdc85b3809917fefc21603a4de86119ab54dabad0e1258c8a387c632bd034decf1ea0d6a0a829246cacefd8651b84d1aaf10b55d2e5423d6ded58b92bfbd SHA512 3131dce9b4f3bf15d09ebc87b323c06bdc30a833ab7c6a964f31599d0b21fd5baa0c696af1356db58677c58d803033e786a80db1d46444d92b91a9fee2736cf6
 AUX txtorcon-0.19.3-setup.py-Dontinstallthetests.patch 680 BLAKE2B b26bd4e41d8f3b8b9e795e77475c93bb8f8a1ce138c1fbf83af9d3ece46f031e94e90db35e0aa057594004e80d4413c4853d7b3cd7c41b784ac5a40f6a843d8f SHA512 95894caa6c9e6f3f3a2744a1388397b0ff7298bd508579411ce2cb93ea6f990e6068806ef8d4a9fe959b235ed68402925c731beb9ff9b638a8d6ef2c10709eb8
 DIST txtorcon-0.19.3.tar.gz 265716 BLAKE2B c0778c918689906c1066f714f4c6621f176cc413b0ebbe628201727cb7ae24c8f1b5a8a5a030b5cb48b2cea96e29f2f7bb5a54744e36324a938841b11f44474b SHA512 748e23c25c0b287467e0fa7db6ad69a8af7010957a846141b9360b71af0d279153ff401b85d135e7e66171e81117ebc56406e64e660aeda7dde8cd430d0a7254
-EBUILD txtorcon-0.19.3-r1.ebuild 1927 BLAKE2B 1f9a2fc26bf3207dc8f2b2c0c6d1fbe5e67c31aeee1b09f918809871df41abfe9daedaf3c4edac502872d17afd746a054fa41dfe12b68f08a6d95b6705bb71d6 SHA512 d25fad260b248ce92a52122295ec320842796ce1ead02713b8fcf07f3ab3360939ae515e706ad680357d341fc34ab507780e95fe74cfb45596dc552702e8fa70
+EBUILD txtorcon-0.19.3-r1.ebuild 1934 BLAKE2B 714ebd0e85a3727d29fb7f7ec8d09fc961ce0294fe15fb8d606c9e9a15f997ba2481edf625c8c2c079a45426eaeef1d50dd50038c3bf80755c041705c1d364ee SHA512 59172af336ce2b5ece53520818381fc778ea4a2a9380c73257c4816643626f517b43e369d154d514fb559ae15044f9d40e8068545eca871f0252f282461e3814
 MISC metadata.xml 582 BLAKE2B 639a0ba4ae0800bb132268203f31d2b5e4ac5b60e8fe6e3a195a83ce27b1bdbdf15deb567e555ba1f8f80135949424273720333893452afbb44efad24b5c0849 SHA512 daf770953774400a5d78293eac0ed1dd9cb61bc4b208ba1f7e48085bbeff90605faccf44df83c7ee5822cffb1158479e85131a5d1cd513acfad812a8c4b9bf50
diff --git a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
index 54860fcdb3df..9d430018e40a 100644
--- a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
+++ b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index dee9fe73bb28..e5d1eed2f705 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -2,5 +2,5 @@ DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76
 DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
 EBUILD watchdog-0.8.3-r1.ebuild 849 BLAKE2B 7e3a8f978f94fb64e99fcf6723ac1c50f1a202e84647f9520afb276f8983e291d8ecf8f1c96467a39cd0c384f2593874930b932ba8c738f473d137aa91c4c4c7 SHA512 cc9daaedadc680b9c05ae3bd81be4fd38f5090e4d86190a340474a3cfe247a2625adc460b96e39f595a1696bb24496c10fe2b6aa1cb16db8caa4c3129279e100
 EBUILD watchdog-0.8.3-r2.ebuild 853 BLAKE2B 283e1d9488a9bf7b9d2a2b26653cb120e8a12e67728053e5e082eabf819553cc63fac344b2f0f1a793291555771b7b725e29424b2359a54eb36110670b7a018d SHA512 14beeca18f04df2958f720cca9214fb1b8c7936f399021aaee95e883acf56fff7b5a551f7897c39a37f5e6779106124e30fad7ba6ff83fa963d4e57eb499eda5
-EBUILD watchdog-0.9.0.ebuild 931 BLAKE2B 951a405c972e71e02ead554a0245107ce757b85c3d6eb6bbd3d092158ad1f9a424dc1e750412201f48582cbc64787b65753842e1f7e27ae9591a072eb1709398 SHA512 ed7f99d9ede6a755b73e0289bc27e00adae62913155a81d15a1dbe63fce01821f7be42ab01cc9cb8b42da0e9c2372e09db877d494d22ef904c184554768592fa
+EBUILD watchdog-0.9.0.ebuild 938 BLAKE2B 3cacbfc4af7cf5e6dd605f3f8acb3a14d2e332379c19d5f8f4698f140e946a13b8bd54208ebb24bf4af2b16c0cb3bc38a58fe3b50d9e76de0cc609663752a3e0 SHA512 3d969bf4becba8d6c787fb68b2c98e32cbeeaf1b93caaa88ef678a238f54766bcb0397cf241414fa172bd71b6451837259974b1ba0ccd8d0c33739a1361617e0
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.9.0.ebuild b/dev-python/watchdog/watchdog-0.9.0.ebuild
index 0d02a7f7efc6..3f69c35283a1 100644
--- a/dev-python/watchdog/watchdog-0.9.0.ebuild
+++ b/dev-python/watchdog/watchdog-0.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index 28597ba597f6..0a317649e3ab 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1,3 +1,3 @@
 DIST wsaccel-0.6.2_p20170108.zip 21344 BLAKE2B ecb8ef7888fb2ca8e6566d2b3fcbd3911a0df5a8c9f4be86a3cffb95afc31603c2477bd983f9d24ee7cf48c33cbcfb10068c38640ee2a888f46402756313cf29 SHA512 d0cf13360bd6cc0b51b8bee1d36a8ee544816c318e828bf6129ff85827636642cfebae4ef0e99d841cdf64f6c67006a649994804aa42d3d76e977a861aafb3b9
-EBUILD wsaccel-0.6.2_p20170108.ebuild 714 BLAKE2B 7ef33294f7a27e0a8c919bf980cb834a98feaaa718b2410b9c588e18372b3212c0986140bea1881db87eb4905652bb765b5cdc9edb0aa6d56701e68ef9e772da SHA512 b203e9aa57c81b66d4ef13c707d4623a3085ed94de5daeaaab622806fdfe7faa329288459cc04ac7e744b3ddc7b27a0a81406f737021eb30b51ad73d811202f1
+EBUILD wsaccel-0.6.2_p20170108.ebuild 721 BLAKE2B f9eb5a1780b77b914cfd63e4925c06c218642eefdc78d27478652eae684e0e3ef7207acb54dce62559a99aefad1ce09cdbe6deb0fb96a58aa4847349b8fdf39d SHA512 38b0c524f3eb563af1c7a96a812e51105d41bc08f0afff914e0a485011f9177183cc6996797c5c8ed8c2262a6681fc740a05b4d799254e37e1b73dee97147bda
 MISC metadata.xml 377 BLAKE2B 9e994c8b6d0e89336fd1f2998f8544201ccccf3d647f3600e57ffddf21fb75e05bc3f8ffc2634dda9be9ba78709ac634d8d642cf110edd382d24ae055d860fc0 SHA512 cd6ff7d5e94219b550161b57a1c6f3736a8c78906a81a5e293046b9b3b454f97c1fb41dd7eb7034f45ab784c22189e3788f2e8d9c17a725743936796af3a4d6d
diff --git a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
index 3423950a545a..56673cfd1393 100644
--- a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/methane/wsaccel/archive/${COMMIT}.zip -> ${P}.zip"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index b549e2a0a315..8b743560dfd5 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -2,5 +2,4 @@ DIST WSGIProxy2-0.4.2.zip 18817 BLAKE2B 90334926b726024c1a16b066d11cfe579ad80515
 DIST WSGIProxy2-0.4.4.tar.gz 16475 BLAKE2B 8cc91e8364204a03fb8f80abb926e69112c2224b595c695d25e2fa54553fe9c82e3420f68b58f266d04450dd49a6dbf9257c190da8645dfeee976ae101fc708b SHA512 6ae9fca65fe80f52924f42b26b447631e8c278f517ababc23d26e5f8598d6d9b7975197ec74faf64f2e051824366ac14c5db5727a014a187c70a1b4604105b42
 EBUILD wsgiproxy2-0.4.2.ebuild 1293 BLAKE2B 586a922155ebd09cda769b034782a566fc30ecde3b1843cbd3fe79a83b8ba2301cdc26873ea81de328c44da0e24e3ea007b13698f7d0d4ebd83f73632fa0109a SHA512 3c9bb2405c765a29d2c37ea45c0baa2769eefc2e1dc1c121cc2e43b2701c5d54dc903d0ee5b4c30961fceb916f9b368c51d7b0bdad8d15ca0b85be19d0ab05d5
 EBUILD wsgiproxy2-0.4.4-r1.ebuild 1311 BLAKE2B c5396a4a1329201da256cd167959aa440cd7acc8370eb3415b53aaf06318bdbbf37ad62097d746e1c89491846e9ca7b3767946c3b4df989e177aeb7489223f02 SHA512 aa37ca4f2508f90afee59d5b4a46355db9fcb30e214426bf6b024eef651e19b11a667dd86436365fc3d28c91be3ed07c1d5d590c6bdb9e41793b522941986a54
-EBUILD wsgiproxy2-0.4.4.ebuild 1305 BLAKE2B adf1f8b5434b63019d5911fb0980c70aae06a6b6188992f0ccd6b0bb3bc3c2ea7a664bbf7facbb3d414b74d6c7d04a48a85f0c712441254221636b74781a6caf SHA512 b27af464f924f041ed3bc83e0e9a9745bf834d557c7007ca2adaa0b82948a62f3c15169531ca9e61b6d1bf98760010cd61470f61fee0a3a1312ce2117f2787ea
 MISC metadata.xml 313 BLAKE2B 45cd2545e5d5b03206c8c3f2db35c0a95ce08f6c29503c19deee7ebc90f578a8a68bc9ca98a504661d09866ccc0217067643efb84e99cda9d1678231ce01a79e SHA512 147915d551dc542cb68d4cab97a3b187ef698dc450cb730c80eec846e4d4debc954b68d04f76e1df835fcc4d179d705ee95379b38c7d39d0f1ffce809941a7c4
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
deleted file mode 100644
index ab15f36c7cc4..000000000000
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MY_PN="WSGIProxy2"
-
-DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
-		dev-python/socketpool[${PYTHON_USEDEP}]
-		dev-python/restkit[$(python_gen_usedep python2_7)] )"
-# Tests needing restkit are skipped under py3
-# Testing also revealed the suite needs latest webtest
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 9cc49cc3373c..642f8e5a2309 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -3,7 +3,11 @@ AUX wxpython-2.8.11-drop-editra.patch 2197 BLAKE2B 055cec606028e20e613109f3edf45
 AUX wxpython-2.8.12.1-disable-egging-mode.patch 1146 BLAKE2B dff061c8680a3c1a9c9731c8d80acc93f8562ed70e8bb98527b78f0f3813372f6179d8f5e348870cec25c24c961213f7e5db4755b8b79648aa251199b275226d SHA512 a834a2c3f009f6855755bd07b54683b8f3d9dc58ee9d0631e51c0450e3bac98245e4dab0e40820ba1727b6a0d8528675443c986d7fa4f7c58d606d60975e4190
 AUX wxpython-3.0-wxversion-demo.patch 147 BLAKE2B a02fcf87c8b153b3a3fd7abfda117f988fbdafddbeefe47e77adeef6201b0c037c51ee7f4b7fa3d57a92e70b7518ce6fd7148f11d2b53d96fe085d8d366021df SHA512 99682f18a520b68b313301784adaf71c1ab9181022b743de82c9cc6acfaa1fc77867ef43c00926f6d7bdde8ed29fac24b5eb72761209a2e2a1d498feee85a0a1
 AUX wxpython-3.0.0.0-wxversion-scripts.patch 4187 BLAKE2B 07601322f2e71fb6af40172ed64efe5e0b0d32d30556ce821b0a835ae545c016df5974c5aadf6e8810ffc651b5ca8bda47729b1f7589947d5dfc0ad0dfd21771 SHA512 74fe603daafdbc5a50daaa3411ea40243d1fdee2cb3bbd0e6e99bd73bd124137161cd682673f2c727faf92214bfa4d27c059021f19c92c581485bb1d6a5b49a6
+AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
+AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
+DIST wxPython-4.0.6.tar.gz 68815031 BLAKE2B 49367f5d0867c28893c43d54c4ad6001807bdc95d81327082e3c88fd796e5e2daafcf6b70252828bdcfaaec8b42ba64e881575d209eb4f61a85f58ebd79e8ae4 SHA512 bfe799e1a0987cb57f2e31199cdb522471aaa08bb3b642fdf4130f4219b81487d4b6252f7a8afd3af7cdaeef2e992cecfc581e97d8b42307a4e0a8c9009db301
 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
-EBUILD wxpython-3.0.2.0.ebuild 4607 BLAKE2B 9fc253616df9ce7f73e9be44845ed263064c5f23db112b8b9d42cec9ee3af534828055da1dd3b8448ae8628dc392678bbaef32af109fc60b33b9e0b8d3b44946 SHA512 fa4c4287c2d6f9e913eed285a0995346c2202a54724647e0c1fb172f40333c6b4223676430712a072e4083ecef6a81e08f9e684a0c1d6291f5413553d8037d52
-MISC metadata.xml 546 BLAKE2B 02ee62901e80f3a686978dd94f87e6330a88f0f7a6bd34b515b10251c9e837ca74944e9287cba9cafa842744522fde028a553e48b768b174a877a57623ff63b0 SHA512 a30e3f30a3cafb99a1adf04bd5b77b7770d6face33299e226102e40f69312e285d5a4fae6cc58ca8d971d6695cce65a65655f70099af4212a0c6d387cf0fe942
+EBUILD wxpython-3.0.2.0.ebuild 4603 BLAKE2B 2bf6c068b38efcfda0d6a6f95e27d7a6b72ac5dc0f013ce01ee750720919314e60930a5ccc46b13734c09669ccc2cf7b2b344c650867535028f62908c4e392f7 SHA512 68033a3e0b684276f68159b8d9f58d0c35aa082b993598bbc664b10572d011b1c80b503adc4fa5cae2b95d8780724790064ef1acf9062d51031a59b574f98f81
+EBUILD wxpython-4.0.6.ebuild 2402 BLAKE2B d45ecb93d4890b4aa9a32fcf8d739e9bdfe928db2838a412f90e83dac9e8636c1c1ca68bfcf1baab7a0ed2cf5b4137047d6e263eaa4405b2966e2aa3a304a327 SHA512 f8dcb2bc80b1fb01f0dda282e703e4261a916ad392fa2f191341bd36b1e98208834369ebc84d29a884337d3a10d5b88808a7f540375dd6f4d7afa13b775903d8
+MISC metadata.xml 658 BLAKE2B a115ae210604ca2165d0c50cd7eee27170b2f9f235fa159f15812782b741c1481c0f806b951a30c5da43e45a2873ab4d2a09d44de2daaebeacac3e90aaa1a125 SHA512 c9b36cacc2cc3136637483886bbe0198934e5c9dc99f854de49cef263fbfe75a5a8452a9de2752fd55a43dbac4d5bd8bce32d3cadb3f6b14614c171188473270
diff --git a/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch b/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch
new file mode 100644
index 000000000000..795de3a933ff
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch
@@ -0,0 +1,27 @@
+diff -ru wxPython-4.0.5-orig/wscript wxPython-4.0.5/wscript
+--- wxPython-4.0.5-orig/wscript	2019-05-18 22:03:12.000000000 -0400
++++ wxPython-4.0.5/wscript	2019-05-22 07:59:46.522966555 -0400
+@@ -230,15 +230,6 @@
+                        uselib_store='WXGL', mandatory=True,
+                        msg='Finding libs for WXGL')
+ 
+-        if cfg.checkSetup(wxConfigDir, 'wxUSE_WEBVIEW'):
+-            wv_libs = '--libs webview,core,net'
+-        else:
+-            wv_libs = '--libs core,net'
+-        conf.check_cfg(path=conf.options.wx_config, package='',
+-                       args='--cxxflags ' + wv_libs + rpath,
+-                       uselib_store='WXWEBVIEW', mandatory=True,
+-                       msg='Finding libs for WXWEBVIEW')
+-
+         if isDarwin:
+             conf.check_cfg(path=conf.options.wx_config, package='',
+                            args='--cxxflags --libs core,net' + rpath,
+@@ -591,7 +582,6 @@
+     makeETGRule(bld, 'etg/_stc.py',        '_stc',       'WXSTC')
+     makeETGRule(bld, 'etg/_html.py',       '_html',      'WXHTML')
+     makeETGRule(bld, 'etg/_glcanvas.py',   '_glcanvas',  'WXGL')
+-    makeETGRule(bld, 'etg/_html2.py',      '_html2',     'WXWEBVIEW')
+     makeETGRule(bld, 'etg/_xml.py',        '_xml',       'WXXML')
+     makeETGRule(bld, 'etg/_xrc.py',        '_xrc',       'WXXRC')
+     makeETGRule(bld, 'etg/_richtext.py',   '_richtext',  'WXHTML WXRICHTEXT')
diff --git a/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch b/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch
new file mode 100644
index 000000000000..22a56162726b
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch
@@ -0,0 +1,91 @@
+diff -ru wxPython-4.0.6-orig/unittests/test_frame.py wxPython-4.0.6/unittests/test_frame.py
+--- wxPython-4.0.6-orig/unittests/test_frame.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_frame.py	2019-05-24 10:15:51.350004356 -0400
+@@ -50,7 +50,7 @@
+         f.Close()
+ 
+ 
+-    def test_frameRestore(self):
++    def xtest_frameRestore(self):
+         f = wx.Frame(self.frame, title="Title", pos=(50,50), size=(100,100))
+         f.Show()
+         f.Maximize()
+diff -ru wxPython-4.0.6-orig/unittests/test_graphics.py wxPython-4.0.6/unittests/test_graphics.py
+--- wxPython-4.0.6-orig/unittests/test_graphics.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_graphics.py	2019-05-24 10:16:06.520256643 -0400
+@@ -23,7 +23,7 @@
+         gc = wx.GraphicsContext.Create(img)
+         self.assertTrue(gc.IsOk())
+ 
+-    def test_gcCreate4(self):
++    def xtest_gcCreate4(self):
+         class MyPanel(wx.Panel):
+             def __init__(self, parent):
+                 super(MyPanel, self).__init__(parent)
+diff -ru wxPython-4.0.6-orig/unittests/test_lib_pubsub_provider.py wxPython-4.0.6/unittests/test_lib_pubsub_provider.py
+--- wxPython-4.0.6-orig/unittests/test_lib_pubsub_provider.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_lib_pubsub_provider.py	2019-05-24 10:16:49.649969339 -0400
+@@ -49,7 +49,7 @@
+ 
+ class lib_pubsub_Except(wtc.PubsubTestCase):
+ 
+-    def test1(self):
++    def xtest1(self):
+ 
+         self.pub.addTopicDefnProvider(my_topics, self.pub.TOPIC_TREE_FROM_CLASS)
+ 
+diff -ru wxPython-4.0.6-orig/unittests/test_lib_pubsub_topicmgr.py wxPython-4.0.6/unittests/test_lib_pubsub_topicmgr.py
+--- wxPython-4.0.6-orig/unittests/test_lib_pubsub_topicmgr.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_lib_pubsub_topicmgr.py	2019-05-24 10:17:18.276438743 -0400
+@@ -215,7 +215,7 @@
+         assert 1 == topicMgr.getNumDefnProviders()
+         topicMgr.clearDefnProviders()
+ 
+-    def test20_UseProvider(self):
++    def xtest20_UseProvider(self):
+         #
+         # Test the use of definition providers for topics. We create
+         # two so we can check that more than one can work together.
+diff -ru wxPython-4.0.6-orig/unittests/test_sizer.py wxPython-4.0.6/unittests/test_sizer.py
+--- wxPython-4.0.6-orig/unittests/test_sizer.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_sizer.py	2019-05-24 10:18:03.937181671 -0400
+@@ -71,7 +71,7 @@
+         self.assertTrue(items[1].IsSpacer())
+         self.assertTrue(items[2].Border == 5)
+ 
+-    def test_iter(self):
++    def xtest_iter(self):
+         bs = wx.BoxSizer()
+         widgetlist = [wx.Panel(self.frame) for _ in range(5)]
+ 
+diff -ru wxPython-4.0.6-orig/unittests/test_utils.py wxPython-4.0.6/unittests/test_utils.py
+--- wxPython-4.0.6-orig/unittests/test_utils.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_utils.py	2019-05-24 11:14:09.399035368 -0400
+@@ -34,7 +34,7 @@
+         with wx.BusyCursor():
+             self.myYield()
+ 
+-    def test_utilsSomeOtherStuff(self):
++    def xtest_utilsSomeOtherStuff(self):
+         wx.GetBatteryState()
+         wx.GetPowerType()
+         wx.GetKeyState(wx.WXK_F1)
+diff -ru wxPython-4.0.6-orig/unittests/test_windowid.py wxPython-4.0.6/unittests/test_windowid.py
+--- wxPython-4.0.6-orig/unittests/test_windowid.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_windowid.py	2019-05-24 10:18:24.158508491 -0400
+@@ -28,12 +28,12 @@
+             assert isinstance(ref, wx.WindowIDRef)
+ 
+ 
+-    def test_newIdRef03(self):
++    def xtest_newIdRef03(self):
+         """Check that Auto ID Management is enabled (--enable-autoidman)"""
+         # This test is expected to fail if autoID mangagement is turned on
+-        # because a reference to the ID is not being saved, so it will be 
++        # because a reference to the ID is not being saved, so it will be
+         # unreserved when the first widget is destroyed.
+-        
++
+         id = wx.Window.NewControlId()
+         b = wx.Button(self.frame, id, 'button')
+         b.Destroy()
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index f6588d2f5c36..7012622a0818 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>wxwidgets@gentoo.org</email>
 		<name>Gentoo wxWidgets Project</name>
@@ -13,6 +17,6 @@
 		<flag name="examples">Install interactive demo module browser and sample applets.</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">wxpython</remote-id>
+		<remote-id type="github">wxWidgets/Phoenix</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
index 7e8f2b8afb56..598fdd3d4b3c 100644
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="wxWinLL-3"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="cairo examples libnotify opengl"
 
 RDEPEND="
diff --git a/dev-python/wxpython/wxpython-4.0.6.ebuild b/dev-python/wxpython/wxpython-4.0.6.ebuild
new file mode 100644
index 000000000000..04e6a637c7d4
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.0.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# wxPython 4 supports python 2.7, but because it's going EOL soon and to ease
+# transition from wxPython 3.x, we make this package py3-only.
+PYTHON_COMPAT=( python3_{5,6,7} )
+WX_GTK_VER="3.0-gtk3"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets
+
+MY_PN="wxPython"
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="http://www.wxpython.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="wxWinLL-3"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="test webkit"
+
+# wxPython doesn't seem to be able to optionally disable features. webkit is
+# optionally patched out because it's so huge, but other elements are not,
+# which makes us have to require all features from wxGTK
+RDEPEND="
+	>=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	virtual/jpeg:0"
+
+DEPEND="${RDEPEND}
+	app-doc/doxygen
+	dev-python/pathlib2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		${VIRTUALX_DEPEND}
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
+)
+
+python_prepare_all() {
+	if ! use webkit; then
+		eapply "${FILESDIR}/${PN}-4.0.6-no-webkit.patch"
+		rm unittests/test_webview.py || die
+	fi
+	# Most of these tests disabled below fail because of the virtx/portage
+	# environment, but some fail for unknown reasons.
+	rm unittests/test_uiaction.py \
+		unittests/test_notifmsg.py \
+		unittests/test_mousemanager.py \
+		unittests/test_display.py \
+		unittests/test_pi_import.py \
+		unittests/test_lib_agw_thumbnailctrl.py \
+		unittests/test_sound.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	setup-wxwidgets
+}
+
+python_compile() {
+	DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die
+	${PYTHON} build.py build_py \
+		--use_syswx \
+		--no_magic \
+		--jobs=$(makeopts_jobs) \
+		--release || die
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}
+
+python_test() {
+	virtx pytest -vv unittests || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index de6e542753ab..b198667cc457 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -2,5 +2,5 @@ DIST XlsxWriter-0.7.8.tar.gz 233091 BLAKE2B fb5c3f50d56bf20633ceeade3be070028b11
 DIST XlsxWriter-0.9.8.tar.gz 236187 BLAKE2B ff6f7392a72fe00107d2dfdc17a4d17f6505f9961e518115bf88412194ee8f32364709ee3da0756a7de038f1a699e32c000831b58aabe608564aa7171c20f702 SHA512 05c372c25142dc6726fa5475cdda433f5ecae1d0f92f87c50ca7bc26fb99f8ae369a1a8cb6ec5e909280c81f32c92ac23892fbd6326b8e1cf032abcf42c0d894
 DIST xlsxwriter-0.9.8-tests.zip 28345992 BLAKE2B 0cda3578f69ecb152d6f30da6f2ab9c6eae33f4f303f2c9b7fc1bcd661e07722031b8eb35e7e57ffb04c84f6121f3f304c40379f891a0f9c50667503391f8e6d SHA512 a30cf917642100d3ffb9616809e4860593ccfa271beed0baa757ccf6f0822af05daf602d67773ce1b5af020ead108bf7a844dafb426c020c9adaed19cc7aad29
 EBUILD xlsxwriter-0.7.8.ebuild 804 BLAKE2B 502fefe93c1d1fab6a357726d4a1934ec50cd1c1d99a3bf48d81d780400c7ceba4a5068f06ff6ed715abe3fc21e3660a9a57249a1c4f19c503609ece7776e6dd SHA512 3f3bb270da81cce327bd7c7577357d60843831e4a59116d6bf40bf9178b5251153e0660bb5c57998a36833ef59b79b54d9397222606ce379e0e7b7da3a2e7d97
-EBUILD xlsxwriter-0.9.8.ebuild 935 BLAKE2B 5583a8f80ebf3f2f58c9b282c6fd9d5ee899ed0aabc12b2e3c9166c940ae050b0b01575076972f65aa3f53c05354a38b987b2c12a97b53713766f9b58cc9da67 SHA512 8375a37297c1e12f66d9d14ada8a019cadd237969be80a0aaec9d29cac891ce0034b95be242b7006a3bd37ad1eff4573502e26743bd728ac985879763e68c87d
+EBUILD xlsxwriter-0.9.8.ebuild 942 BLAKE2B 3ad61dc7dd80b4bf97612dc5b7f605e47f0df370505f6ee7c4a26d175827501a16d8e82c39d04de0a6f58f3a95459509a458fcac8cde612970531156a17d5d8c SHA512 65a4aa34ff6cd823c8f374806de3f69c2588b0dff5474fabd0b9fee1adf6cd8970884ac54a55a1245a166f33a6913b48ef8c45e565d6f6361758f8e500bf15be
 MISC metadata.xml 385 BLAKE2B 29615c2fcc24b4ee0ab796762a67d1e1a09b4208b18cc13a000b3e7380d5e56c74020436801a41e33a74b0122c3c2872e22a643c1a2fc724ebb6064170ab5c5e SHA512 62eca3ef002307f383a6c074c3dd956d9035488e1eeaaa4b0e20a6c4d7c328568a2178478e0a97d6b3bfef0c9673a1ae2b58ea39e4e5a2c111b0a34c44398545
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
index 6df715810d92..859abebdd9c7 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/yapps/Manifest b/dev-python/yapps/Manifest
deleted file mode 100644
index 1e64967e36ba..000000000000
--- a/dev-python/yapps/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX yapps-Convert-print-statements-to-python3-style-print-func.patch 1572 BLAKE2B c1375ca4ad6a6d7430044f3bc3c29a7f62f06404d64f689a83cd4ff10781f51d4d0dc287c466a622933af7f360c6ce81ddafbddffc62c57d73ac7bc3008a2eb4 SHA512 36ab43698fc637cd52287c6649be064b04374a22b9e459a53f3e04850d0cf8276e042e45994a3d2e0d0c97e57478321631475170dfe3e8efa8debd3d32ea80a3
-AUX yapps-Don-t-capture-sys.stderr-at-import-time.patch 1088 BLAKE2B c00fd5b4834b600127f7eedfbc4a7f65716a412cb1a2011ce36ecfde10bb54d171028c47ea04be2065b7cafa9e612e16e633ac701166506690613e5569a3f651 SHA512 b3a3de5bc11cfc8926e430ab5d8834f00a15362e7a108ad11d40a2c6f804d51ddffbb467dbe1c767b345c3451f4feef642e1b55a735c5cb85c405e8c3c7c0107
-DIST Yapps-2.2.0.tar.gz 13630 BLAKE2B b1c3370c0a91febc7ab567fa9af05150f74d19e4de18d09e41ff7e361b06f8bd9aed0ad5ac01f9d1c46bdb381af57cfe11603ebf534b10979a16a5211171a31f SHA512 087f99071b2615f5382f453d9b3492675704aa7e7ff54b332d7c4e337e16fbd3ab3c1b3820a7941775c0b3ecf7e255a7773cb47ea20e8adb77dc3dc8d9a49faa
-EBUILD yapps-2.2.0-r1.ebuild 686 BLAKE2B e2484dd44cdb697ee6a60e21aa0f376ae703ba6743168ef5c3db7cf510d986bc23446b5a03441f38ee832cfeb9732d7aea34e79f4778de472e425aad18c6ae9c SHA512 6dd0beb74a1a3f3f7d9f8c67cc0c914f70f31253763dc3ecd7b2b4d1ad49b6a1c2638934e36b3f51e33e28fae1fc66beb325ee7f93472eed2a9f8499bc93f820
-MISC metadata.xml 373 BLAKE2B cddb77338531df2a99d22a48d6d5e18cf9fb0f738ea840ac46945d7ca47626a2f4f57d8878898cfcbc0993286753cbbf71e45c66f88fd1e410471bc6671c16c2 SHA512 546f07634ad9ddbbfd3b95c8494f1592f1f38aaaa83f2325a6d0e03bbe64bad498fefef02082c5df8e075763b719993bd09c980f1cf9fdcde433113280edd74b
diff --git a/dev-python/yapps/files/yapps-Convert-print-statements-to-python3-style-print-func.patch b/dev-python/yapps/files/yapps-Convert-print-statements-to-python3-style-print-func.patch
deleted file mode 100644
index 4bff7f8f40dd..000000000000
--- a/dev-python/yapps/files/yapps-Convert-print-statements-to-python3-style-print-func.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d051588873a54860cfb86ec0d330f7d855336618 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <julien.cristau@logilab.fr>
-Date: Tue, 2 Dec 2014 10:41:05 +0100
-Subject: [PATCH 2/2] Convert print statements to python3-style print function
-
-Signed-off-by: Julien Cristau <julien.cristau@logilab.fr>
----
- yapps/runtime.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/yapps/runtime.py b/yapps/runtime.py
-index 58017fe..5d40581 100644
---- a/yapps/runtime.py
-+++ b/yapps/runtime.py
-@@ -178,7 +178,7 @@ class Scanner(object):
-         file,line,p = pos
-         if file != self.filename:
-             if self.stack: return self.stack.print_line_with_pointer(pos,length=length,out=out)
--            print >>out, "(%s: not in input buffer)" % file
-+            print("(%s: not in input buffer)" % file, file=out)
-             return
- 
-         text = self.input
-@@ -201,7 +201,7 @@ class Scanner(object):
-                     break
-                 spos = cr+1
-         else:
--            print >>out, "(%s:%d not in input buffer)" % (file,origline)
-+            print("(%s:%d not in input buffer)" % (file,origline), file=out)
-             return
- 
-         # Now try printing part of the line
-@@ -230,8 +230,8 @@ class Scanner(object):
-             p = p - 7
- 
-         # Now print the string, along with an indicator
--        print >>out, '> ',text
--        print >>out, '> ',' '*p + '^'
-+        print('> ',text, file=out)
-+        print('> ',' '*p + '^', file=out)
- 
-     def grab_input(self):
-         """Get more input if possible."""
--- 
-2.6.4
-
diff --git a/dev-python/yapps/files/yapps-Don-t-capture-sys.stderr-at-import-time.patch b/dev-python/yapps/files/yapps-Don-t-capture-sys.stderr-at-import-time.patch
deleted file mode 100644
index 1e25a0059409..000000000000
--- a/dev-python/yapps/files/yapps-Don-t-capture-sys.stderr-at-import-time.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 482faec17f1c69784d8cc2757a79809458d71154 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <julien.cristau@logilab.fr>
-Date: Tue, 2 Dec 2014 10:40:01 +0100
-Subject: [PATCH 1/2] Don't capture sys.stderr at import time
-
-Signed-off-by: Julien Cristau <julien.cristau@logilab.fr>
----
- yapps/runtime.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/yapps/runtime.py b/yapps/runtime.py
-index 29f91e7..58017fe 100644
---- a/yapps/runtime.py
-+++ b/yapps/runtime.py
-@@ -168,10 +168,13 @@ class Scanner(object):
- #			output += '%s\n' % (repr(t),)
- #		return output
- 
--    def print_line_with_pointer(self, pos, length=0, out=sys.stderr):
-+    def print_line_with_pointer(self, pos, length=0, out=None):
-         """Print the line of 'text' that includes position 'p',
-         along with a second line with a single caret (^) at position p"""
- 
-+        if out is None:
-+            out = sys.stderr
-+
-         file,line,p = pos
-         if file != self.filename:
-             if self.stack: return self.stack.print_line_with_pointer(pos,length=length,out=out)
--- 
-2.6.4
-
diff --git a/dev-python/yapps/metadata.xml b/dev-python/yapps/metadata.xml
deleted file mode 100644
index 335bb8d11a4b..000000000000
--- a/dev-python/yapps/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">Yapps</remote-id>
-    <remote-id type="github">smurfix/yapps</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/yapps/yapps-2.2.0-r1.ebuild b/dev-python/yapps/yapps-2.2.0-r1.ebuild
deleted file mode 100644
index ce36d639e2a9..000000000000
--- a/dev-python/yapps/yapps-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-MY_PN="Yapps"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An easy to use parser generator"
-HOMEPAGE="https://github.com/smurfix/yapps"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-Don-t-capture-sys.stderr-at-import-time.patch"
-	epatch "${FILESDIR}/${PN}-Convert-print-statements-to-python3-style-print-func.patch"
-}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index d2d115285188..52b14095523f 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 770fa3694012..e834907f5dac 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 EBUILD assistant-5.11.3.ebuild 1199 BLAKE2B d0d2c32af3904215f9c1bb9cc1b3fd916e6fa55a1707a0d6959816faafaced118ac30b946df5fe8250ce19058a9b66ba0ecdd37adb3a5d11640ad9be397bc187 SHA512 f675d5c910754521aafcca73d44645f4e45948a8f9ce13689d7fa558c270383b493b2d42ba8fad4d78bb65e3dbf6e8115980a3d677c641671959e25832303f06
-EBUILD assistant-5.12.3.ebuild 1202 BLAKE2B 5940a629c8f8c565859f45f889d2dc25098f7b28f3a5ebfe671245ce81b845b0a5b9c26d2ba7aa0af19fca3c105ab29f94ebfc282c1ab66332abc0de5506a330 SHA512 7ae10138415d4adb0cb8feb0ad62fc7edddca260151a86a0101189b38608a3fc2390b8e9b78016de3759846c523b885943ce8c438725b3e29224e957697f3483
+EBUILD assistant-5.12.3.ebuild 1205 BLAKE2B dd1a5d11b0013c8ba346773c86ab070d40df799e6aed7172e6a10a2cec777f4e3bb79fbcc3b2ee20ce6420c78a556f9203eb700114ffd6742476ece9c2b3d115 SHA512 7314e6ba565a1e7de39baf16f9e0e09ad999a6d83dc5a7c9bb9c06958f01d8de138b730b6c6f040c5de370f3e35311c399750834ef1bacf013b0109f5ab87d4b
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.12.3.ebuild b/dev-qt/assistant/assistant-5.12.3.ebuild
index 6d109d6a499a..88f985ea3db6 100644
--- a/dev-qt/assistant/assistant-5.12.3.ebuild
+++ b/dev-qt/assistant/assistant-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 16556a385b1c..b753b5420026 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 EBUILD designer-5.11.3.ebuild 1236 BLAKE2B 408db3ba570f06df562e0f204844361a617991a6c131275903aeadbd84907c1711ed369bb18e1b5b1a50546c3815e52be2abb4831937bd4d47a8b4fc2c3ed088 SHA512 e0a4208ba68e5a0d40a7e4c4c01ba25bab0e9b36d39d61b38b09dd63c521b5dbfd5141dcb7d00abb195cd448a58f5c4b2569e2656f1d591fb0cebd94c1ac4796
-EBUILD designer-5.12.3.ebuild 1268 BLAKE2B dc5640121b1102545d9a075f0689ca277c93616a8c7b53edb165097f36de64a6c2adf286f8658db389e32456af00420779f9a1cec1de57771f42f5e17d646519 SHA512 9c71099607aaad5e0e4234dbf83f96d0398ea7a4e0ff48815c75fcf8f3cf0111164a0167efaaa4de0e9734a2f53aa5e5824bc8c2d76ac02e5e2a17659c12a91e
+EBUILD designer-5.12.3.ebuild 1263 BLAKE2B 586dc9fefc0917ce401b4ea0a5cc06aa0d998d625464d3be618f210bd5d6dc94576e2cbae3a2badcc043008d45b78da3a9cd637ee42b8ee2b5c82fe0625ec02f SHA512 d9e97b082053c5c5263ff68bdbd27c6767b91dda472f18d10b48faeb6a9da083ae660492da5a815746772d95e119c16e0719f796ca74b10fe0916b068d57c09d
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.12.3.ebuild b/dev-qt/designer/designer-5.12.3.ebuild
index ba8d912cfba0..a7f0b7a36d83 100644
--- a/dev-qt/designer/designer-5.12.3.ebuild
+++ b/dev-qt/designer/designer-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index c7698b03d9b4..31a8d4630790 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 EBUILD linguist-tools-5.11.3.ebuild 692 BLAKE2B 8a28d9d4d7caf6c8514755b366dff85340e6604d6848d21e02fc044bf00caaf00c02a3f602e029ede62f30435aff140125e761b613b81500303adc6db97be52f SHA512 58a8dde23a539f938d65e5bc6ad56e4cca637b37ca78e355bf15668c58e3bedec577aee132da58aaa79d3f39a02dc22bdb050faa31e61225f5b91e05eb8997ee
-EBUILD linguist-tools-5.12.3.ebuild 697 BLAKE2B db261b00901e57f9204c568fb59c8b1db97a8bef41f3be420c85ed9e0f14685caadd527d5dd58cb8d93a891e8367976d7d9407d9640886e448baa1934ddc9984 SHA512 8e842928ff693fe745bd6da532369b6314689bd89fd93bf1cbade1bf5ef414d0fd18843f216e9dffc63ea7c880992a1537f0a2c73788b965bf9c5a3df94ddfad
+EBUILD linguist-tools-5.12.3.ebuild 692 BLAKE2B 2d67da1e8f6b39d3ed46c04bd5558d18293ec914bd586b140b88b3e5a872f4a78b7108a90b0af26a32e1cbd7e77fd1b75faed361d01b6a8151eb042f4752ef0e SHA512 1059df8232732bc82d996852e1747fbdb74a988e29a43ce9454c938a9f95875f8c90745875dd2ee9bfb03e2b3a7f093735c4356cf6e34db22ac2c996703b94d5
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild b/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
index 7f79197d7425..3c21225330ab 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 14212003093d..a64bada00731 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 EBUILD linguist-5.11.3.ebuild 986 BLAKE2B 54982f6360b53d293e40d34896a7776cf170f57736a08582f49e1d6807e5ecc024abc95eaef7f66b5c2293cc016679946d9b350fced9ad76d68a9d56c2da201f SHA512 de7b35827fc28c919c160078666956708f23459f36a412ed437db0ddc1d1aa3e767b532f4f6d5b2420c1bb590a03a9cb65e03fbc73cece9938a5a91e0d8db1ab
-EBUILD linguist-5.12.3.ebuild 989 BLAKE2B 9fdb277755360abefb41a60245c6c430e3e048c19387692e386341accea96b9fd79aa6c6668722ffb22c2ebdcb17c9b1c0c1d16b47cce3966cf8a8c59be4bf0c SHA512 58efbd046cfad0b765ea6aa158868a3ab54350c8022f3f34e8a9f39159143e3c3c4afd2916494b39ca4e01d057777a3c57b79fec4c728bda40d234a9be937476
+EBUILD linguist-5.12.3.ebuild 992 BLAKE2B 125e0834ed962b84dcfabf5f9adc5aa6413b94df83c493c0bd8b1423e8794fd7b9420d52f2d47617b5b7096e9957c237fcdd96387e877d0e0f2e6a73df463506 SHA512 8148c1ed4246acbbfa043cd0dc84368ce8e4d4a2ced344517d6c52194468d24205e9a9439df0337af6aba611b5054511307ddfcb925503ceea5a8baab3c28a34
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.12.3.ebuild b/dev-qt/linguist/linguist-5.12.3.ebuild
index 28d6c0c8b63e..74ab8afcfa4e 100644
--- a/dev-qt/linguist/linguist-5.12.3.ebuild
+++ b/dev-qt/linguist/linguist-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 06ca16e0c3cd..221ec97118e6 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 EBUILD pixeltool-5.11.3.ebuild 428 BLAKE2B 1e35b6315507d84814796595c57a29ff051741098784b0f6a4429b9ad971f5356d14b061d64d628553a0b7f773b7e3792b488f9889a5de65e0b18fd866bea1a5 SHA512 3e5a94fce4c66749c840d47f750cbb2a47e982bdf8aa0010e05547cbd42995c0068ddb3a5380fec6b174904e5bd0ae97e97baeb6c22c1107fcd2de502e77819f
-EBUILD pixeltool-5.12.3.ebuild 431 BLAKE2B edad964ea748a9ae1f8f2cbdd13fc746fda28c87f344b597cac5335b8bdc4bce1b841521edc826fe01e42df42fa637aaebacfc94251a1bb139ac16a13bfaf4dd SHA512 8df53510b4933b5b550ac253e459c21b4c5d81e8f74575669132396311a192464649ec77c998316be747f83fb332a7221d961416bcb3a49062aa81acd373fe1a
+EBUILD pixeltool-5.12.3.ebuild 434 BLAKE2B 6a7df414b539c912325d89d1ca8786749fce7becc167d86907781d45c53cf4abe1ca507c3916014fcd537ebfae6f97f53a93a12968abd9ef406892489b4f368e SHA512 55b2506cbb8dbb2a2300535a1ee7ac17a42c48dca773cd3b6817e5dadaa1e3ad0a59bd643b80bd83e5a0a37e2411e17305c03e8b0fabca08c745a5a6faad353a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.12.3.ebuild b/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
index 3e68ab764c7c..eb3c472b75a9 100644
--- a/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index b19ad21b034d..6eabf9cd2a9c 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 EBUILD qdbus-5.11.3.ebuild 472 BLAKE2B 149435b6760f7d8b627b6715734b994e3f92dd4369eda7b479b6c755228da69d5db0fffe6a47f919fc7b4254ba13e47530233b190173dc47ff268b291d2a6bbc SHA512 d7eeb8a01de0b55364f3da79f9c34e704f9694fc0cd4816d1bfbf2ee9f14fd47f02637f70380d1f8ab3ebc957de20a63f955596edc6bdd4e7fc9579b08ffe4f3
-EBUILD qdbus-5.12.3.ebuild 476 BLAKE2B 0845c811856959200553d686a21fdafbf4ff06ef0422a7236e5316dfbea573f435c55b03650528373063ff884f22e7feade4d007b5388609ab8c656a0bf4ebc5 SHA512 f19536f2a4834c698d15f1b55bce4057729706f74580b9b4f1a68712af781653d03200219c693df05cd89bd891e9f1f547339b45e69089c122467149578396d7
+EBUILD qdbus-5.12.3.ebuild 472 BLAKE2B 5d8577b9bf1b83d91d540536408fe1c58bad11810603db0de05e73122f74c02bebffd8fde5a14641b72f438f03fa496a1570b618fe154be4fc2d87202d765c20 SHA512 7b7a9b2477b881a3d53c017e6f2945c5283ca803e157d179e84edcb1527ee59df1f70d103a3c01329428074241d2094d9181757f73e8916dd0dc3d1927842b03
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.12.3.ebuild b/dev-qt/qdbus/qdbus-5.12.3.ebuild
index d13d3104c983..05da08bc6125 100644
--- a/dev-qt/qdbus/qdbus-5.12.3.ebuild
+++ b/dev-qt/qdbus/qdbus-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 49be25fba771..d12262dd977a 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 EBUILD qdbusviewer-5.11.3.ebuild 974 BLAKE2B e09257a50b04104b7df3faa6af15cdfa1890ea647bfd3bf56fc0b774a5953c374eb25733fb33ce3f3d8f51330dce1e22db874f77eb3165366b700dd26859d642 SHA512 cc669f6430835675d12801a10627c6a273b2e06d213d2f2337e32b1571e71c97f99c6cd3e48551d828c8dac63973aa2a574a6d95ca3d07972b6ffce722d30882
-EBUILD qdbusviewer-5.12.3.ebuild 977 BLAKE2B d5b9ebd0f2a13e31c4faa9ef7141c278f534e1f1d215e4335c883dba7a82b2b0812646d071ea88b128d5d36dc328c6af750cfa8746bd0ddc8ce051ada8d7a736 SHA512 8eb1b7227c7d812222b25a2ca5e09f1e44bff535ac1072335960b7df34740f020938e73faf0b77ec871da9b00f2351c371e4308eaf8278a5f030a229039aa505
+EBUILD qdbusviewer-5.12.3.ebuild 980 BLAKE2B 93a6f47ee9776d3e267bea561e30fb7fd3186d6d36af77344e858a59c522297c76954e45478c8b2ac21baa6ff3e4031bd72a66fca8133f7a75371fb50d18c6c4 SHA512 a64287b869575b3e37d02ebb8d67bc9a72a3ab72ef06adc7c40549cbfcf212d1daf82f996cd84abacd34f84f90c1e7c04de660db18c500a3cd6daa521c1ba033
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
index 09dd13e84c14..20005933cd44 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index d0e9e909a250..b2816081bc78 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 EBUILD qdoc-5.11.3.ebuild 760 BLAKE2B 830ed12c105003967539020517cfc00eb24ff96166ac431963ac0e359da435a743fc152f3ff1864b266cdfc3eada6e1a6f4e98fb84dbe6af675100b4d15df0f2 SHA512 b2d4025624b5980faff4fbcb294e241b9f7a48625796d31dc2cc94e907351b84d259b6dea3637ae3bb93419313495fed6bd55fa04c80b9ba1eaabefb34ea9efd
-EBUILD qdoc-5.12.3.ebuild 794 BLAKE2B ed770e39139cd4d73f1340a318d6ac94c8dab9d664c642db3569ceeb5eb4751da186c6004df4469f208e77bd4eff21b9a9bbed397372fb4ab27bdc99b581b502 SHA512 a6c7c8a208b3a67aa31f62417880b8aee528cdf7d65ff11c871d4160a9db82f11ee34233b80b26f942c2e4ad381060f245dae806e5e6c9be3050f9672a70796e
+EBUILD qdoc-5.12.3.ebuild 798 BLAKE2B 4150d9cfb7427b9b719266fe4f23a5aa708cde4faed2c9c2da9c1a0edc8c11d0dc48466f232408a03932b2fcef504a1fb78ef01da4596da700e3b7e67caa3c3e SHA512 fdf381372a5774152ddf568f7786f8e4925ecdbef909ab29d542d98ddf5b890c21bf45c0741c545decbaa5be58207001a7ff0be5c31ffc39babd6070e73ba4f9
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.12.3.ebuild b/dev-qt/qdoc/qdoc-5.12.3.ebuild
index 02aa22c368e9..7a3172c33a9c 100644
--- a/dev-qt/qdoc/qdoc-5.12.3.ebuild
+++ b/dev-qt/qdoc/qdoc-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 1ca3d71ab6dc..2a6cef029bd8 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -15,5 +15,5 @@ DIST 5.12.3-0-201904161302qtscripttools-documentation.7z 90350 BLAKE2B 1c66f210f
 DIST 5.12.3-0-201904161302qtvirtualkeyboard-documentation.7z 2090456 BLAKE2B 441efc066138c3a74ea51d23f277b7190a38111494d05446d32150b6e36868c110893e14c16d65394709e3dc24574ebecfbe877bce64c6cd44564799b783e30a SHA512 6707760c1139ee66bc294f8407ec43057aac02593aef939c9e03138cd3874f02d5523f31470ac0ca90e320187feb55a8f23dad8396a4d62026af651e23e7379b
 DIST 5.12.3-0-201904161302qtwebengine-documentation.7z 3831360 BLAKE2B bf7277a93a56f6282c078665c7254266452d09f6495fd9dd8f22946d9fe55f774bdf012df15d43e258cdd0a38a49ba2dd3b350b150b2b480f5dda2ccf3f54eb0 SHA512 9102aa1392a6f87bf8be8e4ac212fca002c9a20cfdddfff0e7df7653781696cfd8d44edf52147b2e389796e05e7576c97bcb9f961c60979f8cd57fff974a965a
 EBUILD qt-docs-5.11.3_p201811291914.ebuild 1935 BLAKE2B ebc4b6a01d96ca7537acb4230b45804cce6fef838aec8b222052657cfb48a95032e269363d138e2e6f981ed48b4b4ac6d2449283c9a253c710951cf30fec01d9 SHA512 83663ab9abeac780df98fd0f5f975705a267efddb5c3780c2b9200d89099be83d615c5fbde3ddd315e56de751337e1cd1c558ec3719d555fcc2c63e2c2cd49c2
-EBUILD qt-docs-5.12.3_p201904161302.ebuild 1923 BLAKE2B d26fc9b7a4ba04c44f6f390983fe36397b7bbd2854404c5ff701ede66341bc2d7966b3120ec01a0816e272ad3fa375da3333b26e037207e48f2dc3f95d03dba4 SHA512 5699e0a1d5b4d51cb6609466604f551c34304e53ab9e043c93b549a5f97797b58f7f930468431b818d4baf32fe93e5b558ba76e2d2717c97f77239e0e0f9c147
+EBUILD qt-docs-5.12.3_p201904161302.ebuild 1920 BLAKE2B e3d18e77be8b64d63044951a1c16a47140184979255d21db82aeb617e6a333995606ac64cc9067148bb0f7a37871f5c2843b1958886020db41640ae20df2800c SHA512 613164184d59a19a83dd55195ded80be0d33cc265e3950064680107fd3214f9e185f5fee7626864c913188b1cd9cfb40bdbd35be46893753f3b5bfb130328069
 MISC metadata.xml 1716 BLAKE2B 1a50a8c7b4b2125df82206b03fad6e9721495a0748bbb98ccf059628b03c19dc2e180fe92dd2ce71195357dde2df8717726721afbc6c3cb53687384d13c931fa SHA512 6f7b54859302dd8f7364e7be60e7750286c0326d22debc6488029e4c144d8935dd1c6042d28d31c41cd67b3ab83cbfcd9cc3f9a1d5d0bed66d65a42de61bada5
diff --git a/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild b/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
index 9f6dfa1aff4d..93f38ccd41e4 100644
--- a/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
@@ -21,7 +21,7 @@ SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
 
 LICENSE="FDL-1.3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 
 IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
 	multimedia networkauth +qch script sensors virtualkeyboard webengine"
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index ed69670cbdae..1cbdc096f780 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,5 @@
 DIST qt3d-everywhere-src-5.11.3.tar.xz 84944236 BLAKE2B f1db5cdb569777603868081bd97b0c1b4e68bdb4ec51e133d1078e23796eadd25ecef73caa23872f264aab51ec4b7cfd1d2af087445a8f826c2659fdec5e1a5d SHA512 d75d9b9ddb456d8a0163b35e9417c313c56ca1332fd742cb9a682d3e9d6c68e8cc6603bd900f8c634baf79522a00c0ba9aa82ce3db3b65c4656fef2c71c908af
 DIST qt3d-everywhere-src-5.12.3.tar.xz 84941692 BLAKE2B 245e62dad28fb6c5e75cbefb5153fb139c8b4114fdfebd6987f82b5b2b627614d1b444bcefa002d09dcdbbb6801cace6a9ae56eac99e26d15794ff04e75ea675 SHA512 679c2dbc60fc53c1c5469369f25244bd844c2e6e723a1b451f7cbb50bfa018e6fb715214e5a5df6fb32d7c7936bb6c99d85e299fe2b76344bcf774c93ed0acd0
 EBUILD qt3d-5.11.3.ebuild 636 BLAKE2B d8b9ed4a9f9805f1e1f312ec700c2f28206bc06d72a10c1354ad900a64c974d5aa48ca621bcd41f727b7978cbdfae2ddbe88082092856b332a5150a338861077 SHA512 c7a749e2bafed72cd7adf42274dace66ce32dafdb26c0acf313ca57d249123c5c9fc9a1182724f978687e6998282c8469a6934f4be68c2d80cb9b246e4582a0b
-EBUILD qt3d-5.12.3.ebuild 644 BLAKE2B 065e2a9faad4e787fe053d3f2406c7afe68a88e8f1934d271bd602a63a3f4052a54ede640f758c16d118fc5926bfde7743b7f631a0a575b8241be0c60c66cd03 SHA512 f6856b7563a851589512e2f2221384c6ba6a8b0b36fea28337e3fbb07f29a9a268db4e6fa9cb9a8b8da2815115f5f5771dc57651997ef19704609779bfd736ca
+EBUILD qt3d-5.12.3.ebuild 648 BLAKE2B c6b94cd7763f36c312d0ffb0326f29bc573b27e3d3b317a2a8e40312997d468021a8aff2896ad899f90e65bf53e452f589fdc079d5c1ddd58c942bf1b51c5946 SHA512 4441cbf42f339dd220a8d689f7f43d02607616298206ab59aa18f815c6c7d0c66f877cd52d7d5bcb14af57d7f0a4280e83da35bea1f2aff86411d60ccee4d07c
 MISC metadata.xml 622 BLAKE2B 0b8c25838c12efaeba3d6db640fe658b6c1bc12f4a6bacc06c88e405c16498eb0f7db196efb1b09b46476c0c9c4cfccc64666dd43f31366dd28b7ecaa8018757 SHA512 3edf4c4db2c08652dbc1b62aa216f62b887190e2e0bbfd0cde7410911ddf1e0ea8cc9a27e91db07a78dd6078fd4b1ad23b27f0dba37607771d3b6c2497552607
diff --git a/dev-qt/qt3d/qt3d-5.12.3.ebuild b/dev-qt/qt3d/qt3d-5.12.3.ebuild
index 875c47d5ed08..04590309a520 100644
--- a/dev-qt/qt3d/qt3d-5.12.3.ebuild
+++ b/dev-qt/qt3d/qt3d-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 # TODO: gamepad, tools
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 392dad99a637..2f34ef7bf7ee 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,5 +1,5 @@
 DIST qtconnectivity-everywhere-src-5.11.3.tar.xz 2729800 BLAKE2B 30c86277eb6f997b52bd6ee42d1c420bba88b78bd65e4bab6fb6c38b8d9d61e14da3ca0148f364b981636920452915dd4889a528276c711eeedea507ebfeb7e7 SHA512 e44f2438792733f633c2788e7bc1910e7fdd72af660137cba8aff37deb92c01253b3f4b5663e1bc381e63bcf7a4b469f2682f8c85e6885af423df3d4a5fb055a
 DIST qtconnectivity-everywhere-src-5.12.3.tar.xz 2750144 BLAKE2B 1c287d15713fc2155cb5b07517fdedf566a686601681efde84b096f8e052dc36a872a8c9d263d54ac38dee0c69b8966f877fd698144b5ef897ff290a50ee0aa5 SHA512 4da406d88c3cf216d53c524d3896f50b19dae124baec904233dbb67163a30a955dee29148b5f5b71c35cb28638912423bb1cf4d38c62aeefa7353bd29e97a269
 EBUILD qtbluetooth-5.11.3.ebuild 635 BLAKE2B ed496549ee0b8d42e70588fc6c6b0ca3656bef24dce457d5820d7d6c75dc521afd73e4744d653e4f527f3da33bdd783e66fe53818d74611a1c513868f591bf45 SHA512 bb423dc9da8368f09ee2b6d2411e95c70795fa56e8116fe995e72d0d81d0e742c0dbfdaa43b71598e142604f98017158ccd5cfb94619737552bf1e17339464ef
-EBUILD qtbluetooth-5.12.3.ebuild 638 BLAKE2B 41e1b959552ce1aedaf6bdc186a962e820334c1fee3e0fff0b02a3e8e4c3444ba300cf4335f7cf780f8dbe33f1588e7c7637b5ea49a63d35662de9423a3142c7 SHA512 1353dc06a492a776c0a4b856edfa64d78493200bd7553347298770329d6fb11dd91cd4a6b64dc6a7afe6f1fa66264a93909a976b94cbfc36df9dfbc90eeb9c5c
+EBUILD qtbluetooth-5.12.3.ebuild 634 BLAKE2B e41988e55e399b7b52687ff0820a48424ab9486521e581ba26ab9cf53d0413ab67dd5ab4020a4a40932d9ded99e61c1a6062b29811c302079c522759f84db721 SHA512 933d984dc16a6f0a1b47f78d935da6be477ea71d57d836779ce31f123558fc6d854df3c4990245918c5f8b35db0968c37bcf68c9236342a78f3eeb019634e521
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
index c610b7cd0001..c37c1bd62752 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index d5347abf7913..d675e5549499 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1,5 +1,5 @@
 DIST qtchooser-0_p20170803.tar.xz 32012 BLAKE2B a0363ccebfd17c2ad514afbaf7ea80456826a42b88badff3a2ff4259745721f336a1b034f4a51831832f5b2dcd042c7c010c47e0f17b77ecacc5520f0c6f8d53 SHA512 320d898617ad52392fe24834e99ace685dac84e3a7edb1f6e6358baadb6658a51b02ae1af465ef5e081485a002c787c6884b6e1637ffd0406767fe7555fc32a7
 DIST qtchooser-66.tar.xz 32008 BLAKE2B 1faf4a44406655621e65132289af6a8b0d23f0c1027a3b99017c3951705378bebcfbc3cb32aa59975a101f21294ff701ca6eb6ec18ce977b714a426be0fbcd6d SHA512 0c7d3588ddd7b21e6e9d799204924e06e0b0950c898dfd23088f1e7657b7f821a35579aa062658499809f9d9757e82c3c592591aa2e5ec453463929bf2b33bac
 EBUILD qtchooser-0_p20170803.ebuild 1570 BLAKE2B c386764d8072ba9066f35a1948e173e7cf87bb24cf59853bd24c8b088c050ef620e9e2d34e24ababdd0baf639af3d1e561121f3dd48565ea5f11d9da49ef0096 SHA512 4650af4d9066f9b1ceadff18a02f38634e27ae974fbaa7c1c1894561d0d589900107517c167c2e624b9b5ea51a0c01f9e09c532e6b41da01eb763101f7f57ba3
-EBUILD qtchooser-66.ebuild 990 BLAKE2B 4daa9c42f155e87fb30b94e17494ffcee41ab77b114e1ad1773c03ac2c89d27ccef8394bea2a1e3db615f7e523aef0c67eb9b946f8f56a979fb8532db6181428 SHA512 3865f51a28a2772e1c1a59d90b2652b0380b6fcb9d0e711f53377936621d9ce7e4cee0d78385e2b0f358d9ff45ced66f3b4d1e4f46a55c700f58b9af960b99c9
+EBUILD qtchooser-66.ebuild 985 BLAKE2B 12ad0f8ce3b1cf5d307ab9b83e4f384f69dcb3d6ec6c28c9709e8360412a5a653ac747df25ec1f7e8889c28b317c82526009aa7cdac14fd97364b0e10019496c SHA512 58a5fb7d0dc956fecb87b7c55889ef2860c8d9a6358bb0b76cd573e3f840a08acae93f578ddeb91bf6b4d9fd6e95b7439bbd3e1842a946e2dbfa5d6ebbfd882a
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtchooser/qtchooser-66.ebuild b/dev-qt/qtchooser/qtchooser-66.ebuild
index 6582e4b0d479..43186bed90e6 100644
--- a/dev-qt/qtchooser/qtchooser-66.ebuild
+++ b/dev-qt/qtchooser/qtchooser-66.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="test? (
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 8b512e849916..546010ac1767 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 EBUILD qtconcurrent-5.11.3.ebuild 450 BLAKE2B 67b4088b305ad3b862f12bf84d2c3273057aca67db476ef1151081df084e5b665e4fccbe1e1a018980cad193ae30614c5e82121fd9ad60a5f26bc9d5c85cb0d9 SHA512 ca6d268787d71821e07c44dd051ae0210693649a48880961f4f2afae28f6abac452738e4f30d6b33d3d943a32940fef07708ed6fa75df526a7815d9efcfc62e0
-EBUILD qtconcurrent-5.12.3.ebuild 455 BLAKE2B 3ad2d08dc22f390125d8b7d98c42264f826b9de0f2d715d0ed3bac210453651da4639172f7a2da878aa0f2e9325e51e2d9dafa8daa43b573e1b6256fd5a10273 SHA512 c9b17e9890a5e1791f1d648a2ee7cf9135054d4044bfdf3fb2f326149d01b11a243a641d50492e3f79dcfbbd9a4f0ab045a5dcecd79c74580cd9d5eb7b96fc94
+EBUILD qtconcurrent-5.12.3.ebuild 450 BLAKE2B 14ac82f2e5996da8f5f432139fbbd4cc70fdaea1fcb3e0232f66b65f4ef12b5650b97c8c753f911f3328324ab541f0405ac6d185446b786c3ee502e2e8aabe50 SHA512 2c47ef1a856757a7f1e755cd3bbcb0cff3b9effc244d34da3901c81fc6ff4d92ceec6deed3139964c18f10a1f534aa878a3f03e84e338dde7f5eeca5d6d0c2d4
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
index a8d2c0d80bfb..9b539a15e693 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index de73ce741a4b..53ff8ebffc31 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 EBUILD qtcore-5.11.3-r2.ebuild 1695 BLAKE2B 6eaf1a261dce1ebb3c101c168889dec8eec70b4d5a2ce3921515e634af2a7ff8460de96bd5c2f31c96b598629051e75574e2f40c1be41f82e19f233700d082e0 SHA512 6a3df3fa5073e3c3105f12be6a369da18aaa340abeeaafcbde5df4babe8abc2b1e08de278b3498575707aa40cad3692f8910638217a3b05901061ff130db94c5
-EBUILD qtcore-5.12.3.ebuild 1678 BLAKE2B 4661a50c1a4910155603de792e1e61d84ee7045d59879e027d6894d0e63a85a7adafdc57a576bc6d74ee38c021490577d7c8b25d022b3950e38b60ba43cb3d54 SHA512 2b846d8f6eb5d2fcb8ce84504fcfd0e8067d3d8f9afc53dfd246521129aba12a4b1c7f8694ed5f99b1b5e54b3145398469c7f13089a2a4ef38a87cd81a905414
+EBUILD qtcore-5.12.3.ebuild 1673 BLAKE2B 16a97b7ef96e34fbfb726e0d4b3088340157d6df5a640a52a03e1cc3e9cbce5fa000213a3fbd6a4d60b9716330168935abed92a2ef59c35df7e90b692033b8e0 SHA512 29cb30ed7f74a2817bba7574b8572e0438d8674c638c84a98f8b93a10516c65807f1787a8dda56e6ffb55658c454fc6420d2595953603c33d9b2d15c184baba4
 MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666
diff --git a/dev-qt/qtcore/qtcore-5.12.3.ebuild b/dev-qt/qtcore/qtcore-5.12.3.ebuild
index 2aa86f3a4a1c..6aa5c4038c5f 100644
--- a/dev-qt/qtcore/qtcore-5.12.3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="icu systemd"
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 6371f519b30b..99e3e1716e70 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,5 @@
 DIST qtdatavis3d-everywhere-src-5.11.3.tar.xz 5201492 BLAKE2B 6ccc679892b6e234075cad890823ce5b20c887479f306284c49b40672da54dddc1d65970e3771e05b48ea7acf3e031593c77f64ef32e52106506cf10281c6aa1 SHA512 6e672a7d07f197b86d7914d249078137ae247463c1da77ed01cedc71326e6e4009ecfc7cd59f2277c290ba1e3c84b741466f9feeae8391a11bb7fc458bd06aae
 DIST qtdatavis3d-everywhere-src-5.12.3.tar.xz 5200668 BLAKE2B bbcc3b21c9f604c16c862c7e7fe1b3a3d7f0d1f4b8a0da4b67e56d6912e377d1496f7a399a94cb697f117ae23123b3d6370b47c4cb7223ff8af1b584838c588a SHA512 cb295deb9aa33132294d7d7f4daaa53dd9ab4815e2d3a2c916d88e1882e018a49d8d66db9088f69375d8da759a3f3566f251802aaba82d74cad2eb45d9bbbcff
 EBUILD qtdatavis3d-5.11.3.ebuild 620 BLAKE2B 1e2f2c6cf6ce23820b1e9ccc329c27e3d1c0aae454914e14d6775a507874e8096e7bf41def92c3fda65ebe0a7ef3df2992e7780e67408c8767e9ebe806ce8e5b SHA512 814aa60e87a25a688fe87c9283006c5deb21af8c24bea0639c8b5aa9336ac8b97d3beb8b0a9ad24b6a979f941f586bc1e93c8023be78598bd526ce2c2e44b5c3
-EBUILD qtdatavis3d-5.12.3.ebuild 622 BLAKE2B 1740f129474517f7beaf0f0b6eba86a06aa6305bf54ac64c8a693d42414624a0fd0f370be45ac10b2b69972baa0dd8131b0174627b7646f3d9f0bce2c4b58ac2 SHA512 71160cb9e0f7fbef4b86d0d3b8ccb2e74d5f28d1af14ed7046726a3fa16ac8bf65ce0397d5fb834e6322065688b46b0122f9b451239c4367a0c482ea0591fc8d
+EBUILD qtdatavis3d-5.12.3.ebuild 626 BLAKE2B a7ed6f5552a6373fabaabd1c4bb24ed6be1845627e1e34bb3090928f3eb8ef1147fa4a4f3257fa7b0face55e7e0b3f7058679a8e17383d1fc252b42d9b0c5530 SHA512 1ba4b818b07c2981c0d82a294a663d32307ece49ad9365dea1b7cfeae694cee61f7cf8d76b5e4096fb55ab577482294760d3c7e8b8fc7a8ebf1d804a41c66ce0
 MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild
index 74192731918d..4c1ad54bfa51 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 IUSE="gles2 qml"
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 6bc38fee534f..a34e5ccad2cc 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 EBUILD qtdbus-5.11.3.ebuild 694 BLAKE2B f792aa62e7551e9016afe4598f9af0b553b6e2d0b6bd0c85428428eaac5383b22edf12e4439d95866b1a56b6748669dfd931e9ec7784e497173a2b04a951e2f5 SHA512 9bbea876bb10e412ab510ef15d061308fe642f09b0c554e0ba48b420b2653dad044d940142e2d89533438cd5be164b61ff26500da4244a19d9b5afdfbcf3b363
-EBUILD qtdbus-5.12.3.ebuild 699 BLAKE2B 32f650d2735a56213d2ba38e10f2ff10effacdfc19956a1b4dcf439e80220b712875f7c1cba04663417fcf5a917ed10659bbdf9d9abd8b20d33e9f6addd9bbb0 SHA512 6ad1839d73a9e78be49d5af789a6aea07abd7727e37deabbb3f45431dcd1e25b76f12a1d190df314fcc123c1f46bd77d9521649a16ea91136e852f24a6a9904e
+EBUILD qtdbus-5.12.3.ebuild 694 BLAKE2B 5a7f3d4a5a9f33233175ca3ccf9262ae98f5bc409d471c07d4dc33a3d6eab6cc8b061a3e7dc95134048c981a04dedc4426d20aec7ede967529aac52e8ae28a4e SHA512 c2e4919864ee3e4ebefe1a2920258e1d3de21ca02a0270cbdde4a242905889ab41afef1521eabe471143d646c96efb884299df866be09ba8babb1930dc6e27d9
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.12.3.ebuild b/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
index f8e4dd27c46b..a9c53fd2692e 100644
--- a/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 54939d59963f..b587e60ebfc8 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -2,5 +2,5 @@ AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbf
 DIST qtdeclarative-everywhere-src-5.11.3.tar.xz 22233024 BLAKE2B e443e578091f6f2154f4dda4384b07ff510f92757e113f07e1a6cc9a95caf6dc7994b72b8816e8fb03893ed8180058ae887031af880218e43758b49c397f58e4 SHA512 07d440b10ba2fbd700a191791cb6991fb9ce72c78787340e7f564bdb2bef24b035e15fe2aecd36d58f8794e56bd0aa35d28b350a73707e27748e54d46609e1a0
 DIST qtdeclarative-everywhere-src-5.12.3.tar.xz 20513544 BLAKE2B b6c622cb4728d54d0cf382a5a50af4652755ebd1f8e7ebc8bf07a5f3e3355931703ffa443be11dcf36a132b2f3eacb5fce150088209d173f2ca84bc387096026 SHA512 0caddcfee36cbf52bacd3a400d304511255715e2b5a58c1621ca8120610427c57511785457a9e7fa55975b86e7924a3cffddeb7e2e8e6622af85b7ebac35dd20
 EBUILD qtdeclarative-5.11.3.ebuild 1407 BLAKE2B a9d9b5374498f4e90ce1b3c52924675f226b6ef537b731084771a9d9699d9528af3e38887fefce1f14f2b55ef792c2e356444985dcee9a2e584dd73a148fc48b SHA512 7f42345d59a2342061cbcce29df5c970740581fc558ea9896e980b211bdb8842ad15540e059c5f27dba2b2d173048c67b369451c238384e072a3eedf04c1356a
-EBUILD qtdeclarative-5.12.3.ebuild 1204 BLAKE2B fc1892b3b28296f283242c4c34dbf0b0416a3f22d2f05ae2274e537648eafeea701910ef0f60cb0ee072c5779f3d08d78471cf6dcb9f82496bd1680ef6d63af6 SHA512 f10843b3a8da7b27131dda19c1afcaf90fcc62d455ae86bafd833a13ece69f552650b3151c1f7d9af1da94cc8f96d319171c19d9b4b6c1fdb141d41cdc94c0ea
+EBUILD qtdeclarative-5.12.3.ebuild 1199 BLAKE2B 9c3a073eb33e0e8e742f4ac927713be2f3f7accff17337d36011b8a36958cae44bb764d268b80fbe7cf6297bc1f1efff95795775ba1d0392b4a630b557a7b30c SHA512 c1be23016672d38443ea3e688a468dd2478718dc9728433894c14fcf204175e0eb0a227fb25b0741b53a213e48add5f30a07b3e24e2fe0611a19bf922feedf8e
 MISC metadata.xml 811 BLAKE2B aca4ded12a2034fb5964d6c38806edeb1b2b984c182fe6ae5cf26f28db3ffa8cc942e8354971e46d7bd6f8eef600fe52ef3e0cdb5cb2aef7c7fe616fbc81d712 SHA512 0e278f92094bfc3d7a295cf559178ff093f5ff6776f03037cc9cb4e8574c9298c76f6210f84e611c8cf1c6c063cfd78f8d0c478f30798fc775d7bedcc409c711
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
index b3c3411fbb0a..db83b900d7c8 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2 +jit localstorage +widgets"
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 3dd7b7fa505f..fb76ba9b566d 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,5 @@
 DIST qtgraphicaleffects-everywhere-src-5.11.3.tar.xz 14267588 BLAKE2B 7f64c33505681de524af4dd97707ace7cbb371b15a500516afbabb4e61a13008b2e1c418f2500539ded2dcb4cea8e625c1fc029d92568e3c85aaad5562fe046d SHA512 c07072f7b32fd4e25f80318c48ae5a7dde82a0524ab37b174a5abeb36362e9e493570e2477c11bc4184ecf668a3879df8355fa0693a709f0a06224b41c144502
 DIST qtgraphicaleffects-everywhere-src-5.12.3.tar.xz 14270884 BLAKE2B 2eae4d2ff7125e57685cbd7aa723e763462a9f5d466ea3b8890d4657ce960233868aa0ecddac37d2dba31a1845c5cab1a33f26ad31d8057067b079454cc7ae49 SHA512 3c5e6d7dc51a92d48cce8424ab1fe60ee75b71ebe2e6bb22e719a35bdaf2210b03f90ac066569f5c086ed67ed1463510625307328299310fad7c587e9fd8b385
 EBUILD qtgraphicaleffects-5.11.3.ebuild 444 BLAKE2B 6c01170366e3e07214e52ecfeb78bfa4b344cd4b739e3af0f0606e81ceddbdbfaf7b575f5f59ee58f8f581ec3ee06930df4a33a577e5b081ad0a4fac7919b54a SHA512 46ba9c0728c7f6b607a8da784f82115af398be4f50545a46ea27ef0ac4b6e26b5b8fdca48f9dce0e027e1b7aff16b2db420e9a1d2b4343942d04057a50e7f6ae
-EBUILD qtgraphicaleffects-5.12.3.ebuild 448 BLAKE2B bddec5b1b83e062869c01444361deee949792386d76ec908aa972289a242c0fa2db64c81120c11b117dfa3852c254f6784a451197598e0495b4c7053b77ca2de SHA512 c0412796b87af156e3bf21892a8dd0d7ad39b9cf45c6d8d913006d3f685050511927dbb5fe100771217c04530fa26719d829d9a8ba292556ea73ac030c1058fa
+EBUILD qtgraphicaleffects-5.12.3.ebuild 444 BLAKE2B 7afc09ae80da36695860c2cdd2e52a7c73a45b3881f958b23fa698d1c0c22fa6eee8131234b6a76aad75f0b6078c5a4a564a12528fc1fdc52202bf3e6b8be6ee SHA512 30b13354531eba05b839422f59c27d3f490909c8d7bd0f563fca0ae80941bee1aa29d02f155578e2d9c3e7dc4214557e451819942397cbac1db7e2246a47f0af
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
index d7d01db85a26..5b25e21e51ad 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index e4b547035b03..2bf1fba0bd2e 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -2,5 +2,5 @@ AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae0692
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 EBUILD qtgui-5.11.3.ebuild 3574 BLAKE2B 5c686106b008e3feaa881595b5fd508861e06cba0f869122a02724615c9d2260a5ab90b27a52862c37ad275788d71003bb7f6160f62ca7e024da53bc9fe8d4f1 SHA512 2d7b221594e5b1a60f24f8e76faffaff0ef9d6d93990ea62bab50206592b988265b435c13bbb10add1c5a456abc34b6262a36866498bf6342209cc3946b5265d
-EBUILD qtgui-5.12.3-r1.ebuild 3725 BLAKE2B 243601e66dede4113a81ec9fd508e1988eca33e741e9b3feedc3576b8d0ffd10b82fc65e45eeae6077977a88e686ea8fbabf65482876fcb2d78b688db754ec16 SHA512 bc2d92f2a7a5ee8b77996835e9918e907adaa19e2e41645247a627661fa7c4827a48a6afdaba85be4784ea111e4c0663d8c386f701fb7644628f80321adff339
+EBUILD qtgui-5.12.3-r1.ebuild 3720 BLAKE2B 8a92f6f710fe70f12dd8b172f6c485bec2e945f684eb72b5215e43d1eb364bac0393e04d2500705b208241a9f0c5d6d4d5310acb3a20f57afbdec61c81026bd7 SHA512 f2bdab0a6e53ebaef1301c6e6a721d4b75c70d550e23797df3eb86b2c22744748a73a13bca159b89866c25a91d019aa7f2f7cf2300f227dd1f67343c6c3877a4
 MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6
diff --git a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
index fa203bb4482e..195802572830 100644
--- a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # TODO: linuxfb
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index da40a936e72d..5f4ac7637876 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 EBUILD qthelp-5.11.3.ebuild 651 BLAKE2B 244188add05c44c8e95242c4d1273df8cf44faf3917eb15f2ea9cac9e58c578bf0fce952f1f54fa9dfa80ac2c49db043498cbfe9da763413488e522577e36d47 SHA512 2bd044d4da9a55f4f7931d2c7a36b5bc3e129fc8d0bdaae2ae926c32da4b53e43b505653401a2342f6f6b58e5c0c6c2124449d60f4f7b3bc9c50e94bbef15038
-EBUILD qthelp-5.12.3.ebuild 626 BLAKE2B 8740539f6ef898055779e50facb5d73eccb201f6786416c9b23e206a29278886249670aa95c7317cdb4cdb5197271671923c2d09df8737deded7b3bc742e47be SHA512 cbc52741c443494df867bcd6f81ebc62701db053cc97f4ffa01e3158cba6a927694896bd035035c3cabe160a69d75e7c379af27adb346eff51aa3048ac020677
+EBUILD qthelp-5.12.3.ebuild 621 BLAKE2B a5182db4c2d11d0bc5b59ff0047d130f569114f84e956c914f7b67436a668d9f426e2ecc5f82eb5850253ff4c52271683a0587b8acf00d09934c9f87ef13294b SHA512 7455e1ace4ef09bf955a969fff83c56f6246c7a29deab85d1ed5e2eb0c33905ac7e20f4c112f73f383785c3a4fb6c49135e720e16fef24cae7514748b0047f80
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.12.3.ebuild b/dev-qt/qthelp/qthelp-5.12.3.ebuild
index 943173a184c2..c3099cb4309b 100644
--- a/dev-qt/qthelp/qthelp-5.12.3.ebuild
+++ b/dev-qt/qthelp/qthelp-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 893656e1b998..be14a911d615 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST qtimageformats-everywhere-src-5.11.3.tar.xz 2197304 BLAKE2B 9041260c26b2ec5085a10c05a76dcab59941ae3d18475b93286028b9a4bbafc923795f6f0ec7a0e6b45cf95c21a37fbc76d0868cdbb6ed8891360310cce868b4 SHA512 5e2b83c2a7cc337ca0cc80e348ee41cfead3429245ec0aa18bdef945c85aa878ba684f5d410bca04d0183e0f6032a78b976ba89346043c0a49816c306d0235f7
 DIST qtimageformats-everywhere-src-5.12.3.tar.xz 1793076 BLAKE2B 59dced7576a50441c704c8debf4a86bb4db7cfb752922020d2932ee2295805b27ece866f3f86e3f89b308e28cfb720fb9c6fa782f29f45e1c3b14fd733096c87 SHA512 59cc9df597e6ac31b10ff7440b0793af13ee84a1b363db631a7aeea7413e650a99a42e8c3f4633926ec93d4ac4c2532674ea27df325ba98132bea83c81d6e6cc
 EBUILD qtimageformats-5.11.3.ebuild 611 BLAKE2B 3a6f3f2716bcab08fc5105d3417567adaf709257686adc2ba19b2acb92d81da28d7acd3086671cb07b5e47593e4e30e3566064925e350a8704db28de83942aa4 SHA512 dbc51ff912ce2dcc14813784cca19ca52af98cfd7e7a6f1e9ca3420882786ad88fef1c719fbd0a5d0a9d8a55be7024c12dba31c2e9f70966c7cc9e50abde21bf
-EBUILD qtimageformats-5.12.3.ebuild 614 BLAKE2B c033c340aaf7716b95e162f7806113335f69427af76ed2c4e350e0791a3e44138bcf701d9d602f0898bb91c58c43ed96c6972ada3d1dbf3da8bd31c9c96bb51b SHA512 e9e424d98ba1bc4fa5f8a0916d39cef9b3dc14736e10385bfc49fa02c4a0035f5bce558b8b312b6f3b1ad0da30286c00cd4d26596b8c87da90ff232b59b0ddf4
+EBUILD qtimageformats-5.12.3.ebuild 610 BLAKE2B 1ba8a71e4df388692b8e0c7b69631f15a72d36620918f2fe04996e886d9d8fbc5b0eacb1c45058be712b9fb2288fbfce3d443e564682853ec3f3a67eeb4d3ab8 SHA512 a5a4c60a3489c05e0c3762761f82b802094ba1fe1a984cd0135e345ce9db751e48f4abd9a3620f0d71eec5110581336e767f8dbac1382c522e95b3ddd2438696
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
index 37e545353652..8178c9f3f4f2 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE="jpeg2k mng"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 3aac06878b1c..bc2fb7600813 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,5 +1,5 @@
 DIST qtlocation-everywhere-src-5.11.3.tar.xz 5589440 BLAKE2B 544d90151fcbaf8a75d374e4acec9bbd78b63c2dee0258f1e08e18ffb94a86c91f63dd8c9215af96e3648d50a40fe6b66c105abec0ab6dd4473903a06f2d0253 SHA512 880cd6983bc0b4c5ac5a1edb2b3ffbe89f133bd819e4bea4fb8e91ba8d847ab80572743e3994145ee6697cb2fc24c393ac3c4ead847a022d848799eaa4982716
 DIST qtlocation-everywhere-src-5.12.3.tar.xz 5905856 BLAKE2B b52b9eaea77b4b429db90768d97c7f4d1319c7a860e864acb5afc5c35c0b2c7425afe64909751b2063bad747fe3aa6d899b39532a72065d4cd87935219a196f1 SHA512 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082
 EBUILD qtlocation-5.11.3-r1.ebuild 923 BLAKE2B 8a1734d4437d761f3a19a0aec00e838e105b1c8ac2c4842cb9d3651fc66e344e6af991d91ad62cee18cc3da82eff722c140031b821301ba64f171cf005bc2049 SHA512 5666b1254e93d4bbea2f945043f854784d5a3e003f4361b1cdfd271fc5aa66353d22379edb14633816959ca1be78ac8be97b8d3e5f50437e3c096df785b4b50d
-EBUILD qtlocation-5.12.3.ebuild 950 BLAKE2B d1961722a0b57b61414a79128fbc99262a1ed92b6276a5d36d6db150534db096c4fd8e90c640c2e70c8326453a695577ddbb46b75ee0fd7a80afe1593b2c78d2 SHA512 d709f39bc1d986f1349edd34cb97a6a96ffde97f2c47abfc48f89adb85318e4db082538dcc91f3c23d90b2b586faed19cd3caf19b3ed08e9bd2c431581223b53
+EBUILD qtlocation-5.12.3.ebuild 946 BLAKE2B ea775efcc0c87f91b3b7f012d46073a2a68a3afb7e07ebe8ca55a8bd581f10d8e828d156aafb47b64c8cf014be16d6b9d37738d47e5b6720680f0270fca47469 SHA512 147bf6f4a777e62f0ea7b10b9133b9cad45a00883a64c96dec22623e60b173f1f70aa5e6c0d286e7fd848c656483c63546aaf3126c8072a8425afcd9a5c46b0c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild b/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
index 25dc50ab1019..d2a7145dd2ef 100644
--- a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 137ffc8f044f..da5a862b5cf3 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,5 @@
 DIST qtmultimedia-everywhere-src-5.11.3.tar.xz 3710012 BLAKE2B b1757e80914a41913846dcb890fd56706b402aa0498cfa3e58277e8ab50e95c597df1b32dae11f146283d42c874ec03d8d33374447fc71f529c30d0e465c14cc SHA512 1c9b8f3392ac0c7e63a05d57fb74473a89edc9f2e482d8df97761ca20efd13bca2c1c68907ab4b4af71a109a783a641c2faaf72e7df90fcbed6bcd6e13350567
 DIST qtmultimedia-everywhere-src-5.12.3.tar.xz 3742244 BLAKE2B 65cc184c2625c998ec0f12d5d2f72401693521c9b5e1f27db342279724789e88e0bd6c6cb741ccf28939e8edbb657dde391ceb24ab0cb97c786c114e7e95743d SHA512 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963
 EBUILD qtmultimedia-5.11.3.ebuild 1449 BLAKE2B a84df6ffb0eec1affce07bd439a1774ec2be253037cf985f32530ac29104d6bda0890cd96cf791721c2baaf425f97058470d0eda780daa395151adb51a85006f SHA512 9a2e4aa25acb1c30ec18930ab532d1b42fc96bee3ce43e5c6051e85ee6f666fcf9c190a4f6604854d2f4730de998919a13e7f982b68267899655c911b553b183
-EBUILD qtmultimedia-5.12.3.ebuild 1460 BLAKE2B 75abdc2cd16f927b23a36ec9e06e07fcb9599d7471e92068c4c2916f79290bbee071dde9301362ca97572a4bc4118cae65bc7f832368cdcc14a8140899aada4d SHA512 7f46f89194740c40622df3cde51afa112125139060471848bd1379b222cfcfd525c87e0e7b32707fc9379f7e2571dd838f0e9f1bb372cc693dbca160804788ac
+EBUILD qtmultimedia-5.12.3.ebuild 1455 BLAKE2B 8cef2c9c6394bde8195dc7bff86cfd4947ab5e4b94138e3ccebc42f74f4ddb089fed9b3da7386d7469cbc0a0e4c05c01c2c2a98d0fa9f61651e579e1d744b26e SHA512 edfa649f0a62a825c6b9283d6ebf568841709f0db59a2711b6f168fd6eab52c6f74903e576d70be7364121150fc9464918b00a1fd12b49383b630db65f413b8c
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
index 6d8241532e20..78285281e505 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 10f018631586..817571007e02 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 EBUILD qtnetwork-5.11.3.ebuild 1226 BLAKE2B 7fadca05da3379e876318af7c4c4b8799cfbd23a684ae62d840b8eb97666a2e80f7767932ac5f6d6ab8869841832a5ff94d8555f934376cf4077c920d354b2ca SHA512 b07d448ac64a54c511ead8e823e51b6ca2ed2283a7234c47c8b14fe1773507d15a5e02bd540475bff3ae7d477b7b6b530965329b66b13e6e2dbecc65d4922ecb
-EBUILD qtnetwork-5.12.3.ebuild 1323 BLAKE2B 18183788b5e70da6648711298bbdb5a391dcd8cebb06e7b511faf7da3df782057de2c9958630643ef9c149fc7d7cd465dbbc354202305ff9e14cb57ae0d81224 SHA512 dba7166b2d8c6ff39237e1dae2eff4842ac732248f032fdf500223f73a03510de0527b7d03ff9c250136265ab61d8429c7979525f1b7712468e0f82b26396855
+EBUILD qtnetwork-5.12.3.ebuild 1318 BLAKE2B b8f72ede7e79c0deec90ef97f5aebc58b987bc5198189ad0ae14c4a249cf7d7bbe88713d9f33738f6d84276084de6c630f9d728a66159f01c9e2e2ec94f06205 SHA512 d36400a5c370a3ebcdc547460915916533299892ef4344271d1044cc06e8b4397026e107e0c39b060949378d580a4f868fa03b52f570af008a969303b73fb72c
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
index 8312d0c13577..fe828bbfcafb 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="bindist connman libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index d4ed3f507afc..7d1ae432f5b6 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,5 @@
 DIST qtnetworkauth-everywhere-src-5.11.3.tar.xz 138740 BLAKE2B d8f5dee083314bf37984063a41944b537ddcef010f31d769429136e17c09e7be43cf8fe68e41ea0cf678018f744b7d896bc07798fd545e03594c1ffe0117788a SHA512 4d7dd27b869c9c3ee6fdc745c0532b2efb2b57f7d5447798bb2eeeb62002f856cc21b1169759baf33b060b2f1253feb9c9568dd28ed4bb41cd37aadf4a784a1c
 DIST qtnetworkauth-everywhere-src-5.12.3.tar.xz 139092 BLAKE2B ee8c09ce890010b0ff6424ea74210749fdd0b4ba42fafd0e372ed2719830ce073085f1d5a8d5fbfbb98901f84cd81b105483f310ff6ff056f16430eef6ea1a5c SHA512 07bf159360fe126c23387c6ed5b955218771ac37848ddb83542733c786b415f9aa5c22fd4a965fff591869d2d819bba420b69718e487df3cce382f411f493142
 EBUILD qtnetworkauth-5.11.3.ebuild 371 BLAKE2B e185b40b2ad6a4c89552a98999d0205bec49bbc15bad88e51e0d1079984aaad5ecaadaf8e21f67eb257ef78d52d3cf28773612063798aea810e1b4a8bbd22b4e SHA512 a79559dbb15dc8a3f5ab8225ce0f084f6e90f63e01e6556cb004ecfbe6d361b43cd9d01243eb7bcdd4459b4aa92ee5b38710021a64287ac79b50dd5acd816fd6
-EBUILD qtnetworkauth-5.12.3.ebuild 380 BLAKE2B 316ce7829a30fd3c964d55ab0869da1d68f846b73bb707277134bdffe88d5b16d0687a5849c5898cc9acba5662b348cee2b4d88379ead46eefb7293537819c44 SHA512 18bd352a16ebae3a43bebdeccd0a99ccf67a1ec24d6073df5e36e6aa55bec8b0d4c4b86e714ede481e7f102d950effb9fb486c856be088f5339392033a37cfbc
+EBUILD qtnetworkauth-5.12.3.ebuild 377 BLAKE2B 23de606295519cf1ced4553bc46bed542f839fac0a2e902e4f5205d1572b57a87fa3b6ab5dc60e45636c99078b71e506036f7a8d082d14ccab12209419bf2461 SHA512 f31ddc705a7f5aab7923fe21b162768029e70f9e00da4645651341363a0a6648006006b866fa6d0096e919145cf8f6e2aca3444a71dcdfcc653af304d60e9c0f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild
index 92b8093e0129..0bc1853f9f55 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Network authorization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 5a164b22dcc9..bc23f2ffad42 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 EBUILD qtopengl-5.11.3.ebuild 647 BLAKE2B 56ca5d231e544ff099753b4bf0a8f425a99147a46b40b48aabf3bb495719b73f8af7704cc46e40c10096eeecef9ca7579fd2584bb1224330dc201dc0a3fc318d SHA512 e566e35c76ce3fbefb31a88c8cfe18a55fa91a60d97fba2e6fe88682c9de5c228b9e2579e01f25f31d5aa6536b2363147857546661202f25ded29f8dbb72fd82
-EBUILD qtopengl-5.12.3.ebuild 652 BLAKE2B 7aa26aaf3c9229976b1ebac8ab18473a58eee8c5a1327f919cd0e3c392207a71890718e90cc6c2c853ad881340ebc80b817a586117da074bfcc2ae65e92e2a23 SHA512 8788a920508a390374a3f9f942363f1b0085f14c0f8e322ce4fa5a1620519ad17d4b05ba807ec680d97748285748c2fea32197375d0b2cd147c7f28036a4b308
+EBUILD qtopengl-5.12.3.ebuild 647 BLAKE2B 4bbcb293cd9c8f6e6dddaed42f15dcae6435cd292fa6dc3e9ab119793e041a25e5ebb4cd3212d616f587a443465a1a48bdfa8dc258fe9bc6d293dfc50b22f964 SHA512 08430202e0149fb25c19e4d44aa4c4e41344e68858a659c8806f1cf61f6a0ad9c7a4daca9d0ab8d1ad53af942d53ba8d90c98c9a3b3b6db4d0693303ca7f5edd
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtopengl/qtopengl-5.12.3.ebuild b/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
index c1ee20acd663..6d2a254afc5f 100644
--- a/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2"
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index c146103110d1..98667a0ea082 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 EBUILD qtpaths-5.11.3.ebuild 409 BLAKE2B 76a13915e6303e211a8333ab3ff36f87af44da44d02c38685845298e11a14dec91a1e897dd283c7fb03380551d312798ba36a8a5774ddbd9e86ea3f9637fa89c SHA512 8cc000649802ee5f6adb4d8ed51b5714d8c9d938a20e7ab0c6ae37982f75cc3cef8be0a9b737d31d39028aa9a7a487f4cdd217d034a9c9d360d6358de6988422
-EBUILD qtpaths-5.12.3.ebuild 413 BLAKE2B 6c469fe1a003469ce3ac15b76cedb916beaaec0c1ffa21136d3b73c563255f583bf7f363f60077735c74a68d0048aec3562fd2319e8e0c1444129913e7c06e27 SHA512 ddfe246dc0231142321ea3429461599b64dde15f99f5f5f6e8d98a3f32a2dc846f7525580500c28c1cc596ec8b94f3b48720094c57073be9e1683a93a0029fca
+EBUILD qtpaths-5.12.3.ebuild 409 BLAKE2B 565af458db423c0b627bd2b3ef119eabd3ba0f99ba3378a621ed53e78386e04bb43eac458cfc9fc25fa9964eb4929d0e7c3a7aeec5927a5b1c30fcfc1ec58aa0 SHA512 e9c4c11ed4f954be90ee025b99b4c90ebd4f65004d869795b4bb2c28dd4f46c4849b51e6e0e45c0f28637e1c9a765516e4123173afcf15654e30a41116086053
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.12.3.ebuild b/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
index b0988877f904..10714c49e023 100644
--- a/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index ed8c9d65d8ad..80d4d71c7ab2 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -2,5 +2,5 @@ DIST qtlocation-5.11.3-geoclue2.tar.xz 7556 BLAKE2B 2648b2e8aa8dadad467c7a3ea352
 DIST qtlocation-everywhere-src-5.11.3.tar.xz 5589440 BLAKE2B 544d90151fcbaf8a75d374e4acec9bbd78b63c2dee0258f1e08e18ffb94a86c91f63dd8c9215af96e3648d50a40fe6b66c105abec0ab6dd4473903a06f2d0253 SHA512 880cd6983bc0b4c5ac5a1edb2b3ffbe89f133bd819e4bea4fb8e91ba8d847ab80572743e3994145ee6697cb2fc24c393ac3c4ead847a022d848799eaa4982716
 DIST qtlocation-everywhere-src-5.12.3.tar.xz 5905856 BLAKE2B b52b9eaea77b4b429db90768d97c7f4d1319c7a860e864acb5afc5c35c0b2c7425afe64909751b2063bad747fe3aa6d899b39532a72065d4cd87935219a196f1 SHA512 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082
 EBUILD qtpositioning-5.11.3.ebuild 1067 BLAKE2B 33b8d0611ec21016b589f0fa57839688d0cdafe068c0e104cbf6519342f9ee6efb0d0e535aaeabe4a59573656337fa198a89dbda6a65aa33ffce6649976ac211 SHA512 e4dbc9a1e125c6d0c8c0850bc0f402cb944f61b6ba743b5080b379af1d49ffe1b9e191025d9c689f38e8491952b2a97a7cbdb932078b1771154754444e08c568
-EBUILD qtpositioning-5.12.3.ebuild 853 BLAKE2B 5b7ed00443e1dbf64183d8412771aeb22a07aad5ac991ace27efa8ace53aa90949a9bddf4bc0150d45f9534370c0fd0cb8f920fdc185d22b388b6d1ed85eeac9 SHA512 2f58e1b3e09f659844dcf9b4c44b8734cd586feabbee5f67465d9648b89653eabd2f7dba30c1a2d03b4a66c727272c600847fb0dab5f753e94e54fe68145d504
+EBUILD qtpositioning-5.12.3.ebuild 848 BLAKE2B f41938f70dde3d28ea0c7aea277d912ed3e8fbbe5ca77738020386dad8fdbc0dbc95e4ce6e64f82ec48e6b7326c8d63b0ed2c03c35f06f9e78e2abefb68207a6 SHA512 1386dff144849f5f0222a6c01d7e1bb25e9c26c9ac543a873b25f595f90a4242174eff5dfc75b4bb29581fe86371e64f2f70c69fdd59cdcf5a9d0481a68a5053
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild b/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
index a6334e9a87d7..d03f466e6ce0 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 42f815e4da5a..960fab8dd50b 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 EBUILD qtprintsupport-5.11.3.ebuild 772 BLAKE2B 209f973a32de82ca43f1d6741e7d5b49172fe25f6fcfbbf5e5b059c3cf474c9e0391b460727f300329c54829b7754209a0d326ae8e71f65e480004a572e8e063 SHA512 7c01c211d356686e02dbe0a39e28a5d39516f7870f0119ecdbbcf8146c522237946ccf6131f817341cbe6c0d06501b95a6cd09e239dc78d31d3a2f64f8fec86e
-EBUILD qtprintsupport-5.12.3.ebuild 777 BLAKE2B 588d387ba317ae1558ec2ad1cdbdb0b200076c6811031f7ec28c608aa133b70f2ea1afe4017ac9e6190ea6b259e62bb5d2346d8dd628cc6e6dbbc43f9cb1ffc9 SHA512 270cb1734c0b66e475b08f9356b7a232e43a2139e7685c01663e18ce71aa4be85426042c371a2e0c725f27fb675ccaff97ff1129cba37d7de22fd8f2039d018c
+EBUILD qtprintsupport-5.12.3.ebuild 772 BLAKE2B cbf71557e7b374cefc93f6fe739f52ddd3f5c8e86b859a32c0e2d76569a64cca223fe11b441a2755221b352bfbeab9edaa55b489e13dfc9d37ad335ebceddb1d SHA512 ebfc3146456b476325330132e190d4d6c8f5b4eef59a1a71fef8d9cf42c5d075e3abd32e47bfa298a0b7b2e3e8e6dbcee9491c4c5c5508bd860474de124084cd
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
index faa7032b87a9..b064f4b96c65 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="cups gles2"
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index a5da935e335c..0368805467af 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,5 @@
 DIST qtquickcontrols-everywhere-src-5.11.3.tar.xz 6053336 BLAKE2B 304fbc5e0028f49662dd077349a28ef974470aa4e4389d633a409b6a756c24a730a675b774429246e1923fa1ff3f6b33b8cea75e588c58c55232519c4af45500 SHA512 359a2509e35240b50dea06e7197ce974a92a7f4fe902b7f6c40b087945eaa8faa0395d3d35a6c79c3a5bc75fadc75688d36338086ac67bf2ab8be795a60905b7
 DIST qtquickcontrols-everywhere-src-5.12.3.tar.xz 6057512 BLAKE2B ebe1f4a431cd58891c8550ac1e50992d290c18df54b6710912397f6856ada50f8807cb52d0fbe43f376d187ba6c3f53a0b826babe10fded480d4088bf842f566 SHA512 23410fb82088591a8bed7e8e4127d13929a03adc0dfd18f7e2f906acdac21f7dcbb15cb2257272b893d937bbb54860992667c11aa0c6157d4a3b871616c4641c
 EBUILD qtquickcontrols-5.11.3.ebuild 744 BLAKE2B a2852819d287a0992f4eaca8d5e0a1931d5de6ab67b9f4b19586a48047dc79813f563f97df48f43f4fd1e2aefed579bc1a8bc7c33607325b4e467aa1b239ddba SHA512 3efd926e5484f5390a05251b18c64e4117059103bc25aaa29c0c39081abb23b1b482d22aae480e161452ff502b3d0fe88094380c330d8933af886c22f80922c4
-EBUILD qtquickcontrols-5.12.3.ebuild 742 BLAKE2B 1f67b01a5437c1c364bdf6eef6ab26b427b84d29e9f4757041b46a2bfe47732e7a1187cf118e24151df79b5b04e53c1ab798e2599136f48ea10315491d3c3898 SHA512 8f9d09adc1f1c4c7e3fa16d2d1466c097ee7fbf095fc49918e9860bac3783774de2d7c2e300dc6401902b9c3131cfde6675c0f8d567dc74ffcdc04b85c6ff21f
+EBUILD qtquickcontrols-5.12.3.ebuild 738 BLAKE2B 2f7998e84ac4ae2e732478352c56c094f12b1bb1ce1519169556b228e16e003ec72dc16f44a2909dc3f2f90608ebf5ba03478287d70945c65a21f23b89f32553 SHA512 1de755252cdcf63d7d52adefe290f68013c9968807e08e47fbcad90c1aeee00530046ba08f4360f98dac0a1b2d2b5f83f6df485249e2c5f4b7e897cb3135cfae
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
index 918b4e495412..482e74db757e 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 14f06fd6ddd9..5e85124e5cc7 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,5 +1,5 @@
 DIST qtquickcontrols2-everywhere-src-5.11.3.tar.xz 9042632 BLAKE2B fa057831927bc429f2f3b906165d8fb4299d8fc260f35578c7ab5e68a99056a50848d110f337cd2440d443f123c7aff779a57990bb8232319eb1e9c8b1e91dba SHA512 b0591ac1f6948dfea2b43691f8dc5187a4d68142c61279fcc4387e7e9ea9ac1f4062d93d4adc4f8de28a39ab86a5d035f72f0c7eacb93050f2c002d7a0fc2caa
 DIST qtquickcontrols2-everywhere-src-5.12.3.tar.xz 9297300 BLAKE2B 53ec7eb16cdbc77d60316dfebd47f0372ce90bc9781dcdb1f0b9360774379138cf3483b52ebae9598bebf7460b300b388663fe35292264007d1f240ccf2bbff6 SHA512 afc1ae9a5a046845b085d5cf0019b79d99914a2d285676bd4d8966f1302513078c8279b71134281c03b2c1209295bca438b9e255774574520498b0b5385bad27
 EBUILD qtquickcontrols2-5.11.3.ebuild 600 BLAKE2B 9a7767dd29d2dee265782b08d341b7c113d0cbd3843b0dc3bbef865f91f3b2d66c0beb1b67115bd753b23e70b7b9b22a656092870a863caf1b98cbd809c62814 SHA512 83527f3763478a3f65b085b90002d04d34be9f93c82b490e44860def7a73eca94e93632ab70a561b423c62a8686c429c37353f0f09347ea20a2d82cafd5aa99d
-EBUILD qtquickcontrols2-5.12.3.ebuild 602 BLAKE2B 4b2b36dbb14cddb1a8b1464d271821a327140a667e7437ab28579187df2956d7ec48c4231c5bd3a95cf3ac8e429e7c6c3e620cc15b1933888fc0a2fba219db87 SHA512 7f7b71b29d4354ddc9ede990824e187b52e103b927f6aef66773c5f6ad3297ac3bb7540df38213019c59cd60a337c86632f6bc1bc24ad850fc6622e92b6e047a
+EBUILD qtquickcontrols2-5.12.3.ebuild 599 BLAKE2B d409423c1de739879c4233f4ed50260674a7ee0304c141135ed131a771604860204fd5fdacb9391632f4df55ca6d01b46e9204790fd7dd815002d6fa5b4630f2 SHA512 039590f16bd2e2e29e529b5e2d2d298186364cc3a5ec4101451828d50e427630daebd39fc8f08b2d549f237979684c4d4645bd63d06e93efa830b3a68b86cf9c
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
index 3e47b88ddedc..928ab5744e50 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 4bf06cb72caf..6a76a7262389 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -2,5 +2,5 @@ AUX qtscript-5.11.3-gcc-8.3.patch 7637 BLAKE2B 2d33435184ad673e1771a2f1dc0602223
 DIST qtscript-everywhere-src-5.11.3.tar.xz 2674692 BLAKE2B d209df1f632b9a00973eb043660c8a4a5e5c178fabd3bc715f91b37b781ea3567ea6fd7a2a12d462a63fb858c98a2e3ae703e8d7297a37c5d0dcc81d2f972d9e SHA512 987f9a13a698e3f498ea7408f4a9b2379969e901aa6b672ab2733af9d65fe79dd27af5f67aff5d7ab1903b5889c82359970ac81cf27f1eb2bad1e36eaa376b30
 DIST qtscript-everywhere-src-5.12.3.tar.xz 2674896 BLAKE2B 9f655989505c288d22c9d961e79227cee84ce4d91f6a61b7038e3b993da6f610c3703ad24b2146931c7d46b1765b60f73af8adea6d55823d0b973a99b61adac8 SHA512 4c4498acb39536bdc03643fb1717c7a47c82b1734cf67d17d40bc216084f01e837648d261f7f69e317387f9c6efa9aaa6b0df8f5532f55615252c95b1089ca1a
 EBUILD qtscript-5.11.3.ebuild 745 BLAKE2B 7cb67ba639c285b14249bd4e13967e92a6f367ff4dc2d60000af08eae27a3fb978429c21693b4634e255c748682401f0a85f299f150595a28ea974c9ea4241f9 SHA512 b199f2b09e30601330f2bd600b423f7e89075bbd9fdac99a8a63b91cf3cd8239326b987cfbafd006aa7f0eceaf7820693f7baf469b6a073847584bfe66468a00
-EBUILD qtscript-5.12.3.ebuild 690 BLAKE2B 0ad48ff4971d6e6cbb1b1431813a6ddafb39f6d6ec94425f5445bcdb1a5a0798be687439f9ee32b2dbc5ebf320ec50f35cbdd6f5d60b6a2c5c0c31fd9d51fe61 SHA512 db123607cf054953ba4ecaf4d38f2f1e262dbab27f86b2930b5086b67ef0740f802a9e4762210bc63aca6c231970b5f48d985a58bcdd76fa425c5eba4d557237
+EBUILD qtscript-5.12.3.ebuild 686 BLAKE2B 9d9c3e9c85b2dd5391d5e2cd4eb867fbc4aa39506cfcd29cc7cc41ac0cc951f8bfb14b9868697168ba5a7d06e6d1d3312b9197e37a4443a47fa2c4bc87c9d787 SHA512 29bb1ef9e4cad5c62b7538ed12c1a132fcc7223ed94797e2124375726a659117a641080030dc794290cabb37c48c5108f62a3715625727a4b5f5b4c4ff18f419
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.12.3.ebuild b/dev-qt/qtscript/qtscript-5.12.3.ebuild
index 075e8bd8b707..574a809c2dac 100644
--- a/dev-qt/qtscript/qtscript-5.12.3.ebuild
+++ b/dev-qt/qtscript/qtscript-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index aae9789a539e..84d474198e35 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,5 @@
 DIST qtscxml-everywhere-src-5.11.3.tar.xz 433500 BLAKE2B 7d7d961d2ec8e91dfb6e359ee3cde840094ac22f71745998b262e5a1d489f38f561ad163e36173c7758618213970bcc80a2f327cccb7e80d9b89dbf7ee0d8ecf SHA512 d162da8c11a24b764b793e446a9c1ce91068296e8f79525a874420fc97f0a9748ebef84f0fc0d615b6603025a3d8897f0ef14bcdcd95209f518d691dd457a93e
 DIST qtscxml-everywhere-src-5.12.3.tar.xz 434176 BLAKE2B 8059a28cbd642089408077064bdb0df3d7018872c711283e11a1ca194b7c89d370bf54cbded67feba635c0190f52aaa96f75e6f63362b6af0c62f06246b439c4 SHA512 d515506d90ace5eedfe8bf3439dad0853dbbdbd36dfb509dfa13e3358838353de66d5f6245afe4eeebd19dd3f0ab0ce5e4c3e6fe5d40e5ab46763c453a562a49
 EBUILD qtscxml-5.11.3.ebuild 369 BLAKE2B bc24e3bbc9353ffe7deb038410700c21bd8a4592c6f60d36400c7026bba0073c0ae61a4fdc805cb065e486059dec6c720c1220cd8cfcb74fd26212add21bdbc6 SHA512 5ae35dd30a95e8e93fed6b502d801f32a7253be91363e4eece69f9cee6d01afb687c04a84a58f7ebdc1ecc9c8389f4ac2dcccf052b72d97df721e4ba33df6c54
-EBUILD qtscxml-5.12.3.ebuild 371 BLAKE2B e83384ac54af8a722051384a0d60201184681b6eebb4e1ac70d0c6b9aeddbbf2e505a4819e7fa3817714f100aa60bb358b26e8ce2eafd7bcd7185a4ca7e3eecf SHA512 761109bb7a8fc5408ad258f95642c59c40891ed2937308e89139a5ff19b62ad87d6d5422c7ac13e046615464198cb0100b281087a8898c3b3def59b0ef350bbe
+EBUILD qtscxml-5.12.3.ebuild 375 BLAKE2B ab69ac92e5d96b97c453ced1b4b33bdd6f2ab23789a6d0d82a953c20540657a9512c50eed0b2efb0833709b6f09ffc98e0de03f7e8b4246492d20fc94f8c677c SHA512 f9f95312c4d6080c597236e82d65a4a3d825c70008f744f9d620eba2c9885599f54fae62fe0c15ccf427e83287a8cf0c7966408aede41956b6e8ff62b8a4a0c3
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.12.3.ebuild b/dev-qt/qtscxml/qtscxml-5.12.3.ebuild
index 43f3d8b3e1c9..0dce5e726b9e 100644
--- a/dev-qt/qtscxml/qtscxml-5.12.3.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 717cc5b88621..477955ff824e 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,5 @@
 DIST qtsensors-everywhere-src-5.11.3.tar.xz 2031168 BLAKE2B 089c77403a615dc1448646c5ef73807ad78242840569dc20367afc379aeff6aa8d925896c549568a3af913c5458a0b9e05245fa45523cccf1c89d6e3675edf90 SHA512 b0eae65b31be1c96870d29066c79b170f1f825615a78de902173f64a6d0f132678c5bf26d0033e110dce3ed3f2b99750a3b4cf23e1c13f799a9e51a6cacab10b
 DIST qtsensors-everywhere-src-5.12.3.tar.xz 2037212 BLAKE2B 1f75ceea8fdf8e020e73f2cd8377ca13128bf9aafc71146ad96e7cb1f69df83af2889b5a5684fdfd0abb18553332cdda2f9d8753233ed743d0a136a625941909 SHA512 cf0c8c58bbb84debd6b464bd9b91af7e79a301031613b8a2d0715fa276573dafea0a1c8e472fa2a2d4debd9b26f86a5e6efa9a8d57f7ab9102b1314d609579e5
 EBUILD qtsensors-5.11.3.ebuild 537 BLAKE2B 6e645e2b6c88cceeaa9518b8b21ad303cd457d42bf7deb446edcaac56d2a5a642af82bdd3a1354be11ff440b98823ef8462b39d63d80062a6efb457cde9be5ca SHA512 e72271be0c173cc94db935e97392221e53869ce544550d5e5753604e0e127a0c63257f75ca73dea36ad26f9e2013c66f732a9c325a57877a6751918398a65be0
-EBUILD qtsensors-5.12.3.ebuild 541 BLAKE2B 25fdd6bf0e235ffc86621b64c3a400fc6eb5de83e384e87d024b2828428b8e0f584954ed77ee88b4c6c324a1dde54f5a786a631c129ba50b0b9e8946a4345c87 SHA512 fb30b48223a83e1c5375c6d4bf8deecccf70b82dc2692896f8da34f5191d00ba432eeb312a9ddd8e8e5b23adc9812984c148bf7456fde7cb393be6f30497c171
+EBUILD qtsensors-5.12.3.ebuild 536 BLAKE2B 76d308647882ddd3ba5f69b79ac559bd69c887b9641a57b6a6959d6971fdcf1e8c6c64148489b9dc98c9d42590a0f60326425f6a6c7f5dfd08d19904c919222e SHA512 26bd4619b0e208303bfa3838ff78e6080dcf2764e5bf7012310ad818eb04e530145874031fb483090cbc5ebc8920dcbf1fc31d989c8b6f76f830b4b33131b050
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.12.3.ebuild b/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
index 675f29c7e3b4..b4da6715668b 100644
--- a/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 208a269254e1..469d6d6f2455 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,5 +1,5 @@
 DIST qtserialport-everywhere-src-5.11.3.tar.xz 299140 BLAKE2B a10c24eedc425262145b705b7a264732db6a47d1bc080f2544bdb6873b1e7f6d1c25e9b27a3dbb5fd3eb697f06c4b057c072112090ce5f769f765d858f41860c SHA512 2c09a0e47bfebb494cdc767c5268bde77ef7dcbc665cfdaa0b17468a0cebea0208ea8019d0387622d2db63387557699fa30e043f3478dbddfd6b8fe909a7add6
 DIST qtserialport-everywhere-src-5.12.3.tar.xz 302740 BLAKE2B 105999b369422c4e819c85bdcb2899eff2af9c8486ea485bf89f6b1fbe0d78c8760b52e06942145f7a0ad54c0a25ee504d9b3833536af3cfd88a2efeebda5b31 SHA512 42551b74abe1fcaa1972fb1134215987d7c1d0fe73874a4c6ad5b9aadad71a2066a1846c297569bb1562f94e54a406e8074d444deca510a566e27cd386b47ecf
 EBUILD qtserialport-5.11.3.ebuild 546 BLAKE2B 6007d83605f35634b7480a117aca620f5b42d9afbdec7a25ea379cae60d1223a507d5e9265f6b45827dede903f1ad9a14f275aa2a32ee92e30e60a46dcb1cba5 SHA512 1b4ee72871a87317f5ff2dac65e40923c8736ce66f0af1f86efa82f35ccc7dd4d40b119459b4e8bb07fcbcc72037738512252eea92cae024d469a57b88ecd77a
-EBUILD qtserialport-5.12.3.ebuild 551 BLAKE2B f7a8989ff1b968697349af96be81aa564d3ca5ecd63c5d78c90a04175ea811cf3fca60da5845da3fd10a77a7f792e8cb2d771ffb4d638e0d4f53df807d4b26f7 SHA512 853cd7fa77638f8d1017117ff8c0fcc0c9adca71a2126022126028c13c8103156d5dfcfc64f8d2e1a6a0dc6e61dab8f594b62dce601233b9dc447fcf2f12dde4
+EBUILD qtserialport-5.12.3.ebuild 546 BLAKE2B 9822586d5bd08d020bb4273197ee896c9f06e5943cf242aa77d38e818dc8010f9d51d65763039bb1a84063f5de5da309f00fe7988c39d636fa4ac3b8c3102bce SHA512 74f69b55576a3a5f58a2c08f7f0e14850ce2fb66e07b9407fea593d1b71c956fe2c17bc2e3223aa5bff1bac46e3531f2cc576650dcb425aef4b26dde69f6c8bd
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.12.3.ebuild b/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
index 4d918afef30c..cfad25495236 100644
--- a/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 8a392cdb62dd..1aeb2d14d703 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -2,5 +2,5 @@ AUX qtspeech-5.9.4-nogui.patch 321 BLAKE2B 0b97c282f271a1ba1d7cfa2ba15f75bb2964c
 DIST qtspeech-everywhere-src-5.11.3.tar.xz 99516 BLAKE2B cceff35946e7e8012d628b5d1093256bf68d512c750b4f5613456e225090a3108264046963ca97aeac160293d5d814db9f5286126797f22437f6fdc0e233ebdd SHA512 f4465b0eac4690fe576c098704d992fee884ede3219a6b032608b877748dc670cec6dc592aaccedaa62a0b2c9d552b9e1284bbac44af6e4cf074bd00918284be
 DIST qtspeech-everywhere-src-5.12.3.tar.xz 99828 BLAKE2B a48006c84240091c09af185a6cb6b8df732f94452b92d734d4fb7383966d1be04dc0582c366014f7b75deb2d07c54b275adea3bfbb8d307d2dd1056e4d08c94e SHA512 9623a83cdfbed07dffcd8f0808c2a514c97fda72b68827d917f1a8ee3072286ef8bce06b114db94d7a0c3fc79425c2540fa5cadc6551367fd4431e5396395932
 EBUILD qtspeech-5.11.3.ebuild 485 BLAKE2B 14d1b00fdecd56b0ad7fa19c764d1375fbaa61929402aad2ddf5e5fd67afbbba1b9835f11bc0db5ebe7cd8b73b149b75031d9ecd761a8bb88b2d9e7b7afcb971 SHA512 d416a27dd366f305c662b8da16be7acefc961b8e6d089edc8b400199456a64d2f6a7226fdbdffe5f40ffed6acfd471265a182ed120f13121c220db2e0b46d103
-EBUILD qtspeech-5.12.3.ebuild 436 BLAKE2B 2a5c342c6d7f7d46bcf003325c22419bbe2bf5befd2e0873fa6addbffbd170b4583b861bc58550c34831f1b9fa1ca824e34548bfc27b14e403a0591a245add3d SHA512 2565a566645663b4d69e5860ba79fcbb49056f8a7b5fa11794934aacf112422a9d069f431f64b06ae827d2c14715bc24588addea7eafd74ff22d36f4e3a9659a
+EBUILD qtspeech-5.12.3.ebuild 433 BLAKE2B 9a12396f350c87c414e274ad1ee1fe21dc23c5003939c8f6894af04ba67075919f5c53fb0d3738f52573d930e91b750a52bdb90c8cab8fcf1698194466871108 SHA512 fedf5f8b6efb57752983a99c6c788ec0c9dc094bf98635b8f7bd71f0f2c9792d0ab02a1e38fa48aedd7327785d13daaf12ea1ffae072ff8f2a7a0028e9016aaf
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.12.3.ebuild b/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
index ee3692ccfce5..b967afb594db 100644
--- a/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 # TODO: flite plugin - needs 2.0.0 (not yet in tree)
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 49368dde21e7..1d3a0fcde8e8 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 EBUILD qtsql-5.11.3.ebuild 1503 BLAKE2B 179bc9b3df54a7a6dcbb91f7fd1f4090bc0405abd19c79ecd25f6a25aa7fe6c88197f4d8027df23607e77754a05c1c8b8180327f9705e113e8af6ce9fa0cbd0b SHA512 80e4cb82dc13cccf9287cc9c7a4eb1fb4a661034dffca5968109cef403cf1f3a5d90e1e32b1117a9aed110cac8e762a505859b75aa664b7b389ec49857c0d7ec
-EBUILD qtsql-5.12.3.ebuild 1254 BLAKE2B 60b14c83046c212a3d09c142669372f9b6ca7ce6365a88c0d84797182a9ed10a0898a22a6c5d3db10f1a7dbd6e54746c16092381abc97be444bf6e5c192c64de SHA512 8d1cf58fdce2e4dbb6b0183c154089ac9ea30ecee61be1ab436a0a2ca795077e009038af6e3d2742e3a08c29d5421c67184dda7eab30e8526a22f7d7ddaeae53
+EBUILD qtsql-5.12.3.ebuild 1249 BLAKE2B e6aa2e61b7b1a800e94c9224ac780f9c8533afe6e8924439a048d07c0573a74fe73279e7e926b547c1fc98d4a8f7f8d0441c174900188d6311c61dab465e2e2f SHA512 d6b9b8449aca927b693960058894cdeca4975b96d8329a1e8ad78871a5d1da2bc46ba993c52f186b2d0f52db9083e9679f10f023eb05944c56f963a34ac8879e
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/qtsql-5.12.3.ebuild b/dev-qt/qtsql/qtsql-5.12.3.ebuild
index 92ce286d3e5d..569eebe3a201 100644
--- a/dev-qt/qtsql/qtsql-5.12.3.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index ffc5daae18bc..c4d42605ea18 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,5 @@
 DIST qtsvg-everywhere-src-5.11.3.tar.xz 1845004 BLAKE2B 2e091a4803fca45923df3ce61890e9dffe4b90c4118c7bf95263698f8c5f9d6260c350c3ec40d53de0fbd4e7dc7b742fda6f6693b338d446326bd740c43573ad SHA512 1ad20b3b59e6802f960fc95421b7f4d67460fae91219316bbced0ae225ab5d0066322a49cceaa7a86a981e9e56741724bbe323ac76d3478fc1f5d0d04fdb9722
 DIST qtsvg-everywhere-src-5.12.3.tar.xz 1859680 BLAKE2B 9ee0a2dbde09ef19fc72285f5ec9b865fd65c23bbecc4fcc8969a5f84bbe31818a086e066f32873e0cfd82aaab4a077660eabd2cbcc7494e84949c64b4a99740 SHA512 23517dbdc30d7128fcbeb12a301eeeb300424bb17bc0d156d5e9298c092d3d3afd2cba45768f2512e58977ee2408450f50c385e03a47ccaf3ff6bc7e4fddf61a
 EBUILD qtsvg-5.11.3.ebuild 470 BLAKE2B 889af077ca47889a36ad19af45131c60543380707555f6b7e77db3e31381cd1e5505a7d96e593408b4bff7eb6aa45f797fa71cca74b5cdbc9aa65bf731a73464 SHA512 6f11e597891915ef912e53cdb9088701d64aaf6f6b83ee64059fa6fd1462e05e164f5454a146de90795d8bdee9f3991bc79655dd66f0cbecbcff08e565c0a617
-EBUILD qtsvg-5.12.3.ebuild 469 BLAKE2B 3900abdd203c564a2dcd51d253f04f96cf8c8ead35ff87fff1aa5cd28389dd40b396b94667a3e7722d7a089fa72ed383449d8a86d9878d9f99f839dd7e93b80f SHA512 fc854e5b8952021911aa9b38752155ee7077d8e5fc504c1c91f63c95dcc72605100d817d1d57fc274ae50b258979299141dc70c54fbdaf9a475b3851bd71fe05
+EBUILD qtsvg-5.12.3.ebuild 464 BLAKE2B 62c4116774e4582cc5378019329a22815d30d42bc354c4d2e1102dab5201740e5f26e617ac00a93911c3e2db98834faa0bea16a90d8584862d5233119c1ac960 SHA512 6072540eb5648443688fdbb2dece806bca509be8af57638a67f1254851493435f4d8f5a528eb38096ef344ece66e011358100124e67414646b03ac7c4353d567
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.12.3.ebuild b/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
index ad774a2c3286..32c0b977de31 100644
--- a/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 180af3a55126..41aa25cf6348 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 EBUILD qttest-5.11.3.ebuild 548 BLAKE2B adaa1e47827f621139258004ff0253a604e603301cf5fbf1368acef40997dc2b3deb2261f48097f03a124515afe763e787411ef73c0bc9161b053657b3d93d07 SHA512 d4d14ed102abfa4592e689c17407eb658a1d919df8038c1a4862ea16a3c43595afc7dba2b415fdfd306dc0dacc4d9fe3a7fcf4e045afbfe45b5572c63497b60e
-EBUILD qttest-5.12.3.ebuild 553 BLAKE2B 697f4b3c1b44cdb594ba4603b245ec608b707826379132b66b5c313ac54f4d2de48aac9783d206c75e9eb4da917daf70601a04c1af1788726542daf206f43a6b SHA512 015d0282388fa5927427c1df4027249e379fdd10f6789208d0879d5318398e685e3182e08a1534f07b281bb1e5340b2edd072ab112a33ee6dbea3af15128459d
+EBUILD qttest-5.12.3.ebuild 548 BLAKE2B a5ffaf81ea7498dbd1e5f228467a08fa8a28430f7c5f0df55a1584a8fd680ef650eee1745138823cfed152dcab6ca646b45c02110b40d2b1b9b2c7196b18a8f9 SHA512 7dd5ebd5269ff70d8ba0d5a7b53a55b5722e8c159a000e042a165f6206eccf9296b31f78c138a243720ce5fb96c00c5682eacfc256a36b85dd48c6d60812f757
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.12.3.ebuild b/dev-qt/qttest/qttest-5.12.3.ebuild
index b365a47c8733..e0d7cc228db9 100644
--- a/dev-qt/qttest/qttest-5.12.3.ebuild
+++ b/dev-qt/qttest/qttest-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 72e7f4e641a5..0222649ec642 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,5 +1,5 @@
 DIST qttranslations-everywhere-src-5.11.3.tar.xz 1424160 BLAKE2B a6ee17064d4fe8d3611e04883cbcc9d69bcf872ca4144605da20d6787c051606afdaac771716bb55f1a970dd8468b8e2aa0602d926d8757b2f9faa58db3f6f61 SHA512 eced9516f3e0ecfd11ddd99b7b0f80c47014110af1c43008c764971929405ee7f5194c3390fe07bc4be9a9ead04e7c06c62584475dbe93c96118eaa16cd542a0
 DIST qttranslations-everywhere-src-5.12.3.tar.xz 1375832 BLAKE2B 5fbddd0a1aa58f367b4089dd6560e6251451e623c5e81078ae428a9420386bb6ad60402b6538d4a4004ec28f84df78896e73df81abfae64cd4ddec1c18fa1cf8 SHA512 76e31a3c6a6824666b2f49d7fa0ad6e604f4a8fcb408261cfeb7baa213fc2f54c1382f677c824f47e7a629776637c699fbe215eecfbce85c3ce621c3de9b01ad
 EBUILD qttranslations-5.11.3.ebuild 378 BLAKE2B 045f1311669e5abf0d7d46130f8dd08eabcd05ce97eccab292f3f143dfd248561071ea8eb2d386c325fbd771c240d9001b8fef0f8a22106a25527ad65df73007 SHA512 2c914cf7689eaf76169e2f1dde90384da7d621ec47abb778a3d9f74cbe4aed5f01ff91488e2dd85e5986e36dc441b648907372b241e29212373bf060fe55e12b
-EBUILD qttranslations-5.12.3.ebuild 390 BLAKE2B 634fc602a39e994b29c1078418a5493df4a203c13dde074a2a4dfd223c1b13e75b27d4f4cbeb4c1153a2dcc6c051d4237646a3a419c6e0dfbd5911909599e7c9 SHA512 f24081b2a0f1a639ecd388e2f71fe94679db4d026c27022c2ed21112a8a7d0a707d9a3f835b23fedc6bcd7c4b68c0d21a1fcd34e30faebdf10b0ba6a19778707
+EBUILD qttranslations-5.12.3.ebuild 385 BLAKE2B d1453c2ead40e2d42f44f6300dc72286286ef2146d464fc50e8d55982044cc7bd92cda338cd0fe5a5b775c184d22f92337b56c88a99759d979c05bfc83b2517f SHA512 426f7e3f94ea3dd50097d19aaea939a08d4a45268528a4ef4a2470fe95d4a80a34fac2bc571196ad3df7057a23d79fbaa1e5b7408c10216e37e2625d816a4d8e
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.12.3.ebuild b/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
index 9ddb031a518c..7119dc930677 100644
--- a/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index bbd6ed161bcd..b92d83d2d0ca 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,5 @@
 DIST qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz 10698520 BLAKE2B bf4800c07e1f0f1649f81d21192bde613b20b54fd80b4d49136e7cc052f7f60d410f3014c3066e3f5c83b6a6d838f50f73a78bcd1a8df5e3d5e24fdb5875280e SHA512 cd3ce039382efca26842b8a413995d8b6bc26184e6161e8c3cad9ed326381a3f6d29798a9a42a52875886a23aa6a74bf831d70a62a7d12f852b640dd6854d2e3
 DIST qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz 10916144 BLAKE2B 871db74b3540980d4392fa49d77d60c33f5cbd7840cd41797c168c324f9ba46214cf31154cafec9714c17b784c0ed543f5498146cd3c71228c320fd67792735e SHA512 1aa00fec7e333e4fd52891b82c239b532cf41657d9c3f44c6cc1c211a1412dbf5584823511e54f3feb33b3fed9c6e0171b55afde2df9f0a358e2e4885e1b2686
 EBUILD qtvirtualkeyboard-5.11.3.ebuild 950 BLAKE2B ca0f8b17d29994560b0e1064447710a752028b6ceec0192ca41a1f0e4c5d9564ac46638810c9d87ea3419c7f38cf20be78ae6909e3436d35694c5420271507d6 SHA512 d13ab77891f16720e9db29554b85092e8dc94851ce12d71d9caf34d97ab0bf8b14e52c38a843fb548c1dabbaaec9639eff5f9a582155bac7a3f3cc678ed0d21a
-EBUILD qtvirtualkeyboard-5.12.3.ebuild 1214 BLAKE2B e369eb706a85034144c4e487bdf2a8f8aa8b7ecbdf784eda68c8007c38b102a81b350ac69f75e5006f2958e44c303e8b115dd19fe1bd138a658f51d8f05a4a00 SHA512 38b5f4687a6f7b13b73864f9bdb10c7913fa50f14a4da2d67be8b58d2c715f53a8234e63f7365765b08f5af03268b4265df95d0aaf4c05778004be57c9860c25
+EBUILD qtvirtualkeyboard-5.12.3.ebuild 1211 BLAKE2B 00791d3195d83c4694b2db0a7fecadae34a458461a3a07bf69c9b1783afb7b661a8069892670ea5f307a62ef91234c0ab379b3b4c538211e0a10e55d41ccc91a SHA512 e3a2c47d0158790df8f2338e23367e98eca98f9fb04a2568b896568b4e7e3184fb91e0abd3a7cbdbd05220463fc05cf2bd832fc086e8800db9e1dcdc6e3923d1
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
index c6f4faa3268e..fdc30cf945f6 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 x86 ~amd64-fbsd"
 fi
 
 # TODO: unbudle libraries for more layouts
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 05943ba68921..5a52e5d402de 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,5 +1,5 @@
 DIST qtwayland-everywhere-src-5.11.3.tar.xz 391124 BLAKE2B 2bc90c7a6f6769bcae7e52072d71f38ad984cc931767613e7972373131c9d58c145e9882c29163190257f07a205bdda63f78833859d2be6d6478126c301b70a1 SHA512 e442a13c61a508d6021fb15a0917b7861faf139fb7dca41ac1a3967f4b8dc82da5095029e4c6120464bd36ecf559547fe2f42935d9980f19298f5875cfb5e62e
 DIST qtwayland-everywhere-src-5.12.3.tar.xz 432304 BLAKE2B eb2ba520c651467c8ed5f0d870a69c9b07047cb4c05a0c889b36abeab30149861b83ca693efb0bb93dce4f5da5913afc3c8b61933ef0e8307d22b64fce530d87 SHA512 e66f9f41c15cf84165e559a1ff09e20ec21bb3f909b57fab08b0e3f8f9eeacf75d49541b499b1a6514a34d1ba5dd426ec1ce77719910588afa12cb3a7980dc90
 EBUILD qtwayland-5.11.3.ebuild 900 BLAKE2B 5ca9b8b36a7430adc85e566ed4e02d9a54268e683f2871588b1f72dd9c333b7d7328ca9bf4afc707ea74731ea84be78a1c0420b8b4bf162835bf5aa68eb27be4 SHA512 698fabd9d97312675317d0b336562c49c11420af417e5534a89397d1f08de7dd522774c1d8ea462172f80d6e898fac2497275aa648eaca4576dea7d676a40ab8
-EBUILD qtwayland-5.12.3.ebuild 1142 BLAKE2B 5f93bc46b60d82313d6d328a32f6dc73f31044f99391b7af636b67e0723f0a1cb88d433bba6497b3daff5959033c53d64169ae81b764bb65fdf1dd1803297fe9 SHA512 4650af17ff9ab0ef91a381e8b04c15407d03550c7adb1e064425427fa63ba8b06d3a761f5812be60a899d0d083dca7a3875701d43d07be102b0f3d762e1e616a
+EBUILD qtwayland-5.12.3.ebuild 1138 BLAKE2B 6258fe590108dd600392c96ec36bcb8ee26447798209e4516e8d4fc53a0ae71093b582299614d4e5ce6e251a13269c959fd5fd15b16ed1219c4e610a4377ff1e SHA512 6dcb5332ca67d7660ef4ae6f5d18027d61326aec9b066b12752177f76bba12478cb3280ae7ac9d35d7d205f55319040e27da58d46b39bf3ba7327ac2c0472461
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild b/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
index dcdeeaa61c32..83fd32c5f97f 100644
--- a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 5d2f80835966..78e6b5486790 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,5 +1,5 @@
 DIST qtwebchannel-everywhere-src-5.11.3.tar.xz 177328 BLAKE2B a3ea3c535e466629e5bf2f864967b5878e4e092d614ce05984af81ce979c5866e225d30399a0eb81f9b4b0d44c88646b1b6de2f1be524b5af5b61e995ba780ad SHA512 560d79ba00bebfd5afc238ff486ad1691eea8a1702f565cd838b07419f6fcd1f028ab5b204b32fff6a3c40c3dd13d89e3cce205076a074eebe7b1c111c669d2c
 DIST qtwebchannel-everywhere-src-5.12.3.tar.xz 182808 BLAKE2B 03b1e906e4697844e27a9f4fa7c74bb9df228d31c85071299645ff5441577f749b7019097ac9021f3dda02ca290aba74d3494adfb9b04d8614c82586abbf399f SHA512 2dda4351f5f3a5895a955d0ee77e55f758233672005a068d3e840a01d379727f99287fc6c8fb96516f23a5a8c4ebcb61098690fd3351e79be608e28657534006
 EBUILD qtwebchannel-5.11.3.ebuild 565 BLAKE2B ed1848fc98f77844b8f3d1c59d9925a5ff70b9354081bd9095abc7cd298edddbcfb607d90fdf02b46fe0870f18c03cd3626be05038873a78fb7e9bd58ae556ad SHA512 9da7750ac22aa817fed1e9e55721adb87c892f50ac7aadc4ef3d3c86761536cdc419f61e890c578c40d819c2991ff01dbf8e9089b1bc56721bf42df4cab43cd6
-EBUILD qtwebchannel-5.12.3.ebuild 569 BLAKE2B cd5404b41809151697671842cf6e98be982271a568182b32e10c6aecef4823c379586609f32a6239f033964c33f5f361aeb6ec789140f7527d9b13dfeb85f063 SHA512 c482e36600a55207398fff581d97140581798a7579ac24ca8b01d41a8b5d169fa41a950cc924ab3135f0cadcf7515904846f6c2d070bac8fb3650bec2d960094
+EBUILD qtwebchannel-5.12.3.ebuild 564 BLAKE2B e0e73501655d9cc42261f677c010d28ecae174b3cffe037b23750f4cea225dd9f537f9853f9938f496934effba0ddb3f28aef285c9156a66293c5de05e3afcc7 SHA512 d563ad6a91f3b685b557585dbeb46dec7021a75de14d12c09b14f7c5ebc68a96d42539172ce267e71a9411e46441d3e07b5b22f327e267f25c6f40b9e196b01f
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
index 03797ea36908..d5e5ba7362f6 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 78860b5454f1..c109490879aa 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -5,5 +5,5 @@ AUX qtwebengine-5.9.6-gcc8.patch 1184 BLAKE2B aea72fb7563517f6c1f0f1330bad21ae71
 DIST qtwebengine-everywhere-src-5.11.3.tar.xz 233678844 BLAKE2B 451a2f8361b158835f7f565aea9e7e372ea5670f56a5eef918d0340857e1b336d7147c5f87417a21ea225c248cfda8248869c2023b2e359aa9216ec472dea4b9 SHA512 323179244187b075836101eec15fc96569e31dee7ca0b28d51833cf02a55439ca0ab8e3e14acf970eb0258e1f5187b6b33fc1a35bf9056e4941a2b20be9b0431
 DIST qtwebengine-everywhere-src-5.12.3.tar.xz 249275648 BLAKE2B 7d2404084a510c62b638dd09736130eeb40e494f9594339afc7df6628878aafed778a2785f6848702d51b3a4ef1dc8b333d5e5eeeeb8f930b4da839eb70bc175 SHA512 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5
 EBUILD qtwebengine-5.11.3.ebuild 3567 BLAKE2B acbffbf02b1c8c04b02cdebd495064dd5bcd8dbddfcfe474ccac23123ece756e7b46075b844e5d961019435a9ee2e0bf33c599032eb47cc3b75c717d4d106455 SHA512 f749ae5d194463556dc7221561345a029a01d0e7b4002b5c4a83d1bc6cac48fa2cf42d014641e12e9f7c68036fc8e4bc9f72aaa46eb1420c4853a6caab782ffa
-EBUILD qtwebengine-5.12.3.ebuild 3541 BLAKE2B c46ebaf61d638f983dc5fba738a33bee7f9b330b2d8ccfcc6c10de22a2370d440f1a272b59533ffa260a65adacf68dec0d1279c1f6b5b57a30c0c6ee5d2a4f52 SHA512 23f399af5866eb256a99b70af519dd8ee075868d5afccfdbc2434fd359a7ccd4c0f794789fdea233bc3476415299545e5cdc36cbbea8c9e62e545ad02468c2ed
+EBUILD qtwebengine-5.12.3.ebuild 3537 BLAKE2B 9f67577d90599893da90e7a7929c6f2c92f519e5245343a40d7371c4de2f106e4e8ca240b76046cd0f188b3d4bc8ecbe3c37b620275b4160d78a273e101f1640 SHA512 998e860b7000ddc81ef1a77c38a1c73fc13d133eab40a2b6fb7403aad55c51bfd2890324848f8abdab8e2dd8c47816472319e1b87f4d722ad93a1ef1391c7b51
 MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index 1dc84dc7c80b..d2e02e66be26 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 3c12b04d809c..a526c418525c 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -3,5 +3,5 @@ AUX qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch 1164 BLAKE2B d0d12652387ed2
 AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f
 AUX qtwebkit-5.212.0_pre20180120-js-build-error.patch 2124 BLAKE2B 2c09bff3d9bcc950b7305c7aa943d5af8d47572b2b38063fe4de0e8d48768e9fd337e09fdcc314bd9ceda3e51f8bd6731beb4660a95104c0f1d8e6063d01c294 SHA512 01e090b390dcb78a998203806baa0677d39aa680107ee523e4fe1c26d9fa8750836a715a107eb00487e1ef100cdbfcb8ee9d2d9bb47f5f336dd153b591fb26d3
 DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
-EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3979 BLAKE2B 244019efa18a144e2c0fefc91cee6848796add49f9096b8220a713eb6f79cd94f66a86864a40c4c92bb69e9b16d642958dd890b3981384d7100ab7f017d2762d SHA512 2f551f2077bb1bc718fc26a4d922e948b5074a34e7c51dc4c79f254a4e3066f86c507778dccce0ca87b2dfe45cdb059306c4ac8967857226873438916ef8c786
+EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3978 BLAKE2B f07d92bb3373319701138006ebd3408e25b728d58c1755134966be06b9b70c94dc0e7fc4baec54241db37f37261d9cb7e8e494798ada848bb2dd655bbb67c89d SHA512 3825142883d045a5fedd02848000d212173e6552bfb4b330041e6e1d9930d6fedeb4f0d8c15f41eb00375cb74f5e177c0ce56f37a722c9a5c5c43612bacb5d12
 MISC metadata.xml 1225 BLAKE2B 29d533721955dea3cd9f1d23494438d3abc079d713cf77d707920a765e3eba4e2160d0f80b05ec2ba8cbcf7999aad51201bbf002e8b59161bb2d0d85cd945e50 SHA512 b382f115f4705a577e210760d499fde421d0091818914674f0c2eb7fc4967d19d5dbf752be19f43f0edb27493ebec58b89e07a65ffa505842a089d06353aa122
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
index f288314ce872..5d0412d03ffe 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BSD LGPL-2+"
 SLOT="5/5.212"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
 
 REQUIRED_USE="
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 8aa447b564b7..1b106e70644e 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,5 @@
 DIST qtwebsockets-everywhere-src-5.11.3.tar.xz 229368 BLAKE2B 4308395634f0cb2fed711e5c55cdf0b035f59704178297cdefbabbfc1c59fc4561e5603d44e637b445dabd83555ddd473f705d47fb25be7ad0e8f0aa21feab72 SHA512 8a1ddb2c9ee09018e8dacb5105e24863eb52a84d69ee9792e77c1c6a498634314b24bf3e946f682c23dfe045150898a1c1124bc08416f3560223459b8d1abbfb
 DIST qtwebsockets-everywhere-src-5.12.3.tar.xz 235312 BLAKE2B aabe93119aedf18987b4c2211e1cd312a785592ddd0ac371b23e6d5649849bfe231aa24c2de91c20655df7f3a92a614371846060f5b70e09a14f4f7607242fd8 SHA512 212a98d987b4fd16216ac9a1c98e061be6a5bd2e2c4ec8be80424d6f23afeace790fe666abe8a11e2116dc20f17a41ad0c817fceacdfa5f766b93068ac614817
 EBUILD qtwebsockets-5.11.3.ebuild 539 BLAKE2B 2820edfa86c4fb483d1d069bcbf0a436415745cd95d9f6a1817d1c39a44b69960fd6c5194ab434d5a071246d57ce9bf2a8552f9726903d60d9bcf697d6206e76 SHA512 defda1f4691a7cc7e275f631880dc14f1a62adb9d9a792f2d917281c8ce3ec776588a9a2ef473e2feef5a3366f9b0bdbb532a5aa04d2b621ba3c0bef41e4a59d
-EBUILD qtwebsockets-5.12.3.ebuild 543 BLAKE2B a5307c0a4619222384ccbc249da5071c968a68b4b1606d7cf79bb3768083b50f1b7de94baa02f2441cfc8ce3c333130535b3686687cf1723d34a043715f30cb5 SHA512 a44d3d256e686c292e8660831a77168624b94524a80da5ac5b1c6b3941732b95bbe76dd4210f13e2558381708e9977465d529a5d28d6f77fea799c78eea56194
+EBUILD qtwebsockets-5.12.3.ebuild 538 BLAKE2B f75736bad52bd3169726e57d7213c3fe5ee759d49dc3b248fbe0a91ef28795058b18235ae851d391aa3b6491fcbcc1273501f9beea20f9543307cae549264836 SHA512 24780fbf2896565fbb196a44b010b41f78e5d017064ce0257bf38479899361f6dc75252db770a6f2b2dd4d534f20dfc2f142c4494bcc227afce29ae3e1a167cd
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
index b80875f5a23a..d999e123ec1c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 91caa4b346ec..ee9c1509c623 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 EBUILD qtwidgets-5.11.3.ebuild 1062 BLAKE2B 590a526f7d9846250a0a21a7cc5d20353ec4fca439f2db604e6c1fa76fcc26cfdc41d2b933e965ac32f789447c99935bfff5eb3be5b3647fae8e67385cae2116 SHA512 bc9634b4655c9410a7bdd6464779f6a34e16e112d1917fe74ced5935fedb93f9a699078216b7b0cc55341d69f8037e12ac833d040bf79160fb0a0dc20a99dd90
-EBUILD qtwidgets-5.12.3.ebuild 1048 BLAKE2B 4d1fc045b4739b6d10a0e06461a9d887a105eaee98271094a6c16e2b768d4edde0afe16876206d223caea5a9a2cfc2c33b8d8ef94c6dc762a65c86fd0787b7b9 SHA512 e0934ac5c84ecb33082c6d617da88e688c78fe5e9131568c02519e2ad27f5ebd90f91d7c4863baa52434f47ece624e368b9cdc774ae1b75214579360c7b69487
+EBUILD qtwidgets-5.12.3.ebuild 1043 BLAKE2B ee42a11d1706de778c9944d09350712546991af040d8a59f129a9984de9021db0f6679b2037ab18f06bf220da3ac11d588b60f043bd4c53eab02007740158934 SHA512 7bc1ab5613fed84b9a3a933d4f557cd9a604b31f316239e11de605f7967728434f9d68c5c6f2c9bb2b756b3161eaf2ab5ae97b0b2a2f50c8092a8558b9f45101
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
index f1ee2b9f2a3c..aec9a7be523f 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 180974f63cae..43097814b1e5 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,5 @@
 DIST qtx11extras-everywhere-src-5.11.3.tar.xz 109496 BLAKE2B b95f2d14207a0a87d6ef95de45908351ba2171bee696cb55a9fce334e5d1525c9af968591f03d9b2a40ca1088ee626f81e15b54ef2972da68ee4e22030e16bfa SHA512 8aeae9a567d6a50071c239796e7916b22235b6e51dc56ade7914be85db610bb51fb3cc8a7d863b72ae8c9385498afb8533d3933e780fc8c764ec91dcb3de04f8
 DIST qtx11extras-everywhere-src-5.12.3.tar.xz 115908 BLAKE2B 9ec7d370630f6c43869f648222ff46368cb57984ae732320974258da5b3905faa372e8fb97c25df8c88ce155c75be601bda28c988cf5b639bf6404213a1dbc54 SHA512 21dda778aaccab44d8c4950fc6cc9fc6748f1f38721d8f775c61754ace81d17a03847cc6fbe98a9d23ea592fd5f6942eedff102d4841daa5847125986c474854
 EBUILD qtx11extras-5.11.3.ebuild 444 BLAKE2B 63583d60ea743a85758d9f000a397a4e95fc0b6e07fff1bb2708801033ccc0e5243936b6cdc7650444c26b78fb13853d145e3e4dbe44e964dfe0acdfdc35de62 SHA512 986d3a87cffc00a254d8dc5d21e8d0e1c454bd180c7e2cfe465b56bc52f1fcd55f8f29e65e2915325db223f54154734cee225367defbc170cd7dcbde53273b40
-EBUILD qtx11extras-5.12.3.ebuild 449 BLAKE2B 32d1922fafc24703b96d9ee9f34b7fa6990b87b8d576b921b908d6009475e8fb590e5f437fd8463dd107fd223fe0a54813bc534d7d6633b930fb5592ac365736 SHA512 9d37124eae5487adeb70203ba52a16f0c91ff95590fe029a34fe96cf8ca9966bc03cd5c84fc820cd00a51c216f8490d3939c320bb718f9241f8948f79636542f
+EBUILD qtx11extras-5.12.3.ebuild 444 BLAKE2B 1f625e7a7505dc760f126fe19a88e4e7097465d9eabe97d1919761f9c53dc845a98b95be11c6991185ac50f0c224bcf86622b3963a7f28bd763c6c74b9a6ccbf SHA512 7707a180ba753aeb8ec6106c3ccee763eac26f974f5555fc0107ef10e78d0aab9acef56d7791c755c3c7f14a624f83c3e65b3e4b44028526d05135e35380a296
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild b/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
index 6245a6cc5506..1316e9b6ff3c 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 40d0f73904cd..23173f3186f1 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 EBUILD qtxml-5.11.3.ebuild 503 BLAKE2B 730569acda87a2c6b1d6ea1e7b9818518bd50a18ae9fe0fb85bd306b5b6f18ca0291da56c4425d576c6d68567d1f6f48a70889d2a795895c53fd99ddd69ca154 SHA512 e2e530a07727803520487e72a08d2e7505c218c039c351bf01c9b8765a6da11ea3940000c4aabc121ba66caa5812dc3f54221efd77a499724992df1479da683d
-EBUILD qtxml-5.12.3.ebuild 508 BLAKE2B 8db0359603658d36986b8f5f1c603cb867438f4d508bdf6dec48cc39d842c788cb0f76226e959a19b98769d803c8be106fb825d50f3978bf56683e128742bba6 SHA512 890a9a15eb0b5634c4c440b9d773a110caabfd43d71f9bf7feab4b0e765c4872656031c125f1c258eda2a66f28151ca2ba916f833610ebd58c4652a83dbe28d9
+EBUILD qtxml-5.12.3.ebuild 503 BLAKE2B 3444c37f0b1882ba439687291bb7832d7003cdd6d1bd03db134af8e44a3ed6ae0dc9cc0b4887a5ad8536502dc9728cac8915c9bbb5a5bb107581bc1185952df3 SHA512 84cfd3b77e89717e5a43f23bd1a96ea9f2b3247c069c218323b112d068796fcb6afad3754685b9569010fc2d937adf6528fa63b2394780000d3862effa0db3a3
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.12.3.ebuild b/dev-qt/qtxml/qtxml-5.12.3.ebuild
index f0c71f595c2a..99b8f759c28e 100644
--- a/dev-qt/qtxml/qtxml-5.12.3.ebuild
+++ b/dev-qt/qtxml/qtxml-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 0944f6156de9..fec7ef6d1f85 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,5 @@
 DIST qtxmlpatterns-everywhere-src-5.11.3.tar.xz 1373016 BLAKE2B 6ab881ca138aa5f65aab09ff499181758c1702cd1f3dc1232f12efb756f5efd9a68dec5bce5fc812dde9d4818d0129694a26e364b2d84d9ac6fa5bbc4d089bc7 SHA512 a7a8dcd1ef0bae811f3efbbbf6bb5705b3e75c468106cf7532dde86740240cb3f1f55142706abc1ba309dfdab5edf3dcb12923f75e26c8dd43ffee22bfb73cb2
 DIST qtxmlpatterns-everywhere-src-5.12.3.tar.xz 1389612 BLAKE2B ec5be0189d6e235dbeeff0660756365c6e900f7b56a1e18506e4c4190bcb4dd4f5242144ae53a5f4dc6334369234d0c8f4a05ce1b324a4002adf4da32cf3474f SHA512 4e421f0c78ca74f726f758bd95b33915297922f3b5a4fff84dde2600969f54f3914828fdb7903c7171e192f81966680b6c6bb4750de0be72728124470e7c798d
 EBUILD qtxmlpatterns-5.11.3.ebuild 426 BLAKE2B d75616c8b15a28f6109804dc175d9702b801859db776abc4bb90eee601778305fc08a6a077f8a53740fd309596d8a212f57100ebad71e32056d2fd31f27e8b53 SHA512 ec90645e4800d21632ec35e45ee8f3892b758e73619dd339ec8dc0ccdf1981cc4f8dd3c5ea67c75794959030aeb390d0c2d4ec9f66e3e49c716cd672e647e878
-EBUILD qtxmlpatterns-5.12.3.ebuild 638 BLAKE2B 2011fa33a601559f592fb756476c2954f415825bb1806c287b434a13930ba8c14e491dbcd4c7d3a8a6c620de19449e635331343ae8444563cf84b1f420853e23 SHA512 fb380761a8a352953361e48bd0fe3314c06422b8829791b26d6972963256597b83633c83f1e7ba1b6d1f982e61134c1d5049dad7ea76c968384fffdf7edef514
+EBUILD qtxmlpatterns-5.12.3.ebuild 633 BLAKE2B 5189ee7f3952121612fb85b256291e65b5f37aab3252dd38ee949b67da306930863ec877e0bbdf3b872b42ee24b1dee1ef9121d5c3fd69304454115e7e5352d6 SHA512 8c54e3ad19fac502912a614c9fc69b79729a3973bb0d9b36b42a9bd99559554b0e0315773bfa13d70fc52d377c388ad8503c3971b7c11ee4763eecf87aa8c564
 MISC metadata.xml 589 BLAKE2B bbca816148efdf3a04c05ea1c653a4e9a6e7c9c8109283719d53a06188e495df1addfceca8acc374ed03b89391fe14c70eb6e84b4f5343fb7345e841d50d8ee0 SHA512 dfd095f116f9223cea460984b650cf9d6f506f1bc5e43ae38429528d1218863d785fb47e05a3c9eb4891838d58baa967de3ac31d59e38c4de90a5655c8344d4b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
index 7a53e251e4f8..582535e57efb 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="qml"
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index d96a30bf73a6..25ae18715fe6 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/imu_complementary_filter/Manifest b/dev-ros/imu_complementary_filter/Manifest
index b6ab52ac1fde..635ac631d694 100644
--- a/dev-ros/imu_complementary_filter/Manifest
+++ b/dev-ros/imu_complementary_filter/Manifest
@@ -1,6 +1,8 @@
 DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
 DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
+DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
 EBUILD imu_complementary_filter-1.1.5.ebuild 598 BLAKE2B c16830be1c852c4e99d38535a6b1305478d94da0875f063d4ef3df176bfb072b9b4771bdd919a5b5e9288b4ceb4a91ad8320926f05ac2a30e5d606c1617ad512 SHA512 43ec4e9e3b2100312b3c8a2db4736f7daaedbfad0c05b8206384ef5af02c5b3d0192ddf9c02ec4ffc1cf129edcf72982d740fb23473dc7f67c61d9b92daf4bd7
 EBUILD imu_complementary_filter-1.2.0.ebuild 598 BLAKE2B e58418a4664e2552c8564ed4a411607c3eb2f25d218b12e79fb79345cb9457fb0044eca36eef10aec9a52f1626b7ebccd6bc393cbbe3eac49657fada0d1174f1 SHA512 0e6ad3862755f9d6f8bc73c337831efa885b669036986ebab789d47350851eb35ec00b8b567fd8494303c9c70da93052e2830769fd6366336ee9f9677102b328
+EBUILD imu_complementary_filter-1.2.1.ebuild 595 BLAKE2B 5c4e3b6515a836ad1cc234c520dba54178b7c4c2263886eabe1961b9a0f821a60fc4bca7af3cec0c95adabe967fd9eab29e54b00b02a689c2ee57187fcb6bd7a SHA512 7c7a0554e755b738b860d95ec5abf23c264c56b404a5d86793823352fbdf8e302c8a06814a159fd9e69f3a174ef4dffde5c56c887abbe392e8fda189e63843b4
 EBUILD imu_complementary_filter-9999.ebuild 598 BLAKE2B c16830be1c852c4e99d38535a6b1305478d94da0875f063d4ef3df176bfb072b9b4771bdd919a5b5e9288b4ceb4a91ad8320926f05ac2a30e5d606c1617ad512 SHA512 43ec4e9e3b2100312b3c8a2db4736f7daaedbfad0c05b8206384ef5af02c5b3d0192ddf9c02ec4ffc1cf129edcf72982d740fb23473dc7f67c61d9b92daf4bd7
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.1.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.1.ebuild
new file mode 100644
index 000000000000..3990921e748c
--- /dev/null
+++ b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_filters
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/imu_filter_madgwick/Manifest b/dev-ros/imu_filter_madgwick/Manifest
index d6ac94b16a5f..d8fb3cc5ccfc 100644
--- a/dev-ros/imu_filter_madgwick/Manifest
+++ b/dev-ros/imu_filter_madgwick/Manifest
@@ -1,7 +1,9 @@
 AUX pluginlib.patch 498 BLAKE2B 923d0288c75d969156cc5825c624e041821492c0d767873685ca8d479759cc1ded1d30cb22091b45066a8ea57fb2abcccc5acd852bc0f778a203b99760e466f1 SHA512 59e3d0c7e9c7b1dde87e430cee2084afa2c3e443277322c2c21abfe9619392d88d321b90198f03b5e90f8e3d4eb184611c0839ffdb93ca275d6e20db08e4acf5
 DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
 DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
+DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
 EBUILD imu_filter_madgwick-1.1.5-r1.ebuild 797 BLAKE2B c561d840818d5aee7e61a14c076b402c83ab97ec0d6b9f671129723cc4e86f57e953e9ccbbeba362291cbf1b1561990515dcb7f1768813d0f29739117352ee14 SHA512 ab75f6871c652b1852abb67a6f633faf6048782e0924d00ae48ea2bcc6c116c13b1a6dc6cd2aed51ff554b83a9332c933d94b1a0b46e06638dc9bef46d4dfda8
 EBUILD imu_filter_madgwick-1.2.0.ebuild 755 BLAKE2B d9db5fb169aba977dbe2c7b6d67c050938e72bee39137503c79cea7a110aa7d3ab1e66e781e38636113adb2c6b590dd7bbe3ecdec3fb1ea83db96b6116cd38e5 SHA512 88428a38e0ebeefab1df6d2057b808e04b7d6ba88c430934d1cf6aed0f076f5045c227ef17cf4eabd068e3036d775e43b6ecbe21a0fad4cef0e6044607b0c6e2
+EBUILD imu_filter_madgwick-1.2.1.ebuild 752 BLAKE2B 6ee196807033632b04c62bd8206dda394f69087f0cf0142fba1b72fc1e0cfff0b28cb8fcf661ea9e2e96fbc076ddc7a944100bec7975efae77176b107733533a SHA512 03b527ecf188ce715b2c3f3cb851738faf5e9123e08eb6152921d9a12ba651b88ff963c22e4258a87ad2002640172fe401e74126561fa7686418dbbed1a6c406
 EBUILD imu_filter_madgwick-9999.ebuild 755 BLAKE2B dea2ac8e4c97538fddf1d11eb038196677a469352bca4b9a994ff6d4aa05e5471e036ae93e7c303340c1a5f412b49246d193c4804667f9a6e6a5427909a28991 SHA512 fca79c2a9a0308ed99c5c2acde0a66285dfd08ba60cdc974df9a0dfac864ee6999902b321fb6b21de1989358527e578e778b181fb41868c38c4b6f83244bc2e5
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
new file mode 100644
index 000000000000..1292030f59aa
--- /dev/null
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs
+	dev-ros/tf2_ros
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	dev-ros/pluginlib
+	dev-ros/message_filters
+	dev-ros/dynamic_reconfigure
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rosunit )
+"
diff --git a/dev-ros/pr2_dashboard_aggregator/Manifest b/dev-ros/pr2_dashboard_aggregator/Manifest
index 3d897cdbf602..113d65d64424 100644
--- a/dev-ros/pr2_dashboard_aggregator/Manifest
+++ b/dev-ros/pr2_dashboard_aggregator/Manifest
@@ -7,6 +7,7 @@ DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb
 DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
 DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
+DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
 EBUILD pr2_dashboard_aggregator-1.11.10.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.11.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.13.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
@@ -16,5 +17,6 @@ EBUILD pr2_dashboard_aggregator-1.12.0.ebuild 542 BLAKE2B e20d9749d106b41ca81569
 EBUILD pr2_dashboard_aggregator-1.12.1.ebuild 542 BLAKE2B c2b9b70732d96c9b4828346afeb160ac782a35680e31d2198f1994f466f11a30d0d1aa2a77e864338f3430a617f74de43a577c61f0543973d67984d25f95c2c2 SHA512 001482e1ee8659473f59a9ba338d759712bc6fa5b775438cece7df5a16a309bd3caa7be436b598e2bc3d825b0f0c215f7dcd28cd87b55aaba2e96737aabe4b4e
 EBUILD pr2_dashboard_aggregator-1.12.2.ebuild 542 BLAKE2B c2b9b70732d96c9b4828346afeb160ac782a35680e31d2198f1994f466f11a30d0d1aa2a77e864338f3430a617f74de43a577c61f0543973d67984d25f95c2c2 SHA512 001482e1ee8659473f59a9ba338d759712bc6fa5b775438cece7df5a16a309bd3caa7be436b598e2bc3d825b0f0c215f7dcd28cd87b55aaba2e96737aabe4b4e
 EBUILD pr2_dashboard_aggregator-1.12.3.ebuild 539 BLAKE2B e42f74b6dff1ad6118836842d37f6d1f8d31591d17c2114d0828df47de870faf013f1e471128f25412c806296f325f5bd8cccc0866d9ccbaac46a897d47c5ff0 SHA512 2467e53e347b739fd7e114238b584f737ec40da4b778c37ff75cf257bd408069f8a7254e4eb8fa05a4f561c68f0a5353f4383201da5ee2430bee0899b9d19344
+EBUILD pr2_dashboard_aggregator-1.12.4.ebuild 539 BLAKE2B 76822cdad8be58da8ec9b79eca386ac6d72c47f059a4184076b68450ae654ad54f9fbb581c93f1829c2312c4f29f09f26eea2f1891510ff00689c32b3e79ed73 SHA512 2094e653b0b8ba12040b6e15e4ef28310283a362da77830f9014ec9f1243824364398bb75d277743957218dae95fa0c87d0b0afa03188cda468281658d724370
 EBUILD pr2_dashboard_aggregator-9999.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild
new file mode 100644
index 000000000000..73ac3ae71814
--- /dev/null
+++ b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 30d99b8e7b07..036f45848a29 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -3,9 +3,11 @@ DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb
 DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
 DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
+DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
 EBUILD pr2_description-1.12.0.ebuild 549 BLAKE2B 261499258b614a14fa77defd99c39031d0c91a1e278f71084ade80392b3fddc89057deaf10847f8d8ef76c12c2a67a412f7c531d88677f7740445dd43cbb1d0e SHA512 7fbcc6f38b7363adcdb226d8b8a30c404f62477f5fbdfd17d89b263ffd2f29fff3d24d6af51145484857a9485d922d3079db06e470b42ef7f05093e7717a1ccf
 EBUILD pr2_description-1.12.1.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
 EBUILD pr2_description-1.12.2.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
 EBUILD pr2_description-1.12.3.ebuild 508 BLAKE2B 7f8fd26973b137fa104e5ea8563206776d83dc1f63236897b3b981c484745c77ea6401b44260bf138f0952f28cc164fc1ba8b8ff87e77d388dc1077ed79c07b4 SHA512 c604c0e50604781da7ec5a349b2c16c2a132690212f11ea241230ab446984890326a4ca0cdea0d2d5592e09603c5fd122c29737912fa330ed8b07eafb6b11078
+EBUILD pr2_description-1.12.4.ebuild 508 BLAKE2B fffaec46e8683f1ec5482fe208638c7c40cd4d132db71610a28ccc896bf87981a809873781343e09d3a808730c1ea2eeb4fe2eebc4d23599c91f19088e1e0679 SHA512 ac1c97ed6fdd930bb0addd0f9f4f6e3247e6bec7209cfec0ee7707d52ebd2c6d4be6052d3de9051bf3f741c0b769d3be900f4b7475047d5beff4b96ac074b3a0
 EBUILD pr2_description-9999.ebuild 508 BLAKE2B 7f8fd26973b137fa104e5ea8563206776d83dc1f63236897b3b981c484745c77ea6401b44260bf138f0952f28cc164fc1ba8b8ff87e77d388dc1077ed79c07b4 SHA512 c604c0e50604781da7ec5a349b2c16c2a132690212f11ea241230ab446984890326a4ca0cdea0d2d5592e09603c5fd122c29737912fa330ed8b07eafb6b11078
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_description/pr2_description-1.12.4.ebuild b/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
new file mode 100644
index 000000000000..ab216d560b19
--- /dev/null
+++ b/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-ros/convex_decomposition
+	dev-ros/ivcon
+	test? ( dev-libs/urdfdom dev-cpp/gtest )"
diff --git a/dev-ros/pr2_machine/Manifest b/dev-ros/pr2_machine/Manifest
index d43c3e0aa7a9..5d5bd3d94fc0 100644
--- a/dev-ros/pr2_machine/Manifest
+++ b/dev-ros/pr2_machine/Manifest
@@ -7,6 +7,7 @@ DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb
 DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
 DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
+DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
 EBUILD pr2_machine-1.11.10.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.11.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.13.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
@@ -16,5 +17,6 @@ EBUILD pr2_machine-1.12.0.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e85
 EBUILD pr2_machine-1.12.1.ebuild 374 BLAKE2B 86ba2f0c3dcd06f19e3ea626bc745a5f42ea031ca5d86513661bc410d19d0a4f61b22ce66706ab01eec93e3f1c21d12c6c5b426dfed40a6881fbebaab4835d4f SHA512 62836154f2aee2c4a3167d70ee6ad98472e28f9d603d1e3627bf56e99f6358f4839ef8a355880a156562f03f3bb7e9af52dc64a12f6e648d1100459262b1b251
 EBUILD pr2_machine-1.12.2.ebuild 374 BLAKE2B 86ba2f0c3dcd06f19e3ea626bc745a5f42ea031ca5d86513661bc410d19d0a4f61b22ce66706ab01eec93e3f1c21d12c6c5b426dfed40a6881fbebaab4835d4f SHA512 62836154f2aee2c4a3167d70ee6ad98472e28f9d603d1e3627bf56e99f6358f4839ef8a355880a156562f03f3bb7e9af52dc64a12f6e648d1100459262b1b251
 EBUILD pr2_machine-1.12.3.ebuild 371 BLAKE2B 890080c116eee84c9b928748f20a59362b4c45ad07ceeb3a5f517c30c184d649ef5cbdf43266dee43cd1c5b218c732e7b3be8d7193e25799dc0072f8f4a251b8 SHA512 250bb1143f90cb18517ae4bcc9ad2386b8c256dea0edb40d513bc865366d67ac54928a0a9bc415ed99a14c4cfe9a72fc22e1bde63d37475195b090e20131c802
+EBUILD pr2_machine-1.12.4.ebuild 371 BLAKE2B 173d0a389e8c5df687bfc93bb6b41a867349fd4e8be048c87036521f314910fb3d554011fd902e2e6cbbbf8e81764149843965628eca7d6a92fb5ab6a2a025b0 SHA512 89e84bdd762bc760e912a82eb826ecc7a44a0652f9b3a02b8de0f0a7f071da7c49f64e337029cd218426807d6cfc478e65853b49efeecac887148d992e0b55d0
 EBUILD pr2_machine-9999.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
new file mode 100644
index 000000000000..f3906878327d
--- /dev/null
+++ b/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/Manifest b/dev-ros/pr2_msgs/Manifest
index 03edbe9bb06d..b6f7e18b3bb6 100644
--- a/dev-ros/pr2_msgs/Manifest
+++ b/dev-ros/pr2_msgs/Manifest
@@ -2,9 +2,11 @@ DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb
 DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
 DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
+DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
 EBUILD pr2_msgs-1.12.0.ebuild 533 BLAKE2B dae071e42434578fd96c9c314d2c1370e71108055d520f6037b799ced0ac15ec1c1b730a5ce88b1503a262b67f015050c55fd9e6a9ac4a080a011e41aeeb8210 SHA512 c34917d8cc9d40daa492a63c0660a0e2df521b0df3d5552b15d321055c577b5334a48fb3e939d947066f9ca74bd2bd5e1366f73c6442fdec3220b7152057301a
 EBUILD pr2_msgs-1.12.1.ebuild 533 BLAKE2B dae071e42434578fd96c9c314d2c1370e71108055d520f6037b799ced0ac15ec1c1b730a5ce88b1503a262b67f015050c55fd9e6a9ac4a080a011e41aeeb8210 SHA512 c34917d8cc9d40daa492a63c0660a0e2df521b0df3d5552b15d321055c577b5334a48fb3e939d947066f9ca74bd2bd5e1366f73c6442fdec3220b7152057301a
 EBUILD pr2_msgs-1.12.2.ebuild 533 BLAKE2B dae071e42434578fd96c9c314d2c1370e71108055d520f6037b799ced0ac15ec1c1b730a5ce88b1503a262b67f015050c55fd9e6a9ac4a080a011e41aeeb8210 SHA512 c34917d8cc9d40daa492a63c0660a0e2df521b0df3d5552b15d321055c577b5334a48fb3e939d947066f9ca74bd2bd5e1366f73c6442fdec3220b7152057301a
 EBUILD pr2_msgs-1.12.3.ebuild 533 BLAKE2B dae071e42434578fd96c9c314d2c1370e71108055d520f6037b799ced0ac15ec1c1b730a5ce88b1503a262b67f015050c55fd9e6a9ac4a080a011e41aeeb8210 SHA512 c34917d8cc9d40daa492a63c0660a0e2df521b0df3d5552b15d321055c577b5334a48fb3e939d947066f9ca74bd2bd5e1366f73c6442fdec3220b7152057301a
+EBUILD pr2_msgs-1.12.4.ebuild 533 BLAKE2B dae071e42434578fd96c9c314d2c1370e71108055d520f6037b799ced0ac15ec1c1b730a5ce88b1503a262b67f015050c55fd9e6a9ac4a080a011e41aeeb8210 SHA512 c34917d8cc9d40daa492a63c0660a0e2df521b0df3d5552b15d321055c577b5334a48fb3e939d947066f9ca74bd2bd5e1366f73c6442fdec3220b7152057301a
 EBUILD pr2_msgs-9999.ebuild 533 BLAKE2B dae071e42434578fd96c9c314d2c1370e71108055d520f6037b799ced0ac15ec1c1b730a5ce88b1503a262b67f015050c55fd9e6a9ac4a080a011e41aeeb8210 SHA512 c34917d8cc9d40daa492a63c0660a0e2df521b0df3d5552b15d321055c577b5334a48fb3e939d947066f9ca74bd2bd5e1366f73c6442fdec3220b7152057301a
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
new file mode 100644
index 000000000000..01b46e644d64
--- /dev/null
+++ b/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/Manifest b/dev-ros/rosapi/Manifest
index f80feb3cd938..7c30ffa6a072 100644
--- a/dev-ros/rosapi/Manifest
+++ b/dev-ros/rosapi/Manifest
@@ -1,7 +1,9 @@
 DIST rosbridge_suite-0.10.1.tar.gz 98010 BLAKE2B d634840a68081e7afaba77cff2b0f435392aa061ef6a4d4e75feccaa26811df92e0cd3c1b83973bd7eab534e66a5d5df880428d82fdd7cf20c7997a3427fdcf5 SHA512 455950eb5aebdccd6f173f2b7d1ea0bdf74421172895ab13e3af698a79e49964cb53354f90c396aad596818ecbb36385a3e1c9c373feb3a15aeff13d9e703443
+DIST rosbridge_suite-0.11.1.tar.gz 100994 BLAKE2B b6b21e1f8444b969d94ae1c86c70f242075c1494359df062179789920b3c03aa6ed44dd273c301098ed43f6084c656018349022158ec4b9b4672f20262952c05 SHA512 dd89d43b20589ac436cba673b3ee4f229eb14d47aabbe8352e04d6a2691b6f9e156315788178fbe345fa489fa84f86c626647b09ff3632562eb023bca688451c
 DIST rosbridge_suite-0.8.6.tar.gz 378267 BLAKE2B b5e72b7897feef66aa05603bcff00ba213844f700f56be97a7110f33a77e3aa848ca0c583d5509ee205dc01bf001181b1887e20ee89d8348bc5eb43fd5a829b0 SHA512 e935c20466a13cbcf00051a4f32bc981806244aecf314e09e9e0ca9e0e873ab098b14b5ca5839bf14f2d3dfb823ecc62bb4e26027d4d0ff3f52bf0385011fbf3
 DIST rosbridge_suite-0.9.0.tar.gz 89409 BLAKE2B e48f36b71d8c5bcbd1ede0a87015b231d45194f3410b4cfcc38d39089477418b1f40afb28d8df7beba2e5e99b4aafde53bbc3f9bf371f0434099d7730c6393ee SHA512 4d7a6c0c33da9bf42ff24a0add81cad5fec707ef7149bf929bd2aac92ea2fe6f42da21bd5349dadee05cacb69d7efdb7adb0c01fc01c8251e0503cb488a73364
 EBUILD rosapi-0.10.1.ebuild 663 BLAKE2B 0ad6c396f05a610652b1d3220cfcfa34196dd76af637ec97874b290577c64a9c496fa1f8cf076843af21f881242009edb4f5c3f1896b1f795843f704961f6f76 SHA512 3922668b92fdb9d2a3c21c3d76953cc86d590e5008c15065da7579e35f097166b36aad45bdeecee366fd2849d7cabdc0c69fdf44282bcb89a50243b54b3e238c
+EBUILD rosapi-0.11.1.ebuild 663 BLAKE2B 9f03580ede2b577d9c04c1561396557e992db1111a1ff95de0d7581554496de566103c8e9d1419ac905b4f0d3ba4a11c9a26b5a59f476b9fd54814cd8ae8d497 SHA512 ebf0e04b0e7c445a598dfac234e1965a68999125b76319bd80902da9e07d38127a906076a1046d855b9d6bda8b9b7f122d088724bb32d4d6851f934068b0c3e1
 EBUILD rosapi-0.8.6.ebuild 666 BLAKE2B 4a5f2c91cbbac4dfd373c467b4c8161c159a20666350d6c498d54fb1cee3b3c9f47ba535b9d9d9d342ffdf473c095c392a806b727da9f51e87a5590196889ddb SHA512 f9d3f52c6681107c6c51af0f18a09c849187d7ba29361fa56bec76792e6eecc1d5d9f5e900405c5dcc2947046bb7bf3c090a90883d9c346d7973a158d16dbbfa
 EBUILD rosapi-0.9.0.ebuild 666 BLAKE2B 510dbf0f6129e666050621d4430f1e7107e51553aed8f4e70f18b611957fbe4c0e0e9ac4ddf301ff160efce8ec2dfef2d9c29e91898eb0a4adc2a526234b2d91 SHA512 b85e31287a3d3a3ef628ec346d125beafcc30023c12127a16aed0192790bc71db425c709e1b6e91d24c50e5492a768b08f5519a7e92f866ba5d3c48ebc275819
 EBUILD rosapi-9999.ebuild 666 BLAKE2B b72ae518fb0e55ae5140173b5798d487958bec6d00c702fda74f9566528eb1cb6a90b280f8ad213020409f85a0d29adc7312edce80b478546774b56a17ede0bd SHA512 08c596717d0acdd3255ddf0908aea6bd3f9ac722a29345e52bc973b26c3c155b6e6118ab03dc6dd8ea55cab2caa13f40a7352da8377d196ffbada60987c015db
diff --git a/dev-ros/rosapi/rosapi-0.11.1.ebuild b/dev-ros/rosapi/rosapi-0.11.1.ebuild
new file mode 100644
index 000000000000..cc23483b1818
--- /dev/null
+++ b/dev-ros/rosapi/rosapi-0.11.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosnode[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_library/Manifest b/dev-ros/rosbridge_library/Manifest
index 93e56ee97fa9..3bdf29be710d 100644
--- a/dev-ros/rosbridge_library/Manifest
+++ b/dev-ros/rosbridge_library/Manifest
@@ -1,7 +1,9 @@
 DIST rosbridge_suite-0.10.1.tar.gz 98010 BLAKE2B d634840a68081e7afaba77cff2b0f435392aa061ef6a4d4e75feccaa26811df92e0cd3c1b83973bd7eab534e66a5d5df880428d82fdd7cf20c7997a3427fdcf5 SHA512 455950eb5aebdccd6f173f2b7d1ea0bdf74421172895ab13e3af698a79e49964cb53354f90c396aad596818ecbb36385a3e1c9c373feb3a15aeff13d9e703443
+DIST rosbridge_suite-0.11.1.tar.gz 100994 BLAKE2B b6b21e1f8444b969d94ae1c86c70f242075c1494359df062179789920b3c03aa6ed44dd273c301098ed43f6084c656018349022158ec4b9b4672f20262952c05 SHA512 dd89d43b20589ac436cba673b3ee4f229eb14d47aabbe8352e04d6a2691b6f9e156315788178fbe345fa489fa84f86c626647b09ff3632562eb023bca688451c
 DIST rosbridge_suite-0.8.6.tar.gz 378267 BLAKE2B b5e72b7897feef66aa05603bcff00ba213844f700f56be97a7110f33a77e3aa848ca0c583d5509ee205dc01bf001181b1887e20ee89d8348bc5eb43fd5a829b0 SHA512 e935c20466a13cbcf00051a4f32bc981806244aecf314e09e9e0ca9e0e873ab098b14b5ca5839bf14f2d3dfb823ecc62bb4e26027d4d0ff3f52bf0385011fbf3
 DIST rosbridge_suite-0.9.0.tar.gz 89409 BLAKE2B e48f36b71d8c5bcbd1ede0a87015b231d45194f3410b4cfcc38d39089477418b1f40afb28d8df7beba2e5e99b4aafde53bbc3f9bf371f0434099d7730c6393ee SHA512 4d7a6c0c33da9bf42ff24a0add81cad5fec707ef7149bf929bd2aac92ea2fe6f42da21bd5349dadee05cacb69d7efdb7adb0c01fc01c8251e0503cb488a73364
 EBUILD rosbridge_library-0.10.1.ebuild 1483 BLAKE2B 55954740bebbe6fb42218e84a333565b6fa6daaa222928d924c690a451b885b3dba08e1db30b31a0d1386604c8f63a1d103683b3b7ef2833492bd90e0b7fe223 SHA512 74d666ef5c129e85a8eddfb6dd4eb467e6a306349f965e03ad2c8fd4ccc6e0ec89e86fe90cc4d5fbc6f392a8e137600bcf4466d1388a26aa944cd441607b35f7
+EBUILD rosbridge_library-0.11.1.ebuild 1483 BLAKE2B 6bef2ff2c8d85fb5d23ac1b4b1915fde7a30acb81adf3d4db2abb95b79414d0b4adf0a5b43a090e9f38f11651b3f4677beb78b6af20c09571464e7f8e430311d SHA512 bf8c6336f625c62399f9982feb9e848cb24364b59792780d2214df3376b0e5ab2bb55aaee3cd9f3b47e66fa22bf46cf17fe7c3a1ea8f162cb74a871a215bfbfc
 EBUILD rosbridge_library-0.8.6.ebuild 1451 BLAKE2B 4af51fa5627a70ab81bdaf3948f72ddae45fdbb43353456b9ed5f77a0b8809aad4d4649114c190aa25b412233e67fb4f7af28c1ac877ebd0cc494fdcbdfdce8e SHA512 3d9e933033b2e1f65eb80e3e97e6bce1f9044b6beadcc7f49830202da9d75b9c1b05636569c29835e0553409e04e921c00df232dc201172a227d66bb8dc9adab
 EBUILD rosbridge_library-0.9.0.ebuild 1451 BLAKE2B 429d111b4ce4a0c3b8403a89dbafae8c882907ee468a463f249cdd92341749c81579b008ab101eabcc99d734ab28c43dc743a50d9b8e060b1025b0a41285898f SHA512 c8dc224f9ff3ae1a048a2d9f505c5b4d985418532e167030960782da352f25e29522f09294730bb7dd299ee8a6f60f44672f6c9f6c791cb401efa29ae02d1c9f
 EBUILD rosbridge_library-9999.ebuild 1483 BLAKE2B 55954740bebbe6fb42218e84a333565b6fa6daaa222928d924c690a451b885b3dba08e1db30b31a0d1386604c8f63a1d103683b3b7ef2833492bd90e0b7fe223 SHA512 74d666ef5c129e85a8eddfb6dd4eb467e6a306349f965e03ad2c8fd4ccc6e0ec89e86fe90cc4d5fbc6f392a8e137600bcf4466d1388a26aa944cd441607b35f7
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.11.1.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.11.1.ebuild
new file mode 100644
index 000000000000..b8746de4b113
--- /dev/null
+++ b/dev-ros/rosbridge_library/rosbridge_library-0.11.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosservice[${PYTHON_USEDEP}]
+	dev-ros/rostopic[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/cbor[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/rosbridge_server/Manifest b/dev-ros/rosbridge_server/Manifest
index 72de48f45dca..ce76261e3f0c 100644
--- a/dev-ros/rosbridge_server/Manifest
+++ b/dev-ros/rosbridge_server/Manifest
@@ -1,9 +1,11 @@
 AUX backports-ssl.patch 420 BLAKE2B 0d97fd93631f33867234ca1e7207ab5176c45f6747cc37b97f54b57fe0d10987c02466988c612293072ffe10962c8777ed0723aca8b6f24ded873f7ad7f5b99f SHA512 ed873ddfffb3702d2de62491d76cb829d02f215b09a3c8ce3564d1ccf1aced76939dca26eb22ccb21853ab8ab1a85d654a34bfd48533041c0dbc709c105b296d
 AUX tornado.patch 3361 BLAKE2B 94032b87881cba8bf383729ff260ad34a10fc42d4cfbbf53e5051eb488bfc4a534381445260709566b0fe7d03129cdf7737a9bd952cd2eb3f79181650ee758ef SHA512 6f8768716801dbfd00ef5698b91ea3d949c00895d18b3476d80a4fb09456b23412564d03b7a10eac6ee603dc4747aea8a96e6571164718eb0790f6475de9ee93
 DIST rosbridge_suite-0.10.1.tar.gz 98010 BLAKE2B d634840a68081e7afaba77cff2b0f435392aa061ef6a4d4e75feccaa26811df92e0cd3c1b83973bd7eab534e66a5d5df880428d82fdd7cf20c7997a3427fdcf5 SHA512 455950eb5aebdccd6f173f2b7d1ea0bdf74421172895ab13e3af698a79e49964cb53354f90c396aad596818ecbb36385a3e1c9c373feb3a15aeff13d9e703443
+DIST rosbridge_suite-0.11.1.tar.gz 100994 BLAKE2B b6b21e1f8444b969d94ae1c86c70f242075c1494359df062179789920b3c03aa6ed44dd273c301098ed43f6084c656018349022158ec4b9b4672f20262952c05 SHA512 dd89d43b20589ac436cba673b3ee4f229eb14d47aabbe8352e04d6a2691b6f9e156315788178fbe345fa489fa84f86c626647b09ff3632562eb023bca688451c
 DIST rosbridge_suite-0.8.6.tar.gz 378267 BLAKE2B b5e72b7897feef66aa05603bcff00ba213844f700f56be97a7110f33a77e3aa848ca0c583d5509ee205dc01bf001181b1887e20ee89d8348bc5eb43fd5a829b0 SHA512 e935c20466a13cbcf00051a4f32bc981806244aecf314e09e9e0ca9e0e873ab098b14b5ca5839bf14f2d3dfb823ecc62bb4e26027d4d0ff3f52bf0385011fbf3
 DIST rosbridge_suite-0.9.0.tar.gz 89409 BLAKE2B e48f36b71d8c5bcbd1ede0a87015b231d45194f3410b4cfcc38d39089477418b1f40afb28d8df7beba2e5e99b4aafde53bbc3f9bf371f0434099d7730c6393ee SHA512 4d7a6c0c33da9bf42ff24a0add81cad5fec707ef7149bf929bd2aac92ea2fe6f42da21bd5349dadee05cacb69d7efdb7adb0c01fc01c8251e0503cb488a73364
 EBUILD rosbridge_server-0.10.1.ebuild 685 BLAKE2B 259375e88c849f71ddf39e6c58aad758dfe2eabb2e91dbf6ced144877b055c1c5c688dc4418b0f1893bcc989f678bb8422852513c31b0f7979ac0d204cbc589e SHA512 566e5972c24df6cd116632c8fd45a4601e2ff1d6c24fdae489d97d39e4efd9fbe7ac06423846e9913d2274f064a63b6e11f89c390333f1d0eeb8b228682e860e
+EBUILD rosbridge_server-0.11.1.ebuild 685 BLAKE2B 74e48c9cf1e3d6c2a5e13d1427debfba83bc90ce573f32ccc94bff14415095c1ce57480b011815d7ed631646e623ed2e9c10ff78abf474dae5ac9116da497934 SHA512 f376293c321e6ba9847c24da86df3ab052b7a4a5b7db3686e1d067395b44f8559990b45118fbbbef79543239956c72cba2ce4d7ffb1be5a418d8ea80ca61f073
 EBUILD rosbridge_server-0.8.6.ebuild 764 BLAKE2B ab514861c12a7d838a821acd2635f9b8b8f6af5f461aa235b60787900dc1a28d86a84e4511eb3968b4fccae216da72262ccc4a4efe2df680748b539fae9019c1 SHA512 e224d013573111dac8f7de49f0a617a42f1b96d474c740823f3506a1e7353ed4d1e15b0d31d122331bbdbe5bb7896d894a9c0be667c5f7caab92bf1d1ddcd331
 EBUILD rosbridge_server-0.9.0.ebuild 688 BLAKE2B 08a4a13cb920cdf49b059c7578d36834d5a26df42ea8dd0edcaf15dc7cab2ec6db571138fdac289f38a3194c7f083149a523806131d10ca54e704fda3115d33c SHA512 a6677d1a786506d9909abb297b58b823588294df9d066cd20ada2db7543a036ce7b32cfaf7f0e87334c6f97e9543c62e010997ce1ed198b46e4738b4a99beb4d
 EBUILD rosbridge_server-9999.ebuild 688 BLAKE2B 08a4a13cb920cdf49b059c7578d36834d5a26df42ea8dd0edcaf15dc7cab2ec6db571138fdac289f38a3194c7f083149a523806131d10ca54e704fda3115d33c SHA512 a6677d1a786506d9909abb297b58b823588294df9d066cd20ada2db7543a036ce7b32cfaf7f0e87334c6f97e9543c62e010997ce1ed198b46e4738b4a99beb4d
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild
new file mode 100644
index 000000000000..703a455899be
--- /dev/null
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A WebSocket interface to rosbridge"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosauth[${PYTHON_USEDEP}]
+	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_tutorials/Manifest b/dev-ros/roscpp_tutorials/Manifest
index 0cefee574a31..eef6c5fba201 100644
--- a/dev-ros/roscpp_tutorials/Manifest
+++ b/dev-ros/roscpp_tutorials/Manifest
@@ -4,11 +4,13 @@ DIST ros_tutorials-0.7.1.tar.gz 140483 BLAKE2B 8f2d4aee6494476bf7efb2ea35962ea61
 DIST ros_tutorials-0.8.0.tar.gz 153739 BLAKE2B 0dc7918a2b95a26518d07d753040e381b26c357eb3995a22a429d58c244751d7c58c8736efbab23a6a5ca6903f08e43acf9519f2a534b22fe89ea853b2e3fbff SHA512 269f71ef360f7441e1bfed2c2b3da791ce8018d6ec833a1fb7198d289067359b1e7704e37580c61188cc45034c788f3ca463882f8247a155752ff5c61939d795
 DIST ros_tutorials-0.8.1.tar.gz 153831 BLAKE2B c34aec17ffd247554e37abb252848183392864c801dce7e2cae8c66d9fd30fdb12d50163487eff8615593df1532dece6c86303aab0b91d4075c14a9fba652b5a SHA512 f537312a78c27375791e11820f4d3a70433ce200d724d80bc8b417edd3c6dcbbf72abac0e9a98a199da2e3a8dbdec34e81d9106be4f6a5243a6f84d02d9ca668
 DIST ros_tutorials-0.9.0.tar.gz 154992 BLAKE2B d7a45d0adaa1507ae9494ea9590b9c69d3bbececa01f209a93825432b4b362499cde8c966e6734dbd854478e98970c340403ac56cb99a00b07cf9cff8b28fa36 SHA512 7beba72d3f72943ea5402416dc03809576d47d4e76e81d9ed85eba69c1f9a4e5737a91bdac76747f47e9d6459e5dd8e062cc8ec5f2fb9450cdb013b416534e56
+DIST ros_tutorials-0.9.1.tar.gz 155151 BLAKE2B 7371063ef77981892fee54b6b3d29907421f29deece22c6d53ace576717357a9700a2e14a03bd9f24c2285a16b55f5c9665a0da5081ae1599da8df5ec68ba425 SHA512 62a980e9515515496de39aa360df030f0dd8678bbf132d90386775c34e3b54f33a477aaefb65db803dcd704b8fbc61d445617399ac38cc2fa3f3363a6052682f
 EBUILD roscpp_tutorials-0.6.1.ebuild 616 BLAKE2B 523f0e07b31bbebb8bb71dd0c7810439ec54431a6fc64bd293938651b17e1c751bc90b0007905e35b740db4a7c3c05628c73336ddd8f5e79efaa07a8722b3d83 SHA512 c2389098568c49cb24d43280017872b29155fc5441534aae03aca3be506058e9cdb0385a763a22c99b1d0e73a7c0505fee7b0db0dc5e433c380c68f6ba3d92e8
 EBUILD roscpp_tutorials-0.7.0.ebuild 616 BLAKE2B 523f0e07b31bbebb8bb71dd0c7810439ec54431a6fc64bd293938651b17e1c751bc90b0007905e35b740db4a7c3c05628c73336ddd8f5e79efaa07a8722b3d83 SHA512 c2389098568c49cb24d43280017872b29155fc5441534aae03aca3be506058e9cdb0385a763a22c99b1d0e73a7c0505fee7b0db0dc5e433c380c68f6ba3d92e8
 EBUILD roscpp_tutorials-0.7.1.ebuild 616 BLAKE2B b4ed00d497e609ef6d5888556fdfabb84912cb4f2f55f42990f18f9864edd3bca19743bbfdfb37f42dc1db183e4c11e8d0af2fc974122fe7dff136b9efcc281f SHA512 8eeebc4781f2d72898298228e28808f0fcfbce52f1a81b4fe532d037570e1a42de256f569fa8e21453e34941bfff6365592b5dfc4e6a0f3795b7c1b7ef7e8935
 EBUILD roscpp_tutorials-0.8.0.ebuild 616 BLAKE2B 277dfb5f79c390b88e1d938da3e4b9929edaa970280ff7b36c82bda6501d10fef0f99992f0523906ce62fee7942e5f69e2d33565c346f44a68c2ac3dd91d09c2 SHA512 229897133f8ca39d82fe27ceafff9ad80157996a13797d3bbc526a58f479812081e2ea1d8ee316ee0f66ab1bb8af713e51ef2a8a882ff2f2b357364109ddabea
 EBUILD roscpp_tutorials-0.8.1.ebuild 616 BLAKE2B 277dfb5f79c390b88e1d938da3e4b9929edaa970280ff7b36c82bda6501d10fef0f99992f0523906ce62fee7942e5f69e2d33565c346f44a68c2ac3dd91d09c2 SHA512 229897133f8ca39d82fe27ceafff9ad80157996a13797d3bbc526a58f479812081e2ea1d8ee316ee0f66ab1bb8af713e51ef2a8a882ff2f2b357364109ddabea
 EBUILD roscpp_tutorials-0.9.0.ebuild 616 BLAKE2B e3b6ddeff592902eefe58708f682822a152139dc186981d6f605e255b585cb5b4c401de2db24bfcc5f1eba8cb3ef2dda39164643d43e2c3b9d2fcee2ea92c1bf SHA512 c13ed8ca592c4c3cc90618fc4b85754de386a39ec491f544b4c580ae30b4f493fd27cf13f080e0f5e201ac9ff7ce057ddb99cfe3a287eba971124769d498c46d
+EBUILD roscpp_tutorials-0.9.1.ebuild 613 BLAKE2B 072af07aa2ae15bbd01ad6f4b064a27fc4c1bd364f822c1714381284865663461a309d4128a7c944159ef80e356fb6c5f977b4ab266548334c62aa376bb337d6 SHA512 334204fa1f456bb3f74b45fcb8a8577b849a401c64b5aa4e1ebddb36ac9f090ca604704596bc15adef2d5681523854886895c2f1b4eb162970e5b2586dcbee8a
 EBUILD roscpp_tutorials-9999.ebuild 616 BLAKE2B 523f0e07b31bbebb8bb71dd0c7810439ec54431a6fc64bd293938651b17e1c751bc90b0007905e35b740db4a7c3c05628c73336ddd8f5e79efaa07a8722b3d83 SHA512 c2389098568c49cb24d43280017872b29155fc5441534aae03aca3be506058e9cdb0385a763a22c99b1d0e73a7c0505fee7b0db0dc5e433c380c68f6ba3d92e8
 MISC metadata.xml 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.9.1.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.9.1.ebuild
new file mode 100644
index 000000000000..ce7133ab81ce
--- /dev/null
+++ b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.9.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/ros_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/rostime
+	dev-ros/roscpp
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospy_tutorials/Manifest b/dev-ros/rospy_tutorials/Manifest
index eb0e9f1dd6e4..3f0ce4501668 100644
--- a/dev-ros/rospy_tutorials/Manifest
+++ b/dev-ros/rospy_tutorials/Manifest
@@ -4,11 +4,13 @@ DIST ros_tutorials-0.7.1.tar.gz 140483 BLAKE2B 8f2d4aee6494476bf7efb2ea35962ea61
 DIST ros_tutorials-0.8.0.tar.gz 153739 BLAKE2B 0dc7918a2b95a26518d07d753040e381b26c357eb3995a22a429d58c244751d7c58c8736efbab23a6a5ca6903f08e43acf9519f2a534b22fe89ea853b2e3fbff SHA512 269f71ef360f7441e1bfed2c2b3da791ce8018d6ec833a1fb7198d289067359b1e7704e37580c61188cc45034c788f3ca463882f8247a155752ff5c61939d795
 DIST ros_tutorials-0.8.1.tar.gz 153831 BLAKE2B c34aec17ffd247554e37abb252848183392864c801dce7e2cae8c66d9fd30fdb12d50163487eff8615593df1532dece6c86303aab0b91d4075c14a9fba652b5a SHA512 f537312a78c27375791e11820f4d3a70433ce200d724d80bc8b417edd3c6dcbbf72abac0e9a98a199da2e3a8dbdec34e81d9106be4f6a5243a6f84d02d9ca668
 DIST ros_tutorials-0.9.0.tar.gz 154992 BLAKE2B d7a45d0adaa1507ae9494ea9590b9c69d3bbececa01f209a93825432b4b362499cde8c966e6734dbd854478e98970c340403ac56cb99a00b07cf9cff8b28fa36 SHA512 7beba72d3f72943ea5402416dc03809576d47d4e76e81d9ed85eba69c1f9a4e5737a91bdac76747f47e9d6459e5dd8e062cc8ec5f2fb9450cdb013b416534e56
+DIST ros_tutorials-0.9.1.tar.gz 155151 BLAKE2B 7371063ef77981892fee54b6b3d29907421f29deece22c6d53ace576717357a9700a2e14a03bd9f24c2285a16b55f5c9665a0da5081ae1599da8df5ec68ba425 SHA512 62a980e9515515496de39aa360df030f0dd8678bbf132d90386775c34e3b54f33a477aaefb65db803dcd704b8fbc61d445617399ac38cc2fa3f3363a6052682f
 EBUILD rospy_tutorials-0.6.1.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
 EBUILD rospy_tutorials-0.7.0.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
 EBUILD rospy_tutorials-0.7.1.ebuild 584 BLAKE2B ed4d39bd594234392e65e19dcaa019c7620196cc3807203984c77e779c9ad1b28f5940882bf2e131a21bce294c222a2c2131660c7a7bbf87a2ad0c8cdc990240 SHA512 3ac348fb1a4436859b9f74e9fe78db3d239f78fd12757f2d5481c5b2562c56fb36aeae28e23419cd278e7d34f7ff8404af81dce5e0322f9131ed69ac2d71f748
 EBUILD rospy_tutorials-0.8.0.ebuild 584 BLAKE2B 40388c2c6d10ade2e2b313523f6d21d5fadc0c6d9c71769245833e5e5b56a3b16ab8d97c72bf4c4672e0431c33ad3092e675e04d5070bdf26f1df8ad3c63aa61 SHA512 01fb16bb755f6f9f9afa5045fd4b76b370800b3e59dce440317a4c5b26cfeb6e2d1d66195fee0374185cd08e91dd25bcba9cb5130581727293de7e1eb27a5712
 EBUILD rospy_tutorials-0.8.1.ebuild 584 BLAKE2B 40388c2c6d10ade2e2b313523f6d21d5fadc0c6d9c71769245833e5e5b56a3b16ab8d97c72bf4c4672e0431c33ad3092e675e04d5070bdf26f1df8ad3c63aa61 SHA512 01fb16bb755f6f9f9afa5045fd4b76b370800b3e59dce440317a4c5b26cfeb6e2d1d66195fee0374185cd08e91dd25bcba9cb5130581727293de7e1eb27a5712
 EBUILD rospy_tutorials-0.9.0.ebuild 584 BLAKE2B efcf40c9f6d8e01f5195c13812c8155ad424281f6320d3cdf3aa1848f009db86b8d04b6ea0c120dffc3135f1d218807e260fd4711955aace0dda5880f5af7866 SHA512 91fdde82439c6052e3beaa60c3fcf05584db3b37b15feab37f84ec9c5eb3c8c74a36b630232756bd5c71d31d8ee328f811c0e7742899eae1c765b930e839f0ac
+EBUILD rospy_tutorials-0.9.1.ebuild 581 BLAKE2B 2a1246c99e200e97be41048d1706d59efc4401746b49776def06cd7a190b588af3b561aa891abade9c177028ba48ec12ed76f0b492ebe21769f7a1dc95fb1ba9 SHA512 445d3b6cfc8ac0a9705cfa0c22b219c2c97f9ec6955736ddac89adb655b5f31bb79fd9c774b2eb06f7820e7c1ce328ce1dcfa8051005865490806e9290ebe018
 EBUILD rospy_tutorials-9999.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
 MISC metadata.xml 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.9.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.9.1.ebuild
new file mode 100644
index 000000000000..0884ee095a59
--- /dev/null
+++ b/dev-ros/rospy_tutorials/rospy_tutorials-0.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/ros_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 474d29e14eb0..218fd42bf8ca 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,4 +1,6 @@
 DIST rviz-1.13.1.tar.gz 5094089 BLAKE2B 7f4c106bf51b2465177107f5eb19602323045423b3ee5149f70b177170af9eea1cea0d4069f859c3c9bf3a2bdbe7feb91b802c758a66f6b990bd890b124d2a52 SHA512 cace4d41341647a8e4d5ab3be64ca71a4b41134a15a4df8556f35824c550c5fb7024f7338d0ffac1ea9c7f574c10757b773a8df37625d6e616eafdcd7f0aab09
+DIST rviz-1.13.3.tar.gz 5085813 BLAKE2B da1f12c1ab9e7306bcd5762311948f0e4af355c80b1f0ffac521c64e62250c11c48f52659c187137c27209616a7564086bc84a3cc81f88ded2c6d3c65847774b SHA512 90d319342e16735629a3aa8229b0f8b55b6b8f863fba719aeed0a6b06cee5fd269dc852b4bfa861422b44840d57e8030c98da09b046a378a36fdac58f5782f96
 EBUILD rviz-1.13.1-r1.ebuild 1681 BLAKE2B ce51638542b6abbebb13d647552646d5e8cd797845a386a347733acc02ab585d451e0fcfff19a7d798e99f79e37238751167d2331b83bc89ec03e76e56ca9a39 SHA512 19569262319e122cc37f572429315302b31da5b5f7de520cd9b60c8841fbdc617aaae0ff25d1e0b6dd9b007e0d49e735cd5ddded586efb4750d6a87c3e211f34
+EBUILD rviz-1.13.3.ebuild 1678 BLAKE2B 0fa86998b709d83a21be63fdde597107e54be94487d98a6b58be8768be50fa17804c4ee2a3d44e0b8a546d0e7519da9951138e6dee7ff1ee2ab7bf012d917563 SHA512 e9bcd8aa8a72010f34b439b273fd367a53af0c743b7e80f817be2bbbff551310411793badc7b194ca18630694b04000f430abe5f0d9726df8685215dfccf28c4
 EBUILD rviz-9999.ebuild 1681 BLAKE2B ce51638542b6abbebb13d647552646d5e8cd797845a386a347733acc02ab585d451e0fcfff19a7d798e99f79e37238751167d2331b83bc89ec03e76e56ca9a39 SHA512 19569262319e122cc37f572429315302b31da5b5f7de520cd9b60c8841fbdc617aaae0ff25d1e0b6dd9b007e0d49e735cd5ddded586efb4750d6a87c3e211f34
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.13.3.ebuild b/dev-ros/rviz/rviz-1.13.3.ebuild
new file mode 100644
index 000000000000..1fb1d93cd930
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.13.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/rviz"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="3D visualization tool for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	media-libs/assimp
+	<dev-games/ogre-1.10:=
+	virtual/opengl
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-cpp/eigen:3
+	dev-cpp/yaml-cpp:=
+	dev-libs/urdfdom:=
+	dev-libs/tinyxml2:=
+
+	dev-ros/angles
+	dev-ros/image_geometry
+	dev-ros/image_transport
+	dev-ros/interactive_markers
+	dev-ros/laser_geometry
+	dev-ros/message_filters
+	dev-ros/pluginlib
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	dev-ros/resource_retriever
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/urdf
+	dev-ros/media_export
+
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	virtual/pkgconfig
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)"
+
+src_configure() {
+	local mycatkincmakeargs=( "-DUseQt5=ON" )
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/rviz_imu_plugin/Manifest b/dev-ros/rviz_imu_plugin/Manifest
index 0ac395f4956c..a3313c20b00f 100644
--- a/dev-ros/rviz_imu_plugin/Manifest
+++ b/dev-ros/rviz_imu_plugin/Manifest
@@ -1,6 +1,8 @@
 DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
 DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
+DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
 EBUILD rviz_imu_plugin-1.1.5-r1.ebuild 469 BLAKE2B 0f5068d4d4d812f3062ecd046884843c26a47a3c653b68cca70da3d3cd0b7e58e5d0def78a5365df0a6c2b5413504bcf3c3b09764b66c45b65aa5a294ed80071 SHA512 cb48900eae0268b9fc85e9b630da9e6b2d2eaee769279061012ceb8a2196c63d97afd010c9b1340c44369b604152d85147300ede6da6289bfc0ac0c90b4d4d62
 EBUILD rviz_imu_plugin-1.2.0.ebuild 469 BLAKE2B b5a5d6f9e05a3313ea31023d5bec80a35464fd4373156a11b2047a5c8ce29ab80ecb47df59e6962db97703ab72e20f1fa81c68b94a70cda6330a9e3fb6a45d30 SHA512 0efdcfd8766151e774db18ceeb8f8fcae833d7e699f75b4088517f1f344034247e5d19c53f08d762e261b82f2e36309ff0bcf7a84525fc34b2b4d3270e0442d5
+EBUILD rviz_imu_plugin-1.2.1.ebuild 466 BLAKE2B 53847bdd20178a98b7c16978cd6169dcb7047de54520b1df859b03dc8004f273339c6650b2b1bbbfbcabe94e7e0bda288224ddb6f1337e845e7e510d1d1ca5d0 SHA512 b460b6f6ac90c4267f4f101f897198cd8249c9acb571170b23e1a1a835fb069b8b8245dadd2c859a2c9c5162312a963f47e788f1ef393953bcc0d8fbe9e7c827
 EBUILD rviz_imu_plugin-9999.ebuild 469 BLAKE2B 0f5068d4d4d812f3062ecd046884843c26a47a3c653b68cca70da3d3cd0b7e58e5d0def78a5365df0a6c2b5413504bcf3c3b09764b66c45b65aa5a294ed80071 SHA512 cb48900eae0268b9fc85e9b630da9e6b2d2eaee769279061012ceb8a2196c63d97afd010c9b1340c44369b604152d85147300ede6da6289bfc0ac0c90b4d4d62
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.1.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.1.ebuild
new file mode 100644
index 000000000000..f6636224b446
--- /dev/null
+++ b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="RVIZ plugin for IMU visualization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-ros/roscpp
+	dev-ros/rviz
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/std_msgs/Manifest b/dev-ros/std_msgs/Manifest
index 62b12bb80be0..731c9916b3b7 100644
--- a/dev-ros/std_msgs/Manifest
+++ b/dev-ros/std_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST std_msgs-0.5.11.tar.gz 6551 BLAKE2B d1ad69b21dd51272bd98a59d746d272c8b46628cb65688b1cb83c45fbc3e2ef3978916fe3830ef957f1ac6ae9478a30989664fb50d36a3c4b9187d6a1b8b533e SHA512 6cc7cdc4964c29e650d6dccbbd49095dc54a735e6e468e224179ad5a371b1f16a384f43b863c94f256fb2538fed5fd25967c5bd07b2d72ee31e997e1ac04fa7b
+DIST std_msgs-0.5.12.tar.gz 6545 BLAKE2B 4905063f43b280211366d8a5f6d8d6071398bbdac5c04ecaa62e0b118df892c757b1d2ca03b6748ed788e79a0e38b81856349199ab634108e19f75ec0c388962 SHA512 adfb561e39b64f5caf23a5be05e796dd13b16a748925f3c3fd8a5a69651b8268ea6767331ca4512d147edd4d284334d33291908e913bb6dd856e5a5d107150a7
 EBUILD std_msgs-0.5.11.ebuild 381 BLAKE2B 5395aa82cd6887b4a93e12ccd4b80303deccfc2e6b7c4248a963d7e9e88e03d7b43361ea97ecfc9eea76093448c12d822cea232a1c67c093167c58fe288d5fca SHA512 6bc0e71e04c51a6adbc2ede94b82a3e49ca8603f0fa6c1d1f1837e4947390c487e60ea0a9188c9d59999be8efca6e823cc864932e236cc6017a77613c82d3599
+EBUILD std_msgs-0.5.12.ebuild 381 BLAKE2B 5395aa82cd6887b4a93e12ccd4b80303deccfc2e6b7c4248a963d7e9e88e03d7b43361ea97ecfc9eea76093448c12d822cea232a1c67c093167c58fe288d5fca SHA512 6bc0e71e04c51a6adbc2ede94b82a3e49ca8603f0fa6c1d1f1837e4947390c487e60ea0a9188c9d59999be8efca6e823cc864932e236cc6017a77613c82d3599
 EBUILD std_msgs-9999.ebuild 381 BLAKE2B 5395aa82cd6887b4a93e12ccd4b80303deccfc2e6b7c4248a963d7e9e88e03d7b43361ea97ecfc9eea76093448c12d822cea232a1c67c093167c58fe288d5fca SHA512 6bc0e71e04c51a6adbc2ede94b82a3e49ca8603f0fa6c1d1f1837e4947390c487e60ea0a9188c9d59999be8efca6e823cc864932e236cc6017a77613c82d3599
 MISC metadata.xml 326 BLAKE2B 4b680ab2eb28397e602d23f97d16fd19b8530c9f9f36944a164a7dac2a9967775aa745c00d9848c4f9c5146323e51defedf82f30be0203c7ff96025e7462ecba SHA512 7849e2c2fc3e1d8ab8abf940aec65b4eea8adfabb974abd0990bef7a1b807ee6feda3a7a33922c3ebe90e447266256f816d9cebce91ce0c902a12c9f82d02c40
diff --git a/dev-ros/std_msgs/std_msgs-0.5.12.ebuild b/dev-ros/std_msgs/std_msgs-0.5.12.ebuild
new file mode 100644
index 000000000000..c56056155bac
--- /dev/null
+++ b/dev-ros/std_msgs/std_msgs-0.5.12.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/std_msgs"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+
+inherit ${SCM} ros-catkin
+
+DESCRIPTION="Standard ROS Messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtlesim/Manifest b/dev-ros/turtlesim/Manifest
index 0a87f5a06186..b935da524a23 100644
--- a/dev-ros/turtlesim/Manifest
+++ b/dev-ros/turtlesim/Manifest
@@ -1,6 +1,8 @@
 DIST ros_tutorials-0.8.1.tar.gz 153831 BLAKE2B c34aec17ffd247554e37abb252848183392864c801dce7e2cae8c66d9fd30fdb12d50163487eff8615593df1532dece6c86303aab0b91d4075c14a9fba652b5a SHA512 f537312a78c27375791e11820f4d3a70433ce200d724d80bc8b417edd3c6dcbbf72abac0e9a98a199da2e3a8dbdec34e81d9106be4f6a5243a6f84d02d9ca668
 DIST ros_tutorials-0.9.0.tar.gz 154992 BLAKE2B d7a45d0adaa1507ae9494ea9590b9c69d3bbececa01f209a93825432b4b362499cde8c966e6734dbd854478e98970c340403ac56cb99a00b07cf9cff8b28fa36 SHA512 7beba72d3f72943ea5402416dc03809576d47d4e76e81d9ed85eba69c1f9a4e5737a91bdac76747f47e9d6459e5dd8e062cc8ec5f2fb9450cdb013b416534e56
+DIST ros_tutorials-0.9.1.tar.gz 155151 BLAKE2B 7371063ef77981892fee54b6b3d29907421f29deece22c6d53ace576717357a9700a2e14a03bd9f24c2285a16b55f5c9665a0da5081ae1599da8df5ec68ba425 SHA512 62a980e9515515496de39aa360df030f0dd8678bbf132d90386775c34e3b54f33a477aaefb65db803dcd704b8fbc61d445617399ac38cc2fa3f3363a6052682f
 EBUILD turtlesim-0.8.1.ebuild 774 BLAKE2B 7186c188c1a1e1ca0eae4e71d52968879f4dc5307de29eba04c303f8ee823762dfe2f7e9392e7dbf0b747ed2c6039fe62fbf065f046b6050bd9ef91ed5928ae4 SHA512 8dc724d0a64be8fdf139dcd875965935201b2b6de5eae6265a18d05f76d0a3070ebf63b0f36c6f1225eec3553f60fb6162b0159da298465d78e4b9b54ce4bcbb
 EBUILD turtlesim-0.9.0.ebuild 774 BLAKE2B 6e7dc750b9d704cd11fa9729796b1529513aafa28c8385c969a99cf10bb443b339292cd33316f90d060994cb50593d86da57d373c2a079f37c07937b0c2c3789 SHA512 98ae52b0813983852061ab691d7c038afef66650b2345cb1fd16386ea4932576b92ba26e9e3f81e9f94158f4df2aa9328462d20dfc2ce7d366e9d3e13aed6652
+EBUILD turtlesim-0.9.1.ebuild 771 BLAKE2B 263880e5b2bf49e9d2c373d9f70f989b8b8c8875927edb8d6af51cb7c423d58353e3cc0f63ea692f9c535dda00a8b70e7823a2adda8af2d6d007ec9538172851 SHA512 fd5c13afeb7ca4e424993d8067aa7755fe126092ba098efeaf193d9371e47bb8e8bd784049e84c3866d25dd62960acf4f019068ac582e147746b6fea21238734
 EBUILD turtlesim-9999.ebuild 774 BLAKE2B 2bbfdd355907a2a63bf44b0781482d75a01a1c0f92bb0301538a5e791e2aa72ec0bfa8b63462d3395aabce3cc032f2cdc0fc073de54fa67d76097d7797c32337 SHA512 1d2e018a5ee100fb1e68844cf92c6567b5c53954d5d3221bc0f8f749e6c6cc7b80087b41e130b62ca174d575f1488329aca360fb80d179fc5a4505ed8c345d43
 MISC metadata.xml 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/dev-ros/turtlesim/turtlesim-0.9.1.ebuild b/dev-ros/turtlesim/turtlesim-0.9.1.ebuild
new file mode 100644
index 000000000000..a6c833ed721c
--- /dev/null
+++ b/dev-ros/turtlesim/turtlesim-0.9.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/ros_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/std_srvs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tool made for teaching ROS and ROS packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-libs/boost:=[threads]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/roscpp_serialization
+	dev-ros/roslib
+	dev-ros/rostime
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 637ca8fe30e6..61449dc6f96f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/acme-client/Manifest b/dev-ruby/acme-client/Manifest
index 5cd149f5c171..52c4e1f8fbac 100644
--- a/dev-ruby/acme-client/Manifest
+++ b/dev-ruby/acme-client/Manifest
@@ -1,3 +1,5 @@
 DIST acme-client-2.0.2.gem 19968 BLAKE2B 7a877d86ac4828fec08edd606b2f4f31788454ebe8109b1e94d28f33d00b0a3e49aa7ad8d3b46fa2440bcd1d7cda1c53ab91d6be6280dfeb0e5ccddcac02ed25 SHA512 e02fe9f919f8d5356bc60d0b6f2d05db42e5d6671762bfac45aafb118647e2d0b50cd7336dfa1f0983432e2bddb0344d1b240bd674e31ad14385adc15d58e1e1
+DIST acme-client-2.0.3.tar.gz 203320 BLAKE2B f5bc600c58b29429b8615b0d8cdadade9a4c7018068c356cfd481eee8b7718c19e736c620a752ef1a68ae70e8f641f3fb2ef7bcd44b70ac63cc97bad19ab3579 SHA512 c2b2bcba1cfe9184922cdfaafd02bdb51abf11cb39457e89f0670098bf9d240332129144fd4a7fcbc214a1496dbde576236ea15634b70f8f3fe22304d769f0c2
 EBUILD acme-client-2.0.2.ebuild 481 BLAKE2B 0c020887aa03ed71174f1cdf8ebc8d3867984cb40e6dfef6962d92f9345babbb0718ed0c8566aca7f423df8af4a3c963ec894f550817bee73f33516ee4466a1a SHA512 5688074abb247833350b8d966fd05956ce8a4e1337047dc08806d4ccafe5c90ba26fc9da107c04ca82e5984e8842fe669150aa3436956db09bfc4b8de0306543
+EBUILD acme-client-2.0.3.ebuild 842 BLAKE2B 3442fb202735a83a8b04d9486b08ff806f7a8af5aaa2a99a8a81bc942df04bf8c1819f2f42922a69c74b460008c608e53d2641588b1780495a84f6c9af00680e SHA512 1a6bde736be125430aa621474023fd01497d18a4adfe6c1cecfb6175f06121eac34acd1528c208f88cfcd6d076293717cdf3f8ed412f76ebededc24f6d3113f7
 MISC metadata.xml 542 BLAKE2B 2902d90ca553bacbcbe63ab667666b71bf156426583e91296742628aab47628205c2af8e9310795d573e894ac01ea9d178f70c45a962a8448031b1dc69c7860d SHA512 b8da5f9492916504fde0846a7eb3c2480b101f2ab419120c840a831b5180f88e2745350a729d0388acb5767b94e586ec5475674bae6805dc48811d92287eea0b
diff --git a/dev-ruby/acme-client/acme-client-2.0.3.ebuild b/dev-ruby/acme-client/acme-client-2.0.3.ebuild
new file mode 100644
index 000000000000..6c9c64a75eeb
--- /dev/null
+++ b/dev-ruby/acme-client/acme-client-2.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol."
+HOMEPAGE="https://github.com/unixcharles/acme-client"
+SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/faraday-0.9.1:0"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/vcr-2.9.3
+	dev-ruby/webmock
+)"
+
+all_ruby_prepare() {
+	# Skip failing test where incorrect der value is retrieved, may be openssl 1.1.x related.
+	sed -i -e '/assigns the public key/apending' spec/certificate_request_spec.rb || die
+}
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index f79d4b799d58..7abd8bc66eec 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,5 +1,9 @@
 DIST asciidoctor-diagram-1.5.14.tar.gz 11264778 BLAKE2B 298d3c8dc569877d4500bbbc41167de66748d67e9813c6d505aa9296fe49d973e3455a9f53a127ebc9127db64b5228c24e1ddb2ccacfe5bafdfbd5a8511ffb49 SHA512 66f8b7f48dcab4feb14eadadeb571c7cedb0b18c7a0acb004ebc6144affddc1d4a3d05a27996c666ac7966b62d05a5953b7a84895268e071445209b928fe9e89
 DIST asciidoctor-diagram-1.5.16.tar.gz 11264819 BLAKE2B 31320b609aaa8458bf24d05f5ea5a561801cdf5e0243e333bbf209060fb75ebed47f94302e381420f8d294a5c0349783d8b3e2bdc81721d50d990eb978a220a5 SHA512 94822a604c43894e2be11370aa4595948e35f4f670338d84abe798beb312a8212c944e78478b785d68384177787539ed4a20a360b55325bd94ced502ca957843
+DIST asciidoctor-diagram-1.5.17.tar.gz 11705185 BLAKE2B 0a5611c9f8bfe18d74585635a168e8cfbc80e4ad40eb530c7bab2ff4595d73139776fdaddbd190a753fb9c938aa46449461f20e1f9033ff3ff3a0d5c48b1f07a SHA512 656f62db4ec7e7ffead58f37bfbdb2d1c21cc70a86e734e67dfc9bd569ffee643679938a7ac2c172f08cadaf5307843eb7fa3406530c3eb67e4ee2cb8abeae80
+DIST asciidoctor-diagram-1.5.18.tar.gz 11705290 BLAKE2B d5c1a6047af1a1a5c1b08ccb180dfa57057213df2f8a9ec8aef6608bc34501aa979cb30c2c8b196e0039be24d8c5ba9e81d902f603e9624402eaa7e93d800169 SHA512 f3341ffd0b9f7eb994b478ebb81f668a30fa338cf76cfba638032d5b80203b304776cee4d1f575270105af9b51dc6d0a80604e92e2ad54760dfa9b73ffa794cb
 EBUILD asciidoctor-diagram-1.5.14.ebuild 961 BLAKE2B f5ad5d4c9674a957ac2174db163056e5a31ba2986320d72984bd1dd1a0a4850d42c8b8e6f367e627dcaf81bcdf01196b800856a6859b377af9da9249ef922596 SHA512 7612488e39c1b48217b51d80b3653168b2b6a95320890ebd8ac66135de8b8d44b666ce2e911ab39778d5932d9051039e85d974b11125067a1f4ca377fc7a0ad4
 EBUILD asciidoctor-diagram-1.5.16.ebuild 994 BLAKE2B 69c8359ee48623e3ebe9be94fdd1b1966ac1920d502b5cfa937e658a9beb5b4d068e7716627a336181a8dcba71de093ba68cc207bbb45a95eba9e2ce570762bb SHA512 5e634949f1191902c14836fd1bf56ce58ff7f8a57586d75bb09f81798c5ce89e44d270cd12fb4f3a9f92df47790f50bbb318a68faf75189e6bfe3b42c694f648
+EBUILD asciidoctor-diagram-1.5.17.ebuild 987 BLAKE2B 96570c68b021a8336dbb44f25b4f6e904328d5cf884af51e69b91a6c5256c412696e1022a9afb13a77da629dcbc575d6ed08899b722a601f0838c8d44164b179 SHA512 a12c69cc0792446b8b25d7e4d4c74d8978a3779d121d5ebc0884a24f2d6e9fb1ecf0c0e29d43b767bf0f1ee98a4751131f905ae132e9c15e0f97bfbb103341e1
+EBUILD asciidoctor-diagram-1.5.18.ebuild 987 BLAKE2B 96570c68b021a8336dbb44f25b4f6e904328d5cf884af51e69b91a6c5256c412696e1022a9afb13a77da629dcbc575d6ed08899b722a601f0838c8d44164b179 SHA512 a12c69cc0792446b8b25d7e4d4c74d8978a3779d121d5ebc0884a24f2d6e9fb1ecf0c0e29d43b767bf0f1ee98a4751131f905ae132e9c15e0f97bfbb103341e1
 MISC metadata.xml 357 BLAKE2B 967e1f1518c38ff81d15df5b62943b278acf74a80938d488cca0d2489f268ba0d41ad74e78b7b53bc1fd4ed646880ed36defc9c110d5af3535970c364d8c923b SHA512 711af8ceb9724236076e02a077672296a835981c7a78e4f5f5976dc190b2df640d24933cc2d92e81f84e695f473d187a7e83d2b60c3573a675ba30b01be85db8
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.17.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.17.ebuild
new file mode 100644
index 000000000000..bda3f3cf2bb2
--- /dev/null
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.17.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
+SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.0 <dev-ruby/asciidoctor-3"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/c.formatter/ s:^:#:' spec/test_helper.rb || die
+
+	# Avoid specs for unpackaged tools
+	rm -f spec/{a2s,blockdiag,erd,mermaid,msc,nomnoml,shaape,svgbob,syntrax,umlet,vega,wavedrom}_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.18.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.18.ebuild
new file mode 100644
index 000000000000..bda3f3cf2bb2
--- /dev/null
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.18.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
+SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.0 <dev-ruby/asciidoctor-3"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/c.formatter/ s:^:#:' spec/test_helper.rb || die
+
+	# Avoid specs for unpackaged tools
+	rm -f spec/{a2s,blockdiag,erd,mermaid,msc,nomnoml,shaape,svgbob,syntrax,umlet,vega,wavedrom}_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index 28d4029e2b80..61e978d16759 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,9 +1,11 @@
 DIST asciidoctor-1.5.7.1.tar.gz 565182 BLAKE2B c697ea1b371a9ec26ec3277e043275ed3672bad104d34553aa442723797df3cc4e5a48447f806dba53fb3a142760f514bff74b189058260f621c8b63f8ad02b1 SHA512 4819aef93fb301e5378871935370fe37671446ecdedf76853cc0c19a6a5f3f0e2debbf2afb8ba7287f866fb57903abdfe6d845e1ccf24dda4347ec9c92624c3d
 DIST asciidoctor-1.5.8.tar.gz 583484 BLAKE2B f0c654c5e43a0ed061dbf80eb382fac1ea393870c7c2530649a5a41f1a5bd5e72ffb11e8ad8dd2925510e18f4528079ae532b623e6e7f38a119565df01139f58 SHA512 3f767cdf945361d81b0a89137fb1e77377cbb4171da790027cbb9cd8cf1deb03f24a8ec780b427b7bce34538e851a44682515fbaccf8558d61e22356b9d216dd
+DIST asciidoctor-2.0.10.tar.gz 613180 BLAKE2B 46125c85276eb0c7cf4404ca04d854449233e2cd14e24687aed9f95eb64ceb6ebac3d3ed73918679b9a5b047e41d82d02383d0e08acd0df5cc9bc216f14c79a3 SHA512 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe
 DIST asciidoctor-2.0.7.tar.gz 609712 BLAKE2B 261732ef068d7382870ef2b0f194e3b97c61d1f3db1800a7ad0acc24f53e803b35cc5e12eb55b8cbe6727d0d472d7e4e496afb26bf60ee3d49d9a163f3e8292d SHA512 e79a76d97edc804153ec461a5f8482e1322bfc6b268b168e80617f06e5f114dbae6d703cb2f11c43ecb8b678fa11f22dbeb80aaf6daf34940683a31925e52927
 DIST asciidoctor-2.0.9.tar.gz 611530 BLAKE2B 48f3c3447bacf009dbdf1529780a60fd144bd18951991623319dc30c1009e96dc28f84a7dab38431d1efc0a9f09494aae3e83f6b5959d5684fb167731826e07b SHA512 17e9358bc98f34f1b8dab4781b48705acf6afa0aaa0c8dcd22183bf3d5a275e0afff96d7ecae140e908894e18a54c5b693acd6826f68892a99ec3dd0a4ea61e7
 EBUILD asciidoctor-1.5.7.1.ebuild 956 BLAKE2B c6aac8ca62a7c9184b00a741ef3c2965de557f4e9075d3587e26cfd3600d042f769396286484160c86ca1293a9fd033356bf9bff2040047ae7745b154eece7da SHA512 80c28f9473ada0de74250728ae4d9954309bd96694a8aed5c51d330a49b2f18c48c82a85c4754af3e3e9f729be58ceaa6c3c19154ff96cac8c3d20a17afd5727
 EBUILD asciidoctor-1.5.8.ebuild 964 BLAKE2B bb3ccf1c3d93162d54b20c0cf281a2ceef572b9fbfb100b9c384d62ba9714d97bc9dfd76b471763bff5426377d82000b3a9a117ac7b9e069f944c062e4859786 SHA512 fa0f72422debff36a010a46b90634a2dfa7ae641f289655f5c84bfde0497beb6618593f8a765d740b367957a9ac12bd9018a581ffa6bf44dd95c3ca8fa98dd2f
+EBUILD asciidoctor-2.0.10.ebuild 966 BLAKE2B 47944c0a838f509ef35e8f8401705575bdc8544724739ba0c6f8f959bf8146614f5aca52c5042bc26f6d74eec3640caebd111e49175cdfadcf155b67ea7cd23c SHA512 c4967c6ec664452e18711f08144b4c64fb91fc81982c2b314e92f6d8380f6e5c60100b826139bb173d6b2a8f59980b835d466821da98a177c2a3d77814761bf9
 EBUILD asciidoctor-2.0.7.ebuild 959 BLAKE2B e9bff65490ef3236c5c0a50daf8a3752a601980f3d786911b8ffad2ebd78c3cd1fa5bea69f5d2f91820c5f381595544aa1580be0470b53ff7fb2cc610f156433 SHA512 1835703ae555fd59671b68738ffdf0c873b3a692ecd602f5d8f2054f87bc3ba9151c3c76f4a328a0b940519f165c99159343bd2e73c243a0cfda9d9cfe40dff8
 EBUILD asciidoctor-2.0.9.ebuild 966 BLAKE2B 47944c0a838f509ef35e8f8401705575bdc8544724739ba0c6f8f959bf8146614f5aca52c5042bc26f6d74eec3640caebd111e49175cdfadcf155b67ea7cd23c SHA512 c4967c6ec664452e18711f08144b4c64fb91fc81982c2b314e92f6d8380f6e5c60100b826139bb173d6b2a8f59980b835d466821da98a177c2a3d77814761bf9
 MISC metadata.xml 349 BLAKE2B 65a3f6dbbe523d1017d78e939c291e40edc3429d06ff16bd0f8150f3879e2b0840619653115be43c876d1cfeea8e95a3e29fea7447b18bc28bb0218ac03f11c1 SHA512 e3ed6253349df933eb4656c972f1a6cc71567c27a721195abceac0d28bfbc991cbda8772f661021c3cf954d2a917730bad54982e319655a204b6b30c1c67c6d1
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
new file mode 100644
index 000000000000..2bbfe037e9be
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test features"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-util/cucumber
+	dev-ruby/rspec-expectations:*
+	dev-ruby/asciimath
+	dev-ruby/coderay
+	dev-ruby/erubis
+	dev-ruby/haml
+	dev-ruby/nokogiri
+	dev-ruby/slim
+	dev-ruby/thread_safe
+	dev-ruby/tilt )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/asciidoctor.1
+}
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index f4e103e0cf35..2efceef96326 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,13 +1,11 @@
 DIST autoprefixer-rails-7.2.6.gem 196608 BLAKE2B 0f9224fbf765877b1b7414c68fc39a6587514d27fb5290e1a623db8dcdcbf6f668b66ddd0133906a97e63e877b8201168a45520a9919dc756021d5a7cffc0d38 SHA512 37b3f245291711f92ab9e264491637e753afb95e52f9fd4e2bda6655cd781b2d031934f3379cabdd5589bdf57b780d0727f2fff1cdf7887ca4cc323d23023396
 DIST autoprefixer-rails-8.6.5.gem 208896 BLAKE2B 50e8b8ef3fec9a0bb8d68afa8950989dbf84b58b79b8822e83bf22873c5172c2c514643c31dca88cfec49bd585563eb9b201c621d3ab6707ed0d49c6cd4c8fc8 SHA512 fddabc4d745ad1b4282622a52ab4e36c377eccec85c4e80b3e8d633ffcc2d1613f4fee9e9f2356c85d251e44b0010418029bb278894987119689435ac885e982
 DIST autoprefixer-rails-9.4.10.1.gem 217088 BLAKE2B 212920f8d1cbcc86c825974b6cf66f30e7f0b277160148b57d87f5bbaaacec5c017f7ac600f86a8cd5fffb0305bc2606dec213a2fab58584630014ce99883520 SHA512 0f291d66f9aecf52d1aa68032bcbf7561a196247b5effa0403b1797109d124127accb5a828fc28ed933aea5194ba9f497281d81651943cd6c26f814e19162bd9
-DIST autoprefixer-rails-9.4.5.gem 214528 BLAKE2B 0894d893b2b30bff4193e1b9bcc6b5cc274ca8d3c4a7fb05ddb002ddbf24ee5af8ed2db39224d880dc227726033d896fb410d4eafbe8cd6ce978b58ef561ee04 SHA512 f166a49e458bfa242cfaa38e9496440be76abeed4d535ccf14fc656ab59160e0ff1a6c5145a6217af4086c2843d1785e84dd7edcb2de5d563c1179cb6612a5cc
-DIST autoprefixer-rails-9.4.7.gem 215040 BLAKE2B d0d16eb708886812c526191345c5d9db054332a7807adce71d11d439e81d055f238f273b6a919fcee1722e317426c8a77081ff250c6c1aa55923a5200adcbcea SHA512 64239dbe3ec8cd472cfbf1fe0cc355abc958abbfa322d298c425762d1c20bb1bdf5d001d55b0cf90268b9f59240e60f4b74128822bf026cfb2985ad169422303
 DIST autoprefixer-rails-9.5.0.gem 217600 BLAKE2B 067c27d42bf7f869f3030e52a43c2350cb6f670b0292ac563c41a40007aa63566b0b8924e25cb0cffac091fdcda9f86d6993f1cb634a705701fd748989c7830e SHA512 7e48dd177abbd06634e4a6be40494dfc109d1ce50cc20585cbbcd4e828d6e9dec42fd34ea55456d9db4eff6c74286dc1411aca6beb3c40103561034e9b85d4d5
+DIST autoprefixer-rails-9.5.1.1.gem 217600 BLAKE2B 188f5a23296d107e068339c0299913f4a9df641d97caedd6f140c39dfa2eab3e7cf76ac4b4ed1c46c0cd424fac1872515e54b7fe8c62285286a6aad292005657 SHA512 d1fe0da0390ac635081327b51350636b58108bd4689f6ed37a03fbdfd8620a7916bbff6818532e58c82d32912935818c476823b6d1839f068c2c171fc405e6c7
 EBUILD autoprefixer-rails-7.2.6.ebuild 827 BLAKE2B fd6aef469bd1e07f5100e88ebe523da96383c721dfc2bee9b7babb7d11f3d710bbb6debf4cf9cd57702f81150c8b7c7ef9a0f3de4efc1e6325240fd1bf2e4bf0 SHA512 f17f3e58a7cf0a8d960d683d3cdc6ddae7065ce7d28d3284b45b169210a068a9ec0dafcee100fcbda098aab73c809f455908df069ba72e5536b95aa1ddac7ace
 EBUILD autoprefixer-rails-8.6.5.ebuild 827 BLAKE2B 4bce491c80db4a8eb1d77467167c3c290c0af5311f4395424f5f0c4e2b30e1474fed1746c3dc5127413d48b9e7031f8e782f7b5d1a1987550747c3900d8954cd SHA512 8bd8a32ceb04e688ec4d149a67b98905b2ec975684f3fb2fe3dddcc4ff0d8a04e7556b41a3a804a6b1dd2d4c46d4b5ab45c6ed45f300c7171bf2335f73d42768
 EBUILD autoprefixer-rails-9.4.10.1.ebuild 845 BLAKE2B e5b1a04fd59da7936ea67781b76812cf584a03b01b761267d3c35fe63cb126af04d0ad186ce38fd7ef4ae4579f04080b3fda6ec3bd0dfe53e6e451981c146f9f SHA512 8b8f190dbf44fb05dafa8861e94ac635e96cd79ec25866eb7391357c81c90feade321cde4f4a6cc2b8b921e7646b11a06e2985bad8c52792af688f07e7a2f1bb
-EBUILD autoprefixer-rails-9.4.5.ebuild 845 BLAKE2B e5b1a04fd59da7936ea67781b76812cf584a03b01b761267d3c35fe63cb126af04d0ad186ce38fd7ef4ae4579f04080b3fda6ec3bd0dfe53e6e451981c146f9f SHA512 8b8f190dbf44fb05dafa8861e94ac635e96cd79ec25866eb7391357c81c90feade321cde4f4a6cc2b8b921e7646b11a06e2985bad8c52792af688f07e7a2f1bb
-EBUILD autoprefixer-rails-9.4.7.ebuild 845 BLAKE2B e5b1a04fd59da7936ea67781b76812cf584a03b01b761267d3c35fe63cb126af04d0ad186ce38fd7ef4ae4579f04080b3fda6ec3bd0dfe53e6e451981c146f9f SHA512 8b8f190dbf44fb05dafa8861e94ac635e96cd79ec25866eb7391357c81c90feade321cde4f4a6cc2b8b921e7646b11a06e2985bad8c52792af688f07e7a2f1bb
 EBUILD autoprefixer-rails-9.5.0.ebuild 852 BLAKE2B f8b5cd78ed21271c928cf958bdce4a63a1c180d52bc676cdb2a7c3127b1d7001f99af471c6ad575eb23bd37c3d2ee6a0e5877a4879020aa414b0314fc6f60baa SHA512 4233e830acebedd41a32ff4f40da0c965b9ac65911d29b41c8d385195b8123c88e6b26f1293d6993cc6812334406d3b6a376b5b01a821e099ae6960af1e6e005
+EBUILD autoprefixer-rails-9.5.1.1.ebuild 930 BLAKE2B 9bc0d96eb27f70fc0e07f85293e2525f3821a5261dcb8501206ac3ca67157df396a51bdedb00f519ae1338c2e97db09eda8581c11406e2000d225a42767d943d SHA512 39032027fda288057b29ee37ffcbfba613ab8533517f3f2c164f35eeedb06ea67477d9ab2f28fa2c855e71c082d1e5cc072764df568e2137102f6f08116119b5
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.4.5.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.4.5.ebuild
deleted file mode 100644
index 8ae938d51a0a..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.4.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rails
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
-	rm spec/rails_spec.rb spec/compass_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.4.7.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.4.7.ebuild
deleted file mode 100644
index 8ae938d51a0a..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.4.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rails
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
-	rm spec/rails_spec.rb spec/compass_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.5.1.1.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.5.1.1.ebuild
new file mode 100644
index 000000000000..3c20314227e0
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.5.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/,+3d" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/barby/Manifest b/dev-ruby/barby/Manifest
index 08019b391711..f10135705b7b 100644
--- a/dev-ruby/barby/Manifest
+++ b/dev-ruby/barby/Manifest
@@ -1,3 +1,7 @@
 DIST barby-0.6.6.tar.gz 95120 BLAKE2B e46f261eb11eb2f5b17061e6cbe04419df81d4248a9bed8a5f8f90cba9329915cacf3fa48cc922f4eac14ca7eada87e5be526d9b0d2e0bd1f443daf09af89088 SHA512 5b0a00861b9cecee153c5e1f4e1564d99021b3f7f6005efc48d666f8b4255e91f18792d19b9ae635d40f72dbb38de8db215a252b553138be737a52a8ba85c728
+DIST barby-0.6.7.tar.gz 95199 BLAKE2B b1729e361a41deee248a3c74c56d072fe0eeb3463ff4730744736e1a523f2844e877d63b058ec02e4cdad1f77620bcd476e823864428aff78b462cf29b20909a SHA512 29ba52612b2390ebd2a9e0acc0eec4a4c119ca305662f47e6656cb63727956877970d14f9b924466fad6e9e927e23f74c2614b41e09ca6b068bdabbaae21f93f
+DIST barby-0.6.8.tar.gz 96647 BLAKE2B b0af8e5573dc7d3d1881c793895d1c440b97bb5609b0759f56bdecfed7b4b74080f96301d2511101abb21760074584905fdc4e94938d38e2a553933686ccf976 SHA512 1d51dece22febd8c8a234241b88edd3ea93eae328e69fbd8dba3f48afcea7943ec4a72252a74b476aae5812ee132de6b87e37f9fd4c2a43d7c79ec68c831b68c
 EBUILD barby-0.6.6.ebuild 2402 BLAKE2B b0a2f7b6ab787f3fe84879eb4e6d5df34b12fbe11c34bcb492d21d91f996e7104a209d62a2ddb16f14485dda3146b77c8f76e5a2c565e9a5f3f970c5ee453c8f SHA512 b2d94ed9fe4d4b0ca2446837a1387b304e7410a5ac8acab634663e971893c577df667328805a6b43b16adfe135e794c260d1307fda49e586c4f3c92e215409a8
+EBUILD barby-0.6.7.ebuild 2395 BLAKE2B c8c2ab141e7597208c521a3e97e32d564fa350fc8501c7cd79f7821c8b3b5ab3803e48feebd7f48d2c1f02a5a9ccf090bdb648aa6c87d0d735814789fac05bac SHA512 5697bc3d0af5ae3cf9b95bee7132daaaa5afdb7fdb05334d2f89c83f294286d999a73134a4cd3e6c46bce7d2ace45e8460b196201943908e8ac23b71c6ffa9b0
+EBUILD barby-0.6.8.ebuild 2395 BLAKE2B c8c2ab141e7597208c521a3e97e32d564fa350fc8501c7cd79f7821c8b3b5ab3803e48feebd7f48d2c1f02a5a9ccf090bdb648aa6c87d0d735814789fac05bac SHA512 5697bc3d0af5ae3cf9b95bee7132daaaa5afdb7fdb05334d2f89c83f294286d999a73134a4cd3e6c46bce7d2ace45e8460b196201943908e8ac23b71c6ffa9b0
 MISC metadata.xml 1073 BLAKE2B bf39d76c0240bbdeeb85299879247c695237c4a614c1728ef2c432b8049a9e1bf381acdfeafb0bc3083c2238d3b4489790c845d127fafa14038538fa0ef01b8f SHA512 c3e13b0b201a8a8556b5f725d366b78da9ee82bae9707a8722055d0e5e73571560209657e4c7ef69a777934585cdd2d0e001a979f35773f9f31ac99d6346f4dd
diff --git a/dev-ruby/barby/barby-0.6.7.ebuild b/dev-ruby/barby/barby-0.6.7.ebuild
new file mode 100644
index 000000000000..b0e8897fd519
--- /dev/null
+++ b/dev-ruby/barby/barby-0.6.7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
+HOMEPAGE="http://toreto.re/barby/"
+
+GITHUB_USER="toretore"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test qrcode rmagick prawn png cairo"
+
+ruby_add_rdepend "
+	rmagick? ( dev-ruby/rmagick )
+	cairo? ( dev-ruby/rcairo )"
+
+ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
+	png? ( dev-ruby/chunky_png )
+	prawn? ( dev-ruby/prawn:* )"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+# testing requires imagemagick capable of png output
+DEPEND+=" test? ( media-gfx/imagemagick[png] )"
+
+# prawn breaks tests for some reasons, needs to be investigated; code
+# still works though.
+RESTRICT="prawn? ( test )"
+
+all_ruby_prepare() {
+	sed -i -e 's/README/README.md/' Rakefile || die
+
+	sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb || die
+
+	if use qrcode; then
+		sed -i -e '/^end/i s.add_dependency "rqrcode"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/barcode/qr_code.rb \
+			test/qr_code_test.rb
+	fi
+
+	if use rmagick; then
+		sed -i -e '/^end/i s.add_dependency "rmagick"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/rmagick_outputter.rb \
+			test/outputter/rmagick_outputter_test.rb
+	fi
+
+	if use prawn; then
+		sed -i -e '/^end/i s.add_dependency "prawn"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/prawn_outputter.rb \
+			test/outputter/prawn_outputter_test.rb
+	fi
+
+	if use png; then
+		sed -i -e '/^end/i s.add_dependency "chunky_png"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/png_outputter.rb \
+			test/outputter/png_outputter_test.rb
+	fi
+
+	if use cairo; then
+		sed -i -e '/^end/i s.add_dependency "cairo"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/cairo_outputter.rb \
+			test/outputter/cairo_outputter_test.rb
+	fi
+
+	rm -f \
+		lib/barby/barcode/data_matrix.rb \
+		test/data_matrix_test.rb \
+		lib/barby/outputter/pdfwriter_outputter.rb \
+		test/outputter/pdfwriter_outputter_test.rb || die
+
+	sed -i \
+		-e '/semacode/d' \
+		-e '/pdf-writer/d' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/barby/barby-0.6.8.ebuild b/dev-ruby/barby/barby-0.6.8.ebuild
new file mode 100644
index 000000000000..b0e8897fd519
--- /dev/null
+++ b/dev-ruby/barby/barby-0.6.8.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
+HOMEPAGE="http://toreto.re/barby/"
+
+GITHUB_USER="toretore"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test qrcode rmagick prawn png cairo"
+
+ruby_add_rdepend "
+	rmagick? ( dev-ruby/rmagick )
+	cairo? ( dev-ruby/rcairo )"
+
+ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
+	png? ( dev-ruby/chunky_png )
+	prawn? ( dev-ruby/prawn:* )"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+# testing requires imagemagick capable of png output
+DEPEND+=" test? ( media-gfx/imagemagick[png] )"
+
+# prawn breaks tests for some reasons, needs to be investigated; code
+# still works though.
+RESTRICT="prawn? ( test )"
+
+all_ruby_prepare() {
+	sed -i -e 's/README/README.md/' Rakefile || die
+
+	sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb || die
+
+	if use qrcode; then
+		sed -i -e '/^end/i s.add_dependency "rqrcode"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/barcode/qr_code.rb \
+			test/qr_code_test.rb
+	fi
+
+	if use rmagick; then
+		sed -i -e '/^end/i s.add_dependency "rmagick"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/rmagick_outputter.rb \
+			test/outputter/rmagick_outputter_test.rb
+	fi
+
+	if use prawn; then
+		sed -i -e '/^end/i s.add_dependency "prawn"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/prawn_outputter.rb \
+			test/outputter/prawn_outputter_test.rb
+	fi
+
+	if use png; then
+		sed -i -e '/^end/i s.add_dependency "chunky_png"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/png_outputter.rb \
+			test/outputter/png_outputter_test.rb
+	fi
+
+	if use cairo; then
+		sed -i -e '/^end/i s.add_dependency "cairo"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/cairo_outputter.rb \
+			test/outputter/cairo_outputter_test.rb
+	fi
+
+	rm -f \
+		lib/barby/barcode/data_matrix.rb \
+		test/data_matrix_test.rb \
+		lib/barby/outputter/pdfwriter_outputter.rb \
+		test/outputter/pdfwriter_outputter_test.rb || die
+
+	sed -i \
+		-e '/semacode/d' \
+		-e '/pdf-writer/d' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index a8dafba467ff..20c42f9cbcf7 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -1,5 +1,7 @@
 DIST bcrypt-3.1.11.gem 44032 BLAKE2B debdc199ff3806b32998c91a99006f293ca6ebbfe2573546afda7c705fbdc0ac8f4cdfba97c1765668cfe3782cb4f9affff1b59b20c42e19fd14a6fa52f66160 SHA512 bf9ff0d3cdd7044b4ee5796cd04869f21bb3384143b0f336bc2cd9a8f0db3f9562aa23a39601c1d86f153b62f07469ef066616f8a52cfcd840377e331cb22454
 DIST bcrypt-3.1.12.gem 44544 BLAKE2B 767d38c3fc03e24bedc6a14668538d214219b93fed0b918dedfd5aabc25cd46273e0f7a849dbfa8d23e4ace2ec037809dcd927a9942bfcc126def7e707252c39 SHA512 1cb465bc00e40c82c7b9789cf5ba96273a455f4c1c993f411a9b80d39aa9c938e4909a094ca92af786ad3cd836eebac2aefcbe1bb29c6238947e55fcdc110d35
+DIST bcrypt-3.1.13.gem 54272 BLAKE2B b2a349955a066e39cc50540ff116e70e2bac359c03ddd9dfa35d6a946d15235921cd82feec8b1d76f5f82a3ff9dea288f115dc8e1fae3f24e559a1462e173ccd SHA512 d996f381643a0322d66a1a5dc7d26887baaf48d90ac8f87283bf2aa35f2a0048049e1df10d95283d37f25e3331ca3cb19a9a7c12b95fa1b1a1bdec0e5d8133bf
 EBUILD bcrypt-ruby-3.1.11-r1.ebuild 1632 BLAKE2B dbcd215a7168f7b3db6d64b07df88e5827698043ee6af3c147a02d178c1ecce02a6cf359525e36ea65c545dea923c14bf185776ea82b84e0e3fdc2dcb41b3a97 SHA512 b5246d4420931b77c58d3ede50e039b461047fd28b605d8a887ba12ae1e7ad8c88bf4a192eb16a7def6a7f6902f4674f38e0dbaf12670c5edb2dc6d7fcb54062
-EBUILD bcrypt-ruby-3.1.12.ebuild 1637 BLAKE2B 2b51d6f2b6b9fb9c27ee967593129b0f919d98dfb1f0df42980e5de9bfd2c4b93f99f97b6362aa61ed29500e17c667cbc73d490851953f60757d3026072539c5 SHA512 feb7fa8d7b5da414abae7f1a4f3589607471eb0285064012afe422d9b363644d64fe7f8b518a3255fc156efe0d619e6386beeb399211070a36eac656f3b8515e
+EBUILD bcrypt-ruby-3.1.12.ebuild 1636 BLAKE2B 5495f644f9bb9de28b1f0fb3e83a8cefb6ac0c42ff0f02f2a72483943782a8cffe1d6bc7232bc5f4c0a00e063a57c331b86ff8fe6dd78a47959635435ae48280 SHA512 a0db8d2864ed9aaa1fea91fcb138fba86359a6861198aed86a24a1dd2c608ca97e5a9859a218acd5885c3a2cec635617d730cacf36c208e802a5ae9eabbb602d
+EBUILD bcrypt-ruby-3.1.13.ebuild 1637 BLAKE2B 2b51d6f2b6b9fb9c27ee967593129b0f919d98dfb1f0df42980e5de9bfd2c4b93f99f97b6362aa61ed29500e17c667cbc73d490851953f60757d3026072539c5 SHA512 feb7fa8d7b5da414abae7f1a4f3589607471eb0285064012afe422d9b363644d64fe7f8b518a3255fc156efe0d619e6386beeb399211070a36eac656f3b8515e
 MISC metadata.xml 346 BLAKE2B 635b8241d82a243f102d3ee6ce24c6cb183a9decd70cb02ee8734c85c9796b3dad0206b4e18da86df0e68fdc72a782b0494d682e757631718d0d60ee27b3d67f SHA512 ade206e8719923e0e758268c757100148580fd817bf477beee8df9b9b9f99a50b82b898e555bb6b0fd91239af22b1d7aa320caa1fed5c093a8799e82fac97608
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.12.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.12.ebuild
index 929efd4d33e7..774897c69c35 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.12.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.12.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="An easy way to keep your users' passwords secure"
 HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild
new file mode 100644
index 000000000000..929efd4d33e7
--- /dev/null
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_NAME="bcrypt"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="An easy way to keep your users' passwords secure"
+HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/git ls-files/d' bcrypt.gemspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/mri extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/mri V=1
+	cp ext/mri/*$(get_modname) lib/ || die
+}
+
+each_ruby_install() {
+		each_fakegem_install
+
+		# bcrypt was called bcrypt-ruby before, so add a spec file that
+		# simply loads bcrypt to make sure that old projects load correctly
+		# we don't even need to create a file to load this: the `require
+		# bcrypt` was already part of bcrypt-ruby requirements.
+		cat - <<EOF > "${T}/bcrypt-ruby.gemspec"
+Gem::Specification.new do |s|
+	s.name = "bcrypt-ruby"
+	s.version = "${RUBY_FAKEGEM_VERSION}"
+	s.summary = "Fake gem to load bcrypt"
+	s.homepage = "${HOMEPAGE}"
+	s.specification_version = 3
+	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
+end
+EOF
+		RUBY_FAKEGEM_NAME=bcrypt-ruby \
+				RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" \
+				ruby_fakegem_install_gemspec
+}
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index 90cfbec38966..ed355ac0113e 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,3 +1,5 @@
 DIST bson-4.4.2.tar.gz 107429 BLAKE2B 94b3f694d79a3219a6e7b13f4dfa5935a1fec5ac99883918d61052786b2e033d8cd335013155b4b9069a730a3a87a0c0ec00b8b5ee5b89bb8c357909e8f67fe4 SHA512 a27a82fab17f596df986a3c81f1e73146a8d283bb16e8a7dba1921215e8f0e863b6996dbc107ede44546e750e4b19cc2dd934d290e25712472efd6cc075b9984
+DIST bson-4.5.0.tar.gz 107547 BLAKE2B fddbb84ee74c3b6bb50a79141e583b300deeaa85b7b39b4e26985fa1cd0c741813eb4b3192fffe97d8bb238430087e4726004e8d3c50d39f17f8b270b8635dc4 SHA512 093a4906961d765bdd49febbe9c3123a34d3f80adc5e1309abb2b5fc1380bff37c9d8df475bfb29fc9359cf440813e716ff359e461f5e7f6d5e1e02009bc24bd
 EBUILD bson-4.4.2.ebuild 1076 BLAKE2B 167cc4c37fea736e2e02b341cca067ba49a9c3851cc84512b3c080b5bd1d5a2fbd269369a5638dcb0dbc8c09f33b4ae803f13710323bef0b349a460b5c9fd5bb SHA512 c5eaa66135fdc0487115f0047c4ea2f7f2a6dbf1acd1b276ce606cf47fb06d910b3f4145f1f8f595b8a69057ffc2d9a83a2e9029d6a262f9c0d7d8d8685c0494
+EBUILD bson-4.5.0.ebuild 1069 BLAKE2B 6b1d760e74c0eefcc12ce3513bdbfd219bfc5f79abbfd42fa981de5d93089b4f2f3d5611925e32174b897ada0d09a74ba88d8e103c4d18801a03ae2ea8eefc39 SHA512 e8533682d3e2e00647d1c488e05982622323a6fe586ad0c94dbf590fa97da609e47d19d4ea782d6884498e5b8a31ecea5c68d7fb887c88f13a621776d9f0e418
 MISC metadata.xml 343 BLAKE2B 45b4f3d9d5e86b9fee94d0b51c420d48c51b914adb49585c12519a81de40c555bc5ed48b03b751c7ab524464e46836a25d51f824c56cb03837f61ae071e1517b SHA512 a5fdde2808fc5c77be1a62a593215b8b619f53ffd8606e76db34a2eb2006deea409c64e85d6ba8a5b4089133265b6911188a9026c3698b44270ef8ce1f12967f
diff --git a/dev-ruby/bson/bson-4.5.0.ebuild b/dev-ruby/bson/bson-4.5.0.ebuild
new file mode 100644
index 000000000000..da73b88ea528
--- /dev/null
+++ b/dev-ruby/bson/bson-4.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="mongodb"
+GITHUB_PROJECT="bson-ruby"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
+HOMEPAGE="https://www.mongodb.org/"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="bson-ruby-${PV}"
+
+LICENSE="APSL-2"
+SLOT="4"
+KEYWORDS="~amd64"
+IUSE="test doc"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove project-specific rspec options
+	rm .rspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
+	cp ext/bson/*$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index e7527c8db33b..4672950ee754 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,17 +1,17 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
-DIST capybara-3.15.0.gem 328192 BLAKE2B a70e77447c7fc2a52ec2f49377dffed167e6da21dfe3815122dcd2467c5d7022c40a320207de5d6e5bcde466d6605a0ddcf8596219519c77ff4c7e3042303476 SHA512 7d4aacfccead777f41e3acdabd642628e7e617e6c3df5078ba672c3cca5aa635b954cfc48601a5675afeeb3d4d161d70f5e0f24b413ab83c0dbde08cd2dda30b
 DIST capybara-3.16.2.gem 328704 BLAKE2B cec9871efe380b57b2dea54824e2032de5bbdc7bb49fbdb8c4f135ba4ae577431e9813a8532f37bff3616820916014a91fd5e558f4f0049a4718fc22e12f953d SHA512 9350fdffa5991aa680337a77ea5422adf0c9cce9c2c42a0e30b7994377cce827c971e4e34c4331b2e2bf7fd3036845416dbaa06ebeb2c6d40c89749fec3240cc
 DIST capybara-3.18.0.gem 331776 BLAKE2B 05d4368f570bbf74a3540fd7d7594cb95c602507f4ddbde437b702b6a280dce5bbf9d0412a1a6ce7888af3a72667e6e3efa7c83d50a8791670121673426c4de2 SHA512 5e9321eb2367bfb48f090868c944bf9920e6bd298e5663e0a820d63946a9cf320e5e3a9b95569779b7e6cdc361dded5ab12a8fce4a0df430c4768d8ce161d02c
-DIST capybara-3.19.0.gem 333312 BLAKE2B 31bd7caf2f9964d4baa37526dc8b0a4f734df16e340d66939d042779a75902be936fd0763661c312ab76e89f1d786e7baafe07280a24064d9282af2bf5ff49ae SHA512 4ddffef7d921d974beabb7a0ecc1bf68b262f9037323891cc1d60984789463d54a1a55522eed59ad7301164fb82e51c8e87b7ce7b298522c94b092d284f8d0cc
 DIST capybara-3.19.1.gem 333312 BLAKE2B ff0ea453066b2b11f417f9ea54af47ed9fb27847a09967a07c97196dda0e76e2c9862bea89c9ef7006bedc0dabe3b6e5cab19fa12f5b2e80f8872ca43b6dfdb0 SHA512 3098748e34ea794b13bfb62fc3a98c3cda8acfe1cfdfc9d816a4cf2c38aff6f1b9f23b4d84ca2cb8f0257a7bf1f5c368dcd40148354661687346ed30dd005b87
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
-DIST capybara-3.20.1.gem 344064 BLAKE2B ba014545dc42d4e024de42b4d359fc6fbd799209836082e2e0c862057f620018d492c8e5537fe378d43c0f0b830b419e09352341ff24ef6dd3efc6ff1bf780a6 SHA512 473b8b177e75fecb4ef1b070cfb39618210a589603ed74290ff155c71ee4059ffbf0bb00541a2f4082a15e54c87ae1cc0700637c3dbbae0ecb5ee4130b3e9cce
+DIST capybara-3.20.2.gem 344064 BLAKE2B 6b0c8551c2cc88ddd201d416abea25b03c874ac65bc3d7abeda0990e03bed231493310dedd287be1c8961e1d38c7d4d0060698645223167113b86dc650dd6ec0 SHA512 f91902712c5140428260fde24643900c628c75de66752a655584c600c84bd55e9f5153c694c7b286d0c295f18bb459906bf5e68ca636bbabb29f84c4f82031c4
+DIST capybara-3.21.0.gem 345600 BLAKE2B e9a2ea78a9d0a3ec4fad7b61b82a527fdb9b1a5ad3a2bc5a3b294b90c6a6afb0c5ff00056371c1a70ef28d340a048073e713d0eade7db610bc256cf58e8456fd SHA512 e632eb75c13b1c13691fa7b7ee81372adcb205df7942593a7a7a45207068a043591c8cb50dfb1664d1d9206e610ab1107a2a4d3fcfd614be766207ea7a32fcab
+DIST capybara-3.22.0.gem 347648 BLAKE2B f1f50da92f62fc31231564500ae94ed7e5d07f4fcb04b68829dc538097f1bddb313fe9a8384772da24485879bb7c16caaa7dd2f4994d0bb95313fbbd5c79a3de SHA512 b77ad55bb35a3f62057a649e99086c322a3b3832f2c907f7abee46d694c5c189aff9f286590c8ab597bb767e56f3ec51911842146677545b99c44db27ca236c6
 EBUILD capybara-2.18.0.ebuild 1552 BLAKE2B 7029dd19a177f4aebc1e78d83f9561ef4f3abdd41b0b8d77426e11bbaffc7865d746d4f3d3e6ed696c4414008648acc707f42e4a716681a2e331acae512ce8a6 SHA512 87dafa1f76c10eb0853eb7c8e3da36ff7c0b522b887c037ab9c3fdf12b29ec20d39a3638c4119225ab097dee44b878ed1ef0aa753d0d83f886c6d4c089a6c931
-EBUILD capybara-3.15.0.ebuild 1612 BLAKE2B b0e1f6191969448419867f9059fe8982dd46caabec30c2d223445998721757b7c90424efefc68284c103a5d6a061033715d71766050557b99d888a62d5f459b0 SHA512 14fe1febda7cdb8a99af6c1881e3b8d8fbfc82743893fa34c8151aa23005a271d28a900a7dffce23aee433564628088429a23c537e7b5581732c6b059269ccc9
-EBUILD capybara-3.16.2.ebuild 1606 BLAKE2B 3d4903661b3928fb816e8d5f9336fbe638c3c37dc9692565823edcca4c4702692f83783033e5e75d48a4e7d41c731ac7a3ffc23485cdfcaf7b46bca4ed4870f7 SHA512 6a916003e05cda5f05f9e78ecf8211a38f8a94265f7759dfb84f90ee8fd68e1d24cf4ca21b94e6e763fc9efae948430446f2947453e2e6e660d61ac8f46a1b3e
-EBUILD capybara-3.18.0.ebuild 1805 BLAKE2B d0519f603a2ba92da76acf55461156da7a09d3ddfddb914e1328ce210593f1f587948c370f631daf9ff20a3bb094780a53da4c247e3872ff3b2fd84f5a2b1f83 SHA512 ee6e39820bc0031bc86cb905043018950984dc79bcd910d70a6f057ba018d97740ad1806c92f6723d180ec3717e9c12ccb6ba45ee1a1c403a5f8f15ec2a3a756
-EBUILD capybara-3.19.0.ebuild 1805 BLAKE2B d0519f603a2ba92da76acf55461156da7a09d3ddfddb914e1328ce210593f1f587948c370f631daf9ff20a3bb094780a53da4c247e3872ff3b2fd84f5a2b1f83 SHA512 ee6e39820bc0031bc86cb905043018950984dc79bcd910d70a6f057ba018d97740ad1806c92f6723d180ec3717e9c12ccb6ba45ee1a1c403a5f8f15ec2a3a756
+EBUILD capybara-3.16.2.ebuild 1605 BLAKE2B 9deecfdc08bd830d3c59787a6ee5e64df2da86ee381093b437df9c75763ca44116a1a2a9ba53e474211f77c6286059b5570ccc6f1573ae07599b17bf993dd7a5 SHA512 7317522977017cbe3d76c3437d860afa8d1ce5cd20682511bea5148391a29cb8efba1540a8567f4b29579c151d551bf4b6fecc1f03080205e432ef619be6be73
+EBUILD capybara-3.18.0.ebuild 1804 BLAKE2B 678dba02ba98f19bf4ef17086d3bab0f8216ba6e89d85ca0377a53a03c3b952443a29bd00d8cb0b85849516663958a315386c059fd4d0e119f4417b9550a9558 SHA512 8a1ab2c59dec10beafb8362ad7a58f5389d385ce98975e427f40cc8b464d095ffda7baeb44fc66a5b7ecdca86f181571d16af0000b74a8fc99b1d99118f22a30
 EBUILD capybara-3.19.1.ebuild 1805 BLAKE2B d0519f603a2ba92da76acf55461156da7a09d3ddfddb914e1328ce210593f1f587948c370f631daf9ff20a3bb094780a53da4c247e3872ff3b2fd84f5a2b1f83 SHA512 ee6e39820bc0031bc86cb905043018950984dc79bcd910d70a6f057ba018d97740ad1806c92f6723d180ec3717e9c12ccb6ba45ee1a1c403a5f8f15ec2a3a756
 EBUILD capybara-3.2.1.ebuild 1552 BLAKE2B 02cb90fc41a6c642bcb8c3efad2428e9d49cd5fe06a43217a4e67b2b9ec957e5038377cd8bfe957605d3f9bbf85765eb42f07a75b8b8534fc142bb6a71af4a03 SHA512 7ad2cdc611be697732243100756b0be1d66da2654c5f65102a9f258298d1220e21683f1eeeb82ac3f2bae0edcc844d94de2a23eae12e9e4235128df8d2df8d56
-EBUILD capybara-3.20.1.ebuild 1826 BLAKE2B fb4e93b36a5aabde81799dfdb42aeff00ae4b5e3133f4033f22e0b46ab3e0fbc029fca8485f3361b0bb1ced40250336063e864bfbeeeda6bb941f0e602829b3f SHA512 e4d8b1713e6e09e936ae0359879eecb6d9d07eca6e6defa86b4ade8c1ff8062d7c0978f234db50c6522326933e5a79217752d4a13f95d726d3fce774b2efb617
+EBUILD capybara-3.20.2.ebuild 1826 BLAKE2B fb4e93b36a5aabde81799dfdb42aeff00ae4b5e3133f4033f22e0b46ab3e0fbc029fca8485f3361b0bb1ced40250336063e864bfbeeeda6bb941f0e602829b3f SHA512 e4d8b1713e6e09e936ae0359879eecb6d9d07eca6e6defa86b4ade8c1ff8062d7c0978f234db50c6522326933e5a79217752d4a13f95d726d3fce774b2efb617
+EBUILD capybara-3.21.0.ebuild 1805 BLAKE2B d0519f603a2ba92da76acf55461156da7a09d3ddfddb914e1328ce210593f1f587948c370f631daf9ff20a3bb094780a53da4c247e3872ff3b2fd84f5a2b1f83 SHA512 ee6e39820bc0031bc86cb905043018950984dc79bcd910d70a6f057ba018d97740ad1806c92f6723d180ec3717e9c12ccb6ba45ee1a1c403a5f8f15ec2a3a756
+EBUILD capybara-3.22.0.ebuild 1810 BLAKE2B 8f86264bfa40ebbd169e78ca2fd0324b69d9a46cc52e895790ba11dcfc46eec4557da91a8827ec7cdb0b683fac7f35b8e323b0219ec42d3fcb720f343ecb1616 SHA512 d69eedebe35e30b7773bbfae074b4ea09b75929c8350547e35dcef268e8a94f713c6baff74bb73ebb3b79dd35734acceb967728c725554e7450e0b17a4fdebef
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.15.0.ebuild b/dev-ruby/capybara/capybara-3.15.0.ebuild
deleted file mode 100644
index fb436b473689..000000000000
--- a/dev-ruby/capybara/capybara-3.15.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	>=dev-ruby/launchy-2.4.0
-	>=dev-ruby/selenium-webdriver-3.5:3
-	dev-ruby/sinatra:2
-	www-servers/puma
-)"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/rack-1.6.0:*
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/regexp_parser-1.2:1
-	>=dev-ruby/xpath-3.2:3"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
-}
diff --git a/dev-ruby/capybara/capybara-3.16.2.ebuild b/dev-ruby/capybara/capybara-3.16.2.ebuild
index afdd54d05cc6..d22b2b7118b6 100644
--- a/dev-ruby/capybara/capybara-3.16.2.ebuild
+++ b/dev-ruby/capybara/capybara-3.16.2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.18.0.ebuild b/dev-ruby/capybara/capybara-3.18.0.ebuild
index 6d4f00d22fbe..593a3ac94ef0 100644
--- a/dev-ruby/capybara/capybara-3.18.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.18.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.20.1.ebuild b/dev-ruby/capybara/capybara-3.20.2.ebuild
index bbbfa3a36f7f..bbbfa3a36f7f 100644
--- a/dev-ruby/capybara/capybara-3.20.1.ebuild
+++ b/dev-ruby/capybara/capybara-3.20.2.ebuild
diff --git a/dev-ruby/capybara/capybara-3.19.0.ebuild b/dev-ruby/capybara/capybara-3.21.0.ebuild
index 6d4f00d22fbe..6d4f00d22fbe 100644
--- a/dev-ruby/capybara/capybara-3.19.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.21.0.ebuild
diff --git a/dev-ruby/capybara/capybara-3.22.0.ebuild b/dev-ruby/capybara/capybara-3.22.0.ebuild
new file mode 100644
index 000000000000..b6b0785652ad
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.22.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/launchy-2.4.0
+	>=dev-ruby/selenium-webdriver-3.5:3
+	dev-ruby/sinatra:2
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/regexp_parser-1.2:1
+	>=dev-ruby/xpath-3.2:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Update spec to catch the right error code. This seems to have
+	# changed recently accross ruby versions.
+	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index 8fa4c3ea2732..7a0012adaecb 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST concurrent-ruby-1.0.5.tar.gz 1307802 BLAKE2B 2eee2afdd33e2609608e9389847de380eb895c2193746b1190ea96ca8bb67eaccd8d141bc2071006afbd971f078e5b6452d1e62624892c0fce2c12b8ac9fa28b SHA512 fdf7324b56bb37b4a79dc89882354e452ee838a097f522fb906c20a06856303cfbbae16f2500255cbfb4bba33ee1b3b3ee8facf3d0156e976add64209e349da6
-EBUILD concurrent-ruby-1.0.5.ebuild 1248 BLAKE2B 98a428271fee0d0bb35167e19107db2dcfe088dd0e38dbc962bae2ca4b064c689ec180d1dfe83fec6495b57cbe07bc70b8943faaa3f7671d02520121d923e784 SHA512 9a71a1976d209460e2c05c33adbffec4d4a1b6de11d80ee2764d9cf5ba30c5e3c1dcfbb7b78376549f5d28c6f268d33fe819658bd1dadc59d5cf96b36786dae0
+EBUILD concurrent-ruby-1.0.5.ebuild 1247 BLAKE2B 5bdf51b93ea60b3c55946f8e46b3e936dffc0a3ac112609fcc7374cf2f196939fea177d5d40fa500aeadcca4b0b4f3f72c7cd488ddd6a823917af2842b8ccbdf SHA512 071f216a5267fc5049f4c3b30d8848d1221944d3fcabecdae6de8e748e075840ddc7de745564b2673870ae8a69d345c855b008584dadd9943fd16f619ffb335a
 MISC metadata.xml 358 BLAKE2B 4af4b67d3a6beab61cb05090b0f0a0a7802af67231fce103d84c2a475f9e65324a511f5a1c8b9df808a929281811de7b5f62a680688dd89c25ad75424bc5f2a8 SHA512 64e69249d1082b41905c309e159ad7eb8045af1c89ecc77cf119ed6014d40e83ca81bfe8938b5eaf5119fe12c02f1b1613ccc885770c897be06769af40dca85f
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
index 2126aab03675..24513ef465b5 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index a903f7678762..65634ce3f942 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,13 +1,7 @@
-DIST cri-2.15.1.gem 32768 BLAKE2B d1f829443a724a6d72f13effb279d8578ebdc4ca0b354f3285d68693eae1e6514cb0bcf831ed0068df72469f3be4b21af61a68056dc8c5fb105991cb677e906e SHA512 6ce36b74391d9635094614f5fc33738d65e40b8796caae3e39d4bc170d6f9f4bc5b2b944d36d79b453f9ba7715e2858b27f1c7433b53ce0bcf2fe748153d75a6
-DIST cri-2.15.2.gem 33792 BLAKE2B 778f115db95cc0d4678a1a5805aa8bfe6208f3518fdf593efc61e51d5e6cc611ac88e1a6d66d1dfd231dcf31198b08dfc3f9f6ae1f2896e7a68083e96fbb318a SHA512 75e9e8e0107879aff62be8ec07eee1f37996c42a1077955f444e1b1da320c59cf272692cb33c4a197bcdbdc994b7e17dfb4de5accc41c6a2165b89a17f1b28e2
-DIST cri-2.15.3.gem 33792 BLAKE2B 3496347dbec0a8224993fb1533e782c34211d0ee5dcbd560ae7c7405109faeb70bd68aaaae0741f9fa76a5354c61c134ca17b7f166a5cea5fa9908cd45d20a17 SHA512 76580197348f6d504cb532d54d0f17da162d58569b9ef953079c5ff6fa5b3ba500b072ed4219a842f0f5de04d6e208c0fecbd8e553174cb968010e24904ecd6c
 DIST cri-2.15.5.gem 33792 BLAKE2B 90724633a26acce78e8d041df96d91ea6db21c9d96558cb2f14c458880f4e2fc3a99de2242340cd2d8e4a3c1f68eb7dcf3877c67b4ce6dbc590b4dcf3ef4b41c SHA512 7519fb6eb79e3f818eb66be8344ee10ec61e09f81b3d70c4e0fd29736c957d1e760384661d018833015307a83b5155bb5c146bd6ea67fe929ab96d665279d6a9
 DIST cri-2.15.6.gem 33792 BLAKE2B 901bd6a1812b258b2ef26f5dc534f2249f813a00dbffff0a651dcd48dabedd02c49fb101026bd33ede14ab730d253decee8dc6e4e915fce1c5b1b28f153b281a SHA512 3d997c90c46b4d787f2411e5c2eea5aadc4eb6837948920a93b42e2ecf01637d1589e864b59e60002bfe6ac80fdfa9d0473c0d4b4d94493a998af47f3818014b
-DIST cri-2.7.1.gem 25088 BLAKE2B 20317d886401d6d5f034c27396cad2fdaf322246c319ef3cadc3e38169dbc00c83771fdb2d564efd0ca386b916a0bc2d8cf283742ccd18ca390e491a84f5e31f SHA512 37d641390dc83550c254b3c48018f7f2c53f73161807c299cb78ef84b8625e5f00cd8c877ac464ece5c6623d7118872c45648ed56c2bd5f53ae62cd66b8e24d1
-EBUILD cri-2.15.1.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
-EBUILD cri-2.15.2.ebuild 767 BLAKE2B f29200d7dab980c5abf5177f4181a0f4fd02fe99d35b17fbe6e0f0715c9d4cd4b400225e4533e6db3102cb4f6a17d174529229ed090f184775651c4f798eae6e SHA512 49b159f0c6fb6193e3e9a3b22086c20efebb94bb9b01a8dc2d0ba737d5635bb9d4bfc888fb9af723513bb1b6e737ca6bf221bbe35fd2f1f5205ec8134e8268fa
-EBUILD cri-2.15.3.ebuild 774 BLAKE2B b0622796955ba7dca667d771649d87f922bab2223d73c62c03b850fdb272b1fbb794ad7603ad6a3321ab98c4869a710ed5ee6cad89e3affdc9dbb1e86edeb561 SHA512 72e473b4b858c0a7eda23ea946a23be82a9484830e6cb364f99e50b7cfb641744802e602a766ad3e7268e05be2c7725e4c9b882b3b9100b1e007c2e0e30ee4ad
+DIST cri-2.15.7.gem 34304 BLAKE2B a472c8ccb01ca4d744343dfc96b08fa16ceb2b2f06abcdc88c19ec7584f54f52cd7d422a56c8d74c38ce6e7a42aaac48433f0a27a6a2a8758c4b85ef0c022749 SHA512 d9567b83f9ac17deffb0e9b1300c69fc827f7568ca6789f06c7933284cd9e620223337fdcfbe1b251207034d7c2cbb003fbfdb1da07cfe8c87a42c962fd91635
 EBUILD cri-2.15.5.ebuild 724 BLAKE2B cfe09acd444fc18a61b8e73b0ff814eaf43e5b16ae8e5b7f293e8fa8818e248daba8e1a079193bbf7c38c419923b264ad69599aa98a0dfc24a4a298e31c8aac7 SHA512 da3c2148897a921eaf01879e7db3838225b100ced243454bd95395934255fc85624fe37dc524add61ad31d4d00d8a4bd027258015fde75a92dfb5c2c283061de
 EBUILD cri-2.15.6.ebuild 724 BLAKE2B cfe09acd444fc18a61b8e73b0ff814eaf43e5b16ae8e5b7f293e8fa8818e248daba8e1a079193bbf7c38c419923b264ad69599aa98a0dfc24a4a298e31c8aac7 SHA512 da3c2148897a921eaf01879e7db3838225b100ced243454bd95395934255fc85624fe37dc524add61ad31d4d00d8a4bd027258015fde75a92dfb5c2c283061de
-EBUILD cri-2.7.1.ebuild 772 BLAKE2B 3e09c46b3ec082da544c48c2a4c6a024ec45c83547bb3558a5b26c0399818a1fd9ee602155aeaea5e7a408fe4d3abc1294f03bd1d3d14af437a77ba125651e48 SHA512 29b1e00f40376ec04affde1d366437fb65bddab170bc6f4b66c3a4f42c560bd2970b923a2cfa17e62620170695c1929e6958b1f0da966e87280ada6c08b80ee8
+EBUILD cri-2.15.7.ebuild 724 BLAKE2B cfe09acd444fc18a61b8e73b0ff814eaf43e5b16ae8e5b7f293e8fa8818e248daba8e1a079193bbf7c38c419923b264ad69599aa98a0dfc24a4a298e31c8aac7 SHA512 da3c2148897a921eaf01879e7db3838225b100ced243454bd95395934255fc85624fe37dc524add61ad31d4d00d8a4bd027258015fde75a92dfb5c2c283061de
 MISC metadata.xml 321 BLAKE2B 2bbd02b4b0f33bb2e3942b93c9af104fcafe960a59b2f109935f5121c2476635f1a3efb9ac092f4f5e6138df0398ea0ca874ee62390d20f3620d442d3502d42d SHA512 8e90f3ffd2b30ff9557e4c11bb31655cbd65498191288c68191f2e5f6d7bbdab6f1c22935f8d45fa95673582d1d0bf776055c0242cee2da27c9d3e71e2851f72
diff --git a/dev-ruby/cri/cri-2.15.1.ebuild b/dev-ruby/cri/cri-2.15.1.ebuild
deleted file mode 100644
index 30952c0fb573..000000000000
--- a/dev-ruby/cri/cri-2.15.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
-HOMEPAGE="https://rubygems.org/gems/cri"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/colored-1.2"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/yard dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
-	sed -i -e '/rubocop/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S rake test_unit || die
-}
diff --git a/dev-ruby/cri/cri-2.15.2.ebuild b/dev-ruby/cri/cri-2.15.2.ebuild
deleted file mode 100644
index 1108a4528f6c..000000000000
--- a/dev-ruby/cri/cri-2.15.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
-HOMEPAGE="https://rubygems.org/gems/cri"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/colored-1.2"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/yard dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
-	sed -i -e '/rubocop/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S rake test_unit || die
-}
diff --git a/dev-ruby/cri/cri-2.15.3.ebuild b/dev-ruby/cri/cri-2.15.3.ebuild
deleted file mode 100644
index dde7acfd1152..000000000000
--- a/dev-ruby/cri/cri-2.15.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
-HOMEPAGE="https://rubygems.org/gems/cri"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/colored-1.2"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/yard dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
-	sed -i -e '/rubocop/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S rake test_unit || die
-}
diff --git a/dev-ruby/cri/cri-2.15.7.ebuild b/dev-ruby/cri/cri-2.15.7.ebuild
new file mode 100644
index 000000000000..121074120806
--- /dev/null
+++ b/dev-ruby/cri/cri-2.15.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
+HOMEPAGE="https://rubygems.org/gems/cri"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/yard dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
+	sed -i -e '/rubocop/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S rake test_unit || die
+}
diff --git a/dev-ruby/cri/cri-2.7.1.ebuild b/dev-ruby/cri/cri-2.7.1.ebuild
deleted file mode 100644
index 0ac2af111595..000000000000
--- a/dev-ruby/cri/cri-2.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.adoc"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
-HOMEPAGE="https://rubygems.org/gems/cri"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/colored-1.2"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/yard dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
-	sed -i -e '/rubocop/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S rake test_unit || die
-}
diff --git a/dev-ruby/delayer-deferred/Manifest b/dev-ruby/delayer-deferred/Manifest
index b6a3e1c37406..56f2457e19eb 100644
--- a/dev-ruby/delayer-deferred/Manifest
+++ b/dev-ruby/delayer-deferred/Manifest
@@ -1,3 +1,5 @@
 DIST delayer-deferred-2.0.0.gem 20992 BLAKE2B 0a297ad96a76ce38497c26c596581b3082d7cb9f2b0401ff90a2985a82340ac5e19124d03dde807a57d6765c2af93ef167a1557be171bffa71aee595a6ebb3c4 SHA512 d1e33f318e45ea212a84eea436f396ac9a1fb5ceb3bba018ff5b58211352954447f798148092bf46a8e29c6bc7d81e1c091f95e68f43339d4de63e46c98e5e0f
+DIST delayer-deferred-2.1.0.gem 20992 BLAKE2B f50486ee9ca431fe637d15be99e7e0b4fae443cd8c8e5bf12f40e199361909b8a18147cda4809cd11222a86052ccb418333b86b1dfd95f85885232949ca6eb59 SHA512 314a406c14a05ad9f0c1ae8feb88612148e53f62a1b091feddce385c63fd4acc25e6b869e55961f021966fd0a928f6145cb4c824e8d299441cc5d4d72c6c2dc9
 EBUILD delayer-deferred-2.0.0.ebuild 591 BLAKE2B 21bde993daf0495b2194a5624607c61415dfdd06f68baab33699d92110167133c0502e8027d072a36b6d31c6d08a9288e421073f2230b3ea6f22131d5973abdc SHA512 7c79648ad890514aaf2944e87a42737b38f74c65a480465ad28c9b75d692dc84c7c291787d0da81f28a638dfd3f34d8ed80b9b0e5cffd5aafecc65a9dbe18b45
+EBUILD delayer-deferred-2.1.0.ebuild 576 BLAKE2B 8f2df150768f08a6079b57af83fd1cc4a276a64d2f8b8b94d46b3314ee9e6de88b2d74a26c3746ff447010c9bd46fcec70a1e3682c7dd582ca8fbe882b159d80 SHA512 ffb66e053d45d868a8f20180ff96325caf411a18b9d66f7132add7c01234c705e9bc59f5f1436dc5ba7b2eb2eab3d845b70cabb178e474c42b3097ccd8d5c294
 MISC metadata.xml 474 BLAKE2B 5e75d643a2080cbcf84a8e0173c9ac4305317f952fab14a573f45ae650aa56bdeb11ffb2efb887b9a206f04cbc9eefdfe065766b21811cc627387517f23421b4 SHA512 8d070713e84530e8e20065635f5dfd632661a491e3ca8dea97bf8308b6ec7fabce0411afad7006856559f4a8fb9f4b6fdfa196bbfebc0b993cab521ce771ad5c
diff --git a/dev-ruby/delayer-deferred/delayer-deferred-2.1.0.ebuild b/dev-ruby/delayer-deferred/delayer-deferred-2.1.0.ebuild
new file mode 100644
index 000000000000..275690e37ba0
--- /dev/null
+++ b/dev-ruby/delayer-deferred/delayer-deferred-2.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby implementation of JSDeferred"
+HOMEPAGE="https://github.com/toshia/delayer-deferred"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/delayer:1"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/helper.rb || die
+}
diff --git a/dev-ruby/delayer/Manifest b/dev-ruby/delayer/Manifest
index fc838ad90993..f5d45671dbbb 100644
--- a/dev-ruby/delayer/Manifest
+++ b/dev-ruby/delayer/Manifest
@@ -1,3 +1,5 @@
 DIST delayer-0.0.2.gem 8704 BLAKE2B f0fba28398c0e585b10cfa48eaa7aceb9914e335f11253e8c4cb7a3c85201fae7a52e6792f1d0e824c75936ae2dea572a0ea99e89384562b76be615f6b70628d SHA512 1a5e149b739d8dd975d5c4a9e6a072181cc4d816af202461a0f98ec91f92e85e76faf700171b83652ec4f5114b1c1c5b2c6cd9d1d8d6508c1161b43f099e2b88
+DIST delayer-1.0.0.gem 10240 BLAKE2B f39c02110a2c1734b8ae0f05619ea5954c3c1bc52fb70f179ea7ebc8531677ec1af232adadb08810d6a394ccefc6b525d8fda1cb7bc0a714fcd6aa4059202fb2 SHA512 2dfe3590381796f50dc89c17b038fd94cba21660e6863c60600e590f449180eb5e424f81340c6698dffddcf64f5218dadbdc96f1553e2eef96be2b1fbe2d1fb3
 EBUILD delayer-0.0.2.ebuild 481 BLAKE2B 0e15d86fc49a9617b2f56e50f142c74b616ae423019ca98dc9994ab19a5240a33629f12e159d260ed8cdd1061a692cd52097ac99689bfb2622683c42a4292806 SHA512 d51a61129b82b5f5fb168251a3535cb7f27dead399119c395d45300ecb09f4df09c437c0f45fa00941ff2004cdb6088be22416efc942760a560baf4e0c7f1483
+EBUILD delayer-1.0.0.ebuild 474 BLAKE2B 445367905feae6fb007a5c879cc7a7436deff7ed343a6efcecb2906d807ef9df230f9e5052fcffc8b3e8e40682dbe6e1d49db85d46aa1fc6333dc72819d70aa7 SHA512 0a8fcdb199651fb02522a50ef9ba0f45fde37e47c3d0b25decf9853bdc4843b985b2f9c159de0e775b349c2c6d4ab99cb9c4d55ae35f19ca78adc40341a5aca3
 MISC metadata.xml 402 BLAKE2B 55d14808082ea735f42e1973414806c29ce83dc35dbc7a9b72c70d22bb00b0f5f22f34798a8232dbf32a74a134387eb47ff014477e336c912d89bd23c388e78b SHA512 9d11aea71d2c27e3aeaa80848458166719daff95243f342b946756e9b2d0d1ab23551a3eafc40a74fad1d029798f2ec7bb67bf224ae9985bd7db9fdf4576ef41
diff --git a/dev-ruby/delayer/delayer-1.0.0.ebuild b/dev-ruby/delayer/delayer-1.0.0.ebuild
new file mode 100644
index 000000000000..6b23b20cb3d5
--- /dev/null
+++ b/dev-ruby/delayer/delayer-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="Delay the processing"
+HOMEPAGE="https://rubygems.org/gems/delayer"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile ${PN}.gemspec test/test_*.rb || die "sed failed"
+}
diff --git a/dev-ruby/diva/Manifest b/dev-ruby/diva/Manifest
index 5a114b744c24..93952efae7ef 100644
--- a/dev-ruby/diva/Manifest
+++ b/dev-ruby/diva/Manifest
@@ -1,3 +1,5 @@
 DIST diva-0.3.2.gem 13824 BLAKE2B da6236bf24dfca3d2ebc241172ee104c5ce66001446fcef397108695ffa70e37d65de9a2db29a706f6f81c5d6a70934cc59155d94e890f7499ed572df3adecdd SHA512 3506aead4314d8d43c838ca0bc596a8f63e6d0b86da68810999e9101bfad611b8fd4902078ec7495e66704e756d928ec28e916105f22c4260b2681ab97eb08aa
+DIST diva-1.0.0.tar.gz 13654 BLAKE2B 3743a2a0cacf6390a2bb2149e1213c9057c7c348fdb514d622b1edeeaad52a8a255defa0ea556a6bc5f89889d36f9f096b63d48eb03d868797f37ba2a5ba6a03 SHA512 d29375840893f61f022e3afb041855486ff13266a9635c8d944177df0642f1e53c0038b5bd6fecfa2d02296558f6f0f0e4f86089434f6c5f04a440044c9b75ca
 EBUILD diva-0.3.2.ebuild 499 BLAKE2B 80bbc5b0b9c4db65c6e7f7716ed092ff26eaf57ca79748c3595b732e39eac8855610f7cfda4c06c915ebaf51cb98ba42291f534780be3d8663604935da791807 SHA512 8323059734455e2724f3768d9472640282a2ee6f88741c9b2bd1229a9d155f9b3753d3c0fe7b59051d2dad80d052f7ffd99f7f81e21ac46931e3ccbfc32de01e
+EBUILD diva-1.0.0.ebuild 544 BLAKE2B e2a7c239813917ddd0d04593ef365a02483719fec363b3fb60c890d690f5ae71b6cbdec7237c50ecddd57d4a918937234a349c23ef684aaf31f0af3b04989853 SHA512 71ef8ccc0697bc519d5e654fa9a93a13601af2ecd829cd11881596812d76bf11884755bf2591606a4291df5a34bea5cca10f2d61e8319c294cd56e031db71c2b
 MISC metadata.xml 399 BLAKE2B 26a2baccac7448af4f7e749c1e8a69821a25864ca8f3672f137e73ae7a257ec87398239cd94479a06691ee3ddcfc0e4ead1b71f58ba2fe5541577099592466f2 SHA512 a95f31401006f69283159dbc1524b53e79454609c6bda896af06f472c84ff828162fea80594028fd8c02110cd190beacdfdee47dc27d69d5b01b10e29a4ce0b2
diff --git a/dev-ruby/diva/diva-1.0.0.ebuild b/dev-ruby/diva/diva-1.0.0.ebuild
new file mode 100644
index 000000000000..2023272a0fae
--- /dev/null
+++ b/dev-ruby/diva/diva-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of expression for handling things."
+HOMEPAGE="https://github.com/toshia/diva"
+SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/addressable-2.7"
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index 6a8e0eb68fbc..bd8301449878 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -2,8 +2,10 @@ DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b97
 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2
 DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a
 DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac
+DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
 EBUILD elasticsearch-api-5.0.5.ebuild 1133 BLAKE2B 41cda736b76a0122515158b0816d08dc0f5e6a6416772654dd5ba65657f362036c175f4121def0ea69e5ed6763a393ef92fdbb982fb1b5da6623bf1135628e6c SHA512 799d1b843fd684810f79a835fbd2026ae9e813a1e99f4e5d950398589f0ae9f38a420770bda06c314726e8fc0847bb504d3aed3fa23e2485bd31e2136c4aa55e
 EBUILD elasticsearch-api-6.1.0.ebuild 1161 BLAKE2B 2c0ea526d791f49afcf21492e8400588fd55bc312cca0038fe7e8f609f35670c74ebc0f2e10406d36b8c2e6fe2008e2f493900a17bcea91e56902d0d719becf2 SHA512 f5b8cb948946ae443225975813623a182b78262411b2f463a422e2a87b776e0a6fb81987c48a8e10882e48bc578c31ea14695c87f967046514f06fd6bc3a9756
 EBUILD elasticsearch-api-6.3.0.ebuild 1151 BLAKE2B 2a8a26719aefbad975aeece61c818f65d40a0e75fa66b83ba3a9cb0f8cbcfebbe859ceab4e575a93c6204a6551104fc838c5f59fa1362365e1e6d0d39ffb9a5e SHA512 285503ba3f8406053ab5dc18a26133eb80e298853333b67fe254248e3b2b4c9a8f23f1a5611ce5853c3a653c1252a44d7c1a8329bc8766ce47713ff175088c57
 EBUILD elasticsearch-api-6.3.1.ebuild 1472 BLAKE2B b96b03841c716861d2d039e87a78db37a354742e65fc5414cd782856fb6097793c545a91e99dde39268944b613b858f0a861a2e7d8bf19071262c4a3226f09db SHA512 c6a7ceff3c422f029378acd2afd0066fac6b35ac2edd9efd58fa5896d31d5f1275fc43c2db3a2a012fd4ccba01b483f555b4b477cc8eca37fff9869721811744
+EBUILD elasticsearch-api-6.8.0.ebuild 1472 BLAKE2B b96b03841c716861d2d039e87a78db37a354742e65fc5414cd782856fb6097793c545a91e99dde39268944b613b858f0a861a2e7d8bf19071262c4a3226f09db SHA512 c6a7ceff3c422f029378acd2afd0066fac6b35ac2edd9efd58fa5896d31d5f1275fc43c2db3a2a012fd4ccba01b483f555b4b477cc8eca37fff9869721811744
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild
new file mode 100644
index 000000000000..4dbb938a449e
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem eapi7-ver
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -i -e '/config.formatter/ s/documentation/progress/' spec/spec_helper.rb || die
+
+	# Avoid tests that require unpackaged jbuilder and jsonify
+	sed -i -e '/\(pry-nav\|jbuilder\|jsonify\)/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index 4fe2a30e6cce..c9084de1c05c 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -2,8 +2,10 @@ DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b97
 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2
 DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a
 DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac
+DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
 EBUILD elasticsearch-transport-5.0.5.ebuild 1259 BLAKE2B 47800a95fcfc34d1431ce18379199a6c0b4b08941076a1d9b48a05a6a5af099a6f17925dc16cc19da688a77f0b3f3c70a33eee8538ef8b4573adb4ca1beb7c73 SHA512 3f600001e97a6e0833b637010219eb0fae8e01421380af6b10f6be3afec9cfac8f40ca3d8a5e932b9cee152eff6be9e76e5a7083d30bb6b4335fa2c1829572de
 EBUILD elasticsearch-transport-6.1.0.ebuild 1287 BLAKE2B d96821cd23cde49e90692702e98a98c3119c27d1dfd6794a01dfbfec4a553289b5c12b7a2199ff5089030936d3e591d3a4137d28aed3e86cf21b0ac2812640d6 SHA512 57e1a6024da309130f6820efdc4346a7ebbb213be3d9f958978368a27f387220e3edcdb3c960a6c7fa25737a6fdfffc670db037f9c9a1762a4cc55c30b98f2ba
 EBUILD elasticsearch-transport-6.3.0.ebuild 1277 BLAKE2B fc41e8d8e10dd890e5255fc71e5a035a741e4dce0ad9d44e74406defb548b32ea0c483ea23f602a5e2a6d445ba6e3c3fd2bbb34b9bfe6dd34fe8951d6de3a3f6 SHA512 43cf3dd6986e1f4c6fed1417798abb6154b2e269e3279a75bed776a95039691d989ee63fb0a441a34de4d8f4e906163948ec5adf0dc9c7636258b3d787897ec3
 EBUILD elasticsearch-transport-6.3.1.ebuild 1284 BLAKE2B 3288fafe5b6a4cb14dae4055aac032768baa0b344e73aacc266b2f73e4882fe48b38812d3e870bebfdc6fe4644dcf1decafcd9b45ef91776322c06ee4c6203b1 SHA512 3236272c505ada8a99b2ce70ad5fc1609e83e127f5dcf0393565a0443ec0f335e9be2f7dd6456430e434af517253c6d75ce195570a3f384e04ab290c3ac41a84
+EBUILD elasticsearch-transport-6.8.0.ebuild 1284 BLAKE2B 3288fafe5b6a4cb14dae4055aac032768baa0b344e73aacc266b2f73e4882fe48b38812d3e870bebfdc6fe4644dcf1decafcd9b45ef91776322c06ee4c6203b1 SHA512 3236272c505ada8a99b2ce70ad5fc1609e83e127f5dcf0393565a0443ec0f335e9be2f7dd6456430e434af517253c6d75ce195570a3f384e04ab290c3ac41a84
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
new file mode 100644
index 000000000000..62da4c569e55
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC=rdoc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem eapi7-ver
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/patron
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 3964d60f3c78..a6d70eb13236 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -2,8 +2,10 @@ DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b97
 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2
 DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a
 DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac
+DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
 EBUILD elasticsearch-5.0.5.ebuild 1170 BLAKE2B 22d0fc7196747dd85537cb2a3d868e0a69892c68111f121d171b9cc776246f17914706610c1d456967f099c6a28444f463dccdfc9cc3b87f1c429a061609eadc SHA512 82c3fff22a34b7cef89fce10b4ee9f4dee271fc2cb72d91581fea8970275f7392aeccc70485fc6b5c2b406ead47eb9b66435530e26176210866e7d199a46d6c0
 EBUILD elasticsearch-6.1.0.ebuild 1212 BLAKE2B 48ae9f91f475ce090b78e392d311df4763b433ee80f3c5cc4f20b730c042850aa9cfe9f69ef68f22697f460b73e5eb5769bdbb188c025912152a70b9669f5996 SHA512 911f5178d30323b89c158a5cdbe01eba7f8995aa65a8f74a322012206b570b17b4e0968ac9817fd1c672f292a8db9ac6cda1e45c08dad77824d3617b5f0d08f8
 EBUILD elasticsearch-6.3.0.ebuild 1202 BLAKE2B 3116cf81bb808fff3153f2261d5455e1b798320222f023b70a24c7b35cc4fffdd3282de47c1d7e51373ef484c3e626c388770c311f91a3d40b8ccd6e463faa6b SHA512 9df5c78d491525b87f22fad6bbcac2ec41dcfc7396781619eedc701c3b10cf1fb8be57261d1b35d00abd247eb85a401a3683f58cd9e276792584a86e6998055c
 EBUILD elasticsearch-6.3.1.ebuild 1209 BLAKE2B 1774fc89a0b925b8ea7c9fb971cd439fffa815bdf701fb9584ef409314d0a5cd3dff09ae7730b6ccfa6f5a857f3108f7a8292d3a3b6f75f21eb1af1e74abdf69 SHA512 977c26438353872f490b0ca44c2387e5f3b0a09ada828b70d4779ec648543e8fcaf8465b9f205aca10af22560321efc801317f42a2460b1494cac68017d42299
+EBUILD elasticsearch-6.8.0.ebuild 1209 BLAKE2B 1774fc89a0b925b8ea7c9fb971cd439fffa815bdf701fb9584ef409314d0a5cd3dff09ae7730b6ccfa6f5a857f3108f7a8292d3a3b6f75f21eb1af1e74abdf69 SHA512 977c26438353872f490b0ca44c2387e5f3b0a09ada828b70d4779ec648543e8fcaf8465b9f205aca10af22560321efc801317f42a2460b1494cac68017d42299
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild
new file mode 100644
index 000000000000..a56db80f2fb5
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+inherit ruby-fakegem eapi7-ver
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	~dev-ruby/elasticsearch-transport-${PV}
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+# Tests need additional modules (at least 'turn') packaged. Then someone
+# should look into running them and so on.
+RESTRICT="test"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 6e1b240ef6e6..27b1de59c2c5 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -4,10 +4,10 @@ DIST facter-3.12.4.tar.gz 392011 BLAKE2B 5e3d7ce65eb6c35cddba70b2b397cdc9c591a6c
 DIST facter-3.13.0.tar.gz 391833 BLAKE2B 8fabb2ebb438975564a770657866c6ac8ac77394c4e3cdb635eae78a744a097ef5eabb4307092cd2b9cf12b4db70623b18b3ca1e2c9e1a248825a2bf53b76565 SHA512 f3c39239d7b0708bd98a3e5de5d5623406edf5e60b6321de1d4ec7c8cf903f3ec777640b9301979f2316e90e97e2aa0a80dc71975239dc715aaba61ec7cc37de
 DIST facter-3.13.2.tar.gz 392065 BLAKE2B ae06a1a44de25f55b2eb84483a7abc70433b9437a00724f239a908846148f20bdb3e208d10256e6ddeb7d609ee9eb1c572e14dad84d8640fee147c34cb1bf184 SHA512 c7d1d0958720e0884b06eccf6d7fca64d2c8462c1747bbfbfe5df957ad009c3e930fe5eee80d42c985ea9f59e2b8b7d0a34a194a7e1c713a043bbee9a3b89df3
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
-EBUILD facter-3.12.3.ebuild 2452 BLAKE2B be5a19e9f1662fe58b53bccbac68f02678b70437473a359a50d60eea2f4c3b641ec547b461c92990105ce809950aec808375fadfb490656b5bf654caebb48c11 SHA512 94e313ec5a6d24214968476fe9b52f09ff55ae143f68a6d537fcf2d295fb4daa19dd8c1918333013ebc90f4d0370ea68b07e55eb978820c5dbc53f1e7da0da03
-EBUILD facter-3.12.4.ebuild 2452 BLAKE2B be5a19e9f1662fe58b53bccbac68f02678b70437473a359a50d60eea2f4c3b641ec547b461c92990105ce809950aec808375fadfb490656b5bf654caebb48c11 SHA512 94e313ec5a6d24214968476fe9b52f09ff55ae143f68a6d537fcf2d295fb4daa19dd8c1918333013ebc90f4d0370ea68b07e55eb978820c5dbc53f1e7da0da03
-EBUILD facter-3.13.0.ebuild 2452 BLAKE2B be5a19e9f1662fe58b53bccbac68f02678b70437473a359a50d60eea2f4c3b641ec547b461c92990105ce809950aec808375fadfb490656b5bf654caebb48c11 SHA512 94e313ec5a6d24214968476fe9b52f09ff55ae143f68a6d537fcf2d295fb4daa19dd8c1918333013ebc90f4d0370ea68b07e55eb978820c5dbc53f1e7da0da03
-EBUILD facter-3.13.2.ebuild 2459 BLAKE2B 5b28bcd4f1d69b32328de460cf1cf07817fbee023ff41565c9dbb8e0d8fb002e4eae2197c2ec11bdfa54260b2ec5433a63c166fb6142ddb18b85b2bb0b3798ae SHA512 6000759eaaacdf5ba27f840bc630a7040a81f97f07d11820de9a2ecdbbee0b39115eacba633ef5c5efba388c6f5ca9d400b65238afcf9b892b4971bc75c94078
-EBUILD facter-3.9.2.ebuild 2104 BLAKE2B 657616098817dc41ff43f1034dc697789e0e971ba0393ebe819e52a171cbb2d2a757aaeac60d4797b98df6a043b6afd28720cf79e6ae8ad33eee1ace71bca9de SHA512 49aedb61355c7b9a5f48b8be4c7fe76c8e48526470e094ea4491d8c36df5e97ae21b585bdd2d8afb932ed8bbcc806e3ef4d779d514fd8eaebc3b99c05cf68e9a
-EBUILD facter-9999.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
+EBUILD facter-3.12.3.ebuild 2453 BLAKE2B 84fcaf6ca2106c2f47246bebd12805e4ad7591c81a7714c405e08229acb8cadb54ba5b7886a724836eae739b921ce93a1e13dacd73185dc639962dd05beb38e3 SHA512 cf4880ee52cee45c830b0aee96aec7654e339b0aee5fd16428e3ed2c7e7a4c9d625e0433f61b0954da95a0ddb04011b69ad14cb3bf18fbb4502c268f19409307
+EBUILD facter-3.12.4.ebuild 2453 BLAKE2B 84fcaf6ca2106c2f47246bebd12805e4ad7591c81a7714c405e08229acb8cadb54ba5b7886a724836eae739b921ce93a1e13dacd73185dc639962dd05beb38e3 SHA512 cf4880ee52cee45c830b0aee96aec7654e339b0aee5fd16428e3ed2c7e7a4c9d625e0433f61b0954da95a0ddb04011b69ad14cb3bf18fbb4502c268f19409307
+EBUILD facter-3.13.0.ebuild 2453 BLAKE2B 84fcaf6ca2106c2f47246bebd12805e4ad7591c81a7714c405e08229acb8cadb54ba5b7886a724836eae739b921ce93a1e13dacd73185dc639962dd05beb38e3 SHA512 cf4880ee52cee45c830b0aee96aec7654e339b0aee5fd16428e3ed2c7e7a4c9d625e0433f61b0954da95a0ddb04011b69ad14cb3bf18fbb4502c268f19409307
+EBUILD facter-3.13.2-r1.ebuild 2460 BLAKE2B c61a7e483fd07cfa046ef307d0145be401ba889ed567bba879a54c6514b9441933db6511368f1d50e57819154dcadca5eb9998d31ef38b27eb532ce3f645fc4b SHA512 93a7ab3eec9edf826eb7086e1bbd961dede5a05e241c4a871b6bf452d14a8fb008c0f846bdd83f6b5ea85f9770b3a0bfbbcdd885275e3fd72f91b5b6ff711c67
+EBUILD facter-3.9.2-r1.ebuild 2105 BLAKE2B e859a3a4218ce492f0af48fcedbd1dad637abff814544e2d224bf1b40f5f7af2a8fd7defa350046671aa1bb47abc0e0114fdeb786735030cdc3b4e4f43d65660 SHA512 ed097468f444fc3c23a8cf9dceae6bd49c33090e7f738c7564f11743652c3085195e427ad10cd9fb76646049f3264264030f957f28fd500c5a637bdb6c838111
+EBUILD facter-9999.ebuild 2418 BLAKE2B 4bf8b77b1b66039da3d4bfa50e8bdf829f5443c7f578043b044f21c716d4103e10f22ccf1c83014f3c4bc7674232ae1df14a7de4eba5e99f5eb9b5da96a39041 SHA512 2709eeaa36352957bc4c958ee4441e6b6004a6d849653f2765b2989a7cb6d4f4e8a8ac904d76d6746954d3ab2b4e8b98e93fcab3fa14600c0e2f7bf26bf093b0
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.12.3.ebuild b/dev-ruby/facter/facter-3.12.3.ebuild
index 1f3d28128872..6d48b1f4f370 100644
--- a/dev-ruby/facter/facter-3.12.3.ebuild
+++ b/dev-ruby/facter/facter-3.12.3.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	dev-cpp/cpp-hocon"
 COMMON_DEPEND="
 	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:*
+	dev-libs/openssl:0=
 	sys-apps/util-linux
 	app-emulation/virt-what
 	net-misc/curl
diff --git a/dev-ruby/facter/facter-3.12.4.ebuild b/dev-ruby/facter/facter-3.12.4.ebuild
index 1f3d28128872..6d48b1f4f370 100644
--- a/dev-ruby/facter/facter-3.12.4.ebuild
+++ b/dev-ruby/facter/facter-3.12.4.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	dev-cpp/cpp-hocon"
 COMMON_DEPEND="
 	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:*
+	dev-libs/openssl:0=
 	sys-apps/util-linux
 	app-emulation/virt-what
 	net-misc/curl
diff --git a/dev-ruby/facter/facter-3.13.0.ebuild b/dev-ruby/facter/facter-3.13.0.ebuild
index 1f3d28128872..6d48b1f4f370 100644
--- a/dev-ruby/facter/facter-3.13.0.ebuild
+++ b/dev-ruby/facter/facter-3.13.0.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	dev-cpp/cpp-hocon"
 COMMON_DEPEND="
 	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:*
+	dev-libs/openssl:0=
 	sys-apps/util-linux
 	app-emulation/virt-what
 	net-misc/curl
diff --git a/dev-ruby/facter/facter-3.13.2-r1.ebuild b/dev-ruby/facter/facter-3.13.2-r1.ebuild
new file mode 100644
index 000000000000..ebbe2255c467
--- /dev/null
+++ b/dev-ruby/facter/facter-3.13.2-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils multilib ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+BDEPEND="
+	>=sys-devel/gcc-4.8:*
+	dev-cpp/cpp-hocon"
+COMMON_DEPEND="
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	>=dev-libs/boost-1.54:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${BDEPEND}
+	${COMMON_DEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# be explicit about the version of rspec we test with
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
+	# patches
+	default
+	cmake-utils_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/facter/facter-3.13.2.ebuild b/dev-ruby/facter/facter-3.13.2.ebuild
deleted file mode 100644
index 73d4aa321d5d..000000000000
--- a/dev-ruby/facter/facter-3.13.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
-	EGIT_BRANCH="master"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	dev-cpp/cpp-hocon"
-COMMON_DEPEND="
-	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54:=[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${BDEPEND}
-	${COMMON_DEPEND}"
-
-# restore ${S} and override all phases exported by ruby-ng.eclass
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	# be explicit about the version of rspec we test with
-	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		CMakeLists.txt || die
-	# be more lenient for software versions for tests
-	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
-		-e '/rspec/ s/2.11.0/2.11/' \
-		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
-	# patches
-	default
-	cmake-utils_src_prepare
-}
-
-each_ruby_configure() {
-	# hack for correct calculation of relative path from facter.rb to
-	# libfacter.so
-	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
-}
-
-src_configure() {
-	ruby-ng_src_configure
-
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
-		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	addpredict /proc/self/oom_score_adj
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.9.2-r1.ebuild b/dev-ruby/facter/facter-3.9.2-r1.ebuild
new file mode 100644
index 000000000000..f23d657e2fee
--- /dev/null
+++ b/dev-ruby/facter/facter-3.9.2-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+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 ~arm ~hppa ppc ppc64 sparc x86"
+
+BDEPEND="
+	>=sys-devel/gcc-4.8:*
+	>=dev-libs/leatherman-1.0.0
+	dev-cpp/cpp-hocon"
+CDEPEND="
+	dev-libs/openssl:0=
+	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
+	default
+}
+
+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.9.2.ebuild b/dev-ruby/facter/facter-3.9.2.ebuild
deleted file mode 100644
index 67281c8efef9..000000000000
--- a/dev-ruby/facter/facter-3.9.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-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 ~arm ~hppa ppc ppc64 sparc 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
-	default
-}
-
-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-9999.ebuild b/dev-ruby/facter/facter-9999.ebuild
index 683775e7668d..89cbbf1b0b4b 100644
--- a/dev-ruby/facter/facter-9999.ebuild
+++ b/dev-ruby/facter/facter-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ BDEPEND="
 	dev-cpp/cpp-hocon"
 COMMON_DEPEND="
 	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:*
+	dev-libs/openssl:0=
 	sys-apps/util-linux
 	app-emulation/virt-what
 	net-misc/curl
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index bf775fcc444c..43562d6091db 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,9 +1,7 @@
-DIST fakefs-0.11.3.tar.gz 44888 BLAKE2B 498dbcbe12389f27b6c6776425910f91ccc45ff85db1fa59e4fef8635dc9923294dbc979df2d10846d1435e81ee6d622190d3195399a4778d00bd4446edd2571 SHA512 9c9e18337d3c461fe4b5a4e6ede17cd840959147e66a57eb61fa203d8ba95d5655885d3e5b776ecb3a1cee93488dc711d1b2bd28df23bc131195e311229c329d
 DIST fakefs-0.19.2.tar.gz 53405 BLAKE2B c9841f7f2aee5135d149187d03f7f3034d3c6cbce6d33d3710fcdbd936b4599561c857dfac81f13262da6f067a843d0c3159abca0e8be7f77c95ff20e8bd123a SHA512 e27eedff44c3ff556b0e7a22e434205e54847a6f6b03a8ab7604c2f2e9abf8be7d5b8d29bd51e24cc032dfb3aaf7940060c3dae5532b0921e363d2213b12ed90
 DIST fakefs-0.20.0.tar.gz 53591 BLAKE2B 067fef803bb0efb50f63f0c0fb645bb4d0d1c00d198cdf367e99871c6cb9e28cc1d4f0a52318a61c446577aa58170143c2aea4b0b826136610430abf996d03aa SHA512 9f9b2cef58709f7ab1147602b2f47d6a0302b217cc7210537605491f9db6477183e5fa447974c0572f1a1fbecce1029e451241d44b5f96eec97a7521275c165c
 DIST fakefs-0.20.1.tar.gz 53626 BLAKE2B 013f49b57355943eb6624540be93bc069c95409f9e1d49c8cced034656f596ee98fc3ee4dd40cb80383d447164f11242e16a5ffb9b35ba2e28fb136e0f72a09e SHA512 61d83868a0cf4d0abf071fadc9ca21176e3ef8f2ccc781760a8b0b3e55713750d3e952482e90a87e8665163a262e8bdef8e6b2f3c423fabe696d64f356862aa4
-EBUILD fakefs-0.11.3.ebuild 1098 BLAKE2B d31a81a83d641186b7780447a291fab0812191766b5a6600ded1e365d3ffe1807df11ab4bb557d60782532a67cf13b05c5b892fcc8fadbe536eaf3cb9c3a6047 SHA512 52832e5b6530397c423f3ebfa64c7fb9b60e52acc9e5d84aec735a784130ecc75a604ded3cba48979c4e511624e90bbff8d9e3dea9df9dbde84a0bbb8c40f53b
-EBUILD fakefs-0.19.2.ebuild 1103 BLAKE2B 2ee343b1cd7c756eb9aeb89cd4fa943e2293b186c232c39d7d01f7b2917b3b637625a1521081c0dfd92cf7245fdfab3a64a166279b0ecc398f5ec843d832edf0 SHA512 ac0506ed2570bb76334c3e8e76d28a8caf4b19c2f2a4c92891b3e7c11ea66d8f0b7362e05468939818ed016efc259fd0aa42d5f076766ef4d7a194f569b9da61
+EBUILD fakefs-0.19.2.ebuild 1102 BLAKE2B 5f893a8f3bd14ba8af92e187a3f6625dcb56d8df6224c70cc2c0a26804465049b687c3cf105591fe852a4e1cc19c54fcb647100308f0f7ead0e60f7d11c7566f SHA512 75c3ef7e129619bdf5cfa3296b97bafee262428130e04b093af001b5786398339fda6ad1617b0de4d6375b3165fe4dfe6be437096fe87f59b6970387e7ebebbb
 EBUILD fakefs-0.20.0.ebuild 1108 BLAKE2B 2aa855c4dd2eba585807571ac5a938286920ad9a99aac4033240acdd5598a2e905993e2999b26fcd7031b91af85755087539ce363855c82b5d03ef0bf86b9053 SHA512 eed7c2c586e324dcb07ede4b54ecc306c1328f2cedcf1bec73dbd6ead75d254ceba48670549e2f28ad9caacb6a3721f2da767e352bfe834abc8a59eed2491721
 EBUILD fakefs-0.20.1.ebuild 1108 BLAKE2B 2aa855c4dd2eba585807571ac5a938286920ad9a99aac4033240acdd5598a2e905993e2999b26fcd7031b91af85755087539ce363855c82b5d03ef0bf86b9053 SHA512 eed7c2c586e324dcb07ede4b54ecc306c1328f2cedcf1bec73dbd6ead75d254ceba48670549e2f28ad9caacb6a3721f2da767e352bfe834abc8a59eed2491721
 MISC metadata.xml 340 BLAKE2B a31a62212f53154af4d3dce332d30eab8433785cdcb07531f743a5d48f3e7d9dc55580651cdcc765d4dcea5d27e78902624d475f8ae052efc6d9c2eea8b57d0e SHA512 1369c8941ac7aad5dd54222a870a5d173194c4f241093864b25abc1ca97e9f55d8fe928157c11ed63d2281352bbdbf6779cbc00abaac206fd024385ed5eb8478
diff --git a/dev-ruby/fakefs/fakefs-0.11.3.ebuild b/dev-ruby/fakefs/fakefs-0.11.3.ebuild
deleted file mode 100644
index bf597b109fbb..000000000000
--- a/dev-ruby/fakefs/fakefs-0.11.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/minitest-5.5
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/fakefs/fakefs-0.19.2.ebuild b/dev-ruby/fakefs/fakefs-0.19.2.ebuild
index 11fde11d49ed..f3c2663d2458 100644
--- a/dev-ruby/fakefs/fakefs-0.19.2.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.19.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index a1b2172b31fc..2df3ca22d549 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,9 +1,11 @@
 DIST ffi-git-1.10.0.tgz 166192 BLAKE2B a663da1272a41464bcc3fd6a69055615beaa75aca09da60a4459034230ddb7768573e6a91e75b0e768f16333f23e55e045b6cff3be63c5138c85070903cea869 SHA512 f4a7faa02eda8e67b4c05ecc93ed1848daa9d55ec2eaf367947dbb4cf6b0edd76db1e8232db0a17828df40c3cdabb9f7edac11b44f9de00bdb69d0c9a84d4409
 DIST ffi-git-1.11.0.tgz 156535 BLAKE2B e4c5e6406ff6603a3c41146d6ec3f07fdc3ba2243349b6a77083c195e1b9b40648950c82bcdbb846189b3162c43b23b3cabcde92a4e6f2f9fc8c4ccf03ac473d SHA512 38c66841fb33f7fe7abf0186ef48e28525b9b50450dd886716662ee8cd630374abb41a2fa5fec9cebdcae0e8ffa76ba5b36d89bd441d09a54503032c3950dd08
+DIST ffi-git-1.11.1.tgz 156715 BLAKE2B 4ea2d0f54dc6ef327c57408e568c5f728f5c387e810e25b6becab8119ebd8a20d6c834a80c1ababf3fd4fc4a4d4253146fc161f93fbf02e153f73fc812bad309 SHA512 7f6c2ae66a2ffc40b154ada2d3e2c0f81e79803ba693ce2a83d16ac6a210ac5494bcc4b28948b3b68c9802a7cacce77e4a7cb1c3c1105039c08c50e5c8137fd4
 DIST ffi-git-1.9.18.tgz 901805 BLAKE2B b04715095858d461e4a0a904185dbd603e391611ef446de385deb533d8fcbff0ada3f1865599fb51e3446df629c16d491c476e179cfa356c7d8c84e1827b2729 SHA512 49c52e5e42e436b7969c35a34b28bd7929d75372638ac5373486a1d624026c12dc682009bc101e4a2c8f1442ed6f1ba17b438cda2e02d4256622b489c4bd9945
 DIST ffi-git-1.9.25.tgz 164209 BLAKE2B aab3addb5d9138f81d0688ad628082e7aef5f96a1b046dfa57a7195dcf7432533052bb397ac8335f7b17ffece9424fad7d986065a82ac91437e0d8d27d76ac77 SHA512 94a45f4152458d6aedf50645c8074626dcde4326093a606e509c3fbcaac79a1e6a9f7df624f14946db4f3767ef6fb3e311e60531c209676e66ebbf21b07a6786
 EBUILD ffi-1.10.0.ebuild 1552 BLAKE2B 585d5be6c8ee4c59ce19767a43bc7c0fedc0dc27c9c94076d49e84156b3b0cfb17d2277cd31be1dad0be399b30fe8c7ecafb72b166bee4e61a8e498561422f97 SHA512 167427710f3068457893e51a677c1b6041cd56ef70afbf45988aa762fa4f729360858b6ea3b26958eb364973d80109f57b84da6edb707703f66272060bebf877
 EBUILD ffi-1.11.0.ebuild 1555 BLAKE2B 5632a82f896fc08b8b2603bfd5f9cdb6b904b81f5df97993b71c29f7c777655246a3cae68527f96dd9a54202c234ac7956c43fe2aaf34503a47fef666a92b6ca SHA512 9c3c415132088edf87b581091fa9a6a1178ca377b065d204a05987c2112488b6097a33a943c47f7ed52f01256dfc8eb86532208365cfa67efddbdd075cd62035
+EBUILD ffi-1.11.1.ebuild 1555 BLAKE2B 5632a82f896fc08b8b2603bfd5f9cdb6b904b81f5df97993b71c29f7c777655246a3cae68527f96dd9a54202c234ac7956c43fe2aaf34503a47fef666a92b6ca SHA512 9c3c415132088edf87b581091fa9a6a1178ca377b065d204a05987c2112488b6097a33a943c47f7ed52f01256dfc8eb86532208365cfa67efddbdd075cd62035
 EBUILD ffi-1.9.18.ebuild 1539 BLAKE2B f8a42a2d72c94d76b9f9c4178c212b429cf799ee912a7905e806a3aa14e16b361efa873feb00ce1aed50b9e8e0357029fbc805db2596720dcf6c4cfeeda1f168 SHA512 9bb9f63adea8e800990926785cb52853e5f3bfe8cf658381dd87da9eba60051d9d344b53c420816a5e31c29b0d0de88d70542041211118da7a2637d50a8b6bb2
 EBUILD ffi-1.9.25.ebuild 1537 BLAKE2B 348f396f6a4cabd71fab1d2cf1c122432a93b4986134fdda8276bb54eba3f6c040d4c94434a6a9d3d6fe729bc9525d740f3f2f6d07ab3110158188fa84e91347 SHA512 9ba767f47269db8fab5656d2a3b4c481201ad73c87b7b760c93b74046fb4c82971dc812b980e3bc80cf6cd378bc260fffe8e53799eddf4405721b4ea798e51fc
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.11.1.ebuild b/dev-ruby/ffi/ffi-1.11.1.ebuild
new file mode 100644
index 000000000000..3f78f61b9bd1
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.11.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://wiki.github.com/ffi/ffi"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND+=" virtual/libffi"
+DEPEND+=" virtual/libffi"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ffi_c extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/ffi_c V=1
+	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/google-protobuf/Manifest b/dev-ruby/google-protobuf/Manifest
index e96a989e88de..5dbe07d0edd3 100644
--- a/dev-ruby/google-protobuf/Manifest
+++ b/dev-ruby/google-protobuf/Manifest
@@ -1,3 +1,5 @@
 DIST google-protobuf-3.6.1-ruby.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
+DIST google-protobuf-3.8.0-ruby.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
 EBUILD google-protobuf-3.6.1.ebuild 905 BLAKE2B b9af584f19a244535574ef187d5b5effd8cd823d96c4706c00cb7ef0c29ef81c258c62e89c5c23975a35ce26ad79abff2bd6ff34444479568525941a134ca830 SHA512 b18c47f7915fe1607568d9dbf0c159afecad4e84b7197cf1748e4ca6ef05e71ad85f001b29e172d8a4ccb4cd3be4103b7f4b2acdc458b02e94b74dff9a497a72
+EBUILD google-protobuf-3.8.0.ebuild 913 BLAKE2B 8e1ea1aad0db1207f3c82e7065f28ee19cfe5cdffff91fb75113bb5963830d67c71c8be1b45e85fed77036d579a203775eabc207ff5ea5dbd9fd28eb638048b4 SHA512 cb217fcb8495f773778fc2e53e56a48828d3390907420c37cb0a711b545a07533ba6145d34ad322a8eb2a2586c94d9f34b32f8bc8624c4b7dca9b5f0b46aad9b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.8.0.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.8.0.ebuild
new file mode 100644
index 000000000000..5eefeb1f2412
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-3.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Protocol Buffers are Google's data interchange format"
+HOMEPAGE="https://developers.google.com/protocol-buffers"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
+RUBY_S="protobuf-${PV}/ruby"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" test? ( >=dev-libs/protobuf-3.7.0 )"
+
+each_ruby_prepare() {
+	sed -i -e 's:../src/protoc:protoc: ; /^task :build/ s/:compile,//' Rakefile || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/google/protobuf_c extconf.rb
+}
+
+each_ruby_compile() {
+	emake -Cext/google/protobuf_c V=1
+	cp ext/google/protobuf_c/protobuf_c.so lib/google/ || die
+}
diff --git a/dev-ruby/gpgme/Manifest b/dev-ruby/gpgme/Manifest
index c601a7b88853..e2876c60c5cc 100644
--- a/dev-ruby/gpgme/Manifest
+++ b/dev-ruby/gpgme/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-gpgme-2.0.12.tar.gz 2414972 BLAKE2B 8890e01ffeda828468d4fd520a102a9bd9415a1503faa57b0b01f6f9f96b8f7d459ebf615f402e3b62583530bef71fc1c07ed859e9b2201657af4a487b70b794 SHA512 7c98defc69fbcee37af654d7f13110ca10663da15f40b2b558c32c1695caaa6b4ec2c65c9c6dcb1a60b9dc955d11226776d4ec7db978847b74638cda3274644e
 DIST ruby-gpgme-2.0.18.tar.gz 2799633 BLAKE2B c50336a8f5ae75fc56a29c043a19e84083f122534bf5639124c991dfb55c03b9ddcfe9a07431e0b826adce2c4fa715576387ea51361df68bb3f86019e049a018 SHA512 9be9112572ee2bf92c54c763f3588d0348c62af1d053b3a9d97d89ccfb5f17507be41d89aacbf75a746682dc176d04599d8fb9cfe6d5ac071fc8435eb31513af
 EBUILD gpgme-2.0.12-r1.ebuild 1432 BLAKE2B c7c7a499a550d6a6a4a9865f7a2c598834b2a5e49f4b51c4c10440d8f4b0bf75c82907847320dd2a9ebdb58bf718a2c80f710f9ad7ded52e60101d0095b1d70e SHA512 eb791978ee0bf94622528ca5e08226e427e4b8a949d9730704eb484c035175bd9947dfc10e716d5630d10287cfe2ee5936f16bda7296e184d1b40f2cd0178d12
-EBUILD gpgme-2.0.18.ebuild 1724 BLAKE2B 7ca9494d31d73b4a8982de71a1a03f02d6ddbe0c9a6a0a1870ad79678b03cc0d3003940d0fdb5c26a11bcfd3dc57737b78f7b729e5f3a0d3145b26e0d7adadeb SHA512 596d5af3db975d480093170ddb7c405e410059198de9a9b8a361f3fe4bad9d000508b3a1fe34cb8581860a0c3023e0c2798eb9dba2ca64fc1f33a3e1b47c917d
+EBUILD gpgme-2.0.18.ebuild 1759 BLAKE2B 6acb4f2612d0c323a3f17d6fbf6ba665c05738144de4ec77ed2ebe26276b98bc7b6050d93b87b390279d918a4bbb2b2b1c6acaaf6da6e120a70e6ffa1c65d32c SHA512 5ff67135e24316a43e61bd3f176de216b749bf404b682e686d7b6d989a40f507e3bbecb8c20f1f86864c264bd8dcab1619eac3e279fb792e0cfbe5a0c4d97dae
 MISC metadata.xml 467 BLAKE2B 43fb75477602eef095d6c69fcb8c54d00c41bbe84b8ab313dd0d7b0f5c2cb0164f61d9fe66da75c3b0e0c9dd2f01621bb65c9243242432e0ebe00d1980ac59b4 SHA512 ef3183e3a7feebe61f96efe8398b19502d57fc8595f6bbd7c0382c4c060003116648605f8ccdb193103f0433b321e98dda3f720da993a7840e7645f8911c0a79
diff --git a/dev-ruby/gpgme/gpgme-2.0.18.ebuild b/dev-ruby/gpgme/gpgme-2.0.18.ebuild
index a92157864819..eac41b41c93b 100644
--- a/dev-ruby/gpgme/gpgme-2.0.18.ebuild
+++ b/dev-ruby/gpgme/gpgme-2.0.18.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND+=">=app-crypt/gpgme-1.1.3"
+DEPEND+=">=app-crypt/gpgme-1.1.3 test? ( >=app-crypt/gpgme-1.13.0 )"
 RDEPEND+=">=app-crypt/gpgme-1.1.3"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha:0.14 )"
diff --git a/dev-ruby/haml-rails/Manifest b/dev-ruby/haml-rails/Manifest
index dfc15af469fb..91f98033642c 100644
--- a/dev-ruby/haml-rails/Manifest
+++ b/dev-ruby/haml-rails/Manifest
@@ -1,5 +1,7 @@
 DIST haml-rails-1.0.0.gem 13312 BLAKE2B 9bd863d693121f2bb42bc0dc292f647220a4ba0b152c2fe6b04fabc0a0b537e1d31c12b040841ea2ac51cbfa771bdf21a94c8e482978dd2294a709916ee3aa06 SHA512 92aca4aa20591e47830779ec9d7a04f67cbcfbdcea3cbf2cbe50862ee61d1e373db96dcdb9b187fce2a167132b8394dc738db09416492689fb138d60f537b593
 DIST haml-rails-2.0.0.gem 13824 BLAKE2B 4d885be047f972cea11d3c7d0a9e56d557763d5bf3e95e7cefab33a4422ad114f6351db3226cd1d7645082d70f03a9ecbf86d6ef089ac0ab8836b74736d7ecc8 SHA512 47c5adfeb7b24ccf83ada7c2b453696f3544bc2ed4e7de3ae8ab52a64f6b5f3a3cef36f3144600c47b2f647ec42fd40d32651c7cd1b90184b767f81ec33ac855
+DIST haml-rails-2.0.1.gem 13824 BLAKE2B 24fded0f576d92083a10737954e1a32eb8e5f6a8db11fabc55ac0de3b17377419606d44f5b2e202e0733d9f538166172a6b5f7e08ee7efd71ddf7d3e7f6c9107 SHA512 7ccf9d618ca7b7c1681a063c51cf9dae9ce5e245479e3e7ba87a170ee1ba3eb35ff59061195928792f19f7e33a12ae7de3d5a36d35958e2a1761a12dc51b26d0
 EBUILD haml-rails-1.0.0.ebuild 692 BLAKE2B 46b142c11a855fa6e05462a20061f408bd14341ddc002a66fdeb9133457d53234a43d5198705281939afa12a66c4e9749affa04d55698d6b84950c45580fd07c SHA512 b38a8be75b40b6690904b3e2c5c17b870e28f54325d017725dea945ed5679d2677e757ab0389acf950e0eee4249aa2e67eff646203eb5e824817ebc49d8623bf
 EBUILD haml-rails-2.0.0.ebuild 688 BLAKE2B fd58aebcbc7818b4d3d9789372fdcfd5502b6d6790c30cd83df11ec5fffb54f54566c6ec57fc460f7f6738d07ad9e75658b24bb0a562badf9da5894bd6e17d60 SHA512 8319af2f3775cb135f55eb409f2892f3ea542d54b7ee8d15a232acd32288b23ca0a4d3b8a803c2c9ba0877825c0a58414030e38be1f59e11780e7894e9bb3ac2
+EBUILD haml-rails-2.0.1.ebuild 681 BLAKE2B 829119916d34445f23d8bbe4e733fc5df8a332a06fe4135f7a9b83b6a7f072eff733961888d5f60030472ef6114d43207b1e6a312e0c5b258d519b05096147c9 SHA512 826133a2a3b2260afa46b7074b644c92b6dcca1f7ce89803066d85617c6fb87b7ad8841a78555e885cfdee548f635595da6d5f5e8b60ba1bab347199b98fcb81
 MISC metadata.xml 335 BLAKE2B a5cfc94870073cefe663542cff943ea70824dcddbcbc07d34ba6f1067caf922fbfba2a75cb7215c20271bdb7f3b7c16bdeb7ab3ca0d2adbc46a1756a2d079849 SHA512 25a5b3c96a272c61b756d168146ca0f3492d14b8672192afdcedcb3690de723ac0915a7120fb03db06fab6b701ebba205cbc57c49f681720fbbbe5a612d01e0b
diff --git a/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild b/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
new file mode 100644
index 000000000000..3cfe4a30206c
--- /dev/null
+++ b/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides Haml generators for Rails 4"
+HOMEPAGE="https://github.com/indirect/haml-rails"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/actionpack-5.1:*
+	>=dev-ruby/activesupport-5.1:*
+	>=dev-ruby/railties-5.1:*
+	>=dev-ruby/haml-4.0.6:* <dev-ruby/haml-6:*
+	>=dev-ruby/html2haml-1.0.1"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rails-5.1 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+}
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index d5696de694bc..a989ecdd0af1 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,9 +1,11 @@
 DIST haml-4.0.7.gem 121856 BLAKE2B e2598df73b9bf7337c06f60b30fcf7925fa5948f4643051aabbbdf600d25dbc2f614c4cf2054a916f69ef431847279eee1fbdf02e9bf2811369f2c195ed00413 SHA512 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568
 DIST haml-5.0.4.tar.gz 124580 BLAKE2B c22e464be26f65bd94b202b21604bb9fe3d740865832c9299d93606293794316a5262504e15583fdc2628a3015ea58f9924a9b3aab2f46340b305ad5af7968ac SHA512 125ae514f800b2dd58f7f339ef3bf8c15114c5738813d911985182d4e4b1e8551c92a89149427aa8bf3326f45c8f71f4f13f37ecb7e2bee5cb75163538f6a3a8
 DIST haml-5.1.0.tar.gz 125693 BLAKE2B 0a2e9044e7468a93b5fa62adc77131a67e79fe3701f86ba9dc341a5e33a52701bad09115137c7decfac92bd7e1aa92bbe6bd0a063ef5917c9c6cf4d072a9278a SHA512 97ed4eef3f1b0748c8d7c717dffc466db9da92c862bc90f9db05043facdbe58e605f83193a0d94b8bbcf2863ca0ab95de0a31ec266ee2907aacb94346fddd875
+DIST haml-5.1.1.tar.gz 125902 BLAKE2B b8564dca6a381038dae1b737b6f4a51089b96f618d684f43db6947bc738e06b073aa17241b406ed06fea48fda9c7ec759149829a5727f8da3df21da3cce22318 SHA512 fdc01762280cbece243d1ac1a3c8b6b484e3b01fcb2ff80df591d172ec6aed7240736095aa5a09149049ebb54cf24af32706772a6090c3171c84ccb069d12826
 EBUILD haml-4.0.7-r1.ebuild 1246 BLAKE2B a1879eb558ab35464526fafa41d70172a035c9c0a62642eb06f255160b33f311fd656a9b656b734c489006640845b1622c83e09f5d0af4bfc5e241264d033d54 SHA512 3c0a7b865749cb14df8f4a5e074b17a229287d76da4536211f2795c7fb61ad5a027cfa88309b80c9db7f2726896c7ffcd877b7b136fdcef3f2aa9d964f02c934
 EBUILD haml-4.0.7-r2.ebuild 1276 BLAKE2B 3445708f362dbd6d8d6f63a5552fd30fe933b0111554764f5116d050d090809954901bd2fb83aada132b3ff6d4862226b3a53ca6dd4138855ecaa033b217350b SHA512 6877bef9aa2741465aaedc9feb531aca9f12e986de40fbf200661980c262e6c27fa691980bc8b0c40aca1175da747f4fa0ef7d489a5572f6523b6bcce3a04650
 EBUILD haml-4.0.7-r3.ebuild 1124 BLAKE2B 9c900d645a5837b8ace67948e23020182f81b3531335bedd18a11005612a3aace012904db34c079b1f69e68728afd24c4be3e54d71827e6fa021c687775efd57 SHA512 c7bf5d9c5503454217a4da4a9dd0cc34d048a5ad21b0db7771f48313cb2cb5bb2b9618823f8adb6e95fbf3b56730ab064c67019cb8e86458a644c2ce4a8b8ee3
 EBUILD haml-5.0.4.ebuild 1613 BLAKE2B 917d8a40a68f551bf7e7c20aa317810c86e81788f8cbc15fe478b6af058c9c536d98c7744a32210bd88c1e249d1550269fafdb11c65fae0c129eb2519ce3dc65 SHA512 439c4eea3f128b9c2282b6c41e0af0426bf3853feebf126f09b752189db722e7a07d2b81b1a57bf8993960e5d833907164725b4f0462dc013aba746bef100764
 EBUILD haml-5.1.0.ebuild 1606 BLAKE2B 8f6e72bd9ce8cfe462a532968bed9c3e75c140700614be4c05173cffff13fbd034f0cd5acb37406a4d110b517c35bc62bb0b3c5dda605a5dd55da5f4b94056f3 SHA512 7d89ca2ff45bb0a9245e9f280a75573221dc7138dfe2b065cf60d5a54030cf14d6a8b91b6f43b679a730b492d4469276bd6838a700c8583a5b287e0f9b14ad85
+EBUILD haml-5.1.1.ebuild 1606 BLAKE2B 8f6e72bd9ce8cfe462a532968bed9c3e75c140700614be4c05173cffff13fbd034f0cd5acb37406a4d110b517c35bc62bb0b3c5dda605a5dd55da5f4b94056f3 SHA512 7d89ca2ff45bb0a9245e9f280a75573221dc7138dfe2b065cf60d5a54030cf14d6a8b91b6f43b679a730b492d4469276bd6838a700c8583a5b287e0f9b14ad85
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-5.1.1.ebuild b/dev-ruby/haml/haml-5.1.1.ebuild
new file mode 100644
index 000000000000..425a2568ea5d
--- /dev/null
+++ b/dev-ruby/haml/haml-5.1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
+RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby web page templating engine"
+HOMEPAGE="http://haml.info/"
+SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="doc test"
+
+RDEPEND="${RDEPEND} !!<dev-ruby/haml-4.0.7-r2"
+
+ruby_add_rdepend ">=dev-ruby/temple-0.8.0 dev-ruby/tilt:*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/nokogiri
+		dev-ruby/railties:5.2
+		dev-ruby/activemodel:5.2
+		dev-ruby/actionpack:5.2
+	)
+	doc? (
+		dev-ruby/yard
+		>=dev-ruby/maruku-0.7.2-r1
+	)"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/bundler/I s:^:#:' \
+		-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
+		-e '1igem "actionpack", "~>5.2"'\
+		-e '1igem "activesupport", "~>5.2"; gem "activemodel", "~>5.2"'\
+		-e '1igem "railties", "~>5.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/,/^  end/ s/^/#/"\
+		test/filters_test.rb || die
+}
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
index f26ccaa0e034..da6030ae09a3 100644
--- a/dev-ruby/hashdiff/Manifest
+++ b/dev-ruby/hashdiff/Manifest
@@ -1,7 +1,7 @@
-DIST hashdiff-0.3.7.gem 18944 BLAKE2B b7d39375a0c688e4fe2672701d87148b6ff6ee18fcc58b68f71a4c449613c124022538a04ae9a995d2d20e9d40e0ab263664f1085dc205286a3bd3595c83c760 SHA512 62cbbd1631127f98be214ab5c849d4a78c9f9aa762e372412a68f843df09caa9bb3b8ff096952ff4fe5b401dc8fefff7e42c2d1beb7e647ed9216550ecd06d93
 DIST hashdiff-0.3.8.gem 18944 BLAKE2B e248384076cf73db84095060578fcf3f458eaccfee8bdf4645c98c9fe51c67fe1fe1b9affeb485880433acb52d41f5c23f8a9d1bfb4397a820dfad01dd7f9092 SHA512 d58b9a07db1044e9b9b61cf1eb9515ff5a8426f0d59484c132c2c498591c9dd73cebda8a98b180d05228fe8e1e610d0dddb3a63ea38981f6609ecdf239339a83
 DIST hashdiff-0.3.9.gem 18944 BLAKE2B b24c557b0ca14758706b3de6a34034725af4f2c1d6f6a92d03353ab100ae2c82672d5854a17b382f2b5ef7a9bd296f03fd1877d4d36b7c626e3828e2d1cc6055 SHA512 0cfff7d94405391a5d810b6323b820ad73d4543a33bfe34dd6a4159bbf4190eaeb33e8a617bbe84662b14d54ec3d95e838cde5b38c29a029393b6b41f62ed45d
-EBUILD hashdiff-0.3.7.ebuild 655 BLAKE2B 78853182de5010cf0d0de76a5b447f3978d2239111a31cab13326b92cc3dd9b9e00fc2bab8d6c24d859512c3deddf70f5480d183595d7007247debd48bcee308 SHA512 fb59040ce490c67e868d9e5b7c09a4cce2d2c8797fa45e5c04818fc76581e693eb7c868277a127da61d03c6b6b2e0b7591f7f38554718986fe77a3d2ef5a1fc6
+DIST hashdiff-0.4.0.gem 19968 BLAKE2B 8e9a70ef34a2099a2f3b1748e952132af00bdcd70ce16a8c05ef1dc941489b8b8880933bf97bb084c84f3f75753335f5831f968165dacbbc8c3133fd539e4bfa SHA512 4556479daa42486d12d181c6e231a788c5ddab1b193d1452644ae501a795233e6bf23556bdd0a162a9e386ad2ebebca4398724533d52eff3b36134f8ffa5615f
 EBUILD hashdiff-0.3.8.ebuild 662 BLAKE2B ed2d660123e34a57c8ca56e1ec01502f3cf8ac2708256588be03e2b207dfc03855df3c3b9d367f81b5a7d61d34d959434ff8059ae397b3040a8e5d947097f980 SHA512 9dcc3808948f7a5320a2beac3aa69da16b9211633572b7e19d169d00d45df49d94a1c02d3465c34b339fe85a4b5468fdef83badceae13e9d748dc28270d44e10
 EBUILD hashdiff-0.3.9.ebuild 656 BLAKE2B 77260f5c02647334fb37abeeb078ef23e4c1ae6aed2fd96c852d148ca8b79348f6c1b6c60c8c76cd524256c89868e88a7855973703f599880cb9b31564d7dc68 SHA512 af7624b954bd5f149312dde53c256539eb4a2dbb468fd2240eb7b3a5a2dc9afb3b560bcc66c26abafacdb4c92ed93043977ba1fe3d0c36d3564d8a1899d12a14
+EBUILD hashdiff-0.4.0.ebuild 656 BLAKE2B 77260f5c02647334fb37abeeb078ef23e4c1ae6aed2fd96c852d148ca8b79348f6c1b6c60c8c76cd524256c89868e88a7855973703f599880cb9b31564d7dc68 SHA512 af7624b954bd5f149312dde53c256539eb4a2dbb468fd2240eb7b3a5a2dc9afb3b560bcc66c26abafacdb4c92ed93043977ba1fe3d0c36d3564d8a1899d12a14
 MISC metadata.xml 345 BLAKE2B 32c55c352e09a4cee12f02ca321e7581b56faf759bd3cf95afc684633c7324bd10c19fb832a1d7cb3e96787721eae0f0bd85428fccead003ba72fca53882ba65 SHA512 f241e4bd08fb29d4a2538d5b548597c5869c0bdf332e3453e55c625093bde7c52b35e7a7bcd691b9f5b2bf2cd1c90ef244d23e343cf7800f9fda4de73f6a4cbd
diff --git a/dev-ruby/hashdiff/hashdiff-0.3.7.ebuild b/dev-ruby/hashdiff/hashdiff-0.3.7.ebuild
deleted file mode 100644
index 793b1828597d..000000000000
--- a/dev-ruby/hashdiff/hashdiff-0.3.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple Hash extension to make working with nested hashes easier"
-HOMEPAGE="https://github.com/liufengyun/hashdiff"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/hashdiff/hashdiff-0.4.0.ebuild b/dev-ruby/hashdiff/hashdiff-0.4.0.ebuild
new file mode 100644
index 000000000000..7782fdb1b28c
--- /dev/null
+++ b/dev-ruby/hashdiff/hashdiff-0.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="changelog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier"
+HOMEPAGE="https://github.com/liufengyun/hashdiff"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/hiera-eyaml-gpg/Manifest b/dev-ruby/hiera-eyaml-gpg/Manifest
index 8ed18ba476f4..a6d4e02a7819 100644
--- a/dev-ruby/hiera-eyaml-gpg/Manifest
+++ b/dev-ruby/hiera-eyaml-gpg/Manifest
@@ -1,7 +1,5 @@
-DIST hiera-eyaml-gpg-0.6.gem 9216 BLAKE2B 2578195d92d4edbfef9184ea8d9a72f2bea3c67a51ab95579292859c81f41a199ddb92a0168f209548354b3365c66593d48df1b9dacb9774df42c3439305f8da SHA512 bc66c5adbbb4e861ceab689f0695bc6d36b8fe5ecc9e42d03f2640c4264b65d93a19e829edae8aed531f101ac2f41dcccd676741323011a83f0e11944c5204cb
 DIST hiera-eyaml-gpg-0.7.2.gem 14336 BLAKE2B e8a2e5666a930a0955302b0d3cb505c00c936e01db095f56c746de2945830a3adff70b86bb68a74637f87d80ade8aade697b22ec3b263310edc3673f8a8c22e2 SHA512 4d27db9d1ab9d5e7368e92ea003aef776a6da5e078b0b7dc22a494680521b69168e2220d7311fc27c6896828ce4fc5182b6b66dd92a9a9ae42b0086e31e2634c
 DIST hiera-eyaml-gpg-0.7.3.gem 14336 BLAKE2B 2a08dc3251f6e28be3a027778dd7a30f7d186ec06965cb5ceb93c4f9ff361b49a4d220323e3a8576cedf6d8b487bed6c14e2203314370faf26417207ef011e58 SHA512 4cd1005b1775af2a433b9d91c7cb16bb854bee3a818f566134549663bd620f1a4e2a14dca6be5b319c5a95c26b464d8f438d51b876f21e6190b4210283f838af
-EBUILD hiera-eyaml-gpg-0.6-r1.ebuild 489 BLAKE2B 454d9e330e41b015c4d62c9ffdc4f643898089a5c69aec01e012fa847821950847b941585e951fd5f8e4ad04014cc609ec7b54a9a4bf0c1058141beae022af05 SHA512 eb3ee5b96f7a5a912357ac640b14a7e67a97e31e10cba9d46cf236dc075efd66533b4b984021252bacc25cc27a3d003f009bee9dbe0db1e2f67aa2f1ed6c1b49
 EBUILD hiera-eyaml-gpg-0.7.2.ebuild 476 BLAKE2B 2d2f02b28435121378169c33fe1f7b8f40ea32dcaf020a87b17f333e4e2efaede01053c2e94fd2d7023ff199d10d1f31e91664de135d37df6dec7f2eb41bd425 SHA512 8e103c9b1af6fd13ae69b3d836f6e89bf5838f5f0e62cd312eb28e665ace14f4cc0bffcff91eeb582fcc6c91c89715d8ae8651b0d627653155373b43a5549caa
 EBUILD hiera-eyaml-gpg-0.7.3.ebuild 476 BLAKE2B 2d2f02b28435121378169c33fe1f7b8f40ea32dcaf020a87b17f333e4e2efaede01053c2e94fd2d7023ff199d10d1f31e91664de135d37df6dec7f2eb41bd425 SHA512 8e103c9b1af6fd13ae69b3d836f6e89bf5838f5f0e62cd312eb28e665ace14f4cc0bffcff91eeb582fcc6c91c89715d8ae8651b0d627653155373b43a5549caa
 MISC metadata.xml 473 BLAKE2B 076b7ca0bd642db56643c593070270ec77bccfed2f6ca545571e291c5faa7ddbf437c7216c3d115e8c646e41ff2914db4e7e9c6af0fae792cac38136caf04fc9 SHA512 5c9d09cc98b71839551598112cedf87d6adbd9311f126400527c61a8827c708d69a62bf84d4e269373729426740aca87060f7ef3467a0d3b5fef60920e811a21
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6-r1.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6-r1.ebuild
deleted file mode 100644
index 5636496434fc..000000000000
--- a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25"
-
-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/hoe/Manifest b/dev-ruby/hoe/Manifest
index c2ddec2242a8..7d57b592efc5 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,7 +1,9 @@
 DIST hoe-3.16.0.gem 188416 BLAKE2B 48383c46512a359a269ca3475ec701b1443e0ef71b31d1ca1604de391ed4df6b0ad27dd1c5f6ed04751047d211f2c6299245361cf131e2418f224324ac9934c3 SHA512 66cefb5a24906e19bbf0c82c8539d6d101b84d0dc1d3ce1910e4117357639489968271e76e86bd3c432b9ef7e3b24a78294c06210cbef280860f7dac18100606
 DIST hoe-3.17.1.gem 188416 BLAKE2B 0fef6dd9ae4bda93f527d7451d0d591cdc4ba1361aaec531f82e0d7ff03575845c3d5ff85189d76f9ecec17797774fd0ca82f7332a4588d086a494095af99a9d SHA512 5e4b83309ed88da098a5ae8698f9686cea1657f4554fff72446bac46bc567125232a3c5a5b941bd6d5ea18dc53f3cbf5b329f2f0623ef74e81d81586edc63ca3
 DIST hoe-3.17.2.gem 188416 BLAKE2B a6f4f93cc2d724b1c1e855c4e6976b5dbb469c4e10fc9c181b6cafaeb7088f9c19bd4bb5b858a25f011dead1b6e8392d349fe9e86d704a6a4d627cddab8de46a SHA512 d6703cd8913ac7055c33dbfead5610bd197be90ac3aeeaf2e4498ab088447d7e08dbe1ad3fdc602afd26fc7cfda12d73dd43a605b9bf59ecd83b1cfd8845f55b
+DIST hoe-3.18.0.gem 190976 BLAKE2B 227dab02241ffa1992fd80d357fcc8ec12a703413a25f38e7c22d97a187b968d334db7fe6b5d49ebe6027b05df660530dab9dd470bbd5816e7e766d86c4de94d SHA512 87b24dd77200a6013eca50b57c001c437035ab5e74809a941a28616d9a722b130a624f1137d7c55eacccc497c5c57f2ccfe872d160915b1a00a71cdf2e76695b
 EBUILD hoe-3.16.0.ebuild 1519 BLAKE2B 764738ca5d9c9e9b5594d5ba663b9b4c8bf904dc586662b44e36d8a697e8abda3bc5b0ffd7aaf05ac0eb1abbac3bb85458d79b196217da6f9df81d5a6744831a SHA512 7d846277053b5fc31f3967388833cb16e7d95481857e2154798dcef672f8d335d729a89203bac1c45e8b0c6531c782d3bf0669854441ca929eaa3d743c273b90
 EBUILD hoe-3.17.1.ebuild 1526 BLAKE2B f146316ab2273ecbd963acf2a53d69be268d0e8d37b0fd0c3fe120028a656e26c1e375940aa2956074b77fc91cd43ddccec4f8c0f21fd6269f8bd4c1e0e9bb61 SHA512 55d39bdd286085c669ab0d2063b28a30213560ca2119011546705372ababc305357f1bcb984acad186a8811f73d6aca81d98413eb98a7d3310c22e86b98a42f8
 EBUILD hoe-3.17.2.ebuild 1533 BLAKE2B e9501728a35520ffc525df76dd5a8b396e5741c4314975418b1585ec8ffe06b5abb75fa5c58990be581d1360cdff85db6cbab31dc4e22080c351d4ab349cdfd3 SHA512 9c676473a653a5dc9a40756c039bf539e33f678304433918d2f0d1ec1d1c16abe289508bcae850489130852e2ab1459d4c2bf12378fbb5b6b7bb7db69e52d651
+EBUILD hoe-3.18.0.ebuild 1526 BLAKE2B 3b901c928ebb7743e0bf2d115c56c8c6492421b28c71ca027e3a8e4fc87075fb0e34d5166e074a422aedbd36b4c9e1a7548b26d959a687405ae86583f93b2195 SHA512 42127d23d5dcdb630ad00674da5ed47d19bfb7593daa44197c401c2b58ce7f222a17291d56824da0f5a2ac46212e7687a4688ed80f81f9580c19514ec6943fa9
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/hoe/hoe-3.18.0.ebuild b/dev-ruby/hoe/hoe-3.18.0.ebuild
new file mode 100644
index 000000000000..2e01454d1f5e
--- /dev/null
+++ b/dev-ruby/hoe/hoe-3.18.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+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="https://www.zenspider.com/projects/hoe.html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
+
+ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-13.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 "rdoc"}/-S rdoc/' lib/hoe/rcov.rb lib/hoe/publish.rb test/test_hoe_publish.rb || die
+
+	# Avoid test with random sort order
+	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "seattlerb's hoe-3.5.1 Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
+	fi
+}
diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest
index ef71eeba49eb..3912dad313bc 100644
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@@ -1,5 +1,9 @@
 DIST jwt-1.5.6.tar.gz 28586 BLAKE2B d1fa2e735cf93126866c7a5eca14d63ee2646a66b9759fa59ec3191544efb2e0f502c7474e41a1b0d494ed8d692462db64efd718b8c6fa8acb4fcd9b58ab1c32 SHA512 f112bb815ef1af1f77d082574f5157f33469c2caba88716aa16b20dc48d279f8579730f75db81aa31480d6edd5deaa110adbaf3f52372b0397d5822a964a759e
 DIST jwt-2.1.0.tar.gz 34188 BLAKE2B 0022dbb76cd8570aee84b6590f24639320977ae8d6d5fa53ef1d260da12bc732f9fdc01d59f6c994dc36642a7b67786b607ae76aca8044b7d5f5c60dc300966a SHA512 ad65b6ddd5fb7f33efe0036103f8f7482fd35090b8545219141e8885298fb4809d2386fd6e986c9bca0f85c823c9d4a6500785c0c5964db22d023a99c603ec47
+DIST jwt-2.2.0.tar.gz 41060 BLAKE2B 80958a9a88ad0f281f0eb545e584bc1035d1f13ddd0e2c337896300981fcb09849dfdd97828a5820fd241a3387b545c67e600d9148314860380398819f321aff SHA512 66da3ea525041080ed6c1da50e61a7e5ec9c8de70d5dc592c781b89aab7feebcfc419ae4362504b793cdc8857b37797efaf2847eab9425a53628680f5acdc0ce
+DIST jwt-2.2.1.tar.gz 41269 BLAKE2B 51a47d07c9386c42dd22832d4b1c5a7c8c1b599dad15801d8192f023ee73336de4ee1c7c61c76ab9e181b26e168c661090cffca2d8db27a7a2f6a8be40dfb6e1 SHA512 cdcbbbb7af4bccc471a8a8ee3341c8b23d634b3f46522585fa51d228963c58305d16b45f3455c811a86bff13d3e4c3911e54d8a2932228d0feb5133ae43949c6
 EBUILD jwt-1.5.6.ebuild 678 BLAKE2B f799859c28ebb2daab33604f350df13bca00e98cf911b2e996000bd10d4b313374536d1e4340cd7e2b28f025d18e7b209559b353066793f5e6f762f8542488ac SHA512 715f7b2cc586536480a9f84889eb999844c448adff10fc55df610f8d1ecc1aade26435f3c0fa66eecbaebf3069f351dc6c2a0f900e2382d44533ba4c33d7a7e9
 EBUILD jwt-2.1.0.ebuild 701 BLAKE2B c8b1f519529db9c0fb535196ee063424a062356774ec475226ed0175d00c47f2e8345ebce00c52a9870cc0398fcb03798e05b4efa77709490496263057b816b2 SHA512 c73c0717981c5e52d0904f96499a322fd1cdf8c656bcb66719d200012c8904043d0b927118b3a23b4ebc70351ebb6ca8623abda042830a4a6916a2b0d09f4be0
+EBUILD jwt-2.2.0.ebuild 719 BLAKE2B 903dd40cd20dd28355a1bec57146b70460bc8dd48a6ff8f18f4c25ec15fc90373b10cd5bacfa5904b6b947a9e966e0adf9703f9fd97277b55adf904c9f6c64d6 SHA512 9ebc0f372b4464ff435ec080fb7395f63dbb49c9a3704888451a3ac88a4c8d5e11220e944c7f391a4d714b27dcbe5f71bc200ec13c054def1a6a74b63a93c8e9
+EBUILD jwt-2.2.1.ebuild 719 BLAKE2B 903dd40cd20dd28355a1bec57146b70460bc8dd48a6ff8f18f4c25ec15fc90373b10cd5bacfa5904b6b947a9e966e0adf9703f9fd97277b55adf904c9f6c64d6 SHA512 9ebc0f372b4464ff435ec080fb7395f63dbb49c9a3704888451a3ac88a4c8d5e11220e944c7f391a4d714b27dcbe5f71bc200ec13c054def1a6a74b63a93c8e9
 MISC metadata.xml 338 BLAKE2B 685874339b4dce29aaee7a4ff92e7df63ebced85bf94bd9011e0f4b6e1ba3fafc0fa0e701bf25fa8c1dec357ebf27f373742d45b12320ff28a496405982860f2 SHA512 700a3cfc122774c85bb6047a68539139d53dd6abe814b20bad12fb65233280e9aeba45bce0551920b0de550adb2744f4ee7e2eb0ba39e98efeea7a23c63e4428
diff --git a/dev-ruby/jwt/jwt-2.2.0.ebuild b/dev-ruby/jwt/jwt-2.2.0.ebuild
new file mode 100644
index 000000000000..297c32535e27
--- /dev/null
+++ b/dev-ruby/jwt/jwt-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="ruby-jwt-${PV}"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/ s:^:#:" \
+		-e '/^SimpleCov.configure/,/^end/ s:^:#:' \
+		-e '/codeclimate/I s:^:#:' \
+		-e '/codacy/I s:^:#:' \
+		spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/jwt/jwt-2.2.1.ebuild b/dev-ruby/jwt/jwt-2.2.1.ebuild
new file mode 100644
index 000000000000..297c32535e27
--- /dev/null
+++ b/dev-ruby/jwt/jwt-2.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="ruby-jwt-${PV}"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/ s:^:#:" \
+		-e '/^SimpleCov.configure/,/^end/ s:^:#:' \
+		-e '/codeclimate/I s:^:#:' \
+		-e '/codacy/I s:^:#:' \
+		spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/metasm/Manifest b/dev-ruby/metasm/Manifest
index 4a7718e13df7..3d1c0a84d6b8 100644
--- a/dev-ruby/metasm/Manifest
+++ b/dev-ruby/metasm/Manifest
@@ -1,3 +1,5 @@
 DIST metasm-1.0.2.gem 746496 BLAKE2B e7248ba61702fa74d2f53b6f8f112d1cbc113742891478c932151771a6ec66bc560d1b6d2a886c018e48d64e515c5a09e4c9d98deea7608dc2579741117bb04b SHA512 b5f90e46be0d3b86c2b525823aa1fc1ea711a8abe9edaf2908af73d869e1f6dc5163f45ea20bd1034b0f10b17c25e7b7cd9af6a77ebfbf24d925a68a84d264e3
+DIST metasm-1.0.4.gem 802816 BLAKE2B 8950f4c3c0d56bc414795c5a348fb07767223163c1cece4a7b5f5374b1c9c901a576b6adbb10d28b6b4541649e176863ad68da3a7e2155025c7f1bc9eaadff90 SHA512 35fe98bfd9d8b2f0d6a69cce409319288d9a54458f22a308682c3ea432e2c34d50d33a3849c08f773e87ee0a67aa5cc6bb337ec99045f23b6aca43c9f5ce70cc
 EBUILD metasm-1.0.2-r4.ebuild 1269 BLAKE2B f7ec84e28e9fc88caabfe8bdf7a65091d66b5de52169e2a06c7754799a419f3d881ec0acf07f9655a45c0046d0613bd0d2893143781eff98d957a09531a146f3 SHA512 9fa688b44b6c3729e53e1daf1b9021ef86e95ddf1acdd17cda923c7b5e91c42ac352da380da62dece3b689d3ae41c45c82c2f119e426f71b71edf37bbc1f757a
+EBUILD metasm-1.0.4.ebuild 740 BLAKE2B f55aa204fbe7a3eecf31a3f87fa7472714070e50ae5b1272f84b85e1f9be795b0684be5c4ab14edd8266880ce8b9d0ac07707619764af8c3f245606dcb0cc641 SHA512 5577c8f9f28dea1579130153175dfa3ccab5bdeb3855023075d541cff3aeff05e95877d8d9562623a29c54e2458b760c64b43d29ea8fe92c62c5d3befbb49203
 MISC metadata.xml 253 BLAKE2B 48f33288fc58b41b96f50af29bb4ce8989e714fa989ed445afc8933d1483e1026a019783805ad1b42399227819f461ed5c874df1c78c4bf144bccd07306ee995 SHA512 fad4a58e4c2a6eaa8bbbdc75e3995b5da53c9291f82480e35a9badfc1374bcc484663f2577790a46218be90d3b42bb45620297316c5493bc4a46af0dbd29189e
diff --git a/dev-ruby/metasm/metasm-1.0.4.ebuild b/dev-ruby/metasm/metasm-1.0.4.ebuild
new file mode 100644
index 000000000000..c8698af680ca
--- /dev/null
+++ b/dev-ruby/metasm/metasm-1.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="BUGS README TODO"
+RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
+
+inherit ruby-fakegem
+
+DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger"
+HOMEPAGE="https://metasm.cr0.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE=""
+
+KEYWORDS="~amd64 ~arm ~x86"
+
+all_ruby_prepare() {
+	mkdir bin
+	ln -s ../samples/disassemble.rb ./bin/disassemble
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper disassemble
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/minitest-around/Manifest b/dev-ruby/minitest-around/Manifest
new file mode 100644
index 000000000000..dd29a5528116
--- /dev/null
+++ b/dev-ruby/minitest-around/Manifest
@@ -0,0 +1,3 @@
+DIST minitest-around-0.5.0.gem 11776 BLAKE2B 1b1bacc229252e41412380d95e50ad05f918c13d37e7939f96fa19e4254c7f5222482d0f080355e5a900ff8ef89f768cc527c9b1c2644817e4d46842cbf83140 SHA512 8e57d436d39a41c5a08df6006a5cd46f92550844f01f9b6662918b9ba9536b74f6c83fcaea64180c7e025a1a14d4e037e1b17b84ae395a2b745e58f21ba5c752
+EBUILD minitest-around-0.5.0.ebuild 746 BLAKE2B 4225c1129b08b5f913b420e4a5719ad7999d03e590254dca6e0bebb3162cf025222d7bbd4200ce75eddc1bc0c2deb4879fbfe2959763f5a8509f85bca2e779ba SHA512 9686845dbef9db05d724939196c9eac6d288a23bd872348bb632d5b50779f5e051d0a84b3246e98fdb0793e2a0b0951ecea323dd42a498883317dd905c5bfa7f
+MISC metadata.xml 351 BLAKE2B ae5b0a952544183ccb7ea67c0481ea052d6188effaa70cf6e27b542a0beb738f8bf7c6c8fe77a14a398ff7c417a83247aa4415100dd1f6029d69b8e777f7a774 SHA512 31b2d93963f828730d17dcd8eb9bad905b6b06a4ea9442375a4de3af1906b925530cbe21608c12b7608c790cbd1743cf16ec8147151c8073d72798d903a6a05c
diff --git a/dev-ruby/minitest-around/metadata.xml b/dev-ruby/minitest-around/metadata.xml
new file mode 100644
index 000000000000..4cbe1280bf75
--- /dev/null
+++ b/dev-ruby/minitest-around/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>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">splattael/minitest-around</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild b/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild
new file mode 100644
index 000000000000..286620470fb8
--- /dev/null
+++ b/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Alternative for setup/teardown dance"
+HOMEPAGE="https://github.com/splattael/minitest-around"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/minitest:5"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-util/cucumber )"
+
+all_ruby_prepare() {
+	sed -i -e '/bump/ s:^:#:' \
+		-e '/ls-files/d' \
+		-e '/cucumber/ s/,.*$//' minitest-around.gemspec Rakefile || die
+}
+
+each_ruby_test() {
+	for f in test/*_{test,spec}.rb ; do
+		${RUBY} -S rake test:isolated TEST="${f}" || die
+	done
+}
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 298096890f0c..0de9d39aa874 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -5,5 +5,5 @@ DIST mocha-1.8.0.gem 223744 BLAKE2B 625f38d6ec53cbf549cbace873172b8511f2e6a2ccb5
 EBUILD mocha-0.14.0.ebuild 888 BLAKE2B b03c2e01b8225cfdb5553c7c5d475e92d4e5fad16fd4bad97ac92529d1b779d0c20a989256b8239f4573588636b0891dc08381fb3a79256546da6b8fcbc0c6f6 SHA512 51740cbe68158b599d1aa8a234ea2849a0dee3342ee57005f40eb7f20bc4b584e6234812693bb5be369a81566f41e48b2036e409ba9555f1b7c1d9e5a5c076a3
 EBUILD mocha-1.4.0.ebuild 857 BLAKE2B 61cf42131ae9ddf3c315a0601c064a8e53ecb5552843eb8ac0f62d0b4e9de401f4e76100178964e4dd05c848587c49c4382f47e60a44337d5c129fc1a61099c1 SHA512 8b71a6494d3bc312dd6357138916655e2b6c15861032d83e643fcdbe895295f65086b2152b189f7c85f2484ed9f94a145b2a9fc4213e107c94cb142f5cf9b37c
 EBUILD mocha-1.7.0.ebuild 881 BLAKE2B 6c4a23c2fde8e6ba217d09aeff94837bec6a2b8d2199d7e08e4f98f7ecc87167d2115b3aa42cd1092739e873cd054fc7bbcfef3516d0e26be4fd972e98a6b620 SHA512 eab51b5cb550081d3f2c9077a3a6f3e02372a0d8303c90642a443763a776a748dd17e6508d03b089e98a9e2a113ad5026b5d60d26d826883ae42900948a898bb
-EBUILD mocha-1.8.0.ebuild 869 BLAKE2B b3525ba3448fbf871f173bbbe67f4e1518f4de1ddb4d49e276c0b57c0a86471190ca4b96421f33a2754683a4e4e9174087a02c752b3e4e9248624017ff132d7c SHA512 48b567ec4fc26f54595519d3284dd4b63ac5bd6a3ebd2bfa9e2b1d37a0c32ce44af0c947ed3740ffbb8cf1acab757cdb966966ed05975b7e912ddab6e31755b0
+EBUILD mocha-1.8.0.ebuild 868 BLAKE2B d80c7ffdf0c96bb8886f60fdca73b47babe4d19b1e38b9da806b18c886fb3ed005009e074f2dda5ab0c12aa59ee737c513deff503b6ee80d6235838eb25c1273 SHA512 2817f42bb5a6ec90476effce5c93670c852b6df64d5d1894e3c6e89898ed927a51f185cec6af608c74c1d4d9b11b15bb616152460c7491bc4d73095d72c96ab5
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-1.8.0.ebuild b/dev-ruby/mocha/mocha-1.8.0.ebuild
index 9231dc401baf..f935f5c457d1 100644
--- a/dev-ruby/mocha/mocha-1.8.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.8.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://mocha.jamesmead.org/"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 21b19690efd7..784f960016f5 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,5 +1,7 @@
 DIST ox-2.10.0.tar.gz 199144 BLAKE2B e2d175c379e4c860d540313642ab4ea39cca1eed7d5a0a896f6eb09786d0c421f5a2a0e4af5880c07b757a1604a8ede47ef4737739eaf53f9ba733b67b3e0091 SHA512 0fc7809f86528c745cc6719fd92bb51fe7c895c62b2cd27c02f2b596c19078f04aacfee90e489bede0ecd47876e36280e6852509f6d34f9b4a6292441745763a
+DIST ox-2.10.1.tar.gz 200165 BLAKE2B 46daff5d1f0b4230fddfe72217b25a77de03f3a9431a6daa93e7bc88c46482b80717f1f2bc623fbf94f3bee90e2c3655aa1b6f6d48cb9b31cc5e530c14aef25a SHA512 b1f6ec2337e5d7db96cb2b3bacb4850b9b2b64426250203de7613845fa83ce68dddba0bb6a6560c8e04f0a6416a0dc9443a469d40261e6d6bc42b14239a1eaff
 DIST ox-2.9.4.tar.gz 198547 BLAKE2B 4a088fb9d8ff0aa89c6496f8d1228ca33445e34fd66476de288c4373401421b27fceced671d4754b23ddc4da0b49b1ddba1ce060c5468723a146e4d5d10b7a0f SHA512 babb1e4a88596553ddba79afeaa2bad0221e90e08cc0505c8297b61b6a1acb7c9e458ee71da420ee49378c4ac8d3b8545d1ab7e05710da556c452f3f7bb133f1
 EBUILD ox-2.10.0.ebuild 856 BLAKE2B 11753f60afcad4f816476945dd3d3438270e9af6f2ce55f356a08c9d6619eec450827491f7cd04d944e45855e75bbb610e9e20f44d0214bda4fd9276a932b0ce SHA512 142f28d29ab128f8c51a3641d567d3dfc8c448f42e62d3ef3576c0440abe3694b88896385f56f5cbf4895178b1f391776c883d8f21a9106560609fb6116a649b
+EBUILD ox-2.10.1.ebuild 703 BLAKE2B 3f5023edc767873c0e4fd05e94fd96d7814460a3d1c7a76dc66bf937b4e10bab6d973627dc54877714dbcaf1f8c88b66ed50a8826f52a3da0740211ecb660101 SHA512 0d052fcf7d238ad037322d004c8478742f2c703e05fe852882228fc1ac5da1581608bdcc78e3e83c12c14b78c18aefbc886e9d380c1166b9771cdb7bc4e70607
 EBUILD ox-2.9.4.ebuild 705 BLAKE2B 8733bfbbc871b1a0c48535a843e1c3e2238b83856d2b4d6217c815721add2131242af2fb77b6a84b53c403321c1a0833c39da6550d77a0e711680836ad6db4c9 SHA512 5b8cc05d083eb5e4b9f9b3d133357185c266f96663d8362e7d8c02174eb5cb11f8af671fedc8d10ce7b46777c115201ec0ecb3d3e500184ff31db411e92fdc97
 MISC metadata.xml 336 BLAKE2B 7371e572c7bce86e0d3c2ac19ff7555b4bdf793d96377dcdbb810f8fc09feb597f4cc883a03e888c0c38c1a1d9ceb7ef150ac228db7300aea01238f497f0473d SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e
diff --git a/dev-ruby/ox/ox-2.10.1.ebuild b/dev-ruby/ox/ox-2.10.1.ebuild
new file mode 100644
index 000000000000..801336f6f2e8
--- /dev/null
+++ b/dev-ruby/ox/ox-2.10.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_configure() {
+	${RUBY} -Cext/ox extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ox
+	cp ext/ox/ox$(get_modname) lib/ox/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/packetfu/Manifest b/dev-ruby/packetfu/Manifest
index 0b92c7af9798..0ffe37d9ab6b 100644
--- a/dev-ruby/packetfu/Manifest
+++ b/dev-ruby/packetfu/Manifest
@@ -1,3 +1,3 @@
 DIST packetfu-1.1.13.gem 769024 BLAKE2B 6fa53680dec76c14c6cd73cac4e57acf2da5aaa2a9a6371d0b9fbea1e764d9e2eda09fcf0ad245eb62340fa0d3047e525ba290d4c45ff4739e28fd5782659cd6 SHA512 c3ee67bfd597dcd197f213361ab94c614136304d8746de45b99322c1b6878eaef7c4a2ebc19be658d891df3e7d261476def27ae14990157dc6cb466815bd6f15
-EBUILD packetfu-1.1.13.ebuild 1457 BLAKE2B 38e6695ae320acb9ffc712f082c93f8cb861c8177a9452579ae8ba65193131e61acdfb0199f5bd71e400783965fa02c288a8937c89be205f06b1caa15d595f54 SHA512 c7a7921cd500e10d4637170f0d352e9ea885edb38696eba41d5c444cb898741df75f3aafe4e161f0f42f5459a3e50fc478219f429519734db820d944f2fe6290
+EBUILD packetfu-1.1.13.ebuild 1461 BLAKE2B b99027f7f1ef548fc959e2b2b6732f7156f1e5a25a157f113cb00cfe62483fac2c7d53dde4ee8e58e6d831f3a7d2d011ae0cff017102f426b6fcd2765f87292e SHA512 fa095e7785c3f2d8da311a97fec007414dd60ad236c26b9dc1408e10b0ceac1c7b8fd53a15f3d4001d1a99e611c2873b74a9200fd305df1c1884f3e7bd66fde2
 MISC metadata.xml 434 BLAKE2B fe58a2b87ac8c12d9086d60060e2677e9128a03b0225035b8f8257d0630305d67b6df990dc4955123fc860b0ac2bbaf7ee159aa37269790ed213c8b29924b3cc SHA512 3f354e2902da8e6a4a8637260f1d3f600d15a3a942fef3456274d8fb8704f0608193f390f46f479387faf8b33b46b4b567f84411f1aa157cf2e09d5d00f1e8e4
diff --git a/dev-ruby/packetfu/packetfu-1.1.13.ebuild b/dev-ruby/packetfu/packetfu-1.1.13.ebuild
index ca383b97edd9..c065d55b827f 100644
--- a/dev-ruby/packetfu/packetfu-1.1.13.ebuild
+++ b/dev-ruby/packetfu/packetfu-1.1.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 
 ruby_add_rdepend "
 	dev-ruby/network_interface:0
-	dev-ruby/pcaprub:0.12
+	dev-ruby/pcaprub:*
 "
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-its-1.2.0:1 )
diff --git a/dev-ruby/path_expander/Manifest b/dev-ruby/path_expander/Manifest
index ec375934866d..463aca1ccf46 100644
--- a/dev-ruby/path_expander/Manifest
+++ b/dev-ruby/path_expander/Manifest
@@ -1,5 +1,5 @@
-DIST path_expander-1.0.2.gem 12800 BLAKE2B 99bc161e39803b01f2bac48eaca063a00473db1cf2f033837a1ffc187847a32aa5a88077d163b8acb2a75171a5fb134f47ee6d82cc8105d4ce297919ea8fce76 SHA512 550d20be7f3379ccb30e2e0c86c26348103d7d11d7b5d21c684c341cdb7cf1aaa29886c7b1210265af7bbc1853b8c26a0048d6bd40a8a2752938101e64a23468
 DIST path_expander-1.0.3.gem 13312 BLAKE2B 79be135b73f192e86cbdfae7a203434c4c8b1535c2db959141db79fd6a2eedd92c6436376485ccf3f8c15efcda31de40a7dd5a8c71eece17ca1e72f7bd7e95b7 SHA512 e05d66759a863f69845e41da1677f2020111e85e206d58acb93d18e044833f70b9420929e731884e6bcd156988ca3ae836f9913697ec85756a71f68499469ef2
-EBUILD path_expander-1.0.2.ebuild 759 BLAKE2B bd330755d7783774be5dc732a20bab12a862cb68c83163e4cc31d051d519f3054bddeb4a7ca97eb9b2b92d4e9b38b546985aa7c483a321e6287d0a788829f3c1 SHA512 def5cc3a9f94eda59aab6b45b3d22470417ede6f6d113a8b093b28750111527388a99c5fd390db76cad9ccd3d55f9103a6d9356e86d7337c54ba5cfeed4b3723
+DIST path_expander-1.0.4.gem 13312 BLAKE2B 9372b904a490cc07a29430a397d84d09484486517769a7803e983af31f6a181c7a5f8c2af15e5fcdfd9b794c9bfa1f5bd908c39d22c2b2e2dc7b8eb0a929592c SHA512 69d45724f3ba406a6dc96df06be1dd9cc869a52c4ea19eac9b900a8db083ce04fad4dbb37e5e75f5a229114f7b65023df2edd7c367a0670432e74105cd3c298c
 EBUILD path_expander-1.0.3.ebuild 763 BLAKE2B 13ef4de2c0d18b0e8a4d7caf68f8d999867e1f589f4e4b27d6d0618e2a8e20adb7ab03bd6593eb5fee11ce874210b296f0cc56e6ca285d1775d0d7bae57ecc22 SHA512 4172fd07e8184f3d8b234b209720c11014faad8f2aa507e117ae817b014656f3491ba9291922bf8acd80572d56404b553c72c017e78d58f2a587823ea7099326
+EBUILD path_expander-1.0.4.ebuild 749 BLAKE2B 45fea82c358adf7cd21dec1a4b1d84edaf94fd17a7c9c9be5ae3ec61349c741940be400e822b1877d3b7c56a88101e5489854e8dc558784f63690b1af3c4ad31 SHA512 c14007442145b18d62a0e2c34cf4b049cd8b87fd31ec59749cda3705d07b16bc45d8178a0bb07d9a5aefe8a12914061ab134c02f8d7c879bc3ecfe5232520899
 MISC metadata.xml 339 BLAKE2B 46f1672ac66227d580c5f13621d10aa58b2a17373eb108a190e64203ca4dfaa92aee5dff0c71551a52af7cb58a77336f34328581fdcb75e68ecf7698071d1100 SHA512 9defdaf2e5b30460816c7e929aabc8421c4afeba6ca56a60001bff5047052a2a7f7928a683707b26582facb2886f05a4ecb56e5036fbfc4f75d4d3353fefb8a5
diff --git a/dev-ruby/path_expander/path_expander-1.0.2.ebuild b/dev-ruby/path_expander/path_expander-1.0.2.ebuild
deleted file mode 100644
index d63deb968507..000000000000
--- a/dev-ruby/path_expander/path_expander-1.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pre-process CLI arguments expanding directories into their constituent files"
-HOMEPAGE="https://github.com/seattlerb/path_expander"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-IUSE=""
-
-all_ruby_prepare() {
-	# Fix tests depending on sort order
-	sed -i -e '/test_process_args_dir/,/^  end/ s:^:#:' \
-		-e '33 s/$/.sort/' \
-		-e '83 s/act/act.sort/' \
-		test/test_path_expander.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/path_expander/path_expander-1.0.4.ebuild b/dev-ruby/path_expander/path_expander-1.0.4.ebuild
new file mode 100644
index 000000000000..8bca9466ad0d
--- /dev/null
+++ b/dev-ruby/path_expander/path_expander-1.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pre-process CLI arguments expanding directories into their constituent files"
+HOMEPAGE="https://github.com/seattlerb/path_expander"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="1"
+IUSE=""
+
+all_ruby_prepare() {
+	# Fix tests depending on sort order
+	sed -i -e '/test_process_args_dir/,/^  end/ s:^:#:' \
+		-e '33 s/$/.sort/' \
+		-e '83 s/act/act.sort/' \
+		test/test_path_expander.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index cfa0f22e80a2..2ae138669f74 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1,3 +1,5 @@
 DIST patron-0.13.1.gem 64512 BLAKE2B 14f691cb0fd1c863a1ef634ba8aee94751095138e940f13bf09860e9e0061872fe14fa33416f59f82d4adc53963721d653936a3f058b27654ea7593d6068d0b7 SHA512 7b082ff7442c2635c38b37132cd61f6cd18d4792d41cbf3bed1201fb7371b75bb628a295f4e3dd173c23e086d3c1f54f0217df3f7d1a30c1031fcca86269e1e7
+DIST patron-0.13.3.gem 65024 BLAKE2B 87aa69aab49978d14a80ed9e09d74d7853da3512875cc3aecd3f387d1523b85c84625b57a5826e5f5f999cec4feaae58c1aaae96582144a5c9dc537c9d5a4224 SHA512 afbbbd9570e338a5d1b97b4ebeda76ac95a22c29d908629723d345a47400183c2ccee67ebcaf5b6f9ecb032eb3b847e70ec9eebff75b33045a3665c215abfbd0
 EBUILD patron-0.13.1-r1.ebuild 1250 BLAKE2B ed6fe6a7f5be66a4aa9c2212225d1283a0798c6de787fcfd59a853630b82c1bea3ca7a0f98641b01e6c193a0d6326d991d92f66813c69d9728bef4013e9e052c SHA512 90f5e7269dd0e93cace60443f3f399f3ae0f5141c93a039ba276389ba931c94675981a13b5e17bb481e642563ecb91876da3f87d1aa885d57d01128f88ec5292
+EBUILD patron-0.13.3.ebuild 1245 BLAKE2B 22e88a599244a238d0248e61849739e36520fc158a2eba708d9806de60de307d194d82498c51bf991846c33e23f6b1da4a606cafbe8da7553c1f5d2b39d1eb52 SHA512 8cb4ccdf7868581e8247149a90049574cfa5268c548798b463f0095462dfa914a6f0b80ec46a2ef057eed061aa981d9062125f40bc6cba53676d2c0486359347
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/patron/patron-0.13.3.ebuild b/dev-ruby/patron/patron-0.13.3.ebuild
new file mode 100644
index 000000000000..cedf0130468e
--- /dev/null
+++ b/dev-ruby/patron/patron-0.13.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+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 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND+=" net-misc/curl"
+RDEPEND+=" net-misc/curl"
+
+ruby_add_bdepend "test? ( www-servers/puma )"
+
+all_ruby_prepare() {
+	# Fix Rakefile
+	sed -i -e 's:rake/rdoctask:rdoc/task:' \
+		-e 's/README.txt/README.md/' \
+		-e '/bundler/I s:^:#:' \
+		-e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^end/ s:^:#:' \
+		Rakefile || die
+
+	# Avoid specs with failures. We were not running any specs before.
+	rm spec/session_ssl_spec.rb spec/session_spec.rb spec/response_spec.rb || 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/pluggaloid/Manifest b/dev-ruby/pluggaloid/Manifest
index 256ce8f15aa8..420428261cf4 100644
--- a/dev-ruby/pluggaloid/Manifest
+++ b/dev-ruby/pluggaloid/Manifest
@@ -1,5 +1,5 @@
-DIST pluggaloid-1.1.1.gem 14336 BLAKE2B c4191a02630d764985546ec40520e09a8aef6e1b5bc94da5e5f058065ef7f6a18751dad10d293c3219f1eca21e17b310b1998e33c4e96573f33dd28faa50bb6c SHA512 80453954f98c7fba354455b73538d055a7d9d38e38f16723dcc4b04811286a8e34e413f31d988b86580eb5a4890d5405c78e6798bcf1ca489fd3159b23653070
 DIST pluggaloid-1.1.2.gem 14848 BLAKE2B 72bbcfe71c3c2e6a96425639b0db2af9a10f92888af09093861879529458e51ef3793a614a8d573829a4cc34be6e56721bd3f01523f3e5feb722800538ed097c SHA512 e381adf34e918c7d9e1b1ca88cc7eba585f2d88937fc7e2fbb6ffc7e276ecea42f27e101bb0d0a80ce5d365cdbaca9aab0c8f2ba33899cc3e1ba6729514de1da
-EBUILD pluggaloid-1.1.1.ebuild 566 BLAKE2B 2b12afb5e8ffc7c4378e49fc08f78b64f0d825d8f73f700ef984046814cd158f1720753aee5d9a94fd2e484eb6675cdac215bd15aa124aa57bc3d8f76229fa9d SHA512 2048b6f666cca17f9626cc28accbaf2c05c78a63056472c20374ff81bdeb3682a437a2e1c9d7b01306238e3b1636ac94a5a8327012dc6921fa34063cda752a67
+DIST pluggaloid-1.2.0.gem 14848 BLAKE2B ee092768b9aac2c64a0ded18f328f0f1a5d67d073da28a3029c9be13554f77565ed2338fe9630115067ecc1d0d712273642e0679a43f822995faaff48cdd7849 SHA512 b17bd264c2e8027ae1a9288b5b9a12f5c0e4c91bebf9cee5328bfe61aaa32662f55901d5ece030702780756474d54028272c7cef18fc79982d9d7c48f04b5acb
 EBUILD pluggaloid-1.1.2.ebuild 556 BLAKE2B f89267674776c7ac0d5426b887eb5db28aa1df63f1a06af61fbb2d2300fcdec75aa0dd505df58705925ab265a3b2656dfc515390ef06fb13e721f083d0e74077 SHA512 c4c979703f4996345fb7c23d661342c49f3a28fe90705c0fc69d5ac26662a89a2c40b3e8f34b7d796762ecde209bef37fc4c04adf8dd0e6ed01fc7934d04ecd2
+EBUILD pluggaloid-1.2.0.ebuild 558 BLAKE2B 3503584a6126ecdd56f0715c57d6bb3d9902c5fc201cc1e883dd94e11219e5502b802b75f40ed92f1e9cb5ddac834c4a3bee1847aff5f29193604125dd9552a9 SHA512 5fd51185815ebad86f3c4b312c5e7c383ba99f166aba9ee65e98e5ea4cc84bfac45beb31db12b832f797ba896c0712ad4141676c0868b10d5fc9091dfffe5a84
 MISC metadata.xml 411 BLAKE2B c4607d99d68dd5f206741e4021f2c8c2495468085c941aa66fb26aa356029b47ae33d1cdc16b07e256bc1bee58a92f5ca4599432a1b6e7e882275638fd02ecc1 SHA512 24dd8c687efe2f4b36b890912e583b7800151d1209b74b0676ec9c863e263e8858a9a9e465523680890e14243c8a2d67e7a999a1973bc5bb797cebdf886ae546
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.1.1.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.1.1.ebuild
deleted file mode 100644
index 48fb87cbd71e..000000000000
--- a/dev-ruby/pluggaloid/pluggaloid-1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-DESCRIPTION="Pluggaloid is extensible plugin system for mikutter"
-HOMEPAGE="https://rubygems.org/gems/pluggaloid/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/delayer
-	dev-ruby/instance_storage:0
-"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/*_test.rb || die
-}
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.2.0.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.2.0.ebuild
new file mode 100644
index 000000000000..750c3f247644
--- /dev/null
+++ b/dev-ruby/pluggaloid/pluggaloid-1.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="Pluggaloid is extensible plugin system for mikutter"
+HOMEPAGE="https://rubygems.org/gems/pluggaloid/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/delayer:1
+	dev-ruby/instance_storage:0
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/*_test.rb || die
+}
diff --git a/dev-ruby/podcast/Manifest b/dev-ruby/podcast/Manifest
index e016971e39bc..1dfae7cbf2ba 100644
--- a/dev-ruby/podcast/Manifest
+++ b/dev-ruby/podcast/Manifest
@@ -1,3 +1,3 @@
 DIST podcast-0.0.4.gem 1166848 BLAKE2B dbe6931da156025bed3862cf6185ce00385ea704e5552e9c83c3d0a9aba40d7071eab4a69e95835be7782892254d43e96dad33e38974d41845d899eaba63ee54 SHA512 5be795a7f614f616e93ed2e1fdcbfcd1513fabfc6a728dee0216907d951ceab37e909d2cdc44697f7d6497e21537bafa68bdac196255233cc3126e40c48dec95
-EBUILD podcast-0.0.4-r2.ebuild 557 BLAKE2B 6b661ad70dd3ee1c833b2e515cc9e1f9c8d80b2e8f2ed1fdebad7011509b94a97f2b6c008c9a14d028eb699348a3a41e031294a534999419dea1f8ee19286fd4 SHA512 17ad9ca43593fac018f04216c5d099852b41271e397808d556088e78d9002c957b8b05ca908beb02c46c25d3a3c30f0e4e19d59cb5223af984c888f23496f751
+EBUILD podcast-0.0.4-r2.ebuild 554 BLAKE2B eb3afa6fc602c5673d04f89ee0eb7df745ed2957dda19292cc51e88046a7f06d47767f899b8bf40ef4f1523fecf110b8dc81dad0395e39fa5383e391dce02f7e SHA512 9a97562feae1be8fb38bcb1a280228c29ee4d9a30f06f8a9659f7fd437e80caaefd9c33cca15070874aa6c849574f78a2d261d25458b0854169d7cb82dcdfa89
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/podcast/podcast-0.0.4-r2.ebuild b/dev-ruby/podcast/podcast-0.0.4-r2.ebuild
index 09e6f85e7672..801480697d65 100644
--- a/dev-ruby/podcast/podcast-0.0.4-r2.ebuild
+++ b/dev-ruby/podcast/podcast-0.0.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index fc5703b8a2f0..a4a0d2deb5a2 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,5 +1,7 @@
 DIST public_suffix-3.0.2.gem 95744 BLAKE2B 5c06af572214760f7d2a176e1b6603ea9bf0f45c91633cdead841ef8289b7c9ae7ae5b0400d5248d3df4c3bc81d9bb357de622fb85a9c3a67f4973872bdee94a SHA512 eafab08d0114212798390b4b5e9472fab98c91b38ea836c76254673e48bd068afeeb5ec4a2685bdb030ea78e4e5ea0be10dc3b742ed30352e11ec7a7cc1e7bc2
 DIST public_suffix-3.0.3.gem 96768 BLAKE2B 0ef8da7c32a2a1268d45a03a46f9a7de9da312fae2b2461692b1eefca09075029972ef196ae5c531d85140cc5da4107ff47abb16129b19e995357d04cfd852b4 SHA512 8d80d126bb91162d9228dd515c2e5cee466134493e874c136831eda11293477a035ec05436a16dc0bf720b7b38b15664e8c1d9b5f4f140f4054fc387565ea275
+DIST public_suffix-3.1.0.gem 99328 BLAKE2B 50c5e415bc59edf3a733eed9bfd5e23b5892fc12dd9a0ce624dadc41227b5ed295a6df3a1b48b4dc375ab0e1c3b4411133280df03c9e0a5269e545213873ae8e SHA512 8f47f75bb9c23b1c3655aa3d3f5dab302e47c7c1a95f07bdc40f782b95c15a79c898f632e844cf9c350aafc1a7dffee3890d68dbfff73f43551a2bbb03667a69
 EBUILD public_suffix-3.0.2.ebuild 834 BLAKE2B 35f65e5abe8032946dbae78be95f3a11f91380f74e8b7736f025c05fb3b68181e7b8712081a3908ae4460ea2a539428acc92b330de1c65573f2956cbbae72402 SHA512 e574ad1b94f28ccf7d19daf05abaf1ad76760499e262c17249d6de12f6f17917ccc9bb7739c33561d48b73de11fd3f253cea1e228c7a22d5c57b8cb197aa961a
 EBUILD public_suffix-3.0.3.ebuild 833 BLAKE2B 2713eb35bd37ba741ef662270006c25737018922449a89f6e99ab39ac96a8cb4e3eb0c709cc8d74944c9a3c41cfd2763f3001e6d05d5ea1c3bf81085ffeeb4e9 SHA512 a5ddb4b4d9a4177b695fb358115e711c4a73f823028006d77f4427614873f8d72bec6e09ec7843cdaab4c02f5f043317b21cd742141de6c2ee5ce06511c2639c
+EBUILD public_suffix-3.1.0.ebuild 826 BLAKE2B 85c0e285fe0de2d86a3f64bc1327ce00849c5a5618a4635e6aa46a515b344fd4228ae2080d0743cac56e1ec20fafd352194938a3c1ff4c562732472446bca913 SHA512 ab7816066d60dd9501a266ed56c5842af4eb0e2f92127dabb855f9c15b145d67374f1437ff60acbd4be18eb7210a86b4669325bcc927f709950ecdf3e09549e3
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-3.1.0.ebuild b/dev-ruby/public_suffix/public_suffix-3.1.0.ebuild
new file mode 100644
index 000000000000..186d9be0920b
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-3.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="3"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/rubocop/I s:^:#:' \
+		-e '/yardoc/,/CLOBBER.include/ s:^:#:' \
+		-e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 20f32fc68a86..76bd2f8a99a3 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,7 +1,5 @@
-DIST puppetdb-termini_5.2.4-1xenial_all.deb 20538 BLAKE2B aad000bc0e13e3c97f4428bca88653cbfd76db2e5499f2acad90afcff58847e1dbaec9bc9ae8ec30e21c9b5c8308061b7d51058f0a17e2936d6dfd05ccc650f4 SHA512 98e871a4867735a8ca677ee3fbb6ab5e8718e78623fe6d497a3c680e090b86a0cefc35ee318f6f5abb45ebfd02d9bf75a04f0f1fc48ba654443c5c4ca99f3180
 DIST puppetdb-termini_5.2.7-1xenial_all.deb 20560 BLAKE2B def7bb25badadd2880589d5708e8b9a0f87033977a21ee65fca7b27caf8c3568c66cf7f21123ecd8dd037e29023e65a9393d8b3608ffe0e021f9aad5a8c66755 SHA512 b5a5b4c721a35d95093d9da757f5a2dcfcc232343b6ca6dcf7184a20f9ff305a9c2f04328e17a0e02579d6ee7245c7c9b7e9ba8d22bc8f3bc1c13cf50c784101
 DIST puppetdb-termini_6.3.2-1stretch_all.deb 20662 BLAKE2B 2e7daef3892070d5356ced070544099a546e4887b5654f795e06952862e4c0cb155df200806217fd5376b1bc3fb53107467ca76acec05283d2f25fed7ca7e5ca SHA512 555abacc9de7221df78a8459a76a4c3c8ce3a1bf5e2b6f1d800761eaea650d2a308e6a5054be082cfb9823903fbe049b2dc5f323b8af93693afbb61c8ce6c4be
-EBUILD puppetdb-termini-5.2.4.ebuild 658 BLAKE2B ae9429d33a65439a01c830746c723aa118126782ae587adbd8c2614292309be0e981b117b2057ccdbea1a3a9f545bdfd1722ce43eed7520288a646d4c70e0711 SHA512 ce99726c37ab4e7435b649e74def768077ea61c49dc0971bafe7e9fdf8e0a0a6942ca64c12937ea6625194a0ff8dbabd4181bcbd6b6654b68ab395c4dc62d203
-EBUILD puppetdb-termini-5.2.7.ebuild 657 BLAKE2B 4c2787b66a9f5af952b0aec5c23b3626f381f3559b8facba86947f061120195ef9e76d054ccee55c4ea7b251da5b516dea532451577f656381ed9d5fed864b84 SHA512 625b708e447abdc4c646bc5a2f44cad28be880a523bb38559a04ec99633e63a25488396f0df40e0805a0e6b0acb3d174867435b726bfb74f91fecaa6fbbaa124
+EBUILD puppetdb-termini-5.2.7.ebuild 655 BLAKE2B 1439379709cf6326a1d3510fcd1e82a751308a6e3666aa99c756a9043157cf2ad850c9f1d367eabcea227232709fcc185f0b115479dea5c4b872cba09bf62eec SHA512 5e80114c8e6cdefed8c1daa81c535b8ed3c8e4981953d8e57ad77c19361ca01e565bbe1862ff5ab0607537d50e6c7bb0ac16777fbc9eed01905df51e7559e85a
 EBUILD puppetdb-termini-6.3.2.ebuild 663 BLAKE2B ee7bf569a71860c88a0553ba60a08a57df1650050470c9e42ec6138386d21069c45a828be62c16582a973c30c314a5439903bc682b28a62732486737c079bf7a SHA512 efaa2a0f75daa2a4b7791ecee01c17286f5dd11f606c01187b9081f4793d456abc24dd9d9317804784cfd34e578b5dd524c270831c9a9fcbb6a1df6d07639051
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild
deleted file mode 100644
index a4b1fa6cd9cb..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit unpacker
-
-DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="http://apt.puppetlabs.com/pool/xenial/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1xenial_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/puppetdb-termini/puppetdb-termini-5.2.7.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.7.ebuild
index b7bb4d90e318..bfeaf0652c58 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.7.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.7.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/pygments_rb/Manifest b/dev-ruby/pygments_rb/Manifest
index 97ad66caee39..ee4b8a606567 100644
--- a/dev-ruby/pygments_rb/Manifest
+++ b/dev-ruby/pygments_rb/Manifest
@@ -1,3 +1,3 @@
 DIST pygments.rb-1.2.1.gem 1176064 BLAKE2B 7a6651606a433a9f15853ee06c3fe9a02d266f9441a08cc92c0db4ba679a97a2a25aaa4e96a621fbda0553e9b0c995ce53c6f828793f4937de12b3089f12963c SHA512 f0fc63ec028169872e28e2181c6a10c8a3f5e7f07074ba9f43475a0b5aa403a03d7045abb03433b600ef3d74c460556355b4ee64be598d3b93ddb1e0bb306259
-EBUILD pygments_rb-1.2.1.ebuild 1533 BLAKE2B f272b37494aae4228ded5ef6853eca4e4720ce190fb1e6d3124eab6a2d912551f7aa67aeb1d3dfb1c811b989fffa416e4b3cda3e1308b71ac1fde3432367ebe7 SHA512 964f32c1d43ec1654f971add27ecffc6d916df5454af61b89aa52400547bdee72238dff57690dab5f6a45e2f980ee7107ee10f726512201bad9db247eb751741
+EBUILD pygments_rb-1.2.1.ebuild 1537 BLAKE2B ba189a842a9c209f2edc3ea44775b080f678e805a20b05a9bb4965ba398d3a2d91e7ca897b3a13942c114ebcaebefd7e5f11387678005a44ed37eaac2557abdd SHA512 226735705e289a3cac433d4d41f1d4e8b4431d6e822bea83a3a051cc535f49691a2a00384c397ea4fbf03958bcfd74efcd5b2ca035306d62edae394780ddfac0
 MISC metadata.xml 342 BLAKE2B c4cab71f5d398ab14a8e95598f510c092fa2cb34fd6facf4c59289c8f78f601d585207eba1ba4822ac6552ae12375e4e786873a55d2a34d2e36c02fa72ab5b02 SHA512 aa104434e5ba9d5a27409be91ee791f898e72aa38632b3c185c09071632915686dd5a3ccb46c24c911468d29cdfed6c6421bdfb0119c28bd5c404be4b55bf789
diff --git a/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild b/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
index 6dff83c2e598..1e51b2fb94b3 100644
--- a/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
+++ b/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 PYTHON_COMPAT=( python2_7 )
 
 RUBY_FAKEGEM_NAME="pygments.rb"
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index 0c8611b69b44..e3e0fc052e6f 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,5 +1,5 @@
 DIST rack-attack-5.4.2.gem 23040 BLAKE2B 7af950339f03139e6a3ac9e8349e6d2af5182a29f643a08a9ea0806349c02965d05e99d95421f14ba827c9c942a6824f710dbaf06adbb0aa07dde03d74e629ed SHA512 a4af12c2c436a3634108494e2a5b9c5751c0fa2e87af6efa326d9c09fdae54b5bd8a8974c48785dfef64565ff9ee0a6704c90acf1277c8e80849ff30f9fbb67b
 DIST rack-attack-6.0.0.gem 23552 BLAKE2B ffd558e6a8b4b03fb332ef84f74c77f3f6dbfbaa8ce819c9522c02791ae35acc177b07a5f52f1888ccf25feb068e1812d1d61ddb7ebc9ea34da7ae1fe6275c27 SHA512 dca8ab20a3c4e5ac1214b232674fbf164a4c05f7ebb219193608b235583cdea5367d402d32a60d6a92c534a04d328714c673a7c93c50423a038e653561023f87
 EBUILD rack-attack-5.4.2.ebuild 924 BLAKE2B 9bea5a9f9f54b9a6f54b17c2d0dfb84546c54b95ae9c994152a5f56440e3d3a0725e43c5c28d8a08bb6075fe7ccabfd38c96146c885e9c53572a3364262dee37 SHA512 4462b6e58fe4beab95ea2fc9b4468180877e77dfd664a25140725de53397ed04d4252a6b71fe2c8b86f5a66d5eb43bf7c5958ae6bdc5e5e0443c430b96d2840b
-EBUILD rack-attack-6.0.0.ebuild 917 BLAKE2B 4aab8ba61899ea23d166edf3696e879d56372da26c33611288e247f81f5a7541cd5b6c5e1d6ac750c9b3c3ebbf9bd5a03c636a0cb8c5ab399b77dc091ec1ede2 SHA512 f59a2b528f0ba3eb2cc7104e1dfe1a20be75920e14f1144505fb2d5081b1fde8d819c9018b2b52c9a1aa635b96f6f61ed024264122860b59215dedeae9f6f03b
+EBUILD rack-attack-6.0.0.ebuild 924 BLAKE2B 3241be83552def347c81a139384404c0e25e69500ebc60ac268e636d647bea1bad5e2f54c5a0e96f19e223ab726f113a1296d1f590ea2e6b4bb886608e45e289 SHA512 3d0cc2b9f14b58d2577c76953f3fcf4258ae9035e7ad09cde092fa4d32fd55c32efd481bb8adebc79cfd8343edfb9903daaa65ecbad26ab2d44f945c583076be
 MISC metadata.xml 349 BLAKE2B 5e0852caf34767613f144f3a6680223198c6cad55b7ea30d0778d788ce2293a2586bf0edc698dc0a5edc11d4e1d408576ce9d7c1eb3602e7fe7f10e2be33c1ba SHA512 9584ab20de3f1604d81e9be1baa8b4e355e5a43fba3a0cfc43a3d4f5e67df0d089a906b479b99150f76e54d07310d650ae96171d6ddeb8e3f00a446e2a95a795
diff --git a/dev-ruby/rack-attack/rack-attack-6.0.0.ebuild b/dev-ruby/rack-attack/rack-attack-6.0.0.ebuild
index 9189aae50b5c..dbabb18b825a 100644
--- a/dev-ruby/rack-attack/rack-attack-6.0.0.ebuild
+++ b/dev-ruby/rack-attack/rack-attack-6.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 # Skip integration tests since they require additional unpackaged
 # dependencies and running daemons.
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index e89d4c3e44fb..e0abe19785c8 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,5 +1,5 @@
 DIST rb-inotify-0.10.0.gem 15872 BLAKE2B 52647ff17994287810efa9c04bc9553b101c42cdd27cf42d530565127dfce104a589ad729d7019409079731577d327221ec3423fa7a5f746aefa3d817b93d898 SHA512 16aa7fb21e5ed713335e583299cfc72676e3ef66de3d349f74a14885b88020b79e031839b193dc140036a0b6539a45ef3a0c3c6027a7211508d388137d22a13b
 DIST rb-inotify-0.9.10.gem 14848 BLAKE2B 35eb00dfe1e7e76fddda080499275c053e82431af520170362354984cb2af3c90e3ba803ef82fe50f1451d3fdb0ddb7ef9c1dc648836403a6865396987d6d9c2 SHA512 ee1aecfebea11655450776013d8d2fa3fb2af784285db3c32b5a452241f9cd48a8f9a10cb2f1ff96b191c0dcd43ec4f78e8a363447abf97a8cd4ccb778de4889
-EBUILD rb-inotify-0.10.0.ebuild 1044 BLAKE2B 9cccf6e21367a0e1aca4c4224567d91d4129aa94a2a5c639863fc53250696d869c0733f0c8db8dcd0bc6e2249fdd81a23011abd42a9f3e714b2a946c678c8aff SHA512 93cf3c260778af90842232f53697ac4431646feb301324ace7c25b78a6d838aa823aa36cd8b55cc6c7b7ca2ca9f14b4445dac7eb721fa34e353a1f1ed6cc0477
+EBUILD rb-inotify-0.10.0.ebuild 1042 BLAKE2B 26bf3806a1d87959915ba4fd9c196a9b56cee769c9a3e75fa5bbcf21f06b31fad18644654703aead958a15e0cbd33f285b675c3a79fe633393d09d47426e39f1 SHA512 45f236acd5540e92b15076d3fcfba487247f65c67cc8f5479e0b7c8f17c7176dbb9711a267ef29f82cff957cfb9366b9bda3a64b9451b28e13bd09aa48799326
 EBUILD rb-inotify-0.9.10.ebuild 966 BLAKE2B 4659394c98f68f370bdace6336139828619748a16daa6cb503ee508040779a3816be32772d435647695692900e5999b0d005a0d726e4bf426d6e57929a3bc17a SHA512 32667f3dcdcbf6e7fdc8f890ca623a6d6be9474df27862d08d3e34323a1814753834e9595c795f2923a5bc4647d3d2ae4f7a4b55d20aa2586aa1eaa184276e24
 MISC metadata.xml 341 BLAKE2B 9b7d043d113a1bfd0bb07588615f04762e5d4334763055dcf818969aa98c543c19b1e1005d3f8e0ad5d6c0dfed342b3ee8f2bfd9a49eb133b34f5cafd6f7f91d SHA512 0449efdf61caad416c9b68e1b5de20c46d29a8961f462dd7f1971e3723b8b0b3567507cc99cfeb2151e0c8c14caa28947dc23906281b20771251b3b47823b4a4
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
index bd247e1cc636..3473e5d940ca 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
@@ -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 "dev-ruby/ffi"
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
index 09efe6a39ea5..f25846b20b04 100644
--- a/dev-ruby/rbnacl/Manifest
+++ b/dev-ruby/rbnacl/Manifest
@@ -1,10 +1,10 @@
 AUX rbnacl-buffer-size.patch 765 BLAKE2B 0865380f35748adeddda7a9a880df0c1be81994a965ecd40505e9f47f39c7d2a55876080007e28204e388f5a09396d28275d2cf9547536523c7d2fc5f6e035d1 SHA512 da9dd16452b1449f3d862d940b518bf4b99726195ee0ccd0bf3633299b6d9f44120b9b638b77243f7a1c30802d79e6467d2673eb7987cbe38091033aecda283b
 DIST rbnacl-4.0.2.gem 220160 BLAKE2B a4a3a7b0346bdc3d0e1930bf9b1c6c05182456837c53c8a56f5d8eec831df8768589affb00450088c4ccc3de37f474a359e9ea362655ea66ada63467936abcbe SHA512 d13d36e4248d5e40bb5d9496e08823438d312c16d14e3068be89a62dd7f80ec7f99fa5995752b183656b6ae863af77645b16ce45d05a74ad0dfbd4a93c8854d4
 DIST rbnacl-5.0.0.gem 221184 BLAKE2B f64a754c478c57af901432e9cef335d9f01c1acadcd9d860dacca2ed5d59bdb71f3a431488357b57cbe7af61cf03b50b95ab5421a9ac59f63242a0ddd693e373 SHA512 d6c0c90587beae9f5086c442f4b7b9f430d527576307c5a5cdc5532b231245e5615434a001b3a4b47d1fb7d7148a167d77f12e7b4f5bd1c25c7ce5d361eb42f6
-DIST rbnacl-6.0.0.gem 225280 BLAKE2B bd9b12d4b7bedbc091e21c48f859bcdc969ef99ba50cd8b32ffff9040ad4522821e8eddf2269efcc29d30d967d70cb5132863f783990c860f3b3f9dcb342c2d3 SHA512 2921269c65503038d271506c56c8ce9d2ce34e1dde45cbe5f1bb14a6350608dc6690db7760c29960232c71fa21e7e183be1fe5238fbed228b74d3c71d7881034
 DIST rbnacl-6.0.1.gem 225792 BLAKE2B dd2f3ab1996b51f905016df9a21d2c4dce69246727efa35444a9f88f3d071607d122aaa7e61e5283f491e3e8e9deb0897844fc4d8f8562c3b855b6489ff8ee71 SHA512 f30161cf38972c94f00200bdc0790b7b3b6c5a7b0b2663fab0a11b488477424e5b57280479cd28e2736eeaa1e524227e6aa688e814a1b4af274f1c82a5d553ab
+DIST rbnacl-7.0.0.gem 225792 BLAKE2B f489e0f8521ca01d49676ba4d06b28b449743dad309a0ff9ab30499b76ab132b1d176144d24bc0eada1bbc2cb13e83d332105a0010946cff0b02baf4d4b3c246 SHA512 49cb3587ce183349234be7ec7db83b797c1e6d09535e4e692d01a307e221baf7af6009ae8aed5fd36bbcd8f1847c49a0cf599160e89dc2f2cb3eefdbadc2bb09
 EBUILD rbnacl-4.0.2-r1.ebuild 794 BLAKE2B 674c9c4ca5ced2f9216ba1aa14e4e6fbe08df35f6af28c91541e26ff5a14e9024afd7b936ad38dd2aa748b7866c8a8a167326f99f7525f3f944a8c771a2086fe SHA512 7eaba4f90b7b832720e2a7fb3ad226811ad678d6002c5db83ca4bdd15f121f25943e15651111695c447ad1fda70dff37d39a2056ffbb9347dd85b902f83ceaaf
 EBUILD rbnacl-5.0.0-r1.ebuild 798 BLAKE2B f6df83228b60bd0914b10ea9aac3102bfcdb36394a5f40c051ac51bc36776eb3bb788876560f1965fb7498513da735dcd2895909e6c2a0cda2f68ed3af214f20 SHA512 be8528b0feb3a34d6d75536dfdc99a002a493a3593b56c248d2e1623abb22ef8e5f4b43f3335e757b2db763b9aebfba18edbfab8d3a36da4cca539aab8b51ec8
-EBUILD rbnacl-6.0.0.ebuild 746 BLAKE2B 61729c7e6bc87b88ee3db31c86a36c4ba26137af7d830009ed5c2c8fe86576b5e8c8c44b87bf25d9078ae072125f2460dc458f61c10508a80139f112aefe76b8 SHA512 12c7e458496cd6d02aa8a9cb26754abe63905c0aa1c86140b1f8c0aea661e8fe79a6f9cfb82fd87aa6f1e980a1620530c0a3a44ef73711fa3889d8e38ab4c515
 EBUILD rbnacl-6.0.1.ebuild 746 BLAKE2B 61729c7e6bc87b88ee3db31c86a36c4ba26137af7d830009ed5c2c8fe86576b5e8c8c44b87bf25d9078ae072125f2460dc458f61c10508a80139f112aefe76b8 SHA512 12c7e458496cd6d02aa8a9cb26754abe63905c0aa1c86140b1f8c0aea661e8fe79a6f9cfb82fd87aa6f1e980a1620530c0a3a44ef73711fa3889d8e38ab4c515
+EBUILD rbnacl-7.0.0.ebuild 739 BLAKE2B cacdc80445a2cf9aed181fe7ca04df972c778f62d79582c20a554a40c38aeb84585f6cfabfb40494c7aff0b45df244653a0130aa376889477d20fce9c4671dac SHA512 1b0777df6444d247ede6c156ad6971fcbcc4a2c2e8a145c80ba9a43285059b61c20653da5128a013698611f775f0a07fcfb51ab44e209465d7aa6a41b0b87827
 MISC metadata.xml 345 BLAKE2B 9b2e901225c95717838370d1de17dea5619d4485d7856050d55abd8bd05eeadbf012ce47b160d367e0027d2e42abfdf4eed15c598d0a8062713a00894495cd88 SHA512 e18502485ad21a5e5cb71be6f2980657a40b08618b50147f50daba44e1f87f009f796e1df046bef94c05bb9305e1bf9dd1a81df33c7fdacc8c2974dd18cd309e
diff --git a/dev-ruby/rbnacl/rbnacl-6.0.0.ebuild b/dev-ruby/rbnacl/rbnacl-6.0.0.ebuild
deleted file mode 100644
index 1207ef481838..000000000000
--- a/dev-ruby/rbnacl/rbnacl-6.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a high-level toolkit for building cryptographic systems and protocols"
-HOMEPAGE="https://github.com/cryptosphere/rbnacl"
-
-LICENSE="MIT"
-SLOT="6"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND+=" dev-libs/libsodium"
-DEPEND+=" test? ( dev-libs/libsodium )"
-
-ruby_add_rdepend "dev-ruby/ffi"
-
-all_ruby_prepare() {
-	sed -i -e '/coveralls/I s:^:#:' \
-		-e '/bundler/ s:^:#:' \
-		-e 's:rbnacl/libsodium:rbnacl:' spec/spec_helper.rb
-}
diff --git a/dev-ruby/rbnacl/rbnacl-7.0.0.ebuild b/dev-ruby/rbnacl/rbnacl-7.0.0.ebuild
new file mode 100644
index 000000000000..191075d0bb4e
--- /dev/null
+++ b/dev-ruby/rbnacl/rbnacl-7.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a high-level toolkit for building cryptographic systems and protocols"
+HOMEPAGE="https://github.com/cryptosphere/rbnacl"
+
+LICENSE="MIT"
+SLOT="6"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND+=" dev-libs/libsodium"
+DEPEND+=" test? ( dev-libs/libsodium )"
+
+ruby_add_rdepend "dev-ruby/ffi"
+
+all_ruby_prepare() {
+	sed -i -e '/coveralls/I s:^:#:' \
+		-e '/bundler/ s:^:#:' \
+		-e 's:rbnacl/libsodium:rbnacl:' spec/spec_helper.rb
+}
diff --git a/dev-ruby/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index 5023bb6edf76..a1b7228be567 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1,5 +1,7 @@
 DIST rbpdf-1.19.6.tar.gz 12026339 BLAKE2B 8ec388e65f110773b9a7c160a9bccbb1beb6f3ad0bbe2393a7b91087e1d2b3cbdfb03284737f6763cee6cfa947d68532cde8f4b684b004dfc92f300510a1f5c0 SHA512 192dae84ef2a44cfc7bde38e776ade1aab95e812f55ba1848c20be4a2e65231c97330859cf14b1d3bfd7aa158a1ea561602723e9e96e275ecc771ca781901271
 DIST rbpdf-1.19.7.tar.gz 12026440 BLAKE2B be785f7f810c11c64efcc2ef896486dcc3d13b506badc3527abe18065c82ff32a025eda3fd925c9ac0da5c99d0300f2d76fbcf52d444bec46ebdf533b0180234 SHA512 6d4f01760511f117f2ddda87cde26ddd0e47c6245692d80fe84a9ff5cde9759b7803dcfbd328ff9af9e59f6bca9f210d8bcb66f66f288acb512f58920fb5e7d8
+DIST rbpdf-1.19.8.tar.gz 12026547 BLAKE2B 4989bee6f35d74a703539c6d209c14730e2674d94454b1794172f147dd01af20bdea5c4ed3e68a047f7ddad17083d74ea061dc5b0c28e66acdbf56ab1e335dd3 SHA512 e3015e80b26f9de2727ebd1a97ff5fd3937b7e133d9d39c2e1b3e9fe326354ca66ef569fa35bdf4c8b495b40df1ceec26d043e6f86be8ce741068a2c28ff8a28
 EBUILD rbpdf-1.19.6.ebuild 1307 BLAKE2B 9c87bb17ce8033a755f9b3a8991340111adafa43eab6a3bddb8a1cdd76a2afcbc479515e6bcfb9ea80b099d6b3b72347d67cbbb0c5b1738dcc46d51bac7cedaf SHA512 3a9c6aafcb558c88b274cc2243def2139fb0e07617e939bc1f0823baaa67b1760597445a1ae3b5ea871723c47fd31625cbc5a81f624359ae4e4c74d7c59cd54b
 EBUILD rbpdf-1.19.7.ebuild 1307 BLAKE2B ef4976b492a44d70aa4e305897fbde08eb420010d9b49ca963fd7dfa4a77c6b0a8d8c2f64869c4bb3920dbcf7644c18f1fe44493bf5aa94e89c50790db87c5b3 SHA512 fd351d15fc789e4984690124e094d9b85efdb36999a6dfc492393a12a62da22a3e187fe15dbee720dba206e3676e238a4e101f448269579f88881a2155a465c7
+EBUILD rbpdf-1.19.8.ebuild 1280 BLAKE2B 7337beecf56b9882621706b58f8c748fcba94c0cfe9a6a4fd4b27eb448f790f63a2f31df152567a76517274804d40e1270ae8a413e810368f4ee80822b84ab76 SHA512 21c0fc4a8b1e1531653dd58b724b18bf56f453bf14fe6258de5b01223739659970cef48352f2cee03cbcc13e79e1841d1384121115f1db65f676bb50926d885c
 MISC metadata.xml 417 BLAKE2B b48fb397e76caa8bfa35675062a6c4026ae44fe43cd305eb51c9470d9dce6654603742954145f3bd063f6ccc6f56162ca9affa6acc6698ac81432e0dde42a070 SHA512 c33c8dded82e45f867b4e93cb3be96cabf42152bfd6aa13f9144fae15b2b4f4b8f503d4aef4af8c2448584c2e71251c958b8dacb14c26da4a6c2b9b3ff442dc4
diff --git a/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild b/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild
new file mode 100644
index 000000000000..cec0aa03e682
--- /dev/null
+++ b/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# Avoid the complexity of the "rake" recipe and run the tests manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby on Rails RBPDF plugin"
+HOMEPAGE="https://github.com/naitoh/rbpdf"
+SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
+ruby_add_rdepend "
+	dev-ruby/htmlentities
+	=dev-ruby/rbpdf-font-1.19*"
+
+all_ruby_prepare() {
+	default
+
+	# This test is enabled automagically in the presence of rmagick, and
+	# then fails.
+	rm -f test/rbpdf_image_rmagick_test.rb \
+		|| die "failed to remove rmagick tests"
+
+	# Loosen very restrictive htmlentities dependency
+	sed -i -e '/htmlentities/ s/=/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	local cmd='gem "test-unit", ">= 3.0"'
+	cmd+=' and '
+	cmd+='require "test/unit"'
+	cmd+=' and '
+	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
+	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
+}
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index 9218052c70ba..8994d7d2a02b 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,5 +1,7 @@
 DIST recog-2.1.31.gem 236032 BLAKE2B 5e6b4ffe163985ff437c2fbaf203e1d07796ead0c20b233703fcb66bfed45930463dc1b7b2bc0c6c9ec1089730589cf996b59382ad4fd63d4913b118035fc852 SHA512 eeabae2684d4fb616d7ea272dd9c4fda0b1a2ea7776cd664fa237989b68e277943642267359a2671ee180e1a5f0cda8f0be24bfa2b4d7729b469664700955ada
 DIST recog-2.1.46.gem 246784 BLAKE2B 1b151fb6944371d186154ecc28eb74f6727b92394bf3686fb7230603e64a37438dc63293929b63025794ae053304ced7f74da4d530d24f77a6274ffe69cfff7d SHA512 aae48fc9a91e7f750944a97e562789efde14474b42d063dcb2dacd038e78fd20222719e0f17d66c8a13b7261e2e58567bad4db0a84893724a5c04504d35efbc0
+DIST recog-2.3.2.gem 259584 BLAKE2B 035cdcb23fa837798fd256d00eb3cfa11b6ebeefd218c3c00a0f68ad1311efc6ce62a3db537cdc7a692d77e10b45c63f7c391314b05ca93c9afc269e67e7ba24 SHA512 0deb0e2354bab3ae190b0b71d370755de802d679a37a2d907fcc6503a12120e27d607bd3f31db62f678e4488228977132f3816a4586e5e85ba37f7ff6cd27733
 EBUILD recog-2.1.31.ebuild 779 BLAKE2B 9298c273ae50c521f7f69a7344c9fbb018ef55f66667debe964f6a7f2b0a41636b292c27d8ead601d6ca7438b023d4c698aebd42cb6d4f92986d11f81953b298 SHA512 e54bb98094439e2809e8d816e6f23d04bf80670abd106395f6bb4d955d16c6896b440181d7183481f067c9d3675e0b162ad14814500300c971324a7b53e5400b
 EBUILD recog-2.1.46.ebuild 841 BLAKE2B 610ba24ff01b902c9cf7f35567a578b7425a25a79f1f05e376f67d39cec01b20c6ab602ad7734e0a9cf6dab10075ee5cc58280c2e8a8507a31b624a43453bd8c SHA512 081060546281be7a36215ea6d60d9a2236dc25d6cca2da29b0c9c5c0549efc1d1de97bb0117aa59952d4d6d1197e4afa7fc3eba6f4b9e3ef029991dad60276d4
+EBUILD recog-2.3.2.ebuild 820 BLAKE2B 6261682f3ad083ccbfcc217000da03ee7acdd04a726e17c32da3b5a1472dc7e45dbf4a2c5b4fbe4a9b59ad853c932288f066d24f9c6a282849291af19d6a3ed2 SHA512 41ccda56593ee7a63c62e86169fb45512a1936dd2b15272f3de8a8f5010f74035a28adc91b73a166f1dc854a0d87a28f771a8c2ba737085e9ba52174f7e10989
 MISC metadata.xml 334 BLAKE2B bccb589153c4961a76c8bbd83ace97d4295b5c6a3b66ede325156940c8d0a1119bfaa838caa5d1e7ffb1363e4a3cbe8d2899fc2430b051dab63b11709f16d190 SHA512 cb416ad148d55b439a260d17b6f014075031a7b60cbf686b75e2b34f4d7bf82a8f0001c84f0dcbd9506a855a64dd20902965a0744cdd9fa06f6391929d5245fa
diff --git a/dev-ruby/recog/recog-2.3.2.ebuild b/dev-ruby/recog/recog-2.3.2.ebuild
new file mode 100644
index 000000000000..e041a3e28841
--- /dev/null
+++ b/dev-ruby/recog/recog-2.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="xml"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/recog"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/nokogiri"
+
+ruby_add_bdepend "test? (
+	dev-ruby/regexp_parser:0
+	dev-ruby/rspec:3
+	dev-util/aruba
+	dev-util/cucumber
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' -e '1igem "regexp_parser", "~>0.2"' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	ruby-ng_cucumber
+}
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 24e4622d1779..01059cabcf5c 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -2,8 +2,10 @@ DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6ae
 DIST regexp_parser-1.3.0.tar.gz 82564 BLAKE2B 4b35174893fe3af4d4c2f65625c8920ed4fa5b081868ecfdd418af5bd24749e123c27f26201caa7a792cc3abd89bd826ac332ad042731a330fbf3b05052c14fa SHA512 e2947d32bb8f81fab2428c92ca03389a6df963c4bc2104f9cb9bf013616efc5fdbef711e87d6ff15e2d3a5bc667b1a8c9fc643672975fa23b6e700b2a090c536
 DIST regexp_parser-1.4.0.tar.gz 82874 BLAKE2B b758f5c16c163d43fbf856af20ac6146e9fa81b2945fe7bed8ce66bb3f46586ca03d680a98ea3c2a2deab825adf5d7589856c666b763dc9e688e37e555bbeb1f SHA512 0d350df94cce0812e721d9b2d3b3dc2f5fdadf87eda3824e05121cbb6aceea9b99783bba771af74d9b5606e99e64e23af13abfb000f925440095d612b579c8b3
 DIST regexp_parser-1.5.0.tar.gz 83561 BLAKE2B 0bdbdfbeb8b576e078ae60f39260630139e1ce41c41e30750246e6f2f3d01a5f9186ea724fbbe1247f032eba7fa8be18906993155bcea54ab7710cd5d66c1343 SHA512 bb23a4ae04f4db4b4c02df323e2bcb0f4400e0ea6a362abeb7572b502766c7774ad04a04d9e8164c7650e3ac9f6b36b5ce0accc967aaa742aedbd61b55e24893
-EBUILD regexp_parser-0.5.0.ebuild 874 BLAKE2B 3b5f06c9ecbaf5f8cf271834c4faa3838d30364619cfe3794c4bb1ac00e6495b06918dd54d451d3bf1a6edd0d358eb96c48b3cb647750e4e4a63ce42a971d4ee SHA512 ce7521f4dd924ac5ae9c8af6b2e8f72d34162c63d0b99e35f440c771bb74279a78fddcd21a597405c94ac10bcf0f311b253585753667e4e7da7a0bfd7096b975
+DIST regexp_parser-1.5.1.tar.gz 82482 BLAKE2B ff1746e52e786e273923dd222ea8c8276eb1e4ffe9bf899068160dec229784709ba679983c1e43736c128ec094861174bd43e0aceea704ee2d38aff4a53e6775 SHA512 4856fbcac800083b417880c30b5d6a5ea445bb85950bdd7898f368bfa2d44b01b1e2058b279f1640cf1cf4d7b28e225d25bc2d356d2c4a7c1be0a2c621dd3827
+EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 643ac4c39b1558bbddd7cd4fce144887fdc6edefd08da694dc1626685831e30cd46da1d1f0a866fb05861ca49a3045583c5016a8586832508de917a0cc306eb7 SHA512 e8e6ff8528e6e7498e0ac559764a0ba260c373734962252777002ccd5bd70665f22e673cbc4857980dc4f0801b4409c37ca90e45b2f05c809d27a6edd0352aab
 EBUILD regexp_parser-1.3.0.ebuild 922 BLAKE2B 5be2d2c572cf88f11d57e426aff58fc7f5daac3d87920f159375c8efdeaab4865dfccd870d292ca9452ecea611dbaadfbd1ca575a496fb409dcca3f410a0f89e SHA512 4253374a0205da63624210a7fbecce3f587364997b02bcc11e526a14d1ee0fedf011da4029b011e830ed759492b0f839a0f18d425b89e5617d2be1f6588fed57
-EBUILD regexp_parser-1.4.0.ebuild 923 BLAKE2B 5e9186256f6aefc91bdce5132f7ea5db25519839f6a6f2ef48e4fcbec5232bda6680ae846e691ccccce01c6796c55067f5106a94a614d4fe49f9f7452d4b4085 SHA512 5a37ac3193aa6b0cd59184efbbc4e6c4689874441657e19820190755643ffd3f73013b0cb37ff2cd915cd360bb455240d1cd244fdedaa2e78f2e23309ecfb618
+EBUILD regexp_parser-1.4.0.ebuild 922 BLAKE2B 5be2d2c572cf88f11d57e426aff58fc7f5daac3d87920f159375c8efdeaab4865dfccd870d292ca9452ecea611dbaadfbd1ca575a496fb409dcca3f410a0f89e SHA512 4253374a0205da63624210a7fbecce3f587364997b02bcc11e526a14d1ee0fedf011da4029b011e830ed759492b0f839a0f18d425b89e5617d2be1f6588fed57
 EBUILD regexp_parser-1.5.0.ebuild 859 BLAKE2B 9f0111aa2452d92e69a43b452e9364677919683596a8022777df280fd12039fc62de41c0f2ad71125ae32debec70e4aa94a1dbbac1825cd6d7fd0ffd07cf0ffd SHA512 053686da238a0fc129e9e61bfe972bdaa50629d4557daff8e4bc053fb3be72c1902b1d397e120c5de7446ef0bb4ffadbcffdcf87bb761f12af2e7324587cc29f
+EBUILD regexp_parser-1.5.1.ebuild 859 BLAKE2B 9f0111aa2452d92e69a43b452e9364677919683596a8022777df280fd12039fc62de41c0f2ad71125ae32debec70e4aa94a1dbbac1825cd6d7fd0ffd07cf0ffd SHA512 053686da238a0fc129e9e61bfe972bdaa50629d4557daff8e4bc053fb3be72c1902b1d397e120c5de7446ef0bb4ffadbcffdcf87bb761f12af2e7324587cc29f
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
index e9781606fb8f..061c75e89e37 100644
--- a/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.4.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.4.0.ebuild
index c7be5088b5dd..2167d9769c71 100644
--- a/dev-ruby/regexp_parser/regexp_parser-1.4.0.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-1.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.5.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.5.1.ebuild
new file mode 100644
index 000000000000..804b3a4e3a70
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-1.5.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel:rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib bin/test || die
+}
diff --git a/dev-ruby/rex-bin_tools/Manifest b/dev-ruby/rex-bin_tools/Manifest
index dcf9262edf4a..8c471a9b49f9 100644
--- a/dev-ruby/rex-bin_tools/Manifest
+++ b/dev-ruby/rex-bin_tools/Manifest
@@ -1,3 +1,3 @@
 DIST rex-bin_tools-0.1.6.gem 81920 BLAKE2B 543e9c293b7589792c5cad55dbe7b760b97194a6adb01953ca81ee603e1c576c7f391012dc669fb03d7cf18ceab0ec88e0b4b6e0ac56fe21ffc4c6bc8b937fd1 SHA512 30e9137194b97aae0a0972a10cf415ebd28a11699ce03dda2c32529d985d0376a6028c40bc8570ea8328e076c51b7a52d26872c43074db2a98ed4b2db1969c2d
-EBUILD rex-bin_tools-0.1.6.ebuild 642 BLAKE2B 85a14b250185f0272d6775154c349a4c5f9d5aa4e8f762ddec31bcd04a05ebc5c29cdec65469db8eba611c6078474af08130b7cb713b83da29431e75d21abfcf SHA512 5d2df66415d00d1e508a812e6385f81782376b2679ee0b7adb6a2736fccb3b5671fd5ae31e1906bde23bcecad11ed95662ae69b510d791ae476226fe2338dfb2
+EBUILD rex-bin_tools-0.1.6.ebuild 649 BLAKE2B 883c1c6e37335370431f9e895afe7205a440eea54bb1fe0053c804afa460568d075d1e405ef621a186ba4fc468e041b716b4e7fcc15ee1cfa3b93d886c9e3a8c SHA512 33d1e639a32231e43828661759efc5fe3549ceac1247abd2622b655af7afdac1a84775c6a4f8aae420d88d8e4b8fba93762725ccddaf8240b91a73f8364b4134
 MISC metadata.xml 399 BLAKE2B b82cb7fb695efe7a4ff0e6e83e93dab0ed7f6704dd916161cd4042354714963096668585d421a362add7f73e966ce872d6533ffb6e0f935352f5e21214844b6e SHA512 7d9afbd71bb64675d28110ed1120f45f0369610b4a295fc55652eb75fd1c3bc5ea964635540a9c0161ab1f37981da6ac2c3e9faf5ce239a72b5f90b9dd8aa43b
diff --git a/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.6.ebuild b/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.6.ebuild
index 1ac91d731a63..ac87d48570e1 100644
--- a/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.6.ebuild
+++ b/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/rex-encoder/Manifest b/dev-ruby/rex-encoder/Manifest
index fbeb9fb102a6..a32c246777bb 100644
--- a/dev-ruby/rex-encoder/Manifest
+++ b/dev-ruby/rex-encoder/Manifest
@@ -1,3 +1,3 @@
 DIST rex-encoder-0.1.4.gem 40960 BLAKE2B 8ed2e19dc422249ae71f6725e475c7fa695791ee2d4d79ebc0a9c1a2b44a8e90728fce12d6c5eabc3aab472277038d465acd0e430f8cc81947756c1374acb184 SHA512 30c83308cba74ff3204d5b923370b80e22817b824341d6544ddd68e7f86465d52ee1eacae16c8276bdd7f785efd74de2423a9f4866e8b50e17b3424c96ef0ba4
-EBUILD rex-encoder-0.1.4.ebuild 644 BLAKE2B 9f24a118e67a94cef7c5e167699c08f97bab148b0b3a69275c0c17317d5f4c4da59887465bd6a0745c6f7dada306341084513df5afab63061eb5f09b99a456ca SHA512 27c3d24b909c24fa20c4382ffe8ec08664443cc84855c3328916323b279a8d9f7b27e58e8aed1fcb614f159b1b1810ea6ae1a0f60ee0c6eb39f6c0ca21a77298
+EBUILD rex-encoder-0.1.4.ebuild 648 BLAKE2B 114ead67a81879751ca8fc3ed3273be7ae0c1e52bb695fddba02b45567d59aa40c89a85c6523dd0d5046b938f49b5da3cac4d2b6abeed70d8eb93ced35383f16 SHA512 f693d261519cfe2b979a62103038836a1cb3bded69d553d4c19420adbbd01de86cbba9245cbdd48e2c4df0f2b59891378ddf60ec948d7020b1b87bf3ada5b8c5
 MISC metadata.xml 395 BLAKE2B 7edfb355a33e38963e2360abf61815b8848ac07a91f45718a970ecb1dc80c775e23f2c8b06e155011472bc1e468627eb36302fa6fc252aceb1563d484a3af3ca SHA512 57f77e7772cb1d0cde7ce68242ffe773a4960434a99c8f2e873d88ca06f5ea4cb1f56d28b17849f6a36880329b2642f3bf93776fec16c10a15ab017ec4ba532c
diff --git a/dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild b/dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild
index 01837135779e..4ab72064dbb4 100644
--- a/dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild
+++ b/dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # Specs are not provided in the gem
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rex-exploitation/Manifest b/dev-ruby/rex-exploitation/Manifest
index 340a28d0e334..27b14984cf11 100644
--- a/dev-ruby/rex-exploitation/Manifest
+++ b/dev-ruby/rex-exploitation/Manifest
@@ -1,5 +1,5 @@
 DIST rex-exploitation-0.1.19.gem 79360 BLAKE2B 47043054ee9d08775c67d54b31861ad3a454a487bdc47beb135942e267040de7611308c62a23cbf853d190fb8f88c52998dfe3b24f66a698e76e273b6a69d822 SHA512 244de5259e3f4f645df09d1843c34d9ea4f9ea56ba22498495792f192b79a0451810f5c7e73516da5a455c27e61b66f8ccfbc485372946fcedd179b75ff9b31e
 DIST rex-exploitation-0.1.20.gem 79360 BLAKE2B 59dea65582647444e21cc1b0ae744c857b3007b8215c81244d37c6f3d8abcb1ef1b1d01428f306b4c5f6fdd1b3db0326de3c50fa38fa50505b4de9c05ba518e1 SHA512 e1df4ffde57ab40bf4b2492370d44bf064f39f657c7a8140416f51560a0be9b31ef95b1bdadaae6f6ec75c86e0978b41112a18caa1f69262c67945d3529f9990
 EBUILD rex-exploitation-0.1.19.ebuild 623 BLAKE2B db040a15cc88f665e28bcbe3aa61050ea013d58ae4b250e8a129e9bfcea5dc8b04cfde68573c5c9c6d9e2617751f28cb02ebb61e08b862ad46b46842c04cf882 SHA512 5e1e3c631fbca630730438e837696965a21f1c6a1ef49fa311752fe3361c47cc769732d73857a7e8f0913c2700b5d2e51c11fa285241b10928cc48cc9adf307e
-EBUILD rex-exploitation-0.1.20.ebuild 620 BLAKE2B fb55ed0b54719e26fdb472d4482175a694096f4ec48e04a01f9167fb4ce4b04aa9da3ba52fbe137bbb5ec95e74d9b467c49795fd17e53b3797588c764010dab1 SHA512 eb708f52068f838eb0d0d04de566cf617b47164d2936bf48d957d79191f57c621e00100c3345773fd02e6f95aa95cb7890d7202420319caaca447c73d7c8bc25
+EBUILD rex-exploitation-0.1.20.ebuild 627 BLAKE2B 806f1be5a1487fbeba68548d7408602b6f6ec3a480c2cc7533961778588ca7cb4038e1aa36c5f04f918b3a2811843e5b4c1d2301f7d47d67d84f33867c0f1294 SHA512 235fe2607607bd5c8dcf2c2b1eb2efd8c40cf7adf7e99ddabe34d030bb0625ba8c2601d58b23f7456bb8ea899b390b045a25a0a470ed8543556900112ee1e1de
 MISC metadata.xml 405 BLAKE2B f814e2256b6d217a3ee4353eb07d5f5eda723cf7bcf06504ba34df7345584e1feb4320d445b5e5a2c91e9e86948291db47c06c60864954735181ef5bb790c993 SHA512 3af40e7e532b1d0c141aa419cdd5f10dc151c3406e90bc56e7e281a78e8fca7e8204213d6e0ffc6ed74ae4d0ca6a9bc79c5c4760be0406b0d89694d0299d5c85
diff --git a/dev-ruby/rex-exploitation/rex-exploitation-0.1.20.ebuild b/dev-ruby/rex-exploitation/rex-exploitation-0.1.20.ebuild
index e00da4173939..4ae9822adb15 100644
--- a/dev-ruby/rex-exploitation/rex-exploitation-0.1.20.ebuild
+++ b/dev-ruby/rex-exploitation/rex-exploitation-0.1.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/rex-rop_builder/Manifest b/dev-ruby/rex-rop_builder/Manifest
index 74c0c5aa2155..9d378a144f09 100644
--- a/dev-ruby/rex-rop_builder/Manifest
+++ b/dev-ruby/rex-rop_builder/Manifest
@@ -1,3 +1,3 @@
 DIST rex-rop_builder-0.1.3.gem 17920 BLAKE2B 065ab39805966db515da08a1c321cde39e07b140aa58c48eaeba15ba12d6ae9da6455d924aff3355fe1c89d1b0ab54704f18b60cec13f5267e9f6b7bfaa0b312 SHA512 c01c82761bd317fcdf0de4cd03b834c3e3d2638a9bf72e7c47643fc8faab179dfa639b319fd1de7691d0dc2ccb7578bebbd567e03e8efe24553cc481456ad4d6
-EBUILD rex-rop_builder-0.1.3.ebuild 558 BLAKE2B 8cf22798f4d01a88c942bc5bf076188c5ff64f30a8d53e0df7905183f3092af9ba0ef4e6d4c70a89dbb8b08ab1d99e7bc065dfbed1f6e3df569c04fef537cac5 SHA512 b8690c182b0574fb36422bbd7741699dd079022f910de1187e6cfd3418ab670ae3452714f1f862a7408858162a43b579af6657271b43d7dcb50cd2ca2eed69f1
+EBUILD rex-rop_builder-0.1.3.ebuild 562 BLAKE2B 1016ca9cef9188e30071165f05250e5bbb889d08f28971f770193aff2ebe3937d5fa8f5e032b41fbd3d03bac0cb1bd05c3b7be06c12f368c5d50be3b953c2d6c SHA512 87bf1bafa6aabdf6e5028ee35dda2e84ef67afd9b6efaa3cd51d439fc600933d4ef0cb584e71e6aca2d667c121dc556906857c36b8de2a99acf82d2d5c5994cc
 MISC metadata.xml 403 BLAKE2B 9a5c794632db50243654e3b68165492bfb92ba003f4985c9ab5bd508b483425abdce6c74435f7c39602aede5f44f80f2817c5fac80e609e3705a57ce33e8b014 SHA512 e96dbda4584d3c4057cc8a20b0d39240fffaa9aa01449658c8d32b09e76e8f0c2242d075278ff330a6c0a3564e85382b8972eddefc7caa682d3abab0d208c253
diff --git a/dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild b/dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild
index 219d91961f4c..776b98e5c24c 100644
--- a/dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild
+++ b/dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_BINWRAP=""
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 1b8fd221ec0d..b14d40545fc0 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -2,8 +2,10 @@ AUX rrdtool-bindings-1.4.8-graph-ruby.patch 1857 BLAKE2B 4a36c4dee4e755bd39851c5
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
 DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
+DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 EBUILD rrdtool-bindings-1.6.0.ebuild 1326 BLAKE2B b266e0aa7d92ba5a38b932a093be20ec12666df06a77b923819f18e0ecfd704df6b8974f7db4bcf84cf36dfd3bbc3b93cd4043a391d3c68182442a9c06d26393 SHA512 691b98c9f70445a4b02c512c5f08e7198ab0060adba1f58b0ae8cf6cad835043d8bedea3a4a75b443b33012aedffaa3ffa27a7f7444790a518bbfd0e646ff1b9
 EBUILD rrdtool-bindings-1.7.0.ebuild 1332 BLAKE2B 6d9d813bbb0b5b9b19ab7aeed4adc5409b1f5d584b7b36fbe7e80c9231ce9cdea562907670a87985459af303de251176bfd29ee59f1a264f1dd0feacaf0837ba SHA512 67cb1d983c79dfbac0a03e3adbdeaa0706671096df31846949874733c23e498e3ceb04bbce65f372f14b32083b0fd4d61d00bee0650f851b11fd34a44a012841
 EBUILD rrdtool-bindings-1.7.1-r1.ebuild 1338 BLAKE2B 76f06f4a5764e493a6dad34f691ef02eb7254ea9f5350ff02cee3cb3f6dbe46c85f19fb281d0a9466fcfa52e521df221f29c4c261cbe5f5cf261f233e7ddf76d SHA512 2042c9db914941a057a0c3892bc951d225fbfc3a65273651b51491f01004b55be56a05681c3e1dd60bd8f0ead27bb9a8c7e277e87f2e7d087ae7e8e6d3238f69
 EBUILD rrdtool-bindings-1.7.1.ebuild 1331 BLAKE2B 6b352bc9bb7383edcfecfc58b4498dbdd81bf1047715ec97cf8fad886273cb50c8aab98240ef71459ac1e580b3aeea87ad0acd6c15e5b98101aaf01bec697133 SHA512 aa8e63093b5cb2b82f9ac9934a66ff17df6d9605594b54fa0db6b11cf6e32183c7dcb779b67cde0019d7ca490da2dd8015f80dad727bf55f461a832cd28bfbfe
+EBUILD rrdtool-bindings-1.7.2.ebuild 1338 BLAKE2B 76f06f4a5764e493a6dad34f691ef02eb7254ea9f5350ff02cee3cb3f6dbe46c85f19fb281d0a9466fcfa52e521df221f29c4c261cbe5f5cf261f233e7ddf76d SHA512 2042c9db914941a057a0c3892bc951d225fbfc3a65273651b51491f01004b55be56a05681c3e1dd60bd8f0ead27bb9a8c7e277e87f2e7d087ae7e8e6d3238f69
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
new file mode 100644
index 000000000000..113be286f9b9
--- /dev/null
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_TASK_DOC=""
+inherit ruby-ng
+
+MY_P=${P/-bindings}
+MY_P=${MY_P/_/-}
+
+DESCRIPTION="Ruby bindings for rrdtool"
+HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
+SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
+RUBY_S="$MY_P"/bindings/ruby
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="graph test"
+REQUIRED_USE="test? ( graph )"
+
+# Block on older versions of rrdtool that install the bindings themselves.
+# requires rrd_xport which requires rrd_graph
+RDEPEND="
+	~net-analyzer/rrdtool-${PV}[graph=]
+"
+DEPEND="
+	test? ( ~net-analyzer/rrdtool-${PV}[graph] )
+"
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
+}
+
+each_ruby_configure() {
+	rm ../../src/rrd_config.h || die
+	touch ../../src/rrd_config.h || die
+
+	${RUBY} extconf.rb \
+		--with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH -UHAVE_RRD_GRAPH)" || die
+}
+
+each_ruby_compile() {
+	emake V=1 ABS_TOP_SRCDIR="${PWD}/../.."
+}
+
+each_ruby_test() {
+	if use graph; then
+		${RUBY} -I. test.rb || die
+	fi
+}
+
+all_ruby_install() {
+	dodoc CHANGES README
+}
+
+each_ruby_install() {
+	DESTDIR=${D} emake install
+}
diff --git a/dev-ruby/ruby-atk/Manifest b/dev-ruby/ruby-atk/Manifest
index caedcfc6fba4..13425fe23201 100644
--- a/dev-ruby/ruby-atk/Manifest
+++ b/dev-ruby/ruby-atk/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-atk-3.3.2.ebuild 745 BLAKE2B 305ff6df6dc4edebebd436328e798bb0f189535ad20ebd38358d8a2d7d8853926663d536b2cebd8714da9e99673262176869601ddb806e611dd63c3b2446659e SHA512 594f8eab177111023f3dc3b5aa5db9995fd036a86c2f2d4a02b307950bdcbeeca638cce268bf28e672943568124271756ac8751f780b7b7b6d96ef5eaca37fe3
+EBUILD ruby-atk-3.3.6.ebuild 739 BLAKE2B 5cb8a40421a958d24f6cee62c5469723eacd672a1a11606c7fabe35f2c02ac03027cceb5636dafc70771c1ad77d35e0f1e5fbf0b6d2d5a8db30f9b3b6218f3f4 SHA512 8f8d57f9346ba9761edadcaf8637b81de31e2bd721696cff0bca9dcdcf48828f52207cbf84642a3525aa5baacd06dec43fc9d7ed003c556416b4d4116e3636b2
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-atk/ruby-atk-3.3.6.ebuild b/dev-ruby/ruby-atk/ruby-atk-3.3.6.ebuild
new file mode 100644
index 000000000000..f666da65a3bb
--- /dev/null
+++ b/dev-ruby/ruby-atk/ruby-atk-3.3.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Atk bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND+=" dev-libs/atk"
+RDEPEND+=" dev-libs/atk"
+
+ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' test/atk-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-cairo-gobject/Manifest b/dev-ruby/ruby-cairo-gobject/Manifest
index 86e13440fab5..277de7aa9c0d 100644
--- a/dev-ruby/ruby-cairo-gobject/Manifest
+++ b/dev-ruby/ruby-cairo-gobject/Manifest
@@ -1,5 +1,5 @@
-DIST ruby-gnome2-all-3.2.9.tar.gz 2305753 BLAKE2B a7db155431ba45cc35d5aeba1c2cd1d9b9da8dad4fbb914812a5eaa36f25a8f0e947f90c8e71f6d087852621fa139a22be0422af81934dd7b82844cf7fc02183 SHA512 e3f960852d97f2693f1ad6c26655232c74c99d9d98529dfed0ca922c57de1bf3444a7b3595e1a59ebd6b8064b7f5449f1eb774c09c085b74e5ce81b9354fd868
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
-EBUILD ruby-cairo-gobject-3.2.9.ebuild 946 BLAKE2B e0df0ca8f4f7fa25a1a78b3273a7f7c20a9c53e88535706c21f2a179e21e05437a4a714a1d4ee3be80ecf9193c36262704690bd7d57aa6a84f7c78e1693f4eaa SHA512 440583b717b3b9c93b95f92eb4f96a12f6cbc8354b1d3ee30e51db34853af5115a671adcc5dfffcce9bfaa7ec5929adc984df896f4d38d3382ff498167617ad3
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-cairo-gobject-3.3.2.ebuild 949 BLAKE2B 421ba2758697cbaad9ce0a058b40ae1644bdb3cacfddaee283a8b153b15085322c707513ad0f571bdf2bcfab382ef81e6df972e3f65ae4908e638431b90f5ca3 SHA512 60b85c4f9f3c93292476c7a48b1db70e28c5a31e95e22663d9458e429406c3749483891080723d15115e79084ee57dda313826f5aa3f8a0ce0b45905ff8dec28
+EBUILD ruby-cairo-gobject-3.3.6.ebuild 936 BLAKE2B cba00a20f21e2798bd1293d89ba9b04f4df8ac08c4e5bbbb3d2db0cc241a6c1e87a201fcfbc61768eaf3e6df54f6190200e506d3ec6a7eb7f8428c607cb0b8e1 SHA512 71a238d3670caff64ec8a0a9b1c7e1f0d95e2cd032667ad714562a721ef87750a4c0986751047c288823f2226d46595c282b08276180bb493e458c72691375b5
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.2.9.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.2.9.ebuild
deleted file mode 100644
index 64c5c78cf850..000000000000
--- a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.2.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit ruby-ng-gnome2
-
-RUBY_S="ruby-gnome2-all-${PV}/cairo-gobject"
-
-DESCRIPTION="Ruby cairo-gobject bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/cairo"
-RDEPEND+=" x11-libs/cairo"
-
-ruby_add_rdepend "dev-ruby/rcairo
-	>=dev-ruby/ruby-glib2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-	sed -i -e '/notify/ s:^:#:' \
-		../gobject-introspection/test/gobject-introspection-test-utils.rb \
-		test/cairo-gobject-test-utils.rb || die
-
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.6.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.6.ebuild
new file mode 100644
index 000000000000..ecd747dd85fa
--- /dev/null
+++ b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+RUBY_S="ruby-gnome2-all-${PV}/cairo-gobject"
+
+DESCRIPTION="Ruby cairo-gobject bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/cairo"
+RDEPEND+=" x11-libs/cairo"
+
+ruby_add_rdepend "dev-ruby/rcairo
+	>=dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		test/cairo-gobject-test-utils.rb || die
+
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-clutter-gdk/Manifest b/dev-ruby/ruby-clutter-gdk/Manifest
index e287b4dce215..b252e715da25 100644
--- a/dev-ruby/ruby-clutter-gdk/Manifest
+++ b/dev-ruby/ruby-clutter-gdk/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-clutter-gdk-3.3.2.ebuild 531 BLAKE2B d593a67d004ca527c6861db89999d8fbc765e95bfc1b1c02f9623245bb3c73c670445a9117eb280c46f247427c006fde022774b1aafb9c47451ec9757a341000 SHA512 5d26fab2a8aeadd63b4065b77412929e77f83759a4acf4822b600e64b8007373a1acea5bb7f68d97ca0498ea6e8d64eccc27ccd389c9e5312f9aab7cceb99015
+EBUILD ruby-clutter-gdk-3.3.6.ebuild 525 BLAKE2B af61c0c8d3871153c8412219d844c5c61b0dafc9ab143b6b817aebfdc482b614e374c69dd9f3c488dd351b5e60647265ec3b3d2c6f823cf04c5a7079f8c5c26c SHA512 6826afe5072a09f0a243d315d91f0080a84b51a5671543fa8486218646acc75017bcb624a37371cd7f6603c1f9ff5cdb7ddacbc6d3286ee48c3b696a0ad3c75d
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.6.ebuild b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.6.ebuild
new file mode 100644
index 000000000000..0dcb0dfa89ea
--- /dev/null
+++ b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby binding of GDK specific API of Clutter"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter-gdk
+
+RDEPEND+=" media-libs/clutter[gtk]"
+
+ruby_add_rdepend ">=dev-ruby/ruby-clutter-${PV}
+	>=dev-ruby/ruby-gdk3-${PV}"
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-clutter-gstreamer/Manifest b/dev-ruby/ruby-clutter-gstreamer/Manifest
index 24eb74391030..ad521a2b82fa 100644
--- a/dev-ruby/ruby-clutter-gstreamer/Manifest
+++ b/dev-ruby/ruby-clutter-gstreamer/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-clutter-gstreamer-3.3.2.ebuild 1008 BLAKE2B 30cb45a06a3d2a59b38a6a8cd1dce565e5bded38eb4b5ad82c329ad5cfdd9bae766531d507fac8958601f9244afcd7ef71661bffc28c8f707432d518f88b8a3a SHA512 8be5a67eb339a02fb5dd1f4758286391f827242865f422a7e036aa0d22eaecf881f7e579b254c891eb5a696a1827a5166b5945fec5761eaeb5bc84a2310fbef0
+EBUILD ruby-clutter-gstreamer-3.3.6.ebuild 1002 BLAKE2B 6b348e5b5868081ce66fc61aaae963c758a17b3ec638a9d9a22d58af73bc469740d0c68c7803485086632f741784d99c3b3f3d3e231e728b21ae1c39e3d301cd SHA512 ac86136c4d0a6d0f0269d07cdbe4133f15e91564fd3462e2da95d000a79c223074577059f784996f1eb81edeb2ee79eabc11166c4db0861b34f06199d060a5b6
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.6.ebuild b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.6.ebuild
new file mode 100644
index 000000000000..2dbf1ed25069
--- /dev/null
+++ b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter-gstreamer
+
+DEPEND+=" media-libs/clutter-gst"
+RDEPEND+=" media-libs/clutter-gst:*"
+
+ruby_add_rdepend ">=dev-ruby/ruby-clutter-${PV}
+	>=dev-ruby/ruby-gstreamer-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		../clutter/test/clutter-test-utils.rb \
+		test/clutter-gstreamer-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-clutter-gtk/Manifest b/dev-ruby/ruby-clutter-gtk/Manifest
index f3fd5ac33afc..99f5dfc1ee60 100644
--- a/dev-ruby/ruby-clutter-gtk/Manifest
+++ b/dev-ruby/ruby-clutter-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-clutter-gtk-3.3.2.ebuild 1081 BLAKE2B 3ed182d8fa5f6d6365952a91faf49298ba7e3e511219e3800b169e1c6401bd54d42e7ede6b8dd4923d69e809ab967a19706e896f0419bdb8455b1c805fdddef8 SHA512 dee9e8aaeaf5d1edfd5c1e4db036f048c31168c1a8e2619e8ee7bc53e558c392d7534f09ff631d28252be48d3310ecde4bde2d659d1e48a2a7cf29b5b9b35012
+EBUILD ruby-clutter-gtk-3.3.6.ebuild 1075 BLAKE2B 5c0b5b33df1c163dfe6e06a7b9a5802c69c24c294a2b808a49f3909b826d3a23ceb8c174b87beb7202f0b97f0789756f1cfe9a945b7d737d25b20bc819e3951e SHA512 85e67d0fb6827f99347e7eee4fd6211bdea308f72699ec0ee50c2412ee43303b241d5792fbc7e838e5b591ee19a9be947ac327b2b9a5195ad7705d0256a9396b
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.6.ebuild b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.6.ebuild
new file mode 100644
index 000000000000..aa266f055b4b
--- /dev/null
+++ b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter-gtk
+
+DEPEND+=" media-libs/clutter-gtk[gtk]"
+RDEPEND+=" media-libs/clutter-gtk[gtk]"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-clutter-gdk-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-clutter-${PV}
+	>=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		../clutter/test/clutter-test-utils.rb \
+		test/clutter-gtk-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-clutter/Manifest b/dev-ruby/ruby-clutter/Manifest
index 173c362fdb18..5dea2311098a 100644
--- a/dev-ruby/ruby-clutter/Manifest
+++ b/dev-ruby/ruby-clutter/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-clutter-3.3.2.ebuild 1212 BLAKE2B c996c36e81d46814ed5a34da846efc1ebb5b82fdddd6ca1b7d2af35f99dad330dc183d3bf994e759da2907d173b36ab21e74f61c78f087bc16a0b2d6f5fdcd3e SHA512 d3cfdb0bb93ec57c7f096df993fb7a8688ba40f16509ca7d6d1394a41b1ff6c1e0b2c4c4735f6f151851fe7845bb75f67aa7c058a07f4d119de46df112c2ffb9
+EBUILD ruby-clutter-3.3.6.ebuild 1206 BLAKE2B cc7f77bbf14ba2c0a7cfc084caecf4d2f2ebe69e3dbf263fb9fd1fa5d9152e32f1cc8ff2eaa8fb6acae9a7df29f3d0273dc84c40dedf76c514ddb1bd8c11a542 SHA512 e47f63468488e28186e9e44fa3210668adc143d13f044ceddee69184256750437e3f624ad77b67e3cde02b36490339b7d05724c831e18ad3c1ba1049ad924150
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-clutter/ruby-clutter-3.3.6.ebuild b/dev-ruby/ruby-clutter/ruby-clutter-3.3.6.ebuild
new file mode 100644
index 000000000000..90000c969b9a
--- /dev/null
+++ b/dev-ruby/ruby-clutter/ruby-clutter-3.3.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter
+
+DEPEND+=" media-libs/clutter"
+RDEPEND+=" media-libs/clutter"
+
+ruby_add_bdepend ">=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-gobject-introspection-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-cairo-gobject-${PV}
+	>=dev-ruby/ruby-gobject-introspection-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		../cairo-gobject/test/cairo-gobject-test-utils.rb \
+		test/clutter-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-gdk3/Manifest b/dev-ruby/ruby-gdk3/Manifest
index 2f9eef2ccd4a..8ca3db634791 100644
--- a/dev-ruby/ruby-gdk3/Manifest
+++ b/dev-ruby/ruby-gdk3/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-gdk3-3.3.2.ebuild 849 BLAKE2B 4e3fbbafbd5b7ed2a30bef8b9e1ca2a3f37845fa2cd3b1af603e70afccc643b2ba96889976973a961bf2e98332ebcb6f3f436cd4c829e3b4e6552419c669da87 SHA512 a8d147a3f5d4d6da40c2d8a25b929ffcdb97ffd06f691bb4b23372d4a8f4a4a99716a7f8f02e9ebbf59b5e41504901e9f6c4b9346f16455a64f1016bb8c12b7a
+EBUILD ruby-gdk3-3.3.6.ebuild 843 BLAKE2B 0d387bc85c8eb01b8a58f46ca24733d43e9243b9f41eed7905c1d3cdee622afeec925e9a2e52f1134cd5ca7431b70941b9f37526b5bec0b725f94c3b4cf147fa SHA512 e17bb3f06518bc700913ca3e64962f42410ed70222e15b56596d21c36fb32377217236d20fe732a53335df800a1fbe6705b558fef5075b94a105c4ceda2067be
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.6.ebuild b/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.6.ebuild
new file mode 100644
index 000000000000..ecd7f280062a
--- /dev/null
+++ b/dev-ruby/ruby-gdk3/ruby-gdk3-3.3.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby GDK-3.x bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:3"
+RDEPEND+=" x11-libs/gtk+:3"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-gdkpixbuf2-${PV}
+	~dev-ruby/ruby-cairo-gobject-${PV}
+	~dev-ruby/ruby-pango-${PV}
+"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		test/gdk-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/Makefile/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-gdkpixbuf2/Manifest b/dev-ruby/ruby-gdkpixbuf2/Manifest
index cec911cec6a0..bb4a9cc21ce9 100644
--- a/dev-ruby/ruby-gdkpixbuf2/Manifest
+++ b/dev-ruby/ruby-gdkpixbuf2/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-gdkpixbuf2-3.3.2.ebuild 572 BLAKE2B 6c60f1c4f68a04fddf0e56f521262f243de26a7963efd61db677e03d2476cfb983c4a4080c2e86dec804ef57371fdbf87fb7f91cd8ee58908135fa7f4fea4681 SHA512 54ad5840c0608c264ac8c98ddd61724c0d0e8bce1962b21ca796653dc37b35f6658ebddfe6edcb8eccb69b1e230d572b3427728443ab6e7010ac9bf31e44dd3d
+EBUILD ruby-gdkpixbuf2-3.3.6.ebuild 566 BLAKE2B f395f2ae2614fcca93ccad766b378389d520a81bf1ea4dfa951878731ad97b213595a4e623033e947e48501f5d6914fa5f7be6e9d0973600ef9f108969b0109a SHA512 c2345afafc74e7ed9efeb52121537852ed99a613c7093fd8f9340f770220f7f1327fc9ace3516780a6dc88a06821ea43fd647f193a8f16e60dc48f0c30b5b82e
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.6.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.6.ebuild
new file mode 100644
index 000000000000..bdf7742116e2
--- /dev/null
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.3.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_NAME="gdk_pixbuf2"
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/${RUBY_FAKEGEM_NAME}
+
+DESCRIPTION="Ruby GdkPixbuf2 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" x11-libs/gtk+:2"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-gio2-${PV}
+"
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-gio2/Manifest b/dev-ruby/ruby-gio2/Manifest
index b71cd3835a0d..686c70bad591 100644
--- a/dev-ruby/ruby-gio2/Manifest
+++ b/dev-ruby/ruby-gio2/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-gio2-3.3.2.ebuild 945 BLAKE2B 203737505ff329c34f97e677c7d29e1efc0dd62ec9300206350a0d716d52d464acd63a4d2ecbf21972650f3ac3ced870dba3cb51e3664e50a82865cc542a2edb SHA512 758ded8237888b5371b5a27cd2d67407516d7a1c7d72a574edf1f21a68ffdb45bd69817ac497414c8e289ee19dd86145f4d00d13c528f7201908c60b1b7cce5a
+EBUILD ruby-gio2-3.3.6.ebuild 932 BLAKE2B a57cc8bd9b607d38800b982184328cb5e2b9bbefeee50f3b03493f06ef4fd42476b0d2c3d85d519d493e065504912060edd8e18c45b01f3c1c985e78d5d44b68 SHA512 f5326cee41a43e63f469c417b92485295042b69c35d2c67e7de9453b7f27e5981948d664549de9a4786da8426b213a5782231989048856c215b81971be6b4c28
 MISC metadata.xml 484 BLAKE2B 92b370579737b078247911f01123a69d4b3a885554f2d0ad7f4f327b2b9d99af9176c362f9fb206f8d0c0cad2f929562f647777333ce0d65819857b56dfa2f0c SHA512 d2a0d82edb1c77c3ce6138842269447a5e1e2ddeb5ffacd1d3c5692132f52ca310a8314285006b98aa277816ed63203542685749d8e13ebf563726c1b63a61bb
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.3.6.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.3.6.ebuild
new file mode 100644
index 000000000000..341d6ab3eb43
--- /dev/null
+++ b/dev-ruby/ruby-gio2/ruby-gio2-3.3.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby binding of GooCanvas"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-gobject-introspection-${PV}"
+
+all_ruby_prepare() {
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		test/gio2-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/which make/,/^  end/ s:^:#:' test/run-test.rb || die
+
+	# Make sure Makefile is generated fresh for each target
+	rm -f ext/gio2/Makefile Makefile Makefile.lib || die
+}
+
+each_ruby_test() {
+	XDG_RUNTIME_DIR=${T} dbus-launch ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index e98095435163..fc0edf98fb07 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-glib2-3.3.2.ebuild 844 BLAKE2B b28c519fe7926bd0a67f10b58e40bd055642aeed3191f08d391fb0fb1e7d56201462a4c7adcc888b66731a1090219bfa86dc4dce1d801719ef3114468e503fe3 SHA512 71d13d477e756c1cb8e749f692a70d84d75b620a3c1d72447aa9139130d0e0099595348775f4dd6bf32fc2255de1f96252cc68b15627298de4137a1bbd14e8df
+EBUILD ruby-glib2-3.3.6.ebuild 884 BLAKE2B a4872156721bc6f7a65d876c04436c68eec9c8409e91ccdfb9e1477f8c8dfa7654c373d077b519e0905e2a62182f5264fdf80bd7d9273931e6beff524a55b72d SHA512 0f995f8522b503c3f2d2fc5125eab6b2c83aa74ab2d2b3232f4e4ad69ab311cf57d8c29344f6d1b4bca48964b48ee89e0b2602f83cf775bf9e060ecd46e8c435
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild
new file mode 100644
index 000000000000..b5ef2c1f6643
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+ruby_add_bdepend ">=dev-ruby/pkg-config-1.3.5
+	test? ( >=dev-ruby/test-unit-2 )"
+
+all_ruby_prepare() {
+	# Skip spawn tests since our sandbox also provides items in the environment and this makes the test fragile.
+	rm -f test/test-spawn.rb || die
+
+	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
+	rm -f Makefile Makefile.lib ext/glib2/Makefile || die
+
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#:' -e '/^setup_homebrew/ s:^:#:' lib/mkmf-gnome2.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gnome2/Manifest b/dev-ruby/ruby-gnome2/Manifest
index dd993fbd078f..e5d45970ecef 100644
--- a/dev-ruby/ruby-gnome2/Manifest
+++ b/dev-ruby/ruby-gnome2/Manifest
@@ -1,2 +1,3 @@
 EBUILD ruby-gnome2-3.3.2.ebuild 1017 BLAKE2B cd0e8a1444124910a0a91fb06ddb68c31f15177c13f05b8c387cae90f691be1785361f4ef82e952bf36ff41cc62c42375b398859d133d7f9254dbe2f5b839d0d SHA512 8e7c88e37b24c7f8db9da7285c9d2c342ac0c1e64638e49786064a68d65cb4ec8a45b413c052edd48afad4fe24528ee2957141eeccf813b07ea9584ba9e83a10
+EBUILD ruby-gnome2-3.3.6.ebuild 1011 BLAKE2B 7628e3a09af9706f626f4b6e60e75180027f926ec30e0cb100f77b47b15178d349234e2070345487263ca341ed780c94a891737bf62ee5351f90b687e3effc9a SHA512 94607e8b51c6ebee5ff6fd9cd2065051bb84955a52ac0bac4150486857b6e403f433c2eee2e0bd95d9a354aecbb393d5d2ba4d9fb0ba8a184e4b17f0c6e87ee7
 MISC metadata.xml 335 BLAKE2B 5707a3055ed527b5df006003c21be9700e45bcd9f59990b9b685a908fb7014f17bdbc99f79c8892c234a291c0c47585ddcff5c9401dc0d87dca03d1abab1778c SHA512 fa2c5a187e5c868de7f4b9b5398c248f325f1b3d0b2a490d782f2406fb9f587d0150ad4f91b7738d7d856ee8ffc18529f7a38590aa1774faaad3dd22a68b8af6
diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.6.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.6.ebuild
new file mode 100644
index 000000000000..e7a6d40efe5a
--- /dev/null
+++ b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng
+
+DESCRIPTION="Ruby Gnome2 bindings"
+HOMEPAGE="http://ruby-gnome2.sourceforge.jp/"
+SRC_URI=""
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-clutter-${PV}
+	>=dev-ruby/ruby-clutter-gstreamer-${PV}
+	>=dev-ruby/ruby-clutter-gdk-${PV}
+	>=dev-ruby/ruby-clutter-gtk-${PV}
+	>=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/ruby-gdk3-${PV}
+	>=dev-ruby/ruby-gio2-${PV}
+	>=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-gobject-introspection-${PV}
+	>=dev-ruby/ruby-gstreamer-${PV}
+	>=dev-ruby/ruby-gtk2-${PV}
+	>=dev-ruby/ruby-gtk3-${PV}
+	>=dev-ruby/ruby-gtksourceview-${PV}
+	>=dev-ruby/ruby-gtksourceview3-${PV}
+	>=dev-ruby/ruby-pango-${PV}
+	>=dev-ruby/ruby-poppler-${PV}
+	>=dev-ruby/ruby-rsvg-${PV}
+	>=dev-ruby/ruby-vte-${PV}
+	>=dev-ruby/ruby-vte3-${PV}
+	>=dev-ruby/ruby-webkit2-gtk-${PV}"
diff --git a/dev-ruby/ruby-gobject-introspection/Manifest b/dev-ruby/ruby-gobject-introspection/Manifest
index 36caae8914ad..956f531b188b 100644
--- a/dev-ruby/ruby-gobject-introspection/Manifest
+++ b/dev-ruby/ruby-gobject-introspection/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-gobject-introspection-3.3.2.ebuild 1064 BLAKE2B 58395216023484a4eddbecc51d39ef4181034ae31535d0ae60ae87e31269fc89d955c587e64cd369cdc990fdeabdc96b05302c89e977dcf65e31b5dce5588a61 SHA512 2afddec38dca9c32b3e5b79fe338f52ac8c3dfc02d54e3377bb7928f3e522ecf361d8dde8e29d9d598396309c8c3f22e917101abba3be82b68167393d60ca8e1
+EBUILD ruby-gobject-introspection-3.3.6.ebuild 1051 BLAKE2B 8a7cc0ca7691fd8676a319bac7179b0bb7c9add3555238adfe0428a81cd23fbe88bfab96ed60e3a01bfbba14d34714238142df7fcab50dbe9645367d70458cc5 SHA512 23000a36802cb89711e747fe3d4a0d720409b61a38a964b51cb64942a1c2733d6ed089cafb13ce0443f05367f3ef246d237b31c001432f747d6d09b0fbcd2065
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.6.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.6.ebuild
new file mode 100644
index 000000000000..2cb9544a2609
--- /dev/null
+++ b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/gobject-introspection
+
+DESCRIPTION="Ruby GObjectIntrospection bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/gobject-introspection"
+RDEPEND+=" dev-libs/gobject-introspection"
+
+ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
+	rm -f Makefile Makefile.lib ext/gobject-introspection/Makefile || die
+
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' test/gobject-introspection-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gstreamer/Manifest b/dev-ruby/ruby-gstreamer/Manifest
index 1862bc598072..c7e27b0dd323 100644
--- a/dev-ruby/ruby-gstreamer/Manifest
+++ b/dev-ruby/ruby-gstreamer/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-gstreamer-3.3.2.ebuild 886 BLAKE2B a53c045d7edd7d64a98b1c5710fb8ec1f442256ab277a0537df2ff2f9deb1cb8abab6c9886858187eadc1f3edb341aca1e298a049692abdda68931aa6262bf6d SHA512 56a244610a3de81622d71896c83909b09f045df43faf940f8606f382c522bc673dc5379c5739f08686b2638b8bbed781974f7c585d0aa68abb05bf20e82ed155
+EBUILD ruby-gstreamer-3.3.6.ebuild 873 BLAKE2B 556cacc9348250bdf6a6d7beacc056a1875728e17c02cf0c707c7a557238f42bd07890ef1d5d7e91761e1cf970f3e3ef04f1e63056b9af09bf9b52c83da64e9f SHA512 4d1a1bb17f0417ed6d3cb19685f466d1f16e3c7f5782894da9501e8fe7e4a363ebb73c6e042babd06bec3e0b23170021c8db7fefb60c570104bddfe9fccd153a
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.6.ebuild b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.6.ebuild
new file mode 100644
index 000000000000..93583053003c
--- /dev/null
+++ b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby GStreamer bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0"
+DEPEND="${DEPEND}
+	dev-libs/gobject-introspection
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-glib2-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}
+"
+
+all_ruby_prepare() {
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gtk2/Manifest b/dev-ruby/ruby-gtk2/Manifest
index 5b2aba64995b..b9085fb26b5c 100644
--- a/dev-ruby/ruby-gtk2/Manifest
+++ b/dev-ruby/ruby-gtk2/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-gtk2-3.3.2.ebuild 1018 BLAKE2B 04564e48ecdc2e1effe0709e127e9db77df3b238d68dadbf359c246ed286d4edf09e3a0f68f54462e575b8846ae1c53128a751a8febd83c83accfde1660daeac SHA512 a9121c567b3dcc027831da18a97f83f93c22cf4e5d8bf2aadd4f5eee917aefdccf30829a23b431966a3b997bc48b52be733c6990834b98aca120a9706db4537a
+EBUILD ruby-gtk2-3.3.6.ebuild 1005 BLAKE2B da1bc877607fce36ea597f5bf8d4739fe30be2945d9a780b832e9b13ac3e82aded631d37c5e78f4fb85fd87acaf8c754a02b41634e523912d315d8a649a454bf SHA512 ce95fc881be56582d461ca50e67a26674e1f1a7e2fd01f3faabc581ba720371997d27f932f668cb79818931018708dee7438c4823570e8ab96a5f7c38f79424b
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.6.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.6.ebuild
new file mode 100644
index 000000000000..42e6773e7dff
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk2 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:2
+	x11-themes/hicolor-icon-theme"
+RDEPEND+=" x11-libs/gtk+:2"
+
+ruby_add_rdepend "
+	>=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+
+all_ruby_prepare() {
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+
+	# Use standard icon
+	sed -i -e 's/"find"/"call-start"/' test/test_gtk_icon_theme.rb || die
+
+	# Fix search path for gtk-2.0 on Gentoo
+	sed -i -e "/include_paths =/ s:]$:,'/usr/include/gtk-2.0']:" ext/gtk2/extconf.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gtk3/Manifest b/dev-ruby/ruby-gtk3/Manifest
index 635f6fdbc1aa..03e480675f4a 100644
--- a/dev-ruby/ruby-gtk3/Manifest
+++ b/dev-ruby/ruby-gtk3/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-gtk3-3.3.2.ebuild 1072 BLAKE2B 0396307ff637c97255164ab7aa03f0c446ea739db81a8c34ed9ffb5c02aa2a781c1ae9ad6ca7e62a14a91465bd495f9eece9f81277a64fb35c95f605f49ad004 SHA512 32ea33da483e5b80a260cb165d4c41d7d096a610fe64074fb51646d3a3a9d5906674f08e5c7d507be8d7b6e0c6b3c3b1c46481baf6043cbbf6debcd991429041
+EBUILD ruby-gtk3-3.3.6.ebuild 1059 BLAKE2B 6d71e9bf50f99dacacc4f694372eea8c15432bad890d8c1959878bc622ed7599861cafd276fc453a0522f9bde1b0e4ae40155a70596264ed8a5083bc6a1b5c0b SHA512 eadbf5049428480ffefb2bfbd57b01face82bd8f22078f26ecd67b425652a4fb57242bd6d8ad2240c7abf7311010b9dc909491073a5a8af35fd0ea35320e981c
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.6.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.6.ebuild
new file mode 100644
index 000000000000..256dc2c7b9a1
--- /dev/null
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk3 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:3"
+RDEPEND+=" x11-libs/gtk+:3"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+
+ruby_add_rdepend "
+	>=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-gdk3-${PV}
+	>=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/ruby-gio2-${PV}
+	>=dev-ruby/ruby-pango-${PV}
+"
+
+all_ruby_prepare() {
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/which make/,/^    end/ s:^:#:' test/run-test.rb || die
+
+	# Use standard icon
+	sed -i -e 's/"find"/"call-start"/' test/test-gtk-icon-theme.rb || die
+	sed -i -e 's/"search"/"system-search"/' test/test-gtk-icon-theme.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gtksourceview/Manifest b/dev-ruby/ruby-gtksourceview/Manifest
index b9827d891d15..c9b9df4a4cf9 100644
--- a/dev-ruby/ruby-gtksourceview/Manifest
+++ b/dev-ruby/ruby-gtksourceview/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-gtksourceview-3.3.2.ebuild 815 BLAKE2B 997eb6024d13581159e479b2db87e3aef20ea9a48c83160f05d27322bd5d924db51f5510e7b62659e97916d8b8112d01e50ccf13136dd246ceb16ecc6081c930 SHA512 e59292866149513b2d5ae7d9c6fa1e4aafb411c0f32add6202bd7ce8f22827e6065f77c4e537bcae1d083c2355941e6b2ffbba4626e108b8251db72829c88919
+EBUILD ruby-gtksourceview-3.3.6.ebuild 802 BLAKE2B daa89eda65fd5e5d67e49a67743fe8e4c01b5d3f57ab6b664cccb8c1dd9cd028ca90908881b022dc61e18cdb2d73d31ca40020db98fcbf681984f30e7873d030 SHA512 2320b07164ae55eb7b1d81dfeeeb410b6600c388123227f1539c8499ca60253fe2ed643905bf8a2e7478765d435aee1d0a06a2e84b5ff08a645f7582af597e38
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.6.ebuild b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.6.ebuild
new file mode 100644
index 000000000000..c1d95dd86692
--- /dev/null
+++ b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_NAME="gtksourceview2"
+
+inherit virtualx ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/gtksourceview2
+
+DESCRIPTION="Ruby bindings for gtksourceview"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" x11-libs/gtksourceview:2.0"
+DEPEND+=" x11-libs/gtksourceview:2.0"
+
+ruby_add_rdepend ">=dev-ruby/ruby-gtk2-${PV}"
+
+all_ruby_prepare() {
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gtksourceview3/Manifest b/dev-ruby/ruby-gtksourceview3/Manifest
index f32920513b1f..e1b99d0bcd5a 100644
--- a/dev-ruby/ruby-gtksourceview3/Manifest
+++ b/dev-ruby/ruby-gtksourceview3/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-gtksourceview3-3.3.2.ebuild 727 BLAKE2B 2daa72f2ec478c0924d1ce2094d3f6d881d047cc4924be941090d203a4fc4eef4b1c49243bdc5ca916539fd2ca6b4d0c4196f64f9baf141ad6b73a03deeaf7ad SHA512 3ad1e4ab4ce60f89f85d0ec2375552b118e4414b7c44fe71dca9464303a7609db076789953060a250ce0516fdeb8b0f37cf45e6ce42fa69a19f9d89307b479de
+EBUILD ruby-gtksourceview3-3.3.6.ebuild 721 BLAKE2B 8c81601408089f03b75d4469b21ca7b3af27541f6dbc396e709db42ce42479a9f59652eaf01e58f743072a7b7293097b77b69b819d149647c780d34edf816040 SHA512 a2011d64e90afb71d6cea87b33f090e179f9c9bae2de86a3df1d9fa94e083456e4641aee062af066cf7900fc37b92801d2616f4f967777e38972c2664e58882d
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.6.ebuild b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.6.ebuild
new file mode 100644
index 000000000000..4a285a492de9
--- /dev/null
+++ b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk3 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtksourceview:3.0"
+RDEPEND+=" x11-libs/gtksourceview:3.0"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-pango/Manifest b/dev-ruby/ruby-pango/Manifest
index 9d683d0d0dd6..3c00120af7da 100644
--- a/dev-ruby/ruby-pango/Manifest
+++ b/dev-ruby/ruby-pango/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-pango-3.3.2.ebuild 926 BLAKE2B b48b9c249e68dd9f4665e1b5e9a25fe87bae3c72eea5806d655fafa2f1a7febab24c8367ebc72f8ed8cabd180259e946af61f38d63943b03094347a9872d434e SHA512 84811d88f54e5d0853ea43d2150c34be2635127d1d5fe9f9db2ca50aed86c768fb38c0cca6129a436c7d08c24478b923ed972cb7c2daf9ea0685255ddac8bb63
+EBUILD ruby-pango-3.3.6.ebuild 913 BLAKE2B 6741b0a7fa5386307a09f76858b310fb18369c6b6dedb89622f07985f663d02b98d3e4714d101ef62cf418f3d43af993234ecb09c9471d6c86c936d31a095623 SHA512 fad99d0a7094be7ff495af62902c0afb4ee099ce772b1062ce3669e8d7980a3a8acba94ce2ab72aae587c45e14ee25a6af7b70cb350a261708c3b3bd012b57fc
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-pango/ruby-pango-3.3.6.ebuild b/dev-ruby/ruby-pango/ruby-pango-3.3.6.ebuild
new file mode 100644
index 000000000000..880b50d9aa51
--- /dev/null
+++ b/dev-ruby/ruby-pango/ruby-pango-3.3.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Pango bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND+=" >=x11-libs/pango-1.2.1"
+RDEPEND+=" >=x11-libs/pango-1.2.1"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-cairo-gobject-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}
+"
+
+all_ruby_prepare() {
+	# Remove test depending on specific locales to be set up: bug 526248
+	rm -f test/test-language.rb || die
+
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	# Include pango path since run-test does not list it
+	${RUBY} -Iext/pango test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-poppler/Manifest b/dev-ruby/ruby-poppler/Manifest
index 70272700bd40..18cb64e50f3f 100644
--- a/dev-ruby/ruby-poppler/Manifest
+++ b/dev-ruby/ruby-poppler/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-poppler-3.3.2.ebuild 816 BLAKE2B b763adb627c5f3cd941b026ab16aded21c8eba3cf5bfaf1ddaef6da748dbe57d9638d08942287c86d2174149ebbf832724b554dfee07895edef2d0124fce4119 SHA512 dcc216145cb8b4e3f7dd9199033e5dae2b76efb09b77d88c4d71474e21ec0e94bc69d9da0fe34f1f0add6a11ff0692c2c3c6ce99d5aeb1e6e9eb91285b4929d8
+EBUILD ruby-poppler-3.3.6.ebuild 810 BLAKE2B 453860cddf821f0435b844db09760e5ec5b3f284fa7e58b5e9f973e0f570982dddc447209d2b293cc5472a86c0598b5e21ccecae12d6ed0d7b2f97841dced39f SHA512 18ba58fcecab5398ec48b01cbec4d47a4221a7cbede92517c2414df4a8a700eaf4cd9d38a6a398d0217965bb3c6b5f32dd382d394d7de5df5d6a05ac25e959e8
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.3.6.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.3.6.ebuild
new file mode 100644
index 000000000000..ed0b2a50186b
--- /dev/null
+++ b/dev-ruby/ruby-poppler/ruby-poppler-3.3.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby poppler-glib bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" app-text/poppler[cairo]"
+DEPEND+=" app-text/poppler[cairo]"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-cairo-gobject-${PV}
+	~dev-ruby/ruby-gio2-${PV}
+"
+
+all_ruby_prepare() {
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/if have_make/,/^    end/ s:^:#:' test/run-test.rb || die
+
+	# Avoid tests downloading a test PDF directly.
+	rm -f test/test_{annotation,document,page}.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index b77aca5b3294..c565f9bc7415 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-prof-0.17.0.tgz 93492 BLAKE2B e573b77fb5f1134af99480efe3af706cade122c51bbef883cf0f915e359c695fe70485239fee7415288e99115146230bc803ec1976a39c6f5d743c10f0158744 SHA512 4e2a542420eced379a0326c0f48a041379a7a2aa06247e5cd9659f92b44ebcfca21d12a7bdf50f23ef0bdd6b37895b963a489a975ca84d487920c8fe52446d53
+DIST ruby-prof-0.18.0.tgz 93925 BLAKE2B f7e0825e5291fdab017035b2a71029407d2b01161f4c4c7aa1f10a80b4080ac14f7adaa2c0340fe5c80f7352181d085d724dee66597ed29825ab7116d37c5e58 SHA512 1743bbd97789c9de66e9479384d204b0870e43a265471f0fbdf7a72bb19d77a30afc25da9d0ac66a921c28ce83d8a8d72279bdd9b23cf8505ccde952092dd9a5
 EBUILD ruby-prof-0.17.0.ebuild 1587 BLAKE2B b9c7a8498f62a71985aaf972f41cf2cd6c0077d5e5e76a0cf219410b1dd04b784f47daa91cec44e95a87b8dcc8155f1697d19ec47c5bba19ad533a797a0d53f7 SHA512 b4b76341a641dd4a197317dfb8c123e8b35b37828823a0e4ad11f954bf3d0d1ecd8596c80e671a51c933e7a8c6c788980b65bf540c8d454fae02968d9cc78bb7
+EBUILD ruby-prof-0.18.0.ebuild 1579 BLAKE2B 307f6bfd7e04f53b41ee151c3c7fcd4f52b443e52cb311ff725457c48298c9afbdc25d0cf7bd22a11a641a07815abe67f6e917faac125de81a33934ed959d069 SHA512 0fb3e2406efb366f147011304f7b6967d2ad9a9b577123255f194628accb9e64af6c311eb58573e2d2b76b65c6eb163818c34054291ed707982049a94afc7466
 MISC metadata.xml 345 BLAKE2B abf08843e05ea5a260b8d3b1de88259aa5b593ef0be34c9066cc9f53aec48f13e962ee77224e28b7253f45850af20222d672578f57111bbca2d250458515c26d SHA512 e1647ce0131d640e8de67cdaf4bedd36d5cf3cc1d251e08b3f36a7c82bf356f80a3911984adbe14d25250b2f5c3333a988b5baed8978adea0b68594d985f22ef
diff --git a/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild
new file mode 100644
index 000000000000..0bda0ee97519
--- /dev/null
+++ b/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGES"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A module for profiling Ruby code"
+HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
+SRC_URI="https://github.com/ruby-prof/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# Avoid bundler
+	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
+
+	sed -i -e '2igem "test-unit"' test/test_helper.rb || die
+
+	# Fix a timing-dependant spec since its thresholds for success are
+	# too tight.
+	sed -i -e '/test_class_methods/,/^  end/ s:^:#:' test/measure_cpu_time_test.rb || die
+
+	# We install the shared object in lib, not ext.
+	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
+
+	# Avoid unneeded dependency on rake-compiler
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
+
+	# Create directory required for the test suite to pass
+	mkdir tmp || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ruby_prof || die "build failed"
+
+	cp ext/ruby_prof/*$(get_modname) lib/ || die "copy of extension failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for dir in examples ; do
+		docinto "$dir"
+		dodoc -r "$dir"/*
+	done
+}
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index 03f3b0aeb223..8ae9e80ff216 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-progressbar-1.10.0.tar.gz 51483 BLAKE2B 24b92718fe933caa29460939a816b14a492d3144e9a891839ec3b5dbac103849bc0aa3becfb47e507a001ce6b0d0bbf2e0b207fe8d7cb51443924e81c9395b0a SHA512 ec645858d619a95081304905661918eef6d5bd19c0f8d00beac48df3f202d18ac85811d51028d71ab144a5a56649feb2409eca59b3db26733c00a1a54a7ef55d
+DIST ruby-progressbar-1.10.1.tar.gz 53416 BLAKE2B ee435291cd55558843ab05254c01a6148711aee54a5ce80d7b03902e32fd8735fda2e3686794f3f2c8a62c7ca26d90df4d63b48c8d947a471279c35131c49898 SHA512 6cbd791833a1638949c7283b5c475164b44ec8a5d4c7eb417d741da5c9cda9e777481a785f112be7fd1c3714668ad58cbf9aa39eecb61d1022fb3bb35ddb6203
 DIST ruby-progressbar-1.4.2.gem 24064 BLAKE2B 4c26f5c281129a7333c8a7a1f7738a094ec02d769293252c8fbc6df0bea99971cd0d235b6bbeba7e2e4fac10409028f7cdb15870484878c26d9ea9f709f0135b SHA512 443fc015b2dcabc76c685f1529a39ffba289cb00c3cee3992ef240fb9822729f9049db4d85c58ee1ab6cc17927cb325044ea45a968c755a9b5ad93f7b9999fbd
 EBUILD ruby-progressbar-1.10.0.ebuild 1036 BLAKE2B cc1a671361c75ec7c53d71be60216423c00ebb065ec8cd7761508bb3b3ff289afa0a7a4328a9e1bc2c0c4a9ed7ef8d2ffa934640bc0835394b6b1b2ff43f2ba8 SHA512 1fc42617574876ffa95a44c353b29e54425f3cb7c5d85e5edaf54d96b1be87434b72006164768b05b85071893f4ada4028c98691aed89be2c9f0cd1c87b4df5e
+EBUILD ruby-progressbar-1.10.1.ebuild 1029 BLAKE2B 24093411f6bdcf8e8cd93761d889682edcd462d898b558b656a4536f0420f3c89f14c67ce118f64511cd930fe378cca809a872a785274794eada2a07afe1cdb6 SHA512 82a8e0d8e9b0641a832d4b2a1f77d73e88178580729fc897b5c6cb69b140eacee5c862980575cf97cb1e8f647902e9870d0bb06ada04f7a84d1d077656cc1a74
 EBUILD ruby-progressbar-1.4.2-r1.ebuild 586 BLAKE2B d9a86d4032d44252d30e5fcb3774ec26efbfb6d1348cc604fc6008ab31ef836e84e558bdf1610168ac97e06aa48310f7d1b74e908e5e3aee60ef165b946b8535 SHA512 7fe1ac90518b66e1605b96c966e31ac111491d1af807b9f5d45a27832d872452db3a1c3aa981af03247670139a3feaf7d26f3443b32f6aafaf05cfd8407a7c22
 MISC metadata.xml 352 BLAKE2B a36b436c51b56ed96a170c6edaff16655ff0d3b42f2cc6b13e67c252f89e2d56c47ce0c69fd693acc9ddab9a755a5fbf5d72e360f2e6a16bc0117148eb7a25ef SHA512 a572b7825c4e778c503bfa3bb1b82d4d91c28285578c614a8a0c62bdf1967f307645c92f0101a4898baa0ebeac9a26455e459b2440db6989593c0cc4472df616
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1.ebuild
new file mode 100644
index 000000000000..0910ef551afc
--- /dev/null
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Text Progress Bar Library for Ruby"
+HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
+SRC_URI="https://github.com/jfelchner/ruby-progressbar/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-progressbar-releases-v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~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 dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/warning_filter/ s:^:#:' \
+		spec/spec_helper.rb || die
+	# Avoid ruby24 syntax for an unneeded check
+	sed -i -e '/^return/ s:^:#:' spec/ruby-progressbar/refinements/enumerator_spec.rb || die
+}
diff --git a/dev-ruby/ruby-rsvg/Manifest b/dev-ruby/ruby-rsvg/Manifest
index 1c7e08f5b57f..085542f3c71d 100644
--- a/dev-ruby/ruby-rsvg/Manifest
+++ b/dev-ruby/ruby-rsvg/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-rsvg-3.3.2.ebuild 1026 BLAKE2B 9e47b4c0014bc754f75f39ab5eb82eff2104c679e9dc191a54410a744ff9d83019d2c96008bbb477e82c4360a60e5601aa7c50151aaa881cd59032db050eebb6 SHA512 4a114d3cb4b9c25ce570e364a319e2e513046451c7cf2f497903c7da30d66180b5deafa151c67fb4d8829f616e67cdf7d1b2716b9f1018f008d25f96f3830e0f
+EBUILD ruby-rsvg-3.3.6.ebuild 1020 BLAKE2B 21f727dfe81b014b2d10bcaad1142267d87a7d372526ee8f106334f45ef8dc8a5d10188e8fe3982c11513d09554a6c3d6e484f1fb59794c07fef2ec3d3e3cd76 SHA512 a4f7ad1698d437c2c5044168f1ef4d9ae8ca0b098b63ad1544099cde73f03d189053a2b4e1ba52282d513b0db3d9f445f1e6e513281ea9dcbbbc842dfd74393b
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.6.ebuild b/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.6.ebuild
new file mode 100644
index 000000000000..43cb3c718d48
--- /dev/null
+++ b/dev-ruby/ruby-rsvg/ruby-rsvg-3.3.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_NAME=rsvg2
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/rsvg2
+
+DESCRIPTION="Ruby bindings for librsvg"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=" >=gnome-base/librsvg-2.16.1"
+DEPEND+=" >=gnome-base/librsvg-2.16.1"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-cairo-gobject-${PV}
+	~dev-ruby/ruby-gdkpixbuf2-${PV}
+"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' test/rsvg2-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
+
+	# Avoid test that fails and may be version-specific
+	sed -i -e '/test_unlimited/aomit "version specific?"' test/test-handle.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-vte/Manifest b/dev-ruby/ruby-vte/Manifest
index 99c015efabcf..8351fa0398a0 100644
--- a/dev-ruby/ruby-vte/Manifest
+++ b/dev-ruby/ruby-vte/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-vte-3.3.2.ebuild 531 BLAKE2B 47f1522ec5c9056969a16ee4807bbbd629a12101bb6237f8bbc3336b7a4a1a3853f1f4adf86e2f48e1f908cfecd9ba64b8d703de49f69793e7c27411dc6ff485 SHA512 d26c9667379595634cb0203d664007d8f4a116ba566ec060868631bc2d123fa24ae2cd09bcc4216d722f553a2307932ea55d6e6bd3a133e8e39bb28ccf2132ad
+EBUILD ruby-vte-3.3.6.ebuild 518 BLAKE2B 6d178feb4fcf51713df3a6bcaaf493dbb12110cdf0f6727e92c7b04eedd266e6dee2469956cf6aa2f88c97af12f9bd4b30b7b142e13cbdcc768aa130dd61056d SHA512 721336db9763a4b173590abf6e8e0f54dbbc45cdd102f959b88a6d1a7d4114ed8bb086f194ebe15232ea69f8a7aa19fd7f46154cee2d86ce7981c16994f8f814
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-vte/ruby-vte-3.3.6.ebuild b/dev-ruby/ruby-vte/ruby-vte-3.3.6.ebuild
new file mode 100644
index 000000000000..d1099f2a49c3
--- /dev/null
+++ b/dev-ruby/ruby-vte/ruby-vte-3.3.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby vte bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" >=x11-libs/vte-0.12.1:0"
+DEPEND+=" >=x11-libs/vte-0.12.1:0"
+
+ruby_add_rdepend ">=dev-ruby/ruby-gtk2-${PV}"
+
+all_ruby_prepare() {
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+}
diff --git a/dev-ruby/ruby-vte3/Manifest b/dev-ruby/ruby-vte3/Manifest
index 57347375b7c8..872d51184229 100644
--- a/dev-ruby/ruby-vte3/Manifest
+++ b/dev-ruby/ruby-vte3/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-vte3-3.3.2.ebuild 730 BLAKE2B d4a4580f7e71449e0f9e0e8c1eced6811bc4e7b35d4c2dbc048387891819f75dc19b115fa768f7e980de5eae3caeba278c762532232273ca46b01ab887d26e42 SHA512 85c94216109cfa3a07639eb1ea811cfec737d8eda04ee743944e635041ab8204cf24da4f417c26c233f6fafb8fe8c4a3ef479cabaa6ba5710150cac29051d82f
+EBUILD ruby-vte3-3.3.6.ebuild 724 BLAKE2B 5e946d2c76b685374b40bec6f67e2f44e9acf7d07d84d2d8facf27d57822ec2817ea37ed404631e962a22a2e3a831a92fc04963814e2df4c926b8af884468999 SHA512 4a02a712d4c7552079e01e2095d1b913aa1ada12f99d1938c4221a599919d330adcb24f1abefa759ecf2eb8d6bc21f4cebab72a67986aa4bf2df8c7e06b9a979
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-3.3.6.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-3.3.6.ebuild
new file mode 100644
index 000000000000..f37e95963cdd
--- /dev/null
+++ b/dev-ruby/ruby-vte3/ruby-vte3-3.3.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby VTE bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/vte:2.91"
+RDEPEND+=" x11-libs/vte:2.91"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+
+	# Avoid tests that require a real pty.
+	rm -f test/test-pty.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-webkit2-gtk/Manifest b/dev-ruby/ruby-webkit2-gtk/Manifest
index 4495ed23d342..a4b444b07e6c 100644
--- a/dev-ruby/ruby-webkit2-gtk/Manifest
+++ b/dev-ruby/ruby-webkit2-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
 EBUILD ruby-webkit2-gtk-3.3.2.ebuild 994 BLAKE2B 8b3df54bf34a5a6140c06ebd29ba018e8eb27ec4adbfaaa31bf1593a5281f27762fa3b86361e33c375edd1443b67c7a9813c877bf4dbebaee9efef6f6121ecfa SHA512 662f6428335822cf5dd61106eab0119594a996475fe7cfccb52d61ec559f9914410787130d6ee7b7bcae742a34a0b52434f6ea14b8c9c5d426731e42fae38cee
+EBUILD ruby-webkit2-gtk-3.3.6.ebuild 988 BLAKE2B e4695f137172f82760865791aa479d0aa666b5bd2bfe4dd2fc16597a189049ce13ebcf8b578a0596ec1d14634f52724d3fd4635748c66ea727c5b6379390ba83 SHA512 2f7abe6ba541f8b5c9db790855a5ff0cbca366387b472cbeee43c22098cda16f215127de8ce8dd6f4219ee087ca95ce6c5d48543820de1c86a38686a254dc056
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.6.ebuild b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.6.ebuild
new file mode 100644
index 000000000000..ecbbba403394
--- /dev/null
+++ b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby WebKitGtk+ for Gtk 3.0 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" net-libs/webkit-gtk:4"
+RDEPEND+=" net-libs/webkit-gtk:4"
+
+RUBY_S="ruby-gnome2-all-${PV}/webkit2-gtk"
+
+ruby_add_rdepend ">=dev-ruby/ruby-gobject-introspection-${PV}
+	>=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		test/webkit2-gtk-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/"Makefile"/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	DCONF_PROFILE="${T}" virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index b16a68a44347..54618b6e6114 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,10 +1,12 @@
 AUX auto_gem.rb 159 BLAKE2B f5091d3df1318606e623a3bde402bb51b693875ba9504e0a48a911de14d904116d62a99eaed64d0cd5cee28c58f3d003e56c78df5c40025594fd7ad22a1eeb1d SHA512 e42e790013d20335ca5319803518102593408d077f22c95dcb08969c69d3a81e49e47cd002715bf760bfcd9a29304002354d8add42fd2415fb10a0a2a323d64c
 AUX auto_gem.rb.ruby19 509 BLAKE2B 3aeb669d0dc6c6016091375adf8df8f8a2b810d40e11b3142669098d119369c4294c5d4758d1369fb2479ae3766d8e1421daa0076e2da4f66d00f9e0ed6584c1 SHA512 2b8f4ae00fae383357dd1eb1159ecf1689cb5b79e996688ae091a157b9f27e980761ed8a771d9d3b954d325f817972c4d02f4b5d3c8f4307d2cebce7651af666
 AUX conf.d-gem_server 81 BLAKE2B 2019f1b5085a824e1a9e0551a8b224391b1db777f15aea7fa613faa1c7a51f6c0015f92c16a95c0c368ad701c125307c0535ca1029891345476636fe45289fb8 SHA512 71630a0530ec62f4024d9bfc4e6afe1f409f3bcb5d71ee5876d1e190c9e69016571ca8f500fcc7ffea6cbc36a8dab5eef2d0c61f72de99f2776c9137010b9ccd
+AUX gentoo-defaults-3.rb 1692 BLAKE2B a7f20c82b76eb22749cc2e0ec2c9674a0da35d8adc8f12c6b1bd441dd157e04c88168e43471374754b0f0af6b58d854fbd714d3ef5583e973954898cbd4fe57e SHA512 c56f171de57aba6ee268a519f3dda79fbc5a6c16872c76f66b02cbd245680cfc1c21f7a6d97863c96f60fae46ca308eca1453a3d9465dcbfe7ebf0fe0d65feb7
 AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716d107a8f98c5058676c675eb42e1d5e0a7214cd74df9148d54220c0202189938c45f4000301e52a3a73f SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c
 AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1
 DIST rubygems-2.7.9.tgz 862854 BLAKE2B 7bccb1fe1ce11b33501f881d01b8b0159e6b3c0a434fa100b98490cd1813b5309610e8ef5d1a2c5ab23c22bf0cd55ace7b055ee57f9057398662276128b3e949 SHA512 5f699f47bc24d8ffd4f8f44a509a9df71fcd945ca2574dc9d5050bfe06a44830a368f45d204112d7a4f1877e1600a6fe4d1b6b68f9a55288664667b4220a7d72
 DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e
 EBUILD rubygems-2.7.9.ebuild 4397 BLAKE2B dfda01f88b60b4c1a3d13ab2a2e136fd95fdf39a588f61e264ff6d125deda5ec45a28a0f653af1ec6cba2c1190cab9a94f90aa726ec04baddfb8e5daa27cfacf SHA512 18b691805bf137759852bbabc75f7d4ffb9cf4aa3d6a91ee79a97abc3aa340761e31b266ac4cba8e72c602221e9406058b7203dc397293922e9e1823ddb3a9bf
+EBUILD rubygems-3.0.3-r1.ebuild 4741 BLAKE2B 0dc9cc369992c68478568ab3056443f96f57d17bae1eaf0c07b641b1c445e4dd08e0f18fc573133a8184d8a1c3929669606e3b48259d43cda1b2d40b93e0b841 SHA512 c971ddcbf8119ddabeb50b08ecf2c7a695285b6bd6bb02bd698fd238cf9409ab24844b491ad520a8a9240c1452dd2cf4690356a5bd3d30e219318d37f6d2be95
 EBUILD rubygems-3.0.3.ebuild 4733 BLAKE2B fa821c214ebda0e0b260b58cf8c4dc7756686277120add9f4b3a361eb0aad996abf24a1b5b3b903b13e17fba6f96af41adf8831f77610df1622cd94681643395 SHA512 b71228239dafdf6fb013fa2ed1ec5c99d538d6171c7c1863df6c6613ed74c0b3e8474c29d7a63f5385a460b952db59534e2abe9f20831afe561264f97777a414
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/files/gentoo-defaults-3.rb b/dev-ruby/rubygems/files/gentoo-defaults-3.rb
new file mode 100644
index 000000000000..b8ad8f1227ce
--- /dev/null
+++ b/dev-ruby/rubygems/files/gentoo-defaults-3.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+# Gentoo defaults for rubygems 3.x
+#
+# Gentoo policy is to install all manually installed code into
+# /usr/local and to keep /usr managed by Gentoo. This policy file
+# ensures that all manually installed gems using "gem install" are
+# installed in /usr/local. Gentoo gems are installed in /usr.
+
+# TODO: We used to manipulate the default_dir, but this no longer
+# works since this is now the base for the new "default" gems that
+# ruby 2.6 uses with irb. So default_dir should refer to the system
+# default now. rubygems also provides various hooks so we may be able
+# to use those to install gems in /usr/local by default in a less
+# intrusive way.
+module Gem
+
+  class << self
+    def portage_gems_dir
+      ConfigMap[:sitelibdir].gsub('site_ruby', 'gems')
+    end
+
+    def local_dir
+      portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr',
+                            '@GENTOO_PORTAGE_EPREFIX@/usr/local')
+    end
+
+    def install_dir
+      Process.euid.zero? ? local_dir : user_dir
+    end
+
+    undef :default_path
+    def default_path
+      path = []
+      path << user_dir if user_home && File.exist?(user_home)
+      path << default_dir
+      path << vendor_dir if vendor_dir && File.directory?(vendor_dir)
+      path << local_dir
+      path << portage_gems_dir
+    end
+
+    def system_config_path
+      '@GENTOO_PORTAGE_EPREFIX@/etc'
+    end
+
+    # Set Gentoo defaults for gem commands
+    undef :operating_system_defaults
+    def operating_system_defaults
+      {
+        'install' => "--install-dir #{install_dir}",
+        'uninstall' => "--install-dir #{install_dir}",
+        'update' => "--install-dir #{install_dir}"
+      }
+    end
+
+  end
+end
diff --git a/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild b/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..8c6d1f49acfb
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rdoc
+	)"
+
+all_ruby_prepare() {
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-3.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/assert_self_install_permissions/,/^  end/ s/^.*RUBY_INSTALL_NAME.*//' test/rubygems/test_gem.rb || die
+
+	# Skip tests for default gems that all fail
+#	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+#	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
+#	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
+#	sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
+#	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
+#	sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
+#		test/rubygems/test_{gem_installer,require}.rb || die
+#	sed -i -e '/test_\(load_default_gem\|default_spec_stub\|self_stubs\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+#	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
+#	rm -f test/rubygems/test_gem_indexer.rb || die
+#	sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^  end/ s:^:#:' test/rubygems/test_require.rb || die
+#	rm -f test/rubygems/test_gem_commands_setup_command.rb || die
+
+	# Avoid tests playing tricks with ruby engine that don't seem to
+	# work for us.
+	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
+
+	# Avoid test requiring network access
+	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
+
+	# Avoid test requiring file system permission changes
+	sed -i -e '/test_traverse_parents_does_not_crash_on_permissions_error/,/^  end/ s:^:#:' test/rubygems/test_gem_util.rb || die
+
+	# Avoid uninvestigated test failure in favor of security release
+	sed -i -e '/test_self_install_permissions_with_format_executable/askip "uninvestigated failure"' test/rubygems/test_gem.rb || die
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+}
+
+all_ruby_install() {
+	dodoc History.txt README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(23|24|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubyzip/Manifest b/dev-ruby/rubyzip/Manifest
index 8be022f4f2e9..0f411930d987 100644
--- a/dev-ruby/rubyzip/Manifest
+++ b/dev-ruby/rubyzip/Manifest
@@ -1,3 +1,5 @@
 DIST rubyzip-1.2.2-git.tgz 153976 BLAKE2B 350c05b5dde15bf6450c32b679b474df68b8597e82770e2d5f59bd0c430344a3f2868e8d2d7f59f2240f8fea02bc7ccc31777ceb5ff66041dba5a619e7849b21 SHA512 1af115db39b5107687049cead85732a3cdc6b0c3db69103af20bccf1c684ddc99d5d2f5b178b86600d2d6458f5eb535b7c9dc89ab32c91dba3519bbd3df59e7a
+DIST rubyzip-1.2.3-git.tgz 155000 BLAKE2B 021bf1f3278fe52a2a1f0b8a6a8e0879f81a3b0765f1f5c12133ac6a2f2995ae56b786e7e53a4146cfd7df281199f4072dd820c334d18fd4f2a59ac500b57763 SHA512 a6dab87588655852fb4d363ce179af79e967f7fdcaa55460eb1bb40c0cccb04170022fdda5a88149bace8873646150cfbd0ba37ded79f6fc1d7243db45eeaee2
 EBUILD rubyzip-1.2.2.ebuild 1189 BLAKE2B 3ac1c055fbb0333d3ca0a6d10586f4b8564d6d82bd9086f24f68b56c20ce124f2849e3349385c41dc9b670ca1f04250885fba214bcb329db8f9d9f2cf3e57a17 SHA512 73281d290f5890d948d68fedce3c368c765b2878729eb3fabd9606a0bca3c89a59cb78d7cbc58926d3df944c1ba6fab338954ec745bdb2b1dee9721da40a9ada
+EBUILD rubyzip-1.2.3.ebuild 1189 BLAKE2B 4d5b92b57427bd228034cac98b8c32c5cd9b91fe67172b9015349de64f874affed327656edcc0da42cc9f68807e0f2460f80c56f5c665e3653d3bd91b29241dd SHA512 4274fcfa27169c77394913e562acdbc89d80bba685e56f27444baf65f01bfda062f161ddaea4ff615c796c3ea6d0d92066404f739654f0c08d07f4428f49d395
 MISC metadata.xml 341 BLAKE2B 2e04f2f0e3ee64a4d476ca38f166efc94dad160850cd08b42ed54e68a275ec1d26b76a751bf9a347da5f9c8851575a8a58b9021f91acd1a733be536f947e6743 SHA512 7928d7e4a5dcaeb924d44348981910cf0024939f6f169a00df46fcd80cc933b56e91423e8919ef7a74f03e4bc1eda7b7f8a8bc6e954f6195989c1a9eb574cf3f
diff --git a/dev-ruby/rubyzip/rubyzip-1.2.3.ebuild b/dev-ruby/rubyzip/rubyzip-1.2.3.ebuild
new file mode 100644
index 000000000000..165e218f146b
--- /dev/null
+++ b/dev-ruby/rubyzip/rubyzip-1.2.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby library for reading and writing zip files"
+HOMEPAGE="https://github.com/rubyzip/rubyzip"
+# Tests are not included in the gem.
+SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="Ruby"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${DEPEND} test? ( app-arch/zip )"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
+
+all_ruby_prepare() {
+	# Avoid dependencies on simplecov and coveralls
+	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
+
+	# Avoid dependency on bundler
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Fix hardcoded path to /tmp
+	sed -i -e 's:/tmp/:'${T}'/:g' test/entry_test.rb || die
+
+	# Add missing requires
+	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
+}
diff --git a/dev-ruby/sassc-rails/Manifest b/dev-ruby/sassc-rails/Manifest
new file mode 100644
index 000000000000..66acb9d0e7c0
--- /dev/null
+++ b/dev-ruby/sassc-rails/Manifest
@@ -0,0 +1,3 @@
+DIST sassc-rails-2.1.1.gem 33280 BLAKE2B eaa66fa6bfa60a41c8b2a180ac58758d860feaa33aad6a92b28b3224361837281c353041f854317591ef4ae99a6e48f00d8cb31fdf1e5c6a12f58fb24809d615 SHA512 d612a0c5d0d4f55600f8f9734f5bcf30c62c2bcd657b917ee13e95b7f7c3c08b2b4cb2b62b75c52e08992b254279aa4988c3e94b56b91490532b2382dc0d8555
+EBUILD sassc-rails-2.1.1.ebuild 783 BLAKE2B 82fb27a1be266c91e2b423646e2e13d7f70fefce0951595708dd580624eb4bca1d0369aa5ea09fb4351df0537b1185d5aab757805ead5620c822ee3a0ad08646 SHA512 d37ecbd211802bbba7f0ae588138ffb9517f266bb9b14082b8eade25acd0965c37a0d391854001e7d1b839962461f8d3477f6e5d8bed0fe559a248fc351d0675
+MISC metadata.xml 342 BLAKE2B b460bdd1f19ae844f16c9600d7ffe9c737fe0812e88d35e572eb75d616b2aa6392bd0fa83eac92bd349503f5d72d39da3317b57415c38d121c705f09c5317338 SHA512 ee5b3763d54c109df23d6acdb840d71569d9405884bec4fb15de75d6fc66f68a5e40a8b873dfecab98e6c1f7e47cea4f875ac842d1f0d08cf5fc6cdcb0828312
diff --git a/dev-ruby/sassc-rails/metadata.xml b/dev-ruby/sassc-rails/metadata.xml
new file mode 100644
index 000000000000..6cc4ce8447fb
--- /dev/null
+++ b/dev-ruby/sassc-rails/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>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sass/sassc-rails</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/sassc-rails/sassc-rails-2.1.1.ebuild b/dev-ruby/sassc-rails/sassc-rails-2.1.1.ebuild
new file mode 100644
index 000000000000..ca9443f56d99
--- /dev/null
+++ b/dev-ruby/sassc-rails/sassc-rails-2.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Integrate SassC-Ruby with Rails"
+HOMEPAGE="https://github.com/sass/sassc-rails"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/sassc-2.0
+	dev-ruby/tilt:*
+	>=dev-ruby/railties-4:*
+	>=dev-ruby/sprockets-3.0:*
+	dev-ruby/sprockets-rails:*
+"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/bundler dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/rake/ s/,.*$//' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/sassc/Manifest b/dev-ruby/sassc/Manifest
new file mode 100644
index 000000000000..2a1bb4f6c9b0
--- /dev/null
+++ b/dev-ruby/sassc/Manifest
@@ -0,0 +1,3 @@
+DIST sassc-2.0.1.gem 357888 BLAKE2B 670a622edc065abd7124a413bff3e32e524703cd3343ae7ffd1439af075e04d513ee125ddbd9ff81ffd7eadbb2dd935a83dc71334252b681fb478da9aad06181 SHA512 cece2741e316eeb4684a5650627bb2a9f161bfd99a3c93c2bf8b7d40f47ff064ee837831b1f9ad77d9e321bbd9874301762c9f0519b2b42658cbea6fd7240fcd
+EBUILD sassc-2.0.1-r1.ebuild 1230 BLAKE2B c89dd78b25250f86705c754b8dbed9b9310a2ece0f324dce102dd5cdec3c5c4da2cecf8f9e5f9a0e1332f5e672b029a325889a436becff468094f6e88467e70e SHA512 e97918a8e2828850d4b8d155615ac88a9a1cdb849683828b14f07a446a25d7414a5ea32ce1071a1591d044c3aa8101f9bb5e7033fcafd3b802eb7d21282065d1
+MISC metadata.xml 341 BLAKE2B a87edcb982765d42f3b800c9cc82e1552e92c758454449fe45da64ae131526134e6f0c3e828547ddf4e63e464563589b67de46c11539464c78b4de4291be6b6b SHA512 4cb9faf011e514021d70371749be7c56529e0bec0b880815cba83fcd66fd9e5b1f44932b3d498a7cbe26238659d590bb5a4e3f98e04553b8299299aaec71c70d
diff --git a/dev-ruby/sassc/metadata.xml b/dev-ruby/sassc/metadata.xml
new file mode 100644
index 000000000000..7e5ec7336939
--- /dev/null
+++ b/dev-ruby/sassc/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>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sass/sassc-ruby</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/sassc/sassc-2.0.1-r1.ebuild b/dev-ruby/sassc/sassc-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..5ed366f5d0cb
--- /dev/null
+++ b/dev-ruby/sassc/sassc-2.0.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="sassc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use libsass with Ruby"
+HOMEPAGE="https://github.com/sass/sassc-ruby"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE=""
+
+RDEPEND+=">=dev-libs/libsass-3.5.5"
+
+ruby_add_rdepend "
+	>=dev-ruby/ffi-1.9.6
+	dev-ruby/rake
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/test_construct
+	dev-ruby/minitest-around
+)"
+
+all_ruby_prepare() {
+	# Use unbundled libsass
+	rm -rf ext || die
+
+	sed -i -e '/spec =/,/ffi_lib/ s:^:#:' \
+		-e '/ffi_lib/a    ffi_lib "/usr/lib64/libsass.so"' \
+		lib/sassc/native.rb || die
+
+	# Avoid version-specific test so newer libsass versions can be used.
+	sed -i -e '/test_it_reports_the_libsass_version/,/end/ s:^:#:' test/native_test.rb || die
+
+	sed -i -e '/pry/ s:^:#:' test/test_helper.rb || die
+
+	sed -e 's/git ls-files -z/find . -print0/' \
+		-e '/gem_dir/,/^  end/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/shotgun/Manifest b/dev-ruby/shotgun/Manifest
index dcb46582a466..bd09b3ac8e39 100644
--- a/dev-ruby/shotgun/Manifest
+++ b/dev-ruby/shotgun/Manifest
@@ -1,3 +1,3 @@
 DIST shotgun-0.9.2.gem 16384 BLAKE2B aa87fbaf2af41a28dac3d5fadc635ff0948dc874e0a02c6b6a9a7717e955a093862b18b6a37d76d6fbb776fb2e3b62fd5be7fffc9b97eea99719748e2c66d45a SHA512 62228b0b8bdac815e2204fd89d3e106d033cfee7668ef12406120e5a21f52770ee36c6fa7b3edf3eaf09bdfde5849239364d3483a817914024c21618897e8d9a
-EBUILD shotgun-0.9.2.ebuild 825 BLAKE2B 682c64ff9628385a6ea98b33643f70e9fce9d33bd92d0112d6e06fb9e90a54c6047e19c2b9fe25fe04afd253e83be08c635468697c3c35495f16d164f542167c SHA512 7c420837e92a6973e70555ed3717793e9a6a1b8844fae0879a52543f35958efc71ab8989e93a4115f5cbf4f1471e97e631e39e39e29d906067c7e573b6b365f0
+EBUILD shotgun-0.9.2.ebuild 829 BLAKE2B b1d2ba8fb470f2c2a0112ea2378b280b11dac5192e42b2f87b3ce03567c870960ce8d180ad9051304c00924062d55d77cf3db6fa2c570317428d8d8c62748dd0 SHA512 544c02fbc33407eb3c350c54ca55b4e9b317c070d4c070d81b162d99dd805bdaa218bd1636354df1efbc25f99a3812147cfde49514a44164072812a9a300094f
 MISC metadata.xml 342 BLAKE2B 85674a1f5975afa534d61eed939d8619a1debbb3e3487baf6b02ff382d732061e1bc52dffacabc057319aa1cf0b0a09bd67685066659c225c23dde5e93214fee SHA512 9c32ae892991216ff0cbbcf0f0a3d467c019900c2f34a07702140eda576e3e8b88e622fbe7d954b65db9719c7460875e28180145cad6ddd0155cc853c733d79f
diff --git a/dev-ruby/shotgun/shotgun-0.9.2.ebuild b/dev-ruby/shotgun/shotgun-0.9.2.ebuild
index 44d5deb505fd..a98cdd82f3c5 100644
--- a/dev-ruby/shotgun/shotgun-0.9.2.ebuild
+++ b/dev-ruby/shotgun/shotgun-0.9.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # No documentation task
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/spreadsheet/Manifest b/dev-ruby/spreadsheet/Manifest
index 1c88fc644b8d..5bd22d132492 100644
--- a/dev-ruby/spreadsheet/Manifest
+++ b/dev-ruby/spreadsheet/Manifest
@@ -1,5 +1,7 @@
 DIST spreadsheet-1.1.9.tar.gz 4656240 BLAKE2B cb2b663bc4721d916f0485fe51a5e46239f2e48dca2410d3b5e6f50ad4a4fb92982e3a9ba7605c4f202d538f3f69931837c2c0d323b8b30e9c25210fadca8796 SHA512 1a4d8f3e2f6772ff6fdfdc818893d8d808b03f68428125d6f3deab38830dc47ab203fbface21b01c66ab451e2175db38f4b6d3b0cc2423ac37578d3bd135305c
 DIST spreadsheet-1.2.2.tar.gz 4656143 BLAKE2B d68e128fc902dce7508e64f2ea530f222cea6be43a2841aa9fe28a4155919c11279bb43f525de8b62f1a08a4eb35e0d7bf0af2b808bd22e649a798fa3a77bbb0 SHA512 8a7a7b385b15967b3cabf4fcc40a69788ef4470e81789256208be6b6afed4fcc078e85e4cfab0e647a03ec3c312d07f4c24160bf57814d4990f7c6dba3abccef
+DIST spreadsheet-1.2.4.tar.gz 4656374 BLAKE2B f1879115c108e26e9a0593f3d7f8ed94527b404d7c6e6b1e94cb1bd1012ed83943a7d48e7abd99548fb9f702f7a97896763d34022716309e87aaaf5923806654 SHA512 273be3ca2cb11f705f6cc610590da96a69d5d6aa8ec8b74b8a30673bcebb20363593edc5bbed8b0d4cd4f57fb8c65a893ad8435e69f87b1d7825f80f8d0cdde3
 EBUILD spreadsheet-1.1.9.ebuild 855 BLAKE2B ebf9b73e1ffb80be01af994b2d924f5e3e2e851084c8b2993a2d7d189b572eb0300f41c8e340c5ff9f70aa23ff14b8a8597393841ff98ff6a1f1caf3496ea8bd SHA512 231e04c918bf894e7d6b7131865f9ec9a8cccb4789cfef955cc644df7ca84656a5e54241d871497c3090bfd31a70a13f779eebbbdbcdb7336d00ba40a3f22d38
 EBUILD spreadsheet-1.2.2.ebuild 855 BLAKE2B ebf9b73e1ffb80be01af994b2d924f5e3e2e851084c8b2993a2d7d189b572eb0300f41c8e340c5ff9f70aa23ff14b8a8597393841ff98ff6a1f1caf3496ea8bd SHA512 231e04c918bf894e7d6b7131865f9ec9a8cccb4789cfef955cc644df7ca84656a5e54241d871497c3090bfd31a70a13f779eebbbdbcdb7336d00ba40a3f22d38
+EBUILD spreadsheet-1.2.4.ebuild 848 BLAKE2B 28d89fd28787cfd5a3c98032e72b87dfe85d640665a91edb0964342331058ee6976769e422ee387a881d434f2a95990f8886051fb3aa695c7d12869cd0058687 SHA512 4cb7dc5a12a88c25d6dcf1c17a30f817ac2b6aa7aea8e95b3f9ac788ea31b1204db34877955bae4aa352a048f596b49f57836df7df4978457a4d6bcf2100d4ae
 MISC metadata.xml 452 BLAKE2B acebaf37b6e910c08eda195fab8eb473c2516d5a22d30b64cbb564d25e9c162d3f2a5918fe5ed208533fd847de10ba374c5647f18d33f2045ced2c0fc6158af8 SHA512 a0677ee7cb739f0108436f4021f487e59ad4d24af2d3e08c463b0042cc3016f02a025cbb558a68c04cb13fac2b099530fa3c17b29b473c9371b2243810664416
diff --git a/dev-ruby/spreadsheet/spreadsheet-1.2.4.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.2.4.ebuild
new file mode 100644
index 000000000000..c24aef1ddbd0
--- /dev/null
+++ b/dev-ruby/spreadsheet/spreadsheet-1.2.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# 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.md History.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library to read and write spreadsheet documents"
+HOMEPAGE="https://github.com/zdavatz/spreadsheet"
+SRC_URI="https://github.com/zdavatz/spreadsheet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+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/stamp/Manifest b/dev-ruby/stamp/Manifest
index 6bd026e8bc42..572797bbb78e 100644
--- a/dev-ruby/stamp/Manifest
+++ b/dev-ruby/stamp/Manifest
@@ -1,3 +1,3 @@
 DIST stamp-0.6.0.tar.gz 9099 BLAKE2B 6e5d4b95fcd6f31f47b02a4053670fad53e982bd965120f02ef3751e9b499d21a0867ef11afd628eeb2b1bcc523e3423aa319103868554b4c74341253614b1b3 SHA512 2f467444bad3c8932aeaeda061796ee3469b16d908027325efa28f7da005c8a4c8c95f0d3b84b6b1040bf5e5fe4114fc4779e3c9efc6c00817a050c13be62472
-EBUILD stamp-0.6.0.ebuild 786 BLAKE2B e9e9da344319d9d717f0f9b1105dd5c9a0db2aa48a06d51f37f4936a2d1563fb7873e6cbe71facaef30e4d847266379fe38ef6e2bdc924ab12601888a7cd33b4 SHA512 216dfb67048df5489393c560d64466276cca636220ab0f4af05839342731ad0567046ea1cfd0e46440598e9858fecd246647df6cbbc88665c782c1b7e61d2c91
+EBUILD stamp-0.6.0.ebuild 790 BLAKE2B 247aa6231bc3d03d830369e9840883331ad2413921543e01015bd9335c14a3b831196db813ec58930ae7a6e6d58b21a1778e078dc84800392f590717d8b83010 SHA512 6cfe15fc7873971f5438ae69f97ef4080937934cf5ef0e73d15ed12cc3c7ef924ba7cddf8fa9eb1e4642ac36794b2dc7a4ae9b5246329545f1091247dac63366
 MISC metadata.xml 339 BLAKE2B 39578762fb4e2cabf1c1d57b6644848565610013bb0cb5a0885eaf2923dcbc9ac2246e5ae22d688fc4c1eb607a3caf2288ed45400b635debd87a2e20c99bee6b SHA512 b81167c6ad8195382cfb07051680ea331441869f33b0e9eee25c86b18ca6f107b7e464581d0f63422ca2c81ead34d8bb51cebdb1e9cb7afffdb99fa6e2d33329
diff --git a/dev-ruby/stamp/stamp-0.6.0.ebuild b/dev-ruby/stamp/stamp-0.6.0.ebuild
index 6eee587d06d0..9544f8dac9b1 100644
--- a/dev-ruby/stamp/stamp-0.6.0.ebuild
+++ b/dev-ruby/stamp/stamp-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/strptime/Manifest b/dev-ruby/strptime/Manifest
index 40bcc2aa3f7a..b48d72c45896 100644
--- a/dev-ruby/strptime/Manifest
+++ b/dev-ruby/strptime/Manifest
@@ -1,3 +1,3 @@
 DIST strptime-0.2.3.tar.gz 17375 BLAKE2B 583566c19cdd96f97b469d3353236624b814ea9200e1479d32c552d06431e0008cd9dcf5be03564948898fb9e5a1470a5a8bdb531d4054bfe64899bbd6ec92e0 SHA512 1b9ee2f7c0fa747c6df5a56c5d7f667c4a9314c334472867e890758074f9da387aae54d9171b2460036a21e890fd743187571c6d4a995e4117d6c4307b8134cc
-EBUILD strptime-0.2.3.ebuild 872 BLAKE2B 622782f08b94f2f2a067d49d2a0101cbb794815839be5dd9e0b33ae3776d26a7b889a9f66840f6c936c3c414258951dac72f6f4f3f12fc5e221bced04d726333 SHA512 2238b88dffdc0f8bfeaa1636ede6a62de10c77de1cdf43aa52b6c2d08047dcd5c7a8df9f9e509209302eb9c8b85dce650fb1e24128ea5175bbb1f1c37d5e1305
+EBUILD strptime-0.2.3.ebuild 869 BLAKE2B 1d82d08d5962c7dfab8ddb163ecd494e4c5dd61e8f3585c0bf0050b04fd9dc07af2d8e95a8ba55ceeed74c41b5c1e8a54b86dea36027433f0fe63acff9ee1a04 SHA512 e3954b95b15674f1c4369a9731bd6e2199a1ddbf8b65efecb7c3490ad46641be857cb780a01fb978e1ee100764e0f16f598903836055d0995ec60b435edfc010
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/strptime/strptime-0.2.3.ebuild b/dev-ruby/strptime/strptime-0.2.3.ebuild
index 4b7ddca63c51..d729ffe83522 100644
--- a/dev-ruby/strptime/strptime-0.2.3.ebuild
+++ b/dev-ruby/strptime/strptime-0.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/test_construct/Manifest b/dev-ruby/test_construct/Manifest
index 6f918e4d04cf..21fae8f17058 100644
--- a/dev-ruby/test_construct/Manifest
+++ b/dev-ruby/test_construct/Manifest
@@ -1,3 +1,5 @@
 DIST test_construct-2.0.1.gem 13312 BLAKE2B cda8bec1e1fe343ae506c73bf480a982fdd1224da1e77ab19827a3b76dba57294397d811040448cef6956c8492c9c5cb618d204834d31b54e8619b3d224da20c SHA512 c9898beb04d23974dc5b66a9d7bb4a77cd040cc63b724108c4fc4b81f0680d23a9e09b96110c1b5458107d0c2c8714cbed8b2e81611eef8ca7fab92b31014e98
+DIST test_construct-2.0.2.gem 13312 BLAKE2B e1a5068e8133f739dfc407e943b0486c0c2bb2a8f18943a23b366205b206a56b792630daad7a92a021ea367d490b117aec1313faa0e5360bf6b984df3b82c16c SHA512 d73e2daf5c5974c79aedfcd7e1cd6681a3f1f6fe3f2c68bcde26690a18be920ea53b648407e4ee33444364b2a02f1517362c876e703abad02fc528a47de092ff
 EBUILD test_construct-2.0.1-r1.ebuild 605 BLAKE2B e196f6c66397ede5b6ac53867d11f51a341eda3a1a9851e4431234cd6b14089b9611ca28741af2d465a1b99c73cf16cd76b5a8be55c5a796ae9febb42c0a5dc7 SHA512 16fafa0e0090a2fb076715008b2c466515cb48bf548404e9635a2fc6e1d31a18008414ba1ab1a5bfec0a845ba8fb53f7d251f8b1a8ba58371fd3aaa6ecd5007c
+EBUILD test_construct-2.0.2.ebuild 598 BLAKE2B 44b65fe864a73e394d14ef583bad03815971df4dec8c0853fede1251a8be66c7356605aa9420a3697a51d240aa135d21c507868a8bc570016de08bfb9d3ea8e4 SHA512 c65c2c2a6246b1b47669b07d45eb1d2b48f60b55ebc12b995911534eb8290a81141bcc4093929e79e9a416059fc40526d0b04fe75e73a7a326323227e520c882
 MISC metadata.xml 344 BLAKE2B 57f981c2fc03d23ec6e61d5eed8c83a647e6e01273fe5c8d30bc3aeb2ad206e47cf11a4febea9f5fb4af1c4f112ad5d90e30d6669b9d77bb16fe939ab305a9e3 SHA512 a22764193d618f851e61007e23776099d89f6f81345326ca65916671ce532a0de0ca7bfe0714903ca004d19b876975b9d005980336731babea75d6e711fa9199
diff --git a/dev-ruby/test_construct/test_construct-2.0.2.ebuild b/dev-ruby/test_construct/test_construct-2.0.2.ebuild
new file mode 100644
index 000000000000..dd4b939f5a67
--- /dev/null
+++ b/dev-ruby/test_construct/test_construct-2.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Creates temporary files and directories for testing"
+HOMEPAGE="https://github.com/bhb/test_construct"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/minitest-5.0.8
+	>=dev-ruby/mocha-0.14.0
+	dev-ruby/rspec:3
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/textpow/Manifest b/dev-ruby/textpow/Manifest
index 8f8b6277cd43..45076384688a 100644
--- a/dev-ruby/textpow/Manifest
+++ b/dev-ruby/textpow/Manifest
@@ -1,3 +1,3 @@
 DIST textpow-1.4.0.tar.gz 386724 BLAKE2B d2fb051810cdbe26caafae62d402ba257a644ceeb5975b1bce8858e8359026bbeac7795b264c84462cc6bd02b5a110eba70338d955ba793cec8abdf194089217 SHA512 134b38e277118cf626e3e3643e447d7c7914dc89dba527682c4d6318a0d3b96edb81a68ac5e039158058de371ab9a326088cb119069c55032de7c2f1dadffdcc
-EBUILD textpow-1.4.0.ebuild 701 BLAKE2B e0b053ca371b317bdd89bba217f2e4e682b79a468db2d72d7f14113e50a390a66e15883f475deafc340aa9f1ce46105c41f9e3fb07dc6a1280f57c4529b5604e SHA512 6b6d95ba6146795f1c56ed3b9eb8422a84036d87d11daa6897254dcc38685bf8f016fc2040846965d64ce27f09600906fc52fc26ebbe4ae78a29f82446154416
+EBUILD textpow-1.4.0.ebuild 705 BLAKE2B 11993d5b5e3818e75e9451a27d8e6979217ced095fab809c3e0973982226c38d3d9748ef69af6ae1aa1ffff1b1d7fef0fb45dcdfd56a03874025a59d5315d0de SHA512 ba656735fce8b45f424ad7dd26648e2a4da75e1a40252077a81d59ae2abb1b5253eb271cdda34fadc127c4327a860b39fea7968e9392b3e6a13eb06edfb81617
 MISC metadata.xml 341 BLAKE2B 383fdb5f393623dcb98c457af70169f516cb868d8baa65ba26d3bdc4a7c8b863f15aa131a93edbecfb5ad1a402618286eae5364ea30d5972ceb530c7d5bfcd1e SHA512 63752ac0e90d7b5b58d10ab67633b84c62515a7f9e5f106e40fbcb1daf3ee7a8669fe156504017964eca39827f8542c1519643519ad85dce69ad83f71b306c8d
diff --git a/dev-ruby/textpow/textpow-1.4.0.ebuild b/dev-ruby/textpow/textpow-1.4.0.ebuild
index 86518c85a192..a7207ddb80a6 100644
--- a/dev-ruby/textpow/textpow-1.4.0.ebuild
+++ b/dev-ruby/textpow/textpow-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index bcda37343b8f..66c87f1114f4 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1,5 +1,5 @@
 DIST timecop-0.8.1.gem 16384 BLAKE2B ca3aa8422841b83f4631afa102c4475f4df73c3968eb9ec17d2159a41ed976330ac9c078970f3ed2a504146ae0f4d88650892c314c92da6dab0f8a0ff0a24a35 SHA512 c4d281aa04fe94636dc23dc0fa6ea4a1dc27fc1debe550b06a208ceaab1d9d8b160f792bd5f14a7c004cecf489d4427df39873a68fe6ab27fe9c0e94770cc764
 DIST timecop-0.9.1.gem 16896 BLAKE2B f4dd9293743f0be4dc5616aae077965a32e348faa7019867d694689b0376c6be06817870842bdcbf5f398ec4814ae1e4f6546c75c95639bbd2cb8021a1dee3f7 SHA512 2c8429ad4d9c706865810caa80dfb12c16acaaa97ea289fc300e172a359817fea7d31789f4bea75cfae8ce1f84e7d8effd32b39a0482f3d68fb4e225b487e13e
-EBUILD timecop-0.8.1.ebuild 991 BLAKE2B 6c96ddbf8210c1960fdc3f78e6b9562505c2dd8e2f93ae6e6595c995f2dd0ccee97ca64599fb4f813b7fc808c8dc5033d6273795db86818d2ac338b8aff765e7 SHA512 9165d32f3bf1f3bd166533fdc2c0a50bd99d0d2c9eabad014b202cc893733665d706d7437538fb3f847dc9387c01b034879a36c8ff236c6c5934894de9b89ad3
-EBUILD timecop-0.9.1.ebuild 1005 BLAKE2B 3e0f1ae4b8f001e3e8541809487e37208997d0ec17b58527d1727181021f28e9916f50062b29a7716bf704bc756c24f07fd9e01e7ebe231a1d177724c922503c SHA512 872b6cabc68311dcb5f30d193d521147e59f9ca1c9bef7b2dc45c77f9e07720b2f3cfa90a6d290c4a178eb60954f77b6255b2838c8aa9e60a7bd81dfa110a2be
+EBUILD timecop-0.8.1.ebuild 990 BLAKE2B 9ff884f6288bc677b46766101295390a3c3d790414f2cf7e2d57cd2e6057cac544f4049d3b796a6355815edfaeea11e0ddc413a12208032ef004e7f0f09b4dbe SHA512 6c64387f2b03a3c0f18ba433bbcf3e208bc80d7ec5503022ba579307eb71b4aafd4ac6cafa5d4abb7c382b71f9e532196f7dda3409599f927777446f18f5e73f
+EBUILD timecop-0.9.1.ebuild 1004 BLAKE2B 0997ca426b8d4219a00f9382b9c71bb936efd375d29bcd33ba809759d27b42d4f096109bc5cbc1a58e072903d0ada95eacf308b5d6baca643e0966d5a0f3cc43 SHA512 40da3a0289396c13fe4719fb5ebb65f4a3219ece072bafad9b25c3779f1fba1683a93abcb1040073f358f3baafc8a4caf4bd8ed4511cbe7f460fec293f26bfbf
 MISC metadata.xml 343 BLAKE2B 98bc9d7ecd9ac2badbcf92ce7b89b2b4e3798fc284b7dda56b582a0d18f2dfd4dee8b371bbd74e404985e6d370737e5ed746543393408ec60157b8d0b95a7b86 SHA512 1f1d30e9ec8a13854596017fc22a430ad0b34a8d8477804d28906eaa94c294f5cb7e845adff2aa89835681afab48f77b601b5cbff780d00bf0d58959b2ed4fac
diff --git a/dev-ruby/timecop/timecop-0.8.1.ebuild b/dev-ruby/timecop/timecop-0.8.1.ebuild
index cb3a11c1400a..e0a4e9da65b4 100644
--- a/dev-ruby/timecop/timecop-0.8.1.ebuild
+++ b/dev-ruby/timecop/timecop-0.8.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/travisjeffery/timecop"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 # Missing testdep activesupport
diff --git a/dev-ruby/timecop/timecop-0.9.1.ebuild b/dev-ruby/timecop/timecop-0.9.1.ebuild
index ed9761391250..32ae668084d8 100644
--- a/dev-ruby/timecop/timecop-0.9.1.ebuild
+++ b/dev-ruby/timecop/timecop-0.9.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/travisjeffery/timecop"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 # Missing testdep activesupport
diff --git a/dev-ruby/timers/Manifest b/dev-ruby/timers/Manifest
index 58c31549f6d6..1463f5a3ebfc 100644
--- a/dev-ruby/timers/Manifest
+++ b/dev-ruby/timers/Manifest
@@ -1,5 +1,7 @@
 DIST timers-4.1.2.gem 15360 BLAKE2B 2480b6051825e26c9c30418e4acd7f9d8d0173d21038349ff16c086a2712eff7e9349720d270ed6505d8f90b14fc4dc99cf06d948922a222196d338b7933b5a8 SHA512 8c43f6ab09b918fc047056de20e85371929cd6841d7e26dedf54d565585eba040e23cef83c8747eb0ec43df8c9d9cf5915b5ea0ac6f6d551a0b086de3a9f3499
 DIST timers-4.2.0.gem 14848 BLAKE2B 0d3c1b70e6b4dade1664eac6951dfa1ff876098747d2f6eab21a2dff2f334cd614ac2c73e0651b93e92b3850c7933445a14bc4f43b50adbf1895b49c05d9507d SHA512 c5516c45e47bcd35bb5f16be0ddb31a2b1370bf06ee833c50b3121a7c36437fb418c58986b0d71979cd01af47bceb1ccd2ff50b1472592868175c4271c85e15c
+DIST timers-4.3.0.gem 14848 BLAKE2B b6dfa758b8b16fbc2a28da08df05ade4551d398cfcf1ce09cc080dac4ac6adda4e741a9c5dc89d71594fbc81e5b55303556b012b03bd836ab1f63f0565acafc4 SHA512 6783424cf79f7f36292198621f93e17540e93011146c3a33b1b14a118c31a508352e56e479e3df8d9692c6f95b366561f27b374611851e88ad3fb6bbd1606037
 EBUILD timers-4.1.2.ebuild 799 BLAKE2B 7987723613746413a08b27ab26bf1905df37aeac417cfc6fd138759adfffc8cd2f0826153bc982c17613e5b4cda947d8527ea8f7b19dfea7a3732cdefcfc07fc SHA512 9ad952a071e71579a131d97af99e2b3b55db6a640eb412d079aceb5695fecf324701e7dfed7776c5d7e29a8283f3cb74f1ec05fa2137c97ad5cb06fa92abcfad
 EBUILD timers-4.2.0.ebuild 937 BLAKE2B f4036237d491ccf5b15e976b46bd9fd977e9f1f4213c3b6160f817410f35e71a05b623cd68e9a5a4b7b80b0d202075e45112210fcf853706f113d6c9442432cb SHA512 1abd084f2571c4279a7dba710f5a1f98350902c8a99069d2645f0d8a2ef9be216871cbbd2b69214c354ccb63b1c005b389c2efdc3b184e00d3f3ddc809d49022
+EBUILD timers-4.3.0.ebuild 931 BLAKE2B a579d07b04af0c82a2a13ab0b98969cfe67f728b2c6ef16aa05ff88bf9b11bd35aa6d66f165c0cc3f930384db3180bf2a0f077df48086a8dc31428ca4a89eaef SHA512 fbef149f37f49ff3a5aaf09abbafda6d3c644ee319158b6473c4df7faf1f41c666657a45b77b9802eb25dcb7c5a2e592c0dac669e9536ad073cc0e814b1a6713
 MISC metadata.xml 341 BLAKE2B dfe2c9228e7b666d6b7acb9d9f0cdaa70263a6d5960ecbb144699e62c94ded1b613a8d22f82e5125f6a2e954901a65da57bd432823d922d17164e273b809d8a9 SHA512 b863e101e06e7a8827cd6166688dbfdf77c5bc84203294d0ab63315fe5b5b03fe1898d02b9f219bbbb3f3cddd3d5185c34d9e4079bd993631cc849eae9ac9be1
diff --git a/dev-ruby/timers/timers-4.3.0.ebuild b/dev-ruby/timers/timers-4.3.0.ebuild
new file mode 100644
index 000000000000..10ac18c10a09
--- /dev/null
+++ b/dev-ruby/timers/timers-4.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby one-shot and periodic timers"
+HOMEPAGE="https://github.com/tarcieri/timers"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/coveralls/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/Coveralls/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid performance specs to avoid ruby-prof dependency and 
+	# because we cannot provide a good environment for performance testing.
+	rm -f spec/timers/performance_spec.rb || die
+}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 546f2bf45c3b..0ef81d4ac5bb 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,3 +1,5 @@
 DIST tins-1.20.2.gem 305664 BLAKE2B 37d206664077aa1ba8bac395e076b448797c9d73f46950ff339834b55cb1eaa36e1cdd47a9795d783671a8ef393f6059578ed684240de377ec8824c2468f5014 SHA512 c6c7694ddadf0cf46176a1fabda8ffc2d6b098ca6ed4d568f30c66100a2f55c25ce83c09e8ba379ee6c49dd68d6f1572f17f70f9666628c1fe5225fcc9d7b788
+DIST tins-1.20.3.gem 305664 BLAKE2B 26c78cf94acba6651c631b274a98cc7e19d3e215a450d255886d201c5bf94c343141edeb03456a178943cf70efbc9b75ea12cc2ccaec5c929fe5b2c08e918d2c SHA512 f5f723402096e869a8e44e64db9dcd0be4620812f0b5cc291df79010fcb87774ad56298de328242c96ce9dca64f7313271b9fec8cff758a6b3b689bec17c965d
 EBUILD tins-1.20.2.ebuild 628 BLAKE2B 8130fcde3c9ae7f8103b30cae9b164fe3245e243b053710c5cf59740e9144489cc50e05fbddf1a23a7a0dcba8fd9b6cd6d68b1790f2d63fd0c49bf58eb6c6697 SHA512 de10342ae03324eeb94eff836cc4761d87e533a1ab92642a5ee459e57048a0de3ab10f990ec8a400c4c1cd7b7ca382dc09279991254d89e785b4451cc1541e0f
+EBUILD tins-1.20.3.ebuild 629 BLAKE2B 39b3cb83747562c40402326766539b93349ae5dc6dbecb47e33a49f25fec4b2811351eb9c7d0b853df2bb7db091482ba5a5327c0ea0e9b2de9834e40566bd3fb SHA512 40ac327a065893791ccfa28e6d04e40d35a6e504fcafea7e0d2899ac46ce24b6c0b797bb184ee8f6390e427d6f76465d99b7b249c32933e66922699120347b80
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.20.3.ebuild b/dev-ruby/tins/tins-1.20.3.ebuild
new file mode 100644
index 000000000000..19bbb25c440d
--- /dev/null
+++ b/dev-ruby/tins/tins-1.20.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/twitter-text/Manifest b/dev-ruby/twitter-text/Manifest
index d4522db2ffe7..ab5a3952ea89 100644
--- a/dev-ruby/twitter-text/Manifest
+++ b/dev-ruby/twitter-text/Manifest
@@ -3,5 +3,5 @@ DIST twitter-text-2.1.0.gem 54784 BLAKE2B e0ee791f63d43f8ff8d87f5b4cca337761efac
 DIST twitter-text-3.0.0.gem 58880 BLAKE2B daf80ac931ee68a9f0f84ae13433169c70147dd738039b95268e01da59c61717f1df067685df5923bb799b728d788316c3bc7cf1da5b5dc209c485220e8bc8aa SHA512 2afd07636e1cfe140ff26e52ec8a4c23b6116f7166a73e1af1fec283aff7549c06ff46ed51fd178acddd607c1f9c82eff1eee7cb3ce81eeb78a73305e14120ad
 EBUILD twitter-text-1.14.7.ebuild 680 BLAKE2B c29b150b4c4e45ffb53d1d9e08c6f3ef07d83243f3d9557d3f423b1ad54d5fa9528e3219db8b719ffe9be35b2cae82f10487c5399928d3fab8a2e86068212548 SHA512 79b220db94ad7d250ac8bba09205e7efee7c2217d2b4dc08d1b52af714a16de2b9340676c531ef11bd47a78a83041dda69e34f7c0676dd9d20cc8a4875575ce3
 EBUILD twitter-text-2.1.0.ebuild 724 BLAKE2B eef9bf040c4e09f4ca58b457f1fd5202f09ab3375459dcfa40cb9f7fcdc9f079e08e78d1a9c1092e077e9c480c87c082c3b6c27bb2c77a92c8dce7f78a8b5a18 SHA512 00496136bc4b3c86b6392e4f0d9a716530409df3f8e3c89aff2b0f43fb07aaf89e98af9091f86c9f11735aff514f5a797231843c1f17676214d091e522e8c141
-EBUILD twitter-text-3.0.0.ebuild 757 BLAKE2B bd209ed87bf8c64077daae8f5cee0714316e3e333178f39eabf26b9869ad61d67c81131524214599ffee9c38bb1b825996951b32d18eb9075418d5e836ea6335 SHA512 4dd72b67112e8d393b54f81c8ab7c5164b234239a2afe08b69141b62821677cb50855ee68f26f9fe25deff48e9423eb8122452a7f3d2a337d6c4d5cee46df01d
+EBUILD twitter-text-3.0.0.ebuild 764 BLAKE2B 1f83a69de0b321b971d3ef1fac4eea9167ef78b0b828c216e69254f657552ae1096159715b33ed5f50f490e66756b5e4c9203632a084eacbb34dfdaf1f48ee16 SHA512 ad12cf88f4bc063bf2ab43e15a878d2a9864e3d62150620260a5cf57eb2a00e91c8df9dfdbf1444c757d1f54ce7c3a51882d864ae648627da10a635a8818e6f3
 MISC metadata.xml 346 BLAKE2B 3c20459269b0d8df90be33c5884c0e5925e9f2cde075ebac70a03e74e8afc51cb0d652aa4825099a775cd266e50e47ed6b2efc12a1ac253b68fce15a97766101 SHA512 89f26f9a6f6b3ae47bfbfcdb944b44b17f4fc9217c6858d88c3127dbe580f8e00575c6214cbe62f8e5e83e3d662255757c03d4c5608e69229c0417f55ae23bb1
diff --git a/dev-ruby/twitter-text/twitter-text-3.0.0.ebuild b/dev-ruby/twitter-text/twitter-text-3.0.0.ebuild
index ea59fca60491..0c091cf061e1 100644
--- a/dev-ruby/twitter-text/twitter-text-3.0.0.ebuild
+++ b/dev-ruby/twitter-text/twitter-text-3.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/ultraviolet/Manifest b/dev-ruby/ultraviolet/Manifest
index 86bdc5eb8b9d..ddf05710b7c1 100644
--- a/dev-ruby/ultraviolet/Manifest
+++ b/dev-ruby/ultraviolet/Manifest
@@ -1,3 +1,3 @@
 DIST ultraviolet-1.0.1.gem 46592 BLAKE2B 2dd9b69bafdb83c321eee2c4fed9a39782959893993bdd27d3c1ab8337ac1f9a68d8cf7cddbef12404041d541d183f0bd205a4c36ee4978a2c0a631d0df3fbce SHA512 f974f95743b56d7424c8ac96867c56f4d849247ba552bd09ba8893ca6520758ff2132ac46a42f22b8547732bd148531d177a7d38522fad1dfb86d54ffbb29861
-EBUILD ultraviolet-1.0.1.ebuild 702 BLAKE2B 79e928690e8914c853a31dd460d90285e01f8deb23f956b257fe05d848838d378d6a80feaf9a769e475ca8552ea4dee6730afda71774f30cd61fd5f448137f3f SHA512 d4b16aa0eca6bf8f4808f49c05472e60cc78faa18d407247b6117f9cd7b700c75e2212eebccfca04e05089e4eff9a6a0f1ffe4aff319ac5dc8d60d1d1c945858
+EBUILD ultraviolet-1.0.1.ebuild 706 BLAKE2B b8f94548418da69c3376b16a0103c729e451b8d6da44ad8ae327f7572328713bfa099cc9cfebd8fe03e04c0c4d76864e551620c8aebb007d87fe5e27982fd18d SHA512 ea480e5a81161c5d49e32a7a3c778b0057db4c8f0e511693b5950ee55d909d79cc040abf0478b0e75bf820da681c1889cddebad938c053e38e9f47cab9c50049
 MISC metadata.xml 345 BLAKE2B 72aef81c1274db29f1898e20cf4a298d017000f8cc2842be7066fad3600feb955faaa0a0f8361fefd931395a252ffaf43bcfc0761074a1a8ddc6ce150ca26c36 SHA512 3cf569bd61e3369a5b1ebfe5c45d01df67316bdf5aaf429514f68f89e2aa526a6bb7460a970b906c8845c3f04d25d35151d986ee72e3f9509791340576539391
diff --git a/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild b/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
index 1a22074b10bb..388c85ac1ee2 100644
--- a/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
+++ b/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 1f88afaef43f..09f37b970794 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/bibtexu/Manifest b/dev-tex/bibtexu/Manifest
index 85fd61001ced..e0d06889c4b2 100644
--- a/dev-tex/bibtexu/Manifest
+++ b/dev-tex/bibtexu/Manifest
@@ -1,19 +1,25 @@
 DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-module-bibtex8-2015.tar.xz 9204 BLAKE2B b3059e4fbab10f31060cf16b41424ff9a1fcc42e587f3f937090db1b320af75a2925accf4fd785ec0574609510b42c011b7a8c7d6400c68df655e8752eefe106 SHA512 4fb4d5c80e6b8f4f53bf43ee587a274b2dca3b0fdbf74f9f898af82b49d1fe4492ebef69caccb7ab8951c08eeb70ddb21c748434dfafdac047abe47bd305e2e2
 DIST texlive-module-bibtex8-2016.tar.xz 9216 BLAKE2B ef4611db0d4d6b4eb67414f64252032ff29921ed9cd6cccf145792b937a26d8b683b3d0b75a70e4b51d8cbc53a0c107adec8320f2ff035000a1bcced31e51a2e SHA512 442e629cefbffa5c8b415183785789986b3b764c44515bf5bd29bbb75f8f49e519490a5a126f6db2cba9fe2007c57541d77151100e71c91ee62dda3a5f4ba1c2
 DIST texlive-module-bibtex8-2017.tar.xz 9216 BLAKE2B ef4611db0d4d6b4eb67414f64252032ff29921ed9cd6cccf145792b937a26d8b683b3d0b75a70e4b51d8cbc53a0c107adec8320f2ff035000a1bcced31e51a2e SHA512 442e629cefbffa5c8b415183785789986b3b764c44515bf5bd29bbb75f8f49e519490a5a126f6db2cba9fe2007c57541d77151100e71c91ee62dda3a5f4ba1c2
+DIST texlive-module-bibtex8-2019.tar.xz 9216 BLAKE2B 533773a96606e2b92ae5a08ff65f2d0075453faed37a0a6ee727107bd64699d400faa834146ed11eddc1f5d259d5da6a586e7e4e2984aa99e4ee3da07f3b2f33 SHA512 9d8ebea38bad048488251baf4ec7f939eec9c75df17dba576e510c09da6288a9cd2967c6c1dd5f7a472de51e38030801ff192874fd7d038a1f81e063614675d7
 DIST texlive-module-bibtex8.doc-2015.tar.xz 13420 BLAKE2B 5d1b6a2ca0622fae482a4c33530acff637fb638e452474131506f8eb322a49ed15f02fabb82dd7e2bd218e8ec7a05d40357ea55a8d146f895ae7843bc0ca3caa SHA512 7d4525d402ff02fbff6217be7420ee61f77601a083e86a97bab0cc2da0dbc2600c678e9540103a70038664696206b1ea03e67d0c476b064af7b55b095764026b
 DIST texlive-module-bibtex8.doc-2016.tar.xz 13420 BLAKE2B dd36adcb452533908c8854c492430a97121a73d6c2cca6708de5cd83f43a58358b5368498691b237c197a13054b17e43015340cf655122e85d74d7c2f84ad6df SHA512 e4fff102d5abd0a1f10319baddfaaca5cc2947f2cc2893fa5ea160695aa3b43a62769747a648c2c4fc6ca5fe2485257f9ddca1b93cdf370568e2ede62ca5de64
 DIST texlive-module-bibtex8.doc-2017.tar.xz 13436 BLAKE2B e7cd99e7f327c5d90b63e9644d2c836ab563931a505eee6b4823ce5f7f8e02861b4bc61af3d5b6731c3c8e77ab78372e3ae4e992c2dad10c21dfd09c4b307b63 SHA512 1b5ad06b229f6d0b1d9712eb4e35d96ca1e707040ea0981d399346f9f432821a8739ad0826df8de31de613011880a4a5a26b848c7a2c4bdd27263a297036b932
+DIST texlive-module-bibtex8.doc-2019.tar.xz 33160 BLAKE2B 9295f0114acb74bd9abc4621d9126b8e1bdb5b0fdf779db3924f2147bdd77217800da69788f9d601c910ad54a1cd6b4dad787e208bc4b020816668aa6d82a764 SHA512 bf6b13a5ca1e467c5435b51e6c5c6c4549eb456ae91fcac1c756ca09c165fafd488de6a4d2462057ef6ec7b3ea0b0518bd732556159ced0936494c5ebd4aad22
 DIST texlive-module-bibtexu-2015.tar.xz 244 BLAKE2B d757fff4c5f5ff5c7441f8cc8659a36c0ac97bdf75264d13777f8d3df2f040921cf3e04d7ec3b48e076d859bd90ffbe43a85a2500927b2f8728ae4696e214281 SHA512 3a5c3e4fcaf36428f64a4a9341901769bc5ea7fedbed6d8f3d293b9e44f9ea71046ac5717c366a392305d88b324d4461e1c30a2dc0305c969914e26b921806c3
 DIST texlive-module-bibtexu-2016.tar.xz 244 BLAKE2B 8fcdf1b14f79d5258d9c72ef702b39fb7e6bbd43889a842f31d83f9666847093401821df645e071f28c755e2d5bfc80c007d9e9e66129addcf9e5c668d7aa138 SHA512 50b36da89006fd378acfc35d26c9acc5dd2755ce2804495d050b44e686d41f940bd0682e0222eafd57113e149c81054d91d5ab1edbbf2f7ab2c3b6f651d3ca9c
 DIST texlive-module-bibtexu-2017.tar.xz 244 BLAKE2B 8fcdf1b14f79d5258d9c72ef702b39fb7e6bbd43889a842f31d83f9666847093401821df645e071f28c755e2d5bfc80c007d9e9e66129addcf9e5c668d7aa138 SHA512 50b36da89006fd378acfc35d26c9acc5dd2755ce2804495d050b44e686d41f940bd0682e0222eafd57113e149c81054d91d5ab1edbbf2f7ab2c3b6f651d3ca9c
+DIST texlive-module-bibtexu-2019.tar.xz 292 BLAKE2B 534ad7d8d9a1e8169a28e04bb9d0c7a083a781e2a0035e9c66fe88251e36c5a7f552a0f557571b2a90c5a4e28a48b1c10ee58aae9df5a98544f24edffa5f54eb SHA512 ad6c9702b9b1a41f45e493d27a75f703a06aab99f30ed920f8e3fa8a00d9fdb37009afc7dc5c27ac557e5fb5b3214cb0473ea5099e1fbdc596c5d8f86865a71f
 DIST texlive-module-bibtexu.doc-2015.tar.xz 13416 BLAKE2B b6ea17a814897a302633bd4721fe251a723712d611e695127647aa3f340b79c9baa4a2e7115b3e73e517b94a456d366956a9c5ed016d9a1044ca5a823c5dd2d2 SHA512 ae4b87168c620f72479eb895493ab725e37589b40f9cf0b88373a63f860bd9c8f4dce587ae55f6746616d42b69c95e82b8083e95a9ed7fcfd6de6c8a2a90a47c
 DIST texlive-module-bibtexu.doc-2016.tar.xz 13416 BLAKE2B c7d33e4d606f05a32257c22721db79db8c11f0dae0f7459465cefd87c5b898e3e0c793958b9cc17f880ae97eba782db964e33483a55f966478202a018e71b281 SHA512 206e6e68ec0b24986ea1a54f970397de704b819e264c7c42d0de23efb73221e5ce746311aae8513458f275872fc2ad6d2328ba89b30a90491f4049e9c317a363
 DIST texlive-module-bibtexu.doc-2017.tar.xz 13416 BLAKE2B 45aca26d3cb18ca85c761316d5fc4eeda7e11447f4bee8795918e550744d26c9f14b25b7876121584ad626b531aaac1ae329223bf448f8a3476fa864ae571f2f SHA512 c66922b2d155f3d7763ed08498283fa49f7d3a1cdc67be5f2e32189ae622743a6658d5b1765d85f7cbcd958ca210a235de43f9dd4ce2d822d679efafe5d45025
+DIST texlive-module-bibtexu.doc-2019.tar.xz 67480 BLAKE2B 0a30018731760afaf76167bd729e4c241af3a6a89a1bd1182e9de29962e0dbf48f52fae6e3091bd2fbc8ac14bfa58f35f00dc002ea0a4592b375e7bf495de905 SHA512 317a7806774db23017870f67b66730a77ff3944467bd9575bc6fb9f6a64c8e273bd3e337af218e1b4a156cd4e040bf6c152711d2e8bcd4bcfcb94c4746cd6b06
 EBUILD bibtexu-3.71_p20150521.ebuild 1637 BLAKE2B a03099842abcff075f710770418f02e92109fee65d4da14ffb86b807127a362eb97d745dc3038b57f45b8b97bb9c11b638b30a42c5c444dd68fd999dc845fd08 SHA512 31d6e649679f311eb325a4fe0976075c3b2a7024defc5ada49e4070fc2dfcd70f85f50192d54c905e472132d4830140084208d087cb8fb2773d1310786449092
 EBUILD bibtexu-3.71_p20160523.ebuild 1636 BLAKE2B c134b5366b9abf2cf6d32a9519a61575e21be52c01637f03e90bd66fd8144cb4af82417474e27778b1662d657a43bc8242d36ee16e24302a89f409ac4b3a85fd SHA512 d5d365d775a9ea716a766539e7a4c3be6086983f47af41a157c336aeff1c5e7acba38e82e6d34b997fa57b883338d1d7909aa09f6ede00869f95840c20e6c65a
 EBUILD bibtexu-3.71_p20170524.ebuild 1634 BLAKE2B 6055166402583dff8af59047ecd61f682cebf27d7c74e8bdfa84c2cad15ddb2363f6d7dd6d4a0ae98392f5c42a2e594f31db9cb7211558ca467c2f3ecef84909 SHA512 5a59728aa03420eb6e65c093379c7ae49f6a4eeb70ad8cf698601954d080357df9d80d06220b5248625be6b6c8fe8852ee60aa5c672dfaab92ed0da02ca9bf71
+EBUILD bibtexu-3.71_p20190410.ebuild 1600 BLAKE2B 0c36be1b4a8f791cdfaed640ef424ce5d99f304ebb674c3a50020f427abacd5186c2a1e49bfc8900a55eedfefe140a8432a51146d4a7bc3d7cae90bac24ab277 SHA512 e743758c2f6a0e83208c13c97da6b975cb329ef3fdf7142dc258e27a32d8d856e73e2a0630c7fac64d7c42ed4fd148cf19f58706b763d7041bb53e21b2023a1f
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20190410.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20190410.ebuild
new file mode 100644
index 000000000000..3a604e2f60aa
--- /dev/null
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20190410.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="8-bit Implementation of BibTeX 0.99 with a Very Large Capacity"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+RDEPEND=">=dev-libs/kpathsea-6.2.1:=
+	>=dev-libs/icu-4.4:="
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/bibtex-x
+
+TL_VERSION=2019
+EXTRA_TL_MODULES="bibtex8 bibtexu"
+EXTRA_TL_DOC_MODULES="bibtex8.doc bibtexu.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+src_configure() {
+	econf \
+		--with-system-kpathsea \
+		--with-system-icu
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		csfdir="${EPREFIX}/usr/share/texmf-dist/bibtexu/csf/base" \
+		btdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+		install
+	dodoc 00readme.txt ChangeLog csfile.txt HISTORY
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	if use source ; then
+		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+	fi
+}
diff --git a/dev-tex/rcsinfo/Manifest b/dev-tex/rcsinfo/Manifest
index bcfe743c43b6..cbb399967f81 100644
--- a/dev-tex/rcsinfo/Manifest
+++ b/dev-tex/rcsinfo/Manifest
@@ -1,5 +1,3 @@
 DIST rcsinfo-1.11.zip 168947 BLAKE2B 4b947a5175205f5b62f18f557a101b2a64a210fd061198d8738cc5082ae218bda58756bb8fc70cd69213bdbc849e7a27d40e16fa743d9fdbe7b7e056161e0c59 SHA512 122faff4690e35de6b475c6157c791a968ce4307f5f9640191f5245c280d120e9750c1c7a041e9ee0a40c3774f2848338f27302e29636bde52d499f9c0f367da
-DIST rcsinfo-1.9.tar.gz 15709 BLAKE2B 9cb16830acdfd7cef88804fae4770377ce2347d775a4f32717518dacd40075ecfc841568b77a86649e7c5c561d512a4b3dc4599afe1885e97348ad9339d65d70 SHA512 9cd79b79ea1f12bfe1e1545e4f9599ed5cb2b2f87f5077c14402a99fe1cf64ab2d4fc60a1351a781582d6b23a406ad74cce827f5efed9adb484b0f4391bca5b5
 EBUILD rcsinfo-1.11.ebuild 514 BLAKE2B 1ce7cacb8ece825a1d47aea3f0f4024e79256d9a1b46aed9385a7db404da9465466570fc4511a665c37146694648ee589e0345e24d350cd0e9adadf524b44bc0 SHA512 2e668e47c3208510c03e731df0ceff7c107f993ee6c951935af17d23656bc92a4308bb2e3b8bc5be8cc0750816cb0d49e531d43dda1a1e7c00af41f8bf38673e
-EBUILD rcsinfo-1.9.ebuild 506 BLAKE2B 81642d2cbdeaf330faeff82a858a5d9127a1217468157b166afd374b6080d5d396f3f3e124ccf586789074cf264f24c7d9970640c3382bef679c1104193ad3c9 SHA512 290207b7f8b6a6c348b4bb049e6b7b6da85ea94478ec5859d1d15380aec07fdad245dd31e01131d8dca314fbe3e725db3a6f67f9f3a2529ef31c7ae19aca345a
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/rcsinfo/rcsinfo-1.9.ebuild b/dev-tex/rcsinfo/rcsinfo-1.9.ebuild
deleted file mode 100644
index 181948a8c608..000000000000
--- a/dev-tex/rcsinfo/rcsinfo-1.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit latex-package
-
-S="${WORKDIR}/${PN}"
-LICENSE="LPPL-1.2"
-DESCRIPTION="A LaTeX module to acces RCS/CVS version info"
-HOMEPAGE="http://www.ctan.org/pkg/rcsinfo"
-# downloaded from
-# ftp://ftp.ctan.org/pub/tex-archive/macros/latex/contrib/${PN}.tar.gz
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DOCS="README-1.9"
-RDEPEND=""
-DEPEND="dev-tex/latex2html"
diff --git a/dev-tex/xcolor/Manifest b/dev-tex/xcolor/Manifest
index 561342855f00..8421e4aeab81 100644
--- a/dev-tex/xcolor/Manifest
+++ b/dev-tex/xcolor/Manifest
@@ -1,5 +1,3 @@
-DIST xcolor211.zip 745959 BLAKE2B 3eb312f4e06f96511e16828a38746a306d3f1132fbf93eab028b50787db215c054ddb8cb03a93dce48d4f0de330934ccfad4a70feb5f1357fec9f510dc35d7b2 SHA512 bd504ad3ffce1e9c53dd8588e19568f673f92100a3aded5278ed6893525cc68e505eacce99b563bd94e8844ba6d3bc443c529a2d46505897daa6d30b6d61f430
 DIST xcolor212.zip 769972 BLAKE2B 4d8b1dbf123fae07e6ecfdd90150d82b4932e64941598774d8bad4b009db15491d831bdaa03266a925724bac2d22bd28adf7e936f991d4d0d90a14de4ec81722 SHA512 66255b29aa7d2eb11239fa9ce1a12e2b9397028d84b1503fb5bbf06276b597263224eccd064f1e87f7bdb2e96b0ae2d564bb7cb99b92907ccfc2468492a3479e
-EBUILD xcolor-2.11.ebuild 858 BLAKE2B 21a321baca910d0921b50bf6bc9452984a5d740c6649908a864bdac04d81eae4658a7204e370fa2e129c6dbe79717a8369b9f2d5e4c32f8a73dbfeb4d4a819d4 SHA512 b6d97fec226e15b68c81197d92b2580fcd9da45443afaaad0411a29fb5f3d98a80378365f82e6243b068d5172390fe2dfce9e723892f0968c1a941a3634573c7
 EBUILD xcolor-2.12.ebuild 863 BLAKE2B ab751b55b4184f46d469ac76ab50bc8de142b86770eca5f4f06c3ec8f056263ada0d7dfc3d476d91d4c810bdc6364cf6466782eee5f7671489099e4446b905a6 SHA512 52dca55a50799ec384cda8e619659ffcfa5e149fe755a671bed077af470bd41dd6963138c6bca8d72268589ca91e43d10e4387a95cc072297fca332a21aaa4c5
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/xcolor/xcolor-2.11.ebuild b/dev-tex/xcolor/xcolor-2.11.ebuild
deleted file mode 100644
index 6f7dcf0def51..000000000000
--- a/dev-tex/xcolor/xcolor-2.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit latex-package
-
-DESCRIPTION="xcolor -- easy driver-independent access to colors"
-HOMEPAGE="http://www.ukern.de/tex/xcolor.html"
-SRC_URI="http://www.ukern.de/tex/xcolor/ctan/${P//[.-]/}.zip"
-
-LICENSE="LPPL-1.2"
-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 ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-texlive/texlive-latex"
-
-DEPEND="${RDEPEND}
-	doc? (
-		dev-texlive/texlive-pstricks
-		dev-texlive/texlive-latexextra
-	)
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-TEXMF="/usr/share/texmf-site"
-
-src_install() {
-	export VARTEXFONTS="${T}/fonts"
-
-	latex-package_src_install || die
-
-	dodoc README ChangeLog
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1e62e6184d14..044c2cb59694 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 1d9a5bfd8b2e..e501db348b0f 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -6,5 +6,5 @@ DIST bcc-0.9.0-linux-5-bpf.patch.xz 28524 BLAKE2B f0369e50eabd7b1eb9a492b9652cd7
 DIST bcc-0.9.0.tar.gz 2036984 BLAKE2B cebbeb57f06af90442d28be1633a54c198bf796786c4fcca3a83dea03bc76949f958dd24f7d85feb2e3402576410f965754f3d031076486b7d378493c56035e8 SHA512 373080181380ec3bcb13469e29ff1f792e924a2df00a614da4647ed54060ad216525dd0f49c5d0afba7946a6d2f4e3475af97250a33db825945af3d165294091
 EBUILD bcc-0.6.0.ebuild 1132 BLAKE2B 4f3fe126841b267c7ac676be765968163e350831a9dad18e9ecf923c6dc5fbbbcade831cce89c9d25d862174deaa512f5310a5a667ede2ee2cd356277ca38f2d SHA512 7359781a42c5470be2d67fed289c5aa45c1495a060e3e022d2e0b8a086b3b03bac422b85f8fd835e7dbe882d42829b24aee364e84c988ec744d2d45913873ca9
 EBUILD bcc-0.7.0.ebuild 1134 BLAKE2B a3a89ee433c77d182394f2cd4ab6200059430ef623d000f2e2f651a9c424bcd804414f19598fb1f192f0caf28aaffac3ed858973bb5c3f98e386b2167690fc20 SHA512 2f4ba8cb864ef80e5081d0f84092b0c2e1a2a31f522c3ee5ed8df134bd53023bfd8366e4e15e9c8ff5cd4f81897d28c08befa0ec7655f9d8696f574c9d9719e0
-EBUILD bcc-0.9.0-r1.ebuild 1670 BLAKE2B 947df6d21a52d197fa05c307f02cd40bd34a98bd015036016837f46a081a842cab0a02bfb9a433f5f0180753f5b3de7f3af7c95071eceafe496adbb62aeb4464 SHA512 8ecfb0764de2ee7e53e2d64e81d6d9b2fd7e0d5c94dc523f06564977da28e26769d388658197238f6a8acbe0c189923a0208923a3e77997b30453e9e8859de34
+EBUILD bcc-0.9.0-r1.ebuild 1677 BLAKE2B 6d2affa32b03f82c91071ff634e915093cd16baaf1fee9109c4ef4e63f24ae19d2827f954de09d86cf28ad2a3f34da54fb6da5472f3727deddf9d6043639df4f SHA512 076a60b122d350a2041c94fd29d23630e631c713611032aeb1525077c5c3b7ab138d065f4acced277f265e410284df52aeaa3678134f66cafaead924d4f1dc7c
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.9.0-r1.ebuild b/dev-util/bcc/bcc-0.9.0-r1.ebuild
index f23a490a9026..1f720a826ce8 100644
--- a/dev-util/bcc/bcc-0.9.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.9.0-r1.ebuild
@@ -16,7 +16,7 @@ RESTRICT="test"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+luajit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index a0c6141aaf5f..80510b3107b5 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -2,6 +2,6 @@ AUX bpftrace-0.9-llvm-8.patch 1306 BLAKE2B ef6c7cfd58f6683d3a234fef6a5aae6a8136b
 AUX bpftrace-0.9_pre20190311-install-libs.patch 4453 BLAKE2B d8b552a04fa4815c8b2209c57ad9dbecb3938531ef3c6ad481d5ec034e8a8aff323f29acfa920f00d612a2f859b0b03272955384c06ee5051d7c8844163fdae6 SHA512 0fe1ea870b5a963ac040a7a636cd0255e60577bd7e9aa6080e40116c964c4a4bc1b5858290c2f381916433504bf28118f9b03089fb0baee32085aad104b1621c
 AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
 DIST bpftrace-0.9.tar.gz 668655 BLAKE2B 650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc SHA512 771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
-EBUILD bpftrace-0.9-r1.ebuild 1362 BLAKE2B 1e6ef72dd185e27edf5439bde430030df97ff61520bea6d506491ff4748e136ef1e56cc165b6f208180a94a9ed946ee1d4269e6fbe6b107dea6d8184ec36b36d SHA512 bdc7078bd027069b72bcea3b0f85d8466a2b0378083c5c3077ad1871f15ade9171e7ecad2890c8e5d4020a4c1c1e1e31312e9a6817e27cae94a79500445eb549
-EBUILD bpftrace-9999.ebuild 1362 BLAKE2B 1e6ef72dd185e27edf5439bde430030df97ff61520bea6d506491ff4748e136ef1e56cc165b6f208180a94a9ed946ee1d4269e6fbe6b107dea6d8184ec36b36d SHA512 bdc7078bd027069b72bcea3b0f85d8466a2b0378083c5c3077ad1871f15ade9171e7ecad2890c8e5d4020a4c1c1e1e31312e9a6817e27cae94a79500445eb549
+EBUILD bpftrace-0.9-r1.ebuild 1369 BLAKE2B dc88a0672c969716d83aba591e99c477dee5527faa60bf418fe8547b5d86286d743ef04e673e0aeae418f3bab34da0768b2d3575f0a9ae84a8467180931ab903 SHA512 6865fad28da5145dc206c42a52e99efa372f1380751980b0210a0cb0e62bcde7be2cb3ddccd0724b9c9de1ffc4aac075e61df4b2fd8441b8adbb7183070e126a
+EBUILD bpftrace-9999.ebuild 1369 BLAKE2B dc88a0672c969716d83aba591e99c477dee5527faa60bf418fe8547b5d86286d743ef04e673e0aeae418f3bab34da0768b2d3575f0a9ae84a8467180931ab903 SHA512 6865fad28da5145dc206c42a52e99efa372f1380751980b0210a0cb0e62bcde7be2cb3ddccd0724b9c9de1ffc4aac075e61df4b2fd8441b8adbb7183070e126a
 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
index 81d37ad3721c..74351e85e8c4 100644
--- a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} =~ 9{4,} ]]; then
 	BDEPEND=""
 else
 	SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	BDEPEND="app-arch/xz-utils "
 fi
 
diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild
index 81d37ad3721c..74351e85e8c4 100644
--- a/dev-util/bpftrace/bpftrace-9999.ebuild
+++ b/dev-util/bpftrace/bpftrace-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} =~ 9{4,} ]]; then
 	BDEPEND=""
 else
 	SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	BDEPEND="app-arch/xz-utils "
 fi
 
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index 766fe26cefbd..ed7335d7c505 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1,17 +1,16 @@
 AUX 40catkin 89 BLAKE2B d8a24606f095c6afdbc9141a47fa250bd931b53f9e32ce885a7e1dee33013968e8e401404c187d8afb6660bbb3528888c43b46e473f5dd96b53cf9af04d24d42 SHA512 bc0fc727177f071c48b2177adceaa0f5578a55bb05a65035871d83c7b217d86ef7f6c8585264971d0c8957652a8a60dbdb674600087800433823190e577744db
 AUX catkin_prefix_path.patch 3297 BLAKE2B 60027c9564b6013f885bdd1f695e7279459cbf499536f381806116ef3d9d66a8507faa39008ee95d1d5662ec667dbe8ca3c1b284f0dd0fe561217a4876bfe960 SHA512 22c6e2440e1d7e48c46c0ad7f2006d621942b9c75d1d126ef1e110b36da321b79152aae8bf4d82c18250ce6da3337c697733ba130c1b2f116282ccb954d8d13f
 AUX catkin_prefix_path_util_py.patch 2134 BLAKE2B 2c358c1e7e9b2cdb2b889b70ca5644f3823b7d1ef0af597d7f7f0a6de9ef7697d41ce74964f5e0d95deb9d2bc9e1afaf4665fb48cb76258c552483cbdc68374a SHA512 68b375ed46f7d25ece3e723fb6d41ba3f89bd27ef44f11d74427f63d615e043ab02de4ac806d77059db8a0d12671f0602df16a2b318b9d6e36671cd1491ce2b0
+AUX catkin_prefix_path_util_py_v2.patch 2146 BLAKE2B 3d5fa2ec75d71938f3290617f60eb45e46ee6e24da722d05977dd5c58eb078ca1d5fd7b943bd46bbe765e63a7114d5df9fe36ac286f161c99731736a51635279 SHA512 b55d1a67433afec78238795c5d807607c59b97514beffa5e2cf30c9340ec0d62045bdff9af875fc4c2ae7b4d90859010b08b737120e9434d9c7589569f8696d9
 AUX distutils.patch 798 BLAKE2B aeb6d364c8fa565e662686f723fe782bb6d3b2a17c0a1b243090515290258586e0df79699a32ec0eeb5834628dc885566c296055c4062826c03014a809b8cb01 SHA512 de281d0039515c4621d161c778520c4306897426c5692f46b4440326b6246502e64f90f121eaff8741775bafcb4213b2817468354db8c5b3c1250a2fce42d36d
 AUX etc.patch 654 BLAKE2B 0ec3289f09983127f60ce4e1a93ad82b9c928fffe3dc820dc3ffc33c4cbedf794d3e49dbe646c83f884072ad949ebdbbe334cced9fdaa3448b5b219669019913 SHA512 8e6026dac6d79fc30056a7c598a99ca4cafcad442eec2eb2f48219b184d610e4d5da5faea5284dd078101b4ef761533d034aba49fd1af95f7f365887bbf22739
 AUX gnuinstalldirs.patch 714 BLAKE2B 32364640271a4868d5a92fcc9ca803df8067ecda2c89c69eb88c168bab4acc099ef2a7efd3c56a77e34acef2ad308780b69c66eb49c272e4d3b1b776d1b4c594 SHA512 38e6e0a220f20a7909a760b558997086bac9dc4919158d58dc41e5dd7d3bf22b8eb9a48cb05503c594dfa0a9e4bdb70e8eec121f45f777fc7821ec6e3678b600
 AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee9c544a10fa4e61036ffb45a391f40eacd7f97ec92abf060a1afc790d87cc1cfa40ddc07561db14c027f SHA512 7d6e1cb0076681c6cbb1332b05e6cd33bae4f780939e00412fd4b022f71b0418a4ff4f8e13d06f42fd21225e78d058818d680fef691dad4412d75ea0f0ef9f5e
 AUX sitedir.patch 884 BLAKE2B ba051cbd046971d3b6327755b0de83c03b3a441a3e47e7d791e653bcd0b7ed3373752367a4ecfb8570a6b5d7c6fb3ae006f0c516909646d7ba7142f20b352217 SHA512 c619b6bcfa007f90464146767ea5b1aed4dad79d16bcc7daa573df14dcaa6eeb2ff96eb9d838d3bbfd0480b87d5538ffaf31dc059e25224d425f3786523b475d
 AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913
-DIST catkin-0.7.11.tar.gz 206933 BLAKE2B cda31e3d097516ce830060a2323956ec27c4113d161e95ab55564c00209e23d894e2acf3bf11b78e19538d4d8ff4c85814362a89bca58700da5fb609fb708fb8 SHA512 71810a80c1ac4334fdaed176285bee6bcb0443529debecf421723881e3d6316f41d4ed07c5eafa55515ba9d8143d5dc5fb683eda5ad54e52fda5c24085c44c96
-DIST catkin-0.7.12.tar.gz 211602 BLAKE2B ee5b9e57601847f79a2e7c49bb9b38974b0385a1c524c70cc549511d31b9fe8d03bf95e254b9c40a420fad990da40bf9c5d29f198ae42bd772c54a89cdc532b9 SHA512 ada496fae0959330b369c8a29daf9c575fcc94c3ee7e27e0180614fc49912450b23163622759975e588ffcdd49180e5f2fc8351e02bf1aef9b1f2db92811dbd6
 DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
-EBUILD catkin-0.7.11.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
-EBUILD catkin-0.7.12.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
+DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45
 EBUILD catkin-0.7.14.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
-EBUILD catkin-9999.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
+EBUILD catkin-0.7.17.ebuild 3135 BLAKE2B 0b1b959e28e610973e36d4942ef9fa04ee9997b5c2f98e5dc217bced73ef336da1a30fc093fccaa57805fcfd132aca4461cd9f9da583a0eb183badeb13eb6b06 SHA512 a871bfa69c8b764b76c82b39f765d10027ebc48d400bc005e86171b39637f57201ad4c6d2597c2e725aca422a7d0c9877b97bcdfa43713ab2c81989ac5168b9f
+EBUILD catkin-9999.ebuild 3135 BLAKE2B 0b1b959e28e610973e36d4942ef9fa04ee9997b5c2f98e5dc217bced73ef336da1a30fc093fccaa57805fcfd132aca4461cd9f9da583a0eb183badeb13eb6b06 SHA512 a871bfa69c8b764b76c82b39f765d10027ebc48d400bc005e86171b39637f57201ad4c6d2597c2e725aca422a7d0c9877b97bcdfa43713ab2c81989ac5168b9f
 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.7.11.ebuild b/dev-util/catkin/catkin-0.7.11.ebuild
deleted file mode 100644
index cef4fa0eb0e8..000000000000
--- a/dev-util/catkin/catkin-0.7.11.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-	dev-util/cmake
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
-	"${FILESDIR}/package_xml.patch"
-	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/sitedir.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
-	local sitedir="$(python_get_sitedir)"
-	mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
-	)
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	export PYTHONPATH="${S}/python"
-	local mycmakeargs=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-
-	doenvd "${FILESDIR}/40catkin"
-
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-}
-
-pkg_postinst() {
-	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
-	ewarn "installation path for package.xml files on Gentoo."
-	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
-	ewarn "packages that have it installed in the old location:"
-	ewarn "		emerge -1O /usr/share/*/package.xml"
-	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/catkin-0.7.12.ebuild b/dev-util/catkin/catkin-0.7.12.ebuild
deleted file mode 100644
index cef4fa0eb0e8..000000000000
--- a/dev-util/catkin/catkin-0.7.12.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-	dev-util/cmake
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
-	"${FILESDIR}/package_xml.patch"
-	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/sitedir.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
-	local sitedir="$(python_get_sitedir)"
-	mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
-	)
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	export PYTHONPATH="${S}/python"
-	local mycmakeargs=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-
-	doenvd "${FILESDIR}/40catkin"
-
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-}
-
-pkg_postinst() {
-	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
-	ewarn "installation path for package.xml files on Gentoo."
-	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
-	ewarn "packages that have it installed in the old location:"
-	ewarn "		emerge -1O /usr/share/*/package.xml"
-	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/catkin-0.7.17.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild
new file mode 100644
index 000000000000..84cbac41ee4e
--- /dev/null
+++ b/dev-util/catkin/catkin-0.7.17.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/catkin"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+
+inherit ${SCM} cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
+HOMEPAGE="http://wiki.ros.org/catkin"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/empy[${PYTHON_USEDEP}]
+	dev-util/cmake
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/distutils.patch"
+	"${FILESDIR}/catkin_prefix_path.patch"
+	"${FILESDIR}/gnuinstalldirs.patch"
+	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
+	"${FILESDIR}/package_xml.patch"
+	"${FILESDIR}/etc.patch"
+	"${FILESDIR}/sitedir.patch"
+)
+
+src_prepare() {
+	# fix libdir
+	sed -i \
+		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
+		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
+		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
+		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
+		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
+		cmake/*.cmake || die
+	cmake-utils_src_prepare
+}
+
+catkin_src_configure_internal() {
+	local sitedir="$(python_get_sitedir)"
+	mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+	)
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	export PYTHONPATH="${S}/python"
+	local mycmakeargs=(
+		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
+		)
+	python_foreach_impl catkin_src_configure_internal
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	unset PYTHON_SCRIPTDIR
+	python_foreach_impl cmake-utils_src_test
+}
+
+catkin_src_install_internal() {
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_install
+	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
+		dodir /usr/bin
+		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
+		done
+		touch "${T}/.catkin_python_symlinks_generated"
+	fi
+}
+
+src_install() {
+	python_foreach_impl catkin_src_install_internal
+
+	doenvd "${FILESDIR}/40catkin"
+
+	# needed to be considered as a workspace
+	touch "${ED}/usr/.catkin"
+}
+
+pkg_postinst() {
+	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
+	ewarn "installation path for package.xml files on Gentoo."
+	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
+	ewarn "packages that have it installed in the old location:"
+	ewarn "		emerge -1O /usr/share/*/package.xml"
+	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
+}
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index cef4fa0eb0e8..84cbac41ee4e 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
 	"${FILESDIR}/distutils.patch"
 	"${FILESDIR}/catkin_prefix_path.patch"
 	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
+	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
 	"${FILESDIR}/package_xml.patch"
 	"${FILESDIR}/etc.patch"
 	"${FILESDIR}/sitedir.patch"
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
new file mode 100644
index 000000000000..ae468b21c01c
--- /dev/null
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
@@ -0,0 +1,40 @@
+Author:  Eric Timmons 
+https://bugs.gentoo.org/show_bug.cgi?id=586104
+
+Index: catkin-0.7.17/cmake/templates/_setup_util.py.in
+===================================================================
+--- catkin-0.7.17.orig/cmake/templates/_setup_util.py.in
++++ catkin-0.7.17/cmake/templates/_setup_util.py.in
+@@ -264,7 +264,7 @@ if __name__ == '__main__':
+ 
+         if not args.local:
+             # environment at generation time
+-            CMAKE_PREFIX_PATH = '@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
++            CMAKE_PREFIX_PATH = '@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
+         else:
+             # don't consider any other prefix path than this one
+             CMAKE_PREFIX_PATH = []
+Index: catkin-0.7.17/python/catkin/builder.py
+===================================================================
+--- catkin-0.7.17.orig/python/catkin/builder.py
++++ catkin-0.7.17/python/catkin/builder.py
+@@ -1143,6 +1143,7 @@ _CATKIN_SETUP_DIR= . "{0}/setup.sh"
+                     'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
+                     'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
+                     'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
++                    'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)),
+                     'PYTHON_EXECUTABLE': sys.executable,
+                     'PYTHON_INSTALL_DIR': get_python_install_dir(),
+                 }
+Index: catkin-0.7.17/test/unit_tests/test_setup_util.py
+===================================================================
+--- catkin-0.7.17.orig/test/unit_tests/test_setup_util.py
++++ catkin-0.7.17/test/unit_tests/test_setup_util.py
+@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa
+                           'PYTHON_EXECUTABLE': sys.executable,
+                           'PYTHON_INSTALL_DIR': 'pythonX.Y/packages',
+                           'CMAKE_PREFIX_PATH_AS_IS': '',
++                          'CATKIN_PREFIX_PATH':'',
+                       })
+ with tempfile.NamedTemporaryFile('w+') as setup_util_file:
+     setup_util_file.write(data)
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index d41794180823..a8e5ed555440 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -8,6 +8,7 @@ DIST cbindgen-0.6.6.crate 82574 BLAKE2B ec3d2d03ea677acf89046d148447ea1108f4d018
 DIST cbindgen-0.6.7.crate 84579 BLAKE2B 6307bc70346acd1340393c07460198666b7133d3cc21c0d02712a017458e3a228ff6dc6f3cfda8d560e5cc8eb6d9a15e52309099dc7deb151bf157ed6856ef6f SHA512 1a2a3f2055b0527b878b78834e6c802a171ed5f3494ff4819622f8244821d9a1b23d34d0c9370bee10a9f334cdbdfac43cb513f61bd49d57614f66825cd78030
 DIST cbindgen-0.7.1.crate 90623 BLAKE2B 4fa7e82ee15b89a7de678eedb6ff95c3ca36376aefc8496a6b728eddce075a2aff9076867adfc0b6104a3317fc1e205fa4399b773211944261f8495265eba574 SHA512 ee9856e07ea55c03f4a715497167a4714e3d1297c1f52da2fef507b44d93f258ca2eda8004befb3915a9cfd783b44e6768706de5efa3cac6f7a778bf8ccb4e76
 DIST cbindgen-0.8.2.crate 98747 BLAKE2B b400fa5df818760a48483883eae959de04433d1ec2d5f67bdba5c065e6bebc4f21424badd8c7598ad4aca5e1205230e79528ad9d0e1e736c2dd00745abdd058c SHA512 e4e6079170ba396f753603cd58c2a8c252e216e129cea6a0c4d82b399aea78f569d80345dbe69af509aadf207790b4d00b8f2edf500b36d54d9c095a65b9e792
+DIST cbindgen-0.8.7.crate 107774 BLAKE2B 55548bfe721ba049231318712ae392f49fcef98d328ad73a9d7af41df7c209dec1d4fcfbe0c4fe5d03abb9e14db961bfee25df79113c6f585eb5e15127161eea SHA512 0238fa87100f1792cbb2b2c977bdc13a9a8a3e916f841ee112f69335a8ecb2a9fc99d3a0ce5eda16c9eead7ccbe8e7b3b8248d4ceaa218bbea0ac9a6a20e805d
 DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127
@@ -76,4 +77,5 @@ EBUILD cbindgen-0.6.6.ebuild 952 BLAKE2B 5916e4bbb6e7d1b42be8d7488d1ed5a2ab078ff
 EBUILD cbindgen-0.6.7.ebuild 952 BLAKE2B 25e4bdcde7e4b0987b0f03a838c4bb3d6c01b58b4438c856764bbed32ee8cf5057530551d6c4a857ae9ee8a9f316b43db7f35d7ab1a5f07daeb98d3b1c0961cf SHA512 cf11bac47b5c4313b5ce328f1229eb14b9dff879ac887be66f607ff3969797f46bb1eac60b69df7ccd50074251dbacf96e598dd939db69d623d74e6af27c5bc2
 EBUILD cbindgen-0.7.1.ebuild 987 BLAKE2B 91339558e85ad7f8eaa70e3c4889ef7a01ff2df2f53eb9384dd9446cb034916255f1afbce29a045553177daffe94597c6991dd30917f7a17ad86100e530121c1 SHA512 be4cae3e22bbe5f9ebd6e00627d626615a9e8a04118e080432d4415ca0fe201aa76b5553e6360fa3b429624bd6f3850540e9b348e6751b5a3ba8b58becb5fe75
 EBUILD cbindgen-0.8.2.ebuild 1126 BLAKE2B 8db73faae848c3ca588625c9f86416d053bcec19743dd49b11793a5b12cf67d61b69301ac397ca54d7f53bb1548134ce33c1490c559242e2061c9c24f7efefa6 SHA512 aae96c92797b4159c04ab4ff3dcc5d7363132cf9cefaae5a980b608eb89a587b6dec74353cd265e866f58a2d06af9f12eda22932b7452189214a567893172dfe
+EBUILD cbindgen-0.8.7.ebuild 1126 BLAKE2B e4ba38b90ac624dd8c6c3fa781e45fbcfbd625be3477861d6390ca35821ea9032cbeb5ae06ee5e629cd191480c6f5dd530b9334e731740922b0fdea3109f7164 SHA512 81391a5777d22c6ef923075845cff5999ffc2b36d2bab5d7d79e6f3f7824eaa4d6a9742915e49adf840f38d0807ccd0d60e0049f99810b47addf4996df06a1a1
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.8.7.ebuild b/dev-util/cbindgen/cbindgen-0.8.7.ebuild
new file mode 100644
index 000000000000..378207aaa152
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.8.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.11
+autocfg-0.1.2
+bitflags-1.0.4
+cbindgen-0.8.7
+cfg-if-0.1.6
+clap-2.32.0
+cloudabi-0.0.3
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+itoa-0.4.3
+libc-0.2.47
+log-0.4.6
+proc-macro2-0.4.25
+quote-0.6.10
+rand-0.6.4
+rand_chacha-0.1.1
+rand_core-0.3.0
+rand_hc-0.1.0
+rand_isaac-0.1.1
+rand_os-0.1.1
+rand_pcg-0.1.1
+rand_xorshift-0.1.1
+rdrand-0.4.0
+redox_syscall-0.1.50
+redox_termios-0.1.1
+remove_dir_all-0.5.1
+rustc_version-0.2.3
+ryu-0.2.7
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.84
+serde_derive-1.0.84
+serde_json-1.0.36
+strsim-0.7.0
+syn-0.15.26
+tempfile-3.0.5
+termion-1.5.1
+textwrap-0.10.0
+toml-0.4.10
+unicode-width-0.1.5
+unicode-xid-0.1.0
+vec_map-0.8.1
+winapi-0.3.6
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for generating C bindings to Rust code"
+HOMEPAGE="https://github.com/eqrion/cbindgen/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 7748bd1f2bd9..64a3d9fa1dac 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -15,7 +15,7 @@ EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3
 EBUILD ccache-3.3.4-r1.ebuild 1917 BLAKE2B 740c0be412ab1c4402682dc403e292c96e3f7b4ef9c881bc71d8a4dfcf58716141a8eba73baba94ceb21d25cb3398c1e3f2a5a0e5435acc02f9c561e3777dc9b SHA512 d4c0899d3bd5f7c8040e4591a658ee93fa7fb96339a0f72169016ef433266a98e558242250697ba9b5abad0eccd636fd23892f6e88e7ee30f9bed84a38eba04b
 EBUILD ccache-3.5-r1.ebuild 2046 BLAKE2B f5bd4d9cf89b0896d51152614c47f329e29d084c371b4fdd0291d2d6d1b2d880af38358a6ffbd620b9a8d1f3ec6a95d263ce2f8fa202955c2cb32c77cf33d758 SHA512 a90b898e8e261afe126321d7222ce41d4c91e068ce5baa15927a630ea66d141cce95f87b826c85b33599f33b0584055d22af6dd358651daea29487800f0cf2ae
 EBUILD ccache-3.5.1a.ebuild 2096 BLAKE2B 3334ed2e2f022f39b27aa9fcfd39d98eb8982bad09b67d3d7a1cbb0a47115dbd416f886121e32aab00c75ee729038efa5696c8bf9c00e9ac0a513d99483ec2ad SHA512 246e5d788fcb590be2b2fe9cd6e214a87934e0547a6d0dd9e3c888f4955ed33be9cc87a2eb0afdc517e48d6dd1bb02129975b4a7b27fbaf77fe76e4a7d971137
-EBUILD ccache-3.6.ebuild 2092 BLAKE2B 306c6916bfcd970ab34eaa3cb26601d1d3bcfea3198ead3f496e246926231c20d05ad9205152f91973242c5b397adbe17029ca4d2b029101d7c3cd42f7f6123e SHA512 67b86a8d10535ea4e636cfb584e05462431e5ef41c58edbee7cf4e73d69dfe1d9bb17eab683ec68c80752d0153d18ff31f390369f12e79cfc06d03762bfc5666
+EBUILD ccache-3.6.ebuild 2090 BLAKE2B ccc9d6dd797173d2b6a310efd8a9d2acb15707ac485efbc8aa7b9dfb149acb480d607ba65cf0c3391198169718de88ce515d93fae2368ab30a65d945438bc637 SHA512 da392ae3d454c9dbc44dd1c77fde3955a0fc1c60d8b65b24cbbb0228264c851ac3edb81a23bb56b5be71dbe5cdb149ccfe31e5bc75536d8b44f25805f93e89a4
 EBUILD ccache-3.7.1.ebuild 2126 BLAKE2B 11a1cdb3de7b56d6b97069c8646825ea10bf105d477b6fd16afc235d376b5bb888c53f9148b2ae0aa422d782b6b99e673a5aa821cfb09f0433388f6fa37a0c11 SHA512 b303a89fe8a501547394ba89ac44f9865320a737b8d9cb74acf1008b66803e2f62f46a38c22a1f4890891c97ffd0e249b0c3863ed3f3e2511f67a84f3164633f
 EBUILD ccache-3.7.ebuild 2133 BLAKE2B 354617f79fa807e3b36b394e369496cd915f22e191b45338776da48d187af80e771b64f9123d29ce240a5fa4c8c52c5e394fcfc3f59f16e6a92ae5bbd7819917 SHA512 3666d897b79716ee3c033c191a5b12210294dd13989f761ec5f4d8cf5c24ff1c7c9214b0c5069a0b8f8b76e828f163cbc4e5617d4acd33338b7dba9eebb52fc8
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.6.ebuild b/dev-util/ccache/ccache-3.6.ebuild
index c5d681ea5ff8..3d9e06692b8e 100644
--- a/dev-util/ccache/ccache-3.6.ebuild
+++ b/dev-util/ccache/ccache-3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/cccc/Manifest b/dev-util/cccc/Manifest
new file mode 100644
index 000000000000..c412bafe0f5e
--- /dev/null
+++ b/dev-util/cccc/Manifest
@@ -0,0 +1,5 @@
+AUX cccc-MFC-dialect.opt 560 BLAKE2B 65000ebbc99b306318aa2da34031879b7393649573b8509bc12ed6174d59208ea2a06e1af8d98eefb3d142d51e9b98bc9e2a058e8f8f3a68b17f76bb4dfcf6b2 SHA512 e37ded34821690e0b07e4e3da502bccdb5760a38a9f1fbacb6cec4de143cc9c0160684d9a41ce0c3ff8e2a7716889824594d6f8d374a631dbb0de91ccec53903
+AUX cccc-c_dialect.patch 2048 BLAKE2B d97bd8430fe1357779ebf221607ea724485cf5bf572c86f4adcb85ea6d29c41bfeeb562534bccd1787241c024951941921fe6936541c5ea1f72ea923e9612d12 SHA512 5fadc49a0da8ca51b74dd92e673b413b506c8b06dfeabb7da0e2ddf24e7766d58ebbcc00d018677f4b0ff77d10df8b974ff1afd4100c33152e8cad0538b61789
+DIST cccc-3.1.5.tar.gz 662760 BLAKE2B 57817ef9a44f002c017245d7dd3b1ef97fec59b59bce465d5e5e1cc12409b5602cfd8bf7ee938e526af9bcc11398639900d26848aa4f8c7f623669159de17117 SHA512 61544669a75ff7bd99c6ff5bb1e6ec163f2a09f4538493fe60e8f9f95eab7ba19ad6d39b6717ae010a223b8efe48c497a4feb8ead218e350ee2ab91b9c52c969
+EBUILD cccc-3.1.5-r1.ebuild 1589 BLAKE2B d884aa93f5f3ac2c971b65362b2ca1d35a51d316df45488f63dd2bb3e58fe79332c8bbb836350fd19915417b4c45c3eed158fe078f43df31db37efe00a4d20ab SHA512 1e47c296d5c116b4bdc642e6484e493086d0b35c3498ad0dda5d5245930b4c3b1b783d65628f3a93260b4df99ea469d10653929a1481aa1ec77ec8a0587dde0e
+MISC metadata.xml 694 BLAKE2B d8992216f3b05e4382fa843df2a71673946c1e81ef7325fef7ad39fa073c092cc86b1cd993582b40b230adb6902a406c30a7b9a00d557e7f2aafcf4e940e51cb SHA512 442e37fb776949e1f59ca7074ba1219e77e7e1be0003c5cace090342823227fca6a9a10ef607d133245985c717811005293bf2044fdb0bacfe2e114eea3ec2ad
diff --git a/dev-util/cccc/cccc-3.1.5-r1.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..a26523720d4b
--- /dev/null
+++ b/dev-util/cccc/cccc-3.1.5-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Source metrics (line counts, complexity, etc) for Java and C++"
+HOMEPAGE="http://sarnold.github.io/cccc/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/sarnold/cccc.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="apidoc debug doc mfc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	apidoc? ( app-doc/doxygen[dot] )
+	"
+
+src_prepare() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+	use mfc && eapply "${FILESDIR}"/${PN}-c_dialect.patch
+	default
+
+}
+
+src_compile() {
+	tc-export CC CXX LD AS AR NM RANLIB STRIP OBJCOPY
+	if use debug ; then
+		DEBUG="true" emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
+	else
+		emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
+	fi
+
+	use apidoc && emake CCC=$(tc-getCXX) metrics docs
+}
+
+src_test() {
+	emake CCC=$(tc-getCXX) test
+}
+
+src_install() {
+	dobin cccc/cccc
+
+	dodoc README.md
+
+	if use mfc ; then
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/cccc-MFC-dialect.opt
+	fi
+
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/html
+		doins cccc/*.html || die "html docs failed"
+		if use apidoc ; then
+			insinto /usr/share/doc/${PF}/html/api
+			doins -r doxygen/html/* || die "dox failed"
+			insinto /usr/share/doc/${PF}/html/metrics
+			doins ccccout/* || die "metrics failed"
+		fi
+	fi
+}
diff --git a/dev-util/cccc/files/cccc-MFC-dialect.opt b/dev-util/cccc/files/cccc-MFC-dialect.opt
new file mode 100644
index 000000000000..4c4acb32e1fb
--- /dev/null
+++ b/dev-util/cccc/files/cccc-MFC-dialect.opt
@@ -0,0 +1,21 @@
+;;Pro*C embedded SQL
+;; looks like
+;; EXEC SQL UPDATE ARM43_OD_PRODUIT_SERV
+;; SET ARM43ID_TPS_FIN = NULL WHERE
+ARM43ID_TPS_FIN = 0;
+
+CCCC_FileExt@.pc@c++.ansi@
+
+CCCC_Dialect@c++.pc@EXEC@skip_stmt@
+
+;;MFC
+CCCC_Dialect@c++.mfc@ON_WM_PAINT@skip_line@
+CCCC_Dialect@c++.mfc@DECLARE_MESSAGE_MAP@skip_line@
+CCCC_Dialect@c++.mfc@DECLARE_DISPATCH_MAP@skip_line@
+
+CCCC_Dialect@c++.stl@__STL_BEGIN_NAMESPACE@ignore@
+CCCC_Dialect@c++.stl@__STL_END_NAMESPACE@ignore@
+
+CCCC_Dialect@c++.mfc@BEGIN_EVENT_MAP@start_skipping@
+CCCC_Dialect@c++.mfc@END_EVENT_MAP@stop_skipping@
+
diff --git a/dev-util/cccc/files/cccc-c_dialect.patch b/dev-util/cccc/files/cccc-c_dialect.patch
new file mode 100644
index 000000000000..c8951aef13c4
--- /dev/null
+++ b/dev-util/cccc/files/cccc-c_dialect.patch
@@ -0,0 +1,79 @@
+diff --git a/cccc/cccc.g b/cccc/cccc.g
+index bdb6805..fd7b504 100644
+--- a/cccc/cccc.g
++++ b/cccc/cccc.g
+@@ -84,6 +84,30 @@ inline void endOfLine(CLexer &lexer)
+ #token MAC_NL		"\r"	<< endOfLine(*this); >>
+ #token UNIX_NL		"\n"    << endOfLine(*this); >>
+ 
++/* augment dialect policies -- M.H added */
++#lexclass SKIP_STMT
++#token SKCOLON ";" << skip();mode(START); >>
++#token SKANYTHING "~[; \t\n]" << skip();more();>>
++#token SKNL "\n" << skip();endOfLine(*this);>>
++#token SKBLANK "[ \t]+" << skip(); >>
++#lexclass START
++
++#lexclass SKIP_BLOCK
++#token SK_ANY "[a-zA-Z0-9_]*"
++<<
++std::string treatment = 
++	CCCC_Options::dialectKeywordPolicy(parse_language,lextext());
++
++if ( treatment != "stop_skipping" )
++{
++    skip();
++}
++else
++{
++    mode(COMMENT_LINE);skip();
++}
++>>
++#lexclass START
+ 
+ /* preprocessor constructs - comments, #defines etc */
+ 
+@@ -343,17 +367,29 @@ inline void endOfLine(CLexer &lexer)
+         if( treatment == "ignore" )
+ 	{
+ 	    skip();
++	    //std::cout << toktext << std::endl <<" :ignore" << std::endl;
+ 	}
+ 	// Ultimately, the next two cases will need to be handled 
+ 	// using a #lexclass or something similar, for the moment
+ 	// we just try to skip the tokens themselves.
+ 	else if ( treatment == "start_skipping" )
+ 	{
+-	    skip();
++	    mode(SKIP_BLOCK);skip();
+ 	}	
+ 	else if ( treatment == "stop_skipping" ) 
+ 	{
+-	    skip();
++	    skip(); mode(COMMENT_LINE);
++	    //gobble end of line M.H.
++	}
++	else if ( treatment == "skip_line" )//M.H added
++	{
++	    mode(COMMENT_LINE);skip(); 
++	    //std::cout << "skip_line" << std::endl;
++	}
++	else if ( treatment == "skip_stmt" )//M.H added
++	{
++	    mode(SKIP_STMT);skip();
++	    //std::cout << "skip_stmt" << std::endl;
+ 	}
+ >>
+ 
+@@ -426,8 +462,10 @@ void init(const string& filename, const string& language)
+ 	pu=ParseUtility::currentInstance();
+ 	ps=ParseStore::currentInstance();
+ 
+-	ANTLRParser::init();
+ 	parse_language=language;
++	ANTLRParser::init();
++	//parse_language=language;
++	//move above, M.H.1st otherwise time init not to language
+ }
+ 
+ >>
diff --git a/dev-util/cccc/metadata.xml b/dev-util/cccc/metadata.xml
new file mode 100644
index 000000000000..ecde1cfd0a08
--- /dev/null
+++ b/dev-util/cccc/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nerdboy@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		cccc provides source code metrics (line counts, complexity,
+		object-oriented, and structural metrics) for Java and C++
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sarnold/cccc</remote-id>
+		<bugs-to>https://github.com/sarnold/cccc/issues</bugs-to>
+	</upstream>
+	<use>
+		<flag name="apidoc">Build software docs with doxygen/graphviz and metrics with cccc</flag>
+		<flag name="mfc">Add patch for MFC dialect options</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 5ea55c1f799f..dc8247bc9870 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -22,11 +22,13 @@ DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22
 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
 DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
 DIST cmake-3.14.4.tar.gz 8853821 BLAKE2B 8005387dbb9a0d2ceffda324d81e38710b51d9e1befa40322441722038a9a5bf04127edec1feb4ab9a75779e4cbac6eb0f8bd3e0d08b7d2427e88df095851d46 SHA512 1011ba6cc54680699e97a5e25c4be6055c04f47847225f87f91ada0b2ace2d6f709a3fa49a37fd5c2276118bf29f5ce9d6e24473bff6f3c90f25e92083a5c412
+DIST cmake-3.14.5.tar.gz 8854929 BLAKE2B 3e783de1ce541039c80228a56fed4fd28e9ef2ea48f274995f6f26f8b149f1684aab6da518f27106f364a4f0a6f370334f3a85dd61f1bcce22c34337ef4afdaa SHA512 9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.11.4-r1.ebuild 6220 BLAKE2B 0490388c4d5a698062592e86cb6fd3b83468f4822964459a8b7d540817b0b0863264e1c0b565f8de8b820f142d1e976b8a67d4e2ccb6c04f920cb06cd2ae4fda SHA512 14a6655444822ad8099b259bf9082042eafb4fb3fcfee83ead4677f22b7ff1a2b916ed38b6e691daae17467f45b0b468b82c35febdf9118853fe3faf999d58c0
 EBUILD cmake-3.12.3.ebuild 6000 BLAKE2B d62e6c9766e7acbe5f8b080489c3d543ed257c1c06d87ea0f2ae0d5c033860622777cf1c4a2849c26a8f630158c78f47b531752eb32723379111f19533b0e3d1 SHA512 f50e7eca076cb7f8e4ae8214a404fb885cfc9a617456a1f6c7fd79a0a91323b7501ab2e03234210305a77f3d86cd52a6edef5b52d16c98160aab1fce6d726947
 EBUILD cmake-3.13.4.ebuild 6207 BLAKE2B a2a7aaac70aa184f7da025954664f2a6a688a6f90bedbce965187953c3b8fedf984dcc7bf467171170857f1d1e6d350fb3a5dff2a53c90904ba262bb0c38ec6f SHA512 748e7e64d4a3dd96afe5ffe2981a79e5d4f380559fc9ef48a232360989a5cb01bde48aa014888a176042474c9d53c0eab9bd35adb03c04e28bfc990736de86b8
-EBUILD cmake-3.14.3.ebuild 6105 BLAKE2B 20b01af4f5fffa0bcb40c9ef6cdbcaa81178c06d553fde71b44962412d6f9a4a274c50ea02dfd9996687b0d089104fef567c96bf2cdb975839bb65f7e7644e2b SHA512 456bae1d7c1b37026dd0fa92114b201f241ef6c923879f65f4de1f5626173c87bc0acde51b09d1b0204b21dc9580bb55651d554fc9352fb06a90dc724d4084e6
+EBUILD cmake-3.14.3.ebuild 6102 BLAKE2B 46de5e2014598410823652ab6ea612e2863e1a3a0c482fa51133ebaf52e7769942a345094b931a4be41f219214611979e5905c22780a7582ddff088de9e53747 SHA512 763906a9580a58c244fcbdaf1bc45a2afa9a306776557c7644c91343538bd79b2d8876a71e03d94c4b61e0e7bfdb0889d2c974039db3f5775e54d62e1c898ccd
 EBUILD cmake-3.14.4.ebuild 6108 BLAKE2B 8900d5f87f6e0a69b6fc6593e02e4665d4b40f600572b76897a3054322d16488f57107c0813a1b73ef5080e5d86220eae881daca28eac64e3a411b1be0d68294 SHA512 676d070b2cccb86116b9296dbed2287d4a3257d736dcb4d38b11d40e1b3f5b173118df703ad7955e4f2905c3c9cd33e4c33d9eb86af766d40348476f8424bc48
+EBUILD cmake-3.14.5.ebuild 6108 BLAKE2B 8900d5f87f6e0a69b6fc6593e02e4665d4b40f600572b76897a3054322d16488f57107c0813a1b73ef5080e5d86220eae881daca28eac64e3a411b1be0d68294 SHA512 676d070b2cccb86116b9296dbed2287d4a3257d736dcb4d38b11d40e1b3f5b173118df703ad7955e4f2905c3c9cd33e4c33d9eb86af766d40348476f8424bc48
 EBUILD cmake-3.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.14.3.ebuild b/dev-util/cmake/cmake-3.14.3.ebuild
index cbd1847fd72d..1d69e200248e 100644
--- a/dev-util/cmake/cmake-3.14.3.ebuild
+++ b/dev-util/cmake/cmake-3.14.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-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"
+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 emacs system-jsoncpp ncurses qt5 test"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.14.5.ebuild b/dev-util/cmake/cmake-3.14.5.ebuild
new file mode 100644
index 000000000000..0ec739545d3b
--- /dev/null
+++ b/dev-util/cmake/cmake-3.14.5.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+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 emacs system-jsoncpp ncurses qt5 test"
+
+RDEPEND="
+	app-crypt/rhash
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libuv-1.10.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= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	# Next patch requires new work from prefix people
+	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
+	if [[ $? -eq 0 ]] ; then
+		par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_preinst() {
+	use qt5 && xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use qt5 && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use qt5 && xdg_pkg_postrm
+}
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 6f8f2ea9fcc5..4e9c559ed5e0 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -3,5 +3,5 @@ AUX cmocka-1.1.3-fix-doxygen.patch 1138 BLAKE2B 44ded90b04bcc9eae14f7332a8407137
 DIST cmocka-1.1.3.tar.xz 78744 BLAKE2B 5043a496afab08837a73c2e0ff9c9b3c3880a2fd394a768b1f8b51d2fec517a5527e93b7e660f8dcc73af79aaf88e224f4e2869c7e31540f8e54c76481905ff6 SHA512 b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
 EBUILD cmocka-1.1.3.ebuild 1215 BLAKE2B 0993757ee364fb894a6c505cd6d03138bafcda15ac74671879880eaec2207abf5aa181cdb2ab9170239529d98d9cc5bad48f1cabfe5dd8b9124d0c2d9422fee6 SHA512 7db546da812952a9adf0efc5f90de762a6fca4b594532062c6540efd31883b67b6123e8999c593c9701bd44501714d42cab15119dd4234bfe96089f190225469
-EBUILD cmocka-1.1.5.ebuild 1079 BLAKE2B 00205bb8281de3d51083d88058cb99b1f0c62767cb2b5fa65d579b8b8b17c8d75642853d204cc65e92d86cec3dc9b131671b3f8f76f619de0d37c5bc20aaffa5 SHA512 7e6c014890290d1e03cbd8df8f5994090a3ca3c5815eda8b4dd122272d128e76edaf2abb59e2b67c4864d7a543749d0fb08ab08102089cc38ee827229fc56676
+EBUILD cmocka-1.1.5.ebuild 1078 BLAKE2B 0f7ff8e03038b24f2251b61b77d6979179bfe17cc39e9461200c8ca1db974c413bc4c82ddb2d54dd041ce345d4a5830e704267e80295d1a88103aeb37e0b0e13 SHA512 cbe2eb812839c7007d0f9a75204029b135a2a9e41ca922070ae5ade48967c6b927a977bbc2d0515cfc7250395f89f4a9a1b64d8df34702516d096fbb6e724df8
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 2a85128ae07e..0e7a9f96a010 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 
 BDEPEND="
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 23146604487b..aa0bb3d81240 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,6 +1,8 @@
 AUX cppcheck-1.75-tinyxml2.patch 2232 BLAKE2B 389e8678fca9eee616640fc535b0c71d0476f6a2a3eb8700238d85bbc32823c92fe9b72e1a4a3b01143e23df60996a21a669625b418e579441d85ef460fd38b5 SHA512 575dfe090885cbd8157b089def7a47750519b8ea459404d3755ce23ea98e0fde2da5f0c7551a69ac195c2e3c5d03ce5a71c3d66b3fb119609eba6aaa31c39899
 AUX cppcheck-1.85-ldflags.patch 1503 BLAKE2B 0458ff66d61b9cd759839d31bc0fbe611e7d23e8d720a4b0a861d53b3fc54b30d67c481c22dfbb5254a6160eac04505f00dee01c4283214e15e21b26e0b7a76c SHA512 7cad7d456c8d3bfa5efab1c67bcd0f7e509e10e539ee9941055caad41ff3b4737d3ff82cfa172ad867651817bdd4a518a98d22732ce0df5227c149dd2122e9f7
 DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
+DIST cppcheck-1.87.tar.gz 2243258 BLAKE2B ffe42bfb2e896163678c5bb24e46ae2391ba8254cbe7c1c19c3c1b16cd38adf9c773de6aaefe70af08b9c1dca8b0b0b5e9939323368a2f81491fd6981ff18139 SHA512 b0149002b40260c1488904929296403722a66b84263b41d0097c3caed28265332766c114f0d1f378ea6c7e73ab973ea71ab89c6744f6cc818f22de08933e6766
 EBUILD cppcheck-1.86.ebuild 2314 BLAKE2B de0698614f2f1790971fe198662fd235e5456a1f9a046f10d628889517bc5809fac6c76222ca7a5b0d7909c7842d77244c81c9606812450118e61c476492f08b SHA512 8d8502abb416704964aacb1267c2814e5cf50fe02c4a245bbb217a4cadbffa6efc1f288a94143b36f739d6f89e5f75133b1aa691565c76ac92a49cb0984d0c1e
-EBUILD cppcheck-9999.ebuild 2195 BLAKE2B db0b4d69263690358f782623a90813e57c0ae50b75045f919a5d6e2508dfda48c60076bcc4b47c554618bee509e69a8583958ecdb2acfa7f1c66dd567ba4959b SHA512 f9b6b82fab51429d1c46a499d490c5ef6c4bfd760644496b5f2316cbb7c3e6bce6dbbc20e2919309dd037f5e0d721dec87107a88bf269c8fccd3dd90d0a0de4e
+EBUILD cppcheck-1.87.ebuild 2324 BLAKE2B 215dfedc15175569b7ee7b74d7e777340c04f0f464b1231ec2d5972d6872f699795f533e569ac4d2e1ea7db1924368cd69c27a3ba02a6905763dec30723b7ca1 SHA512 0ab1c75db54314f4406c70ceca3e4fddb298477eb242f17e765add78ba1be95eb2fe7b4aa3ab394ebddd2c3a054299d1c1b0ab67d7aff2c6107ba6c9c19a31d5
+EBUILD cppcheck-9999.ebuild 2218 BLAKE2B 8da9a6043ccca21b3ff5c3cfc7c1a01921a74f5d90a85245f02c5b9892c310ceaafa33c7d3b788582cbd89a45954ab6c62936740093807b5cc6dc69a666a6189 SHA512 f135588fd803a510c43a3c1d37e018bcab6ab2daf03a04ce32f2d7285b421e4ea859c07f335974b0e234660fb0df309ba0a8ed41d46704ca8363b2674de69923
 MISC metadata.xml 401 BLAKE2B b48cd9d365773e4c050d1ce2f58a108fa33bf28fb669a8fbe99a9b15d33cf203fa4a94d3411674892efb4cb5e5bd1cb5a08d97a3054b7fbdacc462695f0d1874 SHA512 08b51c30fcc21277bf320c1c9f36cd9efc7c39261b52f70f686953731c2d075482fc1959457dbe276877d508510b32a23d8f7def4ca52044fabc44a23c56a8f4
diff --git a/dev-util/cppcheck/cppcheck-1.87.ebuild b/dev-util/cppcheck/cppcheck-1.87.ebuild
new file mode 100644
index 000000000000..13f0eb6f1f86
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.87.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit distutils-r1 qmake-utils toolchain-funcs
+
+DESCRIPTION="Static analyzer of C/C++ code"
+HOMEPAGE="https://github.com/danmar/cppcheck"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="htmlreport pcre qt5"
+
+RDEPEND="
+	dev-libs/tinyxml2:=
+	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	pcre? ( dev-libs/libpcre )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.75-tinyxml2.patch
+	"${FILESDIR}"/${PN}-1.85-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	rm -r externals/tinyxml || die
+}
+
+src_configure() {
+	tc-export CXX PKG_CONFIG
+	export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
+
+	emake dmake
+	./dmake || die
+
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile || die
+	fi
+
+	if use qt5 ; then
+		pushd gui || die
+		eqmake5
+		popd || die
+	fi
+}
+
+src_compile() {
+	emake ${PN} man \
+		CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+
+	if use qt5 ; then
+		pushd gui || die
+		emake
+		popd || die
+	fi
+
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_src_compile
+		popd || die
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final} || die
+	mv -v lib/library.o{,.final} || die
+	mv -v cli/cppcheckexecutor.o{,.final} || die
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,} || die
+	mv -v lib/library.o{.final,} || die
+	mv -v cli/cppcheckexecutor.o{.final,} || die
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt5 ; then
+		dobin gui/${PN}-gui
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_src_install
+		popd || die
+		find "${D}" -name "*.egg-info" -delete
+	else
+		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+	fi
+	doman ${PN}.1
+	dodoc -r tools/triage
+}
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index 3e3669313a35..4eb9053d4312 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -108,4 +108,5 @@ src_install() {
 		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
 	fi
 	doman ${PN}.1
+	dodoc -r tools/triage
 }
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index ac1e5641df87..c329100b1306 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,3 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
-EBUILD cram-0.7.ebuild 480 BLAKE2B 615be2c72a86ca4803e3fe2dc978cd338b96574e87437eb7fca9238fb3aae5b9ee6d515ce022d184ea10b2269b44d99faa9968bb17ca126ccbbb26422a781efc SHA512 68ba8ff4d9634b37ed737289ade62b5377462928c0575ff06d7dca557f532e55c8507092d9f6f9d54a92dab1e74dbba420c65a4cb470c3eed67773e803e211b2
+EBUILD cram-0.7.ebuild 576 BLAKE2B 01a0b489f7a207404ea359a00e7f9a09dc2ac284d83d53c51082d0075c482d35225e98e2c86f880ff23df27fb9d66f3586a829e641fdb9cf0f43f8ef2dc65522 SHA512 fac841287897266f20bc3a23882cfb6660c8cea95e482fbcb0b2e25fc6843211aad54fd1e0c8c6bafc61cc3035f70577c56ecf51c0cf00bccfa7544630cb1700
 MISC metadata.xml 613 BLAKE2B 4e970afed6540c9f375c79858c297326994950a3498b51fde64aff6bf4262e6d73f1c77ef5ca621be1ac4fab79b2e4bde73e914869726a6d8665d291f854aea2 SHA512 6dffd4dc26817f9ff558ab98deb4b0097fbdfd0394291969b817d2edf1caf108d46d0188919d77e54942a35689c564f2948d627e30e5fc6acb403e8d7f6998d9
diff --git a/dev-util/cram/cram-0.7.ebuild b/dev-util/cram/cram-0.7.ebuild
index 05dedeb0a0af..80888de3e6c4 100644
--- a/dev-util/cram/cram-0.7.ebuild
+++ b/dev-util/cram/cram-0.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" "${TEST_DIR}"/scripts/cram tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
index 651c24b2a9fa..4540fb968c56 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -6,7 +6,6 @@ DIST creduce-2.7.0.tar.gz 768832 BLAKE2B ddc471b658a7feb8591dd4e402ac51d7c97a170
 DIST creduce-2.8.0.tar.gz 774668 BLAKE2B d799372d107c0cb45e9ed95f82c29634fd9de053c4eda1a2dfce8b2152ca84f7fff5e7b679e21e6dbe869d139e1cfd73963c02751ad30809a3470316ce10e077 SHA512 9d616dc421d0e932656ab0220ebfe1a4f20a08d46bf4ee004ef96a693ff37caeadf96c769262574a9789ac52c2bb4586e2b8602f7d44b627229b8eb45f5af0ea
 DIST creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz 720872 BLAKE2B 031104f5e7ca3d3cfb41087f432ec0cf1b1c125171ffac31b6f3b0a9a4483b5ca8a667331aacae7f5acdaaf99e8b688bb62b332405c1266d2b114a4bdceca9cc SHA512 36cc12015d85acfa99f0d04440184517da1f766df7a804ee02719f1208f67aff4f4db7af4066817b17efdc89a6d2cf7ab62b0c622a611bc9b03a89b8d1b68d01
 EBUILD creduce-2.7.0-r1.ebuild 784 BLAKE2B 093f61657be92f1efd7dcb1abea1a79ba13def8c3ec013572c648357b1bdbeb4a39be827eafcac9763f8fd2a24ca90b8609924b27c45f32a8e95c7eaa3acbaf4 SHA512 a73b178134f28b22bcd070682f9d656fe8fb8dc05ba956c8ca5e25a18b1127ee85bf32614bb77350413afd884bd46d6bfd1b17536cfcfaddebc934a40b9067fa
-EBUILD creduce-2.7.0.ebuild 656 BLAKE2B acd91114279b3a71d0725dc1f862b47195e5281fad1d3b0a20557d461a9fa4f4bcaa08bbde130af9e34437394d541e338d896a811cbdc0dfacd3759e4b24735a SHA512 20afd62b290c267c1968f92fbec4b4eee27f39f2cb2b131f64ab4557b96a58eee10a33558d21ede3867cdcd3588bc081bf9a4dd1b6e8d1253487cb080365cee8
 EBUILD creduce-2.8.0.ebuild 814 BLAKE2B 2fa4ada35468979232ad1fe3fc6624d09df764454188933dea519ac1adac1cbec5c839ddcc71fbe569c80b74ef5cba199bc912c88ae090cbbaf68ee3983a4dee SHA512 0ade02bd6ba2c664940bb5971e71d973132ca6708cd887daad785b911b2b0e0523a7316c23bac612c75b5475b52df670a1a7714be6faf36a63ff8dda2d5acb2f
 EBUILD creduce-2.8.0_pre20180411-r1.ebuild 935 BLAKE2B 7aa0a8ca0800a216918a65bf00fa6926f2210d688b2e6385e4a6147f9b913d365971923dff7a2df8d1da442ebebc9c6befb4e243175ceaab29572d0ed57411e4 SHA512 403502450479f91306f97d3462a5f5b300a71d5d618e8bc735189031c0a630cfecdc86d568b712fc2e50e8feeb504be4ebd58bbe84698e363d174a9e900a5a7c
 EBUILD creduce-2.8.0_pre20180411.ebuild 886 BLAKE2B 0e7f8cfab414f998d5b8a3872c14d680b6848f17107a77cf00738f3b3a4961289862a44571888c125db3dc3bd9a7805a5a72ca4641abdc3f7e79cf353f8f6544 SHA512 500c0b3462147f872fab9a1b27266a848adb2cabc39a40c591bc057176a78c23b785da6e37acbbd5a6c3bf8efd30ec3e3faec39bee9c1c9b7044d16edeecdb34
diff --git a/dev-util/creduce/creduce-2.7.0.ebuild b/dev-util/creduce/creduce-2.7.0.ebuild
deleted file mode 100644
index 3d45da9f2c81..000000000000
--- a/dev-util/creduce/creduce-2.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-inherit cmake-utils llvm
-
-DESCRIPTION="C-Reduce - a plugin-based C program reducer"
-HOMEPAGE="https://embed.cs.utah.edu/creduce/"
-SRC_URI="https://embed.cs.utah.edu/creduce/${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-lang/perl-5.10.0
-	sys-devel/clang:4"
-RDEPEND="${COMMON_DEPEND}
-	dev-perl/Exporter-Lite
-	dev-perl/File-Which
-	dev-perl/Getopt-Tabular
-	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex"
-
-LLVM_MAX_SLOT=4
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 852d9e92164d..2e5e6e58534b 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-test-runner-15.04.0_p100.tar.xz 304760 BLAKE2B 0afe953376482276229ddf7a5f8e6b9a79c6ea6003f658b38f292099ec42d65b9c4a913f963bf013a2999066c4ad97bf7bc593074c1d393aa2d000d51d7f7f7b SHA512 4ff94fe022d69c0bc83b35fb14397fb59daa0b6a9ff9d7f0c93582bc5468ba6e495d4b95f9b4d8cb56f0b782d4582dc2cb67fc087aefa59295a3b40ecdbfa34d
-EBUILD dbus-test-runner-15.04.0_p100.ebuild 1073 BLAKE2B a146962b47dce7e03c56aff5c4b1267ec9e613f3cc03ede486410fd18c9497eafe3ac7bb0bc9e1a926d0341e7b9a181d3b9d23782ae3abaf8d293153da2e0169 SHA512 88f33b879746a4849dd8abaab6ce3617287828fde4c66b5c4b3215e8a7a4a8fc16fef19569442a6a243924103a740ded523243da8055ecaa3d7378be3356b839
+EBUILD dbus-test-runner-15.04.0_p100.ebuild 1072 BLAKE2B 73a7549bf47036e537d090918c501bf7da7884ed23f6a662b05407a70da22a7f98a6571cb680c6598d2ed6be28b0a4a15056b913256ec4009c12e2fdd96aa017 SHA512 77c5a806bf089f9659b1ec316fbbd90a08d70609dc427343923ab43d10e7d018164fda02adcd7a1ecda9f0baadf34e5fa4f9a71c2e1dc615b9feb866444d224d
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
index b8397d945529..7b688bfa13db 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 89d9934735e6..3d3a32142276 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1,5 +1,7 @@
 AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
 DIST dwarves-1.12.tar.bz2 112400 BLAKE2B e71051041dfdbefc603dc041303de82e2e44c8b0f4f888577722466aaf7958cab7b04c15154faa8cbfcaa44fe60fc549e09b2fb68747cc3cdd08b8bce487cfdf SHA512 20644344e694253b79ede65e489696a319f10eaf424af81882414ae6efeaf34a82132321430d647916b78f97ef504907b3bd32919420f2cd14384910e283ff27
+DIST dwarves-1.13.tar.xz 222008 BLAKE2B db73f5c9a319a1a57ef37127350a9da117e3f5c89e199445393e3e312139ce8f88f46e6e5bbf302d708c0b075b1c2b2cd75dc7bc213ed144d1db792c55358220 SHA512 26485b183b4c7b608dd0392f9155dd570a14c86fdeafee232e44ad30f14a1357b408b61b0e8a31ea4bf976ed7fc44e7d5a4a3ccede9713c47265ad52c13dadf0
 EBUILD dwarves-1.12.ebuild 1038 BLAKE2B 9cb69f3108df21db6c39c359129df606083374ba7a9dff0b8338dcaf9ca96bc1b85be0c135d7c2e8b76a60e1b391ed6c4abcd9eeacfc75fc6eb8526f0a2dc803 SHA512 9ba86d1966a769c43202fa8152617e6af65a0f967433aedfe69461857607485c26d1d51fb8dc5c5b2e48a55d9c8d1c67c54d0d64f3b837a9438531e1d2ffe51e
+EBUILD dwarves-1.13.ebuild 1034 BLAKE2B da7070d039e312e088bdc3b17f946e75a087b11ccc6e23c09a4b7653e9e06b9d5f79722a7f28eee9004cca098a18d2b1990ce167ea8551affa9fd0e6b3e9edff SHA512 814470568799ebb37f19c0032523406d10a6847b7d3f262d0cb350f05453485b3fafd265e0887a568d111eb641654b65302093361cd0390c54a951356e96d3f7
 EBUILD dwarves-9999.ebuild 929 BLAKE2B 5531cdc3c1f3fc899cc16b34202a204b345af50d00eb14120e25da00a724599f9395df68e96e2fe8364ed826380e9afe014d8bc56bd92fc0c59b40c87a875519 SHA512 8a44218bb5e96127336e692040626ccb9414a7b53e53df85ff01b6580129b13f8325540e9b9247039a4c92971a9818bde1ec99842c65920a7b40e74f4f4d851b
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.13.ebuild b/dev-util/dwarves/dwarves-1.13.ebuild
new file mode 100644
index 000000000000..5af51df1a8e6
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.13.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib cmake-utils python-single-r1
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+LICENSE="GPL-2" # only
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.131
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV//_p} == ${PV} ]]; then
+	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
+	S=${WORKDIR}
+else
+	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+fi
+
+DOCS=( README README.ctracer NEWS )
+PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake-utils_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${D}"/usr/bin/ostra-cg \
+		"${D}"/usr/share/dwarves/runtime/python/ostra.py
+}
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index 7101edf6c8d2..9655603d75cb 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,5 +1,7 @@
 DIST flawfinder-1.31.tar.gz 174148 BLAKE2B f545a9d4dc8c0a9d7ae34fb5b26e06eb7c40a916155fdd738e4d56b6fccee4af1941935b6847d5f6c8f968ba45e95a8e9b44e5723b11a9c47fce725d1c27dcf1 SHA512 880919a05dbf0e29055f052b88c8bbfd403105504749bc65fb17675e6ebe0d84f9cd367e7a6efc68dc0d9209e0938185da4718b70f484007c507fe96b83e0355
 DIST flawfinder-2.0.7.tar.gz 249177 BLAKE2B 35dc5796ca7ecf456bf623247c7fb3944e05864bb714900a386f3e39eed81695409b44b9684365e4b172feb938a7c781c831856a8a94826c48b1027698b0967a SHA512 ecfe98c58e253b1d90b833747d69c41597ab7b4c82286e5f45dff45de90056216c25d2c9626540aebfc1e475882a04c3cfa3c0cb3ee242f498f5cdfe188d761f
+DIST flawfinder-2.0.8.tar.gz 251546 BLAKE2B 4817d3f529c27f0e969754fab08d1323b5fd778e4914882bdd4a61a96301ded287e2899016e609f658d9fee5dc76c1013e535a32120831cd166bb3f24c443e8f SHA512 9346c60808087ddf28f433067691c662beb0c36375903fdd0b4dbe3e53fe92b3893e38b13ecb0fe134586cf680fc554d33c92ff910dbd1cd4c3cbeab946038f4
 EBUILD flawfinder-1.31.ebuild 724 BLAKE2B 4441a55be26ce38da31944675d0203dac0028b27acbf99dadc1e733114d8e6a80500aa0c90a592f89b188831faa1ffc1160a7f11e96a7b940f9af01f518e164b SHA512 d4730fd182db2bcd39ff3b44c0036fa4dfd00d26b98ff5732c03d89980de5ced3a9a955d926dcf40f1afb829839f5aab0f635d4a60464d15fb603bc7190eba39
 EBUILD flawfinder-2.0.7.ebuild 804 BLAKE2B c06f4c5294f71217367bde02d91d79d12f5ea23bf7d15ff62655c38a267d068b4085bd90a481145a0b915750c2c5c0a05dad0bdfcb40c04bd71e10aac3818b03 SHA512 bfa525396655d991640313738924849bd6ab1650d9e15bae5fcc3569ba5026bfcb520b8c64fee70834f40be08e574c62ba08809dce5aa03f7c82cf7c40a0e4c5
+EBUILD flawfinder-2.0.8.ebuild 804 BLAKE2B c06f4c5294f71217367bde02d91d79d12f5ea23bf7d15ff62655c38a267d068b4085bd90a481145a0b915750c2c5c0a05dad0bdfcb40c04bd71e10aac3818b03 SHA512 bfa525396655d991640313738924849bd6ab1650d9e15bae5fcc3569ba5026bfcb520b8c64fee70834f40be08e574c62ba08809dce5aa03f7c82cf7c40a0e4c5
 MISC metadata.xml 622 BLAKE2B b86d650364e1cd87b7fadc99bfc02e6acb360147c849846bfc94b3e827042aca129c745240ef8e04e3270ec6468dd5654ef9dbc55eeeb59d0251a73ab9d5f888 SHA512 5eda245e47619da4309fe11fd709daf8aedfefe97624ffcdd898bb4915c29e8dbf07b25543071ea9fe15af604a96f030ba816e26580c7166fd9689a1062e8e2b
diff --git a/dev-util/flawfinder/flawfinder-2.0.8.ebuild b/dev-util/flawfinder/flawfinder-2.0.8.ebuild
new file mode 100644
index 000000000000..cf9cdb27f945
--- /dev/null
+++ b/dev-util/flawfinder/flawfinder-2.0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Examines C/C++ source code for security flaws"
+HOMEPAGE="https://www.dwheeler.com/flawfinder/"
+SRC_URI="https://www.dwheeler.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i "s/${PN}.1.gz/${PN}.1/g" setup.py || die 'sed failed.'
+	default
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	local DOCS=( announcement ChangeLog README.md ${PN}.pdf )
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
index 701df0ecfde0..4647f9589610 100644
--- a/dev-util/ftjam/Manifest
+++ b/dev-util/ftjam/Manifest
@@ -4,4 +4,5 @@ AUX ftjam-2.5.3-i-hate-yacc.patch 1756 BLAKE2B 26aefb56b2125b765eee2b6dc9a55fd0d
 AUX ftjam-2.5.3-nostrip.patch 780 BLAKE2B 7299ec77c1ed3ccbc87669850ee54d6d61534983793f076e56d95ea83e9c8617c80ec08d84bad24bbf45f11b6e0275167f4454223366ef041a81a4360d1b1d09 SHA512 6d8b399f8a4047c34b1315a230cf47e8ab76c7fbad9089fd4c3c18b2ba7fbb2f3ecbcb2d3a1075f0d95d36e547490de345167ba55fed75221b2b8162796ccc25
 DIST ftjam-2.5.3rc2.tar.bz2 215963 BLAKE2B 77e92dba10dd2b99b53bea87dc47c7f1d5da2a39789cc938d8141debf3ba5d6e25ab4092e1a3b69266b3353866c76e72706d13d3751a321e42bc5aafdf87e8cd SHA512 18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd
 EBUILD ftjam-2.5.3_rc2-r1.ebuild 1120 BLAKE2B 9e492d187622a734ad37d59613ba99bfcd063d7625a636eb11b56bb2063919c477cc556f6fa00af63e2244cdaeb8e4bdbf60374801e20c3bf24eeaa6c9bdbd26 SHA512 fbd5d795bded29338f0bac374717c20a7153436fff55c50164eab245c4fa518c52173321c633506501b4570da1531e06f63b78a9b7b9f08028fe0b0bcaba75c9
+EBUILD ftjam-2.5.3_rc2-r2.ebuild 827 BLAKE2B b1acc647281d9dd98e7e96111b71fb58a793e748f7cccdec67e2f0dd9d20a24fa02e25059d77b74d0549bc8005191dfe6591f152c168d927054ea7d218e15f6c SHA512 7d1e0a8199ced6d731a61c72d570cdc679f762acadb4cd9da1637e7e363aa9a38d8190b492d4c678289e4d2a05e457a897abae11266393565328612b77f1ede6
 MISC metadata.xml 217 BLAKE2B 55f0e28ee6fed5a28a2b01ba5367d8b0cd6e4d9fac04998f93794be3ad8a1d526d473378623b82888869bf94ddf8838c0134e733c5708e11d2b7ba0c148ab434 SHA512 84ae81764128d1c529f0228dee8311929ec35ad1bd0a8ba684febc06c8f6671b23317b2e04b0ab3670e476209ba085916afe8ada10b855510df91303aad473e5
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
new file mode 100644
index 000000000000..f8cfcd0508c4
--- /dev/null
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV=$(ver_rs 3 "")
+
+DESCRIPTION="A 100% compatible, enhanced implementation of the make alternative Jam"
+HOMEPAGE="http://freetype.sourceforge.net/jam/index.html"
+SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
+
+LICENSE="perforce GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+BDEPEND="sys-devel/bison"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DOCS=( README README.ORG CHANGES RELNOTES )
+HTML_DOCS=( Jam.html Jambase.html Jamfile.html )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.3-nostrip.patch
+	"${FILESDIR}"/${PN}-2.5.3-i-hate-yacc.patch
+	"${FILESDIR}"/${PN}-2.5.3-false-flags.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 136d7b8decd9..534647ab6d20 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -2,6 +2,6 @@ DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b
 DIST geany-plugins-1.34.tar.gz 4640059 BLAKE2B f6a2e001db42e348c129b503fd969f142fecbaa06a10bd220d348f70e6af087a0a856a403bdf866f65fdff02889fa03a2f3a662be3efad0a17401266ab883bcf SHA512 31d25e9b0946b7feeae40b81c4e0c177568cc161c24bfa1c8271dda1c15a44e86f5de9b5992a4acde6cfafe2924a1cc22e95c7b6fb253e8a358931fa5f8ecca3
 DIST geany-plugins-1.35.tar.gz 4656963 BLAKE2B c7c96c7bbd1d17083f75a90eaa741277626db8aeb693cb78d3fcca57136923c58eba1755cc55263d431ff7a992e22b365f91be5e424b4f02eb25299ae3d3cd93 SHA512 9fedb4237096d939919fa40c39a7d19debb19211260a2797b5566c555052dcd8bf9a31a694d057f1dcded794bc75883d0007f8dd9427e3d899434fbf0e8a8e9f
 EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
-EBUILD geany-plugins-1.34.ebuild 3355 BLAKE2B 7635730a857fe4e94c0935d7f71585ebb45a799cb6307438257dc5bc2cd25c2247dee96eec80b439cfcf859f7f59e3a200687b3b65d10c7075398a01fe4546ed SHA512 b2595fdd7b45ca1c56333a968ad09afc844440402db82d18601c382888bfce9dbecb9d4d8ed5a586791757104abe177c27a8f94252791545c3d769ccc768b23d
+EBUILD geany-plugins-1.34.ebuild 3354 BLAKE2B e33f1e116cb417bf67bb56ae1abc50d0c8b2ca5ffd8b5d5742ee7da694df13609164af3287585035e00e374fdce0c3c4fed99aeca4a5b7d8388a54d97e693b49 SHA512 4076e2f23e030932d937dbdfc5fba307d19b052cc0e936611051fe26d8efb70929ace9741b401c9576cd912792aa4163ba9a981da0a35e852c414ff67921101e
 EBUILD geany-plugins-1.35.ebuild 3318 BLAKE2B fa8b8919b8fafdb570e6dcc0fd951b5051fba7f3f02afd02f1fef4798edbba2f44e9e26df59569d877123f3cd4e2125ee6a91b0573001bf73a1f317393a07849 SHA512 8556d21fc5f1130c3ba4f98d1300232a1638c9874548b4787bc139997e07009f316d8ca682f01efbf185e72c8c838b28ce33b00f24c2f23d603cf82e5aadd21c
 MISC metadata.xml 1591 BLAKE2B 33b24731bacbd726ff66b7c8915504c7cd74970d3d59a64f7de32c285d0674a272bae2f35798df90aacacc4c35e05ffc155ddb58d1d7f77f17e48d213dcd4f3e SHA512 b305d755827f8e73df732bead1ebc8af4d93a03958bac3e3b00c6cbcf2335caa51f83619779567b3744e76390b8aaefa71cd6487a3f77b54050963bc61e0ecf7
diff --git a/dev-util/geany-plugins/geany-plugins-1.34.ebuild b/dev-util/geany-plugins/geany-plugins-1.34.ebuild
index 056115d3bd4d..52235149aefe 100644
--- a/dev-util/geany-plugins/geany-plugins-1.34.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.34.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86"
 
 IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup"
 REQUIRED_USE="
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index f6ea74b68ed9..442b81a7f2b6 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -2,7 +2,7 @@ DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73
 DIST geany-1.34.1.tar.bz2 4474211 BLAKE2B 25c9b3f752b0b19582120ea342d8029f811040ef433adb065aec028f0bcc0909ea1b0005445bae70a53cbb2b1d3bfe0c2dd9d9c25c5e3f89bcdedebc0a392301 SHA512 3e075b23b22682324e4a56046d238d9d0087d095a6157b98c342fbe40a2bfa7118f72cfe1f414d110fff1411e4cc9c33fff800e0a2e32f9f0e5fd7b6fb560c9a
 DIST geany-1.35.tar.bz2 4593705 BLAKE2B 1d411da04a82987abccb33385d3b50025078b68dc2cc4accfb7822000a786b97f613a35864fde2389d0525b9547972d0e56699b75aae40686f0ad7e6e2beb4a6 SHA512 9ae2f168b1b5e9fa9029a32f5d1e9b591e50ea4e79041760524a4389572400c6f8f56f1fd6973299f152f9fd653cf3d52ca50136f0bbdbc15d3395bcf7388ccf
 EBUILD geany-1.30.1.ebuild 1572 BLAKE2B 76511c81bddcb43513af0f8c4203137988e12641d1c426ff54aadca90dc3a300224a234d0d6f290687a4e93ee71fd2db9ee5b845eaa27014d32416eea7960fdc SHA512 5598cf20f2a491d24791ff1166457d8dde9aa967170d5140fbc4fac600ae668e1aeb8e26eba147752364fbb7104535003dbe2276d8fe3ec6cb808314813e45c2
-EBUILD geany-1.34.1.ebuild 1762 BLAKE2B 18f4760c8dff8502df14948dcd42595b3ff6d2a5c770592af5cbcb7477a2265b76a3ddf7db4d3a259e4e0df9db90ac37829e1875e6ea1216a8cc051f2f80aa5a SHA512 75777e9b8b5f8e0d547b5c97a18a05bcd41506e61cb16c062a0ce123fb614f21c4181b8c4f3425ea57246885d62d231ad3a5d632a8e02069a42259d514e07b2a
+EBUILD geany-1.34.1.ebuild 1761 BLAKE2B a505b602d4a87225b58e47e8836f0c661bed0767cec33b29cd351582c7f0c2518fc80a0a642ce8678f3b3d9c565c6d71374ea97e528d5ca5fe73f53eef78314d SHA512 8fb31c0d0c468bbff814526138c07ee6702e06c40a5c7639f391675553daf901cea1e14f08738ac3a03116a0dad8ba775e6f2417058eec3e91268d79a61324f4
 EBUILD geany-1.35.ebuild 1726 BLAKE2B 032a836e7c4c2f29f6e2220627e21457dc42469293e041946b2ab669013d894d9d179cd8121e677a9f4e80674d6bc380e0be6b88a5be9913e4fd089b9eb95713 SHA512 0273728a66b6a4429d216cbfbd07124419a77a897533817b91b4df8037196cea680da1fb31911055c6f57e1b045743c8e1e5671569651afc03c61da02996993a
 EBUILD geany-9999.ebuild 1726 BLAKE2B 032a836e7c4c2f29f6e2220627e21457dc42469293e041946b2ab669013d894d9d179cd8121e677a9f4e80674d6bc380e0be6b88a5be9913e4fd089b9eb95713 SHA512 0273728a66b6a4429d216cbfbd07124419a77a897533817b91b4df8037196cea680da1fb31911055c6f57e1b045743c8e1e5671569651afc03c61da02996993a
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
index 396dc4ebee9d..04d361cf4ef7 100644
--- a/dev-util/geany/geany-1.34.1.ebuild
+++ b/dev-util/geany/geany-1.34.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/geany/geany.git"
 else
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 03f61925114e..d51cc8f3482c 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,4 +1,4 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
-EBUILD glade-3.20.4.ebuild 2387 BLAKE2B 003c02a10279cb52ddc2ff94a990bc126439f7ef5f8fda5033a05587701d4b6de31b661cb6c417ec1b8aff5c55da73e7a4609df693951be702d39a7854a8446f SHA512 2619096c3f62994aff9022a68987f09c409c213e6cf076328d805915fcb183283c2fad7de4c5c4091573c4417fc94607c32f7e7013041a8582b45b304effb6a8
+EBUILD glade-3.20.4.ebuild 2386 BLAKE2B 8f4d42898dfe18c870f0ea90442c0ab98d43ea75299ce210a80b7527157a0f8e1bda0527c22f51c4832f6c42b6539e5294e112f822a2a94b156ac089313384fe SHA512 3cccd8c8e69e26ea881565673ed6883a68f00d11d5aa72386ca123f0c982ecac4af509359c1512517457b54c52aa5b58caac09116b6fc1c7592833ce34b348b9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.4.ebuild b/dev-util/glade/glade-3.20.4.ebuild
index 517ed1022cfe..d3714066465f 100644
--- a/dev-util/glade/glade-3.20.4.ebuild
+++ b/dev-util/glade/glade-3.20.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 585c26aea9d3..9839962f85c3 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -2,6 +2,8 @@ AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356d
 AUX gn-gen-r3.patch 1560 BLAKE2B b76caed0277797f9e478465d329933be1418ea01d54cbf2620dfd8bd77fde428705c188a1a5eb2ac0d755622a870c30cebf7e027550ec69698297a64d04145a0 SHA512 80d18a413523ccceccbe8669527cca4b402a400d61c067ece21f8dc2bc9a00d3ac38b24c3f4f399f352d7af20675e1b81eeef3fbde2c681d50354296a8b4cbf5
 DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
 DIST gn-0.1544.tar.gz 911124 BLAKE2B b8bac7783c373e8101cf727c254c2ee50af49c3e679a8df2cb337a0637e305f1f9094517e6af6a76a19300f533a41d9433624a7963ba0151a88a636bc7e6b4f8 SHA512 5cb3a25b66d44cd26063453ddf96563d62b24e8a961ca7fa29a48ee7bde4a423bd0dace36c432b46b677e042fcac9a4fb23afa5dc27e994fca54030b972dad29
+DIST gn-0.1583.tar.xz 648856 BLAKE2B 997e469bd1411c5307ebf03fca0c533356b6d652f4782212681de7e57f21c493d9d4ae8856877d259234babf4be4e13e529532ba5075ea0de3b823f66cb1ff1e SHA512 8026f9fe549fb2fe8d83ad1ae93ebfd31851e64bc43765fbebda9963b2719c25b551a5db4cf833ac475a797abb928ccc03c74be8be49a3dd184ea944e5d749e2
 EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
 EBUILD gn-0.1544.ebuild 1195 BLAKE2B a8476c5c8a3c0cde6dc09e87635764327e95f550977a98d46e1bcfa21255775a95ae999390cb0bcebd60e801c7252fac48d64daf4ca0ea134d68a3cc1db1f457 SHA512 999dc0bc2ee0559259649e19a26372f858e7fb32ce2e3acbff486e890076864d702a3bf203f1e92e5dab54ad0a59895e2b13d691ccba47888d7c9f1c626a2ea4
+EBUILD gn-0.1583.ebuild 1207 BLAKE2B 6db9a7ee497b95fd4f3d3d3471e2e51cc46db59a6b82682941d689b9c579b83ff180145a9717aba7214b577ab018e7f5a58af111ab12d90abf9115a393e61c76 SHA512 9b3d50155570b52488ac2fa13c4682c427ff7d2daf859fd645c61dcec6b7b03b96c2968e0143ef5ec44215ceb3529ea6dc0b9bb10c4a12d2fd21611d3feb3caa
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/gn-0.1583.ebuild b/dev-util/gn/gn-0.1583.ebuild
new file mode 100644
index 000000000000..60df97bc0fed
--- /dev/null
+++ b/dev-util/gn/gn-0.1583.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit ninja-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
+HOMEPAGE="https://gn.googlesource.com/"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vim-syntax"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/gn-gen-r3.patch
+)
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	python_setup
+	tc-export AR CC CXX
+	unset CFLAGS
+	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip
+	echo "$@" >&2
+	"$@" || die
+	cat >out/last_commit_position.h <<-EOF || die
+	#ifndef OUT_LAST_COMMIT_POSITION_H_
+	#define OUT_LAST_COMMIT_POSITION_H_
+	#define LAST_COMMIT_POSITION "${PV}"
+	#endif  // OUT_LAST_COMMIT_POSITION_H_
+	EOF
+}
+
+src_compile() {
+	eninja -C out gn
+}
+
+src_test() {
+	eninja -C out gn_unittests
+	out/gn_unittests || die
+}
+
+src_install() {
+	dobin out/gn
+	einstalldocs
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r tools/gn/misc/vim/{autoload,ftdetect,ftplugin,syntax}
+	fi
+}
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index d27cdf74a907..f042409a1dfb 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,5 +1,3 @@
-DIST goland-2018.3.4.tar.gz 298506989 BLAKE2B 9fd4db8c178c0a749c685b5e77da22717923f1da2371e92246eec3422e8041c3d8c975ffc562e92dcfdd0580297f4ffc0569e82ffea231cc3688b5570b4af7cd SHA512 ce7efbea9b531079dfae241f4817f04bb3969a65b1b8d6128b28d82b0262dfe3881ae1b6ceeff4fd3a084743d2ad512dd948f231a66f3b6a4347c522409cc81d
-DIST goland-2019.1.1.tar.gz 311687094 BLAKE2B ea7d23a5a835790801f781d19949b997358b8174f8b7551096a9df254dbbaf8bc8fd5f6a7e55a6016c0cebab363d98669fdaba1b9673e13f44ece6da7bcf2cf8 SHA512 c617c9af6f31b7b83f921ca41500341ec2971d7270cb433c024e615d043fb591590a39df81d8fca1a587c86e02b09c37e12aecd1292ff9198de83d6d9fc2e379
-EBUILD goland-2018.3.4.ebuild 1037 BLAKE2B ac2928910ecd153c1408e23bea8f428c21cd4d6bf7ff07839371d357fa8e0749571edf2b22dc804f4782f30f3d460bc7726272922b1770149d171492ba6f33cb SHA512 28ef739f655709535288f66783b0c6b0fb9bfcd3dec2e95ecb1472c774ab82b589b34b9182c292c664cafa212b43a79cfe61ecc36fbcd43777aff0ca6a117f47
-EBUILD goland-2019.1.1.ebuild 1037 BLAKE2B ac2928910ecd153c1408e23bea8f428c21cd4d6bf7ff07839371d357fa8e0749571edf2b22dc804f4782f30f3d460bc7726272922b1770149d171492ba6f33cb SHA512 28ef739f655709535288f66783b0c6b0fb9bfcd3dec2e95ecb1472c774ab82b589b34b9182c292c664cafa212b43a79cfe61ecc36fbcd43777aff0ca6a117f47
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST goland-2019.1.2.tar.gz 312490907 BLAKE2B 9cc0abdb9d86b1bd9cdf67e3e65548bce229d3575a62ed153435585d0d82489b193cc775341e194107cc09e4e6e2ee84f4639259c998a7191b765edb6f5695ee SHA512 fb5c597634cc2a84f2abaeae9d0a31e332ba0123d44a5cbbf1587e05cd8da0358794ab80bb873d3395385aeb87d1d92ca4dd7e606523a621fab16aeec85aaeda
+EBUILD goland-2019.1.2.ebuild 1037 BLAKE2B ac2928910ecd153c1408e23bea8f428c21cd4d6bf7ff07839371d357fa8e0749571edf2b22dc804f4782f30f3d460bc7726272922b1770149d171492ba6f33cb SHA512 28ef739f655709535288f66783b0c6b0fb9bfcd3dec2e95ecb1472c774ab82b589b34b9182c292c664cafa212b43a79cfe61ecc36fbcd43777aff0ca6a117f47
+MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/dev-util/goland/goland-2019.1.1.ebuild b/dev-util/goland/goland-2019.1.1.ebuild
deleted file mode 100644
index 824cf5bfe3d6..000000000000
--- a/dev-util/goland/goland-2019.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-SLOT=0
-
-SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
-DESCRIPTION="Golang IDE by JetBrains"
-HOMEPAGE="http://www.jetbrains.com/go"
-
-KEYWORDS="~amd64"
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-QA_PREBUILT="opt/${P}/*"
-
-S=${WORKDIR}/GoLand-${PV}
-
-RDEPEND="dev-lang/go"
-
-src_prepare() {
-	default
-	if ! use arm; then
-		rm -rf bin/fsnotifier-arm || die
-	fi
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/goland/goland-2018.3.4.ebuild b/dev-util/goland/goland-2019.1.2.ebuild
index 824cf5bfe3d6..824cf5bfe3d6 100644
--- a/dev-util/goland/goland-2018.3.4.ebuild
+++ b/dev-util/goland/goland-2019.1.2.ebuild
diff --git a/dev-util/goland/metadata.xml b/dev-util/goland/metadata.xml
index 6f49eba8f496..474123637388 100644
--- a/dev-util/goland/metadata.xml
+++ b/dev-util/goland/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="person">
+<email>zx2c4@gentoo.org</email>
+<name>Jason A. Donenfeld</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index c4dac067629f..dda76d0a7ae4 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -5,5 +5,5 @@ DIST gtk-update-icon-cache-3.24.8.tar.bz2 91113 BLAKE2B 4a930d001a9718b14089962a
 EBUILD gtk-update-icon-cache-3.24.0.ebuild 952 BLAKE2B e6d8bde862c87e3d257a6c4ac52107e0a742e046fd21803a0429b6e1ad5dd8b1e748e03f4912d685d8cb479903efa86318ad3fb708bd21733f6f8a05d9d7a7cc SHA512 7ce0934ced37329c5b2040aa8370727803fa13a4188190afc3df1822f54557af89423857dae3e4e2867eb90e9bb96a299e33c0af986194619f3d2de097c6733c
 EBUILD gtk-update-icon-cache-3.24.3.ebuild 952 BLAKE2B 4233d8df548b6223fbabd12051fec2eb069e22e67eba583b143bd4ee1afddbfb521b3c6e7f1e5eb0574837a7e9606fcf591bad03edb449de2ac733beda93d7b8 SHA512 cc5c5783d8f50a7cd6010f51452fce072534c45dc36e72f9e27a8eab5b6ac5cabd172f26f9edde014e76e9c0f393396196a75683553fbb97c51e9bf3bd78d70b
 EBUILD gtk-update-icon-cache-3.24.7.ebuild 929 BLAKE2B a2e06e40a204b23ba64c05971f0bcea7c40f118ae3ef0ed33b4bd58aab7308cc28e84c93281076eaa5471cb4eda3197656966fed436f8f0e857ebb03cbc90f3c SHA512 343d66080958ca27964b3f6a2795865fb8e080535293182f53e967f91dac4164bf9af9b65463cb79d85402ae9949f417bcdb1269ebac22967be813b9424fea07
-EBUILD gtk-update-icon-cache-3.24.8.ebuild 925 BLAKE2B f1c8ca73827188d493517dfc9c551e24a2961baa6decb7a63000b6b681537ad1818c5c8bb385ad8c2601a5be317f2dc6f3d7d3d7464bd23f91cee3a510645791 SHA512 18212a17b353c632f6db0fc0ea9f6d35d951fb9e45924eb81a2272a1ddfc162e8638acd6a2cce74549828937cab7e663d24931ba07557e6265d41246a0384c60
+EBUILD gtk-update-icon-cache-3.24.8.ebuild 924 BLAKE2B 1a5aeb037b80d977307da6a15221e946b1aba5b98d3eb3fd54ba1d3ec4f31894faba35759ea600e300f2a99351206bd230e10f2820676e406f855afa4afc3453 SHA512 7897e2ac030626f0cec60ead5fd2d829cc4fc37c8d0e7d38dc436d82361d2840bb0597eaee69515a88a4f8a7776631f5ea6355cf45eedf82e8d6be0001c7c3f6
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild
index 7926a3676cf9..3f2814c78a62 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 1c51ea591450..23cf5860b895 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,9 +1,7 @@
-DIST include-what-you-use-4.0.src.tar.gz 437340 BLAKE2B 744f7893169a637636107e23cae356db7f12aa01fefd39626600b3fa3dbd77688503e7332a2dbc673339145692625fd8fa3f10e0d405a77e2d5586e6bfeb0378 SHA512 c96b78ec8f8289bfd7830acaf533aea0077bb36311d3b8bb7f31464c1b3a5b3f353b24e81ffc581811b4083d3b5959e4e947e3a3d16cb7c77de00b05b9972a90
 DIST include-what-you-use-5.0.src.tar.gz 439081 BLAKE2B 85246aa5333a073bb195b873d7bfe084a56c343cece92322706717ce699bcd75b737203858277202791ec0eb91f560b06a371e902cb175cdb2858562a4830e74 SHA512 9d4a9717a3a3f6752f8bdd1392b6d7a5e8b8dc277ef46a50f24185a089360380e1da92a61fd150598843f5c24cff03e74bc674e57579960d977acde755e34c52
 DIST include-what-you-use-6.0.src.tar.gz 440406 BLAKE2B 485a61dd4f72c158ad9c798c8121d7af9134d79b94c9c30c14674a62007e9fc05acc7e2341cc3282288611beb9138768bf11cd2d73efed372adab83e90b268db SHA512 2bf2593dba252d870074125f976a237e901e969323969f2c8fb030e8376bb230f1d5c2baecc8cd8fad7099e83589c7666c44cd178d2094f6e883cace1e53ad90
 DIST include-what-you-use-7.0.src.tar.gz 541840 BLAKE2B bf20a5598f02f03e5f714582653b8062eab6e414967ef2374c28bb6c1cdce8f73f80e3b2f4953fd943587ce17dc657cf6ab2a9db4208a59030d432f6a40532e5 SHA512 50d186b2e09c3595cc2dc7513e5db74da0038987158c2c45ef4279c67c50de621ca6499b07894ee203f25566aafaddde4b05840946f921678499d2efc131575a
 DIST include-what-you-use-8.0.src.tar.gz 545788 BLAKE2B 7b70d951b7ab2d62a8a6168ebf86dc76fd406159155dd93a509b8c39953506166ac18da3028be8dc7edfbb39eb96613b0e344067154dd8614fe7c63ad3ef04c6 SHA512 e75e91ce198b1ec446ed34afcf9fdbcb0534c5edc5346e4884f0f589c73512d778c428aa71c1b109d45a45543a952438610ab21e32ef1f03ff1a014823ed8425
-EBUILD include-what-you-use-4.0-r2.ebuild 1319 BLAKE2B aba4fe812640bf3d0a2e71c7a242f7382c51911fde078d500b2b30321aa57c0ef412fb983635cf52edb9688fbdc6da66e958c02841ae4d9e480b4025a545acbd SHA512 cd2bca4aff3d4ddb6e8dad496b075996b7ebca4f1ab886a8920a5a804f345f05634cc6bf2c7047a2e375cc08562453696aa3f8f160dbe2ec2f51d6fdc393591e
 EBUILD include-what-you-use-5.0.ebuild 1319 BLAKE2B 9e80fbe8541e9a2179a3c3a16ff1664b5ba15ff35723b298a8ffc5764591c2d4508c724341e6989a5e9425008cae3bdad41cec78c5387ca43f2c1fb8982543f1 SHA512 38ef2977761377c078553619960d4fcb71f0d141d08191421eb2f0f3b9e3a01f758ddc22b65d50bb97661b98e42be65905a911de02655e5c73234a4076f10695
 EBUILD include-what-you-use-6.0.ebuild 1319 BLAKE2B f3304e57585cc3e52ea9181fee7214eca19620e239b5009927a967649c8f66288c7044320721755820e54d8ddcc547d15a01b1f894800715340b183042b4e4be SHA512 e511f24c4b09caa070d390e3d9ba6bbe72cdd5cf5157ccbe64836efef525a937923ff42180c1ad5b3f741a495b4a35f7260d642b6d6b625fead0b92f681cde58
 EBUILD include-what-you-use-7.0.ebuild 1216 BLAKE2B c8ee0c61209225b05b50625799b786e6e115576e383d50ebc3fab065e96310019c97dbf371ec683f4cd10382d4e88eebcf114b843736ae1d0e9a3113b0512d52 SHA512 03e2042d26614945f25d4e0f86efb733f51f5e0130b3d44de0fe2d85d00b4f290daa9f9bdff3d0c3af1888d5e1c0e32567112f0c1ca0e1d328f178d16fa0cd05
diff --git a/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild b/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild
deleted file mode 100644
index f36a4f63c3e1..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit cmake-utils flag-o-matic llvm python-single-r1
-
-DESCRIPTION="Find unused include directives in C/C++ programs"
-HOMEPAGE="https://include-what-you-use.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LLVM_MAX_SLOT=4
-
-RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}-clang_${PV}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
-		-DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
-
-		# Note [llvm install path]
-		# Unfortunately all binaries using clang driver
-		# have to reside at the same path depth as
-		# 'clang' binary itself. See bug #625972
-		# Thus as a hack we install it to the same directory
-		# as llvm/clang itself.
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPYTHON}" run_iwyu_tests.py
-}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 966042409bc3..7e33f09f20b7 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,3 +1,5 @@
 DIST intel-graphics-compiler-1.0.3.tar.gz 6721202 BLAKE2B 2934778e931a4b38a239ede5944757cc42c0a965e700ba471272ba8e9ca08b1c1c790c920ed6896a870985b1d2819a182a9aaf5a5a8cbfc13038ecd7cf1def1e SHA512 c0c0cc21263b71bc57aed43a3e8bd641ea7853db0a574823a70abb592a69b7f8a9f426e88e7fddea4cf6a14de44e064f80abcfa3ea709701e5003e0d4b7adfb0
+DIST intel-graphics-compiler-1.0.4.tar.gz 6720515 BLAKE2B 2f9ac9a2435bac785b6a9f3cb8c63eb570ee1a87eca9682fa1c09363f5da3b258e22ad1c5b1628a1537b36afb7c6f6e66f2052b31ef7fdff0bc43cf67fad55ba SHA512 0b748b33c4c1822d8fb159dbbbeb35f0573d3eb464e3be0a94771069e47a019d6cbe878d2d2a1969ec87b051d62ff2f77db88b02238e9a74d8f62fc71f07e264
 EBUILD intel-graphics-compiler-1.0.3.ebuild 919 BLAKE2B b6bb9e5f2c49b110bcf771e10ad4ecdf04156e6c9e4fe0cc0c979daa0ad1efff4f1bc54fd4940e3e4f9f67beba22f85fcff79873edbef858459b15846cec4899 SHA512 2fbbc2ab3a22a4fd8637278e4e16a2b4be3dfd77b11e687948dc18ecd1401163e3d5a94ffc24ae2a1a29d53f8774139d2914b6197da9277af8384395dd88ef96
+EBUILD intel-graphics-compiler-1.0.4.ebuild 1214 BLAKE2B 4543f3229f2a7abb992fa35a8a76780560cfb3e19d61e8612fc21866897b432cf650413ccf972115d2262b8ae58883a0de726f08018c42d55d0ab8245baf6682 SHA512 acda5f7466d703a6973d498a903c42ffa71f940eca0d127e13c96708d6051ba8423c6fbfa5ac9a97ad8c919eebdd29ea501ab1bd83fc3e371be242d54b5f4229
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4.ebuild
new file mode 100644
index 000000000000..2a30895b7689
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib llvm toolchain-funcs
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
+	dev-libs/opencl-clang:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if tc-is-gcc && [[ $(gcc-major-version) -ge 9 ]]; then
+			# Bug #685790
+			eerror "Compilation with gcc-9+ is not supported yet. Switch to an older version and try again."
+			die "Tried to use too new gcc."
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCCLANG_BUILD_INTREE_LLVM=OFF
+		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix)/$(get_libdir)
+		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+		-DIGC_PREFERRED_LLVM_VERSION=8
+		# Until a new official release of opencl-clang
+		-DCOMMON_CLANG_LIBRARY_NAME=common_clang
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 699fc237bcf1..ed7548638936 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,3 +1,5 @@
 DIST kdevelop-pg-qt-2.1.0.tar.xz 660268 BLAKE2B 4cf890f5a3281cfefee14575c5ebc3d756f69f27af00fbe806aeac27aa1f2e5643a78dc415d9d5ea3c5434c5b08266aa114cb1d844002222cdc861f133e6b7b2 SHA512 0d0350c921a85ce6682219b0d67617aac21f5e3a95f6d50869c172200db02099e10cc025439ca5a08a93b711e21a3393c5bc50bc709fb4f6a57f19266c6f469d
+DIST kdevelop-pg-qt-2.2.0.tar.xz 660284 BLAKE2B 103572038bc3c3c43eecd3ff9411e2d28aeabf60bfc0bb91c6056d05901711f2dfe03ba098c658000b1a68998644efe34cede2857b3131e2a59f4accf8cecbf2 SHA512 a34bbdbf6e99d3b004c8a1d925fa5d45d9084b1542551f71de6a79c7ef851ca7057593f09c8824ae7961072c9f5e16199d7c4d7a037174f81163f669c96970f4
 EBUILD kdevelop-pg-qt-2.1.0-r1.ebuild 517 BLAKE2B de0b12b1863ac8516a22f4f72a32451f49ea2e8d0775c5fb105112d44f4eb7f8786b87f41356f02489a727fab70977c497827d9e3232e21aac7333161f781e53 SHA512 4e9381a8e4be1a4755d14803da62644654f66b6c641eafb785bb7eecb764cae425e896e0adae07bb6fe6eb43fd981a47fe700ebb175086d2c930dbe8e9639a3b
+EBUILD kdevelop-pg-qt-2.2.0.ebuild 470 BLAKE2B b65c30aeaf8ad7d58ce081f024981dbf6c0c6d3d7d89881dc6518b74ddeb3969becb8cf90d6f7ffe30a05af42c12b8a8e17338d75e3373215033d429cd242f98 SHA512 aa44bbdba14dbc804b904509b19665d843d691dc9c2f72be0392ad380ed6a94d38b9a1f2d5b7727d5e9f77eabe834ca2df34060cd248c9a94fd90a667d718e83
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
new file mode 100644
index 000000000000..e9ebafe8d759
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="true"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
+HOMEPAGE="https://www.kdevelop.org/"
+LICENSE="LGPL-2+ LGPL-2.1+"
+IUSE=""
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 24b38ade82a4..56ad3b0e988b 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -4,7 +4,7 @@ DIST lcov-1.11.tar.gz 155906 BLAKE2B eb31119d9fa5b83a6671125c1899dbd10d26eecb0fd
 DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
 DIST lcov-1.14.tar.gz 177359 BLAKE2B 17069d38bf607217b8ff59f573fc02badf56afe65965d2a359a14835af57e2b6c512bff06fac3dbf4e94cd35701216edb8026d333b2baa8772d0ef551de37af1 SHA512 2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc
 DIST lcov-1.9.tar.gz 140035 BLAKE2B 5d432bcef695c0016f7d4bea57cd3c0caf8fda54eb4acac0f957c93bde714dc4dd221c3a9e98cff4a329fced75e658fd943d8db0c0fc4d32da15af158434287d SHA512 518f068d5eb4a805985863e7b755ae16b1b2ebb9e42cc57c5cda20a60f22e170c1e2957692086e5eeabe12ddbcf39132494aa2ea7ce33411e8abeddc759852ee
-EBUILD lcov-1.11.ebuild 574 BLAKE2B 4349f37845e48e6cd30e543557ee59b00ff18a030d3049adb7a1d47924202c9233db6c8b6831ba123cc1e3ca7093b298ae688cbfa15dab59097d4ea858d3dbd0 SHA512 a5559fb75533fa53ec54edc0262fac5582b68ca42b66b4dcb7b708e69032eb63c7fffb94af629113d50ff2598166853ed19c489ebfbddafada4fe88e0ea4f3bb
+EBUILD lcov-1.11.ebuild 570 BLAKE2B cb9e8c6a2bb8403b53b209d1b3de4f5976edc5db2839726d62b90d3774c6206b40704a91989a2ec8d6ca92472672120e07c0715a856793bad9c32ced47ab1756 SHA512 b53f801cb6260d5aff9c09326bbc6579b3c9e41ecddd6f8dd86abb662d387d585b40077693f9f8852b845ea9a57cfdde073e940dd5ca5a612cd31bb5e3806d03
 EBUILD lcov-1.13-r2.ebuild 875 BLAKE2B 498056b0e0cc168cd73b11215677eb133e275b6c43f4f7a2764cd61b404fbfdc7fae118c85a124d90439cdd1bf6ac2f417d7e06a8e417a610567e8e8e9fe1402 SHA512 0d41f7863cff19f2f2502637091a0e8c387712bac88a6a5d9a43e6c952f2860e4a5f6e81b1e8f4f56368ad9bb66f2b020538455335fc5b22622961ccf733b010
 EBUILD lcov-1.14.ebuild 825 BLAKE2B ad1c93c3934a96d2770094f84f5c80b6221e276da61a4f31051c646d04b4d91cca47ced68b2647ae9398cb8aa3717c3bdc65855b7ee09c31cc09912a15c126bd SHA512 28b0849fcd0af2961024d601f4bdeea2ca6a3810e2e574467c48185a2c9aa8064df905e1ca01625f02162fdcba206a409126265bd85e51e2a85ed3f5f5a423a1
 EBUILD lcov-1.9-r1.ebuild 591 BLAKE2B 33ef4b968b902c0b9433949ebda11cf354ffedb796d418d8e85d540082e9e7b9331eaab53de3408bf4e38ec00770bcbc16e675abc594101a8768b68e5d41dacd SHA512 43ceb5cd12d882924ad03decc31afbc0e8c620fd2cc04483ef013abbad658f7bf8682d1118761b60ae81a32f20a5f339258edfa7c7c9ffb1fb4aaf9356efac18
diff --git a/dev-util/lcov/lcov-1.11.ebuild b/dev-util/lcov/lcov-1.11.ebuild
index 83edb27798aa..cb9b990b3e67 100644
--- a/dev-util/lcov/lcov-1.11.ebuild
+++ b/dev-util/lcov/lcov-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index d8a7242c3f24..7c89bd4d62c8 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-build-tools-0.5.0.tar.xz 23392 BLAKE2B 1f28ae093af772ed2b6f75a7933b76a2c608171bf15e0c8483477d7f3b702dec79f41af70bb38863c3b17ff9d52a8f2acabd4ed2347bb7f421d2074b8767e96c SHA512 6802f3d5e3d622b136cf312ad929353aac1f42355c00ac9e3fb7a9d46c63dba1f87a0a4fd11185289c4e7222d5b0d30b8829dacd38c88de45901ff0559639e90
 DIST lxqt-build-tools-0.6.0.tar.xz 22520 BLAKE2B 99e8032e111f776708d0a84e65db6534f517e75803d2cf747618889dccc46e9d55caa0ba3c89c88d56143a69ced015df9f1eae68a34c7ea050c6f97aedcf0f33 SHA512 f95c47d40f26defa8bc4e13a0449428945c282cb5e2201610e9529bfd5154a438ee9dcc4f556bd76efe13b97533bbed2f49ab5c100225907781093094a692227
 EBUILD lxqt-build-tools-0.5.0.ebuild 503 BLAKE2B 79a8b9b8f017d64574c9b27ea37bc5d996bc7a3e9bfffce322fe63bc85690e013664dbeaf79ff2371b060f88c1bf2bb84ca2597fbf93b56b03daed8891453db2 SHA512 d95996271fa9f93b4efe8ffb16498c5431d8d83909ff271fe5783c393fe3506c89bceb997aae0f912ad325d84dcd34f53ff36c569b66dbb22ed8d7e46fc4cc3b
-EBUILD lxqt-build-tools-0.6.0.ebuild 512 BLAKE2B e6294f672a7e6b3eda41e2eceb4dfbf711561d7653021772237715a627531a6a5ae215e4f95164ac3be0f3bdf8c9698c553320ecda13ee2b1da81120829e266e SHA512 523b7f62ee39adb6548788b404914365e5c2032671040bb203d1e3296f35c17d59e976c80037ee61aacb6fb64cb34f1530f3973de16af27fb107171f0d16a0e0
+EBUILD lxqt-build-tools-0.6.0.ebuild 510 BLAKE2B 64ef5ec87839112fed95be98f0aa6c197a34f2a9dcf69af2b37c8bbac6b7b5213f4a9a57efac1306f61836e749038f5b1b0c97a73d0c37ef1cfc5d0b5794edd3 SHA512 7343c08fd1d16bb6da81c67f6c714fd5bdbb22230d1e0e80a2b2618976531ff8fe9b7cc0b09a296bbbb310cd6fa0f40c74133bc378e4fc63bd4b8ee2b36daea4
 MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
index 7cd05eadac92..93dd16cdff90 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 2ab1efed5c6f..b3f9bc8fd89b 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,5 +1,5 @@
 DIST oprofile-1.2.0.tar.gz 1533343 BLAKE2B 873433ddba11389a221ff3b6eb6b8b19748ac4989232bda7d9af698b95dedf8ecd1112dce3accab5e1b40c87287901c015eec167713b9ad11daa0a0f0e3255f9 SHA512 d642d9a8d71ad271a80d21806ffd8522613830f450a71dc531005e940f31f683936691898d381a31f8913715361db8c1713dfe3744a5f9214419349f6504717d
 DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
 EBUILD oprofile-1.2.0-r1.ebuild 1594 BLAKE2B 9a571f914951aea903761991e020fb481602e3288a4ffaf53b14c5e46fbd0eb7e071e3689faa1422446a64b3f38d4fe915c28ca275d1d087ea8737ddcef3477b SHA512 83e6b5441251e157a3334a0b0412b31dddc7b9465fc9efdcdd5af672a11ecd513197b89b7bc164da723f95916e3addf23fc155c6c10b592243aa13e1581b30d4
-EBUILD oprofile-1.3.0.ebuild 1600 BLAKE2B faabf7848b42be376a21c05d89829e6514d82cce9f618a66c9928c756c4e41bfa275e433100df28a9662472ca39f33cd951fa2be4f8ff9d0e2a091eed8f69a38 SHA512 3123c01bf2c5dfb313abdb01269a4255f7620da24a25955aec7f59d426a958a3f4fbf5160b3a3268bc499353cb5370b00a15aa1e53ff3a5781ff21641dd55a40
+EBUILD oprofile-1.3.0.ebuild 1598 BLAKE2B 16ffd972fa68d8a36061687339fad9835a8be7c611a22d29fb7dbd796d99d48e2b96a596131b2f5fed2c84140c9e257ef9f5d5222b79a04a6d3fa4a0df2e2204 SHA512 408a8c517ff63afc31c7981ff1a5b6a37edefac2b749c3a81374e70ae97f1c2f37dd10164b3abe2ad0d5a884d7fd0c9f7ace7c561a319214d1b25241a7291ab8
 MISC metadata.xml 423 BLAKE2B f94e15abeacab93798df7566bd1dc4d8e820aa57ddd71c2e5bfcf0c983bce5961a7c8bffb4f0ebdd92785002745314feece144e29000dd38f29426d2b35b8897 SHA512 01f96b806fca3e20eb84908a1cd77edbe11291be0098aff2e4d20f0fbf86ea0ef9972c7148c791bc826152a109d16903781cc2f2f367a2ac8b8fb7e5efee378a
diff --git a/dev-util/oprofile/oprofile-1.3.0.ebuild b/dev-util/oprofile/oprofile-1.3.0.ebuild
index bd943675ab3e..a47709f9e9a8 100644
--- a/dev-util/oprofile/oprofile-1.3.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="java pch"
 
 RDEPEND=">=dev-libs/popt-1.7-r1
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 04919201779f..0de6f4817210 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -4,4 +4,4 @@ AUX plan9port-freebsd-10.patch 265 BLAKE2B 0a942f899bd05d3ad671134a3277a5bf8e41b
 AUX plan9port-noexecstack.patch 984 BLAKE2B 5e7dc7b084096b3b49eda81e244dc16849fe7fb66bc17b15fcba2d35aec63067eb75dff73ea74bad02878e50353ba145ba101ade8e086434a5be2568c416df02 SHA512 160f0a793345603c4c905e65a6fa4a25b1a1c1084f0eadd4ada49ba5b6efc48b975031d14926fdfc2bd48d2e3860c987da449d9d9973038ab510f42528383da8
 DIST plan9port-e78ed7a67bbaa37dc57dfb37219f505c48755e14.tar.gz 23442851 BLAKE2B 89e2a8dcdf650cc3640ef0ba496f1c22e74831fda2e4a51cf8419c496da5a480a10324eb295369e9192defbd3c6411ea351bba1c6bdec5d72bc4ee397da58114 SHA512 3cb126eb0f8c58c76c4da5aaca6b3956b9cc30b1955c1b9db4727a01a46cae696f01b538a47f6f009e955f6ed8f308b60b6519d4184e10b255636ea32a1e9099
 EBUILD plan9port-20140306-r4.ebuild 3536 BLAKE2B 257db122e1fbd1939aa60dd640cccd5c461792dddd05fa168b6b89e4813c5089781fd6c5c4ebe45131ac25112cf86fcf459905ed379d928b5a3f3d14f30efb5f SHA512 290a3824ee3aaaa2a813f2e703b16851988126e1d7c1636552767529fb9bcbc01edf86851d6869f1000df71bb8ce8a0fa34af807810c6dd87702e6a9e711685f
-MISC metadata.xml 683 BLAKE2B 4a52db553cb90ab9472d190a70260e4d8937037008d8aec07b6b92dd336b1506a1753bec4e916b655f177fdd4efd793f645be51d1613124e6bcba570255c3273 SHA512 8d8bc34ae706ed839de9f2c1e32be135545b706208ef800d9ebde98f2f182111a91bc92c1f764c6fa6d26af8615bd528e1dfb87e0597e86d4ffce06f3a0c0b33
+MISC metadata.xml 485 BLAKE2B 562cc265d88d43f48e39421d1ee8be547b74741a6ef9fa4ac6c46ae9fe19d8f1745b71439d21a95370eae39cd0ad5b87b710be375f4141510f6510fa5a721186 SHA512 655f45ad6e519ef7d350fd5df2ad4bb77e08730d80f3da2fc4572522d162279af23e82a79df55b2952135c8348565e1d706c38b1576ec2fd7e68a422deddf068
diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml
index 1ddb5cc0124d..522c313926ce 100644
--- a/dev-util/plan9port/metadata.xml
+++ b/dev-util/plan9port/metadata.xml
@@ -1,17 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andy753421@gmail.com</email>
-	</maintainer>
-	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Plan9Port is a set of Plan 9 utilities ported to the POSIX
 		environment - also know as Plan 9 from User Space.
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 20e61abc1a15..d61d0e299828 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,12 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2018.3.4.tar.gz 310736836 BLAKE2B 2d43955b4d4299026c3fccd00c42e71b98c314d33857b1f81a84f365efde4b89d29b8c20826a3f89b6dc36fb293d867874edc75d68f5070516a27ccb68034cd2 SHA512 35b133b0db3b7fdbc4f08d0070de5aec8b3f170657c932e5c5c0af2e8c4be8b9e408558a0595794acd73e2ef5085295929b2a11013e6e72b852fead4ce572f60
-DIST pycharm-community-2018.3.5.tar.gz 311914955 BLAKE2B d4e1e2cc19a416d7f5ecc1ee181c0b6a4e29ee3577800f2426ec84a7a16f53992526b1df8e3ccd43ccbdeeb7f6521d579fad41d145ecfd24408d2d18b9b577d6 SHA512 a81c95397388b243a5b548e2b4bc54f1be3fdedd191c33a90f57a53002d90eb462d5fbc69b2fa88ccb35d8521cd1224e4491928e4c1810a2e7429a6ba6050d36
 DIST pycharm-community-2019.1.1.tar.gz 332489780 BLAKE2B 2cc7dcbab5fa321e423991622b4e7c9e41c184312a4b3c3a8b900b1ea2436d9f6009e26ffca12f3335be8bb520941c6ac6b579f3e6f2fc0f1b148a9a00ab1868 SHA512 28d7a3353bec271f0a57bea3c44fc788a5b3a5215dff737ba293c2ce73509d06b217ee1615901c91e5895d61a58a2b696c50ae760b6b3a88b472f3746f28bcbf
 DIST pycharm-community-2019.1.2.tar.gz 333983594 BLAKE2B f5dfa1986d88c7598cfbd5050c385a1b1b3374286e57fd513a94eb19bc42116b1ceef757d194ef1df66739b25f10663a74e374785b4c5584aec9b8900e67dd0c SHA512 48782960022efe48f37b2bdec0be1f15741f6dde2a2dcec686ecfb07c81996c3d6fc46cf3eda2fa4cc53a67f7ec47909e47ed57b2edbf973482ca37781067415
-DIST pycharm-community-2019.1.tar.gz 330592651 BLAKE2B 4165a1bd9cd63e70b9f982bca4324b2aa1db32bc73bf30e521ed5921eb4b03ffe98004d16600c1795cc974d5188c24a17c988c6b37a90a5d038b0492a692275a SHA512 aa411f7354c7954d22e51246349b66a13cf0544a00ee92945ceb072f3636a020b0ee812a84d49c74e2121561af4f96e9fb6f7b26f69bc473c15ed15614fd16ab
-EBUILD pycharm-community-2018.3.4.ebuild 1060 BLAKE2B 6ac3d2db2453ee6199d90e16a1cfebb303e36d85c86907ebe0c1c765b785e30e68c6d2f942e2ab9409b64688215a30b3707a2251d765d75972b921b921e57a5d SHA512 9417eb41e3ee6c142a90abe8363074023927c644c687022dea88a0aa6d35c2d771ec493abd9e0ce8e345eb8e150a969178f09c9d5bca3117a718a96d3a557bcd
-EBUILD pycharm-community-2018.3.5.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
-EBUILD pycharm-community-2019.1.1.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
+EBUILD pycharm-community-2019.1.1.ebuild 1081 BLAKE2B 67dcc04b86db58f962198ff8209e602ecfb355f59b465d343071f1ee55894561c0ec19c3e58a8512d4812f4c28f8506bf5266ecd536dc2ebfeb023228acb45b8 SHA512 f3c51c3027b8c0975ed94d3b25a2ba5d1bdd512e9d0b2236b534ad88776aeccfb4c9313bcb616eafb06bacde6d6845a5b9fa01e7998f5828141b06af23ca31d3
 EBUILD pycharm-community-2019.1.2.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
-EBUILD pycharm-community-2019.1.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2018.3.4.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.4.ebuild
deleted file mode 100644
index 4fdbcc0f9b03..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.3.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2018.3.5.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.5.ebuild
deleted file mode 100644
index 476b12dea206..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.3.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild
index 3bd1b2cb4101..92e344b69eaa 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	dev-libs/libdbusmenu
diff --git a/dev-util/pycharm-community/pycharm-community-2019.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.1.ebuild
deleted file mode 100644
index 3bd1b2cb4101..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2019.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index ff59aeaf7eb3..453a77e1c390 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,12 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2018.3.4.tar.gz 398325518 BLAKE2B 27ff339d2e8e3db0c94f7a1d8d9e1c740380f62d4b132dc37afb2e1cb4b6ccacdaf29e6caaf25aebd25e650c7a4d1a089b74b3cf1ee8d492722604b11644467a SHA512 34f2461e0af1c18364e7414fe4f92fc34b1c82e17dd2db0c46b812909febb30e9aff26c1c363072f36facb6bbd6d186497fc02b6a7916c808dded63fc7350696
-DIST pycharm-professional-2018.3.5.tar.gz 398296895 BLAKE2B 281fb2c28e556a98e90be37e82fc39d5ed3d50416f1bb519b1a9273880e952faa5a3a85eb1b90928ccb4ad45684fa9be715788ae412b74b4ac287b45bf5458a4 SHA512 2d84368d3058856024f289084d506d92711a369b79d582b9c53b6941514e3089604bac8dc9c5be0a7d15b483bd74e4e1cf2d60cb5f61e3c9755a98091003f42d
 DIST pycharm-professional-2019.1.1.tar.gz 433810320 BLAKE2B baba76f893ca92990241de495f0a00029a135b890aeca067fdb699ffc6f4e7042487ada452f7fb793731b0ec303f0e73baf2c76da8e0821edcf195c210958b74 SHA512 d4419fbef02e3c8a6c3820da56f089a5630ac2c94dc701854f0ea03a5797f7489db6613a8426cf89a4c6c5259b44d589846b04e36051e44641845a32d81b368e
 DIST pycharm-professional-2019.1.2.tar.gz 436256239 BLAKE2B 3253c74b7308dbef8dfd78fbb525af104d11d5ea4c66c48882685dc40011258a6f9d912a9402818f219c7c968cda61e4723544607b71a1a5e7ee0e1bf743ae86 SHA512 ee7bcf292f780ed2fe12c432b546eb470b2f556337e2b9c22905797f5f99899a2b5d80bee032cac45427f5480f8f2b3512e32cd4d1a0b6ae6b355f8dd0674b51
-DIST pycharm-professional-2019.1.tar.gz 431555873 BLAKE2B c222d81a342055111455b749100392b17409c998d539bb3d64d4d51d155df07062f05057194c79da9ccaf00888e0238731f94651fbae8e92d11ae6fd8e5d3f6d SHA512 20b60f9c97cf3e8b31534c79775a2cff4a9a1281faa75cc7eb236f860a315b0c1d232356b648778499ebc5ab49cc737911a7e1d316d6f375d865ee9e5042b7f3
-EBUILD pycharm-professional-2018.3.4.ebuild 1203 BLAKE2B ca69d0047d4998c0ce5143b86187f1c04d879857ab738c45783ba8f315ab2434ec659e6400be6265c4983eaf653d9053396c6378e832c45229a431c5085cb2b2 SHA512 c02ed49d3a9616261b0fe5d0868aecb5e5439ee8d5789f7ed1c5c6e4ac33100e957b11b1e674aa2fbefbc61939bd7f466c6ff478dcfe8c7a9a7985bc08fb1d60
-EBUILD pycharm-professional-2018.3.5.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
-EBUILD pycharm-professional-2019.1.1.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
+EBUILD pycharm-professional-2019.1.1.ebuild 1225 BLAKE2B bffb2416b7700db9acedd379c865121ee37ca5c7452fa64968f8aed6351646d904e0d3e148ca66381f02e3fdb0892e7b9401c59df24813a29c15d7bd95f8ef49 SHA512 d040e96a09e91f41db9ada5372166721831b03ddb6068f45ee068c6ad5613a818487cd4274986ff4003624641a6c5634301b6e1f9b38641ffee05c75cf7a086e
 EBUILD pycharm-professional-2019.1.2.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
-EBUILD pycharm-professional-2019.1.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.3.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.4.ebuild
deleted file mode 100644
index 994b2eb0c059..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2018.3.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.3.5.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.5.ebuild
deleted file mode 100644
index 4b028da13f8f..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2018.3.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild
index 9196130c9fd9..0f418726afde 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	dev-libs/libdbusmenu
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.1.ebuild
deleted file mode 100644
index 9196130c9fd9..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index b73141ac3584..422d9d9a8e8d 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -14,5 +14,5 @@ DIST scons-3.0.5.gh.tar.gz 5510846 BLAKE2B 64489a9335a9aa0e2b58a78c6bba613de41d7
 DIST scons-3.0.5.tar.gz 655236 BLAKE2B 1ccd35e393b3307e0be830c2a5491712cba59fe476dfd9c461567288eb76a42e10ca1552ce7603facb66caf5c0b82583c563bd2342b9d7c68c8cabbd0317467b SHA512 0477038b014674049f12899b64584d44a85283d521b2422561e42020a5ae296a5af005684087c3ff410ed3fcbdcc5ff61998bc429eb29513f2a864138ffc4945
 EBUILD scons-2.5.1.ebuild 1591 BLAKE2B 5a370c069a841b45cb9d7ec214c66312f5b3f9febcb953fd466662c5e70b866a1f48c70adacc7d9a43f11bcb8c07cb7d18a7f3dde80843460812742d982b108a SHA512 a08e399a4b43143f13b13d4731e839039dbc1b53482078b990d67f06c65a481f4eca889616fb5fccbc9fccd6c1703f307af5b8a010466039ec149eca5c7fa309
 EBUILD scons-3.0.4.ebuild 2115 BLAKE2B 87f1ed75b61212eb76233c2f3b91903a9e40c8214d164a0b2c72a86d32c80cfea76681176b333738ba577c4c73edd0d1474e1e10125caa85ddd19c070351b850 SHA512 71fe9496eebdf581b1b4ae793da2a3987ac900dfb50f62bf7e68bb1a3cc1f3539f4d226222e7b541be87fd661a0afb981c6ca65cb6c3e73c9ac34eba6294ec21
-EBUILD scons-3.0.5.ebuild 2090 BLAKE2B 341713fffa258fa6f2c41716499236e77f3dec1c74e03754599192965461a7736e2e7070cdd053d083eaae823231b20820b71b1e337e2a75d528925a1420d6d7 SHA512 da0183be00184c9cdce3827119a7255903d802cc85211faac699d02c976ef88388907cb4d08542f28faaa8c4967f25fa8bbf34fe8d98eea4e68d026026616a5a
+EBUILD scons-3.0.5.ebuild 2115 BLAKE2B 59f3a9d6965e521187b66ea8a60161f264b657fd17823cdecb44332be27c39cbe4384ee4643295fea081123db5636c97933661ca8fdb6a691fa989a513e0d67a SHA512 3d9c7beed9941b897add393e5a7868d0034b88ce75f8f4d8fa070338f70994bbc7d0919451a1d2d4ec50aec0adeb609c7925f90cab98ddf31aec0f231de5711a
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.0.5.ebuild b/dev-util/scons/scons-3.0.5.ebuild
index b3f2cb4c7ca7..833c091b6892 100644
--- a/dev-util/scons/scons-3.0.5.ebuild
+++ b/dev-util/scons/scons-3.0.5.ebuild
@@ -18,9 +18,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
-RESTRICT="!test? ( test )"
+# unresolved & unpredictable test failures
+RESTRICT="test"
 
 S=${WORKDIR}/${P}/src
 
diff --git a/dev-util/splint/Manifest b/dev-util/splint/Manifest
index 466cac9189dc..2d662c92cbd7 100644
--- a/dev-util/splint/Manifest
+++ b/dev-util/splint/Manifest
@@ -1,5 +1,5 @@
 AUX splint-3.1.2-musl.patch 232 BLAKE2B 1d802cba805a993ccec83b2beeefba3f7971fe31d4c20f03082538aa47ff3614fa8c270a6011c21745c85ad9325884d7447446dcc415995909bcedf1fcf10f9d SHA512 4e74cd5181848c3babf3a6d6687eb6d274be1549f26b7817b2c3fa4c0cee048c841d71a28931ae4db21c0c67154cff536218e7ace6d6e5ba4c7eccb7a800790f
 DIST splint-3.1.2.src.tgz 2284033 BLAKE2B b071092ddb82be76734e00cdc8f96b697c20d0beaeba921b74464ac0b1f727c396f8f15845cf8c6c20011186e4da00199411545e0e167fcb9ce4ef2b27efa975 SHA512 9bbf3f6575763c022940efde947f845f52095a1bcf645f7f4a98feb335b62d2bd50d78420e7fe95f81eb139b110d8fe48112b025deace45f7994360b20d47e0b
 EBUILD splint-3.1.2-r1.ebuild 1001 BLAKE2B c96b4fdeeba281d26aa346a77bfa091934421215add9b6c81a93cc820f3ae16c5a20e023774e38b88e81a888a7dc5ee1c0e33626f4ae93537505866f93b937ae SHA512 8e4f2feb30a17f713410328823e9c44af8bf7ca2df44fc1504314cebffad44e1395c1e2ad185f24ea846456b79278ded4cfd8f799f2defebaa2061edfb53533b
-EBUILD splint-3.1.2-r2.ebuild 1100 BLAKE2B 8db7b89182b5fe3da9f13eabdbf555495d1dd32a6a437d9437a8f4c12c45cb1e4a4776bda3fd09f84fe589837d0077002f3835cf4cb42540a5dd36b69a09f6ca SHA512 68e3fc629c36c6a686dec98b3ae30d2afa68a77d5a8ec70de11206f7a23247e669151a189801cc041adb456117da5b70086c117cb38cc99529a59ba6ec6eb28f
+EBUILD splint-3.1.2-r2.ebuild 1104 BLAKE2B 34018ff5595437b51568457c6432c556a34cf4b3b18ccc2e10e487d594e7f743bd7971ccbb60172772570d77b16f42fb53e6a69e42384117dd354d336fa48f2b SHA512 a1c3235f37727e8edc66b23ea6527996b5074adc9492b54b095583a37ae094d988064e8583ba38665c386a6029f956c0f737b8d782cef80a94d18097a024f77d
 MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
diff --git a/dev-util/splint/splint-3.1.2-r2.ebuild b/dev-util/splint/splint-3.1.2-r2.ebuild
index 1549f142bdb8..81adbc54f739 100644
--- a/dev-util/splint/splint-3.1.2-r2.ebuild
+++ b/dev-util/splint/splint-3.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="
 	sys-devel/flex
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 286473607365..863745553eee 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,8 +1,10 @@
 DIST strace-4.25.tar.xz 1425268 BLAKE2B 896685589686864316940b8493e481f5e37d1c2f536551f79193bc851d66614816abbc989dbff2b18e38f5bff535315ca732221d520f282227b74a4eab3ebb4f SHA512 1465ef5ebc77cee73ebae5e12c72ff1826f48cdb2b36bdd5116380fac3add73f3ede3ca2694358bfb0c3e3141be5b747b353749130a366c81d05709b2d7bb879
 DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
 DIST strace-5.0.tar.xz 1468752 BLAKE2B 3626697ec340728f2703cd5d8a4e8f274184a6b8ef76b1d239ba7a2ec8c76d7dd7e47e6cde6f5edc8e14ae0322e82a6425fb8586d0f1aba709c4d2208a503027 SHA512 cba3280ada27ef434eda54d0e150f04ab89ad227d67b29bd0993f9ac7747eb32b0e49af8cc493b92eab99c0848ec8dc6bbd9b1db423abd53f19129dacbddf265
+DIST strace-5.1.tar.xz 1493868 BLAKE2B 1a513fbcb30a61af60013c779a6ca8c842aa20a6f359c29cf16bd5357dd26428855ebb8b097c137f8351d87b776d9674c7e41fb2789185439b70fd6d50c904e9 SHA512 dfbfa97650f0c42d088a3c5ff9715a05a31e579742fb2874c225b6e3c26b0d49c2427489080e971ee2cabb0fe744ff2464b3524c5adae0b3d5843583018de074
 EBUILD strace-4.25.ebuild 2288 BLAKE2B e39d94b807ba5ce91458dda8447ae2b755a5a61b0ad651632e7fde3c755dfe7c0737815f6f40a9cd13e0aeffae1fa55c386a0ff9326d25440f04be487f4d7d02 SHA512 8af2410ba171659feb8495c769c7143d29a1c4c39fa1a3de04c4be9b712663089edfb1c3d811a0fd8d2b039e88cc7f71c73155e46c04a1873ff0072bf829a8f2
-EBUILD strace-4.26.ebuild 2301 BLAKE2B e082ebd9683bda40d46e8438ca7d6d3dd533ca5db8882e3e301b2073795bd1067037cf052e434ca002d7f80d0c7c174a67fbd30bf2e9763e3ba2eb88bad68bb5 SHA512 14afc5fc20b55812801485d2cfedc9c49c9b5a8e3855ef08b1bbd7b799f05dd2b35d6714ec9d2af4d5ffbe740bc7f359add9df4d66af2f745809f4ed06a2f2fa
+EBUILD strace-4.26.ebuild 2293 BLAKE2B 68ec49fb0499e9e5d5808e8df8f7319a170a4d4f1a36ad9d4659f9ac8094215899229a0074989a52608d14d603758cdd5f470a5179f7aacfc94e7e3de41a31d2 SHA512 cd5163668b4e6e85299500534fb495b6198c3def1c1783452154da9201c631d80955ed033610699a39d44f184eb9677f7b66bd8025d7593ec6f5603b94f905d3
 EBUILD strace-5.0.ebuild 2314 BLAKE2B a099080ebbf5d84e4020c46af52fda1e81a05ab1510bb5ffb5985089a4a9b33e4154ccd1a1950112855f1d3ee3f51c4300c008b9dac10ea2436e41f0182f0ea7 SHA512 f3cda33c84b3ee265499de412b8215bfea4003444b34926de59cfd71d5e75ea71f4d47ad9ffebc862d977e01c71d014c73d88a1c3f8d18a6b78f32b41717a8d8
-EBUILD strace-9999.ebuild 2307 BLAKE2B 8d6eda425278182da95dbef8e55bcb7c589453e564fe265bc8ebae9363eae0d9bb1e38fdabc8767b4a561f1a58584603b3debe904e0ecbbf3a8ea6744f375223 SHA512 b4875ea4ad145e2591c6078ed660c9acf7cdeb938b2a2b9301158c6a8f77e830820f30bd07e2603271544fe565a73926de93f139fc0dbddab9473dcbdc05ae98
+EBUILD strace-5.1.ebuild 2336 BLAKE2B 476de457dfad9302e5e62b76aae7ecb463074b81f265aaaca03b990241a6d8773b20418ed9aaf00476adea083c2ba7418cf4ce9a9f8ab284a5c393e8f3a6bb6d SHA512 05db005186222d939bd1692b992aa43d74f138458c05d11af5ab8840ebf785f1400e0d59b713e37421d3124306bf47a7d2cf3f783a72d91c7688d9cb6b325f2b
+EBUILD strace-9999.ebuild 2336 BLAKE2B 476de457dfad9302e5e62b76aae7ecb463074b81f265aaaca03b990241a6d8773b20418ed9aaf00476adea083c2ba7418cf4ce9a9f8ab284a5c393e8f3a6bb6d SHA512 05db005186222d939bd1692b992aa43d74f138458c05d11af5ab8840ebf785f1400e0d59b713e37421d3124306bf47a7d2cf3f783a72d91c7688d9cb6b325f2b
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-4.26.ebuild b/dev-util/strace/strace-4.26.ebuild
index e0e68ced9e54..716f82575b30 100644
--- a/dev-util/strace/strace-4.26.ebuild
+++ b/dev-util/strace/strace-4.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/strace/strace-5.1.ebuild b/dev-util/strace/strace-5.1.ebuild
new file mode 100644
index 000000000000..db378889c0d5
--- /dev/null
+++ b/dev-util/strace/strace-5.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static unwind elfutils"
+
+REQUIRED_USE="?? ( unwind elfutils )"
+
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
+	use static && append-ldflags -static -pthread
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	# Stub out the -k test since it's known to be flaky. #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	# Don't require mpers support on non-multilib systems. #649560
+	local myeconfargs=(
+		--enable-mpers=check
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/strace-graph || die
+	fi
+	dodoc CREDITS
+}
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index e4f979cf0519..db378889c0d5 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
@@ -78,7 +78,7 @@ src_configure() {
 }
 
 src_test() {
-	if has usersandbox $FEATURES ; then
+	if has usersandbox ${FEATURES} ; then
 		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
 		return 0
 	fi
@@ -88,6 +88,8 @@ src_test() {
 
 src_install() {
 	default
-	use perl || rm "${ED%/}"/usr/bin/strace-graph
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/strace-graph || die
+	fi
 	dodoc CREDITS
 }
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index f3a9142be8fd..04faedf739c7 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,4 +1,4 @@
-AUX sysdig-0.24.2-kernel-5.0.0.patch 1181 BLAKE2B 4d58160740ef2751947148850253add6962049ca7e9036854f9f1800addb9d81a05c815f93a294a418568edf55200aa0f782633cdee4bf9e161b5278e31360c2 SHA512 ff0c365de5213c68ea4cae153d949f97e7abe72c632d5142f06d46b159305076396637723e09b7ce361c7778a60b2c583b02ed8f45fa39c4b5a1989c4b0e3b8e
-DIST sysdig-0.24.2.tar.gz 855317 BLAKE2B d394ac3bd7e405664da2b45d8cfd5d3433e20266a9489f63b7d4c3bb955a60640d13bb33e6dd2057b16b6ce0617afab88cad2ceab58aa50f6b43a64f6a50f45b SHA512 10ec381144733abc2c386f6570d4245ac2c1eec64d0f56800963acbd9cc38eece504f836f1ab0e24224ff44233945c8273b72efc77d7eadce98d7c4fc378740b
-EBUILD sysdig-0.24.2.ebuild 2070 BLAKE2B 2dbed3d36ddad0c6ba3646440cc2614f458a71aa7893e9495c632796a9173c0fbe82844def70689aece395d2f3826ae9da277c73328d29458cb19e1486a15885 SHA512 0972247a9975339c162c7fde71f4e0ff7811be67665f6e8fb89658327aec179c89564fd223e493a1e3b936cd070e9dfff6cf3d543633b3ab5b805ffb1a60a204
+AUX sysdig-0.26.0-build-fixes.patch 1545 BLAKE2B f182cf721180ee624deeefafff54a48fc4e5024cff00e26f178960d9f7a3d7e8a481dee028fe1dac789f77ec8ba772cc5da82c4d0ebc388f1aa711824d42a2d1 SHA512 2d34ab81da7d3a07e9c7116dc1d25e6db93b5faf2be2a4fe1710efba43293892255591284bc1d2c39953c4cf73ebcacb73b5626cc2d649a0505e351165c9b8d7
+DIST sysdig-0.26.1.tar.gz 892441 BLAKE2B 38302458c54a10719fadaf5e5bb6d29931a262550eaf44350543e99cd33e6a90889d81f49096d2f57fcc903bc9245a1f782b438a48613f9fc9f90273c46f0f39 SHA512 817573dd2945e20094c548a481205d7ae700e8242a12c75bcab41c52330fb6f508214d71f3d3ba4ecc86576e555c8c2a0c155921d61d29a5861bbf982600f6fb
+EBUILD sysdig-0.26.1.ebuild 1998 BLAKE2B 52ae3ad4e180a6640c613d6d5adba3e11d0485e7ee235f79eeadd19291e1291927fb6666c66555b0239d9015de9c56dcbca5f9a922a37422d155dd88e48f5097 SHA512 e6299a6be79367693680df3f2a5bc2555731ffad9dba8c333a1a4553120705a62be74127f0163c41343bf8b63d74c73d6b895a173812c57df394b64f1941368a
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch b/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch
deleted file mode 100644
index 711eb182751e..000000000000
--- a/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2c8f0263382bf64800faec5fba5cc3e005d9fb1e Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Thu, 31 Jan 2019 10:54:00 +0000
-Subject: [PATCH] Update for change to access_ok in Linux 5.0
-
-Linux 5.0 removed the 1st argument 'type' from the access_ok macro.
-Update the ppm_access_ok() macro to cater for this change for Linux
-5.0
-
-Bug: https://github.com/draios/sysdig/issues/1299
-sysdig-CLA-1.0-signed-off-by: Colin Ian King <colin.king@canonical.com>
-
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
----
- driver/ppm_events.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/driver/ppm_events.c b/driver/ppm_events.c
-index 717590888..cc3eb98d2 100644
---- a/driver/ppm_events.c
-+++ b/driver/ppm_events.c
-@@ -46,7 +46,11 @@ or GPL2.txt for full copies of the license.
- #ifdef access_ok_noprefault
- #define ppm_access_ok access_ok_noprefault
- #else
--#define ppm_access_ok access_ok
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
-+#define ppm_access_ok(type, addr, size)	access_ok(type, addr, size)
-+#else
-+#define ppm_access_ok(type, addr, size)	access_ok(addr, size)
-+#endif
- #endif
- 
- extern bool g_tracers_enabled;
diff --git a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
new file mode 100644
index 000000000000..8e0dfd606a16
--- /dev/null
+++ b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
@@ -0,0 +1,52 @@
+diff --git a/userspace/libscap/scap_fds.c b/userspace/libscap/scap_fds.c
+index 452353a6..6eb7cd16 100644
+--- a/userspace/libscap/scap_fds.c
++++ b/userspace/libscap/scap_fds.c
+@@ -49,6 +49,7 @@ limitations under the License.
+ #include <errno.h>
+ #include <netinet/tcp.h>
+ #if defined(__linux__)
++#include <sys/sysmacros.h>
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
+ //#include <linux/sock_diag.h>
+diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
+index bc851319..ec454de7 100644
+--- a/userspace/libsinsp/CMakeLists.txt
++++ b/userspace/libsinsp/CMakeLists.txt
+@@ -145,7 +145,9 @@ add_library(sinsp STATIC ${SINSP_SOURCES})
+ 
+ target_link_libraries(sinsp 
+ 	scap
+-	"${JSONCPP_LIB}")
++	"${CURL_LIBRARIES}"
++	"${JSONCPP_LIB}"
++	"${TBB_LIB}")
+ 
+ if(USE_BUNDLED_LUAJIT)
+ 	add_dependencies(sinsp luajit)
+@@ -157,13 +159,12 @@ if(NOT WIN32)
+ 	endif()
+ 	if(USE_BUNDLED_CURL)
+ 		add_dependencies(sinsp curl)
+-		target_link_libraries(sinsp
+-			"${CURL_LIBRARIES}")
+ 	endif()
+ 	if(USE_BUNDLED_TBB)
+ 		add_dependencies(sinsp tbb)
+-		target_link_libraries(sinsp
+-			"${TBB_LIB}")
++	endif()
++	if(USE_BUNDLED_GRPC)
++		add_dependencies(sinsp grpc)
+ 	endif()
+ 
+ 	if(NOT APPLE)
+@@ -177,7 +178,6 @@ if(NOT WIN32)
+ 				COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto
+ 				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ 
+-		add_dependencies(sinsp grpc)
+ 		target_link_libraries(sinsp
+ 			"${GRPCPP_LIB}"
+ 			"${GRPC_LIB}"
diff --git a/dev-util/sysdig/sysdig-0.24.2.ebuild b/dev-util/sysdig/sysdig-0.24.2.ebuild
deleted file mode 100644
index abc1676d9a6a..000000000000
--- a/dev-util/sysdig/sysdig-0.24.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0
-	modules? ( || ( MIT GPL-2 ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-cpp/tbb:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	local PATCHES=(
-		# compatibility with kernel 5.0.0
-		# https://bugs.gentoo.org/680084
-		"${FILESDIR}"/sysdig-0.24.2-kernel-5.0.0.patch
-	)
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.26.1.ebuild b/dev-util/sysdig/sysdig-0.26.1.ebuild
new file mode 100644
index 000000000000..a6c3bad4d48f
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.26.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE=modules
+inherit linux-mod bash-completion-r1 cmake-utils
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://www.sysdig.org/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0
+	modules? ( || ( MIT GPL-2 ) )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +modules"
+
+RDEPEND="
+	app-misc/jq:0=
+	dev-cpp/tbb:0=
+	dev-lang/luajit:2=
+	>=dev-libs/jsoncpp-0.6_pre:0=
+	dev-libs/libb64:0=
+	dev-libs/protobuf:0=
+	net-dns/c-ares:0=
+	net-libs/grpc:0=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:0=
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	net-misc/curl:0="
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/os-headers"
+
+# needed for the kernel module
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+pkg_pretend() {
+	linux-mod_pkg_setup
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	eapply "${FILESDIR}"/sysdig-0.26.0-build-fixes.patch
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod for that
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+	)
+
+	cmake-utils_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+	BUILD_TARGETS="all"
+
+	if use modules; then
+		cmake-utils_src_make configure_driver
+
+		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	linux-mod_src_install
+
+	# remove sources
+	rm -r "${ED}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 23d2ca9013eb..28d3ac294c0e 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 5ff30d5a2886..1d1b009452fb 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -14,6 +14,6 @@ EBUILD darcs-2.10.1.ebuild 4718 BLAKE2B 0f818eeaa81699cf527ea3d9178055eb6459af41
 EBUILD darcs-2.10.3-r1.ebuild 4808 BLAKE2B 18cde1ea42d8e9b5337a54cebc3c28f5db6268f6d6f7ad5c2502fd3eb43f446e65c0ebc42add5fee7f746a38015a6222839874afa824e56d853ea494b3ed5ba2 SHA512 7591fca5a971792ead68bcc5ed0e60e7bd5dab9c88910fa76d286c3b4db08117e1a288b2518621a4834522f6089307bed7628c709aafd1929e81d3f28b2cc3a0
 EBUILD darcs-2.12.0.ebuild 4848 BLAKE2B 0d383975d11f05a84f92c1d979c022dd4782d6580e3afa8ad8488c2df4a4baa27e0603981fcdd6a56b0862447aed13fa2e7bfa44eb9869b6ebf9e0ecfe5f200c SHA512 b33bd6342fc307ebbf7fe6ee4494afcf06cd6a13ae5355269728e0bda5cd2779c877cdf8795b308aa838d5095bfe406d098a86ffef217ad943601ef2d872fdaf
 EBUILD darcs-2.12.4.ebuild 4485 BLAKE2B 97b418af61478c458081a634448b4cd4457fbd29ebd52fc8d844924e3f095f598a85d7c7afeb3ff7c7e394b9969d2caafcf3d90d1e2208ad632b0796104af0b9 SHA512 01cf2fbbbc9d72093cd7e5dc00ed120e7a7c24e0e94746dc8a3daeaac7c699ba28c61d7b1459198e35789e37ec302dfd0378e9093857ed6eca6075159d977dd9
-EBUILD darcs-2.12.5.ebuild 4539 BLAKE2B 21e9618f2a46848d5613c430a8de8edbf10559d57003776dcda4fe444bf2782d80edfbeecd3b355b6fec2d1e767bb94a4662f6a0ef8b36cd9ffb96d90bbe3724 SHA512 14224e9130171d617552257bdaf0c6f0b6918bfcedc84047202726eb377e7bf92ac0e6468d63d7db3b1526af09d381dbf1d84a2b575bc08a379bc5f30cb6059d
+EBUILD darcs-2.12.5.ebuild 4560 BLAKE2B e8c04c5d25a21a6984fcd6ef115bf74630c31847660740b1a81d29bc05a8a8ee22b3804326a74b8df90dad7292617d607b52991255423eac63677ed0acf01c6b SHA512 b5eff6df3f8f19e712c95de99583982f3293ab644e5ab06ca0bf04922d2c90e1c0b65fede1b50e2055129675db46522192950541222e1cbbca04309d5562e3e1
 EBUILD darcs-2.8.4-r6.ebuild 4727 BLAKE2B a29e103c6a5bb7695f150516ec7259b88a63b68ad5eb48adeb0b606c409d68987c98522cecfd8bdf29f96dc1f82abc4298e3a86800c5b58167941de62ff725d9 SHA512 9f866150888280f6b12ccc6f714a04f6789cc84d34ed982e84d365abb5a3e6c97dfcc981141675ea7ed45bf1a8f5940fd9abc138c1dce6ecaaa8faf99a8606ec
 MISC metadata.xml 593 BLAKE2B c4ab655306f001cc3fe3007152e25d32d97fd3a87db76051c6c75b1d53c2c6ebd2105b2674bea5872e678b577c3cca737a3bbf6fe89923bc4f780ea2dc8642fc SHA512 cab7d36edce3f7da1742ebf086f69468f2745cb58fae83e74fa3e6016f4a7285aaa57100fed17df47940a51029ea78892147b7fe86ef2e456b7e34cc34a421bd
diff --git a/dev-vcs/darcs/darcs-2.12.5.ebuild b/dev-vcs/darcs/darcs-2.12.5.ebuild
index df94ced13860..8a94f1a19057 100644
--- a/dev-vcs/darcs/darcs-2.12.5.ebuild
+++ b/dev-vcs/darcs/darcs-2.12.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+curl +network-uri +terminfo +threaded"
 
 RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?]
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index da535d4fe71f..e80caa6744ae 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,6 +1,6 @@
 DIST git-lfs-2.5.2.tar.gz 947150 BLAKE2B 08949f14d6292689a00ba693123373b7317a96165fcbd8bf560e81a7e1d03a1ac809cc5273efecce85f017d576107c5e651f2f30331130ecf154c9799394d590 SHA512 58475f833e0ef69d37ece91f3792b43f2a589cce94d1eba22a0534aa40257b236f9f9aab633c8b800bec129eb86fbc38e9ab6b5e52144595a27cd13bee5cb33e
 DIST git-lfs-2.6.1.tar.gz 1630301 BLAKE2B c88ee2110fac8d46567b348c9473e3c5d9e4b763b8f03437e2121388f588109f62ea9145e239a619688150acd871c486309dc3a2bc6d046d6c25a0c43c607ebb SHA512 1f45d8da4f67d37e85b061c219423863ed41ed4723dd1030e7287e422d84cd615ddd820765bd32a147264c0f4bf9d5e84185970442fd110ae9656be97de78663
 EBUILD git-lfs-2.5.2.ebuild 815 BLAKE2B 7598fa75771f1294d39de2557b972b48d2abb97db24077ada954cafff45c088cea4a5c6a5e418a95801e5ac12c049aaef2cd168e8d68758246e97d1e54b79ebe SHA512 3a24bd2d5dc65727069e5ec49984fe4db4de86092a4a8653c0437ed9b1886692894cecdf05b81ea980dcf3f62b3e0b8868697f3e7b07d24e228aa8f02a0bc3aa
-EBUILD git-lfs-2.6.1.ebuild 812 BLAKE2B 4a791d6abb3cab3dddcbd756c75a058ec1428d2b9d29fa6c713c59d8827ebf7eaaca36b0f26756ea7e10d783702dfb3eb9ceb8f887ebc4f2d6c62cb5ab861b86 SHA512 f4aee33d8df9ae3c19b33d6337f9bd891ac6822b990ec873af7da0f269715760c8f83497bd81095ceee0a015733206acb395445bdf422271c9f5f2c54b18b523
+EBUILD git-lfs-2.6.1.ebuild 811 BLAKE2B 3487db8ed7c7c7f78ea475a74ddb7ad547333d91f52589bbbb5c21c6f5d6b09a3e79fe5b9b998d123e847f9498c93cf6b66985a8cbab1c9c37a9e91ef5e75a82 SHA512 256e2b58e8740bf56583acc96e49375d53d4eff017139d86a826186a935403df536b4130907d037018e65c4f601d766b787678ea860ec3c47e1ad999d5c05f12
 EBUILD git-lfs-9999.ebuild 814 BLAKE2B cf8f2f87805383310a9bf7d8fafbb3ac528ea6cc11403833023bcff0704d20b9f31f6c465e87077bff99a4592b9a8760c0136c40326c39101dfef2fbd54a2bb2 SHA512 668a206862c0d6efc69bd4cf7361c530b2e266c9187c960e36e51569b2db1170528d97a7cc4a9fa68af09b92f6c15e0388f71ba562ce52dda9a20a621e7964c6
 MISC metadata.xml 331 BLAKE2B ec49bde06277ccbdacd3b6c50e0e32c5b14464ad015e1a7a57446e905d0ed9b3b0b71650a455a3b77c5e0ac2530874f37327b1fef3c924577b08c1e1c815c201 SHA512 51f68466f5396fe0326aab5f3a5fa70761647d722d02339fd6072d21976dfd27fdafa1ee44680be98dd0c1b80b29801eb7ed1508aa850104bed564c5f1a38011
diff --git a/dev-vcs/git-lfs/git-lfs-2.6.1.ebuild b/dev-vcs/git-lfs/git-lfs-2.6.1.ebuild
index ed1c9a5d2cb1..d80a68a5c75d 100644
--- a/dev-vcs/git-lfs/git-lfs-2.6.1.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.6.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit golang-build golang-vcs
 else
 	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	inherit golang-build golang-vcs-snapshot
 fi
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index a2fc07d46d04..f447e26a06b8 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -15,21 +15,21 @@ AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d697
 DIST git-2.19.2.tar.xz 5235608 BLAKE2B ece292b8cf41deafc63c00e6176b0de39936f7d840d776192f32c1e293abc06c39119d13ed947d3de6a212fa6973bedb288c06f8bfcfc8144e563d5af40e45da SHA512 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96
 DIST git-2.20.1.tar.xz 5359872 BLAKE2B f7eb640f179837687b2b343d8a3a03d7d0fa60ca17e28dc5637a75800752d0e02be4c535dc4c3be6f25020aa419f22aa6855c641b06c61ebf45e0c51de069262 SHA512 3f05ea3a645d4d74c7380b03e2de39f893ff77a05d8b595ce30300d1d4e032f11d84952366096f8effd5fba18dfa5ebb946bc07a984eb7cbbda113cb88202f6c
 DIST git-2.21.0.tar.xz 5491296 BLAKE2B c5e66f4d4045f99bb4306e8f096ae9299908383df78bdf2a954cd415f4778eb59ea0ee7d501689313617de7dc1d2ee4ae15ab70dee564add5de877109073ddff SHA512 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973
-DIST git-2.22.0.rc1.tar.xz 5556340 BLAKE2B 8c38e15e429391156c2c4c45da51f793d820bfabb89d98b2c04f5b287e3edca8bcfa2af5fba27e19ec07f1ccbde2e5e404c57650ce5b0593ab0198fb541bb80b SHA512 c3d878f7b5b4c4d67d4c8f20ab07a54c2bb4c2646feedc4a670e28849bb544177ab7aab6458bc982774c954b6c05b8e83acf3b9c5eeecccb34776cac16cfe1e1
+DIST git-2.22.0.rc2.tar.xz 5556836 BLAKE2B 24914ba911d169aef54cee4e1ccfaa7a086f2138c485e1158322ab2bc34087f3ed30dd3d1b57da4e2135b9876820874568f94efdbf0ff2f06dcafa7bcef1d99c SHA512 7222181a478a1d7306732e2404cf0569ed2545864cc059c9a48760cd5b7c85d44ff2d2a38b5c40e4aaf5eae51b822272b3865c8b0e0116888116a66a125d9f6f
 DIST git-htmldocs-2.19.2.tar.xz 1223848 BLAKE2B 6f30192cb101988fdfcce3bb79c684c6d1ac08cdc929caa049102fba10277fa8cc908904fe7472e40d60707c1b23145d95c441c1401c8697c37a81456d79aab8 SHA512 830e780beea10bde750d09a335fd9986c5ffbf47a724cbbeed5a1a2c94bc81d9c9223e415c5888faf81ab6404e460565434988f6635312039b88282a46014634
 DIST git-htmldocs-2.20.1.tar.xz 1227884 BLAKE2B 2e3b5e888d187cc7563a36d9b0c43118fbc50ddf9ca65a98319f563ff226e1f9829d578f578619e04d9576eae95631188973484aa758a9706a7a08261e0a16ad SHA512 aae04a8a42865a855d699d445d2fbed657aecce8d090a36e171c6cf260175102fe2314142f3b59d200460560b413698fb263e77cadae49171bff50b96edb6d63
 DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380dbf3ca72526067b3a86ed0865e37351c4fac1f0c7e845e7b0c27a1d955c64622f10c999389446b53191acdc05a44647847 SHA512 4537b3f67d03050e5daefaa6f274d3acdf6e116dc8c7f76566b33100e76a445c3e3894b5ff63b5ddb024e1c691a3bf08acea42dbec681da1b0f1de2e5736c9c4
-DIST git-htmldocs-2.22.0.rc1.tar.xz 1262076 BLAKE2B 8de3c767d178a638aaaf257db7e3612746eb79273317b5e53b0c2c359005f758acc47c7722e5481faf6d53056054831d8c027d1e2698a9b4e79d4e22bf9da9d4 SHA512 60c17024aefc0f32a4cb5d028174f93fda35502ca46f84f5ea48eca49c3186948592525420f9c80eacc3bf89d34746a7e76cf0c680962c18643035a27ca0cbde
+DIST git-htmldocs-2.22.0.rc2.tar.xz 1262116 BLAKE2B f40895b6debb400554325679e66225d2db83110914ebac86dba086722a6fc17306d42e6aed0d90876607cc1f5e2b516c1940cdc4cc2e021c685a12abce4a674a SHA512 d2887b3d51c69333b6214350b2660b7eff51986b666684cc728ec1d23a2f6da197c9d5e518480ef3fb19e3cbee59cd836c333ac690831f025a161a93f325d0b1
 DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1
 DIST git-manpages-2.20.1.tar.xz 439172 BLAKE2B c1c7a3031d600e53451ff2c35b00a541dfc09554b47567c4bfa8410d891dbd98c2ff28cbff5deff21e74c1c92eaa70777013e23bae6a484ba1690bbefc1740fa SHA512 43ab28063b896062727ced8aa64119daebef261c5b393cec112fe9872955a165abc3d91f75f6e273d60b15f3c49eba44dfc7591ede452cfee8362f7d5f39c5f7
 DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30
-DIST git-manpages-2.22.0.rc1.tar.xz 443212 BLAKE2B ea5b83efae9dab4955c52c1a14b4ac2c13b851ec4e72cc2998dd5c3a808fdb1fb332e108e99aa26bbf822f21b1bc9ca4f8e0a221d2979eb0e8340900b5f2c4ba SHA512 ad94dcbb373d7d43d2e9b843c2fff6dc05969563c164e18044ca7eca35d0be021ef79a117f5b430e0baff614b1357bab68ecaed59a75ae7963ad6af16ebbdc3e
+DIST git-manpages-2.22.0.rc2.tar.xz 443240 BLAKE2B d88eb577f93e87f9ed890575e2c995befb115d060fbe6fd8832c28b0fb3efeee9ba55095a3201207866103cdad80499448c81b4e41274cc678749cfd1316a38a SHA512 1db498bee26739e94f8fb201f583c9b0d64bdd8af7135285ca31c7423aeb1e55dad580ab8f23f40ff2b1e1d1e0462fff596ee0adad0a61b73a799f8bfeb93b78
 EBUILD git-2.19.2.ebuild 19013 BLAKE2B 5ac67e85648aeaca6ccf506c0348b7d21509c7f9a463309a5657f2f4dcdf1136c65559c6b8aa3159fb2b91c39d5dc4af35755bb32498645ec554e769bedf72cf SHA512 99bfefa79aa4b00a0dbcfcb944efb6dcc5fdbfa5927c6b6d84ce03a1410f206e753f1a62c4ca960b3b016081b37c30280436cbf4028caf18ea27c454bb9b0dac
 EBUILD git-2.20.1.ebuild 19026 BLAKE2B d5a503c9590d6bf2381bed1925e2776717a57b6a0ae78ecc493a26345813b10a149dfd929cb9d0a3761fd386b57dfd0ba6cb24e57e6c8248124cc64f384628e2 SHA512 75c7bc502304e1b3950ddc4b0780d926eefcce807cdfbfedea1d9c301a2acff0d60f4d021d98d4a00ddfa89db935cd1fb2400aa9bb7067ebded929867c14c950
 EBUILD git-2.21.0-r1.ebuild 19102 BLAKE2B 3c101dab3ff22f21a0570f8d1db432c77e09e8237d0d6059e408fb87b38b1ada2b9a24076094fb1081c81e5ceb0465b661e5a77bbdec212a9d6b118fb45b9740 SHA512 14451c205814c6cd433b8ebdb976b38004c61ef870f7f415e795a3a34c43971a284ac98e33e128d02f46de591fd391c97e0a5e655df3ca342c9859cb00edfff3
 EBUILD git-2.21.0-r2.ebuild 19240 BLAKE2B f1c59f3d68e71be8bdf97a86b52ac43ed5b39ce5ee970f3637d0a38843f2ad0bf826330242676a54f713fe36dfd3bbfbc6cde2af353b032acbc3c52dac2e4f10 SHA512 93cbf694e504a6bf02339ca38221ce26ef82ff55f4d9a860aec4f2a3b6c3415c84bd633e60c8caa7cd9be10ac57af360f70a900329eeb1a41e6072aa5e760a57
 EBUILD git-2.21.0.ebuild 19070 BLAKE2B fb5bca963913d9994c90e553cb27ae70596e180ed97d029adf38ae01ed27f48b19b52607df31b93b0485bcdbcac433d5b935e580230b2986a1ecf4af30c3d92e SHA512 f071bca6a089fb96ea19615d4919c5e52538bcdb92251b85741fe6d61d4fce3ea5892f040058c90d3ea89805630f1725f5d0795086a713ffa323a1212ac3406a
-EBUILD git-2.22.0_rc1.ebuild 19249 BLAKE2B 0e1fc584d9a7dd2afd4510e91cb5b5f433db48e716ea40480e4d1814e73378ec31cef7909ead21e3eea7277bd24514c10d042711e263cd7dfed64cb0ec2d6042 SHA512 ea7ae2a61281b8315d3adbff7e4c0d17bea660dad637b3ab362b1052de82d994a952c43fad49273ca04927345cc97833257396365bbfffad1e66d183687088f0
+EBUILD git-2.22.0_rc2.ebuild 19249 BLAKE2B 0e1fc584d9a7dd2afd4510e91cb5b5f433db48e716ea40480e4d1814e73378ec31cef7909ead21e3eea7277bd24514c10d042711e263cd7dfed64cb0ec2d6042 SHA512 ea7ae2a61281b8315d3adbff7e4c0d17bea660dad637b3ab362b1052de82d994a952c43fad49273ca04927345cc97833257396365bbfffad1e66d183687088f0
 EBUILD git-9999-r1.ebuild 19157 BLAKE2B 9db762ff5fc8c5be76bb4a5c6af3655f25782a5bbe9e348a398e15f5936117e573694d30710903334445938e3c6892c79fa1487aef2a037f4adb610601205c0a SHA512 d2a4c881e19cafb5b88c9dbc6eabe32a35150dff41470da4b9eec38aeb1c270f69b4196688f5ec96d6fef86c84227422c2cd89e4d8dfe1562ec0ec5046170f29
 EBUILD git-9999-r2.ebuild 19157 BLAKE2B 9db762ff5fc8c5be76bb4a5c6af3655f25782a5bbe9e348a398e15f5936117e573694d30710903334445938e3c6892c79fa1487aef2a037f4adb610601205c0a SHA512 d2a4c881e19cafb5b88c9dbc6eabe32a35150dff41470da4b9eec38aeb1c270f69b4196688f5ec96d6fef86c84227422c2cd89e4d8dfe1562ec0ec5046170f29
 EBUILD git-9999-r3.ebuild 19157 BLAKE2B 9db762ff5fc8c5be76bb4a5c6af3655f25782a5bbe9e348a398e15f5936117e573694d30710903334445938e3c6892c79fa1487aef2a037f4adb610601205c0a SHA512 d2a4c881e19cafb5b88c9dbc6eabe32a35150dff41470da4b9eec38aeb1c270f69b4196688f5ec96d6fef86c84227422c2cd89e4d8dfe1562ec0ec5046170f29
diff --git a/dev-vcs/git/git-2.22.0_rc1.ebuild b/dev-vcs/git/git-2.22.0_rc2.ebuild
index 64663fba9b78..64663fba9b78 100644
--- a/dev-vcs/git/git-2.22.0_rc1.ebuild
+++ b/dev-vcs/git/git-2.22.0_rc2.ebuild
diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest
index c1c8d9c0e8a0..319d023fdae7 100644
--- a/dev-vcs/hg-evolve/Manifest
+++ b/dev-vcs/hg-evolve/Manifest
@@ -1,5 +1,3 @@
-DIST hg-evolve-8.3.3.tar.gz 733641 BLAKE2B a2dff8061df3fbb31389be06bcba68d69b56bbb0037ce0dcb98c9d2852f060811fb72155a004161ebe7e4be0fc232fc356938629e24943c87649bd11a9f12e60 SHA512 bdd301c44156a38e6f4a216d4813acc9a85de3358172b42ed74107117811c40333d1676f1380667ca060815d5004e81629588691d969b31f75a8a93e16745973
-DIST hg-evolve-8.4.0.tar.gz 738359 BLAKE2B f7334bfa55e303c1e557f0e7aef4b9f23998d3f99f6ca74892cad9d77fb443a4a5cde69a4479e8a2eac866c49220640756f428001c1257d7f8527418fea27361 SHA512 fa3769ff6d884c5733024d5e8f4474c41b72ad811f4176216f60834cec65d831e78b78ebf15568113953da691c4075b1cf136e0f3531aab90b1afdf5e638b5e1
-EBUILD hg-evolve-8.3.3.ebuild 749 BLAKE2B 169226b35c8bd4a7c061b51b85b309b8fbf67fcf7977d1a9d22f7c66d28c448a4388d753f9c7876cd49acecd5b626a2d1918573917b90d9e386e3f537d93f171 SHA512 76922991a5290ab3bc524ffbc28e57cadcb76d709b0a55d6b0d83ce9606609e4d1447afa5b997903b261336f10dad7def6a7bd5a133effd590773250a44fdc79
-EBUILD hg-evolve-8.4.0.ebuild 749 BLAKE2B 3d42920b21837708f764dbe4e012e11938c722802a22724bac8931c3e671b07ff389a9f8c920b555c27daa830b47bcab20e0aac3b037e83d9006775d21434b42 SHA512 f3b40e73c9ba525e53707ed0df74c9a3566b6ce5dcf986b16d67350a69664773019c27955343e261ad4bb28335a8ecaf6b00ca310a5d2bce590e3c7d34bcf127
+DIST hg-evolve-8.5.1.tar.gz 755965 BLAKE2B c9d6ea06f91cc537e1ea9266a09cded59e3dfb69f0bb5300a40b971bda6f9ce680c81978c23806972ca88931d9f2d67eedce14ba1f56670fa3c18194b63e2999 SHA512 7c5d9608d03ab81fc7291edb3f0ddb016cd4b267997bf66fcb221c9c917fbd34bfb4637bbb0c60b460a32304ee45fd7e30db929312dfbaa94df17baf7947482e
+EBUILD hg-evolve-8.5.1.ebuild 749 BLAKE2B 3d42920b21837708f764dbe4e012e11938c722802a22724bac8931c3e671b07ff389a9f8c920b555c27daa830b47bcab20e0aac3b037e83d9006775d21434b42 SHA512 f3b40e73c9ba525e53707ed0df74c9a3566b6ce5dcf986b16d67350a69664773019c27955343e261ad4bb28335a8ecaf6b00ca310a5d2bce590e3c7d34bcf127
 MISC metadata.xml 323 BLAKE2B 960bd09bae7474d94c2d986fe304708d0bf4f4bbd6deed930a539d521f20bdd6664934ac2999dab925fabd9ab4e298a343405d976a8bb6865e6be8aed7eb11d2 SHA512 92404b3c82702ad0876850c003dddf1dcb01cb03e4b573cd0e04dc276db0a89adbc5f83f8fcab0ff5e7bfaf767080d8b41a2916aeeed6e7f70afab477a67c63a
diff --git a/dev-vcs/hg-evolve/hg-evolve-8.3.3.ebuild b/dev-vcs/hg-evolve/hg-evolve-8.3.3.ebuild
deleted file mode 100644
index 018094011080..000000000000
--- a/dev-vcs/hg-evolve/hg-evolve-8.3.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="enables the changeset evolution feature of Mercurial"
-HOMEPAGE="https://www.mercurial-scm.org/doc/evolution/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-vcs/mercurial-4.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-python_prepare_all() {
-	rm hgext3rd/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dodoc -r html/
-	fi
-}
diff --git a/dev-vcs/hg-evolve/hg-evolve-8.4.0.ebuild b/dev-vcs/hg-evolve/hg-evolve-8.5.1.ebuild
index a89ef7e4eea3..a89ef7e4eea3 100644
--- a/dev-vcs/hg-evolve/hg-evolve-8.4.0.ebuild
+++ b/dev-vcs/hg-evolve/hg-evolve-8.5.1.ebuild
diff --git a/dev-vcs/svneverever/Manifest b/dev-vcs/svneverever/Manifest
index 8e69bbe2b2f7..cdf8040da9df 100644
--- a/dev-vcs/svneverever/Manifest
+++ b/dev-vcs/svneverever/Manifest
@@ -1,3 +1,5 @@
 DIST svneverever-1.3.0.tar.gz 6006 BLAKE2B ab5b280f5aaba0cbe25cbbf1223930d4dff9f272666ede8845338bea77da6079de9b49be2c9efd346045be5a6af7a9a372365b577df27b0815a57179ce2e050f SHA512 dfc5f8e96808d95ce387b2c0d2ea34c4cae81851dc5813b05eeec719ae7cbfb69ff33f38a88429b1caab2873af676072ce3d76592d8fac5dd186f18454bade10
+DIST svneverever-1.3.1.tar.gz 6178 BLAKE2B 971f723f54972c1679980ba291a933e20e607bec4846f44354da3b45984faa7792e5cd8bb612c6f92a9d48c78dfc954a90da367e33c9e857fd5495c03b8ae53c SHA512 d2aaccc48c96fea6dcac77e4f61d80feb83a272440f6ac906af3cf01455494c4f09c9cf64b60ead63151137f2b9baa5b672bb5d1c43e20adb0de8608ca8a249f
 EBUILD svneverever-1.3.0.ebuild 489 BLAKE2B 87bcd9744c8c27a66e9d98564767c435f6cf305014f6c080a94db6ef3b4574da243ea8964ace318bc22ffda0fb02f1ca4793b1f9744399ba65e6b91d90a25cbb SHA512 79dfb6ecc90d24bf9e57c365572c8eff27eb8beed9518530aa349e4e94b74f3f4a7f82490cae3717c3686321c24bb151d8b97e72f62107eb7b2c60eade057ad4
+EBUILD svneverever-1.3.1.ebuild 487 BLAKE2B a365066d33c6530889221220dde1b1cb9acf7c5c3a1bb5d99739ece77b823c31f4c533549af1b06d5cd6449027898928c534f5b9da0f6437ee9cfa3374ca6532 SHA512 a93689749c4753163e93bec2d368f16ddb93ec3f4e0064813cbd1f43a757f4a586634c46b67af87465d3b5b166e80b7c3d41f803bc760b238d880b2247e8297f
 MISC metadata.xml 334 BLAKE2B 8d3ce38a8ae3289ed55ea0daa72adcbfa8ea7cfaea7bbae2f7afded9c79cf3d41658ccc0bdc324db4640e73f3fd902be86bec29927f73582d860f697564a9f6d SHA512 d50e4630b891664dd365e38a57ed146acdcca6d645994d010b58b46b70adb77c3bad5f0ab5088302dd8f21adb33e8b478ac31426dd8bfcf94b1f82fe2613b446
diff --git a/dev-vcs/svneverever/svneverever-1.3.1.ebuild b/dev-vcs/svneverever/svneverever-1.3.1.ebuild
new file mode 100644
index 000000000000..daf9629664d7
--- /dev/null
+++ b/dev-vcs/svneverever/svneverever-1.3.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Tool collecting path entries across SVN history"
+HOMEPAGE="https://github.com/hartwork/svneverever"
+SRC_URI="https://github.com/hartwork/svneverever/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/pysvn[${PYTHON_USEDEP}]"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 30097b73516e..cd43b545c745 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 6303e3e6c499..1b2b5d3e8b60 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -656,8 +656,8 @@ if [[ ${ETYPE} == sources ]]; then
 					${DEBLOB_CHECK_URI}
 				)"
 		elif kernel_is lt 4 14; then
-			# We have no way to deblob older kernels, so just mark them as
-			# tainted with non-libre materials.
+			# Deblobbing is not available, so just mark kernels older
+			# than 4.14 as tainted with non-libre materials.
 			LICENSE+=" linux-firmware"
 		fi
 	fi
@@ -1227,7 +1227,7 @@ unipatch() {
 			UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
 			debug-print "genpatches tarball: $tarball"
 
-	        local GCC_MAJOR_VER=$(gcc-major-version)
+			local GCC_MAJOR_VER=$(gcc-major-version)
 			local GCC_MINOR_VER=$(gcc-minor-version)
 
 			# optimization patch for gcc < 8.X and kernel > 4.13
diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass
index ca10e742f1b1..d61effb5e9c6 100644
--- a/eclass/llvm.eclass
+++ b/eclass/llvm.eclass
@@ -6,7 +6,7 @@
 # Michał Górny <mgorny@gentoo.org>
 # @AUTHOR:
 # Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Utility functions to build against slotted LLVM
 # @DESCRIPTION:
 # The llvm.eclass provides utility functions that can be used to build
@@ -17,20 +17,21 @@
 # a proper dependency string yourself to guarantee that appropriate
 # version of LLVM is installed.
 #
-# Example use for a package supporting LLVM 3.8 to 5:
+# Example use for a package supporting LLVM 5 to 7:
 # @CODE
 # inherit cmake-utils llvm
 #
 # RDEPEND="
-#	<sys-devel/llvm-6_rc:=
+#	<sys-devel/llvm-8:=
 #	|| (
+#		sys-devel/llvm:7
+#		sys-devel/llvm:6
 #		sys-devel/llvm:5
-#		sys-devel/llvm:4
-#		>=sys-devel/llvm-3.8:0
 #	)
 # "
+# DEPEND=${RDEPEND}
 #
-# LLVM_MAX_SLOT=5
+# LLVM_MAX_SLOT=7
 #
 # # only if you need to define one explicitly
 # pkg_setup() {
@@ -46,11 +47,12 @@
 # # note: do not use := on both clang and llvm, it can match different
 # # slots then. clang pulls llvm in, so we can skip the latter.
 # RDEPEND="
-#	>=sys-devel/clang-4:=[llvm_targets_AMDGPU(+)]
+#	>=sys-devel/clang-6:=[llvm_targets_AMDGPU(+)]
 # "
+# DEPEND=${RDEPEND}
 #
 # llvm_check_deps() {
-#	has_version "sys-devel/clang:${LLVM_SLOT}[llvm_targets_AMDGPU(+)]"
+#	has_version -d "sys-devel/clang:${LLVM_SLOT}[llvm_targets_AMDGPU(+)]"
 # }
 # @CODE
 
@@ -58,7 +60,7 @@ case "${EAPI:-0}" in
 	0|1|2|3|4|5)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	6)
+	6|7)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -82,11 +84,19 @@ if [[ ! ${_LLVM_ECLASS} ]]; then
 declare -g -r _LLVM_KNOWN_SLOTS=( 9 8 7 6 5 4 )
 
 # @FUNCTION: get_llvm_prefix
-# @USAGE: [<max_slot>]
+# @USAGE: [-b|-d] [<max_slot>]
 # @DESCRIPTION:
 # Find the newest LLVM install that is acceptable for the package,
 # and print an absolute path to it.
 #
+# If -b is specified, the checks are performed relative to BROOT,
+# and BROOT-path is returned.  This is appropriate when your package
+# calls llvm-config executable.  -b is supported since EAPI 7.
+#
+# If -d is specified, the checks are performed relative to ESYSROOT,
+# and ESYSROOT-path is returned.  This is appropriate when your package
+# uses CMake find_package(LLVM).  -d is the default.
+#
 # If <max_slot> is specified, then only LLVM versions that are not newer
 # than <max_slot> will be considered. Otherwise, all LLVM versions would
 # be considered acceptable. The function does not support specifying
@@ -103,6 +113,37 @@ declare -g -r _LLVM_KNOWN_SLOTS=( 9 8 7 6 5 4 )
 get_llvm_prefix() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local hv_switch=-d
+	while [[ ${1} == -* ]]; do
+		case ${1} in
+			-b|-d) hv_switch=${1};;
+			*) break;;
+		esac
+		shift
+	done
+
+	local prefix=
+	if [[ ${EAPI} != 6 ]]; then
+		case ${hv_switch} in
+			-b)
+				prefix=${BROOT}
+				;;
+			-d)
+				prefix=${ESYSROOT}
+				;;
+		esac
+	else
+		case ${hv_switch} in
+			-b)
+				die "${FUNCNAME} -b is not supported in EAPI ${EAPI}"
+				;;
+			-d)
+				prefix=${EPREFIX}
+				hv_switch=
+				;;
+		esac
+	fi
+
 	local max_slot=${1}
 	local slot
 	for slot in "${_LLVM_KNOWN_SLOTS[@]}"; do
@@ -120,10 +161,10 @@ get_llvm_prefix() {
 			llvm_check_deps || continue
 		else
 			# check if LLVM package is installed
-			has_version "sys-devel/llvm:${slot}" || continue
+			has_version ${hv_switch} "sys-devel/llvm:${slot}" || continue
 		fi
 
-		echo "${EPREFIX}/usr/lib/llvm/${slot}"
+		echo "${prefix}/usr/lib/llvm/${slot}"
 		return
 	done
 
@@ -134,8 +175,8 @@ get_llvm_prefix() {
 
 	# fallback to :0
 	# assume it's always <= 4 (the lower max_slot allowed)
-	if has_version "sys-devel/llvm:0"; then
-		echo "${EPREFIX}/usr"
+	if has_version ${hv_switch} "sys-devel/llvm:0"; then
+		echo "${prefix}/usr"
 		return
 	fi
 
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 65b09932a7ac..b9562376b868 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -41,7 +41,7 @@ esac
 
 if [[ -z ${_MESON_ECLASS} ]]; then
 
-inherit ninja-utils python-utils-r1 toolchain-funcs
+inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs
 
 fi
 
@@ -78,6 +78,12 @@ fi
 # Optional meson arguments as Bash array; this should be defined before
 # calling meson_src_configure.
 
+# @VARIABLE: emesontestargs
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Optional meson test arguments as Bash array; this should be defined before
+# calling meson_src_test.
+
 
 read -d '' __MESON_ARRAY_PARSER <<"EOF"
 import shlex
@@ -246,12 +252,27 @@ meson_src_compile() {
 }
 
 # @FUNCTION: meson_src_test
+# @USAGE: [extra meson test arguments]
 # @DESCRIPTION:
 # This is the meson_src_test function.
 meson_src_test() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	eninja -C "${BUILD_DIR}" test
+	local mesontestargs=(
+		--verbose
+		-C "${BUILD_DIR}"
+		)
+	[[ -n ${NINJAOPTS} || -n ${MAKEOPTS} ]] &&
+		mesontestargs+=(
+			--num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})"
+			)
+
+	# Append additional arguments from ebuild
+	mesontestargs+=("${emesontestargs[@]}")
+
+	set -- meson test "${mesontestargs[@]}" "$@"
+	echo "$@" >&2
+	"$@" || die "tests failed"
 }
 
 # @FUNCTION: meson_src_install
diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
index efc9a83d84f1..b844a3591c8a 100644
--- a/eclass/mozcoreconf-v6.eclass
+++ b/eclass/mozcoreconf-v6.eclass
@@ -196,7 +196,7 @@ mozconfig_init() {
 	fi
 
 	# Strip optimization so it does not end up in compile string
-	filter-flags '-O*'
+	filter-flags '-O* -ggdb3'
 
 	# Strip over-aggressive CFLAGS
 	use custom-cflags || strip-flags
diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass
index b76604b1af24..ce8b6e3a992d 100644
--- a/eclass/postgres.eclass
+++ b/eclass/postgres.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 inherit user
@@ -27,7 +27,7 @@ esac
 # @DESCRIPTION:
 # List of versions to reverse sort POSTGRES_COMPAT slots
 
-_POSTGRES_ALL_VERSIONS=( 12 11 10 9.6 9.5 9.4 9.3 9.2 )
+_POSTGRES_ALL_VERSIONS=( 13 12 11 10 9.6 9.5 9.4 9.3 9.2 )
 
 
 
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 613af912b93a..d4f4678eed07 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -166,9 +166,9 @@ qt5-build_src_prepare() {
 			-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)"
 
 		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
-		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
+		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s|)| \
 			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
-			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
+			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \
 			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
 			configure || die "sed failed (respect env for qmake build)"
 		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index f3b7ab9a568c..6a559842f07f 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: rust-toolchain.eclass
 # @MAINTAINER:
 # Rust Project <rust@gentoo.org>
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: helps map gentoo arches to rust ABIs
 # @DESCRIPTION:
 # This eclass contains a src_unpack default phase function, and
diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
index 1e9ac6c80b4d..c4a0ccdc8fa0 100644
--- a/eclass/savedconfig.eclass
+++ b/eclass/savedconfig.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: savedconfig.eclass
@@ -33,6 +33,11 @@ inherit portability
 
 IUSE="savedconfig"
 
+case ${EAPI} in
+	[4-7]) ;;
+	*) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
+
 # @FUNCTION: save_config
 # @USAGE: <config files to save>
 # @DESCRIPTION:
@@ -46,19 +51,16 @@ save_config() {
 	fi
 	[[ $# -eq 0 ]] && die "Usage: save_config <files>"
 
-	# Be lazy in our EAPI compat
-	: ${ED:=${D}}
-
 	local dest="/etc/portage/savedconfig/${CATEGORY}"
 	if [[ $# -eq 1 && -f $1 ]] ; then
 		# Just one file, so have the ${PF} be that config file
 		dodir "${dest}"
-		cp "$@" "${ED}/${dest}/${PF}" || die "failed to save $*"
+		cp "$@" "${ED%/}/${dest}/${PF}" || die "failed to save $*"
 	else
 		# A dir, or multiple files, so have the ${PF} be a dir
 		# with all the saved stuff below it
 		dodir "${dest}/${PF}"
-		treecopy "$@" "${ED}/${dest}/${PF}" || die "failed to save $*"
+		treecopy "$@" "${ED%/}/${dest}/${PF}" || die "failed to save $*"
 	fi
 
 	elog "Your configuration for ${CATEGORY}/${PF} has been saved in "
@@ -99,7 +101,7 @@ restore_config() {
 	use savedconfig || return
 
 	local found check configfile
-	local base=${PORTAGE_CONFIGROOT}/etc/portage/savedconfig
+	local base=${PORTAGE_CONFIGROOT%/}/etc/portage/savedconfig
 	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
 		configfile=${base}/${CTARGET}/${check}
 		[[ -r ${configfile} ]] || configfile=${base}/${CHOST}/${check}
@@ -143,10 +145,7 @@ savedconfig_pkg_postinst() {
 	# are worse :/.
 
 	if use savedconfig ; then
-		# Be lazy in our EAPI compat
-		: ${EROOT:=${ROOT}}
-
-		find "${EROOT}/etc/portage/savedconfig/${CATEGORY}/${PF}" \
+		find "${EROOT%/}/etc/portage/savedconfig/${CATEGORY}/${PF}" \
 			-exec touch {} + 2>/dev/null
 	fi
 }
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 9df8ecf69bea..3d997fb65819 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1112,6 +1112,9 @@ toolchain_src_configure() {
 	*-elf|*-eabi)
 		confgcc+=( --with-newlib )
 		;;
+	*-musl*)
+		confgcc+=( --enable-__cxa_atexit )
+		;;
 	*-gnu*)
 		confgcc+=(
 			--enable-__cxa_atexit
@@ -1210,6 +1213,10 @@ toolchain_src_configure() {
 		is-flagq -mfloat-gprs=double && confgcc+=( --enable-e500-double )
 		[[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc+=( --enable-e500-double )
 		;;
+	riscv)
+		# Add --with-abi flags to set default ABI
+		confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) )
+		;;
 	esac
 
 	# if the target can do biarch (-m32/-m64), enable it.  overhead should
@@ -1637,6 +1644,7 @@ gcc-abi-map() {
 	local map=()
 	case ${CTARGET} in
 	mips*)   map=("o32 32" "n32 n32" "n64 64") ;;
+	riscv*)  map=("lp64d lp64d" "lp64 lp64") ;;
 	x86_64*) map=("amd64 m64" "x86 m32" "x32 mx32") ;;
 	esac
 
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 78fc85af5a9c..ecf35b29f87f 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/descent3/Manifest b/games-action/descent3/Manifest
index d9c208619dfa..958be74c77f7 100644
--- a/games-action/descent3/Manifest
+++ b/games-action/descent3/Manifest
@@ -1,4 +1,4 @@
 DIST descent3-1.4.0a-x86.run 2736956 BLAKE2B 23ea2042404308ff6d9b1b3fca688b1b59c9a774017ed0ca0a1e95166c698a41f7453addf6af043bb5faed8866ce590692dc8c708de01fb5464b0c456863c50e SHA512 e6c5d6a678c46374c5d5d40589d40906378fd17ebb658778a2d052a71cd069877a43eb83b344b41473fe443e886c3b07283ea9de908df4ab8584638670114ecc
 DIST descent3-1.4.0b-x86.run 4504631 BLAKE2B e6e807b8e1bc511a612a7b217ec9b86bb75cebfee3b30f636f7b668a651c09e61b13679d332e92708e8adc926033c4abe9b270e0357673d4026f934f31287de2 SHA512 912afcf51a2f4f8cacb231e318d4837c64b2f762109244c083760b5e580298d4166fea0878ee2d344b841c788d673896a09d0052ebea59dead637d834e826db3
-EBUILD descent3-1.4.0b-r2.ebuild 2648 BLAKE2B 081a45cb4d741de3d086fda9f32425d3e14385ec5c2ac96e8608a41cf35d6fef6e9c696c9f51329d2ef1a38f8d0012f6ce2a379f2639634dcec1954f0e340a1d SHA512 3c7aff0955aeac46ae72f89b993b78922a5450dce9f5d7270a42461c32cefef4795b48eddcae13405d4f35c71fd27adecfc922dfedfdff2a2773f0c364f37566
+EBUILD descent3-1.4.0b-r2.ebuild 2660 BLAKE2B f2fb0f3d955a9d867747892d9897e757f066c400230c1fc4f7d437f401ce890052196809ebd0426ae61b588962fba92a940a0e39fcb2eaa045bc58cf80dcf1ae SHA512 874f2c6a6009302badfc428a3a4f8909a513bab9a798e2ccf178ef97c0c1cb6001d2913de6b23deccabe25eefbc481ae932a46d3cd1d467396966a7c68ad2b7c
 MISC metadata.xml 625 BLAKE2B 5fd68ba049724b77f21760b68d7a2a755dbf7b8caa159d629cd19bac4c7500b02a867bd999d87cafa96f2895ab068c1ae37890021f2de1be52a377dde4f4ac20 SHA512 a72428b67ed26503112a398643a53230dd80f0b48a0ffa53a4ade00647302147aa042acc91cc6b49fef0d23efeafef2e33d4caea4bb845de7f6d08e8c943d71c
diff --git a/games-action/descent3/descent3-1.4.0b-r2.ebuild b/games-action/descent3/descent3-1.4.0b-r2.ebuild
index d663b28ab8f5..44a13d1b0af9 100644
--- a/games-action/descent3/descent3-1.4.0b-r2.ebuild
+++ b/games-action/descent3/descent3-1.4.0b-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://lokigames/${PN}/${PN}-1.4.0a-x86.run
 LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
+RESTRICT="strip mirror bindist"
 
 RDEPEND="sys-libs/glibc
 	media-libs/libsdl[abi_x86_32(-)]
diff --git a/games-action/fakk2/Manifest b/games-action/fakk2/Manifest
index e626e8c64035..e1e9386cce54 100644
--- a/games-action/fakk2/Manifest
+++ b/games-action/fakk2/Manifest
@@ -1,2 +1,2 @@
-EBUILD fakk2-1.02-r1.ebuild 1662 BLAKE2B a5f89834da712fbc95fbce9934a08b51c806937042e0d8df372427e6a24293455c7335bc1b3f354ce0140630b5ce2086904032c718a60c924e699137755727ea SHA512 60f1588dec82c4bfce2c02ed0ee8668d32aeaacee540084611f2b85aec46c1964cfb3d73e604b6bc7ee2187ddd6c3ec5a8cc0b4ed1921aee42f14181f9a336c8
+EBUILD fakk2-1.02-r1.ebuild 1667 BLAKE2B 9f4592d26f217af0e858c4cd0c164cdd7d8cac625fed15b0ab35a5decc1f9e14846d697b062f4dd0e00dcb118bae2a29f17918cd97fc87dec3f220e96c22367a SHA512 4023c429060f6272e790cd15493aeed264153637f709c88c21ec1c6786ca4829d7014d48e449641b1fabe51e7ab13a0a4cc306485c6bc943a4c978b05f2843d2
 MISC metadata.xml 1206 BLAKE2B a3c0be20590459e2401b791c4c1211f7155d4e76f34757ad180c9626729f431ee77a00a30b25076cef69705e64cd54ca581d147132f2c8323b9053013255d5a8 SHA512 786927f7a429e4ff1f1097144f41b832b7d8bd8fd1423dd5587d3c496a2ed4be66aa34702e360c702f536429ceed38082475529392c5e0ef389aa431d2595432
diff --git a/games-action/fakk2/fakk2-1.02-r1.ebuild b/games-action/fakk2/fakk2-1.02-r1.ebuild
index b038c25d14ee..f7e669e552d3 100644
--- a/games-action/fakk2/fakk2-1.02-r1.ebuild
+++ b/games-action/fakk2/fakk2-1.02-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="nocd"
-RESTRICT="strip"
+RESTRICT="strip bindist"
 
 RDEPEND="virtual/opengl"
 
diff --git a/games-action/guacamelee/Manifest b/games-action/guacamelee/Manifest
new file mode 100644
index 000000000000..20dc9bf8c3f9
--- /dev/null
+++ b/games-action/guacamelee/Manifest
@@ -0,0 +1,3 @@
+DIST Guacamelee_linux_1393037377.sh 552784497 BLAKE2B 1f36e1a6b65bcf774d0f4e15b37d8eda3ec91691c7e3c556f73e903559c3215f3611fdbec284259fe7690037cf4ab8e338c1caa7faea80c8ce98d02581b0de4b SHA512 e52c4099e15f20df6512c3c9617cbf29f5ea428c117a0520ce57bacf99b7d33ace6a04c811fd9ced63b7ba11a3a79549b93f83fd18e42ca9a1366aeb4114cd87
+EBUILD guacamelee-20140222.ebuild 1437 BLAKE2B a8827fd9d360d18dd8d755637e818a0bbc96632384218f39fb4247ed63e6179dc070b0b54bf28258772b101e192f40080181e846624a06adb8ecbc2fafa5ed43 SHA512 a03ce27e2ddad28782b8685fb0f7c5d2904086cfde78d433bbbacedba6237055e52b1adb3b62b583771c8fba00f1ae4b7467df20e35fd3aacdc5051bb4699160
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/guacamelee/guacamelee-20140222.ebuild b/games-action/guacamelee/guacamelee-20140222.ebuild
new file mode 100644
index 000000000000..4774a553e4eb
--- /dev/null
+++ b/games-action/guacamelee/guacamelee-20140222.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker xdg-utils
+
+DESCRIPTION="A Metroidvania-style action-platformer set in a magical Mexican-inspired world"
+HOMEPAGE="http://guacamelee.com"
+SRC_URI="Guacamelee_linux_1393037377.sh"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+RDEPEND="
+	media-libs/libsdl2[abi_x86_32,joystick,opengl,sound,threads,video]
+	virtual/opengl[abi_x86_32]
+"
+
+S="${WORKDIR}/data"
+
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR}/*"
+
+pkg_nofetch() {
+	einfo "This package requires the Guacamelee! Gold Edition file included in"
+	einfo "Humble Indie Bundle 11. If you have it then please move"
+	einfo "${SRC_URI} to your distfiles directory. If you"
+	einfo "missed it then the game is also available to buy from GOG but the"
+	einfo "package will need adapting first. Please contact the Gentoo Games team"
+	einfo "if you bought it from GOG."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	exeinto "${DIR}"
+	newexe x86/game-bin ${PN}
+	dosym "${DIR}"/${PN} /usr/bin/${PN}
+
+	insinto "${DIR}"
+	doins -r noarch/{*.dat*,media/}
+
+	exeinto "${DIR}/lib32"
+	doexe x86/lib32/libfmod*.so
+
+	dodoc noarch/README.linux
+
+	newicon -s 512 noarch/Guacamelee.png ${PN}.png
+	make_desktop_entry ${PN} "Guacamelee"
+}
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }
diff --git a/games-action/guacamelee/metadata.xml b/games-action/guacamelee/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-action/guacamelee/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-action/heretic2-demo/Manifest b/games-action/heretic2-demo/Manifest
index 3ad7013042ab..8ff3dfbf218b 100644
--- a/games-action/heretic2-demo/Manifest
+++ b/games-action/heretic2-demo/Manifest
@@ -1,3 +1,3 @@
 DIST heretic2-demo.run 55065564 BLAKE2B d4d2e3383a14633d215f4cc7c979dc737e56a743998f10b36d0b9cbc3787df86cc0943802ce700e2123791f9d44cea9fd37d891b7c0562dbca1a4264e3eb48cc SHA512 62aba7b4569b76bf9a01864652da7be8e268ad3cad4eb5b986b7e84adbd88e826799d021b141f9a7a1135520e440de4ce2e57c5be6ceaa85dc08295d5e3ad30e
-EBUILD heretic2-demo-1.06a.ebuild 1352 BLAKE2B 27e78bca84c57cfe8ccb7fe99dc4780aaefdf38521f243d67dabf7ed76b3aece0844e8abfaaf550eb98fe2491cfe73abf446628062bb761477bd4faeaaf1f8fe SHA512 facfe4e8cca8e8d0d25db13459b9c1e2c145f0fe58e8ebdf0469b208d59a442bfefb74752cd67ebfc90236403f38abbb61329af952768b7768d9e6ba07af11b7
+EBUILD heretic2-demo-1.06a.ebuild 1364 BLAKE2B 43b9ce781e8061f23dfc100f5f797d503626ecba192fd122e3bac15ed5d0ccfa140ee5600e8aad2a991141f6350a487bea045fcf2ddab72eba2649164ffbf932 SHA512 365da399424fc1b05ed7960e2cbf8179092f6441a2095960b68250fe3111bc78bedfe8867a0e93597871a54613134b85b184dff92d92d8757b806fe39ff568fc
 MISC metadata.xml 710 BLAKE2B 2b9f13c1ebed41739b7700016440fbc43cb798906a68cd6c6c105218db4681863ebf1d711534967abed200c4e6ff2c5f42963b01fb33b63a6a1e6311e9f76c4a SHA512 3d5b818e953410bd3b51926173604c85ea1d74d6433e5ea52866153fa9da7d4627cd18adc844e10fa54cba1d156b505dca9364b22f6fe7d2d792127fa65b4586
diff --git a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
index 0db2fab52331..13ff487e694d 100644
--- a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
+++ b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="strip"
+RESTRICT="strip mirror bindist"
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
 
 DEPEND="games-util/loki_patch"
diff --git a/games-action/heretic2/Manifest b/games-action/heretic2/Manifest
index efbf3772cc08..7ca9cfc6b8a4 100644
--- a/games-action/heretic2/Manifest
+++ b/games-action/heretic2/Manifest
@@ -1,5 +1,5 @@
 DIST heretic2-1.06b-unified-x86.run 4718161 BLAKE2B 880b8c9468bf98a95cc0e31e9d1853de6f0f7e9d205518043ab243f81f760e588655b85bf7a2e1983ff738072adaa731a9488e00d342ec86be41f1b5aa32087f SHA512 7dcd4f8f87d526db7ea9fd647e4807d4e1a404a612460f8dcc0d0360964ef0d4c721e9c62b58cd1764c1e2c71ad1539c6aac5083fadc7a85ec4c12c8aa7b338f
 DIST heretic2-1.06c-unified-x86.run 3667873 BLAKE2B f492aec1d290ccf32a63d5a4ff017168ba89435db63124ce9de93ebe9c5284cf6dbabe0355fbad6a52f20d646194a9fd5014c1030abc1946961f922ae57e810f SHA512 e855c573d6e215e18d80143d1850e890349f941462a5d2d59c57a02f11a39967fd633efdfe46199d588e97cc99322d539ac50fc7bc7fa6d7e116e99f5a532de4
 DIST heretic2-maps-1.0.run 6257076 BLAKE2B 15151d80027f4912fab919526e4b91cacb87adeee7cb97e50b1ad5cfa905059c169705fd40ec3330b58996fac167822bc93af49c01fbbb61e4ace73309932cc2 SHA512 ba570caeae6bbe4a97bfe937353014dc9ddcc5a007b0fd1911ab1494667d2dae263d727190e7172d35639511a6383ff35eea5622cdc2e124e3793daef3c8e607
-EBUILD heretic2-1.06c-r1.ebuild 1790 BLAKE2B 1d0ee015a2235d76172b62af841e892dd7357b7f1628f9c5f955b07d828ff1024c1790bbe8b274f3ba758fc1b90e198e44f8aa6d284ac16292f8a4a50afea702 SHA512 2d197ecc09bbfbcfa09e3d4f1b7daadc6fce99189dd6ebbed14141dc377ed9f83b028c81868934493d90dc126f551a8f155ea9f267c4cf53a926c7e7291462b9
+EBUILD heretic2-1.06c-r1.ebuild 1802 BLAKE2B fe462943c6a872273ae068c80257c358b9e622ad4bd93637510b91ceab35fca37f7c10a2270944a0fd3be6d91b9f8a6eb797d18a51d29f352e270f6ed1b929bb SHA512 c161a23edd7b0d3589f3a6c0b5fa05643deec40f9e2562185ae860b1b2524b1390def80275a36f2663b186d1e9cc805264fbd0ba5bd6a1ddda9137b30afc8003
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-action/heretic2/heretic2-1.06c-r1.ebuild b/games-action/heretic2/heretic2-1.06c-r1.ebuild
index dc1322e89355..60d2b16cafed 100644
--- a/games-action/heretic2/heretic2-1.06c-r1.ebuild
+++ b/games-action/heretic2/heretic2-1.06c-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="strip"
+RESTRICT="strip mirror bindist"
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/${PN}/base/*.so"
 
 DEPEND="games-util/loki_patch"
diff --git a/games-action/mutantstorm-demo/Manifest b/games-action/mutantstorm-demo/Manifest
index 38283c6ea72f..515dc1b6585c 100644
--- a/games-action/mutantstorm-demo/Manifest
+++ b/games-action/mutantstorm-demo/Manifest
@@ -1,3 +1,3 @@
 DIST MutantStormDemo_1_33.sh.bin 9249167 BLAKE2B 304877cb30ba0f43540b6d467e0d4ebd12c3896778c305a3aabf8a2a747fc1fa48e75d6e4ee8c123afa58fbb12fa9ead4f9f9af3bdc0604b3ff613ee92a558bb SHA512 176c9f05ca03a1b8f397e046eac26c1442571806543df9b7e0545b8e32e0cc8f2fc827f03840c2082e600a9336ba2c7a7497ef336d9eb8c4e8f122abec413cad
-EBUILD mutantstorm-demo-1.33-r1.ebuild 1031 BLAKE2B e0c6460b22957d97e71872821e582289d1cf421d1e11d19aa972e09a148ff37bfb492c5a03f0142cad169c39c6154c7ca42065019165bdd4e7109fa0deba3541 SHA512 8f117835feb59654850854fcd27291753838c131e41d3e7a48991f125a70472c7b4fda05a85bb778cd1d046aa279f9b909ee57f3e35c7afd4f3904eb1ffc1471
+EBUILD mutantstorm-demo-1.33-r1.ebuild 1043 BLAKE2B f37a69291b969edcea3b47aa073afb06be4ad8629942a1671b589045432bad4481eab0b74b26c60ff295fa7f66aafcb6b88e08fd9fc7c811e75df245529c0c86 SHA512 7b2e977097b95fae79329f69e4643eaba2d9712a8ad5783092511eae1cf7aee15a2c7f0f6c0aa6cf61c8cdcf8fbbaf789307f54f5b06204f5b095b0564f804bc
 MISC metadata.xml 1759 BLAKE2B 797c2106d0302bd32b52a60f07df2d9aea348308b05249cd8ad7102e61aadcd7fc327a0e7e1d347e50b53c55923b333f4bc0419dca9abbd37c0d0b2f138517b7 SHA512 a5d3cbfc4ed0b4078a83f5c608129e6d4f69f1c76bb442f2907dd99bd2b13163080693b4ba6e07b2ca35d0e5495c64580a9aae3cf30e6746df435098a75dceea
diff --git a/games-action/mutantstorm-demo/mutantstorm-demo-1.33-r1.ebuild b/games-action/mutantstorm-demo/mutantstorm-demo-1.33-r1.ebuild
index c97fee4f7172..6a4460c8715a 100644
--- a/games-action/mutantstorm-demo/mutantstorm-demo-1.33-r1.ebuild
+++ b/games-action/mutantstorm-demo/mutantstorm-demo-1.33-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ LICENSE="POMPOM"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
-RESTRICT="strip"
+RESTRICT="strip mirror bindist"
 
 RDEPEND="
 	media-libs/libsdl[abi_x86_32(-)]
diff --git a/games-action/postalplus/Manifest b/games-action/postalplus/Manifest
index 5c6536dec6ae..eaa91cb6f346 100644
--- a/games-action/postalplus/Manifest
+++ b/games-action/postalplus/Manifest
@@ -1,2 +1,2 @@
-EBUILD postalplus-1-r1.ebuild 821 BLAKE2B 751b7928b33ddfa68f752ccb0d1c2ac356df5ad7fa5dc0a49bd908564d4fea70d9f408e2295d68443c09f2859910d581373d4245ba08328ebf5b8705f5f0f59b SHA512 709242ec1096a0041ebecf97e890e6aef0561536efdabe6dda665c0fe7e9841568ee681fc543391419741837f55ad45cadce588ef73ccf4e2bb128f84b3a67df
+EBUILD postalplus-1-r1.ebuild 826 BLAKE2B bf22ec1c8dacc52ea276e77c10ea598c2e89692177fb66dbd35676ff2dcc555c9c6df3f53f5af0b4b82cf310fb8372e93b113cd35fb0b6c8cf79dc7b4a2df960 SHA512 030f5b9b32419a116acbbb2e265b00b8ed4b46379af44ad426cc6c9c4f63aada386f55df37338e07d99de07fe356908981f31e7b3575aa685c3b5555f4c3036f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/postalplus/postalplus-1-r1.ebuild b/games-action/postalplus/postalplus-1-r1.ebuild
index 569d32f5fa13..223d0a7931d1 100644
--- a/games-action/postalplus/postalplus-1-r1.ebuild
+++ b/games-action/postalplus/postalplus-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-RESTRICT="strip"
+RESTRICT="strip bindist"
 
 S=${WORKDIR}
 
diff --git a/games-action/rune/Manifest b/games-action/rune/Manifest
index 874c47c9d3dd..642390427c9f 100644
--- a/games-action/rune/Manifest
+++ b/games-action/rune/Manifest
@@ -1,3 +1,3 @@
 DIST rune-all-0.2.tar.bz2 6507237 BLAKE2B 98afc23e076801bdf8de2fd80e5d95dfbdc74399cad91dbe2a19c3d41b1107b8b07aee5b480e212c7483e4215d9cd3c9101f8d189191aa779ed9f22f73ef9af4 SHA512 5c86306c84a6b606e13c3b1eebf676479cfe8d1112a2c5b31d6332fc7305fea74485d9a4b89286db38b968f473a40d7b5e500c17aaa8b2010edb17cc95b1695b
-EBUILD rune-1.07-r3.ebuild 3287 BLAKE2B d84df4e0e016ddb27d13e656e5a4722c15b886ae47f572819a2bc54fd83280118a20c6ae6ceb060ed5f97da047f9015794e3f557b7d3d1822953404d156c6825 SHA512 b911960b002dbe6c5052054c8a83ab6a3049f06ef72b671a7a3992d6b09342fa78f4b76ef20da53b1f63a536cc7a870af71847ff93b584873cf0cefb8f49b4a3
+EBUILD rune-1.07-r3.ebuild 3299 BLAKE2B fb8748b5eb430bd68583e1f92926216e6a24b54a8ddbd647d2cbfe6595486439785ce4d00709633aed2a7f622ac267dec1739ad5d9bfda825d1cb95ebbdeba1d SHA512 a79c44b2d8914c6b1e367a626dfd7ee9ae5061e390bda0dcec83924d6167651484810f2332eaee2667c35c2ba63c958da4e756bed5e4e4677ded221ddf67288d
 MISC metadata.xml 2118 BLAKE2B 2c390a7a3fdfe18a338dacd5d568a2912aaeacba4e75d260474a2a9c7474a9d30b0072d34b364f83ea25ae188df0a26f9f5550b25a94581a0dea1b64bd4ee055 SHA512 64d64e07f93b267b5e8682f716f2fc6cfeef77732a5c2a583d3c00bf20f5be1c257f8259c52a5c0962d5ce96bfc892b2bf1185c9219016808876164700f2ebdc
diff --git a/games-action/rune/rune-1.07-r3.ebuild b/games-action/rune/rune-1.07-r3.ebuild
index 2f649202e4e4..253554d25b6e 100644
--- a/games-action/rune/rune-1.07-r3.ebuild
+++ b/games-action/rune/rune-1.07-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="strip"
+RESTRICT="strip mirror bindist"
 
 RDEPEND="dev-util/xdelta:0
 	>=media-libs/libsdl-1.2.9-r1[abi_x86_32(-)]
diff --git a/games-action/spacetripper-demo/Manifest b/games-action/spacetripper-demo/Manifest
index 569f06012962..9ad2c63390c3 100644
--- a/games-action/spacetripper-demo/Manifest
+++ b/games-action/spacetripper-demo/Manifest
@@ -1,3 +1,3 @@
 DIST spacetripperdemo.sh 5179095 BLAKE2B a2d3109c6557df46b2afa221b92983d4a364abe77260c96066bf466682a022832fef2aee80a438b4e07da5bfcb5d868f45429be87b024d0bcd21eb6636a3a100 SHA512 43c0aac805671716816dfba58fe1ccad333886a1a20a3dfdaba7b78512dbe2ca6fbe6c09782e14f81d475c9c9bccb4043bac4c8bd756800fe43596dbee5018a0
-EBUILD spacetripper-demo-1-r1.ebuild 1131 BLAKE2B 04f1785b47cc5178a599493ced63abd223bd0229c75350afd81928bf88f571f0c1141718c528a1d2e27669e2f88c3080f75db6cea13560f3b4898c7d52ea7587 SHA512 d9e2659153e14d56d9d989df738a0c9238ff900c072c00cb3bd5d9743132218c6c7d65b204483679cefe25af244840d0b92b2c04487921aa0e12dab122e7fea3
+EBUILD spacetripper-demo-1-r1.ebuild 1143 BLAKE2B ef221ce3460aa8892bc7a3434a26459c6ea06cff43bb746bf4bdb2b8751c4be25b641ecd161824416181aefafbd0df3c7f5611ebf4883eb8dd5da5d8e76f8396 SHA512 2d054936c100b2d567f3f5bdbf54664bbf6c569fb77283bdb7efd185444cb9d4c84538db15c28c60a7f456ef1f5e8ae014075526f7750007a579d70dbcbed0e3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/spacetripper-demo/spacetripper-demo-1-r1.ebuild b/games-action/spacetripper-demo/spacetripper-demo-1-r1.ebuild
index 637e20d2d6fb..7dc8a1ea15eb 100644
--- a/games-action/spacetripper-demo/spacetripper-demo-1-r1.ebuild
+++ b/games-action/spacetripper-demo/spacetripper-demo-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="POMPOM"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
-RESTRICT="strip"
+RESTRICT="strip mirror bindist"
 
 RDEPEND="
 	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index b88d23032487..33786db041e3 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index d4a778022d9b..8a269ef31847 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,7 +1,8 @@
 AUX dolphin-5.0-CHAR_WIDTH-collision.patch 2043 BLAKE2B d29f1f9ff360d79105d7020174bfc5063ad18c544d17056dca055174d8d0c837671f5d04f95de98e140d8634651f869e1a0d9e79b834f0f039ce59900c0696b0 SHA512 47c25a3fd5e6c47e34fe23d5faa71ea316c708fa2bbcbc5136a415fc25a0b207c4d18bfedb2d7c4e2a71394581d1e41fd7d4cca3544d34e3f4a6a84fee360314
 AUX dolphin-5.0-no-pie.patch 1068 BLAKE2B e941c7002b7adaaefc5c9ea2433a1362c1698b325c2804a31eac616c1185205c27b10466a9f4f1f3e2c2e3773f24f5cae6afb849cbf18a574dfbe08622f88ffa SHA512 8deacd47896003687e25117d758cba6423a6729e6bd54c1bdf39e904f6659ee42d5740338fd94301ef98befaaf02697e32d5fecb604ddc38186b1f81285aec56
+AUX dolphin-5.0-soundtouch-exceptions.patch 591 BLAKE2B 7a5f25041214f58e99f8e6d50544392be6f1336a070e812b8f4675c777a3e53482c49fdf578781d2a8bb6f7eb6517f6dde087965482756e7b156958c25c815fb SHA512 df9d1832ea2d844ec7ca79b01a3fe8463e21feb089105b79c91218db0d6426e1fc489d3b40688e02a13bef8782b80c50f09f0d0603822c035e8ed99b559a0f39
 AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391
 DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
-EBUILD dolphin-5.0.ebuild 4610 BLAKE2B f10b2979143b167887758b6d70db658ce0fe4d9c0bdc57ccc87b16b5682ddebd23f9e14d5fb000b250767bd11487fa13e988b76fd6958cfa56a396c2e5adea4e SHA512 d45ab963c14353014fd9178b61ebecdb017e67ea8e99b252712acbd9732ddb31ae5125ffeaef6cd66276b526dc74955904141a88252682cf34ea3df184ac6746
+EBUILD dolphin-5.0.ebuild 4655 BLAKE2B c78423d3ac3063e0a758e105f2cd3dd4e27bcf92c2bcd7544424d570e180c7c11f4ae809f1faad2ffb55357beb01b9de3c03e1bab2f60bcf7de2bdb2516256b1 SHA512 51a8927b7bf1fca75c0939c220cd1f1acba53bd9e641ee284725c0cae495c14e06bd9753db01e82cb7c64c57e6057a25d2b6fec27e4b8397eb52ca52cb4498fa
 EBUILD dolphin-9999.ebuild 3917 BLAKE2B 1f2bb40aeb8e7aac5b2fd566f23506b28ac7a895aea076cff52f5f2d1cb3cd9dafe4be6efd11ba43d53d5c24626c05ff2a37a766ac955d84a8b24b21b0e9718c SHA512 3df915167defe593a915292997b3e063b090224d82071ffbbecf9a3cf4a1b8ab03b9afcb1bd7466127b69a923bd6b6a29af25fb60b116aecfcfad39d4f2a81cd
 MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild
index 491d92991bef..871b1246ade5 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -75,6 +75,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch
 	"${FILESDIR}"/${P}-xgetbv.patch
 	"${FILESDIR}"/${P}-no-pie.patch
+	"${FILESDIR}"/${P}-soundtouch-exceptions.patch
 )
 
 src_prepare() {
diff --git a/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch b/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch
new file mode 100644
index 000000000000..ffd07cf0697f
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/686752
+
+Description: Fix FTBFS with SoundTouch 2.1.2
+ Explicitly disable exceptions in SoundTouch headers because Dolphin
+ is compiled with -fno-exceptions.
+Author: James Cowgill <jcowgill@debian.org>
+Bug-Debian: https://bugs.debian.org/917671
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Source/Core/AudioCommon/OpenALStream.h
++++ b/Source/Core/AudioCommon/OpenALStream.h
+@@ -32,6 +32,7 @@
+ #define BOOL SoundTouch_BOOL
+ #endif
+ 
++#define ST_NO_EXCEPTION_HANDLING
+ #include <soundtouch/SoundTouch.h>
+ #include <soundtouch/STTypes.h>
+ 
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index c7fa76d9cf7f..3267f5294083 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,6 @@
 AUX pcsx2-1.4.0-gcc5.patch 694 BLAKE2B d523ed4b60730d38febceda5a4ddea3aad96788184cbc19e1d983a37524d63618ce45009fba555f31f75c8a325156ae0cbfff74531c469add6c867ffc73f47e8 SHA512 c95b5abd255f4d0a1d9efa8b45126fea2c57ed2110358687a14d44c5ccc8f670f33a5e9b56bd9e3ea4806ad2429a84b70d796bec9c909262379bba5914e7d51d
 AUX pcsx2-1.4.0-xgetbv.patch 1361 BLAKE2B f6e28703f59dbf79c38812e9a61828f1c40b00982e86b7f3d8b507c54a331b38febbafc98012bc43a84b5ba077af56d73cfb9f1c036c0b619ace1129b91ad031 SHA512 03bc1059dbca73382c3d708e92eef270bbf7958736010d8ffcb92c81972e34e1603007b2aad41b70694791760f9323353815f3468392e39e3893c06327824022
 DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
-EBUILD pcsx2-1.4.0.ebuild 2897 BLAKE2B 29580f7dcc52243cfba39b6cff4c0cec2105d0517fb12686d4fa2643a8899b341b40f8cf2a8da33a7d77d2bd3f5f6e47e3648fe16b4eb902d5f01cfaef31e0c2 SHA512 a015bc26554976d1c5f9a3903cd090aaf4eec5f6aa4ce9a0d991fc2dcb71371f0ce8ee358b20d3f0f7e9f40fd82a87197601cc64694f2df8839641e08713e991
-EBUILD pcsx2-9999.ebuild 2530 BLAKE2B a7636a21259bfb43293940bedba24521570b844fb04deb59a8e4017cb51fe0d372552156f4e3ac72c9abdde8c166c6c21271378ff7cb29f41d946562b313f055 SHA512 38214dabe6d312fc5a4a3a3ce73285b385f2668b83d4a280bf023804db2c6f60debd150b5304b878137d06cb9e05aa8eab22a45bf8e64d27d4c5c0db096fc2e0
+EBUILD pcsx2-1.4.0-r1.ebuild 2862 BLAKE2B 3d18870ff5ea8f0cfe42ac5d4c42b513e004a46b6540bc7bcf25c29b28cfaefb07ee3da983112f54442714c5a1551a89c8b8fcf9fe5b00c6729c4c75c63a6c84 SHA512 bea798521b7978df7a06a1130c38d8b57e68902e03915a2efde51cf541c9ab2da3f67ac3a1c90f86acdd7904c13bbb19369247c39ce436ac79674f67e15a89ad
+EBUILD pcsx2-9999.ebuild 2498 BLAKE2B a9fee170d38a6fa704a9bb79041eca8520a7b36661af8fa2daa7d551ecf2e2a2e4ed2f64a0fd4a68cff13e8db25380b6eb2dfc7abf106ad5f34ca45c935a96c7 SHA512 3cabace84c937c8e3a3ebdf633a6c4d3c562262c526a05525b76c75eef688c88a8b4996c82cddc84b0709c4feb61612db0e97173dbd70bbfb590423fd34b519d
 MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..0ddc30dd7ba3
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW"
+MY_PV="${PV/_/-}"
+
+inherit cmake-utils l10n multilib toolchain-funcs wxwidgets
+
+DESCRIPTION="A PlayStation 2 emulator"
+HOMEPAGE="https://www.pcsx2.net"
+SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/bzip2[abi_x86_32(-)]
+	app-arch/xz-utils[abi_x86_32(-)]
+	dev-libs/libaio[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/libpng:=[abi_x86_32(-)]
+	media-libs/libsdl[abi_x86_32(-),joystick,sound]
+	media-libs/libsoundtouch[abi_x86_32(-)]
+	media-libs/portaudio[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/gtk+:2[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/wxGTK:3.0[abi_x86_32(-),X]
+"
+# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
+DEPEND="${RDEPEND}
+	>=app-eselect/eselect-opengl-1.3.1
+	dev-cpp/pngpp
+	>=dev-cpp/sparsehash-1.5
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-xgetbv.patch
+)
+
+clean_locale() {
+	rm -R "${S}"/locales/"${1}" || die
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
+		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then
+			die "${PN} does not compile with gcc less than 4.8"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	l10n_for_each_disabled_locale_do clean_locale
+}
+
+src_configure() {
+	multilib_toolchain_setup x86
+
+	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
+	# if it something other than "Devel|Debug|Release"
+	local CMAKE_BUILD_TYPE="Release"
+
+	if use amd64; then
+		# Passing correct CMAKE_TOOLCHAIN_FILE for amd64
+		# https://github.com/PCSX2/pcsx2/pull/422
+		local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake)
+	fi
+
+	local mycmakeargs=(
+		-DARCH_FLAG=
+		-DDISABLE_BUILD_DATE=TRUE
+		-DDISABLE_PCSX2_WRAPPER=TRUE
+		-DEXTRA_PLUGINS=FALSE
+		-DOPTIMIZATION_FLAG=
+		-DPACKAGE_MODE=TRUE
+		-DXDG_STD=TRUE
+
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
+		-DDOC_DIR=/usr/share/doc/"${PF}"
+		-DEGL_API=FALSE
+		-DGTK3_API=FALSE
+		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
+		# wxGTK must be built against same sdl version
+		-DSDL2_API=FALSE
+		-DWX28_API=FALSE
+	)
+
+	WX_GTK_VER="3.0" need-wxwidgets unicode
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*"
+
+	cmake-utils_src_install
+}
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
deleted file mode 100644
index ac18cbd565e4..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW"
-MY_PV="${PV/_/-}"
-
-inherit cmake-utils l10n multilib toolchain-funcs wxwidgets
-
-DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://www.pcsx2.net"
-SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/bzip2[abi_x86_32(-)]
-	app-arch/xz-utils[abi_x86_32(-)]
-	dev-libs/libaio[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl[abi_x86_32(-),joystick,sound]
-	media-libs/libsoundtouch[abi_x86_32(-)]
-	media-libs/portaudio[abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
-	virtual/jpeg:62[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/gtk+:2[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/wxGTK:3.0[abi_x86_32(-),X]
-"
-# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.3.1
-	dev-cpp/pngpp
-	>=dev-cpp/sparsehash-1.5
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc5.patch
-	"${FILESDIR}"/${P}-xgetbv.patch
-)
-
-clean_locale() {
-	rm -R "${S}"/locales/"${1}" || die
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then
-			die "${PN} does not compile with gcc less than 4.8"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	l10n_for_each_disabled_locale_do clean_locale
-}
-
-src_configure() {
-	multilib_toolchain_setup x86
-
-	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
-	# if it something other than "Devel|Debug|Release"
-	local CMAKE_BUILD_TYPE="Release"
-
-	if use amd64; then
-		# Passing correct CMAKE_TOOLCHAIN_FILE for amd64
-		# https://github.com/PCSX2/pcsx2/pull/422
-		local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake)
-	fi
-
-	local mycmakeargs=(
-		-DARCH_FLAG=
-		-DDISABLE_BUILD_DATE=TRUE
-		-DDISABLE_PCSX2_WRAPPER=TRUE
-		-DEXTRA_PLUGINS=FALSE
-		-DOPTIMIZATION_FLAG=
-		-DPACKAGE_MODE=TRUE
-		-DXDG_STD=TRUE
-
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
-		-DDOC_DIR=/usr/share/doc/"${PF}"
-		-DEGL_API=FALSE
-		-DGTK3_API=FALSE
-		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
-		# wxGTK must be built against same sdl version
-		-DSDL2_API=FALSE
-		-DWX28_API=FALSE
-	)
-
-	WX_GTK_VER="3.0" need-wxwidgets unicode
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*"
-
-	cmake-utils_src_install
-}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 5526d71d9d27..78e81473e330 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -24,7 +24,6 @@ RDEPEND="
 	media-libs/libsoundtouch[abi_x86_32(-)]
 	media-libs/portaudio[abi_x86_32(-)]
 	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
-	virtual/jpeg:62[abi_x86_32(-)]
 	virtual/libudev[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
 	x11-libs/gtk+:2[abi_x86_32(-)]
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 506c64c8574c..d4621ca6b642 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/etqw-bin/Manifest b/games-fps/etqw-bin/Manifest
index 0dacdbad9fb4..38e307f15762 100644
--- a/games-fps/etqw-bin/Manifest
+++ b/games-fps/etqw-bin/Manifest
@@ -1,3 +1,3 @@
 DIST ETQW-client-1.5-full.x86.run 556383725 BLAKE2B 8fcaa8518c7c452a4fe593a00beea0f5a6d5849c72b03d4a443fffde8540ea53b7bf0376d90b2f2ed4e3a736628f8871e009a49b938344516b2db0495cf1e826 SHA512 32bb3d7ef47790ac6b790a5a5d61592c3504d034372254102985e58dee25b5d200e507330226bf8458c628154c246b2abcb08bf550fa044189c4c8de813af0c2
-EBUILD etqw-bin-1.5-r1.ebuild 2012 BLAKE2B 688f996448189c1525475aea0534e09b69d09f7da0b3626c38fbf251afe61ceefb16e925abc81eba5fab7d4e498484d83f81a0314a6267ab0757b1343f9630ed SHA512 6314fd268f98d28fce833aa8c3cba5be60ad8d50372a810cfbf3f29bf04903569ca82016b2ff8e7bd063a123c90b09442287afce1fac20c036f94f73562f54a6
+EBUILD etqw-bin-1.5-r2.ebuild 2011 BLAKE2B 733f330654dc3187c75cb39af388e52e3d3ccda2b1a55259540cc9887f307a4d8f7db3593b31f69bf9a24f66978f4d2566437a91591220362102fd2f4b7dd7d1 SHA512 612aed9239f38e025965abbf2bee85f4d117a104d7c6c9a7e9ef789817c49ae4e1c8f8ec880cfb23e544cd9923f7d388169d949d3874337ea636d8f771d093f7
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
deleted file mode 100644
index 8270e50c21ee..000000000000
--- a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Enemy Territory: Quake Wars"
-HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
-SRC_URI="ftp://ftp.i3d.net/Games/Enemy%20Territory%20Quake%20Wars/Patches/ETQW-client-${PV}-full.x86.run"
-
-LICENSE="ETQW"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cdinstall"
-RESTRICT="strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	>=virtual/jpeg-62:62[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
-	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	cdinstall? ( games-fps/etqw-data )"
-
-S=${WORKDIR}/data
-dir=${GAMES_PREFIX_OPT}/etqw
-
-QA_PREBUILT="${dir:1}/*.x86
-	${dir:1}/*.so*"
-
-src_unpack() {
-	tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip
-	unpack ./${A}.zip
-	rm -f ${A}.zip
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r base pb *.png
-	dodoc *.txt
-
-	exeinto "${dir}"
-	doexe etqw{,ded,-rthread}.x86 openurl.sh libCgx86.so libSDL*.id.so*
-
-	newicon etqw_icon.png etqw.png
-	games_make_wrapper etqw ./etqw.x86 "${dir}" "${dir}"
-	make_desktop_entry etqw "Enemy Territory: Quake Wars" etqw
-
-	games_make_wrapper etqw-dedicated ./etqwded.x86 "${dir}" "${dir}"
-	make_desktop_entry etqw-dedicated "Enemy Territory: Quake Wars (dedicated server)" etqw
-
-	games_make_wrapper etqw-rthread ./etqw-rthread.x86 "${dir}" "${dir}"
-	make_desktop_entry etqw-rthread "Enemy Territory: Quake Wars (SMP)" etqw
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! use cdinstall ; then
-		elog "You need to copy pak00*.pk4, zpak_*.pk4 and the megatextures"
-		elog "directory to ${dir}/base before running the game."
-	fi
-	elog "To change the game language from English, add"
-	elog "seta sys_lang \"your_language\" to your autoexec.cfg file."
-	elog "Menu fonts may not show up until you do so."
-}
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild
new file mode 100644
index 000000000000..014fcff96bae
--- /dev/null
+++ b/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Enemy Territory: Quake Wars"
+HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
+SRC_URI="ftp://ftp.i3d.net/Games/Enemy%20Territory%20Quake%20Wars/Patches/ETQW-client-${PV}-full.x86.run"
+
+LICENSE="ETQW"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cdinstall"
+RESTRICT="strip"
+
+DEPEND="app-arch/unzip"
+RDEPEND="sys-libs/glibc
+	amd64? ( sys-libs/glibc[multilib] )
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	virtual/jpeg-compat:62[abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
+	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	cdinstall? ( games-fps/etqw-data )"
+
+S=${WORKDIR}/data
+dir=${GAMES_PREFIX_OPT}/etqw
+
+QA_PREBUILT="${dir:1}/*.x86
+	${dir:1}/*.so*"
+
+src_unpack() {
+	tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip
+	unpack ./${A}.zip
+	rm -f ${A}.zip
+}
+
+src_install() {
+	insinto "${dir}"
+	doins -r base pb *.png
+	dodoc *.txt
+
+	exeinto "${dir}"
+	doexe etqw{,ded,-rthread}.x86 openurl.sh libCgx86.so libSDL*.id.so*
+
+	newicon etqw_icon.png etqw.png
+	games_make_wrapper etqw ./etqw.x86 "${dir}" "${dir}"
+	make_desktop_entry etqw "Enemy Territory: Quake Wars" etqw
+
+	games_make_wrapper etqw-dedicated ./etqwded.x86 "${dir}" "${dir}"
+	make_desktop_entry etqw-dedicated "Enemy Territory: Quake Wars (dedicated server)" etqw
+
+	games_make_wrapper etqw-rthread ./etqw-rthread.x86 "${dir}" "${dir}"
+	make_desktop_entry etqw-rthread "Enemy Territory: Quake Wars (SMP)" etqw
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	if ! use cdinstall ; then
+		elog "You need to copy pak00*.pk4, zpak_*.pk4 and the megatextures"
+		elog "directory to ${dir}/base before running the game."
+	fi
+	elog "To change the game language from English, add"
+	elog "seta sys_lang \"your_language\" to your autoexec.cfg file."
+	elog "Menu fonts may not show up until you do so."
+}
diff --git a/games-fps/etqw-demo/Manifest b/games-fps/etqw-demo/Manifest
index 27fa7eec7fdc..b0d360d61705 100644
--- a/games-fps/etqw-demo/Manifest
+++ b/games-fps/etqw-demo/Manifest
@@ -1,3 +1,3 @@
 DIST ETQW-demo2-client-full.r1.x86.run 691248874 BLAKE2B 42692da7b2f7f35730dea9557c26bb189ac555eccdaf2873d3b5e91bff640b1cd121022aa671c990f92164a97874e9f46f47c76ad01f2ff2973ad3edea6898db SHA512 41332208626449da74bea71a9926258f50986f0af85045d470d4405d27e497085ba318337181802be58eb50c724ab91df6b9c810e5fcc5f8dc131486d6529f38
-EBUILD etqw-demo-2.0_p1-r1.ebuild 1571 BLAKE2B 543abe8bd0d12d46745eb178d4741788e45f759cf736b31e5bab290bcbfe6028a71a4e2414c9b24d30517bcbb1e7529f58d90f9d8a2742fe40c95e820a632ac3 SHA512 5491d3b22dcbc7c3d623863e61f5db062a8998f888a4554a02ebae745cd7cbb19c9edd3967c9387459825dd12e1eacf752ab43554d4affe39412b54837ac2824
+EBUILD etqw-demo-2.0_p1-r2.ebuild 1570 BLAKE2B ae136c82547538ae4954bb427ba3b9bd81a15582312b0660f17ed01c420e338c222493de5b87c317dc3c4b90e866783f927fc3844c449ca21f3ed216a48f49e6 SHA512 a3e7a876e4797bd14999787dd37d4d5cf910546c77335fdb062c2da4d5cd2be7cc8d84b2e58a99f366b14f2fbc8f647a0d3f6ce0ee9cc8fc85042431f73a943e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild
deleted file mode 100644
index 8915a443830f..000000000000
--- a/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker eutils versionator games
-
-MY_MAJOR=$(get_major_version)
-MY_REV=$(get_version_component_range 3)
-MY_BODY="ETQW-demo${MY_MAJOR}-client-full.r${MY_REV/p/}.x86"
-
-DESCRIPTION="Enemy Territory: Quake Wars demo"
-HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
-SRC_URI="mirror://idsoftware/etqw/${MY_BODY}.run"
-
-# See copyrights.txt
-LICENSE="ETQW"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip mirror"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	>=virtual/jpeg-62:62[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-QA_PREBUILT="${dir:1}/guis/libmojosetupgui_ncurses.so
-	${dir:1}/data/*
-	${dir:1}/data/pb/*.so"
-
-src_unpack() {
-	# exit status of 1 should just be warnings, not corrupt archive
-	unpack_zip ${A}
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r guis scripts
-
-	cd data
-	insinto "${dir}"/data
-	doins -r base pb etqw_icon.png
-	dodoc README.txt EULA.txt copyrights.txt etqwtv.txt
-
-	exeinto "${dir}"/data
-	doexe etqw *\.x86 etqw-* libCgx86* libSDL* *.sh
-
-	games_make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data
-	# Matches with desktop entry for enemy-territory-truecombat
-	make_desktop_entry ${PN} "Enemy Territory - Quake Wars (Demo)"
-
-	games_make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data
-
-	prepgamesdirs
-}
diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild
new file mode 100644
index 000000000000..57a181dc367f
--- /dev/null
+++ b/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker eutils versionator games
+
+MY_MAJOR=$(get_major_version)
+MY_REV=$(get_version_component_range 3)
+MY_BODY="ETQW-demo${MY_MAJOR}-client-full.r${MY_REV/p/}.x86"
+
+DESCRIPTION="Enemy Territory: Quake Wars demo"
+HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
+SRC_URI="mirror://idsoftware/etqw/${MY_BODY}.run"
+
+# See copyrights.txt
+LICENSE="ETQW"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip mirror"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	virtual/jpeg-compat:62[abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
+
+S=${WORKDIR}
+dir=${GAMES_PREFIX_OPT}/${PN}
+
+QA_PREBUILT="${dir:1}/guis/libmojosetupgui_ncurses.so
+	${dir:1}/data/*
+	${dir:1}/data/pb/*.so"
+
+src_unpack() {
+	# exit status of 1 should just be warnings, not corrupt archive
+	unpack_zip ${A}
+}
+
+src_install() {
+	insinto "${dir}"
+	doins -r guis scripts
+
+	cd data
+	insinto "${dir}"/data
+	doins -r base pb etqw_icon.png
+	dodoc README.txt EULA.txt copyrights.txt etqwtv.txt
+
+	exeinto "${dir}"/data
+	doexe etqw *\.x86 etqw-* libCgx86* libSDL* *.sh
+
+	games_make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data
+	# Matches with desktop entry for enemy-territory-truecombat
+	make_desktop_entry ${PN} "Enemy Territory - Quake Wars (Demo)"
+
+	games_make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data
+
+	prepgamesdirs
+}
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
index 78ede7d22c24..c929cd393b3b 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -1,4 +1,4 @@
-DIST freedm-0.10.1.zip 7230096 BLAKE2B 2b553e6f263acbd6c63ddb123d1bf9fe80ce1d7a3a6b7e1b7ec64446acb520c147336da5431c5c93f0843ecfa039645cc21a4a62b39268b34f99306e1eae4f14 SHA512 cc3b393e20b503e83ca2bf90ac528d42c951881b58d22970b154fd262e69f7bae038f7300d74e467af6e31e626a12d4a9fb5bf5ff3e9da84506df41be18577f2
-DIST freedoom-0.10.1.zip 18496121 BLAKE2B b9fe88e086fb35b29d9562c5ac1335bd7eeb18ea7900c44d4ca7707bc52f03b73ec1190c578f57548320c70c0f73415a268d737cc545310fecb66ba47d242107 SHA512 a98d400267801dfdf67aa035def6d62fffff1c3a2d1aebd482929274e1f86e05e79c9cbe528a80d5c87df7306364ca74a3b03674273a0079bad724e7b23e38eb
-EBUILD freedoom-0.10.1-r1.ebuild 1107 BLAKE2B 20f9de2e03a87686acd9fd69bd3400332f7bcdce6dfbb31e498dbdb52503b6fc626c26c77f261338f1685cabc5b9c0bf34582c8fc212f756e139f711c1e0120a SHA512 c4d2d314dd2c298e86de7e9616fa77901d321075404269a0e1b48a44f019a0f0559661c16c3e19b53cb2783c2a3a9e240bdce5d387647784740c8324fba7dd68
+DIST freedm-0.11.3.zip 7853186 BLAKE2B 5f399233e0d1f1c61d8170dc8e13ca0c6efe79255a87511027ad69e9ab7cf21045e9bc7f40fec6fa3604b3c77590cde8e85b2e9a53e1d89c5aeaf67bffa7023e SHA512 263f126e519a883b828b4f321363fe0f8c557ae58b76c6b3e28aa60e86c15fcc78c866bf003fc523276cefbb431023de64f09b026e85b0a0c7c85a88d1f47cd0
+DIST freedoom-0.11.3.zip 18889307 BLAKE2B 052d7f58d1beb7947f4fff3021ec0229c9746bfb7970a52d23fa44fc881d8cf3c314b8ecf0dc400c2da4e28c623695874ae75dcd1e45933fdb1826ea04f0e24b SHA512 c67fc69bca87cba2ba40b91f578724feaabbd6cd64c6845fa567d6901b7a9e3145185011731c677a71f7b5a6f8707855fb573c0c09b6d47fef83b1577b211816
+EBUILD freedoom-0.11.3.ebuild 707 BLAKE2B c37d9c313b4b0abf1b559909b730aabb091dc48bdba8754adec2f427b01952f03810d67052f541d9b1aa5ff51035cc7b8598cd578e6cf512990c477c3c07ea58 SHA512 da624039370da6fbd92cb5a1f21e1a4d38f8f7abdbec98eac6d888f383c24954dbbd2f3388c87911fef68bbefb8f94be6c05bd96f41ba2ad72cb2c68b6cdee4c
 MISC metadata.xml 345 BLAKE2B 856529c69e0cede9d5ddfc4476945783de0ba760f0c1719d1f58a012da24a6739757af14561a04e9393c49cdd7e2cf69fb3a2a690140adbe3e0635953175c46b SHA512 d830ba46200839ec37d298883c566cc63eafbc45ad6683ef028d4168e0bd4aa245fb13d4c5e84eb5113ee37db85d018f8ef7222da00682524157ff5d29a6da6b
diff --git a/games-fps/freedoom/freedoom-0.10.1-r1.ebuild b/games-fps/freedoom/freedoom-0.10.1-r1.ebuild
deleted file mode 100644
index 357def0066df..000000000000
--- a/games-fps/freedoom/freedoom-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit readme.gentoo-r1
-
-DESCRIPTION="Freedoom - Open Source Doom resources"
-HOMEPAGE="http://www.nongnu.org/freedoom/"
-SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-${PV}.zip
-	https://github.com/freedoom/freedoom/releases/download/v${PV}/freedm-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-A Doom engine is required to play the wad
-but games-fps/doomsday doesn't count since it doesn't
-have the necessary features.
-To play freedoom with Doom engines which do not support
-subdirectories, create symlinks by running the following:
-(Be careful of overwriting existing wads.)
-
-# cd /usr/share/doom-data
-# ln -sn freedoom/*.wad .
-"
-
-src_install() {
-	insinto /usr/share/doom-data/${PN}
-	doins */*.wad
-	dodoc "${P}"/CREDITS
-	HTMLDOCS="${P}/README.html" einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-fps/freedoom/freedoom-0.11.3.ebuild b/games-fps/freedoom/freedoom-0.11.3.ebuild
new file mode 100644
index 000000000000..d4377003850c
--- /dev/null
+++ b/games-fps/freedoom/freedoom-0.11.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Free game content for the Doom engine"
+HOMEPAGE="https://freedoom.github.io"
+SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-${PV}.zip
+	https://github.com/freedoom/freedoom/releases/download/v${PV}/freedm-${PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/doom-data/${PN}
+	doins */*.wad
+	dodoc "${P}"/CREDITS.txt "${P}"/README.html
+}
+
+pkg_postinst() {
+	einfo "Please note that WAD files location is /usr/share/doom-data/${PN}"
+}
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
new file mode 100644
index 000000000000..66f882a8f107
--- /dev/null
+++ b/games-fps/gzdoom/Manifest
@@ -0,0 +1,4 @@
+AUX gzdoom-4.1.2-static-libraries.patch 5077 BLAKE2B cd380317c8e6da864b527c03f295e3fe9f7d1f9c7d7b3e429a57e780209565c54a9dbc658924ba1341cd3ebbbeb4297cc6b6be71e3df4be1f8831e108e0227eb SHA512 2113cd9ec8f88d4be4728b172ff8bb5ae6c5c4138b87f19504aaca21f3c6fce56da3d8e528419444d156cf6b7c327a768a8d89414e9d455f8111cb3ee7009e89
+DIST gzdoom-4.1.2.tar.gz 13045742 BLAKE2B 38c70eb82ba266e5b41bf62f28f4cee77ba17c0cc1e4186bf11be9021386511346c111874b695ef56a4ed3c93668bb64a71ba4169183646e49d0ab60a1c0793a SHA512 915029e676b17dd330aeee17fa8a9e07bb8e7a16e8ebce9fcdcd24e5b2f0cc48fd8f6914314029b332112ad4215a0f0d45d8e448e9025ac3c2a708a5e0bbd399
+EBUILD gzdoom-4.1.2.ebuild 1416 BLAKE2B b5363acf75ec922fa1d5995f386e4a008f9f5bc3a7f6dfd5018469f64898db68f4ea5a640adcdc3a314bdfd28de421d427ded5adeb57a0f2c97c7e5c14f3442d SHA512 23e984657223468e64bb1d59e27d31d3e0b6cc11543fc5b9bc3c3acab7437ac24f23b9ea377bc12d4c861e79aee51de4a7c177e45411dc1f12876228ab547f9a
+MISC metadata.xml 971 BLAKE2B c8b8d21ceb52ed04b079e9fb5de2b30351e5bc613a20d73f8cd26be75615959ace1ac8bf4b61b6009455e5db68377fa093040e7dbd9c2591455a1813c7d2c7b6 SHA512 f8c7cb9aec78c3a6ac5a861a5a7bd9d96dfc18883aa1c9265608edb955f962a81e078b2bcd23524a649643165150fba2e3b04df92d56bba17ec9d5b10156b119
diff --git a/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch b/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch
new file mode 100644
index 000000000000..344fc0193d2d
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch
@@ -0,0 +1,139 @@
+From 6fafa297bfe0f82696d898d66e39c50f4f5eef16 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Wed, 15 May 2019 23:58:28 +0900
+Subject: [PATCH] Force STATIC for internal GZDoom libraries
+
+This makes sure the internal versions of these libraries bundled with
+the GZDoom source code is used. This prevents the system from building
+GZDoom for dynamic linking with incompatible external libraries (see
+<https://forum.zdoom.org/viewtopic.php?f=2&t=64633>).
+---
+ asmjit/CMakeLists.txt             | 2 +-
+ bzip2/CMakeLists.txt              | 2 +-
+ game-music-emu/gme/CMakeLists.txt | 2 +-
+ gdtoa/CMakeLists.txt              | 2 +-
+ glslang/glslang/CMakeLists.txt    | 2 +-
+ glslang/spirv/CMakeLists.txt      | 2 +-
+ jpeg/CMakeLists.txt               | 2 +-
+ lzma/CMakeLists.txt               | 2 +-
+ zlib/CMakeLists.txt               | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/asmjit/CMakeLists.txt b/asmjit/CMakeLists.txt
+index ab5c2fb4f..6b7636ebe 100644
+--- a/asmjit/CMakeLists.txt
++++ b/asmjit/CMakeLists.txt
+@@ -97,7 +97,7 @@ set(ASMJIT_SRCS
+     asmjit/x86/x86regalloc.cpp
+ )
+ 
+-add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
++add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
+ 
+ set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)
+ 
+diff --git a/bzip2/CMakeLists.txt b/bzip2/CMakeLists.txt
+index 6ff9a2172..7fefb2bf2 100644
+--- a/bzip2/CMakeLists.txt
++++ b/bzip2/CMakeLists.txt
+@@ -7,7 +7,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
+ endif()
+ 
+ add_definitions( -DBZ_NO_STDIO )
+-add_library( bz2
++add_library( bz2 STATIC
+     blocksort.c
+     bzlib.c
+     compress.c
+diff --git a/game-music-emu/gme/CMakeLists.txt b/game-music-emu/gme/CMakeLists.txt
+index a5e06bc8a..5c37ebd29 100644
+--- a/game-music-emu/gme/CMakeLists.txt
++++ b/game-music-emu/gme/CMakeLists.txt
+@@ -163,7 +163,7 @@ set (EXPORTED_HEADERS gme.h)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+ # Add library to be compiled.
+-add_library(gme ${libgme_SRCS})
++add_library(gme STATIC ${libgme_SRCS})
+ 
+ if(ZLIB_FOUND)
+     message(" ** ZLib library located, compressed file formats will be supported")
+diff --git a/gdtoa/CMakeLists.txt b/gdtoa/CMakeLists.txt
+index a0b76e0c3..485f3778b 100644
+--- a/gdtoa/CMakeLists.txt
++++ b/gdtoa/CMakeLists.txt
+@@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE )
+ 	set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
+ endif()
+ 
+-add_library( gdtoa
++add_library( gdtoa STATIC
+ 	${GEN_FP_FILES}
+ 	dmisc.c
+ 	dtoa.c
+diff --git a/glslang/glslang/CMakeLists.txt b/glslang/glslang/CMakeLists.txt
+index c86eccb6e..e376a9178 100644
+--- a/glslang/glslang/CMakeLists.txt
++++ b/glslang/glslang/CMakeLists.txt
+@@ -120,7 +120,7 @@ endmacro(glslang_pch)
+ 
+ glslang_pch(SOURCES MachineIndependent/pch.cpp)
+ 
+-add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
++add_library(glslang STATIC ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
+ set_property(TARGET glslang PROPERTY FOLDER glslang)
+ set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_link_libraries(glslang OGLCompiler OSDependent)
+diff --git a/glslang/spirv/CMakeLists.txt b/glslang/spirv/CMakeLists.txt
+index 8062f8067..03d34d8f4 100644
+--- a/glslang/spirv/CMakeLists.txt
++++ b/glslang/spirv/CMakeLists.txt
+@@ -59,7 +59,7 @@ if(ENABLE_NV_EXTENSIONS)
+          GLSL.ext.NV.h)
+ endif(ENABLE_NV_EXTENSIONS)
+ 
+-add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
++add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
+ set_property(TARGET SPIRV PROPERTY FOLDER glslang)
+ set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_include_directories(SPIRV PUBLIC ..)
+diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt
+index 81834c742..33a3938cf 100644
+--- a/jpeg/CMakeLists.txt
++++ b/jpeg/CMakeLists.txt
+@@ -6,7 +6,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
+ 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" )
+ endif()
+ 
+-add_library( jpeg
++add_library( jpeg STATIC
+     jaricom.c
+     jcomapi.c
+     jdapimin.c
+diff --git a/lzma/CMakeLists.txt b/lzma/CMakeLists.txt
+index 3948ea2ee..4246a34f8 100644
+--- a/lzma/CMakeLists.txt
++++ b/lzma/CMakeLists.txt
+@@ -34,5 +34,5 @@ else()
+ 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" )
+ endif()
+ 
+-add_library( lzma ${LZMA_FILES} )
++add_library( lzma STATIC ${LZMA_FILES} )
+ target_link_libraries( lzma )
+diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
+index 52542bbaa..a1d6637a9 100644
+--- a/zlib/CMakeLists.txt
++++ b/zlib/CMakeLists.txt
+@@ -137,7 +137,7 @@ if(MINGW)
+     set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+ endif()
+ 
+-add_library(${ZLIBNAME} ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
++add_library(${ZLIBNAME} STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+ set_target_properties(${ZLIBNAME} PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+ 
+ set_target_properties(${ZLIBNAME} PROPERTIES SOVERSION 1)
+-- 
+2.21.0
+
diff --git a/games-fps/gzdoom/gzdoom-4.1.2.ebuild b/games-fps/gzdoom/gzdoom-4.1.2.ebuild
new file mode 100644
index 000000000000..57242205a7af
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.1.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg
+
+DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
+HOMEPAGE="https://zdoom.org"
+SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BZIP2 cephes DUMB-0.9.2 GPL-3 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fluidsynth gtk gtk2 openal openmp"
+
+DEPEND="
+	media-libs/libsdl2[opengl]
+	sys-libs/zlib
+	virtual/jpeg:0
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)"
+RDEPEND="
+	${DEPEND}
+	fluidsynth? ( media-sound/fluidsynth )
+	openal? (
+		media-libs/libsndfile
+		media-libs/openal
+		media-sound/mpg123
+	)"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES="${FILESDIR}/${P}-static-libraries.patch"
+
+src_prepare() {
+	rm -rf docs/licenses || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+		-DNO_GTK="$(usex !gtk)"
+		-DNO_OPENAL="$(usex !openal)"
+		-DNO_OPENMP="$(usex !openmp)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	newicon src/posix/zdoom.xpm "${PN}.xpm"
+	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+	cmake-utils_src_install
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
new file mode 100644
index 000000000000..95f6ed619edf
--- /dev/null
+++ b/games-fps/gzdoom/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		GZDoom is a modder-friendly OpenGL source port based on the DOOM engine
+	</longdescription>
+	<maintainer type="person">
+		<email>vilhelm.gray@gmail.com</email>
+		<name>William Breathitt Gray</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
+		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>
+		<doc lang="en">https://zdoom.org</doc>
+		<remote-id type="github">coelckers/gzdoom</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-fps/soldieroffortune/Manifest b/games-fps/soldieroffortune/Manifest
index d62e537d805e..79ba08f86e04 100644
--- a/games-fps/soldieroffortune/Manifest
+++ b/games-fps/soldieroffortune/Manifest
@@ -1,3 +1,3 @@
 DIST sof-1.06a-cdrom-x86.run 22928437 BLAKE2B f76f605af08a19b77548455c0101e03aca7cae69462914e47911da2fadd6d4f3b766e1069556ead0d06c757b179ae2e8105e76ea37852f17796b47b4712aec87 SHA512 91ef3953bd6b6630ab602f64d15a3056f85d90139b18aa3eb9a9a0a75db2ece61ef683ddf1d03b63f0dfc902d7a27914ae673398713941f281e96555d9645078
-EBUILD soldieroffortune-1.06a-r1.ebuild 2098 BLAKE2B 0e1be93ed8fbf27b6024cc3cdfb89bbbc69d2f1b5f0c6d9d91728e61b9e4c1d169be3530378c65b83b2136f4fab7a19bc278b527a95f41e0dac9f2ead89fbe23 SHA512 afe8941cdab0a3235f95e99a570f58944123c0b49cddc466ab857f0455c1bdf1b01e36d04ea83d51fcb3649cafc80d3312e2db07356066d26f910912843b7f06
+EBUILD soldieroffortune-1.06a-r1.ebuild 2110 BLAKE2B 787a5c00863f9019709f92b3ce6de04daeabca808b51d8e589951286497e48c771f62d7c31f9823b65726cfb57ac72ad80f8dc581100416bbf9e3b592e6302c1 SHA512 05f99512e81837bf410ed719a1610eb51daa178af43c1581f099eaf5f0a56b03ec84c36de84fb35eac5db3f4c1bdb1e5a36c682c22bd210129f572385804b84f
 MISC metadata.xml 963 BLAKE2B 3e6d4e2bf56378a5b2db55c5ce7ac3505a2b14a75ef00b409aa37b31d79b190284bbedd1206f9df78922844d583d947dc064ed272444ea77941b8e48dc82dd94 SHA512 59c285b27116238b779238f0179124a2ef1eefca76ae20a84f65ea8850548228dd540ba90b856dafccdd489f911beabb7b2b0a1fa4630562c995f845421f4895
diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
index a9cfb2fbe14c..b10d3fa33648 100644
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://lokigames/sof/sof-${PV}-cdrom-x86.run"
 LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
+RESTRICT="strip mirror bindist"
 IUSE=""
 
 DEPEND="games-util/loki_patch"
diff --git a/games-fps/tribes2/Manifest b/games-fps/tribes2/Manifest
index 5d06ddab1330..fb2eae2bb997 100644
--- a/games-fps/tribes2/Manifest
+++ b/games-fps/tribes2/Manifest
@@ -1,3 +1,3 @@
 DIST tribes2-25034-cdrom-x86.run 95560158 BLAKE2B a4516fddde83a8623348557983b3b5592c24108805da521d1b24bee21c06f8300ca812db8533855b70d924c59cf2bf417a771daa417c7f9b79e39f34a3611f98 SHA512 a3d2800af06d8659193ed1da4b9042af0924e1a0ade8a410aec31d66591efa2d2773aa12b33f7234975efee083974a77434bb1c0124bd57bfcc3be4898c46ad8
-EBUILD tribes2-25034.ebuild 2122 BLAKE2B 56abbd3c628f94595c2eb2415b8fd344f446bc71398f144bf3c092f7896f223ac0512315b83c2faef56fb9f9b7f9915505bcf8cd6d72387e2eaea330801ad344 SHA512 acfc53599d9754d526975641040b6cb520ffd7e2435eb0637df4a319d35db1900d76f4bc6c103f4e2dfeae8e67488bc0944384fa605978f51c4932f253d564db
+EBUILD tribes2-25034.ebuild 2127 BLAKE2B ac9cac766ece1b2b3358a209ce521ec502e1b5124b4e93a85aa77fcdff917ad0a69b9ee2e2472d3c356f4b6002252ed46d540a13df95b1a6aef7566034ab2d4c SHA512 20f4656f8a4d6dec75d75d5baba38bdfbd2f9233e9a306f3101777d810f1985d6b060c37617d2428e573f82e2fd04194e7b753eac05e9284716d03c0aae55296
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/tribes2/tribes2-25034.ebuild b/games-fps/tribes2/tribes2-25034.ebuild
index 817ede1c3913..9de54a92aaf8 100644
--- a/games-fps/tribes2/tribes2-25034.ebuild
+++ b/games-fps/tribes2/tribes2-25034.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SLOT="0"
 # someone does fix the patching.
 KEYWORDS="-amd64 ~x86"
 IUSE=""
-RESTRICT="mirror strip"
+RESTRICT="mirror bindist strip"
 
 DEPEND="sys-libs/glibc
 	games-util/loki_patch"
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 19f897fcbcec..4a39e2b858e1 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 2773c00f1671..6998c43be05a 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,7 +1,12 @@
+AUX el-wrapper 1646 BLAKE2B b4ddf1c5873b765af1c58a57cdb99b164f6e2558e1523253d4ed7a321ae9dc167dcb6f25271353d90549e24ff15387e087db88fda18f6832549a7e71168c4d98 SHA512 fc4e19608f40155f4e5014595b5497f6ebc0df0378bc430b9cd64c3a3139bcc8101e5831ef53e07866b456000c17d7e8209ff0d16e067fa434240bfc4851ee9e
 AUX eternal-lands-1.9.3-build.patch 16222 BLAKE2B c7da08215575f6a39fd586842f6a872706356f8c203abdb8865de325651d5e9e9e2976da5720cbe05144cc49bf9908667ce910b09bbc32e8a32e6ec82bd2b287 SHA512 b268c0f1dab0f86bfcea3d13122983c4efdbf9941d1851618a01986b2fc36139350e830c6838c229f7ffbb69fd51a46d06277eb43167a47e192b86db710dcfc7
 AUX eternal-lands-1.9.3-glbuild.patch 581 BLAKE2B 448e86a18de71390225c4bacb5d824da63db9c0213629c618856de0634d7b9fca97c22558031d79c2a7f69c273b7e68d02fde04c82d2d42b339227ebd7e5b35c SHA512 583b306f98975e8d86314519cfd0034870d07a2d908de9ac2fae9eba50ce90acc7f8949fbe40379a13308ebfdf33379f5801ccfe83d67c318b8edc3ddc0a9ed5
 AUX eternal-lands-1.9.3-minizip.patch 2142 BLAKE2B 6b3e12d4cfe47f5e808c7218b72f1f3ce571cacc5e916951068f1e589d8f00056add853d0d45ad72d060cd787f25c0d5f839359c39dbffc29ebfe7ef1a92c759 SHA512 2a560c99504a649de7d01d08bb4d92cdd803e6c91b2ef2d1e82449268e8248b468fb8bb855e8e73396e8d4e5e2def44bda9df07f654b730bb25b509550d0f826
+AUX eternal-lands-1.9.5.3-build.patch 2629 BLAKE2B 2151293ed631e75345fb2c264113e28d11ccf42471599ab4784f1ae19091602a0b2d1ef56da4a0396a263b7e8672810e12d96d0341666a8589037c41793b3342 SHA512 dba8288ee3309f97d779e0005f6f6234ce39de02badad78fe2b642ed120a09b2cda4b1558acf5bb3478a844c964454f935b407c02f0067ca837ab26c860494a1
+AUX eternal-lands-1.9.5.3-minizip.patch 2944 BLAKE2B be3ff1adb91681bbe826a409f2ec3c855c7dcb49d7aab076ab65c6c1145fa70e6cf98ae25a6d18b77fed63395c552047dae1407885758186ef7f3f9e737fd25a SHA512 feaf805e16bbbf33aaf15d6eb4e6303f1c80f135809952b59da2decdc8f1f2b65487031b7b9b29f969e631afa5bfc124741b385f4adff66d65cc1b0cf983f149
 DIST elc_1.9.3-20120213.tar.bz2 2401172 BLAKE2B 496315a0d09d0b7cb99a77c77965d3d85a675659ae1970dc2c7c7560146b165a48a35f6dfd7eb461d4347ee2023df91ba47c05120957f52f777ea530e868b8d9 SHA512 3580d3ceb94094443ef25f6e4880c9ffe3fff256c8d8e6657b4e0683a05184da9e6a76264557d2065a8187e3d36febd9d30ff5adff83a17607b1e478be90fabc
+DIST eternal-lands-1.9.5.3.tar.gz 2814562 BLAKE2B ccb3dd78d12817912293f8babbd5f5dde6f0e3ea0cb34526edd7a3f0371f5313f94ff2d6b22cf472442869dfcf9893c19ec72d7ccf879b0e6a3dbfa05249c38f SHA512 bf0da70080377a76c66d6201da6032aae2967051e23f8aa433d450ec845bcd91145b965632fa63f66feebc15eaa9a65ff8f33884cc1b7c3605125f1536d91563
 DIST eternal-lands.png 9955 BLAKE2B 376f6826bab88e798c39d79f00bd8c8758798b70beb980d44bfcdf0c4afb696ea15f58177267ddf189ce53ef6c2c33efdcf507f5135ccc000b56ca28de078f80 SHA512 c77571c949bb43fa7f95ae58f863ed972cfc76e184de5d0fa0a3599e4f7539f6334b843233b61fc807c90ef270d87cd57494510ce559427b592d255c198729bf
 EBUILD eternal-lands-1.9.3-r2.ebuild 2853 BLAKE2B 4431c51b3390d8b9bbe525d3c5a246ba3ca87a35e1a1d0fd0c54a83e81dd535062d693bd34b526e86502499d14a91a44ec9f302ed4d2e1e278a5ac4c5c30eb49 SHA512 d67cbfb1b521709f783ddb4429de88500efe327c89cf1a9c37043efa8a86fa28877621c158cd867a600b9b7e93818fc5b78aefa3cb967cb631d76321ec37bfcf
-MISC metadata.xml 482 BLAKE2B c0d2df678bcef1eb71b0a5f8824c90cd8d0f0b2fe5edf05db77e37d916b9a313dad3cdcbb64b08f793aef403dd6b79023a83584ce79073f7428a553da787e1dd SHA512 cb16ba8f0737fc26263d31d90e70d7468df8cb3fb09f7777f8c59b198f0f47d2139d5fc81597f7c63bff1afa242b60ab009f645c9269092ddc40dad2f2c62e1f
+EBUILD eternal-lands-1.9.5.3.ebuild 1613 BLAKE2B 7a15e0303d1aa003cf094dcdc8abc5576adb4146db6ea244c9cde78676136f70a5246dfbfafd0a2df3b2c6ee5f53c14f9c1dd10d0c783724cfed743e76e859e6 SHA512 4cd53ef77085a43503ba54ce78a58ab374eeec854ba3e95ca8d489c3651dbcd681c6d217d6fc6e8ba5a8c33e0e2ea4af963a46eecb7d2b5bcf57094ec6bbdd97
+MISC metadata.xml 385 BLAKE2B 5f7b3fd58c620d6dda10b183473856241e1ade18bdd190865a4c0a8432d1bbead7da0801acc99dd9b42c77757625a4cd145f615435317d0329e0028af8ece506 SHA512 a3b44275d69059374a2dbf2761b2ff68afdb3fb195f714f1d797c7551bae5c488249dd5dba9bd370e982e69d7ba347306c64a82d1894bf66fbf55a5db985df9c
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild
new file mode 100644
index 000000000000..772635913942
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="A 3D fantasy MMORPG written in C and SDL"
+HOMEPAGE="http://www.eternal-lands.com"
+SRC_URI="https://github.com/raduprv/Eternal-Lands/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="eternal_lands"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="app-arch/unzip
+	dev-libs/libxml2
+	media-libs/cal3d[-16bit-indices]
+	media-libs/freealut
+	media-libs/libpng:0=
+	media-libs/libsdl[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl-image
+	media-libs/sdl-net
+	sys-libs/zlib[minizip]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	app-eselect/eselect-opengl
+	media-libs/glew"
+BDEPEND="${DEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+S="${WORKDIR}/Eternal-Lands-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.5.3-build.patch"
+	"${FILESDIR}/${PN}-1.9.5.3-minizip.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i "s/FEATURES/EL_FEATURES/g" make.defaults || die
+	sed -i "s/FEATURES/EL_FEATURES/g" Makefile.linux || die
+
+	# Remove bundled minizip
+	rm io/{crypt,ioapi,unzip,zip}.h || die
+	rm io/{ioapi,unzip,zip}.c || die
+
+	cp Makefile.linux Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	use doc && emake docs
+}
+
+src_install() {
+	dobin el.linux.bin
+	newbin "${FILESDIR}"/el-wrapper el
+	newicon -s 48 elc.png ${PN}.png
+	make_desktop_entry el "Eternal Lands"
+
+	dodoc CHANGES TODO
+	use doc && dodoc -r docs/html/
+}
diff --git a/games-rpg/eternal-lands/files/el-wrapper b/games-rpg/eternal-lands/files/el-wrapper
new file mode 100644
index 000000000000..ab392d334207
--- /dev/null
+++ b/games-rpg/eternal-lands/files/el-wrapper
@@ -0,0 +1,53 @@
+#!/bin/bash -e
+
+elc=~/.elc
+datadir=$elc/el_data
+browser=xdg-open
+
+if [[ ! -e $elc ]] || [[ ! -e $datadir ]] || [[ ! -e $elc/servers.lst ]] ||
+   [[ ! -e $elc/el.ini ]]; then
+
+	[[ -e $elc ]] || mkdir -p $elc
+
+	if [[ ! -e $datadir ]]; then
+		echo
+		echo "The \"Eternal Lands\" launcher is downloading the game data..."
+		echo "It is only needed before the first start."
+		echo "The default data location is ~/.elc/el_data"
+		echo
+
+		tmpdir="`mktemp -d /tmp/eternal-lands.XXXXXXXXXX`"
+		trap "rm -r $tmpdir" EXIT
+		wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/el_195_1_data_files.zip -P $tmpdir
+		unzip $tmpdir/el_195_1_data_files.zip -d $elc
+
+		echo
+		echo "The game sound and music are optional, you can download \
+them now or any time later from the official website and unpack into \
+~/.elc/el_data/sound and ~/.elc/el_data/music"
+		while true; do
+			read -r -n 1 -p "Download the game sound and music now? (y/n) " yn
+			case $yn in
+				[Yy]) break;;
+				[Nn]) break;;
+				*) echo -e "\nPlease answer Yes or No.";;
+			esac
+		done
+		echo
+
+		if [[ $yn == [Yy] ]]; then
+			wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/eternallands-sound_1.9.4.zip -P $tmpdir
+			wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/music_full.zip -P $tmpdir
+			unzip $tmpdir/eternallands-sound_1.9.4.zip -d $datadir
+			mkdir $datadir/music
+			unzip $tmpdir/music_full.zip -d $datadir/music
+		fi
+
+		rm -r $tmpdir
+	fi
+
+	[[ -e $elc/servers.lst ]] || cp $datadir/servers.lst $elc/
+	[[ -e $elc/el.ini ]] || cp $datadir/el.ini $elc/
+fi
+
+exec /usr/bin/el.linux.bin -dir="$datadir" -b="$browser" "$@"
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch
new file mode 100644
index 000000000000..28f4ab0da542
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch
@@ -0,0 +1,70 @@
+From ef13ae006609e51eaddbcdf0495f44cfde797e26 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Tue, 14 May 2019 20:34:47 +0300
+Subject: [PATCH 1/2] Respect {C,CXX,LD}FLAGS
+
+Upstream-Status: Inappropriate [Gentoo-specific]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ Makefile.linux | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.linux b/Makefile.linux
+index c57aeeeb..a0839c5c 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -17,11 +17,11 @@ OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
+ 	$(shell pkg-config vorbisfile --cflags) \
+ 	$(shell pkg-config zlib --cflags)
+ 
+-CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
++CFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
+ 
+-CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
++CXXFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
+ 
+-LDFLAGS=$(shell pkg-config sdl --libs) \
++LDFLAGS += $(shell pkg-config sdl --libs) \
+ 	$(shell pkg-config libxml-2.0 --libs) \
+ 	$(shell pkg-config SDL_net --libs) \
+ 	$(shell pkg-config SDL_image --libs) \
+@@ -111,7 +111,7 @@ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
+ DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
+ #(shell echo $OBJ |sed s/\.o/\.P/))
+ 
+-EXE=el.x86.linux.bin
++EXE=el.linux.bin
+ 
+ ifndef CC
+ CC=gcc
+@@ -127,8 +127,8 @@ all: $(EXE)
+ 
+ # the compile targets
+ $(EXE): $(OBJS)
+-	@echo "  LINK $(EXE)"
+-	@$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
++	@echo "$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)"
++	@$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
+ 
+ #recompile on Makefile or conf change
+ #.depend $(OBJS): Makefile.linux make.conf
+@@ -136,14 +136,14 @@ $(EXE): $(OBJS)
+ DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :)
+ 
+ $(COBJS): %.o: %.c Makefile.linux make.conf
+-	@echo "  CC   $@"
++	@echo "$(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
+ 	@if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
+ 		mv ".deps/$@.pp" ".deps/$@.P"; \
+ 	else rm -f ".deps/$@.pp"; exit 1; \
+ 	fi
+ 
+ $(CXXOBJS): %.o: %.cpp Makefile.linux make.conf
+-	@echo "  CXX  $@"
++	@echo "$(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
+ 	@if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
+ 		mv ".deps/$@.pp" ".deps/$@.P"; \
+ 	else rm -f ".deps/$@.pp"; exit 1; \
+-- 
+2.21.0
+
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-minizip.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-minizip.patch
new file mode 100644
index 000000000000..c1eb35fdc849
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-minizip.patch
@@ -0,0 +1,90 @@
+From 7df2f0a47ff2d25898063dc2fb30ba3d80d63afb Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Thu, 16 May 2019 05:31:16 +0300
+Subject: [PATCH 2/2] Unbundle minizip
+
+Original patch by Julian Ospald <hasufell@gentoo.org>.
+Bug: https://bugs.gentoo.org/423327
+
+Upstream-Status: Pending
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ Makefile.linux     | 4 +++-
+ io/elfilewrapper.c | 2 +-
+ io/ziputil.h       | 4 ++--
+ new_update.c       | 4 ++--
+ 4 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.linux b/Makefile.linux
+index a0839c5c..d29ac912 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -12,6 +12,7 @@ OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
+ 	$(shell pkg-config cal3d --cflags) \
+ 	$(shell pkg-config gl --cflags) \
+ 	$(shell pkg-config glu --cflags) \
++	$(shell pkg-config minizip --cflags) \
+ 	$(shell pkg-config openal --cflags) \
+ 	$(shell pkg-config vorbis --cflags) \
+ 	$(shell pkg-config vorbisfile --cflags) \
+@@ -28,6 +29,7 @@ LDFLAGS += $(shell pkg-config sdl --libs) \
+ 	$(shell pkg-config cal3d --libs) \
+ 	$(shell pkg-config gl --libs) \
+ 	$(shell pkg-config glu --libs) \
++	$(shell pkg-config minizip --libs) \
+ 	$(shell pkg-config openal --libs) \
+ 	$(shell pkg-config vorbis --libs) \
+ 	$(shell pkg-config vorbisfile --libs) \
+@@ -64,7 +66,7 @@ COBJS=2d_objects.o 3d_objects.o \
+ 	hud.o hud_misc_window.o hud_quickbar_window.o hud_statsbar_window.o hud_quickspells_window.o	\
+ 	help.o highlight.o ignore.o image_loading.o init.o interface.o items.o io/fileutil.o	\
+ 	io/e3d_io.o io/elc_io.o	io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \
+-	io/half.o io/normal.o io/elfilewrapper.o io/unzip.o io/ioapi.o io/zip.o io/ziputil.o	\
++	io/half.o io/normal.o io/elfilewrapper.o io/ziputil.o	\
+ 	keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o	\
+ 	main.o manufacture.o map.o mapwin.o	\
+ 	md5.o mines.o minimap.o misc.o missiles.o multiplayer.o	\
+diff --git a/io/elfilewrapper.c b/io/elfilewrapper.c
+index fad99d62..5dee9a37 100644
+--- a/io/elfilewrapper.c
++++ b/io/elfilewrapper.c
+@@ -1,5 +1,5 @@
+ #include "elfilewrapper.h"
+-#include "unzip.h"
++#include <unzip.h>
+ #include "elpathwrapper.h"
+ #include "fileutil.h"
+ #include <sys/stat.h>
+diff --git a/io/ziputil.h b/io/ziputil.h
+index 86128315..51fa232b 100644
+--- a/io/ziputil.h
++++ b/io/ziputil.h
+@@ -8,8 +8,8 @@
+ 
+ #include <SDL.h>
+ #include "../md5.h"
+-#include "zip.h"
+-#include "unzip.h"
++#include <zip.h>
++#include <unzip.h>
+ 
+ #ifdef __cplusplus
+ extern "C"
+diff --git a/new_update.c b/new_update.c
+index febd10ae..ec039f6c 100644
+--- a/new_update.c
++++ b/new_update.c
+@@ -5,8 +5,8 @@
+ #include <string.h>
+ #include "md5.h"
+ #include "elc_private.h"
+-#include "io/zip.h"
+-#include "io/unzip.h"
++#include <zip.h>
++#include <unzip.h>
+ #include "io/ziputil.h"
+ #include "io/fileutil.h"
+ #include "io/elfilewrapper.h"
+-- 
+2.21.0
+
diff --git a/games-rpg/eternal-lands/metadata.xml b/games-rpg/eternal-lands/metadata.xml
index 3a16e77fe8ea..3b426abd6bc5 100644
--- a/games-rpg/eternal-lands/metadata.xml
+++ b/games-rpg/eternal-lands/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rich0@gentoo.org</email>
-		<name>Richard Freeman</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<longdescription>
-		Eternal Lands is a FREE MMORPG (massively multiplayer online role playing game)
+		Eternal Lands is a free 3D fantasy MMORPG (massively multiplayer online role playing game)
 	</longdescription>
 </pkgmetadata>
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 049b016205f2..059253c26911 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index da128893fa0c..a6e83a9f6c5e 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -2,5 +2,7 @@ AUX README.gentoo 602 BLAKE2B 53d39bd63283a570b0de64481de26a4eb481b84f00619f34fc
 AUX minecraft-server.confd 318 BLAKE2B c4ae9a7e68e0db71f9cf648aeab10030264a544927f697d005016662a402bd1d64ea02779eb6b645c16845cec6b22842cf08c51734d608f90eb0d45f6c786a67 SHA512 bad9df2874a862f28a2a34f70509c34086ab5d63e6bfda79905f4058a029141ada592dc435d9773b6aa6332447c875675d68e7152ddf18b55a6157b81ed82f95
 AUX minecraft-server.initd-r2 1376 BLAKE2B 70dd8c49bee705e4e64ead008125af4b021ec205067c86a74fb197e66762fbd064672ef19d334ad3ad2486094bdaff74b1367b39c885a38f487f8d17aee40850 SHA512 1034cd5219f1cd1d9360138ab4fb1142f682db68abe66ae0e5bab3190b6606ec1976488420fa940b7467e7989c987e4520813b93bd86918cc1ed6f0a9b319fa9
 DIST minecraft-server-1.13.2.jar 33835116 BLAKE2B 4d92068d51555ab44a2efcdbb1676ef34a7085e4d666a7915c4c5a3d1f9502536df4bf67909d27b7b94cb8ebb483dc55f935f21930d4bc454645ed44ef8e6ed8 SHA512 c9a98f1d224519369d6c4882cfe93a94983661c0c0b8a7f0b2f271af752fde5693025b684a01665992b3c70b37ac891ce1747f062bd86354777c416219629b64
+DIST minecraft-server-1.14.2.jar 35932967 BLAKE2B 1dbba4ae065a05539db59412c393de9c183384ce5c4edf2f19ffd702c60e1f85c10362abd3f75c01bff08d764bdcab2783c569ea722d582ef1049d7a688f2448 SHA512 9670c1038aa23c3012241a5a103ab5a3e989efcb13edd45f318f92e9968f5f2e99314d3edd0c6851238772e2e1cc5b4bdaeac686a7622e321ac81bf40e2a3cf7
 EBUILD minecraft-server-1.13.2.ebuild 1255 BLAKE2B 311809aa76df3a3e92f3baa1dbb5365c0b954e540a0ea1f3988a631788fb9580bd09218b715f5e2597b0431c11f710f9ce80a756eb67100ce249219d5f69243c SHA512 fd0cd3745f0ec6d8fd48d16a651d057ce767e333931c17dc36c54430bab6737559dfb4738ccf7ceac2ef7f98d61df8c8d7a4e45d1dd05110b45d75afdb9fe65b
+EBUILD minecraft-server-1.14.2.ebuild 1254 BLAKE2B 10d73b75ca6a018e7033c3775ac87fef7b3da8caf7c8c8bdd7e7495a089436790d3bf14b5553158e8064e48d31a5473923f26aa89e8c8633b1c1c1162589f79c SHA512 caf0671e08aef8543f8b4988c0a39d0f287b4954139adab2d9a78bdc7bcac2e1f7b610d70bb7c0984cca553682c07795ea27d90c2caf36e136b0464e3b7fb2e6
 MISC metadata.xml 614 BLAKE2B 78e166781dd7310c6e8a148ba0bc1e36c8e6a21a64587d65b5239f43e7dda4b494b77b254b420e3c1317390debad03ec35847eadbf345aec3c0ba1a6d759f546 SHA512 0deb2afc6cfcfc57351b210f21506ffb5dca43e51aeda268a92781640d8940ce71024ed71a8de249b4ac135da92fd5e741bd8be5e5c00cf0d4b26100b838ac10
diff --git a/games-server/minecraft-server/minecraft-server-1.14.2.ebuild b/games-server/minecraft-server/minecraft-server-1.14.2.ebuild
new file mode 100644
index 000000000000..3d9540765c05
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.14.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="808be3869e2ca6b62378f9f4b33c946621620019"
+
+inherit readme.gentoo-r1 java-pkg-2 user
+
+DESCRIPTION="The official server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://launcher.mojang.com/v1/objects/${MY_PV}/server.jar -> ${P}.jar"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-misc/screen
+	>=virtual/jre-1.8
+"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup minecraft
+	enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft
+}
+
+src_unpack() {
+	# Don't unpack that jar, just copy it to WORKDIR
+	cp "${DISTDIR}"/${A} "${WORKDIR}" || die
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
+	java-pkg_dolauncher minecraft-server --jar minecraft-server.jar --java_args "\${JAVA_OPTS}"
+
+	newinitd "${FILESDIR}"/minecraft-server.initd-r2 minecraft-server
+	newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
+
+	diropts -o minecraft -g minecraft
+	keepdir /var/lib/minecraft-server
+	keepdir /var/log/minecraft-server
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index d4c7b541e856..52ccf8a24fb4 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest
index bf69810036c1..168420e6169e 100644
--- a/games-strategy/heroes3/Manifest
+++ b/games-strategy/heroes3/Manifest
@@ -1,5 +1,5 @@
 AUX heroes3-wrapper.sh 195 BLAKE2B 8c588f523487201cc7323f49e0912c32dee2699d04ed4ac9bea55aa588918fc797c93d2fbeb04aa5a726ebce01e0862d5e21a80d477f1e32f535f5c5c9d771ef SHA512 ac1871676ffb0c818ddd9dcadad031d3e296982a989dcc91241b2630eb773e341058e1d4406374a21bcc0f6c8caba94398541ddbc540e7c140660838ef3ed0c8
 DIST heroes3-1.3.1a-cdrom-x86.run 3012188 BLAKE2B 9a76fef81737fd4d0bd6d6c75a5c845a8fef00e739463737996b2065cc9be0c773c198d76310ceafb25cd60b01ded7862cc3ef906eebbe91d50d5f34d454a23a SHA512 d0cb902386361b17009aece0d0508a0c19683c71acf3abe11a7f50ec2d4710a89cda3f5f9da326b58e9b945da5f62533dea54457e141ce71ebc3e9945dca814d
 DIST heroes3-1.3.1a-ppc.run 2643068 BLAKE2B bb975aca97d5b753badb6f0511f2bc88f3ace3488f82a1d70ddd5cadf78f8ab57c4472f6d3d3e9f69728d1008d51ab31a816660611e421873f7b773bf76fb23e SHA512 3578dbed0ed9fd47f67e6abaec4b4d66628160509e68dc3bea7b5288230e344b5b8f9d380c6a35ffc9d084d0e2a54ce84df72b13bfb609fa4d7edd1456264276
-EBUILD heroes3-1.3.1a-r2.ebuild 5478 BLAKE2B 6b13ab2a5bf911b39b36d73cdb702f6f643cdb993ed9a2130799eb8f16427b54dbb66bedbc1fba5b8ebc85c7bc4213b0fd2bb6f59b6adb6804dc8013325372c0 SHA512 56678d9f57e964d89f93fa61a11c2cb3c2b476bbe982a1b861b01859655de51a579e34114b210d2fba412506ffe2db3693a035b854acd0e7e4ba1142596595c9
+EBUILD heroes3-1.3.1a-r2.ebuild 5490 BLAKE2B a28b071bb1d6aa050206caf1bb60fab3cd57efe9cdb69f4176e6e8e56615acc624b4d1ab62b895330d0e6a42adfa9da1989a9a9ddf39a4ab68dfa678e4a22041 SHA512 51047c467215e0127630dbb056107220f4bf71d6b03006f509e49f4073a19275681790c07cf73e13037a90cc1923a5f56d63a96db14639ef62f4d3fd12b1f427
 MISC metadata.xml 451 BLAKE2B ea23bfe60a36d79f73d5ec04c4b58fe66241baff684458e6121f0f247ee8516767f372551e8b17933cbdb4271d3e99f6028c9a99136daa6e8b558e7a918acf2a SHA512 d4b4f5dd75aec49703e77221d3811c20f72405f45f5ac7990e46a8cf8d639f3c53c5bfae13e6615c0a0ac16ee57073c8e92de355f7e1ac934d9be6b90bce6990
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
index a08da4b3256a..46b85c58595f 100644
--- a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
+++ b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 #	[x] Base Install Required (+4 MB)
@@ -39,7 +39,7 @@ SLOT="0"
 IUSE="nocd maps music sounds videos"
 #linguas_en linguas_es linguas_pl linguas_de"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
+RESTRICT="strip mirror bindist"
 
 DEPEND="=dev-util/xdelta-1*
 	games-util/loki_patch"
diff --git a/games-strategy/smac/Manifest b/games-strategy/smac/Manifest
index 00cea5f3ed46..2961c95d4a77 100644
--- a/games-strategy/smac/Manifest
+++ b/games-strategy/smac/Manifest
@@ -1,4 +1,4 @@
 DIST smac-6.0a-x86.run 6801730 BLAKE2B 95d50c79cde06c4abb5473d7a67f4a66205f7147b7796c9f5e62273776083ce592ec748fd4db559b57568075fb53b4d44db05b2cf14e450ed5757898da6c26d7 SHA512 b71dd1ee46d37d66131cf6fc15c6a406719989021c8dbb6e74cded18c5520ee9ba4bbdfc5bdfc0ddfa67fa2e846365636be41d87a6440473e8ae5ebf542b7744
 DIST smac-install-ppc.run 18528928 BLAKE2B f5c9689c192ebd8ae03d5bb5d4db6deb2b19c5924ce87426cb9140163c9b53a1c4b0ba8592d8b823b2b73847cbf4ffa6d400000a3cf458dd5473ab6bd0aef965 SHA512 99fc6edca2c9e64bfc0cab644cbd061c3842359c16e5e6537a2aa2df4cd2a1a6a39169a2b9540199b08f7aee28f4e2cfad814499fdd55b5edf7ab9b19c12d793
-EBUILD smac-6.0a.ebuild 3069 BLAKE2B dd865b2d81bc1bcb69254beed8f8f9066a83e87541bac41bd230a895f72939b8f0780fa6771cda473c3fe43a8277531e026c0da204b921f83d0f87cdec9e070e SHA512 031b661c3fc11be4c3474fc7c752ca15332b982e527f61560763c5a3592369262e5ce76157f61f00a635b22b0d0be489732183ae5ceb42a09fda004ecb5d315b
+EBUILD smac-6.0a.ebuild 3081 BLAKE2B f4307008823a84ab2f47d445fd8e97a53f78b5320a6afc1e58cc79a6d5a4a15c5569995a02f9ed6eb3e2d2e8ee66062a5b9397546b8e94b32d6209d1e9bbbc72 SHA512 d581ce47fe9b14d2b2652c435972c2af563a4d956dba74583c8a8b8f645f6deeb4e5fc299fcb02f1981868213bba884c6c6388cb1393bfd6ee0ac4c951195061
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/smac/smac-6.0a.ebuild b/games-strategy/smac/smac-6.0a.ebuild
index e6aff2ef3a12..098890ca9b4c 100644
--- a/games-strategy/smac/smac-6.0a.ebuild
+++ b/games-strategy/smac/smac-6.0a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+videos"
-RESTRICT="strip"
+RESTRICT="strip mirror bindist"
 
 DEPEND="games-util/loki_patch"
 RDEPEND="sys-libs/glibc
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 590d89579787..d0e79550790c 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 9daf18aa068c..a5155e77ae4c 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -2,5 +2,5 @@ AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b05
 DIST dconf-0.26.1.tar.xz 218516 BLAKE2B ddb23a1f6519b5460903b1a91ba48242f144a768f7ec5b9e82953589474df998061a4fbfb3605027cb51db44f7e49f88c774a735600de2bedaf8889b58e050bc SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da
 DIST dconf-0.30.1.tar.xz 104376 BLAKE2B c5a90c092b6e028dafbc9aee2f29f622dc4a696e815266355de4a056fe507b0cca9eaa9b10753501ee44f74ee57d0095fd55aafc7205ffea1f0321ed705dbe0b SHA512 f7d136aec7cb75b64c7d9446d520f4c4af368e6d22346b7bb8ad66c08afaa03a72aacd44016dae7690e37b7d0deb9a16187445db176427a12a8b3cd3885c9e03
 EBUILD dconf-0.26.1.ebuild 1498 BLAKE2B 7829c513e07d7d7f40404f18a173310b4d7f9d591650b807529512b37431c34404fbc8a3b02cf854044e450c6009eb02b1a5582dc930dac621aa2a961d46f14d SHA512 229b151dc70b0dffce0998fab2dcb6e7f8b44c518e9f07ca80340f53124b9a91cc6b2c1c2ca6c64be9704511ed46505ee3c6f45c14fe666f2e64ed96adeb5e7b
-EBUILD dconf-0.30.1.ebuild 1837 BLAKE2B 4f0454046da38237b306858ee218acdae3110b45269331bb0e083425e55ec344addaa992bc9936269379d8db0f5507a8afecbd8c4faae76c56fe5dc46e8c93ec SHA512 fc54cb98122e12c9533fe6c3b9be4ff06b871e607418db0798660e30796ccc91cf5548572f38fb19cb4c3726f3f4bbbc6e949bcb47b8b1735112e1dba3602123
+EBUILD dconf-0.30.1.ebuild 1836 BLAKE2B aefb138e9f3b272678f2c19d6f045a7dd48f43b33cc6f3ea04dca50b137557ba63c198501810d57347bb7b2e489abf5002f4963b77c1b0d0cb16f23b0c4bbe64 SHA512 909c48993239b1e6a76ba0c4db10c211b071cc2d226c4bdf8f3c8cb885f168a8ac9d51e0ae42e807f4cdc1289de71c9b64b1c033a604c8abbc2f78e739ded20a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.30.1.ebuild b/gnome-base/dconf/dconf-0.30.1.ebuild
index dff2814c5947..5de86babfd8f 100644
--- a/gnome-base/dconf/dconf-0.30.1.ebuild
+++ b/gnome-base/dconf/dconf-0.30.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 2ac318271a5e..4099ac19a0a9 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -7,5 +7,5 @@ DIST gnome-desktop-3.30.2.1-patchset.tar.xz 3572 BLAKE2B e8a681ea7a3eab8186c89d8
 DIST gnome-desktop-3.30.2.1.tar.xz 1052492 BLAKE2B 064ca0580e00e7561bba73a4ae14fb642fb3c66e9619cf3690df996bbcace27188da0bc33384f06147f69653f43ea7bf73adddeb4477a7d231db66e6dca444ed SHA512 dddce479ccbb7245c6bea0638199118a88ba6d4f8f61e0c673aec2e738c26d9a99053499b3db190f731cf48ef8967feab5e4b253fc96ae68aa19d235bb52b31f
 EBUILD gnome-desktop-2.32.1-r2.ebuild 2296 BLAKE2B fbd9347c8215cc512b0a510da35b4e12425f7c33a40a6081f714ba3cf4d71eabf66c27c230eb08147d9c56c1d15ac9586c7ecaa894baffc6721fbba35bcda062 SHA512 427f8dca28ce505920a02e0f540b3c311baff2fc03dcac908d07d4d4e463f70dbb3b642ae53129ff7c4a2892efc34ca84683316cb15f493c89968ed390e4b74e
 EBUILD gnome-desktop-3.26.2-r2.ebuild 2060 BLAKE2B 162338d1095af7c06f71f74a3041530a94697a028ba0280b2d1b636f8232963abb13334ce6aa67a64844d3e587ba851ee3fecd5a11f4a31c3201b472a6070cb6 SHA512 09979d7241039cc5f2a82c614b3d0cbbcc7850eb744958645cffb68a64b314a43b21ff53fb8f01610af6066edf8a6b9c63b4509e010985a8ee465818ce8eaf36
-EBUILD gnome-desktop-3.30.2.1.ebuild 1998 BLAKE2B 3e1c649138fc0cbf1ea59b656f080183f7767f042216ce3e73c1e1f786934f6ea5007c755214c91dc017efa46c08fa1f7e0206cd3d2487ea2b95faeaf386fe7e SHA512 763bfa1f9b960f05493846efaab179627f60e8ff4099cbba7dbebd817bb2255f979185fb553d445b8e6e24d53d72904ca2411fc651e371a9afeff3e45e568145
+EBUILD gnome-desktop-3.30.2.1.ebuild 2004 BLAKE2B b2248519f1261b4f9834b50b2fe006e770a8a3948be1ea0893659a63ae5d92f110311264065e44c4b53827e9f02db4cc853ddfc1cf7aaa659b68df3d004ebe53 SHA512 5ca8b210b320029bb7924d7188f272b1b10a1b0b3bf58f1fc71c1dc0666c565cb2af80322851f1725030c3b6a72a93946e1d4e1e19a32d13377c52fd9480a4cc
 MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.30.2.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.30.2.1.ebuild
index 2cb5ebf48a84..c876ea13a3cc 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.30.2.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.30.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3/17" # subslot = libgnome-desktop-3 soname version
 IUSE="debug +introspection seccomp udev"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 96c782e75a11..a18330b9e03e 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,5 +1,5 @@
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 DIST gsettings-desktop-schemas-3.28.1.tar.xz 652416 BLAKE2B a9ddf44153a83fa188f873e6bca29499e1abc7dea310c6eda3193233e363607781c93bca64a9ddf2f31137e22e54e23b0f139e90ef99c181aac9a976409b6c94 SHA512 2bf3260e976943e9d1e51feda62ef1e432870a6d9b34881afbdf99ddbe4954e5dd679697e152e793a0b38492dbbc4891018f7aa8cd4e703d05a8647cc5a56785
 EBUILD gsettings-desktop-schemas-3.24.1.ebuild 773 BLAKE2B 0e1ae32f96f19282f026d4247c1dc95000525836c0d8528d1ee275ae5bbe4511cf2f23fdf693a56480e83ad22f620d03c8f24bd9a8d0b236f5bd976f404c5892 SHA512 e8b192cb63c0a765b79c14db77b6fe7d205dfacb78875ef3038d8eea5a54c180bb6db3e6c8664c20960f7aea38b39df2b968003abd56ef2f4273e7c78df08e23
-EBUILD gsettings-desktop-schemas-3.28.1.ebuild 780 BLAKE2B da7c4af14669d72d2b2b9bccebac1e57fbf3a271914b2f123bfdb28511a24688a5bfdf632868d69f649949ee32778434e441636e86807907b9fcbf5c3c6d1d86 SHA512 1dc6a5fb4e43729d8792f3651d19dc38f3611dda1f78222061dc11ebf9b5000a089857c329e259628f67ce6ef9982e60be95d3a1b32c58ccefe9cab2eab71edf
+EBUILD gsettings-desktop-schemas-3.28.1.ebuild 779 BLAKE2B 547fa563ed24c7b69815d87fe6900a53ef4c148f544779b4371d0ecd841a72a6fa50ef626270dd376049b295825f1b44b4dc7894a9284692f09ab8fede69fffd SHA512 b48f7113dd184d06c1665441f6032c92664f61f004f07917a7349f54828883ab0d0fe8fbe2584e6f44b48c062afc547319b04abf9a17912e40640f810fcdba17
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild
index de57650e9d33..cea124823ffd 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-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 ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 8d524839e642..2b069e7e9002 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -3,5 +3,5 @@ DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa
 DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457
 DIST gvfs-1.38.2.tar.xz 1202808 BLAKE2B 31150c10e042b262a55f4a072496138f47532ec55c2cae564d7c1a7a06b043bf131a91a633757fc02a0a31fc052a6ae64bd25d357cf60efa10b9490c6d1a9d84 SHA512 b6982f2c23cae057aebd00dab52b4f21f8bcef79fc5e97c098d54a9ebf997913f53146bd1760065454198c94a66f1bc1fc5325b08fea10e63a755fad87321488
 EBUILD gvfs-1.32.2.ebuild 3811 BLAKE2B e0980669a87db9f15e07e81e281ecec55ce72aa98f924acf182fbf9aef851dc8b7566ae15b81f635fca1150da730aa17f1d20e5242e4116f08d16117cd80d174 SHA512 a7e156297e36658b14b9c76c2c78318ea135a4be914ff06f587cafe3cedd5b9c44d6e946117ad520a65551b15fba5fdfd65de2862f3d8ad10fd6f729f983ddb4
-EBUILD gvfs-1.38.2.ebuild 3659 BLAKE2B 2f9c78e51d970378890b0419a6ce43b432720b6516c814ad56467e9bb96bc6ac19af19260235a43295b151e74d684944c0d3fc9e09f5f8333c64dbec9aa2ade6 SHA512 4d21bbc3f98add447f0a98ffd99058566a59f052175600b72ebe7adec259c3b85ef03d9599918d091de0b3e4c16e52a09d5d7f723b0cc06b3d8bc36f19dc8183
+EBUILD gvfs-1.38.2.ebuild 3657 BLAKE2B 670e1068bc59ed2ecaad5c101e02ad3a382f2adb73ffa2657b85f78ebaa0781f205fe50d6f598b363d2883c80d1695bee01c7219ae2cfbb32364f1ffe519afc7 SHA512 d8c9748cef3e427735c85a08df4661b3c30a5195d58ac21f874948e15b00aeb237010777a09ea6c56ed65928b8fb2d1fabd964bbdf52a78899d42b3fdf091bf0
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.38.2.ebuild b/gnome-base/gvfs/gvfs-1.38.2.ebuild
index 9ab2161ad96f..edb6eac9f3a7 100644
--- a/gnome-base/gvfs/gvfs-1.38.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.38.2.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.57.2:2
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 442d9842816b..235f9c21d6dd 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,5 @@
 DIST libgtop-2.36.0.tar.xz 727072 BLAKE2B 46f24573bde0bcfeb2210ea08446f6e6590fadc5697745178133ce5f3aec2e464cbce8446d2dbddb9f05d4a16eb7daf110c4554778a28573116b2b59edcf556f SHA512 2768c628fa3e872a940246042b2c78ad4618612ecb2cf2b95fb70343a4f1a01bb558d0ce9e5b3468f395349f338ca33d460e1d91f2c123ad39243cd0ff20d5e5
 DIST libgtop-2.38.0.tar.xz 729700 BLAKE2B 2296741d6c6bd1c9eb17be10e480dabd732e956826c859c176cbc6f8f03259a3b2f2f04d6c55d1c562b082f7e880bb4b7a3f07a66d7f24660085387dce078879 SHA512 96586b7f12a2b63c5ec7f69c51b6e28361a7458f24f20270fc589213bfae43ae99d1e39efb6101d189741bba084c887554f745131e99d8ed90b7db6d53c36e1d
 EBUILD libgtop-2.36.0.ebuild 770 BLAKE2B 71a2bdb383799450816be360031d49f469974bd5d7d75a5c582416f53c00cae349bdcd8017cc97badb988651a0807dbce09adb1a28b5dfa2f39760674560ea94 SHA512 20efa1d4e1cb504c03cade5ca3490600a7c6b6214f5de4f905fedeec4f14c975f13550f89be1167eb249e465fd19fb7cd6a0df67a237fc4a3d1b2fb6c7233ad6
-EBUILD libgtop-2.38.0.ebuild 773 BLAKE2B 8bd4b02b245abe84e56e0f425a0780138a0bc177991930145004361689d625bfeeb30f267b99693c8bcbd5ff9dc8b431f626aba3fee98e6046696ea4692e061b SHA512 6511a69b027907fabaf29d000cb2e48f566b53fc6ba6a5df71e0fcf181b6d9b2af7052bf33fd00fda6a670dbcc6da67a767e785f3dc083ef0964b7b8ce4476ca
+EBUILD libgtop-2.38.0.ebuild 772 BLAKE2B 8e71709e0b6b78813da6ea805b06eafa8cac92778a131d18e45a9161fd56d7e505dbcd45a37beff36098393df62655266270708332e9be1222c19a98936f4159 SHA512 3e6f98073427c7467c713b6daa8bc94e1b2d211cc1a1fd4546206930dc6df8657e88bd25844a6f6408c4fc352c25791bb266f077127399e2819575719ea1350e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.38.0.ebuild b/gnome-base/libgtop/libgtop-2.38.0.ebuild
index f4a8d7d5623f..39e474f17a26 100644
--- a/gnome-base/libgtop/libgtop-2.38.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2+"
 SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 2522f5158ea8..875075326060 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -3,5 +3,5 @@ AUX librsvg-2.40.2-vala-out-of-source.patch 1066 BLAKE2B 43bb0dfdc90f3fe3084e23e
 DIST librsvg-2.40.18.tar.xz 574384 BLAKE2B 964997ef3bd5f8bdcab43e67f22d12458683c0eeee2fa81e7a6199f6a31c7ac11c599327a6a66118000f63549ea735a042c71429635f6dc9bf073f12eab067b6 SHA512 faf503d0d881801ce129715e7ae979ee1675bd32beac9170b1889c94aac64caf486968bc86f3480463b84e94f28c1d805551ffdcb7068ecadd0688146e0fb182
 DIST librsvg-2.40.20.tar.xz 1796376 BLAKE2B ec8e7308a0255aa22038262d69019e810bb78b92e3de62662b53ab375110c8186e565e1eb7f5825c61c6d10bed1876ff3f7a06d1073e9676a3d2bb5dfb6b791e SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f
 EBUILD librsvg-2.40.18.ebuild 2686 BLAKE2B c93c8988aba169199d3c631a9ba394b0cff890f6729bc7f7373d434e4653fec755a4421d70df6406087d2d22b795d2c59f7389e13eac37adc58dc90ddd02387a SHA512 52fe6200b0ea54eb7211fe22f84914bc14791adb29703ae720d8ac843219794674a109a773ddc37ac55d82d7e235cee9d089fc4de5b78924276d210fa691acbe
-EBUILD librsvg-2.40.20.ebuild 2697 BLAKE2B b4af074f6aff6b89447d1e96a9176bcd182d6f4f08daee34b0d718e959e7019e70eac476bba61fdb6ec1b272f001453da8d98d9265e2996ac170d52eea5570f9 SHA512 a3db86c75d962dc747c63391b88c84f6679d67ae9aa9edd1a15fdaf4ec7e90ce2a2fa500f621135584d20ecd710b14e3e5c796196ba36dfaec6a5360e57cd5e5
+EBUILD librsvg-2.40.20.ebuild 2696 BLAKE2B c6da4c75f4c6cf7c583e8ba6a529302426a03cbb3f34691e6549c8a40b072ab4b0bceb09b680964495188960c6e2bf935a552376eca542f2e7388ae15fee2a06 SHA512 8cb04b588594efa846c51c6f413819271db498e5a2f0dfc6187dcba70dc4b775e647297addb7b53ef833acd9bdfa0c6bd4bde4a9bcadf883fc03f6b8dd1ca7d6
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.40.20.ebuild b/gnome-base/librsvg/librsvg-2.40.20.ebuild
index db1ba2d0a330..efe8251b43f2 100644
--- a/gnome-base/librsvg/librsvg-2.40.20.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.20.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection tools +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 352541de09a6..f4412b2402e8 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -7,5 +7,5 @@ DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5c
 DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13
 DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
 EBUILD nautilus-3.28.1.ebuild 2656 BLAKE2B cd1f74358d8e23af670c498ad510c27e261423ef560b59559be4ceb79745b0db16f61da3580edae7998ca88eb7983401ba656c0a105aca362770f6ad2a08c206 SHA512 6ab0cbc44f446eb9e82d9046aaaee77f1bb34768c2583ed5143fd17f12af7d2f46027f08732f9483fce151091d6cf167e13879e301360056ded4a2326bb9c4d5
-EBUILD nautilus-3.30.5.ebuild 2774 BLAKE2B 267b558f87c9e1de6a6098f6110bc53ee9a85c69982322713ed0a9f3e1cd35781f277e08b5d2a23736ad318d5388a1474b6df5c7f78b6fe70d8b633a3b1bbb0f SHA512 54ea6c27d8a284084cff10daa9a0317ce56ea2dc9f64b62727893c17a0a09df6655e6474983ad1bed09a9e2197c5fc4558ca7480968f85ab8d66673679ffd494
+EBUILD nautilus-3.30.5.ebuild 2780 BLAKE2B 89428170b804da39250b721558dc568700549d1b0cbf7b35989074b7402d8271ca8b684b5d1b9e7a318f2984bcfaa51e67dd4c392109403dd9481a1e21723283 SHA512 1e182d99407ac7464b2d68801a2a49200f4bd3a7e781bc7506a7c97045ca8dcffc382b088fe2b5c96d0de6d94f0066fe0c3b889f68495a075f7fd64e85bd2f4e
 MISC metadata.xml 577 BLAKE2B 16a9d9904b6a1cb02d844b3a90cd87e4398024a16d4cef1a5106190a06b6d60058db172d1ae1ae0b424c3a2c864dfacbedaca696e847f88a1a5ae300a2cb04b7 SHA512 c42d9a07ac2a05a5da2c6c10c49c3810ed3409ac00d5d7e744d15232fb62ec0f84d2ebcb36c5a819a476ae922900d1d8270101b26a766e85c35d3fa2d6531747
diff --git a/gnome-base/nautilus/nautilus-3.30.5.ebuild b/gnome-base/nautilus/nautilus-3.30.5.ebuild
index 6e3ce6e6522d..4fd2e7af0498 100644
--- a/gnome-base/nautilus/nautilus-3.30.5.ebuild
+++ b/gnome-base/nautilus/nautilus-3.30.5.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.55.1:2
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index bc7745ba9ad1..3d2db8fde8d0 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index de9abd927659..3a1c4c77f18c 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,7 +1,7 @@
 DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e8a87a83235f85738e4b5ee7ea9db31f63c5681b1eec24388ff29b54bc1e01c12e3a15d5eb445c72ffe8576c211f708945ed5dde2bf SHA512 09e482976fbefbd388151736fde4d4e198f3584b47f270ad7d0ce4299029012fa7c7825e221a094c8536ebd5824406bb943a8aad5cf51d60dc22dcf5c02b3b91
 DIST cinnamon-control-center-3.8.0.tar.gz 3870700 BLAKE2B 7d75b7697f72e6d1c9af944a6bb0b0b3cd4d6ae387aab744ddd75f5fc122aa9a770d405cc20c00f46802e6bb5dcb40b384b5a75630f9d5a4f3a4b456e31ef279 SHA512 76f85a3d17fb91d5f0d14c784b4a3c5798e9cc74f22990737684808d1e43c6c8cd6e42ca5dcadb4788dc365f7c06dcc945aa13be2a9ecd1c6cbc8ddac550f5e1
 DIST cinnamon-control-center-4.0.0.tar.gz 3872314 BLAKE2B 85a49a6713347741a4f1bef8bdd339645abfbccbe9621de8621b5898586d93d399312794be42834f3338fd70c7408f5d5f314ce03ef332fc0db19e053be70a69 SHA512 4ec0dab3dfe36a1730577abf1ecddfc96194364a1dfaf9cb939686b1621b96d6cefc60b204dd000b7ab017237c32b138cbe15644da5dea4a2406c2bf1a686638
-EBUILD cinnamon-control-center-3.6.5.ebuild 2466 BLAKE2B 7a3bb2afeb1618e7d020c4d5320baf222ddbac924b4fcf3f0ccebf10072e9ccc990a0781a7a20d3feb6017c9e7370b8b62c33d36ba71612f1ed5d2f2c71e877a SHA512 9f3b7c43c256d1565904eef0262e276f53b9e2d272e6546f54645e0852a1432f32e1ee51019df243d21c234ea6845d0d2f232ba56d676a3549679c02733afa52
-EBUILD cinnamon-control-center-3.8.0.ebuild 2468 BLAKE2B e8472023968e0e4c55876058da7805e50fd86cc651a3505ec3b9ffcb52bf29e6aad70245c806eee5ecff8008611879a583c911cc731a7bdc860e05ec4f972de2 SHA512 e42d45c9ac71a35737f8989012c28ea5324bb1b3e20b9fe175fc6b7a19c3482209a168db45993a193941292fe5bc09e02b2991bf09531652a178fd889210d20d
-EBUILD cinnamon-control-center-4.0.0.ebuild 2465 BLAKE2B 69011fe3456ddbcd4faecce5881ea07ad19fc10efc370322822af3933a6f2dc14659e10ca8ce89d94ecfabb6d82d0d3ddba967495ea3c41b69d82b0decff7a7c SHA512 c95310fbb092e069c05a891a3d884423e9a0d5214124904dbf1eb3e3061f2241ff9480cd1083af98a8893758213adaa41f0d972aa0b7e2f609844606b699af21
+EBUILD cinnamon-control-center-3.6.5.ebuild 2498 BLAKE2B 48aa011647ba6ce6d5dc0d3542cf1dbfb0cae4fad55aca0ab38120248ae50caccf96b4714661a2469fd3a2d59ca123eae98bb65ff7826f36cc0749a126c52b06 SHA512 850ec0d55fbbc1208a9367a261c0136d6d7ca41a637f8eb10174414d948891bc39ce8efb56fc976a2238b14b3fbb90317d24ba3ef344d79711bf5c14b7bf8ccf
+EBUILD cinnamon-control-center-3.8.0.ebuild 2500 BLAKE2B e78e46f4158da409cb599022e665bef401a70c01aec03c36847c9fd375480207395033cf458bb71c8faff3e70f09e6955c3b6f929608cb510d1bf2059b484779 SHA512 48737ad04bf5c89807ab229c61a7d6e0a57856ce06758a6da4035d264a41dbe8e8b19b4a9ed7c0a42821f16b238ba97f2aefaa78e5e5b4c9ec37dccaf1d68516
+EBUILD cinnamon-control-center-4.0.0.ebuild 2497 BLAKE2B 0bc2d74667086abe7f518031cab2099c8b5aed5f775e5e1b85e8bf8ed37c26dc90e562816665a5a1f1ebd0112c1f04fe292bf2fd0229c680dab10370de4ff5d7 SHA512 1935d917534a2a1abfc3f7b84a5d314c791d50b198130379d5ec7a5fd4ed169f0e3bcbbbc8f1664d2efb78e4785caa506a540809a30b8a1baa538208427522ce
 MISC metadata.xml 452 BLAKE2B 0b3f734916acf4ee8b2fb22b8b419dd63a18c107c4521d874a7c4a2ea45fd8ffd9ce7f44e85a7b4642a989dd0c96a80f02af4e57e64d99f650ab821b2a89f746 SHA512 e063012f6cd1d892a124a3c47c247ec36351993af36c3c5cf0be0b1fafa12119f1e7506013a3fb97616b8343c924d4bcd341350c4e575fb042d63c957c8cc666
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
index 12f5a93bba7e..f58a8476ab81 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 inherit autotools eutils gnome2
 
 DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.8.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.8.0.ebuild
index 1a8d61f02251..19a446799972 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.8.0.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.8.0.ebuild
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 inherit autotools eutils gnome2
 
 DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.0.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.0.0.ebuild
index d5007242a7d6..2b78cee3d3f5 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.0.0.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.0.0.ebuild
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 inherit autotools eutils gnome2
 
 DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 4ba13f71df15..960101a80150 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -2,7 +2,7 @@ AUX cinnamon-desktop-2.6.4.systemd.gschema.override 127 BLAKE2B 9e92cc304697735f
 DIST cinnamon-desktop-3.6.2.tar.gz 571728 BLAKE2B 17a3297b75a1ba9e34ff5ef8b7252748b4300fe40381b8d5942fcf5baaf7532a560cdbd918d2dc7ed34921e357c61f74d947a5e2174cd7b0310f91015a4bc4f4 SHA512 75af7ec916d43d02eebe9a83214cdb538067f6b674ca76e109f3bed909e61df11ec83350e97505ddaaed24f097e7b20512822e30b52d14a39d6a0e3d582d05fb
 DIST cinnamon-desktop-3.8.1.tar.gz 489295 BLAKE2B cc2216040387ff573d4cfc740e7e400862c8fc1361f38b2771ac94c490a8710e487ae1d33ab1a7ed98423c94e77bba32db6cbc563e9152c67b011459f91ad123 SHA512 d4b5e6d848a4cb01e811410da8b07d2a400f6632abba9cc0ed74e5321ba3fafd1ec9ac90307eb56ba7047dbfabbad9526e1348533c6207c9a7756c24751da933
 DIST cinnamon-desktop-4.0.1.tar.gz 489598 BLAKE2B 3d223faf0d9381bc5bcd4be131f9dbe1bea0f6ec57cc5413e24fac8a1855737ba55f55faff36436c8b8d6266be264d96ce51ec1bd8c1406f5737c9b3ee41c0a9 SHA512 68ce970736eac025c5cf73239dccd010d70197011e75258dc234bdbb52346466f51fc211c58d2ce730e63fb6250fa763ccbdf44cc08df7a028a0bea01826ddb4
-EBUILD cinnamon-desktop-3.6.2.ebuild 1679 BLAKE2B bda865a56a16a6e50980bf5ba3c810da69ef60de3f5db934a23d1fd8e37ace326387e5b9badb5518c9e6a4c29b026a985befd3f07620c73da4c1824ad4ec4954 SHA512 cc8a714dcc655dd86382ab06af14346cd75b26d9cceaa34d6ba23abdaa155ad3f33d31e1543f6771d80b268e7f65c12e90202fc13e18703487994e3b60c9bbba
-EBUILD cinnamon-desktop-3.8.1.ebuild 1570 BLAKE2B 0a583861ace5431ed2aae8a6712ed7b5190b7170a3c223a52fa8094702ca301531bb3af3a0c3b898c8f0e7786bc86a39c45e2bd3839fffe5cee316e11067ad4a SHA512 4c94fb92f13de37a17cf5fca9ebb31d292025b5228933020ec951bbf3da7d058ea52aa354295beab7fc39e422ea4caebd2cce13cdc547ed02304128090d83d4e
-EBUILD cinnamon-desktop-4.0.1.ebuild 1570 BLAKE2B 0a583861ace5431ed2aae8a6712ed7b5190b7170a3c223a52fa8094702ca301531bb3af3a0c3b898c8f0e7786bc86a39c45e2bd3839fffe5cee316e11067ad4a SHA512 4c94fb92f13de37a17cf5fca9ebb31d292025b5228933020ec951bbf3da7d058ea52aa354295beab7fc39e422ea4caebd2cce13cdc547ed02304128090d83d4e
+EBUILD cinnamon-desktop-3.6.2.ebuild 1711 BLAKE2B 0e2584cbf4a4a8661446cbefee9d7f0c65d6f5a7118b2e207faa5421f810bf553f69168c4c032c07a0adde0a83dc4e44f30924b843caa7286a08b836934499e6 SHA512 2a20513bf51b0cc158dc252d34cdc2a103a5102f01a6ae5a3e95285c2183adf1f3041fa47aaced81c81249ad5b5efbb36fb5ac2727c0fc1d8ded28a515aec741
+EBUILD cinnamon-desktop-3.8.1.ebuild 1602 BLAKE2B 0c30b98911950e66264991076fd66085cbbffe5125fb1a988651ebe039d17fa6d1f79b090ac1f2f4107089910bbf6f3515aa99b8648dbc5fdfb992c801865661 SHA512 d760379aadfed2c1f4651764ef58b7e85a71c5abb1166d8d07a62e4f1571a68c76a7281f030343a2f97a7ddb9a2c180bbe64d60835241a9f2ac5602c6238ad30
+EBUILD cinnamon-desktop-4.0.1.ebuild 1602 BLAKE2B 0c30b98911950e66264991076fd66085cbbffe5125fb1a988651ebe039d17fa6d1f79b090ac1f2f4107089910bbf6f3515aa99b8648dbc5fdfb992c801865661 SHA512 d760379aadfed2c1f4651764ef58b7e85a71c5abb1166d8d07a62e4f1571a68c76a7281f030343a2f97a7ddb9a2c180bbe64d60835241a9f2ac5602c6238ad30
 MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
index a03807fd59a9..13f52b383f61 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit autotools eutils gnome2 python-single-r1
 
 DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
index 40fb0e307acb..8f712eb3961e 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit meson eutils gnome2 python-single-r1
 
 DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild
index 40fb0e307acb..8f712eb3961e 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit meson eutils gnome2 python-single-r1
 
 DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 1cf3a3087ac3..d7979e4f0093 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,7 +1,7 @@
 DIST cinnamon-menus-3.6.0.tar.gz 180165 BLAKE2B a014c120bc84206914be69fcae0f4ec09b98a281012ed3f6f2f21f46762ea0b5e289c6dbd321fb7889f6172c9e7150673513e4c15dbd2e634c48efcefa816176 SHA512 dc90dbb8633ac77f4c8be7b013e3d6f9ba8f4e830f7e8c09ec7dcb9566a3768171a59cdc90b6cd11ad015b93629cdf6fc8c2397656f74603a517c0fbc97d3b14
 DIST cinnamon-menus-3.8.2.tar.gz 181252 BLAKE2B 9f91d22760d0ee13ce968dc0b553d2bbd8ead94169baf4bc8d4157e23225ec0a9e70d2eff22975aec6c2985517391b5e6293fd630e038061d313098320a8a498 SHA512 ce75e4076fbedffa998654537520dd0efa146ae4419d76921bf7de44a1b16c3431cc819a55436bfa038947d21f83cda37dc56fab5dcb372a90ca8a3850271868
 DIST cinnamon-menus-4.0.0.tar.gz 181311 BLAKE2B 6893e9478220dd2b8d5f9e883bb647fcd529744e4bb858f29ff2332f06abe1581b7abc6f19d78543ded8da7061cdf7095e361df2059e806c821e60847059bfe4 SHA512 8ada5b351d7d7b09dbdb8f3d6650c03e9a78a5ee729a2f557bd2f49180fe9272889a39309751548d4680794c606294f997ea20aea7e6f6229fb7fbde4b038852
-EBUILD cinnamon-menus-3.6.0.ebuild 869 BLAKE2B 605b700314515d29704c6a4d834c4d3a8911fb8d603743215adaec321e33a90995c117ee98e8e547460717295a61996ecf8248b67534e172e356d961a1b4c93c SHA512 fc67e347dc2eb02a2c641fbf137000e49758e6e7ec546f373779b0b18419702addc12e66d0ca39d25bb206b1c5938bab4822a3d9fa79083f24777b5747b6b290
-EBUILD cinnamon-menus-3.8.2.ebuild 871 BLAKE2B 052d9d7d79f0f45c8a40ad9eb8803cef75d2147435ed66b2cf07a19f0feab00f3cc32cf222f7643ea7631051f6fe5c38b48787dd30773694c44da03634d51593 SHA512 657908c263a9caeca19d9f2eb3b94136150355859ae271b1cd524e5596a438d9d0d279de3aa0139f959b6f13d92d3ec4eb9680c41f9ee396d800087904675a42
-EBUILD cinnamon-menus-4.0.0.ebuild 868 BLAKE2B acdc18bae5ba877b97c044f566afff0037fc8879a41148b8d92787bca2833cfb15caf7aee50e5aec20ad07e3955859d46b45613389d55d5233f526ad7f74f0df SHA512 163fa3456743ded8c3f0179dd03c1b315c4d137074e462b5af82a03fd8153448ced1a593675408451b24949139f1dbf777e16b703b8fa480f276f2837f6a4f3f
+EBUILD cinnamon-menus-3.6.0.ebuild 901 BLAKE2B b0c47f136b4a0b1df9b8ccbc9d8bd5d2d3961b44197535974e9b9098e8dcd87f8f726aebb8f94aabc80048c45e691065f5f58bf8ac37f002dec0cae5dfff0582 SHA512 c64269cc73de2c99a074f43830b756e8cf541b46d66e400b422447d57952e06a20451ec10d141e033b1dd93636a62b7a3237618eb5b7669efed5ff0acc30246e
+EBUILD cinnamon-menus-3.8.2.ebuild 903 BLAKE2B a3e5de87b0329be9c58991d518e9e5e1642eba4fd78529ce0f73f08d4aa3441d4c493ac495137ed7db8cb15dc52ba9c26105831b1dc6cd0ea324f3aa9ba9aca2 SHA512 13d04939f6e1d8ddb8bd6aa8b8f2f9b0260002856293ad1b8aaf0919fdfe41dca7e490ab8a68ea8e3173f556efe111d439cc94f42c6bb06308ad19354b1c1d5d
+EBUILD cinnamon-menus-4.0.0.ebuild 900 BLAKE2B c449925872317a69ea32d18e41680396d6a6833342cab7953907002c0404d607736893038bffb6845d5e8520c778b47ad1622b3ce3e4790a522cc683b69a5636 SHA512 6b260f7d9728f6d8b0b8d1a8d15e4d7560a41bb17c9e98f419611af702c758106621d3ba672134fe0e88798e9db4361cef4d049fee062d3fd7058e2bcb0bd2c2
 MISC metadata.xml 341 BLAKE2B be1e94bc533e24d0daae51089eb50e5e3f30db907094797872e42eefdfe7e8f6abe0f0cb7174bf650e0f20f9a5fc58a4e7243913c29f2cd7e06ca4e46bc4ba63 SHA512 177880a66033caf631d8b8c794da66a122feb891f1208fe6d6f9a3e7675f3cae22d85d0cdd1dd5c17b9098e8e38e823b96385e19f75439ea4d0b32a1f6e81f83
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
index 0a3cbee5e369..f6c42f53c85c 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools gnome2
 
 DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+"
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.8.2.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.8.2.ebuild
index 35270ece27e1..62f8d6bcb74c 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-3.8.2.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-3.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools gnome2
 
 DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+"
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-4.0.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-4.0.0.ebuild
index 4ce6af5d1df7..b966e8ccad30 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-4.0.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-4.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools gnome2
 
 DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+"
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 9a7a35b59cb4..d5e8a7c1c802 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,7 +1,7 @@
 DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37
 DIST cinnamon-screensaver-3.8.0.tar.gz 161238 BLAKE2B 1deb5439c30eed8f16240cdacb20beee3dfeef9529d9efb913f4922b7a53ebf3372f64f80c1afdc9899eb5350b97bccf9a1cb98d703d19afa05e6ce11377531e SHA512 9abed09abfdf193b66c70cd2220d7d7aa056a99b6ffe12e3d80ea8af39d4aef79f0851e83b525850cc56da5944d7b29ceb8c4e15e2bc1e847ce62c13c45d1bdb
 DIST cinnamon-screensaver-4.0.1.tar.gz 156640 BLAKE2B e82354ce36fc325f524e60680c51d46ba7924154e2ff64514687498a7ebbf13d626e5441177d0679c763a4bd3c10a2b7e08ed01470358bc4606be90d37867570 SHA512 c1262d6c1e9575da8007f41f637ab9f7ba33ad5a3a909a7b756cef1f4cb0f323ea4d89fd7498d9589975b9fa6e4715d631413eec7fbcb9c3b46d3a42e02ac7bf
-EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2019 BLAKE2B c00235893861bd3c104e603d935b08dda9f3a98c4fb86d03b09e736f983c77c8298dfe6a9cb1a3b064d433794b189c0c1fa9f72320729bf9eac3a72bc68086b9 SHA512 074770c42460d122b1185a6cd7c5eb1ccc763ea668751a2789fd7b73f806ab37eec793d1a3ddb2d135073bf4e74764b3d8ad5e7fc96a79165f64f67757939925
-EBUILD cinnamon-screensaver-3.8.0.ebuild 2021 BLAKE2B c15f3852945c7bcc73e7bf3b2d42ffc44510af2b01569681fb77c7156311456cf6cff733f8c9da27965e28d8e00593d2c3d49540b3377840a917bc7b24297148 SHA512 414f9128bb7fd8e68974da5dcad7fcf9d2133b7c477d2ce02294e5ecf3c8c0258c6848dc14624d409d6a3b5d6aee9f51655caf927dcafdb925f814bfd6d5deb1
-EBUILD cinnamon-screensaver-4.0.1.ebuild 1988 BLAKE2B 14039b3a35233bb2953a80535f1a282f704cce9b98054f77aa8027b7ae98d187411dab24148afceef4b574e763ab7fd008ab7680b70415b807b0771af1d73158 SHA512 4bae45220879f644f98a430d1cbfcee590a6cd3f399964302de05daacea34eb1c395d21cb7999fb5b7cb1dae8ba31370c10a6de0f372f2838d3546cc5ace6512
+EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2051 BLAKE2B fecf8ee5cf1bc6b77b34f7aed4d5b067bef8ee4292c0ed20f371c78db694ab79f89f4005f2557d93ad9ab7885b9c4758fdef2d19a1c8520928bce85c2119f612 SHA512 6d7e5b83564911e59bd1874f253b0aa59bd706fb35c0acad44934ddb0a0362ce152b66ba26877189873d95616b6bf8219c2c8624edbdd6f3ca0348ad14487e15
+EBUILD cinnamon-screensaver-3.8.0.ebuild 2053 BLAKE2B a0d7bc8b42e8dd48091a784d93d112e267042b3ad0b5165d3e025899fcbad34b2d2d8b68bde39c07e59e319832e9f3a5e0207a2b383c200932553eff1eb14eb4 SHA512 2f8c915433baba601c9c96f609edaf8e17ebb8398c6180c01c7c36e6935cf36d6019b01982398a4438f0fb95c4ab90570435dd7f704d4284f4f042cf27dae416
+EBUILD cinnamon-screensaver-4.0.1.ebuild 2020 BLAKE2B bdb73ddb461b9b870fac5404a31e9748bc5bac65aa581e3482958e96f6b160f002bef79bc873aed8c050e88523af5ecf83270155b5e96d9c0bffad34873ce178 SHA512 68df4f57ad84cef39f12d8be9d3a282ec00c96b3490b50af5ae8ead5817eec98ade202da4599f954404ab6723f44f58b7d071cfbdbdc43759b91baa7d60758c2
 MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
index 9c0b09f7ef17..385750e81eb2 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit autotools gnome2 multilib python-single-r1
 
 DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
index d00d3dba0f63..8721f31fc3bd 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit autotools gnome2 multilib python-single-r1
 
 DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild
index 0f9f555a9164..9ecb20be4779 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit autotools gnome2 multilib python-single-r1
 
 DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 49a918fb2201..ff20ec8d30a7 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -6,7 +6,7 @@ AUX cinnamon-session-3.8.0-elogind2.patch 617 BLAKE2B aad4e717fef7289576e81f863e
 DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
 DIST cinnamon-session-3.8.0.tar.gz 197983 BLAKE2B e0a8b57637668586f941c64df6e610a5df385a6ea67a71e1e666344a73e0095861beb9d958344dfd18988960df1e4380e72257c5f490ab344a4e0de6a749c2d1 SHA512 c737ee77396d38e27d93a5d2cec76d9072038f6a096c6071f450a9a3eb71d83beb1da3ff3320820d7989731281e5a108c330eec333a7fcb66ca7a37f16501c76
 DIST cinnamon-session-4.0.0.tar.gz 198396 BLAKE2B 713573d445f09cfa4707c3ccaff04bdcc95ea7b60568fc136359258022af287df66992444da462f0488dc4049036deb190523695e519eb61329e922e05871c39 SHA512 7e91bef4e294175fa3333a96d0cb9d06db36c9b5a86d6e52734447ea62d411535760fc46713961a46299ebeb3767a0abd4768279e9f6c176ae882de9b7aedc5e
-EBUILD cinnamon-session-3.6.1-r5.ebuild 1581 BLAKE2B 5828b2be457ef30ab84f430a1395180f96a60c0cd2f7b66dce0919b762d2d338f7b6340f3567d7eafd156a35fa5ce0d75d39e1cb6642463363b77f2e88ab3576 SHA512 02db7e1c3b8ed1843eb7dab55473dabe05cc0489b97509afe5481b69a365aba087eeeda3c3ff7438da1088ca83c448f741ff23ae676a442226781ed960b5bb8d
-EBUILD cinnamon-session-3.8.0-r1.ebuild 1515 BLAKE2B d073cdef587a68254154be86f13dc2995dd4169dae112111c893b30a72daf78d39b904a277e635332b996246f67dc322451a2052ca1739ee299e5434ec0afff4 SHA512 861f76f771abc5721088656b8bc534507db0db47f89c27253791b0dd71f4233d1aaafb2e693503d757f7d03333b26ebc8005cb65454ac556fb0aec11f5de7de8
-EBUILD cinnamon-session-4.0.0-r1.ebuild 1515 BLAKE2B d073cdef587a68254154be86f13dc2995dd4169dae112111c893b30a72daf78d39b904a277e635332b996246f67dc322451a2052ca1739ee299e5434ec0afff4 SHA512 861f76f771abc5721088656b8bc534507db0db47f89c27253791b0dd71f4233d1aaafb2e693503d757f7d03333b26ebc8005cb65454ac556fb0aec11f5de7de8
+EBUILD cinnamon-session-3.6.1-r5.ebuild 1613 BLAKE2B e52ae9b2f5f3b9c9a959db4037ebbd75bd5fd34c8c07a17b1788dc730e6de82a208d0797b284d712f590922ef36bf83be1a8133644052e506946c731a6a307ab SHA512 06681ec6c2a1cdaabc243880315bafe8a4d332043dc031178145a1596099b0b38fafd6f5e6674c3276bc78b13069ef7c4832adb705a31d12997a6a062ba9c0c9
+EBUILD cinnamon-session-3.8.0-r1.ebuild 1547 BLAKE2B c28815ce1abdcede81fe8f479be15d25cf71baaf9324c09b16b8526176ab6a71c5ee2c636cf619f8c3cfebab7e88f29c79d53152ce2b50efe5f5bb12d49c8492 SHA512 2a83ea20d01142682077cad35f8cd15466ae617b26a0199f82957eace1f3774a1ac3c487ec4815e22b8ba8bcc59e23b3f99c85cbd2f23d6a545fa9abac6f4580
+EBUILD cinnamon-session-4.0.0-r1.ebuild 1547 BLAKE2B c28815ce1abdcede81fe8f479be15d25cf71baaf9324c09b16b8526176ab6a71c5ee2c636cf619f8c3cfebab7e88f29c79d53152ce2b50efe5f5bb12d49c8492 SHA512 2a83ea20d01142682077cad35f8cd15466ae617b26a0199f82957eace1f3774a1ac3c487ec4815e22b8ba8bcc59e23b3f99c85cbd2f23d6a545fa9abac6f4580
 MISC metadata.xml 451 BLAKE2B ef4fb2792b489e2c45e320fd073b71a3ae1095cd18868fb244fe21bd271dabc683b9a0db617338c15ec35e16124f2d851346da60647676053e80e7e21857dc81 SHA512 a96919c80e1cd5ea2536a928572aeb5315c1df6f3414d901f18410a0e2a4cbac8218a4a52a90159df94b35e8946066952fa625ff44ce55670bed9c140d374c15
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild
index a3760072b6df..9dc721e9e17d 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools eutils gnome2
 
 DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild
index 5a7e3a61c7dc..54fe4a32199d 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit meson eutils gnome2
 
 DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.0.0-r1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.0.0-r1.ebuild
index 5a7e3a61c7dc..54fe4a32199d 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.0.0-r1.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.0.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit meson eutils gnome2
 
 DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index ff06e302ebf9..6fc69e3171e2 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -3,7 +3,7 @@ AUX cinnamon-settings-daemon-3.8.0-accountservice.patch 2213 BLAKE2B 2e867654ff2
 DIST cinnamon-settings-daemon-3.6.1.tar.gz 995005 BLAKE2B c512fe53b707099dca0926893f03056d508bbe22026367c3212a99f22df60d629e02e080fccdeb73151c7aa7e93396b47bede1820059f4a53eace11a56ae5521 SHA512 48a28decff08a191f4ec604386c3bb5c07001d4bc4f7b6d1da379626b41650653fdd14205bbed5321c41fbc281e8638b17e1de30dbba5d299f79cde03216cb33
 DIST cinnamon-settings-daemon-3.8.4.tar.gz 660607 BLAKE2B 1db6e8677c9f9e1fc649d29b3de46d2797f01dbaad3a907329eb6781c6c4ec17706d06045ae230315c7802a5ea176dda73dfcd437fd07e3398ad732e96240a83 SHA512 5bd91e781d47413b50b69b6a8d4cbe9060579452db7408d375f01b05b4070caa684d333ef875a7dda85d1acad3442cddd38e13167fa198e3a5540fef7bedfb75
 DIST cinnamon-settings-daemon-4.0.2.tar.gz 662735 BLAKE2B 158e2ee120e2b359c6d84aa52c6b2c9214148fcf48cdc8ed9c777344f21ce82b5c3e4d0b358046abb1de8fc23a43b7cced02b77b43c1230fc2d97db58423e125 SHA512 3e51628339ae7766c37090c82a7550e2f925843ca62ef9cca606568c9771a8f16035735b3db612aae0938553fd37fb6eaf8d30437baa501160221d1b71d0e94e
-EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2042 BLAKE2B 5941be45774f98c77b5cff4ea89403166943715c46a7904f634c394fc168bc6aeccd9dfbd35869cf36dd0fa4af89ec286aebaf9be861722dc4096399c9ed3ea8 SHA512 41702acbfccba846c82ebec1e88a9b15c3b5946cd73231075086b7bac52734f15d8061e02f80e7431469b204d2f2e8259dd5d101361f48357c5e1c0fbcee10f0
-EBUILD cinnamon-settings-daemon-3.8.4.ebuild 2128 BLAKE2B fcfa71c27b440eb39ab6ad5dbf4e6283476189084c7cb57ca04e8cae5796cf1cda726371ee7d026dbe83425a61a89d2e2ba9deffe987932332a9edc7ed3c1edc SHA512 7dfe766d4cc43325b633465e78bf7f0825d3f375eda5ddad413ead31111016f116f29f2d4a2260e18cb56aa95874525e19d68306b8c9ba666e19cb970d7345de
-EBUILD cinnamon-settings-daemon-4.0.2.ebuild 2125 BLAKE2B 13f3293169b74d65b3bcaec9a5e9b23d5109424086769f6cf95d0bfe08a20dc56135fc731ca11ca9c3968b2c7202994240802d6775f352be47555a79e5c38a04 SHA512 9a467be0079e755217704ab57b1d494617cad60a71acf0c75b9b392f594cea76d74d5769279a30209c5fb4a669c8407a35647b93ca9b0c5867ae5b39d16497a5
+EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2074 BLAKE2B 2f36a9201456c63c528b2447888b0af76c9810b1a591605a8a0d9242ea972db94165824e95e216968d4ecb6c8bd3a44f94669d8aec1de1320861c247c248e64c SHA512 75dccdcfeaceea3634fdc0985a5ce9ee6281d5ea34593df64ae4d409e001235e1de29d1c79bc6aba772d6e98207c0b69a8afd061a63283720fb2e6e7562ec5b9
+EBUILD cinnamon-settings-daemon-3.8.4.ebuild 2160 BLAKE2B 4b49f89f6a23977d46a587b3c81e59f395962574f52a5d5dd6cc079d4c689116547334645c894ea5ba65ef463eb28b2ffc3dabcf9ee5e9915e94dd7f058c97db SHA512 fc46e0b3ec322ac34d6c9f0ffde235025544fcbaac37c1915a957ba398cd5a9b4199ea49aca7545c9dd344180b3232e34a778b2b0445e57a639855e8b56c72b8
+EBUILD cinnamon-settings-daemon-4.0.2.ebuild 2157 BLAKE2B fef8a0765c1124bc46927f300ec6914211fa2f966b7a950c3f2c3235f576999409857adb6e745c14d0fc5224ab6e8f76ba9342c87ede6d5c985ac3f97fc38f45 SHA512 0bd78905d15f364ef0134f6f1c22c53d338308798aa46af783c0fd534db782c7216967e8b0feeafe28e1400c0a6ed1d4a19aaed9d30609e254fbdb118dd485b7
 MISC metadata.xml 453 BLAKE2B 430a92263b5593b373d945790b066af782b50e58008c4cbe045b768b757bf0ff286629df2a1e35b8fa13582aea2e134a8b55468e1abb3b67598f4f338c4f67f2 SHA512 b4525358e2f21c39d179f8003bd27122af405a7c79dbde94bb0d3b5086f9c39691c9dae986cacbe669316e92459cec19a40af2ed651d0abfcbbbce0857054ee8
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
index 66ed58615ece..c7922a114969 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes"
 inherit autotools eutils gnome2 virtualx
 
 DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild
index 538687301a25..82214fd1c4fd 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes"
 inherit autotools eutils gnome2 virtualx
 
 DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.0.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.0.2.ebuild
index 1a4d83a8c1da..22efbf589c1e 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.0.2.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.0.2.ebuild
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes"
 inherit autotools eutils gnome2 virtualx
 
 DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index b7a1849ffa20..084f88f4249d 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,8 +1,8 @@
 DIST cinnamon-translations-3.6.3.tar.gz 9486325 BLAKE2B 75d25beb66dc28565eb6d61f64df66e69de347ffe01984d9958b3388109d7e89f839205913432d7d68a7fedda743d4de52d63b1d95fc54ff77a8b80501d7e668 SHA512 274ad790ad9e8bc1d424ce45ff426ebdadf868bd48c065a21a8be014cabc889927974de5eb56ef909317bcecf4a0ca9e98af8ba3ade08c903fa286c93e05f695
 DIST cinnamon-translations-3.8.2.tar.gz 9741950 BLAKE2B 23ae3b3551f911ca23b86d06a60e49ac063be7bb0fee65a05e1b5fe55908bb971b73e24e62b8bd82b5f486dc6d37aa724ad5252d8526f60c00b96e8570727f92 SHA512 8ed052da06764b71a344d2e8eea2d7b3132e5b185167d7d2e95b312df89e5302eeacde15d0ec337ab5573f7497be7b66db3fbfa4cb8a654e8199690315c319bb
 DIST cinnamon-translations-4.0.0.tar.gz 9742058 BLAKE2B e55931643378ea43508488f431f95f83efb4de8691303da5fa1e91bdee7486fec9881ac75123a2775e88708d40f148fc3a6b0580e447cb370b364d412a8a571a SHA512 a4ecd3808e28de61556f6995c3f21c7170c2fabb81f8c10e548909eca2dabc0b33d912aaa41f4fdbc5d66f573c2e50c8ea9fed93d2fc6200a1e1662291a75811
-EBUILD cinnamon-translations-3.6.3-r1.ebuild 1361 BLAKE2B b30f76730a9e283a793ad8036e5e4bd5a6aca87e02903c6c87e64c67db1149ae426e37036dd94e2ab163a0d1ce1318ada461786e9e5df939fb3096cb0b807a20 SHA512 9eefaf04e7d7f151df23305fe6e84b8d9e05395def647b3773a762ab369f59e1521af377ff162c266272ac1f6608d8905b9920f22c6a2a4f3c6adee3d3c847c1
-EBUILD cinnamon-translations-3.6.3.ebuild 1309 BLAKE2B 7cff20355506a7a644f58bf10b0498fb9f08782177d78af6790c590703df83d7533239c033058adf903ad580572857959d9b26ee9daab59cb5cc8eed7a0924f6 SHA512 dd6b64f23edb69ff0a8672dee36ce4f34bb60a7883b265cb6b6c3caffcf3ad57419551dd4057f6b386df679ae6cbc28fb58abce676c844e80e50745fca5f8d83
-EBUILD cinnamon-translations-3.8.2.ebuild 1361 BLAKE2B b30f76730a9e283a793ad8036e5e4bd5a6aca87e02903c6c87e64c67db1149ae426e37036dd94e2ab163a0d1ce1318ada461786e9e5df939fb3096cb0b807a20 SHA512 9eefaf04e7d7f151df23305fe6e84b8d9e05395def647b3773a762ab369f59e1521af377ff162c266272ac1f6608d8905b9920f22c6a2a4f3c6adee3d3c847c1
-EBUILD cinnamon-translations-4.0.0.ebuild 1358 BLAKE2B 55b13c776b5b0c3b74435f47b8b3598f428a6d5f0c13d491ca55c6c63407710b71af904d3a7dde6a28c672f384ab9c695c63053658b0f226a5c2e2da0e54f781 SHA512 e9dc87e46c0ab540c5d5de7e872848a8098cf901aea6310b88c241e5e4a1cd563c21b94444d0ef35b8b8c329b06bf0e3d38752ea9826a1291fca561165053b21
+EBUILD cinnamon-translations-3.6.3-r1.ebuild 1393 BLAKE2B 72cf78b6392340ce9432951ff81c9ef882a51fab9f051ee8b22892d16ed1ba056f24ec07a5b983aa02156a1c9da91cb6002a9dd7aa150bcd03db6f1fcbacaea6 SHA512 08d040c7aa723eb78dc82bf4c31d992c3783fb5de39cdf7bc3996e34f1c7153a8150cf17d2493fcd60b835e76c88ccc48f157293766e80e03549a73a7c5c1023
+EBUILD cinnamon-translations-3.6.3.ebuild 1341 BLAKE2B da3b79b225093075d1797e83eaa6fd158b70e25fa8a59478da41eb234ad0ca904da41e929336754bfd0414ff2048f6f542e3a064f091a54fbd5be0aa6e7d3e6e SHA512 c6db4e334eca9c4f79c2781eb271a7fd5666867d5168b317b4a992079259ab4fdf92c7fb2cdf74c068059e47bd2d401fe03c48b16eb72b5e7c81f5fed95396d3
+EBUILD cinnamon-translations-3.8.2.ebuild 1393 BLAKE2B 72cf78b6392340ce9432951ff81c9ef882a51fab9f051ee8b22892d16ed1ba056f24ec07a5b983aa02156a1c9da91cb6002a9dd7aa150bcd03db6f1fcbacaea6 SHA512 08d040c7aa723eb78dc82bf4c31d992c3783fb5de39cdf7bc3996e34f1c7153a8150cf17d2493fcd60b835e76c88ccc48f157293766e80e03549a73a7c5c1023
+EBUILD cinnamon-translations-4.0.0.ebuild 1390 BLAKE2B cd70b2ea86329992b0c0b668c74a58a7f37fe936ffbb1f1393637f4f38bf9dba0939dfc8bb80ad1f0a8e0ec0c6a0e9989e94b04b6ba868c5b17149b434a9dd88 SHA512 b8907e3f4d96b67bb4f9db5f0830ee1c5fafae4b61c654a4d9c6ecb1ed22a0286bfce832bf0c913790db2faaa7b9634186bc0be7093101d500215a0fa7154684
 MISC metadata.xml 348 BLAKE2B 22e9f760365b2c7e8aee07556c723590b93f615fcab90c687dbaa55f4a32262ef29b1d576f68830caf6c21a315e87009c0101b98fac856c70d88269a12bdc251 SHA512 357310d45466db6b2f600aacce60220f88810d91ff228bdfb874c3f3c7148c6ad599c11d87c63e1b2650361361e6a3accce18700aa15046322514f5065cd0777
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild
index 8f055fc0aec4..a1d4f0cb21ec 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild
@@ -7,7 +7,7 @@ PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh
 inherit l10n
 
 DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
index 39fbaa56032e..3f983826e048 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
@@ -7,7 +7,7 @@ PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh
 inherit l10n
 
 DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.8.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.8.2.ebuild
index 8f055fc0aec4..a1d4f0cb21ec 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.8.2.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.8.2.ebuild
@@ -7,7 +7,7 @@ PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh
 inherit l10n
 
 DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-4.0.0.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-4.0.0.ebuild
index f2148817da6b..2e0a21f6b1fe 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-4.0.0.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-4.0.0.ebuild
@@ -7,7 +7,7 @@ PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh
 inherit l10n
 
 DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 0ac5ba2b8958..b912cb9cc4f1 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -2,12 +2,14 @@ AUX cinnamon-2.2.6-automagic-gnome-bluetooth.patch 1715 BLAKE2B acee6063acb4c0c8
 AUX cinnamon-2.8.0-background.patch 1106 BLAKE2B c3f42ba7e5f298b4345701536d7045cb4b224f4c22645135083ebccf5211bf33eaf61f95c639737561208e7dc10cacc54e900f93a18d73d0aaf90967192dd3ae SHA512 2affc6ab9b9b1f444fb5fec752e4d90cd7716986e5c48087c6e2bc9820792547fc1f6aca66d096ec056aaa0010c023fca2c88f6828320fb575a0fa2e56b22995
 AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74
 AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03e202b76956c96df2dea7f2401d03c3c679ce19ec7e6ad046abf0fa1f1715ee94194a370605454dd3f3a777493c9cad9a88a3878093cda96b77b39 SHA512 a8b810f0aafab57984e8189bcc827e72dad7b9201ff88b36948b701cddb61c3bf003aa7b1986ad3ea526242800cbd183890218471fde7e7d7d2b9550b6688dcc
+AUX cinnamon-4.0-fix-pillow-settings.patch 1363 BLAKE2B 6683cdb92c4da3e09b8f6759216676d666ce832f3687f2775914e27a0f0a3d1427be7774aabc6525f601204682471da3479b35c2bcc3dce3e08929b7d4761b48 SHA512 cd86597c4c5009d8227774d96c375d52c8ab42b944e7dea7013f94c2616511be9b5e3b79b812c65714f58bc67c3a32f34ec71ff0afd4f9ea3c5aea6664817946
 AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db
 DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642
 DIST cinnamon-3.8.8.tar.gz 2234388 BLAKE2B edc27a670d788673602536f960e2859f6cc15a52ebd12cd741821c4455664ca6bfc6f2b2e3282a0797b15bf93a33208f4f4458df7b2cbe17e50d90412811265c SHA512 5f8acf181fde8d9156ef8767f97b24e207f6c44975e5ef97e812fcdd3b2d5ce4c921297b679ad1ade6fa8e4f9c544b74143f4d925d022cc95d6c71561ab40b53
 DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1
-EBUILD cinnamon-3.6.6-r2.ebuild 7592 BLAKE2B ad37cf9da4574f2202f5e98feb393f6e91dd5c8318dc93745e0d163c8097f310b384804c6f6be6df51b8374776a96c350e231c155cad56b5969517ed137a788e SHA512 0dc653bad186ec29296683f95386fad15cc5d1e79dd090cc35bf1e652a0c04b6363c23af8cc6e84fcdf6dc0cae538705c120e0ac43b9e685660ddb9a6dc04dec
-EBUILD cinnamon-3.8.8.ebuild 6887 BLAKE2B 361d67af525736eb3fa0d20f42c5f8426a019f9bc501b450b1245d8457cb238bef77deb79010f5a795e4fe183c8f34b1bd2997bba6c8f643a74902d0e976d5de SHA512 9417677f50f690f835855bd0ce8757b06714b614235433ff65c3ac3a8f14175924c20d510a95f60ef6c7a2b8293b1b52302924112eed8b257ce2e6661c09516d
-EBUILD cinnamon-4.0.3-r1.ebuild 6847 BLAKE2B eadc559c90991d6c87777bbca311e8e3bd2bff9cc96f679dba80daba382c7851e92b79bf4885b0324bf3fa82df472ac2750cbd8a13d26daf37724d67a9138087 SHA512 81ccb461d637654e3f813111ec194236448775b20a1af6937513afdd5da7801e3fb1091fb1c6d5ca4105fe7fed56dde250ecea4abaf9ebdd8fb3865b8c92f92e
-EBUILD cinnamon-4.0.3.ebuild 6977 BLAKE2B 7c1ec29aa0b65d576cf902b00067887125b0b4f350c3abbc220ee9ea782feb1e893111142d722b34ced666becab01d3d399f9b5946c7d906185e3b813e919619 SHA512 91ab56be829ed0ae2fcdc7e659bb3a9055801450cc3e0037b04c3d06971ec42cf43dd8a4bc05226390cc231ca654e95cdcd3e5002d4321fea3ce5ee0ffcd1dcd
+EBUILD cinnamon-3.6.6-r2.ebuild 7623 BLAKE2B d5275b7e02349be3bbba781980a1c7a877d373c0d11aa1b13928bf151e07c25b9ff86bc526a570a1e2b21c13dc54867264007439e157fac86e3466f810212d5a SHA512 bc12240a4e6ddaeb5baad0a8132fc0d6b20923d2fea9164d18b0b2c910e81e26206c57c70cb5b508caeff8b68a4f583a6645f928634dba4fc2c2bee265ee637c
+EBUILD cinnamon-3.8.8.ebuild 6918 BLAKE2B d0d07475e8877447f22ac3828791d37121e98c4fbb8e32537e966fb1b33bbaf6c95034e55aeaf2ffc536010d498d9fe4a70e3e935256710bafe945aed17b0a5e SHA512 dab6b97d7ef9e8d8c21b1dcbd78e76b2a6cf11407b97f3638c77ebbdbd971bc5096945780cb4990e545140c435201d58487c3477212af1582145747e7c18a4c6
+EBUILD cinnamon-4.0.3-r1.ebuild 6878 BLAKE2B 48af48d98fb39f2519adaa69c534f00eeb34f1c7d8e8ae5cc715b4d3ec4b0fc4a31073f8f8d0f136a97004045ded2e37d1270c111bd1fdf86f0c98d733140184 SHA512 da89cf1b1041856cc737bac52ec2bec75d5c0950f52490f305c0f06e3d6b48cc77fdf617920b504e10198948d3370c99a7c6829eaa104f09c5713b077ab0d1d8
+EBUILD cinnamon-4.0.3-r2.ebuild 6941 BLAKE2B 157085e9ad570acb8ca6fc419a60b9040da76f61a77aee5b08c102ddd96160dde2ccb6954fd505f67412af28d68b53587a1a9c615c06e67e89aa5d7a2563b85a SHA512 f4b0bdf02cc2bdb05ae582646e266d3595efd91e21703ef7e9505c5e4227c7ea301622f06697d07ca8897cbccc40f6200a9bb8866f22ab363f5178b5c1707e90
+EBUILD cinnamon-4.0.3.ebuild 7008 BLAKE2B 1529e7f397e813d67c3e449f0615fdc93e1017adf3a39f1e330829be0962e5aff91b6ed002d657846fc9bded4cadec8d23c97b90bee0c526a5fc148292d29f16 SHA512 ea9cadc0f8dd70c7729513db1e9575b9632990d1e6bc919052e9a069b1baf57fd023fd5b551f96a484d8e1a73f910a2d6a315f4342bebcd7edb02f194951b1b9
 MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
index 86faa2d785d8..de4728de28e6 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 
 MY_PV="${PV/_p/-UP}"
 MY_P="${PN}-${MY_PV}"
diff --git a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
index 0e3a5d99489d..394c580a0b3a 100644
--- a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 
 MY_PV="${PV/_p/-UP}"
 MY_P="${PN}-${MY_PV}"
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
index d35a2bceb260..bb933cf417d0 100644
--- a/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 
 MY_PV="${PV/_p/-UP}"
 MY_P="${PN}-${MY_PV}"
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
new file mode 100644
index 000000000000..01d93daa666b
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="+nls"
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+	|| ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-4.0:0=[introspection]
+	>=gnome-extra/cinnamon-menus-4.0[introspection]
+	>=gnome-extra/cjs-4.0.0[cairo]
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-4.0.0[introspection]
+	dev-libs/keybinder:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	sys-power/upower[introspection]
+
+	>=gnome-extra/cinnamon-session-4.0
+	>=gnome-extra/cinnamon-settings-daemon-4.0
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps[introspection]
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-4.0
+	>=gnome-extra/cinnamon-control-center-4.0
+	>=gnome-extra/cinnamon-screensaver-4.0
+
+	gnome-extra/polkit-gnome
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-4.0-fix-pillow-settings.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
index b3a59766aac2..b97490e84fcc 100644
--- a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 
 MY_PV="${PV/_p/-UP}"
 MY_P="${PN}-${MY_PV}"
diff --git a/gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch b/gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch
new file mode 100644
index 000000000000..e06c86b8f3d5
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch
@@ -0,0 +1,43 @@
+--- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py.orig	2019-03-21 16:46:14 UTC
++++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
+@@ -620,31 +620,6 @@ def has_transparency(image):
+         has_alpha(image)
+ 
+ 
+-if Image.VERSION == '1.1.7':
+-
+-    def split(image):
+-        """Work around for bug in Pil 1.1.7
+-
+-        :param image: input image
+-        :type image: PIL image object
+-        :returns: the different color bands of the image (eg R, G, B)
+-        :rtype: tuple
+-        """
+-        image.load()
+-        return image.split()
+-else:
+-
+-    def split(image):
+-        """Work around for bug in Pil 1.1.7
+-
+-        :param image: input image
+-        :type image: PIL image object
+-        :returns: the different color bands of the image (eg R, G, B)
+-        :rtype: tuple
+-        """
+-        return image.split()
+-
+-
+ def get_alpha(image):
+     """Gets the image alpha band. Can handles P mode images with transpareny.
+     Returns a band with all values set to 255 if no alpha band exists.
+@@ -655,7 +630,7 @@ def get_alpha(image):
+     :rtype: single band image object
+     """
+     if has_alpha(image):
+-        return split(image)[-1]
++        return image.split()[-1]
+     if image.mode == 'P' and 'transparency' in image.info:
+         return image.convert('RGBA').split()[-1]
+     # No alpha layer, create one.
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index a712a4bb55f6..1385c6a9e40a 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -2,8 +2,8 @@ AUX cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch 860 BLAK
 DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f28277500aed9f5bc2672f26ec72f584576c53d7aa6069737ae81bd0b1bf05d56d39c947de1206c506d72c8da075 SHA512 648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155
 DIST cjs-3.8.0.tar.gz 446667 BLAKE2B d7d37d2aa47fb32b401727e2d5f7f6bd3779e62f5bdaf77501e0999bc7d74a14c5c9924702091d4b32dc7a572b5e920e2dcf19e50b048907f87993d8be392ea7 SHA512 7f776be2d4863ea7bb32e266efb0c5d5e0f86bab68bdabc1478e04809f8f887b4ff0853075baffa46055d347fc22c6252faefaceba750f61b0b21229f6130bd0
 DIST cjs-4.0.0.tar.gz 459595 BLAKE2B 63ed660480f87fcd57103965226b3457dc70586019c9ea7f446af86f0b18b493c315566c608f5e999f3b64765d71eb5d463053f3d859f7121c95dcc74d04016d SHA512 86baaba3721b71b266c560180ba20af43eed0d2b8fc37af0d24c7c0c36252e2af85da928b42260074f236f0bc4d4f4f28d20127021e67f23a22b042a09a3baa7
-EBUILD cjs-3.6.1.ebuild 2096 BLAKE2B 5f2cc7c4517cc8c012075f2ff5ff0dba936699f5997e0cd3839fb17de6c0b8e5352c3bfdb3ce4dc00d86816352d7347c193a853b6c1a3e1741c310dc5b9dad1a SHA512 187d890fc87dfdbb36aabac71265949543c033ab650125782b806a9b2c1dae05cd9fae5316a4013d8fe20cfd6543dca2305f6634b1ab29dae26a175c6631e375
-EBUILD cjs-3.8.0.ebuild 2001 BLAKE2B f8aca1867ff72015b96331d882f31533656965f9758476622d1382dcf07bb8ea2831ef933bdcfd9fa01e8220538e1c87afe54bff54627aabafb6814f8a253303 SHA512 0ac840158afd4df20b43fc640fd4ed12ba2410e9b9817ab47e8fc293b291c6d46870993812bd3f2c3e2c7d399f8af41422431e166dd203702f2bfe312d5a4c82
-EBUILD cjs-4.0.0-r1.ebuild 2002 BLAKE2B 4bd66ad61c9d33f2d9bcd4dc993d1030974d7b62e6025cad8844a39d252623887887c2c949680c667f551e391e92e57674953761157f47740fc781cc3912ce71 SHA512 d3c1cf221bf3a99d581ca763f5092b8e99b5d733702e289c1ff10c799a0b44d547014e1c0f7b86db92eafbddcbf4ae32d195e880f442a167e89687ed5d6b4d84
-EBUILD cjs-4.0.0.ebuild 2001 BLAKE2B f8aca1867ff72015b96331d882f31533656965f9758476622d1382dcf07bb8ea2831ef933bdcfd9fa01e8220538e1c87afe54bff54627aabafb6814f8a253303 SHA512 0ac840158afd4df20b43fc640fd4ed12ba2410e9b9817ab47e8fc293b291c6d46870993812bd3f2c3e2c7d399f8af41422431e166dd203702f2bfe312d5a4c82
+EBUILD cjs-3.6.1.ebuild 2128 BLAKE2B 197398c85e99a5d2ff2ae53049c78252b350e05b7a27a37c29e2073791a9e3d14d01366571ab46a75987c35e2306d45bbbc4c9bd7ef6a07b0fe8b5348325246e SHA512 fbee3abf021008cad7c78b532bab89c16cf534a011da7753ed129d3b69402e50f1f4222381fe1c7b2d1caeae626c4feb86c0e4390787ce1595f8b6b1c9a9314d
+EBUILD cjs-3.8.0.ebuild 2033 BLAKE2B 672e5d47952b6e86b4ed2ec2a7671e0034db87b4b478e41cfa576713daf6dc7ed7b6260a8f23c82e6af91b005523b75194ef94ac5ddb252fe5ed068bee01a2ac SHA512 10d27f6eed91ca36cdb50e5a73c166c650bde01118bb0c7cb8e8858582d98993b1b10af8949fa2254749c00632d3aa0649d6946a7359872712833af107537a9a
+EBUILD cjs-4.0.0-r1.ebuild 2034 BLAKE2B 9a714a14654de497d3f933388ddfde87ebad7f4304755a4631f93e3f97f1261539997427bed0462466f22359cfdc4339294319b93575a13442229d7c883b5fa2 SHA512 85e68e8a335396715a84fde75b572a9808a495a67d5b82e36453ea382a58fdae8b7577de804edc000eed57f0f56cf30329717f8c482d1646232bebeb4291d5c9
+EBUILD cjs-4.0.0.ebuild 2033 BLAKE2B 672e5d47952b6e86b4ed2ec2a7671e0034db87b4b478e41cfa576713daf6dc7ed7b6260a8f23c82e6af91b005523b75194ef94ac5ddb252fe5ed068bee01a2ac SHA512 10d27f6eed91ca36cdb50e5a73c166c650bde01118bb0c7cb8e8858582d98993b1b10af8949fa2254749c00632d3aa0649d6946a7359872712833af107537a9a
 MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
index 285c4c138814..90d097a42a06 100644
--- a/gnome-extra/cjs/cjs-3.6.1.ebuild
+++ b/gnome-extra/cjs/cjs-3.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools gnome2 pax-utils virtualx
 
 DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
diff --git a/gnome-extra/cjs/cjs-3.8.0.ebuild b/gnome-extra/cjs/cjs-3.8.0.ebuild
index c36285e11ef2..a4b03e1ad79b 100644
--- a/gnome-extra/cjs/cjs-3.8.0.ebuild
+++ b/gnome-extra/cjs/cjs-3.8.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools gnome2 pax-utils virtualx
 
 DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
diff --git a/gnome-extra/cjs/cjs-4.0.0-r1.ebuild b/gnome-extra/cjs/cjs-4.0.0-r1.ebuild
index a570b3b3d468..ac8896b37366 100644
--- a/gnome-extra/cjs/cjs-4.0.0-r1.ebuild
+++ b/gnome-extra/cjs/cjs-4.0.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools gnome2 pax-utils virtualx
 
 DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
diff --git a/gnome-extra/cjs/cjs-4.0.0.ebuild b/gnome-extra/cjs/cjs-4.0.0.ebuild
index c36285e11ef2..a4b03e1ad79b 100644
--- a/gnome-extra/cjs/cjs-4.0.0.ebuild
+++ b/gnome-extra/cjs/cjs-4.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools gnome2 pax-utils virtualx
 
 DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index c04d13844793..84b0d3cfcc5c 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -3,6 +3,6 @@ DIST gucharmap-10.0.3.tar.xz 1713960 BLAKE2B 0a0412c7a4d46c25112d9bb33d64e82b448
 DIST gucharmap-11.0.3.tar.xz 1766884 BLAKE2B fe92675494d5bf8e62f3b38356ecca59d4be515c8a08d6729d1bc3c7ba6c7b3e4ed802f4e1f79f2830f56f96a7d708d7d5a2bd1a79a36c9cd2bb0f1b6bfd1577 SHA512 281749d3fbea937ff6ce958a7216ead03fdf19cb303aef528a1456c5ab90be977f704ff65b2e665cbad58d2c14db51b0ad144fc6961aadbb7d95ec288d79402c
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-10.0.3.ebuild 1671 BLAKE2B d8c12bc00d5b338edbe768d815b0ba41837c997bf19e1c4f7a74819bd25d4e1f915c95d49b3910f3b334f7659a7f99862fda0a057188f33d364ad9a1439bc096 SHA512 679a8133e468d0925106087accb8e110fb43ca6377d96b7fa2ecbb4168f043f8ed09258c1461ce46a756d49d78879719a2876b44a0a0fca542c5143df837b526
-EBUILD gucharmap-11.0.3.ebuild 1755 BLAKE2B bb718f52c16ef7f45a710882d4ecab9b9bd83a104216f0707a395822737a7be8d2ada095dc45a2d04b408513d63c9f520737d77b4641d82cb38401df73e19dcc SHA512 56fec2c5dc95565f075af572d667fe6b6066266db0fef6591c9f667d8a11735f393374fe00335226026de3e151de79d567158fb6648863e7bae7bf296b2775e0
+EBUILD gucharmap-11.0.3.ebuild 1754 BLAKE2B 1b522810cda8b011400c7c2b8311fe8931a9a62b4d6e00b45dd54a4ed9b000db2c05d42449c9f1d34b0fb72c4afd85c5fabc0593bdec244860881de620de1a27 SHA512 dd97238b031b76d92b885ede28aab52bd8f0f78e46ee5c088168f75735d59bfa662854edce376542a2f5b6ae44d5f75a0689f28ba8efc8420c02941c406548cc
 EBUILD gucharmap-3.0.1-r200.ebuild 1491 BLAKE2B 3ecdcc4e40b9c05ea876c1a25ff8f578144f33905c0ee86b3a384992c16e1169ee24ce6f376e0fdf892d47472a353ab3ecb5ed8e7528bff887be1728100b65ad SHA512 35fadc3a1efac5e157e1215a79b0f05cc1ad20ec1a7b38f6fa382ec6e4de450004a2c3b48a47059e6777b17bfc67bcb05e69a016fb32c7a76f6c5f4e667196ce
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/gucharmap-11.0.3.ebuild b/gnome-extra/gucharmap/gucharmap-11.0.3.ebuild
index e6f9ca6aa286..e3c3eba118dd 100644
--- a/gnome-extra/gucharmap/gucharmap-11.0.3.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-11.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
 
 LICENSE="GPL-3+"
 SLOT="2.90"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 
 IUSE="debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 4b99f2090130..a6ae8227648c 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,5 +1,5 @@
 DIST libgsf-1.14.43.tar.xz 618272 BLAKE2B a381125ce75d06ae4bf1c9dbe9b2e207534ff7c3310e40984e482bc5120eae45a7e3ed4cfd878890037f31ee540c700dea3120119b9a533fa79cab317a0c83a8 SHA512 bb487de9358c057fc73f3414c9515726315be9b6d78456253daaca1cbd58281de8766e0b72914532d63fab04d3ae2cf90f711f436c7b4f70620d77e8a7802ac9
 DIST libgsf-1.14.45.tar.xz 618476 BLAKE2B f577859578de6ca359a7377dcced424e95779d3fd155cdbeb1c2874f7a0d0c7a09a2322d2538452b48798ea979e8260be77215140f298dc58ee32a0b9ead0e47 SHA512 2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd
-EBUILD libgsf-1.14.43.ebuild 1001 BLAKE2B 983e97127fd0c089be9314b4a4e6af68dd8f2c2e151adc7d9ca309deb03356349ca7c3af196cb23b3bf17d5214397341c6551898da7971003a23a950243f6d2a SHA512 c2abbc8d22377b1a7a4a3a3eab9975e28626ade46e55705372d467cfa59b7e0efcaff9f075d23c35b917af92e32ae01940cf131a940af3b94f64a63078e7fa90
+EBUILD libgsf-1.14.43.ebuild 1000 BLAKE2B ab04bfba11ed11f061bf2074d72b20086e9b3b41edf4ffcd8cf0ce3dc7a8816f61f15c9ed20544123e3f928289782d6f3f61c4ace27a539abe76545b73c38062 SHA512 0426fd92c203dd7a38a1b8a63f169c38d89b8e18d52b7c51db433540619d20574075fa2bccd2ff64eb1fea8b583773d364ac049f7e19782058b9b05c88d08233
 EBUILD libgsf-1.14.45.ebuild 1010 BLAKE2B 8043a19be833dcde9f5a1c1ac239d540fcf5dda856e16ba27de0e6edbd49695e39017ef4b7b60dfe51d4d48e7eb0c5cfaf656fe4f982a89b5347d35945552878 SHA512 bf1a134582156ebd7d88a89fd6d6bcdec9734c5dbe07bf7862716312c3dc04b1ed3b9544b2eb6ceb005b515c80dc6e791f03d52c0d0769299872aa7020308bb0
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.43.ebuild b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
index 73972e54497c..50994922bae6 100644
--- a/gnome-extra/libgsf/libgsf-1.14.43.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
index 9426937c0a75..6f7679e5951c 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -1,3 +1,3 @@
 DIST nautilus-sendto-3.8.6.tar.xz 109428 BLAKE2B bc1f0798962d09ca05a64a0db7b98b697c68c7f63239eaf59278ebab7039061cb5b04b0235209db89bf537219039bcc8fff49c9dba2379fcbff32a7f9482dda3 SHA512 c690acdd6d53bde2fc2898362d1030b04312b857924e18735bb330621c64ab63656612a36b646fd34b586af5c34a93bd37c3f969c93bd87c4efe870f55934b92
-EBUILD nautilus-sendto-3.8.6.ebuild 673 BLAKE2B c2e9807a0b2e94b4aa3bd6ed4e237f86cde0c90a96fe49b3d5187456bf94f8ddf1ae4e8653e72aa8c47ca8963134f9ff4d9129974008174313b00406bdaac765 SHA512 7eeddb88d30c75306fd3f1c79049c702fa761115d1fc9aa1fb634a8ba543b849757a16ac5018447c21bf7a514f2bc57741979e99d1650c1c58bec0259112ffd5
+EBUILD nautilus-sendto-3.8.6.ebuild 672 BLAKE2B ee3023c7e8fdb9e5f44e1e1ba9b198d61ae1daadd72bea8cd5615ffb623e22fc8e88c2b6f60dc6b8c243f1f12e36404443c5082eb906a8186193f30f4e662cbc SHA512 e20d9e4225e7c7a4235d0b8a7738d2b2176818c15c9b3a5fc819c12977d1745637bc5c0e08c781defc561878a3e80a2c907cb19f3246cbd824b3df5070749d39
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
index cf4b4bd28513..c0f27a7d8712 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
 
 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="debug"
 
 RDEPEND=">=dev-libs/glib-2.25.9:2"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index cb75ecfca61e..846dcb3c3621 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -3,7 +3,7 @@ AUX tracker-2.patch 821 BLAKE2B 748b88d6487780c35f51fda765fe6539d2ff137123a34f5d
 DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
 DIST nemo-3.8.6.tar.gz 1425290 BLAKE2B 15e82a6b6c298e66f6d752f738bec31d1d4fab726f86baa5d58c5d47cfef2de218c18c711ee95588f68c4bd8bced41a993af3c100b8478707a746857cce906ad SHA512 88cc268aabd9fadcb87df55e3872bc69f136e68f252ad2077e1cbf86e3c53d027142390883cdd61235171d04807d8ae85893abbdc65ff34cc6207d10879b1797
 DIST nemo-4.0.6.tar.gz 1449313 BLAKE2B 0d80e23a503c34e52f126635a7b3df54f7f0d336a637f14e11ac8e1d252a4b7bd43173c362ea0f24602fc4eceb71c97d651ddec2f2922d70c32518fbc8d15424 SHA512 87006f345317b37093daed1081880a4c28eb84438b9c43f9b62211824306074969e5e21df57cfc5fa163d66d16bcf7ba6c26674e27353cfd8a91cf2bfe82099f
-EBUILD nemo-3.6.4-r1.ebuild 2100 BLAKE2B 5eb464b052cf646ef083d00bce998915011f344dbe327ba04ec2e58c5feabeb4daabd8b252e16beddc9d0db05655533c61607efd0389cd89038dedbb64ea43c7 SHA512 3ebea7a6b66f93284b2f8c4f0a3918ae074d86e86a71578470bf6c272fdcf94e57925d7e22c59d2260a7f2a27b5acde74836e313ce13caca9e86b2b2731b9555
-EBUILD nemo-3.8.6-r1.ebuild 1995 BLAKE2B 9079ca667c1dc132f85c656d28b2125720a40443509ffd7f5b5a0dc3c3ca921bb0f8df1146fadbfd1a6a5bb4f29dfc2f5c2ed16ba3a96ed47a8c7d6e21084130 SHA512 8367b8957a2282f5dcfdfe8b98f8ef019eca89a4225b17d53634c2d157feb8af6cccddf158fabb0c1bcfbe5f4f8c185a3b77ea88506a3b473074ae71ac2e6a25
-EBUILD nemo-4.0.6.ebuild 1995 BLAKE2B cfcdf828d36d552cce7adb9c3c663dd24ad754965da507dafa1a437e3e607ed85b8299c9cb560b2c896aaf1b6b5f4c5115f682c26199a77b741703005559d5f6 SHA512 5f41ef563465e27f40a4e59227e6280109ef8521a62a02d3eaa8a4c39074795784b214ee843e69a7ce9c3ce835ff33a1b6419603e4056942fae8d20ec44a6417
+EBUILD nemo-3.6.4-r1.ebuild 2132 BLAKE2B a7b15a4ec18b81c65e68ac6b88f88ecd7e42cf6965d1398e7f65d8bcf72109d760e8e88741444325619a5be6278099b52fb6a0b6be11effbb6844b0e86c0bf6a SHA512 a0bc57ff5150ad30dbfbde7f73af2561a59de7651d37a0c39738d62d9176258ebe9fdddcde8e0e4c8dc9baa1bc113b0498157bdf5cf60e55a208219ae94366c3
+EBUILD nemo-3.8.6-r1.ebuild 2027 BLAKE2B 120f6f91393a3c60d0d7edfe9d21e4eaf57c86513b35c02f41c748ad486fe2fc90fac61ba33a0dffab215c9bc2fa6e9c8461991d3c80ee9461e40809f70af925 SHA512 22e405c96bdf037279c951591f4b88b352a5ab3833faaa5bc3dcae18c36a2980ba6472e5011d267bad37427643cb70a2c8a024b4a043695588ca75c6c4c308eb
+EBUILD nemo-4.0.6.ebuild 2027 BLAKE2B a11d2693b601bb09c04cdcc9b3dbb8205246536f92d24b1a7fe1933baf1b5b68ff3f02b63f3cbf20d73a9d23483c2f3aa384cdc1ccd838eb42b81b9a166010c6 SHA512 0e6dec5c862f10b58f6881fc130bbc4343194ba7de531f03e90d93b09bcac5c1cee563906f6d966d9fef87f2095907af97bea500dd8020089747d137810602ca
 MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/nemo-3.6.4-r1.ebuild b/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
index 7019bc0db237..7b653aed9ab7 100644
--- a/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
+++ b/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit autotools eutils gnome2 python-any-r1 virtualx
 
 DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
diff --git a/gnome-extra/nemo/nemo-3.8.6-r1.ebuild b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
index 4ddc41997b43..b1c30effa3f7 100644
--- a/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
+++ b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit meson eutils gnome2 python-any-r1 virtualx
 
 DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
diff --git a/gnome-extra/nemo/nemo-4.0.6.ebuild b/gnome-extra/nemo/nemo-4.0.6.ebuild
index 4aa693cf74b4..5d84190d07e3 100644
--- a/gnome-extra/nemo/nemo-4.0.6.ebuild
+++ b/gnome-extra/nemo/nemo-4.0.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit meson eutils gnome2 python-any-r1 virtualx
 
 DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index e8bc26a6a0d9..5f228017ebdd 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-xsl-3.20.1.tar.xz 568400 BLAKE2B f61151777eee346d08ecee2903fcf34759581b782662658a6af68f6623e62f9773ef842fa430655871033f39f10aa50481543c4d88f94c6484709fcd3d3776a7 SHA512 7ea22c3180261917d1a277a9b5023f9b2b22346bc3f55cdb1c61c4ae8f78411da93058b55f99c25c9a1bedad21ffa6c3dc460e1ee98614a84a4efa2c2449baac
 DIST yelp-xsl-3.30.1.tar.xz 518444 BLAKE2B 013dc16b04129c714c1938a0cb02f9f833a5a234dc1414387350c01c6f7659e87b0aa6b40e063605b0e5858e2bbf5201410b892ad728086cbca117e4bb942d74 SHA512 34d3a7a95af72a6676db1da2e6bf0fe1dbb3a69b1a82cab2998e305a76dd140012af129c204531c9bb03c5e0593286a4d8833e68b401903e967005f422c6a54e
 EBUILD yelp-xsl-3.20.1.ebuild 591 BLAKE2B 7168a720b5fccd8e694b0b5c9ac78b3a7e1ca56b302efe52b01ad5b957d5a5ef54965b71e7b55c8900c4c03ec320a4f0fc1ba802b0fb3dd10dfc0534e7fd3198 SHA512 37205b98bebfd7eec5c1551e8d02e53ac48505dbd6acd869ff517dda29d9a2f2f6a099fefd06da09c36a466651fe31bc0d08ec84f6fd070e970c9a559181f1d8
-EBUILD yelp-xsl-3.30.1.ebuild 595 BLAKE2B 370bb83fb0123b9551f451b064628070dd0aee0c00ea78311c8cf369c4459ffcc72000387e30e05feb1839f6133f5b31b3875e3998a576853918c5a5c08065c4 SHA512 f21bd6161cdffe191fafaf56f53e794a6b7dbe400aecc51449c9f0063dd4b94e986e6a10c6aef42b29549d8e60345a3390e091115a4559b08ab9a8146406eeb5
+EBUILD yelp-xsl-3.30.1.ebuild 594 BLAKE2B 073e09feb117e1303caf64c8ded227438f304ca25aaf6359d71b4a2fa95943c8345866bd2b9936311e1a9037ac0d27a179e29f133ba7ef2f81804e7d652944ca SHA512 f6ebcc41d7d0eb99a30fa69eb73cdaede94372c5fe3e03f72324f643de18f255658da876277b5cacfc10933876ecd0826e2be89c1912ab6761b750f37e93c083
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild
index d3f99792f87d..869f2b7a7eb6 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 7be93df48131..4403e8df30d9 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/mako/Manifest b/gui-apps/mako/Manifest
index 0df5890951f4..be8ecef07b76 100644
--- a/gui-apps/mako/Manifest
+++ b/gui-apps/mako/Manifest
@@ -1,4 +1,4 @@
 DIST mako-1.3.tar.gz 46482 BLAKE2B ea7699f713aded0476f3a9b88d90fa8d3bbd4e64e888caa68a98208625cdd15f1261c389dcb8ab43c6fbc77e1ebc0840b378443a1b350ff16adc59b98b9be0a8 SHA512 efada6ac413d80949669df3124ab9979537dcedd535132de57338b484ff2c81da8da59503a14dc2e9bbb266101659dd1d399d66456d383fdd1853d9137587259
-EBUILD mako-1.3.ebuild 892 BLAKE2B 1dc59aa384af7aa3a3e1349a3ea925e7ab34e0d39f41cf6aff5725624187036b44204e051c978958660994fa6aa8f6dd1da5f8cb0e0462a4b82aa194b87dacad SHA512 8746c4dbcf1e87288b6662b77bc2bbb53fa2d0e338daaed923c31fb32713c661c538812f38637baaeb57ca1b5c05c25401ea88d9c1ba71b3d560f98efd4a7ee1
+EBUILD mako-1.3.ebuild 891 BLAKE2B 428e070928f0ed53fcd04655625b5098a639adb7bc5cf5ca6a2e355799147d9b4e7d7d81c87aeaac01f90a6a01be2cd6853097025879193b86cec3642cf44432 SHA512 48c897b77b1cb6ca55124eba4b9c7763878e48a70ae84514f57f64e66c8f7376b79f64f99ab9c52b92d973f1bb5814ee4ac0dc2ca0cb88afeb6597626b387175
 EBUILD mako-9999.ebuild 894 BLAKE2B 5d7a5aa5cbac293bc0b1f9e0e5bed07c38a2c2548da92a95c907f48c2ce310fd20f88e695bbd956be3044178a268198abcffb62c104b1ca075318528981baa50 SHA512 c30b91982ab4b20a31831a16df7807a14ad46fcfab6ad5f6b7a7ff6ca28b54188abc95dec2c08aac90bbd132a815b1ec88fd106d6a3a1d682938b645791524c0
 MISC metadata.xml 642 BLAKE2B 4b96d18b0cf351347a12d6e520d7aace4de2f7df8532953288dcfa2549cde936417b73499e0d0b7debd7716d1b49431db6529a213da0b69491df081400af8ae8 SHA512 51c3f7458f486883613916701f721045c3f7f82c9be1b8feb781632e38489e08c1d84411daaf56e01bc07d06c3b1c1683f55a79a51b4d6fd0f522ce97d303c8a
diff --git a/gui-apps/mako/mako-1.3.ebuild b/gui-apps/mako/mako-1.3.ebuild
index 510e14df0aca..3b9ffdde2139 100644
--- a/gui-apps/mako/mako-1.3.ebuild
+++ b/gui-apps/mako/mako-1.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
 else
 	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/swaybg/Manifest b/gui-apps/swaybg/Manifest
index 54d888231f30..4c08bfdb966d 100644
--- a/gui-apps/swaybg/Manifest
+++ b/gui-apps/swaybg/Manifest
@@ -1,4 +1,4 @@
 DIST swaybg-1.0.tar.gz 15851 BLAKE2B 820edbce4161f2d109bc8e842fb2bef101a5793d1da90f4258e5771fe85ab089e184c063a0a7073adbe218c59307946f86bd02c4d62b0585aeb3f9cd5c7963f8 SHA512 67d0e0109b906ece51800729182940374cc59fa07d0866b57cf876d12191fe12e796b84350a849dc85183fa58a3b2d196191e48dcc03dcc3708a980ed4a8cff0
-EBUILD swaybg-1.0.ebuild 806 BLAKE2B 12b1dca5a0e6ac37c752ff068f785f490fd467c698b052656a1ed80f4e5d22c14b97f264b07b2016e7e12a12d8595dad1fddf2c3d72c8571827116ee0fd56354 SHA512 a1dfe9bbb8bb4051c56ef2f3b6d3a0b5dd70ff73ff4ec7e90dae7f8d8640d47d03d5021874469bc585c1058acef783a27ee743c4b26cec57352cf291c86d3400
+EBUILD swaybg-1.0.ebuild 803 BLAKE2B e321bf40913172eb0135b1a95b059d8e0b63a7ddaaf50ff13e4f3299d4e3e170f271eab777cc8a46410027e9ab48bf13f12738ced1beaf65409765c2e543d056 SHA512 c4bcaed1e6d6bbaea50ef9c4eaf70f3acb9bacbea9691279bba41e642c4763590e03243af44d690d474d52dd571bf92ff5fcca5cabbf71c8e8055fac56cfeee1
 EBUILD swaybg-9999.ebuild 806 BLAKE2B 12b1dca5a0e6ac37c752ff068f785f490fd467c698b052656a1ed80f4e5d22c14b97f264b07b2016e7e12a12d8595dad1fddf2c3d72c8571827116ee0fd56354 SHA512 a1dfe9bbb8bb4051c56ef2f3b6d3a0b5dd70ff73ff4ec7e90dae7f8d8640d47d03d5021874469bc585c1058acef783a27ee743c4b26cec57352cf291c86d3400
 MISC metadata.xml 943 BLAKE2B bee5990db9047cfa3f362a6d576f6d932e247e0235a04b83f427b5c9048e822a193585719e1d65747cc8f97d6b1f44f2435b9e956412b8fe707401fa492215bb SHA512 7d4b7910ef0d43041f899b608f351ef834870f8a7f1b9081c08e6ac197f65b9c7dc53e6785b7b9250ec7c3ee2200ee69b711a24c672c8bd3ceee381d5568756a
diff --git a/gui-apps/swaybg/swaybg-1.0.ebuild b/gui-apps/swaybg/swaybg-1.0.ebuild
index af2fdfa04742..605770a1f3d7 100644
--- a/gui-apps/swaybg/swaybg-1.0.ebuild
+++ b/gui-apps/swaybg/swaybg-1.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/swayidle/Manifest b/gui-apps/swayidle/Manifest
index 502b47254911..a2333cca8721 100644
--- a/gui-apps/swayidle/Manifest
+++ b/gui-apps/swayidle/Manifest
@@ -1,6 +1,6 @@
 DIST swayidle-1.2.tar.gz 9136 BLAKE2B e88eec89007deed59df30f3f89111352b8a1ed464141783cb25b0d0a484e8ea4cfd611f1bd80d9420368d7912979eb0536a6aa583d24504d32bac797a898dba5 SHA512 2539e80a45163bb3e76f7b41f6fd6a1d73d194b7e466f63178b5087d05470fceafba38a26d592a534a01b992a2c0cf0f8fb83805cdf41ee956fea5136cc8fe89
 DIST swayidle-1.3.tar.gz 9714 BLAKE2B 2f57576be0fc9343c2dcacb0acbb06f105143e98e26650de71c9031ecf6702f98bb4f54a3d32a46f0d425a398ece511d35ad696e59f9e9b4ec6b8046a76da49b SHA512 efdf391870cd6eb2b21ef6556d8cfdec3c76c059c1f1065a55719bef55d3aef2a7fb39f38f0ac3a8e2e8a1ffa9df38635d7dc3397add7adf255db69c55b4351b
-EBUILD swayidle-1.2.ebuild 1328 BLAKE2B 4f588965446a3f1f242632e0f0d91ee06297580c07476b1e84699bd47d4e4f5b7d3b64bfe5f6b4b4c183345271f078142b5a5dfeafe36c7c765d1e00df997998 SHA512 69cbf4c69d3039df28acc4b3661ad31f98859a7529f0b51fa199376061c9cfdf36d0b87be88a26c05a9494ea28b66ced74136104516b00514086bef50a29ca13
-EBUILD swayidle-1.3.ebuild 1330 BLAKE2B 79fceac111b432e684b932303e55e92cbeb06f8a4f2210911e2c43f347b88e3d5924b8d17fdac06e081c86aa004d5124c63d1a16c40d7e5954ed353911734588 SHA512 3208a10066102103291b349c6251cfb4a3c7b8680f0315b7f57226d16131d0300c60acaef296e56a83aa586af768efb5d55b8dacd952c48faee16a773fed8cde
+EBUILD swayidle-1.2.ebuild 1327 BLAKE2B 8d8d05bed875eae6b86984e92051a8da8e52b0fef07e42d0459baaef18d5efd0fd043b7251fe717c1514b25e249d65f10c7b1ee7da756c07d63592722dd81d0c SHA512 c8d544b8f4549770a58f6663207a0af73eea7186c18234e78744b60b598ee998ddc1ab90ad416b8a5775ab99fdda4ed8d35e3df2aa68ee2e479462b5151e779c
+EBUILD swayidle-1.3.ebuild 1327 BLAKE2B 8d8d05bed875eae6b86984e92051a8da8e52b0fef07e42d0459baaef18d5efd0fd043b7251fe717c1514b25e249d65f10c7b1ee7da756c07d63592722dd81d0c SHA512 c8d544b8f4549770a58f6663207a0af73eea7186c18234e78744b60b598ee998ddc1ab90ad416b8a5775ab99fdda4ed8d35e3df2aa68ee2e479462b5151e779c
 EBUILD swayidle-9999.ebuild 1330 BLAKE2B 79fceac111b432e684b932303e55e92cbeb06f8a4f2210911e2c43f347b88e3d5924b8d17fdac06e081c86aa004d5124c63d1a16c40d7e5954ed353911734588 SHA512 3208a10066102103291b349c6251cfb4a3c7b8680f0315b7f57226d16131d0300c60acaef296e56a83aa586af768efb5d55b8dacd952c48faee16a773fed8cde
 MISC metadata.xml 1067 BLAKE2B 059ead0c34aebcaa6f8ebd10db8b9b0aaf2df66f84a6ae10d16f3a32d680426aa4733c0788dfe61532bb90d3b92f4bb451e7fd1be822c6866205575fd3c4861a SHA512 99a60f4bcfb76aa7d2a6d4d2a7a6879d9f0ac17f0be3e37d59bef4a4b158b9e685dd5932a02e650b96756dc7f6cba2aac9b1eee95c6d56f4429c23e32a101ad4
diff --git a/gui-apps/swayidle/swayidle-1.2.ebuild b/gui-apps/swayidle/swayidle-1.2.ebuild
index 126e7299ba0c..b4a51c1048ea 100644
--- a/gui-apps/swayidle/swayidle-1.2.ebuild
+++ b/gui-apps/swayidle/swayidle-1.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/swayidle/swayidle-1.3.ebuild b/gui-apps/swayidle/swayidle-1.3.ebuild
index b338cccdbd2e..b4a51c1048ea 100644
--- a/gui-apps/swayidle/swayidle-1.3.ebuild
+++ b/gui-apps/swayidle/swayidle-1.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index 07ba36b1fe20..8c35e4934c20 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,6 +1,6 @@
 DIST swaylock-1.3.tar.gz 32848 BLAKE2B 81ed50839bcb0139e7fc2081bd37e738f3e6ef23e96a5108d1acf56cc3425285f7382576a54201f1bf188883b1da06492074c091877af13832c0140e4e6099fd SHA512 723d758d76f076f3f1539ea0d651f6ad2562659c72eef7e895d7827a0be21db663652fe4ce2609065aff45ff20230879599868cff327ab52b896330ca04d78c4
 DIST swaylock-1.4.tar.gz 34288 BLAKE2B 6b2c8764fd605b04843c254e776f7174caedf4f0dbc85cbd9b5cc10762eed5694ac2fdaa0393a630afc374980f0d6530104119505f034d65af37d738ab1a30fc SHA512 5068b5f97e3094c511deda553f363a71f655b16e6533ef8f82befcd3b9027a55de81f143eb95e60cf4dbe4cecdc49906285bd6a0e6d51eb3b2807d0101581809
-EBUILD swaylock-1.3.ebuild 1299 BLAKE2B 5dc7a8e625fc802b46656bb3bfc73a25a9fb714b859174291cda1743f7698e108a820f148c7cd9e08a97c2ba38a48b7f89e06bcb841cc57464913cfca3a08dbb SHA512 1c7c1a4c31ec67a883a4c9d04a3fac3326aed6686430a5f7d51a2f58c794907ad4ec5a1667b777594091c14d3f54987aaadb8880dcdb5b2642457bd2d6d1cb61
+EBUILD swaylock-1.3.ebuild 1298 BLAKE2B e3f6e209cef86bd0a1fa1fa0a3b44100099c7dc5aeaaa45be12273fa626e666678b1a748a148ece598b3c9d368882c15009d5c04e0832976ca65af0e0c97b335 SHA512 396e428375c5abeabee082653fd7e4c2944312a1486eb793aced86ca8013bd9c9cc7069773d49bb9e4ad43a5e74c34822b8a68a5b835e164edcc89a2d6e90cfd
 EBUILD swaylock-1.4.ebuild 1299 BLAKE2B af3facdccbab77dca204d14c34418c6ad8c523d8c1c21c64d8612ea15cfc64be8e41aebcb013feccf7057646f0a42362bf4090e4f22a7a80c8be1d9cbc158070 SHA512 3c5e6e70a045d7689009648f6c331b92976cce2ba7f0f0fc8366162daf2f7ab8b6bd4b04a3533466a94b92ffe0b272cc0043513d0a4ee9b091d496423554c079
 EBUILD swaylock-9999.ebuild 1299 BLAKE2B af3facdccbab77dca204d14c34418c6ad8c523d8c1c21c64d8612ea15cfc64be8e41aebcb013feccf7057646f0a42362bf4090e4f22a7a80c8be1d9cbc158070 SHA512 3c5e6e70a045d7689009648f6c331b92976cce2ba7f0f0fc8366162daf2f7ab8b6bd4b04a3533466a94b92ffe0b272cc0043513d0a4ee9b091d496423554c079
 MISC metadata.xml 1292 BLAKE2B 9f376dc92ce4d49acf4ad1d79c1b24465d9944e48fce54f23e2e8a076a2d65282ec9fc963246e8e8a85d85b7f9258a17724221e2c63453ed2d1cd98b95853759 SHA512 d53e022caa435f7904f8b9f86c18cf33b9663cf48a8d3d34d6779e2ed4625beafcd30f34d5ecc224f45349846e8716b7587c9ce711216ce7326e27424675c595
diff --git a/gui-apps/swaylock/swaylock-1.3.ebuild b/gui-apps/swaylock/swaylock-1.3.ebuild
index 57dd5189c5db..8f7ba94b3aea 100644
--- a/gui-apps/swaylock/swaylock-1.3.ebuild
+++ b/gui-apps/swaylock/swaylock-1.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 02ad117336e3..b08f96c750eb 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index aea4d9113410..9ed88060b167 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -2,7 +2,7 @@ DIST wlroots-0.4.1.tar.gz 480127 BLAKE2B f193860ef9e0852b053270bdaa44b491a8c65a7
 DIST wlroots-0.5.0.tar.gz 481154 BLAKE2B 094c7c92191ea9c581debc90fa7b0117ed15328c11a098e53cec05b326e84c54481a69382ef9a592337ade370ffb55ea98b545794471808dee9f41ee9db8194f SHA512 4defecff91a6179d3a6b7d05c92c14b20c7fa69263a889869912e913a5d1e29f9fd4684f9816b03e2427a21c004d64236f35d8282e02e8d27d826442f1f8b3a7
 DIST wlroots-0.6.0.tar.gz 497934 BLAKE2B a0b631831752e533f83ed62e402ef69b0994df050fd643cf2ef89556face4a822b3936bc758b70ab160eedda8ced16c0992dc209600914095784bba97bd26ee2 SHA512 c205d4303a381e11ef2f4db2faac1ddf9ad85c675824aae9cfe62d9f8bd313f1568d4810db1d006416783b50c8364198648a46d1ba453a0d8f659d6920618286
 EBUILD wlroots-0.4.1.ebuild 2556 BLAKE2B 387bad0c2177db317674eca833112491e6a9fb78dfe1f6f652450a557bcc5ef65c575f0024b069e6b93122b94e6fc180f8d046ee4d83c2be571150458fdb8868 SHA512 4c57f85f868d258bbe8168137f4e5f639dd617ab994a93324a115ed31e3ff2dddd802bc787cada563df8df780cd7a4ad3d1a57cf2b64c6408c862ffa64178c41
-EBUILD wlroots-0.5.0.ebuild 2561 BLAKE2B 0bd400c9856dbb697d344c2655f7bc81cfc667d632f9ed185453460442a73833a6330676ee75222df483d494235e7f33ed06a93ff7ee5e475a2dc65d09ce174d SHA512 e0e8415389e7f7a04e987c6d1dd4b2aa6f9a5011547e3d8637e598eaab0f89fe4b52985e3c07205067b44c802e0a501aa46d9a6a709f047dc7b5c1e1c2798aee
-EBUILD wlroots-0.6.0.ebuild 2563 BLAKE2B 3702306601cfb39e3d3e6719cfa75e6c23ee7f35814c804a4eb9997bcc004b5ff57f328d17625bd1313ca7898ee86211a3f1857c401886e39d9971443ccd478e SHA512 9c69220a61469efe672e06414dbdac04e7dbf25eb5b3e8cda4696752b0604421144b167cf5836ef413d500427edcc5a7d02dbc821027f3952bcb385cb310d6ad
+EBUILD wlroots-0.5.0.ebuild 2560 BLAKE2B 888dbb482966d512c7c448ef30061acf9bf19f311cb1cede67eb51d4969236f366980b2d13a852a6a19e5ed0dfd3969abb739796b3ba77556a70447245ec6ac2 SHA512 60e2b90b688e7e62e1a34077e5edbf07c1103da4d9198fb224b511b01a78c98011a835e6f547388646b337509f912d93ef674e919a08da2c24a6383ce74d0f21
+EBUILD wlroots-0.6.0.ebuild 2560 BLAKE2B 76b28e33dbe932fe89160a4806a46d3f1de2118ea05545d2248f3c7ddf59609bcd339dbe34673054943e7ca37360d3dec773630f0e2a4dde803062aa14facab3 SHA512 aebd49d399a8989d56bd2e08291da1af80432ec9cf642446bc5aa6f71c8c63d9f3467243fd43d216693831dfa432e1ba4be494a79b999254e6a741e730559ff6
 EBUILD wlroots-9999.ebuild 2563 BLAKE2B 3702306601cfb39e3d3e6719cfa75e6c23ee7f35814c804a4eb9997bcc004b5ff57f328d17625bd1313ca7898ee86211a3f1857c401886e39d9971443ccd478e SHA512 9c69220a61469efe672e06414dbdac04e7dbf25eb5b3e8cda4696752b0604421144b167cf5836ef413d500427edcc5a7d02dbc821027f3952bcb385cb310d6ad
 MISC metadata.xml 1682 BLAKE2B 5713fb5006f1c178ba401ff4831ff991ec1e2270bf7d7961a0727a8934cf9262654fa12b9e13cd14803a8ace50c04dcdcdd37ff6162239fb22c30c84970b1f7a SHA512 88263936158e8d423f79ac9932286674e0b7e6e50f0279cefc07fa3961cda5c65874b14029553ce8b93dd22a7715ca40b1db32d239498d144fc6c901000e5018
diff --git a/gui-libs/wlroots/wlroots-0.5.0.ebuild b/gui-libs/wlroots/wlroots-0.5.0.ebuild
index 186530905677..c41237dd8a5f 100644
--- a/gui-libs/wlroots/wlroots-0.5.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.5.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-libs/wlroots/wlroots-0.6.0.ebuild b/gui-libs/wlroots/wlroots-0.6.0.ebuild
index db03b0f1e012..99d9b05be6f3 100644
--- a/gui-libs/wlroots/wlroots-0.6.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 4bbdfcde6b9f..2fd928974a81 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 65048606d7a3..8d99f7686810 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,8 +1,8 @@
 DIST sway-1.0.tar.gz 5474548 BLAKE2B bea0a72c374b75f027e466d83e8c06abe32205e0cda80776b0e48e327a6da4e965a6a575595e5a38bcb125294c509b5d9a1db17604dd9e9032acef404366bdb9 SHA512 57e2610244c8bcd2b09bb5396113176d118ee5a0688aea297d4c191eda70ce29b36ff64e05c57d1a32a31cc4f2ac2562fd3cb3890508a8f3c7cbcb9fb017171d
 DIST sway-1.0_rc5.tar.gz 5472917 BLAKE2B 33e01bd0da0a90ff7c09b9af0ebf9f9263be3789390777ee207d2e4297a55d79d4cc7fea28aab121820fffd3447f76d9af60a9c118e541f0ff85ffe9dc17ae48 SHA512 26eb5625e1f940a1705f2d675587ce142a7b07206187c851660bf1c405e9a76c0cc20cf616d471170578f50dae2fc322b504df1ea3ef722fc5992dd9803de8fb
-DIST sway-1.1_rc2.tar.gz 5480615 BLAKE2B e54980bd23ee29e7a2d7abfcc3cb474fbe77b2e830e2a7afef0a3457ff67d683321b0fb4f4aae17d717171d6bf7d5f91ce468e090a02f8287e71fcb88717fe4c SHA512 6016d45f0812bbdc782fc81c63089431888398739c8b304b8021375a4f019f11ca8cf4bf12be07ed0d102f50c76586d1bd2b9658f6b200c1c777afc6ccc6d371
-EBUILD sway-1.0.ebuild 3039 BLAKE2B 90d47a1b7f7720be655d3c83d0e1e2020fa8953a2d5d787ed46898c8f77763c0964b9c03255a56bdf8c7bd7777559510b23673c027d332620ed0deda48dfa5c4 SHA512 5f317e47ebbde80e7e02ac3218b13d1a321559fd40c619630e688ad182bc13bdbc4cec0e2d0e0d6b186f640cd63fd7e9de7c4c1f803707513eacd00249c68ee7
+DIST sway-1.1_rc3.tar.gz 5480553 BLAKE2B 21623ffaeca39599f83fcd3e1888bfff8b7a67cf03ba47eb6df5a9d88a857b9c9b65872925e37b95c85e63612884a7e727129a69396aacce5287545a6e9f2b3f SHA512 425c0af31ecf64e3be45fd0a8592fd3fc57127fa8f5c9bf08ec059bbb396bc83e883b08a32dce24d3de9f7027301e3e8e85f0d3e1f261f93bf66ee0d6a8fd0d0
+EBUILD sway-1.0.ebuild 3038 BLAKE2B e883271f1a8e48ac932693b87c233d95c900ccee158dd6044bac72ee77ca594b738eb554e96f5660d0f5ea0bd8cd1208f3afa1e46acbef81899dcda1fc0cb060 SHA512 f4cd617c06f0807672a7db0b5d899d6b3c82d6bf313c3a82a1d43b65f54c982703ec17d4d08b0722453881831e5186efc2b57fd4c8515e3b83df28d7950c467a
 EBUILD sway-1.0_rc5.ebuild 3049 BLAKE2B 6be3b4e7dc5a58acdd6b9969075c9371ed581b2acdc3fcfd86730830572d9d98f16f98369bb74ffa5f395632948edde53c669421d95616d9afd8a722a19f0cbc SHA512 caaeee7f5ed66a86b6232e5ef6fb98b3e458ae9224f763a3f17f5de92d4e2aff3a2b803202940dc86433ab097a5f290421664e5723106feb09e7b423670f8a3e
-EBUILD sway-1.1_rc2.ebuild 2953 BLAKE2B 0146efd670edbafed4df718383d9c059cced7dc7178d407e46c3ee3a3b260464972e2a485fd34f511bfc276a1cd41e41ba14e2a76058a626c222c06e8a32fb02 SHA512 b6fc5f65a764a2fc6e31e8b828bcccfca3b85d5d6b1d39ee7096b0dee22de36385d9432bd4bd90358c84e6cf7d17efdcf077c0513ced9d0be4e18ed8467b6d68
+EBUILD sway-1.1_rc3.ebuild 2953 BLAKE2B 0146efd670edbafed4df718383d9c059cced7dc7178d407e46c3ee3a3b260464972e2a485fd34f511bfc276a1cd41e41ba14e2a76058a626c222c06e8a32fb02 SHA512 b6fc5f65a764a2fc6e31e8b828bcccfca3b85d5d6b1d39ee7096b0dee22de36385d9432bd4bd90358c84e6cf7d17efdcf077c0513ced9d0be4e18ed8467b6d68
 EBUILD sway-9999.ebuild 2953 BLAKE2B 0146efd670edbafed4df718383d9c059cced7dc7178d407e46c3ee3a3b260464972e2a485fd34f511bfc276a1cd41e41ba14e2a76058a626c222c06e8a32fb02 SHA512 b6fc5f65a764a2fc6e31e8b828bcccfca3b85d5d6b1d39ee7096b0dee22de36385d9432bd4bd90358c84e6cf7d17efdcf077c0513ced9d0be4e18ed8467b6d68
 MISC metadata.xml 2486 BLAKE2B 2d34da83a8d8726b91189d27a400e705a1b0259a1ca577a85e7c21784274a08a0adccc134cd523e193f8635b26dcb1802e37bfa1831f58c922285341b1eadd5e SHA512 9d382307136a126a614a8361828cb018865243b1a8c2a4dd08fbd484afc53320abf6d64dd82dd93a47d8de284552f1857c028c6c72db06199152e1458b636ec0
diff --git a/gui-wm/sway/sway-1.0.ebuild b/gui-wm/sway/sway-1.0.ebuild
index 959bbbde1c79..9962383f238e 100644
--- a/gui-wm/sway/sway-1.0.ebuild
+++ b/gui-wm/sway/sway-1.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV=${PV/_rc/-rc}
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
diff --git a/gui-wm/sway/sway-1.1_rc2.ebuild b/gui-wm/sway/sway-1.1_rc3.ebuild
index 5293b993a7d5..5293b993a7d5 100644
--- a/gui-wm/sway/sway-1.1_rc2.ebuild
+++ b/gui-wm/sway/sway-1.1_rc3.ebuild
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index cf4f6f6ba70a..7998432cc250 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index 81edd7482bd0..3bd259f8206a 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
 DIST khelpcenter-18.12.3.tar.xz 3841936 BLAKE2B 3173d046335069aa66c62d7d85a2144f1e0479e898156acd164f6b139a1ab0e27b8b496131053c2f6458bb098a0c580bf760b2725a8a4df858d4d13fb08e9140 SHA512 728b335076dbaf63bf8ce8fbc55f5d4efe01663998b30ae40d252903c1090c29d5cfd58e9036242ec9b0206c34d7b397a0739e7ef9962d6dfb0ecaff9ea45df3
 DIST khelpcenter-19.04.1.tar.xz 3846828 BLAKE2B 00af379c707fcfa7bb24991858f99c739e8a49cb88fa99d74fded544f16dda734402397a6c33f173b228ad49b0944a495b483e69cea7fa180ccb0e725e530985 SHA512 c42206554beff891c51c8dbe73baf722e1e571e1166916dad36c37573c09a5696c06b711748dd863782c43d507c2f6103d1aea122e5ef33fd59972c0d4e8503b
-EBUILD khelpcenter-18.12.3.ebuild 1160 BLAKE2B c91fa2abbfe68f4d04440b909dabd9f746976003d4a633f6ab652fdad4cd159794e606c51cb658eb892869e2268e90121ef6aec7faba05da84bdb9edd91f3fd0 SHA512 862a3867b84df67810b957209ff50a1071e784b6061add34b65783bdc1f6dc20a1aff3a6339faa0749fc25067c5a20b7a1100e65698c86379b8c4356a60eef5b
+EBUILD khelpcenter-18.12.3.ebuild 1159 BLAKE2B f0deac6f1871a6aca5a33fa0a3745db95d2a57dd7ac5eb316c12c5d6d0cb9808414384b10a9814bc951305614e790cc242977a71a845c78aa04d900209cbfd34 SHA512 158a9911268c56571f0eeff10dc1d3a14ee5f936487e7c10b249f7b38fc9b378b93a336eb4c814e5c1e52a8bbd9af7edb68d8deb0eaa2bd2ccd504653dde77b9
 EBUILD khelpcenter-19.04.1.ebuild 1162 BLAKE2B b9a9d0841fcba5e2b315a76381b777fe8eab24e6e8d62e05d601875ba90af659587cda9222f5f4d02125b0515425df71897abe2d9a3fcb17e9e8467781c60c62 SHA512 d4f4e645d8ec0abfdb8b6697bc2360448d080998ede63117067784a99c570035c92d5ed464ac68a85cddd23aa0cb65d516d1944cf6d51b4d1be66f8c141ee88a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-18.12.3.ebuild b/kde-apps/khelpcenter/khelpcenter-18.12.3.ebuild
index 3be73a991940..5dc755f57bf4 100644
--- a/kde-apps/khelpcenter/khelpcenter-18.12.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-18.12.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="The KDE Help Center"
 HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 98ff1af9ea59..47c07f127b9a 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,5 @@
 DIST kio-extras-18.12.3.tar.xz 562196 BLAKE2B 539880e283251740d44b1f27947722dbb70ecdb133d6708b6a7746fdf65de1eca170ca6d92d22d21b4fa790562d4f71bd8783997bf6bb707e2d2883b1c0aae34 SHA512 a13c349a27b7ffd665b9a3812d70228ab40ac48c50ded7774ed954ce30a6454d1a9c5a27769ddae8f333db0c87943eab18380da413274b69802d9569f6e48d66
 DIST kio-extras-19.04.1.tar.xz 570944 BLAKE2B c5ab5946aaa0ad84fff3368efd4d8be13585bcb0e614d8b9cead8f198259276c614066afa269b2c95fcb689d0a31e1e0aaa8e1259b016d3130c41b52ece0c717 SHA512 a95247aa3174e6f9d153282c19519e13e9209793010d9b48109206a8d7a4db80086518ccbf0b442fc37715c1b4d10888e4a812082b5de998b4390d62aab472c3
-EBUILD kio-extras-18.12.3.ebuild 2046 BLAKE2B f993bf45fdf157d44c595d77587493e86cbc600f9b722d0e6c063b657e879f1211446b9b809dcfb91606c3986ff9b283c5f8ae20a5292c5773a1df18eb4109b4 SHA512 e2613284e71ddb38f48eeb77392dd533ceb0476f2d7f421f9e92156eed1ba74b5cfbfd56e422a06b5ce9808c8db80803e05570ac28e7500205666704a9bcc786
+EBUILD kio-extras-18.12.3.ebuild 2045 BLAKE2B f916cb16c39f2cd9020d3d36def084546286e516c970da2e58d5dfe57d252596ca59fc9facd13f45f3417ef3d7e80ab423dee8e6beb4966ddc079b90ea1cfd2d SHA512 d3f965ac79064e81f5af0ff38a79bfcfa0d77f3105aa34b5328ecd9b319eaff6be3ee1811afef9137d3b8026d836c934a27736a993b4136db679eaac45c66ec2
 EBUILD kio-extras-19.04.1.ebuild 2091 BLAKE2B ecab8666df53a419fc696e1e776004df446b08daa015bf57e7bf00247932e1ba497622e5837d42992e705433da1edf78e1584fd53231c20c33b5c1d0dacdf101 SHA512 1500f85c5697f63c132e42c4c3c1d800f949cd2203f5f330d4cc0c52b20b2b500990a4d7f4a7961ed258a6b1e3c467f8c50944140bd73d7b26c3f02f274323ea
 MISC metadata.xml 667 BLAKE2B 7f837cd50d37a8692d57859a3328770578e13052392bcee145c327e6a07d147f8194ae09ab0c6933fe15eb6964640e8b82495417b3776cac3fce0825fd1fd989 SHA512 3c14222010c942ec878bc049e2e92dc6180305de69804bc024bba1f159d08c97eb61b3e9ad68e14188515bde2b21a026c8068ab465ce8ca22e8e3e0190649154
diff --git a/kde-apps/kio-extras/kio-extras-18.12.3.ebuild b/kde-apps/kio-extras/kio-extras-18.12.3.ebuild
index 9482d93a903f..9d934ccc5e55 100644
--- a/kde-apps/kio-extras/kio-extras-18.12.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-18.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
 HOMEPAGE="https://cgit.kde.org/kio-extras.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="activities +man mtp openexr phonon samba +sftp taglib"
 
 BDEPEND="
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index a9d2e2653817..de1f5517daad 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,6 @@
+AUX messagelib-18.12.3-qtwebengine-5.12.3.patch 6953 BLAKE2B f69a90bedaa477609a464c5430792944cc4eeacd38b90c1d39b6eeb53d880e8551203c9912c539db60bfbd4478803561691dbb15a14ef2ac651dcf8049f78e98 SHA512 0cbf1b934890073083a2ef1a5099a27a8d5e5857b3a0a4690ef2b889650574341d442acda3154a2911eb3ba80319c5fd1fe3c9d50f454cce102a0437157792d2
 DIST messagelib-18.12.3.tar.xz 10428172 BLAKE2B 549089a1cbfa3d27b6a69b8efe11299c377bb761b223d4a3e00bbf241dccf29a7e49607b665e565bb11fa5c2b0d54543ab91a42180122664c47f8f38c45c606b SHA512 06ef96514d4d54d0c25114cac358de039874622c307d71bb9bd23e01c6fb665001e22930e2f2ccf7ef4b083544619a8c382ad8c40c8ee227039a9c33b34cf220
 DIST messagelib-19.04.1.tar.xz 10451112 BLAKE2B 24509ce59af9bb4de8eafc59d354f86f1e1d50aa431a11240e120f21f5af32ae92a2e247b7ef22eb063df552ae2394edb39539b6f099e25e016272f38452869a SHA512 1e3be1fb0521f49f8e6f9fa006d3ef728fb9f967614527d8768b69ad42a66a46bc36e0f1913b94a36eff1833d1d019a9ef5b91075706a1b7d9c80967b5814dd2
-EBUILD messagelib-18.12.3-r1.ebuild 1918 BLAKE2B 955e593d4ec93be8e02f08065de545f8e641f1af2ea06f290b023dba2040d6aa0ad1f318f9dd09cc8ad691a13f8199068611afa0c47e78b16b070b80a4564b50 SHA512 8babd52045b242a1554782464250ffff0829fd3b529bd5867aec0b8bb24fd9907d804722d3003d1cccf3aff838fa70d24230a3e95babe6cc54af7f03a78ace76
+EBUILD messagelib-18.12.3-r2.ebuild 1988 BLAKE2B 0a1aeb8237c306928d30be394002f98f2dde244db93b22cab1a487bf98a98ae2b2c0084ec3934a924c33553ab0cba44306c257064c02aef93dc97a2bd53b1519 SHA512 e52766970667ee8c186ac0f986ee31d26595fc48cf617c943f3bd075a67c98f715deebb42fdcc6bbd2c9c02864ffa20fa886aeb9f518ebf6f3cccd2d8fe1855a
 EBUILD messagelib-19.04.1.ebuild 1906 BLAKE2B 3e76af59153ae82a52abb94a9eee0ee326583a05ad559a9c102d167690dbb45c577cc1b43211911ccaf647eed4033d4cc0dd21e41ab3dcecc256d6162df95f24 SHA512 42d8025849c6252a16b00c19379578aed74ab8c848c3853cbdfaac8daefc8bbcb17b14111a36c7189e7de585f73c5111d2d232dac8bb2bb825ead7d5e09f46de
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/files/messagelib-18.12.3-qtwebengine-5.12.3.patch b/kde-apps/messagelib/files/messagelib-18.12.3-qtwebengine-5.12.3.patch
new file mode 100644
index 000000000000..3fdc1527951a
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-18.12.3-qtwebengine-5.12.3.patch
@@ -0,0 +1,172 @@
+From 9f0ce086c6a4e487cee1f01acb15290ebff19ac3 Mon Sep 17 00:00:00 2001
+From: Jonathan Marten <jjm@keelhaul.me.uk>
+Date: Tue, 12 Mar 2019 08:47:43 +0000
+Subject: Move management of QWebEngineProfile to WebEnginePage
+
+To avoid a crash on KMail quit or viewer window close, caused by the
+MailWebEnginePage being deleted while its QWebEngineProfile is still
+active.  Simplified management of the profile by handling its creation
+and deletion within WebEnginePage.
+
+Deprecate the 2-argument WebEnginePage constructor which allows an
+already allocated profile to be used.  This constructor is used by
+Akregator which specifies the global profile; it will be changed to
+use a private profile instead.
+
+Differential Revision: https://phabricator.kde.org/D19559
+---
+ .../src/viewer/webengine/mailwebenginepage.cpp     | 10 -------
+ .../src/viewer/webengine/mailwebenginepage.h       |  3 +-
+ .../src/viewer/webengine/mailwebengineview.cpp     |  3 +-
+ webengineviewer/src/webenginepage.cpp              | 22 ++++++++++----
+ webengineviewer/src/webenginepage.h                | 35 ++++++++++++++++++++--
+ 5 files changed, 52 insertions(+), 21 deletions(-)
+
+diff --git a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
+index cd91494..f3790b9 100644
+--- a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
++++ b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
+@@ -29,16 +29,6 @@ MailWebEnginePage::MailWebEnginePage(QObject *parent)
+     initialize();
+ }
+ 
+-MailWebEnginePage::MailWebEnginePage(QWebEngineProfile *profile, QObject *parent)
+-    : WebEngineViewer::WebEnginePage(profile, parent)
+-{
+-    initialize();
+-}
+-
+-MailWebEnginePage::~MailWebEnginePage()
+-{
+-}
+-
+ void MailWebEnginePage::initialize()
+ {
+     settings()->setAttribute(QWebEngineSettings::JavascriptEnabled, false);
+diff --git a/messageviewer/src/viewer/webengine/mailwebenginepage.h b/messageviewer/src/viewer/webengine/mailwebenginepage.h
+index 7f8e6eb..d581efd 100644
+--- a/messageviewer/src/viewer/webengine/mailwebenginepage.h
++++ b/messageviewer/src/viewer/webengine/mailwebenginepage.h
+@@ -28,8 +28,7 @@ class MESSAGEVIEWER_EXPORT MailWebEnginePage : public WebEngineViewer::WebEngine
+     Q_OBJECT
+ public:
+     explicit MailWebEnginePage(QObject *parent = nullptr);
+-    explicit MailWebEnginePage(QWebEngineProfile *profile, QObject *parent = nullptr);
+-    ~MailWebEnginePage();
++    virtual ~MailWebEnginePage() = default;
+ 
+     void setPrintElementBackground(bool printElementBackground);
+ 
+diff --git a/messageviewer/src/viewer/webengine/mailwebengineview.cpp b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
+index 0685a8d..09224cf 100644
+--- a/messageviewer/src/viewer/webengine/mailwebengineview.cpp
++++ b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
+@@ -34,7 +34,6 @@
+ #include <QContextMenuEvent>
+ #include <WebEngineViewer/WebHitTest>
+ 
+-#include <QWebEngineProfile>
+ #include <QPrinter>
+ 
+ #include <WebEngineViewer/WebHitTestResult>
+@@ -81,7 +80,7 @@ MailWebEngineView::MailWebEngineView(KActionCollection *ac, QWidget *parent)
+     : WebEngineViewer::WebEngineView(parent)
+     , d(new MessageViewer::MailWebEngineViewPrivate)
+ {
+-    d->mPageEngine = new MailWebEnginePage(new QWebEngineProfile(this), this);
++    d->mPageEngine = new MailWebEnginePage(this);
+     setPage(d->mPageEngine);
+     d->mWebViewAccessKey = new WebEngineViewer::WebEngineAccessKey(this, this);
+     d->mWebViewAccessKey->setActionCollection(ac);
+diff --git a/webengineviewer/src/webenginepage.cpp b/webengineviewer/src/webenginepage.cpp
+index 447ac26..2fcb6c2 100644
+--- a/webengineviewer/src/webenginepage.cpp
++++ b/webengineviewer/src/webenginepage.cpp
+@@ -33,8 +33,24 @@
+ using namespace WebEngineViewer;
+ 
+ WebEnginePage::WebEnginePage(QObject *parent)
+-    : QWebEnginePage(parent)
++    : QWebEnginePage(new QWebEngineProfile, parent)
+ {
++    // Create a private (off the record) QWebEngineProfile here to isolate the
++    // browsing settings, and adopt it as a child so that it will be deleted
++    // when we are destroyed.  The profile must remain active for as long as
++    // any QWebEnginePage's belonging to it exist, see the API documentation
++    // of QWebEnginePage::QWebEnginePage(QWebEngineProfile *, QObject *).
++    // Deleting it as our child on destruction is safe.
++    //
++    // Do not try to save a line of code by setting the parent on construction:
++    //
++    //    WebEnginePage::WebEnginePage(QObject *parent)
++    //      : QWebEnginePage(new QWebEngineProfile(this), parent)
++    //
++    // because the QWebEngineProfile constructor will call out to the QWebEnginePage
++    // and crash because the QWebEnginePage is not fully constructed yet.
++    profile()->setParent(this);
++
+     init();
+ }
+ 
+@@ -44,10 +60,6 @@ WebEnginePage::WebEnginePage(QWebEngineProfile *profile, QObject *parent)
+     init();
+ }
+ 
+-WebEnginePage::~WebEnginePage()
+-{
+-}
+-
+ void WebEnginePage::init()
+ {
+     connect(profile(), &QWebEngineProfile::downloadRequested, this, &WebEnginePage::saveHtml);
+diff --git a/webengineviewer/src/webenginepage.h b/webengineviewer/src/webenginepage.h
+index be38368..95c7c76 100644
+--- a/webengineviewer/src/webenginepage.h
++++ b/webengineviewer/src/webenginepage.h
+@@ -31,10 +31,41 @@ class WEBENGINEVIEWER_EXPORT WebEnginePage : public QWebEnginePage
+ {
+     Q_OBJECT
+ public:
++    /**
++     * Constructor.
++     *
++     * A private QWebEngineProfile, only applying to this QWebEnginePage,
++     * will be created to implement browser settings.  It can be accessed via
++     * @c profile(), but it should not be shared or reused unless care is
++     * taken that the profile is not deleted until all of the QWebEnginePage's
++     * belonging to it are deleted first.
++     *
++     * @param parent The parent object
++     **/
+     explicit WebEnginePage(QObject *parent = nullptr);
+-    explicit WebEnginePage(QWebEngineProfile *profile, QObject *parent = nullptr);
+ 
+-    ~WebEnginePage() override;
++    /**
++     * Constructor.
++     *
++     * The specified QWebEngineProfile will be used.  See the description of
++     * @c WebEnginePage(QObject *) and the API documentation of QWebEnginePage
++     * for caution regarding the lifetime of the profile.
++     *
++     * @param profile The profile to be used
++     * @param parent The parent object
++     * @deprecated Use the single argument constructor, which creates and uses
++     * a private profile.
++     **/
++#ifndef WEBENGINEVIEWER_NO_DEPRECATED
++    explicit WEBENGINEVIEWER_DEPRECATED WebEnginePage(QWebEngineProfile *profile, QObject *parent = nullptr);
++#endif
++
++    /**
++     * Destructor.  If there is a private QWebEngineProfile then it will also
++     * be destroyed.
++     **/
++    virtual ~WebEnginePage() override = default;
++
+     WebEngineViewer::WebHitTest *hitTestContent(const QPoint &pos);
+ 
+     void saveHtml(QWebEngineDownloadItem *download);
+-- 
+cgit v1.1
+
diff --git a/kde-apps/messagelib/messagelib-18.12.3-r1.ebuild b/kde-apps/messagelib/messagelib-18.12.3-r1.ebuild
deleted file mode 100644
index 0059d1aa05f1..000000000000
--- a/kde-apps/messagelib/messagelib-18.12.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries for messaging functions"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!=kde-apps/kmail-4.4*:4
-"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/messagelib/messagelib-18.12.3-r2.ebuild b/kde-apps/messagelib/messagelib-18.12.3-r2.ebuild
new file mode 100644
index 000000000000..6dd0db1af4af
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-18.12.3-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries for messaging functions"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!=kde-apps/kmail-4.4*:4
+"
+
+# bug 579630
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-qtwebengine-5.12.3.patch" ) # bug 686842
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 5a76a5d26839..56e22faf041b 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index ff806a6920d2..8a708e299dc0 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,5 @@
 DIST attica-5.57.0.tar.xz 63188 BLAKE2B 8932646bf4af38d049dcb95f9e6599773e9977968b98f7b881751c00890bcfc1430758ae0e56031d83a6df963ee9134bac9368de551b2787f86eabcd7fae810a SHA512 217c0d00fedd594826eaefbed683008df00403179243c938eebdb46a429a24be4a684286d7f813593711059f9ffbb4c5ff6261a436b6d568f9fedd96f52ed0b3
 DIST attica-5.58.0.tar.xz 63180 BLAKE2B b2f97988bdf6b20f685bb9001ce0346d3ca94ee0088f5189695a6f0c5d18120b123db357b996e7d9d3f9ce87899b6c8fe0c4e95f53fdc5f1e296d5b86fe5bde9 SHA512 e33104beb353982e587384b1ddc831f640177d2b0e24ec2c7f378ef8e9b7e2a998e3425ebdb3c17cab56fe3873b296c86302e7a9a00641e06e8a2896163e7703
-EBUILD attica-5.57.0.ebuild 436 BLAKE2B 8431acda1b26caf5f5b32a82b58e0782a5995781a8163b333f8aacb5d835ce396568da1064033cb615e575944eda7ee026f295da8dde10316aa4480389790aeb SHA512 c607ecbd8a8ec1d3d158389a3dfe3fe2b3ac8dde2adc49792cbd934acd8bf0de2b63e251a409dfb5401e499c65dde3dc0bf420c4d9a9ea51481935594b6987f7
+EBUILD attica-5.57.0.ebuild 435 BLAKE2B fb0f5aeb275e825888f99e7dfbcde27b122e9d218a52b9b493f3e1060392ccba43aafe81394b1f9ba91a121f34a79da9d8d68c024391197f0c08e10fff5a6302 SHA512 d130a352bb1c2f5f99b2c2c7a71a46a68ecfe05e42859c8e6b011aa61e40d87acb314eaa8c906f52d8d0acfa4f2a5bebbbcdf59ed591ae4e94dfee8e79743d7f
 EBUILD attica-5.58.0.ebuild 438 BLAKE2B 4119f9488ab90384f415a6efe79f34c93e7bf0166d8364151a31063fe1fbb53aa25da0f7025f8cea7a93a89154ada5f7df2a07619292540478efcca78c7aeee9 SHA512 90b2ad26a4b6799d4d512d2fc253571ad7f5dfec1bfb9c5c8b75e96e85b9c893a79ca4b1399fc45e9025b4619d5c967d0fa4b718932e4413914b7cc7ded324f4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/attica/attica-5.57.0.ebuild b/kde-frameworks/attica/attica-5.57.0.ebuild
index 6a49def19a00..fac8a0a106a0 100644
--- a/kde-frameworks/attica/attica-5.57.0.ebuild
+++ b/kde-frameworks/attica/attica-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing access to Open Collaboration Services"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 71c8cec37725..792e6a863693 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-5.57.0.tar.xz 239808 BLAKE2B 6b39d6ca0690b6733d89bc11cd61f016f2c00382022f2333ee02f48edf5d09402d8b6807c6a0c4e92841a83609fae583085fd51ed5e2fe31158e8b6fc26650db SHA512 c9471c22159ee3cd8aff721718b53edb7691358e50e5c23c33a47873b48d65e19bab44a5dc583c3dec18293f068fa9c50735775b6ab014d107aeaf10b73a0393
 DIST baloo-5.58.0.tar.xz 242440 BLAKE2B 1f7903e40d2ce371822fa0e716954fbcebb6920e8edb01310c405c8477db93f51abd248ad8c0e08548beb23367029ada886e02796a6dcb96044ae79e856e5620 SHA512 af7c8f822e71d1928e18875fe026ab6feea80e6cefb6f9ec98f1444c46827cefa8b9ec4e913e079944e96b3de6eed4d0895df2c293933270c5bb464277866396
-EBUILD baloo-5.57.0.ebuild 786 BLAKE2B 1db47c62dc7c6deb8b47c6c9b81217d22eca5f29e6ee141ee7d4ca366f136a17aa574ef92e7face7772e42a3ff9dd00b35e44593731ca94c4578730726e39671 SHA512 5b859eece5f895463651dafad4ff9d8671caa506a6397a1982a378f5e100890317b43a3798eea16cb07874c9a41f7233db0f4d1fb20b47ceef79a5700e605cae
+EBUILD baloo-5.57.0.ebuild 785 BLAKE2B 6bd7d9c16a9393d0e6d2cf9eb7bab254b9ddb7d12dec716005942070a9a42a7cd54e8c798814518896b3e07e806f5a2b1ceb8b82195eaa8ed7465587bb8034a1 SHA512 ec4d7688ff099eb76a4c3b29e191ebea8f6b4072ce35efad324dc80c40e9e8ab16747f7cb7fc8080e4d6d5b14748011c31e67f10625e2693bfc695633746c1e7
 EBUILD baloo-5.58.0.ebuild 788 BLAKE2B f6d55b9aeabccb35111b1c2368e5257214f4f5146d4ad552499dd6e60a260ce8669a8c34a1863d929b6afd418e29a079f6fa34803029f4b0753dac594f2e981f SHA512 67dc790e67ebf5fd4b682c9944fbb4f06a523b19ba03070e4dcab0cd77e0d511e1860345eab57f59c5a033319c4961e7a651264b4222bcb2b0249c3f56017a48
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.57.0.ebuild b/kde-frameworks/baloo/baloo-5.57.0.ebuild
index 45ba1c43fe6d..95fc16711c8e 100644
--- a/kde-frameworks/baloo/baloo-5.57.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.57.0.ebuild
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework for searching and managing metadata"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index c07340168aac..d659f0bb653e 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,5 @@
 DIST bluez-qt-5.57.0.tar.xz 81332 BLAKE2B 1bfd1b958cc07ed2454b9919ed63eabcc9b49cbeffbb173c94229cb88e971abb18de5a4ab3aaab4a0bbd01e50f8cfed56f9928412fb051dde49941cc73fcabbd SHA512 b47fc1ded879a20f97860afb034f247ec52fd6fcf7c069452b5769f5b9435e7c85ee4835ff53051cf6702765ce9e37ef53d12002c6beeddb36ef4617933b961a
 DIST bluez-qt-5.58.0.tar.xz 81240 BLAKE2B f0850279bccef79c8aa86a745a78044615e25284e140727dac9d6fd3202fba07ed7a347e75a4bbd911cbde6f4b70ece1a7599c712b384ec4bf4f10c5b894bd5c SHA512 c6447bc8464876f91d8a9e2a0bd545791fa627ae94c47990ae58df7ac29ea9bf932482ca0ff94e84946950ddd95c9784d53ac6fd25e98901267d5267251d0d6f
-EBUILD bluez-qt-5.57.0.ebuild 636 BLAKE2B fcd68a4eaddf63fec7bbe8ea8795db8b207cde2d6eb2ea6c4363b1bc70c01bbc2f44fd37dd5a44fd1e0e4b870cfe8248e47370c0682049b20f37f3713ad47f67 SHA512 ae79af0aa220ba7f1db6b2f9a1737c692f2658e87f88563c7b5bc5537cb9f36eee49e96fb5a755a9c37ce7fab14914637bc68904f535be914549494faadfefa8
+EBUILD bluez-qt-5.57.0.ebuild 635 BLAKE2B c256e2133242cd29bda2258d07f53fff95341b459f22bb4b76d12d55ffec614d137507967d409a058a229c49c8b097c657c5e1d46c9be237d818711129a96cbc SHA512 1c50ccc8a4b4e855b53a873916ff1d7597a6f5caa4e0cc4d088594d896bba352e5350667d96c47ba9cb9a276f5c7dec19338de9aa61dea3f1d49199bae7c9986
 EBUILD bluez-qt-5.58.0.ebuild 638 BLAKE2B 8636bea4bffc84d875bf414988cd68ae9e8b1ceefbfcf0e65832fb5e9e43cbc93ebec0da54e01571ad09eaf338c2d31335f0571f9494fca486d08126cc265d9f SHA512 267ae2372a8815ee932dc57ffbc02e2f3b09c791ff82a237fc5806262034916cd9eed4398be108557f640054da0289a2b1013cf2ad7823e269989cf8c2f1adfc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.57.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.57.0.ebuild
index 7a980738124f..757d3a173aa1 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.57.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5 udev
 
 DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 3b70840e1230..07b3c7e8c629 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.57.0.tar.xz 1612824 BLAKE2B eea556d3fb645c2985d2d1a9d96a42bde55d953ee26bbef3c408e2d0d61caf04f8895e42026249effe81d8c1e525e49dc96eca90c9bcd0a38ba0d2b471e4ae89 SHA512 b5ebe252c77f78f871768b359e03ba97440e96a726c2f37d054ca7cb89a6069a027a4c6a38fb0365639c1eebf816983a7fe84951aff3ef44228225532c8a2a55
 DIST breeze-icons-5.58.0.tar.xz 1660648 BLAKE2B 7721b9ee344cf10ebbbee0b5731891448e722cc61f71c27c5dc27dab58eb1e9d4b0e9b5284685a5d54da584d769321d22428f2c651ea99820229df2856966f0d SHA512 3733fe1634dbfce4f5713689c334948f28f133936c7b069088b68b1c468fc0bdf6a95a6743c10ed3a0d13afd6814756e9ff32f1da34a33bebd579044507a92d5
-EBUILD breeze-icons-rcc-5.57.0.ebuild 570 BLAKE2B bcbe04ffeeca29b9560fb84a0a068770bc7c3ca90bc98c9f3c0f0919f94307c8619e63e3c57f99aa7de2020b1bd94511d24b86563627edc23a8754e3a4c59632 SHA512 7b87661f12360660506e5e0108efd1255ae03508685cb901fdf3d12993ae61443a757f12ff2ebf5815c0bb47fed01b06cbd41bd28993780bf74a244368aa3d2f
+EBUILD breeze-icons-rcc-5.57.0.ebuild 576 BLAKE2B ef7d2ec25275cf9a3a47e696de76c99006d6edf540828f5581ea8a1b13bf96091a61ed009054ab65bfe149b342e124c59e6f18f6bc78528fa0a4a18db2074621 SHA512 7a8bd3ab56f23d85bda37f31da31cee5144705418a40410a55044bef8a7a06d926afe4ecafc5a994fab7a997e5938379c16f7aa2c0d61b1908008d6e21bfdafc
 EBUILD breeze-icons-rcc-5.58.0.ebuild 572 BLAKE2B 081d6b9fd27a9339a5c0192e490a088811071cbc2080079b95004c5eef812d9608d817d40ca9154802166cc1cefe2e7b584d2174da8fd38cce9af96e1dbceb5c SHA512 4a8c106ceb327cec44d777150081027725883f864414d5dbe669e3e1f2cc30910d48407141011563bf9f7167f127add9c7e9a52da5aeaf3f120a8d6c413de299
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.57.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.57.0.ebuild
index fd5a31052eeb..5ce364b94070 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.57.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.57.0.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Breeze SVG icon theme binary resource"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index e1d21e9f7c85..31a950113c67 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.57.0.tar.xz 1612824 BLAKE2B eea556d3fb645c2985d2d1a9d96a42bde55d953ee26bbef3c408e2d0d61caf04f8895e42026249effe81d8c1e525e49dc96eca90c9bcd0a38ba0d2b471e4ae89 SHA512 b5ebe252c77f78f871768b359e03ba97440e96a726c2f37d054ca7cb89a6069a027a4c6a38fb0365639c1eebf816983a7fe84951aff3ef44228225532c8a2a55
 DIST breeze-icons-5.58.0.tar.xz 1660648 BLAKE2B 7721b9ee344cf10ebbbee0b5731891448e722cc61f71c27c5dc27dab58eb1e9d4b0e9b5284685a5d54da584d769321d22428f2c651ea99820229df2856966f0d SHA512 3733fe1634dbfce4f5713689c334948f28f133936c7b069088b68b1c468fc0bdf6a95a6743c10ed3a0d13afd6814756e9ff32f1da34a33bebd579044507a92d5
-EBUILD breeze-icons-5.57.0.ebuild 526 BLAKE2B baf280de64dc2a21718cc6e19d09cbaf62c89cbb0cdc27bab4417eb49245bc8c8d04e0eb5b717c6b6738d0cae7211928a5eb0c5c9baf15deab4ca586606b79b8 SHA512 ddebb37e56912706555f7d5abcbcce266a208b522d604b8df9de3de143172e2e15e4dfc6c2592a3df678719b743839fb9f0029e0dc038b6eef7f26926806edbd
+EBUILD breeze-icons-5.57.0.ebuild 525 BLAKE2B be71c7c2c66e4f25b44bee20010af4043bc1cebce88b153d90bc7aa5f9ebb4ab24e27287d7c8d46953327c1fd34d9a7c7b65d8ac97a04fc1c0bb4cf9dbba82e5 SHA512 330de5903adbe280f684779f54fac14e4b1f7962b193d183a6830bece6abccef11fb2bc56389c8fff152d358481776536d84fb438b5894ae106c8bcd2d8a17a6
 EBUILD breeze-icons-5.58.0.ebuild 528 BLAKE2B 7baa0e98ad5ec6e59aab943cf061c6303dbddf76947bb82c433be1a4647d3c6d7cbb68a3a79cc85886b9cc0bcd9a3bba713b6f6383efc0a5aad96201c26f5676 SHA512 ea3be13783076b02c2484a8555b31f1deb3e77815976b8270ff3ce16d7914a21562ad5c1852c37ee2c7869e89feaa9cdafd0cd36905b1d33b2c94f565c8f9abc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.57.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.57.0.ebuild
index 7795f5bca080..2833d00a9a35 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.57.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.57.0.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Breeze SVG icon theme"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 766fe2ea6e40..c4175e7962da 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,6 +1,6 @@
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
 DIST extra-cmake-modules-5.57.0.tar.xz 326656 BLAKE2B f6a3785e5844b1919495804e97e158c96d0b9bc71aa0bdf49b78b54089da97fd99e67f10a7d5c099874fea9a16b70745c798afbc1367fe81b1793f8902e7de6c SHA512 25a559f45e9e6b99400b210eb3bf81d6e0924675cc3c85af995f64cb4536e88e0dd734f919ef8cbc8e00de74ba328a9fb3aed5d3ada53f1827479b7a90669f97
 DIST extra-cmake-modules-5.58.0.tar.xz 325704 BLAKE2B 8772a22d144f28007fce24b053f195a4285ade2bd75ad186f20883fe6c050755a9805bbe8042f4bb3f7c0392761b1d72791d233f271fc3e7a16506115d427159 SHA512 edff7bcef7effad524743cf234ff6bb41ab59b7d8e4629ee11be9faea97985f32fff0d96cfaf25277acce9806abea3abe475c9dfe2f8c2dc1b61b7f52d2396bb
-EBUILD extra-cmake-modules-5.57.0.ebuild 1546 BLAKE2B dd972cd5843ed14f7350b5dd6001af58fb0b15fab246d6bdcc83d0bb9727445dab9989e21d0159b07ca58939043931dd42fc55f545b6cc36d633c62e0356e7c3 SHA512 09761497e5f45885c44df67c90eaa580d740986086c574084e8200034228b55a1cf4966732d1b5dc5220321a0b15613313389bd6093a5d74d889ab0605cd464d
+EBUILD extra-cmake-modules-5.57.0.ebuild 1545 BLAKE2B 6761bf728d50ee8faace03b50b0399298345bfb133e83e0644b5870a447d891a719549e792f4eda5d665d5dff3021d36bff6186b0fd3772702db34aee777cd44 SHA512 8d3576676e693f37ceb68e72b5281e17757842edd14e1d07f7fa0301a8be840ece6651cdcf664c89405d994e76bd000671a006b2a54b2f619795f65b8cf68927
 EBUILD extra-cmake-modules-5.58.0.ebuild 1550 BLAKE2B b49b8a140c3e441f8b3c32cc94c6f1df2fb6006916a195520e95ad9757fdf1dd6fc7cc5f1fb05304726c520e4d39888fd865a4cde2e9fdf297b8f3a139bbd46b SHA512 dfa5ec4e2d31740c4cdec8f3fde0cee59c7715dc31eb49a44c50455353c806b71a54af150bc6e5783f32ae7a55a011870671be2904caccbf8cff046ada7e88e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.57.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.57.0.ebuild
index b7ca395d9d30..61889b6a3878 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.57.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.57.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 11397fa2cda2..b09f3756deba 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,5 @@
 DIST frameworkintegration-5.57.0.tar.xz 1753224 BLAKE2B 533532e20231e4d1d4bee8d5964c791a62f5d91a4e458b720e7d8086e92204b234846269f3ae6c23492bb77e0d42ae39da6d2dae85a1e034c0bd67be04639b88 SHA512 e8aadd2d4ead08ada18809b0a54879415dbf699885ec74c56dd689226a235fe6a034600a0b357162eee475c8798863ef0b50ea1384c603756b3dbfbf3425df1b
-DIST frameworkintegration-5.58.1.tar.xz 1753724 BLAKE2B 1162037b803e3f1780eccc8517409a6e9df33b20580e6c8355514197ae011fe38c7523dd9514bb6df21ec4b748d5e530de2740bdd67b5f879b56c5a7f7aa2571 SHA512 a9ed9edd85b4305d9b9a88b41f8ac2d50d18146fe74744b789dcdfb896f24ae6efdb9fb877155106c05222e9144e268692ddb15eb3930f3ed9ba713e0d493dfe
-EBUILD frameworkintegration-5.57.0.ebuild 1136 BLAKE2B 36f7f01bbc13ae5880f8b0b8c97019ffd05bee988351a9b60b9b956a8af4910ee56d5e9744e8eb771c14aaf5fb4d58f47cb7b05354c51e24b4c303ca5de4e696 SHA512 227475ce24083b7a3260c1948a8cbfcdc4f90b169b06dd559aab8cb31b078c45f6e581a7e0bee0a043c0fa0be003efba7e53cc5fed76064979bc0ac7aa0c8c1a
-EBUILD frameworkintegration-5.58.1.ebuild 1138 BLAKE2B 759bcccee4241b7924f6d8cd62fe02200be17a2dffffc0ff676ad49192c934e38b08d7956875a1b37d7aba28c7c050c752d4cb8bf90a32f4c54a5af2182e6254 SHA512 93ec5f372790e1e95f6a63efc94aba099237f68f10617337189fb3cc510f067aad304dd978238446d8ad7dc36c6e6a1a4bfdbec6a29aae6434e3abfddc99d512
+DIST frameworkintegration-5.58.2.tar.xz 1753508 BLAKE2B e8f647b58f87adf2f3bd1813f8bc22c5b87e07ec8020dc07a65de31b970ab048111575f529055e46d3b9601abb250e03e6ebe9c2799ccc057f795e5daf5a7a6f SHA512 ebcb1be8cc103a24d8f76d3f007a9040ec18fad6b65a8c6afbeb51232eb31ddafd903008e1831259f2f5d915f16894c56e384a8ed625c32f172ae6368e3e0e99
+EBUILD frameworkintegration-5.57.0.ebuild 1135 BLAKE2B 8b7aa45b3ea719b04168306c34ab1583b33a4601b1299423e227bf6d8084bcc9d7c69b5924de7031e8ce7021d1e4e053472172ef6f1394e49f1b3a0d126d62ab SHA512 08726481436220befa39a27e91dde2a85b65c4ce40159b3a936bbd55dab139192dadd3239672a36764b0a82da15d5e8c12c97273082d2e67d5110918865a939d
+EBUILD frameworkintegration-5.58.2.ebuild 1138 BLAKE2B 759bcccee4241b7924f6d8cd62fe02200be17a2dffffc0ff676ad49192c934e38b08d7956875a1b37d7aba28c7c050c752d4cb8bf90a32f4c54a5af2182e6254 SHA512 93ec5f372790e1e95f6a63efc94aba099237f68f10617337189fb3cc510f067aad304dd978238446d8ad7dc36c6e6a1a4bfdbec6a29aae6434e3abfddc99d512
 MISC metadata.xml 339 BLAKE2B 9adff6fc4d48a8e94cd7701e7a3b956963b25af1538793345846c70186d7536597bcd9a1cac92b292220de5d6c2562864b64556c36cd579041b567d970db6828 SHA512 cf6eaaca36d7a193361608ad80cd1a4e79f71952926fb01c8905879422c91d38d6988e473a14960437491e5b43d227497500b79ff3696f0d96cbc1b69f9165c1
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.57.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.57.0.ebuild
index e16a5b6b088b..16146aff846f 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.57.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="appstream X"
 
 DEPEND="
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.58.1.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.58.2.ebuild
index abb6426a7b47..abb6426a7b47 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.58.1.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.58.2.ebuild
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 9dd7f2332414..00eb40cf89ea 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-stats-5.57.0.tar.xz 61176 BLAKE2B 3b674764670c5074debe1b66d6b50d0869947d8abeb4f52e54d7e790352a87bbdecd8afa8f6ce5bb7932e70c0cb36406029d54508dd14b9405dff454a794fa20 SHA512 8f009ce2f97b2ed6fb7b09293992a9922ca7306cb77a0aa9cdc7f134ea72cd7c37ff9d3e6e9fc7b44b95377602e42a144bbb8dbc4759b07d94a965fbed883c51
 DIST kactivities-stats-5.58.0.tar.xz 61100 BLAKE2B 7931448941fc7bda258850668b33a7046ba7dbdfb3aacefdb9931da43095534a2fe3a320aa45673fed3fc7f8bfe94cba964cd9136a12cd90e6f592724db57299 SHA512 d819cc9cf3232b47e9eaec6884a4a98f69bf6ffec02db8d2f07d90b7d5b3357c6e87b65eda0f842c80b566e0321b62dc27ed2baefc50c1de15cf9fe98001cd17
-EBUILD kactivities-stats-5.57.0.ebuild 445 BLAKE2B 34d26e4d1980a285056afa4f7f539c99e7c025996af409f6af152a99a0a5f8d1584b95af9f21f109a2a698e62cc11812c5c16c9b5a9711ff93ca9d3c4d5de072 SHA512 f09c50566594e8533233de5b6d7f201beea373fa8c94d3ec64a00b5eb73e86896a8f82486bd06e64e4d436d101388a82a3ccc8870fde9c6fdc0411b92f79c3d6
+EBUILD kactivities-stats-5.57.0.ebuild 444 BLAKE2B 5005f7f33b16b5b2882de9c351cdeac6585ab428e34850293790bed65d2d6c759f141369328c93036996abd56023c9b3207b2e59ffeb7d357c42139564f024d8 SHA512 fcc9e924697f688d15d25084578759e05e460e8d9cef9d0090e03f26b03f6c6406b1b92cb07ba72638bda77a7abd5a9f81dab747deb3b8a8c15ffe47431115a5
 EBUILD kactivities-stats-5.58.0.ebuild 447 BLAKE2B b3cd69d9dc1f725a1680341c347743dc41502d24aa8d731e8b335bcb95b07dcd2984f7e91593e5d33b33a31d222ae5703856d69036f1bf47dd133ab99dd493bb SHA512 91202042ca45fda19397d01249c17a9a827db71351dc656176602f83093b73b26ddd5349649e5a938a8c53cb5434b408d009e25b8f10308c763566d3302c666d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.57.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.57.0.ebuild
index c36fe31ff76f..1c16fdc536d0 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.57.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index e10318e00925..207190ed933b 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-5.57.0.tar.xz 61532 BLAKE2B 99d4f2249645f9154dab8cb65323ce91022a5a5225d4c88eceddcb501f1ae1be4b9c43b067f91be6a227d7bcda459bbb6dd883cbab0bc5128b516397c5203019 SHA512 b4ac393181f97112c717898cf1b3ae07379029d5fb4e762bce859326ddcd178711cfbe62743b77e1746678c2288e41a22412180a833e00be0140e67d8d54c216
 DIST kactivities-5.58.0.tar.xz 61576 BLAKE2B 3c8224186d8708ca493ec953d5fd8fd6531d5a64c6b7fa8b9cb297179b36908a93e03b1c035e2bdfdbf3842230e9e5aa9098ef54f84f13d8aaa93a863db53022 SHA512 f51836925f0afd8031b667eea8dae910ad7072c550047b7b012207579d834219260860cd824c0c212e7a3167a1ec256d18cbeeabb78d265aabf6184b870b461f
-EBUILD kactivities-5.57.0.ebuild 558 BLAKE2B d425a7f228ca5abed8e79426d782afb5595d5410c0521cf104b610f6070f96ec2d910c8084b5a550e17f9a5c765184fb7f7933b6f96ae02aa233ccdbde7c591f SHA512 11c07447b79fd7ec5a7dcf45e7f3080dbbf8c12087c03821941e98b320437d8b7e0c89ffed54d9cac847bb6bc290b2ee312ceec50613addb02689bbc9d3d6330
+EBUILD kactivities-5.57.0.ebuild 557 BLAKE2B 81031a1d7fe3180c1ccab0f481ba590e756aaf608853cdb3b707e7de702953a9712947656274c0af3dd8a8356448fa7793454010d8cbb1bf63e5639167bfd66f SHA512 8fbd15c85f402fde7770a4280740ca15a22a8d48f3bf05e659f9f83fa760c7b133a40a090d5f12707797025f729c787c354fded205a2885c4b8cbbae53bbce81
 EBUILD kactivities-5.58.0.ebuild 560 BLAKE2B 230ac87d824fba3bf636e9951e1872ebeaa34b946716e3b2fe5e7cc4cc5a94116f1d2bf25105525e892501721fc0a36816e57fb53d8cc69e1042b0404ce594b5 SHA512 ce529717877ddf2deefeec81ed8455eb687f591a938bfa3e8bf51c335922934db25b8e1fe7b8d325645ec3b9016050d963ce4a7284d1e9a58273868e639f72be
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities/kactivities-5.57.0.ebuild b/kde-frameworks/kactivities/kactivities-5.57.0.ebuild
index e8ab2a3ea912..c556b38fcb31 100644
--- a/kde-frameworks/kactivities/kactivities-5.57.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for working with KDE activities"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index b92529158b08..e971a6ad3ea2 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
 DIST kapidox-5.57.0.tar.xz 396700 BLAKE2B 7b135d432b761590c570ce52e72c9f0a23e1bef887fb16a71c1bb615a7592ae1a1a2123431f99a87feeb0f122cc526d3094f8d788da241c025c228f7931871a6 SHA512 578411585cb7e4ca409fa16e023a58ce3f2313497b33734e002633ff36ecee11354b259bdfd0dc46820ce81f0455a7c6577e8e2efae91c354d19805325b70d80
 DIST kapidox-5.58.0.tar.xz 397572 BLAKE2B d245c43f30f7ccd963e0adc81b6cb76821a0f34d2b107473703e874864a08e312a8943b8de79e4b7dfdda7a3ecd208230ed7ce25b718ed411c124851e0987dc3 SHA512 3ad73329f72fe78abb48a72a4caf06e09ef4237e2dd44732ec30b12af433f62bdc08501a4b00c37f390c71e79b90d1ca90de0d0d04854b30b647cde7e48f050d
-EBUILD kapidox-5.57.0.ebuild 609 BLAKE2B 6505ebc0cd1fac1cbc3bbbffd8bd417a0972bdfbaa18042a31fdd8bddd54c7157ac3aa1a1e26c289c2f5be6da83b2651385511d2a39a2b81c6cbf6a568eccaa8 SHA512 7440b94ef6a333e3b11ffd073de024841803d3ecccccf6d2b31545ad56d4394b6b9ce5a8cde6c016844ba738c47504407f0e581933354371a15734606ef9f55b
+EBUILD kapidox-5.57.0.ebuild 608 BLAKE2B eaa6095abeb963ae6a371ff2fbbf5786ddf75a0533786b07e5ad26910cbb6a4fb98e9e68e6eaeddcc400eace76c3a44d1b5e2b42d0c347b4f811f89d9eac9309 SHA512 2128a14fc51410cdd16d561bd40fc9b525f19a23c8a8a7e040b8d7bd3c5fa34dc76f56cf20490e3fe8ef110f8e134bfb90516dd4af3f79aa0f7318bd9d5f0f27
 EBUILD kapidox-5.58.0.ebuild 611 BLAKE2B 1be75af99e107518fe9b15750538fe9a0c6120c5d2252e2190f0949992f3bc9a23d7b9c767137c87521effb4d9ba10368e61af2d27f49ba46f575671ef14cb7c SHA512 ca9e2a3dea48981bd2f43e0c617575ee12a7c7ba8052394152ed40718c4f04759ce2223207e1a8ef28b524f99b1ee11cf019055978b8a3b397daaad6dee90292
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.57.0.ebuild b/kde-frameworks/kapidox/kapidox-5.57.0.ebuild
index 4d4fad5acd16..274a643f1e54 100644
--- a/kde-frameworks/kapidox/kapidox-5.57.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.57.0.ebuild
@@ -12,7 +12,7 @@ inherit kde5 distutils-r1
 
 DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 783d41c14cca..33890dbfab29 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,5 @@
 DIST karchive-5.57.0.tar.xz 440156 BLAKE2B 7ca293a6b00ba3cc8c3eae5f45ef8ad7df725590b3c909bab7b95c575c446975b446c9c05358ae152d47ce74d84df10ee1940f017b61c46eebed5d38d23bdf11 SHA512 f188cdfbb40903bb4b1374bcb4694914c0845d9bd67ea42c2c9f268f917c93b16300dde072b19110b41c881cd3d4c37f46e0d1cf60dd11224c6710fde48b7619
 DIST karchive-5.58.0.tar.xz 440860 BLAKE2B ff02d74dedaf8bc7e543e52e75d792a541865e76acd805fff42a74bb6087fa03ccf508818919577f53d9da3a10c30172ae8eecb3eec42744b9c1c300057703a3 SHA512 fd3e4f013a18a2e2876a010ba673c207a8cc05f3e41723daf46181f915259a06ba63e02d0d47cbf9da0445da94ce02cc62cee4fb90d0da2323c3e51a4d3e4d35
-EBUILD karchive-5.57.0.ebuild 565 BLAKE2B 0a3fca333e42a9693aaa01a041183f19f3be8c86e62727be2e7bda55574d4a973a06a0a4bcf3d5bd63c7cf639398c9fa8df408d0cf6b40dac5f360976b5fe2df SHA512 c7c6c603fe935b12cb3c633204aa02446f759159fea30f57be7ad3552ada62d616cbac860caa26ed71cb639c531fb96d12a9a4a6aa1b3daadeaa2531a8786013
+EBUILD karchive-5.57.0.ebuild 564 BLAKE2B 25421c9dbd482790f5af1749aa17865ff93a3fb3c15237568917e6b4a520509966cb85649966da649b754a4de2daff1170923cf32380566bac2f2fdf18102770 SHA512 34616f2325f468715716b3a2a7522e326fd92dbca0eecf193ce2581121464e597ad531817c70f2e6068c0573f8197e82e64cb7b4e61ee28e70890015fdeddaef
 EBUILD karchive-5.58.0.ebuild 567 BLAKE2B b1a6bb64bb791bd39fdf7f4e0bb64bd9b88f2fa4fe25844c277da4848f3dd3031012545ba73f2347370babe0e11a46945c6b9bbfb6a5c685e86e4fd1857068b5 SHA512 bb8707ab22252bf3a9599ba064c5a41997dbe8dd44c399f4617defb5c16ec208afd23b7e9b2c8826b18dfe5b6c977d03e5abbc87fc9d8c1f524f046c367162f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/karchive/karchive-5.57.0.ebuild b/kde-frameworks/karchive/karchive-5.57.0.ebuild
index 97cbd79f5437..eac7a6c9eb67 100644
--- a/kde-frameworks/karchive/karchive-5.57.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+bzip2 +lzma"
 
 DEPEND="
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index d3be6a0dccca..2ce22464a3d4 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,5 @@
 DIST kauth-5.57.0.tar.xz 85364 BLAKE2B 24eec6862a3d68e3abb7b16a2ed93d0b04484d782ecf5543092b382dc84e3935ff81073f077d3b87b68ea5fa2b95bfad4f8cc9572fbb2284ff152da3d450123e SHA512 7d5e2aee7c5f60cb1e30b1a54864ba79e61f3b79bda4c9efc8adb58b04e5723412156501583593087ca594a4348f8be7d569e2ef67747d95492b91b3c1cf5fec
 DIST kauth-5.58.0.tar.xz 85388 BLAKE2B 55a02bce3c06b00c1d8cb6422550d170343934a2e339f3d358f8789bcaaf1fcc90c74cc6a5ef38a07f69a38c88af64588f88c1be957aa3cf605285279bbcee0f SHA512 7d337b4b6507dd1b35df118a5a1f9167efcec67386f85d0ed3c7f22dbb6c56fddf7ba4979c7f1c70c11b525f99a2e3e95e3a1d4f9971d8c02ce40e9664ee0cef
-EBUILD kauth-5.57.0.ebuild 835 BLAKE2B 1c1d8a94ee759202e042106e1c70d40887cd7afa71e340f88fbdb095000e0e280e6a9fe4724521fe385ea964085cd060a37e5aec0a6cad9516a1003813ab0913 SHA512 6c2d7cb293b9f4f7fd2c8cc5eae4dfa15b803b37c68dc3675bafb295d18d2caa1408b865a41c812965a843757f48e81fb8f47c20a745c60123ec40f9ba997762
+EBUILD kauth-5.57.0.ebuild 834 BLAKE2B 57cfd202374fc7e3ce62a4eb817f9c987413374ca4546a3f6dd492bd5d9bfd30d59d3103f663d8d51c4e42571c5693190ba8e80cb5e08ebc032aed04d32c796b SHA512 4c17cb96a12ea7ac4297ef74ba203efc2fc72ad0f17502bcaf17051fa712d3da5a1ebab810ed0d2b6a4e972ffa6072cfc15418491b723290cf2978f660cd2158
 EBUILD kauth-5.58.0.ebuild 837 BLAKE2B 712f431c7dbd6fb1a00a9731fff4f1c46841996fb1a2a2684bbe907cc50acedc839ff765b055dfd596e46a38c60315e8f5ada9f5c46275a4689e67552f73c5d3 SHA512 77414c4a4851b0650c3e5b52b8027a999ac355781b3f2395b96e0f4f2a574b8f56421ead834da4d54d6deafea647cdb8a460c91d7b135c7cd3a5c98e1a7e447c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kauth/kauth-5.57.0.ebuild b/kde-frameworks/kauth/kauth-5.57.0.ebuild
index 13d60d084b33..8b258022a27f 100644
--- a/kde-frameworks/kauth/kauth-5.57.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework to let applications perform actions as a privileged user"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls +policykit"
 
 BDEPEND="
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 62aaac5dbae1..379ff41eccc8 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST kbookmarks-5.57.0.tar.xz 118788 BLAKE2B 46a243d8ea07320f7b00b2daed77af579d513e4db4aec877c0ae68027525283dd1bf364f63f20de42bf38529283b1cab0a5664a12f84c3aeb9fe34e517e46de0 SHA512 d76b95a7a32fb4118160363d1f55895d60f5cef9e00d2db646c1964e2d1aa7e8508589013ae1b284951642fa0c6e3dd74703e1d5407bb8fe7156e189fea82df9
 DIST kbookmarks-5.58.0.tar.xz 119732 BLAKE2B 31507f772e8b6c466eff55cc5ecc87930873049f19fd5df410d19b9004dc615fefef72beb978f04a7f2e336e8b6f62b2e84eefe4ef90d0f4be7b47bd4691f317 SHA512 c0953fd9f0da27ae20ef8f2501a8ad3f5ab2f68d1d1279013b16927803e2325905b57eb6c0a91ad69ba041a2834157f3c8dbd8ece605e40b82f9949157f27e58
-EBUILD kbookmarks-5.57.0.ebuild 696 BLAKE2B b2b4fb847b264d0ea385d09fd60a5a2ae54d6798dec1e6fa6983c71ed7ee1c2141d382744a8cf98481aa445ab6260af867e1cba74ddb4877cd61344be6411273 SHA512 f3b89f7d7cad3a8db6ff28574499f74986b3c25938341a1d2281e5bebd5c7eb6f101d36ace44e1a8be544a2dc1d682c23307e0d1e078f75b232291c2f1de9dde
+EBUILD kbookmarks-5.57.0.ebuild 695 BLAKE2B 21b44c400be3a0103c3d5d7a584aee67c04d027848fcaed3fe0cfd990c0a75b51eabbcac4611536deecd45467168f881affaeb32a7e00d732f7df8165bf53610 SHA512 ae58e7fb103666505f57db99b56c5e5cd50a94cf88bf2f9ed0500f7f6237d883537c928c1f40450b5f9cd3ca0e347c768a6c1b109501117f1a8bfe7e9c164c4a
 EBUILD kbookmarks-5.58.0.ebuild 698 BLAKE2B b0efa8edd479397635edf1123a36c713a9f178cabf312f20877333d62f2e7cbe7c7f4321bd539e67d85fba3dd7e54e43a4e93cc62b4326bddb7aaabac14a66a2 SHA512 ca04395f8665b11e181666a9b5174044c04b508a72eda34fe4cf66fe52eefb841d4074db1b4db4a9965de46866b87340bb629f17fad21112506b4f81cd9599ce
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.57.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.57.0.ebuild
index 58f77010030c..57508fa95d2d 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.57.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 5441f44e6975..ce204e9c9a78 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcmutils-5.57.0.tar.xz 237884 BLAKE2B dbe773de10a68736b3db103e5a536805bcb22338a1306bdb4e1c69e0e4e8276a7d73b8c542b05617b784a776399aecc603b267ac507183bc456541dd34938ea7 SHA512 a0ee851de095ff9cdc9b16c2817859663571eae477d96c96c44c4d6f198b5b61b2ead2fa6073884e940c4a7bce61143c152b38ea118ab7e100065605709d2a35
 DIST kcmutils-5.58.0.tar.xz 237272 BLAKE2B 0ab3be8019d86fd08e0fd22c9a30b27f04d74f6ab23f4f3c25f6c63572ca2f90490578c7a39f8c2caf2fdd35fef1ac33792560fa8ebbb5a6448d26c439c6b19d SHA512 261b75340fddecc4845622111b9cb00a2f85386e3912c794e4fbb8381e1b67062d1f6b069ad08874e6d37571fc62265f3a1598f2e4ed0a8552582d6e28afac0a
-EBUILD kcmutils-5.57.0.ebuild 774 BLAKE2B ff7698dc5017a76365d5614bfa4e72489009e941cc3e977dffa9e2f9e9c918b1deee01a6357c684df33ce0fede521931408594b2640238b0e0f7c6be192d8293 SHA512 7a8b8f6324c17b7ff5884b0774a7c24b736431633ad6b643b9303c4a6eb44eb19b78aff900e08d15b490795f6f52d6001295551a6e8529a4e8190afe06fe16ea
+EBUILD kcmutils-5.57.0.ebuild 773 BLAKE2B a9b66e3e75b7449e78ac748bd7eaa0572b019b449d9316ece48f7f43f69dab1e500bd5d88554e9b86d3e2b31671c4a03d20dcdfc43875c4551cc0ac16684887a SHA512 b4e93bc75c5daf03311b589a545f3199ca9e5bbe09da972a54f14108edc7c41557ac4b6f0a8bc2e5e457350fd27b3cb836b8866ae6cd3177aa1a4d9698dbbb9d
 EBUILD kcmutils-5.58.0.ebuild 776 BLAKE2B cd28361a12c27c3038077b115e88be567e503ad2fd1999f1da025a8a46444c9f182e74f70b39f380b4d12bb77ed5f146edeffd1963b443a81037a669ad478f46 SHA512 fce29f11124e6d2f4ab7c7c2474b20b7244b3043219050317ec2096bcd5d4304523767cb0121f23d1dd1042362564e55323a406181830d27aa3e3f3f3907f760
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcmutils/kcmutils-5.57.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.57.0.ebuild
index 7c3e0857fafc..0701db2b58ac 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.57.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework to work with KDE System Settings modules"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 713fb6b4c104..3ba6632497dd 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,5 @@
 DIST kcodecs-5.57.0.tar.xz 220256 BLAKE2B d08076fe25719dafb9bc752a18f09965e77a730cd6d68fde17aa537748774aeebd9975b1bb86d828c05eb1a5f4957992af69e134c591cccd8301e5ffb19da770 SHA512 fd041bb6ef26185cfe69eeeae88e1d270712e01305a8da4b9bfd4da0ae4fbf1f3c11bbfae1150b451e4bbf4003acf13dd31b34d6fba84858e0f8bf3e72dfd973
 DIST kcodecs-5.58.0.tar.xz 219648 BLAKE2B 6f5d8561a5bb1a39db32a6f8879eaf4510c35db16286404cf06092cc443714f64a7a7ff89f9e593cf2b9e8f6647665ccc098075bd788319c2bbfee25e8060e34 SHA512 4e4f8083066972a9fc9565673b571d98316bb818646110768d5a68fe47e2db88dd453c22edbb307a65bfdb8a90eac5136507424a2fee5b85bdd77240d33b94f0
-EBUILD kcodecs-5.57.0.ebuild 337 BLAKE2B ea6ddace610ccd6cdec15860cfa8b3f51434f0a5c9387630a85df80e36149e5e8670677f5c1a13b817fee67ad72e409f56d6b4505d69ede4a1a940f3cf7143b5 SHA512 48499447e8ea18095dda8bf54a5c1b1981d5673d0001460c7354448fa84a6ae92f65888f4acd2defe78605b99102b999049d9b3b2cc2b06e38ea6b080a85ee20
+EBUILD kcodecs-5.57.0.ebuild 336 BLAKE2B 055e3b2281645531fd000c8fe28ae509ca94e930a20457d2d5c020c5faac2bd2b800d2dea881f27cf53ef6b3d4da7dbfdddf2149a016cb5123d1cbe15e053281 SHA512 2e1feb2a81c72d6f78675827f9cbfb67110af2058e99747478544bc112956a673c7034475e2bcf7f4b97a80680e83790f8cec30ea7553bc5a72eb038fc48b744
 EBUILD kcodecs-5.58.0.ebuild 339 BLAKE2B 90a5de9f16b37682df690b1828f1a6e25ccdf3210f1dca634d1bd7881816089d5297bb0954c88276e4cf54a9c4f2ca0aeebeb0baadc1c8abc4e739834c30b3fa SHA512 de757756deea2f69578db101666acb5cd4e8d171d1ec5ebf87e75adad38ee11016e56dad38bedd6de865df8bc31e19f2065fe4ba57d16ef17f39532447b7b071
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcodecs/kcodecs-5.57.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.57.0.ebuild
index ebba62946e4c..b2fb527840d9 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.57.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for manipulating strings using various encodings"
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index f63b2ce65c97..f363bdcad021 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,5 @@
 DIST kcompletion-5.57.0.tar.xz 115828 BLAKE2B 0635170d02269b33f2b89cb42404a392dc3edde4de6ac02a962dc308ab472a648d14994b62c37191143a88cece6a7722655563d256dd29a4dd97b3a05a7b4890 SHA512 d4782da892535a07ac904be510f76741c648e0b007f09acc7b0445308f8f9f24d25abb194b8824b8fc2de3be117793ed4fb8c5f40c3743f3e0ad610fb04e0747
 DIST kcompletion-5.58.0.tar.xz 115672 BLAKE2B cf313519118212065f7e776e2640b33d779438af9e67c5191c4ed367262867d322db5fc5bb7dde768bff7efffc84e071cf12da62b4441e481301746c5df769c5 SHA512 c5da666c8f480d96989ab2566b27c533eed4ebe7df8c2eff9226caf5ffc243e6f3f8f058dcd9d2e53ebfada4fe0e5887bb7d459271e7b6599b168a3ae96505e4
-EBUILD kcompletion-5.57.0.ebuild 481 BLAKE2B 7bd70308a0124eb9b1b1d178f72cd725f7b648a113469e2124e03c34997bbe8820f7c9e78ed0683458ec3244ef9132c047b92063dfc30fffa898c4b2ac1542e5 SHA512 23d795bdb54b924e90681f7e821c8acfc5c9ea8ed19433d83a355a26fe82d5216e9c21d01b38a8ef4dc40fb16cf1bcead3eb844b63348bc75245edb0d0450193
+EBUILD kcompletion-5.57.0.ebuild 480 BLAKE2B 51ff3b25d7871fb056e0273f5721e41d0b0e6dcc1b9579ad8537472aaa8c87230f73b17449bd120512790ca00a6ad5b781028ec17a5348c50ce6c11a457ca846 SHA512 6c7488efac41bbb9ea0228966079e7fddcb7a62679fd72cbec9cfe95f433864bff0cb4d62210ae3c98fc8edff04b5dd98fa8be5b8e6e6437f1b2fbdc00e2bfff
 EBUILD kcompletion-5.58.0.ebuild 483 BLAKE2B 49927d9efd28f699f8bc53da75eb846cc92f409b4db2d0e6fe093e529d1ad5a11aec4ea5fcacc85392ff277347bf93c11348e36e7e3d4418314a9470651ff669 SHA512 9e159798eff3a80741e5e5a4e90269ed9347952373bfa1a8194099d5701bafa96b2cbb8daf621566f1101190b4ed319af2c03f960acd9b0de39d218a8c1e7a69
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcompletion/kcompletion-5.57.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.57.0.ebuild
index 5a14c5d3e930..5d8978e547b1 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.57.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.57.0.ebuild
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 363e4b9033b1..4c845b82d8a8 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,5 @@
 DIST kconfig-5.57.0.tar.xz 240340 BLAKE2B b5746022b9f23c0baa71344076db1da16ff7df3b4086a0e592c7cb89b62706e87125c8ed218606f4280e694b15067b3727bb00e3d44acb5eafbfedf6279bbb5a SHA512 bae34417c51c52610c7370d4ecfe59ed995a1a70ae828c4f699436eb2c2792a3bbdc6bec86f304edfdd94d83c56679493baf4e317d68e330a98c1944c78a1650
 DIST kconfig-5.58.0.tar.xz 240316 BLAKE2B bd0bcc2a8a12e994c904ba70cfac799685c1b22e39a811ec595d50347e3211d4c3cfc50b386e45adbe6e73ee25b08749d952d7d961e76045f18a9d9607dda684 SHA512 bdcd7b28734406ea5bc8e323659cae99754ca0da799a97d20a0e56ae74386cbec9bdaa447ab1b445bf137dfe928bece0c28a7630a1856eee9d822e6b01783c19
-EBUILD kconfig-5.57.0.ebuild 662 BLAKE2B 89f5100d0020e83a2daa3364debd86fc3a4260377b06b87e7c492eeea315309d53a9cc866faf2193cf2630aa74dcc6e950701038233e37bb52d94991ac107a7e SHA512 1617734fdf6ec6019acede08d414ad7c46e47c2d967309f5080efa542a222f8254f81e045fc6e6887eae4b6ceb7f49aef968e00779c5e65174584ba52765bbbe
+EBUILD kconfig-5.57.0.ebuild 661 BLAKE2B b18b407a4f7ccc10a035ba37279c070fcecdc1aac9094cedbfb04577b1dcd309e6c90b27542c986131774728afd55881be90a2a75e043449ee3bca0f98636b6f SHA512 6e8bef88548cec26c65797c979a854b167c63b8667a077c0c7bb0cd6449679cfc90c0136272087e4ec28a629f823c3522eeea5d82f879f94b21f4ea5f9067813
 EBUILD kconfig-5.58.0.ebuild 664 BLAKE2B b3aa3333ce71a50b51cf46e5a4c4ad148d26f518f1ce8f540c7d4f595e6d09d400f3f683d26610b4b9f9b4cb1f8beb04f3c46faaf27958cd08e709d33e4fe393 SHA512 ca684681b6f6681ee3134076ac12fe6bee0cdad2ea37df395351a9e1cc0be64ec8b13695251ab54652b57813881fbf09f2f5bc54c68b5f9d7a71c537eb1610eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kconfig/kconfig-5.57.0.ebuild b/kde-frameworks/kconfig/kconfig-5.57.0.ebuild
index f1516db23b0d..113d69543507 100644
--- a/kde-frameworks/kconfig/kconfig-5.57.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for reading and writing configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="dbus nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index c1e878639721..94872d2d0af5 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kconfigwidgets-5.57.0.tar.xz 376756 BLAKE2B 1fcb069fd7e2dc0c9204973c80def90e01a50d122d5b3e69bc48bd2f6030b625bcd55cf826999832afda2f6aa522c37a621891f16915672904a3e6829e34fd24 SHA512 4df0d23c08ddb63ccb1bd372a68b279beec4a5183ebd96bfca3c892f60311e72d29ccf35ef9afc84c87d13d014eccbf37b8f062fa45890a2b43571a04591403a
 DIST kconfigwidgets-5.58.0.tar.xz 375964 BLAKE2B 185f235368e85d9531b7c5584bcaed88bb28eb5c36669aa57b47251ca2986ada1809368cf9c234ab39b63f4dd23c0ab1508fab23bfd8867258f497cf29e8de59 SHA512 5ab2ff176df4eaffd15861bca535637bdb9e7ae1e30873aedbf39da7fdbc669672ec9f012b9e6fc3ccdfc8a9cb505b6b9dd4b799736ff0ff03c9c6071e2d58e2
-EBUILD kconfigwidgets-5.57.0.ebuild 793 BLAKE2B 96a07ba83c78d423fee7ffeaa6b368d98f1074ae615717c6dcd76efb4e8aae4122708e49a0d258b27afb2d263ae94100b75cd7b87440b14e83ee391549eb3924 SHA512 d874f619f2fe55f0833aef1bd8b0b6b4dcbb16f5c78eb6bedf43d309c0d4e4cf0bab06324931e0099feb19d185d7fe74100932edb7dd493d14be9b9fb885d2fc
+EBUILD kconfigwidgets-5.57.0.ebuild 792 BLAKE2B 1151647701a753dfd5395d7b5f0463305517c0c88da4ae9fc00c202e9862ce2e38b3c65b06dcc446a6ea81655cb67f4710e6ff80390e22ca0a02c86a51634d38 SHA512 eae2d010c449ce9433164ab1b032289ee68bf3623b0afe3e04d206b3c4ba464fbf6ca7dd82c8ef455cc38c8998dacdb5265063a1c67579c2e1b32c1f6f599ed0
 EBUILD kconfigwidgets-5.58.0.ebuild 795 BLAKE2B f3a9d3ddaf5706c5c352c4808a8b609109b15fe3169cc5adb190a265231eb25043824e36b2d5cd7c4aba439528222162748f347967f52ed27369b1783d06f4c4 SHA512 1853412623faa7c1ceb3845e4976cf00ff024d9af57478bfdeca509747380c5906f0103abdddc82eb6a22d6837ee82476cf9319d3cfac299c77017e44ac09105
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.57.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.57.0.ebuild
index be12ae8e5ab5..483fd9376d7b 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.57.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing an assortment of configuration-related widgets"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+man"
 
 BDEPEND="
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index d64adcf7f8ad..250995039351 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kcoreaddons-5.57.0.tar.xz 361424 BLAKE2B 21027f024557d608f8a1bab36b3ad3f97dc41212e69c12f8b857cef7d1fdc05b2dbc4425da24e3fe9d56c5e25bdad387b937478c46285a09a749aae1f2a62f40 SHA512 838cc6a2541b3c8216629d7920725790b5bbe10fe74cd6d8b6c503aefec1c9c1f5d966ce3685785792f2078a97c1e156bb79bd083347cedcdda106a58c8e9115
 DIST kcoreaddons-5.58.0.tar.xz 364740 BLAKE2B fe24a3d257793bd8e84e157d0093ae42122219b0490c4319b63aa6c5bfd60b7dcf59309d8906fe00e6647b539d99519de3fbb237736d27253d938abc82e5d302 SHA512 704985ec358804089267dc43efff0947dd56b74e627db900e38af5ca6c03be4c5f271a5e4ca8817f4ca67642b13c22bfdce57d77ea64266766e2d84a53d0238e
-EBUILD kcoreaddons-5.57.0.ebuild 729 BLAKE2B 6d6ac25dea995d06db06b231599e1d6c4107ec114bc61792b22bcb9bebb192cc7da13dfb97d63901fd2fe6ec3ea2585f4f2c02842d6178e0f33ac44e8d1f3a1f SHA512 08660fb679150ffc61b0557978097ea8bf6e008acbf5ca426158c0d01a41867f90f4b66bcffae70aba100f1575cfca296bfc04b7124e108aa93a0374448da268
+EBUILD kcoreaddons-5.57.0.ebuild 728 BLAKE2B 9aa4d28c28ee62d0521b21b1bc2822b5803256fd84ee3595da58bd1021089d3c6d115a145a6a23d671693bde384eac66e7dad596c4ee475aa70a45cba6d1fc8c SHA512 9eada6e84d0c32eb89f7c837b4f8fc4cb8feaf6472778d3260f523feee746a4a0c8e1a7e62c96f6eded97ec7fe0baa70e92bf64240858215e85c6eb81201a4fb
 EBUILD kcoreaddons-5.58.0.ebuild 731 BLAKE2B 5b81bbe4154a76b977a6b71f0c82b50c947eba0c273dfdf81f34f8dda1289b202cb5806c64a093cb5b2adcc834644709d0abf1123811ff6e0646c28c0cc0f124 SHA512 2045acf1f5671b89baf068538954ea1129e58bb38b6eee14c6ad2e28685c9bcb95fcabf62ddf475a0d59a6f0cf418a28ffd98cd779694278576639396f470596
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.57.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.57.0.ebuild
index d34b7c34e921..1006300d5245 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.57.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="fam nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index f12d8b2e45aa..cd72ae8e33ba 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,5 @@
 DIST kcrash-5.57.0.tar.xz 22984 BLAKE2B 80b57fdd6bd4c5e566d76fbc569823486a6e0b853fe07e9cb9efd850baeefb14c8d132f01ef21da733dbd37d43df438b31e609de3c95c135e46637d92bfc3248 SHA512 fcdef127048097217349e62b1204bb99357ceb82ba609fbfadaed673a426ab0f75c32b458fb336945b7b380f540c07d5104f5e16afd9433aca16713f0a459c36
 DIST kcrash-5.58.0.tar.xz 22880 BLAKE2B 1342423615e764063d3562d82111360bad8b3fff94c457699aa3a1b8046ba9b9b7e121994db223f272e89aa2a81d105a449441f1f1d8ddba7eb068e90f7598c8 SHA512 589622d8aa5235d2311d6ed05c97ba9f9ab64adf36b38f2db51efe8d30062a7e416e1111dbb1986eb757b3e52e588c0bf0b81bf3b6a159ee714e88400dc96d1a
-EBUILD kcrash-5.57.0.ebuild 620 BLAKE2B 0d517d09488a70a52f9fa8aaa9d04cc48918a421b7c85f60c64d4d5d38cd0f89fd29dc06098bf054391f1a32b18844e832867a1e102e9de4e5265b995394002e SHA512 1222c89256652bdf202ca53fe6e4227e84e52c5aa9006d2a255b3ad5c6bb5df32d5c26d161ba616dfa779ce403eebb672f81425507732cfa9535fdc8216b973a
+EBUILD kcrash-5.57.0.ebuild 619 BLAKE2B 57bf6ae96325747d2b5fe4ce4e2f4135ee010b27498933f38e183bf4c05c5c31321e41d60ee6f2cdde30db066c24eb5685fc95ce1efb1d6c04e44073ed9ce19e SHA512 a93b0481cdc44a62ce1af9a85650024b44a76a9ff5afddb0446abf11c06ac00687c086d2a4fc0d0633456c1f78074970dad8c1978a6649723c98df9738323b08
 EBUILD kcrash-5.58.0.ebuild 622 BLAKE2B 7751424d383bcbaf936d216a9507fc95c1156598849c5d4762eaa68d322b33db34cd4d885460ef2c02d97e8fffaf1a7869e44637b3a1880a512bb22c00f94e01 SHA512 4ee98c08f55e4c54c2a4da00bfe6e0c31ef28669cb5cf2e895e7428a849b57a586c998ce68d325c9b81f8b1bb6e937f86cd9e932320116341cff62329b1fd682
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcrash/kcrash-5.57.0.ebuild b/kde-frameworks/kcrash/kcrash-5.57.0.ebuild
index 2e0264f8fcc9..2e2467d75ca5 100644
--- a/kde-frameworks/kcrash/kcrash-5.57.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for intercepting and handling application crashes"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls"
 
 # requires running kde environment
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 61b7e30f5909..3864bcb3bb26 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kdbusaddons-5.57.0.tar.xz 37152 BLAKE2B 40036cccd05d3dbaa834663f0b6591bedfaa9233cb908cf29742fcf2e85d6bdd82e4708f5f2d850beab37f8fafee7a7ec23ab72a8ec964dbd17dcec35b2ab68e SHA512 ce8ba7f0499ac57d93f327edcc0a58c03174813f41bc170be577c09403b218080057f7eef3642eef859776979a0cf04e0f064071f073ee8600e04bca1ef90187
 DIST kdbusaddons-5.58.0.tar.xz 37048 BLAKE2B 7a25fdd8ee0c9468112a907a06c366d68599e86e78a7dbbbc4cc65e96370664f95e47901a682d5ec35c27668b0a3e97dc4297a22b8f9f8635e20b39b37d6ba96 SHA512 ddba1e9d535be578f68deea2e38919db691cdb25719b18197d13fd98a0d81ad537550b4b0f0243971741c30dc0fb1b9a242b56310fa52c756c1911b76b880002
-EBUILD kdbusaddons-5.57.0.ebuild 561 BLAKE2B db71500f5a025a2df02532c1bbce05b8b12e01042dec52295ed5700cdd89fe93147eafbd66ae69e69fabcc59220d19652cf9f22a840b83827d005ac6a7b16335 SHA512 b3b305e90032fecee8c9f72e781185e3e7a189a7ee659294974620d2755376d232d9ae8f4865277c8fa3fdc9bb76193a4587da9a95b6735793adaeba2b779b4d
+EBUILD kdbusaddons-5.57.0.ebuild 560 BLAKE2B 626f5dbcd8d01c07183463fd5ac019de993e89f5abd84e08ef0dfca294616e45165209c086951902da1ba7de10bff298fe6327f61a08ade323e56bf6203c3a9c SHA512 3ff09212dd5166753bf0b9af7867c703512f94ce5c33b39aa9ee5c8ac191a95c0a0e40581e26ac03f066884f56b9e936c854b217978086888f8e1023d7c0efae
 EBUILD kdbusaddons-5.58.0.ebuild 563 BLAKE2B bba001e2fad73e6789013324f4dce4af687283c255521d4c746ba482b1426364b0bf0690ab1682350f97a51bcc4b8533ad19808e18dedf12086ec5848e057dcc SHA512 22a10b3c753a106ef1b0e486a9a4032774e3654144088b160d39b767b87d517519e0ca093865577ce01adee382b7858c9f5e2ad2413de31e3a70a5974815709c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.57.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.57.0.ebuild
index 70de2e1ad803..2a3aae34bbce 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.57.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for registering services and applications per freedesktop standards"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls X"
 
 BDEPEND="
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 7eee1b9dc569..169d0ec664ff 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,6 +1,6 @@
 AUX kdeclarative-5.57.0-fix-plotter-crash.patch 8674 BLAKE2B e260ae732380833519007bd379cf7d527d494959c3abcb1e88d9ec1f62899a26d2bf20dc995403d77adcce58b7da3bda5b9be7fa16c06c98b116c999b8674594 SHA512 da30f3f6a9cca0ffd2e737820633e29919761ce6631f25e12d39d2cee100f9a4d012f10767504bddde34fa390f8ee881e9dc052f15e4bf3b6f6cfb74ff763759
 DIST kdeclarative-5.57.0.tar.xz 173752 BLAKE2B 49d2d600004472634e979d24caee79b456fafaea0c18550145a8b7d25b619f56e4eaf4a447f5eee435627cef23f67fe5cfc45ff56d2cf67c7df2b681b744638d SHA512 90e5fd9474a85b8d723cf33b5c5db443837710a6f40fa12f57e1cfe87733986b9ca9c2accfa7e254acf081ee69d5b3126b3f67b531024225172d737ef1c7df07
 DIST kdeclarative-5.58.0.tar.xz 174028 BLAKE2B 0b3e26b25d4104c7556c06b44aa4c6385bc453f586b5fe39f366a0af2eebc90ef0b51011507d8932521fe3e3af08b63e0aa101687c37ad1b571b8a86483bc0df SHA512 fffcb319a15cf89cc7179f0c543376eec83c0de8a49f533ab3c0488e13788b246b051a36249e0212517260fe24db647190e055a72cfa472dc168f0ae776cda41
-EBUILD kdeclarative-5.57.0-r1.ebuild 817 BLAKE2B 53a1d1c0b2cb3e52bc7626974f574b3833fab6bf56cc65b76ab100692328885e7d72fe8071779e9c5dfabaab8a7a4d505e21faf9af14db4006f2a293c5eed965 SHA512 7829f472d93e8a204787d733e297525638e72ed34205f41318de8d412bcdd6ca4ea27cdd824d675c8bc07102b4f32f2612b77816cf1e1cebe694e80548059ead
+EBUILD kdeclarative-5.57.0-r1.ebuild 816 BLAKE2B 6944ab0d4f6b0d0ba529c4c5ab87032e05c1cd8794e273f2ffea1ba3b9f520ccabd30a8635b4e012307c58f23ea74e49d70ccb9ce25dfb403bb855a230837202 SHA512 b716de77020cfda163e18b4c3547c28401b15fff336f03d960162e13649c8ea7d41c59d837df45414899d559db69a669353e8bf8db2e7359bd5680d7824ba15a
 EBUILD kdeclarative-5.58.0.ebuild 763 BLAKE2B 6f7823c3200a4db84b3472fdc8eaea552dc3fd200fe9580c792aa44f816a302d97e84e8a434041a32bf665f0004c279d99ddad5514c76f79fd0ebbb23bf14e31 SHA512 93e64ef6a925fe9c6afcb2875ed26391f39c10547f2d6ff2f3fbe7e8fd88ece65847b7b52a8215988b740ee6df95bc2990e9c9a23add17e8fd83b4abc1b63d58
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.57.0-r1.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.57.0-r1.ebuild
index 0ac11d5c2684..9c670dff344d 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.57.0-r1.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.57.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing integration of QML and KDE work spaces"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index fd827210bb5e..022940a3d1e7 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,5 +1,5 @@
 DIST kded-5.57.0.tar.xz 38140 BLAKE2B 9d09d1b54e16b21031b8749e9c6dc549b4da3d45ed636ad092226099738cd2b41666b6e6abd0cb6751f10bd804d75aae886fd61dc98ae1c6fb7bebd554e59419 SHA512 fa6fc76d1c50e23706ce944797cd6370cee9bfdc9c83eb0029092c7d8db70aa55718e401396dba6b57923e202209990be305e956516133d8da1dcc0594d2f045
 DIST kded-5.58.0.tar.xz 38220 BLAKE2B 1957e1148b95f18bb93c62512988cc4b12f471335407b72d67447e1f6194c5c6592e37123964017e2faf3b21c93c68d63ea541e0177df991e782adbaa8d75a67 SHA512 67638ec4bf65ab74ac4cefb0591bfcbb80bdc37b5bc4ceb4099a9304f00a9f744710fc525c7649ee53c1bc6e590f583cbbded506ee96c0f96547217b21b81766
-EBUILD kded-5.57.0.ebuild 735 BLAKE2B 73346f808f4453aebc85dbe883d8dd22af678ba51a7e18f42fb21a1366caf890942fdb451b5d92a997eaf0ffffe4cde437be1491418582cd7ac9bca4c9cb99b6 SHA512 504e5e7bc694206a4e820a9bbc34801339ea95a4d6ce50b4aff0ff1a46ff164d97764f87d691419f290fa3256191e591c088e2d51a0c9a7932ba602a03bff9fe
+EBUILD kded-5.57.0.ebuild 734 BLAKE2B 007c19d6b229431d79fd13223e8fc4b2ce1f6a76726d39ae4ef635b888ce08a93da0c81b3f54936b424ea2212d1ce3a215014f87264d3ee789ab52b5e01dcc54 SHA512 d3f52b65215740bcd57de3339d751d5a5736185c2a51bc8a624aac222502c99e41f096010a4ca39aa9d91be1642798ef18b47caf9d05b85b1c7bc297ed9c4e33
 EBUILD kded-5.58.0.ebuild 737 BLAKE2B d92ee839d35654b8545e5b831f51c1663c8fbfcf93111a844c7c8da5791c64a2bc18e56538ee6fba47743c5635ad8f377e28e19469f14baf17d1006b8c1fc58b SHA512 70c1faa76b51a27541f39e13611400426d51c0325264f22b0621ab4056d621528100247460da4a5b629fe665343e5efc2441cb8a7ffc328b3ff5908e877739a5
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kded/kded-5.57.0.ebuild b/kde-frameworks/kded/kded-5.57.0.ebuild
index dd360ed99182..4e32f7faa16f 100644
--- a/kde-frameworks/kded/kded-5.57.0.ebuild
+++ b/kde-frameworks/kded/kded-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Central daemon of KDE workspaces"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+man"
 
 BDEPEND="
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 7b38251103b8..5d57ca864168 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,5 +1,5 @@
 DIST kdelibs4support-5.57.0.tar.xz 3505284 BLAKE2B ce9f79396a3572280ea4373ad07596b5d939cd0f303612bbba3826ab858b8bfe47816a6cccbc5b5d75da72fa1f8760d21a42da6ae29898559b46fc7982c07590 SHA512 5d989df6412a85ab4693d1148252222a9f9861388c15d6e340670a8016780848e2e3e58e6e3a505f585890296c9e91f2f762fe768561862e58ea253e32f27412
 DIST kdelibs4support-5.58.0.tar.xz 3502084 BLAKE2B ead8ae1b82837587dc772bcd7ff5d7e0278c3217167fa49b295e385b6987aace6eda24322503c52f648311777608978dfcaa84f42e1f80f1e034b09210646fa2 SHA512 c5b24bca72814e2ef32212f6834cdafa9a52329330ce782cde567a46144d6eac89141718053a3d905d344c14b7b51a5b49737f85761f3324c12e43f81ecac0c9
-EBUILD kdelibs4support-5.57.0.ebuild 2204 BLAKE2B 014a8acff1d07fab496a3d89ac5fd5eeea33ab901b42935e8c93673780d6075be451e93c2263d582911ae407d09e90d2493e162c0d9592b26bddace1fb2c58d6 SHA512 f78b83a80162a26508b0775af7036cb31f5397a88a8af84d6ee5933c57b52b04d6cc557c0f942d57d351db806447fe6f7ce20ed7715a86de9f394dff2a603856
+EBUILD kdelibs4support-5.57.0.ebuild 2203 BLAKE2B b04d3514545f0bc63b8207398f99c3c417d905680a607cc50a6ecd7fe36f8b6dca5315d7df15348991455accea99cb240fab8a909f54b445566a81e7868f0946 SHA512 85e13b0e3b4bad57cfd3c9b297ae4643b531fa9f2bc2d823c9ae805f0a0e607e403e0a5702b10c529af05be7e10d66f8668ef6a2d5cda814fc78e389d02308cc
 EBUILD kdelibs4support-5.58.0.ebuild 2206 BLAKE2B f6f5751e13d51a33af69af5673a83fa006c0023a2b094f09e316f31b6cbfe9008e9da8a33c4c92e00477d7b68d531e66e32c8d59b2d24b798d978e50651e4c51 SHA512 8a33c9b731d48a5fd2419670eba1f94b3eb39ffa03ee4480f274e3353a9ec93b7d6efc93f0232a87dfe5e07ad04cc005ec05a9420fab8b704fa469b30fefd2ad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.57.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.57.0.ebuild
index 1590c1360bc0..736392194cf5 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.57.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.57.0.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="libressl X"
 
 BDEPEND="
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index bc35cf565826..7ce390ac5051 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,5 +1,5 @@
 DIST kdesignerplugin-5.57.0.tar.xz 90920 BLAKE2B 0582323e51acf112395bccd7e95d469b6979200c12368e75ac8dee6b1c6b1c2c3123ba07fcb743f609cc6924445acdef339432112c5f8479d7b7c584e644b417 SHA512 3d1c1242005c7d94a1cfdf868cee6ea88798f19567b19685a3e573ae446365a8ff74e2378cdffa4ab96886efa7bb765e9d4d802225bcb8cef17ac344bc49ac66
 DIST kdesignerplugin-5.58.0.tar.xz 90552 BLAKE2B 9561a6956b123669a06b198e415d43bee48fea2b68c37f0923bbe5d8b8cd97ac661ab278c9b41f4c329b70aed67421bd4bd2b2d70084d86446419f5e1d5cc781 SHA512 65ff89ffb3797d31e4fde69330cb7966b8e01893895cbe7df6de699912deb5863d45833a0bdddcdeb5b038894115ad79817392ee5ed4ca8254fba369c9aeb133
-EBUILD kdesignerplugin-5.57.0.ebuild 1438 BLAKE2B e012196eb415080d83570715a3180a6622905461680859ff59c3116b3bee660f338b2021b656035629bb37bac89927eec1abd726d28c8f498721daed2e30ea59 SHA512 60dc1c4cf7fc6c10815e444d9b7c9c1bf5b740fb495da50b4fa6ef73bcb69f6248fd79aa6ac8fdb7471a92147150f3508a8152412ac91161048e981ffc521adf
+EBUILD kdesignerplugin-5.57.0.ebuild 1437 BLAKE2B 2f8f243ac140462966f7213991cafe1a9df485917eab1bdac681b15e2e497d5a9e72a9401cf8d260e21f07c1c625f5a772ed8c9d9cf1be963f1c95e367303f58 SHA512 8486a47de80a357d1f6ae66e9ef219ced62a7ebb7b0d1fbdb0269b4dad88dfc0e49208a97ef699df3775e32ff1132b28d6880d8f05ffba4dc82d69ffa8721143
 EBUILD kdesignerplugin-5.58.0.ebuild 1440 BLAKE2B bc5883496d83d9137ceb0ccac2e918fecc0de3d09275301ea9d2a4db9eb1c3ed9161cf995d35e7984fdc1f15dcc6cf387cc07667623d81e08662fb66775bf17e SHA512 acfe73c9504164d918181c67e87e31b7f0a1a86993d4dc828e34462f3a05fb4dd40b534c41f4c2888c70a11baa571108a3edcd55bf42e6f9e8fbcbeede35b04a
 MISC metadata.xml 402 BLAKE2B c6bd347d2ec708beeff1a5e62dd8b6915a884afb3810841adf5bda651d5fa2caca0f3375e63d01e4af4b87fc955b6df0483d569746ece2d8b79948fd3b009b1f SHA512 c53b159358adf3556c50482484c631542f17a968d9b9481b6efb6552ab1244753f86fb3b992bc47119a1f6df3c4dab0f003887ea9c45207cbb1d19878dace05b
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.57.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.57.0.ebuild
index cc797a000a96..16e84d2efff4 100644
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.57.0.ebuild
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.57.0.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="designer nls webkit"
 
 BDEPEND="
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 6de1aa30c821..91ea08f841f0 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,5 @@
 DIST kdesu-5.57.0.tar.xz 46372 BLAKE2B bee195d4f4afe2887d1e697335b1ac2fc660f058cbf75fa6c5c6c1d5eaded34da86874922b63242348238eef915ca2bc6071a3282cdd028aabf5eaa340bcfcd3 SHA512 f8a075bcc003074f2bfe7c926c158a873e70bbb8463c14dec74cf794e1401a02c2c08d699b5292a41d055025bcd4a336575df1363c8bca2d52bb8f844d9ed5e1
 DIST kdesu-5.58.0.tar.xz 46588 BLAKE2B c6c2481e15a2b0f2455ade16b84c6ecc4d9086a7a15b20965ae56d19fe297592b1deeafc6b05f5a634f28815413d1a34939ba0e6475c86ac49ffce99bd3679e4 SHA512 e2318670aa7465ac4268239f882b57af35f6943696498a4da33c51e4a89c3be646d617fe50e3aa132a200373f567b26a2247aba5638ad28b1ad0429c21eaed88
-EBUILD kdesu-5.57.0.ebuild 602 BLAKE2B fd2c6e4179c062f8f6635787d8207d58ab2d428d30a7954614dc5920d95ee0efa8a4f3f97c08b57da0a3b95a6f8fab5e8e74c868019d6e93c2281ce8a5095835 SHA512 6ee9069a7e611a4e42905f190f42c4d2831d23015c67ee6f3aa6debcc6f304cbd899a1da722a4d2c3ed654c941380c254f9a081ce1813f07e989f850ad58e16e
+EBUILD kdesu-5.57.0.ebuild 601 BLAKE2B 324ad244fdd9b5df7397e360d25f554d95a967525f641c57573529e756f01c2b0bd3b7b0e22892b1e0399ceb4330aee298d149dca86872d439ac9b3dd87518a2 SHA512 94d742e93dc43486cb2595dc309085d55ec40ec4badfea4e3a3ef6f51b6a72be8b5cd63d6045e7d3058280c33535e830368f3608805dafde1d83b5364d58bd48
 EBUILD kdesu-5.58.0.ebuild 604 BLAKE2B 945bf79e5f680a5efac006425a5ad399429041d428d73f7265d5937f8ef48d6842047e6ac52aadb4099274557db9acf3e666898a12f172fd21d1ccd82d4a3a55 SHA512 02d46a529fcf0efc797afb6867fc1f9df4e835d3303e8b3dc972f17caf40349bbdc08d80073b1c90a605f9cba4c8b3092cc0c541adc13bbc664902a47878077a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesu/kdesu-5.57.0.ebuild b/kde-frameworks/kdesu/kdesu-5.57.0.ebuild
index 424905a1cd61..b44109e1951a 100644
--- a/kde-frameworks/kdesu/kdesu-5.57.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework to handle super user actions"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index 0cc3785e1283..25dbf9572aa8 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,5 +1,5 @@
 DIST kdewebkit-5.57.0.tar.xz 29460 BLAKE2B f4ae75f85f9b70b16b9cdff30e3ddff8b6a5086ba4b80c938017dbb15f9947ba4ea3a3373df8e785dae9f21cbfa5b43647ca6cb2bc9c405694a9bbad82f28194 SHA512 2e6f66ce4bd50746674aba9b2f0a347ecaa1ba6626b3fbeda2c03a1c69a8275ff2e0a1d84c71347895265fc3fe21fc7d7f931709c4f6926a80047a24b1d78faf
 DIST kdewebkit-5.58.0.tar.xz 29568 BLAKE2B d843850ab0be6eb9b3b551d4d9a200875151a2e77281638ba9b32ea817e38dbfea9fe4632ba397d3c674c5cd04317a1bf3ae834bb102d9755664bbacf69ea4c9 SHA512 00cad08646d47ecb7230b2edeea0901555963ba5969af27a7652151c36509d2d2c501cffc65309c0005d9d97efc261b3190590638a379207541eef41cf160067
-EBUILD kdewebkit-5.57.0.ebuild 676 BLAKE2B 17156ae06587197db235da742514ea870e81addbeffdb55b43bb27aa885e0ef56def7d3f8e90100f9f5f070a70bf9d617bc8686a5ffd7d8496dc3dad6d569b58 SHA512 8a6b795fff91fce1fcd2852f7930d818f0e5a50ae688ceec5994ec96b39609eac2713140d53d9aabd84d34834dcf6a3a0e4389ee007261294826dd72353e48fa
+EBUILD kdewebkit-5.57.0.ebuild 675 BLAKE2B 95752c1b81f4aa72f56c4111757c50a91ac6217edb5e002be09380365fe5c039095a37226436b8d6bc59018a4fb0a39e605357aeae9d8847798cd68535099083 SHA512 92ef7b7a5be9a9716521028c751ad5ca7120b965bed97073b2f84027a4c30f6e997c7bccb740161b0c64e11f985c9c1fa604879a11e5397af123f20b0e4c421b
 EBUILD kdewebkit-5.58.0.ebuild 678 BLAKE2B 5a2e2e111b486ab0d0ce6d62ea0e46d019c89bc7d4c21180df516672017cfd71ff3f97379782dba2f1de48fb4e61709cce69986b4b299a7f10ed4e8620e1e2fd SHA512 367362afb2ff72fde89b415076d586c181fbfd732b363066fec08fafd56f1d855467f61d98d60126b70a7cf8e8b56845f1a50ff35580b5329f2b3f670590573d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.57.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.57.0.ebuild
index f32d7ce93d52..2c6a38353a91 100644
--- a/kde-frameworks/kdewebkit/kdewebkit-5.57.0.ebuild
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing KDE integration of QtWebKit"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index b7f32598d96e..0a834f7caf97 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,5 @@
 DIST kdnssd-5.57.0.tar.xz 58180 BLAKE2B bb2f566b878d6f403f3c8a6f5d474c09627d5a8861085358efc991cf5ba851edf43922ead2e9f27e432b4105af372aae791052ae9a2872bde610d9f9f8196b65 SHA512 0ddeb80af5bb2f9f508efab13ae3fb1068734834c1d3d67896ad52fe5fe00abfcc7c3ad1c8743b58ba50d677709df751a846d1576f9ee66e45f753878193aae2
 DIST kdnssd-5.58.0.tar.xz 58224 BLAKE2B 48b73cce88035c1413b41e7c7fdc96664400f1a5d86f04007ca4b4b18134676846f223435ef11d8b5300d5b0d04d4591d8a454a05f9da292b9f4e3c4ec0e4b31 SHA512 af54e5c275f58b51a538dd5a0e50c53b78a9d421c142a3f812e63c4064b5ad5907bc668512b982a02accbe4fdeff3646eb85405e559514eea8c98368316a22b8
-EBUILD kdnssd-5.57.0.ebuild 607 BLAKE2B ff08f7105e9313eb5fc6f43146a047f6e902600fdea0ceba9cfe06ca9be2043f44a1ace86760ab23fc539774d870b6e5ccbafe5c25eebfe6119d69e66c0a9191 SHA512 71be9e6ab616b4651636b6d1827147f2d1fd179bfd517b31a3576ca46441e82ed2fce04d069ff8aa6126cdfa0cd9c52d4ea2a4f9d198de5ca9e62b911282b174
+EBUILD kdnssd-5.57.0.ebuild 606 BLAKE2B 54aaaf974f3f1e7b444503b27494660bdbc4c5dd231dc9369e313fb43de77f4a0bd7f0a619fdea1fb0d2c008ee737094c2c5e8dd5e0f40a1d362336c74646e1e SHA512 be4a9b3ac059c31d7a2916249f4ce115e5304fa834bf7524800a45209a1da84e0b537285d17f2da7b42e65fdddfbc39290ec870c95d8334957b9069c489881dc
 EBUILD kdnssd-5.58.0.ebuild 609 BLAKE2B 26e49558b7d97e21b078971bb4d34711958b5f9f2f66437d55f5fc6439f012cd53f5f32ef363fe353d026b4bff65fa3c7fe9d9fc00b084aadef187247826565a SHA512 c1b82af8a68b39b82c823f139a4ec0ef1a776367c7f560c6573987bb2f8b396377fed8f7ce9ff5fb3fb33f582dab969280a5f7451009e3398e74f18feae18631
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdnssd/kdnssd-5.57.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.57.0.ebuild
index 8ab68666eb52..f0c03cc9ca66 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.57.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for network service discovery using Zeroconf"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls zeroconf"
 
 BDEPEND="
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 7b01b914767e..a6e1ba10f7d6 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,6 +1,6 @@
 AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
 DIST kdoctools-5.57.0.tar.xz 426072 BLAKE2B 4446a883199b927904ea420eb01bc28301bb5a49c0ac1977229b2227a68c630f29156bdb26b1308abfc2fa30371663bd91a366e8aaa60ec0891b2c1dad7e6b07 SHA512 b4428e106414768d11cfa8cd285fca17b7ee088b89138f394a62ad5209ab89e9364d623180ccf73faad8e2ed902ec38dc4548259355ab1cebce75148de71a722
 DIST kdoctools-5.58.0.tar.xz 428436 BLAKE2B 2b1f4a2c37f9ec8d2e0bfd901eb80e75720fd078265a2a5544a7f79c80d6bf2e05872c6b908330f54a83c42fd0bb37e60bbea07c9e6e0ecc6c0da991d1e0269f SHA512 ab758d22eb424d5488d034a249d9f828412f78c8dde01b32f3e67feb7b84cec1aa5282135455ad0168d01f0fc54b590103d4d5f85f9f44c3d3a4742fbb160a7e
-EBUILD kdoctools-5.57.0.ebuild 830 BLAKE2B b4bb2d8cd800f79ce10a03e0a9458b8f8171465701cb9ac04eb45845f35f1281d10baaa26ea7534bf2264891249bca68866c9d7fbf165ab7165a9e1992e9879f SHA512 bd04a42236eb7541029f4f363b56b49b4f236aac9e961dd20366b7ef4f6028a5b0fb957174e7d19241c7b85dd300088d65dbf1787c1249a66c9c2c2192097fdf
+EBUILD kdoctools-5.57.0.ebuild 829 BLAKE2B 5a2b69f0a6c2618af632542e459de1aab724cc0f4497fb2160cb4152e2fb58a012f1e906a851bce630a1175b90f8d8bd9813a6849a4f18bc34303107cd6db0fe SHA512 e15908d253cce8adea7a11ed2e424a14211e6a9067bae934529b3206fdf3229c368cbe018d93c2ce6b4c0e643f42225a313d4c2ee12e8e04c9f4fbe73ecbbde8
 EBUILD kdoctools-5.58.0.ebuild 832 BLAKE2B 196d19d7342de8c5c55d03824e8bc05096cc0de00d9db180d09d85244ed703b7c144294bd5a7bd67429e00dbdaa3cdf5f7f39a61188e7360b5aa847bd2440d76 SHA512 97ec366935ac281a524d025feb514f641a01e323120f3e12a952c31ec817b62ed5506bd5ce1c69a960cb9a3c0a1747e089ed9f3aa4ba47a4630a37dd4549251b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.57.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.57.0.ebuild
index fb6309e4e9d4..1ca1508df78b 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.57.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index dc4d37c292d8..af017652ceda 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,5 @@
 DIST kemoticons-5.57.0.tar.xz 1696576 BLAKE2B 86dfe34561a9369fe73548558ff12697c179a04a20ab6a8227220a5aa4d74e18ca31e5556c50746404eb17843326b44c7487530aa88b8dbb3036aae5d17a793d SHA512 3bf3089fe10df6f91336838d7b0b87681e0b0feeb9bda89f719501accfc6a39b6392504e0179c4505209dd0df5d378dd9415678b56c21f073c953381661b0429
 DIST kemoticons-5.58.0.tar.xz 1696468 BLAKE2B da229623c51af69937f0e039b240186a43f71a41e3223c673aefc09f78c5ce98bebf5b24ea67f062fd5d0ba9ec6fa994aa296db64214af0984d5b849bc324d61 SHA512 2fb641e05cffa31e7d2d9d2a0110ade0f1fdee7fc3f23924505c874d76db24999b041b7df4cb62ecb455081457e013a7ee906479acd35dfe283843c1d269ecc2
-EBUILD kemoticons-5.57.0.ebuild 576 BLAKE2B d0a2a72bed3643ac9cd6124f8c257558b168be423199d0b7ac840e95c287f2e92e285b007dc42766bc811aff7a1cc539063bdc89092b575ef4ae203df86aae35 SHA512 02db65862addb1da2bf38d4dff99c6a1b80b0c90bdbe6d41edb97f4770c91805be282c47d6fb1ea0dad954c3dcf7e2e65af8e7f6c48877d5e1c3d5543f9f5058
+EBUILD kemoticons-5.57.0.ebuild 575 BLAKE2B 9a3c20519bacd3d351f9f53ff25ee1877b4dfdf202d390eff9030d6c098ec2288414fb7c9c96584194f53aceaf13503fc6a68c16e3f745f1875cff3d489f4f30 SHA512 6bb992247255e414d75e3574b168dc3adb5cfdf90b1038367c4f1905e633c46ea3768d85d18db090d011cbb5ace795a6f2911c6e6a485f7426c87784e78135dd
 EBUILD kemoticons-5.58.0.ebuild 578 BLAKE2B 5eb9a1980910af3fb4f85c7ee13b221e4551819f4ff2c23155906e3557edfe52902c47c5a4e47988901b1f9209b74956a1e2b8127e09be00f891c276e4c55c09 SHA512 25e93269c5928110f6d548f515adbf91bb335af7bfb60a22fbbf1f0ca493412a1cf1bf9bf5b573010ad130770d0e9bd0841233c8e1541824515437635da419b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kemoticons/kemoticons-5.57.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.57.0.ebuild
index 089b7025fe25..fa2f1a7a935a 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.57.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for converting text emoticons to graphical representations"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kf-env/Manifest b/kde-frameworks/kf-env/Manifest
index a68cf882c326..7083d3f0271b 100644
--- a/kde-frameworks/kf-env/Manifest
+++ b/kde-frameworks/kf-env/Manifest
@@ -1,2 +1,2 @@
-EBUILD kf-env-5.ebuild 608 BLAKE2B aab5cfb8dca32de72d175bd530fd25380c78253618d12fe01579b6b5b4f458eb0d4191308f4245a4583b5bfc080dceaaefb17be2c30ef3f95e723db29e83bed2 SHA512 0c16461b2ea386f4c10482c9421f6d181c3e1104687bc7049a70162f1cea125d9933e96573cb37fc5204a85b95db34c7a496bff163c8b6beb68d0c7ab687719d
+EBUILD kf-env-5.ebuild 604 BLAKE2B a3b7df06ae260d5ce2a65f1cb22ffdb2132e0a9d0f386995161a0c7c989f56a9e096a8402016a0c65c72b3b27fc12d7f6c7818b9fc6444098567d43405dd1f83 SHA512 ce13c26a1efbe7acf9c6a668ecd2f06255bcb1504aead93346f06bb7205ff0bb061ea795f886eb887fa9abd36467c0b4f32524b09b6be5ee13477917918b3bf2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kf-env/kf-env-5.ebuild b/kde-frameworks/kf-env/kf-env-5.ebuild
index 0c79c5bfc596..742d31631fe1 100644
--- a/kde-frameworks/kf-env/kf-env-5.ebuild
+++ b/kde-frameworks/kf-env/kf-env-5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=x11-misc/xdg-utils-1.1.1-r1"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 21da3846207e..5282eb6fb365 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,6 +1,6 @@
 AUX kfilemetadata-5.57.0-non-speex-files-crash.patch 1648 BLAKE2B f6a43d3d4b4503075eb0196ca85a6f7622cfb294473f492a044e48b4bcb96a135e939122855563946cbdafe954b8c203400abd50f687da97f4ead6a8220b1006 SHA512 8f29fcc30343697787f6baae65a6cd12fd9cce89aa0ebc50b8ef157662d8336bc2dc7d2956cc3ca2364da7eef8c9beacfa63adecb66d4aca41526d58f7200b47
 DIST kfilemetadata-5.57.0.tar.xz 410556 BLAKE2B 988f822829c294f2c1dd6f88d8a395f8cb07709a46b79754cf782bc426faa89688cc78159fb0172499be53f1c4526df722166297dfc687388a36290c31732c3c SHA512 a513a9e850758647e098177eeea793a2672644de531293b37d57ee216fd3048c124dbea99c5b469ce110fc538169fe72fcfd1b72a1296360d1f111d14bcf2b8e
 DIST kfilemetadata-5.58.0.tar.xz 410740 BLAKE2B 9479591b73c030f6b074e4d1b6fa6752dc171e83a81a6ff9f39e4452960e6f4201e901a510c2a2b1f71f68da6ad5ef3e33ac667e761017b93d98f7795b247d40 SHA512 1a8967b10882910645254fec74a0b61fa9a7458a5cfeb105d3161deda07591871b505c4b415f2ae8612235a3fc611084da5ea534224405bdb19b0cd04a674c11
-EBUILD kfilemetadata-5.57.0-r1.ebuild 1756 BLAKE2B 27e0f007d2869bc595a36fdcc82a186cadd81b86a26939bf15c39e230bb591eb1c02b97f949f8236680d359db60bf424e07a6edcb8fa08102892955c50ef4ebc SHA512 0f8d4099df91dfc196e58b8474297c5f3e0c2ebb41a7c2d8da4c8c762d384d6322a57c05ac4e2d15c4c9b545e00bc64a847e05e65abfe3079f0a7d4326b3e7df
+EBUILD kfilemetadata-5.57.0-r1.ebuild 1755 BLAKE2B 9277b5f4deb68d0005f319a84fd31c94ab70f9f84a1df6d65a0e60a519dbcf63833ae021e5298d8d7f114fbd68cd328b1e25b22cd6dcedda0e01566425429a71 SHA512 490dda36f35ef809c65fed62bf5cf59ad9f4fc7e656bda613c7421aeabbe25c33e39fd82368ef0cccbbbc4fc709424302e7c1671ab2549294cec3ce188915f00
 EBUILD kfilemetadata-5.58.0.ebuild 1698 BLAKE2B 0a0c32ebbc12f92c79da36b635485ef4c02f8de55a7107236ebb7633160427004406721ff63ae064d17ee18aad3d45f5b7a6fb45a95e4a63c2738e5a10fb568e SHA512 d53d4560d8e9d10a3384ae67ad53ef050aee0930c6b82ed0b83d7bd5ddd8a30286983b26f318d1e846da7da07717b0f66f402708955ee03a92e06dff56680c19
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.57.0-r1.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.57.0-r1.ebuild
index 241eef48d393..e5cdc0411f51 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.57.0-r1.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.57.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit kde5 python-any-r1
 
 DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="epub exif ffmpeg kernel_linux libav office pdf taglib"
 
 BDEPEND="
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 0bae67fb4037..8d510319b66d 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -2,6 +2,6 @@ AUX kglobalaccel-5.57.0-runtime-crashfix.patch 1035 BLAKE2B d21b9f91b8f063ddbcfc
 AUX kglobalaccel-5.57.0-runtime-crashfix1.patch 1704 BLAKE2B 15ba3b0c39e9d1da36733673796126e55eb3cace7a43944d10e8e30c42a24390fe662d30dec5cc75357ea1e12d413cedd4cc43377b8f0fe18afc81509572ee53 SHA512 95e2ea355b3a260ea080b700e68d6f7a67b7f394f0d085450ae9ee31d09240377f4a346f7cc26db34868f22c75b65082a0a40c1999e6b2a4d4eab83be3aa0c4d
 DIST kglobalaccel-5.57.0.tar.xz 84148 BLAKE2B 2dfbab1efbf652dc425f50ff035378c4bf8850e51df70ed7513d65344a95beb4267c5655ce7d5d9a4f6bca5b91c60dfd272750e92a2725f2cda17a831d072ab3 SHA512 26bdbfa6ec61831db7c4b539f4ca93bea397c607fa4d8f047a6166e8e69555443ef96a75331ab40a871ab3c450fa6996c2697888be38d191b0e6c43c0b54650c
 DIST kglobalaccel-5.58.0.tar.xz 84192 BLAKE2B ffa48dc75e9c62f59eb01d30110917e9a0bbab0e07441265763418503e16b1bb70bad3fe328e584155efa879d2326c66958f6be7c0dd8304f4d4c34e38068c25 SHA512 4dfed2f280aefecaf9f8eecda5b3663c831fd85781ec8b64c2cd208d3e7af170b52603f8746193f48a92dbf86f6e9fd3fde90fb592557867cd78473dbe810990
-EBUILD kglobalaccel-5.57.0-r2.ebuild 716 BLAKE2B 4bfe7fcc460a66cb39cbccc7ab6688e224cd89fec7073a6a41e1c6db359597f56c818f2e0c7d7dbcfef1a11240325a04eff0604f0547d248c3f4d73748ce10a6 SHA512 bcaeca35555d51525369038a88b626837a3cad86c5e57c2e7de57656053820a8d4c78681b02c912ec64a3ad1963de6e77cc5ae34b98ca72aa994b6cd2694124b
+EBUILD kglobalaccel-5.57.0-r2.ebuild 715 BLAKE2B 62643a9cf5f12bfce97ff7846c9d61bf986e945609c3eea466046e55f6b9f20f34a82a096a153132caa423e27282bcb93673ce9ae64f7f5edff3f128705778f0 SHA512 608801b7a945d0769611e62bcbf3a0890323b1a4d7044a74fff636d74e3a9bafa49f925755b36f37d97ac2e8129c782f94f6e729d5046187dbf01d5ae93579d9
 EBUILD kglobalaccel-5.58.0.ebuild 659 BLAKE2B 8984b5c7453e970ec7655a4f9d668bb1cdc52c4aa5c7502a02e9f8844d24056a4f9130d265cc09df1aac5d9296d9f51ab3a56b1a57598a4f90ca15121a35aa8d SHA512 47e98ef6615ec2ec8fa691016b1404d94a70af9d87a68fa024f2321375b98c0a56100df4a1f0b63e78e5e1c4e8d3a9952accff365389d6bbdfa2842410dc7aa0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.57.0-r2.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.57.0-r2.ebuild
index 69495ffb5824..698fc1264813 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.57.0-r2.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.57.0-r2.ebuild
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework to handle global shortcuts"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 LICENSE="LGPL-2+"
 IUSE="nls"
 
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index aa36806e082c..9b9132d6dba8 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kguiaddons-5.57.0.tar.xz 40404 BLAKE2B d398375113a6786754292b71822bbfcbe08930a09b5f6e00f42319044970210b755e8b622620cc407cc388c18ccdd58d3ec09206453af47e408ef010e1b6068c SHA512 50a64ff32cfe59716ebf2cfb7e0cbb96efed5ca392ee687ea4ca559c3915ac1b950d458ff39fd26f3c1105e4eadbcf19cfc9e727c2d8ac33eb219433bfbefb4f
 DIST kguiaddons-5.58.0.tar.xz 40384 BLAKE2B c44596c8bdae787460febfb94fdbf640117eb27ecae2e3a051a6b34aaae0cef14ed114a3e7cfb89ab466e29c444185f0c1590205923141088588b7350807072d SHA512 a675fe76ef2d46c59d8d9ec5e949dbfca8d24cdb5ef4e5c3774dee45c82cafa0ff8e94c9508ac6cb875fc2188d564754081c5a1fe7b0cd096a128499a544c106
-EBUILD kguiaddons-5.57.0.ebuild 428 BLAKE2B 69b865004e192ac6d6e68432a34d126cd377bd8a126501a595b5a5aa56b7b915e71af834684db489c712a1335e3d2b4209d2c5df4684c20a57879566bc9867ce SHA512 fbba915345ee211acddd24df31faffacc80d7d28dd0d1a486cd7b44e8d9984907ce27bf8aee32d21570c97d86ffdcc103e5b5e6e97f19bb974ec1d706131f7f8
+EBUILD kguiaddons-5.57.0.ebuild 427 BLAKE2B bb27fe304e4d2d3ec06bc4f536419f59f2c2c8af3fd8a6cd3d446377e04c416aee8c805b5f82fbbf8d9851bf7a2405d4502e384364ba9b5a6b66b37014695175 SHA512 018278880cd6d23ce0ce4e498913bb60c40bf3704b8c05f680ed21cbae5c9f8b12c25c88fa6a6aca64b4b1058b4cd882d066e783f874a3467fa4f68df4c1747d
 EBUILD kguiaddons-5.58.0.ebuild 430 BLAKE2B 7a8efc394c841c6b40737eb8629bdb656872c532e7165da9c185e63f02fe98175921137b51532376a51e43d54036287c41bc95a5e1deaf882cdd15608ed545c9 SHA512 098183ae6ebda55adf940310b2de1d90324381d0eb03ebb9636660d9b33ea1237ab258c56768b1e4518f2a43d00781d294bef5a64a3e3be0a16ca9aed3877452
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.57.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.57.0.ebuild
index b0d89d46ec06..34c26c1531ea 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.57.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing assorted high-level user interface components"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 013999322b48..97de80ac7b27 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,5 @@
 DIST kholidays-5.57.0.tar.xz 202428 BLAKE2B f47938b8eab86b78c5c7b846360c0b61e63b65609664816ab592b3a15feec419dd8cd55ccc632a3e9a8bd525e10fc257a3c469cb5184a9500ad53474a8ff60e8 SHA512 373b3ddb2f037eec1a2a7a9df7d2e12aeb1ccf5cb547d2a48ba541c29877c79f557867cef72ea20eb2fdf4bbeea105221da460078497d2e3314f4f4b25b1731d
 DIST kholidays-5.58.0.tar.xz 203840 BLAKE2B 2461a70c0fe71ddaadf533aee0d56ccf1a8ffe6e829ec5f6dbfcf0d07503ac955522268d7bec00d30b99c0ed88c0cafa57f3dc0324a88a46e7768fb693ae4930 SHA512 ef5a62331ee788d08913d4ebc68d6d420670d3bbb0823447e4ebfd1d0a7dec8cf44a5bda7453147160885a98900a081d60c5f175d4c6872688d394f8ea08180b
-EBUILD kholidays-5.57.0.ebuild 636 BLAKE2B ca5ac0be71a57b9fc2bf2d8a3e7ce7f20154645d4699ff1ced843f3a789c6916df4129bb3502127ff2ddec47a503e3d3bde7a3c9f9c9b28cad2014c6fa1c85e4 SHA512 b3bc3575f18825824aa37dffe5b11eafdbe7db21170a56eefa5f4e27aba3b62204f3370875b56650d8339f5c68de1530d4128b3c03955080dd2b4956a8fdf90a
+EBUILD kholidays-5.57.0.ebuild 635 BLAKE2B 4705bca03c7b27ec7ae87ef7027b6e14eadc9a15f64ba5ca80ade8de87faf9af28313d37f35eb88a6aa1a0ed983dbdf0eae7a20b3ea747f985a0ac208dfbe35a SHA512 56c81acbeedcfc59d090315edbf9913c0e4a2e39521f4a8468101ea709b154ba614134d8ca9afe2fd5960b8dc0526eca70cfbfbf298c1ba562c381dd441dbfee
 EBUILD kholidays-5.58.0.ebuild 638 BLAKE2B 87c4f0314bd102dd08f8f653ab7abd66a2009c3b2a029a4f43c98a404da9665580b4cf5a96ab4715c3f4575e181d1c8576c5568ef823113fb59d7a6ea31dc28f SHA512 41261f1ac0f0061e148adace2902a58a209ad2048420a26f98b8026bfbb6424481ed90f2d17741b7c2755aeb8de2e24aa901c3b3aa54111a5c3cf4a6f90369b5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kholidays/kholidays-5.57.0.ebuild b/kde-frameworks/kholidays/kholidays-5.57.0.ebuild
index 5dec17f81fa5..11d401aea7b6 100644
--- a/kde-frameworks/kholidays/kholidays-5.57.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library to determine holidays and other special events for a geographical region"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 79cc7e0909e7..eac9f1c94daa 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
 DIST khtml-5.57.0.tar.xz 2078272 BLAKE2B 1d936c093f05df2b05f0bf523b070219784dec8343e118ade300a33091f53284db5baa9fcd0ef573c72bd678e35f81285b77290e607925a6ef268f6184e16e5c SHA512 15ee8e93899e37249e6265aa43e92af3136f2ab773144aa7623937456083588f82de11812f68b2a917b2e7a7638a58f8a605b6d5db8fb6427e0fe1af59bc4bc1
 DIST khtml-5.58.0.tar.xz 2079860 BLAKE2B 954952c52806ca25acf2e76e4b6bf1e86ceeaf386d264029b5efc12c922e90f76f99b104e29bf365703c7ba5b5ee9fa25aa62e4a1473006ead7c3ed9858c9cb2 SHA512 f4bc0f9a5a6288e76efe79596957aefeff5757cb447c9752bd20fd6dc48a199311fdcce78c22696d66c5dc2ca509d4c3cde56c0335be1c8e19bf104544546824
-EBUILD khtml-5.57.0.ebuild 1596 BLAKE2B 9433c3b16f115c19dcafd515c5120164394dca574775ae1cfb2bca2e423e381e3b28760d8acadc3bc8b0eae4842fa6833ec3640c47bd79962f7daed05cfa91ea SHA512 934707e3312c00f559897e1747a3c3728a68fb06997da7cdd072f502adb38a2d1a4f5a415cf64179cf7a9c18a37671fc0d08846d4a690b61f6f658250d9be833
+EBUILD khtml-5.57.0.ebuild 1595 BLAKE2B 16ad7c591eaf71a3eaebbc82c7a72847a59566789863960f233de3e9f338446c0ddb960ed5fa91790899e42659efe37a223a31e011e31af1279d62e5f3b6a412 SHA512 255507edecde5e1bc7d15b065d36648690c79741fc9997430bee7852f8d3a531f0b44fbb941083c7486fe18806c82beac4f8761cc1a5f13b7043e36fdbc9ef3d
 EBUILD khtml-5.58.0.ebuild 1598 BLAKE2B 86d13ad2a1e5da43152c0ac1879a71dc4006910d4d336ee8d0dbe71149a03fb32be3da59b82f32c437fe5bd9c1cb7ff17ad888877ebfb05b6a1ae97dc6dc5740 SHA512 565410e34ecbcd6e26fbe0de98ac8961a0256c4ef2197ab5f376b5700198f82608ded6d5dfd001448a2a312519052c1b50321a14317e6a1db83f7895b627142f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.57.0.ebuild b/kde-frameworks/khtml/khtml-5.57.0.ebuild
index 2420d7640583..7c582450e5ac 100644
--- a/kde-frameworks/khtml/khtml-5.57.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KHTML web rendering engine"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="libressl X"
 
 BDEPEND="
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 61e475d4d0cf..396c13ce46bc 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,6 +1,6 @@
 AUX ki18n-5.57.0-python.patch 512 BLAKE2B 9feb6bd88fbf7ed853be777320d5d4821320da91308866d1afa08f3e7ee1631f3f59e2b096c8aa6f2b2562ead934ab11a03633fa3b09cdccd1e292adee7adfaa SHA512 51462a06c232b9ee1eb1f0e290ba286f7f7702676e5b8c86626dfcaa0ed11b3d15744573643960ead459f9366e21d859e54e344abf7108f084e84dcf0765b596
 DIST ki18n-5.57.0.tar.xz 587548 BLAKE2B d24048a067f2bb8cbf8eba5eb6f9fbb09851172bb95e7c29dad000224f3a9278a5cd5eeeaa47ed4639cf0c6ad570143a5fc6a8ab16ea6af18b0bba71f909e0b8 SHA512 0d6993b55d79138f735821a7cacdd95db264cc63e11d40fb65c5a8fe2ebd3bec58b688d5d4f8dbb58a6aba41d505aeb9460a5a6de35c91c2426c7e10e9604488
 DIST ki18n-5.58.0.tar.xz 588136 BLAKE2B 79ddc62882bd2dd0da2686b43cfcd1fc6ca7608065e04bdf92afb7b1b6b58af09d8e22252180ba18cfcb82887c6ec46e59a62ccb577d8d4b3babc24bc4d572f4 SHA512 dae7dbfeb887db2f799619222702e2767a7a4f83e21a718af7f9376e735928846f4d792f9fa30dcf4d9010efdd5ffd926a89fb0fa9dd068e2573d2d47159a971
-EBUILD ki18n-5.57.0.ebuild 722 BLAKE2B 197358803fdd535e5426501a606929510a840aa7a2e4745c5dc30bfed5d3aadc894d9abecb21b8c5d48a7bb4286be7e370fb74bb7b61467fb76400400f5e70c3 SHA512 9ba5e1c11a1a0f92864908e59cefe59fe6ea006af0666433e1f9b6d692355b44f94b5f712bb78b8baa2e12d6f37abd01a1b81837426d733e9c73d5cb9cd982b8
+EBUILD ki18n-5.57.0.ebuild 721 BLAKE2B ebf7f85220d19af888e67c7c66003685dfbf8c7b35b67dcb1a8d60ebb13ce5b924cd4a1f9eb1c0d0678701312ec5dde5f87bf0de0d7fd3dc352f92a25bc93130 SHA512 1f1538eaf6f9561e5768cc26c72b7e7176cc2671ff0a0d1a9883aae314a1730da91bf550663729962df218fefefdc9a6a48465c77a3d2c8b708f8ad222957119
 EBUILD ki18n-5.58.0.ebuild 732 BLAKE2B 3e7f41235fc1dccaba356cd13fe45bb9405a26550989dcc0db1c42eb8dc5eb945ba95ec88a58c0dd763570a403cfedc529f9a53dfbc84f214e71546ea92991c8 SHA512 7cb0e0159102f7255b23d2e500d5eca8a240277a28b724c01ecdf417d027e4c923db6ee18d2b1478921e06f731f53c9f042da7d4a14557a41a958cc5a68f2d84
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/ki18n/ki18n-5.57.0.ebuild b/kde-frameworks/ki18n/ki18n-5.57.0.ebuild
index 7a532d282916..a1a30a969472 100644
--- a/kde-frameworks/ki18n/ki18n-5.57.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5 python-single-r1
 
 DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index d302ddc3386b..c83aae9b7c77 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,5 @@
 DIST kiconthemes-5.57.0.tar.xz 207712 BLAKE2B 85c54c2aa5cb434835530457db7b336632ce5a258eaae5969323eb5bfc270d808262d0a3910f212888706074ec0eb8d1655100a67db61206f7b6e667ee25e3d3 SHA512 3c4a2f95e882fa0ec3888f848305d876df49bba3d7dfb35bce012d40266fb2b8101790e37121c954e0b314dc64ad9fded75bc0bbcd133432614e8d25aeee8a30
 DIST kiconthemes-5.58.0.tar.xz 207444 BLAKE2B c5d18cb45ff02e836bf82bb09f2b450a70119caa4cc9ddfb1cbea208c6724ec37194e53f619978f261b065a6dbe7f26454ca2ba3d3b8300ba8879b46ad0d5e18 SHA512 4ccaa35b81daef5e63ba43ce8baa5097282aa790cb8596ced8f8c23570813433ac497090fee257f764363150a487a433af68cf6e065d90c2163acfbea1e36bab
-EBUILD kiconthemes-5.57.0.ebuild 660 BLAKE2B e1583f8ba351fb5ae55d94739e8ac2eb14717be2c06604892818f5d383511fe84654eeaffe53699b0ba97c9078063d60dbd9b4a65fbf5355b934f859e8dbcc65 SHA512 88ebc15fe426a5e7018ff8f0442bd1816d4915d8ca37490e6633732ab38a812c51d425c8d9bddda12d0d100fcb8a44bbbe8ec8084cedd060af7918d7dd0ec7bb
+EBUILD kiconthemes-5.57.0.ebuild 659 BLAKE2B c01f97998968d186354f30f5f090615f12993592c3136a0b62e4f66d150478c1522c4da4e1bf74edcb25824837ee7c85fb7d8e082446a9889fdaafc6fcafa723 SHA512 ef2f5a8bc91435d97799e17496f4f9f0e52d31f61633c7a875808a8994e84929950f0ab5873684e00b4c0b5b524096aceee0a6343c5ecf202be30d48fca5abfd
 EBUILD kiconthemes-5.58.0.ebuild 662 BLAKE2B d8b7210b81e177bc1cd5925904c3b041ed240e7d659237ef47060e04f14491495490e7aec7eda58cc0c8fb2e231a7057d759a70741f7eae19d665c8ba4870bfc SHA512 e59527dea3e58f3f93157535b9606c2b39b59797186e241c6be5023f934187a3f0f387cfa8862cbe96911dfee799e0ab0c1e23d8452c7d5f2d3f1b7db6daa6de
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.57.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.57.0.ebuild
index be326c0fb431..b38e3e30b9ad 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.57.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for icon theming and configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 0012dd71771f..081e40ccf721 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,5 @@
 DIST kidletime-5.57.0.tar.xz 26832 BLAKE2B 99c26ced1bb55e57c067b4e1a86b6489ef85a67e5689f86240754f53686951627c275f289cf4d84c76cdf9e2239c6e0bca94bb74a8cfdb3549fb1e1b2af69f2c SHA512 ecaf06c798fbac4867f9c226ad3f0c7c8aab597ab3cdee2c00916715bf30635978be2e3ce5e1de2da5229f62ddfe12f5df04d4fabbe2de84c2aa1b7290caeae0
 DIST kidletime-5.58.0.tar.xz 26908 BLAKE2B 674be73ccdb27b5709188b29dfe77743bfae99793c98d145dba8892fbb3dcc63057ee5497dc913914b675bb77855017e01e765ae35fcb37dd3c6165d685ea435 SHA512 73c81679d969a03e8e8aefb53896a463493cc6f252e2bd6d86219458761ef75df8b6795254544e4db33229a8775e6f6758183719ba21ec9eb21e5ac72b105886
-EBUILD kidletime-5.57.0.ebuild 850 BLAKE2B d8c590d970b9976e2a25d860f17ff621c1a15f42fe61f61ef6aec0e42cd6fb4e0095c1266c73a6197701e632a24cd605f2fa081f2b0ed287794bcdd5f9ebd354 SHA512 e815e175340a50adb4670ba597fad42b15db25017ab64163913a25760b2c1f777876788fa224f2946a85a476a63a3672893cb190916e845185c835202879c748
+EBUILD kidletime-5.57.0.ebuild 849 BLAKE2B e9b642bd1491f02f0534a2491de4ba3dc498127824a956512a4bf615c7d427e2009c1f3d0b9834456ac56d1ef7a782cbad2c3fe8dfec1e50931946d0c8389e21 SHA512 179198de321897d27c67fcaafbbe9ac0ea265a06fd94d2ecd5736482f3a53c2975e9497156a7e42dc30051108ecbb13bbedc69b7e1577dfd54096fbb30cf5727
 EBUILD kidletime-5.58.0.ebuild 852 BLAKE2B 596334ae2aa103824856c372838942657c697ea6b0ba9a079099d36f4bf254536aa016559105c1470a0aefea93d06dd6710c8cb06e92470bb02d7c38ffeff226 SHA512 42c0fa27a0760ffc81b3427f784761527a8a0a0c6674841e6f8184f064b17c66d41e01f96f75e79c1ff43a9bbe64e79b84b4e3ab3672b13adf9dead18226e905
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kidletime/kidletime-5.57.0.ebuild b/kde-frameworks/kidletime/kidletime-5.57.0.ebuild
index 57280563250e..3a222d56dc73 100644
--- a/kde-frameworks/kidletime/kidletime-5.57.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for detection and notification of device idle time"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="X xscreensaver"
 
 REQUIRED_USE="xscreensaver? ( X )"
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index dd451a2a630f..78d3d584e0d8 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST kimageformats-5.57.0.tar.xz 204656 BLAKE2B e0b102ed78fba81918583e990a9a36c93f4bd1fe7a72aa148f75f1f065de3b70a317993ba0cfbf8c059bf06006d375fdf8dad741f0c33717782d7dd0e249935f SHA512 57188935493a10a20a645d18e5b97749c7f61649a71624e91c594636ef0827ebb8020616cc035560b9098d82bab8fae4f201db0183c6e6064d1581e2daeb69fa
 DIST kimageformats-5.58.0.tar.xz 204928 BLAKE2B c92fb2656fdacda9bc4b117e6f3724c2d242e954169640bc61e25ad71190de0a46ad40f6e4f6e2eeb0572fb5461425b35018eac22c33a6762df2e18998a289cd SHA512 5676c3f9bff8a295dee67a26ff8241b6f0fe608b1ba289a5a90184f01f9a2439ede313e73761e0a0861bf9b06e1baabab6c4d64bd247f23abd980a98603942c4
-EBUILD kimageformats-5.57.0.ebuild 724 BLAKE2B 10f01b7c858d6169eda0aeff51c832cd3745d157b547cbc8c2f98e4372ae5caa1a42df7b9f8708514ed1d49964e5e350080d11d5653cc5b7a192e9890be26c2f SHA512 40e0d1decfd69b6df94713f75e3a944c30012008455ccb283c7fa3b1546178f14c1d6e88169cbf6dc82b2295f6c018067d98205e653e6e0467951e6ec7b8599e
+EBUILD kimageformats-5.57.0.ebuild 723 BLAKE2B d382ae68114b06e4be561920113af0e3a1c5e77f2011402401c3c4a08f2d8d1415419b84ca2edf0234089ccfdd518b21e116864f6222f1dd19afada435a5bbce SHA512 9ccb7db854e2f4414dc38a9e0a23e33692dbb318c43278bdb3c7c777a975e85a083581081b67b7433a7373cac154b27819ba6195758ca3d830f7f35f8b9bdf0f
 EBUILD kimageformats-5.58.0.ebuild 726 BLAKE2B dbffc3d8fda1dec4be295083e7cafadf7806bb13d4685c48dd94d8cd090533d9d30408c6dae05464315193432df723f72fc56168bb36d1a1ea4a01cdeac46b74 SHA512 5dab7dbc90339e5f93fb80937bb0008abecbd5f7a4f076f5e236947b60e5f868426e291bedd333caee2b67240540059c92a2f5ca6ec6d0d1012811ca786eb812
 MISC metadata.xml 327 BLAKE2B 830c0a5e6689cfb881f6c878199b45716bf683fabe3ef6cbe51c757efcb057ad253912930b1637d958e26dbe0072ed25fca3051b752084a634dab1d1f34c7e6e SHA512 269908d4ff42e80fcb50a3a3b9ab6caceed1068edb2469f3de5563b5505f8053c14c698299383686c752a3b43097d3eccbfbde7f0d41684e5270bb2281a24d69
diff --git a/kde-frameworks/kimageformats/kimageformats-5.57.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.57.0.ebuild
index 9dcc491e6c1e..761556381abb 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.57.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="eps openexr"
 
 DEPEND="
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index aab4d95770e1..7ef4ac426d37 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,5 @@
 DIST kinit-5.57.0.tar.xz 120616 BLAKE2B f3ded2f772117a370218495431451f14902f20183f38f7d30715c38113b36d75cf45e90834884045033009d16d7816afea92aa8f2922850a1e612d9f6f441af6 SHA512 09bf6f107cc7e6ac62aac2640b45e6262fbe43b01abb4cb36aa8380e09ce7ec8401a6385f0f127137d042df90d97f126498e2a88717ea66e8785acad45f11f45
 DIST kinit-5.58.0.tar.xz 120644 BLAKE2B 27f10c50fe3e6b771b8927471e3d2812352d073082b78cef4f856932782b6d96944a8db882bdb98c11da2ad4f7e04c6e61619fd2887c92d63352a499149b0633 SHA512 71c3fa045c727fbc548f8714e70866f857ce9b90decd234833d4f1655c660b97cc787b2ead28ace3d16e770a109fb357f1520ea22e83f4d0a651ca1357ea9082
-EBUILD kinit-5.57.0.ebuild 1010 BLAKE2B e55a49a4251a88389d86d5254da01ba199929df69872dd9fbc244cd0ef47e9e6b4364e622916c0327899975d1b054b0510ae4f2aa2644b62d5112e3d57ddcbe7 SHA512 ecaf620fa3448dc4913fec0f0d4ecbc612ce25dee3544f5643ffd5c1612ed020383edab4effffb414365eab7ce2d1a666e975e6a3861ce003f3f4a971daf82cb
+EBUILD kinit-5.57.0.ebuild 1009 BLAKE2B 85a64f4470208cbdcd46f04f27cdc55e15dc65416f55588e2e6291c1de43e56730bdf93ef0d118d1602df13bf5c7af0a6f2016956b97f00de23ff04959902a6a SHA512 9171ef6866381e5d07a95c547681edf40b0edc11cb7b1b3fe475f97cddea1b51ee74d46fb74b1b4106edb8161381f3e214256fed3432f815563938bd3343f0f1
 EBUILD kinit-5.58.0.ebuild 1012 BLAKE2B b4443c5882bcd9e6b8907eecfdd5b917eae451800a9d712a1ab99bb3b0f7b18e5672294b39106cda69355bb010f2ebe2f3bdd92eb622851257f54c738e7dc984 SHA512 ef17952b036d27df49fe9677c1a4c17ce5740272765f764332d649554f0592d1a92f3a0f9a8a26c5d225076c67e4ef8c0492f00874604c731c8470b49ee89eb4
 MISC metadata.xml 412 BLAKE2B 8029572bd77c6a7381c5fdce9d864c05616c1da9144e61385936a6678cc94f2279be1b551c148fcea8b58f98ce704521c0f02f3b7ad0f9b41a4ebd3dd7c469bb SHA512 f5e7eea56365a00dee0fd4983e10b7cb5a0ec42f68eff735778d69f59499f7b5f59289429a59e7ef6e2afa8a830261782f4e86db229224e442c8d83dcc1e635a
diff --git a/kde-frameworks/kinit/kinit-5.57.0.ebuild b/kde-frameworks/kinit/kinit-5.57.0.ebuild
index b26278d0f043..d56b6839b29c 100644
--- a/kde-frameworks/kinit/kinit-5.57.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+caps +man X"
 
 BDEPEND="
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 8893ba34018b..951a98ac7339 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,5 +1,5 @@
 DIST kio-5.57.0.tar.xz 3166500 BLAKE2B 2b6be8ef79751d2158b2e0acfdd296cf1780cc314b0b23fd7dc17286fb1d89caaf4fb912ce7be3a9e615714824b5c7a289fb7f6e73224d424cc79d1c17858306 SHA512 88d07ae8f8de356999a4b4de5fc73d7c0b6e707145643629ade12be2c72a892b20003bddf93f64b8f1711d32be58d23799f9df8d6e7fc9e42b35f1b8c6a3c977
 DIST kio-5.58.0.tar.xz 3166976 BLAKE2B 35539418655906066f71def5bfd26636e28b396b6d749cce67f66d9c09428e71052f9798bad15aa6edf779539ec3d182e617b5961e8e7fd807a564a7e3e4f23a SHA512 3d2d881f802516d890ffd3b5013972a6cd507228006d1e86d0c130209e776083a95b69bfb578509440a6ee387bea2d888029441b0ce9e6d93196536ef40f0c12
-EBUILD kio-5.57.0.ebuild 2021 BLAKE2B 59bc913a2a8b15e34444869e782fac421e6a2d9df518e4f3da8ba394c07e9e96b57ddd57fcefac6a056cf369a4dd6131190762ddcdaabb1df197155d5f7d70be SHA512 3db59a1b978e9710fe226b47d910d916d7772b8b210faeb6ca347acef8d697d4e5be900fb1e69b8603f46673dcdd5ef2a02c250121d16edf1fe4004654ad8a2e
+EBUILD kio-5.57.0.ebuild 2020 BLAKE2B 2ca17d06b542342d4d66021bdd3174f595bce4892d05c71ce2f68ad2af58c30f8d68021e9bbfc3cab1eb77b92d0048b19f875debf14382e402f591d0c45bca93 SHA512 9cf7ebb045c2e118818f777856ba7742b1fd9d76f68522ee20a815fdf8c7363722c85b63435d1b738b01b8ffc3006623a2ee72a3be921a4a67b37c6ba45d481e
 EBUILD kio-5.58.0.ebuild 2023 BLAKE2B 1476f5f15bf0fd7c39a9472cfba79d2afc5076676a421f214207039e61f96a0475ba244608bc8fe56a70f2e1e1e7dc39a81d8b53f2650728977cfb8833bfe6bb SHA512 ccec0a9672992d4c64cb7dfe9ef24095e4caff05072ddfa823f4494323bfabc3355a6532bd49f4dc3e557d2731ab2c62700df50d06c61f071a0448cefcaf8c92
 MISC metadata.xml 389 BLAKE2B e0f1cc136204ab865eef4b3051c40b136fb2659f402148b8f7e48b80bd9c7156f0811a7fe80bda4a16ccf671e69d076afc6179dae6d34db695672534a0b9de5f SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820
diff --git a/kde-frameworks/kio/kio-5.57.0.ebuild b/kde-frameworks/kio/kio-5.57.0.ebuild
index b76808290eaf..ea3846156446 100644
--- a/kde-frameworks/kio/kio-5.57.0.ebuild
+++ b/kde-frameworks/kio/kio-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # drop qtnetwork subslot operator when QT_MINIMAL >= 5.12.0
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 148f7cce9de6..9b9233c792ab 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,5 @@
 DIST kirigami2-5.57.0.tar.xz 137836 BLAKE2B ef279fd43854c93c9615df69fde57ea6449e4a7b1aa25d2122829d752b263638c5395bcae020d40307188f6aea0c96cfedb158942cd438cb9ac6c2b0f7c875b4 SHA512 10631cd367a5f55c09f1fba1488ba43b1e2146138e8dfb1d15d36868dbfff3ae06c3d111290b0fa118db9248c166d2aa2c13a95ed07ed0424ee059cb0d1fafe3
 DIST kirigami2-5.58.0.tar.xz 140408 BLAKE2B b3fcfdc0cc5c0d890cfc79fee8c36f69209b546186e7cef237110e0d86c200d1729c2af24be80adc6b22d3566c6b0aef2846c767f138013c851d57941d56d428 SHA512 db7da93a1af3ba5216fd903667d75fc89e45197f7bdee713cfdf04b6bd1269d67c756369503561ff0c4766f088bd261b87a6fa7e5000d7533f9ccd088d710da3
-EBUILD kirigami-5.57.0.ebuild 861 BLAKE2B 57cc12dcaa4c94d3aa5082b82dbfd22989c489db1d774731233f49683b68f1e6dd7f0e6b8bf7d34e0b1fc7716661ce1229f08febf215e969b1f9a20aea006c52 SHA512 6dafd0a690fd88c1c1494d9bbe14e0e3417ac3fa46ad6aaf0f42dede81ecd3c1f42df3c296da2d1ebb727cc2360b6c91ee0b6c66359b1d176411cb54596e8b40
+EBUILD kirigami-5.57.0.ebuild 860 BLAKE2B f2bcd626370c53ff6d9222f8b078194ed533d89ef6b53b1c1ef87bfcce28e2ecb14964d95f148ac75d82b5bb80fd7a94eed3bd184f3b356ae5edde952034798b SHA512 7182029732ff692c98efdfaa51fb83b2f6e22243ee21f26bf972d0d6b88c2483d27213d8df64d10791256424094d23f1cef564fb8b66c24aacea56f3fef8a9e4
 EBUILD kirigami-5.58.0.ebuild 863 BLAKE2B 262f404d3ec703101cc5af4f193d9ad92f37746cb9da74c2f48adc82a308f66d063d1df37ce1ceb51cb2f38fd590377f584579c424258b8cad15f95d90b8d312 SHA512 d91e8810765b9622ceb9d910b2f33ee4580c0a4c05df0e0292622abb0ea967f2cb526fd2e20b4e78e9c4a1717b4ad96b13f8f9764ddd84d2a91829425e0bfd00
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.57.0.ebuild b/kde-frameworks/kirigami/kirigami-5.57.0.ebuild
index c6baaa61d114..871d1372712a 100644
--- a/kde-frameworks/kirigami/kirigami-5.57.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.57.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
 EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 1a5cc68eb173..47872d52e19c 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,5 @@
 DIST kitemmodels-5.57.0.tar.xz 390044 BLAKE2B ef10ab7f42a3fdc6b6c44ffb2a0718cab3bb30a8aca6e6c77632a247406f5df8bfd4d7c54835fbabd09d2965eee98f72f394ee5f37a2c2eaaecd7ed05a76c81f SHA512 935571b934eea27e2aec01e839e58d69a35f7ce13d7498bd8d1a7fcb8f858e519e0bb3b3d1a67e5f3d7611480642f4d0d813fd8200c99951ac05827ca4ef9cbf
 DIST kitemmodels-5.58.0.tar.xz 389944 BLAKE2B 0cd6dc9650c6d13320751605c268a8898fd31e9639943f0fb0b9a61db745afc055828841b7ad2123fa08c078c3dbd4d0e4d08e9933d2b08f68e94cef290dde34 SHA512 10f6af35a689a22106bc3df2eb7c069251c8ed61fc665cef224d861d8551805d0fdcf0c22a2b0d44fd5d2e4f7a94283d06a92dbb6b648bfa5a71bb63b873a87b
-EBUILD kitemmodels-5.57.0.ebuild 350 BLAKE2B ae2159bebc5d307c19288d2df022314e549873d822063ccb50fb29e701c7db816f159c805b236eebc348d1f8455a2d492402e75d661b315b8a411051f6c2972f SHA512 7d1e5400c09194d017855d357c7013f054c7b560dab0e54f288ea51db799d875fafacaeaa5304a90a3eb0bd60dc869828e102e2e4a9538d3fb67f70a39f0a95f
+EBUILD kitemmodels-5.57.0.ebuild 349 BLAKE2B 6ec4f127fcfcf7a361fbd7058454fdb0983cb6390d001e9600c5525fc6be9903b77cb2262cf2aa6113880ca1892f9e1990f56a97862a40ed8a7a8b5e045025af SHA512 3ef655c15a0f19aed76c0fac2bbf150a2110419a34750325c0d5b9e1d174a2f91ca3dc8379eaf173e747e1c450665043a2121b45c5c8604b388700a76c48ba2e
 EBUILD kitemmodels-5.58.0.ebuild 352 BLAKE2B a932edfee121f332f30a01a89a19df0e188d4af70ddd137adea6f58f337c6ac6d06406050bbd1e7503cf089ecbc4fd1196331b66cba801718ab77d36d5d56494 SHA512 e4013307f945cab5f5f2c0fea51b7cae1cc80fd2276a04c236d90d0e2eaf5ff1b8c1d947f58ec307cce19b85c6e7e593fed229e2064590ed77cc97e58a902ef8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.57.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.57.0.ebuild
index 21e6c941cb00..df3830726202 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.57.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="test? ( $(add_qt_dep qtwidgets) )"
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 264b17e0016a..7d9d139ff0d3 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,5 +1,5 @@
 DIST kitemviews-5.57.0.tar.xz 75368 BLAKE2B dff9f28078110a1106821a6e7542e9f8ace31c51eb1b987cc804ae91e9d5e3ca9e608908eef09ec712130538e4713b6c25a12a4dc1744eb34a6c1cd849008e42 SHA512 0b5a20ce63e21317f560514ada231a87692aa36c8eb3905e1e9fc8ed52e8b1dce5ac0e35af310916bec1b9cb601c2b1e0f5c7c2b72772198ad1827465ec1e342
 DIST kitemviews-5.58.0.tar.xz 75268 BLAKE2B b909e887e27b60d10ecdbd55285a94603a4c9f94ab2c19eca01d7dcbc3241c5e4caa3dd16ebe59dc4ddb1b817dd43825c14dd5dc79d971e2538241384f6c05e1 SHA512 fe08b97c3b698ee4cad96cfff6907b88f6c77841619abff4caf2f949d4e9379860a0e5c0be6ace4b573b0efd9dfab2dda10ee4856b5ea99e8a8be836444f048f
-EBUILD kitemviews-5.57.0.ebuild 412 BLAKE2B f131b4982c3a68b1ebd4e051f62fa7aae13021f835f3b81bef8465d22e631d0cc3de8cfa73a628872050f309a92c6155df3ac521bd1f03bd224d2e85e63cf6ad SHA512 e9a4ed5e7e2a395cf627bde44f615df3b73ddbc8da7c90763bce03551c306a1891cc7b9f97f8e61d69a77557f783b9f189fb7114191dac27c6a09955398350c4
+EBUILD kitemviews-5.57.0.ebuild 411 BLAKE2B d5d0220d62366d95d7aead78fdf2c3f85b9852f0ad7712f4c0c4fdaf71b426d041697cca9265a2d8651a4ca74d30528c9433fb94eada6d6738bbdb7d3a2f3fa8 SHA512 2f352fe812ef18a921139285b2aa73311ce218f77f875ac6a9207d89d9d776e140ee0af5417f7a354dddf1b19cc7c9df4bb7c7246c5f75a721ada753b343239c
 EBUILD kitemviews-5.58.0.ebuild 414 BLAKE2B fc9483262d4eddcd06c0124a025eeacceaeea2939d30d6cb4a666ce5324c7f8481d707736c922082b4181c0e6e71edc292e0019b04f861e2c46123204bc27468 SHA512 3275650bb7fedd7d0e26d8c66072454dc988ce8bb652cf5303d0be3691a798f8c08c323bda98b60552244491582a8f2894143fc78d39b553362bc6fe706edb5d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kitemviews/kitemviews-5.57.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.57.0.ebuild
index b8d8154e1807..543f33093513 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.57.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing additional widgets for item models"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 4e88d756ca34..0b9fb3a54a45 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kjobwidgets-5.57.0.tar.xz 87604 BLAKE2B 88026b98e267c746f24ca5609454e023a91a703783d8e89678f737caba6e113fb1df4129809563e5b6d058c3ea7b17782dbdb5a203ae633dc4a40ae574e7c84a SHA512 a1bfaeaf280abcdfb1dbfc0d236c781c40b3cfc4513f9432059339bf182d8a7afebd5593e200cf1301fbd91dc6f8a6e3c14698940bd7489f9176090aaa7f3efa
 DIST kjobwidgets-5.58.0.tar.xz 87580 BLAKE2B 65b96139facf3594978b46b738d924cac3f6d75c4e70568f3312db179738d0dba96c3bd483b42e95f63c392e807dab3392db3d95fddcb946ff38fd83039badc7 SHA512 e753041daf75c00a9d7980b3fdc68faf818c804b339580cb186685e89506b50e148bfe213ebced6e888004761d78ca168d8c0555df22cb491d6b3550f7f81a96
-EBUILD kjobwidgets-5.57.0.ebuild 690 BLAKE2B e5a5fb6df03f7a71f910d1f732218416bb7d12066e8b581aecd5c8e91e0280d79e021b4945b756b1e6408228b73f867369778422ff11376419083f29dae534d7 SHA512 f5166cd09ff9b48bd033ee6ba2fcec03970119840bf8a54cb4697610d31d6bf6f1df58394d104edab376933af6a5ea58c5a64ad769142fd83932c329decde0f5
+EBUILD kjobwidgets-5.57.0.ebuild 689 BLAKE2B 1a0ddfe348b3a7cfe15d7a24ad7af096a79f141fccdc060e72b2b9715aea87f49754fbba145ba5836bb9ddf2cbc2792a1bc99f51d1ad7b4a826330156129d278 SHA512 cda209dd34bcfd378298f35fce4b89da6437aa488bca3f59ed41de205d1ecba232472ebb3d6ab915d65cbd1d5a24aa0bc73f74ff0d0eecc32008aac2a6e86525
 EBUILD kjobwidgets-5.58.0.ebuild 692 BLAKE2B 21497d6765215b6882546b4c40ad1123d4f053acc67f2044f118b90b6bc699e638588773c57cca57884c8afe116bbefd68dd60b313436376fe2e2b1abbf15998 SHA512 6753337087f7cc27db46e4f309fedd24f3f7587803ba3cda3169aaf8b5cdbf1fa46af64f803fd3db2262c02d2da8c35b88e6a5f3f8ebc5898e92c5e809614617
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.57.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.57.0.ebuild
index 4760504eeea0..35ab2c596781 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.57.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls X"
 
 BDEPEND="
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 18c73d611ddd..0441a205de06 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,5 @@
 DIST kjs-5.57.0.tar.xz 295044 BLAKE2B 29bde20552bc3563ec10e550f7aaf3265fb7fa8dcbfd829d026a662b5374c4eab2dafe00ad3354967115df27f725730dcd36f3d796fab37532354b01dea1e87d SHA512 eb35e3f0ef37f953a9545ef769f0120d55fc780af0816711a8086c6cfbfaadc60cee8b0fda0433de3792ad9c731d7ca5548ba59b68dced8522f87aa2a18a8637
 DIST kjs-5.58.0.tar.xz 294716 BLAKE2B 6b5a3c8d4c32d8b48849a9099935b351517c717359e63023bf970cee8508903a884421328b4ba9a6f0a20ebdc68642afa4de31418cf7cf810ef425bcc11aee7c SHA512 6faa3bb2e0dbc8a1126010249b2b8e7668e158ff1ecaad7ee2f1b6869f32dff56dd09d5d1c26cbea157f41e4af47b7e95ac00053e61e3a86d29702eb09a5c29f
-EBUILD kjs-5.57.0.ebuild 386 BLAKE2B 81dcf13f16ac5e13749070d4854e3aabaea73a3b6c7ddf0b7a0cf0a5bd67f48ee99eaa846dc2b45fb001195b66bf973fb36456d98cfe94d1d87caa57c47292dc SHA512 e321234bd9156a559ee7a1c53260c16da9bafb570f0513827d84244fca2c5b5d968bd4e2d59e48beaa7afc770a376aaeb7231537f734a45b148aead566bfa1c0
+EBUILD kjs-5.57.0.ebuild 385 BLAKE2B f21a162d8ad24cdc1431a20e65ac394e46d65b1c947ccaa32ba9fbff29b3a9a4716b14e372cab1de8b7da2d67ee3b1690b77785388572b43dd078baf8d8dbdd0 SHA512 62c875dfe6ea7c0cbb595ca9bf2d77b8e8e9d18f1abc8b8a10f0e7e692da38642e625ca7e2a05bc12fa5a4de312890f137fc56bcadeaffaa5cd1926fa3e53da4
 EBUILD kjs-5.58.0.ebuild 388 BLAKE2B 033f4d101b09a5964fda0fe274985077d613d6282144a82bce37c3cb1c5fdea44294105a458014899c5ec856e227b10a53d77bcb8e55f6a71e9b62ebe4631896 SHA512 1dfb75d8a922ce9b4c7f0ab0b5148c6bdd864299d14574f9d2b5ac1669a284a69170cc99ff71996bf35434c76c8a890c4560937233b958fc642ee089de9f8e48
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjs/kjs-5.57.0.ebuild b/kde-frameworks/kjs/kjs-5.57.0.ebuild
index d67b12c075cd..c7d55414983e 100644
--- a/kde-frameworks/kjs/kjs-5.57.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="ECMAScipt compatible parser and engine"
 LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index dc4646ee475d..268587698ab4 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,5 +1,5 @@
 DIST kjsembed-5.57.0.tar.xz 169620 BLAKE2B 6de44e5732cb7c863f80de7cb0518eb50042e5281ec1ad3bb34d7162df6840738e1c112e1dd2d886113b44b3f34d87d33eac9f4a474075bfc077198cb22a6535 SHA512 2c8ad7986a11416d948846b97bb746875aa1dd90083e58270b7d1f2fe720ffc4fe5f11e6b4f1235a532a62abee94b2451c4af9bc35003eac5fc345d9f688b032
 DIST kjsembed-5.58.0.tar.xz 169796 BLAKE2B 5d77825b0df75df0b1ced1f7b6c082c0003b9f7ae21735436c752048701ee8217310f8c4ccd512375d82c852301d15fe2df73137fde0629c91b20edcdb81689a SHA512 a6fe93c0ecfee82394878fc4c388ba749f50e0e935c131e422dd80a1b81246f3b1eea74ab21df5016284b02a19fb27c06354a1f10582809a59f9cb40421845ec
-EBUILD kjsembed-5.57.0.ebuild 511 BLAKE2B 67e68163e974ed51cc80cfaa72ee412fdd2b7b88251deca0e912f29fdd77eb94acd0ae31cfb4389fcb0b97eb2d421990ec93cb5ba4133efe4391b16a94a49284 SHA512 40314a88160dcaac928180d41722c686854d3feed71db764b1cd87e7cf3bbbaee42c3a7f81090444e326f6b7c1a0cdd4c1dede17292b6ca08226ed27e0f42540
+EBUILD kjsembed-5.57.0.ebuild 510 BLAKE2B e2789077bc893d0cca7e4bbcf1033c4572875617307cdd46c3d63cba175a73fadce7533b9dfd04d220f515e70962a501fa69949c4377649a20b4c7610757970b SHA512 20af10fcd17cc7420e98cd87a9480d7be4d063beebc731c2ab7f0d6630cdc2c8c001c9d7ddbf585bf827c470ee92bcecd6ac4f697f7f4855ac6d3e3a1301a39a
 EBUILD kjsembed-5.58.0.ebuild 513 BLAKE2B 668771636d52a2ebce53c510555a970d5422e0897f2b2f745e51831b13d3af3a118aa245baccc07a4e7da99261c8e0963d25e542d0a87dd949f5f0590d8126db SHA512 816213999090c23c7eefa1a0c92fe699cb05a61d70f08b86e25d4d4fc6bb4787702d60512fb2f33dc144a89bd34f95fc0e8931572757a4e44fd5605910ba891a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjsembed/kjsembed-5.57.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.57.0.ebuild
index 0c2bde65adc4..85032942ecd3 100644
--- a/kde-frameworks/kjsembed/kjsembed-5.57.0.ebuild
+++ b/kde-frameworks/kjsembed/kjsembed-5.57.0.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Framework binding JavaScript objects to QObjects"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index c1b1119951e4..2da8506ebc00 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,5 +1,5 @@
 DIST kmediaplayer-5.57.0.tar.xz 9688 BLAKE2B ab72fac850a8ecee008a40569cda86ba30a2d2f7a96a798b6ef610666110ca871172b21169d2a1038159be5ec129b923e043478ed61fcb23758910c19790c249 SHA512 1d6f1c37362bd1302a83f9c5af71227ed29be045dbab0fabeab4ec70cc960e81863900da0db672cd553291d721dfccff37674678bbf10c3e73848694fa1bbd93
 DIST kmediaplayer-5.58.0.tar.xz 9648 BLAKE2B 738524728740403effbb48c12b24c4e79446794777a0c99997c324ca475f6c75cc2c7c59af0d28816d5008483397f5075940f807874a6f20561f53f87d19a953 SHA512 08c48d48ed149b52ed2b9838a78d9b08011c859d63f1b18ad8238042c3e710d9b40a7c719e36d5a70161a3c27827ea0394f61c9556f72a25bc6acaee31791e74
-EBUILD kmediaplayer-5.57.0.ebuild 449 BLAKE2B 38616508ce319aa315adead66bd86bc1578e167a146b8a2706bb4cd262ebf3d4f08b4c869d527c10795ba27f9a65f0f8896d1a931dfac68743b0808091566ad4 SHA512 4f983e02bceca0a4a16e00bbe93f2be06fd7636d1d2b13411aef75eb9ff2835a48843eef90d96c474a06d342aeb9de517eb5126ecc88a66b5b25081977930d35
+EBUILD kmediaplayer-5.57.0.ebuild 455 BLAKE2B 3528df1a91eec8e81934cb15f24851750f5bb66ca70061e5f62033682d091ed8c0cd864a242e1751a6857c6e307305ad137cfb5809431dfe74df96bc0286e727 SHA512 1caa2f71ea756373b292c93f2b6ee727b8181f568a8a32fc072e715591d4dc2642e781787c1682c5e2244bc505f19f4ed0939022cd911f5f40b967a979d8d0b4
 EBUILD kmediaplayer-5.58.0.ebuild 451 BLAKE2B 21f9448da8012e68fb2606ffa0d7b0998214f79630c6ac729103590c46b55d7d8d3e3c0a80fa2296c1ad74714e05326e8a6beddb52a7579e8345a69ca5ddef89 SHA512 38d7d6ab2968880eac99eddd3f30d76fcc935b1fca5757b694cd05217883062068ed0173d008ae9abcc6fe78327f38105731b37204e7bcbd1878771b6d6de93e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.57.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.57.0.ebuild
index ed419fd142d1..5c2ff30eb8ea 100644
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.57.0.ebuild
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing a common interface for KParts that can play media files"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 4fe973cfcc3c..2d88ae2240fb 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,5 @@
 DIST knewstuff-5.57.0.tar.xz 1012056 BLAKE2B 145802e435953b83d81a414be90b83ebdfe28e51ae3bbbba192bde18a5d6ff42b54a76c66fd1909deaa368928ab91005cceaf35e01990fb998aae6dba33da78c SHA512 e7229607cb79fb406b1947baff58ed2e58b6843f055a0396b708c58e97bca8d4f0432419b0d7628bdda4a38b411392a343cd17c59e7a845b36da7baf8daadb1f
 DIST knewstuff-5.58.0.tar.xz 1009836 BLAKE2B b2b8df092500654d31ff30c0db830a29dd7db46c339d0bf1b742eeafb12a6a8039effd1c3fdff5c9486903f00ae57e40ae2b31a377bab983fefe8de165bca986 SHA512 2cb66fd3ed5f35eca3373b3e6ad39813fd17607f8b128c028067f39c39c354e9eb7cae4173a92107b021e83dceab46625b71305bc2bff37590bb43baacc33caa
-EBUILD knewstuff-5.57.0.ebuild 894 BLAKE2B 3b70af05f61831fe69cb2fd2efb0597b246b858e6631c5447458b50b00df822a9882c6d5924283038ab2ddf28d7412b75ac43a42f0d3908fb6fac2b604e80667 SHA512 15b5352459e895dec3254a1697e6e4a6d873386829db55468b97b97899610d6a64c6047bff098431f9f7d2c01088fbe6f8886067f94a39b1698601b4adb721a4
+EBUILD knewstuff-5.57.0.ebuild 893 BLAKE2B b9232f5ff89b0dadd9b139343ebf1e18f180c7546666ae6362786df34578777458a98cf595e5bf50b4a7b90f71d95642ae8d7b4752afc05ddaae2a0c5d9ee281 SHA512 69fa29f88035d1fd5becadf6074afe155b5571f31de9a8fb3327c5e2e7f8ebafb463e8ec404735e3d5f45244810c1500b528f132b98f71c55619e984d95d2351
 EBUILD knewstuff-5.58.0.ebuild 896 BLAKE2B 9940af439c9a17ca6ca86f4f834eb80472c4c659717874e8f791da77ac81b83a13c08c628ea69a60c5ebf336b65d9d6d77ddeb574ab8aff3776a092527b9bcad SHA512 bff2bce9a300805b4ec61b0072d1c73ad0eeb2626f9172d6b4f84ce22ffa295415ac8014361e6702bd01728f0535c0082058fd08da6248db7082a36ee4885246
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/knewstuff/knewstuff-5.57.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.57.0.ebuild
index 1f67c7d82afe..7b7a9785f9b9 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.57.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for downloading and sharing additional application data"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 6b8d76715ec2..39a99a9117c5 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,5 @@
 DIST knotifications-5.57.0.tar.xz 113180 BLAKE2B 30f09deb22ae04e5e6cfbc270315ecd9bfbb07e7576c686bd06b7b2fd0dbc54f1dd784dcc61860b1fdc23089a37ec33d3807c559a105c0227a16b7d8866e6100 SHA512 f0c8b805d251c5172fc7e8f0a61e2d9e21ba705287376502695bc50b465c792c43311b96a931b43c5a07042a443ff5f20c47a1274628bdc1b1f94f819136d9b3
 DIST knotifications-5.58.0.tar.xz 113680 BLAKE2B 4d4a0816c0ae9e5b4a685d40889269a1b34fbff548193b1857d62718f81a5bc4f166c5c69ee4eb3f73595e19f1346aebf3945b0edb03ffad950c2eda1ba3b6a7 SHA512 40614ca155fe9839e511a3416ee85b233e0b8ce9a3f3ee182f959332d61dcd323267f19dbb71f73fed334f5de22a8efa5bfaea5ca115c21f33efcdd08567ae2d
-EBUILD knotifications-5.57.0.ebuild 1098 BLAKE2B 631db1624ba9c5ea06f841402aa5901fe201295a29ace54761861a2519b5ecf89841e6cae91bee2fbffa697f3be064480a5beb9cc8d8613b8d01fc1f68101355 SHA512 7955d0c240f399198921ec281e3a2c1a92f0ae356c14c53867e0dadf00274903a1d09475480f39afa7bc7f6560f4bae6290d56dca6434a3c91da2b4cc4f5d4c4
+EBUILD knotifications-5.57.0.ebuild 1097 BLAKE2B a2e91b78557355cc11304b799f5dbeaa29bfa484888403984d6283a82b8eb7f978adcc767d34012b0b10889ec14c3ddfe72013aaed8575dca371e99c1c346841 SHA512 c090616eef64f1c63dee5811db5a5dd1e88f350b8d55bf6be6c19f09655096c5b5669f91949734d3e70e86de6a55b2c742b3b1e741393107ea19eba2df1c759d
 EBUILD knotifications-5.58.0.ebuild 1100 BLAKE2B 549b55c57b4c151723143d74e7289b7219ab34a3d35e12f61d9b90c7271f948e34772aad472a98f2acf94a1e3fd73f21e01fb308e813dd09de07797aef5ccd50 SHA512 f70e0bd9b344450047a9720bb63709d669bc7ac01222f6476946f080ddac41eddfff0612ee0d70210e34295c2ebcaf830d96e448c70adaddfed1e7e3444eb295
 MISC metadata.xml 468 BLAKE2B 372e11b35b4abe5a1505ff086f4368f28d3aa137d38d33334404872068c2ea401e225b7c482be11a314d03e4e7b2aa440ec095d4d6ffd9a9a2ec1beb75af2c7e SHA512 70130ce812a1e3d370ac5858fb946372e93cc63a65f4ae3c34639521250949fcf6b79ce51aeee02a701edcaff36d66ad284b0880c3c15a7f33d2c4e44e6a87af
diff --git a/kde-frameworks/knotifications/knotifications-5.57.0.ebuild b/kde-frameworks/knotifications/knotifications-5.57.0.ebuild
index 080763d7e43b..d9abeda12d3b 100644
--- a/kde-frameworks/knotifications/knotifications-5.57.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for notifying the user of an event"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="dbus nls phonon speech X"
 
 BDEPEND="
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 7b703c3dbe72..2cd83b0669ea 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,5 @@
 DIST knotifyconfig-5.57.0.tar.xz 83816 BLAKE2B 0d6926359b64102322bc2a5ece1d1cac0b24b9d251b3a3a8da811cfb4179206529c579e3c4647d58f9a400e91e48ab0484afe9f070dada25b0a595ee4df155b4 SHA512 eb803a397e0d82d1a43fb75a2351795e2b6421d72a7e03f376de0d059b65ce25f89a66336eba01e1a6d4c41cae7fe640e35aa32c782b5be860435fe48a58a1e3
 DIST knotifyconfig-5.58.0.tar.xz 83936 BLAKE2B ec00e9e395edb3cc66997021d32aadd8488190b454d4cb95d80bc6513a00cc2f8619dbcd61684cc1a3f7309fe50208240e2f10934fc77876c568e1d54c2b8256 SHA512 881f54d22dfd7920eced65d869303f1bec593a995a966d1a641ebae22bcbff5800f4d992c8190049ef6ff821a279f272ab7342f59a4d9aaddb66fb8535090c1b
-EBUILD knotifyconfig-5.57.0.ebuild 532 BLAKE2B dc474e2dc84d6120fcf5c7b036931df6dd33a7189a81a5ac98203299d343089a183f268884bc7d178e2ace272260d80dcb026557c602f5096b67bead1e90ed8e SHA512 5bdcfaeac0c6b507fdceee3fba380b8962f5ffba22f60e9ddc9b9f016f5f5cf9803b51d6f53501ac4b660a392db4628c565195a1f8505f649180dbd431c4211f
+EBUILD knotifyconfig-5.57.0.ebuild 531 BLAKE2B 0e66599b04d0fbf50e706a4450154c71ea90917d37f9a87e0181fea8b45cc981cd03e2ff3f5993f7565d57e13fe29abb3cc0324fcd3a18b6387f274e693483d4 SHA512 ceca785ea79071d2100de22198faf189954a0e265dc7bb6997019f67049bc880b78bdb473ff0228170af7ad6f6b9db95f9a5b8e281aa45e6cf014468181cad96
 EBUILD knotifyconfig-5.58.0.ebuild 534 BLAKE2B ab532612150fda6d800b99ba99ad87a61774503df71cb353c60e6f3f48c1cb4ae44a9df0d4daafab17cd104c786a5c2cbb28678468d22e3000b6af4a01a25b8a SHA512 b85b84153ca35befc008425e7be497234b2f8fa4f866bedf036b29b91ac4f6cb627dfcdc2279e689d4d8189ec1d118d68f59749d0bf49af8fc873a0ad7d101f2
 MISC metadata.xml 344 BLAKE2B c11bdb097349febc683046711b82d656d79473ecef4d5d539c71b458f4dc5e9b7f0ced04d5fd59fcdf14377a22591130c85f47a0041d2bf4096675c9c6b802fe SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.57.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.57.0.ebuild
index f6219af74f11..004db9a32488 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.57.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for configuring desktop notifications"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="phonon"
 
 DEPEND="
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 8ff5142505a0..a6b0e68e835c 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,6 +1,6 @@
 AUX kpackage-5.57.0-runtime-crashfix.patch 1391 BLAKE2B d67afbbeefba387176a5ac24345e44994360490de8c0af3f851726941872de7a2d4169b14ade3dcb64a6eb871cd8e3bce748cff1d78219e9ab1f92df5aedb326 SHA512 8b053d3dab2cb93920c3712bb14d75ec8a3af392fe05fbdcdd65faf50ecbcda2ae78c1759a7d0ef742698b111881df57785399e558b450af17e5b0a4c7b1bed4
 DIST kpackage-5.57.0.tar.xz 133456 BLAKE2B 72c295fe68a2afb5d93acd411344b3617c0c85286201541088e4afa0fc2bb8c58633c583f5b572b9e9fc4bbfcb55956cc4cf57355cf9271b1f0afe42fc4330f9 SHA512 bd133f60e8a09e1802354118832ad939235570dea7b8eba028d8144366769626b7f8830cc5486ac0791c21523ea06c284ae8b9b08b2d3a526b43e636698ad360
 DIST kpackage-5.58.0.tar.xz 132896 BLAKE2B 048ae64ab785adc5cdacb0fc44f6c1b8854f8b9e96a92bf0d4fca353c13e8f325cbd6fdf822b49c601e83f1b128afbf37b4dcc8ea2a8dbf7b34f76da1d27df26 SHA512 1e62422675ef980c5098a24deac23fb25d4d7dca86accb78c82ab2039e3f03ba2eb93aead26149bb887ae65d3463824a4d1b91c4b73758d6a797cae3a502fc1f
-EBUILD kpackage-5.57.0-r1.ebuild 718 BLAKE2B 3fb5204413e301e3496fd71fca07843c4a9bdb4b7ca9f4c6731b94e7e4daa7c92751693d07a4ed674c0973ce89a90058dd8586d8d10097e8101a8f0748b52559 SHA512 62ffd80a9fae0d85102c92e3ac47d3e75014b9a89f589db3278ec3a19d0047f9d4d891d09c4b8b486d5fa9e3b92eba2a686f88e4df57df5c5c3fb1109c22e74c
+EBUILD kpackage-5.57.0-r1.ebuild 717 BLAKE2B c704943e95e903ebeb17400a612129eeff787d38fcf6a4d776e54a90e2155d70c8bfe9a237b905cc6f2ad579bef595d59bdf12bd064dee6b66fc157d6d4623d2 SHA512 37afe265c7cb083d1e94d97257abf09b550e229e2aeb0427e39ad83a92611c90cbea42f53b835843502021b0b4ab1e34f3ca22739bea1f06c96440fae0e91ff8
 EBUILD kpackage-5.58.0.ebuild 665 BLAKE2B e2d96c0c6ed6441cae1bd2360b7d3f62f22c5aae4fb56a29726e478db21874f102c076ed36301a4574606956a6cc44391b07b7da54924a2761d3b103d5da58fd SHA512 ebbe419ae19780525b4e156c348e1c6d65b1274d89eb3764038b486615dc16394dc3e136c15cdf42c5ea953101ad86dbc6d7b43df1229deb4de7dcc9cdb07357
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kpackage/kpackage-5.57.0-r1.ebuild b/kde-frameworks/kpackage/kpackage-5.57.0-r1.ebuild
index 5fad74a84480..8fb1c225f7e9 100644
--- a/kde-frameworks/kpackage/kpackage-5.57.0-r1.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.57.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework to install and load packages of non binary content"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="man"
 
 BDEPEND="
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 4e3c0b9ba203..ba3469ff6ce9 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,5 @@
 DIST kparts-5.57.0.tar.xz 175968 BLAKE2B 61b1c15baa24343a345a2c23aa82ee48b4a666c17314fffbf150b714278dbc5e7ee10630822efd1bded330276c9ff634d83040824934badbc3f0527e0db193ed SHA512 785a09e00bc0cf78a57d7d81839cc74fa4d8497cb73321edd7d89b24343339d42d1e4c2d398d51874309824bce8c229f447a4136775690373f402f9127950b56
 DIST kparts-5.58.0.tar.xz 175784 BLAKE2B 28c78008cf6bc364e1da2c72451a8d763d9aab5b640ed8ccbcde42c1ed53698d502de7395e5c6aebbe152db347c992b1ab352f3e5e729e0c5b22168b3426ab68 SHA512 3b932af859a6e34538949ce7bb7c17bbf2d8e7ee7cc0c144180c5f36a3dad28b9b26b9ebf7ae08f6e586d24e066da17f3edd6fee096577151b386f327faeb70b
-EBUILD kparts-5.57.0.ebuild 711 BLAKE2B 1027afe435d1185b317f7708c3ee1d5ce45e69de759f3f98769a88c75e7b32f41a9411e456836875d83d6b6ed152fdb15c6e34751f881838d51228e4c4dabb95 SHA512 027bd5d5d2fa6a0e7ac0e7c16aa21e873283968bdf6be3d75bb92073819416b7ae3eb7d82b197249c338497ea152c574e3af0f0d9557d00d2445eb66122ce1fb
+EBUILD kparts-5.57.0.ebuild 710 BLAKE2B a267f1f5f0dd907e6a2ad4b3d482f67b848274f6e9107d0a920fc08e51670921e6817c66febe51aa9c85edc51d3f7d116b6966080458a9c73400a72e8f66cca6 SHA512 58e2e7b8f4468c92c5ae530c435cc10b05a4e39d13c834902eacabeac3067b4f680a3acbbec117d05fad2c4c22ae90d64514f8d3b55ce7a5a17961d610a1091e
 EBUILD kparts-5.58.0.ebuild 713 BLAKE2B 425991e401e13ee82e71e696f25260db30c6fa1e1cdf6a4ccb79c7ada9133f4c77a8ae26448676467652892f65d21769d23ec7a725d27fd800eee9f125721c21 SHA512 be38b38b135e60c99ea360dd3650235ea0f3b340fd3f67d4f13e0d0b88bf0bd7f483eaf2296dd72f5ce549ba7fa54effc08bf159e5c9bf3cd91b4e8652384a47
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kparts/kparts-5.57.0.ebuild b/kde-frameworks/kparts/kparts-5.57.0.ebuild
index f30ea0f29e04..cdc674dcccfe 100644
--- a/kde-frameworks/kparts/kparts-5.57.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing elaborate user-interface components"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index fecb067db7e3..d5acabbde639 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,5 @@
 DIST kpeople-5.57.0.tar.xz 60688 BLAKE2B cd6241098f8d531526faa4c897c254b6d6b33e29547a832048230026d64bfc995c1bf07f39d37806d55a8c38a46f7e93981ea5b0e59421348e955973f3f2c5f0 SHA512 39f959dd4ee33d37079caedcefc924f2e39faea48451659b65bd8c4a357b8456af883589e9d51c59ebadf12705242018c94e9454f60289ca0778f1f3555ffd7c
 DIST kpeople-5.58.0.tar.xz 60424 BLAKE2B ebf40db5297826a54b489a7181072933b8e7e80d43e3509a8748e66e32feae41f6e140daeed295970811225f02307e1d0d2a79eefef224a398c3b767f225469e SHA512 b10a232852c190ab21fb85a4b3eb894a46c83f01fba1fbf6235484a20f8dd4d9d93ba19c758e6b11f179993460b9aa86ad1a36f91899ae4c6ccaafe5d0392459
-EBUILD kpeople-5.57.0.ebuild 787 BLAKE2B 2695d328698275414a39e3879486ab503548b70b8b8f291aa7f7a9a36308e889f2464d88eb605f00c44108f5eb171de7617a06f532d7dc577300619f01b5e149 SHA512 2a7295f75d7ff80afc026c86f1c0170d55c654c19b291f6bb8bf8476f3969f3b2c0019cb4f816a3d87a8fa6724f13594a727ef868a07999aaa99eb57b94a364c
+EBUILD kpeople-5.57.0.ebuild 786 BLAKE2B b114efcf6ef708918482c944adddffd28593f09f19edcd8cd0db49a823ad2b4054dcb1c03a65c5c01fd672d8d652340ef9eb86613c07d6b752ed42036afdc439 SHA512 9be56a5bbe903d54eb65fe713eb856973f20e4d66d7594eaee8f28d03aa9ede896a761c848cf14ed18ad402650151891cd0a3a5df657f41613f4324cb5ad3a72
 EBUILD kpeople-5.58.0.ebuild 789 BLAKE2B 3fc9ff64e76612279ce32086aac22ab08ecceb233a575e2532ff378e61d1639eb80fc0291ff7b9d05510f0b8caae68792c3da73d033f16b2a177ece4d85e4636 SHA512 0a0143b3d8893ec26806d32265415f5e558ab80d0e1cd36f0597ba8ae6fc542e276d77ad12c08c56f23f8c731a2c690ad2231b3328b6571267e38ea700873948
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpeople/kpeople-5.57.0.ebuild b/kde-frameworks/kpeople/kpeople-5.57.0.ebuild
index 5638f31753ec..08ab1f5ee8ab 100644
--- a/kde-frameworks/kpeople/kpeople-5.57.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.57.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE contact person abstraction library"
 HOMEPAGE="https://cgit.kde.org/kpeople.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 9d5aaedeb6fe..c37d839593a5 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,5 @@
 DIST kplotting-5.57.0.tar.xz 29764 BLAKE2B 75cd9eb694ee00ce80893e2f833bf30c8426ea7de50e227d25a89bc742d47b26543cb1cfa3168d0decac5d2e2513a5aa8b832ceb534e055103636c2b6a25c208 SHA512 36f8398890d39f920eb1d3fa09452b19a1c605b77c0babe88b33639efbfc5b16432a8f1369f718344123af37ad8e102d7e48752af50a102559182bdad0931298
 DIST kplotting-5.58.0.tar.xz 29852 BLAKE2B 2b2817fa8bd65ecdd4842ed83fb50427f7a389bbee75bbba9c37add070722fd62b5e65e833fc939d17ba651062d6a212f6dc334c0fbf2499dbb7354f21f43a2d SHA512 5c447f24d7dae28b75da8c2102d03f47757094dc41c79d21c474e0a19fb0c3ff96eda308b761bf8ca2f9a242cc611aaf496c3b67ee1ee587d64447413717f215
-EBUILD kplotting-5.57.0.ebuild 352 BLAKE2B dbdbcea2bb94a45207fc3ea34f6a651f17160f1529585e2bce42dd8983782326e566511aa93f5af90e38fe5481b52e8da98017a633c270fcd5acfe42b95fcf00 SHA512 88fcad6cefe18622b6ef835255d8178927e8ee22e34109e558be7a9a4ab93593d7c9fc3e1ced8fee8ebf500043ad22ff5f3bda8267406bf0e405f7e365a440f6
+EBUILD kplotting-5.57.0.ebuild 351 BLAKE2B 8311be78d1602f2447adbf9a3d502af85f0cb70d23417560495d246aab7bc582d70401316c6812090ad31e63854222bbaaeea81058d9efe52700a62869dbb316 SHA512 1c8d44f36491dc10ffd11ee6c232bfd9deb33e3cdfa65953e6ec7219b4869bb243385383910e3c4dd0600f61eaaa57aa585e78736a8c2a67d93676d91c6d4e70
 EBUILD kplotting-5.58.0.ebuild 354 BLAKE2B 37ce61565cdd8f9afc847d333e92311fca5f8111befe4597cd04ec3f7676aa1b29eab0c65fa83d419f7cd541cbb50166daad4cdbb7e69497e3775afe27f1b5e2 SHA512 9d5fd373576b22b2603a10f6a2fbff4f475754948cd2a5c2c5b8ee16110b4e678b28022b447b35d2857855a6cdb5cb31b778f98522b35ea4cda7c6cd531348e6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kplotting/kplotting-5.57.0.ebuild b/kde-frameworks/kplotting/kplotting-5.57.0.ebuild
index 739020b28f91..57c5ebba8648 100644
--- a/kde-frameworks/kplotting/kplotting-5.57.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing easy data-plotting functions"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index fee2dae9fae9..27e7f6a243b2 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,5 @@
 DIST kpty-5.57.0.tar.xz 58208 BLAKE2B d23034abcd6f3a35f69ab4aa256ee243f7eec1249b4626e61ab86fa58f9cf8e606c836ae18ab6ecbb3088969bcd5e31100048772bb9e33b9ba51a928dd27c773 SHA512 56f92155b824a52da6e90a214350287bc141dd5838ed658fb93ead2ed3fb589fc33deb25b080c8b3bd3f5ca8b767bd82248d0f2f729bb8bb0606a6a167353b2b
 DIST kpty-5.58.0.tar.xz 58236 BLAKE2B d3e576cbb0da1acdef3ef770c6bd8886fc0abae4194972b9ab93fe2a837de940b93fd366cc342cff5806c52de2277253f003c81d47784a9fbf80a47823c6f137 SHA512 426d3941dbe9ea5ea23c6a8601976460ca7c847363edf2650e2c921b0916ca08bdf882aa328e7a5d7d89adf6d25f1620c74df7a09139e4b595d772cb73daf084
-EBUILD kpty-5.57.0.ebuild 505 BLAKE2B e68e48674f8b65f1195363944574669ed4dab4517322f87dcc512f5129199405bf86796bea1cbd5a802ab2bb3cd38a40bab7a8b80e870e1ecd03a1158122d063 SHA512 bbe48d5fe98c5e2a5ba9a5292952388529ad4dbff858bd81fcf0b74302eff3b6ff0038db75410611b29e16ba557f8f153cf4bf7141d0f0701dc3b0f5c4bc8934
+EBUILD kpty-5.57.0.ebuild 504 BLAKE2B 5cd5cc18d386b9466af4597d3fb95828f360eee25080e791937cb9fb9e7f7375e2f3636db55342dc38ee7215af3563e4ce8f1a77b9be15a0894ddf905f05e0ea SHA512 d8c158d31bd8a0598ecf8661563a1df787c623dd5a24b784406eb87b33290d1e29d58a87cd839f861b32b181d16fcaf8e5011b6c20a771e1e0caf7a3e9d17448
 EBUILD kpty-5.58.0.ebuild 507 BLAKE2B ca2769d3b0009ad36d597f8341fcbb4e33bd3fc0a2db6c742133d2758dd356db835d02e40ea7309acacd6b04f2ced79499b9500da2987372bddbc8a6a6613295 SHA512 e8faff5bd2bab185d34fb962668ea0204e65886f08f877bf0b1815dd544ecb554b5ae79a1ab1589446222e6b3c2d3f27ea453c77febd20cff7b636a07f225842
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpty/kpty-5.57.0.ebuild b/kde-frameworks/kpty/kpty-5.57.0.ebuild
index 90bd21e7c0d1..a2d47d922e6b 100644
--- a/kde-frameworks/kpty/kpty-5.57.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for pseudo terminal devices and running child processes"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index c9a8f5bb830e..c300d730a63f 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,5 @@
 DIST kross-5.57.0.tar.xz 127652 BLAKE2B 864811a01004deb93512457ddcc59787ba504ef2aeb5f4026dbeb06ffec19fc67a3be7bc9527b7e3598b3c8d21ca3438595ef6f938b40d77f71c89668b64bee3 SHA512 783f75e4d5dcaabab0c756d7aa7921d9ef981be85d2ff9b3dd392d25b40cd8631a2f9163d8189f099ff428688fc7f4675ded10e0a89293fbca531db595594282
 DIST kross-5.58.0.tar.xz 127048 BLAKE2B 67ac9e60087fdf931a999bdbc2e1ae43c95cac0ab8ef3e0632ebdf23d24213d02a6a0cf4cdbeae7137c2af2975ccb89cbb60c5ce1fdce1a9adabeb6aba8c9279 SHA512 cdcdf4c649ee46ae3540af83717a161a46f40e5304780124b68f7b4c2e45c8c3b75ea067b13a562defdc88ffc266006871d1413b9c59ff9255a8cd74affb9f14
-EBUILD kross-5.57.0.ebuild 734 BLAKE2B e18cac4e1a68f535b832ea6a10cc776c9d81566aff54356fabf3bd46210d3ffc30e3d1c7bde4f0bd980ea766934fd46ad5959e9e7bf547e40ff19c4413af6fd5 SHA512 f2dfb1d29f84bbf13af053cd75cfe7a8b8056808bde5068ea987501e81030a217b4b0d5b0fee0f105762a795b8f9bc7ff5a5b22d76e9131986829a4f120a10f6
+EBUILD kross-5.57.0.ebuild 733 BLAKE2B 0856b10040bb8bf26e5613e7072a5002f645cd382e837fc77ffdb501ddd659094f3343a1249f3d35d64ed02a6a9efde821c1e59e539078fbeeeab98923dcde2c SHA512 deacf7bde0991061d792271bd12d240c3a92021ddfab18ee6aa8ea33a9f96f84b97e85d730fdd94f581cf14d168bd7f8af5ad7e5e299b5283eb6ecb46f9a790b
 EBUILD kross-5.58.0.ebuild 736 BLAKE2B 231917e0c0e77a959019fc88b0d846b6a250d5e5baeff2667bd11f1131d0e8e131f135f86957d767b2f62972fc77e3695d70795ecaae5f1bfcb3821a65b8a99d SHA512 06af51fa3f89e3b62b3890a61d6733dbc461c8ae4aa2fd7ad52107deeea7b02ea7bf0585a22951fd50e0fac07cfafba9bd7cf4047cf4f5d73783e25c34e09b3a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kross/kross-5.57.0.ebuild b/kde-frameworks/kross/kross-5.57.0.ebuild
index 6be84f16a2b3..920479160a35 100644
--- a/kde-frameworks/kross/kross-5.57.0.ebuild
+++ b/kde-frameworks/kross/kross-5.57.0.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Framework for embedding scripting into applications"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 6dd7f23ae7d2..0edf9a95e3ea 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,5 @@
 DIST krunner-5.57.0.tar.xz 62060 BLAKE2B 9c5a429f811705f25b5cc9655c051125cef41d5c016fddb7279ce6f0ba7718ed30c48f11cb4ed8e8632f034062726f533fe50ee7d61d540fd3be1037a6469247 SHA512 365009e4aff8b102b252990b76ae993445ee8a7f7ff71151df3624c11205296f19e6d8b7c94136834358645368fbe93b9f9dfe27c1deb6d3c0937dbbe256b08f
 DIST krunner-5.58.0.tar.xz 61920 BLAKE2B 3084ee5664a0958f53bbd0380dd281019e9b1c2f7333a852d96c25e7de49cc9c745d9e59f04b145d37ef185fe6c8c600578e7195b3c2407ef2fed7693c451277 SHA512 43e6d0a06a9cc639fde105013fb82e9264a1c0444b2a88d761f92b23f38317d532be113fce5f4896e0cdf6b30f9b4db164e47335c944f0d4a8112c079230fcaf
-EBUILD krunner-5.57.0.ebuild 778 BLAKE2B 432047e90e219a3c54a5d85b1bb46f2e0cc75c707127a69c1a1c1f69ee2e369a51537228f4c1b8ec5cc689b698882bd6558959550deba68715ecbbad913aca77 SHA512 0ab4212b6ac44729ccf8cf16a6c6ce617c287e74c6f84059350f944574d6edd38507ed70cc6842dd88fa2efeda53ede75191a47300d8529d59ce30eeb8367f13
+EBUILD krunner-5.57.0.ebuild 777 BLAKE2B dfe7e719725a5fb22667520379ffd826e67d8c78b1184c33eb217ca28c4129305f121ac6819368359491ee658aa46eb8a9a550cb0589b9ba40523d787a5b9182 SHA512 7b0ae1f2b81b09131fec83808300e4c18139168a849760197d97ef3e10f8302d15a62838e010ecf9d8d39ea282d4abd6ef535bd76e0c993afe96ce9dcf16339b
 EBUILD krunner-5.58.0.ebuild 780 BLAKE2B ece5af3cc9fd7441571248a00355aa41a827d420ce30ac5fcbf631bc025901ae4ec97353fbe9e0bca45c68e7175e2e83c12a210485af89ff7cebe69d0c9d0162 SHA512 27f3cc21e4b7cab007041718182ce97d8c290219d10749797b303a3ba1bc3144eeb02d5f8d250876718c906e90b01673b0edba90efd9f54d99d71d6809c3419d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/krunner/krunner-5.57.0.ebuild b/kde-frameworks/krunner/krunner-5.57.0.ebuild
index 2303cc5c53c4..a9045e535f1f 100644
--- a/kde-frameworks/krunner/krunner-5.57.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for providing different actions given a string query"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 9ec1d0d9044a..2f0c68e228dd 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,5 @@
 DIST kservice-5.57.0.tar.xz 251212 BLAKE2B 26a2da0bb3aaf0a5bcca9a98812cd743939a7b16fed58897798c8b4ed2c67621cdd5acf28635e4f7e63822da4d3441b1a941c74d491c5c482a594f737c981399 SHA512 8035500c9dc116d89f0c53968a23aa571fd52ad57666ff16c79b279748117409dcae1d28e8f0765e0e7094f0657e35ebd0d601c8fbc4bf2fae37bd7fcefa756e
 DIST kservice-5.58.0.tar.xz 251572 BLAKE2B b967671a9d1f7986566411ba65d1f2c1bc176fd56b351eef2098bce2904d8905a0e30cb38324bd076931d0f9c0163bb9b64839cc8f36c819f7ea1ef6a2b60b37 SHA512 4170b2dbe4021947862ec946e1282cada74ba12f5bfa1251087363e7693d334cd0775fb7b76900f661c65c525ce5480d69d551203c58c938e73e2622942a494e
-EBUILD kservice-5.57.0.ebuild 950 BLAKE2B 1c6af4477de972d5442a85b958183994cde518fb5bc8acd9e100d66b204e2c7f4880d79ffca5ae0cda9bb831dfaf8aa00b6415aff039e0503a6df4a73e5c2f65 SHA512 aa81d34bbb6393d889d7b7867699daf5cd45590393562060cf1ca40e851b4f83ca1420e66be917c78b343ca220c22d6f3d635f1517c1211bc16367ad6bb2049a
+EBUILD kservice-5.57.0.ebuild 949 BLAKE2B 9436a7a60faebdfcf80a54bc98fc336fc1f0e1e75f5853c83a774e5ac0585e10d4bd2d4b4102620722f0ff35cfb59c97976646736561d8c8f5da451babd281f0 SHA512 d27a2dad07339179ad2b950ce2e61311111079319ddb3239bbc5e0f7b708182f9e196b3c31e5b392ec39d81cc458279727aa858cfc11c26a906cb5cd0fea8fa3
 EBUILD kservice-5.58.0.ebuild 952 BLAKE2B 552a3f704c2075533b13d5c9eb07fa0e96da2ebe576141672b705ea5fc2744028b98f899adc2f6737e597a5ce7694c47b74de6b52f58cc5239071606fe34d2ef SHA512 c9b914668cf5d2f3f00120622fce69821f2eef083131f60a743e98d35edf0b2482441bd87b10c53afded2e503e68866aa4af1288fe0e0f88da59e0ceddac8ad9
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kservice/kservice-5.57.0.ebuild b/kde-frameworks/kservice/kservice-5.57.0.ebuild
index 34db0e5f51a0..dd9d0bf35f09 100644
--- a/kde-frameworks/kservice/kservice-5.57.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Advanced plugin and service introspection"
 LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+man"
 
 BDEPEND="
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 4f43efe3279c..ef9c6edcca13 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,6 +1,6 @@
 AUX ktexteditor-5.57.0-shortcuts.patch 2231 BLAKE2B 2f63c8f09954fc36bc5bc333cdce2a6b672dada6f1287f2d137bfe2b71ca1c385e9b230c860dc3e42c2827ace3ab636088060a934ebc6a98ac9c06ef539b9a8a SHA512 f1dafd427d9c7c832943904587c6fb37612fd46808500137d814b6d6b960470271f9c61d6a2eb75fcd7909ae7691d7d6d3c49de8b55508e027a2575c07f4255f
 DIST ktexteditor-5.57.0.tar.xz 2294748 BLAKE2B f4c8ef5ab46e6505d3760ba4d40721579820244915c609b3b5148f7718d8649884c87ef7d6809e309dd75470eca70b98c1b93742d1ed2798a4b3150b33f8b555 SHA512 e5b1462eed712273e1b5bf6107f42da7bea79d06d160106bc1fb68825f062b898a15a231f864819b74103eeb8772c09adf591945cef8bd663389290daf785a82
 DIST ktexteditor-5.58.0.tar.xz 2297212 BLAKE2B ef074dc706344df7f35ae8b247f2345a85a50fe04fc0f6683cb1a2eb38decfcc115aac93fe745b5360f0041c3f6ef9d283e413e5ef421a0eb3bf76985f55a0d5 SHA512 fb6b11e257089b7d13d39e05dcddec5797e462d537a263adae680534b22f9f86bf17e844e6d769c3c4f801916e7a38c59cc996785a07c0c3996093eff2aa14d7
-EBUILD ktexteditor-5.57.0-r1.ebuild 1451 BLAKE2B e11245163e18b12be6a6feb5a7dfa3a4a737a6a3c2b9baf6f88f5c166321fe013aee94cc84e260f5ea513d627e92f452e194a279749619387249d6ae0e997d67 SHA512 c67356b7f920f10d88cb23fd22d35b62d7c36809a00acb70dd7aa9262e6947693f1ca9c2ed2bd4c8f1530beac65778357a5427f1f1827774c438e218e16cad44
+EBUILD ktexteditor-5.57.0-r1.ebuild 1450 BLAKE2B 6b7acd84271f000d53344a400d3672a8510a7c3f93d86aab68199dc33bfa52d43a020388fe91b13a2307fbaf779ef4d180650e6cf9dbefc20b517cfaa09deb8e SHA512 47655d9e47fab847f12ceb44ae99df93a5155047b31fd594bfb10898cdc65dddd2f91cbc12877be59be0f14eef0fa6c23603180b2c6daf0d238e73c21c3836ae
 EBUILD ktexteditor-5.58.0.ebuild 1405 BLAKE2B 64dc1e7b0b371b6d43d8fa1c7b457ed3423f00a89906cc6c2c50e64df058ab6dbada60bb2378e767b76fb4e3ad7e8422ac8244885cb0dfa1dae2fe27e32364d6 SHA512 fb63fc8877d3d40ce989daa3e3e84d4b4f38be2b794dccc5d128e3a427b2b2e174c723f8889f2746acbd644e0880377fafe38a6600d7803345b2d0450673af06
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild
index 620b607f41da..7f626414d3ad 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing a full text editor component"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="editorconfig git"
 
 BDEPEND="
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index d0a693846cc0..9d73dcca70bc 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST ktextwidgets-5.57.0.tar.xz 308408 BLAKE2B 21f21f31683c68d82c9ba566dba098b51e20913ee6dbaf8811a6d585384e1e7057394107f1e7753c5f2e07b027aeded81380e4030e434e341cb09a3f3485e9b2 SHA512 da46f101f6ce5e71442747c90fb4b457987bb6f29441d45df9607df981aaff56c7ea48c26a47e70c09c1a790f55a8401de52f009400f9ad2214e5eda45b38cc6
 DIST ktextwidgets-5.58.0.tar.xz 307596 BLAKE2B 0bf4da3605d9f3415abc581ec5495ee87a57a061c6f799a4a39072efc4ffb10354526d22bf7e8be53724817a634b5a49abfd0429993322d7d0d2df195bc18266 SHA512 d3c33fb32fcf7611e06fcfa25c3450ed10076e96c19a4aaa327b0fc005003ee8cd910c9b0519eaefd3ef730da95d40effafe8b008bb9d767b55344ec4805a3cc
-EBUILD ktextwidgets-5.57.0.ebuild 895 BLAKE2B 57e1025ed9f3409d40c2eec34a3926dcf1aa1c8894a2ce5ca19e630bc424e8341d4abcfec87aa97868b7ff2355cde00dbebe777bedb5dc3de7d7ad9e8bac7822 SHA512 61e6c15fac53c3f20117714e5e6a380f018805a03811ba1a96257b26a73cd6b245ca6a27be8047d02c1942afc1249cc4fe25e8e32548dc1dea21dd705c38086c
+EBUILD ktextwidgets-5.57.0.ebuild 894 BLAKE2B 1eccaa190bbdbbeee2abd042790a06df20bbe7bb45e7f0079cbb53398d8c1c03c9c572eaf1d311c6ac4756220b42c6af46c2943c49935d6628704e04908957e2 SHA512 cefe934f05355ceecd5c0bb973c887246365f545a0fcdd23a0e470b7d8cf1b8fdb40064fd6ffbfdb4d0471a8e15e60b3ed3823fbde73fa32a6a3f835b7520601
 EBUILD ktextwidgets-5.58.0.ebuild 897 BLAKE2B 54613a2b8ad890531578afe84175d7ecf6e920a561bd3f909e1a05d59cfc2f1f5518a0076d2f9b884aa75dcd28c84c1b9901ca800191e7358e81c42f7e6314eb SHA512 7f73e30581fec26430f24f606f40d55d7345b93c032b6c44bd9ef331a4405e64cc1bfbf0ed1b5dd28112d33801c1afeb481c5c27d7e4c41e877845da1d8f7a7f
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.57.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.57.0.ebuild
index a37be6b08b96..d00a16042452 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.57.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index e784ffac9374..e440a47a9667 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,5 +1,5 @@
 DIST kunitconversion-5.57.0.tar.xz 772816 BLAKE2B be56cdab5772a592ffa5c36118dc0f56adf5bc50e592814cea42329cd2ca8324eee89c6b2dcd82daab988d159f03468e77fb2937f17a036a525f1f16b440bec2 SHA512 1ca672c4bd6143c5c64e63d0d2099bbdea9b0ffbc43513fe0873c93bea1af3db1fdeca1e3285035d948d6cab8c77b0c19dc4867d833f3d2eedf1a1e4e2bafd93
 DIST kunitconversion-5.58.0.tar.xz 775676 BLAKE2B 974f1941a1ca11c739d0b2156cbea402fc45eb00e6e1aff99158b7ae91689fe54c877a885dae2930f919d2d2a7d64939393f530d825350d82f5781ae53c35839 SHA512 978f8151e89f1bfa00476fdc6b5f19d2ffaf5601f363c89bcf669a68c8b857ef1e290bc9f4abae8199aa68e691dfa96ebc081f75122417e107f120f674ca5042
-EBUILD kunitconversion-5.57.0.ebuild 438 BLAKE2B 5bc4d8edd53e18f5065b60bee56821fbc830a1abbcb96b8093c3f69a9ab59ea7e930761ed5416bfdf8061d904c95e9cd81bcf3d234988c3072c8275b7cc25e99 SHA512 f19df0a6270ca823d8d77cf3aaa00413bd9ab5ee93eae18ceddf11e12c391bcd1d2fe60c3ee400348742bf7a0fe8aca0ff371598ec3d874f9331b2c18b095fe3
+EBUILD kunitconversion-5.57.0.ebuild 437 BLAKE2B 048c85370e0760f883e99bbad6d14c5d68cfc2511b21de3ed661f8bd52c5363148f25c54487c15d9ac0b84358de2d8fb536f2bc63ba3ea19bca70ad7189c9160 SHA512 675525a43d7506a252f37c718e305d352a51ea6f97c333ff6c283349caf9b65c42596b1b1884407eec276e343912aad8d8bb385974df06161b955be5e7284a51
 EBUILD kunitconversion-5.58.0.ebuild 440 BLAKE2B 5d5808075ffe2cd79674dc6cd5b7e7347da9f5a3733489616a32ccf03a6d71b74869ed54c7d6fd9e82318ab4ff9cb555e8169aff075262947417977799263967 SHA512 5c83015e9f714bae9d46b8c6e37455b66af2264263fce04fd25a021e470c3134a362e9e42ab0962a58b23558594c40dbcafabe14bb56ed121580c659b85462f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.57.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.57.0.ebuild
index d5d2519dc974..1d78e16d8a35 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.57.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for converting units"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 0862438c9a6d..6c9c8bab9773 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-5.57.0.tar.xz 308036 BLAKE2B d2da2e0bf99b455946973dd7ec00008affdf31abd03d5eae0509383c2309ce3d5d86ec65d8a9757d15ea04269525296ce9ffc505ba3f669a012e33463465fac3 SHA512 7a3809d6563dbd46c1a8de6f9fe7f1665ede884430ac83782cfed4e02f4fc9ecd275293f8c09463a42054d071a545308c8353ddb447e8b0acab5a9c6e47966f2
 DIST kwallet-5.58.0.tar.xz 307348 BLAKE2B 3b16f63d9f5d38d26f8a45e87860f639fea0aeb211a4b312b6b7ceb7835c605f189590d39f295314149cad3fa013ec23d3478f31f77d79d9e1ee072ff0549f31 SHA512 7145510aa75c179a7c283f26c6d479d753a435a14e423881793ef061b3dc6144c4126365719118b3fdd5d36560a706b36cb003d829d3c469f6f0844351ddc4f4
-EBUILD kwallet-5.57.0.ebuild 1581 BLAKE2B b2b1133b8244518276d374c3525bbf333b824554ac778db81f1fce9ee1316a028fa4d27c428003cdc14979ac8a72aa3dd9dd9a1d5e456635561ebf8f4b0ee937 SHA512 8e94d71884a244fd6ff825cd622ada0a8994a6de1544e2e3880d1b7672ef71497d807bc581fbd83b243c75de1c768e8ae0cc867e07e45009823bd83e5d268e9a
+EBUILD kwallet-5.57.0.ebuild 1580 BLAKE2B 492d58b45fa94058200db9d917a41e7f16c1add6c51ee290411885bebd5d137abb7d907cea580a02e9d8d2e575d0091424be303956ea3e607a90500737e974cf SHA512 65b3c86c0661c4f7be0e70cac97aa3069cc37c991984a53428c8034c3ec985fb067d3c5e53276221ff59e09cf61970ce56b8dfd28969a3ae3b509818f24b1301
 EBUILD kwallet-5.58.0.ebuild 1583 BLAKE2B 034be02cb752e18dee2fada2ed10d00745ae3de1c23ef4e980bde6130f91c6782fd02bf11b88bf3643841040c77e5aaf7e5928a4bacb892b252c44ea62ee0f15 SHA512 68a4c484d72566a32a39dbea797d70e249548fe3a169cdf36511758747ff7f2f2a33242b1ab366c2b5fa5dea9fd6053735dbede46c104c5b05bcaf4d620bc9a0
 MISC metadata.xml 433 BLAKE2B f33e8e33f6e8ddc49a85ec7494416546ddaf4db590b02cb3e4ededc7322cd088b7372291777dd836152df31f0ad890b61638b721fb2fa025d007453850d9e2e3 SHA512 c5285c0beb12f4f5c81f89e856c63737a119f9758e4302e3789603fe8daa3c675674698105e38194eb383097c7f57e8ece1e7b845fff1822cd5ff8b0688ff1c4
diff --git a/kde-frameworks/kwallet/kwallet-5.57.0.ebuild b/kde-frameworks/kwallet/kwallet-5.57.0.ebuild
index bd0350553ed3..1e9fd33fbd5a 100644
--- a/kde-frameworks/kwallet/kwallet-5.57.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing desktop-wide storage for passwords"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="gpg +man"
 
 BDEPEND="
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 27ac43ef8fa7..3f56b76fa475 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-5.57.0.tar.xz 340180 BLAKE2B d1bdee02a1a77c15efb64f26f92c4b239e284677b092c1092102c51b0368d2be816fb3e246626a307cb62d351b75bddaad3d476cdf9136bd93c31dfea7950b9e SHA512 95caf19c0add3f853de7c330b070adb8c9012b4abd84bd235852cc9c3b8795981e5d113f893e4022bb3d3844391f27c8237fb66981bd80a465ec0388331e4fec
 DIST kwayland-5.58.0.tar.xz 341104 BLAKE2B 30bec539e6ad72f00f8373018e446462e407620f549453441e3e8ed87eafd8399a1a3799c26e1ddacd7bb7c13010a26b040e8fc0f5096ff2b8f1ab4f10f334c8 SHA512 5512621e69f354efccc52af1f571c6660ff72581ad00bc4766c4cc42d731baf1358107325af6a3b5685372c84f5c9f4b583d1bcf44ef81dbc252e15d6cede53a
-EBUILD kwayland-5.57.0.ebuild 574 BLAKE2B 8c41e02c0475f35cc687bd6e0b73a7cbef87bc5a55592b9c21be8c9c265219b455fef87876750c1ac6ac613650fca83ccc5d0ade48cb44c3232d4607685e1464 SHA512 22018054d7ee3bbe25d37d31ac7edcc1950e8019e36fd2995eba1942fa13a667df7129d4e32d3d3b528ba744b8947e42986c2a7e236d319bb4975ed0878982f0
+EBUILD kwayland-5.57.0.ebuild 573 BLAKE2B 2dddc6a518d42e02d3981bc5dcf09a8395daa9a20329dccd880ace1a4105e09ccccc2ffb36c4ce887f754985b2b27fda5d4beba3d4992ca837bd8eb27c89a198 SHA512 08e3f2fabc93184e327a3b8245f88fbb7c28c37ab77388dcf24fcaff950a0cf8d3ec97dab8d9375f7402c078b3ea554cc995025b6596d49956ff47088494479c
 EBUILD kwayland-5.58.0.ebuild 576 BLAKE2B a21af5a35987761d5ad98e0a22b00b8cc5c47ea0696364be0962878be01ccce7a4d69303d2ac9afe83891155b79a2fec61a1896c8619728f6641d0cc03d36981 SHA512 50e29810cf5858f3b018a070d1c3a0bd4fd9a209d56f607f4c9838054000f0c52e17338cbc19799e85beccb7979412013d75a01d5b0aed3ecdf08a2858e66eca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.57.0.ebuild b/kde-frameworks/kwayland/kwayland-5.57.0.ebuild
index f21e8ad1578b..0b0cab6b2050 100644
--- a/kde-frameworks/kwayland/kwayland-5.57.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.57.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
 HOMEPAGE="https://cgit.kde.org/kwayland.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 76730573f3af..bb1244f80086 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kwidgetsaddons-5.57.0.tar.xz 2188204 BLAKE2B f429b6a13a656cb4b847609dcf2f190d2069355a09515593072b71cb628346eab2803daff6571a2906223c0d818cf18f606b10037cdd26d0f097d1936b55dcff SHA512 d6d3196f6d06f46b5f1707ba7baab0c9171202282a36d73fc47e0505b1db78ee743f181e6486390813620a33d07febab9af7a74c48945dd4148a8788d8a18c40
 DIST kwidgetsaddons-5.58.0.tar.xz 2192020 BLAKE2B a8015b3d24946957663fc8ff38a3e536d5026825aa2efca624b9756e3c97750c122e62bc9ae4d3e9727f6e395677d05fb1c8bfe0537f6fc1e06e2a9e98b1c678 SHA512 987512048c1ec90bed7252783fc82165a4e30dedfd2d2e3b3407febb624aef30a3969b5a0e78586b1ec0c811a1671620a2dc0f311f48946143c7c2d74322dcd1
-EBUILD kwidgetsaddons-5.57.0.ebuild 532 BLAKE2B d881e8a5e594df0e144dcb0234cc1d69f83b0fcf85cac7ac85fbcf1a6239a77b36e24a468f432e34b9419aac98b2832451cbfea80d207d41b8844c511d78b06b SHA512 ff0e32731ec7961c1d96471b8004f74b512a1b51012988d65e7cddc0d53c7d95b0d3b8e0d1a6bb0045d8f17cc9b95fbffe94361859c9f9aaf611355876852ec3
+EBUILD kwidgetsaddons-5.57.0.ebuild 531 BLAKE2B 92c091110556db80a9132952f64a49fce2433d9f79c3a33ea134274c2552ec9900ae93dccc560d334184a3e62a3c88dd248c39a196e66e24b2730bfff5e010b6 SHA512 cbcd0f287e3aaf18312b4a07c028841453eabea5ca9e822bfb4da08b63d5a5a1492490cc44227e5f97552e741c7ad95c70ff021e8ea5ccaf84e8503a69a1c1a6
 EBUILD kwidgetsaddons-5.58.0.ebuild 534 BLAKE2B e2ff95d423efe4753b68a9d09e4dfe30d087e4ef04b5eccaa1c301fc648bbd494d17deff26a21d4ccf6f990616e4a99a0240e588d60a992933658f3ec8e01e34 SHA512 babccea1b264a1ee23d2389e9bd9e7a210479fd1255352abb6ced1e532d8129385321901b75bf694f144f9ac6b2387aab1648ca6842cf305ce92d4099893474e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.57.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.57.0.ebuild
index 6f1b218a318d..e1a7801dc005 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.57.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="An assortment of high-level widgets for common tasks"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index dd74e2dcd094..fbefc3470e10 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,5 @@
 DIST kwindowsystem-5.57.0.tar.xz 169992 BLAKE2B 72465a79881977fe1d5c8aea4fb656ac97c07643bcdd957ab50a4106d2cfa6effe6174eea7e91ab3463285760c1e81368598ebf6b0326294b88ab5065e2e94ff SHA512 5e529aaec021d4a132ced38f997a6d4a6b978346e7c678db90fc3aeb665ca740b145173913bd34af48343efcac128bfcd85d0c1bbd903a263fe11fa21f31d1a9
 DIST kwindowsystem-5.58.0.tar.xz 170612 BLAKE2B 1496b4671730054649dde7add5f0c3b3c4835b52047ed44c2a449da6d477beb840a8fcd5033d540fa272d62cac322c62214196a367112e27f071e427d2a8a935 SHA512 7d54ee2629940d6dd80fefb673e7e0955cad5b76b17fa74f300bab8b13d97dc755b0562efa013ba05bf070339bb50f3a85b017797dd207d4c34bcb3315b656fd
-EBUILD kwindowsystem-5.57.0.ebuild 773 BLAKE2B 210de1f76b5bc97decb3f4e797da60e55cdf561d230e6bcccf54246f29badfe1af5fa959b0faaf2f69f4731963e246ab4716d6aa5ba6032eae0da7d80f573757 SHA512 c5ed2673be8f7c5d3c77abb85d0033b28e1bd5c7f22d66d1e65b870a8cc520b4e0d09d23fdc4f92848e65c3231f50b2a547f45a74984b25a0b6a7d4de9229e35
+EBUILD kwindowsystem-5.57.0.ebuild 772 BLAKE2B 66cf3f66d54726370cc704947e956ad6dfcc9749619f4162f9fa232770714f9bacda85e8594126a7a5a99649f3df5d3fc4be06c5e7c32ccf0218d9072bab70c4 SHA512 f125809897b286c29185298b4028c6059def0ca5e61622e8646c63a12cce9892c96da76caaaf048517430af08535bef0eacc32cf34f754c2d805b9a0691bf94b
 EBUILD kwindowsystem-5.58.0.ebuild 775 BLAKE2B d98570f26f34868f82ddfdf0558911a70e5d056afe56c50f228571442b440a538d335f1ff5a3a1486eddbf40122a2766e7d98ef49f97b0a6f1658215809bb045 SHA512 7be8c89bb8c74533587b8b3f14f7ef0e00166165058e657d1f0b889a500f6f985779a6def2a43a415be0e4e15b8837358fd6e5f4bcef2733e60b4704506898f4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.57.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.57.0.ebuild
index a006f655ef7c..e114ab974055 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.57.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing access to properties and features of the window manager"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls X"
 
 BDEPEND="
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 2a978c613dfd..351a3d7e5e0e 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlgui-5.57.0.tar.xz 870632 BLAKE2B 27e16e66f3bb1eb82863b470a6635aef79f6e131af3f3dd74f06346dd5e5c8a471da9c081fa4b56428a37691728a26bffd129d17ad11df16d931078addb81ac3 SHA512 30ab6e8734a03d387880e7e9b4f33f4dda2d3b778d7689093575c03ddeee1e640d1b0ffc17cc8eb82c3fb49eaeca422bc7e05b28838e9ebe5f725e08e4fb625b
 DIST kxmlgui-5.58.0.tar.xz 869828 BLAKE2B 93ccca5b0fa12e37f86ef3ca3dc52f2955ece71583ac32db7ee077160c95d095170bc1ee3ebd9bade730112eec807259bb1ee9e9849040f4f1ac4300d267cfda SHA512 22d718f49b5d9b4caca4fc38be4fac42c21d2ff481d0fa0d821df0223b255a79ac27dfd83773a8c0d24b9db79bbc0d486ada7c73d44ce1aeae35792ab4551be6
-EBUILD kxmlgui-5.57.0.ebuild 1220 BLAKE2B d2feb3da9ef378f5327dac99d8edcaf7a23905e7594786a73b109a75e9ec8e3cf4113aaa831db5e75cf613974e9812d0c6d0752a2a6820a1147fbe7b2c010d08 SHA512 e87d0c09235e58aeff9e9c82e8cb5b0f171ab37deb72199fb0c55de1eb0395dd6a397fb6ce0d7a66148b42d03326c71fc02ace43ba8dfc5d1c7a7ab949991632
+EBUILD kxmlgui-5.57.0.ebuild 1219 BLAKE2B 916b1ee2b500ed53505ac09c0b02be57ff594066854a11d3a8c9bc90b5e65ad78d24be71e0b19061ed8a0dd3f8a2dc4ced8f2d8e63f57919cabac78b60f493d4 SHA512 1bfc26b1993d171fb107c91615b586c31009db34649753962f2b86ad3a354edbbb06e07da82af0feb4911a94ae2b36c73baa7df6e1a5e4fbc3bc26c58152be7e
 EBUILD kxmlgui-5.58.0.ebuild 1222 BLAKE2B 45653c9b4eabc2e63417c9d5ba62ccfa4eb4bbf26e5e10876fb0f5e1edb9d7ed56a795a0a65e7636edb0c0e7ab3aea05d83102ae8249bc282d9133646041c325 SHA512 7ae7298346f82aa412b1155161d6efc5e0c63cfe193d0d76a6a80b3dabbe99d8e9d2f595f30dc2276d87b23c43a227be49fafaeb0e83b0eaa990fadd05ddd628
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.57.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.57.0.ebuild
index 01c7708c9951..71524eacf409 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.57.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.57.0.ebuild
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 LICENSE="LGPL-2+"
 IUSE="attica"
 
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 8c0ffd83b7d9..709b7e185495 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlrpcclient-5.57.0.tar.xz 29568 BLAKE2B 1208af3d2f0d87e4ab58e2f856925b356e3bff8d3bac7f41be63ee24fc793238d6de901c07a87e959a0cc5cf97aecd449b86047e07c761ee565e253945775a49 SHA512 73ae801ee93bce010ebbaddb262d05fe2142e8b7d18665f3d3fc1f6495c522378b09fd5ed427b288e818cbffbcabfbba0b92ded10b88ca63eeedc6fdc0cd455b
 DIST kxmlrpcclient-5.58.0.tar.xz 29568 BLAKE2B 737da6be77ccef5c49324de1cbca2a9d5fe1b92732146fd8d5daba74d28e88a31ce3811e5eb580f7e4307a62b4a9879a2d3a23da08fbbeda80d7656ce963a172 SHA512 7046113f391169bef272fa98900d564d65b53f8fd8e5ac95babe21979139cb7f91e902d00801fb928e6a4a5c3a8f5b09689f3c49038194bb5e24650f8b6cebe2
-EBUILD kxmlrpcclient-5.57.0.ebuild 423 BLAKE2B 23d91963c59b4070a8ece4982f9bfe64f0dbdd3bc1d894b12462252338e754f716513bf1470a7ed175927bc365880be208a832de4edcc7ae5381d4b38fc255cb SHA512 67220c76b9ac20dec74d202ae92b466642a741f83dc100b4a657ea2ea275933b1dba7ef876ac6b0ae2aa57d567795a062e44d1ff7d16dae15ef6743192948ff4
+EBUILD kxmlrpcclient-5.57.0.ebuild 422 BLAKE2B dedad571dc36f70545d443b5039157d8b4ad7404349f8dd688bf72db17c787a9b6a96d8e6616ba3d3ccc33340096a148e9ead0ca46c16a23fbc18964063e310e SHA512 cf45217b905339be2f557389b7c446c9656516faab04ab54a15b02bd83464b65f77ceee1c2deb6e794a3620c86757802b3f5229bbfb3edd5aa77b146ee80182b
 EBUILD kxmlrpcclient-5.58.0.ebuild 425 BLAKE2B a0dc0ecd38a696ff85aab8e30d2da9e76f18478a9f318e7597f5cd9232c5decfdb928fb7a5eebe69938f51ea58533249ef049b6b9e855c760517c45585de1cff SHA512 535ce9a1598502de8f9cdc44577c3675ea876b990fcfad94a70ce3c841e5737e0041e2e8ee5f48f02c4daa6e05c82864b649731668ce0c4cffd684b6a85d8045
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.57.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.57.0.ebuild
index 977d36e9cca6..54783a7f719c 100644
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.57.0.ebuild
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index 6c0590a074db..01d0356bd14d 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST modemmanager-qt-5.57.0.tar.xz 101484 BLAKE2B 204c5930a081f42d85ff892b9ad1d05251efe0978a0395b15c720348a6ee3567b47fcbde67662bcb49df8c63475edfa98b95696912bff87f6f73c407738c16a6 SHA512 6575eb0ab80b53bbd8cadce0dfbae3a2ec037af267456d52677df88a2d36c1c0c530b98e6839263af88967ca7b1aea8162b7a5e8244e0e1d78e853a62a8f088f
 DIST modemmanager-qt-5.58.0.tar.xz 101668 BLAKE2B f84f8f853c17f3a992fc2b9eb5ba6189227decbf89dc0ed1c5b08925941416629f1944f7a4f6d76a96a18c994a3db9634b1eabe2c0c69a525d382d37d600c3c2 SHA512 96aa702c3b07bc48132aa9567a25de73cb820c1b3fa59b4532ec5f3f0a9b1528f6def51ca660d7d2ed9e4eec4c4401af6bbeecd7f2b7ef3f92eb40ba74ccac2e
-EBUILD modemmanager-qt-5.57.0.ebuild 407 BLAKE2B 49e3977a2b0581a2a784c56da3f46cbd4d00c1be4b3ff7a446d193ee8ddf963bf3a2ccd3888c73f1400cfdf5d5bc1434dc891d751e27472b0b5c47142c2868ca SHA512 eacfe9011b2db4fdfdb1e5835c290954551db4890244bc4c428bfc9fb3dddb8e7235dc13f1211160e72c7fe13d659cb19bb3bef50fbf58067e867da2cf81e233
+EBUILD modemmanager-qt-5.57.0.ebuild 406 BLAKE2B 0c39ee3572f71575bb27e135564df69410d822dae6474df793a521cfe4116e7a48f4c802a872ce6b90d109a8f470b1005b1ad3ed6beb7db6c4bec4aba235e260 SHA512 319e262413c43ed6cd8c3cff7da87cd08c90057c76194ff866d9d271cdd90138d309abeaaabdcd9d4a3d40e6e2ef83e9e6b32fcbe72d2ebea6bb81461b81067f
 EBUILD modemmanager-qt-5.58.0.ebuild 409 BLAKE2B 7cbf10789f17293bcacdefe950b58cc613f57d4e4bbac28fb958d6dfc129bfdc4d40529782002ae1882f54e2f2e8c79deee9f7d97cdba13867cf341d85ec6183 SHA512 1c1cbd52f33f743ff65bd26e73b1d1b46b6e071785fd9769574eacd78cf28565aaad7d3a09f9a27d13ae8dafbd00fbb796baaf9d7da737e0bfbcd37e17a775bf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.57.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.57.0.ebuild
index 9679f955353a..c224648c89e7 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.57.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="ModemManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 26d1f2a37662..4307c12f85e5 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST networkmanager-qt-5.57.0.tar.xz 183136 BLAKE2B 19a6a51bba900e6b750e96a65ded86207aa7eda75219fa10ec510950b5514ce2af8257cbaa2774e9aebbe13116b7b0ea2fc9fb30f575094caa4651be601a17f3 SHA512 3ed341645b4e7be0bb47afbafb3dc1d2c30ff7c9dcce2acb647543cbd3fbec0e8896a7e2abb37cebf79679cf727ffa78a4f67b3253c8dd6036bb01a4086789df
 DIST networkmanager-qt-5.58.0.tar.xz 184644 BLAKE2B 5c653692033d4e61d9e1dbf4dde684ebeb5c382fac784b67767855c62bba0011df8b8b572b52adc2a59078843b81297ebf056e766963877d7f31ba5b696a38dc SHA512 f10a898d7374a236f33766ec7a96ce349e1a11aaea28d9f728e8941f3ff6fc368b6d065a16ef3e18eae392199bbd669c63a1a6e64f9bc534960bb31b08b26856
-EBUILD networkmanager-qt-5.57.0.ebuild 685 BLAKE2B f395e084ec35a8bd816c6f2b1d950c00de32cc2945925ca3807f029e77c425da5daae9b8a7900beccb073a50fe6c1c6a5656d5452a386627cfe76301030996b3 SHA512 25de58b395ad4466dc6cc284133be1bb7da0f2d53c01fb57e70c97b020c04583161f4e9439c7a2686bf5db4569c3bac1f30453388e0852b7782c110e91d770e9
+EBUILD networkmanager-qt-5.57.0.ebuild 684 BLAKE2B ae3de42743076824d8e13cdcdc490a28f785a594be0131acc29d647837a9633d91c5fb3f431ddc2155e310e975819e1f9a642f48a66f20a1aaced41d2589bc49 SHA512 829ed1bc1fac0644a17051864b4afa2f91766b32aaec7212052b154175919c2e4d7eba26b1018d9b951dd489ce61175e04314b3e4c06e5a1628a1968820d5578
 EBUILD networkmanager-qt-5.58.0.ebuild 687 BLAKE2B 76210b44a00f265d75d4e993bcd0fbd793bcc63f60d6b180f975464d1fbe76dafda887c52604de6841d112b0070211b6bcd7bc89845e3242df81747ae88626df SHA512 97af5e32a056c49f22f3993e28f8f62890155ff8b888aba3b218d445860ec274dc2f3713dc258a2c233d0d77b6a3d8192e1deacb091bc945a385f22aa2b799d5
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.57.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.57.0.ebuild
index c7a56df5d9e7..39db75b16f3e 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.57.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="NetworkManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="teamd"
 
 BDEPEND="
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 83cf4cfab044..5880c6837e50 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-icons5-5.57.0.tar.xz 236767376 BLAKE2B b8c81c6df3093018d6a2d73ef7ff56d7faea174305a0e937ebb855a2dec99089e1774977d336c5fb0d4ed242238b169c61b71fe79f7ec4921fd0b6f4bb068347 SHA512 59b71558f0f378e5cf451c5c41822cd66540f8863377a2aca5d083b7bcb345bf3ba50b3c418e3d6419ba05e2837c1c45324a06e543146b2bcdf0ca282da51bc4
 DIST oxygen-icons5-5.58.0.tar.xz 237288084 BLAKE2B 910c4504687b392edfd398a1bbfef028c6b73d524505d9f89f278999bfc2a5274cded58e86bbb69868f755af317d2306bc72703b3854ea930e8b3ad208d0d477 SHA512 a18c7f4433b89a12d5ee2a3e8666c5486927a93cc2d2fbef9b3107b72dc6fe2af42d9df5f4f16fafbd5b93d9e4ee0525a08883d82b5e4bf1c3f026fdd84a93fa
-EBUILD oxygen-icons-5.57.0.ebuild 519 BLAKE2B cc60b5e95fdd344f4a7ac8045202b06d2ce88f5395d5d3720dcd4376f903f91e1e750c2bac07e8c88927c7655b91b18670a92fcdc3171c3a20384637c164b1a1 SHA512 0fbda8304e3807631e48c39d59f170b7de4231a1adf0ee0a3e0ad7bd4e35da03fcd7fa92eb6553743a732fb0dce5b85fc8e06710d1211019bebbce64f98fc92f
+EBUILD oxygen-icons-5.57.0.ebuild 518 BLAKE2B 8fe3dcca7b31aa135608b41f83bbdbac750b2cd9fa6c31dec1b990cf95a26ce576540f171ced433f3951b845e67196f884a3be83d61029229f5a8fbddb395566 SHA512 1695640730e9ee8db00f82823cde72188e909a7c02f6efedbaf22dff3cff4d08760d1395059b050bd08423f6a66e20e4d8a5f9336a23023b8b0795f146427bbd
 EBUILD oxygen-icons-5.58.0.ebuild 521 BLAKE2B 656e906d63ea2fa77bc689db0608ab509333b8036f171f33575e022b9fbff22df87f89b5321f543252b3f0e34f551e6fa354b48787fed857554d430c2463e713 SHA512 2329bc4850d2bb35024810b7ff8d6e3f2496f523cb6f83b84dc9e1bf57d7e61ab241cc24cc2a7adac24157568071daac94a26b77fe13db963f01bc286ddeed0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.57.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.57.0.ebuild
index 10ea5567ff79..12d32730158a 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.57.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.57.0.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 
 DESCRIPTION="Oxygen SVG icon theme"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 2aa3853fd5a7..3bbf302b1641 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-framework-5.57.0.tar.xz 4636968 BLAKE2B 9963e8f82a9f7962c1c7dee513f3c56ae5932a2cc8f49ba6c55daa29e1fbce382ded9a0c1ba989b1dcaf716feb3bf4b7d1b82aea13f383e5c428072a5ac6d391 SHA512 42016dd7dc9c20c643adb4fae2987d7aded327ff52de6802ef808f1c3adfda4390eccdea56998071422347d3971f94fa21ea6604dbb2555fbbdc6d0f41a45ef9
 DIST plasma-framework-5.58.0.tar.xz 3116544 BLAKE2B f0c950023526999ebdd7e0c888f799d261927230882ad385f3f1f8dd232f1d1dc8824eb7fbc3dccf2f0303006318028cfaf07a97f20b63f503a16fdc4d7e2194 SHA512 4ceb9b2261012179cd0d9e0f1eec7b9d22b0f8a0582b4ccd7846a26619c429d3105962dec95af7daee0087e3011cc956d336a4aeed44671d6a6cbae3d663bc0d
-EBUILD plasma-5.57.0.ebuild 1660 BLAKE2B 8e563ffd2ab45a572eca5339d88894bf98ba5dd1bbde16201424e60f402f5259713c83b7aba2462329f6e04ff4d248769ca8c120e0424160c7534b0ed0005f6a SHA512 c94da9bcc9fd0281f22cc026a04ad7dc19460dba5657f1d06a7412e7fbed882a8180f74a76ab5395623347aa51faaad391b6035afb6ab1ad4841f493f9c238a9
+EBUILD plasma-5.57.0.ebuild 1659 BLAKE2B 081fd9402d0bd1ba3ea5609857d015ca8d2a8ba94493ea361fb071bf82a86b7e28748f57ef99306aa0528e8e77580bc41045b383e62ee4c518f389dedc6efc4c SHA512 c6fd4279f104c1306cbfb1a1662cd5564776c1e227844a113def435bfe006263151dfc9853484d0b35cb8d06dba3e5f19c9d9d9f9a43490bb9ba404fee4bc510
 EBUILD plasma-5.58.0.ebuild 1662 BLAKE2B d2240488c3acb72c53b4683f93216000cdb3c3af17515c9cd4fb58c484f8425174d64ec4944910d880ed0a63534a7dedeea0bd0ddff0d736457e3d3b9bfa3653 SHA512 ec79f627a2aca56df338bd19cb084bed57110a547e4edc0a6e4ada513febbd27042fdc491e1358912f189755d1f898a4da53f324fba555c049ee4b670f2a85dd
 MISC metadata.xml 337 BLAKE2B 83b14f1456a141498367a54d2b3b1bd22095d8a2ea5d4b348bcc1b27b6e753900e89d2b2f7f6623a9737c6c6fdf4fdc741fb38fef17b17bc458d182e72be919c SHA512 bd0bffaf1b63f9b0181776335e38b2ad44baef7fd4a1d78752b5e342de444bfcda03b72c795c0b52c87a768e243e9ffdfbd02de745c2dde8f8372fdcfbaf2797
diff --git a/kde-frameworks/plasma/plasma-5.57.0.ebuild b/kde-frameworks/plasma/plasma-5.57.0.ebuild
index d81c31622f70..c33bddc5ab4d 100644
--- a/kde-frameworks/plasma/plasma-5.57.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Plasma framework"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="gles2 wayland X"
 
 BDEPEND="
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 03a3ef40ff6e..0457b2af9e32 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,5 @@
 DIST prison-5.57.0.tar.xz 41880 BLAKE2B d41e3994b97ef20d89175801c2c1296ba61eba61eb552fbefec8590a591a44fc226373e912b81da99ba1c240ddcf98f47dd4fabde2546b240b0c28b5a3f5009a SHA512 50dc1cac6517db2e5415db7670d2c95ea13ce617adc6197d6db5e9aab888d7df0924fd9114210538d7e372b862677c0e256e4f771efd7bffdda64308f4beafe1
 DIST prison-5.58.0.tar.xz 42132 BLAKE2B ade8e56a57fec855084242e3ebfb6d798bf12b4d990b6a258e36f9fa1577cc121ad32294a2cc7c77e7522a054a5fecdd5b2b2cf7c8366d4f6496e84b6aaf823b SHA512 868ba1784043f1b77592f71810e37623309581f14a4d0348e8b673f466c258993d59dc1cd5920f30439083c48dc2f4e2cdb35c296eb9c7d9f7935a0ba6c9a9ab
-EBUILD prison-5.57.0.ebuild 530 BLAKE2B 468fcb5ab51f267f041c1b5d06a375f67a3b2f2ccfc6590272498d6193dbbaf721da2bd95b2c4b82afc6eb54455d9ad0ed3c91136ea51e322b5cb8a65d314df5 SHA512 23eb3cc26e11097201b29b588305fae813c38239fec9370db9f906a8a16d1bc7ff0dae01f79cd202c0535d64e06e55f3491451099005729d31d673480a0196d5
+EBUILD prison-5.57.0.ebuild 529 BLAKE2B 9dca870eaa3bbff4d27a8e2418a8fa370ecb05ad0b06ea83a2af3d1dd9e9211037ccad590d46fe3765f568f5b4550f002e7eb54feff3a79733938fb55c37b4ef SHA512 b1ad7aa673bbf610fe768db2262929082e583d8bab9c46d716e5e94898c023e7a3b2e83712917e67f51e244363536f61f5a50fb0fe45ff47f779c83d49c46058
 EBUILD prison-5.58.0.ebuild 532 BLAKE2B fbf8966f980ea1d7451b57e67302e4352bc9d98c06bc5fe082ac234491fadc673dbb3ebc6cb5f774890a8db4af24b29caa91098b856f30b454aa4cc770d8bcb8 SHA512 0a06219e595294b64abd469ccc28047e3f381f5537527f8ee36359257cdc8cc621ae44ecb2a4319932dd86e89286cf9b1c77f5239e7714dc31ecabee18ac1c51
 MISC metadata.xml 353 BLAKE2B 0131b7b94f9b9f5c0407c2b4d643f397be4308f66a6fd89260861d971c4274b82581f78e7661361cf1ce1800612d0d9fce132c2d9242356a91bdd1e03a04403c SHA512 2068fedd6ea1d72317184bc10ef48574e3795d2e03e9293d0c2bfa685308727a7cffc9429fad89e42a53bddf7e933f6c57ddba56ca00b8a8671707c1a3948473
diff --git a/kde-frameworks/prison/prison-5.57.0.ebuild b/kde-frameworks/prison/prison-5.57.0.ebuild
index b99927f79723..620237a3e293 100644
--- a/kde-frameworks/prison/prison-5.57.0.ebuild
+++ b/kde-frameworks/prison/prison-5.57.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="QRCode and data matrix barcode library"
 HOMEPAGE="https://cgit.kde.org/prison.git"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="qml"
 
 DEPEND="
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 0062adcd84c8..6e6e161a406b 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,5 +1,5 @@
 DIST purpose-5.57.0.tar.xz 145332 BLAKE2B 82b7afbc83e662c398f9e06bd79060ed28d71d67f0a74546385a230076d17e2d6e0b929929e1ca3ad1322952eb6b15ccf04fb07c0bafd873a1cbaf182a52f1ac SHA512 6a9bb0e19b4e147730fd8b0fb5116f51e9dd2d8bf74fa1b93e9758f3b776c4c1da9e7ff75d8871e28db52b016dbb3d6d1b8c3c046adbdc9c85c1cc1df74188e4
 DIST purpose-5.58.0.tar.xz 146024 BLAKE2B 3f42a33ca64378f34b173411074660ae8a094bad7d4c68a0287da8443a210743692b5e6393e763468ea7caaee512e8475096b0dcf5d8b356b1ad1e79cf023b2b SHA512 41a7c99b012c892680d786ce8f0aa982b79e814763847f86884e4c5a5f36bd925dd8f916b92f5786deafb6f22a5aa5af5bc39c1b73efdc9c58a6b9aab16ae026
-EBUILD purpose-5.57.0.ebuild 1003 BLAKE2B b13901b6a60832af285824e0a5cd0318b474f54dbc9a0dd33728179d67680706cf0403162848b52e20bafb9430f0184417d8eef4f7b311b356b5a7ba3e2732c0 SHA512 40271068aeac5a4fb0d99f95c83fd541bce2ea085eec24144bd137f56eaa67177cb3894ced41e58f6e53f41dac266e9f72f41020f93ab90570bd2f1faceeb779
+EBUILD purpose-5.57.0.ebuild 1002 BLAKE2B 5fcf60043e8ae781f7c22ab13d07a6d818912e7c1d52269043cdf0464b6a27652aeb84e1d68b29974b25e54e618dfde0ff91a5be1cc82024407fde2c5dbb509b SHA512 fa8761e0bcc474602ecef2abfb8c29e3ee221f47c061b3a8d2b04d3dc2bc9ec832fc8e3c0a7df18920d02092d93a70edffe04d5b43344d98b97035db466ab1aa
 EBUILD purpose-5.58.0.ebuild 1005 BLAKE2B d43f711501f73516f41042ce68ef056adc5657bfdf93ffe73fce25630ec58fe438ac3368d2650f3671984bbbc947e9dff269a3e5dd4a82e406dd2e85fd07cb3d SHA512 42000abe416a276e1addf384f03272280099f5469c06a441e665317d900b22fa52c3af0ea9a99a37584df0557594cbbcfb2a7b478156717b0d68dfcca2e34fd8
 MISC metadata.xml 345 BLAKE2B 0e6eede785554aad84ff8d6703b9ab698439d7c383b26f789ea3d6234014b4e4de329159a6264eb37375581106ffa1588d508d2616aac298af08644d1ad02183 SHA512 cee07f4f8ede80430680300afba2bbbba3f38559fec0b3d0dac805beaadf9605f94d4cc23a0f213bc56f6bd48aa5f4f39f010b87453351211ef1c6d53393f26d
diff --git a/kde-frameworks/purpose/purpose-5.57.0.ebuild b/kde-frameworks/purpose/purpose-5.57.0.ebuild
index 8c32c5d5fc40..7df42b9fe97e 100644
--- a/kde-frameworks/purpose/purpose-5.57.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.57.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+kaccounts"
 
 DEPEND="
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 44f451e3531f..4e298753a95c 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,5 @@
 DIST qqc2-desktop-style-5.57.0.tar.xz 44560 BLAKE2B c6b8e95f23b021abb388bddbc685d8133495435804d0c070f1ce0b0aa595263e5affed6df3f7c4d3f9a9d39fdfb03eb2fc8916c3b12b264a67d2f53b540980dd SHA512 eab5daad92b0f24e12c2e821955fbbe19ed22e6cbfdd8ce2cd28e5088cec284f8004c18f7052cd914f91fe37add4f10c9668cc0c569ff2c2e6821da78d2b30fc
 DIST qqc2-desktop-style-5.58.0.tar.xz 44216 BLAKE2B 69fae64b03806953b5298cb9483c0083dd9242c579bc21a5bfc4cd209bebc48308b1be3898fa58dc048679bff18abc1971a21725e4691e1572639716b9ad13fb SHA512 1b6c1b57ed6ebfda06f9724b5b3df4ec9e21bf8c1820018c98ca0bf64f6c1f1906d0f07901bd63249367913ececea3d35a20d0ae3693bf5be6aa1b8098b735f8
-EBUILD qqc2-desktop-style-5.57.0.ebuild 591 BLAKE2B 69c0c4844a95a531c614cf98923dc863894c78f54ed80ffb981bfa93e6313126207abe1c3f2293d99fc3e6a29355557c6fbf828a5d2dc5996fd6ce51a98b2b96 SHA512 8d06511d11155da6150e101627a2f260c5cde62970d7a12ce0bec5b5b725e9c81a6b7990d03c97c38a6b021f5300673fb00959ce30bceae7568df3162f669947
+EBUILD qqc2-desktop-style-5.57.0.ebuild 590 BLAKE2B f3cfba2c0448c9ef04bb5641a61edcd86411b088f1237f73b70a32bb1fa63e595957c975356d08b088b1aa327a8176701f57dcc0843d33c3ab16e7cf74613589 SHA512 3ff34c3096a51c51466a8b5a4d7c8e092a894a6b7184b0dc7b13a351bdd557d42e83c6aae0d063105514f46bfcdaabfd0b21a5c50d6f3481d06a3367e739ae72
 EBUILD qqc2-desktop-style-5.58.0.ebuild 593 BLAKE2B 465691d6cac57b5a45203b3ec144591e7ccb3b0392153f6c4e7952bcca55ad1734c401670cf202b3367d0ea9daee063d8d531dc09323e70f9451ece82c34ae76 SHA512 2fc15a1a1edd3c57425dbb73df663b6c2f2d07f57e284e116836759fd85acfdbb38affc80e5a269d5e0664686e8804113a90a68076835b4674f5a115b82452cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.57.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.57.0.ebuild
index 7b67156667f3..e07f7aa59887 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.57.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.57.0.ebuild
@@ -7,7 +7,7 @@ KDE_QTHELP="false"
 inherit kde5
 
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
 IUSE=""
 
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 073a7971ad88..002a5a4343b5 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,5 @@
 DIST solid-5.57.0.tar.xz 258688 BLAKE2B c0024c205b4e2c215ff35010bc0142f3fa9aefaa7fc713fd4625e6925838745e9bfda6e6b88095624a190d927f3decdde345e1b98c000355c386d7bfa9221836 SHA512 b43bdbf7ad9bb2c6892efe6121f6ffd1b051549964a0eb519f18fb0eac20e7a4b461db5f5c1df76b6963d97f317414deea000238a2a24af6676faa1373c8acc8
 DIST solid-5.58.0.tar.xz 258168 BLAKE2B dccea465f522ae676a5bcb91619f3604655b2c7db5f342d0d54f5319f0ee7399af0bdb490648336759d249e960c7ab577e391c1b9e1eedaf98bbabfd0ea59ae2 SHA512 f0b741be7702bae8cd80be83e41a2d328a85c04913e9a5cf745b81e22cacd493bf62931c6e1a0c283e1fb45000bf8e103436dae521a842f439f9cfcfa471781e
-EBUILD solid-5.57.0-r1.ebuild 987 BLAKE2B 76b8bc6a472c08fe0d88a00e63f7e49e1446be6c2bf9f076bf2b997e5d0e753b1f775595e48cdc4996b86758ff1ce82f8ca40fae1eceaf4f341110d616f7dc39 SHA512 bfb587387062c6128994bb548be82ae6c2337ab415bde61bf7ab36fc8cc65bc13d94217cb42a5f27f858025531231f3dfbc90c375859eac73de28ad0fadc52be
+EBUILD solid-5.57.0-r1.ebuild 986 BLAKE2B ca582289494f9294fc3ae5460e00cb10b26aa7f664facfe174497174277a50822c47d2ca33ce41de31bbf480b110f67380b690525d19f174158d84543834f25e SHA512 a76f09a137efb89197bfbba8c86d97d3a9f4729937cd80199ad5a776d8863e146bef99854ad42a5dff426fe67481e9e1c1308b52e4802b313fa80948ed26e14c
 EBUILD solid-5.58.0.ebuild 989 BLAKE2B 94204f939f3cb41683a7b0a86e815315ad7236c82f86a0b657928e2950b17c1bcd3b0975f3316ab1f57a9fbd2503160b25376a5327d40b6a0ac8803c54c0aa0f SHA512 74998531afffebf9feb2a69bb3749176e32db60d6b43d7069e6660e3efbf74fcacac9d0e8a4b179870ef4001c14690f7df71ad14fda72dcda369b2447e5e3b1b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.57.0-r1.ebuild b/kde-frameworks/solid/solid-5.57.0-r1.ebuild
index 60477aa86441..017f08c3beb4 100644
--- a/kde-frameworks/solid/solid-5.57.0-r1.ebuild
+++ b/kde-frameworks/solid/solid-5.57.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls udev"
 
 BDEPEND="
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index cf9fea9428a5..a654abec885e 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,5 @@
 DIST sonnet-5.57.0.tar.xz 287740 BLAKE2B e4b3fd949b1ea268a80980ee6ae70929b8b8c344633c81c83488551cc75169adf9a03413c4c8d4f49f6cbee96cc0bc4c4c0e94b259bd2c7c94ee570331cd8b8d SHA512 43bd410e64465bfa8d5da35137b44d64ceaa38ca9b526f017930e97ec4ca96d4f23299f8c3a3c7711964ec5a1285a87475d90693ea8a86596a93c7f62783f732
 DIST sonnet-5.58.0.tar.xz 287320 BLAKE2B 3345bdd981b4d27753bd4443f6d5d39f1297459a2e860eb4f8813c41752ffc92007bb65f3807a20eb79f7e5d92957d58686fb67764f8886ab40b3c63fe619383 SHA512 c98d5d8fb19e0995b38ff414c54ea38e4d8303963b36fe140fddb53378c790adfbac3289045b147a6baa283d0a2db8112106808e09c068b180689a8f055719d0
-EBUILD sonnet-5.57.0.ebuild 831 BLAKE2B 1e3e2221b7f9f7d6dc4d505e4895dbe20728bd4019724016ddc84c51662eddef9156aeeee302d2925168aab80bcbf59c7a8584f4d5faf5760a77a81bd9a5501b SHA512 81136d60ecc0e79aa36192435f7d9b87d98d08588bbfaa1aca446fd6dcc350b10756c2a06de6a578dad02c8993c6923634729d35a6b66a7c339ef54d21053886
+EBUILD sonnet-5.57.0.ebuild 830 BLAKE2B e59a518fd5e59d4fcf2baaa256e5cf34dd1b5317d4b11fc8c3a66a65d2454a57e49c790d988511d7a17d953a73c786ee547250ce02774ee97ace83749dd0b972 SHA512 3c40c40e077ba2e2310b80c0a602491b1dbc0c5b0441825a49d4a85ea42af43663e274fad7a25a1658846c5796ed2553e130cf6e98a08d9c9a1135efb48c0646
 EBUILD sonnet-5.58.0.ebuild 707 BLAKE2B b2722b8aa07b724f69c2bd30ea81c2488caa667eca7c9edb7771e26859b7222b18b3a3db1c5afff0c893ee1a1d03b2c0e7c911caa2de96a8491444a3e5d8cfd4 SHA512 c784dfaf440523783af4bbc7d9265ed0dcdf7014cb2626e295dc3154487c7c31d9c7480353aa0521385665d76f27afb9094b097cf7e2f148a8861e7ea9b711f8
 MISC metadata.xml 426 BLAKE2B ae2511b818ef6c330062e792c4f0bf503fd73d0c42d93965f6b3535d6610a75229c6de627e1be5046e95ffbb055b5c1c07c5cb4eb8e824354d9d3e7ddc6ff8a4 SHA512 d429dde1039230ff5cc0611f0373c22511fe7b9b6b5ece823591b8972a876f3d10b4bf658bffc061f8433b8cf8cacc224db97791f2008c47d9d5e41e0deef8a5
diff --git a/kde-frameworks/sonnet/sonnet-5.57.0.ebuild b/kde-frameworks/sonnet/sonnet-5.57.0.ebuild
index 20ef391ea73a..512e1e914fdd 100644
--- a/kde-frameworks/sonnet/sonnet-5.57.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="aspell +hunspell nls"
 
 BDEPEND="
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index bd5e0dccdd37..7f0ef529c30d 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,5 +1,5 @@
 DIST syndication-5.57.0.tar.xz 159452 BLAKE2B 9d5edaad62dde1b5c377c13331fc414b78b31a45f2b92baaaf8723341f3b92d9f7d0d086a4c1ae1b5f983fff276a4649378f12c57d6189946f64b10c58f2a2f9 SHA512 07d71f94fa48b3b8fa8f3853866bcf874e25fe596ee9f084082af4ec0710c9a2f9e39dcd8faa0a63e6a93cf8af6953188e68f9c07110306b29f990c632ea2ee2
 DIST syndication-5.58.0.tar.xz 159124 BLAKE2B 7110789e0dbafcc75381803a53b3c6b622b47e807d3ee4814e1b70b03be96d7013f5f9dab1ca383c94373bfd3605279353464fcfa78a11f123d15265f02e5530 SHA512 fbd3283e37f906b7bde76332721004ad679e99b4d8b3700ee0e98986f14a45dfd32048673d4e5270c351868c6e0f212b17bc4e4bc47f003cee4eb4dd16f9abd6
-EBUILD syndication-5.57.0.ebuild 463 BLAKE2B 678206a801a409da7153922dd5f4edf87ed297f3c2cb320985360022cd6dbd9a3cbacf1b4575ee74b6794745a51d2699fe7f24a700a729b843339a94321bb4bf SHA512 f24174a10160d312d758bf192e330e7e8417f77c3b171ae6a4c3a08de56ceaa0a27c82436d08b10e9f0ce327c0a676ccc5aa039f7389ebce14d8f51537ed6748
+EBUILD syndication-5.57.0.ebuild 462 BLAKE2B 00df0004cc6614695d541e626cc4758a1d5dbbb596e779f46c088cb7925be6d48d934e29e84de93af9874d73e7b9941cf8aa7f2d80ce74c1813d7fa79078615a SHA512 3878a030ed1f7803348f5b202ff8dd25c854d9d2958906035edd5a41140bc2736edd2f0ff854d7a04b925c3a8565e50271cbb56c48d96fb1232468bd58413be6
 EBUILD syndication-5.58.0.ebuild 465 BLAKE2B 009e762558934ca9b53003b001c56dbc0168e142d8cca5761ef0d5e44fcd48f28275c91c5b86e0868fe0458950002abf5e945c78682134fe65d2ecfc9f1637e5 SHA512 7dbd7df753fbd084ca9310d58f6e2edca6b40ba0e4795c77c3218c47e0ef4caae6c6c1e9fad0bf88f243be3d79661f96564b82ece83d3a2632858e73356ce765
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syndication/syndication-5.57.0.ebuild b/kde-frameworks/syndication/syndication-5.57.0.ebuild
index 803c6a5a5b57..6460c1f5b96f 100644
--- a/kde-frameworks/syndication/syndication-5.57.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for parsing RSS and Atom feeds"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 659de6e6763c..31b68e84b882 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,5 +1,5 @@
 DIST syntax-highlighting-5.57.0.tar.xz 1445868 BLAKE2B 3fd1699bd9b83baa5aaf302f7a5f77f4aab1394dcf73aba63e345dfee59ed9849b3d7ac224b3afc607888b22a3f6cd7c98e0552fbf1a6847180072eaa7966414 SHA512 d1f055dc5a21cbaef8d7beb235bb86e9b8735bbcbe68ffdeae56b0fe1152c2f8625dd0371fc3eb213950a3a404b5454fcafd8c7465a5fdfbdf3a4f00168aff1c
 DIST syntax-highlighting-5.58.0.tar.xz 1463544 BLAKE2B ceb2a930d88ed9bd017268d924cabfb90782d9c98e88d9f6563b4c9d1c3a5a1994451e94ca1aaa85a39b4c7412267e3571df475ddabc17690d113a4af6f57916 SHA512 a4b95a8ca9fcccf3fd5ea8d8a0d4a5b35712e69ce466bf28cf1f87831be6120c0bdb62b30fc14b1094cca7ad393fa8348ea1e0f13abc1a6cc742a521d4d7c350
-EBUILD syntax-highlighting-5.57.0.ebuild 532 BLAKE2B 10ca729b952678dd08f1ebb7b105475388bbd6f08504e05d06282bbbafb34637c1ca9dee9bd85d20f094d1e7cdfd792124e40ab8118d243a2812a9a6e3ef1163 SHA512 25f80fd1f255e490e9aa9ab367e637ac9b820b1d61e1e4185a42dba53c57ccdb378a774f20702bbb453393a2e973116377ff9f887646ad76d123418a4fa6d421
+EBUILD syntax-highlighting-5.57.0.ebuild 531 BLAKE2B 64bfc27f5c74bde76df0a75bbac33cb3133dda604eea5d10802cf24313bf656346f2fd7685862529b247fbc48a7fc90cbd3aae7b2d10755e4a4e835efb590cb0 SHA512 7fba8610e06179542dc14d78c5b7527e965e499b81e7caa2e58f265981d14558e4af5bd17efebd459ccaa82b6973af7e6584926302cef1c27574aecaf7e533ee
 EBUILD syntax-highlighting-5.58.0.ebuild 534 BLAKE2B d7ed2eac61ede2842b68bcf43f991d1415cc32b733bddf8d751cba92a8d36efadca71a8c50a07a8243b6fe605af964e4a8a22bf0d8d28d2b13756e6bf3748f4c SHA512 35ebf3c40a708844ce42571b666d416fb3d0366c315a09e4880d04425086c16a9a6299bae557ae1d5a558d379a1f7b2e30789ae776a0e82457e0e8facabdc0b2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.57.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.57.0.ebuild
index 96e46d6cd9b1..2daff1d35205 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.57.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for syntax highlighting"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index edc7ee0b0020..031d883d0383 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,5 @@
 DIST threadweaver-5.57.0.tar.xz 1409804 BLAKE2B d53031a72d993f7046d19c2c2c4a29ced594c734f2f089dc58723c0447ab6a74eddf41ba87a419e8b7faf88c75d6b85ca3ee7d8f9d136070e9e567a9fd510b16 SHA512 dcc47be442be45527dc65d89cc5b77fae2ced7f90cce69e7a7ac55e03d05591b5c93767b75dafb329655c07ba97886f9bfcd6af0441c47d7806caf5649566358
 DIST threadweaver-5.58.0.tar.xz 1408980 BLAKE2B 23c3e3e8271c2b9b6aebb77192e6b0d95a5c9f6f6d7fa890d8fd351f2c9657059fbd797914dc2fdc30153eea038b93c1ae4b0d267d23bd3362628c3a9efd1145 SHA512 75c43383995d053b9f65da1b62a2c52a91449a7eea6713b2363c90b87cfb0ea44d3fa81bb5c6964fd776d5c613ade0dcfb2c4b7a666e55b08fcc27d5c0a9ca54
-EBUILD threadweaver-5.57.0.ebuild 348 BLAKE2B d37fb4f388525a3d52c6a411a01252aabee2562ef2b61e93f31a192a4fffc77dda0fdd6b005aa0a89dd0dab23f26447d297f39bbe70b5d2ceb4105f68ae8147a SHA512 b6d9f9fc169c8371be6b57e01fea38a83596ebcc121fa203f070c13cf6127d424c6ac071f54aaa26ad3057ad5908ec476a8e0c24fa2f59969c827568d67ba70e
+EBUILD threadweaver-5.57.0.ebuild 347 BLAKE2B 6f2ffcb8440fe4971e2fe3dd0b999e558236db97feb356defb7eae9b747f92e26d35e48bceb06cda80d3cee454bc8deb19875b9c03e1d6e79779131a7dcd1819 SHA512 34ccf084f0eff09a270511410fad8c4ead5819edc1b4af8eb8b03337da4bc1d72afa7f4a4b78938fe14a1ba50a5131dbdf21221b8d20925bb0ec7f348651e1e3
 EBUILD threadweaver-5.58.0.ebuild 350 BLAKE2B fb01216199e5c492db0535980f2ade14463af5d0fbb75dc97d2acdf64791e25991de9ef95f127fe03f88ef4a9deec070e3ac354257d20ebeffc8656bb0071d57 SHA512 91fc25640d6c1526ef725716a5634612f8eafcb1d4e05d924583aaab2e06ae4c27809aa736e8344fbd47a93f299bac8b2c0a6efaead764f23af585c15b01bfcd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.57.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.57.0.ebuild
index ba9604ee5ebe..4b7c096913b0 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.57.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.57.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 8a54a11c39f3..e325598719f6 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index e76fb8f55507..e0c808aac4bc 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -2,5 +2,7 @@ AUX tellico-3.1.4-empty-permissions-set.patch 906 BLAKE2B e46830a15f0f1fa05b1d94
 AUX tellico-3.1.4-icu-64.patch 2136 BLAKE2B 667903d58771f3a0b2c4b83aaa864e3ce072dec1e3106c83f835b560c3cf653342b158693ce658adc7ed56cc12515e348922eaabd7e39d353a15908a85a34401 SHA512 468873c3dd692ca85b7bdc7ecdbe755e125d669686374b998593ce5c99bf7be3e3da15656925db9f294175a1fa0811b3de26c075ebc1dc49174960acf89bd06e
 AUX tellico-3.1.4-xmloutputclosecallback-signature.patch 918 BLAKE2B 2150dd13332ea01a5524951085dfe4a7032a4cf26776af5818f4caa7764584027112b3f793e3a839ade84979aa75c1e2e7034d5baaff250b9d32c64832d2e930 SHA512 6ceda2d2a10b480539677654a2b21132c17e88a4395016fdb703c09f9ee066a93c834bc9b229730970dd35dca4a110f4c2fea19775062d404f76515fc0fbc0f0
 DIST tellico-3.1.4.tar.xz 4632792 BLAKE2B 29db598ef558fe04618843cad6a58055b5de392f34aeea4860683f04ef4ab20856fd4a01523dc13c2d68023c266de69590e843ea56f912989d57c01e0d701ee2 SHA512 d09183bee13ae9f7c6c5114b76eeeb959a184def559ae239bb880ef9be964e33878530e9c4c0d3baa6f872bf8db155dffb94592e3a857623ab131d2f28f1f139
+DIST tellico-3.2.tar.xz 5596028 BLAKE2B e22cd7b5f1bfb5221379b0e6c12c894314c3f04348ce8e0f82fe5707aa98d99af004486afe9266056c9650636b553e2355fa4caabe7528e60c0fd5af5df2ed9b SHA512 a24985200a70958f727bda3056de357d6cb74fc407197e9d9056573bc606cd6ffbd5bd971ef56acce3cb58f0b98865f5e89b431fe38c1d27b4dceafe49e78fdd
 EBUILD tellico-3.1.4.ebuild 2608 BLAKE2B a5a2fa788fad61752733ed2c2e2181169eae4865ac7da3bfbcd213b5b3e093cf58fa939805ec624f57ae0eb73bbc11fc8956258f0d8e39afd32eec73c366c6b0 SHA512 aa9bf763266bae19ad6544806cf93d90a73fb0fa7fb0c2944db7db0d84d362788d3480a909705787b8f6cd4db1c67417b38db4912599af56f2a5c7bce9cebc9d
+EBUILD tellico-3.2.ebuild 2465 BLAKE2B 530489b82ff5ce34ce12deb41b1a9f170fdc1bfd37b3b439675eff89a1e5ed8a7a5a5e12010e715de1546b067975075b949b9195bedef436b8c1f9ca06099ccc SHA512 d1302b7abfcf50104abb9af31963ea78bfd5629d08e777a8bfac9f6d2a90f717df43867860627b70b571ce052a2695679b5107d74d3e92c809480ade012c8f50
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/tellico-3.2.ebuild b/kde-misc/tellico/tellico-3.2.ebuild
new file mode 100644
index 000000000000..e75e9ba7649e
--- /dev/null
+++ b/kde-misc/tellico/tellico-3.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Collection manager based on KDE Frameworks"
+HOMEPAGE="http://tellico-project.org/"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
+
+BDEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-perl/Text-BibTeX-0.780.0-r1
+	cddb? ( $(add_kdeapps_dep libkcddb) )
+	discid? ( dev-libs/libcdio:= )
+	pdf? ( app-text/poppler[qt5] )
+	scanner? ( $(add_kdeapps_dep libksane) )
+	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	taglib? ( >=media-libs/taglib-1.5 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xmp? ( >=media-libs/exempi-2 )
+	yaz? ( >=dev-libs/yaz-2:0 )
+"
+DEPEND="${RDEPEND}"
+
+# tests need network access
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
+		$(cmake-utils_use_find_package cddb KF5Cddb)
+		$(cmake-utils_use_find_package discid CDIO)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package scanner KF5Sane)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake-utils_use_find_package taglib Taglib)
+		-DENABLE_WEBCAM=$(usex v4l)
+		$(cmake-utils_use_find_package xmp Exempi)
+		$(cmake-utils_use_find_package yaz Yaz)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index 5d668c17481c..529b9f4c1eea 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,4 +1,5 @@
+AUX wacomtablet-3.1.1-gcc9.patch 1196 BLAKE2B 2e8b7d2f3808b09caa1ed733a6d0876172324809ecc0567a8fffbf962bdcd03fee8399fdc5fbb1b5196530538c04513965ec2df0540c58eb8fd5ecd577ad6409 SHA512 600725f86e5b4eaa654731c14c4c7c4d4d5c8980634faadd5697a866667ca27356213d25c07918fee70ee056cd7d890d612e80c6bd7c0f4e4058be39dddba263
 AUX wacomtablet-3.1.1-xlib-optional.patch 838 BLAKE2B 997d42737c593c5074b6541ca91a1976afc36c7f43041ecd90a32d309c856a9b9b7fb203b135cf997a9a944e9a47febefdc196b36fde94975677ba16b2f17be4 SHA512 b7b8e3c1a2ad97788d6a1bbebc3183b4b1e13ab6295bfc716d5e083a0a317fcd6ba75b49051706c9d776a028a40d3f7cc8edec9b1186b67cdd727ef3e2019990
 DIST wacomtablet-3.1.1.tar.xz 724176 BLAKE2B 062f05067b9ca423527f1fbbc498d3228fba9333f96e918493a00c3ceb669a23c3ab9297bf6c2d3d161559f1d9cf6ccff8f502971718e71a360f3db2e7d9bd67 SHA512 91f8ab9326b8307d63e09c7d75d613553f16c6cb93837cc404cb251aeda93078011b0c5aa0fc20ca4613d82421d73804cc55fa71a688bf4dd0f1d616733ade97
-EBUILD wacomtablet-3.1.1.ebuild 1324 BLAKE2B ad8cf2da6207cd093e0b740a61106c3b00782721a30a71dc8622dadb6d54e29f5fc528aa82406a2669936929a96e4983df9d762a5441df4aecdcfc405c4e6e72 SHA512 0dde63f12d9beef44947ca1639e2722fd806afbe1539f7b8a5d8aaf0e033325cdad88821c9b8ca3cf98f8906225460b40b53424e3b429e9c083d231468658c41
+EBUILD wacomtablet-3.1.1.ebuild 1369 BLAKE2B 7e255af0154d8bac2d38b6607b00527f009ca126373b9d8a69c6153cc4e52f73b53d472efd47347ae5d10c97dadc6db556b7da0753fb6f7bfc3be628168fc95a SHA512 0b9d7e39aa3f827e457cec0eb2e8f4634e5490579c844dbc924e1246ae6d6efc44aa8950f33347917a9c80a68b6609140ca817330c25d6e3779075067940c083
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch
new file mode 100644
index 000000000000..6b0cc5dec637
--- /dev/null
+++ b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch
@@ -0,0 +1,29 @@
+From 810487c4fa240f6de598b04929bb08de8937feb5 Mon Sep 17 00:00:00 2001
+From: Valerii Malov <jazzvoid@gmail.com>
+Date: Sun, 28 Apr 2019 19:10:43 +0300
+Subject: (Supposedly) fix building with gcc9
+
+I don't really have access to gcc9 right now to test, but this should
+fix "static assertion failed: unique_ptr's deleter must be invocable
+with a pointer"
+
+CCBUG: 407015
+---
+ src/common/libwacomwrapper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/libwacomwrapper.cpp b/src/common/libwacomwrapper.cpp
+index 1d11fc3..92a559a 100644
+--- a/src/common/libwacomwrapper.cpp
++++ b/src/common/libwacomwrapper.cpp
+@@ -60,7 +60,7 @@ libWacomWrapper::~libWacomWrapper()
+ bool libWacomWrapper::lookupTabletInfo(int tabletId, int vendorId, TabletInformation &tabletInfo)
+ {
+     qCDebug(COMMON) << "LibWacom lookup for" << tabletId << vendorId;
+-    auto errorDeleter = [](WacomError *&e){libwacom_error_free(&e);};
++    auto errorDeleter = [](WacomError *e){libwacom_error_free(&e);};
+     std::unique_ptr<WacomError, decltype(errorDeleter)>
+             error(libwacom_error_new(), errorDeleter);
+     std::unique_ptr<WacomDevice, decltype(&libwacom_destroy)>
+-- 
+cgit v1.1
diff --git a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
index 733552086e0d..382e2fbe52a7 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
@@ -45,7 +45,10 @@ RDEPEND="${CDEPEND}
 	!kde-misc/wacomtablet:4
 "
 
-PATCHES=( "${FILESDIR}/${P}-xlib-optional.patch" ) # bug 681674
+PATCHES=(
+	"${FILESDIR}/${P}-xlib-optional.patch" # bug 681674
+	"${FILESDIR}/${P}-gcc9.patch" # bug 686822
+)
 
 src_test() {
 	# test needs DBus, bug 675548
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index a9dacb761ffa..e91e4497a722 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index ac414f34a87b..e9b5c40bc28b 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,3 +1,3 @@
 DIST bluedevil-5.15.5.tar.xz 158216 BLAKE2B 0f7fdf6cf700e09a7b3468163e65bbc314960531f6e6d73f599bae98f52f19287a25fc71bf4349dd27791de35a992235ae2a884950217640253e15ab6c92609b SHA512 fdcf1a203ca78f6f36e22fc8bbabb2ea8c3f3fd63d4ba6c37453ea6b32a41311347685be68454c25e4e238926dcc1b6cbdbeefaad3ed384b488054a6a4e0d54e
-EBUILD bluedevil-5.15.5.ebuild 855 BLAKE2B ca3f20d60679aee3a06d5ca5736f2818db599b51ebd3ddd2240ad0e6f943c19159907c77a647b352d98bca836977416c7bbc8fffa226d97eb78da178caba5c1d SHA512 500f8db88ac3af5676d5bb16254e06434b96a3ed3e4dd84f0b4fa5317d2c9c32cbbd689b9cf0fe04ec709455f5c9df30b2f63511a8d0e171d5ee39f6ca6612f5
+EBUILD bluedevil-5.15.5.ebuild 854 BLAKE2B f8d5f9ab71706527cf2dd6291e53c2d6bee0e7ede681bba227191eb0822e8aecbdbb7c1b32ba02f639b1f54b8c0818d78158cd1c52aa425b35127195d7717c11 SHA512 08f883f38ccc2fbd166ede36864cfbfc8da52eed34b6eb253249bb91c7f1b8b76e01e1490c66e4682db4f94cad8050cf88210a71f72ac876566e5839fd2bb41b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.15.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.15.5.ebuild
index df2eeff82f87..0712de35aeb2 100644
--- a/kde-plasma/bluedevil/bluedevil-5.15.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.15.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Bluetooth stack for KDE Plasma"
 HOMEPAGE="https://cgit.kde.org/bluedevil.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 10ab1892775c..4a46633991d1 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,3 +1,3 @@
 DIST breeze-grub-5.15.5.tar.xz 3127888 BLAKE2B 0ee6733509a8e82e272e17ea6247dc3d32420e243c4989a04271a17b30e614d5b35f19a14aebc676fdffbcfe66130352ddde4b5c31acbb890e5a6aa8868d1db7 SHA512 fa95f67ab63382c12f9d5448fe114145c485b73ebc7eeefb4b3199c582707f88fdbc68dbd9c996a46d44004f0a0f759fe44b49d03391a399f8113b4494b64420
-EBUILD breeze-grub-5.15.5.ebuild 400 BLAKE2B 9e310fbee550ec508dd6c4aca628733a018d8cc7b20a2ace8afa09a33c9f4bfea9163057105507a0a97d314a8a3e392f1d55f8908e7be9b4150c912c738fdcb1 SHA512 47a466b8ebb43c49ecd3e753ed2a4156b1e742953f501987d35502330b51f0a9738ed225553db2e71cdcce9c356544cdc991c7c303a9f8916f71887a8e811640
+EBUILD breeze-grub-5.15.5.ebuild 399 BLAKE2B 03712756bec77cdd2ed02d4c1da83cc7c4efb71c492b14b70cad9c4911a8b662877c61692e0ea6ed0e24a1db490d5514c61619d4e47ae765e9670cd6abf28ff7 SHA512 e77a7122822f5805cb76bf40f336b08f3dc6f546cfac45dceff0f85a63d2c81735d07240f83b4ec5ecb26bef63b1a7d2fc9c846d4febfffa3c5ed599216d03f7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.15.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.15.5.ebuild
index f09c35124154..931934c8b2c3 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.15.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Breeze theme for GRUB"
 LICENSE="GPL-3+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 55d3a5083727..752f14d40fac 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST breeze-gtk-5.15.5.tar.xz 47504 BLAKE2B 3a6d4c656e652004e1c3268978e31f476c08a78fcf27de178edd94c1b1f568fcef26b971e52b89037922eb7be86ff5eb6189e8816a6ce6dab5a50c7d951da84a SHA512 61416aa88b50cca55df03b6eb95f6d5f6f7700fb64730668d777155c5ec0a892d00b9dd659f8a4ab86ba0c857d7bb52954563cdb8df2498f8fdfbea95c1cdd59
-EBUILD breeze-gtk-5.15.5.ebuild 614 BLAKE2B 7e20d220698daf13309bdc7ba79d6159f08a20f99011fda7f967a4349c234a7e7c60faf89a956f688d6ae0bc31b0ffc21822a563cbfedc8c8d7122d956854d07 SHA512 06b382d3bb76b895969e8f712cf207ac5ab4a0bf738f2ffe2a13b680d02b296b14640d06aa7f958180c42f557c92d8b77e72a63cb6bc8b6fcdcaf5285e3cf3dc
+EBUILD breeze-gtk-5.15.5.ebuild 613 BLAKE2B 53e90c7de4aaf18b8ca28b389c8778e8a1c9bff95f0ac8b12390a56309780ec8463073ecca20fe946da2c2c8277d4baf3cf5fc5c35cfb93a6eed76331246e46d SHA512 65f365d7b5d198981232627426a11441f3f0dbda52a832a27905e23292b647ae37a06c0d0fd1e103de96ea28e200fb73e76d58c0a1f311ebbcd0ce5d560c4e98
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.15.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.15.5.ebuild
index fc2c268446f8..0587632ef9b1 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.15.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5 python-any-r1
 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
 HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index e8fbcd171114..999be928eb62 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,3 +1,3 @@
 DIST breeze-plymouth-5.15.5.tar.xz 105724 BLAKE2B 2ba7c8daf2997bf8f422e687ff5636398eb5d84867814177c73a2d004baacbc2a25131585757efd615069dabaadd23641d646806d884228b2ac95805576198db SHA512 74df266881cebf5f1378975f6768e43e73a3ca4f6d8f1d73a4026eb1d046b9386887d40e8e8ad59fb9c96c45a6f63aa9b6c41a8d1740eaab4db515ab4c5a5310
-EBUILD breeze-plymouth-5.15.5.ebuild 470 BLAKE2B 5d14d2f9189f11468d21eae24b3c8df53756126f0da8ea79497008412423a02f81cb4184b8d2a9f80df1dfbe275089f084f4b2f065ca01066fa1eb74fbd927b9 SHA512 03f944c29caf89215045c894aa596c51beb87e3b15719cff37b6cde12d0d7888acac959ae5ee4cb7a916a73af53ab77e09ab602dbe11109ee3a21910c449b0c4
+EBUILD breeze-plymouth-5.15.5.ebuild 469 BLAKE2B d97bffa94aee4b2a074aef693231689e43942b6354b29e596db462a1a023aa5307164c949d29c7f9ab59194f0b03de683c00d67e249d68babb06d914f9cbdd9a SHA512 c9e51b0faef8a4d89f30885a7a1ab880d5fd3ef7ee5cb0d6e1c81a9e30f8c6d05f902df9096e40bd6f5677ff384cc1b6f139095c18eb12f98853b308f6aad41f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.15.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.15.5.ebuild
index 779ab1b5bf69..c52157edd663 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.15.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Breeze theme for Plymouth"
 LICENSE="GPL-2+ GPL-3+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND="$(add_frameworks_dep extra-cmake-modules)"
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 98738eaecae9..fe54ef7dba5e 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,3 +1,3 @@
 DIST breeze-5.15.5.tar.xz 25144812 BLAKE2B 00a477883384924cf9d77d659e9df4e31d442b94bbb2ad7b502e4cfd4aa5f40a01918654a738ef92db6ada834a10a7197d56ecb2994218a24d2ec0b0830f887c SHA512 a83ab125ed55f5da6b4e74ceecea5bbf5dc0f2b589b88764b2c0e501bfdc514e7b911e8a93b6e491f9ff0a22055fe8fa6611203f50b75fd624d7427e6c532391
-EBUILD breeze-5.15.5.ebuild 1148 BLAKE2B 5677d11ed699483dd90c0b8b08e860bf6342a1fe7156638cec318c73faaf6cd67b702dbc132b04784c572ed3d737579e22cd11e725e149255e8f9d2e135cf5ea SHA512 20bded45016d03007688b30dc4dfc6b83dca5b14d5f9eb734120bc006736a6e945289999d6d16f5bbee94eb7ea040ed69a16240635922be49a0f130a3c0c8ca5
+EBUILD breeze-5.15.5.ebuild 1147 BLAKE2B cb4dd4a77ad2127928d0ccc7d9c68c2157262d00be6dab67a23f69aefbee1e73292f3969841b09a6cc417b3f0b05687d502a882900a9cd4acb92db038016d900 SHA512 d65378322946d4cedcccd1e09b5146667cbb311785845da84936299d45d3187cf0451b5dd18ad4b698f2c1d006963555bcba2c8c27b2fea4275a89a18fd30e0f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.15.5.ebuild b/kde-plasma/breeze/breeze-5.15.5.ebuild
index 025888a0a755..2504dba5e701 100644
--- a/kde-plasma/breeze/breeze-5.15.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.15.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/breeze.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="wayland X"
 
 RDEPEND="
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 1635230c6e7c..6058ba446b7e 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,4 +1,4 @@
 AUX discover-5.15.5-tests.patch 1208 BLAKE2B 287a2e6ac59f012577df87ea3358514813c958e085a6aaac552add865671bf02cbaba8bc770234b5e647c02d7f097c8749d8053a8e463d5605449686a03ad6b0 SHA512 a51541e75d056c1ea6cfa16a20aca221bb56ae8a940601ea4b1d4b5431366b807d5bf6832733a86028dae9901a4eca8aaf89929ffac896bcfc5fb20eec55d914
 DIST discover-5.15.5.tar.xz 10447644 BLAKE2B 456acc6bbbea216cde7a535fa591ef76316ee07f5ba57e6b3c6c20536b21877eb210f381cba8cc7c114110f3f7ffc4244163174bf8ae95cd022ca05a4be16bed SHA512 fc94bf3d93423d6327951c8ba76c2a08c7bd19aafbca7333e159af7500d1a78b464f7b5824b9168c522f052ca6cd322e9b5a26abd74657b99c734bbc7b864a3d
-EBUILD discover-5.15.5.ebuild 1584 BLAKE2B 9eab9376d186a5cd4f69a7091591384808945246d0f9e662c464e019279aefbfd8fa354c2eecf5640297c99bb15a870b4fd5d53b816182a59cc69ef5d23046c8 SHA512 29e2b6cdad1d7989987e385e3fc5167d182b71ec6de4805302b0ab95ec5ccfe8038501dbe7c4e7670c2ded95bc00ecbf6620e0a45a3f25ad2178d3c3a413cc27
+EBUILD discover-5.15.5.ebuild 1602 BLAKE2B b39611d39bd78d229a7bd5870ea61f6cc43c7a62a37ecc9c096fa74d38e781a3c5e97438b8da4c39329c6ba7bb5df7e93a14599e380669954f9c1d4945d0c004 SHA512 443155262ea5be8ee25ac4484e73c469b7c0192bae03ec1afd4cc80ee2330720141257b96fa6eb19a3b7edb1ba6e15fc9a4367b608f76e9f94b912431eac93a9
 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/discover-5.15.5.ebuild b/kde-plasma/discover/discover-5.15.5.ebuild
index 2844c35b75d7..2623796609c7 100644
--- a/kde-plasma/discover/discover-5.15.5.ebuild
+++ b/kde-plasma/discover/discover-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma resources management GUI"
 HOMEPAGE="https://userbase.kde.org/Discover"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+firmware"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
 
 PATCHES=( "${FILESDIR}/${PN}-5.15.5-tests.patch" )
 
+RESTRICT+=" test"
+
 src_prepare() {
 	kde5_src_prepare
 	# we don't need it with PackageKitBackend off
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index addcfe4549cc..c959954af39c 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,3 +1,3 @@
 DIST drkonqi-5.15.5.tar.xz 738752 BLAKE2B e0a48064a1881079f44c727a1bc08b9e8906b2c3e83a3def8b5fd406b6aa4d2982ebb885f3038692568293da2d933d521735724b34b40fbbcc96b139c1595740 SHA512 812206194f095a4862023a085ac2975c107e2774010598a6bf1b9b88b8dfa1e78819ac4012854d607a61bcba6dc954554ac178ccb3fd304ed27adddefa1fe8c9
-EBUILD drkonqi-5.15.5.ebuild 1340 BLAKE2B f84cc6fa3c7c3fcc0a3a4977eddc42b38caed871227fcf446219f925a9f6989f34f0bd5d40931958c5998115c3df1a2d3cbb925cee89834200a2aa02eda519e8 SHA512 d3a80a12787764a2909b3063f63665b7cb2bc24a690bbbd270f325c10e58075651e9a7b50288281696ff78c2dba414e63bbe01f7f74cb14ac7be4d5cd1dd18aa
+EBUILD drkonqi-5.15.5.ebuild 1339 BLAKE2B dcbcce6cbf6b138ffe393635fc24d883dfff5372bdc8e7498f51a151d5f29ac3c0f2b8712cc72d128ed07c4e741aa190f280ccc32575710934a6dd2629218465 SHA512 bf96866bde31e85e6f74da029b35980c549cf3fda7d7fa9c32b0896f71bd0fec3aa32288bebe97470b8411c37f27c17bd4b6059db6bda7f8c81c78bda042358d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.15.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.15.5.ebuild
index 2ed155c36f40..310e0085fc93 100644
--- a/kde-plasma/drkonqi/drkonqi-5.15.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.15.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index ac533292e96e..0b491da22d52 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,3 +1,3 @@
 DIST kactivitymanagerd-5.15.5.tar.xz 84756 BLAKE2B de13492cec3c4bdb29a8be01777c21cfc5c36c7f644d6d6fd7ef2bc502620031be1c94397e5b7806095a93e9e5eae7a5acfa149c3bc809635f3f3f43b01b1aa6 SHA512 9c9c066ccf7b56ecb0816be5db82dec7d89f9a834ef75a0f96d073d0d15470a57a84f811c17feb4edbf262fc44275d943fd7e06ec2bdb53860a4f6a4ea1b64d3
-EBUILD kactivitymanagerd-5.15.5.ebuild 838 BLAKE2B 96fc29e30c0babda6581a74a968d5e90a3261394178d1b336a866e0bb480a01c14f1bf86b344416f64ffe934d7bfa5101a22dff864806db3da1c938c5b95e1d2 SHA512 13415185cb174f7b623fbb380098af2b980f3243479552e606faf404460d71ee4bd5b43d6f1328a6df759b0f6612a6a64fbc9902c3c47bc2304feb9881642897
+EBUILD kactivitymanagerd-5.15.5.ebuild 837 BLAKE2B 2a3cbe80bfe87d04be976a3d5cb0f9f3e3374620a76d1ac6c07933021a4f6b9d05294fbc9b7bfe088a2af491f6acc584e5b4896ecfacd4e8c309a67d0c2f129f SHA512 ce10a062c7f60a6b44691624dc82ccacb900ff43a88e812a2b1ee74304702b67412996a345dcf011a6fdcf905dd9d6c1c6785f4afc9b84d6e4edc6aa054dc1d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.15.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.15.5.ebuild
index 06e772ab52b8..e618b0067182 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.15.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.15.5.ebuild
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 4cc345410aa6..e9c9a46bae41 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,4 +1,4 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.15.5.tar.xz 585788 BLAKE2B 67693b592af030aac0b130b4233fe770eee2d4d4b82c7ee1997770403e7eb9138f997681a564e349a16ba9e119e95ceb7dba037f39f950f48a0a01a63f447770 SHA512 f7f9f8af72e6fe421a22bde996b5abd5ab194b7fb6b7252e63761658b143b98e8f49783b2a53f15b45c16a6dba6b064293237bd51ef7a61371293bdaea9359ff
-EBUILD kde-cli-tools-5.15.5.ebuild 1543 BLAKE2B 7fb47ee5cb6b86f255667aa28bf412cc62e20026b2b7f6684e83fee7721760e2d3f6a7189e98d7c5a83e8880b6250b4043bf0e6a04a511d0ffc2335653bbce4f SHA512 5f02518ece0cd219345486912c6f694b42e23f78d6aff1168239e20779f2349af13bcc143170b7a0ad14498242eef9478cfd43d7d911c028ca45ea9ead533cc4
+EBUILD kde-cli-tools-5.15.5.ebuild 1542 BLAKE2B d45ca4e837e59a2b0b26142c7d2f9dd28129d64c499751ec1a086edfc49edef97546b6fa914ade07c60da96b37d2da52152ebccb909650c6bde968d41e072fad SHA512 aa02bbf48bb5c79186006e68fde4d08120c6c5b0ec4ed973a52dfbfa53c756e571a7cc58f2fbd31462e66b487e5ff25ad40fabbee15bf7a0c0e8ea12fa3a371b
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.15.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.15.5.ebuild
index 6cd1d987c87f..c4587291ae81 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.15.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.15.5.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
 HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+kdesu X"
 
 DEPEND="
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 9d4d7a7c8b11..60944f653eea 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,3 +1,3 @@
 DIST kde-gtk-config-5.15.5.tar.xz 156704 BLAKE2B 8c53c009c028ff15ab7ec1c8d8e5283c3b734ea92265962b3bb2459def86fbfe1f5b42af2b60eda1c92244e40b8ab5c0471e937ecdbd5564ab4551961400d78b SHA512 b783dd7451fe52a79e92e19c40f932456baa0522b81d982794f8677a26f0907bbf1f7817cf54c988d4aeb0e09f761e665e9f70dab270a7bacf54c391ff31f8df
-EBUILD kde-gtk-config-5.15.5.ebuild 1246 BLAKE2B 0304f20665184c5d4522fdb970fdafeaad202f29a81e60ae882a5f480df622656ad31174d94b631a633c5d165266abd153c5f33269ed4e00b1191447f5f261ad SHA512 d0fae66360e02c9187c4176546b197f0aad6d984b56755e63c1d0c9dd396c017b81db9f6a83dea82c6e8bc221d4b6f4caa1eccf22c45dd1f31831e34ceaec0e8
+EBUILD kde-gtk-config-5.15.5.ebuild 1245 BLAKE2B 3d1291f02a58851e8f39158a767323d4ae2c8318a4e1eed082c7ce7a4f9525ec08f2b19ae2e9da8db166870f24e35a8b3b352c57295d7439cabb47972b46e01b SHA512 839b86c955d8e5c004bb6fa62eca8fdc757b31f134ffcce8ca27dff70d70acafa263b22b7edc4a75733c9f9909fdcd248dacc7508cde8f93fdc770e997b6fd89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.15.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.15.5.ebuild
index 31d7dde1dfc5..035a36f90661 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.15.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.15.5.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
 HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index daff4d8f8d01..efb470022250 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,3 +1,3 @@
 DIST kdecoration-5.15.5.tar.xz 42492 BLAKE2B c4b458e7b174b6ef395edca08e0c0d3787bb30596f76c538a8a537e31314f4f00f55751de92df80058e12ae0a3bc504af5c32aae7ee1b4664bb4495b71d4138a SHA512 8d004eacbf43726511eedfccd489eb91c2324aea948e9ecd111eb20b5bf89b4b88c3fefc237fe1d44029093e52bfa0cf58dcd641701364e51661b0ecff5f67e0
-EBUILD kdecoration-5.15.5.ebuild 397 BLAKE2B df2937556207efd39cbdd28f1220186614ede0aea1b24c148af95068ab8400baa9f6617c6cc436883956cc2ef2cd674a92901a33dc2464fe12f11a8edea7055c SHA512 f9bb327c57fe803546bbaef533db53d75ede3b78778c763741b9ee48e59aca0e7a61f60402debcf8e49055447302ae6e2732c6167fbd56afa6c8a27bdcf2687e
+EBUILD kdecoration-5.15.5.ebuild 396 BLAKE2B def1e5cbd94c4458d72e54b32a30ca73db9e4874796fd410b62847c4127d300ad814172da1e2e11f14197ed186152ee784e89c8986a7ef1216f5eab2f3cdb783 SHA512 577f92c9bf3ac7da92fa8f493a2ad4995c27855b21ec36b1de4cc307fe1972dabbcfa72a60aed125017e4144e67037721860dbb170a3210b8e4b5c545732721b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.15.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.15.5.ebuild
index f9e728b6d768..72892131a52e 100644
--- a/kde-plasma/kdecoration/kdecoration-5.15.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Plugin based library to create window decorations"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index b1d36f5eb543..7572f9262e94 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,3 +1,3 @@
 DIST kdeplasma-addons-5.15.5.tar.xz 604584 BLAKE2B aab24f3f8fee18f4e54a7fdf4edbe35923bf96751f27a656d60b141987174f257ae19b77301dc9b77999ef0f8c439cc3cf71be75a2d4a0b9623e2d23e9ec66d7 SHA512 cc0dff694c71645072c6a56bedaa9067a4947906e5167cd55012868a1554beaa5278d2e4f41092be784c8cd9290c03b807f6622a24941dc0b0f733442355fc80
-EBUILD kdeplasma-addons-5.15.5.ebuild 1503 BLAKE2B 47aaad2e83c9094910fc99edcfe590e7dd260939ab2dea21e2da8a576fc27580699ec60b33c3fb489ac54df5d55ff6785c315e4aa151dabc1a8248260ee66072 SHA512 7f105dbdef368ca5a44d56be38c9ed60bddce1846148335dfbfade5fa503b2d95788f22c34008ad7e5b3dd869fd65e272cce753cb15f4608ad95ab1fee1c105d
+EBUILD kdeplasma-addons-5.15.5.ebuild 1502 BLAKE2B 76742e80bfe694ba50e6a6939bec9d92343393cd3703e368cbc954dc9015bfe2a1e97117f5afee0420246ce8293431e07c7746ec8362008f9000dc8f10f4e6d2 SHA512 77ce447aff550b73bfbcc83d09f2df741d81d94a54101908f3de22226cb85aef5fa7107da7e0cb8c78056a5b76b0feb32ae55eda179f62d5e8206e90c65ea19a
 MISC metadata.xml 465 BLAKE2B 94fe9737b3b632b7c4cb0907ebe49ada7f7216ed88f5132f0b24f5f0b9532993744f9167c775a265bfe827d6b4d430c3949d82da49af275c286003f1d6f25bbc SHA512 c4800f7c56aad0ee306380ddc0f09f39c48565320d38349fa3d3a11e466b40bf35d2bc593fa70c3768dc940f635319ad848724f0ae537d12fa680e24d83110a8
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.15.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.15.5.ebuild
index db2986bf8434..6c4bbbb1a6c5 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.15.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.15.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Extra Plasma applets and engines"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="share webengine"
 
 DEPEND="
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 3f38a532e7b4..7de0a337c92a 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,3 +1,3 @@
 DIST kgamma5-5.15.5.tar.xz 79316 BLAKE2B 369445730b506756e0f18d0bf78106d1795ea2a426996c7e8f9cb8b335e26e427c5d0ce2f4abb3edf8948096058cb4f09e8a7ea82a22291c5bb2326dd01ac5f2 SHA512 fea6a5242aecf366b9c3e908b4d273efc8cae66ed0077d526d8e508425265cf4155503a999035ab5e73a646ed68131b783510634d553f653a964a5f8d8ac4fa0
-EBUILD kgamma-5.15.5.ebuild 535 BLAKE2B f891b3b2129dcc928660a3c27fa016b24c70e7e676447b9aa6729324d42caa0f8c1f81abb8f3266e64becf0e09dd8536c7ff9b6eed27133234373d96205bf05c SHA512 f34eeb5d8cde74d5d14b9072b577c9af31a1f27e829a030505867fd3957b27458e1164fc8f8d8df124990d7677c1f1c3fa93c1c942be8b333164b69806c3c7bf
+EBUILD kgamma-5.15.5.ebuild 534 BLAKE2B b61bce78381c052fd20126557860beaade74fd4e71fb04ac2afd3d2d39a24d447cdd567fd098c9455f022f2fb7ddf4ae22fbd304d6590f5a4e2f4c4e3bfd0c07 SHA512 ab62a94185bb03aeef4ce999e01e937006b977ec4e2739590d6599b7fb4f775853bb6557db78a257312e5e2e66ebd101af36beb9fc6a9f14ef2dd187923f39a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.15.5.ebuild b/kde-plasma/kgamma/kgamma-5.15.5.ebuild
index 7af0b9c2cb2f..9bf58f5a84fe 100644
--- a/kde-plasma/kgamma/kgamma-5.15.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.15.5.ebuild
@@ -8,7 +8,7 @@ KMNAME="${PN}5"
 inherit kde5
 
 DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 9005ae85b4a7..763bc4cc8a51 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,3 +1,3 @@
 DIST khotkeys-5.15.5.tar.xz 1865968 BLAKE2B 109748767e2119b9b54d29eade0bda4d5c696e67b35c549b10d0de19b890dc07a24e4108c3877046ab7468a4f98b6fffa03a818da11c00febf1f168fba7cfec5 SHA512 ad6f99053d7be4c530233d5384f59cc77b3463e1864135cd45ca17ee3eb483f8d503c089963bb758905d0c9e80a3248331905af117e01bd10a24fb4a61be8f08
-EBUILD khotkeys-5.15.5.ebuild 1119 BLAKE2B 21bc96655ffc4904afad74a0e15bc946d2b81380d504ad17ab2af4968280d02849f65d1d91fdb8d8ee959e3e79033f0690cb97d135c47e6b2c0e965c6f936a62 SHA512 03b5ea59494db9668afd4f577a0955ddc2d7799c05e985893b50c68ce2ef5d0d4865019a75141af9a5733b1ba9c4ba565265f28451e2f8e86b9f469b64ab0749
+EBUILD khotkeys-5.15.5.ebuild 1118 BLAKE2B 85f6887495e61d2b0fd9febe31963455c8144d9f22b8baa69a7e5e7a7daba6333fb940d8219a94166241949b778f684ab9ce2b0c2ef5cdd5be4f031bf0a379e2 SHA512 aee5200908e2dbdbfecefeb6d4dcb8638d176fbf31771bb8221d409e91065ed117ff91e9e731c4cec3a0cf034330452d8ee5b7ee2d9435a01b98daae84812353
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.15.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.15.5.ebuild
index 472fe12265f8..bfede84a5c01 100644
--- a/kde-plasma/khotkeys/khotkeys-5.15.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.15.5.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
 inherit kde5
 
 DESCRIPTION="KDE Plasma workspace hotkey module"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index e3246de33609..aeea033d6625 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,5 +1,5 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.15.5.tar.xz 1321684 BLAKE2B 51a3b49a5b724d187f58513c87f0618b1ee71d00e4ed51019017ae427602b7135d6bd9419714c431e3440f8a27152c4a72951d929b727f200c5cf1d72fc3ac84 SHA512 d75561edc65701097e4c9249f1cb7208e14ee1e99acbd6521606c99ac8e4ebe9ab42a804d8ef7bcde138d3189e3dbd9aaad088563ae6364418e6119639ac3974
-EBUILD kinfocenter-5.15.5.ebuild 2590 BLAKE2B 14d77168e2b9329eeec00175fd18e7549644fafd24061470fc72db26fcac47dc9d7759786fe3611db800bc66557070395a82fe4693dcdbcc16224a5810e8abaf SHA512 919c966b387e08701e60202ab7a480097eb0696119117384937dbc805df3956af53681f26e5c98e1abe193387e123a03d019d148903813920b26d9a415955446
+EBUILD kinfocenter-5.15.5.ebuild 2589 BLAKE2B d3e7a577e5f2bc418f0dc3783efec94e0572b51e1844c78ccbbb810d6dd7c034274b11263068e70f855363a7d7c6c023f039de212c3289ebd1a1fbe323e95ae6 SHA512 7eb2535a79e4df4207a038870f5f6c2828ce57ca734ae34c3958017a9e1bcac99b9c015af1e6824fc3167e8235d536715140af9963448e6fc478b1411a38a754
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.15.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.15.5.ebuild
index 92feb8ffd981..29d4e8ca12f7 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.15.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.15.5.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Utility providing information about the computer hardware"
 HOMEPAGE="https://kde.org/applications/system/kinfocenter/"
 SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="gles2 ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 5ac97835e95e..f042466059a9 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,3 +1,3 @@
 DIST kmenuedit-5.15.5.tar.xz 810152 BLAKE2B 16471f36f678e628079901b66161fc81dc20ebef03d70d64716b618050068949ed790f2ab299a89c7a7f61534bb0fa325ac2277518a70f4a46de19bd9f5a03f0 SHA512 ef6883e554de54a3391653db8b9d307f39f2fb35401f3c1cca733641f0f2578d3dc0763c62ff4bb581b816b4699a693d9c5db6b52b2feaeece301f1777b9c818
-EBUILD kmenuedit-5.15.5.ebuild 1046 BLAKE2B a60065d1fe7d309afdea6a0638bbd36467c3604eb2a87c6a31d24d86518eb4b6f39162c63c1b2c2a3f1f6d0dc92eb1c688616cc96babfa94bee26f4a240f1811 SHA512 088a04c3bb8da27d211eb5e81fde50dec04433e2dabb7840caf06b8569644e028eeb3d0e6f0aec159bfe99fcdd0ee93dfaadbb099b889e0b4f8ebacc02d6db45
+EBUILD kmenuedit-5.15.5.ebuild 1045 BLAKE2B 2b4171b9a7a27c95ac9337cfefcad9fef0ea9a28acb3ef39e4b2ebd16dc858762030b356e1298ff0dc98452d8833a591b214562355070b24acd10d6f0acf44ec SHA512 f1c29537e2356fd1b24f994b018e7cd7401470ea5162f13fde5c26e8ac6ede7f9b44a397d84fc45f410ec0b3aec14268e57c76d7d2f81420387b57ef635ab097
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.15.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.15.5.ebuild
index 4a49d4cb99bf..6670ea3994f9 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.15.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma menu editor"
 HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+hotkeys"
 
 RDEPEND="
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 80ac6c2da700..f3fca04ac3f0 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,3 +1,3 @@
 DIST kscreen-5.15.5.tar.xz 123736 BLAKE2B 038e67270053fcae648ed90a277c0b04455afa9dd788943b135ebad1d57bf7b0bc9d5c70629e530b900747454aec829e476245340f08c8d5aa855e677765318a SHA512 29776af422e5948f9563b94609472155e2c5ea762ba40d362cf76469f5f9347f56103b819ccbd2a4b9e8b88080c1d573adae6dd6648a36d817ba71eb93ade809
-EBUILD kscreen-5.15.5.ebuild 945 BLAKE2B 888f06bb0a554743bfcfa8ec30d9e719029976e911b18402c78286bbe0e94fa7888b66040fbe9c08e98fdda1a12f14a0378fe4ecc37f1e0e4433230917f8d26d SHA512 ff1e7f3ccac92799d85541bdea2c682e2c6b10a778de1d4f1dad30519664e61874c9ca3c3a7558c6f31afb51200b74cb2e0b7daeffff0d773a6916e9aa8d1f6c
+EBUILD kscreen-5.15.5.ebuild 944 BLAKE2B e3efb10975048d182736edc78a5fb7ed55170a41fbaba70b8ab3e566df19c9e138f5ce60094ce5418e6270ab225eea0dfbd0374fa554038e005a3f0a70ebfb7e SHA512 f81c103d465ee6fb15d791b014b14c311bb63e594314648945f68bcfe691f6308cd78c6eb8bb550461e1bc915d6b14a54a88a2173cd375a495487da5b4e03fe6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.15.5.ebuild b/kde-plasma/kscreen/kscreen-5.15.5.ebuild
index 135ed0814042..ff19cf5b12ed 100644
--- a/kde-plasma/kscreen/kscreen-5.15.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="KDE Plasma screen management"
 HOMEPAGE="https://cgit.kde.org/kscreen.git"
 
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index d54e65279f5c..f9bc9d457446 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,5 +1,5 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.15.5.tar.xz 122620 BLAKE2B bb9cc80585c74690227f2f72961ff2ee707778fd4eee541840df85d04da7b5a3e8f75c7378cc4de8e45c41e1b29b67725e9b23461a0e8ff4bb00aa046100f851 SHA512 95325d3ab07afea22a10e17a2bc0f4412d57b96385b6fc058d1b9785a07914e1ce89af7a8c773615f884263dc2136fd7c7eb112dcec9d516a267262c37d15d12
-EBUILD kscreenlocker-5.15.5.ebuild 2136 BLAKE2B 04eee287704362576edeb503acf3dcdc51b33158f389c1f81b079cb146d79a8ffa0ab3bb1a20809aff56120741338b546985b987ab52789b3165c41d5641af3f SHA512 b1a346b1f2f872735686b978ef247af6af92bd81c7f92fe5059c4f4e37ea74f9d216460b0c990db25b42727e03adfb38e54db181575521f48d3360b91c2d88d2
+EBUILD kscreenlocker-5.15.5.ebuild 2135 BLAKE2B a14c5c11963076d1a03a4fbf1ba8985e102cf9c4e6e6b0b2b7f304e25d36c508d591e2926dd407478bb76618236a3e070b1a4c286bad0b9c15b52a8b44307311 SHA512 32322bdf390d97b2d110423055e4232e15fdaea889c30e9d84b808edab65f0e6515c110e9a9d8842fee2f94a55db25bc182ca14ab2c5439b4046156b15553e59
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.15.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.15.5.ebuild
index fae09b10c85e..be1138d93235 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.15.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.15.5.ebuild
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 pam
 
 DESCRIPTION="Library and components for secure lock screen architecture"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="consolekit +pam seccomp"
 
 REQUIRED_USE="seccomp? ( pam )"
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index f6298fd89d4d..72c848682a23 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,4 +1,4 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.15.5.tar.xz 21304 BLAKE2B 8664f783d08d789aab81e40cc6d0a7248f0fe25bab20803579ce0c3869a412d2fc8fecf709b4bfe7d900dc7b9af59042d4e648d5b5730a8fb7108f4ac39ba362 SHA512 296581dafc7068a0e536fb3f10dbd56bd288bec5b93f96e5f7d7b03be6cf9f279dbdeccc8c53da21316fa18d758e92513d8f5441d9e80dfee452c26ef1dddcbc
-EBUILD ksshaskpass-5.15.5.ebuild 1209 BLAKE2B 7ffc4c61112ea76edcc1c931da240ee1aa833455aa362359b22e5d2cde7c5b3883e789b8884463f1203b0dbf44fcb836f059dda72a45ce2dd3687ccb36795fb8 SHA512 0fa25924500ad96c286e0206d5c79891273ebcca3ba2894f6977df7eb8eeec0b615d5d6b00770d85b28c071465f19afab252e900d83566194bebe0b17c85dd8e
+EBUILD ksshaskpass-5.15.5.ebuild 1208 BLAKE2B ea2987af04a4d3f03040a66a782090fd7e6be7194b30bb9dadaf2f0bb01e95b12616efa562563f4171ebbb9489828a37dc44416b394b5d242e1c17ec77d4b43b SHA512 a1cddc2234d04f3df3ad15f81c50e2935c752e9913d69da6b0bb6e0c7a1c6319bc63031a33c183d7b66456fc628fd62f166b020db34562aa1ea6ebedb0012306
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.15.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.15.5.ebuild
index f219ee48e66c..bebd3ba15c05 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.15.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.15.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
 HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 643733b71144..dee5d6e44f49 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,3 +1,3 @@
 DIST ksysguard-5.15.5.tar.xz 500116 BLAKE2B 1a22e419af79685e241265d392eed7502998df88168adc4292c8500a152a8d1142d56c4a34dee409b29745d8a07f889c241b3ab9ab8f09f3eec68d1ec5826c79 SHA512 ae74adac0a4b20d9ddcf9b172542a3c96de46adb66b2f6c1d4e5f97562572e365f777d1daffd82e677ca1be37e868425112f69bd6e85e51118dc557f66ab5b8e
-EBUILD ksysguard-5.15.5.ebuild 1116 BLAKE2B e886e3a641997c80097894b30e3f516215601e4c19d2ad8bdf0e2088b12b6a1f9d62cbc9f95b0adc685fce6694af65b45d40c79f80adbe828e0dba53ab8bdc60 SHA512 439066ec4e5aea1e3f244c81637ad369cea8beb65c0052fcbc622a647a19e75ba1f5293ef5c23fc9712df3ce055cd692b884de4c2e57cef22578df6f887cd3c4
+EBUILD ksysguard-5.15.5.ebuild 1115 BLAKE2B b111aeed28af34f6abec20f61a9fa7b3c6e3ea4705d50d351a726f3d7078885250f60fbe6b4dc82ee9971365eaf441030ea2ead6142e0f21532cd1b922e66b05 SHA512 3f84a0ef64d5b2741e31599d2fe79ce886967cb3e232a63faaffd07439567c1390804524be22353ed8f26c7bd90a64aadc1a2e99aacb2a5fca81035bbd47ac9e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
index dfd14aa9aa92..e8a0d00137e7 100644
--- a/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Network-enabled task manager and system monitor"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="lm_sensors"
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 9842b4461c42..cfc9c816aa33 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,3 +1,3 @@
 DIST kwallet-pam-5.15.5.tar.xz 19332 BLAKE2B b5d552500584888d6fd2662e7332623f51ec4a90885c983f492fbff8768b144a5d0bfff8e7466f68b833bbea436b9424b55f221402e1c9ddc8626be63910b521 SHA512 4a1a0b6f4d607a71b2dee3317acd0af1c76991a628be50d67c8231d756255577fe90e0f938050c8f6d6f295d5299deb8a88afbd7eac28050d3b905267bfd7636
-EBUILD kwallet-pam-5.15.5.ebuild 641 BLAKE2B 3b1eff26127ab2d0c041cca82effacfbb61a244662a6e2303d4104601d6b7c07e6ac40cecf8e0076b020aca06aeabfe5ae02097dff5186ae8d3a1d18aa80c9c7 SHA512 74b9838ff3614247839c4bacbc3b659e3a0c71e11e45dfbcd97c301227b02f026c96dc71c75f9a292c179994542704bfbe5893ed7214c4756e1d5a285c4ee849
+EBUILD kwallet-pam-5.15.5.ebuild 640 BLAKE2B 1eb4773d6f5e02a860e49fa0582fe49067b89169479f41cbcaa4b2a27b39529d7e4a9ce2f7d882501aa8c19b7b6a89c7f814ea337602546eecf39f282cac5094 SHA512 be24e213ee8eda14bf0e4a2c49af3203755c4b3fe126500b4895270baf8aa3577473c0e58c2b800759761f5f6b4ce746776b5b5af33147f7691acb8a7526be15
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.15.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.15.5.ebuild
index 7f46cccbe03c..79db1a17204c 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.15.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.15.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index f50a22371eca..e24b61b62712 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,3 +1,3 @@
 DIST kwayland-integration-5.15.5.tar.xz 18820 BLAKE2B b71beaff2c0722e1d824f833d130e2577c48716302210bf34f74fc3b5c9defd5b7501998a7f3e3bf922ca488ec16c36a18a7d881b53aff46e8e6bc60f34a0d45 SHA512 87051e785cedaf373c36cd17519e7e86d3110e6cd6c08fbff27b8fe4a890c1a935dbd6d096291dad2788be849c1c4e17bdb8014fdeb3383678a6b36cd30bab1c
-EBUILD kwayland-integration-5.15.5.ebuild 555 BLAKE2B fe076b1e4be7740bcbc70df9f8344e009046ffc78ae313c6b4d250e9558d2594c452f957d9aacf40959b21c6a81f1e1ff01602ab199634e39f191ae6462066f5 SHA512 dce69ba7f3522a108e13b258f839e0526f364ac946cdbdf14a6da919d4434c24b4cfe4b7dc53e4255580b2194e20fe7d354d56daedc0d2cc51c9587bc6b2c292
+EBUILD kwayland-integration-5.15.5.ebuild 554 BLAKE2B d28247ea10e8f9f971e66720bf70d7ffb84f0707d8c8a301ec5b80b3944c1b58850f2ee4863f3525104f1fbe6504ab661711bed51e306e958dd39f8bbf82854e SHA512 d27d7657ffa91e210bcb979a02223146041c1b98dc8e67cb62db28de28d368203a0af2316cdda2d8c1d70c9feb6a4b21c07e0d4448551831d4942b4460f46a59
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.15.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.15.5.ebuild
index e9d4f868d31e..4e0858fa7924 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.15.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.15.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland
 HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index f5be1378f82c..f4d30e2a998e 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,4 +1,4 @@
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
 DIST kwin-5.15.5.tar.xz 6237440 BLAKE2B 6e1b2bccb9450a15cccdf258c9b75e5651539cb05619dec72f4c02ba555ca3a98f57d8565d1ba59a0e85436bffc7e1960f36dff7b7945789f577c28892a5871c SHA512 2ea3af33cf79e7acde996c87507d277f114f2491ff3090cb0335ce6d026ae06c6ad83aa3fd5b86bbb01791cca747291ce801fc2d93d20e6d7b88f709893a3f53
-EBUILD kwin-5.15.5.ebuild 2629 BLAKE2B 619fccd7a82057c387233722257091544b2128f3b2a86fb0e4220b6e763d5a40153576896363c2ecb67d6d0ba1be07c91e8a044571711be89428339025de77bf SHA512 bbe2b6a298a29a6848bf3d15e2a52f23c20958bd9da3e5fb24e2e2a458814021cac3d73cf0eee81b3bfe17fbef140360e9e837c7a99bbc056470f33559fa1c47
+EBUILD kwin-5.15.5.ebuild 2628 BLAKE2B 1d431d6cde25c3e2b5aeca1d0bd3ae8a4cb55768a2807785119ceb51dbf0e2cb8cac9a8ac810b11983f6e0eb3ba29d2615d49d0cb1b9089d13c9f59e7bc5a022 SHA512 48ca659b58c3b2d027e2911cd7ad6a496879a32df4b7e477d841d2fedbaf7f27b64c3094da01b0262db06373d77a54276164934df16c9c2e60af77b081b9a311
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/kwin-5.15.5.ebuild b/kde-plasma/kwin/kwin-5.15.5.ebuild
index 14ca549c2bc3..74b33bcceaa0 100644
--- a/kde-plasma/kwin/kwin-5.15.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.15.5.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="caps gles2 multimedia"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 5e4fb5910f2f..3f55dc729ba9 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,3 +1,3 @@
 DIST kwrited-5.15.5.tar.xz 20024 BLAKE2B 58648cd5867f0a07636e2ed9e299cea98237ccb4845aa1cd9897cb910ede6baff6def2e2f4ad42b4c90de0b5117c0c269efbc69a44636690a80b36235916236c SHA512 0c59ac76a64a20e49e14681bdf7a67194749a84ebb2224bcf183943d29f4e3669198d2a82a156a9d86b4865e1110e542dd5243045844ebc0e0bfa98bd6134089
-EBUILD kwrited-5.15.5.ebuild 481 BLAKE2B 0d9125cafb702af190dddcb4470efbf9015e4c26fef62790e52754d0d63a2bcd9bea39dedcd24d66b1550b83ff699f882d613403ba172df2ac3438b2b236b76b SHA512 82c62b58dc3f4d6d29aaeec7c8c5c19bc5c3d32046959c0186adde2a1ac5088eae26717cb9a53c172b10ee5624dda712f93e14c0de2ae797212c8a87e04adf8b
+EBUILD kwrited-5.15.5.ebuild 480 BLAKE2B a6dbe8ff13271f2749d8be7b30edb1b95df36671f12a75886e10c11070d5886e6680a7387a9b3d484fab03eb88abf9c9dede01b0e66a945f5e5cccf5c981c277 SHA512 afa3ce11dc93eea3e08af463ff22af8f37350e774f1c967f4e80cc36cf4e0a5d9538834e9b455f131ba3c74471383ab286099b58334fb7e6100cfdb8ccfbb14c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.15.5.ebuild b/kde-plasma/kwrited/kwrited-5.15.5.ebuild
index b1d3b4863e99..c53490533113 100644
--- a/kde-plasma/kwrited/kwrited-5.15.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.15.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit kde5
 
 DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 5dbacd9da438..cf3272813314 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,3 +1,3 @@
 DIST libkscreen-5.15.5.tar.xz 81000 BLAKE2B 53193ee41d81576c8f87053dfb388ff1e13c1fc7800956228e9f3d5e776789d4649e41f39829152bd51ba0de9a1ca6fe87b63e0870327947dea939da05488c81 SHA512 038ea60f534edfd1ceaf523a2d00ecb53f62b6f64ce9900b1313f9ab25b7099146167cbce50b31c799644fb0d5c9522a9bcbaad81e9022feb7532c911b2ec030
-EBUILD libkscreen-5.15.5.ebuild 491 BLAKE2B 686743dc6bbd416e75abb74815ea85089b85329df3fe8ab0a51a9365079371853bc000fc6f7f6f6275578d434d31ba3f4e64f35916c3c0f0caf20c6927a674d1 SHA512 2d66b9a14a08e15e52725d9c9288f1864b4d8e173b918bb63d2d7c2f2d23adfc4a24b6b5131d521c6fb33426db295574f35459ab5eddd601942f3b2bfe6ebd03
+EBUILD libkscreen-5.15.5.ebuild 490 BLAKE2B 650b346825abe5e379592b4054ee2fdcc5f2bbe5ff081550a8179f2d48f6d85e47d8e960b9c3105cc8b9c817c519ff7774dd091e6e17d0ae20c3ff7caecb1084 SHA512 becc6a71c9cf15fd0ca4782dc6a7afbd94f938994ab33925401d5ce9d2d87b4389b2cbbb569f354d7dc6e16d06626decad627856b6405f5ed1572e7d0c854310
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.15.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.15.5.ebuild
index c571be2d4192..c8768f3c1525 100644
--- a/kde-plasma/libkscreen/libkscreen-5.15.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.15.5.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Plasma screen management library"
 SLOT="5/7"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 93921ac7ebc7..cb74736c87cd 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,3 +1,3 @@
 DIST libksysguard-5.15.5.tar.xz 575900 BLAKE2B 0ebe2ae85bce2b11f8be215112504fea728e9f60e272813b9f6d2c54e51b3d60a77885ea8c95eccadaade8f929353342249bd0e7148558c0c1965ebbf7e0aac1 SHA512 a87f58c6a9237261e05b4fb1c315383fb3eacb294279c3ab3b553c0dca5e7e416a31bd685d47da4a8cc777bbcc09d9bac076b26340cf6262c7aaee903baf127f
-EBUILD libksysguard-5.15.5.ebuild 1166 BLAKE2B a753a719c0ee3099bd99b80fb4656a8be04b533bd225c79c05c05f2d1238ca362e18a3565cdcbe239440643159d9fe48c8c65e8df2636fd7a4cc383bfe6ce727 SHA512 198b9197826ed08a7e850fe88a9b05c9dc50a4b877d5c18a0438b3c31b4814b3c86362943655a44f7ea31aac3d2474ab80d7f68696f1a20dbe993352cff69f32
+EBUILD libksysguard-5.15.5.ebuild 1165 BLAKE2B f3ca2e5c826808b483398da5a851ba59d0f06b231cab2b57de6b6a628647feda3ee04be3ea8afc952bea4c3ed97d336e9b2b25183d4f96ab44b4fbc019aab8be SHA512 422afe6d04e6ebcda915a9b0dcebbf9c5889d80c61e3cf5e3f9a23e0c019134aa6343bbb6093076fb34a0efb412a4e4597def775ddbb3d3102ee14dcf4e5749d
 MISC metadata.xml 379 BLAKE2B 98ef8b13c4f1d761a090ac8b0cb33cfb87b25625955018d7c91d6250b5f83d299058c87944004581eaf13649614667bf2b0301eb00e92a9ef6913dedb753e44f SHA512 036552355dd07f9e255bfb3bee4cd8949cfb437c9df36a85467735c5e4d63f7d7239015f83dbfae9b5151f9cb34b4b4f59a62f893da48f68ed82852411013a86
diff --git a/kde-plasma/libksysguard/libksysguard-5.15.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.15.5.ebuild
index c93ca7e68486..626d35b8645a 100644
--- a/kde-plasma/libksysguard/libksysguard-5.15.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="minimal webengine X"
 
 RDEPEND="
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 58f744bdb5fb..b3bc6161514e 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,4 +1,4 @@
 AUX libkworkspace-5.14.90-standalone.patch 3376 BLAKE2B c76206c19939ebe7209dba4172ada0d0aab01f2520cc5ab465c40173d3e6c92cbb7ad9b0bc73e2e229d33792ee6313872fcab73994818e9100e0efdea64b78ae SHA512 6c6ddeca6e2178189b3d63ae77f7bee1b900842a72392fba812bd9231ac6f701fd1655d1212a286d914202c7182223742bb1cc93916f373db99925fb9a9411b2
 DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed
-EBUILD libkworkspace-5.15.5.ebuild 1270 BLAKE2B ff5b4da45a76985e83577e178a4ac5744d86c9da8360979ca6bc121707b94ceca64bfcd1f55af92e113c49a8673834b4c38cb52aee5b8d2648ca253113515a02 SHA512 8063528d50c7e09d7d2c1fed3b87eb84e839439d97ff87e8d34eda26ab15f390ee0ef095b23d01e8a76e66b759892107c1e69f9e8e2120c33a66434e97ae327a
+EBUILD libkworkspace-5.15.5.ebuild 1269 BLAKE2B ea0f0ead80950429ff9a2ff46fa5c65974b36c04287278cde657420259f3b182fe5fdb7775db38eb02e2535b175b5ac5936266688e362ff621ec011c72584887 SHA512 f137931810e653df1b8d3d7cebec3c4ddb819df4c91fc999aba19a597b35b8be183dd5c488315a03fcf48f395b9fb219c0f19ec24f8be5526ce077852c05dcf3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.15.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.15.5.ebuild
index f7f03cdbe1f0..a02f4ae52f21 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.15.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 25e87410a6eb..937beed76ccf 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,3 +1,3 @@
 DIST milou-5.15.5.tar.xz 57296 BLAKE2B 7dd8fa3da98836354072bd4eb67a92173d839ac0432da5bbedbbb3c68c3d1022cb572864e3c0b0335a36efd364676416d07b7258b0e5d17db6306884e8bacd82 SHA512 4b0a7a3edc1d50c64a226ae49e3660635838bd899939004d42a33492ba9f2255ef0c3575e2155f1ff7713c8396a95afcd8659bb61c48dee639962359a562565a
-EBUILD milou-5.15.5.ebuild 667 BLAKE2B 339917a0c6376aaf0c2b0f9f786dff6cc2836a210a37738e8ac1140a6561cf0e1a618e845766a157b20679fe777a31a408a44e6cc39f0b1fd20b066851803c22 SHA512 9ef8b31480b9ec0cd565b6334bbcfce596caef732421532ddf4176181c053aa05977fa1c1342d68729738a4c6409938fa6239d2f64e3344c70f56471c0ad3d7e
+EBUILD milou-5.15.5.ebuild 666 BLAKE2B 351ffaa6d72f89053cf4a167462f08ad39ac9064f9c1b93d2f09f0d402f9b0a6ae0c5a277e36ddbb2b2d0df52c7b202e536c79885d9db5496a8337a7fb2e16e8 SHA512 02413ffc787a664d9a23f07561942ed26943fd050967b7f51566bab98bb341b19811b24bc09332b53a5d7549e9f32c4d476d1ed61efc0cdbb4bbf3e9c6847360
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.15.5.ebuild b/kde-plasma/milou/milou-5.15.5.ebuild
index 6a3834c49a43..aab591c79a3d 100644
--- a/kde-plasma/milou/milou-5.15.5.ebuild
+++ b/kde-plasma/milou/milou-5.15.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Dedicated search application built on top of Baloo"
 HOMEPAGE="https://cgit.kde.org/milou.git"
 
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index b9006b2e093e..d1cf3faff558 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,3 +1,3 @@
 DIST oxygen-5.15.5.tar.xz 4473020 BLAKE2B 1c7fbaac142e80ba14b7fa99645590299b3b0dbc973ff12aa23114d50a4cf61fffc274c066ad90925e7796e3475a00752926b417f18705fe5712a5bb120b0c67 SHA512 fed946bf50e7f58ee247bd63dab2a5c371bf6d2c75cc64924e3de8e9b00faa003e2949dc78cc1babb352a043389d7f285d96731cedf0200b660d99131db0ecd0
-EBUILD oxygen-5.15.5.ebuild 1074 BLAKE2B 1bedd8561e860d5f2841da9e9c82ab08405328c6ec217981dc70db112f71d7348219900d3d1a39089e08e8946578e868153cd52fc09b75047c6cf88b5e645396 SHA512 f47f0069aa8f97f2e4bf9e9df0643ce7ecd36762df6eaa3b4e8bd3281e0a442d12594c8254debf3f1f891659b9cca043b1c5668d433391d49d304e5b79126b1e
+EBUILD oxygen-5.15.5.ebuild 1073 BLAKE2B faad900e7ec0be9d415095aecfd9c11fe83453779ef573e1fefe590dd2a6785e4702e8c5d7df833496f687ed3ff0a25d154eb48708114e5999630b2109ab44f0 SHA512 27d0986cd09174ab2aa82754e63d77bfac2ef61f86f66a9755e70fc52178f304d40e4612d322864d25c96921ffebfa9303421b14bbb4871a66076121f5337d6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.15.5.ebuild b/kde-plasma/oxygen/oxygen-5.15.5.ebuild
index 60f1b1a8260f..203ea9251d30 100644
--- a/kde-plasma/oxygen/oxygen-5.15.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.15.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Oxygen visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/oxygen.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="wayland"
 
 RDEPEND="
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 0e7a5b243099..8b87dda257e7 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-browser-integration-5.15.5.tar.xz 118136 BLAKE2B fc5ead642b561ef383307fca9c06424ea17278fc951bb46f6555d31e7d9d7762a2e211054ba61a6ac83fcb817017745f9773402fdfb1a286fde5be301aadcb44 SHA512 c3f1ec7ebcb06ee6dc807e639cffb373cfe2d2eb549b18f7028e13991154107f474d923fcceea809399836bc3af6299993f91e7bfa85ce80e85c212640b1750c
-EBUILD plasma-browser-integration-5.15.5.ebuild 790 BLAKE2B 19372bfaabb84f204a0716ef0adc74fb57378aa434e2cdb8b060bd2a1808800620819650190da2969bf236b94b67cd648b69e3aa02a0d95112ea3bc637200ee2 SHA512 8340d4825b17a9c5b930577bd38e3e03287ea8e4cb6ccd69c8f5de79189c6d19981c1e5ed0638cfc73b06ec7d9b7304a67e48b4a2b693af5f49c095d12dcfe7c
+EBUILD plasma-browser-integration-5.15.5.ebuild 789 BLAKE2B 7ebacc54feabf28effc14b439a1f989d0092930984b4ed18ce5aa5d2ce41467b9c2fd64fa540a5ef765610d7270b9df4569a9942d90a61de1eb66a04b1f4829f SHA512 e22cd5349e52f11afb652c1add7b9964f67a7129709a9ae70429f9d84206c27aa36bd413f7e13269991cc63b64e8505162969af255cceca92f1baa2a58b22d01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.15.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.15.5.ebuild
index ed07352d902c..25870b49649f 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.15.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 8b96e3eb43d7..f26dd3e0b758 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-desktop-5.15.5.tar.xz 9285792 BLAKE2B 27e44bf35b6c317e8e7d3074c089d1cf5106066e52d5be5fbec36096e1df86d5004fc84bc9693d8d396711f7a94ce5d709ee8c9a5b867ccdfaa5dd016ad14964 SHA512 ed7578d92a908bebc3bc42cd7900704253a7066f667deeed35d5efb291711a364a7026bf9d12510a8113f9d52d6e9297f500c5b04bd8f9522f071da0f240432c
-EBUILD plasma-desktop-5.15.5.ebuild 3777 BLAKE2B 3f6f83bdc400fb5e4cc924fdb733ee7c8af709f9aa951f32103e9722d541118fce3232fa3a29b2b38f1911a42ed1ce525b61aa8749e463e74c4d755f4b522eac SHA512 aed5ed9054beb9266b81c7c1617308357e7d038767c29f9c85aa96ccecc7961e8f9f33ce0bf82a9c36fd76645b29082a319958510164b7c78b52ced97f63639e
+EBUILD plasma-desktop-5.15.5.ebuild 3776 BLAKE2B 67b884879ce313c04c6af99f6a78eecc54deef27dabb82173910f352d64d2995e45d017b2940707bbd0b9494f9a67d3f208f0ce7e213216ed6d15f2548f1a135 SHA512 8200a34a5bbf6ce047175099c7734c5122121950880460ed64a2a5bafa9a9d76601cdb93809d499bb8ffa85dd4c90d88c23617905bc7f992e306135f299ec2a8
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild
index aa2e5373285f..effd643ed428 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index cfe439b623bc..048826298df7 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-integration-5.15.5.tar.xz 55380 BLAKE2B 8388641685477a1778d0ba455c4d2bbff36b0c64224c9a616e6174b1be4e7b7d1b800ac976f1ec90f84ca5945ec4ccac4db5c84d5a3862f6e485d55f8d134486 SHA512 544fce9aae17eb9bbf07267a6d05a8ca34bcb8d33fddb9021dd844e1f20f26df985ddc659b2996be01e49023650893c56748c7d5572810fab7e3e8b6d74b3837
-EBUILD plasma-integration-5.15.5.ebuild 1059 BLAKE2B 4f18aea55c6685d11e30496165894af96f4fbbb68f0a1b86082066850c9270cf2b38c15d3c4b8769b1630542f40776eda669ace566865cd8813df08af2f9e717 SHA512 589bd4522938a548684a06a8b935aef95620b6bc7b27475f2ee603bf8c42525f8889bb9fd5f047f7f9dd3301512a53ffcdfe8413ad5d3014a68b8b2ffecdae92
+EBUILD plasma-integration-5.15.5.ebuild 1058 BLAKE2B d1d62b1350c810f7aac2f1d4666656b566f3e752e771a37f8edfafdc507dcd6249a2fe21fa90fe89fe61aa4b3506afd6a99ac5ec0fea843cf3c0859ae21b1322 SHA512 6762712e8391d4eb0d9812b14caa2009d5d9976820e417150ad363be69f04a19cca3cfe5fca4922b2c4763ed26f48635fac0f746f1cb25d5a4dafa864fec78ad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.15.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.15.5.ebuild
index 72afbe94dd22..4e17077befa6 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.15.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 59b7dd4926ea..3edbbc6d4d68 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD plasma-meta-5.15.5.ebuild 3833 BLAKE2B d9cc7fe71f48dbba749b62807c28c288a2af3ffafc82e8320895133e96d9ecb9c65dcc99973b59ce7ec92cc6df1937acea7424c915f5234ee563caad912ab819 SHA512 fc1d15fce8beab38bf6aaac44e415dafb4691164f6729f70262a15954d187c6525fac469ecbf80d2aba346fd9542450be40762224e23cb0cba7fe59805de8dda
+EBUILD plasma-meta-5.15.5.ebuild 3832 BLAKE2B 19e6f30fca31b3a3c77b13628497ff1ef48e5048c7b3bb59a4fb77d0dfd777d28bf792886ac34ceb3750113880a618c43e4459b24d63dce2a7b4437c2ee7d369 SHA512 c98d716c46660212508f411bc13c747363f06112338c981d98bf014c802689136ad2395984a1e2141154832cbc0d803898c709c5c2a064ce7e868f2fd7316b10
 MISC metadata.xml 1917 BLAKE2B 065db6335ecc51b0de9a52c3b44c77c6936ce27e765c960d908ffa87a84e2d88d584988d14689277b0577627127def243252d5b827d81856717e4f57f4e67092 SHA512 16224a45e1475917b3618b19f0e00d537d4183efee8d7a98c73fd7b1736ecc9471a64a2e130d2a4b385a139be40623e61c9bac20ec1b64502bc85b2dd8a2df9a
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.15.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.15.5.ebuild
index 332911f02873..119b8179c207 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.15.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.15.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover
 +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam
 plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 797542b31ef4..0f26d7ed0704 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-nm-5.15.5.tar.xz 777140 BLAKE2B d75ad6c04587f5bc115268f2bef50e0f6dd2b8b86957ab1f43e284988039fb7d9530cb03d86f5c49bdf6747bbb6ad123c7bc527643fe7461ed91efc93c63e563 SHA512 f3f78f40b754de5afbd63c5713e684fe3d37ae25af5a9e6ba808647e0d7d4f23456ed4b94aa8138e1fab99e7f7d7e0dffb697e0e46c99bd312bad5e2a7b9833f
-EBUILD plasma-nm-5.15.5.ebuild 1983 BLAKE2B e9a373137927a41f87c4cd00fe1710ddc0ea3cceaacec0584890eb22a52b2a86f62a708aadeb7db1d89708e631f3a8f151782369338d8dc40c0b8d645d9c5b86 SHA512 9d3e8f59a63502837e1c7af2d682a22aa4d9b5635b40f324e601e19407db54bfdd70ef701e9654fc9fb28ed2449b304f1aa07d53d5a825f5bcc7c62667543564
+EBUILD plasma-nm-5.15.5.ebuild 1982 BLAKE2B 56527f9910d7ed2ef8d8e3cc13564d4d99cdd5dfa8813f6e22e8ac309adff498a142c2cc7b00ea1e7efd696bc16a2d1a67e1ccbd0ca93e3a0ad0e3585ac8ff65 SHA512 97d12474943bfb5aabed75d3f385a11cf1c4b4d9c6f94fbb3e7c457e0a51cf3bb74f7ef2991199ab1ce026338c00cc57d403ac2576b20924d251cb14c8ef3146
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild
index 7c89b755908d..d9eb050ff840 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma applet for NetworkManager"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index a8d6272ab8e4..59d9a34a0422 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,4 +1,4 @@
 AUX plasma-pa-5.15.4-gsettings.patch 20407 BLAKE2B 872458be40b049d415e24559f9d285554f5449d26bde238bf09488c6f1453c0e040561425e188cf926a76a15e3957da2e8ff106e5f8d074a19b7453d43cc91ed SHA512 19b42891eaf3f53ee582fb96d63b2def3e28c037252f11dabf17e2b00a7b84c763fefd71e779a421fc6706809fdad8800625e94b6ea276e03d6461d3e566dd66
 DIST plasma-pa-5.15.5.tar.xz 95964 BLAKE2B 5177f5aa9944d1c61058791e977b8c2dcd92e8b8d0efffe0a80eba9123443e13683e26ffd94ade01fd6be585a5598953f2d4bfbd3775944d9e81148bbac793cc SHA512 e66c9ac36c7964738f7f2947120f6a243191c75faef2c9b4831410487b6274da782f8a51d29a1f6d3b7ae81a96eaa6115d0629fded0700777856a9307a15b5f6
-EBUILD plasma-pa-5.15.5.ebuild 850 BLAKE2B 7fa817451372b67aecfb42d91647287d80b345202a92f3eeae7211f7bfe5d6befa739bda7dcc9fd851a71b99854d5ee7dd34806660d2b6c37034acf8c3568140 SHA512 48fc5b9022447a3a2b1623f1d46658a2cf31d84789e21829acfea65d4ef4788c16636e8c1f90763bbe797776a44c63451af586ff0108f07c212a8ddd615b2e3c
+EBUILD plasma-pa-5.15.5.ebuild 849 BLAKE2B 544c6d525c4cd28d89448ecd32a33430be771a412727ebe51a26fba6fa1db407ee8c24bbf4272564a561f5884ffe3c0a17b1a22c6faa56c33853ad518dd5647f SHA512 79fd3a894b4912d685e258df6ae38400f15a8dc441a70b8737c480d4ee420e617bce00f92f491e4249a655364938b48bc694cfd135a73db5e6336a83122b95b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.15.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.15.5.ebuild
index 062e9a7ff561..0dad9b387626 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.15.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.15.5.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 56d9e7b7004e..31e2f26da62e 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-sdk-5.15.5.tar.xz 249732 BLAKE2B 305794c1c6098c2f5750dfd3b10506b5494e84256c6c1198b78668fa9d304d9af314e23ec026d4e5774f4c277a65911a109424839bd4b6c39f8a5fcfeb41eb3e SHA512 aff109eeb879b66b6e076ec333703f4e9202ea73f4c97fb05538755f1c0d96d41d2b01a2ff48c050632dbbd848cac4e528aa90be374fd4f2503140490a16753d
-EBUILD plasma-sdk-5.15.5.ebuild 953 BLAKE2B 46cf55d54508648e7614d6bf502a4b37666fd7c9a7c22915ba6015775fdc3c8fa6d98b101af303cb49946aa24798b8a40a1ea80bb0c159382663c0b4e4807056 SHA512 30d914552f8b974637697789bb830608122f601cb21d4d6cea2b6fd2eb07a8234633741a0267de10f0845a1b1395ca1780a44384c4c7475b8ee38e4befc7f0ae
+EBUILD plasma-sdk-5.15.5.ebuild 952 BLAKE2B dc3bbcc3dde15d2dd670d560e1f528db474c979c79bbbdc4482d2e0a195f99eedfd99424249466181c837b231bacdccbc2630847c04cc097b7bad7b167790fda SHA512 572378e3210c1fd8793745e5dacafd8ae0df0dbd56c583334f27d58d53e889b735404cc6d023433d5a3d622a7868f7e32b3529cdc5b82a2956956e2dcfb50f97
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.15.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.15.5.ebuild
index 11fdf03336e7..60a91ed842b9 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.15.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.15.5.ebuild
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 4dec63ae3594..92864f782bf6 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-vault-5.15.5.tar.xz 123880 BLAKE2B d844b31bb0d40a61cc3df1a493730495a73adc2f7e9582279a4ca6d87aac15f45128340093c06b8e1c841abec7a0806acaa6a99525a1793202f3644359699ca2 SHA512 815f45163225ba692fb2b1745c7f99e1ae06509850e82f46807b17664728c2f3667844c42035000d04da6a360913a217edf6f6768bb50a910d316eb7770d929b
-EBUILD plasma-vault-5.15.5.ebuild 1078 BLAKE2B 9836e571f17902fce3ee7e341189184c23652dfb7c9b7d07b5bca209256e7cb5bee6884665a08aecf4f69b38b4d6547d1edc3102587d40bcc14933706b03a2cf SHA512 6dea873d4e4b2c8d05a58a6d7e770c2aab427ab7df9c0d2b41e92f651a6c785b49c827526b724db7ae0ca21b104ba717b87340de57d2a65a1f11b9267dfef8d3
+EBUILD plasma-vault-5.15.5.ebuild 1077 BLAKE2B b1438da912bef60253a671afd9121d7b78f7541645600730477bf1df40cf3b91923b7e873b6afb1590c363cadd06c6328e7e8f9d222743b92deb25bc13ec28d7 SHA512 192b5ef7ed418b69c4f687d3489a4cd51c5de7432211aceabe122992afe445f606b5eb7b3131d2900590c842fed7041b3da11ae6d8050e9e7ea20f6b44dd2e94
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.15.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.15.5.ebuild
index f8abd94eb281..f70c37f54ade 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.15.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.15.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Plasma applet and services for creating encrypted vaults"
 HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index b98b677d1cf9..90eb8ed338a2 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-workspace-wallpapers-5.15.5.tar.xz 24354892 BLAKE2B b3beb39f377d0fc8265ac2c2f18c07806b548b44cc0df6e3b69727d876235dd434019e2e4721168942454e08612f271e555bf76355f121edc1def03a1c4fa32c SHA512 088e22bea249be02c72c1fda974be1f9de3bfcfe009003de5bdddd256834679fe644ae4ff4e9090a99fd75d4c8b8681113e29f13b015bfdafe568a1871a43704
-EBUILD plasma-workspace-wallpapers-5.15.5.ebuild 353 BLAKE2B cadcdbbb6d9f211a7c25ece302479905b2a0bfa57008ccbee80661f6418e99bff647ed8a60d1ffa3506905b9c6f2aaa3fc5923ad185ce82025be90ab22f7d25a SHA512 a007dd02631bda488f67a42a53b6e1e08aea32cdf6054f1eabf1686f8fd1bc1b7fa67356b10595f03695c9035539b16bd8df228eeba157885f20a98eb95e3444
+EBUILD plasma-workspace-wallpapers-5.15.5.ebuild 352 BLAKE2B fc2880c1709d2536cd641f0834546470636e8939323eac5ac19e75dd9603e91129b82293912a06f695e08f3ec84d2eee79c5d49a594fe3a077b37395a32bbd51 SHA512 312a12f19ff9c33022f081630768e442a0f8d4440c7eb6b029d493003f0a18e8021030f930033a76f500ce2dfbf5d5c4d9b0020e86719ae2819dada1e12e224c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.15.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.15.5.ebuild
index 43dbbe961abe..9ccd512332fa 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.15.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.15.5.ebuild
@@ -8,7 +8,7 @@ KDE_DEBUG="false"
 inherit kde5
 
 DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 78c212d5f23e..2455b18f9c45 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -5,5 +5,5 @@ AUX plasma-workspace-5.12.80-tests-optional.patch 905 BLAKE2B 02350e6aa907b91c84
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
 AUX plasma-workspace-5.14.80-startkde-script.patch 1207 BLAKE2B ee59b775f3ffb3d876d1c4c27f8221c9854af155fc4c0dc0c6cb591fc944f07c3196d64438011db6c2833b4030d0ef76e6a49752dcd1267a94e7686af06e5bda SHA512 e8de504db8b4f23ef6c09aae9d9fe88f88ed3623b6b5766e5cf57ccf72d5d31778f8f8ba5483ca200ad6d6fbae1346655f73ca1ef880d3eb1a5775f258501938
 DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed
-EBUILD plasma-workspace-5.15.5.ebuild 4828 BLAKE2B 6b650cffc3dbf84628f1578ea92288716c1fb1d93fad76d63ea11c4f1c89fd7e00315c7f8d25af76a910b8a2da50b53de32897006629b1eaf920b8b3ac181592 SHA512 03fd0625253900a535c301336c33fdeeb47ea0036df3531469a3ce41ca5a9a768386c3aa1371456180c1dc37a3fe211bb6b224076afe592014b1e697e17ea20f
+EBUILD plasma-workspace-5.15.5.ebuild 4827 BLAKE2B c5650f76b65ed3307d8c523eb530d26275a7be8964ab86a24813b9ee449c866ecfc4231996594e6a41453d8b2496fa352c2c999d257aee83ff5af46b9cd0b748 SHA512 c83a13992946a5c4842bef073798616581e390b401ed69be32ca372240b442aa8a575c1fd1658876b4d8334c95aa51f69a13a0df3131239beb870e3283148f8a
 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.15.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.15.5.ebuild
index 1fa0fe290f5e..e2c969156c11 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.15.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.15.5.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
 
 REQUIRED_USE="gps? ( geolocation )"
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 76d248bac291..e778b2205992 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,3 +1,3 @@
 DIST plymouth-kcm-5.15.5.tar.xz 39588 BLAKE2B e7e418dda806645a4d1ae47f817208faebda82ff5670c20473ed19b9a939cfc9ce0be8b29e4bb04b412ade09c6e8fae2a19170d26414f6a22043e64aeee1145d SHA512 f38af7e5fa715531f2515c4452dcc5534c63b8cd6bd444232527a1ba3c1011289ef8b0cb772d40594a040ebd044652de1f8d9e3fd1146e2688fbbe8882a040ed
-EBUILD plymouth-kcm-5.15.5.ebuild 800 BLAKE2B ba394afdb2d07b40be24397a5eb729775b9ca4cc798290d57a74efd39c5291499cab97a74239687e18e6338ea185d2dd3e3fdd6d7c5b0a81429e590689475f5b SHA512 69b3df57b4c7837a0bec8129c69a89f3f5130723ac89ab8d20f0cba5c84bb90246809e36181e6c451c3a30a7ecfd4bdc5beb33c5f63f5efa32b4dc3e6f90d120
+EBUILD plymouth-kcm-5.15.5.ebuild 799 BLAKE2B 9860b4921f67b4fceff4fdee47b6f1e056cc567ff545de71c2e41f979e291a702db009705cd2f26f6c25263200cb350def1fd1f0f2e8838b28b8a25ccbe40835 SHA512 c53bc03e8707855afbeab7a4f73e0df4a43e553fba3c9e438ca33b7c4429166e0520ba9ff3e76cef2777dc17bc3874c825ef710277b44de1d57f883bd9e52524
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.15.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.15.5.ebuild
index 5f507c50891b..60f20d14aaab 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.15.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.15.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Plasma control module for Plymouth"
 HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 8fb278d9f289..8c032755d3ab 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,3 +1,3 @@
 DIST polkit-kde-agent-1-5.15.5.tar.xz 42612 BLAKE2B 22ca9adad609eb5603aa7d50fbfcbf6cf17d96dc3f822acdd91d79b855396b32fa2261086269548a302cbd116cf3eb848a5bf1dc08640bbf678428044baee711 SHA512 030bbff94517a02f40bfdbaf0142834d95fc5299fcb126f3014268233e24598aecbad8b04ac1b6c4d3a0d4821a73b10ecba84f2e80af53782bf137e151455ed9
-EBUILD polkit-kde-agent-5.15.5.ebuild 713 BLAKE2B f0835596be22e55d15436b0c8948df996ce68e948939e88ee666d4765d09536866960f6c79e8520dcd5224ee70098f51469da761f52c9740860d1ab56dce7dbc SHA512 08f92b12ec4bd39eb8796b6c5ca04b064e79e86530dc5342cc148f4b219e783cd2cc9c1b9c116ba99b1abc6b25d4a6b03021f70ce2183c5cd86e6202202f03ce
+EBUILD polkit-kde-agent-5.15.5.ebuild 712 BLAKE2B 114708a883034888a022880199334ed832eadd2f965e332c4627b4bca7292a217a17afc972678a8f106fd0ad294ee7b8bf9e2d615a29cf58ef4ccf5af9ced829 SHA512 c3572e743514d78ca99982a369a95833cc70de75ce17f7b5e0584fc3a38c1b5db15c05bba07764a29e061392464029385c811f62675f9f6d16cfc19d25ea9200
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.15.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.15.5.ebuild
index 0b544b404c84..98fc96e553d1 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.15.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="PolKit agent module for KDE Plasma"
 HOMEPAGE="https://kde.org/"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 02d1f8fc0dab..26f7e4e4b6e1 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,3 +1,3 @@
 DIST powerdevil-5.15.5.tar.xz 599676 BLAKE2B baf8789982b640f8b09ddd66f2f5722df1da2c570267218e1216b8c4fec8160dc933da3cc2355d45ff475de4a5d0357f00ed84d1562f91a0534636bb092c863e SHA512 bc0a1af8eff7da7801b6644a2d28ff595b3052ebe0d59aa808c51dc1c3c3c787c7d7569cc59cca216757e57a67a4a957845792af78aeafb9a71d4ce37723b3b3
-EBUILD powerdevil-5.15.5.ebuild 1611 BLAKE2B 41896411ee0db12ca739ea524fdba0ab64c3bf3bde1f8a8fb91dc4a8bd3b4225a8adcbd250c96eb95148b7661cda47bdfb83efb70ee8031026b1fd77a03173fd SHA512 0a9b9970fd700b05bc5982ab921213a660170f120c2deec30df4a8b87f8c8f71f292397fb1ef49568160b2167c865cf9ee9487401e5f61245f97b489d005e6bf
+EBUILD powerdevil-5.15.5.ebuild 1610 BLAKE2B 1c5abd49c4a29990610e81283c61035476d1916317df0c0886f0b087a2b2e324b229851b9688f1c3a199ba35b451513ba1c7dcf78ad97209f89c377efd170a2e SHA512 31b011a765e18c30b6ad9fd7c3a7d38b4eb79fad9c7cc94c6e973e65cd5fb29d4f22a408fc899b295b4fceae9f6ae0fe858099aaefddc004fa7db0ba6b5b1cd4
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.15.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.15.5.ebuild
index 0a5b76d017d6..31ceb50f3d6c 100644
--- a/kde-plasma/powerdevil/powerdevil-5.15.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Power management for KDE Plasma Shell"
 HOMEPAGE="https://cgit.kde.org/powerdevil.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="brightness-control +wireless"
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 952c2c363ac0..a96dc9739feb 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,3 +1,3 @@
 DIST sddm-kcm-5.15.5.tar.xz 61728 BLAKE2B 358de0f9a3e39f7bdc4f5ea46bb9f7f5fad6601a0eee91bcdb939313bfb24dd84e5df46fb8d9beaf97e3030f63cb0622ab5d3e1a1ec9452937a72661ccbc61dd SHA512 728dedc49670e2b80f48719f3b9f20407cfb580723e1b443eee789c0908d1b7ca70b6d083244df0c4d9db29a90707df50a148f775568abae417c4dfa53607535
-EBUILD sddm-kcm-5.15.5.ebuild 887 BLAKE2B ee9b1445178705f26bd7998c77b0b06ef8a910ece2f332de3ba777108b33319b6c8fbe9d63ea01cf1e94cf152888ae6b3925df13072104134436782afa6a1721 SHA512 4db0b4552706b9bfa8903ca359bd59ec95b95e06f39f669e4502a96a62f175c7f5455c2fbe5f2bb074621129704c777acdc9c258f7688f9bd2c4b043ba441875
+EBUILD sddm-kcm-5.15.5.ebuild 886 BLAKE2B e23150a39b9958ed42d574d19bcf2e7bd6be18425d4fdde741b4c9b4eed8ab7373bb816c6d028e2e21fa2a9d539560324785538f4ec881b668e42682a098fb2b SHA512 f1dc68580e781468ba23e3bc69d6a4fd885b0d5380faf073a57a5c17cdef696aea8569afa5eecf1fef51dceb4b62156dabfb2fe492cf72b5729833f0111ceee9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.15.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.15.5.ebuild
index 15c9797cf7e6..151ebd200e6a 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.15.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.15.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Plasma control module for SDDM"
 HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index fc5d2c5cde7d..520bcba4f6d7 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,3 +1,3 @@
 DIST systemsettings-5.15.5.tar.xz 182452 BLAKE2B 215706f06d842a4be26e5032087ab6eca7b19a93ba998eb46d90593796b351bde893234d7cb097326a58d78a30584312eaae9e0ce3addf44ecfee0553e6075d7 SHA512 9bf486096c8e22779354ce1cf1028f7e55c1dae98da2bd9fcfe496c761e819d26756490d75e531049e519c0ffc0eeb643577004e022c0b0a988730d833ce6ec7
-EBUILD systemsettings-5.15.5.ebuild 1493 BLAKE2B d0425e1eb2c2b178249d6af6b74895303408b35de3b7d73b203c044fc73f2daa09dc4dd146cb562d2f2f9b54ed0ce5e18587e74b1096ee331c6d32adb6a79bb2 SHA512 3e1eccad0dc4c1751067a4f53d8d763139a21dd3c3d290ad00596ed91c89912ffbca26c283b0d00d276c1447375f182df90efa010f0b9f4e7533e59cc5e519ba
+EBUILD systemsettings-5.15.5.ebuild 1492 BLAKE2B 05805262ba9a7c1cd84a9fdec25abf7d929fba64d084bb7a462a55ad07717d4a01d882324a16d752676593b4c590968c5c2d0095b5c924a590677af3df6d127f SHA512 9615a4a30efafacc73e646775e06b166423d27ee0b2961b573b5fc9bc546abd1cadffd16bd9606c08fe927b05fac7f1fb9f206dc50c151eddc128e3bcbb9973f
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.15.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.15.5.ebuild
index 6e7ae264876e..1e6f0ee33644 100644
--- a/kde-plasma/systemsettings/systemsettings-5.15.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.15.5.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="System settings utility"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="classic gtk"
 
 DEPEND="
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 8b4fe9dda319..f2939bcdc513 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,3 +1,3 @@
 DIST user-manager-5.15.5.tar.xz 546156 BLAKE2B 9b37eee3f88ce182aef023efedf288aed43edd7fa3212ba6549c2cc659e891f45cf20ebc8b573286c5b52cdee42d5367835c06c74d31fdb2d6eb7f20fe9a81f0 SHA512 7a8cc2e37fdfc0f99c317db4f4433559e662f0ae03faae9844d4c51b298fcc8906efd457c17898193687c088664008e41c1e158e64fd0af0c581bbb1f98a924d
-EBUILD user-manager-5.15.5.ebuild 699 BLAKE2B 487164e8cfea398a89d38f67022893efb0a42b09f6861ad753a12e100d79f1526bde70408c5eefa8d13d3fba2f4b6ccb127f3d1cea3abdd67d7b96a2a166b710 SHA512 3ed0d5d47950f5432644e12e90bdf14106afe55b05b58a2cd1b065d222446b8bc59963fba691d07790365b4ef2b6428c9c409795071cd64bc67027e4296659d7
+EBUILD user-manager-5.15.5.ebuild 698 BLAKE2B 47ff0768c259489898cfb2c38dc9597f0fa98c058c6daf70fce8ad4b033e2d230df2af6ec317770a60585fac97f3003bcff051c182380f876f6bb5c95478a5f6 SHA512 0de5e8cb97e348b07195f1e6780d688fcd51521a47a810dfcae8eb87ed2a07d8778963b6eaffd692c2168139f33660b0591e12c7f6feef6b90d2ad66e6435191
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.15.5.ebuild b/kde-plasma/user-manager/user-manager-5.15.5.ebuild
index ef600c019bac..bd567cc39876 100644
--- a/kde-plasma/user-manager/user-manager-5.15.5.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.15.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit kde5
 
 DESCRIPTION="Simple system settings module to manage the users of your system"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 297f1be22b57..bece0485c971 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,4 @@
 AUX xdg-desktop-portal-kde-5.15.5-appchooser.patch 2385 BLAKE2B c8917416ae9ed68910e6e19e90116c36ceeb4bf04faa4a9c4fbdfceb39d034bf05961559f8f672c8e75fe16b524aab5a811e52f2ffa10a5a308bd6041f9a2b89 SHA512 de598d043539fee25d29f11439003eda5babcde7fe8b017f4eea975334b297c5faf7f9d21bf49d247415bdf1d953df4187a627cbffa2b2cd0f8774c6bd9cadeb
 DIST xdg-desktop-portal-kde-5.15.5.tar.xz 60292 BLAKE2B 5e0f07ec5e57d978c444fc65e1aa70b04dea458d34d9c091da5699501995499fb877e90ae0272634fc7dd62fa192a99d7f800bf7627612e2eafb6763e3f732ca SHA512 f575c9a5273cef3ab34a7eb4be520cdec3344fd6729f79d4475f200a177fba40b265815136c4af18ce6e48c9736bb835af4d972c5563171ead2e4390e938fcbf
-EBUILD xdg-desktop-portal-kde-5.15.5-r1.ebuild 915 BLAKE2B 57077f6dbea3864f13eaac09b1316db222936e630f5a5f0632d5f7209643b658108c86df5cfa51b8a21fcf558167921e25421ce1685a2240b4b040e6cad74ff6 SHA512 91d018e17b3a17e6d3b29534a1f6ba0345d7800551e17a27aa5630e374773fe8233f1d7bd967a1f880317c0f4798ee97e617cbec4c784a0d11bad326681101c2
-EBUILD xdg-desktop-portal-kde-5.15.5.ebuild 868 BLAKE2B 8c6f8c9056f246b96f34121dc568015414ae858022d3089ad1cde81afc5320a30aeffde6e08d87761bb2479467e09a90e06dd1c6f983d4b56033d65454ea0d9d SHA512 545f13fb72ea0b0588df1f5282ba9b87d1870a4a25ede0c1eeb587e6685e8173648561f7c6ee2c8324470e93a3839e385437af0c9ea7861c6b483648d65776ec
+EBUILD xdg-desktop-portal-kde-5.15.5-r1.ebuild 914 BLAKE2B 3130c056671cbd57b0272fef327b809bc2318fbc98264278e21d5132f4fc6e60aafaa7a31d74141b5e2b41339c76a061f8cdb2513f02c81a46a3ff78e910c37c SHA512 67660f2388e54c873ac53058810ea298373c5f67f936cf2651986c20d6b17b8e0e4874e5fd32dcaa28bab7d5ff3467d9ca56308b0b9e665e52ed110bce15d784
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5-r1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5-r1.ebuild
index 54b3fe3b7111..733e0fca1f66 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5-r1.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 # TODO: Needed for screencast portal
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5.ebuild
deleted file mode 100644
index b36da6ccfc53..000000000000
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-# TODO: Needed for screencast portal
-# 	dev-libs/glib:2
-# 	media-libs/libepoxy
-# 	media-libs/mesa[gbm]
-# not packaged: PipeWire
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport 'cups')
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/xdg-desktop-portal
-"
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index dca2d370ec5b..f8f0a110722e 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,4 +1,4 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
 DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed
-EBUILD xembed-sni-proxy-5.15.5.ebuild 938 BLAKE2B 3b94d30dfc6849bd596a3b1af2b371ad114b9162a7273ef8e0ac21a09f685d11c63117c4613caa21ae7e5048e9f92637746a5f6e8d74fad0694db9f6015fd5d3 SHA512 0697804bc8f946d3d27cd0ae52dc27d6bfccd8ff74b0d2785d42e447965d11041fd39b2b2f32a544b21fee00f43fd3e2ad3c0d32e21e90d644ccef1b6446a2d5
+EBUILD xembed-sni-proxy-5.15.5.ebuild 937 BLAKE2B 6473e8e3eab0f3bd10a1d074ef32929e1f4a5f9e01ea48182df4afc3f1b1350a5631fbf275e934696b2237588a3559a429261d1cf1392b3c354846560be0ce08 SHA512 28b2489919c5487c64eea3f31c94e4d0b1b90072e7ce0d6f77e8b1403b997d95c86cc07634628b049dde96f42f4e9df984e49a7eef529b06ec55fd245f8182c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild
index fb712731ccb2..4faf2de2b993 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
 HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 DEPEND="
 	$(add_frameworks_dep extra-cmake-modules)
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 861e444449d0..a81c7913582b 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/POSTGRESQL b/licenses/POSTGRESQL
index d9c429be7cc7..6291d30179e0 100644
--- a/licenses/POSTGRESQL
+++ b/licenses/POSTGRESQL
@@ -1,23 +1,18 @@
-PostgreSQL Database Management System
-(formerly known as Postgres, then as Postgres95)
-
-Portions Copyright (c) 1996-2001, The PostgreSQL Global Development Group
-
-Portions Copyright (c) 1994, The Regents of the University of California
+Copyright (c) <year>, <copyright holder>
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose, without fee, and without a written agreement
 is hereby granted, provided that the above copyright notice and this
 paragraph and the following two paragraphs appear in all copies.
 
-IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
-LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
-DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+IN NO EVENT SHALL <copyright holder> BE LIABLE TO ANY PARTY FOR DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST
+PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION,
+EVEN IF <copyright holder> HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
 
-THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+<copyright holder> SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
+BASIS, AND <copyright holder> HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
+SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
diff --git a/licenses/cephes b/licenses/cephes
new file mode 100644
index 000000000000..dc1c664521a1
--- /dev/null
+++ b/licenses/cephes
@@ -0,0 +1,9 @@
+   Some software in this archive may be from the book _Methods and
+Programs for Mathematical Functions_ (Prentice-Hall or Simon & Schuster
+International, 1989) or from the Cephes Mathematical Library, a
+commercial product. In either event, it is copyrighted by the author.
+What you see here may be used freely but it comes with no support or
+guarantee.
+
+   Stephen L. Moshier
+   moshier@na-net.ornl.gov
diff --git a/licenses/telegram b/licenses/telegram
deleted file mode 100644
index 77e1f6119fe2..000000000000
--- a/licenses/telegram
+++ /dev/null
@@ -1,687 +0,0 @@
-Telegram Desktop is licensed under the GNU General Public License
-version 3 with the addition of the following special exception:
-
-In addition, as a special exception, the copyright holders give
-permission to link the code of portions of this program with the OpenSSL
-library.
-You must obey the GNU General Public License in all respects for all of
-the code used other than OpenSSL. If you modify file(s) with this
-exception, you may extend this exception to your version of the file(s),
-but you are not obligated to do so. If you do not wish to do so, delete
-this exception statement from your version. If you delete this exception
-statement from all source files in the program, then also delete it here.
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  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
-them 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 prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  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.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  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.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-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.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     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
-state 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 a brief idea of what it does.}
-    Copyright (C) {year}  {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 3 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, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program 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, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU 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 Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index c52131ee4dfd..6e2c8211811b 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxde-meta/Manifest b/lxde-base/lxde-meta/Manifest
index 14b0546547bb..f8a574702fda 100644
--- a/lxde-base/lxde-meta/Manifest
+++ b/lxde-base/lxde-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD lxde-meta-0.5.5-r5.ebuild 953 BLAKE2B 35a9808c50cb78a34283407de3bf1e484ea3308a79b1a5725631d965ef52c079c80cb56be05bc3f636cc76c5bf59c4835ac8253c5bacab885ed0b8631deb54b0 SHA512 5605a730a11f11716542f8c86f1f42c6743b4afe9d27d41195ce283cceee8002471c35ba33ef130670f22e77c22671d04b8daeef7958ba9a0d4b300cad222b60
 EBUILD lxde-meta-0.5.5-r6.ebuild 950 BLAKE2B 32b53bd5e4297cdc8053d91373baa8480996fb5af8ff8d70ff2de7d5baba07f4d9a5f2bf327fa41510218d31b69cd27686549371d80d07e9b82f34cc9b6e2d4e SHA512 b22f33a762412dfcc664312397bb71f0dc30fa7f96b96449b172b6df4ed9c0d48d2899394bff4a8030f1329d87f075cc5a9530be6b8939895604a11bb353a7d4
 MISC metadata.xml 257 BLAKE2B efad62f245bde8ac51046146d034662f80c0d53ba081e1b308572facf6104e001af8d874e5429c2ad7f2c587545091f286e607fb53e353ee6eddacf01846d9ce SHA512 f25b418b4204c0b1b8c3a08ae8cad894c8352b5f49ca653ec9fb028eb5e0cd1f3a8ce26ca5acce609085b8fd73e49586d8c34ff5f0808ff9cb9688c8aafd8c69
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
deleted file mode 100644
index 767a9d1dfb9b..000000000000
--- a/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Meta ebuild for LXDE, the Lightweight X11 Desktop Environment"
-HOMEPAGE="https://lxde.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86"
-IUSE=""
-
-RDEPEND=">=lxde-base/menu-cache-0.3.3
-	>=lxde-base/lxappearance-0.5.5
-	>=lxde-base/lxde-icon-theme-0.5.0
-	>=lxde-base/lxde-common-0.5.5
-	>=lxde-base/lxmenu-data-0.1.4
-	>=lxde-base/lxinput-0.3.2
-	>=lxde-base/lxpanel-0.5.10
-	>=lxde-base/lxrandr-0.1.2
-	>=lxde-base/lxsession-0.5.2
-	|| ( >=x11-libs/libfm-1.2.0 =lxde-base/lxshortcut-0.1* )
-	>=lxde-base/lxtask-0.1.6
-	>=lxde-base/lxterminal-0.1.11
-	media-gfx/gpicview
-	x11-misc/pcmanfm
-	x11-wm/openbox
-	>=x11-misc/obconf-2.0.3_p20111019"
-
-pkg_postinst() {
-	elog "For your convenience you can review the LXDE Configuration HOWTO at"
-	elog "https://www.gentoo.org/proj/en/desktop/lxde/lxde-howto.xml"
-}
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index f1d5f3118d60..260d50b97379 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -4,5 +4,5 @@ AUX lxdm-0.5.3-pam_console-disable.patch 307 BLAKE2B 4bf6b05b5b803b582e441cd5b17
 AUX lxdm-0.5.3-upstream-fixes.patch 5836 BLAKE2B 0e76a7c92a9b5c57dc85fa9659653b29ea449810ee4bf596e4691e91cc4ed1645b6b75e64bd7fe35f2488f469bad237633042b43e10d10afd0ce7f8fa29bdd9b SHA512 c67186af1f3288633e5a3b8a25167f92999209c99dac4257b330d9046eb0524eb766032dc6e2870a9843afa8ede88defcb1f0e1cff57ece5bc9d5d1121446070
 DIST lxdm-0.5.3.tar.xz 239132 BLAKE2B 9d27feb60452af49127972ce0ecdc25122f5f86961f65512fd6c185c5d6ca03e637fab703fa2df156dba8a3d0ef4e7cf9f55e20762ba49bb14dc4ee8a82b1fa3 SHA512 0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f
 EBUILD lxdm-0.5.3-r1.ebuild 1601 BLAKE2B 9462ffa28e673e6d33bc8998ac5d87422af87e1ae659a6a749153f13e00f16028c6338036e4db30f17326b298d10dcba1f26150e3ecca0231e8b053166fa0657 SHA512 cfe4f814cea30c4ca305ec88266cfc3e4ec7048a13d62297f4dfa477a35aac73dcd57b108b09a5190f499e4ef12126ccb3c3c8e52c81f45a853ad4cdd16f4cd6
-EBUILD lxdm-0.5.3-r2.ebuild 1830 BLAKE2B cbe3d0b5b1e00e7a10fed92e32dac6c5ccea52193bbb031829d30925e439b04de13ba2d6a8f3150cf3cba0ec6ba81ef974132473e19ed4cdf1725d8f692250b4 SHA512 5d353b584fce136f90ccd3d3babd4083a5a0cc9f4a917ed758fcb10fb19d3eaf7f4f0f9a331a47c8371a729f59d7e3ce2d04ff61f605273058a0e5b03930d714
+EBUILD lxdm-0.5.3-r2.ebuild 1829 BLAKE2B 639cd342a2f2951a00f423a6d1118994736d36b89a6d6d80e39382d77da59c57db685733e99f79b6e09ef6b0c8382f260d6a936d4038db55db4ca69b4abee92a SHA512 e929cee459f10b7525ca97845139782a09711a76998c925d10f4be2560c33c05f3c0fc2c1096a427644db687e6bd1b2dfbb0f25e90e305872097d7525a1fb7de
 MISC metadata.xml 581 BLAKE2B 1fa67dfa056b08a3797120c83b23a11014a0b15a0c9ca6f6323c77ed80654c67cf1ffa7f4877af66286bf739f77ccbd7a997459abc85d7db7d240519bd60d496 SHA512 bfb1509cb2c43f2711a38c284a1a4152192b91c5a9f681fe063848cbeb39e8a2185d2bff084d08b0d9583cb2482101e23ce955aa9b81606a2bc270a657d7a2d1
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
index 543eded4fd2a..6a29e48fcaa1 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 
 IUSE="consolekit debug elogind +gtk3 nls pam systemd"
 
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index 2b86325f5880..9e10f97491ad 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -3,5 +3,7 @@ AUX lxsession-0.5.2-key2-null.patch 1051 BLAKE2B 9ebf6b30c49ab4f9dcd3506fc38019f
 AUX lxsession-0.5.2-notify-daemon-default.patch 709 BLAKE2B 7f2c75ce81e70abbe0c9621d6d5605a87925f2231d86644dadf93235349a90fa733b75b9a371833c4b8b482b43c644c617f041ac1f29df1d94550cc0d7abd7c8 SHA512 17ff701e90cd11f077ab538cf6e2507e49e01ab8037eb0e52f4e4eb02b6ca72e118bcad2158c3500364c74c6aaafc39c64f5bac411ec4d0115c011e8a6bc289c
 AUX lxsession-0.5.2-reload.patch 1324 BLAKE2B 9457c86d228db27eef0f32149af14acf75e264fd45b1861b05ece4085a3fc48be94ccc60011e496eba605410cf1d7f08289b49e1a62e6b7b562b0edeef1bff50 SHA512 b8eb606b915709172454bb610650dd358b492ab29608ea62c834356a707ddc70440e3215e8b639ec8ebcf459cb8753d6bb525ea8037064be1016201956b91cb1
 DIST lxsession-0.5.2.tar.xz 354092 BLAKE2B 3acbf1be74ed461d331ea8ed10e5c403057671d5f7f32c72951ba89681ad4b0b1a104c2962805738e5b414549e84db3e12327172ffe1b7c6f13a09e09c44fd0f SHA512 2e08e5263bb4ef9d8051e84997347a12d2f1ba75cf4e70f9e3ba783a509246f0d6efd672ac1cc1d0fffc8707710ddb148298449b5365deb6785623d596bc3da1
+DIST lxsession-0.5.4.tar.xz 422756 BLAKE2B a04c67dbbb9da6405e165a05eb43d82f9d7ecc943147a8c5ab4fb5edf50b40b408db102ea1e96e142f61fcc2d1ead023685c33e1c26c09a4183882cfe9c5c930 SHA512 5b92d6e703ef692e3788554a3a34eca7bb4b7bb23d735af838c35bfaab142238eaeee3095176e5e4a7464468ab5478a596c670b0e2488f8599091f3e2fc8482b
 EBUILD lxsession-0.5.2.ebuild 1757 BLAKE2B 47b9ba8b2df76bba57ac7d9f7703679dd12e403ea594af067834251425cc0ec3f310217612ab42f25ef0e6e7c5911ad3bd2828833f71026bc166a14eb1696f58 SHA512 2d9aecf337f2db774aad29ea4ef92d40e05b46d6a081ea784bb8a400f6d2d1445d409a381ae85be989551196cd1324d12fc87d50b48f2bd98d40bae8f0955775
+EBUILD lxsession-0.5.4.ebuild 1311 BLAKE2B 01b9d7d65131918545a0290174e75ec1085b9d282c6a5c20897942dbe7b36474b3462849307044159f4d0d36c72c2b612bc6bf900b2a98979471fa212949d15f SHA512 be85604140af0e52cd71695bdab0b315322cbc8e69253181821227c33f3df3d58c9b386763749cb6d2056a54f014da05e87c14ffc11baf16f592fedd46a38f0b
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxsession/lxsession-0.5.4.ebuild b/lxde-base/lxsession/lxsession-0.5.4.ebuild
new file mode 100644
index 000000000000..e9fb636e8f23
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.5.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit vala autotools
+
+DESCRIPTION="LXDE session manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXSession"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+SLOT="0"
+
+# upower USE flag is enabled by default in the desktop profile
+IUSE="nls upower"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/dbus-glib
+	dev-libs/libgee:0
+	dev-libs/libunique:1
+	lxde-base/lxde-common
+	sys-auth/polkit
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	sys-apps/dbus
+"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxsession-edit
+	sys-apps/lsb-release
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	# Fedora patches
+	"${FILESDIR}"/${PN}-0.5.2-reload.patch
+	"${FILESDIR}"/${PN}-0.5.2-notify-daemon-default.patch
+	"${FILESDIR}"/${PN}-0.5.2-fix-invalid-memcpy.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+	# gtk3 looks to not be ready, follow what other distributions are
+	# doing
+	econf \
+		$(use_enable nls) \
+		--disable-gtk3
+}
diff --git a/lxde-base/lxtask/Manifest b/lxde-base/lxtask/Manifest
index b419f748965b..a1aa8b7f024c 100644
--- a/lxde-base/lxtask/Manifest
+++ b/lxde-base/lxtask/Manifest
@@ -1,5 +1,7 @@
 AUX lxtask-0.1.7-fix-no-common.patch 2102 BLAKE2B b0329dcdaf9b958b3376d3a641fd392980affedea52a432bfb7b88c5dbb6145ead473b4eb6ec52cd49f76469c706bc241b5b3b618d8d12f6fccea2bdc5e860c2 SHA512 74b8f187836a70e7c144b5e0f7b0fc06ac1bd2c8db5559360c709bb441293b0fa92ba41e9b02f7e455d231ddeb6d7822dd8e3859c20252e0bceab391cefb6d2e
 DIST lxtask-0.1.8.tar.xz 137288 BLAKE2B 05a69cfeb8d4801cc0ee7fa502f23d98992e3eff7c5d02ddac8c46942da366224a669704d174723c9857b13396a23aa2bbe4ac0e35afac6f6c65b0e9869bebbc SHA512 095904df6ecea699a2ea44ca6f1677d8882b1bb26926b716bd0d6a65ce5aece99e3ac833d5bf08dcadb42e269baa1d3bd7c6e974e58a64f6da147763e9a40c6a
+DIST lxtask-0.1.9.tar.xz 138000 BLAKE2B 1f26cf4c4ce0ab64cd6b3bf6b7539aead92da2a816f66f4dd53d170f48aee8d824993b26d316535dc23f8539c33f9b31c89a631f2bc8ed4778675a3c001ea470 SHA512 21a28a86180e2c0d11f591707fe4333cb78224316d6c33e581f5a38a36baf619e22c426f58a6e4eaaa5701119b909a956691fc00ef47dff140443148f2941f4d
 EBUILD lxtask-0.1.8-r1.ebuild 965 BLAKE2B 403261a84811f1f5ce3b5eba2c38a124c4ea144160c5ba18161aec57fc4986b42b073512f5819e1603178a7acff019494c1eff7bd0f87838baf370b75b729654 SHA512 2e42807ca81f0ec0d4fca2077b403a45301cdb791ec2b2217833903ba62a5f479aeb17b1fef7abba1ec4c3d15d676b5f06e79b0ebfd9f0f4b6d7de56a6fb48b2
 EBUILD lxtask-0.1.8.ebuild 582 BLAKE2B d1c44263e026b4797dba64945f4390af83de51fe59228b3aaf6e5b56a97d9f2297c3dc3cc2a65dbdbd460fb158330d45a31304abfcc84c16207b0de0d557d43a SHA512 913f9f5f9fe2e3f1c350ebeaaf6973da45c9caefe00dd4c1891cb0f57de76bd85619e2991880d010cba5edb9cb000417865993de477eef19d37208e3af836850
+EBUILD lxtask-0.1.9.ebuild 966 BLAKE2B efd9155fb2ad64004d23fd4d3598814502f89656f4c9f5d98829ccad9795a70aa1d2f10fa53cb05fa0f03d88f5e04a153691673788169e53dde142dc1555dba0 SHA512 4c57d4acc412df94b80a52e7d6a82a5e13ba300ce60cef61979accf74cd00ab82e58ac94b283fc84ca9e3359196df1c9c32bf1757d21f5ac749bd0a6d559d759
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxtask/lxtask-0.1.9.ebuild b/lxde-base/lxtask/lxtask-0.1.9.ebuild
new file mode 100644
index 000000000000..71ab48b914c6
--- /dev/null
+++ b/lxde-base/lxtask/lxtask-0.1.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="af ar ast be bg bn_IN bn ca cs da de el en_GB es et eu fa fi fo fr
+frp gl he hr hu id is it ja kk ko lg lt lv ml ms nb nl nn pa pl ps pt_BR pt
+ro ru sk sl sq sr@latin sr sv te th tr tt_RU ug uk ur_PK ur vi zh_CN zh_TW"
+
+PLOCALE_BACKUP="en_GB"
+
+inherit l10n
+
+DESCRIPTION="LXDE Task manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXTask"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0"
+
+# Upstream report:
+# https://sourceforge.net/p/lxde/patches/535/
+PATCHES=( "${FILESDIR}/lxtask-0.1.7-fix-no-common.patch" )
+
+src_prepare() {
+	default
+
+	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
+	l10n_get_locales > po/LINGUAS || die
+}
diff --git a/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index 05a566b50549..8bd583f05c6d 100644
--- a/lxqt-base/Manifest.gz
+++ b/lxqt-base/Manifest.gz
diff --git a/lxqt-base/liblxqt/Manifest b/lxqt-base/liblxqt/Manifest
index 33ff5a621c74..5459157e13c6 100644
--- a/lxqt-base/liblxqt/Manifest
+++ b/lxqt-base/liblxqt/Manifest
@@ -1,5 +1,5 @@
 DIST liblxqt-0.13.0.tar.xz 56896 BLAKE2B aa642fc87991c1768e391908e6444af456cca073223e4f05a2ff95eb7a04a4ab5d4c7d217424ab8d096531095d2dc767be7341b8336410ab46ce6d2e8676c686 SHA512 17d6ab8aa7475e1d2ca90b9c3d8b0a438003f740fa878b09937e0214f0139b6f69eb833e7179e981260ae67079fd70c19423d1a4948a2a18061539fb2191e9ad
 DIST liblxqt-0.14.1.tar.xz 81704 BLAKE2B 9aa190fce337068d02962af90c1847acd51a63c44019c9ccdc729dea00d52cd65826e50850e913306f5e6f0a20d1e25b4f90cd09ebb9012c2c3337aaeaa3665f SHA512 28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba
 EBUILD liblxqt-0.13.0.ebuild 925 BLAKE2B ce9867b032d01218b81c8e9286abffccc44e53806afe300faf52ebc68878bb05aa9c3ca25889793890381f15f5f0a53119e8b30c24b5f609e3073719583998d8 SHA512 42ecef791fc97efcb6a849f9f775deb4422e1f82cab9120105c7f1cfe3cc2e2b03c8e6b8dfd12a24921f6160efc063e41ac5e14b09fc1514d40e3b2621e00fa4
-EBUILD liblxqt-0.14.1.ebuild 851 BLAKE2B bfb38b965852f6a844d46c278eedf7bb3b81090d4aea4dad7ed11a191e88c65fe4364e3bdeb361daf654eb2c3fa281ca38810917adddb0a1661f48ce9b00d252 SHA512 5b25d0ca41748a1a4812e370f4e95629d173e6db9375f6494c338cdce2abb55862df049b1c00831a068ca17a9982d999d014af5d5e4e595cf60ae4c4811a82d9
+EBUILD liblxqt-0.14.1.ebuild 849 BLAKE2B 509af4066113cf65371709314965b297d19b2c83d3481b798345d30c0c8036726e4bf4c00ff5ffa28887b108227931da8cc64d3e2eff103f4b0fdf3ca55d0ce4 SHA512 da7c14adfbc86b99b7017543e4091daad8e2841e0a5f12d33bb713f247f207935ea9531fb65c8fbf985f3d7840a8c3007227e5f8ec2675b8436abef0b4c6309f
 MISC metadata.xml 313 BLAKE2B 6eee2dbe392f7cd8b5f033d718e5ef3c4d07b788a09d99d97f06ff7571153366bf9367bec44b18d8c096c9afbd8be76776623b0fcc78bc2507422e78ab197405 SHA512 e3a460c17c69d21bb39bc75a79f36154afdd3b38abe18bac568afb28b5739ffc2ffe5d33607037ae32b7d6925512eebf560562b3e157dcf1e882d3bd9deaff54
diff --git a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
index 54b3f2a5334e..2aea29f7f743 100644
--- a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+ BSD"
diff --git a/lxqt-base/libsysstat/Manifest b/lxqt-base/libsysstat/Manifest
index 64f311ab92a4..775c0d78e54d 100644
--- a/lxqt-base/libsysstat/Manifest
+++ b/lxqt-base/libsysstat/Manifest
@@ -1,5 +1,5 @@
 DIST libsysstat-0.4.1.tar.xz 17304 BLAKE2B 0074ef15eaa9feddaa20123bcd39f0b5da2bd9a968a22d2c1c6465fccefe81f5c01e323657c4e8c637704e8bbe77ccf561cf1322853110e378fe2f03d16deea1 SHA512 e0f6497be9a7205b6053cdae0fcd88d8b4723489ca97f1ed2cf6704cae149abc3f3339c777aca638abb054e171c6e592b5a10c129aff0a1f42083bd91ab11eb5
 DIST libsysstat-0.4.2.tar.xz 17508 BLAKE2B f6c7703efbb449659278624d46c595a6fcf4f3e99d0d8633faeb7be36e8759c5ede8941e81df5ab085daa8178b079f598be31a4856339c248f3560bf0d21073a SHA512 9059b9d20edbb7ecd89e722b48c6603b8042030ffad06d3eac167bb518691c2733d314649dc4c42a839d4812c7b65dcd043a13a6bd5b56678da112a8065717df
 EBUILD libsysstat-0.4.1.ebuild 551 BLAKE2B be68641c9ce482e55cf0bf5b1a7799b2545052e361e6a33b4403187c4860a6957a89c8fc79ff736efd2c1415ed09443175b5a1b594e11294429279c7f3c8a41f SHA512 6779d8281ac21b34e19418e0095996692c405df6fd82f285a0a3b81b99843536069b058681c9da102a902cc52433e7b24cfeb4ffd56acdab18916a1edc0792e6
-EBUILD libsysstat-0.4.2.ebuild 560 BLAKE2B 81da119a522f9a210105a6178408eb622ea2bd293c8a866a1ae37b46554259dedb7e1509be0794c44002044d2d35e40ca3d2dacab7beb6f40586d2dbf7073fdf SHA512 fe4c9997aafb573baa08b48920a70f4838399a94a3be8ddf30d95fea963ae56e4fc22f7ef5ebb90b9d5d6a95edb281f9c5ec2e664031d825db0cb96a893abc0d
+EBUILD libsysstat-0.4.2.ebuild 558 BLAKE2B e484244b424e0736351784d0d146a14bc4227a8dfed8cbf092470f6c05b9540b83eceee666d1894d786b2f071ce0319286f5d5302c48203f7eb4aa14c40141cb SHA512 bfcb8737da32538cb3bdc72d555b4f1167612e1e6993ef823e39b603cdf80c62039e3d775e47552aeb273d8a4f3ae976331992115233fb9de537dee031725746
 MISC metadata.xml 316 BLAKE2B dc4c870d7a406c938756a0a5df097283f0d001d10b7bc9a2beb1730214405578f97faf60d9475fe7ba93b649ed33e8b1dd4bf40eec4091e405fc1eecf8b9e450 SHA512 3f9226fbc9629f0c61468c7bc142904fc2e4087a425d528def9f6432c31f3aead2f77959d49337aa3431975306e8ce3ee1d7d8e5d13ce57d20a62538fc7f4ce4
diff --git a/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild b/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild
index e0faa44cc89c..96c2fa678bc7 100644
--- a/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild
+++ b/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/lxqt-base/lxqt-about/Manifest b/lxqt-base/lxqt-about/Manifest
index 0b617f6c8c2b..833ee6e3d297 100644
--- a/lxqt-base/lxqt-about/Manifest
+++ b/lxqt-base/lxqt-about/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-about-0.13.0.tar.xz 22580 BLAKE2B 9368376520c1fab67ee6e23af4a020de42976a9fb703adb7c53c5c6d2f83075db618c837692df18d5fec2c9d68c313f01cf59c4dfa609a6ad180d56589cee8df SHA512 5ba1106a66115f791597b12173be5b8f340c275e21ee53acd77aa7f10c409ad9b0bb83e24479fba6ff4265e6261ba90dde98ce10331b00fc01e87196fa506214
 DIST lxqt-about-0.14.1.tar.xz 36204 BLAKE2B 99bb41746b2ba3943f3817a59dd0786a3fe95a3ff9046a7a382351e17a835953c5fb8748619c2520e18fa5ba665bcadf05fe2c0992dec39366270de26f009fcd SHA512 09cbb4c6c331b16b551d1b63ad4643f424fbaa35cfa9e2d4c70393fae499d403bf8a70c8105d258bd84200d06862033bfe0a082500e794b0db10df38d27b407a
 EBUILD lxqt-about-0.13.0.ebuild 730 BLAKE2B 011ee92f41fe43a06e979fb94e235fb9654087abaad6d82a32b3ae2b7e298a3176f183ae65cd405a7c97d684ee17377bd245d6744ac1f928ef7cdafb6fd65a92 SHA512 417d5dc855c1f9f4e441a62ada6052c3a474d5bcd18b72bc6c00920b5b12471671922cd71feca1848b58afe3770755f7600e1f0fe9bb7ce37e7e67c0d9cfb06b
-EBUILD lxqt-about-0.14.1.ebuild 654 BLAKE2B 5886725493c4b60d286fea082b04488a2082493c43cbeb2895d44a3916138682cc0a04d6c5bc9cd7c3b0073a459f4944ad70acf70d94c85d99a4b8acc40264b1 SHA512 174e1490d03418807ba1e487678e142427b2ee91b0322752b27c79dedc28f02a311f69e62b2b53d03d9552b12a5bc70e92fa4135df405907aa034e14c5e31db8
+EBUILD lxqt-about-0.14.1.ebuild 652 BLAKE2B 985691928caa0b34c06f2790cc96613f980958beb502c6e5443026a606aa5c98488ecc8681ba059e0dd35962e4b06498edb8b3e2b0db80e80a47b55a28a1a919 SHA512 60e86441b0326f25bb2a12b61d7ab72f0814b1110abdf960a2094ef11da27f3a958b4ac0f737e9215b4427e179787235425f371aef2524d23b8cee45fbb8f887
 MISC metadata.xml 316 BLAKE2B 36bfefa13949cfad10150cddaf4d8e2fdbf96632479d9b6a3343f7b9b51e83d34134242b0e5d3a5a0e25a3159030d7a5bc1c97e9ea27d0d85663be67dbadaeff SHA512 b5109f43afacd0a858485db451a587e8dcf9ce2d8f3e146d0c24efcd5a88404265c8e99578aeb7da55ba3429e27c52e27acf6adddc1015eda4f8e57c5f37ef91
diff --git a/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
index 89e05d6b229e..4d0effe311d3 100644
--- a/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-admin/Manifest b/lxqt-base/lxqt-admin/Manifest
index ab1342994289..e3abd709eb91 100644
--- a/lxqt-base/lxqt-admin/Manifest
+++ b/lxqt-base/lxqt-admin/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-admin-0.13.0.tar.xz 116436 BLAKE2B 9395ea5f762da37ebb810c167c66c069b15b86b6b71e4a679d6923a0deedd9a87da65469b3ad5c934f9898e91776eee7ec7a248996283201287d00459f69e5c0 SHA512 fc84f2cffd28ea87833194b36654016d426c3b0e7a468468568f35153b208129d504200b31c17516298444882bc54ad7e3bc1cbef2b67459515eaac3dc77dea7
 DIST lxqt-admin-0.14.1.tar.xz 141088 BLAKE2B 89e84167b4dfe67f2c7831a8d2ec4ee8805518d421e36b5cc1ed482e2166c85c54150ff54789f4e0e3f9fd6a5d202f620d2da60f79a0a23178ac0bf9882108df SHA512 bd6272a3042a71e9e00b2ba10be2575649c2d2750a4e00a6e11adaae6b91ccab5e3cf79a8ceb7bfbe808ec80c139b93e02cd96990f80b68a77a974c063e6a373
 EBUILD lxqt-admin-0.13.0.ebuild 766 BLAKE2B bb5559376fb6ac970c69dd679f104f1304b568e456e80104cd62915e5f0b22118ddb628175ac94bb399c82f364d5ff6f1e7fac33050518bfbdc0a521c164ad36 SHA512 4d2444ad1f09440467875cd27d46056fff7c781a605e7f7db91472adb95ac6a5f82920eb29f260f3aa09f54c5d43ce0f25d2926e948b7ec78bfe77778b479348
-EBUILD lxqt-admin-0.14.1.ebuild 690 BLAKE2B 3b5d61df20aa97c83b9f860b61aa423c3c52460613b082664d929a3cfe8d0e1dafdccfcb7e222aa4217844b83590cdb72fb968da5e782c7850e3340e732c59f8 SHA512 fa597a6ca19eb004747dab5ba30f8b16d06ecaa01a8c2cbd24d6b2dd6cebdee33c3629a27edec5152eccc9b59725f9a339777315426aee6c59f92d08c09637b1
+EBUILD lxqt-admin-0.14.1.ebuild 688 BLAKE2B 601c6a7cdf539197c9b45e9054a56e81bb103b4b58ff841a725a8de738aab7efbebb55c0b8dc29869828ff7046054b7e325d3fe1ef7c2c8c3f0cdebde77f5ebe SHA512 0ce2ba44b8e899054f9f6fdf4f280e2724bbbc7007320aac69694d164dcf8fe3a6e2f0981816a022a5863d28f84d38bba0cef65503636339caea4c322c3a8899
 MISC metadata.xml 316 BLAKE2B be2bd5cb125c608cd60b791dd173079f9a18b247dd7113dd5ff7b9c893b10bb62678e0463553d3f16b10a92a40e88bfe4aa75aca0d5b3ffca9d4024b8e0c43ca SHA512 4fa962d54db76373af467ffcead4c651b8fc226e8da994c6b574dff81e5e1013ff5609c19bcfdeba669809e42c0141cb135248fd48f151781dd611703c88035e
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild
index af58883a5fdd..d384598dab50 100644
--- a/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild
+++ b/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
index 96ddb788bd5e..46cca4c855f7 100644
--- a/lxqt-base/lxqt-config/Manifest
+++ b/lxqt-base/lxqt-config/Manifest
@@ -2,5 +2,5 @@ AUX lxqt-config-0.13.0-remove-dependency-on-QtConcurrent.patch 1122 BLAKE2B cca7
 DIST lxqt-config-0.13.0.tar.xz 201112 BLAKE2B 6a79c1f07e1cf055da09bb7dd8f7da2426891770b0e757ba3c4e5ef137f715ba3a579b2c05a4f1938c9d76b6dda0643119888be7dace2083a57a7dfe0df93aa5 SHA512 a5102794c4cf18a18e633cbc7d0b89653abf2612bc61e506ec169f4898903092f5201a09a2610642c641a17b59a992a6d6f59366ec61d54763e8b911d5220ca9
 DIST lxqt-config-0.14.1.tar.xz 293304 BLAKE2B f090d7878815edc4f3f0078301a099ffc8ff57865516a9097db75faa1627af33c60d76b75cef8a7da5e9e790869e6768f54c3b17c59b038578f22d645c3c22fd SHA512 747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f
 EBUILD lxqt-config-0.13.0.ebuild 1405 BLAKE2B 0e3701718b5b3812bfda4903ddb47011004cf87862997c6adbb43544b4e8f398177fe9c8661ea61fd85197cceb8e2623047a065767c046274a03d358dda3c433 SHA512 c4032c1a2b7f77769bece058a53b6c0010e744d87192c3f7d01cd4b6b941ccf1889559c372c493255f690ede8629a7c6b90fa90b4fc214fe35a2ff95ec435158
-EBUILD lxqt-config-0.14.1.ebuild 1458 BLAKE2B 9d769e034a53f240f7f8650b32ecf246ae2e5a2dbf4358bb5a43ad76e30c720cf8353f61c372e9430c08c0525108c06f418f7b6d81cf8724d28b54e8915100d0 SHA512 4f5ede5d71397c83a524e9f4d38c1d05f8ec7c2df6339c0eb1e35de9b9372cf18e120d93530eaf7bab5293cde43baba754963cd1f6ef03932833917a97e4a4e6
+EBUILD lxqt-config-0.14.1.ebuild 1456 BLAKE2B cfb215ec259e1c71c4d68016f8007f6c8f4385e23d22c5b808c0739e736f2edcf4fb01f8d0142b6ea9ed837703076c42e8ac011ef4b728722d5a5acf5a6afe9c SHA512 19224c98ca49a85f21bfc60000f2d9c27be774ac3f5137d72b72f8da5222926dedddc4a343e53ef4d944c34bd5f76af568434705c8033f992279d65683316845
 MISC metadata.xml 450 BLAKE2B 6f59cf0984e8e6c625eef75e01275d3d9e0b09fdbc1fc82fffb8611b44654da27da256148350c632673352ebc397f07b4696efad6f1f0d35489468752a4293cb SHA512 9e74d2cdc46c1c7797ac91f141995fbab7e11f4f05bef094e2af89d3cfe7d47d209de3de5726eee2eb45926185803ff7c7f012aad994f1acbc43feca88e798fc
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild
index 838fe79c5218..8a62a41a479c 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
diff --git a/lxqt-base/lxqt-globalkeys/Manifest b/lxqt-base/lxqt-globalkeys/Manifest
index c24bd9a31953..168b7676c258 100644
--- a/lxqt-base/lxqt-globalkeys/Manifest
+++ b/lxqt-base/lxqt-globalkeys/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-globalkeys-0.13.0.tar.xz 53128 BLAKE2B 91a61ac4964fd3d883213038e7544fdb3cf02ebbca2f3a42936123b40b11934bbcb31e14b755910bc1b076fdd2b69d6d78778b8e2aff4e4a1635d5393ef96c70 SHA512 5350e91a03fa6928ecefb935302fe87bfa38e6f61bea564222739f4f2896ffab85304d7c0afe6dbfc78912e944c25f32892f35bfb08a904395fda24b9d58b3ad
 DIST lxqt-globalkeys-0.14.1.tar.xz 63496 BLAKE2B 9186b04d290260503a133f4baf9e4156abc056647687f518eaf460c8bd0e4e48d7f4639d1f51ab87f9adc1e2139f0315940eb3da5d098b3b0824e98ae97eee90 SHA512 7683971a916adb0dff8efd5567dad11e0860e48960bb6ed650aa2cd8e1bc33f7b8cbff95e19f198e00b61eea4f7492b41e7a0acf19365143c1c0ce8ea0cbb2a3
 EBUILD lxqt-globalkeys-0.13.0.ebuild 927 BLAKE2B ad3eeabe7130abc1f27a8cf4d7bd5a1f1bc1ef8ecc7184c62ef7aee6df16f9225e460e72f9899b79388d2ca5117715de79224224e0922c39fcf08fc3877960db SHA512 9339ebcc2d33c8fd4393fde8c9789e2707152d1f6ed910d94ad90acb5b570ebaaabc30dc7194440c54e7fa763648e4870022c80bc7d41b60fe18d89dc30f651b
-EBUILD lxqt-globalkeys-0.14.1.ebuild 830 BLAKE2B fd3854c8cf18f7b1b69e327ce5ecc171de86e6d4c982f4c99940a329b0542afd172ddbfd4fd43f42892ac2ee5e4e0d2532d9a6159dd7a6e671a6c75bf616e735 SHA512 edac0e17e0df9b4dbc5456451d5598cfb2edfdae50f51db780e8232a1c550c99055be638a4edebcaa002f7b35c59b9c24631c70d096397b7bc9a209c5ab5ab38
+EBUILD lxqt-globalkeys-0.14.1.ebuild 828 BLAKE2B 849a2498c0ddd402e9ea06b596ad87439f84835627ece1751336bd52c827839f7abe71cbc9e4396eff56cd2f4c8b11cbc8ecd4470b1d03fd6063ff42c8409d72 SHA512 109737bb960c4fec2ade68da6e5498d1ed274d4210b57a933462c9df4efe5e46af29ed82de5a7613de587157783136eace5f951a8d1356cd1356547474f56bcf
 MISC metadata.xml 321 BLAKE2B e4171574ab9b2b3ce038ad57a140049f2835aaad88c8ff7d372e3f65f2b696d27719c1dc2c1b8e98ad6dc657eae88405fb2e9d0a5c88ba48db772f30b1511e5b SHA512 2ab81bdddeec9b554082577559910d8d7f6def6aece5bc1ede46d5d74e5f1e23f86b6256f4e7b6cd55e88523261dcccda4970f26016a817c922d0249fcc30589
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
index 58173c4556db..8e1ed79e32ba 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index 3e7616752c10..9074a84c9a5d 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD lxqt-meta-0.13.0.ebuild 1695 BLAKE2B 3a8e34a40c873031f02e84ceeeff3b96cb14519e111dbcc12df56164d18f659843c720b74d96855ebddf4c27974a70aac7289b0ef052a0bac18f146b2450849e SHA512 634ec73834ad8479249c7b3fd07ecfac8daad2bf0c4299e79712ff6a6a7245a9c0337719c5b0956ff0a8e64a535bdc5ef1741ac50b06e7ed50a5fc46ef14e87c
-EBUILD lxqt-meta-0.14.1-r1.ebuild 1743 BLAKE2B 60c1abe6c5880dadbde36d6b691c0584bb682b0d8a982a93a7909b959784cb857a421dc48ceef3aa3f9f61aa1533e1ae2da058a1eb3b7775ac99feb7fc512c8e SHA512 dfdc49b6058dec6e75e7cad52ff7f4bf30a6e7565ca39ffb531e266c96d02f75070e0881fb5fee7d3b18a59dae3d56f2f1e4b0d6e2167c7f3f90e2c5099d04c5
+EBUILD lxqt-meta-0.14.1-r1.ebuild 1741 BLAKE2B 98dff60ac91f7f6b5fed773fd0c7c74ab88d5c38dd3bcb0baceee68a3818592a53457d4a8005fd36a7592a540e34b86a78f41e8271826339628b152c52ea5614 SHA512 c2f8e82f0188e8a9a44f3b8e3b273b86093a8fc5f7471de4219e5ad2601e99a8014f09027fd04e09a65f5b25bb7f94ac353b497d3ab7d33d3b1846ff188a9b33
 MISC metadata.xml 1526 BLAKE2B 904b5a67781f80fe9467970ea81a52444e5936114ffc5e7e91ee2da9ea68f1d2bc16531e76d08345bf258b1cf3025a63f9333d4bfe74b5a04329c982abab868f SHA512 b8a34fdc1db1caf60524fb7348da13bbe2064dc71a4943c60fbdbfac6a676a5c283e78c77729004952a4f88826c1af7a0435d4aed0db6ae0a96afc5a28998435
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
index c1ba932bbeaf..cf39cb918110 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
 HOMEPAGE="https://lxqt.org/"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="metapackage"
diff --git a/lxqt-base/lxqt-notificationd/Manifest b/lxqt-base/lxqt-notificationd/Manifest
index 7d4f2443195a..35bee388db81 100644
--- a/lxqt-base/lxqt-notificationd/Manifest
+++ b/lxqt-base/lxqt-notificationd/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-notificationd-0.13.0.tar.xz 32364 BLAKE2B c43e57e66e2fdd375f25afd68acc428c6204992e48c2b2bf1a692380bcb2f48663c52b3a5a9b17d01a68d6cb57e6779260da3c9e09873baa0a8c7489dfa9c9a7 SHA512 2bc75b840a666e013d914f08719680cf3af7430a6acfb5072facff8bdc964aeef1d5227c68b5a5c5d8a6d6c572632105e3f2f04c517d8e8669eb40b5a0cf0f4d
 DIST lxqt-notificationd-0.14.1.tar.xz 47356 BLAKE2B b80febe059a17e30df4abb81e6d63271b8955211474d80853dc54ea65112081160bf270766654498b50c78c58df4444682e1e9b9cac800c4afb294fdb2fdbaeb SHA512 dcd1892ff66d6beb5c8953c6731f798a59272365fb7439277732b145cc9e6479314415481d9e8aae9fd670d779011c3d7bb3874b05a67cfad2a722f467866795
 EBUILD lxqt-notificationd-0.13.0.ebuild 847 BLAKE2B f31c338183d441a391e9a9ae68fc89232b40d8b91321c2bd0d81aee0b3167a9a1630e3d61990a6d4ee95af100d43a2b8baa0295fd3f4a15c5988d6ba27345752 SHA512 a5af9a095db555bd09af0cf2fefd83758e8950dcb7db9429b1138d2e647824eaf4921d235ea070280fdee96f0bd3db95a3379cb60795f2d0b73f13b1f40e9750
-EBUILD lxqt-notificationd-0.14.1.ebuild 750 BLAKE2B c25ffaed20427bf29713e80ac72e638cbffbae4d0e2601a21142786ef44c41b71cf2a6d59a478bd7855b103f7853546707063ac2039be2cc08236440fb74bd12 SHA512 b6369cd78b66ca027718da7f17b8ec6beca27c98c0b2157589f379fb4170cdff77567e20c20436bb598ca37b80fe68b1eb3d7a49514fd8d64df398ab1848644b
+EBUILD lxqt-notificationd-0.14.1.ebuild 748 BLAKE2B 06ddf586fa47663f6913ea29a5e99ad9cafae3880030d800693df15937a392a3abc6c2d86e77dd7757fe6f0b66cf73a03779e5af08ec7cfa6e6058507111f3b5 SHA512 32830099724f54901296bc6b126f2f66a66e7ab4d8124aefd592d8977d777609d57d27dbdb4c19f49b7306d415a5d4ae7008d0d833f86540def2d4da78d04303
 MISC metadata.xml 323 BLAKE2B cc28b17d478bed98b59743c03ceb630cc65495414d1dd5703b917643f54ff606518016358e2b0149cc25082097a1e8dd5cb2ee173c235aa6cc4197d9cc258493 SHA512 3aa6fb296384049f738b51edf21ea16a7a68cad1cf5bc79c6c34f970f12292afdb44eb34bf6b48c8e884903dfad041e1078b7409427aaeaabee48d5ee5c1bc14
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
index 5b510c9b2b27..5e97db50bc2f 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-openssh-askpass/Manifest b/lxqt-base/lxqt-openssh-askpass/Manifest
index 298e984ef2b9..24943a773952 100644
--- a/lxqt-base/lxqt-openssh-askpass/Manifest
+++ b/lxqt-base/lxqt-openssh-askpass/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-openssh-askpass-0.13.0.tar.xz 14336 BLAKE2B c9265f0df40dd4826c08cf3f3cc2bd6304db40770b402c117adcb73afd823b5937df8a40e2deaa67c4d7cd581ffd5cca7cca48f41b4059ffc14e6a6bb66c041c SHA512 2ef92c8a75139d8827e38e0f406f9f9f52717b0918ff511baa376825cfb586f2821186692e1e63bd4c569c441ea4eff63a11f59b89a90f47738ece86a898e761
 DIST lxqt-openssh-askpass-0.14.1.tar.xz 16848 BLAKE2B b774027c878c75324a5908244ef2cf33b0a092cbd2c0801c92c1304a6eed40fc8a18919ac25c6632ba306bd7f56cfc64cf9880cf166639cf5a8eea4a1bfad66e SHA512 ab35cd719d4a31a495bed68a30cad5bf85701d223ee7306f0dad40717d0c2821af53e07a929b5855fb0cd680684fb790a638b59a1ea3ef288e0f656ab490b5bf
 EBUILD lxqt-openssh-askpass-0.13.0.ebuild 906 BLAKE2B 2d462266903d2b2bf14dfe56fd7044ed95335075adbac8a36aa9cf22a4f17653c2db02ac6bf53da11fbd3ba61187e7a2e7eb4bd810e0a499a78545054399957b SHA512 c53a254296ac7d53ddf7745e01e1d6523abdbf62a1fc9780768c70250bd51951b4214afdbdb571dfdc3f715bea15b29763d6d04c3494ce90f6941fd48b58b198
-EBUILD lxqt-openssh-askpass-0.14.1.ebuild 833 BLAKE2B da340a44c26570a490fbaadaedd9a2aed4fe54cc81dcfffe36a4897ddfda0b5100170cd19649f86ccefa2a43276c54468cd7e2dd00457ddb7015bd8a44657693 SHA512 697c8f458dbd3efd77bcb03b02a3f97d38454bf30dc299dd9b980905b866931566379f8f11f7b7cf3dc259b1d19f44c9ff7a04610bd68290ed5a21714ae4b953
+EBUILD lxqt-openssh-askpass-0.14.1.ebuild 831 BLAKE2B 2cd3c3fd5a20fbf353d38a483b7474ab9e0473a0a186e631a10068496ae0050b115ffd09719df4fff8508ce2aae636f756ce56f8c92c36bb465da3ec28006f92 SHA512 ed4d5c2f6ade63577827d191dc1379ee344d1fa3e0619682fbdb5cfdbb48ed6822ec41a62cc380f5178750dc1962783b116e6bda103e696938471a86ff71d989
 MISC metadata.xml 326 BLAKE2B 1e00f54527db197d3a43db75f66f6f3d7575560895b815593763522c4696dfc15d5293283cbbf2105747d1b367b3da0c15b1ba2d8bd8bb6905899d0ed51641d4 SHA512 b3984c193ce7a1aa091c4bc90c8933245e1479094ba3022fd9c922c89f81c53a2469542606d6e87d5d6ff78b980999a4d4fa42297363cb31daec41ec9bb0a3da
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
index 93824d9adf19..4a238a176bd1 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest
index b402406eb9b2..67ca18e5a1c5 100644
--- a/lxqt-base/lxqt-panel/Manifest
+++ b/lxqt-base/lxqt-panel/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-panel-0.13.0.tar.xz 273924 BLAKE2B affed55daf1c0a4bf20faeb35278a7d0c7474e514627d24c33469954bcf57ef2c5ee0ac1346918a3edc58f929f07a923e730d0c8ec1d32eeb3d2af41134beced SHA512 f9ea21a24aa8fc0898c756349256a9a84f4e8469743383ce4372f5ab3719170c84ec731d661f7b3355b7501f16fa862ef9d64b7b346e8abd4cbceb547fcb18e3
 DIST lxqt-panel-0.14.1.tar.xz 439252 BLAKE2B 28172f61cba99450965ca2c1660ca51f268a93ffc32769b270e5c5984b8f3534c3e8736f07334bdec1a1eb408ef35a20bf12de5a445faff161a93efbdacbe51c SHA512 e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687
 EBUILD lxqt-panel-0.13.0.ebuild 2881 BLAKE2B bb9694192d9a3beb262d16faa94fe3fc21bef539bf15d1b267e5ec24594f633e5baca6b8d02566abd29b18be3a47adbee8a55abf576b79ee18de3c25e6a6a9de SHA512 a3c8a76c97111435069c591a7d122c8201604a55676c5e4e002d919379e659a40eb4927b711b9bd7d9e112d500a7f1830d1f7021eca00713b75181b3e0ab8d08
-EBUILD lxqt-panel-0.14.1.ebuild 2888 BLAKE2B 0775669c929d8f06046844223d576bd866d1ab1e642531b9ca5812d46b361cf93ce6bd1602e0cf47b386d70c5a510998e544504705e0ca43f28ead74a44f96f3 SHA512 e1e2e2cb33fa785c9feae8acf91ed73111a626526651a225df6f08a4ad58aa33437c23f4f1e9ea342b7ad66fd5d60410cb332704fd6f2f654925286ecafd47ab
+EBUILD lxqt-panel-0.14.1.ebuild 2886 BLAKE2B 94f6fc488f88e6ba186677242cd2b8e04e602d96cddc9fd70aeb0a3231b1a7ab3149fabad37d324b2530c1e246b8105e3296eaa5fe5b14fee135f0e48a45d0f5 SHA512 22000c78dad5c66c28a9c587bc7d68a1e79ee9330767474686124f176d1637249967fcd6299c7f6cb5af078e023c0adcddd1bb08b4a492f478835a7d6f9add7c
 MISC metadata.xml 1505 BLAKE2B bab5a3343f1b765980b9b59a7a7d2b3d4e9968e9f47c2d9965bd1cc59b9770d69e543ecb2adf0c65bed3324becd988e7388218ddc19039a895ede16713014b80 SHA512 3c4775f11a763645878d24f3f5cf4a6c6b8622ee6bb6ccc8cd28582eedc8092030dcff06734db1c3266f13a076a63e1474d1334c206fb4d0bc55829eb3f9f1b4
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
index 9ef997edc34b..37900fb9d409 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-policykit/Manifest b/lxqt-base/lxqt-policykit/Manifest
index 159d1cb33410..160311c034db 100644
--- a/lxqt-base/lxqt-policykit/Manifest
+++ b/lxqt-base/lxqt-policykit/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-policykit-0.13.0.tar.xz 33144 BLAKE2B ae9416d9e7c98c67d3d428ccc28e28a97461f6213e58f90968a44654ffe94246f3eb5f8d51617a2626d805a097f5cdc531c2567fbfb6e3cead2f3aae7c3a625e SHA512 c02525ed60c3882b9fc431630a750937425f8ff296fa82112a2e88cb9d5b96767e2a8ff514daeee5d6dded96536cbb4520bc7bccb6c8fbe4e405168435f9f22e
 DIST lxqt-policykit-0.14.1.tar.xz 37616 BLAKE2B 05175f99bd63fae795499eff02b224a589842e6f4ce0faa66dcb949d99625d8fcdd54600d80832b5211e297e9c0da3aa33ecd6e47b5dd7b0e544a1d301e4e483 SHA512 c3df41a45ef4d04eba9ce0c9f29d4c9b68a192302e85e192a26ae73617b87d0ad70ec64135f500485d4c10095754e36935bf9790ffd83d0197b1bb784971a940
 EBUILD lxqt-policykit-0.13.0.ebuild 916 BLAKE2B b0e4222c40aa15fceed3a5a6ef9d26ab36785b9b51987312b33b3ab222e5e2b0dd2c634a6b6709661410af1883576a46c089966af712b26951454d7d18a1caf6 SHA512 89b844e32ee4a66c96261f857f66b6034e0f604d66b88f8b54824e193723be2ef4366447901eb14deb9684e4d0019c4db27b438b8cce89a3be24e58d2ea68f42
-EBUILD lxqt-policykit-0.14.1.ebuild 819 BLAKE2B 8a7c209208922a193582f431c8d456dc1c9e514ef274339b840a70c595710e039f25b17b02e5f9f3b2d51c7128cd5427326494c18ad7b43f26f88f05077f7b95 SHA512 153775d5c52d5de4dd62d153704f6006b340b9f6933469f2b09efb8e99b8a8bdc2aadce2502e567d52052513f4ceeca3ebc9bca8a5f338ad911767fcbd3e55f3
+EBUILD lxqt-policykit-0.14.1.ebuild 817 BLAKE2B a4a19029dfb9e43afff35b95475a6503e0cf9d2008559a92bc4cd55e85d234da65c23035f5e5398f8741bcd0f4e18d0cd28f1fbbca0531a14909003f1dae9ede SHA512 bbb8d52bb1f0333e07adc262c0f7d04a7eb822c58968591dbbab42f93a49c1565c2b8b6442e4c0913933bfc1b1486782d99444e1ae341afdba99178d0d3571e2
 MISC metadata.xml 320 BLAKE2B 06af6102783b41528cf4a8afd437db1524460cc47ff1004e4e45a8903673019f6c85ff948472d07f053787a767c2d5b3c1986ad20645e0418198e8b7e2d20736 SHA512 24085bd13cb0c25b25737c74a4817ab6a252079c0cd3d29f3caf1ab5e02e85f944653844059ecedf28629b38ec46a02163c806f600bcd044528d4951868e168b
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
index f5f9fc9a0a4b..3fd7c16d7fa6 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-powermanagement/Manifest b/lxqt-base/lxqt-powermanagement/Manifest
index 2516a66cd9ba..ee7ddd1ac442 100644
--- a/lxqt-base/lxqt-powermanagement/Manifest
+++ b/lxqt-base/lxqt-powermanagement/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-powermanagement-0.13.0.tar.xz 31488 BLAKE2B 0c236015333c013df791bf86ab9c5f1aa3bb8f50c298d40214cb41517c82e646de77439321b3f7bffcabc56553758979ee449fb6e67a7e7f7981860ccde28401 SHA512 849bcd0739e30b0450d358e23edb9bf800e3804e0929d78d9d08c640355b6eb9351df458025fc381215734690ea902ec1896f5e070fd19ad006520148233d77d
 DIST lxqt-powermanagement-0.14.1.tar.xz 60892 BLAKE2B abaa853f6de7540dc0b0446dc442f78b59f9493fdf5565c1207080ec979f04b5e42a343d248feb99e57af32b008f49b36e3ec07e1a592eb957adf762b131761b SHA512 04c72e8f73fff647f0a1d987db2879dffaeba7accfa320bc3b101befdb041ce391debd5f6de12cd2614f9ddc9bf07644d778bb33611a3a4690fe818f7bc81d10
 EBUILD lxqt-powermanagement-0.13.0.ebuild 955 BLAKE2B 919d02ac09b49b89a6d45e61b7fec52014b41831145a9e7e661d62840a87d4dda81b2f7df21d893b188d74bc8a5b11f7dbd370c32aff0367cc57fab12096ad73 SHA512 2c96f93812d603188249f78e9ed7033eb66910fe8126152c8034e2b602ccd394130762a4a570c456ef7f6f83e72a68e2af651db6e25442950a37d850a493a89d
-EBUILD lxqt-powermanagement-0.14.1.ebuild 858 BLAKE2B 1379622a9e78a0a85a16bbeb41834a30ca8e103fe73214057038224e62fb12c9241dcc18c61bab28a1ef0122e826f9cb6199c6342c8a6516ab0ab11b27adbeb3 SHA512 e46752ecff9eb4c89621838d7dcaa8665829c6f3f8902a0ec2e88bc73fdb607d69463d6f049530e7c7414356e878f231228ba0c3c66ff6dd6409888b24e95335
+EBUILD lxqt-powermanagement-0.14.1.ebuild 856 BLAKE2B 5f792b5478a4c5cc3ed96d78ea0f508d0363e1b25cca35f0f233db525386cb9fca0e33bde111d811930a16d4dcb727b715b44c9a5358bd63140ed6d8c393ae2a SHA512 4811544a7dce388e7f8f639d5791bda94aecc11feacb1751b47533bc732d65c491a7218ec91496fef02423691f4fc27e2ef7f62528b8e08e49c6823a051dc432
 MISC metadata.xml 326 BLAKE2B 488752fea9acddffc106b0d4c60fa02a3999e4fef6fd83e572f980686ae1f0bce317b0195abca851f509a2fa305d1d433471a09a8feb38094e28a1dc7a64f124 SHA512 3ac636dc74e16504678b9e95e32fff32e7338c14603576dfbaa0e6f9d69f8130cd1f78b6c122be0f2e8a8ae3dd1501baf3281b12280852d293012b6ff31ef665
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild
index cf344d35dcba..bd2aa6e83b15 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-qtplugin/Manifest b/lxqt-base/lxqt-qtplugin/Manifest
index 46b30c4aca9f..3bc5bcaa0b13 100644
--- a/lxqt-base/lxqt-qtplugin/Manifest
+++ b/lxqt-base/lxqt-qtplugin/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-qtplugin-0.13.0.tar.xz 23888 BLAKE2B 564a88cb04416b078e0c415efcb78be7acb7d3fa703bf4c30d75cb0e4aba00b443e021f6d37f9fcc983233824a71cd9b15c45b14579310ce9b3b89a2a1d88c5c SHA512 22f059accdca8216b80af8773eab462c779c489575aa7802e82bb95da4f22a9a0d5a1234b2da4cb39c5050a6e9ded3c2b977068cc37af356ecb09e364633c7d6
 DIST lxqt-qtplugin-0.14.0.tar.xz 22336 BLAKE2B 8155722880cff279aa26676ed425a011b2259ba94bf92122c59643a0ac6dd89b2841bcbeeac26ac24ef1e351dcdbcabf339c4a2bcee2dac30f2f9298434f7294 SHA512 33188bc03ee48a9b6e3cc5823cdcb5c96dba0cda65da511fe603d952c5de24e292cb02208cf357b04718df90f98d53bf48eaf6793d70d043214e429f57ccf53c
 EBUILD lxqt-qtplugin-0.13.0.ebuild 752 BLAKE2B 497271f85f75ffa39b368e5d60dfb315c89740360843490de3e3efc02f523c70115007cdf6bcb7f12be71a9ec4a7c198b47c34a46d65ab6799a2de106a74d2bb SHA512 4ae7b825b258bf199180d0ffc020e60590d538e46682a9bd221c851f52f7ee46b750f43397ffbf72969bb359bd76ec64e74ed3dad36ef9de50564e54f469a29a
-EBUILD lxqt-qtplugin-0.14.0.ebuild 754 BLAKE2B 799d9d0d9de0dafa42d998c1405fcff249a8172d1b1f891696ba7d3b87cb9c26907cebe482c765409c442ce98fe319a022202ce189d50e50f4d6ca7f4d52ab0f SHA512 fc9ae8009bb0a95599f1089ba9d0f3940bd5a86542ea4035fc1748e1411602bb63cf67b18c98cab735938cf96ffbbc12ecb4f5bb062fb1cead6c124807356042
+EBUILD lxqt-qtplugin-0.14.0.ebuild 752 BLAKE2B 0627063577b193da7e78cb15140157f81bfacd9fabb3025e6596352e6e660d8cad47e6f88e4bb4613f144212d5d01c507a77b1563f5bed0f3f565a5f0fd7c0e9 SHA512 3ec2320bb085cabb4ca0ed45ad64cd48988b5118abf8870200f6ae154dc9d81f4defa4e0142088702f3f429211f9ff7cb8892f0e1cdbd00a7fc3bf8584b273e4
 MISC metadata.xml 319 BLAKE2B ed7979a51580013c60fc88f432f2d8a0597a4970fe80282c91bac412d9e742d563972b30099fef401a5fa2d9bd66fc94b139e082f9eca9f0be9426a0cb8bf9de SHA512 960097272754abbf37028a661cc950852cc2a5573081acc2eb8f101ee865513d639a18f3dafe720a92b52ec5b8b48f52f4c79823dee88d0ffc59df432e506a78
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
index a4c000ea278b..650a7de2aab2 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-runner/Manifest b/lxqt-base/lxqt-runner/Manifest
index 3c5e69294fd1..25010d10ca5b 100644
--- a/lxqt-base/lxqt-runner/Manifest
+++ b/lxqt-base/lxqt-runner/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-runner-0.13.0.tar.xz 211776 BLAKE2B bed474f25f485e5c9099b12f65c1b46509427fc6d5d50ac345e83e473d4001679668f19265f9bae442e0c6b196d4f00922b9a38991929f71e30d2b4357c53708 SHA512 fed007134f252f10d215266005a03354f70960cbe77ad37bb00db27e0054b0c508e5dd15a07630525b134c2ecb7db2e36f6304c9cbff60dcf4c3831dd31641c7
 DIST lxqt-runner-0.14.1.tar.xz 223628 BLAKE2B c9f5879bc4c58d0a9cbc19e6efef7fc26bd479e14b7e7109458501372e9b3e251bf87889a1913e6bbc99b68b96b450e71ca57c764aac52afedd35e9904aedd40 SHA512 62d196d37e87bc9154fa2cd9abcb8671277bffdb8673a6531bcb93161944cb8a31298587f8323d79a290292fc73765ea15990106828335879b87029ff1aba28c
 EBUILD lxqt-runner-0.13.0.ebuild 1019 BLAKE2B c608fa4faff48d7f37656e91771e0d74d3730540248dd523607d2787de985ec1415581e19abffb9199a0735116029f2fbc87e66b3caa8475d77efe9fdec88838 SHA512 5f62cf8098dad8153570ff8524ec3c5fb4ed3e18b5d7ab9306a004d0df4b2df52d39677de68fd0be2c2ef91c4f78d74070d74d3a3c55df5cee5933a0ebf142b3
-EBUILD lxqt-runner-0.14.1.ebuild 922 BLAKE2B 3db10d4d1746c69667ff341f3425faf8f62bcc9555721897c8c8b9b556b90a21f0fe323d289d077dbb0f9cf3efcbd52eaa10abc0061abf46b108ec26a7ef8819 SHA512 278513a08610f87e69d2729f36be38b71d0727da240b29efd8f6ac2c8bce5946b15aac89fe8131c1840a92315754f8811ea1b874acb555d047a6aa396fad2977
+EBUILD lxqt-runner-0.14.1.ebuild 920 BLAKE2B 309e1406dad7fbed6689c4c10b5949e01b9f00e8522a479cbac97356ebfb48dacbd3bce828f96540f0d48260cad3876b215556f83bc07d8ad267ba29fa422301 SHA512 cea6087d127513e81a7fe8363b6c835079e306c982f6ea4d89dff972cb3b752cde395c397c44f891f8324f84f6c38ca6180eb74389b0208fec5073c9a1af7617
 MISC metadata.xml 317 BLAKE2B 1407054872d1acf5f80332fe07317c5cd8f8a3bd44bbfb7a74a6dc7738c861a2f925387208ee12ee32e6d8c8578f03a7ae3d07ea05d65bf6ce44361be87b9f87 SHA512 7ac300651df6b6a5cd22ed838779e880ab16717d07cbe084bb7536a8c41bb092168497482688fd3e9208bf2ee6528d62b2e0f7e69c6980d520cce4838b555e77
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
index ef371efaa311..790f3d3de34d 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest
index ae3957e6875d..1ad603a1dcd7 100644
--- a/lxqt-base/lxqt-session/Manifest
+++ b/lxqt-base/lxqt-session/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-session-0.13.0.tar.xz 135240 BLAKE2B 6856b6a14e635408ec86d612ebd549431afba74d990c23977ef8e14cdc043b039888ff5e0a67f265ff4085d936f5fc3d655a4bfcb94f342bef375d597d05de82 SHA512 3ab6161ee75340f823ec82d20ead9eacf7441fd675e2f8a295fc301187e027013c8a2a4e7ca1262795e9b07d3231dbab032363cadde3bf334865260142529316
 DIST lxqt-session-0.14.1.tar.xz 178600 BLAKE2B a4f0f096b994ea409e47d364bbde93bb66bfb4b5fb157ec1acb78a3055584dd31772ca2ed6a6592940e6fb578bbca3d0499f6eaa9775f84ce9703c39b0fc0bf3 SHA512 9274564f3eabe33744bbe8555b1177d8ff6f241f5849bef29f0bb344f506e590e1deab87bf2fdeb867872ebaa0262cda0400f16179951fd66fbcb4d9f7358c4c
 EBUILD lxqt-session-0.13.0.ebuild 1234 BLAKE2B 6bad907466fac22023d3d4deea7e81c2d74ac5d68bf055ef75719adae96b94ec2d1a69b7bac2eee0da018aca8c2967cfba60af709b9497efe6e4b135f99b0874 SHA512 a860e557407680be7b572e13d2fcd248741d1fd91105765bd5604ec9e36b99d6879ee69b4e0f4177cb168be125ebe86a4bd78bae6b05e6a9d70976bfba9514fc
-EBUILD lxqt-session-0.14.1.ebuild 1209 BLAKE2B e372ffbc7f991ed3fe769f9270f4fdd864f2d73fc7398c6a3fa110d78e02ddcf5133ce1d04c7b097817cf703363f007a3cbfa33a4bc3fd4ada6ff3ed1e579ec5 SHA512 c53d30fab78e2187ccd8518ad37960d8a6f392b31856a389b98b12c08ce89762688faceae5031217b52e073fce49c8ee1cc1f66c4d40b751e636ee7a8900dac0
+EBUILD lxqt-session-0.14.1.ebuild 1207 BLAKE2B 52f81a93eb5f26b8a5b7117e46c3c2f14ed2867de163c2a41251be3fd4722c5f54f81b31eabe0f5bfcbf69c808d999dfd3fcb1d6be4c9f3bdf643a0d5b531b00 SHA512 55277218704e75088ebfdc81b77821c56def74ea1a2528e7079eb74f4171c6efb552b98dc9bdd1b9ab1a1e91de8e448d56d35f5a90db8952c9f4dadfba74d9a9
 MISC metadata.xml 395 BLAKE2B 842bf93924f29beba87d230d19017136a5d8a55d62f68a4448860641b5dc7dff042e947d3075a653baf915a14b266caec30d249d64ac2759bf54d1997223d029 SHA512 c2843aefd069f9f8c8b96137a0962a7e672b566a48960d2a24e0a6020ec01fdaec3319cab3160ac530d3a50d43c06a0f8cb59977c679aa6e072f7fd4000e34da
diff --git a/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
index 91df6678fb52..f4bfd3596624 100644
--- a/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="+themes +udev"
diff --git a/lxqt-base/lxqt-sudo/Manifest b/lxqt-base/lxqt-sudo/Manifest
index 908fc4342933..94f24957bb43 100644
--- a/lxqt-base/lxqt-sudo/Manifest
+++ b/lxqt-base/lxqt-sudo/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-sudo-0.13.0.tar.xz 16208 BLAKE2B 83da7ca7fcd4f670e5569ea9869047eafbac68fd43469a3fba1ba51470f9417fbfa7403f1b854b4270aa9b4779475b7a2a97dcb755e02c189b4d87bd969d4b57 SHA512 ea7d8ca093e736e3cf581605598cb9c8ed4e40bc39fb94a4b44334e7f58ae53c489ede0dcfc75de8daf58c115c1a91ae152f676276488df8a16ed53bbf56fc82
 DIST lxqt-sudo-0.14.1.tar.xz 30692 BLAKE2B 18232c3e30cb70097eeef725424065b0d4e374ed710ec34b2254bccfde9382606dfa325995d0eadabeb312d524f3afce335f69d49c986e3aaed016ef71deaf4e SHA512 b2741ead9c03c2dddf878b7658316ad0ce170068aca413b48b2f614e6ee09e7494e9907f7bf46de09c84e50b75cd523b059d47f9a0d2be11b340824475ca9222
 EBUILD lxqt-sudo-0.13.0.ebuild 739 BLAKE2B e6878443efe584c7654e09a01140c9fd113eed691905a2173aa696845cccf4036ba7c26b86c214b4e017b06f3e1420711b43738712361e468e3ca797c88de34c SHA512 02648b5a1eb1b8b9ef37c37e0316a4726492e74cd23260413df8f3a16a5eb1807b45afdf65c7b99f06db61140c2839f7bfb67a785ddccadc150f1fe2bf8b619f
-EBUILD lxqt-sudo-0.14.1.ebuild 663 BLAKE2B f0b1c61e99a477b99541e1c0ff13a3fe4ddb0583137d0933a58c190ce143375b9ecf34a3f7fe38697e18e456f2a25e1ba955d7b47ea65f979f37a231646837c2 SHA512 4c1f939d3451ce975683ade46ede4559c440ec7d5b3d12d0aab351007cb51d017db0c6627648d19f212f88f23b7dec040850847144a33697fa6dbc7774990a20
+EBUILD lxqt-sudo-0.14.1.ebuild 661 BLAKE2B 9ae21cf38e2474411a6415158fc6b9d708f7886612a8592f454307325877991447bc9038e1757a712be67987ef66b281fb0e479e853cbcf13f7f70fc2cf39ed8 SHA512 274c9a7d6c822f2c22ecc3b811fcd868ade24bcbb3139c9bca441c7af8419396e2f3b84d7cddd80a842dafa3a7838ef7c2d5a31696d335dbba2541e460045a68
 MISC metadata.xml 315 BLAKE2B 7e2dbd32ef59c7cbfdfd23b3dfa490445f4ad5ec7419fa83f3ed657c07580ea97df2e8f5bf54754a028517744a9230fd7d77f187ed0bab29c2822b30f00580c2 SHA512 33e754e42343bad0c2e726604c7dec977f9ae4a902af769fe0599ac8c067a6c0047794c468f30fbf6d2262c2f7830b14b913758d5398e0a57b8a29a0c4e3329e
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild
index f1f039457a47..0bcef3d05138 100644
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild
+++ b/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 52c20bd3c4d5..4c8a3e06caea 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index b4986c0aec18..b68ee0616ed8 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -10,4 +10,4 @@ DIST alpine-843b2f1.tar.gz 7490140 BLAKE2B 13ac5ef43dd729a7cf21b44dcd6feace3e181
 EBUILD alpine-2.00-r7.ebuild 2680 BLAKE2B 17d380c90855f1db12df2903827995160692be2bbab4026fba9b63061c1c00838009911e015daadcd475ff8e5d79ca06680959910af33e62e252ab26e423f706 SHA512 3122b28166e0ca43bb8a99590e7bddd4ea471ea007a93ba66ed98251f2cd8ccfc143b31a14c57ab6e091ad2b532c750d5ca5b44e73403f71db7d3caee433f489
 EBUILD alpine-2.21.1-r1.ebuild 2235 BLAKE2B 4b9effef392482acb321f147d5d8565496a4e653fd23d76ea6d7139832b231b1a6d5535c63b981e107d6a5c5ec5d22e8fdc6f8b1aca91138c2979eec854592c5 SHA512 c5429666e155f3d90c1a3c7553bae1a25dd780f0175e64d122a36f758cb42a2bb3ab64453b79e36bfc44900b05804f791c0dadc03387347d81b81aae6a76bdc1
 EBUILD alpine-2.21.1.ebuild 1996 BLAKE2B 07525777bf6d50e0ff285ed174d6715f29bfd1ee06273a83d30eb54e76ed63a965c0db6ded5dbbcb26f0820611febd6bed9f0ec30f5f1f46347e5e6f3b10b822 SHA512 eb625e1459a4276e5e19b4b64473240555b04688309bfd9541cbb353a1d8250061c351be6fac42417a6006df0ba95926d27fcbceaf5793e5afb9dc33c08cd0ab
-MISC metadata.xml 740 BLAKE2B 820db8a1c0c993c1d16d3bce778c9e6077d8fed623156d438480a9a2935f3057540f6285292e0ab5bbb32e6ff604ed10369cc7b484d5c844601d9d33104fdce5 SHA512 aa2c082c27deea84b4d11586c6d85d0faecdd969d77013bf578ca6de6f60e5d9b1ef98b8fd12e4c94aba5b1dc480dd60102302c01926f00e2777d8c0b2b6ecd6
+MISC metadata.xml 731 BLAKE2B 56450ee7efb0663450b32b746f06718440e8b722ed72ad7b7ae5d3f100bf4930bcac1d3aa5bc198bfff6081da220020dcda7ef857409313cb050a51d6f6099cc SHA512 27adca82690095f965b98b31fb175f4215f4585ad8144fab2d3f519f2c6edc77b92f1f335ef832d0bfa99b31713e3064717e8cab75880eb44aada9fed49aaab9
diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml
index 194a0d2436d9..777a30ec204d 100644
--- a/mail-client/alpine/metadata.xml
+++ b/mail-client/alpine/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>gentoo.bugzilla.2012@r123.de</email>
+		<email>gentoo.2019@r123.de</email>
 		<name>Robert Siebeck</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index a3a30154069c..9e125d744eaa 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,10 +3,13 @@ AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39
 DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
 DIST mutt-1.11.3.tar.gz 4581196 BLAKE2B 12f7a067bdfab72628e3fd25e9391d252c8665db845963df5c4a8f66f7d68ce1385e94fd35527718fdbedc9759910e2ee7253430ecddb8ea92f6368078be9a03 SHA512 381079254f01cdd85b9e556a10bb1ddf0b49d96b54fe21d70dd735199dcbbfd46956ad85201fe8a4e8cdf7bdb121664c7b4edc0659da6b14dc8eaf6adf9827df
 DIST mutt-1.11.4.tar.gz 4582417 BLAKE2B 750385cc90df0d34d35103883a9918f205830ea93e5ec9f33cd579d5c121d630b3074f1918fa0e8e5aa91edd503c7ba38c34785a8a96803d7af30d08a0966c4d SHA512 18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb
+DIST mutt-1.12.0.tar.gz 4668896 BLAKE2B 0c3d9bdc55ef836ff5951a897be58fef2d0dda11432df96ddab7b5267302dd7669f6c17bcfbbf706efcc8628dd46a209efa51fa8f4539cc3662534a1e820d6ac SHA512 b9482af3bfeb39ab8be7244deda49b56a77cfa15b3dfc7dd2b0ec2d7eba8e32b742b7a254ff64e6827a6f74f563830276bf950e8b2b192d27a1fd6b1df70443c
 DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
 DIST mutt-gentoo-1.11.3-patches-r0.tar.xz 107172 BLAKE2B bb82a95baf3fe5af191d5da7bd56d0f51d43a390be08442c945515330fd11d5d3a0c2893a5a595ea8a23421ec5ea79aa36a05e46ce71d449c28193b819154c9b SHA512 2d1579f03876398eb793548b31fe8bfc15d226651334dfe07a65eff45ab777eebaae66d85dd0a59e05649ae0924fdb45cfced438eb0dff9742bc13b1fb1ae671
 DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
+DIST mutt-gentoo-1.12.0-patches-r0.tar.xz 106152 BLAKE2B 675bae3f7bf6e9792bf90c891d03f58fb849bc3744a2453a52b0a3cd992f53ebc30e363eb9490e8511f7a956424b686651139e54c329ad47363c01e0fd3e4fe0 SHA512 1ad062551f3033ef30e5cc5ce2fc4df151614cf9277227f6d9153e37069ecff0b9ee5bad7e4402f35b8cc04c0e942640d326f0636cc7c6b1d968494972ee7b3a
 EBUILD mutt-1.10.1.ebuild 9182 BLAKE2B 04bc41d9445b10bb829b7506f76e7d47b4c98a08428f7ad4ba693ba3c1badea96dd69c1895fd3ea7953be657d08913d9a56e6b1a62afc07c9848c6768c249007 SHA512 3439e6b15dbc93f99392ae36e0e5bd36f2f987c1ff4fa65d31195543f97b6ef010bdcec9539acf15ffa03190df278f2e31e152e67883e518243bfc39fb4b3287
 EBUILD mutt-1.11.3.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
 EBUILD mutt-1.11.4.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
+EBUILD mutt-1.12.0.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
 MISC metadata.xml 1704 BLAKE2B 7523cd4cf10efa64877414c7f0e48a4369e84270985c3a0ebe1354497e0fe1e042f3e8bba32b02e2be2c678f21411e5b69105094e576ac508d48f1461a47d370 SHA512 13252ff788f4e4929b98a6126a64fb7c176824be9c6a485ff81b507b31d94cf3278bded58511dede62014661648ac8a815d9df980f7410ebe01d7ac7950845f6
diff --git a/mail-client/mutt/mutt-1.12.0.ebuild b/mail-client/mutt/mutt-1.12.0.ebuild
new file mode 100644
index 000000000000..e7a091241ec9
--- /dev/null
+++ b/mail-client/mutt/mutt-1.12.0.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	nntp?             ( ssl )
+	smime?            ( ssl !gnutls )
+	smime_classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp nntp ) )
+	kerberos?         ( || ( imap pop smtp nntp ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+	virtual/libiconv
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	notmuch?       ( net-mail/notmuch:= )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	crypt? ( app-crypt/gnupg )
+	pgp_classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		# clumpsy blocks for transition period of USE-flag renames
+		$(use crypt         && use_enable crypt pgp)
+		$(use pgp_classic   && use_enable pgp_classic pgp)
+		$(use !crypt && use !pgp_classic && echo "--disable-pgp")
+
+		$(use smime         && use_enable smime)
+		$(use smime_classic && use_enable smime_classic smime)
+		$(use !smime && use !smime_classic && echo "--disable-smime")
+
+		$(use gpg           && use_enable gpg gpgme)
+		$(use gpgme         && use_enable gpgme)
+		$(use !gpg && use !gpgme && echo "--disable-gpgme")
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable notmuch)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable nntp)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--with-regex"
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1 || die
+		cp doc/muttrc.man muttrc.5 || die
+		doman mutt.1 muttrc.5
+	else
+		# nuke manpages that should be provided by an MTA, bug #177605
+		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+			|| ewarn "failed to remove files, please file a bug"
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	else
+		ewarn "This release removes the conditional date feature in favour"
+		ewarn "of Dynamic \$index_format Content, see:"
+		ewarn "  http://www.mutt.org/doc/manual/#index-format-hook"
+	fi
+	if use crypt || use gpg || use smime ; then
+		ewarn "Please note that the crypto related USE-flags of mutt have changed."
+		ewarn "To remove some unclarity, the following USE-flags are renamed:"
+		ewarn "(see 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.  Please update your package.use"
+		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
+	if use gpgme ; then
+		ewarn "Note: in order for Mutt to actually use the gpgme backend"
+		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
+		ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
+	fi
+}
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 4619affca1c5..0394059fdcd5 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -3,5 +3,5 @@ AUX trojita-0.7-gpgme.patch 1416 BLAKE2B dba95c0954a6ac704e5145d140e905bf6f886db
 AUX trojita-0.7-qt-5.11b3.patch 9678 BLAKE2B 0bcf00db610594ff084f5ca3bcfe2d3ad40d44b461358c4b9fc730f6dba787d82837c16f2e6bc84df9d3f57ac404d7c006fc7db223efeacfb9e833b6209b4374 SHA512 c16f3a7b9555e70e61656eb8caf25f778ec14a1dfdd18f786ddc3d8ee49b28fd39c4f438d051dbf961afbaf8cafc3d84a5befa10111ba216b4dec300cd67e228
 DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
 EBUILD trojita-0.7-r2.ebuild 1913 BLAKE2B 045e1f76dc240bdb7f8b9205f44c98a49642dbaba21d697f2b41c302d12253070822b3617b13faac108a88307b43df793ab8a576c257d051bbe1edda07effdcc SHA512 b52d541396a5c99310af90ded525aae4af885b8a897202bba0d2386cffbdd8b7ff4c81584f05d84497a46fc99d62eb6c983a6f130ee666282824c67b29d4b8a6
-EBUILD trojita-9999.ebuild 1578 BLAKE2B c41bb4515f0dad941f18eddf9fbe5845e72e758f65dc8d98d9a0a3460856a30100553857096d4f9f837bf67981f7992c16fdaf950846ec1664cddd4cd0c4d562 SHA512 09d5c425fb5dfdb53ba929a2dc3e4010942c83c2f96f967c6ad3829a160c96cf808de423737bcc92a62deb902cf3074964bf29de6a250d0adca4bfcdfc2e5fdd
-MISC metadata.xml 640 BLAKE2B e60d0eb2b469e6b8f497b6884eea116364f3fbc93632b76367386e65a8d1f3b0a7dff42c48e2a2959799cc61febf5022d3d6ddb4ad6e5e3535dc08ab4633e813 SHA512 3149333258d5506d34854c9b0cc3da3f6560d9a44cf7b26a908e7c2726a145ccfc98c1b521bb56da74517af196e1c3f53a4f0c1d9f4e27fcd3493f5350a4e8e4
+EBUILD trojita-9999.ebuild 1811 BLAKE2B e84ef5dd17183f4c650bdf34d0711941a9b9754b7d54753f2ea706f24ba8971eb79d8543c590d4d821698633487251b63d65c5f0f710370c8ded6cf68704cbe3 SHA512 5dfdea3243f858c8786ec583777fab4438c740d52670102bfa13c770b389cc2cc4995705a28c6ef6793f12b61b4539b74f51658737d1eb2c1bfc723221c696b8
+MISC metadata.xml 727 BLAKE2B ba6e65633a7e29af6b5e1da2722236e44c0f5672567508680e9ce2f6c58867124d446efe1eeab3eaaab7fa45d8bb3de0362099bbde555037fcfd5c9d4293ddc9 SHA512 b3152743cb47801f78ce5d45b94a809e1299aac7dffcb758fc36ea8d606541c5a0ff49824e05cd20a56a5576cd754997ed05dc0eb2933efc197b848db3af3e76
diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index a397e84c7375..7a659b227afb 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -14,6 +14,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="addressbook">Build <pkg>kde-apps/akonadi</pkg> addressbook plugin</flag>
 		<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag>
 	</use>
 	<upstream>
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index 268f9915e76b..7740a0aa6ff7 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://trojita.flaska.net/"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
+IUSE="addressbook +crypt +dbus debug +password +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
@@ -34,12 +34,14 @@ DEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
+	addressbook? ( kde-apps/akonadi-contacts:5 )
 	crypt? (
 		>=app-crypt/gpgme-1.8.0[cxx,qt5]
 		dev-libs/mimetic
 	)
 	dbus? ( dev-qt/qtdbus:5 )
 	password? ( dev-libs/qtkeychain[qt5(+)] )
+	spell? ( kde-frameworks/sonnet:5 )
 	zlib? ( sys-libs/zlib )
 "
 RDEPEND="${DEPEND}"
@@ -56,12 +58,15 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DWITH_ABOOKADDRESSBOOK_PLUGIN=OFF
+		-DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
 		-DWITH_CRYPTO_MESSAGES=$(usex crypt)
 		-DWITH_GPGMEPP=$(usex crypt)
 		-DWITH_MIMETIC=$(usex crypt)
 		-DWITH_DBUS=$(usex dbus)
 		-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-		-DWITH_TESTS=$(usex test)
+		-DWITH_SONNET_PLUGIN=$(usex spell)
+		-DBUILD_TESTING=$(usex test)
 		-DWITH_ZLIB=$(usex zlib)
 	)
 
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index e00d24a7f83b..f3ec8ed0af10 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/razor/Manifest b/mail-filter/razor/Manifest
index b5f7d604f4f0..7c0683f4258e 100644
--- a/mail-filter/razor/Manifest
+++ b/mail-filter/razor/Manifest
@@ -3,4 +3,4 @@ AUX razor-2.85-makefile-quoting-fix.patch 574 BLAKE2B 03616893b3537e00f0a56b357a
 AUX razor-2.85-use-sha-not-sha1.patch 3897 BLAKE2B 5cbdd0cbf6a80f4d2e1eba364d2db5ef972368257110daaf07c8ee6444884b07ff930184a4c92c1b0e7af89cfd5384ada7d00ddd79114c799bc8ad34e8f61a51 SHA512 891a93408f56bb6a7b43814a501cce8775c51abe7cf227c39dd18699ac5f4c1aa5484842435edda58f7141a87e5ebe1496bfe959afab09fb44c3558c66511289
 DIST razor-agents-2.85.tar.bz2 81691 BLAKE2B fdb389ca4192dc2a3b87935fe97a4750ab715ae163aa1cf8adf5c6dd54e8e2f2ca53f1fcc37505b5ea0ec4e9bdb78a14ae8b30fca770de80a2a69e3e534ec3ab SHA512 31dded1969dde963389a5939514c29638ad07f45dbb2f4c633cf20ebc4abab94e65e9a6d8885233cdde686ef365aab11fa5eba2ca38d79c5b8fab689143ff5db
 EBUILD razor-2.85-r3.ebuild 2595 BLAKE2B 743be10deb95e88192040b63e36f871ca557cd471f0ff34ccd93775c93d80e4a5d88a542176af94b57f889855bcbf27e3bdd410613a8fd91fdb37559dd089df6 SHA512 8d36ea73cce5c6a48cbd652f67f2e6e87bc547b9739eb1320b7be061fbcd9b6c11744659f47ebf4af7adc66b600b1a6a3249e72632f5edbd08e51cabf1ec5ea1
-MISC metadata.xml 483 BLAKE2B 01e1a75bae2f75e2b4f0a05fe60c5f81f49ee473044640924d46d21350c8bf1e97a01144b96f8e0f447241bbc76df0fa25d14ec800565c00101c9927de398df8 SHA512 9eb742019e813c1b6fda1c04bd3702c2f56be08ecfe9d39a651a8f17dc884eddd1d306c641420af8336a5162b4eda89533f098c3fd3a5e01162ee897ba4e976c
+MISC metadata.xml 581 BLAKE2B 7a4fa065ec593200d844a2c5cba9df1711608fb089b4c568bc4095e4feee3ebfbeb53aa866b6c6a3044ccc9e6d5fb5b71319ca1f12f7ad7b8693567a1eda4b1c SHA512 6de4a7f82c7b1bacda76f5bb13df29a130c7c7cc4612071178b78a252cc029deb6b596847db37d6b305b5776fa2ce5e0475856fd0e0ea71b56cae36f89d389c8
diff --git a/mail-filter/razor/metadata.xml b/mail-filter/razor/metadata.xml
index 87d0d3103c3e..a6561e30cdf8 100644
--- a/mail-filter/razor/metadata.xml
+++ b/mail-filter/razor/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!-- maintainer-needed -->
+	<!-- future maintainer: please uncomment the following contact:
 	<maintainer type="person">
 		<email>razor-admin@cloudmark.com</email>
 		<description>
@@ -9,6 +11,7 @@
 			upstream care.
 		</description>
 	</maintainer>
+	-->
 	<upstream>
 		<remote-id type="sourceforge">razor</remote-id>
 	</upstream>
diff --git a/mail-filter/spamass-milter/Manifest b/mail-filter/spamass-milter/Manifest
deleted file mode 100644
index 82da0f63079f..000000000000
--- a/mail-filter/spamass-milter/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX README.gentoo 1680 BLAKE2B 424f24428e3500d3fcfa7233643ae14e3844b5a88603dbbbf2a769fd6564b9b22bf2eb7d9442c380be82a765c2391c8f78ff99c1d96a03acad9ba44163ea6e1f SHA512 03e2c067fff97c0aabdca1c47011df72ca0671969980df95d34fb7a519fe16755359bbb72ce33d64430dbdb986a6d2e719451b38288df717ac8378a89cb16b2b
-AUX spamass-milter-auth_users.patch 3570 BLAKE2B c36a871eee69d8ae478da2edd083cb7aab2637848a197b6dc64c9b99c65234ea9e3a0a3d17cf21ab6763d389564c770848acadde28e8df1841abb53cf8dca26c SHA512 d941af831410142de5d445aa188f3736f29ddad1e722c71c66578c7f01e55617729aefc1d50f09ecadf6a71a1f16f7530456da8b0f1c484bb50ada12702bb130
-AUX spamass-milter.conf3 763 BLAKE2B 7f7aa3588788fbc96f3387720711998d59c775fed8e624da7f338eab88990aa47cc3bb7a42e1c2162d1a39482237756c95c343ceff495809de520a4576c8d522 SHA512 35b44ad73f29135259fc6546e3823374a59a607eff7e45b835ac2ab6491000e2d2b44105d4f8fa164512b887de242fe59b0351c53deab41bf2de9f6a5e3aaca9
-AUX spamass-milter.rc4 1323 BLAKE2B d90f5ef57a03f1dc78f254fedcc794a841ba69d94c5d99e3acbbb55c89df684a8aef0c7900b36a1f1354c68be0227c6b739462ca17a5241730010d6637e8b99e SHA512 dae8b53478302a4001e86222406716f1f77f61252ecfb693b94722e2c7f623bef9b4204261168228a16f0bf24e994e02ebfb97925ed133c92930720d0b63d140
-DIST spamass-milter-0.3.2.tar.bz2 125350 BLAKE2B f1897162951e2801a9c7ee4c125b7bb676e006e254f5fa473a3ed4cdef9e56f49a1b6731b8c04c1be1618e8253698790f72fb3ed217fe70fd9be29194ba178e6 SHA512 19279c53c8af738fbdd796e3aa382754474fc8c2ed17a3f857906d61740aefbd30f4759952fc1aaeff31af492fa8782363cbaac8ea1f389b4e2c1237226086d8
-EBUILD spamass-milter-0.3.2.ebuild 950 BLAKE2B 750d91dc294d01aa0effe5465f383db879d91cfaf7f04a94d83764b4bbe707e68cafb8e07f2980a3b26b3622fd994c0f633d89b6fc1256d8589544ee73640802 SHA512 ea62739644628c23d6ff6e02c0a9cde881a0e7de42028f9c8ccfbf0d8f24a83041c076ffc4ab5ae068b12d8c68ee31a6027ef44580742b3c4be66183906b181e
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-filter/spamass-milter/files/README.gentoo b/mail-filter/spamass-milter/files/README.gentoo
deleted file mode 100644
index 49035c0ac5a5..000000000000
--- a/mail-filter/spamass-milter/files/README.gentoo
+++ /dev/null
@@ -1,52 +0,0 @@
-Simple install instructions by raker @ g.o
-updates by gustavoz
-updates by SteveB
----------------------------------------------------------------
-
-For Sendmail:
--------------
-Add these lines in /etc/mail/sendmail.mc before MAILER(local):
-INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/spamass-milter.sock, F=, T=C:15m;S:4m;R:4m;E:10m')dnl
-define(`confMILTER_MACROS_CONNECT',`b, j, _, {daemon_name}, {if_name}, {if_addr}')dnl
-define(`confMILTER_MACROS_ENVRCPT',`r, v, Z')
-
-When that's done run this command:
-	m4 /etc/mail/sendmail.mc > /etc/mail/sendmail.cf
-
-Restart associated services:
-	/etc/init.d/sendmail stop
-	/etc/init.d/spamass-milter start
-	/etc/init.d/sendmail start
-
-OPTIONAL: To run it automatically after booting:
-	rc-update add spamass-milter default
-	rc-update add sendmail default
-
-
-For Postfix >= 2.3.0 and < 2.4.0:
----------------------------------
-Add those lines to /etc/postfix/main.cf:
-smtpd_milters = unix:/var/run/milter/spamass-milter.sock
-milter_end_of_data_macros = b i j _ {daemon_name} {if_name} {if_addr} {mail_addr}
-milter_default_action = accept
-
-Change in /etc/conf.d/spamass-milter the socket group owner to mail:
-SOCKET_GROUP="mail"
-
-Change in /etc/conf.d/spamass-milter the options for spamass-milter to include "-m":
-OPTIONS="${OPTIONS} -m"
-
-Restart associated services:
-	/etc/init.d/postfix stop
-	/etc/init.d/spamass-milter start
-	/etc/init.d/postfix start
-
-OPTIONAL: To run it automatically after booting:
-	rc-update add spamass-milter default
-	rc-update add postfix default
-
-
-For Postfix >= 2.4.0:
----------------------
-Same settings as for Postfix >= 2.3.0 (see above) but you can now use the option "-m"
-in /etc/conf.d/spamass-milter.
diff --git a/mail-filter/spamass-milter/files/spamass-milter-auth_users.patch b/mail-filter/spamass-milter/files/spamass-milter-auth_users.patch
deleted file mode 100644
index 8bfc24e4306f..000000000000
--- a/mail-filter/spamass-milter/files/spamass-milter-auth_users.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Based on the debian patch:
-http://patch-tracker.debian.org/patch/series/view/spamass-milter/0.3.1-10/10_dont_handle_authenticated_users.diff
-
---- spamass-milter.cpp	2011-06-08 11:56:33.000000000 +0000
-+++ spamass-milter.cpp	2011-06-08 12:04:41.000000000 +0000
-@@ -170,6 +170,7 @@
- bool flag_full_email = false;		/* pass full email address to spamc */
- bool flag_expand = false;	/* alias/virtusertable expansion */
- bool warnedmacro = false;	/* have we logged that we couldn't fetch a macro? */
-+bool ignore_authenticated_senders = false;
- 
- #if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
- static pthread_mutex_t popen_mutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -181,7 +182,7 @@
- main(int argc, char* argv[])
- {
-    int c, err = 0;
--   const char *args = "fd:mMp:P:r:u:D:i:b:B:e:x";
-+   const char *args = "fd:mMp:P:r:u:D:i:Ib:B:e:x";
-    char *sock = NULL;
-    bool dofork = false;
-    char *pidfilename = NULL;
-@@ -213,6 +214,10 @@
- 				debug(D_MISC, "Parsing ignore list");
- 				parse_networklist(optarg, &ignorenets);
- 				break;
-+			case 'I':
-+				debug(D_MISC, "Ignore authenticated senders");
-+				ignore_authenticated_senders = true;
-+				break;
- 			case 'm':
- 				dontmodifyspam = true;
- 				smfilter.xxfi_flags &= ~SMFIF_CHGBODY;
-@@ -280,7 +285,7 @@
-       cout << PACKAGE_NAME << " - Version " << PACKAGE_VERSION << endl;
-       cout << "SpamAssassin Sendmail Milter Plugin" << endl;
-       cout << "Usage: spamass-milter -p socket [-b|-B bucket] [-d xx[,yy...]] [-D host]" << endl;
--      cout << "                      [-e defaultdomain] [-f] [-i networks] [-m] [-M]" << endl;
-+      cout << "                      [-e defaultdomain] [-f] [-i networks] [-I] [-m] [-M]" << endl;
-       cout << "                      [-P pidfile] [-r nn] [-u defaultuser] [-x]" << endl;
-       cout << "                      [-- spamc args ]" << endl;
-       cout << "   -p socket: path to create socket" << endl;
-@@ -294,6 +299,7 @@
-       cout << "   -f: fork into background" << endl;
-       cout << "   -i: skip (ignore) checks from these IPs or netblocks" << endl;
-       cout << "          example: -i 192.168.12.5,10.0.0.0/8,172.16.0.0/255.255.0.0" << endl;
-+      cout << "   -I: skip (ignore) checks if sender is authenticated" << endl;
-       cout << "   -m: don't modify body, Content-type: or Subject:" << endl;
-       cout << "   -M: don't modify the message at all" << endl;
-       cout << "   -P pidfile: Put processid in pidfile" << endl;
-@@ -783,6 +789,22 @@
-   }
-   /* debug(D_ALWAYS, "ZZZ got private context %p", sctx); */
- 
-+  if (ignore_authenticated_senders)
-+  {
-+    char *auth_authen;
-+
-+    auth_authen = smfi_getsymval(ctx, "{auth_authen}");
-+    debug(D_MISC, "auth_authen=%s", auth_authen ?: "<unauthenticated>");
-+
-+    if (auth_authen)
-+    {
-+      debug(D_MISC, "sender authenticated (%s) - accepting message",
-+          auth_authen);
-+      debug(D_FUNC, "mlfi_envfrom: exit ignore");
-+      return SMFIS_ACCEPT;
-+    }
-+  }
-+
-   debug(D_FUNC, "mlfi_envfrom: enter");
-   try {
-     // launch new SpamAssassin
---- spamass-milter.1.in	2011-06-08 12:05:35.000000000 +0000
-+++ spamass-milter.1.in	2011-06-08 12:06:57.000000000 +0000
-@@ -14,6 +14,7 @@
- .Op Fl e Ar defaultdomain
- .Op Fl f
- .Op Fl i Ar networks
-+.Op Fl I
- .Op Fl m
- .Op Fl M
- .Op Fl P Ar pidfile
-@@ -119,6 +120,8 @@
- flags will append to the list.
- For example, if you list all your internal networks, no outgoing emails
- will be filtered.
-+.It Fl I
-+Ignores messages if the sender has authenticated via SMTP AUTH.
- .It Fl m
- Disables modification of the 
- .Ql Subject: 
diff --git a/mail-filter/spamass-milter/files/spamass-milter.conf3 b/mail-filter/spamass-milter/files/spamass-milter.conf3
deleted file mode 100644
index 6cdbc1e4dd73..000000000000
--- a/mail-filter/spamass-milter/files/spamass-milter.conf3
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-DAEMON=/usr/sbin/spamass-milter
-SOCKET=/var/run/milter/spamass-milter.sock
-PIDFILE=/var/run/milter/spamass-milter.pid
-
-# User owning the socket
-SOCKET_USER="milter"
-
-# Group owning the socket
-# Note: Change this to mail if you run Postfix
-SOCKET_GROUP="milter"
-
-# Permission for the socket
-SOCKET_MODE="664"
-
-# spamass-milter options
-OPTIONS=""
-
-# Example: Reject mails above score 20
-#OPTIONS="${OPTIONS} -r 20"
-
-# Example: Do not modify mail body
-# NOTE: This needs to be enabled if you use Postfix >= 2.3.0 and < 2.4.0
-#OPTIONS="${OPTIONS} -m"
-
-# Example: Pass the remaining flags to spamc
-#OPTIONS="${OPTIONS} -- --headers --username spamc"
diff --git a/mail-filter/spamass-milter/files/spamass-milter.rc4 b/mail-filter/spamass-milter/files/spamass-milter.rc4
deleted file mode 100644
index 9688501bcd93..000000000000
--- a/mail-filter/spamass-milter/files/spamass-milter.rc4
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net spamd
-	use logger
-	before mta
-}
-
-piddir=${PIDFILE%/*}
-socketdir=${SOCKET%/*}
-
-checkconfig() {
-	if [ ! -d ${piddir:=/var/run/milter} ]; then
-		checkpath -q -d -o milter:milter -m 0755 ${piddir} || return 1
-	fi
-	if [ ! -d ${socketdir:=/var/run/milter} ]; then
-		checkpath -q -d -o ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} \
-		-m 0755 ${socketdir} || return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting spamass-milter"
-	start-stop-daemon --start --quiet --pidfile ${PIDFILE} -u ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} \
-		--exec ${DAEMON} -- -P ${PIDFILE} -p ${SOCKET} -f ${OPTIONS}
-	eend $? "Failed to start ${DAEMON}"
-	spamass_timeout=0
-	while [ $spamass_timeout -le 20 ]
-	do
-		if [ ! -S "${SOCKET}" -o ! -r "${SOCKET}" ]
-		then
-			sleep 1
-			spamass_timeout=$(( $spamass_timeout+1 ))
-		else
-			break
-		fi
-	done
-	echo $spamass_timeout
-	chown ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} ${SOCKET} 1>/dev/null 2>&1
-	chmod ${SOCKET_MODE:-664} ${SOCKET} 1>/dev/null 2>&1
-}
-
-stop() {
-	ebegin "Stopping spamass-milter"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE} &&
-	{
-		sleep 5
-		rm -f ${SOCKET}
-	}
-	eend $? "Failed to stop ${DAEMON}"
-}
diff --git a/mail-filter/spamass-milter/metadata.xml b/mail-filter/spamass-milter/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/mail-filter/spamass-milter/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/mail-filter/spamass-milter/spamass-milter-0.3.2.ebuild b/mail-filter/spamass-milter/spamass-milter-0.3.2.ebuild
deleted file mode 100644
index 0cc66a15a34c..000000000000
--- a/mail-filter/spamass-milter/spamass-milter-0.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils user
-
-IUSE=""
-
-DESCRIPTION="A milter for SpamAssassin"
-HOMEPAGE="https://savannah.nongnu.org/projects/spamass-milt/"
-SRC_URI="https://savannah.nongnu.org/download/spamass-milt/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	>=mail-filter/spamassassin-3.1.0"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup milter
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-auth_users.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/spamass-milter.rc4 spamass-milter
-	newconfd "${FILESDIR}"/spamass-milter.conf3 spamass-milter
-	dodir /var/lib/milter
-	keepdir /var/lib/milter
-	fowners milter:milter /var/lib/milter
-
-	dodoc AUTHORS NEWS README ChangeLog "${FILESDIR}/README.gentoo"
-}
diff --git a/mail-filter/zdkimfilter/Manifest b/mail-filter/zdkimfilter/Manifest
deleted file mode 100644
index 7de2cc3e61c6..000000000000
--- a/mail-filter/zdkimfilter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zdkimfilter-1.1.tar.gz 473348 BLAKE2B 9da47491cf7168dff3a36052c216150ab1f4118c72d1ee03781e0bdd8cbf4dd2fcd89833d279dfdb35a80e0c05923493c39d5edee1740393158d462b54310732 SHA512 6f1c54fe22f0c3cb3aaa347df89c0541b7f06dc68c80820820dd80d3ee46e6c2a369efb70d2eab217564728adc17086c76c878c58be13735c1db14d069832cfb
-EBUILD zdkimfilter-1.1.ebuild 1161 BLAKE2B 297a6b154fc68847776340d182206161cf7cfaa18a28fd25fe428a8b2f1777dfdf3605aeadd807d899ee0f633cd5910bda4dbcb873a4866d334af533d37b08d9 SHA512 551f24da7a22f12bbce49a2dcb8b1a8bbe0521c951353198517424f41e0186096970f6691320ce97cce79824ce8ccb693bfed52c8a58e77f2b7dba8107100857
-MISC metadata.xml 487 BLAKE2B adf92d05a3453670d71ede1c043e777125b72b0d8944f351dd52251e8a4289692372ea430b2d42610acc2ef00d58ee5bd518e3732e1ac3cc088cf750e8dc5fd1 SHA512 844530412b3e951f19a4bcfe200ee46bd6d6e69cf02106f35ed064d2da305d71795a1e6092ef7eda524809f39c0f5633a76058ee7e03d4c4287643b5cf803979
diff --git a/mail-filter/zdkimfilter/metadata.xml b/mail-filter/zdkimfilter/metadata.xml
deleted file mode 100644
index 74324b25194f..000000000000
--- a/mail-filter/zdkimfilter/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-needed -->
-<longdescription>A program implementing the DKIM signing/verification for Courier
-</longdescription>
-<use>
-	<flag name="debug">
-	Log process and signal information. Also leave the child process running for
-	gdb examination.
-	</flag>
-	<flag name="opendbx">
-	An alternate statistics based storage engine.
-	</flag>
-</use>
-
-
-</pkgmetadata>
diff --git a/mail-filter/zdkimfilter/zdkimfilter-1.1.ebuild b/mail-filter/zdkimfilter/zdkimfilter-1.1.ebuild
deleted file mode 100644
index 560e13d531c9..000000000000
--- a/mail-filter/zdkimfilter/zdkimfilter-1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="DKIM filter for Courier-MTA"
-HOMEPAGE="http://www.tana.it/sw/zdkimfilter"
-SRC_URI="http://www.tana.it/sw/zdkimfilter/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug opendbx"
-
-DEPEND=">=mail-filter/opendkim-2.2.0
-		mail-mta/courier
-		opendbx? ( >=dev-db/opendbx-1.4.0 )
-		dev-libs/nettle"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if ! use opendbx; then
-		# remove opendbx stuff
-		sed -i -e '12342,12450d' configure || die
-	fi
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm "${D}"/etc/courier/filters/zdkimfilter.conf || die
-	diropts -o mail -g mail
-	dodir /etc/courier/filters/keys
-	dodoc release-notes-*.txt
-	dodoc odbx_example.{conf,sql}
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} == 0.5 ]]; then
-		ewarn "Database access is now through opendbx.  Please see the"
-		ewarn "zfilter_db man page and example config files in"
-		ewarn "\t/usr/share/doc/${P}"
-		ewarn "Some config file options have changed.  Please see the"
-		ewarn "release-notes."
-	fi
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 600ce99e5938..43b7557f0826 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 42ae432c1a60..61d974938973 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -2,13 +2,6 @@ AUX apache-sqwebmail.inc 347 BLAKE2B e77a680065e064c300d01ec21db524f3a440623b685
 AUX courier-init-r4 4965 BLAKE2B 09f29543599abfb6dd5df058f832e979bde471be3f9d293d975fdfc28787e8622ddab797c9d51fa89207fbc1a1ee23fb82471617366bf1467d1e7f2d7d3f2bcc SHA512 ca5e12bfa4fe2166cd2c1ef8c68e3cda957fd33011971237f3f76ec9d4ec1503eb22d78ec08ed42671d8858790ea7761c272a4896c680a51691c094696fee5f9
 AUX norewrite.patch 489 BLAKE2B f4ed2e1af731811d8da96ee817335016c5ec9a77a53ccd194360e95804f71e7c7825511f1831f1575f77cec35d72f12d39c02f8d10524fc189ff64b8a1a7fb9b SHA512 e9e95bd5d1a78b510f6dd7e155999089f123eecfdc16d3b5005b00981a7b6d29827cdddc61035ed3c3edcf0b9907ddfbae76df6503a1a8ef26b4de43a02bfc8e
 AUX password.dist 247 BLAKE2B 1803a6663c32ccc74c4dfb1d591a01d4416f9de9c4bf35c9a7ca277c2007b8c29a8899f4285c78eeb8592766457eef0caf377a344adee7a61be15bbf8b80c7de SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d
-DIST courier-0.75.0.tar.bz2 6970339 BLAKE2B 2c2f9900ab0370eff8b1a62759295e2d0598153075ea9a2f832d59272c5a21d5ab912fc852c7e75d7510d5ddf2d1484e830e6bf57c6952839f8688f174b6f27d SHA512 37e66329f157e18176d4ac8c5e814be78e80ff7dec234886bec8dce2ae5c58ac68bc18e07c739295c25fae8ec778b162bab505d85ea0998db7192d52c47e7bc6
-DIST courier-0.76.4.tar.bz2 7237424 BLAKE2B 7dbfb43cef75ed5187e044130c6cb793848791956a8531fcc54ae7a444e475c16219816c2ad7834e3b5349cf945f59023f0b9e2415c7c64352b5aa71eaf00bbd SHA512 6350ef5e30bd1e4921350bf3a09de0b56513530852c93f9a06e23625e49ae09d7ff26558da1f816a5bb492579afb5c1cbcf7573199bf898a039cd3607e847c30
-DIST courier-0.78.2.tar.bz2 7379529 BLAKE2B 5ba1ef013e513b269746999b2dd75f37fe8a9f1d87a51b61db1a8100c9a5cd022039462c235d35a95cf14ac5c406becf0f5d4f9344462e862045dc7333b7a0b7 SHA512 376de08cbaf9c2c74cd79e5d42680d8d6c31ecf0b0ef014f4152aa857224ba3e6d9e0f91b5097d15dcb5de9a5603a4707bc9b78902a5934c0a0ca68b74212055
 DIST courier-1.0.5.tar.bz2 7465054 BLAKE2B 55e9ba2a85889e7210652475149f4d3e687fd63a27b44a5a16c888b2f60bb18c4156e3344792585fed2ee3d81770e79c55ce5791842c255b8701bad5d2f8af4e SHA512 99a8e98633da99abd1f6f4e24328d4655526d51dc9fc03ffcb9c1e0cce0e608dedb2ac9511829af4487ff5af4618500d6fbbee26568f2a05e3c9d3cf3b48b2a5
-EBUILD courier-0.75.0-r1.ebuild 9400 BLAKE2B 12243ba87ec94300e956c196f64b048bf0501e22c1ab6de69ccce1689e90e991038fa69aba6f7050080a7a908f77505d3a2a8c070c1499ed7d12460ec8efb845 SHA512 f3f284116e04d535c4d58b6bf95c2a252b3a85cef27b41cc72a658671b3f0979de70ab0938536a5537dd2be171839fbe00f76eedd948cddb4df3d5ef5cd7d71f
-EBUILD courier-0.75.0.ebuild 9328 BLAKE2B 86a2d5226ab9bc935c311d502c19b3a87eff8e4a15669d49e3bfc4e4d139758d2f87f2e99e9d3e3401f817274422b9cbc86c9931275a7d011695004d03a3e3df SHA512 d0bb1fb52b3d310fb271330be96f5946e4116167b22eeaa15021a9ecf9b03266a67d6ae0f217e4bfb0313fc15b35ed455aa1ed55190072a49a6ae8af7e4a11c7
-EBUILD courier-0.76.4.ebuild 9294 BLAKE2B c60f3eb3bd5ef6f025d21689927833745ba1d2c647e811524b60640620d58b23e0e1a656c491b686c2d4a10005011b4c9315e514b642417e320e39949aa5e16a SHA512 5ea78392e78be754ebb7451ba048015d4618f7323a86d83fe66f10932dccc794b6820817ecd36f29a1865163cabd9234946f40dc1ed72c21cf91b14933cc7b97
-EBUILD courier-0.78.2.ebuild 9293 BLAKE2B 97cbd1ffdca33ba984f06e71d723023b6aba88c282e751779bed02f2422e6c4094e3fde7b5a57f3aa54b78583dc928f24103ba931f454cbe862bbf6a84a23869 SHA512 df230c508df13d2fdc03571250af71e53c1309e665428a1b2a375965684cd07e6426847bc5f9e0eb66cd42e4bd24741d46a26398bd0d46bfa77cbf81442e7e84
 EBUILD courier-1.0.5.ebuild 9536 BLAKE2B 00bdb0181a195c8c48e83e5ffe35a5ebef79c6e654d24c070bad1dfe286dfd0f9212d0e0a9fbe94d452e4a4e2c0c79c8c613d582af3fb0f57abfe158586c6eca SHA512 38697b414a92dd38b978d67cc9c2beb84774ab6e3cfeef5c0814a6122631c33109c373ad92bfca5898aa143cb58a22ccbb65f58bdf83170b47f6475b2b086530
 MISC metadata.xml 755 BLAKE2B 8ec0dd31ad59193d95585ab88f0bac6ced87132444a4136b2c2f80458a11f5296c42283574c3b56c26a31dad25fff530ebbfbf1ef467a1b824d11afe93a6da31 SHA512 de15af05e98deba4d3b297b4301439d892c3ba0d8af30ca459fcac72bf0179de87bf11260b8bfdb3827dd1f0e5123d68817766ffe037cece9c30adb3e8bd8b06
diff --git a/mail-mta/courier/courier-0.75.0-r1.ebuild b/mail-mta/courier/courier-0.75.0-r1.ebuild
deleted file mode 100644
index 2fe60c5412cd..000000000000
--- a/mail-mta/courier/courier-0.75.0-r1.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# not in keywords due to missing dependencies:
-# ~s390 ~ppc64 ~alpha ~ia64 ~sparc ~x86
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
-IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.66.3
-	>=net-libs/courier-unicode-1.3
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( dev-db/postgresql:= )
-	spell? ( app-text/aspell )
-	fam? ( virtual/fam )
-	!mail-filter/maildrop
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	!net-mail/dot-forward
-	!sys-apps/ucspi-tcp
-	"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-# get rid of old style virtual/imapd - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
-
-PDEPEND="pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_prepare() {
-#	unpack ${A}
-#	cd "${S}"
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
-}
-
-src_configure() {
-	filter-flags '-fomit-frame-pointer'
-
-	local myconf
-	myconf=""
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	econf ${myconf} \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with spell ispell) \
-		$(use_with ldap ldapaliasd) \
-		$(use_enable ldap maildroldap) \
-		$(use_with gnutls) \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--datadir=/usr/share/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--localstatedir=/var/lib/courier \
-		--with-piddir=/var/run/courier \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-paranoid-smtpext \
-		--with-db=gdbm \
-		--disable-autorenamesent \
-		--cache-file="${S}/configuring.cache" \
-		--host="${CHOST}" debug=true || die "./configure"
-	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
-}
-
-src_compile() {
-	default
-}
-
-etc_courier() {
-	# Import existing /etc/courier/file if it exists.
-	# Add option only if it was not already set or even commented out
-	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-	grep -q "${word}" "${D}/etc/courier/${file}" || \
-		echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
-	[ -z "${section}" ] && section="${2}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-src_install() {
-	local f
-	diropts -o mail -g mail
-	keepdir /var/lib/courier/tmp
-	keepdir /var/lib/courier/msgs
-	make install DESTDIR="${D}" || die "install"
-	make install-configure || die "install-configure"
-
-	# init script takes care of this
-	rm -rf "${D}/var/run"
-
-	# Get rid of files we dont want
-	if ! use webmail ; then
-		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
-			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
-			"${D}/usr/share/courier/sqwebmail/" \
-			"${D}/usr/sbin/webmaild" \
-			"${D}/usr/sbin/webgpg" \
-			"${D}/etc/courier/webmail.authpam" \
-			"${D}/var/lib/courier/webmail-logincache" \
-			"${D}"/etc/courier/sqwebmaild*
-	fi
-
-	if ! use web ; then
-		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
-			"${D}/etc/courier/webadmin"
-	fi
-
-	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
-		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
-	done
-
-	newinitd "${FILESDIR}/courier-init-r4" "courier"
-	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
-
-	cd "${D}/etc/courier"
-	if use webmail ; then
-		insinto /etc/courier
-		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
-	fi
-
-	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
-	if use ldap ; then
-		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	else
-		rm -f ldapaliasrc
-	fi
-
-	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> "${D}/etc/courier/sizelimit"
-	etc_courier maildroprc ""
-	etc_courier esmtproutes ""
-	etc_courier backuprelay ""
-	etc_courier locallowercase ""
-	etc_courier bofh "opt BOFHBADMIME=accept"
-	etc_courier bofh "opt BOFHSPFTRUSTME=1"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-	etc_courier bofh "opt BOFHSPFFROM=all"
-	etc_courier bofh "opt BOFHSPFMAILFROM=all"
-	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-	etc_courier esmtpd "BOFHBADMIME=accept"
-	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-	etc_courier esmtpd-msa "BOFHBADMIME=accept"
-
-	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
-	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
-
-	# Fix for a sandbox violation on subsequential merges
-	# - ticho@gentoo.org, 2005-07-10
-	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
-	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
-
-	cd "${S}"
-	cp imap/README README.imap
-	use nls && cp unicode/README README.unicode
-	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-	dodoc libs/tcpd/README.couriertls
-	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
-
-	if use webmail ; then
-		insinto /usr/$(get_libdir)/courier/courier
-		insopts -m 755 -o mail -g mail
-		doins "${S}/courier/webmaild"
-	fi
-
-	if use web ; then
-		insinto /etc/courier/webadmin
-		insopts -m 400 -o mail -g mail
-		doins "${FILESDIR}/password.dist"
-	fi
-
-	# avoid name collisions in /usr/sbin, make webadmin match
-	cd "${D}/usr/sbin"
-	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
-	if use web ; then
-		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
-			|| ewarn "failed to fix webadmin"
-		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
-			|| ewarn "failed to fix webadmin"
-	fi
-
-	# users should be able to send mail. Could be restricted with suictl.
-	chmod u+s "${D}/usr/bin/sendmail"
-
-	dosym /usr/bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check || die "Make check failed."
-	else
-		einfo "make check skipped, can't run as root."
-		einfo "You can enable it with FEATURES=\"userpriv\""
-	fi
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-}
-
-pkg_config() {
-	mailhost="$(hostname)"
-	export mailhost
-
-	domainname="$(domainname)"
-	if [ "x$domainname" = "x(none)" ] ; then
-		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
-	fi
-	export domainname
-
-	if [ "${ROOT}" = "/" ] ; then
-		file="${ROOT}/etc/courier/locals"
-		if [ ! -f "${file}" ] ; then
-			echo "localhost" > "${file}";
-			echo "${domainname}" >> "${file}";
-		fi
-		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
-		if [ ! -f "${file}" ] ; then
-			echo "${domainname}" > "${file}"
-			/usr/sbin/makeacceptmailfor
-		fi
-
-		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
-		if [ ! -f "${file}" ]
-		then
-			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
-			do
-				i=1
-				net=""
-				TIFS="${IFS}"
-				IFS="."
-				for o in "${netmask}"
-				do
-					if [ "${o}" == "255" ]
-					then
-						[ "_${net}" == "_" ] || net="${net}."
-						t="$(echo "${network}" | cut -d " " -f ${i})"
-						net="${net}${t}"
-					fi
-					i="$((${i} + 1))"
-				done
-				IFS="${TIFS}"
-				echo "doing configuration - relay control for the network ${net} !"
-				echo "${net}	allow,RELAYCLIENT" >> ${file}
-			done
-			/usr/sbin/makesmtpaccess
-		fi
-	fi
-
-	echo "creating cert for esmtpd-ssl:"
-	/usr/sbin/mkesmtpdcert
-	echo "creating cert for imapd-ssl:"
-	/usr/sbin/mkpop3dcert
-	echo "creating cert for pop3d-ssl:"
-	/usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/courier/courier-0.75.0.ebuild b/mail-mta/courier/courier-0.75.0.ebuild
deleted file mode 100644
index 6d13f06826bb..000000000000
--- a/mail-mta/courier/courier-0.75.0.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# not in keywords due to missing dependencies:
-# ~s390 ~ppc64 ~alpha ~ia64 ~sparc ~x86
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc s390 sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.66.3
-	>=net-libs/courier-unicode-1.3
-	!gnutls? ( dev-libs/openssl:0= )
-	gnutls? ( net-libs/gnutls:= )
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( dev-db/postgresql:= )
-	spell? ( app-text/aspell )
-	fam? ( virtual/fam )
-	!mail-filter/maildrop
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	!net-mail/dot-forward
-	!sys-apps/ucspi-tcp
-	"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-# get rid of old style virtual/imapd - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
-
-PDEPEND="pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_prepare() {
-#	unpack ${A}
-#	cd "${S}"
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
-}
-
-src_configure() {
-	filter-flags '-fomit-frame-pointer'
-
-	local myconf
-	myconf=""
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	econf ${myconf} \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with spell ispell) \
-		$(use_with ldap ldapaliasd) \
-		$(use_enable ldap maildroldap) \
-		$(use_with gnutls) \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--datadir=/usr/share/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--localstatedir=/var/lib/courier \
-		--with-piddir=/var/run/courier \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-paranoid-smtpext \
-		--with-db=gdbm \
-		--disable-autorenamesent \
-		--cache-file="${S}/configuring.cache" \
-		--host="${CHOST}" debug=true || die "./configure"
-	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
-}
-
-src_compile() {
-	default
-}
-
-etc_courier() {
-	# Import existing /etc/courier/file if it exists.
-	# Add option only if it was not already set or even commented out
-	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-	grep -q "${word}" "${D}/etc/courier/${file}" || \
-		echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
-	[ -z "${section}" ] && section="${2}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-src_install() {
-	local f
-	diropts -o mail -g mail
-	keepdir /var/lib/courier/tmp
-	keepdir /var/lib/courier/msgs
-	make install DESTDIR="${D}" || die "install"
-	make install-configure || die "install-configure"
-
-	# init script takes care of this
-	rm -rf "${D}/var/run"
-
-	# Get rid of files we dont want
-	if ! use webmail ; then
-		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
-			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
-			"${D}/usr/share/courier/sqwebmail/" \
-			"${D}/usr/sbin/webmaild" \
-			"${D}/usr/sbin/webgpg" \
-			"${D}/etc/courier/webmail.authpam" \
-			"${D}/var/lib/courier/webmail-logincache" \
-			"${D}"/etc/courier/sqwebmaild*
-	fi
-
-	if ! use web ; then
-		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
-			"${D}/etc/courier/webadmin"
-	fi
-
-	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
-		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
-	done
-
-	newinitd "${FILESDIR}/courier-init-r4" "courier"
-	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
-
-	cd "${D}/etc/courier"
-	if use webmail ; then
-		insinto /etc/courier
-		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
-	fi
-
-	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
-	if use ldap ; then
-		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	else
-		rm -f ldapaliasrc
-	fi
-
-	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> "${D}/etc/courier/sizelimit"
-	etc_courier maildroprc ""
-	etc_courier esmtproutes ""
-	etc_courier backuprelay ""
-	etc_courier locallowercase ""
-	etc_courier bofh "opt BOFHBADMIME=accept"
-	etc_courier bofh "opt BOFHSPFTRUSTME=1"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-	etc_courier bofh "opt BOFHSPFFROM=all"
-	etc_courier bofh "opt BOFHSPFMAILFROM=all"
-	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-	etc_courier esmtpd "BOFHBADMIME=accept"
-	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-	etc_courier esmtpd-msa "BOFHBADMIME=accept"
-
-	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
-	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
-
-	# Fix for a sandbox violation on subsequential merges
-	# - ticho@gentoo.org, 2005-07-10
-	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
-	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
-
-	cd "${S}"
-	cp imap/README README.imap
-	use nls && cp unicode/README README.unicode
-	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-	dodoc libs/tcpd/README.couriertls
-	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
-
-	if use webmail ; then
-		insinto /usr/$(get_libdir)/courier/courier
-		insopts -m 755 -o mail -g mail
-		doins "${S}/courier/webmaild"
-	fi
-
-	if use web ; then
-		insinto /etc/courier/webadmin
-		insopts -m 400 -o mail -g mail
-		doins "${FILESDIR}/password.dist"
-	fi
-
-	# avoid name collisions in /usr/sbin, make webadmin match
-	cd "${D}/usr/sbin"
-	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
-	if use web ; then
-		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
-			|| ewarn "failed to fix webadmin"
-		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
-			|| ewarn "failed to fix webadmin"
-	fi
-
-	# users should be able to send mail. Could be restricted with suictl.
-	chmod u+s "${D}/usr/bin/sendmail"
-
-	dosym /usr/bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check || die "Make check failed."
-	else
-		einfo "make check skipped, can't run as root."
-		einfo "You can enable it with FEATURES=\"userpriv\""
-	fi
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-}
-
-pkg_config() {
-	mailhost="$(hostname)"
-	export mailhost
-
-	domainname="$(domainname)"
-	if [ "x$domainname" = "x(none)" ] ; then
-		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
-	fi
-	export domainname
-
-	if [ "${ROOT}" = "/" ] ; then
-		file="${ROOT}/etc/courier/locals"
-		if [ ! -f "${file}" ] ; then
-			echo "localhost" > "${file}";
-			echo "${domainname}" >> "${file}";
-		fi
-		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
-		if [ ! -f "${file}" ] ; then
-			echo "${domainname}" > "${file}"
-			/usr/sbin/makeacceptmailfor
-		fi
-
-		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
-		if [ ! -f "${file}" ]
-		then
-			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
-			do
-				i=1
-				net=""
-				TIFS="${IFS}"
-				IFS="."
-				for o in "${netmask}"
-				do
-					if [ "${o}" == "255" ]
-					then
-						[ "_${net}" == "_" ] || net="${net}."
-						t="$(echo "${network}" | cut -d " " -f ${i})"
-						net="${net}${t}"
-					fi
-					i="$((${i} + 1))"
-				done
-				IFS="${TIFS}"
-				echo "doing configuration - relay control for the network ${net} !"
-				echo "${net}	allow,RELAYCLIENT" >> ${file}
-			done
-			/usr/sbin/makesmtpaccess
-		fi
-	fi
-
-	echo "creating cert for esmtpd-ssl:"
-	/usr/sbin/mkesmtpdcert
-	echo "creating cert for imapd-ssl:"
-	/usr/sbin/mkpop3dcert
-	echo "creating cert for pop3d-ssl:"
-	/usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/courier/courier-0.76.4.ebuild b/mail-mta/courier/courier-0.76.4.ebuild
deleted file mode 100644
index afb85de4a681..000000000000
--- a/mail-mta/courier/courier-0.76.4.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.66.3
-	>=net-libs/courier-unicode-1.4
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( dev-db/postgresql:= )
-	spell? ( app-text/aspell )
-	fam? ( virtual/fam )
-	!mail-filter/maildrop
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	!net-mail/dot-forward
-	!sys-apps/ucspi-tcp
-	"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-# get rid of old style virtual/imapd - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
-
-PDEPEND="pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_prepare() {
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
-}
-
-src_configure() {
-	filter-flags '-fomit-frame-pointer'
-
-	local myconf
-	myconf=""
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	econf ${myconf} \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with spell ispell) \
-		$(use_with ldap ldapaliasd) \
-		$(use_enable ldap maildroldap) \
-		$(use_with gnutls) \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--datadir=/usr/share/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--localstatedir=/var/lib/courier \
-		--with-piddir=/var/run/courier \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-paranoid-smtpext \
-		--with-db=gdbm \
-		--disable-autorenamesent \
-		--cache-file="${S}/configuring.cache" \
-		--host="${CHOST}" debug=true || die "./configure"
-	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
-}
-
-src_compile() {
-	default
-}
-
-etc_courier() {
-	# Import existing /etc/courier/file if it exists.
-	# Add option only if it was not already set or even commented out
-	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-	grep -q "${word}" "${D}/etc/courier/${file}" || \
-		echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
-	[ -z "${section}" ] && section="${2}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-src_install() {
-	local f
-	diropts -o mail -g mail
-	keepdir /var/lib/courier/tmp
-	keepdir /var/lib/courier/msgs
-	make install DESTDIR="${D}" || die "install"
-	make install-configure || die "install-configure"
-
-	# init script takes care of this
-	rm -rf "${D}/var/run"
-
-	# Get rid of files we dont want
-	if ! use webmail ; then
-		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
-			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
-			"${D}/usr/share/courier/sqwebmail/" \
-			"${D}/usr/sbin/webmaild" \
-			"${D}/usr/sbin/webgpg" \
-			"${D}/etc/courier/webmail.authpam" \
-			"${D}/var/lib/courier/webmail-logincache" \
-			"${D}"/etc/courier/sqwebmaild*
-	fi
-
-	if ! use web ; then
-		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
-			"${D}/etc/courier/webadmin"
-	fi
-
-	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
-		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
-	done
-
-	newinitd "${FILESDIR}/courier-init-r4" "courier"
-	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
-
-	cd "${D}/etc/courier"
-	if use webmail ; then
-		insinto /etc/courier
-		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
-	fi
-
-	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
-	if use ldap ; then
-		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	else
-		rm -f ldapaliasrc
-	fi
-
-	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> "${D}/etc/courier/sizelimit"
-	etc_courier maildroprc ""
-	etc_courier esmtproutes ""
-	etc_courier backuprelay ""
-	etc_courier locallowercase ""
-	etc_courier bofh "opt BOFHBADMIME=accept"
-	etc_courier bofh "opt BOFHSPFTRUSTME=1"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-	etc_courier bofh "opt BOFHSPFFROM=all"
-	etc_courier bofh "opt BOFHSPFMAILFROM=all"
-	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-	etc_courier esmtpd "BOFHBADMIME=accept"
-	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-	etc_courier esmtpd-msa "BOFHBADMIME=accept"
-
-	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
-	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
-
-	# Fix for a sandbox violation on subsequential merges
-	# - ticho@gentoo.org, 2005-07-10
-	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
-	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
-
-	cd "${S}"
-	cp imap/README README.imap
-	use nls && cp unicode/README README.unicode
-	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-	dodoc libs/tcpd/README.couriertls
-	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
-
-	if use webmail ; then
-		insinto /usr/$(get_libdir)/courier/courier
-		insopts -m 755 -o mail -g mail
-		doins "${S}/courier/webmaild"
-	fi
-
-	if use web ; then
-		insinto /etc/courier/webadmin
-		insopts -m 400 -o mail -g mail
-		doins "${FILESDIR}/password.dist"
-	fi
-
-	# avoid name collisions in /usr/sbin, make webadmin match
-	cd "${D}/usr/sbin"
-	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
-	if use web ; then
-		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
-			|| ewarn "failed to fix webadmin"
-		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
-			|| ewarn "failed to fix webadmin"
-	fi
-
-	# users should be able to send mail. Could be restricted with suictl.
-	chmod u+s "${D}/usr/bin/sendmail"
-
-	dosym /usr/bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check || die "Make check failed."
-	else
-		einfo "make check skipped, can't run as root."
-		einfo "You can enable it with FEATURES=\"userpriv\""
-	fi
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-}
-
-pkg_config() {
-	mailhost="$(hostname)"
-	export mailhost
-
-	domainname="$(domainname)"
-	if [ "x$domainname" = "x(none)" ] ; then
-		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
-	fi
-	export domainname
-
-	if [ "${ROOT}" = "/" ] ; then
-		file="${ROOT}/etc/courier/locals"
-		if [ ! -f "${file}" ] ; then
-			echo "localhost" > "${file}";
-			echo "${domainname}" >> "${file}";
-		fi
-		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
-		if [ ! -f "${file}" ] ; then
-			echo "${domainname}" > "${file}"
-			/usr/sbin/makeacceptmailfor
-		fi
-
-		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
-		if [ ! -f "${file}" ]
-		then
-			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
-			do
-				i=1
-				net=""
-				TIFS="${IFS}"
-				IFS="."
-				for o in "${netmask}"
-				do
-					if [ "${o}" == "255" ]
-					then
-						[ "_${net}" == "_" ] || net="${net}."
-						t="$(echo "${network}" | cut -d " " -f ${i})"
-						net="${net}${t}"
-					fi
-					i="$((${i} + 1))"
-				done
-				IFS="${TIFS}"
-				echo "doing configuration - relay control for the network ${net} !"
-				echo "${net}	allow,RELAYCLIENT" >> ${file}
-			done
-			/usr/sbin/makesmtpaccess
-		fi
-	fi
-
-	echo "creating cert for esmtpd-ssl:"
-	/usr/sbin/mkesmtpdcert
-	echo "creating cert for imapd-ssl:"
-	/usr/sbin/mkpop3dcert
-	echo "creating cert for pop3d-ssl:"
-	/usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/courier/courier-0.78.2.ebuild b/mail-mta/courier/courier-0.78.2.ebuild
deleted file mode 100644
index e289ecf157ee..000000000000
--- a/mail-mta/courier/courier-0.78.2.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.68.0
-	>=net-libs/courier-unicode-2.0
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( dev-db/postgresql:= )
-	spell? ( app-text/aspell )
-	fam? ( virtual/fam )
-	!mail-filter/maildrop
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	!net-mail/dot-forward
-	!sys-apps/ucspi-tcp
-	"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-# get rid of old style virtual/imapd - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
-
-PDEPEND="pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_prepare() {
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
-	default
-}
-
-src_configure() {
-	filter-flags '-fomit-frame-pointer'
-
-	local myconf
-	myconf=""
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	econf ${myconf} \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with spell ispell) \
-		$(use_with ldap ldapaliasd) \
-		$(use_enable ldap maildroldap) \
-		$(use_with gnutls) \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--datadir=/usr/share/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--localstatedir=/var/lib/courier \
-		--with-piddir=/var/run/courier \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-paranoid-smtpext \
-		--with-db=gdbm \
-		--disable-autorenamesent \
-		--cache-file="${S}/configuring.cache" \
-		--host="${CHOST}" debug=true || die "./configure"
-	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
-}
-
-src_compile() {
-	default
-}
-
-etc_courier() {
-	# Import existing /etc/courier/file if it exists.
-	# Add option only if it was not already set or even commented out
-	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-	grep -q "${word}" "${D}/etc/courier/${file}" || \
-		echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
-	[ -z "${section}" ] && section="${2}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-src_install() {
-	local f
-	diropts -o mail -g mail
-	keepdir /var/lib/courier/tmp
-	keepdir /var/lib/courier/msgs
-	make install DESTDIR="${D}" || die "install"
-	make install-configure || die "install-configure"
-
-	# init script takes care of this
-	rm -rf "${D}/var/run"
-
-	# Get rid of files we dont want
-	if ! use webmail ; then
-		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
-			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
-			"${D}/usr/share/courier/sqwebmail/" \
-			"${D}/usr/sbin/webmaild" \
-			"${D}/usr/sbin/webgpg" \
-			"${D}/etc/courier/webmail.authpam" \
-			"${D}/var/lib/courier/webmail-logincache" \
-			"${D}"/etc/courier/sqwebmaild*
-	fi
-
-	if ! use web ; then
-		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
-			"${D}/etc/courier/webadmin"
-	fi
-
-	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
-		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
-	done
-
-	newinitd "${FILESDIR}/courier-init-r4" "courier"
-	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
-
-	cd "${D}/etc/courier"
-	if use webmail ; then
-		insinto /etc/courier
-		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
-	fi
-
-	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
-	if use ldap ; then
-		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	else
-		rm -f ldapaliasrc
-	fi
-
-	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> "${D}/etc/courier/sizelimit"
-	etc_courier maildroprc ""
-	etc_courier esmtproutes ""
-	etc_courier backuprelay ""
-	etc_courier locallowercase ""
-	etc_courier bofh "opt BOFHBADMIME=accept"
-	etc_courier bofh "opt BOFHSPFTRUSTME=1"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-	etc_courier bofh "opt BOFHSPFFROM=all"
-	etc_courier bofh "opt BOFHSPFMAILFROM=all"
-	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-	etc_courier esmtpd "BOFHBADMIME=accept"
-	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-	etc_courier esmtpd-msa "BOFHBADMIME=accept"
-
-	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
-	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
-
-	# Fix for a sandbox violation on subsequential merges
-	# - ticho@gentoo.org, 2005-07-10
-	dosym ../share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym ../share/courier/imapd /usr/sbin/courier-imapd
-	dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
-
-	cd "${S}"
-	cp imap/README README.imap
-	use nls && cp unicode/README README.unicode
-	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-	dodoc libs/tcpd/README.couriertls
-	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
-
-	if use webmail ; then
-		insinto /usr/$(get_libdir)/courier/courier
-		insopts -m 755 -o mail -g mail
-		doins "${S}/courier/webmaild"
-	fi
-
-	if use web ; then
-		insinto /etc/courier/webadmin
-		insopts -m 400 -o mail -g mail
-		doins "${FILESDIR}/password.dist"
-	fi
-
-	# avoid name collisions in /usr/sbin, make webadmin match
-	cd "${D}/usr/sbin"
-	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
-	if use web ; then
-		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
-			|| ewarn "failed to fix webadmin"
-		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
-			|| ewarn "failed to fix webadmin"
-	fi
-
-	# users should be able to send mail. Could be restricted with suictl.
-	chmod u+s "${D}/usr/bin/sendmail"
-
-	dosym ../bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check || die "Make check failed."
-	else
-		einfo "make check skipped, can't run as root."
-		einfo "You can enable it with FEATURES=\"userpriv\""
-	fi
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-}
-
-pkg_config() {
-	mailhost="$(hostname)"
-	export mailhost
-
-	domainname="$(domainname)"
-	if [ "x$domainname" = "x(none)" ] ; then
-		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
-	fi
-	export domainname
-
-	if [ "${ROOT}" = "/" ] ; then
-		file="${ROOT}/etc/courier/locals"
-		if [ ! -f "${file}" ] ; then
-			echo "localhost" > "${file}";
-			echo "${domainname}" >> "${file}";
-		fi
-		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
-		if [ ! -f "${file}" ] ; then
-			echo "${domainname}" > "${file}"
-			/usr/sbin/makeacceptmailfor
-		fi
-
-		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
-		if [ ! -f "${file}" ]
-		then
-			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
-			do
-				i=1
-				net=""
-				TIFS="${IFS}"
-				IFS="."
-				for o in "${netmask}"
-				do
-					if [ "${o}" == "255" ]
-					then
-						[ "_${net}" == "_" ] || net="${net}."
-						t="$(echo "${network}" | cut -d " " -f ${i})"
-						net="${net}${t}"
-					fi
-					i="$((${i} + 1))"
-				done
-				IFS="${TIFS}"
-				echo "doing configuration - relay control for the network ${net} !"
-				echo "${net}	allow,RELAYCLIENT" >> ${file}
-			done
-			/usr/sbin/makesmtpaccess
-		fi
-	fi
-
-	echo "creating cert for esmtpd-ssl:"
-	/usr/sbin/mkesmtpdcert
-	echo "creating cert for imapd-ssl:"
-	/usr/sbin/mkpop3dcert
-	echo "creating cert for pop3d-ssl:"
-	/usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 87746785944c..7679ce2c2693 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -20,7 +20,7 @@ DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470
 EBUILD postfix-2.10.9.ebuild 8728 BLAKE2B 6170156f1dded2c727b6e2979e45d9d8e6ad77ef456e4e7da8491b03cfabe7fda627f77dc6090ca7285891619f77c5d3546c45536b25356641f5fa37c23f27d4 SHA512 e59ed518a63a41937e1ff8e68fe811bb13abbefbb6c0ff8ab7655434e8f297a18e7da0adb61442f46e8cee87dcd680909be148f1d5f1f75525f2080819eaa75e
 EBUILD postfix-3.2.4.ebuild 8656 BLAKE2B 7c22ee0de6b4a85784f0b35144fc68b45581fe2a276203cd0c409eeb255c0d9661aff4b236223e8193083678a0d7f1e8953b9b0bcc2d860a39ff73410fc2ee92 SHA512 de2c2a2be293bce34e5714fc7b875cc1cad31cb3076ca7661bded16d1a6ff6ca47f793278929d67b05b9e5a61dd15dcd7acb490ab629aac6c63987e92785c70b
 EBUILD postfix-3.3.1-r1.ebuild 8406 BLAKE2B 0242059df542da99a0cf2c4d5e4e54da5cd2b714b0f3d826179d827d13d3d548c59aa7e9ae0a0ff0c9eed864553fcbda1c460d4b6f8f9fe68e135facd028ab5e SHA512 dd62306944ffc38a7fc3e8cd1020638176ea66ba3c80acbd0528ca87c332a34045e1480cb3866a7865a009c834056979188566cf9c93339fc38a463b542b5faf
-EBUILD postfix-3.3.4.ebuild 8773 BLAKE2B b2c44e759c9776ae2dcba5f39f6f792d7ed51a5761c8f6997e61c633460f39c22a5804895d47bf1d37b04ebc464d82f91ff763937942c6dc973adca24e1802b6 SHA512 cb8a5d0b2976c9f45f400e7b0930d8c96c02e077096ad9d8488cfde6a0a16c35642a0ffc03fed072ab25ff5931d8353a468e7b2a67f877e56786157d63ce8542
+EBUILD postfix-3.3.4.ebuild 8766 BLAKE2B dd49aa69ad7044bcf002e74d774d7fbb164bf4ea61214126e7f97b3261c8ed1f7d1a2ba97fb7194b788c58a6e1182408f436418366b6d8d7ca713850dd688cc9 SHA512 e780f698dabc9f01dfa9fc41d76b46b9f53ec9a9d56e33fd1b0bc6499fdc3e44e7f235f3f9fb6eabbd638c55285ae2275211d2582e903fee26f15755a11c90b2
 EBUILD postfix-3.4.5-r1.ebuild 8992 BLAKE2B bccae1f7a1b8253c92e8896d846c7854620eb01a3dbb0ff603fe92327407640a8e2a4c738e1626e0cbc9dc9b76ab3fd1a74d041e54f0824fe279a1afda9f7e0b SHA512 65c32e17e0166ec1b0aa4f3c49d85eb105474bf4aafffcb19a13851faac2af6ef766642cba35f3b0d045363393f01942fa15056f1ec043cc021f9068ebaeb40f
 EBUILD postfix-3.4.5.ebuild 9226 BLAKE2B 050b4e4adf5fd36e1c5a08e5f1d2fe552e6552168b007bc65b61db7cbee5f7e177f2ca61833cf08cb6fc64873809c556695db0868040c4c47cb06201906924ef SHA512 f89b281fb6cbcdf4293ad66cc6f99a60ddb9e92d1f3d15c581e3a5a6222d0cbec2c8a8bceb1264c3d941964340834b7577b7cc9992f521c2331292ed099674ff
 EBUILD postfix-3.5_pre20190518.ebuild 8995 BLAKE2B f303147b08931c3c8f35e2092351c807869af012e5e494934ebd911c7153c8506f79101b919d292ba215e3f3eed1060318edfcd41dc158ca530fb0ff587be3fa SHA512 fbb4587b734ba20cb6ea006da1e633d38a6358f192da75f2f43cde5e01a788f2b212e60b6b5a5157caf0069fd55c6f3c349bbbf1512165954951c1b72d622746
diff --git a/mail-mta/postfix/postfix-3.3.4.ebuild b/mail-mta/postfix/postfix-3.3.4.ebuild
index 629b2c828dba..ea3d915a0e99 100644
--- a/mail-mta/postfix/postfix-3.3.4.ebuild
+++ b/mail-mta/postfix/postfix-3.3.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index ffdbfcf02c0c..493ae4fc383d 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -1,5 +1,7 @@
 DIST protonmail-bridge-1.1.3-1.x86_64.rpm 53554820 BLAKE2B 2fb0eb7b1a1d95ed3cf5785e527692497429f73eeb37dd9a98da7b5b30cafde048898026c8934b76630976585eb43c0a9392efdcb10b8f2ae8002884312a9142 SHA512 61a4a28fe9efbeeaecd79392eb730916e67dfffc1bcc5bbee156e3dd786dfeae5b39092ccab4c6d5ff9719d0792752732b52bc87615a7922c16cf6203eb57f5b
 DIST protonmail-bridge-1.1.4-1.x86_64.rpm 53566050 BLAKE2B 1221a885680704f9018cf8676c747cd6ffae9b1b351ce3bc47213af81c181ea1f5aa8ee3238bc9c93d115c09e2f0389b75eb1c8d5c8274bf812bf4050f9c0dfb SHA512 87668ba2563ebe3d815538c74591d1281bb0f882863528e56a0b6571feb95ddebe2b2cec89564f009429458eac703f7613bb2c6a8bb3f5d07c45b5ff76b486bd
+DIST protonmail-bridge-1.1.5-1.x86_64.rpm 53598661 BLAKE2B 8f0a8e74ad54642e79fd5b30cbd884dbcb26e4becee73f10a3108e1659a170933591aad90b5784ebe37ecc882f558924c037a1b5932c0375c267206695ab76f8 SHA512 c72e7abdb2ce95ac07afc090dcc2d50d5c334f451d5311e3e547b572f114dee80d8253392b9bae3c7e07307915a54d963cf9d755f64984b5260a8093502b5159
 EBUILD protonmail-bridge-bin-1.1.3.ebuild 8914 BLAKE2B 832f25103989ba5c5e413435c63e960c5ae101b4f21d823991860ca8f6a8657b8471722c657dfc45f11c4f810e6baf1d11aaca79db7c623128c8b9f4fbb4ce69 SHA512 9e9b30a476e3d228323e69e047381beafc3346f62f46c60ecd1268d2804ad093440535c435a6cd461eb53a1d52813829af96865a135a90e4e9765b38fbeeb931
 EBUILD protonmail-bridge-bin-1.1.4.ebuild 8914 BLAKE2B 832f25103989ba5c5e413435c63e960c5ae101b4f21d823991860ca8f6a8657b8471722c657dfc45f11c4f810e6baf1d11aaca79db7c623128c8b9f4fbb4ce69 SHA512 9e9b30a476e3d228323e69e047381beafc3346f62f46c60ecd1268d2804ad093440535c435a6cd461eb53a1d52813829af96865a135a90e4e9765b38fbeeb931
+EBUILD protonmail-bridge-bin-1.1.5.ebuild 8914 BLAKE2B 832f25103989ba5c5e413435c63e960c5ae101b4f21d823991860ca8f6a8657b8471722c657dfc45f11c4f810e6baf1d11aaca79db7c623128c8b9f4fbb4ce69 SHA512 9e9b30a476e3d228323e69e047381beafc3346f62f46c60ecd1268d2804ad093440535c435a6cd461eb53a1d52813829af96865a135a90e4e9765b38fbeeb931
 MISC metadata.xml 477 BLAKE2B 8d29a65220a234802a25b8979e598393883a4e905ed6b114297801b93f82212165749f8317791459314afe1c59c6f5a7c2e871bc85637387bc3decae250cec21 SHA512 7d081e416b0bf6b91e6ba69a1de51c35839ff1512ab3c93be3f161ab5e6a4a554d58549460bb7fb73e1dbaf44f76b673067f0f33c4d775143f500416e096f0bc
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.5.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.5.ebuild
new file mode 100644
index 000000000000..35b2fe8b0702
--- /dev/null
+++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.5.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://protonmail.com/bridge/"
+SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
+
+RESTRICT="bindist mirror"
+
+LICENSE="MIT protonmail-bridge-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/glib:2
+	media-sound/pulseaudio[glib]
+	sys-apps/dbus
+	virtual/opengl
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+"
+BDEPEND="dev-util/patchelf"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	# Some bogus files got into package.
+	rm -rf usr/lib/.build-id
+
+	# Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
+	cd "${S}/usr/lib/protonmail/bridge" || die
+	patchelf --set-rpath '$ORIGIN/lib' protonmail-bridge || die "patchelf failed"
+	patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
+	patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
+
+	rm "lib/libQt53DCore.so.5" || die
+	rm "lib/libQt53DExtras.so.5" || die
+	rm "lib/libQt53DInput.so.5" || die
+	rm "lib/libQt53DLogic.so.5" || die
+	rm "lib/libQt53DQuick.so.5" || die
+	rm "lib/libQt53DQuickExtras.so.5" || die
+	rm "lib/libQt53DQuickInput.so.5" || die
+	rm "lib/libQt53DQuickRender.so.5" || die
+	rm "lib/libQt53DRender.so.5" || die
+	rm "lib/libQt5Concurrent.so.5" || die
+	rm "lib/libQt5Gamepad.so.5" || die
+	rm "lib/libQt5QuickParticles.so.5" || die
+	rm "plugins/audio/libqtaudio_alsa.so" || die
+	rm "plugins/audio/libqtmedia_pulse.so" || die
+	rm "plugins/bearer/libqconnmanbearer.so" || die
+	rm "plugins/bearer/libqgenericbearer.so" || die
+	rm "plugins/bearer/libqnmbearer.so" || die
+	rm "plugins/canbus/libqtpeakcanbus.so" || die
+	rm "plugins/canbus/libqtsocketcanbus.so" || die
+	rm "plugins/canbus/libqttinycanbus.so" || die
+	rm "plugins/designer/libqquickwidget.so" || die
+	rm "plugins/designer/libqwebengineview.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-emu-integration.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-x11-integration.so" || die
+	rm "plugins/gamepads/libevdevgamepad.so" || die
+	rm "plugins/generic/libqevdevkeyboardplugin.so" || die
+	rm "plugins/generic/libqevdevmouseplugin.so" || die
+	rm "plugins/generic/libqevdevtabletplugin.so" || die
+	rm "plugins/generic/libqevdevtouchplugin.so" || die
+	rm "plugins/generic/libqtuiotouchplugin.so" || die
+	rm "plugins/geometryloaders/libdefaultgeometryloader.so" || die
+	rm "plugins/geometryloaders/libgltfgeometryloader.so" || die
+	rm "plugins/geoservices/libqtgeoservices_esri.so" || die
+	rm "plugins/geoservices/libqtgeoservices_itemsoverlay.so" || die
+	rm "plugins/geoservices/libqtgeoservices_mapbox.so" || die
+	rm "plugins/geoservices/libqtgeoservices_mapboxgl.so" || die
+	rm "plugins/geoservices/libqtgeoservices_nokia.so" || die
+	rm "plugins/geoservices/libqtgeoservices_osm.so" || die
+	rm "plugins/iconengines/libqsvgicon.so" || die
+	rm "plugins/mediaservice/libgstaudiodecoder.so" || die
+	rm "plugins/mediaservice/libgstcamerabin.so" || die
+	rm "plugins/mediaservice/libgstmediacapture.so" || die
+	rm "plugins/mediaservice/libgstmediaplayer.so" || die
+	rm "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so" || die
+	rm "plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so" || die
+	rm "plugins/platforms/libqeglfs.so" || die
+	rm "plugins/platforms/libqlinuxfb.so" || die
+	rm "plugins/platforms/libqminimal.so" || die
+	rm "plugins/platforms/libqminimalegl.so" || die
+	rm "plugins/platforms/libqoffscreen.so" || die
+	rm "plugins/platforms/libqvnc.so" || die
+	rm "plugins/platformthemes/libqgtk3.so" || die
+	rm "plugins/playlistformats/libqtmultimedia_m3u.so" || die
+	rm "plugins/position/libqtposition_geoclue.so" || die
+	rm "plugins/position/libqtposition_positionpoll.so" || die
+	rm "plugins/printsupport/libcupsprintersupport.so" || die
+	rm "plugins/qmltooling/libqmldbg_debugger.so" || die
+	rm "plugins/qmltooling/libqmldbg_inspector.so" || die
+	rm "plugins/qmltooling/libqmldbg_local.so" || die
+	rm "plugins/qmltooling/libqmldbg_messages.so" || die
+	rm "plugins/qmltooling/libqmldbg_native.so" || die
+	rm "plugins/qmltooling/libqmldbg_nativedebugger.so" || die
+	rm "plugins/qmltooling/libqmldbg_profiler.so" || die
+	rm "plugins/qmltooling/libqmldbg_quickprofiler.so" || die
+	rm "plugins/qmltooling/libqmldbg_server.so" || die
+	rm "plugins/qmltooling/libqmldbg_tcp.so" || die
+	rm "plugins/renderplugins/libscene2d.so" || die
+	rm "plugins/sceneparsers/libassimpsceneimport.so" || die
+	rm "plugins/sceneparsers/libgltfsceneexport.so" || die
+	rm "plugins/sceneparsers/libgltfsceneimport.so" || die
+	rm "plugins/sensorgestures/libqtsensorgestures_plugin.so" || die
+	rm "plugins/sensorgestures/libqtsensorgestures_shakeplugin.so" || die
+	rm "plugins/sensors/libqtsensors_generic.so" || die
+	rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die
+	rm "plugins/sensors/libqtsensors_linuxsys.so" || die
+	rm "plugins/sqldrivers/libqsqlite.so" || die
+	rm "plugins/sqldrivers/libqsqlmysql.so" || die
+	rm "plugins/sqldrivers/libqsqlpsql.so" || die
+	rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die
+	rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die
+	rm "qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so" || die
+	rm "qml/Qt/labs/platform/libqtlabsplatformplugin.so" || die
+	rm "qml/Qt/labs/settings/libqmlsettingsplugin.so" || die
+	rm "qml/Qt/labs/sharedimage/libsharedimageplugin.so" || die
+	rm "qml/Qt3D/Animation/libquick3danimationplugin.so" || die
+	rm "qml/Qt3D/Core/libquick3dcoreplugin.so" || die
+	rm "qml/Qt3D/Extras/libquick3dextrasplugin.so" || die
+	rm "qml/Qt3D/Input/libquick3dinputplugin.so" || die
+	rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die
+	rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die
+	rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die
+	rm "qml/QtCanvas3D/libqtcanvas3d.so" || die
+	rm "qml/QtGamepad/libdeclarative_gamepad.so" || die
+	rm "qml/QtLocation/libdeclarative_location.so" || die
+	rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die
+	rm "qml/QtNfc/libdeclarative_nfc.so" || die
+	rm "qml/QtPositioning/libdeclarative_positioning.so" || die
+	rm "qml/QtQml/Models.2/libmodelsplugin.so" || die
+	rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so" || die
+	rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so" || die
+	rm "qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so" || die
+	rm "qml/QtQuick/Controls/libqtquickcontrolsplugin.so" || die
+	rm "qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so" || die
+	rm "qml/QtQuick/Dialogs/libdialogplugin.so" || die
+	rm "qml/QtQuick/Extras/libqtquickextrasplugin.so" || die
+	rm "qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so" || die
+	rm "qml/QtQuick/Particles.2/libparticlesplugin.so" || die
+	rm "qml/QtQuick/PrivateWidgets/libwidgetsplugin.so" || die
+	rm "qml/QtQuick/Scene2D/libqtquickscene2dplugin.so" || die
+	rm "qml/QtQuick/Scene3D/libqtquickscene3dplugin.so" || die
+	rm "qml/QtQuick/VirtualKeyboard/Styles/libqtvirtualkeyboardstylesplugin.so" || die
+	rm "qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so" || die
+	rm "qml/QtScxml/libdeclarative_scxml.so" || die
+	rm "qml/QtSensors/libdeclarative_sensors.so" || die
+	rm "qml/QtTest/libqmltestplugin.so" || die
+	rm "qml/QtWebChannel/libdeclarative_webchannel.so" || die
+	rm "qml/QtWebEngine/libqtwebengineplugin.so" || die
+	rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so" || die
+	rm "qml/QtWebView/libdeclarative_webview.so" || die
+	rm "lib/libQt5MultimediaGstTools.so.5" || die
+	rm "lib/libQt5OpenGL.so.5" || die
+	rm "lib/libQt5QuickWidgets.so.5" || die
+	rm "lib/libQt5EglFsKmsSupport.so.5" || die
+	rm "plugins/position/libqtposition_serialnmea.so" || die
+	rm "plugins/webview/libqtwebview_webengine.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so" || die
+	rm "plugins/texttospeech/libqtexttospeech_speechd.so" || die
+	rm "plugins/canbus/libqtpassthrucanbus.so" || die
+	rm "qml/QtQuick/Shapes/libqmlshapesplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die
+	rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die
+	rm "qml/Qt/labs/handlers/libhandlersplugin.so" || die
+	rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die
+
+	default
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR usr "${D}"/ || die "Failed to copy files"
+
+	dosym "protonmail-bridge" "/usr/bin/${PN}"
+
+	insinto /etc/revdep-rebuild
+	newins - "50-${PN}" <<-EOF
+		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
+	EOF
+}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index e4a095138423..61ab3d00c2cd 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 3bdd1d713436..d65a1524e68a 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,5 @@
 DIST cantarell-fonts-0.101.tar.xz 263480 BLAKE2B 79652cf87088a8fe505895cad1f2474e0cb52e4be8a977ae06442a0e8ca6ba6a7f93c811b14e56fd5e61a17c97175b2374d180e435cbac00af8c10b272461802 SHA512 52dbd8358de7e20146e627ab0b1298efb97ee335e45d8e63bab7c3a7d05314d0bb94ac448e34af4c6f7212623185a9e03a30eb24acee4915142e40af0086bbfb
 DIST cantarell-fonts-0.111.tar.xz 326216 BLAKE2B dad338329670674cf3815b2045f8f9a739a9e08913189cec67577982e58df8328e0dc185439bffb6bda0529846b844d0b37a3c9615210f23d47616969f7874b2 SHA512 638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e
 EBUILD cantarell-0.101.ebuild 1255 BLAKE2B 51c847b61bc6a1a03057da80ec77a895b0c9baca8286d068a4d60699aa700b3b358caa8039dfe633db2cb4be8610a2948030064bed2f4cf4caf8c81a65a2bd4d SHA512 56a8c9049dafab291dbd4c9d37162162e1eeb9b058de347cdb5e02ba661cbb3e279022971a8e5b5fb097876b5d108a4dec363b98313c6cbace3dd201122ccee3
-EBUILD cantarell-0.111.ebuild 1286 BLAKE2B a4c362c1808f331f116b1d7ba3d133ee73c6afe28cbc264752d7172ba6fa1c95698743e02e3eda15c81c893ed55a57c5a9516e1d41f26f3565f94b5fb50650ae SHA512 ee88a88422dab98f2f0c8632197517f0f18df9a7ff6234b611fb264c7dbc45e94ee96418d1f0053f960b2a60aaace1082cede54376aca76d4c20ace6afc597f6
+EBUILD cantarell-0.111.ebuild 1285 BLAKE2B b259bfda565a1a032ac03f0de270c5e6ff9e272b83ba4c4c661769deb111699a92cd26b48baca631048afd09d6e43be93d7398f65c7707fa47aabc68a073da19 SHA512 bf098f7dd86691e61292073e6bea18f1f08ac4676564f79b87353ab9d9794d2c814ece13b0f9d22f63638f8ec72cc56f48ab0561ee0ea41a39d7b94fc8fefbbe
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.111.ebuild b/media-fonts/cantarell/cantarell-0.111.ebuild
index a55e210a08e8..264353916f52 100644
--- a/media-fonts/cantarell/cantarell-0.111.ebuild
+++ b/media-fonts/cantarell/cantarell-0.111.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest
index 07421413659d..a144f2d574c7 100644
--- a/media-fonts/noto-cjk/Manifest
+++ b/media-fonts/noto-cjk/Manifest
@@ -1,6 +1,8 @@
 AUX 70-noto-cjk.conf 3815 BLAKE2B 84c477a84c117fa7fef4922e6b289c4eab4147a291b447a3b6d90a01d513f1f0c64dcd341bdda7b9b9f8efe339ab6781dde49189e84640ff781091f630b4296c SHA512 8f45cd10f17b4cfc2b5d7d253e7ca1dba20eaff206f479377c25ef54f469aaa3346d1ceb422086d7b25bc3ce6b3cf0a43b5967affd1126c020059a4e319e0337
 DIST noto-cjk-20150615.tar.xz 390518224 BLAKE2B 273018f6d0792ae90bc0d9f44a43f300a7fbd2ca2cbdbf71af911e1cfc0d4f0bb30b5d1f2b15d9bf4df279266921d46987f166dd4559ea15e747db7a22494145 SHA512 738bd840d14c3fc3665b9c6e50b1b2d5981ccdc5e660a6498b4611b8019208f0880df062741d9dec8bdcd54234eed46655e1c739cf872d9dfa5fa0523954a7d3
 DIST noto-cjk-20170602.tar.gz 1667938394 BLAKE2B 51ed7c48bccef0dff75ddc5ec108b61f0f5ceedc41608919dc1071a2308f96c3d2883af932935c32db6dd017e067079d45776eb865200560f2f9c6b89e57dd8c SHA512 861431e1eb0c21b8b7b03f9a97ae61c59a2e513314a24f0c50e2953daac3cba78fa418af32cf66ec100a26c88f5e07bd33eb3ed80b533d97a452fefa5a06b4dc
+DIST noto-cjk-20190416.tar.gz 1882149745 BLAKE2B 0936414381624db8a601cb2af53928658c9f74ed3dac34955f5597e7cb14cdacc517c8b7bffe203d73e03a2c2d4013d3cfc47ce13ae3aa497c6547cd8dcce430 SHA512 8abebae9412622f50adb0f755621d97002233d8db367f8fc38dda6a0828c3ea879e9ac780a3b09239b0570ada1091b0a7889bb7301a9486da9dfdca7200e50da
 EBUILD noto-cjk-20150615.ebuild 756 BLAKE2B c1ee13c7340cf90d0dcd9130c3377332e9772828df9948cf8eb5d3df337c77e67bde57d53c2cdd1ad6129e1cceaec8e5e28179535036ef98c970c602ca95b411 SHA512 c8696b1655b25cfcb1004898d80d757e5cd2273fbe71e01cead68b379643259072917b03cd893de3213d9d76f8fab245255f030b48e5cb39b9d1eccdfe81cc14
-EBUILD noto-cjk-20170602.ebuild 645 BLAKE2B 78dcc2442658268bb47b72bc7ca74d6a3b97cb2166c3e56644a30b06654eb0d88d44f59c7b21f735f8049a0e0be5eda9d86a6dbfea1769c766d652d44cf494f1 SHA512 38664dfaeb6fefcf3aea59b8f31dd62d60f6c1ea31ce810c35f31644bcc8622c84b438ffa4320a1ba65762d06d599187984d981fea09154b355f9dd809a89877
+EBUILD noto-cjk-20170602.ebuild 644 BLAKE2B b996054820cc1fe2621968a4a4c91267823af08b4e3dd6a61953c336361d963172d701408c3ed391f942b30c472b8ffab4217e3a864fcc380087913fd99c5f0a SHA512 d4750ab9746e8c7be333f547d07973e2f31d415b6baffe32a8511aa176fd45cd62a5678d2b7bc57db9c3f6baa35aeeed07e29622f330c53b7676a13c90ecfda7
+EBUILD noto-cjk-20190416.ebuild 648 BLAKE2B b4106f5bed38fa146ec7c380cd0ae1927f5c5fbb5b8ad15afd2e2ec61c3933d9aa186baccd9a3beac254c79ad1fb7bf1fb014e1f8545f0b23fdb14f88dc8df81 SHA512 e25e896dd5049dee3c929cf13fdd58713b408b593b42b5a68c5b3db00cba6dd4ee13f22d1c9353716bc2f8e1ecca182728a2093443c085e44483d111af0ffa34
 MISC metadata.xml 449 BLAKE2B f30d4df6c9ddc672a839eeb6433bd9583fa4af65c32190b09bca261e1a53e0c9bb396808811a3591c8b90337002fba8433d8eb816af4475f57339c299b8eaa06 SHA512 04d7f718df7e4d83823b778f09f1cb4e78ffceb154030dc1f8980cd9ca9cf8ed0140d0354b44e6523952e6ddae3e4879a467a1855092cfb7052ea97e099c98d4
diff --git a/media-fonts/noto-cjk/noto-cjk-20170602.ebuild b/media-fonts/noto-cjk/noto-cjk-20170602.ebuild
index 813eda4f7301..38a1dc57d8af 100644
--- a/media-fonts/noto-cjk/noto-cjk-20170602.ebuild
+++ b/media-fonts/noto-cjk/noto-cjk-20170602.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googlei18n/noto-cjk/archive/${COMMIT}.tar.gz -> ${P}
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RESTRICT="binchecks strip"
diff --git a/media-fonts/noto-cjk/noto-cjk-20190416.ebuild b/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
new file mode 100644
index 000000000000..7802ca32336e
--- /dev/null
+++ b/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit font
+
+DESCRIPTION="Google's CJK font family"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk"
+
+COMMIT="be6c059ac1587e556e2412b27f5155c8eb3ddbe6"
+SRC_URI="https://github.com/googlei18n/noto-cjk/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+FONT_S="${S}"
+FONT_SUFFIX="ttc"
+FONT_CONF=(
+	# From ArchLinux
+	"${FILESDIR}/70-noto-cjk.conf"
+)
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 5a52523aed59..b4a48efcad21 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -1,7 +1,10 @@
 AUX noto-emoji-20180823-build-path.patch 313 BLAKE2B c7a6a67639444329f033da14b58759d9ac265a3dfd7854fc6ba0466ace3c5ce9794c9c6493d08a89d29d4e9a5fa99d1553be13c49fc9f09fb82a82b6b61531f6 SHA512 544acdfd0f2dc0dcfc75b4081f7e1518ab914d02801bf7b38f31af9a0d55ed516a2f53e963606232a8742819b3005f8e9660c8a61257d0583bfee8f095d4e341
+AUX noto-emoji-20190328-use-gm.patch 1169 BLAKE2B 6659f1f80ec3f44942a7b96b23f5ae90ad9167cd30812e6fc71abe3df3179184b2be389ee8f277a4ce696269ffba2e25e8c024677b73c925b7ad06cdebc5846b SHA512 e3c1d68bd887c8e9dd7e752f946cff8265c996cbfafe27652ca90e67bb555433787edd45a5805bbca5b73b15377c5102593f594bbe2777d2c07452143b164c5e
 AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a
 AUX noto-emoji-use-gm.patch 1488 BLAKE2B 08bb2fa62c79615992c25503093d9ee8296dd3d0103ae50e9376020730c48d8e3eb5da281f066242b25d8e5c6a293cdb013b9d276fb10350021479aade1e78ab SHA512 0719575b7d2c3f0cc15c7e7a314e4a528b0601e14b8a06f0304a784d3d5dcf27cf4f881e4b57bb4647ba0cb36ba7be842bea2df1529de55d6ca16b6326c930d8
 AUX noto-emoji-use-system-pngquant.patch 2118 BLAKE2B 55048756859ead78a013a6ff749500107d9fe02fcfe775582fade153f268c5daa6f074ea1e8ea260bd09af077cc19cd8121b570bac47649b669df196e43d2574 SHA512 6bd4dd9e45aa73d8677c671a5ee3d6f03b3e94004db9b9c715cf76402ab2a641ce79991ec583cfe3a15a6c9803de4bfa863bd30cf16e96e9cb8a4683d6c04807
 DIST noto-emoji-20180823.tar.gz 51710829 BLAKE2B 66983bdd3cb5e95727f0ddebca5d85c3f22bb9e7b9216eb1af41c4cba19f2020592be3feb7ac47f723985574b8d57070d9d07d0ce5e5870512aecc2a55b52995 SHA512 73233f3742faae4e37f8588bda097fe9f745f5cc7e6601301c1dc9e30d656c496e074c80bf4391708f6c0dbe32043e8558e4395cce5dbf735772b0e41642b9bf
+DIST noto-emoji-20190328.tar.gz 51710517 BLAKE2B ecedc52d3bdc49281942e7cb6b217928ee57412a420da251855c702e444c5d720464093c173f2878c09b4ef7123aedcfc3aa6aa517a625749d414e4c3b08bd19 SHA512 9e775a18a43edadb24fee498a8dff588949475ba27c2daddc1dfb6eacc18d1bf8810ec88e018398f18efe9ff0c414766f569eec7a714e119f3aabdfbe3ceec98
 EBUILD noto-emoji-20180823.ebuild 1433 BLAKE2B a4df6d3336659a33bc91ddcb21b6b786110fbee82250f56ae449ed9407f7257006be5d36603b5e04220f18bed146346a15ee1a9f1a67bc3b115f641796e6aa79 SHA512 dc11f315255040b361e3a861ff172522eb5b31860e5ffa7cdb2ccf733fd7f374e497c7ab5115efaf7a7f75d7fa2f0a9a311ba7dd7c412d96e298bc3a243c017b
+EBUILD noto-emoji-20190328.ebuild 1353 BLAKE2B 08fe910ebfb5f50cb6a1897866458803d6118c59052a7209758090c503937eff6f619d989c0c3ff65865f6d64384a6943115f1fec17d5a72bdf0e65b3180f7e6 SHA512 62edd31cefd88d176bd04e1981194306350a521b2415e2bee1cede8da74d44513efa1c1f4e62b6553447b989fed930b6574ebd061b636a79b2910c1564de3635
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/media-fonts/noto-emoji/files/noto-emoji-20190328-use-gm.patch b/media-fonts/noto-emoji/files/noto-emoji-20190328-use-gm.patch
new file mode 100644
index 000000000000..6b51d0f52168
--- /dev/null
+++ b/media-fonts/noto-emoji/files/noto-emoji-20190328-use-gm.patch
@@ -0,0 +1,27 @@
+--- a/Makefile~	2019-03-28 17:45:53.000000000 +0100
++++ b/Makefile	2019-06-02 10:36:55.587055453 +0200
+@@ -21,7 +21,7 @@
+ PNGQUANT = pngquant
+ PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
+ BODY_DIMENSIONS = 136x128
+-IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
++IMOPS = -size 136x128 -background none -gravity center -extent 136x128 -compose copy
+ 
+ # zopflipng is better (about 5-10%) but much slower.  it will be used if
+ # present.  pass ZOPFLIPNG= as an arg to make to use optipng instead.
+@@ -165,13 +165,13 @@
+ # imagemagick packaged with ubuntu trusty (6.7.7-10) by using -composite.
+ 
+ $(EMOJI_DIR)/%.png: $(EMOJI_SRC_DIR)/%.png | $(EMOJI_DIR)
+-	@convert $(IMOPS) "$<" -composite "PNG32:$@"
++	@gm convert $(IMOPS) "$<" "PNG32:$@"
+ 
+ $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag | $(FLAGS_DIR)
+ 	@./waveflag $(FLAGS_DIR)/ "$<"
+ 
+ $(RESIZED_FLAGS_DIR)/%.png: $(FLAGS_DIR)/%.png | $(RESIZED_FLAGS_DIR)
+-	@convert $(IMOPS) "$<" -composite "PNG32:$@"
++	@gm convert $(IMOPS) "$<" "PNG32:$@"
+ 
+ flag-symlinks: $(RESIZED_FLAG_FILES) | $(RENAMED_FLAGS_DIR)
+ 	@$(subst ^, ,                                  \
diff --git a/media-fonts/noto-emoji/noto-emoji-20190328.ebuild b/media-fonts/noto-emoji/noto-emoji-20190328.ebuild
new file mode 100644
index 000000000000..0c67590eebb2
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20190328.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit font python-any-r1
+
+DESCRIPTION="Google Noto Emoji fonts"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-emoji"
+
+COMMIT="e7490e1841094da518f4672398bdd74ee3c5fcac"
+SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	app-arch/zopfli
+	dev-python/fonttools
+	dev-python/nototools
+	media-gfx/pngquant
+	x11-libs/cairo
+	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+"
+RDEPEND=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
+
+PATCHES=(
+	# From Fedora
+	"${FILESDIR}/${PN}-build-all-flags.patch"
+
+	# https://github.com/googlei18n/noto-emoji/issues/240
+	"${FILESDIR}/${PN}-20180823-build-path.patch"
+)
+
+src_prepare() {
+	default
+
+	# Based on Fedora patch to allow graphicsmagick usage
+	if has_version media-gfx/graphicsmagick; then
+		eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
+	fi
+}
+
+src_install() {
+	font_src_install
+
+	# Don't lose fancy emoji icons
+	insinto /usr/share/icons/"${PN}"/128x128/emotes/
+	doins png/128/*.png
+
+	insinto /usr/share/icons/"${PN}"/scalable/emotes/
+	doins svg/*.svg
+}
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 20128a7f603b..f19745b7eebe 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -3,6 +3,8 @@ AUX 66-noto-sans.conf 318 BLAKE2B 42a6036c93c982b2b0eb04a530dafe6d8eceeac0e77041
 AUX 66-noto-serif.conf 310 BLAKE2B 804753d2e703ce309e74da15aefdac6d510f52396a312a143c1a9e0e499f0301e5a154f6df48cf4a71834c637b1545953354d0c3518d67a429850135ed2db4da SHA512 c0ade988e2560191098c539de4341dfee29bc67d177f5916c7eb3346586c19c791c32842016db334c3d3689d89a1437220544f2c45934a9c0d74d2f6064aaa69
 DIST noto-20170403.tar.xz 11083152 BLAKE2B 8281cc19a100d1cbf7f57fba9cba077bb0005f7296f58d48247bef6c804b53597ff359dfab7b7d851e42c0294c757f311979b98dc9f1c22e2d3f3fabe4db77e7 SHA512 f8f1414b5b6f793e86ef3cc6a6320c4545f079b337c7672cb8cccc3c50d21d353d81557da4a555cdb6524c79be3e4c167f7d5aac102c38d64926f3b1887ca7f3
 DIST noto-20181024.tar.gz 726721580 BLAKE2B d19d32d98419395df1bb3ca360bd67a50487d499aa3ea1612355b2f0fef09fe8236583fedc6d528668048ccbeee7139df704fc8e125c5eec7215708838aa09f4 SHA512 5df8266fab59a9ad5e6de6971c69d2761864c29e8d0e79e16a44177327b73527a37a9d148b63c862bfb5f7507793aab5c4319603f3b8b80e18eb9f203d7a7334
+DIST noto-20190524.tar.gz 740252290 BLAKE2B e169ee60c9a83c13656ebd5dbce32aad183bbebc057035c69723788725a1c14a016c37bea7ccf30fc9d776e421515c2fa03f929b5f7bf95d9e3abb1abbeccbbf SHA512 668f7d015da420b3c32f8c0313037bab731bd915875f476beb47e6c3e8d33a30cd608d2f351194607afbf28f8f3efc1eb5f8470c03fd88a83df33b478fa78147
 EBUILD noto-20170403.ebuild 819 BLAKE2B 3bf921503660437c91da43ac3e7e9e05fff70ff95e9842b1c5d884d005a28286a929cc66772afa8f9c74d919045f9e45218ce8f2bfa0eb9539b1ceea26c8762e SHA512 728276eef93954d03eb649f2772d4cde19b3080e7bdff2da344d70026d992f5dd1d521f6786c50f32f38c1780988288463705fdd522cec298ba4c8d51bd6b8d7
-EBUILD noto-20181024.ebuild 929 BLAKE2B c1c076c450a25f1372f2a6b4b85d8df2c94b9276a9c333bc1d7f34683c0d8c97dcbee73650361b74e79ee746a721f5102bf7fd39716e6e6d4313e20795ac7f60 SHA512 883a1dc34d6eadca8ad4fd12f7c73fce90a0172be146fd03b339ac381d70caba16435464c8772a0d8cbe840000983ac49649e270faef6f2262bc17976f1e0670
-MISC metadata.xml 449 BLAKE2B f30d4df6c9ddc672a839eeb6433bd9583fa4af65c32190b09bca261e1a53e0c9bb396808811a3591c8b90337002fba8433d8eb816af4475f57339c299b8eaa06 SHA512 04d7f718df7e4d83823b778f09f1cb4e78ffceb154030dc1f8980cd9ca9cf8ed0140d0354b44e6523952e6ddae3e4879a467a1855092cfb7052ea97e099c98d4
+EBUILD noto-20181024.ebuild 928 BLAKE2B 394b9decc5153dad3d77a2ef0078ca4be32ecdd3c7048a80a5e4566994fa9cef0d5059f092649341014737c877cafbd0f791937ba2350ebf7440ecabc06d38df SHA512 eae13a5c8ed1e8cfc7dbc63cb1eb4ea6398f1c0cc4a25b3babe0f93c9dfb2f0d0a1a200519490e562a1b25f05f7c2273ebe42f4290feef7617421777fb173809
+EBUILD noto-20190524.ebuild 1281 BLAKE2B ec8fd536d5b50004161f8dc45744fc7c53a8e1134936106392f8561afbd92f5b566b37587e400ccb9df499eede6803d735c921af73efb3e0cb71e864bec373b6 SHA512 8f7708b4d0c8006eb139bea43dcdbdadb0bf595bf8022f2bb6a39589b8c1392b0c40d2b0164bedcc0759c4f977004ba45c6ea60c23cbd55bdb8b297dbd017cca
+MISC metadata.xml 530 BLAKE2B 68b0a3b988e81eb974ad2585c20ee030d187e54f5cc8b870be03a373d6520bcca6639c0c6356f3c0922dc8cc64380ed2e442d49b6030e4350e0702c198dbe79b SHA512 41ffbb23b7067dc9b7482480ba579679514dae3f8d2452f88cc747fe443051362f1cb548086550d142323df5931e83c537e533753433579af9b7362efc0d9acd
diff --git a/media-fonts/noto/metadata.xml b/media-fonts/noto/metadata.xml
index 4915e3a96577..0f42cde68837 100644
--- a/media-fonts/noto/metadata.xml
+++ b/media-fonts/noto/metadata.xml
@@ -13,4 +13,7 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<use>
+        	<flag name="extra">Install full upstream font set</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-fonts/noto/noto-20181024.ebuild b/media-fonts/noto/noto-20181024.ebuild
index c4654adbcb27..f21e05349fe0 100644
--- a/media-fonts/noto/noto-20181024.ebuild
+++ b/media-fonts/noto/noto-20181024.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
 IUSE="cjk"
 
 RDEPEND="cjk? ( media-fonts/noto-cjk )"
diff --git a/media-fonts/noto/noto-20190524.ebuild b/media-fonts/noto/noto-20190524.ebuild
new file mode 100644
index 000000000000..e845a0f67467
--- /dev/null
+++ b/media-fonts/noto/noto-20190524.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit font
+
+DESCRIPTION="Google's font family that aims to support all the world's languages"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts"
+
+COMMIT="34e98229863e627d0f841e124a8657d5d0348b04"
+SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+# Extra allows to optionally reduce disk usage even returning to tofu
+# issue as described in https://www.google.com/get/noto/
+IUSE="cjk +extra"
+
+RDEPEND="cjk? ( media-fonts/noto-cjk )"
+DEPEND=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-fonts-${COMMIT}"
+
+FONT_SUFFIX="ttf"
+FONT_CONF=(
+	# From ArchLinux
+	"${FILESDIR}/66-noto-serif.conf"
+	"${FILESDIR}/66-noto-mono.conf"
+	"${FILESDIR}/66-noto-sans.conf"
+)
+
+src_install() {
+	# Don't install in separate subdirs
+	FONT_S="${S}/unhinted/" font_src_install
+	FONT_S="${S}/hinted/" font_src_install
+
+	# Allow to drop some fonts optionally for people that want to save
+	# disk space. Following ArchLinux options.
+	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.ttf
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 1fc048d63600..7b17b5da7d6f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 7f2164dbb711..21cba16065e3 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -3,8 +3,11 @@ DIST Argyll_V1.9.2_src.zip 13624924 BLAKE2B 7035a1cd43b320acd3ccb6eeee46681e39f7
 DIST Argyll_V2.0.0_src.zip 13588152 BLAKE2B a299d7b4b2c76ac22c6761b4e25b4ee5751bd0771fb3d4c58dcb722aec1b413ab07fef35263e2dcb311d893bb16105072a83dd640720efbf160a59369fc88768 SHA512 44e9a2307bc39a8e455c15b2f4126de652a9ecd43bec94a841cb3da56896effcb023740d7e6b8991d109766c83426eee4b131a6c56cda5ff28b22a06ea470b5d
 DIST Argyll_V2.0.1_src.zip 13606682 BLAKE2B 156c94d538a868a90e59a009999ed35536ab84e27434c071613540c4afac1c7374f77eca73a38ca87220a0f1cff7213286312cb681d50a7e7e14b946788b8e0b SHA512 d0755d1837fa000278f390d9d101c1e9de3f2e294583c8b67b37f74f0ca6190917bfddd5ce50a39a274aefeeca304aaebdfd11db391521e222da2368a2881c0e
 DIST Argyll_V2.1.0_src.zip 13823910 BLAKE2B 344520ba06055333858ebc1991939589fb276ee434a5d16c6eedbb318da1cff27a910298fdd0ced86f292d1e3564c6e0d6a2663cf7b80cbd4afcf2d49982b3f2 SHA512 9a74828c8cea8aac5795ab48b1531b2cbd43ea613e856eceb55ee291412eb5e8816f25f6bc620bd1bfb32eb8c08e87e85e821a2dcf0c25eac68d96184e8f8bca
+DIST Argyll_V2.1.1_src.zip 13825860 BLAKE2B c1a748cf8ecd8e04164b0281e5cfb708386b196ea75bef6be02945d1a0cd1d191d069420628612ce0bd24028e40221a988becc3eba16293555376d20ab3a4bf5 SHA512 551b90c245d15e401c96c76ec0be66053bd75ca4d8b668a41841d72197820ed27d4d0186f903c126f7bacd667170e8e45e42ad31fcd44ec3276558b87b520565
 EBUILD argyllcms-1.9.2.ebuild 2087 BLAKE2B e20ba736ce25cbe2b8957ef60cd16d4a667ba606c564aa5c28c11949403c44dd014f06ce3a156f99d3f24d0d9a1f5c70dee723451867f65bcdd3310a72e8c904 SHA512 8485775e762c057e59407758788a5982b3a07c33516381ca6bf229452737d4a226e83e151109d6f8afcf70a68581d48009aa8d9722d180cc906796c010580ad6
 EBUILD argyllcms-2.0.0.ebuild 2042 BLAKE2B 2d8c8f9bdaffd551fd69ccd2ba9d7ec26055fc1b52dfd367d32da5a71629e4c50bcb529a1635ceb5dd397cdad8cfdf9fc1c28b5cc6d19206e1e7b0111af45d20 SHA512 e41a6c9053b2bd8a3814a89875d714a4af8d00143277aa120d509ed2d24a3a4f31b10559bfa92141abd0b5131ed5344932e198350959221b48faaadf5f5d86a9
 EBUILD argyllcms-2.0.1.ebuild 2042 BLAKE2B f9560bb31b6f74a37bb7fbe3927ffe8d7435a8057f109f976e9fe8dd433703393a7ca5ffdb086e287ace418093a01ba89d720a6e90aea68819d9d485a0031b4a SHA512 825b1047f6a2c8b49e175442b1cd6f85831527d852ddddee12f0e8bdf119a3234afd672c19b96583f8c18f06e70bbfe19feef9a04ff81eef9398c9261a3d31e7
 EBUILD argyllcms-2.1.0.ebuild 2032 BLAKE2B ab27af1801046c31cce2b24267e3ad372ec5fce441cf4a42b5981bb278d6499178c76c188c935b12db27f0138019a68a4366de7891f0c3a8eb2106696b9a0200 SHA512 430d091e3421deee3fc1a5ab53ba549f677d143cbc5ccfffbc7434bf2b24d5017554b4eaf06895d0124a5c28adb19acf88401d974b2d385057054af0557b596b
+EBUILD argyllcms-2.1.1-r1.ebuild 2113 BLAKE2B 7491a7a5fccb9ca0675dced451e2d8c88b804f279e19eb53c0e6afe8a64c415ae0d9b954428f490d1050e86ff01ad8ff74bbc133b6a189951336c65a6c44cbb3 SHA512 f4180c02dcc2997607ffea5e174626609809a08346b6c65c7f51cb79c2e57eff5de83909855a35712b9d5f055d2ece7cfdafc6af2b9ed0c63ab9570f3cd7bd44
+EBUILD argyllcms-2.1.1.ebuild 2052 BLAKE2B 6812bdc9650f94cb577b901a513849bfedd7403069f4e013991aed46aeddcf80942bb989500a9cae5ce91a49a6fbac54142c525a14d0623c892a4d67eb2615a1 SHA512 267a3532a37275bea029f42f690c10f2776d9aea50b53431354b89d449e8f88d5c7308f4d707f9a158680d5666e044f61bb4b611e90374024fdfa3410c17c62e
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/media-gfx/argyllcms/argyllcms-2.1.1-r1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..276ade085560
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-2.1.1-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multiprocessing toolchain-funcs udev
+
+MY_P="Argyll_V${PV}"
+
+DESCRIPTION="Open source, ICC compatible color management system"
+HOMEPAGE="http://www.argyllcms.com/"
+SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+IUSE="doc libressl"
+
+RDEPEND="
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-libs/libXScrnSaver
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/ftjam"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# Make it respect LDFLAGS
+	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
+
+	# Evil hack to get --as-needed working. The build system unfortunately lists all
+	# the shared libraries by default on the command line _before_ the object to be built...
+	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
+
+	append-cflags -DUNIX -D_THREAD_SAFE
+
+	sed \
+		-e 's:CCFLAGS:CFLAGS:g' \
+		-e "s:ar rusc:$(tc-getAR) rusc:g" \
+		-i Jambase || die
+
+	tc-export CC RANLIB
+
+	jam -dx -fJambase "-j$(makeopts_jobs)" || die
+}
+
+src_install() {
+	jam -dx -fJambase install || die
+
+	rm bin/License.txt || die
+
+	pushd bin > /dev/null
+	local binname
+	for binname in * ; do
+		newbin ${binname} argyll-${binname}
+	done
+	popd > /dev/null
+
+	dodoc log.txt Readme.txt ttbd.txt notes.txt
+	if use doc;  then
+		docinto html
+		dodoc doc/*html doc/*jpg doc/*gif
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r ref
+
+	udev_dorules usb/55-Argyll.rules
+}
+
+pkg_postinst() {
+	elog "If you have a Spyder2 you need to extract the firmware"
+	elog "from the CVSpyder.dll of the windows driver package"
+	elog "and store it as /usr/share/color/spyd2PLD.bin"
+	echo
+	elog "For further info on setting up instrument access read"
+	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
+	echo
+}
diff --git a/media-gfx/argyllcms/argyllcms-2.1.1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.1.ebuild
new file mode 100644
index 000000000000..13a4b210e34c
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-2.1.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multiprocessing toolchain-funcs udev
+
+MY_P="Argyll_V${PV}"
+
+DESCRIPTION="Open source, ICC compatible color management system"
+HOMEPAGE="http://www.argyllcms.com/"
+SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 hppa ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-libs/libXScrnSaver"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/ftjam"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# Make it respect LDFLAGS
+	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
+
+	# Evil hack to get --as-needed working. The build system unfortunately lists all
+	# the shared libraries by default on the command line _before_ the object to be built...
+	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
+
+	append-cflags -DUNIX -D_THREAD_SAFE
+
+	sed \
+		-e 's:CCFLAGS:CFLAGS:g' \
+		-e "s:ar rusc:$(tc-getAR) rusc:g" \
+		-i Jambase || die
+
+	tc-export CC RANLIB
+
+	jam -dx -fJambase "-j$(makeopts_jobs)" || die
+}
+
+src_install() {
+	jam -dx -fJambase install || die
+
+	rm bin/License.txt || die
+
+	pushd bin > /dev/null
+	local binname
+	for binname in * ; do
+		newbin ${binname} argyll-${binname}
+	done
+	popd > /dev/null
+
+	dodoc log.txt Readme.txt ttbd.txt notes.txt
+	if use doc;  then
+		docinto html
+		dodoc doc/*html doc/*jpg doc/*gif
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r ref
+
+	udev_dorules usb/55-Argyll.rules
+}
+
+pkg_postinst() {
+	elog "If you have a Spyder2 you need to extract the firmware"
+	elog "from the CVSpyder.dll of the windows driver package"
+	elog "and store it as /usr/share/color/spyd2PLD.bin"
+	echo
+	elog "For further info on setting up instrument access read"
+	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
+	echo
+}
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 2fa7a0a3f436..0dbc5be5d2a0 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -10,10 +10,14 @@ AUX asymptote-2.47-xdg-utils.patch 727 BLAKE2B e49045dac05319382a1c1b649ce525d8b
 AUX asymptote-2.48-configure-ac.patch 475 BLAKE2B 9794a455eef50cab9bf0bfe306adc39971f4255eaf2dae3357e16d3754d6b577cfd28efafc887a2a4ed22a9569f2e6211e74d61ee85b351690e4390f74ebf507 SHA512 10f60794c7fd79d1fd11cbec7afe0fdbd82ff62add1ed13c1089f24d896867a35b54f6e245dfa2c757193b8575cf582a92390fedba69331159fa9107fd3dc8c7
 AUX asymptote-2.48-info.patch 436 BLAKE2B 549c1dabc62651789889ae78d82dc59326982aa37e8903474a7023481f514a1c0632cd114c347b607ea08901c1f93e751e41d064d16e1dcd4bb8eeedb2a4d5d4 SHA512 f38f45e1148ddd97c231221995cdc04527ed711a60820a7b07ac30272ae3cade1a27786215064a1ca42055b5a3edbc49780b587e3f4d074a3eb2d9ee229cdba6
 AUX asymptote-2.48-xdg-utils.patch 727 BLAKE2B 0352df07cb5930daa71d3fdbf2fb6230b22d3423e06e596e4c92358ba5f84b473900c76c28a083ed583fed21ed644bbe43ec59e7e65ce91257d72ee5d31b794e SHA512 ea5d83b50973bb361e5ad3ad409c2fa0f634fb390a52d17d4a1915960dcff1a84a56e5a59e79cb2fcdd7a02dd7544ee7c58bade22e3c519641e94019bd1d3ffc
+AUX asymptote-2.49-info.patch 436 BLAKE2B bd620511b6c695bd30f91c2e2d3455f35ce328c769f075c862ef884021c44b2363b2dbe045487d7a1d362953782fcef4cc7aaad331e9479371193ef9dbd6facf SHA512 6dfca4a63df4d2735b7f957aa5f6c193a9f2ab81a8d45249d09903c454b2a95e3f480eadeb545d7adfe8efcebb80e4c59f7d240140f197190313272d6e7df57b
+AUX asymptote-2.49-xdg-utils.patch 727 BLAKE2B f2ba7a7cdded26eee90926b62a077be99e84e8ede15e3ffa8c923147c16316bcddff63970b4967d792035c253b4d300ea9139a55b0ad30562c1a6dd279b7ebdb SHA512 64eb6e626ad8a8dd96d9cac5e6ac0c798f317b1d3120bcaffcab4e6c4dff69b07c12108ab78812e54eae862f7946c75edb94dc3c3501996284ac98f54a6ded9d
 DIST asymptote-2.41.src.tgz 3516426 BLAKE2B d4623609be58566e32de82c5c47f635ed737459fa27cd2da0622d639cd8207fc69988a7ecbf82993b051435fbf223c1f1178d213aea258a2b57fd3a698eee9cb SHA512 93f737a44b085c2290c4553c765cf49679820e6623bc5b6d0229818409868876275d6f0571abeb76033955fa95ee594e37d10c9901c54755b085e36760fd96cb
 DIST asymptote-2.47.src.tgz 3621676 BLAKE2B 575032093276b9df6b8d74897a4721dd0d5419b3380bce7962afc9dcdd20ec3bd47b5c4b882f2276a2ac4c0d99e657d7385122d7dc400efbfb52ceec753ee8f4 SHA512 9efc4a70e8d29d6d50ba49c54c48da38beb00f64e5b39f23dbaec5cb12b714e427473fdffbf71f2d636a007cbfc993fa3237a8beab01e3419c1da1287823c159
 DIST asymptote-2.48.src.tgz 3729763 BLAKE2B 5820ddbbd27f6e7296501f50f25051d8417a0ab24d7c4c777013bf23601b5cbe34a69ba781e16e05141fda4e2e7a8bc527a41829f8d9e983aadc19bd05743122 SHA512 cd8b756185ae6627ea66bcaea224152f6644df633fe7ed40c1738f3b2ec31fbaa7ba97f2b1e290b073995779768ee3a264dd942f609b768cab7624d12807583d
+DIST asymptote-2.49.src.tgz 3730453 BLAKE2B b52c2fbac5ea9c6046f2bd2990c7f3792823ae0ecd749c58990bcee898b8af7d26c4b457bee6aa15fb11e3c63a7cdc6d7e4976418ee96fc4470a17f3202d79cd SHA512 08c20e45ab764281b480a97c5e2294cdfcc18b179cbdc85cf9956806b40fe305360d589077bd3ac429985503b0e7d17c889a37349d8c6fdf8ccbd8d822544226
 EBUILD asymptote-2.41-r1.ebuild 4666 BLAKE2B b08d0c753cd411fa0c0c6d32a9c28874e3f035481a5a52277e3e0c43dcab2fc98a51671859ec4542cbbd8d65b0a7519e15cc665053d1e28cc190a8547ae088b3 SHA512 3160eada27c3c6a905df3b622019fb2f759a13ce7c261eabbd84d64483e55fbecc3ae13a5fb42d61b70e4a2874dd32187df1d0bb63f64e02fa6899dc1efeac80
 EBUILD asymptote-2.47.ebuild 4609 BLAKE2B 72b9016f520f39be0841b5363935e0e8fed242c2b1389d3c483f607495c7f432f58384072c760de9869c2d64b5864e19d93b124f9ba8650d44ca08c74f827ef7 SHA512 32f999eead1c5a8875b29ab01b268f4e1724bf4ba80d8e90665d5229fd6b9f267aa1f692b531d137d48175aaa49fe6abb87a05a8950635c80faa890abd8a8bda
 EBUILD asymptote-2.48-r1.ebuild 4655 BLAKE2B 5a26448a84033c85122683607981353344e67713cfc0ed1a817a4ada501db5110a913d0ab025b5e8762a4fdd4056f15b7f0272a9c2f4175a1bf78240832eb4ff SHA512 2a3ce261339eeadd288ffa56ffd1290496c7e961af2cee84aa5865f50e3f5971fbd9ba89f58ddb2febce28c1d05c396ab3fa4ea19c3d26dab90c215a062fe81c
+EBUILD asymptote-2.49.ebuild 4596 BLAKE2B 0462fb2a5efad3462fb7c348a80538badef4fb99df887e8134e1c6eef761c774277914c566dc333a1a6bcc6009cb25655c3d985f7d4d8ec734891a2c9180a8ff SHA512 a0094454032cfec2378a7586c6619d551d8b2cde249db9777db91a6731327f0d54cb0a7eddefbe33119875dec50b32738b82f5d82475c6c88ab3aa1cbabc26ea
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.49.ebuild b/media-gfx/asymptote/asymptote-2.49.ebuild
new file mode 100644
index 000000000000..60224c1dae4b
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.49.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit autotools elisp-common latex-package multilib python-r1
+
+DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
+HOMEPAGE="http://asymptote.sourceforge.net/"
+SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	offscreen? ( opengl )
+	doc? ( boehm-gc )"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.4-r5:0=
+	>=sys-libs/readline-4.3-r5:0=
+	imagemagick? ( media-gfx/imagemagick[png] )
+	opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
+	offscreen? ( media-libs/mesa[osmesa] )
+	svg? ( app-text/dvisvgm )
+	sigsegv? ( dev-libs/libsigsegv )
+	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
+	fftw? ( >=sci-libs/fftw-3.0.1 )
+	gsl? ( sci-libs/gsl )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		${PYTHON_DEPS}
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
+		dev-python/numpy
+		dev-python/pycson
+		>=gnome-base/librsvg-2.40
+		)
+	latex? (
+		virtual/latex-base
+		>=dev-texlive/texlive-latexextra-2013
+		)
+	emacs? ( virtual/emacs )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-lang/perl
+		media-gfx/imagemagick[png]
+		virtual/texi2dvi
+		virtual/latex-base
+		app-text/ghostscript-gpl )
+	test? ( app-text/ghostscript-gpl )"
+
+TEXMF=/usr/share/texmf-site
+
+PATCHES=(
+	# Changing pdf, ps, image viewers to xdg-open
+	"${FILESDIR}/${P}-xdg-utils.patch"
+
+	# Bug #322473
+	"${FILESDIR}/${P}-info.patch"
+)
+
+src_prepare() {
+	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
+		-i configure.ac \
+		|| die "sed configure.ac failed"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# for the CPPFLAGS see
+	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
+	econf \
+		CPPFLAGS=-DHAVE_SYS_TYPES_H \
+		CFLAGS="${CXXFLAGS}" \
+		--disable-gc-debug \
+		$(use_enable boehm-gc gc system) \
+		$(use_enable fftw) \
+		$(use_enable gsl) \
+		$(use_enable opengl gl) \
+		$(use_enable offscreen) \
+		$(use_enable sigsegv)
+}
+
+src_compile() {
+	default
+
+	cd doc || die
+	emake asy.1
+	if use doc; then
+		# info
+		einfo "Making info"
+		emake ${PN}.info
+		cd FAQ || die
+		emake
+		cd .. || die
+		# pdf
+		einfo "Making pdf docs"
+		export VARTEXFONTS="${T}"/fonts
+		# see bug #260606
+		emake -j1 asymptote.pdf
+		emake CAD.pdf
+	fi
+	cd .. || die
+
+	if use emacs; then
+		einfo "Compiling emacs lisp files"
+		elisp-compile base/*.el
+	fi
+}
+
+src_install() {
+	# the program
+	dobin asy
+
+	# .asy files
+	insinto /usr/share/${PN}
+	doins base/*.asy
+
+	# documentation
+	dodoc BUGS ChangeLog README ReleaseNotes TODO
+	doman doc/asy.1
+
+	# X GUI
+	if use X; then
+		insinto /usr/share/${PN}
+		doins -r GUI
+		chmod +x "${D}"usr/share/${PN}/GUI/xasy.py
+		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
+		doman doc/xasy.1x
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/${PN}/examples
+		doins \
+			examples/*.asy \
+			examples/*.eps \
+			doc/*.asy \
+			doc/*.csv \
+			doc/*.dat \
+			doc/extra/*.asy
+		insinto /usr/share/${PN}/examples/animations
+		doins examples/animations/*.asy
+	fi
+
+	# LaTeX style
+	if use latex; then
+		cd doc || die
+		insinto "${TEXMF}"/tex/latex/${PN}
+		doins ${PN}.sty asycolors.sty
+		if use examples; then
+			insinto /usr/share/${PN}/examples
+			doins latexusage.tex
+		fi
+		cd .. || die
+	fi
+
+	# asymptote.py
+	if use python; then
+		python_foreach_impl python_domodule base/${PN}.py
+	fi
+
+	# emacs mode
+	if use emacs; then
+		elisp-install ${PN} base/*.el base/*.elc
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+	fi
+
+	# vim syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins base/asy.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/asy-ftd.vim
+	fi
+
+	# extra documentation
+	if use doc; then
+		cd doc || die
+		doinfo ${PN}.info*
+		cd FAQ || die
+		dodoc asy-faq.ascii
+		doinfo asy-faq.info
+		insinto /usr/share/doc/${PF}/html/FAQ
+		doins asy-faq.html/*
+		cd .. || die
+		insinto /usr/share/doc/${PF}
+		doins ${PN}.pdf CAD.pdf
+	fi
+}
+
+pkg_postinst() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+
+	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
+}
+
+pkg_postrm() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+}
diff --git a/media-gfx/asymptote/files/asymptote-2.49-info.patch b/media-gfx/asymptote/files/asymptote-2.49-info.patch
new file mode 100644
index 000000000000..e2b51860c3d6
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.49-info.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.49/doc/asymptote.texi
+===================================================================
+--- asymptote-2.49.orig/doc/asymptote.texi
++++ asymptote-2.49/doc/asymptote.texi
+@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
+      
+ @dircategory Languages
+ @direntry
+-* asymptote: (asymptote/asymptote). Vector graphics language.
++* asymptote: (asymptote). Vector graphics language.
+ @end direntry
+ 
+ @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch
new file mode 100644
index 000000000000..d5d719de25da
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch
@@ -0,0 +1,23 @@
+Index: asymptote-2.49/settings.cc
+===================================================================
+--- asymptote-2.49.orig/settings.cc
++++ asymptote-2.49/settings.cc
+@@ -91,15 +91,15 @@ bool msdos=false;
+ string HOME="HOME";
+ string docdir=ASYMPTOTE_DOCDIR;
+ const char pathSeparator=':';
+-string defaultPSViewer="gv";
++string defaultPSViewer="xdg-open";
+ #ifdef __APPLE__
+ string defaultPDFViewer="open";
+ #else  
+-string defaultPDFViewer="acroread";
++string defaultPDFViewer="xdg-open";
+ #endif  
+ string defaultGhostscript="gs";
+ string defaultGhostscriptLibrary="";
+-string defaultDisplay="display";
++string defaultDisplay="xdg-open";
+ string defaultAnimate="animate";
+ void queryRegistry() {}
+ const string dirsep="/";
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index c2f5f9aae448..ff8d355a828c 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,10 +1,5 @@
-DIST DisplayCAL-3.7.1.2.tar.gz 10472879 BLAKE2B a0722af9c8a6df8af57c0a66e792886b6aecb78bec79d0bed22567bd6ce540793ed6dd51437cbf1974b9070b9adb3708f841cf8cfae0e482056d90783be6ddbd SHA512 d708110e0528ffada5fd4a0ca7da9cf02a54964bc7d5af2b98738aa3e34079c0a4890f2cf6086750045915e06d6c943fc954e0f03653d25c080522a4b24795bd
-DIST DisplayCAL-3.7.1.3.tar.gz 10474328 BLAKE2B 9c305809a9f46f3ad76eec728026b2abbd1dec3bee46db92bfe9fe4e7c31f24d61eafaca0bda12f510002d3c5d51bfba4c6d4b1bae5e1ce105a8b75d84672ef8 SHA512 9718f589ee1842f6247ea110c4c6defaf767313fb2fd9ce9fb1b35775141774ce9084c2cbf00d9c432162e8b32c8d789e5a52ca385976c4772bf644738257926
-DIST DisplayCAL-3.7.1.4.tar.gz 10478572 BLAKE2B 9f646caea40a22804877f168c2a88a2b3069b8d0e4688c9676bd4d6d873a3528797dd3aadde26da40a4945e224504b2f8673f0c176ced687747ef23d8ca20044 SHA512 d60a240714cf32f1f8084caf74cbccc613263612b7192ad766216ec8253c5682079f32d9cf501e91bf7795ddcce4d9f2f0b023117719d0cc05f203d51dc3ef42
 DIST DisplayCAL-3.7.2.0.tar.gz 10536990 BLAKE2B c3e0c1b75c10911b1624d56f4e5d612eba8c257b5abd8a4632f13d91285283d870d928ad3eb17a9cd620b7fed4b9e5414495e12227fb2b94e3da2551d14042bd SHA512 f516376a84680daa2baffa0b4738f52e5dc6df374ae5d97ed385430e2744a087e044faa4929fdc84b01d79878b44e15eda5fa75b40b8a78e6962f66fc06876d4
-EBUILD displaycal-3.7.1.2.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
-EBUILD displaycal-3.7.1.3.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
-EBUILD displaycal-3.7.1.4.ebuild 1518 BLAKE2B 665a66c4563a6f6ec0516841e063eb0f79278e8b11a82b6d9598305a0fbdaa577f77c18dce7b81a6ed6deb257591e241b1ba308ee1c0d0c5d51a17600a9f8ee9 SHA512 c2e00107271a3a724a07ae901343800da4dfa4d33fc96651149cf9c99cc301be744da73f445641dfd129e9848f07009d95c04055d146fdc84bd2c79aaa71ef87
+DIST DisplayCAL-3.8.1.1.tar.gz 10611516 BLAKE2B 797c20aa7d26014ce5d039de352639b6d9f045eb06701044a0cb4a1b34c9744b0ca4f659a33cd23d16fe918e5d7e270def4ecd5007ddfc82682b486d3a413e44 SHA512 75d4ff038ad4f98b2d234b99d473a9e951983a607c28bc4eadcaa89bcfaa02ca13ed18fca8d4608cd881f215cbb37c36f91f7862a8c83541423524aca35b4688
 EBUILD displaycal-3.7.2.0-r1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
-EBUILD displaycal-3.7.2.0.ebuild 1518 BLAKE2B 665a66c4563a6f6ec0516841e063eb0f79278e8b11a82b6d9598305a0fbdaa577f77c18dce7b81a6ed6deb257591e241b1ba308ee1c0d0c5d51a17600a9f8ee9 SHA512 c2e00107271a3a724a07ae901343800da4dfa4d33fc96651149cf9c99cc301be744da73f445641dfd129e9848f07009d95c04055d146fdc84bd2c79aaa71ef87
+EBUILD displaycal-3.8.1.1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.7.1.2.ebuild b/media-gfx/displaycal/displaycal-3.7.1.2.ebuild
deleted file mode 100644
index 02f4e0b4a7e5..000000000000
--- a/media-gfx/displaycal/displaycal-3.7.1.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	>=dev-python/numpy-1.2.1
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.7.1.3.ebuild b/media-gfx/displaycal/displaycal-3.7.1.3.ebuild
deleted file mode 100644
index 02f4e0b4a7e5..000000000000
--- a/media-gfx/displaycal/displaycal-3.7.1.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	>=dev-python/numpy-1.2.1
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.7.1.4.ebuild b/media-gfx/displaycal/displaycal-3.7.1.4.ebuild
deleted file mode 100644
index d6063154f815..000000000000
--- a/media-gfx/displaycal/displaycal-3.7.1.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	>=dev-python/numpy-1.2.1
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.7.2.0.ebuild b/media-gfx/displaycal/displaycal-3.7.2.0.ebuild
deleted file mode 100644
index d6063154f815..000000000000
--- a/media-gfx/displaycal/displaycal-3.7.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	>=dev-python/numpy-1.2.1
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.8.1.1.ebuild b/media-gfx/displaycal/displaycal-3.8.1.1.ebuild
new file mode 100644
index 000000000000..6d9baac97b2a
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.8.1.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	dev-python/faulthandler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Do not generate udev/hotplug files
+	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+		-i DisplayCAL/setup.py || die
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+		-i DisplayCAL/postinstall.py || die
+
+	# Remove deprecated Encoding key from .desktop file
+	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+	# Remove x-world Media Type
+	sed -e 's/x\-world\/x\-vrml\;//g' \
+		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 924dda877d91..20df8bfba0d7 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -2,5 +2,5 @@ AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3b
 DIST graphite2-1.3.10.tgz 3889647 BLAKE2B c6db80950ed5f81d5ecf77003e23e6545c2824948bdc04aa3111747c0eb1ef074b09fe4c3ec20b68b00f75958ea39c5945a7fbe2fecde55ff32d22e517c91156 SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
 DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
 EBUILD graphite2-1.3.10.ebuild 2499 BLAKE2B cdfabfaeecaf58e032422d60adf6ee349ec2bdba70313138d4dd4e88e258ba9868a31a4f56109a043846e2aaf7dd242468bd49244ebf28c3b3a9cb0b2d085300 SHA512 43b767dbed5273118dd9cd42a505e659217989f4165dd41e971df02ce6042f1c8476e06eda60b66023f02df3a41b0bfe8b63df88b2035d70ccd2d5fe36a7e4ac
-EBUILD graphite2-1.3.13.ebuild 2665 BLAKE2B a1b167348d875a18f31e8f751b47d77905bed6154b608b27fb907e6bc3b3e0d866fb122f39a204bc13a95b28b6de3f42619d3dcbc282dc65ddd3b74c088015f2 SHA512 5901cf0829bea1a6bfea922bc35072b130691f5c63238172f2e4e5f5a600d003a20b522b298e351a3a9590a09d0c868c9b1411d4a18971700fd3e4e6bef96015
+EBUILD graphite2-1.3.13.ebuild 2664 BLAKE2B 523bff44957b4787413d88422a2f3b32b09c3ddf1dcc092b5ca3110845d881dd59a5f52755415fecfc25dcab87e6106494b923432ebca23fd7956ff557e6510a SHA512 a8fd81c61e19b15d90800f7e63c5cc9e9335b350cb6af829557c70cd6f98858d588677f7b86237ceab379a89652bdff8bf74930222c4cc13473a5071c2da78cb
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
index 48547d91bb4b..0fd46d437ad5 100644
--- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 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="perl test"
 
 RDEPEND="
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 12bfda275128..92c3d07dd937 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,7 +1,5 @@
-AUX hugin-2018.0.0-exiv2-0.27.patch 1095 BLAKE2B 52cd5e31f36b22291a3a864a9f248510f0fc871f1a9ee8e49cbcda5d8876eb9e7ec0e5e1595cce015c55dfc0f53b4fa8efc82e30f8c129e81d426accb3538e5e SHA512 480cb3f5e4ba04efa863b409747029ec1ed158168705621b3ba588e6566c56c3e5b16f422daf40cc27660b48f63c1a32861f9a4cda22c0eda397922d00a828a1
-DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
+AUX hugin-2019.0.0-exiv2-0.27.1.patch 998 BLAKE2B fd072b1bfb995f3e63ca78b0ad288c6012e6256d8c268fde7b9d3e1fb346544d34807394ac45b244329d96d6e75347c7e06b8cffa44258dd9b59378f56ead112 SHA512 9127921810b9a3cbc7aa216cb961cf5d8eef04ab5beb6baef94851d25e32314dd0565e507e3e57d2d560b6079afcf54e16330935334835fe664842d337732643
 DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
-EBUILD hugin-2018.0.0.ebuild 2023 BLAKE2B 084ad47690dba6a9020dd815ba6b91621bdbb8ff39b3a70d5033fb9533199254016ed6be6a117ee57b8126169f866453c7016a26ef95733e8d221f00f70421ca SHA512 95a3dff5c0ba71574cd1f7454ffd6fbcaaad105313b20f9bba4eaada750efd1e7262261536898e7b7941775b27325ae9768b3376d0f13a2d4cbe5b7f18314835
-EBUILD hugin-2019.0.0.ebuild 2141 BLAKE2B 2b0a7e4575bf21869c77817400fe8d2c932d997c9af4ed24390f70444478c25025ee846c3c4c18d2eb4d2b6e4bf089963dced68fcc6c173b72ca04cabbd015da SHA512 f3a8f072b086f18b7bc36e89ae1e8aff658b7d188d8b0ed5db6589d57d456264109249f87b11d6fadee812e3a1496468b61580c46045cc8bc88909ed32816084
-EBUILD hugin-9999.ebuild 2010 BLAKE2B dc2a3fa7c6252cb2e6efb15fbcfe410113184c29e031e45d7482b2628fa6d68b641d3c6ee23d0ea5b6fa5150fe2c72bf2c615a603b5452b458ecde44b89e8974 SHA512 cfc02d7f6688f3024c987052a1f1cf3e110265d56b181e89a7f4525570231c8b2ee58932a376350a32b623b0d75b1821084d5523ec3bc7ff41592d1ead667de5
+EBUILD hugin-2019.0.0.ebuild 2209 BLAKE2B 422eb30880ce4b6b99f2386897fbd9bf681f3ac95d08e2403e7588b4d67b6ffbb5426135c301d5a67316977f4752a9db81717672a9374f737f4c6f82cd5e45c6 SHA512 4c6cf8a833bab922cad4c58de82d08360459584894c41d0b4f423480244bbdfc4dd5782c98f5bc8e040974f475d52944b9a1a5ded96e3f465e32241e7fecabfb
+EBUILD hugin-9999.ebuild 2058 BLAKE2B 7a3caa225c3a346a02fe52944ec07fa46116868df793ad91e7f1744bce8eabe495f5969da4f28a399f8c07673c42b6dc37bbcb7d4ee99c83c4dd819b959e39fb SHA512 7d9e70cee2f287214ea55c8aecb181f790ba1ac53bd7ea0fed5a50ce2d6f62c0fa656b27efaf6d965cd91b58e3e04941df645723236c2df58f510d4f69690cc5
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
deleted file mode 100644
index 23dd54289217..000000000000
--- a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/hugin_base/panodata/Exiv2Helper.cpp
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp
-@@ -29,6 +29,7 @@
- #include "hugin_math/hugin_math.h"
- #include "hugin_utils/utils.h"  
- #include "exiv2/easyaccess.hpp"
-+#include "exiv2/version.hpp"
- 
- namespace HuginBase
- {
-@@ -232,7 +233,7 @@
-                     return false;
-                 };
-             };
--#if EXIV2_TEST_VERSION(0,23,0)
-+#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,23,0)
-             if (_getExiv2Value(exifData, "Exif.PentaxDng.RedBalance", val1) &&
-                 _getExiv2Value(exifData, "Exif.PentaxDng.BlueBalance", val2))
-             {
-@@ -563,7 +564,7 @@
-             std::string lensName;
-             // first we are reading LensModel in Exif section, this is only available
-             // with EXIF >= 2.3
--#if EXIV2_TEST_VERSION(0,22,0)
-+#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,22,0)
-             //the string "Exif.Photo.LensModel" is only defined in exiv2 0.22.0 and above
-             if(_getExiv2Value(exifData, "Exif.Photo.LensModel", lensName))
- #else
diff --git a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
new file mode 100644
index 000000000000..e22023f3998e
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
@@ -0,0 +1,29 @@
+Fix build against exiv2-0.27.1 by using upstream recommended catchall header.
+
+--- a/src/hugin_base/panodata/SrcPanoImage.cpp	2019-02-16 09:18:55.000000000 +0100
++++ b/src/hugin_base/panodata/SrcPanoImage.cpp	2019-05-21 14:26:23.470193305 +0200
+@@ -40,9 +40,7 @@
+ #include <vigra/diff2d.hxx>
+ #include <vigra/imageinfo.hxx>
+ #include <hugin_utils/utils.h>
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <lensdb/LensDB.h>
+ #include "Exiv2Helper.h"
+ 
+--- a/src/hugin1/hugin/RawImport.cpp	2019-02-02 11:11:01.000000000 +0100
++++ b/src/hugin1/hugin/RawImport.cpp	2019-05-21 14:33:00.522541182 +0200
+@@ -35,10 +35,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
+-#include <exiv2/xmpsidecar.hpp>
++#include <exiv2/exiv2.hpp>
+ #ifdef __WXMSW__
+ #include <wx/msw/registry.h>
+ #endif
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild b/media-gfx/hugin/hugin-2018.0.0.ebuild
deleted file mode 100644
index 5c87262440f2..000000000000
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	dev-db/sqlite:3
-	dev-libs/boost:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2:=
-	media-libs/freeglut
-	media-libs/glew:=
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	media-libs/openexr:=
-	media-libs/tiff:0
-	>=media-libs/vigra-1.11.0[openexr]
-	sci-libs/fftw:3.0=
-	sci-libs/flann
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/wxGTK:3.0=[X,opengl]
-	lapack? ( virtual/blas virtual/lapack )
-	python? ( ${PYTHON_DEPS} )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
-	media-libs/exiftool"
-DEPEND="${CDEPEND}
-	dev-cpp/tclap
-	sys-devel/gettext
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
-
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HSI=$(usex python)
-		-DENABLE_LAPACK=$(usex lapack)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-
-	local lang
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			ca-valencia) dir=ca_ES@valencia;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang/-/_};;
-		esac
-		if ! use l10n_${lang} ; then
-			rm -r "${ED%/}"/usr/share/locale/${dir} || die
-		fi
-	done
-}
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
index 543908d5bca7..65ee4e79249f 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -56,6 +56,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DOCS=( authors.txt README TODO )
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 686366
+
 S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
 
 pkg_setup() {
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 0783740a35d3..5ec24c68ade6 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver
+inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -64,6 +64,10 @@ pkg_setup() {
 	setup-wxwidgets
 }
 
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_HSI=$(usex python)
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 595496185fcd..3e099acd1082 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-42.tar.xz 8944092 BLAKE2B c616030d5624cc67879f698c52a906dede56db5f594cd1efef67ae7a7ce555f385b60b442e87904e3cb9f95840448e2a58d5121bd8e408812a3099864be880f0 SHA512 49ca335a7f0f83fb925995fa4249790cbb93142a0a30387f4d6c6ee9278599801da8b8644f3828afff8be841f55b64e31fda3bb4c6eea2c540bb94be4c926cb6
-DIST ImageMagick-6.9.10-45.tar.xz 8936232 BLAKE2B 7fb58bb55765efb0d0789334d91b11d95f62b49bef9810e5188291d20bb6fdce0c4e9d9bb9857a76ed3c23ec2c9747d366d1ace696687a7d95fd1ee838f6defb SHA512 a45f9d9d1080b7771b4ccecd4e36dce042e82d3bf18fe0b0d1d4dd82f25ce0a175f0ec6ec31a26f516c6517f2b76aac68a1b4a5471fa4af3d58e1c5f1193031a
-DIST ImageMagick-7.0.8-42.tar.xz 9455976 BLAKE2B c3cc7353da73fea92c51febad8816c333970b91069ee54756acf7f1b9f57481fceec066dcb21845b2ebf1a9a97b17b9f8b6859d1becdbfc9553bfa148b5c0433 SHA512 88f57b69ece3b93b0af41e85bacb0b232cf07e7d0aab34e1479ce6c5fe29b1cfcdcd8bc6b2b87773c2109122614a0f64847629029470d945409b08b19032d936
-DIST ImageMagick-7.0.8-45.tar.xz 9450936 BLAKE2B 6fa1260d98249ebf370bba0cd8352a6acb3b9e27df779881a77ca9701b804e513f6f6e4f8d008c2b86e3b9823d86d1de06c85cbed99c06f20aa50b261745458b SHA512 a54068d68b97adb4ffc3920f93a44166e1ce8c6a79304c60c20f020852e31502810d2f8cede4043ec3870febc3b7aebf2c06c06401813ce054a6b67cc343f1d2
-EBUILD imagemagick-6.9.10.42.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
-EBUILD imagemagick-6.9.10.45.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
-EBUILD imagemagick-7.0.8.42.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
-EBUILD imagemagick-7.0.8.45.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
+DIST ImageMagick-6.9.10-46.tar.xz 8942956 BLAKE2B b62673ce3a8b889bfa7dfb5243c2e594df53915f2253f102b14c3cd9b2d57b2324ecf285be97e6b84e5b7a8b951ff4b76eddbd0c75dede409057ba386bcf9abc SHA512 cd2843a98c2bf121aea4cf2e5c101e879256a8f9e187e3e1042852c41097b1c89312f8b829b13604fbc4f0917e096e25ba09c6b76b462bf4eed8fa77ccd0e478
+DIST ImageMagick-7.0.8-46.tar.xz 9452404 BLAKE2B d235547f04205939370360c99e32ac63641a3fc2e0c9d6266befa02bbd102ed2b66e79e63afafe2a45ed5670882d61e73b93baa8b543d9ba78ffa53bcb114324 SHA512 32177f8a899c6a6b64740c3afbcea584da2573823324ca0bdd5a6d70692ca7a689944eac0b3a07bcc827c5c426fdb9e4b8714448fff7e50e26c7bd4587f2f43b
+EBUILD imagemagick-6.9.10.46.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-7.0.8.46.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
 EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
 MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.45.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.45.ebuild
deleted file mode 100644
index b09291336ccb..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.45.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local mesa_cards ati_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.42.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.46.ebuild
index b6bca9ea8b20..b6bca9ea8b20 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.42.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.46.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.45.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.45.ebuild
deleted file mode 100644
index 69c412db11b7..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.45.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.42.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.46.ebuild
index 59c2b130c53d..59c2b130c53d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.42.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.46.ebuild
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 88c28ed1ad5f..1f8c2f07261d 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -10,5 +10,5 @@ DIST inkscape-0.92.3-poppler-patches-1.tar.xz 7000 BLAKE2B a7658d592806df7580ab5
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
 EBUILD inkscape-0.92.3-r1.ebuild 4183 BLAKE2B 074d57b407abdc33e616d7d6229b9b7db12fc6ed6c5278797bd62296403815d6900081c5fd5adaf20ba4a12bdaf083314531ecb8f10212f51e9ae8293d113ada SHA512 09ec9080cc60458b98deaeda24ec08b27200db024f3f34270264576b4edb9d3a6beb241de0c0a2ff5d019e072538c7279385b0a242dae007d41395de5032a6c9
-EBUILD inkscape-0.92.4.ebuild 3842 BLAKE2B 65915e0d0f058d6eea2a5e404604ba0eb1d466ce0874e502815109e0874e6fe1a7164bb7deeb2b4bfc63e5cd4becd7c9b87986a8af8e560b4dfda007268b6bac SHA512 095f5e03f7228da21d9a230ad9764f9dc54395bc04a9c9a7c9cbc7026f85a4b5c431add5275ac52c0d03467300935c27347c0e2cc869f671b6cfaa192ffd2418
+EBUILD inkscape-0.92.4.ebuild 3665 BLAKE2B da5dd894e76515e300e285139da88f76d12d811de6d7700d1b55710e435975429a961909883ea281194e1e98959d4ef11513213b0bc9a9f3f607827a3ffebb02 SHA512 31d4a5fedc13ea0f19817f4ae88e9719ea6499bf655454cbef2e107358cc20be0fd63b294adfc6bb82b06ae134028ad535e320d6bad753a1fd7503ef0227c82e
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 7d775127ec30..d29e444aff27 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 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"
 
@@ -105,7 +105,7 @@ S="${WORKDIR}/${MY_P}"
 RESTRICT="test"
 
 pkg_pretend() {
-	if use openmp; then
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
 	fi
 }
@@ -157,15 +157,3 @@ src_install() {
 	find "${ED}" -name "*.la" -delete || die
 	python_optimize "${ED%/}"/usr/share/${PN}/extensions
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest
index 5b7998d6bd7b..00522a43fa93 100644
--- a/media-gfx/jpeginfo/Manifest
+++ b/media-gfx/jpeginfo/Manifest
@@ -1,5 +1,4 @@
 AUX jpeginfo-1.6.0-parallel_install.patch 334 BLAKE2B 01d3e16d44789c5c1d1346f6c3067496daad051e60c9a39c69641fcec1766bb69e872f5259b4edd2d7b5fe5c793bc25e47c7329aa49b625ac80954a444562f92 SHA512 5dd86f4172caacb8d43952274b3a0a86df5d346839d29eb7e80e6f7ae8be4b73a70dbaccc1732703d45cc966b8fd762a0a4c5e02a3701718ebcc6ff646f1e676
 DIST jpeginfo-1.6.1.tar.gz 64856 BLAKE2B 5d9748a4af26087e45f2ae3fa709bb2099547f22aaeaf1fde529d92d633b1bc665dfde301a9ecaf4a8e4fa190ef637126d6f4ee43118bb31f5782a402d4a08d1 SHA512 9cc9367b8b3e38ba46bff9477b8f61e63b55bd41a67ea2895cca9c097abba2a7a3ae068c235ecfea72c99af52bba91cbb1eb92feb019ba4eb08e826a7083c68b
 EBUILD jpeginfo-1.6.1-r1.ebuild 643 BLAKE2B 2f1d3ddcdb79c1b5dacdb0e5219502224c679969e6b437d761d2e86021fc7af805c205106af13ab230694673434183b91b6f48eee9fa66975ba2e7345aa8985e SHA512 f6f1ec73f9b12de6dab5ae15c4bda8c20268b8e35c5c3d2804e21de27239d3376c9c3dbb103e5bb7a1f5f8693a2030a28a30ea1405d2436f5a8ec2f80d14632d
-EBUILD jpeginfo-1.6.1.ebuild 670 BLAKE2B 3c03a10d42865a06ca72ce8c0fe765dc2d978ec9b53f0f6f7cc1e19c13bce7ddcb969e37975240788699e33e4bbc4d5a826444148f7950932fbfd8e4467af4fa SHA512 099f7b21978f8df38d027d11af7222ecb539ef42b573d93c4a343e710934bb4fc3c127c9f406c5a9c8859bc7ab0e52d5629918f1cd23079f8c32b7dba0484ae2
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jpeginfo/jpeginfo-1.6.1.ebuild b/media-gfx/jpeginfo/jpeginfo-1.6.1.ebuild
deleted file mode 100644
index 59414dd9e88d..000000000000
--- a/media-gfx/jpeginfo/jpeginfo-1.6.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Prints information and tests integrity of JPEG/JFIF files"
-HOMEPAGE="https://www.kokkonen.net/tjko/projects.html"
-SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="virtual/jpeg"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.6.0-parallel_install.patch
-}
-
-src_configure() {
-	tc-export CC
-	econf
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README
-}
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index b717689f01bc..4580ba67bc9e 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,9 @@
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
 AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416abf1150a4b25f81b5befb8ffb254daf0c25b4b189ba0aefe9a3256eb83013d80919e21f77f7880fa7856a05ef5c995dfc73d079753e2c38 SHA512 c4048d8fe560508f04df785a012db99a5e6a2d4ca5b1d8e774a307cdb99f62de4969b04a58586c771a174dadf6dedafaa70568e8b6342612fbe52be32db257cb
 AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a
+AUX krita-4.2.0-tests-optional.patch 9915 BLAKE2B 3f63d2b30630e42413e58d23429c3df917c926d793c570be87bf59b83af9ec5740b220bbac433c928748dededf6714936c041433bc723c9612a45372311e6dc5 SHA512 72c62152ef767daedee84da58f179b34b0dc38adb03e63433c2870e0de93d30d2e929e65d7a8c8cd968b200ca0d87e570ab3c13f5be8b78b1c328dc3489ccb3b
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
+DIST krita-4.2.0.tar.gz 240015177 BLAKE2B 09992b50dfa4e244c809dd576c3b7c0d1cb09b19fde0985c3d72b57543e5a06aa863b9011d655432a089fb6869e2e7fdb23939877b0c4ee6aaf44a1c88e7084c SHA512 a6f373839e47c4e97f5680d266d1ea9f438db6636d3f8749f7fbf6d93b5329e1d46f7233af901dd224722c08100c4fc3b162a163c721299ebfa2d4939032ae44
 EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
+EBUILD krita-4.2.0.ebuild 3147 BLAKE2B 6238662d22d67a15503dd4c63b9e8c41c4c14144a50c33737b7b1777dc49c961102794a71f22a987fc706b01e5eaab091d78db172d207be0fe176296b1df61db SHA512 b8f6035e84083790fb1000f991daafde41a2c7423dd586d1493ba1157e11587dba39b20dbc3ebf8aa8bc14b04fb41d09114d9655c53eb1ca3af661a6f7dd0e41
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
new file mode 100644
index 000000000000..b605e922aba1
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
@@ -0,0 +1,324 @@
+--- a/plugins/color/lcms2engine/CMakeLists.txt	2019-06-01 15:10:43.442258240 +0200
++++ b/plugins/color/lcms2engine/CMakeLists.txt	2019-06-01 15:10:43.452257980 +0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${LCMS2_INCLUDE_DIR}
+--- a/plugins/extensions/qmic/CMakeLists.txt	2019-06-01 15:10:43.469257540 +0200
++++ b/plugins/extensions/qmic/CMakeLists.txt	2019-06-01 15:10:43.477257332 +0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/filters/CMakeLists.txt	2019-06-01 15:10:43.488257047 +0200
++++ b/plugins/filters/CMakeLists.txt	2019-06-01 15:10:43.497256813 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt	2019-06-01 15:10:43.508256528 +0200
++++ b/plugins/filters/unsharp/CMakeLists.txt	2019-06-01 15:10:43.516256320 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaunsharpfilter_SOURCES
+     unsharp.cpp
+--- a/plugins/dockers/lut/CMakeLists.txt	2019-06-01 15:10:43.527256035 +0200
++++ b/plugins/dockers/lut/CMakeLists.txt	2019-06-01 15:10:43.535255828 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt	2019-06-01 15:10:43.546255542 +0200
++++ b/plugins/dockers/animation/CMakeLists.txt	2019-06-01 15:10:43.555255309 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/tools/tool_transform2/CMakeLists.txt	2019-06-01 15:10:43.566255024 +0200
++++ b/plugins/tools/tool_transform2/CMakeLists.txt	2019-06-01 15:10:43.574254816 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(kritatooltransform_SOURCES
+--- a/plugins/tools/basictools/CMakeLists.txt	2019-06-01 15:10:43.584254557 +0200
++++ b/plugins/tools/basictools/CMakeLists.txt	2019-06-01 15:10:43.592254349 +0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif ()
+ 
+ set(kritadefaulttools_SOURCES
+--- a/plugins/impex/tiff/CMakeLists.txt	2019-06-01 15:10:43.602254090 +0200
++++ b/plugins/impex/tiff/CMakeLists.txt	2019-06-01 15:10:43.609253908 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(libkritatiffconverter_LIB_SRCS
+     kis_tiff_converter.cc
+--- a/plugins/impex/libkra/CMakeLists.txt	2019-06-01 15:10:43.620253623 +0200
++++ b/plugins/impex/libkra/CMakeLists.txt	2019-06-01 15:10:43.627253441 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritalibkra_LIB_SRCS
+     kis_colorize_dom_utils.cpp
+--- a/plugins/impex/jpeg/CMakeLists.txt	2019-06-01 15:10:43.638253156 +0200
++++ b/plugins/impex/jpeg/CMakeLists.txt	2019-06-01 15:10:43.646252949 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+ 
+--- a/plugins/impex/psd/CMakeLists.txt	2019-06-01 15:10:43.662252534 +0200
++++ b/plugins/impex/psd/CMakeLists.txt	2019-06-01 15:10:43.671252300 +0200
+@@ -1,5 +1,7 @@
+ if (NOT MSVC AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
+--- a/plugins/impex/xcf/CMakeLists.txt	2019-06-01 15:10:43.685251937 +0200
++++ b/plugins/impex/xcf/CMakeLists.txt	2019-06-01 15:10:43.694251704 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
+ 
+--- a/plugins/impex/heightmap/CMakeLists.txt	2019-06-01 15:10:43.705251418 +0200
++++ b/plugins/impex/heightmap/CMakeLists.txt	2019-06-01 15:10:43.714251185 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+--- a/plugins/impex/csv/CMakeLists.txt	2019-06-01 15:10:43.725250900 +0200
++++ b/plugins/impex/csv/CMakeLists.txt	2019-06-01 15:10:43.734250666 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ # import
+ 
+--- a/plugins/impex/exr/CMakeLists.txt	2019-06-01 15:10:43.745250381 +0200
++++ b/plugins/impex/exr/CMakeLists.txt	2019-06-01 15:10:43.754250148 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
+ 
+--- a/plugins/impex/ppm/CMakeLists.txt	2019-06-01 15:10:43.765249862 +0200
++++ b/plugins/impex/ppm/CMakeLists.txt	2019-06-01 15:10:43.773249655 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+--- a/plugins/impex/svg/CMakeLists.txt	2019-06-01 15:10:43.784249370 +0200
++++ b/plugins/impex/svg/CMakeLists.txt	2019-06-01 15:10:43.792249162 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritasvgimport_SOURCES
+     kis_svg_import.cc
+--- a/plugins/impex/png/CMakeLists.txt	2019-06-01 15:10:43.803248877 +0200
++++ b/plugins/impex/png/CMakeLists.txt	2019-06-01 15:10:43.811248669 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritapngimport_SOURCES
+     kis_png_import.cc
+--- a/plugins/paintops/libpaintop/CMakeLists.txt	2019-06-01 15:10:43.823248358 +0200
++++ b/plugins/paintops/libpaintop/CMakeLists.txt	2019-06-01 15:10:43.831248150 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-06-01 15:10:43.842247865 +0200
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-06-01 15:10:43.850247658 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+ 
+ include_directories(brush
+                     duplicate
+--- a/libs/metadata/CMakeLists.txt	2019-06-01 15:10:43.862247346 +0200
++++ b/libs/metadata/CMakeLists.txt	2019-06-01 15:10:43.870247139 +0200
+@@ -29,4 +29,6 @@
+ 
+ install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/global/CMakeLists.txt	2019-06-01 15:10:43.881246854 +0200
++++ b/libs/global/CMakeLists.txt	2019-06-01 15:10:43.890246620 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+--- a/libs/ui/CMakeLists.txt	2019-06-01 15:10:43.901246335 +0200
++++ b/libs/ui/CMakeLists.txt	2019-06-01 15:10:43.911246076 +0200
+@@ -7,7 +7,9 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ if (APPLE)
+     find_library(FOUNDATION_LIBRARY Foundation)
+--- a/libs/flake/CMakeLists.txt	2019-06-01 15:10:43.922245790 +0200
++++ b/libs/flake/CMakeLists.txt	2019-06-01 15:10:43.931245557 +0200
+@@ -9,7 +9,9 @@
+ )
+ 
+ add_subdirectory(styles)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritaflake_SRCS
+     KoGradientHelper.cpp
+--- a/libs/brush/CMakeLists.txt	2019-06-01 15:10:43.943245246 +0200
++++ b/libs/brush/CMakeLists.txt	2019-06-01 15:10:43.952245012 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(SYSTEM
+     ${EIGEN3_INCLUDE_DIR}
+--- a/libs/widgetutils/CMakeLists.txt	2019-06-01 15:10:43.963244727 +0200
++++ b/libs/widgetutils/CMakeLists.txt	2019-06-01 15:10:43.972244494 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
+ 
+--- a/libs/store/CMakeLists.txt	2019-06-01 15:10:43.984244182 +0200
++++ b/libs/store/CMakeLists.txt	2019-06-01 15:10:43.992243975 +0200
+@@ -1,6 +1,8 @@
+ include_directories(${QUAZIP_INCLUDE_DIRS})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritastore_LIB_SRCS
+     KoDirectoryStore.cpp
+--- a/libs/pigment/CMakeLists.txt	2019-06-01 15:10:44.002243716 +0200
++++ b/libs/pigment/CMakeLists.txt	2019-06-01 15:10:44.010243508 +0200
+@@ -31,7 +31,9 @@
+     message("${__per_arch_factory_objs}")
+ endif()
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(benchmarks)
+ 
+ set(kritapigment_SRCS
+--- a/libs/libkis/CMakeLists.txt	2019-06-01 15:10:44.021243223 +0200
++++ b/libs/libkis/CMakeLists.txt	2019-06-01 15:10:44.028243041 +0200
+@@ -47,4 +47,6 @@
+ install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/image/CMakeLists.txt	2019-06-01 15:10:44.039242756 +0200
++++ b/libs/image/CMakeLists.txt	2019-06-01 15:10:44.047242548 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ add_subdirectory( tiles3 )
+ 
+--- a/libs/image/tiles3/CMakeLists.txt	2019-06-01 15:10:44.057242289 +0200
++++ b/libs/image/tiles3/CMakeLists.txt	2019-06-01 15:10:44.065242082 +0200
+@@ -1 +1,3 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/odf/CMakeLists.txt	2019-06-01 15:10:44.076241796 +0200
++++ b/libs/odf/CMakeLists.txt	2019-06-01 15:10:44.084241589 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaodf_LIB_SRCS
+     KoOdf.cpp
+--- a/libs/widgets/CMakeLists.txt	2019-06-01 15:10:44.094241329 +0200
++++ b/libs/widgets/CMakeLists.txt	2019-06-01 15:10:44.102241122 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
diff --git a/media-gfx/krita/krita-4.2.0.ebuild b/media-gfx/krita/krita-4.2.0.ebuild
new file mode 100644
index 000000000000..3153c3eba368
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.12.3"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui '-gles2' '' '5=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	dev-libs/quazip
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_krita]
+	!app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gif GIF)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package heif HEIF)
+		$(cmake-utils_use_find_package jpeg JPEG)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package vc Vc)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index cb6a68e85995..8883306138be 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -2,6 +2,8 @@ AUX libimagequant-2.12.2-fix-pkgconfig.patch 840 BLAKE2B 6b16c3b0a7b916c60814817
 AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
+DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce
 EBUILD libimagequant-2.12.2.ebuild 1453 BLAKE2B cc36b27f971c7bdbbfb22a9b14ad70d00129aa90b1cc248cb512040d9a36f6e290acf5a5e6b34f672fc0b0cd95597569ee3d38e0cee57dbdfaa0be4dbc54c19b SHA512 c58252bd015bf0949df83f2781525b94578b19e9827837f50382db171c169af3c5239cb67bf68959411c1d6c231b3182b3ebeeac1ba0ef309514ff535a4eee4d
+EBUILD libimagequant-2.12.3.ebuild 1458 BLAKE2B b700b2e73c2a8429d9c8f171fb0279c2644baced6ed32b00c11af4f77bfaeb1b52ff09474ab91c1eed67aec08cb8c4d85299fa58dc6584e396891076f9c34092 SHA512 9a36392be28772244fc8785d919a91e1d7cef28815808c804d4ec40c862c895cdd7bc659eea278a7ace57153079cff914ad632930602d910548ef0f86795f7ff
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
new file mode 100644
index 000000000000..a68ab9c18f02
--- /dev/null
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
+HOMEPAGE="https://pngquant.org/lib/"
+SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
+	"${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	tc-export AR CC
+	# Hand rolled configure script, so not all flags are supported.
+	./configure \
+		--prefix="${EPREFIX%/}/usr" \
+		--libdir="${EPREFIX%/}/usr/$(get_libdir)" \
+		$(use debug && echo --enable-debug) \
+		$(use_enable cpu_flags_x86_sse2 sse) \
+		$(use_with openmp) \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	emake shared imagequant.pc || die "make failed"
+	use static-libs && (emake static || die "make failed")
+}
+
+src_install() {
+	dolib.so libimagequant.so
+	dolib.so libimagequant.so.*
+	use static-libs && dolib.a libimagequant.a
+	doheader libimagequant.h
+	einstalldocs
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins imagequant.pc
+}
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index d2bb00a7f120..9b7775fbad2b 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,5 @@
 DIST lximage-qt-0.14.1.tar.xz 78960 BLAKE2B c58e5c553e2803cd8d40d807cd1650b72e4de6297f29cdffce19cf3eb402d01735d869ed4e31e9c28ce03e09038628331cc547aebcb636c34dc936b349e33c9a SHA512 61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd
 DIST lximage-qt-0.7.0.tar.xz 41560 BLAKE2B 32ca95556a696059254a686727f72e1d57d245134b507dc90f83920e9a4a71b9b41aca459db96cd2adceffb6dd6592399c27279d3c3ca9ded6fd61480525dbd1 SHA512 a31185562dec1aa720287ab3f9fb79b9bccfcf0f2069aa404bd469852edbe2507f8c24cf8af0cbe2ef7013e4dab8ca51c00ac7a348254f1bf20458decd3c82b4
-EBUILD lximage-qt-0.14.1-r1.ebuild 875 BLAKE2B 0834a1d32ddfd242174dc2a3069cc353222ade0fdcfd03282e2e28ee2e16948f5a2233cee956c78ebeefa6b857b40d13253144b9426be164e84476a1b58d1cff SHA512 c5945aa8396fb16a7d372d1b0711612031dde81141f170e5c141e0dd35ae062b8a6a51c335c9b482d5acd0e693f773c6bcf53b055cdee44fff7976c9e7866be6
+EBUILD lximage-qt-0.14.1-r1.ebuild 873 BLAKE2B 9c51a5bf90065b0b13b2f506f538244e0af20b0c1704daa7a56b395dcc0fe84220a9b646d016941822bbb72ec634f96b6d6a248a990ade99b33ffe4c2e75fbf2 SHA512 bbd759e21943a7ead75e3f7d7a2808140da1de1f7106bb68e757c6b62524e8334708ed0c75061612fe48660590bb4611c0ddd501a943979ced535a15857d0874
 EBUILD lximage-qt-0.7.0.ebuild 962 BLAKE2B ccfd2b0b440910ec1354e14e001823c61ef482d9ce7949cc710a31b0249c34f75678159e566bb6c71695f56af0c37ea638d5597363cb0acb4901670ef2ce9c6c SHA512 6507d2f818a4f6932ef76a380b841e5754137d8e7f65036f9f4ad9742d797276125c8027913ac9a2a41aa5682b9660828dc67e831b221998ff1196d405c6d1c2
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
index 7e74167d0fd4..3b7064657413 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index f365b13a5465..9a3c00175b0a 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -5,7 +5,7 @@ DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a06
 DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
 DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-EBUILD openvdb-4.0.2-r2.ebuild 2051 BLAKE2B 9b38c7a2f4d9c002f98890dd139211a353020d1d8cc3f7b95eac34765e11a153332498f83455cc1db384f436a080d33f5f1d982cc02cc82f4b49d90a8e3b9def SHA512 4c0e23bba7064bab8578b2f26c1234da7be2ddec2c7d70b15a710447d43550b23931120da432069fecaa69cf617376047b4ff1cb597d15fc5874c17034163286
+EBUILD openvdb-4.0.2-r2.ebuild 2050 BLAKE2B 019c4b6ba119dff7aff5cc3b41846f03e65f6680274199c89be04cc573e85af95a28e5d81b6f6d4a62fc1ecdcc733aba9911f4f97abb40128215147ca006a640 SHA512 c806cbdfd23bc085c032212672686e3ff19a1d414e9003570090373d82382a309f3f8d5673de2a791bd6a54a1f491e318e97cef982b03d15a51d21b5392af396
 EBUILD openvdb-4.0.2.ebuild 1935 BLAKE2B 8b25b6a5a55f91cb50c9b79b732d79921eab1ea4cbfa84f47431b1b5256142d489f38cd4da3946bd8d12ad471cb776d6fcf894b12263669138c453624d487868 SHA512 6fdb9ada5f4630e0f1b917b2d9c9467af7e8ba335dcba04866dc7cef3191aab606f5495d36f92e1500c53b1eca1b1471e8f182a470ad495e1290b659a56c10a9
 EBUILD openvdb-5.2.0.ebuild 1785 BLAKE2B b16a9beabf0e755da3daf1213703eb1103bc4a93681c5686842cfd814c1ac13753a8380d4a432772977f328fc5f4ba0e7eb5422142e9c11771952b7ef2b3de0c SHA512 e9ac1a52a478e9bd4108ef78eb124934a22310b9ec96239bf6e796abb873f1a36c527416b68d99e5fea077def2edbb4949198ef0e733532dc9a8daecf86e09a0
 MISC metadata.xml 1028 BLAKE2B a6d852019e2bf507aa175846fc1687f101df9fc498b7dd2c7de25d860f419e86eb37549e3a2b742c32d0a2f5c6fc0450b3c82da18ef96c65fc81e547f3e7e944 SHA512 2f9d7a4271998fd9fef7a0c4fbd9d77187ba0fe41d31a807e88b19554cc5b624686e3dca44a47e8e69edc71fa89a06fcd89de59f09bccf3378418500b268d287
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
index 4b21771b9f40..ec3c20d387c3 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> $
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+abi3-compat doc python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 6dfc53d43ffd..63eb62a16f6d 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,4 +1,6 @@
 AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
 DIST pngquant-2.12.2-src.tar.gz 143404 BLAKE2B b06b1185fdeb1990e6b6f0cb77e33051729731fc2c2f4b1f618bd9077057354eabc21405872c938dbdf5395040860b4a884e9780bbd439da36f2af61d53e82a9 SHA512 ed82e0a57d9f4f3ee40258c4cbbf7ed086177dee1e2afdcb7d308f779c83fb2be9c7226c0713b9c72e6b6c22161dbaca3d14f2bdc2f0468daa608be80e9ef1c9
+DIST pngquant-2.12.3-src.tar.gz 143572 BLAKE2B 6f4cc9f36c9148f36734d9afa3765e206c09e833064cff5d98494d0d71610e857d7c605bc5673eb9fd5b38029ade60c9c1ffc18e745a3dfe5dbde6d39a81d0c7 SHA512 cf39f56750a49b2818fb86b168845e54f3797b664c3f49535ee93a3dc899299192a692039396ffcddc5988d040a778006c5f701f8bcd9f5c73583a47b711b01c
 EBUILD pngquant-2.12.2.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
+EBUILD pngquant-2.12.3.ebuild 1170 BLAKE2B 7c11ec368fcf151b197cdf89128b0b12dad91c2de6a39a9b04f2cc81d85eb59c4e09dd41544a0733ea0f42c5787974e499635f44a43a5a55815d020cfd7faad0 SHA512 842cf9d9d8cfa08ecf9eda120fadf8aa168736000fbaea8b8dcbf63d08901dad796fa1eb46a0a0facf9f6239feb392a0e1529a242ee085d96af950a331f6fa1e
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/pngquant/pngquant-2.12.3.ebuild b/media-gfx/pngquant/pngquant-2.12.3.ebuild
new file mode 100644
index 000000000000..822e8fbf648f
--- /dev/null
+++ b/media-gfx/pngquant/pngquant-2.12.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="command-line utility and library for lossy compression of PNG images"
+HOMEPAGE="https://pngquant.org/"
+SRC_URI="https://pngquant.org/${P}-src.tar.gz"
+
+LICENSE="GPL-3 HPND rwpng"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug lcms openmp cpu_flags_x86_sse2"
+
+RDEPEND="media-libs/libpng:0=
+	media-gfx/libimagequant:=
+	sys-libs/zlib:=
+	lcms? ( media-libs/lcms:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch )
+
+src_prepare() {
+	default
+
+	# avoid silent fallback to bundled lib
+	rm -rv lib || die
+}
+
+src_configure() {
+	tc-export AR CC
+	# Hand rolled configure script, so not all flags are supported.
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--with-libimagequant \
+		$(use debug && echo --enable-debug) \
+		$(use_enable cpu_flags_x86_sse2 sse) \
+		$(use openmp && tc-has-openmp && echo --with-openmp) \
+		$(use_with lcms lcms2) \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc CHANGELOG README.md
+}
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index d4fb065dd017..4182bb9c9723 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,3 @@
-DIST ristretto-0.8.3.tar.bz2 564745 BLAKE2B 74f6fe50dbbcb538ff370fdefc934921e5878f7422dde577b86acc0ee63a03edaada860f0a91301de4b4ed4ae2fab89d74eccc5f3b9faababa4c71ee07159c33 SHA512 c43b48dfdf9e8ed0ea3c5f2bbac1c837881aa6a467c78377b6f53dcce030b5a3b8134a7b8cbad1008ae758295953fde50a916c284e54e8c5490158e776554514
 DIST ristretto-0.8.4.tar.bz2 581374 BLAKE2B 8d4dc91daa1aebf7d8193d8a48c3be29ad6fed86b7fbea68effb63f6a56d2d39898b5ab0c93933adf9d65cce327109dca5ecff96855c4311494de7cc4182213f SHA512 c5479cde66e4f0903b9b8d9b1b8f4c7cde35ebfa334e414c8202e783c332bd4bfec650f85d308c7151d31fe84b27a13bb4048290b0a82ce7b8ba4baf3e4088b8
-EBUILD ristretto-0.8.3.ebuild 879 BLAKE2B 7f7473ecbbf739f47d1cb0370e15b2f487862792487e894b76dab4681adb2c433ea9a782c820bb95111bd83212badeb333ce21e2d10ec8cb455d6acf5224900d SHA512 faf62c22bba201b3136d30843ecca5d11dceb79b64ad97102a9b7ae3242e35264cccc41e66f37b32cd08fa63b599eb40be7a45a51e6bd219cab6757b7a076f63
 EBUILD ristretto-0.8.4.ebuild 876 BLAKE2B c950d825ab3ba23f9a0660a45c18874d591271a86e03c32d77be2908af0628cd1936290505f03a3b523ffd8932a453a8467d5c37062b6e19800635b8835c812f SHA512 42a4b7741c85d52878adc859fe4b9c9a7c5680c59be2c9c52bc9768371c2f39b89da1f01130c63aa4e66420b7d637531355c9eaea418d761b80024bfceb8c337
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.8.3.ebuild b/media-gfx/ristretto/ristretto-0.8.3.ebuild
deleted file mode 100644
index 330499742f2c..000000000000
--- a/media-gfx/ristretto/ristretto-0.8.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	media-libs/libexif:0=
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.10:0=
-	>=xfce-base/libxfce4util-4.10:0=
-	>=xfce-base/xfconf-4.10:0="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index c57999f69e6f..5a23145c3d72 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,6 +10,5 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-EBUILD sane-backends-1.0.27-r1.ebuild 7729 BLAKE2B 99a75ac0aae614e4168b1216ed22c071acc4d1a448eeeee1a6c36991df23bf8e68dfb558d3047e144f8fd32cd4ad766a41238be5a991b4039172872011eed501 SHA512 42689dd5189e9bfba21f016dc63897b0fec6adb18fda2485c64c35764caceff307b18759aa359d7b56fb69aee86ceb769d1c5f5162d30cc9e8576dc3140f70aa
-EBUILD sane-backends-1.0.27-r3.ebuild 8159 BLAKE2B 191353b0d1eb7773c79826595133799321c395377c382ee0cb82d43e951a5cadea5e59d109acfeeda7085a7d1bfc3871a2ce781492c438e803b313780fd061ce SHA512 acf8db419eafab5b27481ae148117325907f4ba5855b9f51790c979a55dda7c27fe4e4090cf8fd1ba224f55b1a54bbc8e532befa3acee53a8c5ee41f39d9d37d
+EBUILD sane-backends-1.0.27-r3.ebuild 8134 BLAKE2B a771fe78d1f77d7230929c81701abce57b455ce9da91df4f4b17e111e10fbe6a9135b6cc2a3bdd10382e49c53af2342e0082c7cd7e6428d40658288666938658 SHA512 dca0a98e48802811198dbaa6b12288364a1cd9f42542af9cfbeb52d1f0c5ff4127ec02a7c524094964dc74737e2eb4ba4af04128abcf7a9dcdbb3809a6c9ef21
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
deleted file mode 100644
index d69b29324a20..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev user xdg-utils
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS="
-	abaton
-	agfafocus
-	apple
-	artec
-	artec_eplus48u
-	as6e
-	avision
-	bh
-	canon
-	canon630u
-	canon_dr
-	canon_pp
-	cardscan
-	coolscan
-	coolscan2
-	coolscan3
-	dc210
-	dc240
-	dc25
-	dell1600n_net
-	dmc
-	epjitsu
-	epson
-	epson2
-	fujitsu
-	genesys
-	gt68xx
-	hp
-	hp3500
-	hp3900
-	hp4200
-	hp5400
-	hp5590
-	hpljm1005
-	hpsj5s
-	hs2p
-	ibm
-	kodak
-	kodakaio
-	kvs1025
-	kvs20xx
-	kvs40xx
-	leo
-	lexmark
-	ma1509
-	magicolor
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	mustek_usb2
-	nec
-	net
-	niash
-	p5
-	pie
-	pixma
-	plustek
-	plustek_pp
-	pnm
-	qcam
-	ricoh
-	rts8891
-	s9036
-	sceptre
-	sharp
-	sm3600
-	sm3840
-	snapscan
-	sp15c
-	st400
-	stv680
-	tamarack
-	teco1
-	teco2
-	teco3
-	test
-	u12
-	umax
-	umax1220u
-	umax_pp
-	xerox_mfp"
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf"
-
-for backend in ${IUSE_SANE_BACKENDS}; do
-	case ${backend} in
-	# Disable backends that require parallel ports as no one has those anymore.
-	canon_pp|hpsj5s|mustek_pp|\
-	pnm)
-		IUSE+=" -sane_backends_${backend}"
-		;;
-	mustek_usb2|kvs40xx)
-		IUSE+=" sane_backends_${backend}"
-		;;
-	*)
-		IUSE+=" +sane_backends_${backend}"
-	esac
-done
-
-REQUIRED_USE="
-	sane_backends_mustek_usb2? ( threads )
-	sane_backends_kvs40xx? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-MY_P="${P}"
-FRS_ID="4224"
-SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dell1600n_net? (
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-	gphoto2? (
-		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	snmp? ( net-analyzer/net-snmp )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	v4l? ( sys-kernel/linux-headers )
-	>=sys-devel/gettext-0.18.1
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
-RDEPEND="${RDEPEND}
-	!<sys-fs/udev-114
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/sane-config
-)
-
-pkg_setup() {
-	enewgroup scanner
-	enewuser saned -1 -1 -1 scanner
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	cat >> backend/dll.conf.in <<-EOF
-	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
-	hpaio
-	# Add support for the Epson-specific backend.  Needs media-gfx/iscan installed.
-	epkowa
-	EOF
-
-	eapply "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-	eapply "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-
-	# From Arch
-	eapply "${FILESDIR}"/${PN}-1.0.27-network.patch
-
-	# From Fedora
-	# Fix https://bugs.gentoo.org/635348
-	eapply "${FILESDIR}"/${PN}-1.0.27-canon-lide-100.patch
-
-	# Fix for "make check".  Upstream sometimes forgets to update this.
-	local ver=$(./configure --version | awk '{print $NF; exit 0}')
-	sed -i \
-		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
-		testsuite/tools/data/html* || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing # From Fedora
-
-	# if LINGUAS is set, just use the listed and supported localizations.
-	if [[ ${LINGUAS+set} == "set" ]]; then
-		mkdir -p po || die
-		strip-linguas -u po
-		printf '%s\n' ${LINGUAS} > po/LINGUAS
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# the blank is intended - an empty string would result in building ALL backends.
-	local BACKENDS=" "
-
-	use gphoto2 && BACKENDS="gphoto2"
-	use v4l && BACKENDS="${BACKENDS} v4l"
-	for backend in ${IUSE_SANE_BACKENDS}; do
-		if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
-			BACKENDS="${BACKENDS} ${backend}"
-		fi
-	done
-
-	local myconf=(
-		$(use_with usb)
-		$(multilib_native_use_with snmp)
-	)
-
-	# you can only enable this backend, not disable it...
-	if use sane_backends_pnm; then
-		myconf+=( --enable-pnm-backend )
-	fi
-	if use sane_backends_mustek_pp; then
-		myconf+=( --enable-parport-directio )
-	fi
-	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
-		myconf+=( sane_cv_use_libieee1284=no )
-	fi
-
-	# relative path must be used for tests to work properly
-	ECONF_SOURCE=${S} \
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${BACKENDS}" \
-	econf \
-		$(use_with gphoto2) \
-		$(multilib_native_use_with systemd) \
-		$(use_with v4l) \
-		$(use_enable ipv6) \
-		$(use_enable threads pthread) \
-		$(use_enable zeroconf avahi) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake VARTEXFONTS="${T}/fonts"
-
-	if tc-is-cross-compiler; then
-		pushd "${BUILD_DIR}"/tools >/dev/null || die
-
-		# The build system sucks and doesn't handle this properly.
-		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
-			-I. -I../include -I"${S}"/include \
-			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
-			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
-		local dirs=( hal hotplug hotplug-ng udev )
-		local targets=(
-			hal/libsane.fdi
-			hotplug/libsane.usermap
-			hotplug-ng/libsane.db
-			udev/libsane.rules
-		)
-		mkdir -p "${dirs[@]}" || die
-		emake "${targets[@]}"
-
-		popd >/dev/null
-	fi
-
-	if use usb; then
-		sed -i -e '/^$/d' \
-			tools/hotplug/libsane.usermap || die
-	fi
-}
-
-multilib_src_install() {
-	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-	if multilib_is_native_abi; then
-		if use usb; then
-			insinto /etc/hotplug/usb
-			doins tools/hotplug/libsane.usermap
-		fi
-
-		udev_newrules tools/udev/libsane.rules 41-libsane.rules
-		insinto "/usr/share/pkgconfig"
-		doins tools/sane-backends.pc
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-
-	if use systemd; then
-		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
-		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
-	fi
-
-	if use usb; then
-		exeinto /etc/hotplug/usb
-		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README README.hotplug
-	fi
-
-	dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux
-	find "${D}" -name '*.la' -delete || die
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		doins "${FILESDIR}"/saned
-	fi
-
-	newinitd "${FILESDIR}"/saned.initd saned
-	newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postinst() {
-	if use xinetd; then
-		elog "If you want remote clients to connect, edit"
-		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
-	fi
-
-	if ! use systemd; then
-		elog "If you are using a USB scanner, add all users who want"
-		elog "to access your scanner to the \"scanner\" group."
-	fi
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index 0b6bfaf0ec24..597f5de44373 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -141,7 +141,7 @@ RDEPEND="
 	)
 	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
 	xinetd? ( sys-apps/xinetd )
-	snmp? ( net-analyzer/net-snmp )
+	snmp? ( net-analyzer/net-snmp:0= )
 	systemd? ( sys-apps/systemd:0= )
 	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 "
@@ -235,10 +235,10 @@ multilib_src_configure() {
 	fi
 
 	# relative path must be used for tests to work properly
-        # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
-        # --without-api-spec to not automagically depend on tons of stuff
-        # that break in many ways, bug #636202, #668232, #668350
-        # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+	# --without-api-spec to not automagically depend on tons of stuff
+	# that break in many ways, bug #636202, #668232, #668350
+	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
 	ECONF_SOURCE=${S} \
 	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
 	BACKENDS="${BACKENDS}" \
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 9c6c68f0007e..4c8e302e8308 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -8,6 +8,6 @@ DIST xpaint-2.10.2.tar.bz2 1891925 BLAKE2B 056ef057357a2441c8a286adf326a98650e5e
 DIST xpaint-2.9.10.2.tar.bz2 1245813 BLAKE2B 9ff1a94bdbaf996f7ca41fd8df86ccfc58d7f51b24b20311f082beb30620dc48a6e9ae0e28ccf2cf41a7cd7901cf303fda1d45a7b48ff4ec356a3ac1f2ccd642 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499
 DIST xpaint-2.9.10.3.tar.bz2 1283725 BLAKE2B 46e1798830ddff6cc7d6d827fad0cad6d42a61dd6e6740ae6d3bca70ae7012a7c63d1d3ea5b6ebb21e0b2889c96c3f0e57969ec02bb8e742f945027e0e22e3b8 SHA512 d5d365e0308e50166e5ac70859e388436d8f0cb870b2dea0155fbc9a65a8377a861bea2217df2b5c016f8751c9ff1f74509eaff310acfaacd7b29c51cf726ac5
 EBUILD xpaint-2.10.2.ebuild 1510 BLAKE2B 84c90679da7f4d8f48a57ad494d6a9914f4fa47a97e3d18bfa4f71c13619c94018e49879371fe18f852c15faf1a75ae4c9228e93d97d7b3c3eac62748c443aaa SHA512 8f009d6bdea418b73a4295e8f66e8b255f6b1b221346ddfe86beb44675fc66954ca2b6fb232f5248e2eb20aa19e7c5bd80b2be25c8ca0c9f5e6f849d34adbeea
-EBUILD xpaint-2.9.10.2.ebuild 1635 BLAKE2B 8cb612fe6cff41992106335bc2bb9bc15def648837f2d174c4c05244e672146a386b4402bdc6d4dfef9ea89a687b3a7de4b5b16c84b0537a1f86b6cdf5754be5 SHA512 63a3808cc6fba26a962f821d140aff7d756be1aa72211d29a2dc65e05dd841640b6a8b81fa6d3dedfff9a27d40936278d8d947052e82b30ef945eb41c62c066f
-EBUILD xpaint-2.9.10.3.ebuild 1700 BLAKE2B 0b7a8b5734e158d365bcef7ecc0cf31bf03945af5e448b9811890af4127b2f63f827a1055742ea12a01676909dcf9269b0d62b8a836acf6c2303bd53f9db2687 SHA512 767027b82623caaf63f312f534b6636dbe277b6ce9ce18ff119eabd6ebe0074ea59e4502afde67f69cbc76b3ff2972e96124537eaf5fddc0787b4d78e7897adc
+EBUILD xpaint-2.9.10.2-r1.ebuild 1634 BLAKE2B fd9d07d153e335a36ad0357348938782f6a887f4b3346ad3191c000cd0237c4f6e1dd3993515686b28da958218f5631c6558ec8b8d7deec8241830aad276823a SHA512 fa3117c3dda557ce2c19717652088d3ad0d7c7546d660ad3e5dbdd788056ffd462905c69f74b3b114658c3f3d7defeeb26307d00425009884a790381f0a259ac
+EBUILD xpaint-2.9.10.3-r1.ebuild 1696 BLAKE2B 140a5a043d216e0350294123b5a9f98da8b36b7648fa4b13c82726392e0fb976015d87fcfe1d2457b28db01ba89b010335d12d5da4c034940c26e3ba9987daa5 SHA512 1fac714e82d6df4f2f0dbe19f5a2fd9751d284496ed3b66487986155d20e4d01de8f0671000214ce87ff7eea09a96f0a3916aa2363c3532837b19f509fe50992
 MISC metadata.xml 1204 BLAKE2B 3cd1cf2062126075b6b4be1b987ab9098ae31b611abe6e81c15e684e62ed0a1133177c4718e5bc51d5be2a0b5b2b58fb4d4a2d67ea77f21ca6d9009f2a4d4150 SHA512 e2b37b1d3381dd97ecdd40f20535426539d7caff8032ffcb5e6b74d65968adb7319523a55e45d31a697a75b9aa384e0a5155059237730ea080cf46532da12c22
diff --git a/media-gfx/xpaint/xpaint-2.9.10.2-r1.ebuild b/media-gfx/xpaint/xpaint-2.9.10.2-r1.ebuild
new file mode 100644
index 000000000000..4ca535290046
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-2.9.10.2-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Image editor with tiff, jpeg and png support"
+HOMEPAGE="http://sf-xpaint.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="jpeg2k pgf tiff"
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:0
+	x11-libs/libICE
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2c
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	sys-libs/zlib
+	virtual/jpeg:0
+	jpeg2k? ( media-libs/openjpeg:0 )
+	pgf? ( media-libs/libpgf )
+	tiff? (
+		media-libs/jbigkit:0
+		media-libs/tiff:0
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \
+		"${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		$(use_enable jpeg2k libopenjpeg)
+}
+
+src_compile() {
+	# clean up
+	emake clean
+	emake -C util clean
+
+	# parallel make still fails sometimes
+	emake substads
+	emake xpaint.1
+
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+}
+
+pkg_postinst() {
+	elog "optional dependencies:"
+	elog "  app-text/gv (external viewer for PostScript output)"
+	elog "  media-gfx/imagemagick (external viewer for pixel graphics)"
+	elog "  net-print/cups (printing)"
+}
diff --git a/media-gfx/xpaint/xpaint-2.9.10.2.ebuild b/media-gfx/xpaint/xpaint-2.9.10.2.ebuild
deleted file mode 100644
index 3e5f5b70aa0d..000000000000
--- a/media-gfx/xpaint/xpaint-2.9.10.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Image editor with tiff, jpeg and png support"
-HOMEPAGE="http://sf-xpaint.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="jpeg2k pgf tiff"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng:0
-	x11-libs/libICE
-	x11-libs/libX11
-	>=x11-libs/libXaw3dXft-1.6.2c
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	sys-libs/zlib
-	virtual/jpeg
-	jpeg2k? ( media-libs/openjpeg:0 )
-	pgf? ( media-libs/libpgf )
-	tiff? (
-		media-libs/jbigkit:0
-		media-libs/tiff:0
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \
-		"${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable tiff) \
-		$(use_enable jpeg2k libopenjpeg)
-}
-
-src_compile() {
-	# clean up
-	emake clean
-	emake -C util clean
-
-	# parallel make still fails sometimes
-	emake substads
-	emake xpaint.1
-
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		-C util
-}
-
-src_install() {
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		DESTDIR="${ED}" \
-		-C util install
-}
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  app-text/gv (external viewer for PostScript output)"
-	elog "  media-gfx/imagemagick (external viewer for pixel graphics)"
-	elog "  net-print/cups (printing)"
-}
diff --git a/media-gfx/xpaint/xpaint-2.9.10.3-r1.ebuild b/media-gfx/xpaint/xpaint-2.9.10.3-r1.ebuild
new file mode 100644
index 000000000000..00b7b44564af
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-2.9.10.3-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Image editor with tiff, jpeg and png support"
+HOMEPAGE="http://sf-xpaint.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg2k pgf tiff"
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:0
+	x11-libs/libICE
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2c
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	sys-libs/zlib
+	virtual/jpeg:0
+	jpeg2k? ( media-libs/openjpeg:0 )
+	pgf? ( media-libs/libpgf )
+	tiff? (
+		media-libs/jbigkit:0
+		media-libs/tiff:0
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \
+		"${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch \
+		"${FILESDIR}"/${PN}-2.9.10.3-Fix-build-with-clang.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		$(use_enable jpeg2k libopenjpeg)
+}
+
+src_compile() {
+	# clean up
+	emake clean
+	emake -C util clean
+
+	# parallel make still fails sometimes
+	emake substads
+	emake xpaint.1
+
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+}
+
+pkg_postinst() {
+	elog "optional dependencies:"
+	elog "  app-text/gv (external viewer for PostScript output)"
+	elog "  media-gfx/imagemagick (external viewer for pixel graphics)"
+	elog "  net-print/cups (printing)"
+}
diff --git a/media-gfx/xpaint/xpaint-2.9.10.3.ebuild b/media-gfx/xpaint/xpaint-2.9.10.3.ebuild
deleted file mode 100644
index f75912276e09..000000000000
--- a/media-gfx/xpaint/xpaint-2.9.10.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Image editor with tiff, jpeg and png support"
-HOMEPAGE="http://sf-xpaint.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jpeg2k pgf tiff"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng:0
-	x11-libs/libICE
-	x11-libs/libX11
-	>=x11-libs/libXaw3dXft-1.6.2c
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	sys-libs/zlib
-	virtual/jpeg:62
-	jpeg2k? ( media-libs/openjpeg:0 )
-	pgf? ( media-libs/libpgf )
-	tiff? (
-		media-libs/jbigkit:0
-		media-libs/tiff:0
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \
-		"${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch \
-		"${FILESDIR}"/${PN}-2.9.10.3-Fix-build-with-clang.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable tiff) \
-		$(use_enable jpeg2k libopenjpeg)
-}
-
-src_compile() {
-	# clean up
-	emake clean
-	emake -C util clean
-
-	# parallel make still fails sometimes
-	emake substads
-	emake xpaint.1
-
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		-C util
-}
-
-src_install() {
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		DESTDIR="${ED}" \
-		-C util install
-}
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  app-text/gv (external viewer for PostScript output)"
-	elog "  media-gfx/imagemagick (external viewer for pixel graphics)"
-	elog "  net-print/cups (printing)"
-}
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild
index 2238a60f8640..1af0862f0c6d 100644
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild
+++ b/media-libs/Field3D/Field3D-1.7.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -12,17 +12,24 @@ SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
+IUSE="mpi"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=dev-libs/boost-1.62:=
 	>=media-libs/ilmbase-2.2.0:=
 	sci-libs/hdf5:=
-	virtual/mpi"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch" )
-
-# Docs are not finished yet.
-mycmakeargs=( -DINSTALL_DOCS=OFF )
+	mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-Use-PkgConfig-for-IlmBase.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_DOCS=OFF # Docs are not finished yet.
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+		$(cmake-utils_use_find_package mpi MPI)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/Field3D/Manifest b/media-libs/Field3D/Manifest
index 2728cad4d0b9..c8b9a5f405c3 100644
--- a/media-libs/Field3D/Manifest
+++ b/media-libs/Field3D/Manifest
@@ -1,4 +1,4 @@
 AUX Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch 5371 BLAKE2B c8a1360db04de4cfa18b739af024934469b9cf2a2314d3fb248ad2df371be902369989f120dc7c1adb86ea77cf01a7a5e0944b9a4a57e9a9e329a06c5d24c97d SHA512 167da6b57983e317266ccbb9670cc5ec03f041343e44af3cbedc14366e349edd1d5f2a0ac163fa919827b2dfdd9811525b81c446a0e32016b3bd51f84f202bcb
 DIST Field3D-1.7.2.tar.gz 502481 BLAKE2B 8d5fbac915b52b36e66250f8fcd2beb5fff9d2446696ad1829e3edf05c9810b5d54928c6ab4f5aa99c1338da24cea446134434a59aa1d053f3da3500c2800f59 SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
-EBUILD Field3D-1.7.2.ebuild 645 BLAKE2B 9b02a5fbcefbed02b0434e553e24207ae103eb898322917caac724ed7ff39f3ce673dfc21b340e8cd1439f4d7e32a29202cd88ee4a387f8de8571aac4a4ed717 SHA512 5d31100bc97fb809082c3f8dd4bc727dd550168ebde3055f8d4a492216a77f7d0e45a1fa8cba65136799a34f7b6b060ff74600a789003ddf6ad8c47847729896
+EBUILD Field3D-1.7.2.ebuild 803 BLAKE2B 85f88e8134a9c39c3e84122a39f6e80c590898c5aae95d65c8f55d3dff44f16bcf018b8fe9f523045df1bc8da3125d21494f8c12156673417a3f17d3afb0d59f SHA512 ea22e2ae2ae07cbc54f1afb47781dea15044be9284a3d16e115dd5016a6e3f351650465afb6226736fc4551864f7d41433a2eaa58335758cff954cd1447e5c05
 MISC metadata.xml 820 BLAKE2B e8b04778684298db20cdea68773c50d5791eb0b024fcc0193293dcc34dd06eb0180cfb16075117c3a4b325d1ef1cb78b3bd40b64b67fb3e41e162a17fceb1cbc SHA512 3e8b636aaa7cae681572ceae3b942e20149864be38c5f437227c462185e3acf4660de7a9071988cf59e3a481e47d804de0c563d23674bc772287318cac9a933b
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 81c84f65fd46..6dad278ad22d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest
index 290ab279181d..bb4b70d75235 100644
--- a/media-libs/a52dec/Manifest
+++ b/media-libs/a52dec/Manifest
@@ -4,5 +4,5 @@ AUX a52dec-0.7.4-test-hidden-symbols.patch 637 BLAKE2B 542d1bfbf8722d900b25fa6bc
 AUX a52dec-0.7.4-tests-optional.patch 299 BLAKE2B af245be87277559c2fbc1695180d4e451ccc6a76157111d57fa86992c4cd4dd59e166b7a68a7d799bdda56d0ac5ae3ddfe5c433cbccf6eef4a999e2b336eda0e SHA512 9f5c0afbfd656287eafeba04eed34070f53a77cb53981d64ff71edb96bef6cc2c0638e0be6647086cbad87ead97aa0215cd6cb413258d0122bc3f45bcf4480b1
 DIST a52dec-0.7.4.tar.gz 241507 BLAKE2B e8475b391a3afe77883f5683f58a64d2babfcf93c08a3bcbd0208476323e9c86c5d268d2738efddd2093a1c47886deb22185cb8f00c4ec8b4153f64e1af1f49e SHA512 4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848
 EBUILD a52dec-0.7.4-r6.ebuild 1439 BLAKE2B b3d5cc7a25f0694ea9a771ae3af526a28a6522b0e2bf094dfc6eb6f56d424fe90502878a8697f12618288c27116deb5d4d4c861bf4b735ba889f8695f3209bdf SHA512 8437c6bdbb0ec560ad57829cf6a2227b07886c27db4a954c3c1b3e402313ad710ea8c0dad575c0f325deb64bb3ba9ddb064255aa37751a27f6f3b6578af54d50
-EBUILD a52dec-0.7.4-r7.ebuild 1570 BLAKE2B 4ef77d35ca6798d64b988dff2b305041c07ebacc812cc07ad4e142987a19ad1a17972347df7ef9f7e7ff3f2547519a8d1653804acee2ef98f5cf243a8aed8a97 SHA512 a3430ca53b31cf7b5f8e6442ca0c5ad16cbfbe9f5b2cfea2c56317a7fa8e2da043a88cebb92e8bea08b7890cd7cb982a7c53fa3d682e42c5104605c24444988c
+EBUILD a52dec-0.7.4-r7.ebuild 1566 BLAKE2B bc6e1c658067476153d9f046491dc0cd0e8aeaa77a3aae784f619d9ad93aee4905351e81795127b85e0eb7afcada94cf365d8aecce84444a71b5fe39a577c99e SHA512 4a33964a3d8a2bc42996060313aefbffee0780495ba0cc2bf91eb157c012ae2cad2d8dd8dcff411eca08125484dff972150484be007f131b95a6e54651420214
 MISC metadata.xml 442 BLAKE2B 6e92f797dedf977ed4dd7321249af91b56488c98f9bb64cc8df4fd1ed1012a501d0f49ef5cb063d52e0636583dca77c4376df2e1071da889f598415aa91d801a SHA512 acc8d37733d5efebd4e65401dfff5926a64e13f641dd383343a26b666fe13963191782990ec4571c18803584808b249cb60646a06d91437f0a6793237eb99ca0
diff --git a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
index 121fa7a0e6ce..0fe011bc5422 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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="djbfft oss static-libs"
 
 RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index a97581ad1bff..005969f3b24e 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -9,7 +9,9 @@ AUX allegro-5.0.11-underlink.patch 390 BLAKE2B 9e28af560d359d1ef2e2a13ac30ede196
 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
 DIST allegro-5.0.11.tar.gz 3203777 BLAKE2B b8946e58cde38fdf52f42e041fb27ea92e9589f3425c8047afa4d66ca466cb294e6c8efdc03f0e6942f665e4624c10e533a64bc77bcfaf132662b2123b97de34 SHA512 bcf3bec236d5dee11c789394144959d2a2f6028ae3d89a91a726f796d74f785c7f28749ac1cda94becaf18c31c76fcf75b8f2f6d1f2c32c52d556f967a406052
 DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
+DIST allegro-5.2.5.0.tar.gz 7849326 BLAKE2B 8d8995b9ad252b81c534099ffd91d81bbdcf4a34f7ca7c4fb7dd97e5c075869c212fa68445a5fe479a675d755ad0414976c11cbc112ecdd61f1fa09704957b21 SHA512 c6341396ad7340233c1297ed122095e5c2d129a32da2350b4bb39c4b74f8d56d57ec4e608defec471d63fff51d786f0a9f3844be82f81cdb3d48d5bc49908b12
 EBUILD allegro-4.4.2-r2.ebuild 2586 BLAKE2B 9436548344a878ee11ffdd2fd20c6f7c6f7157ee1c8f73f9d55e376d386fb8fdbaa5a1178c3bfff2e0fecc9c83ec0275b9883935354746277c4ec0970e2090ea SHA512 8ca49bd5e811faa9e707cb0af64c07857286f6af9f962adc97ae33d3c267e996010bd4f3ce76faa99414ce922f6eb6bb123b9671da388019c8109ee6f8805fa0
 EBUILD allegro-5.0.11.ebuild 2397 BLAKE2B 1477ed40dc61ac329d85893dca32fa4d9c805c7dc0254e22fbda6a25c9b84907634bf83a24aebb113fe28f548311b547a60be6a9a54f32560935f2b36927d851 SHA512 a4663c4c33f07b9f5b58ede35e369107d3585b9489150c50c3cc312a6ae61e12e0a023b19208c53c2dea2fbff4fdf285fd7962afa30d6ad1ba5c55b40e760719
 EBUILD allegro-5.2.4.0.ebuild 2704 BLAKE2B 00be6767ea9561888a856b5645d62b50b35d52881cfa39e0914e60bffb55409db6eb9c81280deb14307140527830428eb638221dee672eb545912946b04479a4 SHA512 6ed0efe4520dada386b2bf29b660696606afe69a723f64f699980a103e5a4b3206724dee9f4c6c77e43009146747973880ad96610cf410b6f5c698904d6a61e6
+EBUILD allegro-5.2.5.0.ebuild 2792 BLAKE2B c68cd10374a280e4e230954b1843c3e0c5d5c3854da9c7309bb7ffeaffeae8d8c69938aefb4dd3cec619f3de54da34b3d4b5aeb5a49da9696827cd395591bddd SHA512 d9771f255e1ce41b34c0c880bbcc8fed5ad81101b0beb57b2fa0d27dc648f73450de07376b08e9ccfb1bb2c28e278bfdd2889c1fe815995898b465b693c36d75
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-5.2.5.0.ebuild b/media-libs/allegro/allegro-5.2.5.0.ebuild
new file mode 100644
index 000000000000..355077dbfb22
--- /dev/null
+++ b/media-libs/allegro/allegro-5.2.5.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Cross-platform library aimed at video game and multimedia programming"
+HOMEPAGE="https://liballeg.org/"
+SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD ZLIB"
+SLOT="5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
+
+REQUIRED_USE="X? ( opengl )
+	xinerama? ( X )
+	|| ( alsa openal oss pulseaudio )"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dumb? ( >=media-libs/dumb-0.9.3-r2[${MULTILIB_USEDEP}] )
+	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	)
+	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
+	physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+	)
+	xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_DEMO=OFF
+		-DWANT_EXAMPLES=OFF
+		-DWANT_FLAC=$(usex flac)
+		-DWANT_IMAGE_JPG=$(usex jpeg)
+		-DWANT_IMAGE_PNG=$(usex png)
+		-DWANT_IMAGE_WEBP=$(usex webp)
+		-DWANT_MODAUDIO=$(usex dumb)
+		-DWANT_NATIVE_DIALOG=$(usex gtk)
+		-DWANT_OGG_VIDEO=$(usex vorbis)
+		-DWANT_OPENAL=$(usex openal)
+		-DWANT_OPENGL=$(usex opengl)
+		-DWANT_OPUS=$(usex opus)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PHYSFS=$(usex physfs)
+		-DWANT_PRIMITIVES=$(usex opengl)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_TESTS=$(usex test)
+		-DWANT_TTF=$(usex truetype)
+		-DWANT_VORBIS=$(usex vorbis)
+		-DWANT_X11=$(usex X)
+		-DWANT_X11_XINERAMA=$(usex xinerama)
+	)
+
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	local HTML_DOCS=( docs/html/refman/. )
+	cmake-multilib_src_install
+
+	dodoc CHANGES-5.0.txt CHANGES-5.1.txt CHANGES-5.2.txt
+	doman docs/man/*.3
+}
diff --git a/media-libs/aribb24/Manifest b/media-libs/aribb24/Manifest
index f4be5771e606..c668477f2870 100644
--- a/media-libs/aribb24/Manifest
+++ b/media-libs/aribb24/Manifest
@@ -4,5 +4,5 @@ AUX aribb24-1.0.3-reset-control_time.patch 713 BLAKE2B ae8d2bcc787ff12c5bd3374c1
 DIST aribb24-1.0.3.tar.gz 57378 BLAKE2B 72d5c56a214d63e477ed0bb77e5f20e79ff69fe3712623f54f1369b041622aef1853909f3dfc31685b346c62ef36ffe205bf7a8d2c9f0a2996ae378b025228b7 SHA512 622cc0c3928fd6db0b5ab3921f27348c956af20f8c0133ad5d9bf4de3d199077d9f23cc86ae149a9f0d13c7ee5906ec95de3fb8388207160cebd1f0c59078c8f
 EBUILD aribb24-1.0.3-r1.ebuild 692 BLAKE2B 31de88410fe23acfbfc52aca125563792566e296315b614ae07c0d378176d10722574eca4bb16d775ded48bb3bd2f679f92cb0f5bec2e6db952c77a9385218d5 SHA512 7650c1ccb3cdc429570da6a677b43c0721a41eafbae387908862123dc7f8f7f65283810cb9c91f0b037cf3b1db364b4da9836c37a7768657991b4584ebb91cd4
 EBUILD aribb24-1.0.3-r2.ebuild 853 BLAKE2B bab9cc33bda115f2be63fb47e076f7f038cfad7e06814cab4dee51839e9aac8f98e7eda9cc56da08224694b799baa047c3ae675a4c70710d5a4a74bc91215eb4 SHA512 23ff30f07977bb69af456a6c9c603e02e870646aec33550ea2c993acd16cf65c7b55425c3c6911132628124c6504c02688c7f64d618d5494070bbc7bef87fef7
-EBUILD aribb24-1.0.3.ebuild 610 BLAKE2B be387cc22c418985fe567238db2dfe1add1576f0484d3fc28162f4f47e4e6f22a2ecd642670d8f5dcb43d3866448b7cb6a0206032f9c25b525d9efcd9bd40054 SHA512 5fec871008d5d91cabb85d145327a748d910898b3eda002eb4efbdc7ab7eff4fa6cf0770b900986c8e8046a1e11a7338cdfc3ca55f0fef59eda79b1b9c1c2040
+EBUILD aribb24-1.0.3.ebuild 616 BLAKE2B ce1ecd3b136e91fd0982f9905c99326241293146fa31a13ab4948943200df4f40dd850e8bd0c5c6b0b60d3030f895d544c8352ecafbdc6c8e900080da6a4eebe SHA512 6f40d29f3a3c0b69e2b00ddd754b75648619d23b76549eb8e6fa9e0c3a0fe011be923dc01bc76c6e2ccfd5aee361c38feea3fbae762d3a92ed8b5adc240007cf
 MISC metadata.xml 362 BLAKE2B a58d2df31cfb55e76bec5b2055ae17cbfed0de0a0cc85d8d604ee5c4442539b00d40500722b9a589861f6de1e49ef9fe171bdae2219325c93fc07b735a349949 SHA512 0266c8f4f74468aca028c09b9bd61817f1358022ba11020c5f1829581113c0510c4f59228304fe4a5e76f4a666c640e0afc6e96385bae7c0de98c5d4b8a64d44
diff --git a/media-libs/aribb24/aribb24-1.0.3.ebuild b/media-libs/aribb24/aribb24-1.0.3.ebuild
index bc97622331ec..ffeba8187ac2 100644
--- a/media-libs/aribb24/aribb24-1.0.3.ebuild
+++ b/media-libs/aribb24/aribb24-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 
 RDEPEND="media-libs/libpng:0="
 DEPEND="${RDEPEND}
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 6d9008613842..842793072946 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -2,5 +2,5 @@ AUX assimp-4.0.1-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8
 AUX assimp-4.0.1-qt-5.11.0.patch 2230 BLAKE2B e99a1e8dcd5f3c5d8f2b5f116ccd2b5f9a7377e3c17f9d7fc6d4962c4a573c5fa68fced8a714c94cdc1e0bdeb7f2a0b2c4fb714f7c54bbe776efc68911ad5455 SHA512 44bd08a59de45bd6431e97c8165ab7d9c08fccc2bcf704fbf063db143152f9e4aa1e9f5ff7c104bd312a643a42259af6e370caaac92f40d369972b21e692c928
 AUX findassimp-3.3.1.patch 624 BLAKE2B 6e1df31dc55739e01807eacf90558be6af791c4054b438f765cd733639c5c6fb34046871577ddbc7194284f81228000e48218a5a890d21390976778928362d94 SHA512 5f8f7e061da89e7fb4705148b171e631e16a3b7ba7156b1cd3a4b8987adc066f0b4a36f7d70a9b174f3bb27ebe13353435d81cbe85a1166c75148e8419311be1
 DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
-EBUILD assimp-4.0.1.ebuild 1331 BLAKE2B 3c703835ae02fd9a706efddb628a13848d00535a40425aef1447ffb39c199ea11c408e74e5a1ea49da19c0dea7b5c5400c7e1726fa7413d1f95496b5743f8dbe SHA512 79164a1c28b7244acc305accac8d3ae8b9de29cd313bd474654986ad4ba137adfd8de26803ae64d74637831559503fbc92cd9d0ea21545b951a4319d77c2ce67
+EBUILD assimp-4.0.1.ebuild 1334 BLAKE2B 69cba811c5f5b0957c36b257c1bc52c30b15c58ade44c5cff8a1e3697eeda607d8ed5885362a5ad8e1b8ba1c982dd8155f325ae3798a982a39a8d0132e68cd4d SHA512 c47fddb39ed30f9c8cdd9fcdf5b43703c07134a8e7dd187518eaec8392792614716252d39f19262278b8cfe832cf92df602b08855d1d0724b74796f851068d7a
 MISC metadata.xml 463 BLAKE2B e8815466468672f2ebf597e0155adf205234f603ae9287a5743005d26ec240429ea5b98d006554abc69e08251613257130a258fe6cd5e1a79865005d98475eb5 SHA512 8daf9f83564ce1357b6a99441fc733b9d7a00db2071cb2fc47f1a0c6a1842cea57a1ec4aa628b86271abbdaaf5c17c60092f1e2de42e9604a5165e81b2f4bf2a
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild
index 4bdb7525726e..954e9f5f3a09 100644
--- a/media-libs/assimp/assimp-4.0.1.ebuild
+++ b/media-libs/assimp/assimp-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/assimp/assimp"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="samples static test tools"
 SLOT="0"
 
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 784d12060411..5901083e0c7a 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,16 +1,10 @@
 DIST babl-0.1.12.tar.bz2 642234 BLAKE2B 2e60f7bc5edd55d78e3e588c1c777e3aff6953ffb0ecb5ac91b2a1bf7019329a1ddedb8de53b77fd1c37342b607f2f9603bedfb45ceb9943051d63bb0bd364ba SHA512 b69c8e3870f25372b2223aa4a716383af30342822461fc847039af964cdd194603dbc327a5c3547369d64b206b54280a5a9a227197ca6b7bcfbfa8e2e560df6a
-DIST babl-0.1.18.tar.bz2 734225 BLAKE2B 8fc7f0c25adbde4c88fef6ef104de232f5dd074c6262a6e47f177be9362d62dc8cf30e098f3f341fe57f164383eb2fc5054d7796214464482c1ef684f09d1cbd SHA512 70cf2db7294d5744e30519ccc9bfd795c9ef4bae4425bdf8719ce0028c6bb81deca7b2c0550e98877beddc7f5d5ce71b9ba5318416dc32c3087a13d8eee42304
 DIST babl-0.1.38.tar.bz2 653047 BLAKE2B 8bc43a7e0b7265f72122743ff4b3e25825e4bbe6797a6e077de16d47239a67cc8fcb93253f54de31012cfb1622cafed2c220cba5cb3cdd9eb1599e5d11b4000f SHA512 4b55b666170322adad4b4624c98110d7a34c496f7aadb22a53c09d1ce5ae518122c2105fd2cb2a057e752fe1540beb703f8192e48e7c43601342a75db2bfdca0
-DIST babl-0.1.56.tar.bz2 673080 BLAKE2B a172819342e6982249734d2e5a0014bc9feaf882788c50c72494adac7160e9cca4b8d45411c110217b8bd8642fe46689295801f1207e54de1219be5e13a475b0 SHA512 e3d6192126df136537ce13b2858a7ec078251093762052bb3edd826a26ab36fee73375ee854bdf423f22fc30f23bcafb3ae46e986ed6555f3ef0809b12c612ba
-DIST babl-0.1.58.tar.bz2 686407 BLAKE2B 89e93f9152adddd5761728e0234e0139b8e7a4611fd0b082998f34bfca6cfc155d35e3d9b66d777022948d6b46e8d6e12af739d43138139b361c63879f39f1da SHA512 4747e9432072ab786f096f18fabe307587f307369ca89ec7ece2ae8db59ea8f618a67c6c9ed93a8f21533bd91e00db05653b37b923dfee074d7c4381452324ce
-DIST babl-0.1.60.tar.bz2 685707 BLAKE2B dccbbb6974160377eb70fa32dad998ceeed6d065ba87a34c11d38e4bd2ea6a4c359f107bfe4afc0ab637fea99377d83c4669519a61fbc9e221a842d1d5375870 SHA512 a65533b4527c4334c7ab14fb16be41e3e2e93f51bbeb24dd427fa9263e25fa8ad83337b73a805bebc2414fb57bccceaa681f89ce5c5187bd0a03703bf07cccc2
 DIST babl-0.1.62.tar.bz2 698161 BLAKE2B 21fdc009e56d40a8ee08509161dcad10c3f5b41c42ab7f2d64f888762a15b3dd4b6723a4caa4aea7c977179007db4b6e39b6ab9fde4c68bb24ea170ccf29dbd3 SHA512 4d2ba25e39b8dcb122913731861fa04cafd97388a1c354afb2188e8582ac78e9e32f838e2be8e9f41ee9ac582081fdee1d79accb60e824b8b2c12995f96a8293
+DIST babl-0.1.64.tar.bz2 705991 BLAKE2B a22522f3c9ce73b4a0d29f2dddae870e7d241c4456295cab8b3a1d6441dcc7221c510ace57ba22a86ad8aff605734430396b65dbad3a51d306344d0a230034bc SHA512 b728c2973f80b62e2ee62307880e00a95a90839e778644dd6ab4076e43708e4939c8162b9a6a474dc3c3c4c087475d51eb64d2effd6dcdf969696060cc22a8aa
 EBUILD babl-0.1.12.ebuild 1340 BLAKE2B 5134dd30060cb44092b6915c3f88da469c319d760e8aff3960c36c991b1b15cb4f696fe05966cbbeaa09910a824067893fe19b853494aae34e09562101ec7161 SHA512 809652f63a16bcc6fee76a7f4d9d2f4460f9b5e79f3e3325ec368694004c1702e5bd57efc5ec5dd91bc66494080268b89d7cecc116943311bd347a32a18b9e8b
-EBUILD babl-0.1.18.ebuild 1470 BLAKE2B 5e45d86ec4e9c274c66ce2bf2829a286a08c81048c36d74e96bb5c7eb4442991a75a224747b1e4e509ff08f758a0794c95d7e8968351f190076d865c49b62828 SHA512 b07a5b88eaae36f039b3f11f729b01464075bbe383c037609784b7644799adc9f1a9a3e156c1207856b2d78f4c85d7a0e39cccb26597c6f238a2712416645634
 EBUILD babl-0.1.38.ebuild 1463 BLAKE2B 8aeb5ec689a4595cafe28fe9c7678d154f2f892b306edbe483db2c26cce220ccc24d5b8c8435aa1f687642a3f3c88180f5d7bde43f6ffcb9ca5a71c2ac5fffe6 SHA512 d79e7597bb0d5fc2670d0991964051d08dc69c090838fa36ec6b188f5062190943ebe27d01bc46fc1aedd7da24e91d7e88c976dd67e85c36887494ba0d2d677a
-EBUILD babl-0.1.56.ebuild 1537 BLAKE2B 1858b7fd4b0dd6eff9031c92150a4870b3edac208819e905ceb7635dd2ce603c0387cefb989fccca639adaa147d9d866040e437d7e70dfc11399181e8f499dda SHA512 add502c131a3691698aa68d7a2e00628675abc0e086c16ac97a1211017f18290470ba0c9044cb6266113aef45671a6bf6a474026393c8fd3eff4d87ff29d034d
-EBUILD babl-0.1.58.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
-EBUILD babl-0.1.60.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
 EBUILD babl-0.1.62.ebuild 1537 BLAKE2B c79d279334766e1ff7621a7c90b660dc723a56acbd0b53afc55aa3f764e99d8c44aec04a608d0d756f6dd579d491c0db1524b647c2ca6fa96ac1757f468d3fa6 SHA512 8a4ade232489f16d797c771d272b465b7d187faccd528015400b86ca8d7be5f83f236344b23921a1ec1f9c959af617c4bff7bb76257219823bc1e99282b24a9e
+EBUILD babl-0.1.64.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
 EBUILD babl-9999.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.18.ebuild b/media-libs/babl/babl-0.1.18.ebuild
deleted file mode 100644
index c4a928b72087..000000000000
--- a/media-libs/babl/babl-0.1.18.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="http://www.gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch_user
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	econf \
-		--disable-docs \
-		--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_f16c f16c) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/babl/babl-0.1.56.ebuild b/media-libs/babl/babl-0.1.56.ebuild
deleted file mode 100644
index 3fb4930af3dc..000000000000
--- a/media-libs/babl/babl-0.1.56.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	inherit autotools
-	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="http://www.gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	econf \
-		--disable-docs \
-		--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_f16c f16c) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/babl/babl-0.1.58.ebuild b/media-libs/babl/babl-0.1.58.ebuild
deleted file mode 100644
index 8d6d747f60ae..000000000000
--- a/media-libs/babl/babl-0.1.58.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	inherit autotools
-	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="http://www.gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	econf \
-		--disable-docs \
-		--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_f16c f16c) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/babl/babl-0.1.60.ebuild b/media-libs/babl/babl-0.1.60.ebuild
deleted file mode 100644
index 8d6d747f60ae..000000000000
--- a/media-libs/babl/babl-0.1.60.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	inherit autotools
-	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="http://www.gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	econf \
-		--disable-docs \
-		--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_f16c f16c) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/babl/babl-0.1.64.ebuild b/media-libs/babl/babl-0.1.64.ebuild
new file mode 100644
index 000000000000..c6f18423b435
--- /dev/null
+++ b/media-libs/babl/babl-0.1.64.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	econf \
+		--disable-docs \
+		--disable-static \
+		--disable-maintainer-mode \
+		$(use_enable altivec) \
+		$(use_enable cpu_flags_x86_f16c f16c) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/bio2jack/Manifest b/media-libs/bio2jack/Manifest
index 546bc3c2e503..772987a2d1e4 100644
--- a/media-libs/bio2jack/Manifest
+++ b/media-libs/bio2jack/Manifest
@@ -1,3 +1,3 @@
 DIST bio2jack-0.9.tar.gz 527385 BLAKE2B 9f977e8f03a9de272c0b440c256569382876a62875dfc3d1f896c80388bd219d195d5544ba1dd5fb6b2141e63368f4293c3cb5081e1d2d8d3cdceef29a54285d SHA512 8faf73b9aa81d48eddb624146c0144094e466f16cad89fad3670f927963a5944d78f0342aba0f29cece422e3f012faf3e1a0c459fd5cef279406f5bebe66e66a
-EBUILD bio2jack-0.9-r2.ebuild 1113 BLAKE2B 5ee09177b04626796bcf12f62456703ccd3ed850570d4fb366c14e9fd97646683c7d09db5b9c8379359e363f70f9c6a4a302db867d9f6049a154975d1af7cfac SHA512 c90ecfbf8289e65fea6b548eae41e22760da1cceacba0eaba64f3234e4b8fe335b471803a7b71ba1f66e7be84c00cff693bb21a38c023da415b65a856204f872
+EBUILD bio2jack-0.9-r2.ebuild 1059 BLAKE2B 66762e33d7c0d21b3a307ca5219c7406a74061c3bd66629f0c24cf2085859b72bd199480d1588f099419af4f4ac9e31e5e3854ab9944845ce088a2319d3b85a1 SHA512 a376d12ed7fa57350b820a746f8c1ca38c8473ef5540a536877849ca7c8783fdbd0de284597d1c15b3f56ea75d910690f7924ff839ac2ca52e3c2345e9b9c191
 MISC metadata.xml 331 BLAKE2B 10b8c96e08bc97853a40647f2875aafc8c7de9994ba5af8cf5e2ed429efc2cd494b65d1d6dd424da234785568ebaeec822f15c0b088a0bc8df1a12322f2472bf SHA512 57c44fcd806d4de0339c0a6041635dac52545c8aa71516aefcde41613a8ec92f293c5e28f7b04ed3ab746fdccee306b80a44ef4faef24b2ade1abd2be831ca27
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
index 1365950c7e60..a9ad79512962 100644
--- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="A library for porting blocked I/O OSS/ALSA audio applications to JACK"
@@ -13,20 +14,23 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
-RDEPEND="media-libs/libsamplerate
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/libsamplerate
 	virtual/jack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	eapply_user
+	default
 
 	# upstream does not provide a real release, it releases a tarball
 	# with a _prebuilt_ copy of bio2jack. Drop all of the built stuff
 	# and recreate autotools from scratch, then build.
-	rm -rf *.a *.o *.la *.lo .libs .deps Makefile config.{log,status} stamp-h1 stamp || die
+	rm -r *.o *.la *.lo .libs .deps Makefile config.{log,status} stamp-h1 || die
 
 	eautoreconf
 }
@@ -38,8 +42,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	dobin bio2jack-config
-	dodoc AUTHORS ChangeLog NEWS README
-	rm -f "${ED}"usr/lib*/lib*.la
+	rm -f "${ED}"/usr/lib*/lib*.la || die
 }
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 935fd70c0c7b..407253b24e62 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,5 +1,4 @@
-DIST codec2-0.7.tar.xz 8386048 BLAKE2B 04e2ab834539d6911300d30a7de00a0c351e29c53972482765cbefefe8d9e0f10b491496690e34beacce27f68da0c85bb6ad8bb75b93ce50e44eb13f1ad8070b SHA512 bf2f40071c21096d9504aacb293e7c293e1a51d732b91d870b5b35c372684cdb187fe4aafb6c27601c75167bd3783470e054d65b4be215facf67acee8afc56af
+AUX codec2-0.8.1-unused-deps.patch 2966 BLAKE2B 886ea88d068b8c6058468c0dffa1071443ab993ff169a9b38b628767ebb866e0e05feba2fdb1a5f108dab15d2f4a06acc228d4fbee7b005ada1185e48ae26f94 SHA512 89c75477ce2ebed216c2239b237c5c9a502753ac55d73808702230b89f81e6a2ce176b0613f258655e6a83e85b5943ccbd7bccecf650117ff61e7d49e386be06
 DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
-EBUILD codec2-0.7.ebuild 485 BLAKE2B 06f9744dbf2dd9eeb47bebfb09662526253ac62e3d34b47390b9b4df147721b6b7aeb51a67c9a5495474e133a4fc27465736ff50c4a9043e3be8e3ff8c834357 SHA512 39da503a4cfd811cd0de69e775b38cd16a1e41cf97342df493f09597efbd225a06e2f56836e9641367d67c5005da67e4c89bb5ee5052b1605117226b251d8b89
-EBUILD codec2-0.8.1.ebuild 638 BLAKE2B 0c90251cba1a1b918d92dc44a7988980b94b21f17132c98020412ea18494d8632d233ee246d89149810f1c5f64ab00ad44b3c444454835b19f0cd084b9b6e558 SHA512 a624acdd621265c64afc95a1dd1215a117b396b0e4ded70b92ba0f276944de3402f9744fa9f2283871be0f6a9ab8762fefb40ad6a2ba9b293588d16587ba0a28
+EBUILD codec2-0.8.1.ebuild 657 BLAKE2B 068d47df535a6094365c8be35bee0c672b7e6203350f209ec2ddefe9efa8bfed26fe541e1a73c07bfcd2d93fc02531b0b4b825f47a5f8a14881317806c7fc39e SHA512 9aa724b393f39ab66e3157323957eadaf38b852ff4c8901d33ff037467c8e2667fba2074e1144078fe2c1cfe57bb855f4b5731ba344145db0aa81c4ee359a5d9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/codec2/codec2-0.7.ebuild b/media-libs/codec2/codec2-0.7.ebuild
deleted file mode 100644
index c50c30e8bd4c..000000000000
--- a/media-libs/codec2/codec2-0.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Low bit rate speech codec"
-HOMEPAGE="https://freedv.org/"
-SRC_URI="https://freedv.com/wp-content/uploads/sites/8/2017/10/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=( -DUNITTEST=OFF )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
index f220838eef34..78da953304a8 100644
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="examples"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
 
 multilib_src_configure() {
 	local mycmakeargs=( -DUNITTEST=OFF )
diff --git a/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch b/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch
new file mode 100644
index 000000000000..174e5173aa66
--- /dev/null
+++ b/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch
@@ -0,0 +1,79 @@
+From 3f786481d49e25a089586df4656cab563c90ae41 Mon Sep 17 00:00:00 2001
+From: David <david@rowetel.com>
+Date: Thu, 25 Apr 2019 06:47:06 +0930
+Subject: [PATCH] removed unneeded dependancy on libspeex and libsamplerate,
+ these were just used for random misc programs
+
+---
+ CMakeLists.txt      | 30 ------------------------------
+ unittest/CMakeLists.txt |  9 ---------
+ 2 files changed, 8 insertions(+), 48 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 669b8be1..6c8eae19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,36 +195,6 @@ if(UNITTEST)
+     find_package(Threads REQUIRED)
+     message(STATUS "Threads library flags: ${CMAKE_THREAD_LIBS_INIT}")
+ 
+-    #
+-    # Find speex library
+-    #
+-    message(STATUS "Looking for Speex DSP library.")
+-    find_path(SPEEXDSP_INCLUDE_DIR speex/speex_preprocess.h)
+-    find_library(SPEEXDSP_LIBRARY speexdsp)
+-    message(STATUS "  Speex DSP headers: ${SPEEXDSP_INCLUDE_DIR}")
+-    message(STATUS "  Speex DSP library: ${SPEEXDSP_LIBRARY}")
+-    if(NOT SPEEXDSP_INCLUDE_DIR AND NOT SPEEXDSP_LIBRARY)
+-        message(FATAL_ERROR "Speex DSP library not found!")
+-    endif()
+-
+-    #
+-    # Samplerate Library
+-    #
+-    message(STATUS "Looking for samplerate...")
+-    find_library(LIBSAMPLERATE samplerate)
+-    find_path(LIBSAMPLERATE_INCLUDE_DIR samplerate.h)
+-    message(STATUS "  samplerate headers: ${LIBSAMPLERATE_INCLUDE_DIR}")
+-    message(STATUS "  samplerate library: ${LIBSAMPLERATE}")
+-    if(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+-        list(APPEND FREEDV_LINK_LIBS ${CMAKE_REQUIRED_LIBRARIES})
+-        include_directories(${LIBSAMPLERATE_INCLUDE_DIR})
+-    else(LIBSTAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+-        message(FATAL_ERROR "samplerate library not found.
+-On Linux systems try installing:
+-    samplerate-devel  (RPM based systems)
+-    libsamplerate-dev (DEB based systems)")
+-    endif(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+-
+     add_subdirectory(unittest)
+     add_subdirectory(misc)
+ endif(UNITTEST)
+diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
+index 35a944fe..9b2e0e95 100644
+--- a/unittest/CMakeLists.txt
++++ b/unittest/CMakeLists.txt
+@@ -73,12 +73,6 @@
+ add_executable(tfifo tfifo.c ../src/fifo.c)
+ target_link_libraries(tfifo codec2 ${CMAKE_THREAD_LIBS_INIT})
+ 
+-add_executable(speexnoisesup speexnoisesup.c)
+-target_link_libraries(speexnoisesup ${SPEEXDSP_LIBRARY})
+-set_target_properties(speexnoisesup
+-    PROPERTIES INCLUDE_DIRECTORIES ${SPEEXDSP_INCLUDE_DIR}
+-)
+-
+ add_executable(fdmdv_mem fdmdv_mem.c)
+ 
+ add_executable(raw2h raw2h.c)
+@@ -91,9 +85,6 @@
+ add_executable(tnewamp1 tnewamp1.c ../src/quantise.c ../src/newamp1.c ../src/mbest.c ../src/kiss_fft.c ../src/sine.c ../src/nlp.c ../src/dump.c ../src/octave.c ${CODEBOOKS})
+ target_link_libraries(tnewamp1 codec2)
+ 
+-add_executable(tsrc tsrc.c)
+-target_link_libraries(tsrc samplerate)
+-
+ add_executable(tlininterp tlininterp.c)
+ add_executable(tdec tdec.c)
+ 
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index a3072c8a1591..5e92d8290724 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -6,5 +6,5 @@ AUX devil-1.7.8-libpng14.patch 1221 BLAKE2B 970fa563cbfc333b7529392d52d1cd640ed7
 AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4aa851c54aed3d09db752cece3c909085a53ef26e530dad70c70c00b522656ee4b2d6f5c3f83a22244d7eb4999d6566 SHA512 c9adacd0b2c2c1d8980ee87b69b27f0bd3f7f3285ef695499ee90bf4aff55cd8f65c990590478a45d02257c8bb9f01ccc463afe9313efe31a02ee67e15b3207f
 AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
 DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
-EBUILD devil-1.7.8-r2.ebuild 2180 BLAKE2B 8b4399b82387d57421092c37ddc56be55c4fda6b2894299ba294e90d7107e826a045520b5b9b3f38380bc749e53cfb45c218523e0d44022de52b92f948ef6ba0 SHA512 6d6acbe25ee6fb929711e8bdb24f2d0c3bcf52547e0e694ab94d529395da9c0850cbb328d8c4b2288f1467255914fb799f27db7a9ce10af223488933d07fef14
+EBUILD devil-1.7.8-r2.ebuild 2179 BLAKE2B bebf9505ef4a83d834503cb4e6adf9ec0c79ebfb06256d4fb30bf3de847ad7247dd5cded55f2fe928df18b95a1bb63403f95c5873edd8244d63a52c9dd076056 SHA512 aaed7e62676e65f3d18fc98bc7740bded30e9e32e60911e71cdbfb9518e568d23cdc867c454952812fe74074780418fb84ada8d12880c318c41db86977f81690
 MISC metadata.xml 499 BLAKE2B 44a05534504849bd393e8b60ca5d7ce0e1b7862fea7bf120ca7f1d4f38d21e9d4566b3037fc9dc9d403f7b8732c175693d3594fb1603d53642354f3a07cf8951 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
index 63a422bed59f..15e294645407 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl static-libs tiff X xpm"
 
 RDEPEND="
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 7bfa1dd8f205..724185ee4311 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,5 +1,5 @@
 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736
 AUX exempi-2.4.5-CVE-2018-12648.patch 1556 BLAKE2B 154787079e9a1b3c747275aadd5fd2e47efd6079508b1f2db12ca5d0a83c1efb31ac87f869703e28e1b638a26d693fec6b6875d762c85c2ea63ff3adba70b036 SHA512 12594e62110d5d0e457102db94822c0920196420ca2321193b79736ed05dde6859723d66bba0177d55b0390c0716debfcf0e074ca27eaa12ef3e29e799d3913e
 DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
-EBUILD exempi-2.4.5-r1.ebuild 1223 BLAKE2B c2d247879a8bd65f89a9a957fd2c7be1396b8f65824a64702adea1f5592596d2367310ab57c11d6cf97a2ea0d9029bd4a6caf2bf182938f5fa1d2e53865f9173 SHA512 af2b6995b53ae1c5427eac267ca96fca20c7bc2a3475a370493c9b7022cc6e24488113fc9ea3e382a904b6798bf10611e9457ff348a7e8ef99da575f729db049
+EBUILD exempi-2.4.5-r1.ebuild 1222 BLAKE2B 93e186963c5e5f3d7e147db76d39a92e9e981ee0446c8323fe9f0164df3ffb88426d5280856a20beacc75dec87ccb31ad069e678103a7f5b505b78d1ca890bf4 SHA512 0111c4a6373b0bcbb9541663afaca2603b8ee5c71a0bf452749b76dd313e90a55c2d57861681a95f777f0be9d3bca10c95dd118060b7392e1c64287f5d15d590
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
index 85ac5b69d1b6..de40c4624571 100644
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ b/media-libs/exempi/exempi-2.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="examples static-libs test"
 
 RDEPEND="
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index b763b372dec5..d10c8ee7e9d8 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,4 +1,4 @@
 AUX faad2-2.8.5-libmp4ff-shared-lib.patch 539 BLAKE2B 3ee6b86534612e6c96bc884e71559521c0ed464a66a07217caef0959eca0e2a0bdc5ef28367340d07d5ca1ab1686408b4c98c7ef718d4bcb0fa3d827c11074d3 SHA512 b5889dec7850ffcffa707a8594ef74f1e33848c22d2eb5e1a397ca57884b984633610f37f111b534724f2d8f0331e40ed90b01c9acf22c34053f740703e33fa4
 DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
-EBUILD faad2-2.8.8.ebuild 1243 BLAKE2B 79a5ace3014765e525f86e969c789aff38620e9257b1da650cc7fbf2c9fd99cb71111fe44cee5628df49dfc4193f46e5d53f2163237d8df22d96a1ba5fc3395c SHA512 70d321880b872c1bdfe98f9aafe519116cb8a1f09f118a230607df36758d4813b7f33b9e5c565594bf3dd826136dfc9ef4e957de343802574c155ed02879d832
+EBUILD faad2-2.8.8.ebuild 1242 BLAKE2B 3dc8a0eec842ed70efd09286079280adeb90fb0be8cd8326d8e92960465f6a9fb1a4735a5850c44312d87f3206e67a2f999c6a745814a88891d51fa46f61e7da SHA512 82e5a871874c2c79cc1064619c4e4f6be13ef27b87b5bf893bf92cbd0f71e5d4ddfa0541ed18170997e0ca3df190ab9e25f54d4099ed54fa9fb298c113753066
 MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd
diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild
index 71287ad16ea8..52d52b03f259 100644
--- a/media-libs/faad2/faad2-2.8.8.ebuild
+++ b/media-libs/faad2/faad2-2.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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="digitalradio static-libs"
 
 RDEPEND=""
diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index 37651adb4aa6..6a8d5590163e 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,7 +1,4 @@
 AUX 1.4.0-x32.diff 755 BLAKE2B 87ec22ce9c53c49788b12f82797f876e207c07dec95a7229a4117cb9bf8b5be988e98b78dc13f7d62079c43ce0d5a6ecf894590ee6dad2f2071541a43b221411 SHA512 c143704ef537a1a151a7778f84c51ca2e098648c7c50f8c17ed0e2ee625acdfa95d9d3462ebd1323fe1be1fa4b72524c219becab320bdb9f2eaa06ad2744d581
-DIST gavl-1.2.0.tar.gz 4589139 BLAKE2B 9e99aa41128690f580ed023de07a449a101a15549e39f77e89dbf08c0eddd6db691d2bd5b50ad64b2be293d6c4cbf6a1d9157a9cc8d4749c7a5118c15cb9fdd4 SHA512 fe3b7ed91b8564e7f61b738f29ea439af462c1e28038ee04f5b8fc82d7fd6270acd7d1dd54c717f289bba181bafe9c3ec6156449d95153d9fd43e18a92a60c41
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
-EBUILD gavl-1.2.0.ebuild 1021 BLAKE2B 34fee7782a808bc01812044354996539bd6d82ba4a059c37a0e36c19a37f29f9a32946abe6baaa8b16720e731915644cbf62190dcbdec96f800616ca28fa5123 SHA512 bd67ce43d24c876b6b5281cf6e6d7567ae917c6a57e28340a98698d3900a239f0e54c1773661477d8b48788097d3eb7d4c9a85010b7418d3ad84872ed8171943
 EBUILD gavl-1.4.0-r1.ebuild 1089 BLAKE2B c6d284504cb16bdd3321c2ba6e0152ef50a6e5226ea9e814bf61515ed972af9dd087ce3116f16f822bcbe5f74c16c891b16b6e84d139a3c2e8fa09eaccf8f27d SHA512 bb18d6c0f9013f3cf07a6c1e2fd9b7d1470430e68c47c47eff7e76215bf5b3b95ec4e4a0aaa0750cb1a8c78c3024771ca61ba848d369180842b1e6667a2d21a4
-EBUILD gavl-1.4.0.ebuild 1038 BLAKE2B 0f58085701e912771bd1fa583057316cafff26ab12633c91b6fbe29be5c8914d4cd6650e590071b15cd276a5a1e5a6ac0e211a7985b36b077f9153cac97bd535 SHA512 c188d45c8e66f8ee204bf092f0d2ce10490beb1f35e604cf8db0a1081edabb71b7580984393a3bd05e8c1a303ff7361a911f8dcb0749be3c97bde4bf5259408f
 MISC metadata.xml 300 BLAKE2B f5a360e6d1615f750c91512bcb7ddeefd0e0e43c7f682931fecda80e3ba489175786e759d5566077248efe3a2f45d6f8da4277fd97b886e6a4421390ed06dea7 SHA512 d7d3c4fda38db5a9b9496c557891d6c9f620d614a2d17b166b21426356d0c431c484c25909db20d619ff43d948b67719a240245254d89ff03447be53ada09ead
diff --git a/media-libs/gavl/gavl-1.2.0.ebuild b/media-libs/gavl/gavl-1.2.0.ebuild
deleted file mode 100644
index 2715afa75886..000000000000
--- a/media-libs/gavl/gavl-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools-utils
-
-DESCRIPTION="library for handling uncompressed audio and video data"
-HOMEPAGE="http://gmerlin.sourceforge.net"
-SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-# pkg-config is only here to satisfy autotools-utils.eclass wrt #432796
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:-mfpmath=387::g' \
-		-e 's:-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math::g' \
-		-e '/LDFLAGS=/d' \
-		configure.ac || die
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	# --disable-libpng because it's only used for tests
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-libpng
-		$(use_with doc doxygen)
-		--without-cpuflags
-		)
-
-	autotools-utils_src_configure
-}
diff --git a/media-libs/gavl/gavl-1.4.0.ebuild b/media-libs/gavl/gavl-1.4.0.ebuild
deleted file mode 100644
index b839782daa1c..000000000000
--- a/media-libs/gavl/gavl-1.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="library for handling uncompressed audio and video data"
-HOMEPAGE="http://gmerlin.sourceforge.net"
-SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	# AC_CONFIG_HEADERS, bug #467736
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:-mfpmath=387::g' \
-		-e 's:-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math::g' \
-		-e '/LDFLAGS=/d' \
-		configure.ac || die
-
-	export AT_M4DIR="m4"
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# --disable-libpng because it's only used for tests
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-libpng
-		$(use_with doc doxygen)
-		--without-cpuflags
-		)
-
-	autotools-utils_src_configure
-}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 716dc79ed1a3..fc684b470321 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -19,7 +19,7 @@ DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66f
 DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
 EBUILD gegl-0.2.0-r2.ebuild 4777 BLAKE2B ed7a2d4ee08e7b0b9ca6f657e7cbec1acb5a1269f0eec3cd3cb6861f585c3be38381a3f754e16ab5243b4bc0c05f3db7912dd204b31fe1c9439c7050b1c941c9 SHA512 ab067c5e98dc06f8de2cf6d3f6e4914485c2c9845a7d7840d7d51ddb0f7875bcd40fdf0a0c1331271f70c1326c95839b10ce1167bc9d86c647e31c212fdbfe80
 EBUILD gegl-0.2.0-r5.ebuild 4984 BLAKE2B 46d4f811b53c6db09ca75f93bb07c68cc9094e4e790e6fbdbcad29680c1e39173577b06474dfaefe1abab0b0e14d6bd836adbfb33dbb9f0907b6ef2fc507990b SHA512 da64b73c555f36830d5e6641eef87008d868c566ed5adaed7de3bad519a1d091c189643859b1b30ee025eadb54a1add9847a67839a5006b207bf558e423f2f32
-EBUILD gegl-0.2.0-r6.ebuild 5031 BLAKE2B f2a0afc2e46268561dd0e887c1fb05c56c69488177eaec0420cc4fa68441b1eac6f358dc78bd46d8eb35e69a3e2721ac53088de883586014fcd466b91edcb55e SHA512 a50ac55bcb8cddc08916d61da67174e4d24a927f685a8db87b2ab1f33b7190ea32d2ba52d9f2a263a0c0e055279b0609560626d1350635e86aa2f6a59e3d6272
+EBUILD gegl-0.2.0-r6.ebuild 5030 BLAKE2B 308f3f88459aadb95c729fb1597394f7a1b71734d320adc8cc2cb9eef9e393b0ede43b23c285a8d7ee42bf391f994a498702847c24364fd6b3ae79af9c99ea0c SHA512 7c6594c499cbd000679538693fd3dd846fc2977d8da3a69944d87b45666295189a5523e30af5c9c7d6032b279bb8bb6e7f78453d616b457e3e6d582c80da6e9c
 EBUILD gegl-0.3.0-r1.ebuild 5383 BLAKE2B ed633ea1a6331b918632a11811b248872508891fa40c21cd17d4f0b19f1463d675b5b1b7180acf904ee9f08dfa1420ae881c5c4cc7e7ff7d71e92e1e70e00e98 SHA512 21587a2c02c1d5f96ee346251271f188ea5fe1cd2711e0005c583535cd90e47d4c8ac119c2d95efa6ff5767e1c5e53802c0b25a9e0dd0b8a2124b629305e9c70
 EBUILD gegl-0.3.0.ebuild 5302 BLAKE2B 9af5ed46f899c5b2bc34c8da9763ac0fb777135bfda816b53a29b2a4dbaa67a441d26b27ce9112cc686c11f2b182bde320b46bb0dacb519a365a7083051949d0 SHA512 089ef4ca7d2833248af322062bdc05f3f155fd7cc9aa67c89e0567d0c7b6a08bb2ab2bceb54e8c0bb790f8caab4bd2418f3885f7f7cc288014f05064163eb6af
 EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 26efbb8ea85b7b55231801f735b689ff0fccc93fa64c9dfaad33b8819c786f16c57cb7af9bc8da1b74ede6ca72e2dd2e67712dc5c5a2fc26bc833177a9e98f93 SHA512 7516b2ceb2c18b90ae48306765154a33405a38cba39c9531a18d7827408f4a0286e72f51e21fea37493df5f143af8fd302d82f2287de296d6e817947ad6f1f10
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
index 63cc626cb6a9..55248ded85f0 100644
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-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"
+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="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 07edf5d05bfe..24680e5d95bb 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,6 +1,6 @@
 AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5dff5b0efc9165079c9232824bbfffb2a13a1ca2acef89ae066bc13ec4c40baef4ac4b1c66c02d4365b999fdd4f54858ea7af SHA512 06f7b13502b9397770b0d9ab20dd70d902feb7d70fd42381cda53183859db15102bbf16d0e4ce5f9b124de99c58c8e4cb0ec85ca1c6f60e3e5287cafcdfadd64
 AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f
 DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
-EBUILD gexiv2-0.10.10-r1.ebuild 1846 BLAKE2B 373cd362dd1062da5773fde0ed3065a21c21fd74b369f5538afb0b8c572f09c5cd4579fe75d17a1700ed170a4588b22245bfec7c9563c02b7b07c40afa17da09 SHA512 efbb28059e59f23862e0fbda53ac826ff1e36b1d47ec94b59dcc1fe6ef74a4c8d4a948e719741e1b3fac706540f2fc0673edf684c983917f38858032fb77427f
+EBUILD gexiv2-0.10.10-r1.ebuild 1845 BLAKE2B de2fbffcddc6ac6c09171916520accea55068cc52ed43af73908c6cc4feb141fbe26cd187aa6362ba0b246a4d7b00aae9d6448741c4ba351009b84fb205caf64 SHA512 2192b65ee68d7ea41a1b0eb225cf773d05556f6b10df61db5245858da8ef790ef35dfb9e44b1c48b76f8b96cf2f3d125349a43a1537e0bbf0ffc50b5da7410a8
 EBUILD gexiv2-9999.ebuild 1650 BLAKE2B 648e3adfb789c2b410c155e5c5f9392327b017581c98893ed3fcf7a6e7b40c0558ee4417a7937ac98d82132747a492fff9d7d9e6c4bfca934173219a1dfb3b28 SHA512 0a3104e245f5ba7236c91cf6469398b997ad6eecf97caa80a1a8dead8af3cb2216d64ab587e1ee1d3d61b356401476ccc9d4423d534240fa348cb8eb764517fd
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index b82e65a292f3..c9cf2f6ea763 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index fc96f3d3b73f..99038d3b30a2 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,5 +1,5 @@
 DIST graphene-1.8.2.tar.xz 127436 BLAKE2B a22251db7cf4719c8a6cde49e6feb0a998d1ec7296fee549a4797d72fa575d4266e48fb5a6d9ebd204b93954a6278b4fa88dc56e5f86d7cf8625a5edc685a09b SHA512 8d250dccac345251081419f4ad7079c8035cb6225e10b23d25799386b067288831c23be667d608228ef44a2f6107ac47fc86bb495eda7881b1336598d6c43234
 DIST graphene-1.8.6.tar.xz 127984 BLAKE2B 7f67b99796cca1a47324674b1871ddfbcce1193ded5f0a37c8c2894d52b6b5823b0fb1909018ea6adb90f7ed53ad6b09eeda9b1606a22a8b85cd0d661d500195 SHA512 ef6e9b5587bd540099216a7e3f7c86eb62368d49876dcd380c9767c6740c8267c9d510c5025dbe56402f3cd15084ef8fc634d3abe486b516f4f5328b87df277c
 EBUILD graphene-1.8.2.ebuild 1743 BLAKE2B ee7cf602d60a917cbf63d825e0ce2c82c702f1719f7bc772645a956b1889c133cdd284b397bbbfd9cd4f3521f4e29d47c9a1df626f7c820e7026adfe689a509a SHA512 02c21c16bffaed406bd4cd1d3c0a439ec571d2e9c88981bbfe7c5983a840ac6df3bccb74c42ed7562ea0b00f2cb2efffe7a7b20f8a4f50173f5c4d2cc01d6962
-EBUILD graphene-1.8.6.ebuild 1829 BLAKE2B d32ba8fa47e8f825108e2cb280e77e825b3b2015038d9095ff75b0f909df403714bad136c972185c3c85161cb00863fd4e23aa286ee37417e61017f510fe07ee SHA512 74e305c9d98eb3fb3840c953518bf6b8a3bd4908ea7305e2b3f1b9ce1672ad929189d7b449c0a82569cf24f50165178ac22b6f8eadc39aba6b94ac6d8766938f
+EBUILD graphene-1.8.6.ebuild 1828 BLAKE2B 43eb21a73492c9283eb95e3fa404557cf3d85fd45c92b062be9bbfbf9f302d95856fa781b75ef739cdb91ba32dbe4e9956baabf9b3bdf9a62c634d5d83d1ccf7 SHA512 c7e1f6eba98c3e219168405a6c870f16fa49de51cee6d9c9a1d13d3d0e1577c95963e8ab1308215d594d4a23238a121037579fcbe05fe0849e80e0bfc74e0ea0
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.8.6.ebuild b/media-libs/graphene/graphene-1.8.6.ebuild
index a2fbb6880248..97fa539628bf 100644
--- a/media-libs/graphene/graphene-1.8.6.ebuild
+++ b/media-libs/graphene/graphene-1.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 80f4c64d9f2e..04799135bc57 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 BLAKE2B 3e51a96a9cec4e7cb9d5ea36620fc7210b0efdf9fb9d4e88984eb492786c441a6bedf87a91133ec24e014a08bbe161e785cab0415bc6e0844d8a0db5d4be5d69 SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1
-EBUILD gst-plugins-ugly-1.14.3.ebuild 966 BLAKE2B ad427380760b614297e3d963f0a6c511c237c8b7e833e365e1757736483388483fa498c6efc1788fb323834a4efa7c679e43c15109532509b2eced5faa849fef SHA512 b42cd6f5ad727c85cd962aefb1259109d1825e1070bd4de75a41c009df296cec393f72e1960443d0c0d1ab896e01977477428aa156895248f286ce932d10e8ad
+EBUILD gst-plugins-ugly-1.14.3.ebuild 965 BLAKE2B 053d48a6de2524a7a87aeca9d55ae3da187437e66d142679f300b5799a282869c84df5460a294641a2d0ed2b591b1289e19f6d86eb4bfc40df73172dc57d70b4 SHA512 ee14e14b1e463814dd3e7dde4567e2b6bd7584f5855f6ef38685a966f29147b2900d103397101e95deaf6044090a556da52dd1f0f76feabd01c8f01a15a73a89
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
index 126fbe0aa3f5..18fdf4c9e2ab 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index ca43d9273c34..6e6526222d1f 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,6 +1,10 @@
 DIST harfbuzz-2.3.1.tar.bz2 17942960 BLAKE2B b1a29144b608463fa668bb66572c1530e90338ac1968b0747011637a91bed4030d77e8fa22e5a229374a0bc1976922e2e8de452e9017917f7c09ae94c3a52570 SHA512 78a8f05bfcc95cfe3fc0f1a595bdc7298c9c1456db6c7ef70914051fda43f37aaff15eac75aa6922eca82d2291baeb8385e02e6aacb44ca05b4873c311a662ac
 DIST harfbuzz-2.4.0a.tar.bz2 17919355 BLAKE2B 4df7677966844481b707fe3133f4fddf3c5c41d7de8aca4e87019e88c928d66000e49117c795af69967f7c69532438ef5aa8f41ead276e7d05fdc4dd874daeb1 SHA512 daeaf029bd5d0d0674f930a8d0dcdc4e0b1253b2369c732c7b4fd130ab9438d0d9526967224a583ee58974c3b492874acaccdac13c71b58c950f0b3f031e505c
+DIST harfbuzz-2.5.0.tar.xz 5620416 BLAKE2B 881789f5ada8e0f5aeaecd1673a87540674c6057cdd6cd8af0c7bd1a19a1d999544c7eb492a7e9a0c3fa2b208c34e79e62089b8548bee5800d6b0d5cdd2914bb SHA512 4b02c20b07f367cbc21d69c86c5d1c0fc403b76c40ed7e379796afa289487dfa4f9a5f769a2da794658c983dc947dfe3ed394ac647f67e86863ee4b774815428
+DIST harfbuzz-2.5.1.tar.xz 5636068 BLAKE2B e026bc77fde742cad28c19562c03ada3b51683dc6192afac9af1f96d2a4e5bc6bad515f601500c65391cfe015e737354088126d998fad1866a4b62ad74a79077 SHA512 402a97c37b81c13c420d25504d1983313f555bc1dec5a21d26ff219207bbf6ddedc0d35f8bb31e4a7fee6ed53efd93b008713dca0d42c3ab966c2afd1a2d3660
 EBUILD harfbuzz-2.3.1.ebuild 3023 BLAKE2B b9a3d08627e11d8b78a5b1c293e3fb929d5796527d4986796235e3e4a0f6ce54d90096eb931bbd6bfb943a36fca9db2ac207be4fdabbc355be407b89831bd9e3 SHA512 0774d1f803551979890e15ce733f400aeb1343af66bd5569c4ca23b3d90131ce82afb3ade7e516b3e5cbf36af0c7fafdd9b07a465b20654aab76eeaeaa6c2004
 EBUILD harfbuzz-2.4.0-r1.ebuild 3051 BLAKE2B a8be41e65f6e1bd80e0d84c520681368f7e06eb80a92c8ddd841b2950e9902a62e8f7c8912839307b999d4e110fc9b3d5be9baed9583fe8327a5e589697e1a8f SHA512 687e9f6a6dcfc7ac01fd44c116b215426eb18ae5fcafd60d55ec1b15181d5256e41b4d30d8e289e4de51e0fe0a5484a0851fa6bd970e36047de8a6af0616fe75
-EBUILD harfbuzz-9999.ebuild 3034 BLAKE2B 7d620a2005df18eced9e5288632a102730b5531f4373289b9c584cfd2b7096ef1264f3778001a5c47f4d455f19c5dbf7f2e8ef27a1939956befe188b779ee487 SHA512 4ea2f1c1f1c4b166c5c69e735c99badf1eb88d25eb78bc9632426cb1639bd121c80016c72798087b167526a13c2748829f93134d59564a1c3e50d40974887f58
+EBUILD harfbuzz-2.5.0.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
+EBUILD harfbuzz-2.5.1.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
+EBUILD harfbuzz-9999.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-2.5.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.5.0.ebuild
new file mode 100644
index 000000000000..f03429a61fe5
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.5.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-fontconfig #609300
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/harfbuzz/harfbuzz-2.5.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.5.1.ebuild
new file mode 100644
index 000000000000..f03429a61fe5
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.5.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-fontconfig #609300
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 072663ae41e8..f03429a61fe5 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999 ]] ; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
 	inherit git-r3 autotools
 else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index bd52f5d0df6d..8a89512516d4 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,3 +1,3 @@
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
-EBUILD libao-1.2.2.ebuild 1527 BLAKE2B f7c7e2c881ac60caae5d52e7b3339b98df4d7749167c1689efe135d3bc0e8bbfcf9f1fb414f5d6730b63cd05f1594f06b11aabc057bf1133e57c3fcc6953df06 SHA512 61524ea29e278104674d42f3891e9886fe0e368ff3f04b8270b92f407f2eb54250ed315497efa23d78c50a9ff0103ec266e37fba2322775d576a2ce3af0f2992
+EBUILD libao-1.2.2.ebuild 1523 BLAKE2B b4411784534a8bc852597f925ffcce6c8ef87f6e2b9374f3728ff77ef9baaa7bf33b0cd50444ed3cf1183172fb908b2591488f8c46b60fc3fa3f40a2fbaef1fb SHA512 ddc314cd6ae3efc80b21c399728c52203cd868ce0aee260ca76a65fdd422f4dee2d65b77c22178a61ef941c0665d19bb29b694aba33f6d45417542cea00c44bd
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libao/libao-1.2.2.ebuild b/media-libs/libao/libao-1.2.2.ebuild
index e6d756ab0e1d..63db88fef4b0 100644
--- a/media-libs/libao/libao-1.2.2.ebuild
+++ b/media-libs/libao/libao-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index bfc0618ffa0a..698b67abb3e9 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -3,6 +3,7 @@ AUX libaom-1.0.0-version.patch 403 BLAKE2B 8ab115aecb2251750f964bafea7e74ea8e4ed
 AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
-EBUILD libaom-1.0.0-r1.ebuild 2465 BLAKE2B 11322e9cb751c58d10c0690aedbde81f72ee50ca6def9770b94267e36584f06dd8ce2a73a0a60b9b18006661fd8081e96245fe99597a259d8ed1b1b7fe6f3b85 SHA512 631746f10c064e4ef5268dcc63f5b4c988522bbb6a06d89c568e6e742be90ff6291d2034246a48856da5ed10e52227e961695a1748dd2b140afea8af0f8e0e33
+EBUILD libaom-1.0.0-r1.ebuild 2464 BLAKE2B f73d81d653a1913287af544186bad78e33124c6b2c30ff96a4bc4c92a5b5f2decc60411523d129bc50b8a0569dc29d497eb70224fdcc44e75fa7e4382c57deda SHA512 2b4e8e4413cab4534fbaed0781d97c5fa6b36b4969a5aea29bde54b304b74ad9bcb8da1b398a6f82f97bc16b4a1d893821bb9bb1ad237c8f290c627ef46db48d
+EBUILD libaom-1.0.0-r2.ebuild 2562 BLAKE2B eee8f8319e5b38bce5585a3ac6446933a2b5be567846c91a3558356ed854c89040deb02b800f7a821be8b96a4d06f2d85e9f226e4c7ca3fc1e7301250b41a0b0 SHA512 33796b8d29ee4a1a8977429d3ee5eaf37ea059465966e1b2c2975c8d364bdf470881046e6c19fd6608b739dea5db4f91f110750601114fd3ac53d4d5bad3c815
 EBUILD libaom-9999.ebuild 2110 BLAKE2B fc0aabd237735452c5218edccfdfd723808d67877025d20e344fc13e567f8705bd48a97316d641b056578a4d70fca8ece459a3fad684febca2198f27f8644d9b SHA512 401a82d1cc0ec2ca9086edb0203d3e9c39dc995241bccbc546b322bb0ad6da8af2a01101d7ceed32b381b3ad175bc7bc616f3fbec17c28eb1cda99d2fb7cde2e
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-1.0.0-r1.ebuild b/media-libs/libaom/libaom-1.0.0-r1.ebuild
index 0746269412af..3dd2b5c6462e 100644
--- a/media-libs/libaom/libaom-1.0.0-r1.ebuild
+++ b/media-libs/libaom/libaom-1.0.0-r1.ebuild
@@ -16,7 +16,7 @@ else
 		SRC_URI="mirror://gentoo/${P}.tar.gz"
 		S="${WORKDIR}"
 	fi
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libaom/libaom-1.0.0-r2.ebuild b/media-libs/libaom/libaom-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..cb5ffad0646e
--- /dev/null
+++ b/media-libs/libaom/libaom-1.0.0-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	if [[ ${PV} == *pre* ]]; then
+		SRC_URI="mirror://gentoo/${P}.tar.xz"
+		S="${WORKDIR}/${PN}"
+	else
+		# SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="mirror://gentoo/${P}.tar.gz"
+		S="${WORKDIR}"
+	fi
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/0"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+RDEPEND=""
+DEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+PATCHES=(
+	"${FILESDIR}/libdirpc2.patch"
+	"${FILESDIR}/pthread_lib2.patch"
+	"${FILESDIR}/${P}-version.patch"
+	"${FILESDIR}/${P}-armv7l.patch"
+)
+
+# the PATENTS file is required to be distributed with this package bug #682214
+DOCS=( PATENTS )
+
+src_prepare() {
+	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon ON OFF)
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+	rm aom.pc # ensure it is rebuilt with proper libdir
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	if multilib_is_native_abi && use doc ; then
+		docinto html
+		dodoc docs/html/*
+	fi
+}
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index b44c86f8c2cf..6b528e5e2e34 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,5 +1,5 @@
 AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a
 AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
 DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
-EBUILD libcanberra-0.30-r5.ebuild 2485 BLAKE2B f1d553d7a9f4c8d9b71399fa0712c06dc6b30912671cda86e99c3ed22e19a33dd96bd137f2c4fd6adc35092d36934e3b73151c8cc8525cb5f9c5e87e17249c4d SHA512 b9a9a36d53c06fbf74fd16e10919f1295401ffb5a7141dc595d93cba2cf441713d15259f1c461134c8f4018ae3931d671a16771b41afd27906d08b91cb3eddf0
+EBUILD libcanberra-0.30-r5.ebuild 2481 BLAKE2B ff884faf9f1ce293710b3de4a974df4a08d41edb769ac609dfa4fe5f1b90adbeeb81adc040aac6a62fe8382f93a16dbef06721ad105066319526c5d09e5891d1 SHA512 1236bc9d589dbec9ff8b4fa4f5f8f7fa30cd3806e0e4f36c6ab18855c9a60b2736d3dd7338484189269854e2f48f72481cec06160e95323cae44981e68710d81
 MISC metadata.xml 1730 BLAKE2B 8a3bef42abdbb7b229af42e8555eee2eb339275c55ffbfa89e62564d4ca28501de45fe99f6efbae91bcbd0c580ed99136bba751367deda70f137230ae7a5746d SHA512 14720aaeff663ff227dc7f59d1f69e636d8bbc7771dda7ed5a950c2ac75c09e0075223fad78b24feda994fa92dce8e5cfc186e08a3515db0645f4403641a9061
diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
index 029a2b7200da..514e1435191e 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x86-solaris"
 IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
 
 COMMON_DEPEND="
diff --git a/media-libs/libcue/Manifest b/media-libs/libcue/Manifest
index b0a2c530dc8f..95d33830844d 100644
--- a/media-libs/libcue/Manifest
+++ b/media-libs/libcue/Manifest
@@ -1,3 +1,3 @@
 DIST libcue-1.4.0.tar.bz2 249426 BLAKE2B 5f26182abade1861fd2c8d9d05a9a9a4a97fc3d408a17b7b0ae6f2bf1828a1223cec7cfabd25778fad58c849481aee979c11d70925978ebf796e0b3598fffeeb SHA512 1efbe4ff2d7bf1716547c9377a8eefefd5392ce9fa62ee07bc948fc5b8832cefeecebf655a40e49eefe4ec857978dfee5a66a0439e36e4440e0ec472e2226ddb
-EBUILD libcue-1.4.0.ebuild 599 BLAKE2B c61779dbb376e3e482e705c0ff3097ee5ebaccea069df475fdc875e68bb0265a914dd5dc4287cb9a156068df4c96b3c10dc73fdb6cd02edc2b4ca0bf95089c08 SHA512 de82bea6a31b94b70a07f3dda133b41d83f738568649c5ae5447c9d4858b6fca484dd8c7e13cba45a7f9e4e34fa41c99d1f06fea73ee2fbb9d261642a5c08c37
+EBUILD libcue-1.4.0.ebuild 595 BLAKE2B 6c6939506c31fd64d83624592ab61d9ec64b2d1a58c57cb6850d2f7565efc28748df9f6e1f55e2831a4792aafa0602dbe7f81bfa879fbe52ef6fd172dad3121f SHA512 316e77edcaae1ba67167f71ab3a6fdbf3a748509c1cbf3b7a4fbbed28c79860b0eb0df71ebc1eae6ff3e993127c686b1134e96dc52afc6d769af5c9ed7e5eca3
 MISC metadata.xml 329 BLAKE2B 3f8c73c503bd519120a5f95a20a1f148643b474b7d3ef590a0581a30e30b6ee47e9e7f9e67c9b21e764b47cf43332d3276f5224e6ef9c20c072b915f2389548e SHA512 6fdc6b7927ab5fc199cfa02255b07209d59ec5992da77c0bc2782e909c6033a2d23895753f33da557e7f3769eedba116d6c7cbfbae6ec5819ac313a6f0de68ee
diff --git a/media-libs/libcue/libcue-1.4.0.ebuild b/media-libs/libcue/libcue-1.4.0.ebuild
index 0c80188e0d62..45e7b06937de 100644
--- a/media-libs/libcue/libcue-1.4.0.ebuild
+++ b/media-libs/libcue/libcue-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index 976318f99557..165712106ba7 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,5 +1,5 @@
 AUX libdc1394-2.2.1-pthread.patch 332 BLAKE2B e43035a9b9f9f7dc42806ee5fac9b1c7c7edcef700a82e845fe72e55f09de31904d61795afdbe50a8e8e1638ac2da0efaee5658a0301b183bfe06dea0a5f46f8 SHA512 ae0c6c4ad19da0b06ebae86e2602dcf80997ccea5cc45c18f71b5c55ac668310989d87e99075a1020cc58fe5d9f8bae71435aecae21e786b4c7436628fba808e
 DIST libdc1394-2.2.5.tar.gz 611918 BLAKE2B 64a5e156bfcef1f7a0ab2ec9be6cab65cf47bdc79ec3387d183778287ea1f72234325f7df5b67745289d68aea0105f24d7c55a4f13e913a60d43e3d74fcd4979 SHA512 4a02560b7b2db7199b91c35786cb9d5af51398795fc1b7f0cb577d3563b27c0d03d407fa472d9756a2f87b658350a55d29c16fef401a74f835ba86e25214d13c
 DIST sdl.m4-20140620.tar.xz 2420 BLAKE2B 2057bd14817809fc4ce8188971e846d70deda495c25dc3e1e87499f61b67373870c4b3f171edd9e5cf20e29c5d4c1eb11858001c67658e06715be3550668a61d SHA512 d8844d0967809241b642e0b6aaf45f2a5e94567d239d338aee45aaeb0e38765bcae419660562b7064d91afec63cc6ade0878fc7d6f36c61c083d136098a9af55
-EBUILD libdc1394-2.2.5-r1.ebuild 1383 BLAKE2B 351fda021ff1424217d978ee74ef195f4c8c084b930f2fb59ff62e4dbedfda1590f79bafaecbf89d52e15bdb10cf1c48b1545f75f89a08cf9b7295273fce499e SHA512 357627854dada364f47726c2edba2cecc83bb47cca22d433804edd08a1492a5ff93a3553c742ddb8e6ceb978a6e2e8ee4625b4ae1b7560509b728009d93bc626
+EBUILD libdc1394-2.2.5-r1.ebuild 1379 BLAKE2B 9897407da35f4592fdeb7fd8e8ae8730d46e6bfcd923cc92985dbd9251babcfe26d7495292f5c99bed7dc1442c12b0e3b396337a2f9febeb879a486cc7bb32be SHA512 4cecd5e6e7e86e347dd888beb94985efb0ae84fe24493219d3ff03bfee8ec4e6cec749b0006d1ab856151a6b7aa9c058e8c64793a78243ff7e46eaa0096d11aa
 MISC metadata.xml 310 BLAKE2B e433df9a1c48848c371f278ef408de74d5a78896a17a511cd1dd7cdf35e77a87070178f22ad55f70a200088f8f2186d970b1c5cea7eed8ca66b8bad58549667b SHA512 2fbb994fc42ad1c7e1da90b5525ddc1ee1b1abeefeed6496b3aea4df79d556e7032291c782c022ab855216ecdf1539e624f951766f19e33564fd80646bec25b1
diff --git a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
index 760d658cc4ad..e2e4faec021d 100644
--- a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index 84f9bc36f500..72924bb2285e 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -2,5 +2,5 @@ AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac0
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
 DIST libdca-0.0.5-constant.patch.bz2 3424 BLAKE2B 048d7afd856090b5f9d0db1d5894b78d037fa1c03086271342527a1bf04f41ed379b38fe6d72eb9bbf74a864c67710b5f9abe53177cdb2f4f53a8e7502d77c44 SHA512 37bd56b8c240f16a6ee86b04d44571345278f8b9dd395cbc307e9fb7e6c001487411d1b4775af19dc97f18fcaed63be97fafeb4fe504f0a76b87022ec792d23e
 DIST libdca-0.0.5.tar.bz2 393291 BLAKE2B 093e941e8cd25ca52ae43ab16607f8ff3c5ebb95ffc4b29c3cb771b6bf9ba45da4cc8ebd83cd91ccd66b0dd981c32a6c77cb3e90f46093b64b9a483dd854ffb6 SHA512 d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287
-EBUILD libdca-0.0.5-r3.ebuild 1508 BLAKE2B 4fb0529cfa895ca1f77a230c795a7fdeedda638aead83aaec1be5ea6c58bdd05c4ce820bf3c16f25b281bfd940655f67abd29287de6db73a5569082abc2f0d0c SHA512 2b07259aaf7252f8f2b81ec285015ac375c7e21d9f5bf1c1886b9ddd302b3c26adbe608f6dea7ca0229e2f6365cfd480e4b4cb86f78563c6ab6c4cd741c3f30b
+EBUILD libdca-0.0.5-r3.ebuild 1504 BLAKE2B 803a0831fa470196a9195e4b75cee1a37fd37742e1f50f22c68c4a98fdbfd0e49dc81a129dbb7553925d99976d03ca278004b21c54ca16d2c3df19a815061d2a SHA512 dd402a25fbbc502b6dad9884576b62ee74dc5286f0596b2e27fa953112d1f5c03de5ac164c351a41dd0385588b536e3c42d16e815be37eabb4cdffd177c93761
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild
index 6b12d373c533..faee1c7a6532 100644
--- a/media-libs/libdca/libdca-0.0.5-r3.ebuild
+++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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="debug oss static-libs"
 
 RDEPEND="!media-libs/libdts"
diff --git a/media-libs/libdmtx/Manifest b/media-libs/libdmtx/Manifest
index 515fcf216734..a906f3eec4ad 100644
--- a/media-libs/libdmtx/Manifest
+++ b/media-libs/libdmtx/Manifest
@@ -1,5 +1,5 @@
 DIST libdmtx-0.7.4.tar.gz 370999 BLAKE2B 7c87d1b1ca8a1466aed6dbd8b60b31c1acacbff46d99855a2366c89a0998acbc8e0b3d3e70612d6bfc736b48e2001d8de14b9169920e802490623009f3395ea9 SHA512 307aeb30506e60fc44550d1bb86081634f0718d53e7b878b45b0e704e75c5996e27285a16881b7c3a93cafa9a9b125175dadc0f0c2c2f976878666eb652108ae
 DIST libdmtx-0.7.5.tar.gz 790944 BLAKE2B af94a998e6ab0b06c17d64d6c720e874540830282fd1219260aa1e5fb44159b59f63fcfd1fbd750333ae50b080c341ec02b81216c2e975a8ef85628b23d4fb55 SHA512 c4bccc9eff4a93b6bb417ed23ed46e82cc98b650a94be40479d192af8537ee02a16700fbbd8f2271035ff8b804c40ab6461825d94bd80a3081d3a4b3988ea22a
-EBUILD libdmtx-0.7.4.ebuild 559 BLAKE2B 2bf658670fbe81aa3d73265f684582be428ad3cf3e4454787cf48ce5e05d5417440f934562fcf3e1467dd7a5aaf6eacdadb9c60bd07bfc3798902df2c88bad31 SHA512 c9dec7100a4fffc636cde5fb6b99f7a9e5a4cee565d2ac52685db6df4c5b128adadefda51aeef494449e71f4a06dd48033905cff1c773e6d1eb9c0229f37127e
+EBUILD libdmtx-0.7.4.ebuild 555 BLAKE2B 26f24731d334beda4d62b34c48b790d91e5c1137444cde0cdac388d9ca786ab71c6509b7b33182525e3f5ed42f4a07574ad709849d26b97004e03a09e7e0d94a SHA512 57f59f9cdbd5ced50c3dd0a2e0470422ca00b92e36444bac240546d76e357449399ea273586b3b619359cacf577e6192f7dbe52354608de61a87f7b1172fc968
 EBUILD libdmtx-0.7.5.ebuild 667 BLAKE2B 0016a960c64cb003682ad790ad8319f9bf0f8ed7bec7e7c09f083db71b80b5b040c5630f3a0d3f76b60245a6ef2741a72ac9c03c2bde6b3e743de1686fb41fd5 SHA512 aa74bfdc89d850c9781b7425f071921b59475e558d36a434011ebd53b4d7a681d59c10e87bcbe66b413cbee7bfb39a0396c633df6a81a947a3e16f5e8a44f394
 MISC metadata.xml 378 BLAKE2B 9dcdc2a67e0836e73a48174390263c6344f329beb3682a92ffc52a11856b87ce5a4338803ee67f07f9d2337b4292433727c3edca55b155ebd93200351231113a SHA512 f4374bbe8333e1e1700cedd7482667159e5c2e31d8b0f6e52074c9261a11327ca9eab2c857f768cdccd287728b3ab3f52628733e4d91725230fedd985d376a7d
diff --git a/media-libs/libdmtx/libdmtx-0.7.4.ebuild b/media-libs/libdmtx/libdmtx-0.7.4.ebuild
index ebeeb12a21d5..860a328be6d6 100644
--- a/media-libs/libdmtx/libdmtx-0.7.4.ebuild
+++ b/media-libs/libdmtx/libdmtx-0.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index 8ec7ed39afb8..f18a5b9bc939 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,5 +1,5 @@
 DIST libdvbpsi-1.3.1.tar.bz2 479964 BLAKE2B a29522d39544d90b34915e2ca9fc9ca455a556097c63639d7604679275b57378822adfb4c022478884c897cdde2c0e5f84355fdecf35fd6bb305d1fc275eed8b SHA512 015d586d1ef1fd35fc4b6a5b79d1ce4570e07070840d7070938c38be64853fb987172ad225f000156166559709061de6f901237bfc0f7f26f219b5950b57c27a
 DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
 EBUILD libdvbpsi-1.3.1.ebuild 961 BLAKE2B 6fbc4e59378ee2267ceb69f740cabf84e3a2c4ce6775a93db3a890c1ecfb9219ceed8383e24323a3f9b306d2623b4266e6fde41190ba46e9eb0b5f7f779c7145 SHA512 04b0ef6a8239d868a357964bb97a54f188fd27f767ed52b0d14e6eb9932f286c1e1a2fbe134ab663461a9436afcebc781934ea0279cf4dacd2df11e0a6a16bed
-EBUILD libdvbpsi-1.3.2.ebuild 958 BLAKE2B e9aa40ca6254ceab463572766eb7f83884bd75c72f4265042d69be540856b31683c52e0a6d994055a6befa26d26d56d5818e6858e2049582b7b463c2c9456e73 SHA512 e00ca677560636b09697575c80003aa3dee8957f373720ab0694fad5926e982d3d9ad72a4650b9405339c83f3815177a07c82589b60a443d57ecf2cc2e7ca567
+EBUILD libdvbpsi-1.3.2.ebuild 957 BLAKE2B 80145c8e053eabad5260a499cbd52f83f9696a36f25c6d7418e80b6266692b969e295878af00ddd615a413aac7b04949c41ef53dc57dd8b8960c1584a4c13be2 SHA512 dbd369691f87cefad14f8ed3d6c4698592ae69b27a92a777f4bfe76bea410de0fd654343a9e96806cf4d5675fb3d2e6bdf4a347c9006f04771ef75c5892bb239
 MISC metadata.xml 212 BLAKE2B f25483a51eb36c195e77aee58c9f94951dbbd719edb1d088524ef3db4f2d8ffc628b6c0c01efb9d5f3083a81e6cd0edeba56af12a9dc643bc3facbf16e89c0b7 SHA512 ad3eb85555c559c56e2fc097ed106671a78bb16ea63253de1786772a1b914833c2af673da087899e1b06f5db150c283cccb81fe8591c257f91913f2ae22a039b
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
index c740210527f0..067915a1756f 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 078ec667770e..310408e7e601 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -3,5 +3,5 @@ AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e87
 AUX libexif-0.6.21-CVE-2018-20030.patch 4629 BLAKE2B 574f95d21507887851da9486cbd8d263ad25e1df59dd8020f1e4b640d5cc4852667c689993e67a7d705c748b521a46cd5e187a99c9d92787bc9758631c8d7741 SHA512 c49437dffebb901209748b884d67192d2b77072b2fb96c77b95f398d3c68272b14ac4a6ddd33111df8dac49cd6ab8f38e230f8f3f0a842d4b40f2fd38f141a1d
 AUX libexif-0.6.21-fix-C89-compatibility-issue.patch 1138 BLAKE2B 5b3923a7fd82fc4c0f267684c67f329b4ff2dc43f9d088acd4a352a9f3c329b08c338c51c77b3f55654e5cf2dbb2f7ba317b10de7e963ccc7b4c1989332fd544 SHA512 a91c2f12141b7a0c399f08f038746ca44cbc468776e5b34672d38921b8a131df3938e400fea04d20c323d6d1363f8fb176a4abac7be4b1ea9bb9694aa902f19e
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
-EBUILD libexif-0.6.21-r3.ebuild 1365 BLAKE2B f423574c76bdcbd9c9f8eb5e7716371280dc3422c2ccc60bc8aff7d74c1f4e524c763b64b04048310650b75bbd3a669ff24b6528943942a24c99dcdaff8e38e6 SHA512 328ef707b3f1d555e071edab2168b351f7ac3b4713dda375d9bb471a6b74224b2edc4bdff632e7f31d6e715679dbc62f40fe3662132586bf162266dd7540e919
+EBUILD libexif-0.6.21-r3.ebuild 1364 BLAKE2B 05d4956de3c4d901780846ec77f11eee72424238e6f26d1a76152e8685db882e7312fcca3bf64f87a810cfc75f2a338c6bd41a19b48c4ff5d0bd6b7f1b7490af SHA512 2a921f46af9fd82ac4669b80c1346a36e2ec5564f2fc33c3022b909a219d6c9e05a47e801c056df291f8097212833c0a783b2becd434847c84ce00646271b428
 MISC metadata.xml 336 BLAKE2B 7f77063db7c0cf51903da446071dff6d4dccf66e552dd1229f01b79ab7716d02adcb146f755971d0fe96c2a04bacbd082f606c4023e6e98f9c502a3f8eda7416 SHA512 8a6e3d7c973692a37f57ce34136c863e6ad14efd064c42ea0be6c14d93beec3c7ae36ed44afd6d2454ab29f4cb633c097a0c3b2ea5c019bf06df4f306dbfced0
diff --git a/media-libs/libexif/libexif-0.6.21-r3.ebuild b/media-libs/libexif/libexif-0.6.21-r3.ebuild
index 77ed7b4ce609..4c5b6bc9155b 100644
--- a/media-libs/libexif/libexif-0.6.21-r3.ebuild
+++ b/media-libs/libexif/libexif-0.6.21-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 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 ~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="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 055401eeb604..7f5c332837d5 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -3,5 +3,5 @@ DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f65562
 DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
 EBUILD libgphoto2-2.5.16.ebuild 6230 BLAKE2B 14a4b1f316a0f4ba439c42a729cd5fc763662f4c78199edff7765ed5bf70e36e2234f07f7fca9e7a4f42a0d888317449b2342e7eb50412e26048f08cebfb5f4c SHA512 91baa693f5cecc6d54f3d1cf55d703fcfb62bb11b266f49c99e615fb924e20ff70ad736ffca98b67677f2e340b3fb9b55dc4e6215ca41237182b56c5702bc00f
 EBUILD libgphoto2-2.5.20.ebuild 6232 BLAKE2B 3617e5aaababfd54a469f77eb01508fe7341d25e013df88ea76c3775410d615702debc961bffebe69bf885bace54a01b979d1c0a3a0f5e54163af07dc25e1fcd SHA512 4e1d7c288187641e8201f6370134b6e8b379e2e02f56fd713af3477781d6b2df1dc6b6796ea30e24457f9f8919926f308f025236f2d7572becc12f48148bf056
-EBUILD libgphoto2-2.5.22.ebuild 6237 BLAKE2B 193a9cd4d99423bceced587ad2bb0bed7f20ddc643fa06fe0666399434b0fbdc7b4bb19dc814ee84e8419deb9ed45c0c4fa82708c9fcd7566ec384e2d750c927 SHA512 e2844be117f14e8ea5ff815b38d8d2ec95739a94c5bba16de85f16ddd6e277d1431cb1eb5a07b244b33b4362ace3a5e1ef2fddbde450773f6517b1dee9f6c360
+EBUILD libgphoto2-2.5.22.ebuild 6236 BLAKE2B 282f564e6172a9d5af1a3a5fcf3f282bb9e1a3bdafeebd081d5580a1b52c47a3665dec84109a8bfe57bf201418e62ff3e616dc457cb4a0f2cb022cc6b8ea6af1 SHA512 2f4b313cbc7067c74e04308691e92c9366106bba603eafcfa501ea15208c6fb931f08d2f8e6b5375fa7bb6870e756669dd05f3f4cdde1d75d58cc75c4b04854c
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
index 4ccf9b401da9..b962ce107c2c 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
@@ -17,7 +17,7 @@ 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 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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.
diff --git a/media-libs/libiptcdata/Manifest b/media-libs/libiptcdata/Manifest
index 818ba56b56a8..ef8c09e802b4 100644
--- a/media-libs/libiptcdata/Manifest
+++ b/media-libs/libiptcdata/Manifest
@@ -1,3 +1,3 @@
 DIST libiptcdata-1.0.4.tar.gz 569132 BLAKE2B acfac5b4f5945f38da47a5280b92939089f2efa8e4ceae9ad00d9d21c7f062445f63c74d61493e711102789edb8c98ffe49083635f67e836a87c32e1127371e5 SHA512 8656b2febaec133d1a8783252047672bebd58ae9ceab5477c4acfa35bcc381dfda08b655a957b962878af28c69deff77d920e780c84b4debdff2f980b3de94e8
-EBUILD libiptcdata-1.0.4-r1.ebuild 1244 BLAKE2B cdf5907a78f9819e7820884a8c103206485f2a17514c51be071f188cc6996aa887d88f23afbd03eae2e605c91314a598fc5b22e655f560f5e79044fe23fd1862 SHA512 9c89c917306faa0de7ee545bae71c8d1e54a744b6d1bb5d92dbcee51df5f5943adb38f6d6d0ec5c5342320ad21c65b7f6540c58f50976578168332508f3031f7
+EBUILD libiptcdata-1.0.4-r1.ebuild 1240 BLAKE2B d4c4a6e3eb9830b266054d2bc962bf6634b0baebdb164c698a62881a64ad73d84d21c529b7896c063a139f034d89d5fe875f870cdd37f72800972690bb1256c7 SHA512 eded54a7f1ba346962290ed6dd384a6f7050cec292a3b7ea1a95353c1fdfdfa81bced8e2b7d7624f2c40f6dac074606a7860d2124accf0233a059d4bf3e54c34
 MISC metadata.xml 975 BLAKE2B 307530f831f91c4ce735b1bc48e836a351ed7b2fcbb7ceb3fdf6d3527f70ded81bae639b2701bd6da54011842964af56b3a7890a0b240052bb81a0273261a103 SHA512 f72b79828ccfd7df1c7a9bbcd961dc73e57ece831ea97291efa52a484b97eb4fe1f7257aadc6a3bb70c7f9f36776b8ca296bedc43b5df86b17f6902a1ec33572
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
index 5169a9e48f51..575825e620b6 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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="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 examples nls python"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index ce6b997a906b..274b14211c5c 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -1,3 +1,3 @@
 DIST libkate-0.4.1.tar.gz 906896 BLAKE2B 99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b
-EBUILD libkate-0.4.1-r3.ebuild 1310 BLAKE2B fb48bc9f30ac6e9e4dcc846b8c7c41182372b2a5b0708c9e6d35dd0d12bb9f89990ec68090ee0efc582420c72208dafe976139b09bdee0afd1f7d2a8962569e5 SHA512 de2b8cfebd28adc1a694625556efc7d9eab191ad663639c7a11c8567f78381785eef1ea4f8d76b17c48682c6eb7b75affeafa7ea041d9f6e3d78bd150b7baa35
+EBUILD libkate-0.4.1-r3.ebuild 1306 BLAKE2B 78f34a4556924ed6335f47611209fafdd842032674886f8a548f0007877ca079ffb81615c2b18ef231bd2b16c9c77ad435b9bfd344e70bfad9f0c304e94a762f SHA512 d9ad9ab1320e54d0bb388c5a2db1830c70083bfd01ad9576f097de7155e483d791a9c2a4a1bf8e50bf527a6f9f0f5a3f18123cc982e86304ece43851fe4f7812
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/libkate-0.4.1-r3.ebuild b/media-libs/libkate/libkate-0.4.1-r3.ebuild
index 72196cff5575..accaa364ea7e 100644
--- a/media-libs/libkate/libkate-0.4.1-r3.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug doc wxwidgets"
 REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index 881bf09ef7eb..3ad697578bee 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -4,5 +4,5 @@ AUX libmad-0.15.1b-cflags.patch 4867 BLAKE2B adcfc2732f6b8b2310f50d234a695820d8f
 AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 BLAKE2B aff2507810157aec4062d157546b921a43cdf63a4e0684f5864ea71b36b4fa726f4ce33d558b7aaec8bb927876abe23c017ef3a1ba9b55715202887010cba3a3 SHA512 de08e0ce3c39b76c2838f940279a39c26e9c7e5b1e762c44f0db1ce3f65364e51036ad4f4ccdc160d80660c723a1bede70a4b505a9a01583de43ebc47aaeedb9
 AUX mad.pc 211 BLAKE2B 3b8678e667461caa6ddc2479687d92a8bab9e7e05be73640e63c9eaf070fcd69d9e26dac1d5e753171795236f5a461c7f59ad46e899ea3227902b9773f9bcfc3 SHA512 ec0b14bd0c6236a216107b507b92c06e295352f1657ba5e45f37fff220a73e1454b262ac36fc715d698c4ffd210d348fca71cf0198e2c49d16fe0ec5ea839f08
 DIST libmad-0.15.1b.tar.gz 502379 BLAKE2B b00de857a0634d7193f656b74cdd5c0642b674f3ee3303a642f8a6fcb64eebaf2b100c6e09d85d892880b5fc4f224c0a5d1ecf5bd95bc5caf00e959c7beac4a5 SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45
-EBUILD libmad-0.15.1b-r9.ebuild 2210 BLAKE2B 771ebe8a78e51729afd376c481e28f438e64d61b36ad45e260467cc106932610d1bb5ea6c485b330d7d5dc41be42eb27b7b73b888bce71973d6c7f978c8e417d SHA512 fba1226071d1c333970a14d4983d6d4b202839cc8bd8035fb672d201c6e5dc2c8a5308e4c96bea68bdc68b5cbc0bc7394fd0f0308c452aefce67e20cab3dec9d
+EBUILD libmad-0.15.1b-r9.ebuild 2209 BLAKE2B d6ad47c53af33d47cc8e581d8b5f90db6c359989ac14a6bd69e2877759d75c1765c6066d60eeaf66dcc2e486200be820c472c326ee9f27b2cd243a55e423a36f SHA512 18f6535ab32073bd313f64f71c31dbba60bc24db636a9d3cad1c227a93da181c3eb952e8b5fffd577ae738d94a209ea0a17f3619ec7b33ea82bd78278f8df8f2
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
index 55105d3364b5..0cbe0cd6f483 100644
--- a/media-libs/libmad/libmad-0.15.1b-r9.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~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 ~x86-solaris"
 IUSE="debug static-libs"
 
 DEPEND=""
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 785480e57aa1..938016d4548a 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -6,6 +6,6 @@ DIST libmatroska-1.5.0.tar.xz 64596 BLAKE2B a14f3f1aef87e2bc05989d3166b562edf852
 EBUILD libmatroska-1.4.5.ebuild 694 BLAKE2B bd3cb928ea029955ea64ca953c29df990e9f433f91f0dd08ffce3e12afd5be04256bba6447f73afe681150242a06d750f3c4bc84c51ce64defd3d1e650543d67 SHA512 58d2222582303d3b556071b46e0fc141836ebbc2b16b5d8c7120a6508e9b798b83b755fe8312f786451ba1fb08bcf62cd30453873b39a73f2c4d9ca3b7aeb353
 EBUILD libmatroska-1.4.7.ebuild 709 BLAKE2B 0cd3c996b2583541cd0db22420d46beb73aade0e6884ac4dca86341df70387d2e513f331b77c08b49dc7dcbe4f0072647996e4c4012bc40f3a2b3d6cc38a8175 SHA512 c1fd7b67325fd6895676f0391809dc71aa77b2d2b2bbfcc22b454f19ef692ae080ced026e1189d387a454723d6573831a0e9cb3d48691a1690f2235b7f98f5b5
 EBUILD libmatroska-1.4.8.ebuild 701 BLAKE2B 8db0db6e5a931f685f76fe67e9dba35ecdf54eaad1f4b4e496e2df77a8d3f468ec2ace53b7b906047cc3cb716f5919f0b37001a640233a7f853d8241a0857efa SHA512 a7a35513c071dd2f660f77dc3f2c062e183d062b913bd6d305b178ab1f9f87dd82bd6e3d0ca0a366b4133c322025f8b025bf211ef8e955770ce41a609d34d1f3
-EBUILD libmatroska-1.4.9.ebuild 662 BLAKE2B 5a45158f814b9c4905081001c3e5a8c8e277eb144fc57432a8ed849964daee316e671692ca3530f7bf96833563a698014bbe0adb0b22df3081b70d1886115e6b SHA512 ade6d326be44913d8be1b3c514e23c738a50c680794205e41c21a7be95f5e2f19f9f6d7c3ba4c9fdb0ebde3abc21eeb7244cc23bd18ab05aa2cf239bdafd3557
+EBUILD libmatroska-1.4.9.ebuild 661 BLAKE2B ae2a926e737b0cc32a9c8c0976e2d66c6a9c58eb0ed4ed23d970c626408736cc757944aade2ac03b3182d745f2ead53e67e12995f1aae82087a2a9b4ef47b7c4 SHA512 be7d2508b8ef0ce98f23330b7192a64cbd50ca62d26c4fc8e4865e76a048d2f08e2aeb1af4b056f066a8b58bb02da6fbfd3275155e17f401fc23fbcc1b15a2b6
 EBUILD libmatroska-1.5.0.ebuild 670 BLAKE2B e78268605d9dbe15a367f23354efb9e284b3fefc092892c4de2956edb3ba158b12340894f4a375351aaab639a09999a54dfdc76ebcf653668e0bbd9eab6545fe SHA512 1138fb82839cbcee9a9b0438d937ff047012e88151615cfa5027b1f12adb4d4a76cea3b41cad591ed1c247479a5c269d93fbacb9bd5638a5036b771d6ac0cb5d
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.4.9.ebuild b/media-libs/libmatroska/libmatroska-1.4.9.ebuild
index bcc4d226d0ff..830cbf92352b 100644
--- a/media-libs/libmatroska/libmatroska-1.4.9.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/libebml-1.3.6:="
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 6391386a2dbf..c71d70e1e985 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,9 +1,3 @@
-DIST libmikmod-3.3.10.tar.gz 1237413 BLAKE2B 25036cada7e9152a95151483da1b030ba2d02199b52d9f550eb312cd6ec69621fbc5ae7973ddfbe9a22bd683e1f184b2d1c474c3d840a274d8c9e6992a627e07 SHA512 89a71f859bb2dbd20db2b8e1c381df61639302b5e10b85d64fa329fcad5aec603992f11d24c4498c442090f1dded7c8f14271cbaf1acc1b7e719be9cff60b3fe
 DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67a623fd0acd3b65752b0832b1376fb05ca00e7fbd09c242a25fb76d90d662afc3886808fbe6cabb15332f263adba37ad SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de
-DIST libmikmod-3.3.11.tar.gz 1240329 BLAKE2B 7f5ceb26cae2e7e53ba5e07bd6e8f29384d9b62863b3c62e147efb1581a62d104d5abefc12eae12d97d55d672436d613679cdaef81365d34af14f240e48bd680 SHA512 61866fee68d91ff967ac2bad041e70034abbb4c095bba0475ed02cb81a467621a41a0685957cd9b5c19ec5218885ad42dc655443d67e01aa2623d91c0496dd63
-DIST libmikmod-3.3.8.tar.gz 1254702 BLAKE2B 4131dffd201061d6573cf46d78b569bbfa0e828261914bad2c278986b64aa4b9de3525e28b64eda4cebbce12a5ec512ed525b9c18e20b51166e40653f64b4e71 SHA512 033e3977d5723c42af697bf1b9ba6b1912fff1bfbef1894e2b1919d55415efa8024046579ff6a1e9ec752a3c793acc60b616c223b3cb5d79a814746c0cf55e15
-EBUILD libmikmod-3.3.10.ebuild 2047 BLAKE2B 94b45940812e21e9784217bf46d75b3f5997e0c7776238a8587af37fd50696cd268c081cb1525973e526302416d22eb1e586c3cc1224ec5f7a7f2de1f33c850e SHA512 36369710a60751bfa25646e83e8370b5a9d1a1972fc80714b374bb7a26ffc7fb1b2112a2f5dc86ff078e782bba8d3f2045cfccb6b663ee3855b4fe80995cb5a7
-EBUILD libmikmod-3.3.11.1.ebuild 2154 BLAKE2B a6847649cee4fc8ebdb11a59254a1db735f4b2dfc90617954feef14eba2f01fabd0022493c88b62147c4ea7952b87a8ad1e52dcec475b743d1b015cab6aa8099 SHA512 a4bd54f9b2098a906498b6d1b90566c96d977f3884897af8a71257cd6a7b050436acd6b499dcce4b6c9176f8f54bd3325d8b80985b841516d037565c161a9e1a
-EBUILD libmikmod-3.3.11.ebuild 2158 BLAKE2B f746c9fbaf02bf7fdcbb23fc9ea76a1df5f5322784ed9c88bd3104cb07d129ce96ff3c9af26b46cf005aaaae35e436a851da5898da7c9bd23127ad4e49ca5a77 SHA512 749ed3eb424efbc6517bb3825f52d97048f8a48f194df3b668244521d1ac5647d72fa1b8ca08aecbb9941b7200c5fbee4dbd2e3bb71275e63ad5b1c2bbe9f46d
-EBUILD libmikmod-3.3.8.ebuild 2025 BLAKE2B 17652c792f297c2df7796a0701a90695cc66849a7ac4426ed3cc41657249c98d5c7b83732ac5a3d199f2ff7a5f47831db153fdeda8093408d5d96d9319c65afb SHA512 fb49e02feb167be764d6c0e0a92a5d9d847a0d7f0e1a639f28e0245bf2a8e569d2e03850b7b6f878252f5b0ebf4e3d4598c8bf6dccad73b7beef1a744652413d
+EBUILD libmikmod-3.3.11.1.ebuild 2153 BLAKE2B 87bc7ff96df31c3ee2ed272cbbc676e74034557540e0cbf124d98fd3255ed20f5ebd9eaedf99194d20684609752e7e2e49b19fa2f598d309ca5859c06ad4a2bf SHA512 2dde178747d840f2b2e9c2d82bd79e3d5516854522e90c49e6a277cf7a9884dd536394fa262a4b1ad6545678e5f1062c33db23afa5ba4719cd49f61e2ad2492e
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-libs/libmikmod/libmikmod-3.3.10.ebuild b/media-libs/libmikmod/libmikmod-3.3.10.ebuild
deleted file mode 100644
index 232cef07afbb..000000000000
--- a/media-libs/libmikmod/libmikmod-3.3.10.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
-
-REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	oss? ( virtual/os-headers )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libmikmod-config
-)
-
-multilib_src_configure() {
-	local mysimd="--disable-simd"
-	if use ppc || use ppc64 || use ppc-macos; then
-		mysimd="$(use_enable altivec simd)"
-	fi
-	if use amd64 || use x86 || use x86-fbsd || use amd64-linux || use x86-linux || use x86-macos || use x64-macos; then
-		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
-	fi
-
-	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable alsa) \
-		$(use_enable nas) \
-		$(use_enable pulseaudio) \
-		--disable-sdl \
-		--disable-sdl2 \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable coreaudio osx) \
-		$(use_enable debug) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		--disable-dl \
-		${mysimd}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README TODO
-	docinto html
-	dodoc docs/*.html
-	prune_libtool_files
-}
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index 39fad3035014..51735588106b 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.ebuild
deleted file mode 100644
index 1e5e9284220d..000000000000
--- a/media-libs/libmikmod/libmikmod-3.3.11.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 eutils multilib-minimal
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
-
-REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	oss? ( virtual/os-headers )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libmikmod-config
-)
-
-src_prepare() {
-	# USE=debug enables Werror, bug #621688
-	sed -i -e 's/-Werror//' configure || die
-	default
-}
-
-multilib_src_configure() {
-	local mysimd="--disable-simd"
-	if use ppc || use ppc64 || use ppc-macos; then
-		mysimd="$(use_enable altivec simd)"
-	fi
-	if use amd64 || use x86 || use x86-fbsd || use amd64-linux || use x86-linux || use x86-macos || use x64-macos; then
-		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
-	fi
-
-	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable alsa) \
-		$(use_enable nas) \
-		$(use_enable pulseaudio) \
-		--disable-sdl \
-		--disable-sdl2 \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable coreaudio osx) \
-		$(use_enable debug) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		--disable-dl \
-		${mysimd}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README TODO
-	docinto html
-	dodoc docs/*.html
-	prune_libtool_files
-}
diff --git a/media-libs/libmikmod/libmikmod-3.3.8.ebuild b/media-libs/libmikmod/libmikmod-3.3.8.ebuild
deleted file mode 100644
index 59cf8cf14b14..000000000000
--- a/media-libs/libmikmod/libmikmod-3.3.8.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
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
-
-REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	oss? ( virtual/os-headers )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libmikmod-config
-)
-
-multilib_src_configure() {
-	local mysimd="--disable-simd"
-	if use ppc || use ppc64 || use ppc-macos; then
-		mysimd="$(use_enable altivec simd)"
-	fi
-	if use amd64 || use x86 || use x86-fbsd || use amd64-linux || use x86-linux || use x86-macos || use x64-macos; then
-		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
-	fi
-
-	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable alsa) \
-		$(use_enable nas) \
-		$(use_enable pulseaudio) \
-		--disable-sdl \
-		--disable-sdl2 \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable coreaudio osx) \
-		$(use_enable debug) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		--disable-dl \
-		${mysimd}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README TODO
-	dohtml docs/*.html
-	prune_libtool_files
-}
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index b3201e2de370..58c0784ae992 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,4 +1,4 @@
 AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
-EBUILD libmng-2.0.3.ebuild 1171 BLAKE2B 2c698f9b5f7b0e7d08a0fe0fa91b0d4036972eb66818f752b0d5b0cdada6bc727d1e6b3972f130f25113d744664c3e0ac53095e215d8e09f9c0e39fcdae36f31 SHA512 4b5bbe4ffb5163e8ae03884f770302dac29d69d47b6b424c670832cc18f8797e8c33e50360adb6704cc9af4b57e6b243d5a176517e76357a56b1b902d2edb187
+EBUILD libmng-2.0.3.ebuild 1170 BLAKE2B a45699461cc634933191ea2aa1f1bc2ecce7c56fc98ed62a8a70ed4209d1fda71beaa2ef28b11d93fb6255ebc1579b4e530065ea402e8d65c4de8f6761a25738 SHA512 759ef1d46f734efb332d4ca12b87b498f551415d51549a7107fad491a41b9e4ce4421f7f2ae6a57d6773e759d91e78c1e86e376096d42cf9b55a87e0233d7d1b
 MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 1194f2098055..5d30d4adf54d 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
 
 LICENSE="libmng"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms static-libs"
 
 RDEPEND="
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index 2e3a9f14232f..a6d475e7f9a3 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -3,5 +3,5 @@ AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 BLAKE2B d4f3102461c76167286cbf
 AUX libmpeg2-0.5.1-armv4l.patch 749 BLAKE2B 205d8f512eda9b357f0c2902aa8799d897a42a6cdcc131aa6f1d746c6af3c264dd17a2f9e86c6b1c0b9c8bd8f49599f8b99b85f761e64f328a37e9d68e02be01 SHA512 d11fb2196ba5c4a08b28693e069146b69f2a1034606b14981db9ca8d4ed09fd92ab99c9656950cc5d3a547177cd9dd7413698a50bd6b8f69080bcf10e8463e66
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 BLAKE2B cc9ace2ef9d6b9f6fa8d0918b627a4f6dc47e5a5d1ed05d60e8a6b9a01451e33be5c5a2732a2aaf1e1ee97eb61590e1f2b0cf568919fc379ac974ec7a849ca55 SHA512 a9425f3cc3a3d6c660bd5c780906927827cdaad27a9526fa57d9026a100ba44b99aeea34c9467d1373316164cd7b36f8357c9aec2c46fa5c8b4557fab5cba2eb
 DIST libmpeg2-0.5.1.tar.gz 524776 BLAKE2B 29b71740fa601c668a8f5b0a43aa763bda2fc66587f5bff847d4bc6d03dd831abe46428616b770aaaabf2d42877daad8c305ab4dd988cc91a4c90decfcc19c9a SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc
-EBUILD libmpeg2-0.5.1-r2.ebuild 1498 BLAKE2B 4653b884c8ff713d9f0668da4ba9adf98b619fa2ec5b9230abb5637c2bb5d3083e0d0e6ea336e7b91a25c2d6c39c51eab7753a65db13d0f732937033dcc8115f SHA512 246df2fc5c129fdfcb7967412ae282ec798b63861a26a64dda5d6285e2972033813f85ab323e39ec0330b38900dedb59104b5e3fecda8c061f83da664cfe741b
+EBUILD libmpeg2-0.5.1-r2.ebuild 1494 BLAKE2B 3f841df84a9883be9b40931612d11e2d797dd99debfbee40cc9b006de7d591d213a76f0e55e742b2bfb7bd65f1f0ec34db28bcf07cf52efa9879197a5dba4cf6 SHA512 e9c7206c92b242945e3c2137cb7d8a7be4b0a0b5361f6c63e370151011f3168e39f2d2d0ef833c1241fff2ddd7b36de2690f5f265965095f8077e10a104e96bc
 MISC metadata.xml 301 BLAKE2B 4d9999b8b7aa1066cb76987da82251084f2fb73a2891392a1b3686119454f7c19ef34d3f5e362bff0db40050790c819606c79fffc74cee1bb780d3edeb7afa8c SHA512 ae5643be12156110bdfe381eef32d7586350eb5d70ee8b431f34a19a1b45dfa2cd1ee28d5b0101fef05f90b5d72ed767163051ce91cc1e9107c23432a29a1b46
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
index a894b9e8eea8..1595b7ed9cfe 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-solaris"
 IUSE="sdl static-libs X"
 
 RDEPEND="sdl? ( media-libs/libsdl )
diff --git a/media-libs/liboggz/Manifest b/media-libs/liboggz/Manifest
index d2cbb481ee49..ce1bbe087908 100644
--- a/media-libs/liboggz/Manifest
+++ b/media-libs/liboggz/Manifest
@@ -1,4 +1,4 @@
 AUX liboggz-1.1.1-destdir.patch 550 BLAKE2B a8823cc2159aa869fb1f6888be83819407bcc9832cda8ed0b43d5b3292914ef1e9fbf2737814904650423df8e60f7e0b2892a5862494b8a9c9b6d63e64e280ae SHA512 e988d3eae103874b905929f749687eba6e539b06ba4d4a4963e6030ede04cb86af6a9dcf84bf7456a25d267fb02a3b55ccd20bb907c3cb7e5e19049f05a78fdf
 DIST liboggz-1.1.1.tar.gz 702261 BLAKE2B 0631d1c30a045c67b38b9de107a97dc8963890a867262b01271adfb4483c77f8d14e203dffd057194b19b4e6cc28169a3a085fbb79d683a48ee091316cca8a4f SHA512 8f5fc8ca49cb6f7a1160a9c1932876b771d55985d59ddc1f48497dfc08641414a58244d7a7e52bfcecdb69f52913d0123efd8f92513f8b9064e4abe1442f2cba
-EBUILD liboggz-1.1.1.ebuild 946 BLAKE2B 52fa60f73699b044080f0d2d3a4d7aff7e7de215e8d759d52356614053fa58db30c8b0962840423a0fe6f6c34f2af35c62f1460158f7b0ff67fa36e0636e32a1 SHA512 1cd0bf158a4c19f2753a14f41054f455db961010d6ea401cb6b5097895bd80ee66fe912273271bade3169214b3a3c0624c7d6062032041c044f6f020e257690c
+EBUILD liboggz-1.1.1.ebuild 942 BLAKE2B 26163a6c849bd393d9f9eb8f072a56410fc8b033ca3d61ec6dfed4897375987372dbe4e26fb59a3733baf908f863bf9b26759942877ba07205c15f460ff29203 SHA512 2aa07ffc79bca53748d83e5df1bd4ea7f379d90fa552286d9540f34208ae222ef6a335b49b416702cb8c705dc299d06ef82469fade38dad4960bb4dc3ca708bb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liboggz/liboggz-1.1.1.ebuild b/media-libs/liboggz/liboggz-1.1.1.ebuild
index 3c249eda6279..2e299bd0605c 100644
--- a/media-libs/liboggz/liboggz-1.1.1.ebuild
+++ b/media-libs/liboggz/liboggz-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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="doc static-libs test"
 
 RDEPEND=">=media-libs/libogg-1.2.0"
diff --git a/media-libs/libpostproc/Manifest b/media-libs/libpostproc/Manifest
index f33744edb61b..8b2b6ef85ac0 100644
--- a/media-libs/libpostproc/Manifest
+++ b/media-libs/libpostproc/Manifest
@@ -2,7 +2,7 @@ AUX libpostproc-10.20140517-support-MMXEXT.patch 976 BLAKE2B 529f8770ea4424506d1
 DIST libpostproc-0.8.0.20121125.tar.xz 65376 BLAKE2B 7745fc0d495a3a6ea45f4e0b012f343d8db0838f7b26f778a646011e3ef01cdc8b7b37b1148b3ea4d838b3a51decb912a6b4328559929f6d38ab01ef8453f990 SHA512 7f1451dbe822d143793c12bb7c18fd9eeb98b5347bbfc54172f0aceb2f18cf31b2c0c888c33a9ce2e9f519b4bbb0a900b729188ce83cda9ad5499a8f6ea2d62a
 DIST libpostproc-10.20140517.tar.xz 65556 BLAKE2B 374dc84fb52f32958bcf9daeaabf2be1405d444f72d1f1ccb22e42b657489adad55199e5be27fa80cdcc21ed4480bae901925fbd833bcd30625d82720d481800 SHA512 0d6dca077c99ac569d892bc92cd08c6bf3e3a5e30e623ced20227b5bd1bd1aa3ecd150bfc900659accd77b997eb64b4d6f0538f9b6161d190ef6c69dcaf47893
 EBUILD libpostproc-0.8.0.20121125.ebuild 2331 BLAKE2B 8561815d2f54feea81ecec29b9080c3d20416ad62be0dc44d4131052095cce339a1c2590433b8d778663841aaffa4dd489a5d8f1987ec3bb57362997bd833c23 SHA512 d95e666bb622c2a60b582199eb7e2e8c33a6ff1e1a346c69a6a64b8eaf17957abe9ee01c33c32771dc9ef6a546dd1e14f0cf6d623cbd8bd0c14dc7f171fe3a96
-EBUILD libpostproc-10.20140517-r1.ebuild 2369 BLAKE2B 323f6744a1e110d0cda256499eb7caff589427a8bce449a6961de6613e5e184317211835fdd2a6b6cab0a2f966396011e121d7e6f1f57edb8d9555004d98903b SHA512 54911dd231d84f2beee948084f701a86961e3cf5c9eb0dc2034d72aa15cc62783bd6ab24af2335326e5860a94f29352549c57f826b9ad227b9cddb7519564cb0
+EBUILD libpostproc-10.20140517-r1.ebuild 2365 BLAKE2B eace9e22fbeb32af50a8043d643df33e14cb67fc8e7f396c61a497d2e58172dca768b24f46d04cb9775ad80ec6d41ecc7092eb12634064ffc341b5b279f328bf SHA512 b6f5bcc654573c7bf0c039c7e6677707c3a4f930c042884f8a737b8e6f79b2fc34efcb68cd7bf634daf18ea421b7077bd2a33d5ffb337a3167e858f3b17b937c
 EBUILD libpostproc-10.20140517.ebuild 2335 BLAKE2B f7f97bced80be871c8036bb3c7ec60e027c29610dadc1bd84489755201ed69e7ce1b2eb1d33ab8aa5c1cb8ef24bbb9c1e83275b0b082b5d816791871df82229b SHA512 16d3c875f4239d8f7e476031397cff007ed5cf7a254f3dc957121715c2bc2df78055fedbb18baed06dff440d629b51ea4bfca162d3a45d8673259edb10c9681a
 EBUILD libpostproc-9999.ebuild 2304 BLAKE2B 10648a622982411f1cc1f1f8b7e65a39d58116acc8cc7b500d8c1bd4814af38d48b800d948d10273c96741598e6807f8026c5de5f309414d8a634716aa5caf5d SHA512 31565525f5c0da1585fb8318f742de382c95fa6650ec5f84fbb7129ef6f3bf3b261beff11c0cc85def19385a9b7b61a8eb0b74ffe109dea2136403ff718ac04d
 MISC metadata.xml 405 BLAKE2B 5249780527d1e7eb098411f01da236035ae3d9459da2fb7c69194a758e84a92bd02338e5d23490f310b1b59eedca9b2e7333d96d4cd18a055da40da1bcdaa2c3 SHA512 f6a4bb0b0fe497133fe3a1d4781472ccbdf30ab5e9c9aabb272b990bd7c5f048da8c430212dfb3b0f41f2a5ad5ebf3c6ae774474601e250444324ef4faf9ccab
diff --git a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
index 2327601f0746..80721f40f19d 100644
--- a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
+++ b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 IUSE="pic static-libs"
 
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index cfe1ca230b45..7bd893dae939 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -4,7 +4,7 @@ AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf91
 AUX libprojectm-3.1.0-datadir.patch 6569 BLAKE2B 08dc8a6fee7ad8560a7b6c675b2fd5ebb8562fe2e59dfb29bff17646a85c70e65b510b5bc817c7954b7a9f6f3f88f915f6df6814de52a15450e90f3f6e69ffc1 SHA512 ffcb7401022178311844f6f87aef488995b06e83d9f7b82ed4d943d5531252767075b1c8412e55521fb079d303027d178c2cd795a1ea70f7b86959e82b13dcf1
 DIST libprojectm-3.1.0.tar.gz 52123464 BLAKE2B 9027adbbbd3458b0ac6c2a822b06d25965ee90f6764095d7f509a578c52127899caf886fd2eea5cec1c3f566580766442faade8f8964fb1cfe2abf8d41ffc547 SHA512 79216b227808d14ca3f897fd33247ead27c48b734475dc507272ba192b8f239683a28cbf89b5c4fb420ed2b90f936c8dfddd545ee000caf2471fb596f867ba66
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-EBUILD libprojectm-2.1.0-r2.ebuild 1491 BLAKE2B 080aca7bcfebd5b2555803ba5d6482612c564c790dba661cafef7af8414209f5896a5113f9d37719cc9937c3535b4dccffa890f4607e3301899bf7c1573b72d6 SHA512 9cd52fcc3df6926b9ff315c4f077f6fee597c35a75903f136e91c5091e4b37fbed9f6fed341af6d105eb8a857e0a236c3bf20e2b4511e22902d98fca6b361c7d
+EBUILD libprojectm-2.1.0-r2.ebuild 1490 BLAKE2B df81e719ce1539346edf2725fbd78094ab3e104a9754e0b30cf37a5a480cd8f9a805b9bdc66c4ec9c177d815f273f3c91f39b08277dae419cca699adb426c969 SHA512 8c18bdd26e192508eefa50e13e75b93beeff6d1d64ca96fc36e85c8bbd2b33ecdbdeafc1b023e52f46daa44f0e203f7f9baddc7867f1045ad1d58dc42eba28b3
 EBUILD libprojectm-3.1.0-r1.ebuild 1123 BLAKE2B 60dc5c75530f3bd25bb46b98ec9915639eae685b256a565cd1fd2a57c220ba0b4e7558addb45793612e8b186a0ae5cd43df835052f8971593551f2ae71cd1a8a SHA512 8f5715322dfb210858949adc0c045e85df98ac7665546ab16db4b3002fd7e4b77232fd51b6ddf338646fa00140130cfbaa2794b4120f83c17e35e6c5398ee982
 EBUILD libprojectm-9999.ebuild 1081 BLAKE2B 1ea51cf766d16945340bb93f297ee726932e99f5c8ab1201871e009109c861f5acc1086404ec2c09dc44d0fcd6031b46d6b38f4195cfec57ef0befe8ad0a87be SHA512 5d744f41a29111f47dbd483c0f0d436b6a9bffb8b1586acee8150292b19865d4a8a9c5a75b9e14de3d6805a65c39909f388a33059819d8619b1f2aa560a5fb68
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index bcdcf33bd42a..92450c70cc2a 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug openmp video_cards_nvidia"
 
 RDEPEND="media-fonts/dejavu
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 59bcac085ac2..cb1f01e0c526 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -3,6 +3,6 @@ AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe
 AUX libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch 1862 BLAKE2B d478fa25f0771d64e644fe9884202d63bf198a0c3627e4dc5912258c45c9b5fc0143c9fe956ba0adc47dbc20744417d031175a3bbe6430f0fbea967f4fc0b1a4 SHA512 973a96892244934143f901d4469036ffe5fef46ea4e44d1c321d9ab888cb7865d59546aa6211b3268672355491d6876faebe57bb8cb1c0915cc692e66958cf0b
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
 DIST libshout-2.4.2.tar.gz 519249 BLAKE2B 15bd6a552eeb39654a07f5a43f670e53b37c0b239424d2530f09f156e1404da8133e557d614aa7c89aa36e3cec093fecd25aa05d855f283d4af51e1b543eb631 SHA512 ae4b042009887de22d105eb8238f4362f6ff51bd645fd51b5a87c4b5e3f5fdc99e9f99f85c24ae2e9d23eab92b854a7e733bf9f8cc61a8362ce984f02a014e93
-EBUILD libshout-2.4.1-r2.ebuild 1422 BLAKE2B 2c9b7ecce83ae62e785938cb85ad900b1d520bb6db20ebd6c92f4d140c8cea405a3bd78d1630b040c1117eed42f9b14ef6bf80c9319a132a0eabc82e0bda486a SHA512 042e66ae246f32c88c40ff6e5768ad9f1cd03473a286d0ec254a94f26c838766550d1dba9d5053f4e92cce09d06410d970bb0fec3f7ec29fa0cf068281b6c67c
+EBUILD libshout-2.4.1-r2.ebuild 1421 BLAKE2B b814eab2c4ae2e3b6b2b7a82f1185ba6ea9e55a0d984910ea9b4810d6a93ebe070ff31de5adba3b6c153958d0db467c57f719f1a011852036077d1297a00b672 SHA512 aa3401795a97f89075b00515aa33ee9b8a2ed681aec0197bcc4a70b87d3570c2686b56881b20b4e452bfacf7e2068fcb2ca1fcb328f9783ba5bf8f9d5d87681d
 EBUILD libshout-2.4.2.ebuild 1408 BLAKE2B d326f61d38ddd063bd728a735ee5a16b51d968ed847f51152c7c70beefa4539cdea2bd404ad2ec789f96e2819bada1ffb92d39fd8903a9476be830ed23c4b966 SHA512 f63419d790238f0e50ba5d9e0a1e92e0d2a377d0716b4be0f9eb05c2ced2b0ba295a6122f142c05e2faa47940b6b693da2777ca3da7af9de314e3c8ba1d1ce78
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.4.1-r2.ebuild b/media-libs/libshout/libshout-2.4.1-r2.ebuild
index e30940ddffb8..74a48b8d3e35 100644
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libtiger/Manifest b/media-libs/libtiger/Manifest
index 3102b447979f..c77aad13ad95 100644
--- a/media-libs/libtiger/Manifest
+++ b/media-libs/libtiger/Manifest
@@ -1,3 +1,3 @@
 DIST libtiger-0.3.4.tar.gz 383685 BLAKE2B 92bfb1ec5879c9d4af2eb1ecb26eda007fd583121eaa6e3bb23de9f8b477612eb4c87359ec61869c5a70233f1055eedcef270cb79cdd94944013147e04a85bcf SHA512 559e522b5127f32fdd08d62c40dfb493dc2db1efd1e21707d723ef27cbe03e7e38fb04d40856d824ed0c3c94a223ed1a0358fc11ecb30446b5ee5c7a3b802e6d
-EBUILD libtiger-0.3.4-r1.ebuild 889 BLAKE2B 74e113baa32fd4832d5719d0c2bddf22c2b747b0a437416e4c4c65fed6359e9afcd472d4e820dcffabc8530ea25a4049ec066214394a12ea36390ba3d7e12ab6 SHA512 4504c1283780f21ecfa5cc97ab1b9b34300edd24c94fa5b3e366689fc1f4b95c730b819efee811a957353634c9b89ac84b11c4715c7f3f0a4d1b4c25ae07ecd0
+EBUILD libtiger-0.3.4-r1.ebuild 885 BLAKE2B 3bef64ed9041b18566ecba0db0b9ccc6886f0c4b12c033f7824f6071d7fa365fae734b8c7f73ca65456b91da9d822b4db93211d47ef8f93a986828c387855a03 SHA512 8be03794d2ee0b123578d08eda9465ed771827da5f6da582a4281fad777b728e57cff66d892e6d836fa071c10ffecf59cb8fe8a8275f288f74628a702879c9ba
 MISC metadata.xml 550 BLAKE2B 58756433fc1ab142f1f2dc2c465371e19c3838874b697297cf3cd62c88bbfd5805807db521135ab76972cc176b131657caf6ba1c8b75ca792f539816a3baa3d1 SHA512 2590f113bd0261f583083f51aee3beb97771b4a112ed23d2b75028daba956278ad3a56cb7de84973c9bbcc72d1c0ee0e4281531a01a8a44f6e55289d8081a500
diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
index 2e938f8e1e1a..d39f030f2840 100644
--- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
+++ b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://libtiger.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="x11-libs/pango[${MULTILIB_USEDEP}]
diff --git a/media-libs/libuvc/Manifest b/media-libs/libuvc/Manifest
index 5aa737b63cae..88389569fe24 100644
--- a/media-libs/libuvc/Manifest
+++ b/media-libs/libuvc/Manifest
@@ -1,3 +1,3 @@
 DIST libuvc-0.0.6.tar.gz 95598 BLAKE2B 8c317068629512a699536d218401a4ab05925e43bb867ddd0c1b3c06f5b26e0291ad4c486a04f16f76ee03cf5d576b7387d4bde726acf105f7297372ec14b1ac SHA512 d8e52f5d062d2b4561562c9dc017d7f8d9d6734c4284e54b7bc58f9fc968cc8aec51dde938e8911a5c71d0c49fca4478c2fe08c9b7041d4fa26d7c6e1e653f1e
-EBUILD libuvc-0.0.6.ebuild 786 BLAKE2B 05fa4aad03557e42bf894f21f59ccc2e0d0f7f0d1aa893ddf1ed9f3fe42fe91bf2fae98f2cb03d82cd25942b99b387b8b9fd64d58ec1be37b4a453c747990b54 SHA512 2b3b6a6606b6e7eb4f9232191bf4a4d9d3a3524f047584dee8a30d16c06a62b9352fb9dad5be5ff7a5b5915f8b03cf9234a85ab4860597b2b6f8a3f651725d1b
+EBUILD libuvc-0.0.6-r1.ebuild 782 BLAKE2B 70e17b7095036c1beeea530888486fa9aea46ece43b84c93479b2c6f7242c0fb365b85a8b4a3f5d08da904e20c2b7d7ddd93d107db22bd6967ebabed5a61631e SHA512 3df82eab14ab458ec028bd11e9024ca4bb19f2d8f698d5fbee3b663387c6fbdb7724cc8d2b3679f600df437b5a26412aa7c50a62dc43153907204303f4923625
 MISC metadata.xml 446 BLAKE2B 1c36e6c623d067d28deaec19f5d5b07e7c6509fe7ec3c3a1955c5edc863c38ec6974b2c5c80487b929e64f8e3c03275e708c9a0151151b3f06f1a988af5d9714 SHA512 19c938d7b3f171395552c4758f86cd6d80941e428967c14490d8ef09f0d48b215b8458d1695f390c257e81cc376f7c401e8405f8103c6c68c2b744cafbdb4eb3
diff --git a/media-libs/libuvc/libuvc-0.0.6-r1.ebuild b/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
new file mode 100644
index 000000000000..31fa1cec60f5
--- /dev/null
+++ b/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A cross-platform library for USB video devices, built atop libusb"
+HOMEPAGE="https://int80k.com/libuvc/"
+SRC_URI="https://github.com/ktossell/libuvc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	virtual/jpeg:0
+	virtual/libusb:1
+	virtual/udev
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_MIN_VERSION="2.8.0"
+
+DOCS=( changelog.txt README.md )
+
+src_prepare() {
+	sed -r -i \
+		-e 's/(\$\{CMAKE_INSTALL_PREFIX\}\/)lib/\1'"$(get_libdir)"'/' \
+		CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TARGET=Shared
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/libuvc/libuvc-0.0.6.ebuild b/media-libs/libuvc/libuvc-0.0.6.ebuild
deleted file mode 100644
index 80fde0f10f9a..000000000000
--- a/media-libs/libuvc/libuvc-0.0.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A cross-platform library for USB video devices, built atop libusb"
-HOMEPAGE="https://int80k.com/libuvc/"
-SRC_URI="https://github.com/ktossell/libuvc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	virtual/jpeg:62
-	virtual/libusb:1
-	virtual/udev
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_MIN_VERSION="2.8.0"
-
-DOCS=( changelog.txt README.md )
-
-src_prepare() {
-	sed -r -i \
-		-e 's/(\$\{CMAKE_INSTALL_PREFIX\}\/)lib/\1'"$(get_libdir)"'/' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TARGET=Shared
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index fec14a260e2e..7ea99216f72e 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -9,7 +9,7 @@ DIST libvpx-testdata-1.6.0.tar.bz2 121020858 BLAKE2B 93bbaa4514e46b762fbf86d6639
 DIST libvpx-testdata-1.6.1.tar.bz2 158774682 BLAKE2B 0ba1897e015c69cbf98b645cc634f98fdaf58aa814ad2cf93ee1812a38d279a570b856017822db0b21215c0e6d2d069c3f40692317c885ffbc3b59c236a754ba SHA512 9038774a6955cb6664ea664b4d8e08b0e7a2acba85429da9fd84f522bc7a03d57f6d9f1302481136a718507113babbe4786ff7a648130298ad2c0b3cbe8e82ab
 DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
 DIST libvpx-testdata-1.8.0.tar.xz 418337232 BLAKE2B 1336e522f18a8f7812b4e7e4de7b27d32778c38fe902c62a4415a17e857868bfcdcbdcab528617db89e9f57449a486333feccffc4a250bfe79fc460c790071ed SHA512 991066467121614106455522b3651f194b45a37125c1b4e6bade59044756f26d914c95388e3c0bd3dc22159525aa6478df36801767bb7506fa7e77b93c6c2ede
-EBUILD libvpx-1.5.0.ebuild 3956 BLAKE2B b4d01e2117eb2d6f4bf2712d226e617746b855070e49a4cfd5292aaacec0749b19d741ac18702bbf3c00378c2aee212b0f33eb8d2afa894e8fa8f1160a8c67ef SHA512 5d6f3930dee0abf3354bdff7a07a6b4d4872bb7db022eeb7169cea86fdd69e12dd750b4bb0c221e8eb7011bc186a91fa6ccd6e0bd2e3a95dec3a34ea55fc836d
+EBUILD libvpx-1.5.0.ebuild 3954 BLAKE2B f83ffbdd1a1f157f57f28184e1103bc172d6330d6e1146ae6014fe7792a118d8c7a4237ad638af4b4e441c81a6d0dc9e1edb0e430eb5155921c77d6f2c39283a SHA512 ae28b6eafcbb42b447a715236594c0cd72665925cf763c8579a668d0424ec86f6258ec10a8bdd0baa0ce332f792e9cb919223e5e4b1fedd2fcd49dce14b15c1c
 EBUILD libvpx-1.6.0-r1.ebuild 3566 BLAKE2B a3d55b41879c3b407bc8fdda418574c4d4a3bb5fc4cd6000af3841c28384f50e8d5f2faf72d33cafa65c6a3037876c471b660e6d48d0de26351c9d038555e1c2 SHA512 8b69bee233977ba30075c2330c0713f9e5615a4bb4c6668af182eb622a1cdb6aeb8318659e1fb397330ebfddb096bd158fddfecf8b6680aabb146a69f173dee6
 EBUILD libvpx-1.6.1.ebuild 3920 BLAKE2B e1350052f0e7542d4e5458305eb7b93b8e9f2399894ca52cbdad78145189429b338deafdfd63b5ef42c55a3e0da9d8c6182113e65cdc60f5608e0bf39ada8abe SHA512 fe68cbf448458d1b36434e5ecc5902577d6e557c06a090cb5695360cd32795052d74ffc1994e6e263c896fa463097224d9ec8d6b08f2a187efa6664b2a1f55ad
 EBUILD libvpx-1.7.0.ebuild 3884 BLAKE2B c6dbf1dc57c1a7e667e21ab1f9e95d191b18efc1b25d1dc76960151f5db2c2ce21ad6e150e78c503966956dff17ea95b31126295edd76ed2a1e6277ce644afbe SHA512 2b9c5422a14f74c827742db43e32da8a8d572624be28ed0d6e652fd9416dd5981daa67b4b01790655bc4d965adb5c38613937dca38de11cf851a2472c34b33ed
diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
index 80a751f1eef6..b3650dcdba78 100644
--- a/media-libs/libvpx/libvpx-1.5.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.5.0.ebuild
@@ -11,10 +11,10 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://chromium.googlesource.com/webm/${PN}.git"
 elif [[ ${PV} == *pre* ]]; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
 	SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 # generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing
 # it.
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index d2206d3a3c7b..3fba6717cacb 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,7 +1,7 @@
 AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.24.2.tar.bz2 244764 BLAKE2B e049354c2ec52116bbc0c588829c8e7d6c780a8325bb050d225e4893a4ca7b3c98b8bddd01dbfa0e67616bb6baadf2483087891d4242ccd4156aa8a8749484ef SHA512 b5d04b6bb1fb4d3a9a58d93b233db502dc2ded75672766a31d252abca657cbf2d170fa590c0c56159b2bac68c7af95d8787a512e318e3a0f30855504bb034659
 DIST lilv-0.24.4.tar.bz2 252209 BLAKE2B 71142f6a458a0edbb2087ac6eb6323b6ae4c53e45db22a616f00b22f818f507aa724ebf576f09654a98812b8b9a73689720677e64c715fbf7cd49ba26c7ddb11 SHA512 cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89
-EBUILD lilv-0.24.2-r2.ebuild 1488 BLAKE2B a49966c50b2545d8d9160112b91563985d50ec858308fee5538e9d8ae2b2c3d8dff7b02107e907abca0fdb5c8075e1803d6d75d9ef220d3031af3255b2e9ca08 SHA512 0a529fdb2f0567266675ca2b9b533854560a6c1e8714bdd1195f18bd82c8c21913c3ebe9dd34d8adf14b1047320b2541734178152967ecced3efdd1a7685cf5e
+EBUILD lilv-0.24.2-r2.ebuild 1491 BLAKE2B 4dcf0a2b5507c3ce790895a917a265ed09f2edef915bae07691788e19b83a34b2c75f7e98cb3919fe3f71d566f6fa736ef8ba2ea490ab0f2ab77390ea2f990bc SHA512 756dfb6db0cfb30532125b9e033d68f12df7eae31ac6f5c7a50d83375f16160321217aa7d78b960cfa8b2e6af6f41e24f0953d6a3cd9a21d81d647cddb2df85c
 EBUILD lilv-0.24.2-r3.ebuild 1600 BLAKE2B 846b39c71656e873d1f526e8daee94bf582e988fc28a11a6d8f7a3e4c22e9e42d5d3db843af73668d40d305bd8e5cabc93f9581dcf65e1ec9d7e8b2cda54564e SHA512 872d49474b3e2f9fedac162d9feeba0650f7c057e8aafe2a68d5ae20310b5d935f3ae409359477653caf5ec187398bf1923ab74c01dada377815b9e677a60b6c
-EBUILD lilv-0.24.4.ebuild 1607 BLAKE2B 2d6dc550f657183747a895e519aa26a3e6b9d1003614a80896b000176ba72c883ce41e1a46381c9342ece1c16cfaadc3188bdcc571bc2182dae58e9871406170 SHA512 fae06ea7bfdc32b185846404cad9683e79becb7b57e9e39bcd5f26675c574485fe93310295bbef501ee88b0d3ee1b0351ed966645fe3ab9e1070cda890999751
+EBUILD lilv-0.24.4-r1.ebuild 1601 BLAKE2B 16ea39c54407f547bbc6ae16e6913e125993b40d28285ddc1f8e78894cf533fad081e07c7733739b1c6119dcd9049d6df63a787b15f821df168f3d0d864a8148 SHA512 bd6116788162314ca7060c8427d37c536d88fb073b4dcb328e0bc63d723c140f5a15b612ee85c79209b5032a97610e2cbe134d416e600c6357ef148276a901a0
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.2-r2.ebuild b/media-libs/lilv/lilv-0.24.2-r2.ebuild
index 6f7029f64c58..ca54e0e874c6 100644
--- a/media-libs/lilv/lilv-0.24.2-r2.ebuild
+++ b/media-libs/lilv/lilv-0.24.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc x86"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc x86"
 IUSE="doc +dyn-manifest static-libs test"
 
 RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/lilv/lilv-0.24.4-r1.ebuild b/media-libs/lilv/lilv-0.24.4-r1.ebuild
new file mode 100644
index 000000000000..54877d5c31b2
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.4-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+
+RDEPEND="
+	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/includedir.patch" )
+
+src_prepare() {
+	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "") \
+		$(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	newbashcomp utils/lilv.bash_completion ${PN}
+	dodir /etc/env.d
+	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+}
diff --git a/media-libs/lilv/lilv-0.24.4.ebuild b/media-libs/lilv/lilv-0.24.4.ebuild
deleted file mode 100644
index 19de278eb55a..000000000000
--- a/media-libs/lilv/lilv-0.24.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
-
-DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
-HOMEPAGE="http://drobilla.net/software/lilv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc +dyn-manifest static-libs test"
-
-RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	eapply "${FILESDIR}/includedir.patch"
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--no-bash-completion \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "") \
-		$(usex dyn-manifest --dyn-manifest "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	newbashcomp utils/lilv.bash_completion ${PN}
-	dodir /etc/env.d
-	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
-}
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 4dc03e5f00b2..b949989695bd 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,3 +1,3 @@
 DIST lv2-1.14.0.tar.bz2 386438 BLAKE2B e09e6c2b1bbf24d5896e7803b970fd8877a5b6a9ded0fcf294561c365d5f0b2e89503c0306b02dd956f7ac6ebd9df4ca0c0a17564ef3851443d81847dd41b261 SHA512 6991d848ed9f04a48ca3070efc15af83431f680aa8a8559a02b1666f7b8d43af8e089f78c3b14ad3345dac32fd1c8ad0faf3a3f56dddc07c6f0e0aeef4077498
-EBUILD lv2-1.14.0-r1.ebuild 1325 BLAKE2B c374bff768ae6cb3e4f7edb5069690b36d556711dfd32f6d687e0ca3d49906a4589067b2caa2d8e0b5977b9a97ccd04ddf46de3cb0328d33ef06758b0df2ec0a SHA512 c024d967536c125254a24ef9c77cba3a71394507b60d0ad2d1cbab3f106fe895be470f2217c1c9fc8f6aa9ff6e6fb01bf1be98622dd04c6912a9d883014101f9
+EBUILD lv2-1.14.0-r1.ebuild 1322 BLAKE2B 684a2df3e27b4fa888c7218a258d55c5a3b4fd34718cc6ed4d05851e6a503b1808038cfbf4fac3b94712f2ac3a2377c2bdf49b888ec1b4c437fcf1bd175812e8 SHA512 8a1dc4d2e4b2d01f6e344fe8eaa4b2df598e9d300ac2fce40b24e13dbac4f6cb2337464b258de3d96d50393e96e23b4c1ad02b3dc29914e50c806f5a502328a7
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.14.0-r1.ebuild b/media-libs/lv2/lv2-1.14.0-r1.ebuild
index e5aff379a1eb..6c55e7291059 100644
--- a/media-libs/lv2/lv2-1.14.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 5f80e07442d7..6a8434002fe7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,13 +2,19 @@ DIST mesa-18.3.6.tar.xz 11882744 BLAKE2B f0f0de6d4c40cf01c6b9cb97d772c6386deb3d0
 DIST mesa-19.0.2.tar.xz 11959876 BLAKE2B 4d82a339a1577fb156b48d330157894891326f36cb265421453a5fde5086ee05f83962fde49113f34917f750cfffb40c8bce84bd003fe9d7c1e6900c52dc4d66 SHA512 6b317205efa7d62150fae23489fbad5f062ecde99fb5b210fa7ccbed2e0ef60aee1f1e66e2c606ea5d59193c3218f732556706ab3b645b175044342d88984d51
 DIST mesa-19.0.3.tar.xz 11963844 BLAKE2B 7d8bae717c0a2a6143d3aee35852145a2032d40ad7f4edcd76eec46392f3917787592d13f9695de54a15ea5bcb3dec3181c418ddfb5b69a3e1b52fb796f04eab SHA512 aa170577252aa4157e4bd49076bbf6207e4aada9fc9f23b255de332e816f9c63e5661f752f2f276dd43e232a8926866004e2a2ff9ad4b411330969c2a9a7ffa0
 DIST mesa-19.0.4.tar.xz 11964060 BLAKE2B 5c0d0c6e019792ff6cd195f3b59303e2230fa32c24aa1524c3cccddc56ef6634732e79ff03c7bb20055c0489dbdd7cc103b27989179602f3c9ab332afd531d1a SHA512 431cd9360e1f6376e0966daf82322877b3833032c800f2d86816b37a6f3978d76294a01c3905a01af610582c9541c2a8b52b2e89c56cc954651aa7a790e84ca5
+DIST mesa-19.0.5.tar.xz 11967816 BLAKE2B 941f99194492fcdf4545d06d4f2d576a1a2b206aa9211dd8c3a018877a42dfac4a6d7b4103e781e4c4211661c118b663225252567e22226a866386a8e242f177 SHA512 aecd5ee54ac0316d5e318dbea0abdc06f23e67d75d36eb82d6cf6a396c9e850e1ccf4fa8815f8c4097b6039ebb1524673189350cbfd4b766ce75ce17c26d9d8d
 DIST mesa-19.1.0-rc1.tar.xz 10877180 BLAKE2B 1ea358595875fbe46b58f5445762cec0c0bd6ee087ce9819237373e2b41aacb64365ac9832b20b9f5fb8838c3d2c6c929cd642bba18b99c7ef153ca124135918 SHA512 a56215882a7c22b7b8fe57d5703914d674841e4045676e2cc2e7834d17f4d5a765516bec4f01eea6772c50e1d979cc430e032302f38c6e7a4274bc43a4d647b1
 DIST mesa-19.1.0-rc2.tar.xz 10876808 BLAKE2B 2da9603ea7ec5c1de94ee24c3200f570e4ea127601f370230dc1bf1b64167c6d405fbd6bdb4cdae6be46ed0ff1610f12c0445c3f5a65dd6559e91b6f664872ca SHA512 4d04bec48cbfb17d6dbe7b7700083612e46cbaad3e3630d6219fd1988f5e793cdb5100b8c2531a94b6078f8bb239fef27ed440122d12a2473be5be8648b6a8b1
+DIST mesa-19.1.0-rc3.tar.xz 10878280 BLAKE2B 0b95b82d46a2c72185652fef76a50ec82b51a2f8efa9ca72e2c10eb0443e9ba43c5906de37d2479dc97ed48a8932eebea27de7e08321d7d3205b188af9f64642 SHA512 740d5d13458b54e1942bfe7165938ec414aa7949aa60109ba872236f3b483c7305ac76b1b48c38dc6fd7691748106447757ac081f364952cc9e00f45fa9e2ea5
+DIST mesa-19.1.0-rc4.tar.xz 10877676 BLAKE2B 7d9237b56c74d72c3cf6a218aa3c72e7c3cefe2511a61a9c9a16dcab306a567ffdeb2d4745dcb4113667ffa4ab5b806677e3b065d8574c1cb44419b99d193569 SHA512 04cc5a537d803359b9eb3207f7b7ab1357126fe78ae0a0ba24df51d2fbbf4e0cf1815a60f99a10b33c822c08af0c84adef44849e73c883f5ce30fdae142c5b61
 EBUILD mesa-18.3.6.ebuild 13688 BLAKE2B e8738fc05efad0af1f627af3339abcb609d55bc656402f4a7cd10d0216a0bfd067ae401c357ce4d9bb7b82d81fb8df5129025840d557863a04f183c38a299ef1 SHA512 9a99c7afc94de3e259156b7e48a8059a90bf8069684ba3354e83aa599e50baf6e63ea6c87fbfd672e0f97bf8383cabe93b193d56df840d586929301fc920ae10
 EBUILD mesa-19.0.2.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.0.3.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.0.4.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
+EBUILD mesa-19.0.5.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.1.0_rc1.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 EBUILD mesa-19.1.0_rc2.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
+EBUILD mesa-19.1.0_rc3.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
+EBUILD mesa-19.1.0_rc4.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 EBUILD mesa-9999.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 MISC metadata.xml 2041 BLAKE2B dd7f78a57123408674d7ca6a8e7a455e84ac668bf9e6552502cf62dc2464f1a62765db5c22c0d4dab82e59a5325ad10d69b436aab96b5a4d5c789f0a7b671469 SHA512 f07128004b03ddfc6d235de15a95c0bd6338133b13daa31907bd2897d65eaa9c8ad1164ec5e21fb7fa6417927a8109cbf86b24bc62b09cfa29d0bb18fcd3c4b1
diff --git a/media-libs/mesa/mesa-19.0.5.ebuild b/media-libs/mesa/mesa-19.0.5.ebuild
new file mode 100644
index 000000000000..6e5cc0499b8b
--- /dev/null
+++ b/media-libs/mesa/mesa-19.0.5.ebuild
@@ -0,0 +1,525 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 9.
+# 3. Specify LLVM_MAX_SLOT, e.g. 8.
+LLVM_MAX_SLOT="8"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-9:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_imx imx
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-19.1.0_rc3.ebuild b/media-libs/mesa/mesa-19.1.0_rc3.ebuild
new file mode 100644
index 000000000000..20146f77c705
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.0_rc3.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+"
+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. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${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/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-19.1.0_rc4.ebuild b/media-libs/mesa/mesa-19.1.0_rc4.ebuild
new file mode 100644
index 000000000000..20146f77c705
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.0_rc4.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+"
+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. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${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/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 95fbfc52ae1b..ef03ecbfe098 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -11,5 +11,5 @@ DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10
 EBUILD openimageio-1.6.13.ebuild 2374 BLAKE2B 673c04d398240d55fe684085300b47af5addea2ba60ae26538fa9af51ee7d3f5465a4155a29568b4eb3e33b260e89b48e4fcd9eea22f0e202b3e417b6f4ab729 SHA512 873b3a91ef4b5e521cf6b84daebb653854e589184ebbf12f3e6d9cd7bb43742bacdca3cd7b4b12cad3841c21435f0f6c7a04d8dfb848a78b94772b6641402cd2
 EBUILD openimageio-1.6.18.ebuild 2877 BLAKE2B 80de70165e8db192ef9749f2cdf305ea23d8bb902d8fb099ede3ccd9b7ebb02ced99f3e24262818ef0f9300459e3edc114bdb5472a4deab2af16d88ecea69a82 SHA512 bc90dddc03af90704d0c13f1f21db3825a0d20d0da1d01696313514ffbf1f846bf030a618fa22a4c11b6f79428ca0946ad2318d21039cd70f1c14c27294a87c2
 EBUILD openimageio-1.7.17.ebuild 2992 BLAKE2B db39f2b797e3b0ec9ffcc9825b5a854f1deedac007a25c5e1a3ed0de5ee976e777238975935a99f6d52e71f24634897bd0673da10f22d42588408c051f07ca8d SHA512 e80ec5440f7f9544d3ece54920d72a42bc751028c1b9ac7876e03012d0009a26612f1031e8dba5622fdef902591fe92872218f45c514f3b61b3c34eb9039d910
-EBUILD openimageio-1.8.17.ebuild 2934 BLAKE2B ac536446a34d9723883192a04fb8dbc551ab8a48cb7e9f4f3168e96181e73e17915961a8f7c7b09a2c92d42b237ac8652f23cbe66b6ab085286dafb435a7fde5 SHA512 5e5f253a0f63c34a07b85cdddc7a9559eac48230627d6fe686e6a1fcbea68c49fa22c64c83c31c3f0f7d25c1159a8f9f66f2621aab3cc90925a2ee90d72900ce
+EBUILD openimageio-1.8.17.ebuild 2933 BLAKE2B 20b7b4389878b57e1258d3bac400817bcc59103d0c951fc0ef29eda569ce87a976dd50814bcea1d40ff5f097480ab4102ef87ecb16a8a5ece001080c4f8d43ad SHA512 9389b99e3664d31ce57b20225fe8c3a26cb75e12b4f463f26da6bd2ac6b28562a8a78ef9974b3a06422b576b5fdee4c28c7e8085e7e6aca7b42c577c03408720
 MISC metadata.xml 940 BLAKE2B 540f2e00e2790b5e1ec7af2f9165d8a911151c9c9d2d6dbaa80f697ae91fcfe4889ec68141ed18a321550f7b9a3a14a306de5199e3cd603f4f6b5a019005f815 SHA512 ff5c1d96b3de7d144f2cd7bcf55c9953e7e385717ad49d009adef1e21ffa32843350a71f98210b724fb74af916be98eb4f5d2927c58b4a848efbffd85f39d933
diff --git a/media-libs/openimageio/openimageio-1.8.17.ebuild b/media-libs/openimageio/openimageio-1.8.17.ebuild
index 0dee277d54f6..f3c032132eb1 100644
--- a/media-libs/openimageio/openimageio-1.8.17.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 X86_CPU_FEATURES=(
 	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index ca994274d8e2..d7440d622952 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -4,5 +4,5 @@ AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82
 DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B f169b5c58877d1dd4ea45cb04d52567803da7c2d11edab072e2b65583109c7c2d52abe07f5bd2b03cba215cdb524a0468900419d8381e95c35eb2f3f4bebe02b SHA512 7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418
 DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d SHA512 65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81
 EBUILD opensubdiv-3.3.0.ebuild 1642 BLAKE2B 934fe6e9f491dbb4ba0e36bacba6ad2bfae774e33099ef3b966573288e1479452bb769ad9c6619b4e859feba89963348d56cd45aa5aa761399dadc485895bc7e SHA512 0bae40e658414b4cf94750fa2b680069be3e63b9a03880a01454db0eef78094ee2d726f12bb967de33003814d6c0241c832158fef7f32402ecceb7adb8bba189
-EBUILD opensubdiv-3.3.3.ebuild 1602 BLAKE2B 5c4758c2b2c89ac6c10f0bf07a32a20b4ee9ff6bfc0d4de292e3d32dfe06103cb5a8fbbdbc86f61096f9d946292b4c4b827ec2285242ffe9110bcd794773b3a5 SHA512 ade1a653e9d368b35bbc1b2ffeb0ae85c4bbb7c057911b2e6fe19899ec8907bb4b36e21077cd3615431d0e3ecbd1d2515cc44d5bf37dd8fd8d918e15fe365b58
+EBUILD opensubdiv-3.3.3.ebuild 1598 BLAKE2B c61ed763e2567b091e040097605cc646d80c48ce70842e816bccd3acfd03c9c36fbe6577229067e8a06720ce474c1ce650ce64c3b40d49a034c54c17cc231e82 SHA512 ab2e4725f77f7ef0cc804382af8616d06009c16d252c8fb9a880a8b8a8dfa87912436cc861652f31582ca374e7043dc28960cb6c6bb80fd098a382f7adf02cb2
 MISC metadata.xml 1145 BLAKE2B 21093cf63091de9706146ce01ddacd277ac425d947260ade355825eca4b0aafd0d0c487c8f85c66e3d455b766d4c566f01dac3ec0275018fba37bc30b2bafce8 SHA512 c9dc92192cf95c30f14516635a3e656a09f080aafc4404cf506e012e8d32173fdbdca63edef8f0c2769928eb62c9900ae810cfe4e64a95a735da5744c502ceeb
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
index 043b810269d4..eedadea99852 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cuda doc opencl openmp ptex tbb"
 
 RDEPEND="media-libs/glew:=
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index cb4324cb3cce..f278cf85bdf4 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,5 +1,6 @@
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
 DIST opus-1.3.tar.gz 1032750 BLAKE2B 7c79cecb957b0353e35758989b07502f2d4531869985639a069dec8737c15061b56ebff5babe31ad316afa9f7787bde6a7c544fa5be10c1e02ccfdff1a80d5c7 SHA512 438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518
+EBUILD opus-1.3.1-r1.ebuild 1076 BLAKE2B 1c000ae3c6c4b41f2248b691deb56f372c1edc1927b0e08762105ba2e21ef4d01aa28531f8a5ff80b5b1b3bb8877ae221658710908f8a568820350bd40ef5d4a SHA512 c230cb39ccbec327464687d9b4b97ca206a7626cffbbcbb317df282c42be54b29b0e50072f9f421ffeb590d82569e5a34b5b185b5ba8a6cd7b7d74a17d44dcbe
 EBUILD opus-1.3.1.ebuild 964 BLAKE2B 82538fba16a8dee170c25bc980d1bb1ee7f385a5c3cab51189e9f5f99bfc0415f4c556df33867c2ba97918e8742e17eea128abda22fda92b5b0620939198b03a SHA512 715f7aad4d3abe10b3dde5bf7c5010f3a9d0eb12c5b6ccd819ce754633089c3b35cee2d51bf366ea879e22844c2c25b29128f1828b836b00dff43cef967e70ae
 EBUILD opus-1.3.ebuild 1180 BLAKE2B 1765b021157f54843049a524b645eb65b1b2d2cea298447c281a89e8c60bfedfed3197695b07b9c5f950bb1707a35c3d1dcc121a29923731410a2eacf3830db2 SHA512 d601b387e877d1b72a1672a9cc5eab1b650e595f6cf7010676e57250fbfc2a8f9a157a562cf52a8cf9ec1ef197a318e76e6e61a797ff2606f725d07c43c2820a
 MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..6658b6af7997
--- /dev/null
+++ b/media-libs/opus/opus-1.3.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Open codec for interactive speech and music transmission over the Internet"
+HOMEPAGE="https://opus-codec.org/"
+SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
+IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
+
+DEPEND="doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable custom-modes)
+		$(use_enable doc)
+		$(use_enable static-libs static)
+	)
+	for i in ${INTRINSIC_FLAGS} ; do
+		use ${i} && myeconfargs+=( --enable-intrinsics )
+	done
+	if is-flagq -ffast-math || is-flagq -Ofast; then
+		myeconfargs+=( "--enable-float-approx" )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index f290a7bfceb2..064c50654b30 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -1,4 +1,4 @@
 AUX opusfile-0.11-libressl.patch 6273 BLAKE2B d4868792619ce83d01994c034f9605a86929e52879a22010c0cc00c512a5b8c5abe2261e406616c04475307b7f9d16a5bc57281304d9462b0317849e7ceda922 SHA512 1eeb55595a125bd43469f47073f78bf392bf70ff5e1f94192bf9a5cfad0fd3a3887d9b38b10290cd32d357d8c6c1e00feddc4f6fa14f652ec56a7d365280d812
 DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc4481ab4652a0be9171d45fe2e855e0f17801cf28fda66f44496ba9f9a2996af7e5aaf5b008e4c3b14263f3160 SHA512 ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349
-EBUILD opusfile-0.11.ebuild 1017 BLAKE2B a7990aba568dcd9ba45948d658d101b568f3dc72464e91d64a0d25460dd4eb3c575dbd46f90d6f8ecfd1459a25d7692139703137a5fa3df9e56b3e2c6a807df1 SHA512 07f8e3aab8f9dbbf911b926e0d3235ccfb8b95f4ccf74e8e8d7c0a353a1037a3c37f44a451f49dfb3df759b11733bea7f2cba5d60f9fcb4561cf9c8a311ceb43
+EBUILD opusfile-0.11.ebuild 1016 BLAKE2B 7f55b954fe3c86b2c04d2dca463fb5383f3cda1d722fb7a1486e8766ea154f5b76920627a35fa898e695d2e5423715c6866fea158154d370311c18b0f0a18304 SHA512 b82e7d9905522a76ef6e89efb838de195cfd772bcaf5bd2ce5ad997e45aec8512807af9ae42a8f6bd31473ec7f2455383c10ebc5a13dc2261da1934b6bab4c5e
 MISC metadata.xml 574 BLAKE2B 67bceafd9042cb07a851772ca2b78b542783c6fd4e9bdd5e44643a36652e24907692465390b33ceddd44d37be297b096129ecb92940fe5d7ec5aedbd709c8cb1 SHA512 12eaea9edb76ed36ac8cd60af4b14cf395b4fcb81f4d3dabb1020a0139f05e05fe80bc800080913e66fcb967d4ed1de6b37238a7b0d72dad69de505354aa3830
diff --git a/media-libs/opusfile/opusfile-0.11.ebuild b/media-libs/opusfile/opusfile-0.11.ebuild
index 949489b0f499..2803e3398d14 100644
--- a/media-libs/opusfile/opusfile-0.11.ebuild
+++ b/media-libs/opusfile/opusfile-0.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 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="doc fixed-point +float +http libressl static-libs"
 
 RDEPEND="media-libs/libogg
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 33a33e218452..16aceb61e155 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,6 +1,6 @@
 AUX phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch 998 BLAKE2B 6f659a6a6aad157ad708934a165f17ca4766dec3baf3cdd03e5b10b41201751f17008b43b6183df9afeba7303603fc9c1fcc413bb16a2e97cd571196ce2e6905 SHA512 c97a88e86ef3f56fdcdb12d3256afce34381ec1072ebbeda7c427db7a9c000feecab5f84a44d9a86fd099b26cda6a8a50a0a4c20139167e4e8b96c96368feddb
 AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08
 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
-EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1263 BLAKE2B 154bac0b193f03e113c557a30354197dd8c6546672c359a02608234a84994caf9aa57a3684acf5d89863f773e9d2d0b884ecadec9be66154fad143b6886d7d30 SHA512 1d4e74536fd35e1a04746fe6f9c9c50457ce19ec0cb056b9896a15613135ebb9d4235444dfd46fe98a612e5276e0e3055fb46f6291c1bd0b59637cf1bb59692f
+EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1262 BLAKE2B a3b5ea35d373f02fae13ab3461f31b12a629e3017375de6ec7112686d11b8b87aad215377aa26671fbbbd16a33cfa94d517874101195123a2b1b689fb5f46f80 SHA512 1aa2be3410239b3549cac802f74f61309a6a06cd01bbfcb5e805e8e012ebbb945e1e4a0d24fd0533a8e8cc3395df212a65a7f850f5710b7480e573e3e4d31b1f
 EBUILD phonon-gstreamer-9999.ebuild 1170 BLAKE2B 4490f89a367ac96fcebef6a32dbcee91aaa693066d744bed8d37540a0ff6acb4c8476d3e50f3bbb248f627179d8d79817c956539266265f3767a5a0dcdf6ade5 SHA512 3ab9128e35376d87edb61cf8bd616b7af43503781a3bbb2b1f79ed03b35139ba3c6cfabe8e57d83f49ba54492bf86cce12d21b21db66ea99af1f6df38267805e
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
index c80af05ae4f4..17981927f53d 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
@@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV}
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 1a5fb6c44ab6..0970e4075eff 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,5 +1,5 @@
 AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
 DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
-EBUILD phonon-vlc-0.10.2.ebuild 888 BLAKE2B a6886cc21e6937c26ade888dc11bfdc4b01772920e804646f5eebcfcb1bfa8c924dd66da919276574fb07a82809d1669c967d9ea19e0fd6e0a2cd413dd678081 SHA512 ef63ea128df69ac4f75a3b79f445293a3c10f9fc3622debfc0f431b7ccf3dd21128b48e606577609abc8c1952a83d6f91defe3483086353defccd22ad31f42e3
+EBUILD phonon-vlc-0.10.2.ebuild 887 BLAKE2B 97ac0090629d73ac4c0cdc17540fbeaf4258869ad16934b0277887c8bcf1de1ca4346a35b360089c029d289cd979dd11f6256794e418c0ff7fc3234de1c39c9b SHA512 33d774dc5a0c613d96de315754dc274fe9297eae6e7b08c42e7c6ebd283eb99674ec98b5afc480054265dfb0b5f6d39160b06a8fe101427de68b17e7c4b7b3e4
 EBUILD phonon-vlc-9999.ebuild 805 BLAKE2B 68dea701bda421326ea0b2fadd1c8b212442855e9c4a4fbd12d43e058dcb823a04b53b13a654102e58df26877dfea82cbed1c6735e78bd1076992ac5d83ff2e9 SHA512 608dbbd83aba883b269ea53ecf7eb816cd5bc9fa482c4bc9759f19cd7f51cde1940c3b9b157323b413eede37a8a1a9c458a0cdac0fd4ad5bd177486e0e23c172
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
index 7e86137ac367..9480384f2a52 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
@@ -7,7 +7,7 @@ MY_PN="phonon-backend-vlc"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 8bc50ff363eb..2e7a50bacef1 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,4 +1,4 @@
 DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
-EBUILD phonon-4.10.2.ebuild 1324 BLAKE2B 6ef0d20a4dbb85e7a3e79dd79912bd9cf1fadf976299b6da7d5afc99435bc887daa72dc454b7bad35380e616593527e67966bade83b8287781c1484e309064b2 SHA512 d2ec58720805baffc45efd4eb073e2237a04307a3131c87b000421b2f322a315d820b47f3e88c207dcdb6c0e1e107f229490323a16bb93f40c8988f477598d1f
+EBUILD phonon-4.10.2.ebuild 1323 BLAKE2B 005ac868e7b70caed892e2996cc8f670aac6c1f570d8509a7a82daabae23d59bf5f5165d5ca504fcfe450c802fb6770e1f274ba48c2dc097f3d36d4045dfd6d9 SHA512 cd537e3be7548d6db5d847d35f0ad22a4823772e2f5cd42ae89f0fb90c919752a9a55d5324d29d90aaaf8497b0518b2c5aca373607edf4df3e75b0df6dfeb413
 EBUILD phonon-9999.ebuild 1326 BLAKE2B 7c6d2b1dc638e0caaa10c788fcb50a56f2aabbcdf1ce4107713b5aac3b89efdbb49fdaebbd18f8c6e6728751db0387bba79f3df91dbee99d503308d83d97bf97 SHA512 88475f68ad0c6ebee1cea8783990d1bd3d269ac4834495094773dca906bb094e37c37abeb64b300584baa6049d273e73954f7e2009d36c2257e67736807275b0
 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/phonon-4.10.2.ebuild b/media-libs/phonon/phonon-4.10.2.ebuild
index ba2947c3d6d7..fb59dd89f044 100644
--- a/media-libs/phonon/phonon-4.10.2.ebuild
+++ b/media-libs/phonon/phonon-4.10.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index dea76764011e..3d0d49f3ced3 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,9 +1,11 @@
 AUX ptex-2.1.28-20170213.patch 2324 BLAKE2B 1536d8b2f8c6c28718ae81a04e3041d5c25f562647e84a098500ca523cb2c4f0743b812e3a1fb9838604752a41b07d1dd41f65d7a9c2bca7a84cc25eb312f3be SHA512 dcdad0e6b2b37c523b5b54c4d885cd99facd7d50733150b2c75fac3b600010c61d2c219a14aecc24a86ff869b62a962e975dd5790228112fe004aa2d8b2fa51a
 AUX ptex-2.1.28-allow-custom-build-type.patch 1410 BLAKE2B 9d1bd1b41752bc3d8c21f72505dbc7c2bafccadcdb1ace339a8f25045f4e2b527af0b3263d4be2f5883912eca733d74cb20aa10eff6792ff89f288e34d27600f SHA512 fc51d24895c7624ee610f5f8537bacc15903816cf4cebb2c32f15afa6c9ab4dd087e21018a81e4d032b37735bf4fba73a406acef8e0c88cebfd6606ba2b11b24
 AUX ptex-2.3.0-cxx11.patch 399 BLAKE2B 482ff38239256f3195d13478a461c45eb812e1f4f047dbbebd275d77edca71273978c183360a6428ca411029be4174637bc591846554ad37af58cf64ee80d6c6 SHA512 9ab265f7d330142453b8b135ee32fde20b70ce6b17266ff61051682d6ca620a9d55c40f199c52feb807372cc64c21e1905907c10b609d2e5f07e572451c9b1d6
+AUX ptex-2.3.2-cxx11.patch 828 BLAKE2B e445858c625de0c924a412690cbf2f1bed6ee4fd7efafd60765a4f43fa204ba474cdf2944acf3eb94b061df6c39cd9016413e6c5d73da3813144fa289746ceb4 SHA512 53d6e66dd4a35dc2e16e5f227a24ec90d3f7667c5f80dc3d7321086b4efb4d63451783450a02a389c09a3faa6808cd90e89e2097390ef9881ffe313fbfd8c6d1
 DIST ptex-2.1.28.tar.gz 305327 BLAKE2B 4a91b08ae326e8ed8d420022c693ea60cb21908380b8c49a7672771686f9dd2ef05151b7d43755bc63ab6624db772c2b53d1ffdcdea9c1dff7627cc3fe0f3b15 SHA512 ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8
 DIST ptex-2.3.0.tar.gz 306462 BLAKE2B 790e3623ce6ebae2dfd8884d8e19e62395c54432289d88bdcf3a01c8ae1ef752ca88869357ac1e4657d59f1ca73d311a3fb9a08efe4e145ca259eff93d8a3b6a SHA512 2d9d320e4205236a4eff05ec3c67d085624809ebefa89fa3b943d18a8b2b6a5f61c022a4cc4363a7c6ceccfb9eac4f8738dff2e90a3355814f2c4ff096c09992
+DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
 EBUILD ptex-2.1.28-r1.ebuild 575 BLAKE2B 5ec37846a07464082c8863b53e523f1b046151f14cccb7b19672028560072703b303feeaac156c78c6a7006d79bed649e9a24d5dac6f2e81985e57077595850e SHA512 0289b417671552ad7400b5784f985d1b3d405b07d10e2101a06289292249d67ab88ad1c041f5641ea724de59a0285797fc7435cc68ad9f3c550bbb30b55bb967
-EBUILD ptex-2.1.28.ebuild 544 BLAKE2B 60cb8bb36eea64f38f892a91bd270eccfaae2b8f409a319688e491069e7c02739977f95663b7eb4aaadbe368ef069d444902dbf3acb13d4f256c4313a5a0fb51 SHA512 546b82932cdb673e44b6aa7e843e8f96564cb22436e274678c0910d4beda2cd483812cc5a6b4b03bab8c2dcdf028ea3ac62bcffd088bf1f51c8a974e9e58f39e
-EBUILD ptex-2.3.0.ebuild 663 BLAKE2B 6ff6a2c7e2668e6ce4dc60e666f5ed32024d9864375a27c8c060fad2baeed6c7105dbca800ed04846ef017f5042e4e75e2a6e6a072c694dc78e4ea6165b4bd81 SHA512 8d280943a293511704d4835c97f75451fa02ec0ebc4b4fb386b948a903e8c8dd7e7679264e64d0700df3cce3e2ae0973da7cef567874001f17dffe8a4520fd7e
+EBUILD ptex-2.3.0.ebuild 659 BLAKE2B 22ebe67087dc4ce5549dd32b35becb3b2606ae7a9c86ea19b29bf6f9a2165c1648b10f7970b3be9fadf2449d71a78b24232155d038036e3cdbc91be27ab33ce8 SHA512 e6ba1ca758119dca0e886a7988dfdff81ea1dbed0a0e84fffeb13bdc1cc140781250f6515cb8a568f5000383b01b2435caf2907d8116e50034418c8108447ede
+EBUILD ptex-2.3.2.ebuild 793 BLAKE2B 4e038fb24bbe5c65fa973fde8d294a980fa4c04d9a73abdb5e6df43b55529ce7eb853a2fd6132b12324a2f634d7dde11aedb6a6fef0b0a228390d227ea343ef3 SHA512 0c88c278faaa06bd433b12a0e935a0faaad921b2b099b0b74cc811a947ffedf06bf13b1b3797f57ad056217984e6af5fd22dc4f41932f3cc53bd6bf734930a29
 MISC metadata.xml 646 BLAKE2B 443223f4b464d16d2e7b4ea692b080f49aeceb1ef4d599d5dccd5aab6223e8f3a562317f7dda0cddb79840f19270f65af948df153cb2064b903f80e00580ee8e SHA512 ec1b3e3f8b15023413723136125ad6a92b7a509532824fcc547bcfe147e63a60e072496cbfa2337bb180e9c718fbe9e49c198f469a9e41a252b1706cf6cd461f
diff --git a/media-libs/ptex/files/ptex-2.3.2-cxx11.patch b/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
new file mode 100644
index 000000000000..f35372b7c636
--- /dev/null
+++ b/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt	2019-03-08 18:39:47.000000000 +0100
++++ b/CMakeLists.txt	2019-05-21 23:20:50.964082298 +0200
+@@ -5,19 +5,6 @@
+ option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex shared libraries" ON)
+ option(PRMAN_15_COMPATIBLE_PTEX "Enable PRMan 15 compatibility" OFF)
+ 
+-if (DEFINED ENV{CXXFLAGS_STD})
+-    if ($ENV{CXXFLAGS_STD} STREQUAL "c++17")
+-        set(CMAKE_CXX_STANDARD 17)
+-    elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++14")
+-        set(CMAKE_CXX_STANDARD 14)
+-    elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++11")
+-        set(CMAKE_CXX_STANDARD 11)
+-    else ()
+-        set(CMAKE_CXX_STANDARD 98)
+-    endif ()
+-else ()
+-    set(CMAKE_CXX_STANDARD 98)
+-endif ()
+ set(CMAKE_CXX_EXTENSIONS OFF)
+ set(CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS ON)
+ set(CMAKE_INSTALL_MESSAGE LAZY) # Silence "Up-to-date:" install messages
diff --git a/media-libs/ptex/ptex-2.1.28.ebuild b/media-libs/ptex/ptex-2.1.28.ebuild
deleted file mode 100644
index b766367ac446..000000000000
--- a/media-libs/ptex/ptex-2.1.28.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
-
-inherit cmake-utils
-
-DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
-HOMEPAGE="http://ptex.us/"
-SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-doc/doxygen"
-
-KEYWORDS="~amd64 ~x86"
-
-src_configure() {
-	local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/ptex/ptex-2.3.0.ebuild b/media-libs/ptex/ptex-2.3.0.ebuild
index b3cec3d387bf..ce1f9fd9c98e 100644
--- a/media-libs/ptex/ptex-2.3.0.ebuild
+++ b/media-libs/ptex/ptex-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/zlib:="
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
new file mode 100644
index 000000000000..b9d0f650ba96
--- /dev/null
+++ b/media-libs/ptex/ptex-2.3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
+HOMEPAGE="http://ptex.us/"
+SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+BDEPEND="app-doc/doxygen"
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-cxx11.patch" )
+
+src_prepare() {
+	# https://github.com/wdas/ptex/issues/41
+	cat <<-EOF > version || die
+	${PV}
+	EOF
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html"
+		-DPTEX_BUILD_STATIC_LIBS=$(usex static-libs)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/pyliblo/Manifest b/media-libs/pyliblo/Manifest
index 07fe7f70cf10..49b4207d0bbc 100644
--- a/media-libs/pyliblo/Manifest
+++ b/media-libs/pyliblo/Manifest
@@ -1,3 +1,3 @@
 DIST pyliblo-0.10.0.tar.gz 29702 BLAKE2B 6120003aba9990a4c9d84050a3501e4f2bb345d7b454f47ca2689091c3dcfa1c59c85ff8c2a7b7d0e7a6b9ee87c291ebceddf09cd9a1a39a0706ae463394e407 SHA512 d2a3d47f6c52d310104256d33fbd5d652ae6bc8cde32c2d3b2f3f407b8a4aba99028e57cd466804d266f63468a6c792760f28a43dbabcfa3330e0a852ee4d4e3
-EBUILD pyliblo-0.10.0.ebuild 526 BLAKE2B f66b2141b74f72002529fe53928ad8241727640a507fa4cfccae0718ae5b9d65f0dbb72106911afc026c4fd30de3ea83465c37b90e54dfa96bce2a011a54816c SHA512 80c6b9eee1e19151df6404a9e56bef0993c840862125030ed5996189b32097262de705c9bec8e3de49c2a539f6ce94424aaf75dc3499f4f86ef6ea28d4469c17
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+EBUILD pyliblo-0.10.0-r1.ebuild 525 BLAKE2B 70f86ab9c9431ce5ef0946b704602d0f9887618b20530c40b05eafbdd1561fb37ba16ebb3193f163a4c8a0983d2de0d1ba3dcc15b52a3b36fde5072c6b9f32e5 SHA512 d90afe286c0f6255ba1a7e0d49f1b7ea3ea8269154e25943250ede7e584e3cec3004077bcfb34280ab79e9cb89208225203f9d0c3cc5692ac783fc6fd94b88a8
+MISC metadata.xml 443 BLAKE2B 0f5ca85fdee859d34612857810740cc23f7e82c757596afbcf33b4825908295d2d49f93ab27acf2e5ce66a1999deded0c30a7d90d2fdf88a609ac19e7d073bea SHA512 258fb4656807e957ee2172da4cebc2533e8367ccad076cbebd6e221cf76df046b748711d4d7abd73bb3c76e13102710beae0eb2ce74378bf1f15a2b8e9f41d2d
diff --git a/media-libs/pyliblo/metadata.xml b/media-libs/pyliblo/metadata.xml
index 1b2becffa26c..511c25a14265 100644
--- a/media-libs/pyliblo/metadata.xml
+++ b/media-libs/pyliblo/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dsacre/pyliblo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/pyliblo/pyliblo-0.10.0-r1.ebuild b/media-libs/pyliblo/pyliblo-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..1ec36208367a
--- /dev/null
+++ b/media-libs/pyliblo/pyliblo-0.10.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="A Python wrapper for the liblo OSC library"
+HOMEPAGE="http://das.nasophon.de/pyliblo"
+SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=media-libs/liblo-0.27
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/media-libs/pyliblo/pyliblo-0.10.0.ebuild b/media-libs/pyliblo/pyliblo-0.10.0.ebuild
deleted file mode 100644
index 7a81790300a4..000000000000
--- a/media-libs/pyliblo/pyliblo-0.10.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="A Python wrapper for the liblo OSC library"
-HOMEPAGE="http://das.nasophon.de/pyliblo"
-SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=media-libs/liblo-0.27
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 7e126539cdeb..2ccbb714e2e7 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,5 +1,5 @@
 AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd9db6e89225fcd8cf4c1eed24dff7bb5348d7a0985633a7f9173a5279b04ec277ad0f775a18c52ae33af86b6522a21a3e63123d162d SHA512 28e3137592c14dcf9fc1d8401e6bc58af7f1abcab4886acde42a03dd7b61aa9b176672300951f7b4fcdf5128ce445f12594f7a09444331d1d6c34aaa7a4b9cfc
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
-EBUILD raptor-2.0.15-r2.ebuild 1666 BLAKE2B 78585fc28baf38b7cb5e0dd8c1e68bec829b76ce162dde1eff8838199707cb7e04610c5558d4bca7f5db17f8c311e07a0cb2f500a71043df73bb95563e8cc0da SHA512 4d4dbffb61dbb1569fce9f899ded5d085a4b4fef2a581525cbcc4ebbceb2847b31ebf56393e6699a0a9cd4c076a09bf5dca7dc7991d5a49fd8b994ecc2c00769
+EBUILD raptor-2.0.15-r2.ebuild 1665 BLAKE2B a91c0579e0565566258a27c9fde285cc4fd03876739fb80b2936d26f43a9e35c378f406d92ad81a9220a6f9c6ba0d357372d73d5f77950d3b4787f5f237b9002 SHA512 0d699a6893b536d287aab45638c57440903b48bc94504001c9ab3076f36f6a3f7e37665a10b7b7d31ebaa62f2a1ec7e46b7a26a8968927a738fe886d6f2ca7a2
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild
index 2f77ba341816..d5f5f8bf1681 100644
--- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 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"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 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"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index efd23662402a..0d974208237e 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 BLAKE2B 0d63e0b2207d1d347ec882e610eb37a625811febc215f089eb00dddec92b1a9fe026d2ab7823677c46e595585f3b5e176c35f9ac1f9ec2debf430ecc3ea950a6 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136
-EBUILD sdl-image-1.2.12-r2.ebuild 1571 BLAKE2B 92b4f2bc93405c473d994dff82967804a8c88b6ed55df5fd7a5f9ea58cedd9f666480e354e180a88566b8847c0c0ecfdb9a2159c1e150da1cb362db2a886c5ef SHA512 8e1a1ebc29e9bc250c819707afcdc38cbee4ad10f5e79e207db677dc6745529e53456fb34d30de0ea61678fc04d0b17bfc4f17478eb1911f389ad27956edb959
+EBUILD sdl-image-1.2.12-r2.ebuild 1567 BLAKE2B f82c035c4dcb6e0fea028f51de86af261a9824b2880b64aad9d2bff24f62c9097f6ad936a7acc777ddd60555a4f63b4d12938b62d7f72574fb6b112068909a15 SHA512 7f1d37b4667404864b5baac84c94b417e21e996f557261b96f3d0d0b2a6bebc131642123009efa81bcc68492a440bb16f2fc747a13b96a977c01a136b04f48f2
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
index 6a9bc4aa1f1a..d9578965e6d6 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-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="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 6e0d678e7956..145de0ed9585 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,3 +1,3 @@
 DIST sratom-0.6.0.tar.bz2 149340 BLAKE2B c661e0c4fba0cdf6cfb8a7dba90ff92135422557a0721bc394c7500853aeb9370554df8a02b7faea2fa222b96db36b20b265cc1fa50e6e06655946dbe992f815 SHA512 899bb01896e2b65b69482041c7e06edc9e45e9a3466392c82a58f16dfc71462a6c3e3e16a5aa50a6347c8366ea72898468910a59a084762f75eb8c7031ceacf8
-EBUILD sratom-0.6.0-r1.ebuild 1211 BLAKE2B 65ab9257c47779f14a6f581b642c7a8c298de6fac338d2d1118f332afe29250a8ca44245e49c8dcd6aa5618a85f505cf6a7063fc11d53346ee11293be993ce98 SHA512 a2c3415150c0726c2cd57b90060befc756b8a2918adb871ee41520ffcadd84d50e208ed9dfd4d33f5cf3c8ded45a32ec08859cd909d1a6c7da47761e7a3f620e
+EBUILD sratom-0.6.0-r1.ebuild 1206 BLAKE2B 95cb41aa86be6f6c56be7375f6c9f5d6439d00aa7493a94577dc3cd4c8ea300dcf4d32ce27fce739ed7cefd4c8344d853ffc24e3f8116e64f6081ef5ce44d61c SHA512 58e56be4c0b43f0d29efd4fc75dece7f2b057e99c6cdea793e1109391a6ab91395e7bb624f8a3ac9b6de77b63fb725991ffa394a127b504bb17241c325de63dc
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.0-r1.ebuild b/media-libs/sratom/sratom-0.6.0-r1.ebuild
index e82dc65f00e5..5e284d8928ad 100644
--- a/media-libs/sratom/sratom-0.6.0-r1.ebuild
+++ b/media-libs/sratom/sratom-0.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=media-libs/lv2-1.14.0-r1
diff --git a/media-libs/t1lib/Manifest b/media-libs/t1lib/Manifest
index 2d3c8cc0432a..b35030029d69 100644
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -5,5 +5,5 @@ AUX t1lib-5.1.2-CVE-2011-1552_1553_1554.patch 5085 BLAKE2B aa10c8ceaffe6d827c38d
 AUX t1lib-5.1.2-format-security.patch 1357 BLAKE2B ba340f40284dd24b5e49ef9aca1a8fa3773d547e382cf5abd5e600ee696e615d050f69d1b974a7e442f70cc3cf80fedce6d55c6e40d12170a60376a3ebdb0a47 SHA512 7c7ecc3851c675780b15b185db1b6c0b412fc1eef7505c822b75163ebdf14762ba999486db3238adbefe1571b762e9014669a585a886e537068b8a38bdb85ec1
 AUX t1lib-do-not-install-t1lib_doc-r1.patch 522 BLAKE2B 37989b16132d84d67b5692fc7c15654f28156fb3162ba4c545ab01e238e95c60e422aa1b86d34d2c160600f0f55728ed637094a2b8fc951b7d338594510c104a SHA512 d77beebb581739f5646137d5c1aa5cf3d9906a010f07e3822040812822782db7712d4d18d6235dc22da6e4531daf81fa891db4c1047ad95ee702da88cb01688b
 DIST t1lib-5.1.2.tar.gz 1872534 BLAKE2B b6f2c17b8009feef3c0ab3a8314e89e421d90349c4465885c3478a9493b30ada9ad0a2f58e70ba863d91e305fbb52f90e6a42b492a0239e5245ff9132c2ba92d SHA512 9f424b19c6f35cc4f194ff7351a4c2352216462c7d1b1d9650ad3a05cf48c6e90c89ccbcda5ecc47a4169a39a850cf84a1fcbf88b3b15614860c27364b631ae3
-EBUILD t1lib-5.1.2-r2.ebuild 1835 BLAKE2B 6704f2fbf193ff10161019529217baf6d83aa5bda1132bba56fed3f26fa2ee6daf0f10e1413ad70bcf36880a8b3fe0e02ec851949134708a3598350833d02ada SHA512 28dedca5bf8f7c66cd6053c55a2038c1ad82d26dc50f069fd900fdeac172e619b568a46a8bab90c5fc2b629a47138539618df6d5ae9c24410310918c4420ea0a
+EBUILD t1lib-5.1.2-r2.ebuild 1831 BLAKE2B 9cfc9594e9026da63d6aacf49be5d547528a755e720959eba20f1713669fdf21e55db723239d4c63dea1da0ac0b7692d42bc9e30690555e3bd17435b598c6695 SHA512 873abde5b9ebe02bf7965eca48e336aca2fa56b6a9fcbf43547c54d2b8569562f364cee536d9a2ed00ea107cce447a1d65558e13cda902d5e70e44e048a326cc
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
index e763c5eb15a6..73c4cebaad8e 100644
--- a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="X doc static-libs"
 
 RDEPEND="X? (
diff --git a/media-libs/volpack/Manifest b/media-libs/volpack/Manifest
index da98b148835c..fef0ed293b23 100644
--- a/media-libs/volpack/Manifest
+++ b/media-libs/volpack/Manifest
@@ -1,4 +1,3 @@
 DIST volpack-1.0c7.tgz 1218492 BLAKE2B 8aa0e76da81a3c7a5050a42b9a16780e90142c0e9318021652b86473f2832cf6f88771c8bd461457ad07c85a9bd1d7723e46c283ea66227290c54d9339abca62 SHA512 1328918bb62e81a0aa9eb26d9b0cff98081518b0fc6c3457413870bb68c793d0d9bfe42d977fa5b5a7ad110358b736ce0d0aff8825333e32e37436d9dba3114a
 EBUILD volpack-1.0_p7-r1.ebuild 672 BLAKE2B be312bc5320ba58e0b10c27be211fcca474937233c12d0b0b6b64750e2b551ee9c0097974f490e32cbfd5635b83daf21703a46a1868fc6bfbfb77694ebbab05d SHA512 b83e161838144a016d45647859411a95fa668a9f76c5693166575e4ccab54b86c6460514935f59015a1f11910b369b1c072a575c388d32c4bc8019601fb7bb63
-EBUILD volpack-1.0_p7.ebuild 674 BLAKE2B b6ffa0087b0794f0baef431084a18ba6b09dbf1b733c2a38ade0838c228ea7de1f583bf3e4890c059043e5f2936bf360710d5f022a1ef7a3bd0d67848f74fed5 SHA512 29b0c08af2e942490f7a5fbd027a5725f0d33f67c9d131695e807267145bdd5c0ae6b68ac215ac40c75ee1f32b119dd969638cae659b4169b655ea8ac5aad8c6
 MISC metadata.xml 602 BLAKE2B 0c84144abaedf91f7ea53cf6e14c7b4e3c0b1b2cd49f641e4d1f816ec3443961ba2d0a5bd075694dc05e17aa3028a3a9eca82d04702963b84ea38bad397547dc SHA512 847fa128baf525bd7027a8f9c0ea6bc2d7210d488097759e74a51eb3d59dfa10fda597c6555b2d4cf8dc9edeec3d96ed249888d082ad4454a03d8966194488c7
diff --git a/media-libs/volpack/volpack-1.0_p7.ebuild b/media-libs/volpack/volpack-1.0_p7.ebuild
deleted file mode 100644
index d1467b65dbd7..000000000000
--- a/media-libs/volpack/volpack-1.0_p7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MYP=${PN}-${PV/_p/c}
-
-DESCRIPTION="Volume rendering library"
-HOMEPAGE="http://amide.sourceforge.net/packages.html"
-SRC_URI="mirror://sourceforge/amide/${MYP}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-devel/m4"
-
-S="${WORKDIR}/${MYP}"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/*.pdf && dohtml doc/*.html
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-
-}
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 9e6353aecb31..7d70a1c35e97 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -1,8 +1,11 @@
+AUX zimg-2.7.5-sse2.patch 9349 BLAKE2B 2b1220d747919074d400dc35d5a23d53be800071d386801c737faeeebf3694925c20de6e0198ef8cbb143580da46e136b24ad39831167440e6ad7415adb76a04 SHA512 c8f27676c441a76dac56b1d8e11229b6b5b9d515a99082d15af9a173b7570becb03961384c64ad62c908e1d64a4427e2b838836c65c1fd687773e6a2da5d6e38
 DIST zimg-2.5.tar.gz 213054 BLAKE2B 0532693c11c1b2bcc0d5bde3a0bc16bf4f736ceff5fcda5d9bf491fcebe7e8be538041cc536e40bc110e438370c8599ce0be35f71cea00429b16c6eeb680cb86 SHA512 7fc48c704b434d837c36d4bafc51b35789eaf90fc81a68dcd7ec546f1e82a3e41c53263f8d381541d5c0ce58e25dddf0adaf1c3575512842ae633b5581778938
 DIST zimg-2.7.4.tar.gz 246376 BLAKE2B b6a21a1f7ca5106810485a69bb4e8f1d59d67fe3a619fd0ac412b1e441fe2d8892f64826666fbdfa48ae441fa5a21512b5ba0977eeaca7dcb7e0fcc43447f6e4 SHA512 adbb525b2611ef5267a4c0d4e8c6dd164c2814241c4d58d5356545b23dcf0cbeabb140141ae6ff0e70ef8e0741e351cbfadbadd60923061ddd693a2c3d9e5fde
 DIST zimg-2.7.5.tar.gz 246416 BLAKE2B a0ce1497356238aee5d3965a7ec57f1591d51c5df2475fb05d208a07f1431f073f8caaac110775fb17c6df8f887ed974b53f262e01f5532de13dc4c539958c1b SHA512 600139f86b074f2ed9614daa58d969465fa3d1578d8165bd2f841193f7b793c4b36389064dd4eee8e01e66a745d1c71c62e5bdb0b5283e54c435ed4a130a5b3b
+DIST zimg-2.8.tar.gz 265363 BLAKE2B a8982c64325e0089617136fcd5d6ee429ab861e3b9445b9cc0292bd3bbd3abb5783e94983e3e802fd9e59c2c7089eeea176d1eda4f3a850379cfc4fb36cbc408 SHA512 1e89087a756798a7ae3bfae3bc8244b29ae8ae7f04f53bdf6c4d4de3cb11412dc1eecd95a4a121bb9077437e633f8fbb665522ff8112ade806d9191ea4b5f7bf
 EBUILD zimg-2.5.ebuild 825 BLAKE2B a44868a6c09dde69f9a14d88e292816982efe3d2a710be81eba6d6ec5879c23b2ffb24ca55015550854e10956efcb9642257889867e0d206302cf1897d472e3f SHA512 5630c26971ac2075b4ceb82f615b818d6c2a53a273258ad4a08bf154239ff552220bfdb7104f94e6a1c69e0e4ff17d0be7dda56c98fcb5fb99cbe44509efa42f
 EBUILD zimg-2.7.4.ebuild 841 BLAKE2B b4db5d33a6bb06230ffe472d9286828bb65972c230a89de9b5e32d3e862a3e5b090ba4e1b153c8282e7a570771904fafedf5a7411c3beed8d0634bc51f4e76c5 SHA512 e1ac5be82ea15245df6f1922b38422cf9162b05a6ab27e3a79290c0aebc51b4bcb7a379f38a5235ddc1f02a412142bd5b68ddbf6c4fa3a773d265cb52845ff81
-EBUILD zimg-2.7.5.ebuild 839 BLAKE2B eba010daef304ddef00bb8b47ee26e717fb0dcc55bf4368d0af1452cc918ef1e79ac7a55c1b39cdbf1d5a3fe69d845b530fef45e1ed93ab4cd82b176b0d09be3 SHA512 4886609730700a7776882df463c66b80ca8cc5bd9b1304454afb29173e4c382f61e11bb2f74b8e8c7df3960ac6bac40f6d472544eef9a39bf731ca0546e64c0e
-EBUILD zimg-9999.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
+EBUILD zimg-2.7.5.ebuild 819 BLAKE2B 971193910a769767c6793d576a7c15a1f39c9dc86609e3c5f6ef61716aabbfcf5b7cc8837c383d3d36a8f6fdfc504337e29bffa13b0810d270aba16d264d1655 SHA512 4bfeecc8a61a0c158397a4f84403ec2ced106573df74c7cd7b8518dfb934e4932646760a9ec56d7f91b38b7ec01087d8f9b400e468231b36b580835203e1d4bc
+EBUILD zimg-2.8.ebuild 778 BLAKE2B c272141d31c5e83e6a467c93804a25c78a40bfce9f0ebb57fe4205d049d1cab1216428a012a46f4a05010901236668c6c8441228345acb1cab7102a98b035f77 SHA512 d13477c97f3c807ea8ef7f3aa88d007dc818b851f9affc81ff204e96d07caa5953169b6bcb5f0ffca9466cb9eade87d5cd544ca298faf406173751a817c9d017
+EBUILD zimg-9999.ebuild 778 BLAKE2B c272141d31c5e83e6a467c93804a25c78a40bfce9f0ebb57fe4205d049d1cab1216428a012a46f4a05010901236668c6c8441228345acb1cab7102a98b035f77 SHA512 d13477c97f3c807ea8ef7f3aa88d007dc818b851f9affc81ff204e96d07caa5953169b6bcb5f0ffca9466cb9eade87d5cd544ca298faf406173751a817c9d017
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/files/zimg-2.7.5-sse2.patch b/media-libs/zimg/files/zimg-2.7.5-sse2.patch
new file mode 100644
index 000000000000..77483ab59e73
--- /dev/null
+++ b/media-libs/zimg/files/zimg-2.7.5-sse2.patch
@@ -0,0 +1,231 @@
+From e30112df0ca703be82ed2c852511916fc46defbd Mon Sep 17 00:00:00 2001
+From: sekrit-twc <noreply@example.com>
+Date: Fri, 22 Mar 2019 18:51:14 -0700
+Subject: [PATCH] colorspace: use bfloat16 for SSE2 linear-to-gamma LUT
+
+On Skylake, processing 512 pixel array:
+
+direction	cycles/sample	cycles/pxvector
+     g->l	         2.35	           9.43
+     l->g	         2.49	           9.97
+---
+ .../colorspace/x86/operation_impl_avx2.cpp    |   3 +-
+ .../colorspace/x86/operation_impl_sse2.cpp    | 104 ++++++++++++++++--
+ test/colorspace/x86/colorspace_sse2_test.cpp  |  14 +--
+ 3 files changed, 100 insertions(+), 21 deletions(-)
+
+diff --git a/src/zimg/colorspace/x86/operation_impl_avx2.cpp b/src/zimg/colorspace/x86/operation_impl_avx2.cpp
+index bbbbf896..f0e7f792 100644
+--- a/src/zimg/colorspace/x86/operation_impl_avx2.cpp
++++ b/src/zimg/colorspace/x86/operation_impl_avx2.cpp
+@@ -114,8 +114,7 @@ class ToGammaLutOperationAVX2 final : public Operation {
+ 	{
+ 		EnsureSinglePrecision x87;
+ 
+-		// Allocate an extra LUT entry so that indexing can be done by multipying by a power of 2.
+-		for (unsigned long i = 0; i <= UINT16_MAX; ++i) {
++		for (size_t i = 0; i <= UINT16_MAX; ++i) {
+ 			uint16_t half = static_cast<uint16_t>(i);
+ 			float x = _mm_cvtss_f32(_mm_cvtph_ps(_mm_set1_epi16(half)));
+ 			m_lut[i] = func(x * prescale);
+diff --git a/src/zimg/colorspace/x86/operation_impl_sse2.cpp b/src/zimg/colorspace/x86/operation_impl_sse2.cpp
+index 48645031..da9d4dbc 100644
+--- a/src/zimg/colorspace/x86/operation_impl_sse2.cpp
++++ b/src/zimg/colorspace/x86/operation_impl_sse2.cpp
+@@ -3,11 +3,13 @@
+ #include <algorithm>
+ #include <cstddef>
+ #include <cstdint>
++#include <type_traits>
+ #include <vector>
+ #include <emmintrin.h>
+ #include "common/align.h"
+ #include "common/ccdep.h"
+ #include "common/make_unique.h"
++#include "common/x86/sse2_util.h"
+ #include "colorspace/gamma.h"
+ #include "colorspace/operation.h"
+ #include "colorspace/operation_impl.h"
+@@ -20,14 +22,25 @@ namespace {
+ 
+ constexpr unsigned LUT_DEPTH = 16;
+ 
+-void lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, float prescale, const float *src, float *dst, unsigned left, unsigned right)
++template <class T, class U>
++T bit_cast(const U &x) noexcept
++{
++	static_assert(sizeof(T) == sizeof(U), "object sizes must match");
++	static_assert(std::is_pod<T>::value && std::is_pod<U>::value, "object types must be POD");
++
++	T ret;
++	std::copy_n(reinterpret_cast<const char *>(&x), sizeof(x), reinterpret_cast<char *>(&ret));
++	return ret;
++}
++
++void to_linear_lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, const float *src, float *dst, unsigned left, unsigned right)
+ {
+ 	unsigned vec_left = ceil_n(left, 4);
+ 	unsigned vec_right = floor_n(right, 4);
+ 
+ 	const int32_t lut_limit = static_cast<int32_t>(1) << lut_depth;
+ 
+-	const __m128 scale = _mm_set_ps1(0.5f * prescale * lut_limit);
++	const __m128 scale = _mm_set_ps1(0.5f * lut_limit);
+ 	const __m128 offset = _mm_set_ps1(0.25f * lut_limit);
+ 	const __m128i limit = _mm_set1_epi16(std::min(lut_limit + INT16_MIN, static_cast<int32_t>(INT16_MAX)));
+ 	const __m128i bias_epi16 = _mm_set1_epi16(INT16_MIN);
+@@ -73,16 +86,61 @@ void lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, float presca
+ 	}
+ }
+ 
++void to_gamma_lut_filter_line(const float *RESTRICT lut, const float *src, float *dst, unsigned left, unsigned right)
++{
++	unsigned vec_left = ceil_n(left, 4);
++	unsigned vec_right = floor_n(right, 4);
++
++	for (unsigned j = left; j < vec_left; ++j) {
++		__m128i x = _mm_castps_si128(_mm_load_ss(src + j));
++		__m128i msb = _mm_srli_epi32(x, 16);
++		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
++		x = mm_packus_epi32(msb, lsb);
++		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
++
++		dst[j] = lut[_mm_cvtsi128_si32(x)];
++	}
++	for (unsigned j = vec_left; j < vec_right; j += 4) {
++		__m128i x = _mm_castps_si128(_mm_load_ps(src + j));
++		__m128i msb = _mm_srli_epi32(x, 16);
++		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
++		x = mm_packus_epi32(msb, lsb);
++		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
++
++#if SIZE_MAX >= UINT64_MAX
++		uint64_t tmp = _mm_cvtsi128_si64(x);
++		dst[j + 0] = lut[tmp & 0xFFFFU];
++		dst[j + 1] = lut[(tmp >> 16) & 0xFFFFU];
++		dst[j + 2] = lut[(tmp >> 32) & 0xFFFFU];
++		dst[j + 3] = lut[tmp >> 48];
++#else
++		uint32_t tmp0 = _mm_cvtsi128_si32(x);
++		uint32_t tmp1 = _mm_cvtsi128_si32(_mm_shuffle_epi32(x, _MM_SHUFFLE(3, 2, 0, 1)));
++		dst[j + 0] = lut[tmp0 & 0xFFFFU];
++		dst[j + 1] = lut[tmp0 >> 16];
++		dst[j + 2] = lut[tmp1 & 0xFFFFU];
++		dst[j + 3] = lut[tmp1 >> 16];
++#endif
++	}
++	for (unsigned j = vec_right; j < right; ++j) {
++		__m128i x = _mm_castps_si128(_mm_load_ss(src + j));
++		__m128i msb = _mm_srli_epi32(x, 16);
++		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
++		x = mm_packus_epi32(msb, lsb);
++		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
++
++		dst[j] = lut[_mm_cvtsi128_si32(x)];
++	}
++}
++
+ 
+-class LutOperationSSE2 final : public Operation {
++class ToLinearLutOperationSSE2 final : public Operation {
+ 	std::vector<float> m_lut;
+ 	unsigned m_lut_depth;
+-	float m_prescale;
+ public:
+-	LutOperationSSE2(gamma_func func, unsigned lut_depth, float prescale, float postscale) :
++	ToLinearLutOperationSSE2(gamma_func func, unsigned lut_depth, float postscale) :
+ 		m_lut((1UL << lut_depth) + 1),
+-		m_lut_depth{ lut_depth },
+-		m_prescale{ static_cast<float>(prescale) }
++		m_lut_depth{ lut_depth }
+ 	{
+ 		EnsureSinglePrecision x87;
+ 
+@@ -95,9 +153,31 @@ class LutOperationSSE2 final : public Operation {
+ 
+ 	void process(const float * const *src, float * const *dst, unsigned left, unsigned right) const override
+ 	{
+-		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[0], dst[0], left, right);
+-		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[1], dst[1], left, right);
+-		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[2], dst[2], left, right);
++		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[0], dst[0], left, right);
++		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[1], dst[1], left, right);
++		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[2], dst[2], left, right);
++	}
++};
++
++class ToGammaLutOperationSSE2 final : public Operation {
++	std::vector<float> m_lut;
++public:
++	ToGammaLutOperationSSE2(gamma_func func, float prescale) :
++		m_lut(static_cast<uint32_t>(UINT16_MAX) + 1)
++	{
++		EnsureSinglePrecision x87;
++
++		for (size_t i = 0; i <= UINT16_MAX; ++i) {
++			float x = bit_cast<float>(static_cast<uint32_t>(i << 16));
++			m_lut[i] = func(x * prescale);
++		}
++	}
++
++	void process(const float * const *src, float * const *dst, unsigned left, unsigned right) const override
++	{
++		to_gamma_lut_filter_line(m_lut.data(), src[0], dst[0], left, right);
++		to_gamma_lut_filter_line(m_lut.data(), src[1], dst[1], left, right);
++		to_gamma_lut_filter_line(m_lut.data(), src[2], dst[2], left, right);
+ 	}
+ };
+ 
+@@ -109,7 +189,7 @@ std::unique_ptr<Operation> create_gamma_operation_sse2(const TransferFunction &t
+ 	if (!params.approximate_gamma)
+ 		return nullptr;
+ 
+-	return ztd::make_unique<LutOperationSSE2>(transfer.to_gamma, LUT_DEPTH, transfer.to_gamma_scale, 1.0f);
++	return ztd::make_unique<ToGammaLutOperationSSE2>(transfer.to_gamma, transfer.to_gamma_scale);
+ }
+ 
+ std::unique_ptr<Operation> create_inverse_gamma_operation_sse2(const TransferFunction &transfer, const OperationParams &params)
+@@ -117,7 +197,7 @@ std::unique_ptr<Operation> create_inverse_gamma_operation_sse2(const TransferFun
+ 	if (!params.approximate_gamma)
+ 		return nullptr;
+ 
+-	return ztd::make_unique<LutOperationSSE2>(transfer.to_linear, LUT_DEPTH, 1.0f, transfer.to_linear_scale);
++	return ztd::make_unique<ToLinearLutOperationSSE2>(transfer.to_linear, LUT_DEPTH, transfer.to_linear_scale);
+ }
+ 
+ } // namespace colorspace
+diff --git a/test/colorspace/x86/colorspace_sse2_test.cpp b/test/colorspace/x86/colorspace_sse2_test.cpp
+index d5130868..ecaa05e7 100644
+--- a/test/colorspace/x86/colorspace_sse2_test.cpp
++++ b/test/colorspace/x86/colorspace_sse2_test.cpp
+@@ -53,9 +53,9 @@ TEST(ColorspaceConversionSSE2Test, test_transfer_lut)
+ 			"162687e701627cdc17283a32c36ea711d28a953e"
+ 		},
+ 		{
+-			"492587e7ed75b7e3ab868bead6ade7a4137c6ea1",
+-			"3b0694e9fbce61466cb5a575f300d784089b6cad",
+-			"b68f103f52ccafae867d664d7f27fe56ae9208af"
++			"95f2715bd0d417028bebd5c5377180fcd5b01119",
++			"76f7c88b198f1ab08167f8162c1237b54f22007a",
++			"1099c3ae187c0a9f79acb9445761b6056218c779"
+ 		},
+ 		{
+ 			"4c0b5ffe768a7812d1ef102b4d8d52614838bc8e",
+@@ -63,13 +63,13 @@ TEST(ColorspaceConversionSSE2Test, test_transfer_lut)
+ 			"85a277a80dfca2e21789cedd76aaee307dbc4562"
+ 		},
+ 		{
+-			"df546ce0ad6f859499a96d2d697d896067e60e38",
+-			"f0041b8a008ab45f0ea1319090ac7e8be0990d92",
+-			"06880efb598e41f96fa79e04dbdfcccd50d6dc6f"
++			"5e35786d313e936566d9873ba7a08a8d6005b2ee",
++			"829fa88acfbbb26801871bf3cadf5cc2eb6830c9",
++			"f82fcad18a19b548d419a1952b6a7a423a684b62"
+ 		},
+ 	};
+ 	const double expected_tolinear_snr = 80.0;
+-	const double expected_togamma_snr = 40.0;
++	const double expected_togamma_snr = 60.0;
+ 
+ 	SCOPED_TRACE("tolinear 709");
+ 	test_case({ MatrixCoefficients::RGB, TransferCharacteristics::REC_709, ColorPrimaries::UNSPECIFIED },
diff --git a/media-libs/zimg/zimg-2.7.5.ebuild b/media-libs/zimg/zimg-2.7.5.ebuild
index 1775f6b60bbb..7bac59befc36 100644
--- a/media-libs/zimg/zimg-2.7.5.ebuild
+++ b/media-libs/zimg/zimg-2.7.5.ebuild
@@ -1,36 +1,33 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-SCM=""
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} = *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
-fi
-
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="Scaling, colorspace conversion, and dithering library"
-HOMEPAGE="https://github.com/sekrit-twc/zimg"
-
-if [ "${PV#9999}" = "${PV}" ] ; then
+	inherit git-r3
+else
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
+inherit autotools multilib-minimal
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 LICENSE="WTFPL-2"
 SLOT="0"
 IUSE="static-libs cpu_flags_x86_sse"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-sse2.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
-src_configure() {
-	autotools-multilib_src_configure \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable cpu_flags_x86_sse x86simd)
 }
diff --git a/media-libs/zimg/zimg-2.8.ebuild b/media-libs/zimg/zimg-2.8.ebuild
new file mode 100644
index 000000000000..d20d4bf58406
--- /dev/null
+++ b/media-libs/zimg/zimg-2.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}/"
+fi
+inherit autotools multilib-minimal
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="static-libs cpu_flags_x86_sse"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable cpu_flags_x86_sse x86simd)
+}
diff --git a/media-libs/zimg/zimg-9999.ebuild b/media-libs/zimg/zimg-9999.ebuild
index fe1991fc9e05..d20d4bf58406 100644
--- a/media-libs/zimg/zimg-9999.ebuild
+++ b/media-libs/zimg/zimg-9999.ebuild
@@ -1,36 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-SCM=""
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} = *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
-
-inherit autotools-multilib ${SCM}
+inherit autotools multilib-minimal
 
 DESCRIPTION="Scaling, colorspace conversion, and dithering library"
 HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
-if [ "${PV#9999}" = "${PV}" ] ; then
-	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	S="${WORKDIR}/${PN}-release-${PV}/"
-fi
-
 LICENSE="WTFPL-2"
 SLOT="0"
 IUSE="static-libs cpu_flags_x86_sse"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+src_prepare() {
+	default
+	eautoreconf
+}
 
-src_configure() {
-	autotools-multilib_src_configure \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable cpu_flags_x86_sse x86simd)
 }
diff --git a/media-libs/zita-convolver/Manifest b/media-libs/zita-convolver/Manifest
index 5072348918e8..e4784a431b6b 100644
--- a/media-libs/zita-convolver/Manifest
+++ b/media-libs/zita-convolver/Manifest
@@ -3,5 +3,5 @@ AUX zita-convolver-3.1.0-makefile.patch 1283 BLAKE2B 14b6b799ff67218b482317ed64b
 DIST zita-convolver-2.0.0.tar.bz2 12858 BLAKE2B 1801681e799a85cd9a5b6d724ea3928e379bcd4cde1e01a39dc714e9480bdc0dfbf777aa4230c42190fc9e98ee3f842f34bf5c65a53744ff6b977c231194bb51 SHA512 5e12e8785e3b3161e42bb3a65e63ec4d4d2d6fa5c11960e0843f3985d76d4f24d7a1d979d0a092dd0c5407b817b66e799da211fa0f7eb96f581ffc56950135ce
 DIST zita-convolver-3.1.0.tar.bz2 21485 BLAKE2B 7976bac136bef04091b76b55fd4afd5a18c7f269c1dbce8875bc7c8a50b652f3c2ddd3c5e71ae26896d906a17b78f2bcfab129c078c1d60f8871c9509bb173d7 SHA512 0003d4fffcc07b3e67d54996a63db35d537d97b26003e06afbeed19fba551d552d4d5a808a86b5c600f5254816c6b26db49f48e13bfa3c77d93d61956c479eb9
 EBUILD zita-convolver-2.0.0-r1.ebuild 958 BLAKE2B 29d71ecce58a60f5ccd52484fdaa6908a7bd0c65f5bb6e6c4b817f713fc49238847e43483e9e614141795626f8d64c0903e22e8cb1934e0cbab299d580cb8d00 SHA512 9a5d86ff5ebac7b440541e5d314c7ee0a87bc17c3a9b2f9c5b454203064cf15d0b4bedac91b1d50211285536391c866bf648f2f4f753557c5aa91ec49b74cbb4
-EBUILD zita-convolver-3.1.0.ebuild 999 BLAKE2B ad058daac14e1207521e1c00c11c246f81d4f4b8909b7d75bd5f83bda380fc4c236ef603cc8b0670d06a845fc29d3ed77e92f9ec64f1488141aa0559cc37edad SHA512 939556a6df4a88960ae18f819a2030acb6d8956bc8d7d6790d0aad31e11b46927e1d01d75daefa767e1399006e06795718687dffebbd2cff9598dfd4fb562169
+EBUILD zita-convolver-3.1.0.ebuild 1004 BLAKE2B 323f97cf35298f0803d54ca880f1ea9579d7ecd5bc5ce691f211188d0ce6405490f24a900c2038f4e6b1a1678e4c592c70965270f7678c2dd739f52331f6c8bf SHA512 8a56f6073c521e046299cb73b9fb6a91e8f4588e7f2b2d55160be83c4f55a09733c86ab847e111d794bc4d960e89e2dc608f206619b972bd9115f0ff72e0e525
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild b/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
index b4dbf0668a5a..22c6eb0b7048 100644
--- a/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
+++ b/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="cpu_flags_x86_sse"
 
 RDEPEND="sci-libs/fftw:3.0="
diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest
index 4458355d2925..2e480cb6a415 100644
--- a/media-libs/zvbi/Manifest
+++ b/media-libs/zvbi/Manifest
@@ -1,4 +1,4 @@
 AUX tests-gcc7.patch 677 BLAKE2B 23258f8fd35fd650524b8b79a324206e73ae8921792898f3b57ad9f2412b79517e4bdd9925ebb997b5066dacdad3d9c480ac8cd54d65b7eba44219ecd2f91f9b SHA512 88e19bbb5e81f506dc031a2d8c2232396840784d3b22cdc67f8358792020c060432881c3a8ca126a96e779f83a12dd8209d7691c14cd2857a536dc0c84f3f074
 DIST zvbi-0.2.35.tar.bz2 1047761 BLAKE2B 5fa5fec7e39c9adc6590f3f6841a40ca723ffb6a017854f71f92f32232103672a6f48678b244a84f0cad742c378ffdb247fe33e5e3cdb1ee4d737e92f650a548 SHA512 3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d
-EBUILD zvbi-0.2.35-r1.ebuild 1326 BLAKE2B 3a945e690fd0d86e3bc110da2b8700c0095d9cf6ee493e13c2aae46bc2d2ac37aa9367f2b94fcecfa380b4151f8670ad87114cadc6872e448ec509b6ce9cc793 SHA512 32ec6b24ea5f6d601bbed14d69d4c97c6641025800cf4b4b6747ef1f62643dfa5394cbfacd45d94913b627d10d0712134a37d45700c4d2658cebf5f1504d2d60
+EBUILD zvbi-0.2.35-r1.ebuild 1322 BLAKE2B 05e20cd52c5b3f5071bd06b081cb6ef04bc7bc322ce91ab254a5ae0be94f9153a6daf5ff6aa22d492806277e9ea18198664a162b373a097f2217d86297b6f2a4 SHA512 e4fb50f210d9beee3ec657a4546ba52f61f8c33851a3eb4c9d2c4d79846ccf784285b9c69d043500846a9759f00244d24af8d94f89de9029cd08ec17841af658
 MISC metadata.xml 244 BLAKE2B 55571cd41428f715036d3a2362fed34732d4e7508383a83799d507ec234175db13ca329b3c7b53487a3775149a8f16d26ea027ce67eba4bd8015a74810082cb1 SHA512 af9d2d89aee60846c292c11e0b2615eaedac9dddde3ff9ad6d4869892bd078ee0a16f8b87e17360d2c82561dd36c3c22bcd110e63835f4cba593e4f5f35db1a5
diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
index 3f634ef235c7..8b2f9be52bee 100644
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ HOMEPAGE="http://zapping.sourceforge.net"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc dvb nls static-libs v4l X"
 
 RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 0934c134bde2..bc8263f2cbb6 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest
index d69fad6866f5..9ae82b0633de 100644
--- a/media-plugins/gst-plugins-a52dec/Manifest
+++ b/media-plugins/gst-plugins-a52dec/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 EBUILD gst-plugins-a52dec-0.10.19-r1.ebuild 399 BLAKE2B 5badb061e541f634bb4bc301a4e2828f95f74bd239551c859ae09b3aeed94ea89a1ea743b26ee4011c3f9e26b1fce587b5bb59186c300b4d37f9420294de4c67 SHA512 81f762ae4e234a7a3f1cfa82ec0efb712cc61da6b4944b0242d5d7d273f3bbdf01f3f9471860778b23a75b654d7e59f2bc355f7d8d68faa81672630d17aeaf40
-EBUILD gst-plugins-a52dec-1.14.3.ebuild 468 BLAKE2B 39ff656f0ced442c5b74404b1233a061793b8cffd0b0011ff00051408a85e5142e37a4cd8108495e1d27fbba9fa5ccb80fdf6d94b8ff5cb0487e82ee0d9d5a8d SHA512 1e7110d88bac3e55e2e812844162125f6f4303c1c933b7008209a987133c9a4db98f45901c35dfd39a86e1b5140168a7a28e4e571bdae3206f35e268f35424ae
+EBUILD gst-plugins-a52dec-1.14.3.ebuild 467 BLAKE2B 4cb53fb4f5585638624a3000f3ca013483f5bf387877cf4f6a997375483a3cf5659bced3dac973ee932457e6b3c214bdbd408a9990fb9db8fdf8d69e9b37664a SHA512 68442ba40966455f042ddfd44e8f309290fc6cc5e9c5b4da6b8fe06f831993c4a0b7f3e95e5c47c73117f1ed9a89ce4837ae2aac9f514d3769bff44c2badad0d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild
index 775e2c8af06c..0f3fad7de4dc 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index 01f44e9a44ed..2639f00ca534 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.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-assrender-0.10.23-r1.ebuild 397 BLAKE2B a37da2f3411bf8a65a65bab2c0acdb246feeda44f7bf843f6fb20a39c9835e2dc9c332683831d628fc861c08c03303768eb728725462abaff417deed43ae2e1f SHA512 cce12435dac51172f7f263bd8c0c0ab33be80a6740584e1dbcb5b707ebf62c034e5d4da247e54639c1a6592cbe7d8be055d3f7b335331cb18629b52c279d18a6
-EBUILD gst-plugins-assrender-1.14.3.ebuild 409 BLAKE2B cd5208c056a97c8db32442968583d9b5f0f5563416653b39540bbbabbc1230e9d8fa5da1da0fba8754776a0aceec443de5ae11a77b6b311e7155b4d20465c243 SHA512 95e420d5c0c55185a4753bdbe227297a8cc4c80716abb757f55ee49e630831eef7c1953eed5e5abd65433148c22b61f60c09b8c8b612cd5c8d4e35ffd0857a15
+EBUILD gst-plugins-assrender-1.14.3.ebuild 408 BLAKE2B 3368af61edc30f07a3dae8c24a7a57931864a0c24b99c0cab175a86d26fbaf6203a4cdc1cc6917e772c3d986c776c496c3d682fcf154bb84aac709161ef43f29 SHA512 73df7c65b2ae72d8cc82341f66f259e2e5d8b7277f1a69a8a616e0edc75212fe6c067b44c95f8d892b99a0808b4ee535ceb0c81fec1cd8545bb67f6febdb5523
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.3.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.3.ebuild
index e168eeb3672a..1df5ef5c1a7d 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index e769b99f6583..ef157505ed1c 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 EBUILD gst-plugins-cdparanoia-0.10.36-r1.ebuild 438 BLAKE2B 056dbad1b9473f84356d9fb0f0ba8c0f7a0438e06b0353d4344c879e9092d05e655f2ab4141259412f621bb53218c454dda0033aca1dc204c5eb0a03c0612757 SHA512 8be7db6c102859a541cf40301567414398e0cd7cc51435956490af1a92a403444d252260178de83f48453ce701020d963fa0f95ff3bad03c1b7973a94ab5d4a8
-EBUILD gst-plugins-cdparanoia-1.14.4.ebuild 474 BLAKE2B b1e3e22293535da0286947c7f3e96d064ed4165fc0fc3b5546894bc9ec55a12e5bc5e4a855d360e63cfa40cc0af90147ed6d5d1b20bc6048631050ebdc17dfdc SHA512 0814991625d4f295b0bc05c6e89a78281302a0c0dc64c8d5ddc419e6fb0838a7b5634382411c2965a464142da3c161e8bebbe6f7130379b97ffec836ba4a11a8
+EBUILD gst-plugins-cdparanoia-1.14.4.ebuild 473 BLAKE2B ff93502a8f090ac1a47b62bf1ddf608b1b176d7ebdac5f14f69cf39324d7bd5bcc5f1a03a3786194ee954ae2f8ecc084fe9aa4096648796b5c79a0b95c38e8d5 SHA512 bdb67ce87f3b3e53008006f4345537490fab616700b35dc61c7e3451a5cb4842f9398b6aa8dcbde231452923aab1a28b444e8b99c4a8801b21a3474dccc39f02
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild
index 54bbd10aa97e..957796a9546f 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index 360af9a4f42d..4f2573629329 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-flac-0.10.31-r1.ebuild 402 BLAKE2B 7dbf745b4d3d9d276df3ca7ea6688b38bb44abd7f32babeacb64ac49bc52f05e73759a89fb53706bcdbcaf66b81fc96fa87dd5e61eb5351c12f69f54626c0873 SHA512 1d0231e51a2320544cb5ff13381b288693f6c43136ebf5452ef3ce46755fe0b4ed976a678d09cb2e4eabff13d3aa1f6b8b28c67b1cf26de93c5111944805474f
-EBUILD gst-plugins-flac-1.14.4.ebuild 411 BLAKE2B 239df299526394a514f7e1b1b7be3ddd771e3f8bab384f0cc23310d394e9ee7c568dcc5d693e8bfcecfcff5786c6c76c92841d23a287a94edc561477f7779143 SHA512 c90f9c3dd2bfc10e55be32eacf1b3a6c234582b0e6a81dbbd632319f20617b8a0d52531ef882991df40983e9df9c78fa59351305fa18709d9e3993b71e32898a
+EBUILD gst-plugins-flac-1.14.4.ebuild 410 BLAKE2B c648cc6326c14d01b2f27a130ce8bb928ae7f9b9c808134158377e7ce3f6b79b9e11ac0d432ef13297d786f92b4e697433dfa77735893e234afef83fae4b9001 SHA512 a066d2b9eea601930b5e0482db463f5057e8758c82367325533003772a18ef74f96cb8aed710395a5d4e894192afde878372f9d1ec7e8364e05a3ddd4ad54767
 MISC metadata.xml 555 BLAKE2B 0a6c97712429505d543caaa732d716a95e4f6f5256aeb202da38bd2399ceb335e1fc6079279c96848d479d3fa3e2b8bb1c92b37ba284204b1936078d0175caf3 SHA512 2ffe5f5f8ef59e30a7da2efe1b5e88858c5f27776b7f48a7748f9cd72a18d5c97ddb239609c7bab808de874f0a51bf886ec24e395641fac995c8d3f041271e7d
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild
index b647ce8d5244..b68773f52831 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index 706489567fc1..1324d4c70f4f 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-jack-0.10.31-r1.ebuild 422 BLAKE2B 7a4fcaf73634137d42bc94a80823c18159092d0fdac3b5bded55777c2c8724073f0eba785b6a41403dff2e328b3ad818f20785b920b35562431841f30979c6d0 SHA512 3cc92fbb1b8d6c8b9a0a1307f3148df3779cd711cd66f5221e75118da6393697d086f6f27364a36fe37ce95f79ffbfb13517a51575c06ba130a2740109375105
-EBUILD gst-plugins-jack-1.14.4.ebuild 378 BLAKE2B 97a749a7a9879e14f79c312bb4dd55ded6d54a3936f06a61f3cd2bee445ca42da66e181902bb62c9bb6e8f2737b52d261ca9b4160858a3903a6f1cf38a1e59bc SHA512 f06f44e5560c7386735dffaa057b870e8f649dfb495308fd8055d52cfc67615262cd7a66caea20abda494f2a28e14d6118263b4cbd2efcd1c87319ebfbc9c851
+EBUILD gst-plugins-jack-1.14.4.ebuild 377 BLAKE2B ca497e06d8a606f1679f302d0734565f74e273ce66d4070848b3e781059621fd693657fc5da9be777d6721c008100908aa25badb4b32cfabddc4f96f97c99352 SHA512 4547ee57176a6de05c4c7798c9ad80cce4d758f5e670f7ef808ff9da08d2a6c1c8d94f00c3b830809b27d641d6b3f6d66a4b554848fe77c7ff7f0694f5b09e54
 MISC metadata.xml 487 BLAKE2B 182c55b79c188f12dcc000cecf9c507933183ab62a78c806b6f43918af528c1c7bf3adf435ad077f689a2b64706b7517b14393500dc4d1b7f2cc14b45dd6b764 SHA512 811374b3dabbff1084c5b1b6fb502197f58da02da195b922ce7556ca6e0f3668f266a14ba1a03ff352edb89a0cff9550e7d59f3f4e116ff63a22c6e8436ef6b8
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild
index cc174b734a75..7d1bfd8fa4f8 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index b7ead815c224..aaa014a3b324 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -6,5 +6,5 @@ DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1fea
 DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d1d16514401fef4bb988ba3d1f306b647ba0cd6e89f0205cc33e6d144889d6b2f7fab9e4fae946e03821a85009fa95c68f3cedf25068a SHA512 1347424ed342f00c25ac4780670611a24eeaf708426b6efc6d9f6c6fa7bf91ef292302a5363afe9523c497265b8c0d7ad81374364cbecb2924b749e716819745
 DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717
 EBUILD gst-plugins-libav-1.14.4.3.4.5.ebuild 2440 BLAKE2B 61c9b14b905aefdac17cffc297fd6e2e6ef850ea7f0b980c468dbdb3f12b52d192134a51c623ed3294872fe74153d66d766dd0cdf8e8fa6eb2275ac4341c14d3 SHA512 b26cca92978671ac18d713c751a2087e0e86d6a05169626ce36b668920a58d98f354a3c151e00af408bf2cd09a02d46fec85ac7d01597b47ecd30eb6e3a3e328
-EBUILD gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild 3168 BLAKE2B ce33cf804b69808fcee7405881bc176249cf88837c553d0912d9dcceda6836518b84a66218a753ed71ce4e1f475d3134ad80ac958e160e6bd38edd7e639abaf0 SHA512 9d463d628c5d09a4e5b0ce2e195367e48fdb65aa82d53601f77f406b33d2fd8718c28a7c84aeea56fbdc0dd9a0513588419838abeb509bd1fee89fea7c352157
+EBUILD gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild 3167 BLAKE2B ae2008f5f67ba8b857856a602ae3c946a9ffa0f4c5d2ace719c46c5f764ccb20e2a096d1ef721cddd75d6dc6f49f368577e4e62eba61cbb7684f375b6309c0d9 SHA512 54177c1fba9539bdadf7267c4ccb66ef943508940e4f1255069fb9e4c62f6784f6c0bb2905b17d2df1de265375843b85b1526c733176e2bbc2375ed3343a3984
 MISC metadata.xml 435 BLAKE2B 8ee96f01d191e918656c2a80e8cacee47237740f7639d34f0205417815a06ae8dd5b0a27bd7bffac668f3a74ce8fc377112e3cbc369ad4fb34089b2975f3c733 SHA512 5c65497b650587ba929108974a18116b9fdea3ae175fc637c470725a39375defbaf962323f7062ce4287655fc47e8fd28ce4a1d8608fe7ea243bc6999a1bf753
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
index 36d97103ff28..86f21eee403c 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="libav +orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libnice/Manifest b/media-plugins/gst-plugins-libnice/Manifest
index 571053c7fd60..a83b51262921 100644
--- a/media-plugins/gst-plugins-libnice/Manifest
+++ b/media-plugins/gst-plugins-libnice/Manifest
@@ -3,5 +3,5 @@ DIST libnice-0.1.13.tar.gz 912374 BLAKE2B ae8ac3af7b5f355e3c7b961bfa60759ba71c8c
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 EBUILD gst-plugins-libnice-0.1.13-r100.ebuild 1395 BLAKE2B 4af1c036097bc514547c1b651fa32d9dd8ffd1546f851fd7bb459b8c10c0b9a74b175e0667fd60ead7d83e897901f1d7a5da7bec226f9ca38c081f6b34dd306e SHA512 8961d22ef8d2d8c2522d5047da6dc0f0b602a9b6edad8ad7f563407c99354f1516768d455fb05d386283b1a42869509468c507d2fd5a45a225e390cd7796aa75
 EBUILD gst-plugins-libnice-0.1.13.ebuild 1509 BLAKE2B 3a5f5c651f385a6905d0c7fe7ea3f66f2c0f9a2fe1242cb3e3a7f89fb7d9d659cc82bc77d886b4d0c5e0e1bc371585c277b30a437449556c8da987de5f6613bc SHA512 9a81a4155b6b4f09106250ad899ac99042ccb3cc8388677932d70fd75ad74023792d0bf5d19372359b1f9d7563aa438373474bc8fb98d4d9a45a951281091c8b
-EBUILD gst-plugins-libnice-0.1.15-r100.ebuild 1698 BLAKE2B ab2113728fdab570ff11dfdbd904ba9c37427191bc631d3147575a15270ad7d6088af32dc3568f5926564937ea38a10cafc883f084505a608d9ba97df6f83d66 SHA512 ffa36f4f628db4fe8ec6a5898ad8b1a5e9c6f192bfefaf4b001c1402a46bec4541d508d408545642df4e7dc942b6eec09a9359ea4034a2f0204f752d97adf612
+EBUILD gst-plugins-libnice-0.1.15-r100.ebuild 1697 BLAKE2B 6406cb733133899eb352b13cc8d508c9fffb508a69724c98a26fbf2942778b75a52d4efbd48c1a6c9c03f073115d3d553cacc8e098a554d927934432d36c2796 SHA512 7955034315f4834dec390c9a8f8311572ac22d194284c94f7c5ac9bf0955a49997c0d446c2d841d027b061d943b256f47b992d24d446afd9ba40eb2d639cdfe4
 MISC metadata.xml 372 BLAKE2B a8206f23c5130a6b0dce3f9e301a998c34401495b4b3fddabc622e99be062815f7174991383f5e4396a345876762f43bb497200496fc778ad45052cd64ed542c SHA512 39d91850c0c10c71afcc7771a7b813080b0a46be31879ab6c33b1b9265d1f85fae78f447b1560e3f3f63b5db78ed30b9d2d7d040d0cc11f31fb5a4398ab3711f
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
index 428380293864..b864bff08dcf 100644
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${MY_P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index 533d3640eb95..58bbcb23a56c 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD gst-plugins-meta-0.10-r11.ebuild 4389 BLAKE2B de5b074ead1f2945933922055274e1865bb67458df6d3b6a9071889f5688fa39c34590112d2ae4400d05698538a1468dcb061cd3301378e2a90a10f7f2690a42 SHA512 e9332638416456961a4baa40356074b1246f0138097ec41d986df2219cc0c14fa8e1247986ef47512f1377c801ac3c18bc930cd8da6d19d19b135a59ca8dc384
-EBUILD gst-plugins-meta-1.14.3.ebuild 3768 BLAKE2B 68e11ff034c2fa1dfd992511e3c5df36befc2d5f4e19fd8aec1318cd4bdec803b2807d72d7235b2a694e6cc728f6fd88de6e0e196d59dae49ee54d5dd919f3e3 SHA512 1331bd54dd465e3974558282b06914e8e2dcc784a975640d8a758c74b9dc72e9037b7d20fba90d5704a86d86940d00b56a7a2f8aaf9aebd4bddc9d4254af21b4
+EBUILD gst-plugins-meta-1.14.3.ebuild 3767 BLAKE2B 1dc8c3582cc83a3497191d857cc38a41b19a6e8b3b4391032d065bcf081d43e2b3f6c0ffa026e09ee7c2b6af43aee6f662e6f0a111dc3d20ca9f5d38b4b2ccd8 SHA512 1a1025964bc9c1d9699423f63b977049fdc58afd6445837d51a22539b2fc7a2b76fcefc74a6044e0b5af20d3ff75cd54bc16bf1e5e4b010835638a4f9a87d8bf
 MISC metadata.xml 996 BLAKE2B 1bc83f42a32de2aafdf03808fffb16d603986c19160d2802426ecea7f279e529ff7ad0e2c321671681f80c3575dceaea0064db559dba1212b0a30b826ae8e2a2 SHA512 4d905ac8fb0f07b2ba3c6791d7a84daef638ed552d2fac834a71febb274d1c667abe66735e7cfe77f5ed83c269c01ca7c2761b13d176164cd956e8fadf31fbd0
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.3.ebuild
index 48b62986af4a..d01cac3fb769 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index 1df95cf412fb..9be57eb945a4 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -2,5 +2,5 @@ AUX gst-plugins-modplug-0.10.23-include-header.patch 860 BLAKE2B 68c3273324dda85
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-modplug-0.10.23-r1.ebuild 448 BLAKE2B 79098c3f7e021e91c3d3ff1c42bdd2a2ad5209cb090564ebf9a59948407ed595ad5ee62c5405b9ff84ae2a5812c1e175820060a7674099d74e54335d21044926 SHA512 fca50e87abf1b0da7daec6b60c57656cd66ffc3a260694866eb63ff0118bf72f156efb9578c4506573da42ad9c011a2a38e08193bff1c1c815d5c386aefcfa50
-EBUILD gst-plugins-modplug-1.14.3.ebuild 367 BLAKE2B a3cdfdca5c4e05ee1f1143bd19d68591b7e6a1e87ce58368742e13920db8d3495f1a31d8d0890f9ca8fb6bba7611eba0e951db98c9586961331dee903e7b14f4 SHA512 67cd86a0a232dd022dfe0288f073cfa603a81a006c935c180c9a0afd5bc3c058cf5b0e5b5be1a792b0dedeb7c80d68f68918f7fc2ce2fb0826f723514af07f6e
+EBUILD gst-plugins-modplug-1.14.3.ebuild 366 BLAKE2B 347cbb40659f69dbb3df4ca316e91e1c7a6c5ee8521dcaae94df6e1d2cf8b61283ecd275c27acb3239758f58cee7d6812870818a678e3926a81417e5d26776bf SHA512 4f344b4963b0ee7f615079073722ba6c71eca2633924e457fe1c71b63763edc2c1739a920f89ce67b3a75895a44e55cc0d05ba4034115afd01f6ac34edc9a12e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.3.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.3.ebuild
index 57026fb1f4d3..8c9e4b846317 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MOD audio decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest
index 91e970ccf13f..b96558616df7 100644
--- a/media-plugins/gst-plugins-mpeg2dec/Manifest
+++ b/media-plugins/gst-plugins-mpeg2dec/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 EBUILD gst-plugins-mpeg2dec-0.10.19-r1.ebuild 425 BLAKE2B a282bc36a9b8b2c9756eecbcb44e1191a9a04db2d79f4d5cda5e85f5418537ae9b5318f4fea32d3f840c1b4bc9d4aabf5d9492a17a4bcb31a6ac893ced054026 SHA512 5e0127181a8fdac077ba6919ee56ddcccecb8944bc63f481c4880bf933545bb56f3213f561a3214505933f3ee24b6aa7a96c01549f4d60ba14bb763c7eff922c
-EBUILD gst-plugins-mpeg2dec-1.14.3.ebuild 425 BLAKE2B e9e2a3e0928570ff08bc1594a867a3b11419a9ed8222ddea03a830b15d5912852bb659885597760fe9dddffbd643c9267af58710a29c5618aae89c41de5a2a40 SHA512 5f0b472838b1890274d6e81ccea92c3e8fb9fe800a7a227b783b91276461b8a549a29705b046cb340d995e71b7309e196eb115f4a135fc613328a1a18702dbc3
+EBUILD gst-plugins-mpeg2dec-1.14.3.ebuild 424 BLAKE2B cd6be543d1e8f4cec64a277dd8aaca05bfb5de206220d104cb70e4cac9b4dfb9cfc14f6cbb77526be58d0df9c05984d0665547ebb7f416df642ee38af3fe8556 SHA512 05fac635298238dfd6cc72b464ff26f73998f54b7759199cff3a08891b2d27fdadffe6b213f8abb4829ef1462fba57fcb6e4ecc80bd3b95b0aa1f3aa1db8a6de
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild
index 51973642a6a3..1a84bdd6c176 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index 6af51a4efd9a..b9c22719d344 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -1,3 +1,3 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
-EBUILD gst-plugins-mpg123-1.14.4.ebuild 383 BLAKE2B 07fd547a2462559fff98b1831c9e66e1888e8a166e37a5ee1911a7bd27433d919435fabbce6f0a84bea6d608aaf132a1b204b53bf4e491c15bbabea839b2e70d SHA512 c3d2d294fb17ac311d9662adef28fc4c88677190e1f9689edf8abcd93982ee63e60a4d4412bdd6138af53b7f084b1948282cd8f68bbd8191b438666e36b93f50
+EBUILD gst-plugins-mpg123-1.14.4.ebuild 382 BLAKE2B 6e8a4f46ea58a2d55e6db9028bdbc0f0c854b484ae4c2a419dfebcbce89ffc75a625c3851f7209f912e76018c587ac4dbd41637617ee0d1f7cb23dc4d25f63b7 SHA512 feb34596b20e947a2d9724b992c3756518a032536a5f940073cceb12cc7341ebca3512aec7b6bf9ca67afcfe3c772c4f53e9fe13459662fa31cbdbc703a2b4f9
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild
index a34effd78b1a..fbf6bf00dfff 100644
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index a1cd35cbb328..320e27c72854 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-oss-0.10.31-r1.ebuild 367 BLAKE2B ee12205502d2dd27d73697107dee57116d4d47f2f45176a56b3e805922201d4a91be11b12ae0f3b65cf10b461ada4054bb0801cd4de1bd80c91b6ccfa15fbbb0 SHA512 cf6f4d422bf392ebe0695262b8468fca446c5451ba36c5ffe4ccbb3ecf867a2f373124edf1670ed211bfa9ea39d8f5afa98e245920ec9a14527037b9d5c8ddfa
-EBUILD gst-plugins-oss-1.14.4.ebuild 377 BLAKE2B fe32bd284798d04d9ee570c2af007278d91fdfdd87359b9792eba703639ce50adcfb1aaaa1576525ce9b7d98dbd89d7d851f738280cec98152f4c24434fb7a90 SHA512 b21fd39740911345eb0b8e084876f464ca3ef4c553182b95735584289eebbf52e25da1edb3666911d59a0f17b6655d20f47141df8a93d92bd3771abc657c505d
+EBUILD gst-plugins-oss-1.14.4.ebuild 376 BLAKE2B 6b401a5a47f045a671f4790268d967c5f8c9ab0cb3a7900e7403231eb82b8eb0e78bbc7273d461892da2163de35844bea9e49ad738366e990caa4071aca7e75d SHA512 70d98f7b864776e4dc8111c13bacb8407ab4df55210f064aa8da5772fbd427107bbbf93b97b3f195dbf42b91e061c0ebef966a8710b4be2ffcb13e3ca34a47b2
 MISC metadata.xml 488 BLAKE2B 72817781f31070fbba548a5a0e724d3a3a419f55b2c1ba1155e88f66b0f779d34fc5705c39d60ecc5c40a9ba47ed568aa2458c0557de1795ddacadf54b39a436 SHA512 6ab36e28308e33d9b2e74a419ed558c913510f23bee1fd1a58ff87c6937dc2c3b4c8c683831e771460258424e89797a6b8c5ebed95cb87506ae7d67c11b2c243
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild
index 5dc5b1192918..b3868bd38ca7 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index f896af661d5b..64e8b8a79999 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-pulse-0.10.31-r2.ebuild 451 BLAKE2B cc688af55730de520620886f87f68cb85ebcf476165bbfaed3e46d2afdb46db36eb80432e86ce791a8f25a6041a0b834c4d714e0b3e0f50f5c1e41a38f02a622 SHA512 762cc23f92d89251b3f92c57d796a0acd0c4904d6a0bedc475d54eb5f475949a34cd0d3ed5384922a35a15448e9ed81ed9efe4ebb8aa25f5ef9158a4f981311e
-EBUILD gst-plugins-pulse-1.14.4.ebuild 458 BLAKE2B dfb1b7d71176deae2dab49bf3dd0e827063a79ce1521fcfa4a38e6b3bda731dd9450d4ac8cbd01fb1e45c1cfcad3235e8968fc7a0f6c6befc8bb93e9af15b9d2 SHA512 fb8c0c23f48b3a141d3d19af5e95c7903c007b08377ac9635583409c32fe00f39b9dbd1ffe4363b65591a601f60545787b38ee8debf295d0befd90dd985278ff
+EBUILD gst-plugins-pulse-1.14.4.ebuild 457 BLAKE2B 710029c2982bfdfe57f2af044e868234a7eb6dbe7a40b5fbc246d4627ed3109eb10d570755da7f1d20b4ba2280635cc0654fa0be8143894902e7a2d323ece4b2 SHA512 c17bc2ff852a4773a0e11183e545d4732f3ec69c46f8f7aa579f5ae13a5ba2521996836f3a735cf162f58f28c56df57cdad586ef64c4a183d407cb0e3f534943
 MISC metadata.xml 610 BLAKE2B c8d30b8baa2a2dc5dc43b2a0f5badcb212567f7ce4873f58b1662b3454c8232a4916f10470bb98c3dae745f818f0e02d7266542d44d3fd4b9eb7edf99bf2a419 SHA512 0f0fa4496446fbaa649c3d76538c4960ca0d7918b40e305aa0da8516e79ef25c10136b0097fd687cb968c37de636b57ae667be1bc3197a571f557400a9c0c478
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild
index d50f2e74ffbb..9674b80fd2bb 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index 4258c37a1462..030dd4bdf7cd 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -2,5 +2,5 @@ AUX gst-plugins-soup-0.10.31-libsoup-gnome.patch 718 BLAKE2B dbc7bcc2dfa9369508d
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-soup-0.10.31-r2.ebuild 545 BLAKE2B 074f21224146bcd4fa25ad3116cf5c71955900a6608b0041eb9f9c7a20750713e8edbf91f0fb144ba18ddbaa7ae2781ae345f7634a22b17290aaf5dd00aebfbe SHA512 a204577538e6ce251baa4e50148d91800c0a541b07032b8ce9e7ea02b77413add2c8c0409540158e003c9ccd4cbec116d6723473347efc8c8b5227af6ddf9f7a
-EBUILD gst-plugins-soup-1.14.4.ebuild 415 BLAKE2B 2a089515609e4c2efb8f013541a77f4c484d4369077f47dde9d3c8494453e0a8eef7b31e8d1fc5e9f4aa192b55e3fb51bb18a5731709f789908a28167bf4ee4f SHA512 55397f3fbf05fa9fec7ef397a4b8f97264a0e7eb6d02c469b5c9da8699400181a7587bfe654b04cfeb4199126203f12f021fcdd2236b1050ea1fdb593e49315e
+EBUILD gst-plugins-soup-1.14.4.ebuild 414 BLAKE2B 81b9d822b76f819543d331bd8fe485e499ec45c7bd74fd45d99dc2750f44bfc67f9617c00be1596741c50f39069f468bdf79bb4b2369cd71b857ee35422eb706 SHA512 a45790c8666caa22d828c672ab0acde3bc5dae5ea5656fc6096fab55b40b15d930ff1a7b65049d55628596071ed6a8593fcbecbe089f4dbd0316e68c10b0323f
 MISC metadata.xml 552 BLAKE2B d1dddafba0b921d7484d1c52567a8b9fbecc611b5234bc602cef79c7953a2a3a9bb423bc929055127ab894506409ddd8e8a71cb432169b1370e65b83b2e4341e SHA512 ce8b5a2a0d33e00ef141b82b3c6d192e31b681f016f431f1306d2066677d7fac66135129f57d25f9d13644c9d3976baf74fa6e6f65f5feebee045b82d04e2d8c
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild
index ff7110756128..d84b99022c84 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 
 RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index b3dd8e24409f..997d7577ae0f 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -1,3 +1,3 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
-EBUILD gst-plugins-srtp-1.14.3.ebuild 388 BLAKE2B e9aa5eecbecbc890189ebd411b60293a216ec64343c8529b1d06141c4eed1dc2d2fbe55a5a768333840be6afb09db5fa7faae823c637e940dc9dfdd76344bf76 SHA512 00d85cfe14805898755c034e5cc337e6dd4050068e95941da2b87ceb546fc1db95af492c661ec7fee31de1ad2394a2c0654b321092ea34db9c24e3bcd10dbc89
+EBUILD gst-plugins-srtp-1.14.3.ebuild 387 BLAKE2B c9fd16ae8f6230297906e20a8d65d8836707ab56e976e05cd0d9690a95a4ca1a39bebd0947e52c5249753b5a1fa04e9da5073f4903981866682dd7eca6d321fa SHA512 97cab975fcc0bca82666c0417c8067de34312fb40c488b8ad42486e1cff49444fb60a351e2b7b12b5c9f8f8bdd768280adfb5019df795c136bd52784cdc8b95d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
index 1ce68d9b3031..a81546dd870b 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 42c72a3c5d93..809dff56cd4e 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -3,5 +3,5 @@ AUX gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch 738 BLAKE2B 5b15f98d2afcb33
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-v4l2-0.10.31-r1.ebuild 829 BLAKE2B 695b8b8aba7477541c7425d5a3dc5c50ee6fd62d8480cb8a440a6aa40b5c22861ea701d2ab7c9b355d7e42ef748e7cdc6836568184f0c9eeef4be078145cac99 SHA512 38b460f13965a518bf6910a0ffa60a1bd89c68bed5ee2eb07873bda27dcc55260ef6f4520b6a8dd97a8a4cc62215762b6003441d8df4484133dda6586a13ffb4
-EBUILD gst-plugins-v4l2-1.14.4.ebuild 661 BLAKE2B 2c94a08a9fbe14e9042ad4d3dc00ddfb9cd8857b644d942ce5ae13463c7b7b37572cab815d4ea15a8f992339ec9f34e93db94f12606ebb8e2e783eb2c54a510a SHA512 05e1e1048480c1bd6b99b8931a3a39c333575f9b5eb6c04270903e19e372861e4e30190f9724ed387c497ecec91425f4a7b37d11139cac447b5ac208ea16b51e
+EBUILD gst-plugins-v4l2-1.14.4.ebuild 660 BLAKE2B b226340d7270d0582203a7dba0572b952f47f04db95cf1da23fd4b6628c13fa8dac334b404ff3306088998d8988fb05174a3785ae20de97bca1d052a08f47495 SHA512 d6e45c89226b36bdafb2c9713cf01735f2cf45127bd5e299cabbb8b8c6bb0f3bcbb068b917b1ad3e136ce09dea1bdf5b189ab68c80db769dbdefa0089b02c897
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild
index ff88ae2f826d..f2b917dd4779 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="udev"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 92a2dcb15f79..31556f5d5d09 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -2,5 +2,5 @@ AUX 1.14.1-fix_no_GL.patch 968 BLAKE2B 31c0857fd971f574455d9fb74ae73590f868c50f6
 DIST gstreamer-vaapi-1.14.1.tar.xz 1064992 BLAKE2B bae42e3cafc6d1e5799a8ef795f9e1f6a6ac60b6878aea1aed81550fd7e408c5104b5ea89d6e5f7535ac8d21fe5f14fccf061e15eb68a7c1c60c29ad4a4deabb SHA512 f1eecb61cb92439d93a47ac162a5cda8a456dbb205594f378e8adf98c45e4cd59553ccfd3bbcf1c6a568c6af5e7834bbfb0ea17610f0c7e7c9e268a4eeb5b020
 DIST gstreamer-vaapi-1.14.3.tar.xz 1070536 BLAKE2B 7e3458702072d96acc31c1ac5c4ec9f23f6d618ba922884fb141a0897a04959da7f34c7abff7765f086357d3f8f7532a1582508d117c199f76338ebd3723c6ae SHA512 b89acf63c2900b0cd588cce1a06d959a4f8bbe929c237fce985d3cfce7b94d43a3317f06a42fa77e3ff790fff8a81c8bbeeed7ac797794e4cc3342f18faa69e3
 EBUILD gst-plugins-vaapi-1.14.1.ebuild 4365 BLAKE2B ed0b9f29fad413cd5889d7c4d16f09d39d9958a95e74c2deab2b1cb67a643916eafd33eb34d65cc9b9a4e722d0a50e5bd41fbdccfaed060300d27740c8bf1905 SHA512 708b42b1e3fc8ab6fbadc0c741f6ee257ce5984fc2d4310142556b34f21b5c9991ea65dc0a48941bcde68126317fc6e634b9a833002e008735fb8774eaf3e941
-EBUILD gst-plugins-vaapi-1.14.3.ebuild 4315 BLAKE2B 250d0888b9dee4d80a22cf7c9f1c535cb0707a139f94227936248bc9770971d1a2bf40ba70c39ff0666defd6066f78c79ad301cf9dbb499c0c71686ac80bcefe SHA512 c6b4f4f5719216fe56c90a5b480caa00aaa7a66e50f7fab92262abcfd333ce201f588cfabe47f24b6d71424cbbb469133f97f4025fd428560e1b311b98878a69
+EBUILD gst-plugins-vaapi-1.14.3.ebuild 4314 BLAKE2B 6653596da8adc4167784249ef02e6d6d40d0d42faa00bf141f2560a94d45dff7d6c138a1332889c4f594b547a7baafda2f42ee3235c61456ef2369167d437124 SHA512 13d59dbbca275f5868341e2910977c24e0b5f289bace10bb4972e41b1286adbe7766ddaf3647363c5d78cc46d318183593ebd007a3c4e3f1bfc33b2e9be82a9c
 MISC metadata.xml 433 BLAKE2B d46828441b89363cce84ff10747ad13f30329aea96cf2acd2fc7deb786c3f3ec0ec5a86011657d39ac905f9f33a3904b38860b16f53cfb150530cc4142f1beed SHA512 366bbe78a862a65a8b82ee43521508db5766cde3a72f4ad8e7f0b703dc23347589e07dcfdb3f3ec12e62ac91adb38b2a58cee5dff4732069ac2b8724524a405b
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
index 86a4d324e32a..940d685060f6 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
 
 # gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest
index d365a39e691d..50e196c8bb43 100644
--- a/media-plugins/gst-plugins-x264/Manifest
+++ b/media-plugins/gst-plugins-x264/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 EBUILD gst-plugins-x264-0.10.19-r1.ebuild 372 BLAKE2B f7006c1521c85e56b2055d838796f034df03ad12870391a4691b9b88b91c4fab6ff9d220c9bf350538bbd3231bf1aec91b0444168d1ea919bc1daec513a5e8ae SHA512 05405a265af0ac17d833cff4c17998af33560f49acffa73185f6bc11e490ade0292daf4ed06a75802d404a427eede3f8d663779e23932487ebf0ec6376c7e918
-EBUILD gst-plugins-x264-1.14.3.ebuild 423 BLAKE2B fd357e38c944eef75509ca27ed01699961cea75c537966efc9790021341456f4bf75ba4f63dba714a01fb23ee11fde9a1840cb24cd2287787e65760047040015 SHA512 2f0a097a83c21be2a8f9ae1b42296e74568db340142c51718aba4362b28486ef09b5933a631e3e1113df34d9d419f5109bf81f5db6a17552beefe984ac2fcb02
+EBUILD gst-plugins-x264-1.14.3.ebuild 422 BLAKE2B c38ec45feb54e8a05d21fcedf3dcc896ccf1b7a003c5f9b4dab827878352341a3003a1c6870830928ae66377e19d4837ca9798d778bf3b07df3f1fa7064f6d3c SHA512 7dff703bc1944912a79f6052886d4d4b52118df3de5577c3f400fee670254e36c37348725052637a2def9f2f552854162cc15c2b76117c43281f74d69477962a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.14.3.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.14.3.ebuild
index c5093a66b222..da2f14886314 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 # 20111220 ensures us X264_BUILD >= 120
diff --git a/media-plugins/hexter/Manifest b/media-plugins/hexter/Manifest
index 42ab63d6e599..88710cb62284 100644
--- a/media-plugins/hexter/Manifest
+++ b/media-plugins/hexter/Manifest
@@ -1,5 +1,5 @@
 DIST hexter-1.0.2.tar.gz 517532 BLAKE2B 78adb77a386a3ec79b951078645084965f9f8cb26f6a362342aea1fa2191fd8cf73d313977cd2542990095a2163c77f4f0602b92793507caccfd7ff2f65823b1 SHA512 5ae765004f319dba8b7c881736e6abd2c794e2b2a43d708dbe0ee791e63d004c4612927b4ff23854367ca3ff49e5efc0a936939d4805d48fe1339a802cccae27
-DIST hexter-1.0.3.tar.bz2 447364 BLAKE2B c038348fb643108616df3f7dffebd8252dbf1b2ee3ff1737a5a946d407f0d6fd013c4cda978f74d1c7e6a5219cf27c9940b9b9eb0b09a7e2cdd3e4143a825595 SHA512 2f9257b08ad493d45386bdb35fa8ead7532223db6cb54065e5809e7bfbdbc71f43425b08e9f9a8ed68a8a7a81804b007cd4f34abbedc1b4fc41be8ffca52b749
+DIST hexter-1.1.0.tar.bz2 737430 BLAKE2B 9c79da379a69bc4ceceab11dc725d965bb923384e060e24eb7e7d1f65650d5c77206a79d02403e7a952c2eb3c46262b5905e5b07872fb5b060525ed0f275cbc4 SHA512 8d433fae44b0620c3866c9a3b2445271a039c8ac3ad12c71ca34d667a85b95b9bddd7e04c4eaa2c27299c66b9cce16d104b5fbb376dd3cdc85f7e4d6c9b28529
 EBUILD hexter-1.0.2.ebuild 716 BLAKE2B 0d9f1a742b7122620bd257db82803fa6e653cb6d228d2dd22f88d107054d0daa4228c510dc61630ed09fc8f89d8f50e75cf8dafefc96eeff9718223b7de79477 SHA512 dd080c25f01098e19878f3ab2d9052c72acb7364cc989dbe08d483e03b2235f27a7d687f8772d0ae980752909d9b52ca019c9119e665348cec157fa325f9fe71
-EBUILD hexter-1.0.3.ebuild 717 BLAKE2B db2c564bf69a379987a7c45d55bc6df3cfd716389aea66230dd4252b0319d1729d3d40dacf2beebe78fa5a148c08618c43918c9b81b72dbdbfc48f92f621b1c5 SHA512 327d9f5a5947f0071dfb29b5994ae5c3218a74bdae594b5bec68289fc384c1dc62d303e4ba882cd6b98ba81b2ea2d88f7cd4087d6875b3e6a5199f7c613d29b5
+EBUILD hexter-1.1.0.ebuild 708 BLAKE2B 59a47422bd3f9f268de7114a2401c7b8f1b996f8a71777a1b6e61b95f97361b259233764baaf93e61075ce8856697daaf909116b9ddb7b31ecb0419ede6f2808 SHA512 c0478fdb661a9445a57659c463192c309ca7fad2d068f98da4442e613f1c8e6cf2890d77c9b29004f4fe9fac86740160dc16bad6d98623047445649d5da45805
 MISC metadata.xml 433 BLAKE2B 7bff94c87e78273a579ae464d3cc071ba60b9a7963937e1ca9b4883a7abc17690edfc2b6d3cb41079fa555c6658e6f73facd5f8d301f0d3dbd3d5a3473d8004f SHA512 3f451cf291b522db82eac8537947668088eeb8c21c13a99a22b830f3a197027b1923b3c2ebf0db7dd6321f2218612b8b2c82626717c7fee42337629430da5e22
diff --git a/media-plugins/hexter/hexter-1.0.3.ebuild b/media-plugins/hexter/hexter-1.0.3.ebuild
deleted file mode 100644
index 48ef4696f122..000000000000
--- a/media-plugins/hexter/hexter-1.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Yamaha DX7 modeling DSSI plugin"
-HOMEPAGE="http://dssi.sourceforge.net/hexter.html"
-SRC_URI="mirror://sourceforge/dssi/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk2 readline"
-
-RDEPEND="media-libs/alsa-lib
-	>=media-libs/dssi-0.4
-	>=media-libs/liblo-0.12
-	gtk2? ( x11-libs/gtk+:2 )
-	readline? ( sys-libs/readline:0
-		sys-libs/ncurses )"
-DEPEND="${RDEPEND}
-	media-libs/ladspa-sdk
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_with gtk2) \
-		$(use_with readline textui)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/media-plugins/hexter/hexter-1.1.0.ebuild b/media-plugins/hexter/hexter-1.1.0.ebuild
new file mode 100644
index 000000000000..868f59e31325
--- /dev/null
+++ b/media-plugins/hexter/hexter-1.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Yamaha DX7 modeling DSSI plugin"
+HOMEPAGE="http://smbolton.com/hexter.html"
+SRC_URI="https://github.com/smbolton/${PN}/releases/download/version_${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk2 readline"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	media-libs/alsa-lib
+	>=media-libs/dssi-0.4
+	>=media-libs/liblo-0.12
+	gtk2? ( x11-libs/gtk+:2 )
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/ladspa-sdk
+"
+
+src_configure() {
+	PKG_CONFIG=pkg-config \
+	econf $(use_with gtk2) \
+		$(use_with readline textui)
+}
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 408bfe177e25..ba53389fcbf2 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -5,6 +5,7 @@ DIST kodi-inputstream-adaptive-2.3.15.tar.gz 709544 BLAKE2B 5e1d52c28f935dc8dde6
 DIST kodi-inputstream-adaptive-2.3.16.tar.gz 709687 BLAKE2B 9462cc7d77c20f2b63ca22ddf284fbec1f90e672c1bc3251bc1eb57067832d9eac8111533820e5f7e50e4d26df2e9bf43c6b059b09c9f47a24e769539efc1755 SHA512 c4ab48af774ade61d36e44f459235956110354b3bc3b010a7ea6ccbf1309c0fe52917c72fd03ce0388afe5813f1571f2d0b89df59ff00101a8342b4ba45f9335
 DIST kodi-inputstream-adaptive-2.3.17.tar.gz 709839 BLAKE2B 55383716f7cd9e0b21b55cd86d2819b08fae7857ea88768311400401c90c1280a36b9dd404f769f30cff46eeb5d36b855064db1dd8c265d4d1231cc73bc0a1f2 SHA512 055fb4baccba713c7195fb7285053514006459ca3ba0197e0ca1bf507472161e4d449e30a8e6b77825c480c405dfee177ad6070f21f1ffacd6248e9e6288e18e
 DIST kodi-inputstream-adaptive-2.3.18.tar.gz 709886 BLAKE2B 5b96786aead7f51172f363018977a879c6ea7a490cb8908e6c201a64b6af88c0eb4ee2eac6fa8ca4305f7a2762f65cd5e9427e4de5c5c637ee60e4eb1cc501a4 SHA512 fbe281e9f89ce5987429231ca7ee2c42aec1016a9742a1783e9852a462ba6d209978096666536c9768cc580482abd1bb1767e3b63002329f90869206c4e297cc
+DIST kodi-inputstream-adaptive-2.3.19.tar.gz 712487 BLAKE2B df01185d734a3dd9f241e91fa392dd7696a37a34575715e46eb503fad82ffd5ceb1ded38531a8fa1a4055edcdd84a1b284fa3c7daf1b12106f7b6be390e87598 SHA512 a76c4a472fd4ecd756eb2936ebf0d1f49dad348747d40c80771bdaafb999bd6e9e32ca333d1d16fef3837e46ed60bef47ff68dccafcd4166e57e240a1d7b255c
 EBUILD kodi-inputstream-adaptive-2.0.25.ebuild 799 BLAKE2B 49612b21ce2fce4f3fd32f5f15ef872ac3738bbee99210e68f68083e413c2bdc6a5eab012fde212e1ec6ab2fd998214a9ad30162ff60aebe52611892afb6ec4f SHA512 a088a71d77ced70bf1e697412f56f92ae3108d2e88a5a3cc1855b35ee89e2fd603f325e5efb70ceaf74af05b0003e9af55aa6511cede51195dcf9cb80e264336
 EBUILD kodi-inputstream-adaptive-2.3.13.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
 EBUILD kodi-inputstream-adaptive-2.3.14.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
@@ -12,5 +13,6 @@ EBUILD kodi-inputstream-adaptive-2.3.15.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7
 EBUILD kodi-inputstream-adaptive-2.3.16.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
 EBUILD kodi-inputstream-adaptive-2.3.17.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
 EBUILD kodi-inputstream-adaptive-2.3.18.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-9999.ebuild 726 BLAKE2B cd3693fd8b4832ee1a9d7aa2841151cdf799b09798566e7ada2bccc558cc4577db076f2fcaa7adea8f273148bda81d55a78e5e7a8f9164704797f5efce05e5da SHA512 0ca52c003def92bafee5c0865aa6c413ff94531c2a804ccd9b4691418265a101929f3b25d2bd1ca94de16c030ac5d8b5a1985009bc1af2174181781b05786399
+EBUILD kodi-inputstream-adaptive-2.3.19.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
+EBUILD kodi-inputstream-adaptive-9999.ebuild 767 BLAKE2B b2900266ac7b915fde25ba54d771751a6943d60546fdef8fdad322a1f9aebe9a85ba0ceb6945bbe4316959059af6ec6ccdd261fd86ef080a07b483ef4d35d59f SHA512 e02c3aee34a8b06658f03300cc3fe0766e0acc1cb9b1c3eae49ae787288b9788547c9325572ed9671dbbea8ec95d6f98daccb980991d0bd6c0dfed9afa7b7852
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.19.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.19.ebuild
new file mode 100644
index 000000000000..039105147964
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.19.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's Adaptive inputstream addon"
+HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
index f7b4692c6e48..2fb43d0af921 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,9 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
 	;;
 esac
 
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 1d9171377436..4ce09f0e5ccb 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -4,7 +4,7 @@ AUX live-recursive3.patch 557 BLAKE2B f18a8152345006272b2b7385053ffd012e6dabc575
 DIST live.2017.10.28.tar.gz 629858 BLAKE2B a1d862ae1356b46fcd4e5ef7e27c47d3fb3abac35add6feb7955f60ddbd93e9242a84102393de67dda0d39c09632a0cc9a5f54d30c9f91d005696d3a566258bd SHA512 eea5bdb8d89e76c8b6aeb6ec04b77af3048cb41f228d230ba4da6045e9bc691a456023d44d8650fe690b08143567ed5af5b633f5b6522debff79344a813dc7d0
 DIST live.2018.01.29.tar.gz 630144 BLAKE2B dd58865636a44ccabd0e3b02e1679393f17fb09d82455188d49d4fcb321b21e136a168c0f4c407c1dba3afcb5b541192cd2c5181d7a7710d39d4727526fc39cf SHA512 dfdfcac67acd28f651807de423c6aed00190cfc38ecd361b76d37d8cc27ee2fa91a42a5b8835045680fd7f65c847e41747b948c2c71e6530a3c7e89421c60227
 DIST live.2018.07.07.tar.gz 630625 BLAKE2B 8545d4d8ed60328ccc782b6c2a8c4a0dc9ce3c1245fbc78fed4d3eb6f42de39c3c341456dc00cdc416fdcb2e518f5fe387273f5b4d2c3e2d32bfa22a21df2a90 SHA512 e7d4ddf51e9666c6ebe9a46976035b68fea94be54825535ffb04006cd242b9d3ad08250305206442bed3500d1e8d628ccf44302c485f63a9e244b3f8b1e27fe4
-EBUILD live-2017.10.28.ebuild 4119 BLAKE2B e659bc41f6a6957369cb65e60ac6002ce822a9535fb5bb01e96ba097dc29c3e7db7b88df070d73132c10b65a13fcf963fd257a9b5b6a1270ea1bf3dcdbf25adc SHA512 c5909db1feeb8fc5bb2ae8ba67b685498db4ccd657563f42adb2e79b96f2ac851f8acee2f847808987cdabd8d10dcd4e2ec6e7e3f02f4aa38f408acca425cf93
+EBUILD live-2017.10.28.ebuild 4115 BLAKE2B 8586858ad266f5bbb4efea2b9c7833664030ec68427b85d2edeeb717599733c36f2db25900d18fbe9bb946a5355350bb7fdcbbde4de597d9c850096cf737f81a SHA512 2959cd8cf4ed9dc25f9a9a729f20dd380194acb41f670d75e7ead37c35b6c8ff0d85a38fd2364997b70368874e320905b382269b946d457bf06e700c92c9c58e
 EBUILD live-2018.01.29.ebuild 4127 BLAKE2B ec6c5912a3bb8f9ef9c4324ee4d6a854f466ce6cd7ea70a35e787315b0a868626e6669da07e41d188c50bd9b19b3e8289e88c749eea31fdc977687ee98d92bfc SHA512 37d4c1ee272c5b15f2b18a70b245d73c3d4cef288b428d21fa905d38bc9acd43cba28723c70a6708a40d01aa62891796a1cb2ef85015e6567dc5c356d693ba1e
 EBUILD live-2018.07.07.ebuild 4127 BLAKE2B ec6c5912a3bb8f9ef9c4324ee4d6a854f466ce6cd7ea70a35e787315b0a868626e6669da07e41d188c50bd9b19b3e8289e88c749eea31fdc977687ee98d92bfc SHA512 37d4c1ee272c5b15f2b18a70b245d73c3d4cef288b428d21fa905d38bc9acd43cba28723c70a6708a40d01aa62891796a1cb2ef85015e6567dc5c356d693ba1e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/live-2017.10.28.ebuild b/media-plugins/live/live-2017.10.28.ebuild
index 982da4ec2410..b487ad21240a 100644
--- a/media-plugins/live/live-2017.10.28.ebuild
+++ b/media-plugins/live/live-2017.10.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
 	mirror://gentoo/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples static-libs"
 DOCS=( "live-shared/README" )
 
diff --git a/media-plugins/mda-lv2/Manifest b/media-plugins/mda-lv2/Manifest
index cfcdc4d8c906..a06e09da0d3e 100644
--- a/media-plugins/mda-lv2/Manifest
+++ b/media-plugins/mda-lv2/Manifest
@@ -1,5 +1,5 @@
 DIST mda-lv2-1.0.0.tar.bz2 2154530 BLAKE2B 4053f7e8c861487ce32fb5e4b94e643084f9a6aa91423011c52c0b8938308abff12a3804b194d7ac2a30a1e5d13e1b69add1b5c18927b4dff687a79b250d42e2 SHA512 3ee521d916eeaec14c64d3cc84d036e3c2152441cb1c266d8971e823a7e498039a210e49af5f1a9a773ac85cb49c620acf64e46a0625c6969f559b4c99786575
 DIST mda-lv2-1.2.2.tar.bz2 2160906 BLAKE2B 2b0660395b3508247558305a1ec80c27c8e23ae4db3fb6eb30a06df54bca822256f712961dbaf9e318966be8f4c90824ea4246499fa2343a59376ef80f862eb5 SHA512 da9960462a896f8412cc1918e3a7c0bf9d33d5431a1264035705ca21295d52de1e6b5360369b9da519376a78f72b0c750d133d89b04240f3e35a210e4551854a
 EBUILD mda-lv2-1.0.0.ebuild 517 BLAKE2B 81cb2ee49daa43b22a5c3e8f38eeffac71b4b633ae20a860f0a146028ba5368850a5323bd4ae549f717c6484ac9407c6cf1e9a62e1065434086a75b1e1a0f3d8 SHA512 345b3c159873e56e2a919082dbff9fdf78295eb05e4b197fabcf68fe0cf2c3ff0c8b9d0d3ff3dd734eb66fc3a7b26e45684ccc75f94219eaa286aa1e731b3ace
-EBUILD mda-lv2-1.2.2.ebuild 523 BLAKE2B 501d82a283ce7aaf4b7821ae7f620b582e3320658c65edffcba7defd2397c7115d2f4fc07db49f07d5d031d54097f25964fad09461e741fbbf11e4e601bb7b3a SHA512 e89e160fd14c18192795d77b75518cbc719421743a0a494b8b390732f10ca18d2bb2c7513cb3aba6bc6d986bd717289a4d355f8c4a4734d39aac62255c24f41e
+EBUILD mda-lv2-1.2.2.ebuild 528 BLAKE2B 0dc5dc15604f9ef81e89c3f97afdedbb01ef8f2b606ada540bdf9efff6e6ed7a52cc3d9235ec2dafa74fd39e5007596d05746b9f6e4e0c6da70a857ed5c95480 SHA512 a1822ad07c8348bf4c1f1658df908616915052969e14b87eddd44ed4ea0249a77cc87ce3bedced824cf078769e7c345cdc3069bbe494633af6bc25b32334109a
 MISC metadata.xml 1639 BLAKE2B a4ef48117da13a3372fc3edd7a2f5c5a720e710f192193647842d5f1435d1a6976e6d229845c22e372f30313d6fb47cb1915855c529241e1b7a9bcfbc448d600 SHA512 aab04b98a5b005f186f2f81444f24899a2204a79971deb638b7fb8f4907a622c538fc01d5a606d4471a7650539993ee2b668324834f11dde9479d140d7edee19
diff --git a/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild b/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
index a9722d0310f3..e144613bd492 100644
--- a/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
+++ b/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/lv2"
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index d4010bdb2b25..4e1b3661a2ea 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,5 +1,5 @@
 DIST qmmp-plugin-pack-1.2.4.tar.bz2 252589 BLAKE2B 562cacdc2e17e5e8163da4a545bda3398eaf638d3dc7a1a5426a9b8786b031e555106be9c82a306c0b8a3d12ee8dbf160fe76d9a3b1f4d776388e4da5bab6fb3 SHA512 10c1de2e5f5f84eb79eb1e2fb590ec07745e75fff103530057445021dbc2e00a58397533f076959a7e6ac569dbfad3876cbfb7c695808ec384de76993f77c01d
 DIST qmmp-plugin-pack-1.3.0.tar.bz2 230625 BLAKE2B a26926c81dee6e47c4a97cd40328329722fa3ccc9c244fddb962ef268337b6a9ea7db6b9568af83f469f88cbf4c60c2154b968276209b118f3124871a6764057 SHA512 5d320938cc5cdd540149f131e41c87c0eb5b4db79fa6f6706dcf30177ce988733c291d95c731e14df13a2d1f9af13916de060d8eaf38910bfcef42aac68bc900
 EBUILD qmmp-plugin-pack-1.2.4.ebuild 572 BLAKE2B 6f7b03728ac4910cb72b17567cfb73c2efb199a03fe37bd737c8abc9a31859502f230d3e44454df9e1c989077adcf6b374b89647766d1422f859a20ee4e38f0a SHA512 cecdad646405b5697109e4c62573076247a838910d75bd2220d383315063247435be70de9b5c8eda43ff1171cade74833abcff6da1bf8d41471ac3cad691305e
-EBUILD qmmp-plugin-pack-1.3.0.ebuild 554 BLAKE2B 589673c4c6ae7e71c40e4e1a923e4349c2eced7271f7a5bb85993a8f70cc1fd37b739b3cba335431b6baffb29dda4282e02f24a8a87cbac4df37eb764d20602d SHA512 e4177ae9e302dfcb198fe63d8b69670cf014f33764ef9d5129ffc8919d03d21fd7f24b290b5e4123e95301c458826707cb629019267c79d12643984dca3ef33c
+EBUILD qmmp-plugin-pack-1.3.0.ebuild 553 BLAKE2B f1790c998325347da0730e4c83868342e4eea9d7cb1d6fda6cb3a52af8560025c8e08d774f909f13431db8eb14307d29663ee2ed4ebacc4f99af6957d56f5b47 SHA512 d17c636d85b0311e7a6cedabe30cd93e1bca941d54b327902cb5275a114e941dc84e5f59504756a69dce8bebd1f58760c7205a14e02e6148c74565af85f7c387
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
index f247b034c7bd..114f1fcb4ecd 100644
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-radio/KochMorse/KochMorse-0.99.6-r1.ebuild b/media-radio/KochMorse/KochMorse-0.99.6-r1.ebuild
deleted file mode 100644
index 149afc4226b8..000000000000
--- a/media-radio/KochMorse/KochMorse-0.99.6-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Morse-tutor for Linux using the Koch-method"
-HOMEPAGE="https://KochMorse.googlecode.com/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/pyalsaaudio[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	sed -e 's:Categories=Application;:Categories=:' \
-		-i kochmorse.desktop || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
diff --git a/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild b/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild
index 0f463698beb5..745430f452c0 100644
--- a/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild
+++ b/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hmatuschek/kochmorse/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-radio/KochMorse/Manifest b/media-radio/KochMorse/Manifest
index 96153ea3dbdb..e3a74f43a775 100644
--- a/media-radio/KochMorse/Manifest
+++ b/media-radio/KochMorse/Manifest
@@ -1,5 +1,3 @@
-DIST KochMorse-0.99.6.tar.gz 30497 BLAKE2B b6c40378f1e105f3010a5d703f910ae7c2216da5892f65c85cb2b56227f38d9e88d49fac38ed3ab8513cae45dfb5bb0474fab420b8151b028061392f7e657dfd SHA512 0803f3fb092962bebffccac143dd4410330d529ec1fe3a8a0c377f640349e0a8f5c254772c5ed7e63cf63c47ce14f304658b4870c78cf89c391823c93ab9b005
 DIST KochMorse-3.4.0.tar.gz 1066631 BLAKE2B a435ab85ea782cb09ceab23109651572a2ed8fab6764ed54cdb5c1f2a51814f477fca013913f81b806404abf0d210edce7cca589b10b19b39fece5d8e1f7b581 SHA512 43cf5c3c9d66c4ef23016246a80ab426976a20ca5a2639d47ff2622adcaa3a9444dbfcd2d5c28c5ee32e0f041e8ecd8a33f82a9ed3040753699ebbb43d8f0faa
-EBUILD KochMorse-0.99.6-r1.ebuild 698 BLAKE2B 46528406e310d8345a9be155310c6c89626c0154881257f9b8d139b49de8e4a5fdfd75d2064155bf1cc23bc43ef55a4b144bbbcf5cf34f572358bdd7f2ecf523 SHA512 43a17a8216db03f0091f247cb5b5624855b313ab1d07f235d19f2d3002995e7d6f361e55bb674870ef11eaf6cf207e2d325e897d5c3d975c57a3acfa23b48f03
-EBUILD KochMorse-3.4.0-r1.ebuild 796 BLAKE2B e4e588ed1b10805a938798f5783eef6801b80614cb122b54ad6ba9db97aaf9b4396129f137fc5f2782dbe35b078017da48c62ede5e9ca65ad1dc1d3045b20625 SHA512 6732d24982a308ebed8a61bc3de3d8277732e9207b9389fcd8505250a886c2291154c4a561da75ed82b156bda8c56c5d4d911f58d6b04716e17bfca360fc5be8
+EBUILD KochMorse-3.4.0-r1.ebuild 795 BLAKE2B ba585172bad6b84134432a5a2263a4128ab42aabc0f01e60b4b1c3a0cd3cb6c000d6fa2c53a741319b4d1b0f17b6141b6a8312b8febe57f6d90787a4fbaf8532 SHA512 ee10eadb4890d3a7aad9f28d964720184ba76ee771d102a1a3508d336575c1faf35e64b5219f6c20a1d326a5f391f3f550eef22d25277a2225dd82aea232369a
 MISC metadata.xml 623 BLAKE2B a5dc157aa180f197ef055d643f18b72242d98f807fd5d8ad465df0d12d0769b73a2c726e6c1daf31e9a269a3af2e1253dd5cfbadd254c773279d504cf7cf95a6 SHA512 7ec69b0f22be7b23ab92513d64383eec7c255e192ac5d1136a5fb2262326c1be52e7615f445eda1703f94642d0ef41f28fe4f2e13f42eba843884350922fc143
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 61fbfe306bdf..32eaa01638c4 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index c5ff555bf7e5..4a818afea08c 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -3,8 +3,11 @@ AUX xastir-2.0.4-fortify.diff 4404 BLAKE2B 46f9d2adfd70575301e7d5f9874520baf60e0
 AUX xastir-2.0.8-no-builtin-shapelib.diff 2588 BLAKE2B 7de77fa6a75819579084f69ac0aabf4b0d87c7524bedd9b989ecf861949c6c21ce759f40502295f9da41ef1d570087356a9f62ec8545cf2836b98dfea35d0552 SHA512 da7374fd129956887efcf9b21047e75a34d32b391cc5a65416481971dc94722f1c538997ac85c5b47a8b6fb69f85611f04f73859736fe747f41f1edeac53aae6
 AUX xastir-2.0.8-scripts.diff 3398 BLAKE2B 0095733a8c590a76bfbed1596fe6a4bd2faca2070989e703fff6b40ec2e5ee3ad628203de12d321b3e4afd27c6626af5d80453212b9a5b8ba8e2d70178a082a1 SHA512 3e7bf50a1aa0abc67f6c83aa13aceb4478965ad21dea48351ab8d45f72a37e165efda07e822642f1bd1095355823f73a02207f84934ca1fc614a3d4784742dda
 AUX xastir-2.1.0-scripts.diff 3506 BLAKE2B 64dcad59b08bb50a558e80b889eb25fec2c3677f9bc2d1d2d19d728df47f977b546fcddac036eb42b086f7bb73394269175dd3a8e13aeac9fe4ceac8de85bd01 SHA512 28d74029262de2ec58805ca8e042d100436369d330667574c01507a1085d96aa15c5e7ee84c200ccca869941acfe73f46959919c4f205608233505138c80aa8f
+AUX xastir-2.1.2-scripts.diff 3766 BLAKE2B fbad015655864f26dfed1b50ea6c1399fc70088ff092a2cdd1a173879db4bdbba43aea9107cc961890012682d0e265f888b908d553c50018d34ea040dc08243e SHA512 aef4410c53aa3d80c4f3ea48a50759a9a1813801d18fb6dd0cf4e90b8e49358c9f6040cca964b5ce4eefcea2966f197207b25e67dd1b69e1bbd5cf0ba640ae46
 DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
 DIST xastir-2.1.0.tar.gz 2996246 BLAKE2B c4b607f09a5cc52daa18ac5ac8c761cf99adc7ae7d61c481d56383ac8a62302b8ec96593a24a8f5870ec7b6aa12ca619f1b93954d120cceaa1126343e080517f SHA512 32c1297d6399c34078158853beba32a4d018d060088b014be004b0837a887c6360e417e1d59ed7865ea1caa3c07f59d7bb4ee3cf9c035e2aabf6ba4783e3d288
+DIST xastir-2.1.2.tar.gz 2724737 BLAKE2B 4b3fe45fb666b1c66f07f57b93f09ab0118daa266e5120ce089b3f95686fc7dc4e10148a2518f0bea9f4411a316db4f1137c898594489bda6c9198b4f34a95ef SHA512 6bfa759df34e68b6431cf5a5c2fe3a501284fac4039af2242c745645d6ccb3476d2f42bd4a8889c3ea01d70cad52d39aac3949d9d5b6cf2c0deff5aa06ffbe93
 EBUILD xastir-2.0.8-r1.ebuild 2203 BLAKE2B dc61aac6fedf3718670c310bb6bf7543a3c6b89cde7ce268ae649412573e3abc1b276887dce805cea66bed9a012807bd37c545b32b1b049235645aaa8dc78d5d SHA512 ecbcff6241fa73b88de005fc101c61188f808cf25769144185e42525396cb7ac9b8f0eebd0d1821693cd8ed375ea1fd4afbcb25bf4b54487ba6bd68e4f52196a
-EBUILD xastir-2.1.0.ebuild 2331 BLAKE2B 6a28db68521d9a4f6eefaf8518066921469da6689362ce67020c9af1972cd41d1c073a922defc1c59c98417dbd385a57aee2be76c7e5205c641eaa82bcbc34e1 SHA512 e8e4ecc07a20f4c8fb803380aabf8fbbf7b37a3ee224f9c4673805cfa4f82fcf079e46216e597bde178a0c485a7be6fd2339e08ce3652c1577e9d916ab3a42af
+EBUILD xastir-2.1.0.ebuild 2333 BLAKE2B a67bf08f7dfa2f21ec517e14c7c38154bf2ee1a10c53152c7c40edc734d4389ff7057dbfe647fb0b679eda5a34053f9d7b47937a208d9c271709a121c9e3d086 SHA512 821d55f16f1f8e887060d9fd58a85c19e5fb81202aa5d3656f15b2db77d2445680e405118d9cc8d011fe5b047a9327ac7f85f6a6f47d4c656c53e9fb0dcf7b37
+EBUILD xastir-2.1.2.ebuild 2010 BLAKE2B b6e8f50069e874c74beff4540ca9a4765a9178459b4a335d3e650559a6ec6676f35299412878c84fa422c5a775578b284d3f0d5a3d6d56484cfcbfc3bca2179c SHA512 0c9909ee954c111d8f5df49c0f79ca5b90242f524fa2fe8724322332a284b07e57e3546b490d72fed678113bbdc2e077c9ad26c0430c63e2b32f4660087bd977
 MISC metadata.xml 598 BLAKE2B f264d0c4da8a00f68c94e83e15dd698a5f2332d92711347337a71fa11290570ca582ec6826ca7b62cab3d1935cb370ad71e6d8db893bc92f195fbef3fc06c4c3 SHA512 e1d392c11713b0cf692ac91df33eec85a4b47f2836851ca9d7dcd16c41a5a9540b67950731c8b943ecc1de6792449972971e295f39eda81f007c6521d6944ebb
diff --git a/media-radio/xastir/files/xastir-2.1.2-scripts.diff b/media-radio/xastir/files/xastir-2.1.2-scripts.diff
new file mode 100644
index 000000000000..7b52c6895606
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.1.2-scripts.diff
@@ -0,0 +1,89 @@
+# patch scripts location (bug #407185). partially backported from upstream.
+diff -Nur -u Xastir-Release-2.1.2.orig/scripts/coord-convert.pl Xastir-Release-2.1.2/scripts/coord-convert.pl
+--- Xastir-Release-2.1.2.orig/scripts/coord-convert.pl	2010-07-03 22:09:48.000000000 +0000
++++ Xastir-Release-2.1.2/scripts/coord-convert.pl	2012-03-07 15:46:01.000000000 +0000
+@@ -26,7 +26,7 @@
+ #
+ 
+ 
+-use lib "${prefix}/lib";
++use lib /usr/share/xastir/scripts;
+ use Coordinate;         # WE7U's Coordinate.pm module
+ 
+ 
+diff -Nur -u Xastir-Release-2.1.2.orig/scripts/permutations.pl Xastir-Release-2.1.2/scripts/permutations.pl
+--- Xastir-Release-2.1.2.orig/scripts/permutations.pl	2010-07-03 22:09:48.000000000 +0000
++++ Xastir-Release-2.1.2/scripts/permutations.pl	2012-03-07 15:42:34.000000000 +0000
+@@ -34,7 +34,7 @@
+ #
+ 
+ 
+-use lib "/usr/local/lib";
++use lib "/usr/share/xastir/scripts";
+ use Coordinate;         # WE7U's Coordinate.pm module
+ 
+ 
+diff -Nur -u Xastir-Release-2.1.2.orig/scripts/test_coord.pl Xastir-Release-2.1.2/scripts/test_coord.pl
+--- Xastir-Release-2.1.2.orig/scripts/test_coord.pl	2010-01-31 02:12:23.000000000 +0000
++++ Xastir-Release-2.1.2/scripts/test_coord.pl	2012-03-07 15:42:34.000000000 +0000
+@@ -33,7 +33,7 @@
+ 
+ #------------------------------------------------------------------------------------------------
+ 
+-use lib "/usr/local/lib";
++use lib "/usr/share/xastir/scripts";
+ use Coordinate;		# Snag WE7U's Coordinate module
+ 
+ 
+diff -Nur -u Xastir-Release-2.1.2.orig/scripts/toporama250k.pl Xastir-Release-2.1.2/scripts/toporama250k.pl
+--- Xastir-Release-2.1.2.orig/scripts/toporama250k.pl	2010-01-31 02:12:23.000000000 +0000
++++ Xastir-Release-2.1.2/scripts/toporama250k.pl	2012-03-07 15:46:49.000000000 +0000
+@@ -28,14 +28,14 @@
+ # map files for the whole of Canada!
+ #
+ #
+-# - "cd /usr/local/share/xastir/maps"
++# - "cd /usr/share/xastir/maps"
+ #
+ # - Assure you have write privileges in the directory above either
+ #   by becoming root using the "su" command, using "sudo", or
+ #   temporarily changing ownership and/or privileges on the
+ #   "maps" directory.
+ #
+-# - "/usr/local/lib/xastir/toporama250k.pl"
++# - "/usr/share/xastir/scripts/toporama250k.pl"
+ #
+ # - The script will create/populate this directory heirarchy:
+ #   .../maps/toporama/images/
+diff -Nur -u Xastir-Release-2.1.2.orig/scripts/toporama50k.pl Xastir-Release-2.1.2/scripts/toporama50k.pl
+--- Xastir-Release-2.1.2.orig/scripts/toporama50k.pl	2010-01-31 02:12:23.000000000 +0000
++++ Xastir-Release-2.1.2/scripts/toporama50k.pl	2012-03-07 15:47:01.000000000 +0000
+@@ -27,14 +27,14 @@
+ # map files for the whole of Canada!
+ #
+ #
+-# - "cd /usr/local/share/xastir/maps"
++# - "cd /usr/share/xastir/maps"
+ #
+ # - Assure you have write privileges in the directory above either
+ #   by becoming root using the "su" command, using "sudo", or
+ #   temporarily changing ownership and/or privileges on the
+ #   "maps" directory.
+ #
+-# - "/usr/local/lib/xastir/toporama50k.pl"
++# - "/usr/share/xastir/scripts/toporama50k.pl"
+ #
+ # - The script will create/populate this directory heirarchy:
+ #   .../maps/toporama/images/
+diff -Nur -u Xastir-Release-2.1.2.orig/scripts/get-NWSdata.in Xastir-Release-2.1.2/scripts/get-NWSdata.in
+--- Xastir-Release-2.1.2.orig/scripts/get-NWSdata.in	2010-01-31 02:12:23.000000000 +0000
++++ Xastir-Release-2.1.2/scripts/get-NWSdata.in	2012-03-07 15:47:01.000000000 +0000
+@@ -123,7 +123,7 @@
+     echo
+     echo $e.dbf
+     # Run in a separate shell so we don't mess up the current directory for the -e test above
+-    (cd /usr/local/share/xastir; /usr/local/bin/testdbfawk -D config -d Counties/$e.dbf 2>&1 | head -3 | tail -1)
++    (cd /usr/share/xastir; /usr/bin/testdbfawk -D config -d Counties/$e.dbf 2>&1 | head -3 | tail -1)
+  
+   fi
+ done
diff --git a/media-radio/xastir/xastir-2.1.0.ebuild b/media-radio/xastir/xastir-2.1.0.ebuild
index 65a7bb764f60..bb02b59e37fb 100644
--- a/media-radio/xastir/xastir-2.1.0.ebuild
+++ b/media-radio/xastir/xastir-2.1.0.ebuild
@@ -28,7 +28,7 @@ DEPEND=">=x11-libs/motif-2.3:0
 	!graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
 	graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
 	geotiff? ( sci-libs/proj
-		sci-libs/libgeotiff
+		sci-libs/libgeotiff:=
 		media-libs/tiff:0 )
 	gdal? ( sci-libs/gdal )
 	festival? ( app-accessibility/festival )"
diff --git a/media-radio/xastir/xastir-2.1.2.ebuild b/media-radio/xastir/xastir-2.1.2.ebuild
new file mode 100644
index 000000000000..b9b5bdb7a8cd
--- /dev/null
+++ b/media-radio/xastir/xastir-2.1.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_P=${PN/x/X}-Release-${PV}
+
+DESCRIPTION="X Amateur Station Tracking and Information Reporting"
+HOMEPAGE="http://xastir.org/"
+SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="festival geotiff +graphicsmagick"
+
+DEPEND=">=x11-libs/motif-2.3:0
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-apps/xfontsel
+	dev-libs/libpcre
+	net-misc/curl
+	sys-libs/db:4.8
+	sci-libs/shapelib
+	!graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
+	graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
+	geotiff? ( sci-libs/proj
+		sci-libs/libgeotiff:=
+		media-libs/tiff:0 )
+	festival? ( app-accessibility/festival )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	eapply_user
+
+	# fix script location (bug #407185)
+	eapply  "${FILESDIR}"/${PN}-2.1.2-scripts.diff
+
+	# do not filter duplicate flags (see bug 411095)
+	eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
+
+	eautoreconf
+}
+
+src_configure() {
+	# provide include path to GraphicsMagic for configure stage
+	use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
+	econf --with-pcre \
+		--with-shapelib \
+		--with-dbfawk \
+		--without-ax25 \
+		--without-gpsman \
+		$(use_with !graphicsmagick imagemagick) \
+		$(use_with graphicsmagick) \
+		$(use_with geotiff libproj) \
+		$(use_with geotiff) \
+		$(use_with festival)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}"/usr/share/doc/${PN}
+	dodoc AUTHORS ChangeLog CONTRIBUTING.md FAQ README \
+		README.Getting-Started README.MAPS README.OSM_maps
+}
+
+pkg_postinst() {
+	elog "Kernel mode AX.25 and GPSman library not supported."
+	elog
+	elog "Remember you have to be root to add addditional scripts,"
+	elog "maps and other configuration data under /usr/share/xastir."
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 02aa1b52fd07..92a125ee1c63 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audicle/Manifest b/media-sound/audicle/Manifest
index 44a88073fcbb..55961f82d4d9 100644
--- a/media-sound/audicle/Manifest
+++ b/media-sound/audicle/Manifest
@@ -3,5 +3,5 @@ AUX audicle-1.0.0.7-const.patch 455 BLAKE2B b030468b23e5a05b2a79c72be9f44e61a31c
 AUX audicle-1.0.0.7-gcc43.patch 2777 BLAKE2B 5b0be13a8a91de81ccc0c3bc54978b43bbeeba187493890ec9192f03259bd9d8b3b2e215a8c781c662cf9bcbb815f71ffdbe98b234eb62bc66c138e9017a7f98 SHA512 e9858e7c7cea35d8f5af5c4c8ca22c80c030eb14bd8798cb617b86bc55067413d3875c9cc30700c2a3aa86a5439dd60708a266acd41195280e744affa89503cf
 AUX audicle-1.0.0.7-hid-smc.patch 3181 BLAKE2B bfdaf969b98c77449a46f79a7f20be976028821f7136413838cb05dcf7fc33d98d4d822c0202e8f631670b802060191e52a8115354b53480c64833b6b7efd215 SHA512 8092d8de0fb6aea240e38c98a45218c002e78af0b1d7b285bca8d9d81ae77a76b15b0db57aaf42c70a65fd52c8ced89c0e31b22213654ba52ac3105f2a764ff5
 DIST audicle-1.0.0.7.tgz 5561088 BLAKE2B 7056880aa6b902e15e7722d9532736b8d513c6e9135b2b5afb839783e3df83f4e1f29f8c73b0f652d920029f6eb12dd7af1a699cb487b9ad0f76229f6ebd6fae SHA512 c96506620e22e1f7846288cb4f34dc7efe59e14d845425673524d0a89712ea7d3dabed546eb921220e021d4e8526937990a4f5764fbf2bb90339b993f6703772
-EBUILD audicle-1.0.0.7-r1.ebuild 2440 BLAKE2B 07f51c0f411cb4312a092ae202ccd01e4b2fa5df9811bff143ddc03860c3954bc9cc096b5688db15948cd82f9e96d10bee7e5cb075fef2569b656311e5169ebf SHA512 519c7b158d1a3ac3c33a58cb782b4b02d49bdbba3a5e010d9f489a48a4928fb7d065e05a9a41c4a6361531b609cbc5d088e5f59d47505fb3662e47bec3e54159
+EBUILD audicle-1.0.0.7-r2.ebuild 2395 BLAKE2B 92c0e6881575eafdf168e26d593a8aff46f53f2ae97d7c615ae58f87c6165bd6cc10ee4962b6062b5f90d20abffc714bf682df5ab8a799ea31c6aba5b618d423 SHA512 eda677f65129704a09fb5e8f7f4a0812f1fcaacdc13310cfbca60a3fd29b54cbc3c8895a18dfdb8ca21b9ebfffca8902c41b43bab3b3cc9da2888af355f6532f
 MISC metadata.xml 386 BLAKE2B 77bb79297d16b8580b574e44a07ec2b8d5ec323528e804aef9e35f7274731e2e46976661b3089fd8d526491984f9564d3dd528564c8559e027b26d2fe3ba3bff SHA512 df4591da51216c3a5b15ef353db9b5666b7e5e4082f3e8214a596a9ab7a344c5e64178c437fe2d15b9f8b5eb1ace88e6ed800595f3b94ebb17c972fe91bed414
diff --git a/media-sound/audicle/audicle-1.0.0.7-r1.ebuild b/media-sound/audicle/audicle-1.0.0.7-r1.ebuild
deleted file mode 100644
index b09d488baa5f..000000000000
--- a/media-sound/audicle/audicle-1.0.0.7-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A Context-sensitive, On-the-fly Audio Programming Environ/mentality"
-HOMEPAGE="http://audicle.cs.princeton.edu/"
-SRC_URI="http://audicle.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa jack oss truetype"
-
-RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	media-libs/libsndfile
-	media-libs/freeglut
-	virtual/opengl
-	virtual/glu
-	x11-libs/gtk+:2
-	truetype? ( media-libs/ftgl
-		media-fonts/corefonts )
-	app-eselect/eselect-audicle"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( alsa jack oss )"
-
-DOCS=( AUTHORS PROGRAMMER README THANKS TODO VERSIONS )
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0.6-font.patch"
-	"${FILESDIR}/${P}-hid-smc.patch"
-	"${FILESDIR}/${P}-gcc43.patch"
-	"${FILESDIR}/${P}-const.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	sed -i \
-		-e 's@../ftgl_lib/FTGL/include@/usr/include/FTGL@' \
-		-e 's@../ftgl_lib/FTGL/mac/build@/usr/lib@' \
-		-e 's/gcc -o/$(CC) -o/' \
-		-e 's/-O3 -c/-c $(CFLAGS)/' \
-		-e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
-		src/makefile.{alsa,jack,oss} || die "sed failed"
-
-	epatch_user
-}
-
-compile_backend() {
-	local backend="$1"
-	local config
-	use truetype && config="USE_FREETYPE_LIBS=1"
-	einfo "Compiling against ${backend}"
-	cd "${S}/src"
-	emake -f "makefile.${backend}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" LEX=flex \
-		YACC=bison ${config}
-	mv audicle{,-${backend}}
-	emake -f makefile clean
-}
-
-src_compile() {
-	# when compile with athlon or athlon-xp flags
-	# audicle crashes on removing a shred with a double free or corruption
-	# it happens in Chuck_VM_Stack::shutdown() on the line
-	#   SAFE_DELETE_ARRAY( stack );
-	replace-cpu-flags athlon athlon-xp i686
-
-	use jack && compile_backend jack
-	use alsa && compile_backend alsa
-	use oss && compile_backend oss
-}
-
-src_install() {
-	use jack && dobin src/audicle-jack
-	use alsa && dobin src/audicle-alsa
-	use oss && dobin src/audicle-oss
-	dodoc ${DOCS[@]}
-}
-
-pkg_postinst() {
-	elog "Audicle now can use many audio engines, so you can specify audio engine"
-	elog "with audicle-{jack,alsa,oss}"
-	elog "Or you can use 'eselect audicle' to set the audio engine"
-
-	einfo "Calling eselect audicle update..."
-	eselect audicle update --if-unset
-}
diff --git a/media-sound/audicle/audicle-1.0.0.7-r2.ebuild b/media-sound/audicle/audicle-1.0.0.7-r2.ebuild
new file mode 100644
index 000000000000..7ea60ba2f27f
--- /dev/null
+++ b/media-sound/audicle/audicle-1.0.0.7-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="A Context-sensitive, On-the-fly Audio Programming Environ/mentality"
+HOMEPAGE="http://audicle.cs.princeton.edu/"
+SRC_URI="http://audicle.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack oss truetype"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+DEPEND="
+	app-eselect/eselect-audicle
+	media-libs/freeglut
+	media-libs/libsndfile
+	virtual/opengl
+	virtual/glu
+	x11-libs/gtk+:2
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	jack? ( virtual/jack )
+	truetype? (
+		media-fonts/corefonts
+		media-libs/ftgl
+	)
+"
+rDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( alsa jack oss )"
+
+DOCS=( AUTHORS PROGRAMMER README THANKS TODO VERSIONS )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0.6-font.patch"
+	"${FILESDIR}/${P}-hid-smc.patch"
+	"${FILESDIR}/${P}-gcc43.patch"
+	"${FILESDIR}/${P}-const.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's@../ftgl_lib/FTGL/include@/usr/include/FTGL@' \
+		-e 's@../ftgl_lib/FTGL/mac/build@/usr/lib@' \
+		-e 's/gcc -o/$(CC) -o/' \
+		-e 's/-O3 -c/-c $(CFLAGS)/' \
+		-e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
+		src/makefile.{alsa,jack,oss} || die "sed failed"
+}
+
+compile_backend() {
+	local backend="$1"
+	local config
+	use truetype && config="USE_FREETYPE_LIBS=1"
+	einfo "Compiling against ${backend}"
+	cd "${S}/src"
+	emake -f "makefile.${backend}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" LEX=flex \
+		YACC=bison ${config}
+	mv audicle{,-${backend}}
+	emake -f makefile clean
+}
+
+src_compile() {
+	# when compile with athlon or athlon-xp flags
+	# audicle crashes on removing a shred with a double free or corruption
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+	use oss && compile_backend oss
+}
+
+src_install() {
+	use jack && dobin src/audicle-jack
+	use alsa && dobin src/audicle-alsa
+	use oss && dobin src/audicle-oss
+	dodoc ${DOCS[@]}
+}
+
+pkg_postinst() {
+	elog "Audicle now can use many audio engines, so you can specify audio engine"
+	elog "with audicle-{jack,alsa,oss}"
+	elog "Or you can use 'eselect audicle' to set the audio engine"
+
+	einfo "Calling eselect audicle update..."
+	eselect audicle update --if-unset
+}
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 1d38c5b4909c..e80cf1741f7d 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,4 +1,4 @@
 AUX beets-1.4.8-imagemagick-detection.patch 770 BLAKE2B 120e0af71fe9c63548f49bf20fa94ec20f8b0cfb8395b319d6f8e2a62b5212adb229691c35297615a3b0272b215c87e1ff861e1887d227fc9460501900edae48 SHA512 6c5da1591e0bfc0936dca52c48f74b80b57c18bb0398877d38deb7d448df9466a8544628e0ce6948204a8deae4679c8dd454dab9a2f0778a236eaa60387a1751
 DIST beets-1.4.8.tar.gz 1493539 BLAKE2B 63c44f05bbf139cd43b5f5ada972fd30beeea2303c6b479b1be35ea21fabb0039b3c8eb6e90f8f1b2a61fed36d97ce09a32c6346cbd3b84c7c978e796505f4b4 SHA512 449bed88185a5ecb4781719e092c2428ddc52fb8084033db64a4c0eca8899154192e7cea82517993d60326c7fe39b26429584ba368ffc35800f722d8d6a03217
-EBUILD beets-1.4.8.ebuild 3664 BLAKE2B 5614f65a3489bc6ee055f25592811fb693123af75b5da4c78c2519244003f81438e162bf6d861b6f023d6a9829f63ec937feb8f37848e7e6091d6aba90ba04d9 SHA512 49049389dd652571f82da01da5ce2f676e6bd4340d989669c58db436d819e0fe27e2b1c8a202c9ff40978a4fb4465e64291918283b3f86e1db372e249eb5cebe
+EBUILD beets-1.4.8-r1.ebuild 3664 BLAKE2B 094cc8dfbf32cea571e4789db182a60ad07eeb772a47be47d45843eefe70c20e619f7524e98f533d14e899983b534d7b5c7aeeeed4e8aa00a723ec325d4449de SHA512 62f4c4d9619fc07388427830fc3a8248e7b7477c6a18a451b75e4291dd928adf40db39ddf606b2b1a9feeaa5e4728796d184b2e905aadec09ff0946a7961d8c0
 MISC metadata.xml 2395 BLAKE2B 0df8a5d3fa7b94b5b8e3e45f25e2c4dc0716c438dd51a6061f2276e20bf9779847c34bc571bcdd8948289c75c879cae6ef76fa8432a550855e9f74966fb80374 SHA512 ea2c961e7380a8c05e0e90b34f50323ca932e06ba33d5a214a633e8eba4281577993a870a7d294f286a90c0492256d3142b9e17aa02e2ea129c9c28e24bf90ec
diff --git a/media-sound/beets/beets-1.4.8-r1.ebuild b/media-sound/beets/beets-1.4.8-r1.ebuild
new file mode 100644
index 000000000000..4cfc7d72806a
--- /dev/null
+++ b/media-sound/beets/beets-1.4.8-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+
+RDEPEND="
+	>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+	dev-python/munkres[${PYTHON_USEDEP}]
+	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	badfiles? (
+		media-libs/flac
+		media-sound/mp3val
+	)
+	chromaprint? (
+		dev-python/pyacoustid[${PYTHON_USEDEP}]
+		media-libs/chromaprint[tools]
+	)
+	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	ffmpeg? ( media-video/ffmpeg:0[encode] )
+	icu? ( dev-db/sqlite[icu] )
+	lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	mpd? (
+		dev-python/bluelet[${PYTHON_USEDEP}]
+		dev-python/python-mpd[${PYTHON_USEDEP}]
+		gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
+	)
+	replaygain? (
+		gstreamer? (
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			media-libs/gst-plugins-good:1.0
+			media-plugins/gst-plugins-meta:1.0[ffmpeg]
+		)
+		!gstreamer? ( media-sound/mp3gain )
+	)
+	thumbnail? (
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pillow[${PYTHON_USEDEP}]
+			media-gfx/imagemagick
+		)
+	)
+	webserver? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/flask-cors[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+RESTRICT="test" # tests broken in 1.4.3 already
+
+PATCHES=( "${FILESDIR}/${P}-imagemagick-detection.patch" )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm_use_plugins() {
+		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
+		local use=${1}
+		local plugins=${use}
+		use ${use} && return
+		einfo "no ${use}:"
+		[[ $# -gt 1 ]] && plugins="${@:2}"
+		for arg in ${plugins[@]}; do
+			einfo "  removing ${arg}"
+			if [[ -e "beetsplug/${arg}.py" ]]; then
+				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
+			fi
+			if [[ -d "beetsplug/${arg}" ]]; then
+				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
+			fi
+			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
+				die "Unable to disable ${arg} plugin "
+		done
+	}
+
+	default
+
+	rm_use_plugins chromaprint chroma
+	rm_use_plugins ffmpeg convert
+	rm_use_plugins icu loadext
+	rm_use_plugins lastfm lastgenre lastimport
+	rm_use_plugins mpd bpd mpdstats
+	rm_use_plugins webserver web
+	rm_use_plugins thumbnail thumbnails
+
+	# remove plugins that do not have appropriate dependencies installed
+	for flag in badfiles discogs replaygain; do
+		rm_use_plugins ${flag}
+	done
+
+	if ! use mpd; then
+		rm -f test/test_player.py || die
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd test || die
+	if ! use webserver; then
+		rm test_web.py || die "Failed to remove test_web.py"
+	fi
+	"${PYTHON}" testall.py || die "Testsuite failed"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/beet.1 man/beetsconfig.5
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	einstalldocs
+}
diff --git a/media-sound/beets/beets-1.4.8.ebuild b/media-sound/beets/beets-1.4.8.ebuild
deleted file mode 100644
index 432eaabd9850..000000000000
--- a/media-sound/beets/beets-1.4.8.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE="badfiles chromaprint doc discogs ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
-
-RDEPEND="
-	dev-python/jellyfish[${PYTHON_USEDEP}]
-	dev-python/munkres[${PYTHON_USEDEP}]
-	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	badfiles? (
-		media-libs/flac
-		media-sound/mp3val
-	)
-	chromaprint? (
-		dev-python/pyacoustid[${PYTHON_USEDEP}]
-		media-libs/chromaprint[tools]
-	)
-	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	ffmpeg? ( media-video/ffmpeg:0[encode] )
-	icu? ( dev-db/sqlite[icu] )
-	lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	mpd? (
-		dev-python/bluelet[${PYTHON_USEDEP}]
-		dev-python/python-mpd[${PYTHON_USEDEP}]
-		gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-	)
-	replaygain? (
-		gstreamer? (
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			media-libs/gst-plugins-good:1.0
-			media-plugins/gst-plugins-meta:1.0[ffmpeg]
-		)
-		!gstreamer? ( media-sound/mp3gain )
-	)
-	thumbnail? (
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		virtual/python-pathlib[${PYTHON_USEDEP}]
-		|| (
-			dev-python/pillow[${PYTHON_USEDEP}]
-			media-gfx/imagemagick
-		)
-	)
-	webserver? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/flask-cors[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-RESTRICT="test" # tests broken in 1.4.3 already
-
-PATCHES=( "${FILESDIR}/${P}-imagemagick-detection.patch" )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm_use_plugins() {
-		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
-		local use=${1}
-		local plugins=${use}
-		use ${use} && return
-		einfo "no ${use}:"
-		[[ $# -gt 1 ]] && plugins="${@:2}"
-		for arg in ${plugins[@]}; do
-			einfo "  removing ${arg}"
-			if [[ -e "beetsplug/${arg}.py" ]]; then
-				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
-			fi
-			if [[ -d "beetsplug/${arg}" ]]; then
-				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
-			fi
-			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
-				die "Unable to disable ${arg} plugin "
-		done
-	}
-
-	default
-
-	rm_use_plugins chromaprint chroma
-	rm_use_plugins ffmpeg convert
-	rm_use_plugins icu loadext
-	rm_use_plugins lastfm lastgenre lastimport
-	rm_use_plugins mpd bpd mpdstats
-	rm_use_plugins webserver web
-	rm_use_plugins thumbnail thumbnails
-
-	# remove plugins that do not have appropriate dependencies installed
-	for flag in badfiles discogs replaygain; do
-		rm_use_plugins ${flag}
-	done
-
-	if ! use mpd; then
-		rm -f test/test_player.py || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd test || die
-	if ! use webserver; then
-		rm test_web.py || die "Failed to remove test_web.py"
-	fi
-	"${PYTHON}" testall.py || die "Testsuite failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/beet.1 man/beetsconfig.5
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	einstalldocs
-}
diff --git a/media-sound/bitmeter/Manifest b/media-sound/bitmeter/Manifest
index 3c1cdf6a305d..2b5064973554 100644
--- a/media-sound/bitmeter/Manifest
+++ b/media-sound/bitmeter/Manifest
@@ -1,5 +1,5 @@
 AUX bitmeter-1.2-fix-build-system.patch 709 BLAKE2B e3f868aeace527b265fd73e96f9f10235e4abe0b62064a16c61dfb30d53b5048e3c7a0a461473e72895b323b96427a0715bc4716a0783b81222eaaf6b9984151 SHA512 6358c6a930d525c6a6c487556ed8db7d507d1cfbf20381c70106bf888889eee09c3d4b84ac27c757e1c2713e97f2987a051b255052881f77a5249b4dd9ff290d
 AUX bitmeter-1.2-qa-desktop-file.patch 381 BLAKE2B e8d126340b50ff13ea62bfb461a15be1144dcbcccdf936ac6e2e43538e619ea7ed8e31a449a366c56b3f74fca7f5df4e9f0196e0b6c442ef17837f809dbe3b29 SHA512 8de6edd11597d9f9c0a6588b49874de5d69debcf155a3f9ea88dbcb28a75e5d0325a8f904be7c6ff0ec17d6fa0f8789566713c736aba71e928198dd774889c69
 DIST bitmeter-1.2.tar.gz 216592 BLAKE2B 4f093de7d87330329b8ab7f2673c55ba2f90da1053d65b0268fe4ad7d024559c737cf7d6b9038c44f16abe6c34fbe73a0c6cd837b8aadc9a2660630b106a41d5 SHA512 aa034b572d499bb0858d8c0e9a0487bf1c83c8edfa43916e1a0618ad2c3a71272f0ed740c8e62d17d8a504d88c7e0fc4f36b736628e481f036812d07f6e251f8
-EBUILD bitmeter-1.2-r1.ebuild 719 BLAKE2B f18b42a640c3650ba79c9f090ea71d2a5c32bd82d9168a2c71e177d01bfdf145104811ed8d6216c12ff69e34d2676959fffbe8d76c54ce010f365747501911f0 SHA512 fea8335b569550a8f1154ddddb75b496b472df7176059d9f18de23cb404e91e18b8819a9b8a681696f56691db7e1ceb06a30708c0e7d1db809bbda5d7021cb2f
+EBUILD bitmeter-1.2-r2.ebuild 707 BLAKE2B 321922e1be64d273396ac2337138ed968704c0036d19e62d21262f7dc7fe97998f68279b97d8272927849698a9cb48ebed2020d92de178275109d3d0425630d7 SHA512 759321ae249e20e5e57c264e243e04946ef2ed6c98c9a4c41d584fa7ca8960e60ca29c5f369ad4d90a94a00343684de6bdd4e3f1c405680b20452dc6cb2e1292
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/bitmeter/bitmeter-1.2-r1.ebuild b/media-sound/bitmeter/bitmeter-1.2-r1.ebuild
deleted file mode 100644
index 35b1faaa6ff9..000000000000
--- a/media-sound/bitmeter/bitmeter-1.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Diagnosis tool for JACK audio software"
-HOMEPAGE="http://devel.tlrmx.org/audio/"
-SRC_URI="http://devel.tlrmx.org/audio/source/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="x11-libs/gtk+:2
-	media-sound/jack-audio-connection-kit"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2-fix-build-system.patch
-	"${FILESDIR}"/${PN}-1.2-qa-desktop-file.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/*.{png,html} )
-	default
-}
diff --git a/media-sound/bitmeter/bitmeter-1.2-r2.ebuild b/media-sound/bitmeter/bitmeter-1.2-r2.ebuild
new file mode 100644
index 000000000000..4ee1222e4afe
--- /dev/null
+++ b/media-sound/bitmeter/bitmeter-1.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Diagnosis tool for JACK audio software"
+HOMEPAGE="https://devel.tlrmx.org/audio/"
+SRC_URI="https://devel.tlrmx.org/audio/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	virtual/jack
+	x11-libs/gtk+:2
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.2-qa-desktop-file.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/*.{png,html} )
+	default
+}
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index d618971f1936..8333ad3ef6aa 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -3,5 +3,5 @@ AUX bristol-0.60.11-dontcompress.patch 576 BLAKE2B 78f5629897a3ae3380f5e64ccce6f
 AUX bristol-0.60.11-implicit-dec.patch 320 BLAKE2B 8fef42ab74f5f6777c86774a7f7c8092b20d8c596ab2118fd862bc32e0f3fa55ceee488cc88d4599f22b4b373d67c2af3ea189f3508e30564ffc71acb5e812a1 SHA512 50a59747c75a8843b06fc412c65d724d8f205be1c6d9d5c0aa0d38c57f0f1401634dd301b531f8a28ca43f3804727d9ded82e6fa49abd5372fc8e70f87f5b341
 AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 967 BLAKE2B 9da2f53f06e4db83c5fe280e3253c70a83e052304c9e5adcd6e64956c81ea7bfd9eaf1dd5d639aca581c16bb446140fcef591753b3325aa0f700ed3a8649f1db SHA512 a86aefdcb1a6431bce94dc062b4f3e73332196fc71a154c8d171991cd61b3694958229c5d329245e098976732f03f75516dd7521d887b822bd6441e66a1bd64a
 DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180
-EBUILD bristol-0.60.11-r1.ebuild 1196 BLAKE2B e32f880e80f8b418bc7a96b319a8ce108f7b6d1ad904c61b3732b16cc3fc497f8fd746e865679240bdde50fb084d2a8f858b09ace5af1f2d415f65f801927aff SHA512 3ec5ec5cda247f80c95189fa89f8783b4af16892df646e5784b814cc025808f366a57424c6571128ee7729494207ab2ad8b6745dd10840790ed295f89ca43430
+EBUILD bristol-0.60.11-r1.ebuild 1162 BLAKE2B a91b2583ffa49b6f3d53c6d5948ece07764d9f4c8c6f1be25043d47556b41969b7329eeb5bf6cb63cbfe6298b63cdb3f28f1a161d2893333b241b6c1b2e0124c SHA512 b4f5aab7a0af100da9d95d6c7e621cf6b0e5a51abe5da4abdae323ba3158f79320a2452338d0e51df1b42821f256f79268148f7c693e04dfa35c331819046dbe
 MISC metadata.xml 599 BLAKE2B fa41cf25b04bb687587a736332f3b66a63a52d13c0371b64aaf8c7d12515df8ac9b15c3e70687b6cd8157b493a65992f2e8a1a96db12cd372215b9791b46fc7d SHA512 ca1be472e9a1dce6e55d3313e9b11f0839fbb321c5b662ebf4a9aca0915d10b15cbe3aee3629b285886e84b53f8c7d0c65613e58be32d5d98f04360b368da1ba
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild b/media-sound/bristol/bristol-0.60.11-r1.ebuild
index 0cb211ac2850..01ee6cb806e3 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,15 +17,16 @@ IUSE="alsa oss static-libs"
 # jack: fails to build if disabled
 # pulseaudio: not fully supported
 
+BDEPEND="
+	virtual/pkgconfig
+"
 RDEPEND="
-	>=media-sound/jack-audio-connection-kit-0.109.2
+	virtual/jack
 	x11-libs/libX11
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 "
 # osc? ( >=media-libs/liblo-0.22 )
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 
diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
index 1f5e0d220258..710b462f28bf 100644
--- a/media-sound/brutefir/Manifest
+++ b/media-sound/brutefir/Manifest
@@ -1,4 +1,4 @@
 AUX brutefir-1.0k-ld.patch 4655 BLAKE2B 56ae2cf653311030e5552e50653082b059baa39bf00d1d9a2692e319b459a88b4bef4e0a1aa01aedd2ec9c97f19de0f03b966d10c6faeeccd6ef907d91b12a59 SHA512 606d32f1b76901e3cb6d106259d19c64e3a6f841fd5d0791623ad824c7264ff3ecd7178073fe488c7f1d26b996b9900f9661406f987f2443e9eb8ef9eeb6491a
 DIST brutefir-1.0k.tar.gz 246987 BLAKE2B 3db08c1f51e8febb63b293d1a242342e7d9f4fa4b447b46da37bc3de594bef8a6ee15cd8330ef73673011186dcfe47a5b056ec3c177f3982cd1837a582f050a1 SHA512 5eb81a18935fc3f014613b74c30b2e9a3acfe0ab58b72358f0428b60f0296ab54796b99fa00b12a671935b57589d710dd81b1e0ca675bd2b841c9e932a2c94ef
-EBUILD brutefir-1.0k-r2.ebuild 1103 BLAKE2B fa456a16de2a0014236595bbc49a5b158536a758a184d87d351053e4d898c509515f2440dce18bfc2ef6db50709314e6f527fc9777353afed53d554098ae362b SHA512 b9203230a0686522331f196fdfb3f0fb3daef3ca35ca6fc5f13b30e85906e9bef4254af5228fcaa68db9498e45ae125359844c489d763e964adcefc401e03e24
+EBUILD brutefir-1.0k-r2.ebuild 1080 BLAKE2B b8370021bf1bf6104292c21aa1efb33b0f02952978138a499ebfe0986388c17e57f5a39149d7acd8eabe9701ee1c5ebf47a7da245ae2f48591342108109962f2 SHA512 70060a3750b4209dafa7bcc48b73e14d74295ea44dceb28e00057a22e32cb858f7e62d577df0aab1ed88cb376444618804b8ce3dc8110aabee98203f57c3cb49
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/brutefir/brutefir-1.0k-r2.ebuild b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
index 5c205ce75718..c0dbb7ac747e 100644
--- a/media-sound/brutefir/brutefir-1.0k-r2.ebuild
+++ b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,9 +13,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-RDEPEND="media-libs/alsa-lib
-	media-sound/jack-audio-connection-kit
-	sci-libs/fftw:3.0"
+RDEPEND="
+	media-libs/alsa-lib
+	sci-libs/fftw:3.0
+	virtual/jack"
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-ld.patch )
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index d4142132a45f..fab1fc4b4dd0 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,4 +1,4 @@
 DIST cdparanoia-III-10.2-patches-2.tbz2 6242 BLAKE2B 6eb0f3c3a331421497e406df969de61d42590f4e8ffff13ffc212ec4a03170b1e02e00322c5c4f2042e5cc4be2cffff58ec8b9b57d851d5df8bebc3fb88ac913 SHA512 523a9ef9f3de263236aad6da102b807a6620cde8767e297e54dcd552f59077d959a89187bc82ad71c577fa66c4862d7c651e922b8b8b8369dd63685cbda9cb74
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
-EBUILD cdparanoia-3.10.2-r6.ebuild 1325 BLAKE2B cf1ce4c6aa1df6a613f86d2247b388fee280393079a284f6aa00ea5aa94b0823f8edd924ff2b2c2a40b7ab5e3d389c160c5714c0c9eebc35dccafed37ae467bb SHA512 1229f4b9749fc5e78c85148c4ab72183fc92d04fec13c623b4860c7e9b62733ead9d9378059c9d1cd351f8ae19a277fe77df24055b3e90b9a638edba4ed24809
+EBUILD cdparanoia-3.10.2-r6.ebuild 1321 BLAKE2B 30833fc15e666cd3268bc6c93119e664eb2b70735f86d151411700094675ad5bd9665d74ac446dcd0fe668d4e6249a3b67a0dcfc9d05d9ec3d3e778c2896c1c1 SHA512 669c340b310ad79f0fb659d36bfaf06d27df486cea58bb9aaa2b5a312eea3399a95f07ff7e25a9719f041adf378f49d1fb7f2891b398d416e2e9e9bb3ccce41d
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
index ef62f7fc786e..ccff9a911ad1 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-eselect/eselect-cdparanoia"
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 56ffc0bcc365..f9bf7cd492e4 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,4 +1,4 @@
 DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
-EBUILD clementine-1.3.1_p20190127.ebuild 5041 BLAKE2B 67d44296fce0e1464582645aaec298982b0fa0bc0dd82d1390c56f45c1fedb16b9f7a783ef7d8e3f5ca0a392dbd1f9c5775fdc7cae2574732b3cda3350ae57b5 SHA512 ce614fec90f176fecc761333c959c67df646797448fc12cf0ab6b696942e13c7dc668cfb75e71f77538fa244ef25a689bfaa4687dc8cf631d52014239e26b152
-EBUILD clementine-9999.ebuild 4977 BLAKE2B c542c8d91b7d2305b6a58b7f863159c175919a7960a59be872079ea6393e57d227046dec4c7ecb4a9c7efe9410d5fd1da37ea207d812da84950fd52830a06c5f SHA512 cbba3f82e7dcc42bb76b2d7b92d5de68110041dd8ceb06683757ee7da5efa1b23be0d5106dd14380dbc7798428e79020e4ae5a153673dd8ed92003bfd7876913
+EBUILD clementine-1.3.1_p20190127.ebuild 5043 BLAKE2B 4d6c2113a990744bb310f7d2ef0c20e24554fc64a5df1546a11cad449a689f5aa2515508dd30cf77b9294eb2b880980f24a5e3b22dd8ca6521c752939eafabb2 SHA512 ca57e01f9fbce22460f1d52a01fbc641afbe2a6981f04544e21fd4a35fc8a16c36313b86637e5bd7ce1b0aa87eeb32178acd92266c47f8c50666a0f4f93e1143
+EBUILD clementine-9999.ebuild 4974 BLAKE2B e25668017fc68c1443848e9677e44672109522bf4e1a6ca806dffbb262f063b430eb31af17c36e349b872f32d7a1b05b5989f457dcaced6cc913ac61121c64d7 SHA512 e3e1d1e24f2290281644313c5c29a531b53d80c5f22c09e87e8f3f5119bb56540844020fce471bbd4070bbb55f08229c35c2b0b0e7d736b0b49c6b12cf34a1c7
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
index 24f7f6aca315..64add8ac854a 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
@@ -42,7 +42,7 @@ BDEPEND="
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
-	dev-libs/crypto++[asm]
+	dev-libs/crypto++:=[asm]
 	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/protobuf:=
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index d3752f437463..95744f36b833 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -42,7 +42,7 @@ BDEPEND="
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
-	dev-libs/crypto++[asm]
+	dev-libs/crypto++:=
 	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/protobuf:=
diff --git a/media-sound/erec/Manifest b/media-sound/erec/Manifest
index c266f6683925..346f4aa22066 100644
--- a/media-sound/erec/Manifest
+++ b/media-sound/erec/Manifest
@@ -1,4 +1,5 @@
 AUX erec-2.2.0.1-gcc43.patch 340 BLAKE2B d3fc0c0d4bb509e7ce3839b8e83732a12602036502a010d1752139c66da6fcc8993bfcc98d74fb226ee67a0af9d2f73c5da97586a2fa61932c6469310411f5d0 SHA512 12f94249223911709ce46b3c5b1985019232f2d2ea906cfdebc30f6fd9e314e38ec40b734ea235d063f499e651a76fb05bcbfdd3be190b41e03625180b154cb0
 DIST erec-2.2.0.1.tar.bz2 25966 BLAKE2B 22e93e2185fc5eafab93a2558b3dd1261bcd7a96613fcc9b321baba13ca4dfaf024399aa298d36a6df7857ff0dd03c0bb15d3b3c26549b1845dba22061a94f6e SHA512 24832483ebca011294931a40be192fa1f6a0fbf69d2b515529bd6d9cbdb5bbd904f266bd824f816d044ed7ba63bc8cc6886868a0d594a0071e757c3e9ebfef28
-EBUILD erec-2.2.0.1.ebuild 1017 BLAKE2B 34ac4b9ee3588604ac5b80b8f71927103c64c5759d8233152836047cc125917a61179ca18022d5f0e8175b9ee77c0e56fa9b0db41d6fd0416929e6fd6fb658dc SHA512 28cda059398bffccdfb257da8e284d42485cc8cd81d3ea1cd9baf5a2e052d189765511ff8c090fbca415bc1c11b1bb76f63038904dd97c8b5db20ce2a1f5ebe2
+EBUILD erec-2.2.0.1-r1.ebuild 1000 BLAKE2B b0a97af4152309e4a9e106c8a9acbee69a7d107dc32862c6f082903db8137cce5434e5a2e48cb0e8f5d7fb7038ca3a87a1c6e4d82f86f0332766dd320e7976ec SHA512 2ba45949afad716291cb0e613e751f61928c5f5aab4981dc2622bf519a3ac16b290dd416da53030dbdad288379858784b4ed62df01c8d5797a3dd70fbfde991b
+EBUILD erec-2.2.0.1.ebuild 1015 BLAKE2B e6276645909bd996d5a03d3b8a94395a5e45f60848b911870caab8a559a4ed6ebce13d663088e5a5ca821b6f776e2ae1102dc44977eb0adb87ba10f3f9d4e0a5 SHA512 e3ff44ed3d359dd5176743241d7bc7d672da6bfa8044c54634b72e3bdcbc6ae9f3ea26a455ceae5cf8bc167e800013bee802eb07ebedd608c6074b25a4b43f95
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/erec/erec-2.2.0.1-r1.ebuild b/media-sound/erec/erec-2.2.0.1-r1.ebuild
new file mode 100644
index 000000000000..527e1ace368b
--- /dev/null
+++ b/media-sound/erec/erec-2.2.0.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Shared audio recording server"
+HOMEPAGE="https://bisqwit.iki.fi/source/erec.html"
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
+DOCS=( README )
+HTML_DOCS=( README.html )
+
+src_prepare() {
+	sed -i \
+		-e "s:BINDIR=/usr/local/bin:BINDIR=${D}usr/bin:" \
+		-e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \
+		-e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \
+		-e "s:\$(CXX):\$(CXX) \$(CXXFLAGS) -I\"${S}\"/argh:g" \
+		Makefile || die
+
+	sed -i \
+		 -e "s:CPPFLAGS=:CPPFLAGS=-I\"${S}\"/argh :" \
+		Makefile.sets || die
+
+	echo "" > .depend || die
+	echo "" > argh/.depend || die
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -j1
+}
+
+src_install() {
+	dobin erec
+	einstalldocs
+}
diff --git a/media-sound/erec/erec-2.2.0.1.ebuild b/media-sound/erec/erec-2.2.0.1.ebuild
index a9781b79bc0b..4d9f2c352052 100644
--- a/media-sound/erec/erec-2.2.0.1.ebuild
+++ b/media-sound/erec/erec-2.2.0.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A shared audio recording server"
-HOMEPAGE="http://bisqwit.iki.fi/source/erec.html"
-SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+DESCRIPTION="Shared audio recording server"
+HOMEPAGE="https://bisqwit.iki.fi/source/erec.html"
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
 KEYWORDS="amd64 ~ppc sparc x86"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
diff --git a/media-sound/fmit/Manifest b/media-sound/fmit/Manifest
index bd68e7ed6e86..a6c4a6d303bd 100644
--- a/media-sound/fmit/Manifest
+++ b/media-sound/fmit/Manifest
@@ -1,3 +1,3 @@
 DIST fmit-1.0.15.tar.gz 295365 BLAKE2B 9424c1fac390adc7fb8746ce05b354b31bc9f4ef8dc49bd8ca2c1362d9b57c1c0d8b10e110faae9d48363dd02f80967c767ade0e67096c27bcf5ae1c9d1fa8ca SHA512 44537669391f5043efe35b53d9693f8ab6a151918583d35439c1b29feca4a707225038512c9a2de734ada9e9acb3b4b191b866038edaed9fe8d1fee09c540aac
-EBUILD fmit-1.0.15-r1.ebuild 1568 BLAKE2B 4d0f1604ac942cb82384a887c2f8e2c0213eff0894b899711d56e6311474fa5644852bf86e1a5a1c4a941e374e5d1ef5aaedb6c31331226563c9ae1fd7678ad6 SHA512 d98a45e4207de40ead50af4dc46f533869428312d47cf97cdfbd1edb37c6972984d05f9ff9b609d5e50b433c26e4659b79ef41b6b0652bc859b0a0bbaa6fb9e0
+EBUILD fmit-1.0.15-r2.ebuild 1570 BLAKE2B 34c007975c899da4d94e4f8d4509c66937fed56e4cd3c84638b7e45465152d45b4dd133cc916cfd1f687af58870374eadf13bfc48626aaecb78c9155afde83bf SHA512 8aa800e5e6697e8560ea378b7f3e8fc2d8fa533d50eebefe6b703c96705b6573a1e3b3c800c57fd95b531683da82213fba7aa404825b9fd0230da217f29719bd
 MISC metadata.xml 251 BLAKE2B 41d57d683fe855b6ee6b161b1c9bcc193e33ed5c184df3738f693f0c078978a6d7bfde323243822cd5e0679122e6241158f0e6ecd237fe8f0e7e770c95d7fd19 SHA512 16072c41732d3c5486b4066a8f17cc829688c24772a002ea72c1deae3dcd78f4ee72bd7948782ca970fdb2e5cba66a16db205a384de036186814b2345f2f103c
diff --git a/media-sound/fmit/fmit-1.0.15-r1.ebuild b/media-sound/fmit/fmit-1.0.15-r1.ebuild
deleted file mode 100644
index d7e9c9594e38..000000000000
--- a/media-sound/fmit/fmit-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Free Music Instrument Tuner"
-HOMEPAGE="https://gillesdegottex.github.io/fmit"
-SRC_URI="https://github.com/gillesdegottex/fmit/archive/v${PV}.tar.gz \
-							-> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa jack oss portaudio"
-
-RDEPEND=">=sci-libs/fftw-3.3.4:3.0=
-	dev-qt/qtmultimedia:5
-	dev-qt/qtopengl:5
-	dev-qt/qtsvg:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	portaudio? ( media-libs/portaudio )"
-
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_prepare() {
-	# Fix the path to readme file to prevent errors on start up
-	sed -i "/QFile readmefile/c\QFile readmefile \
-		(\"/usr/share/doc/${PF}/README.txt\");" \
-		src/main.cpp || die "README sed failed"
-	# Fix the PREFIX location, insert real path.
-	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
-		src/main.cpp || die "PREFIX fix sed failed"
-	# Fix the PREFIX location, insert real path.
-	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
-		src/modules/MicrotonalView.cpp || die "PREFIX fix sed failed"
-	default
-}
-
-src_configure() {
-	local config flag
-	for flag in alsa jack portaudio oss; do
-		use ${flag} && config+=" acs_${flag}"
-	done
-
-	"$(qt5_get_bindir)"/lrelease fmit.pro || die "Running lrelease failed"
-
-	eqmake5 CONFIG+="${config}" fmit.pro PREFIX="${D}"/usr \
-		PREFIXSHORTCUT="${D}"/usr DISTDIR=/usr
-}
diff --git a/media-sound/fmit/fmit-1.0.15-r2.ebuild b/media-sound/fmit/fmit-1.0.15-r2.ebuild
new file mode 100644
index 000000000000..163fafa5f86d
--- /dev/null
+++ b/media-sound/fmit/fmit-1.0.15-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Free Music Instrument Tuner"
+HOMEPAGE="https://gillesdegottex.github.io/fmit"
+SRC_URI="https://github.com/gillesdegottex/fmit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack oss portaudio"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=sci-libs/fftw-3.3.4:3.0=
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	portaudio? ( media-libs/portaudio )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+src_prepare() {
+	# Fix the path to readme file to prevent errors on start up
+	sed -i "/QFile readmefile/c\QFile readmefile \
+		(\"/usr/share/doc/${PF}/README.txt\");" \
+		src/main.cpp || die "README sed failed"
+	# Fix the PREFIX location, insert real path.
+	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
+		src/main.cpp || die "PREFIX fix sed failed"
+	# Fix the PREFIX location, insert real path.
+	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
+		src/modules/MicrotonalView.cpp || die "PREFIX fix sed failed"
+	default
+}
+
+src_configure() {
+	local config flag
+	for flag in alsa jack portaudio oss; do
+		use ${flag} && config+=" acs_${flag}"
+	done
+
+	"$(qt5_get_bindir)"/lrelease fmit.pro || die "Running lrelease failed"
+
+	eqmake5 CONFIG+="${config}" fmit.pro PREFIX="${D}"/usr \
+		PREFIXSHORTCUT="${D}"/usr DISTDIR=/usr
+}
diff --git a/media-sound/gtklick/Manifest b/media-sound/gtklick/Manifest
index 7824f6b9a8f0..6e7a8de9e414 100644
--- a/media-sound/gtklick/Manifest
+++ b/media-sound/gtklick/Manifest
@@ -1,4 +1,4 @@
 AUX gtklick 787 BLAKE2B 6442edd7fe2249447950e03b4abfa912a0841d58aa9bd43a16fdaf52bfa735925caff404db477c40f99b27f4085ba1324d97316ea1f0fe02cdf0a5cce68dac1d SHA512 3ba1e5e9507eb6827dd7649e00da69539537934714b8a3833c8fae21abd0d0d7793a0207f4ebf1f65cb6e111cb7e344b97d5cf397cf038364cffe2ee6be39d6a
 DIST gtklick-0.6.4.tar.gz 35901 BLAKE2B 1dd0adcb5c0489633a00ec52230b0a3b7c0017ce5148c5d8a32cf09326243f61e26cf31e3f25c8213af9a77a4a4bc9b74bfd7167808c9037549cb10b20701b99 SHA512 8491650cf324005f32808036f63574b0a59659bc8e5f3efe615b83e42701f1a3bcb95825a2378b3a17b45ddb5b33c87bed9602a0492d117665d85bd35f4a4a9b
-EBUILD gtklick-0.6.4.ebuild 873 BLAKE2B 441645e0deac450ff50fecb3c27ca2cf00978359c6278e63ed4b1964777178500d3efc949df052d1efddfc38ba72a5c26ca9d5ff65f1544e702905e148b1ae7a SHA512 55bd67fac8119fffd8a495da8ba9eef49b13374729d1a27ccd8d68667fc71f410261394d7769f33be58dbb14190d093c45ea53dd052fd6e47ad679aecc7801b8
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+EBUILD gtklick-0.6.4-r1.ebuild 871 BLAKE2B 5928694401c5df24315312095ba83ba7de705a178d1b14f20d03c2457b80738e644fa326d759dd0fe82b3bc3267738d3adc824385bfc98f1e11d76712552bad4 SHA512 ea76fd58f103ddf2c8cb0f5051761e6fc495e9553b2f71b40fab7888b234851dceec114290b842db6c80088ec9beec94b1a4249302f9537a34a1dcdfd7124661
+MISC metadata.xml 443 BLAKE2B 6674b5c036cda85de93e6ad5718105445bfb79209d0d9e84516381349ca4798e14fa4b913b89916b14550d75f0b8b82a4f396d22673659a4c3eb50e9019f9d1b SHA512 2bc8fd482c0035ca55233825c9312c36d8172d9f8a230140d84ea2813cc0f78eadaaac6d62f3647d74aac661e8ad7875544c7bdb5629140bd36fbff1ca9c4344
diff --git a/media-sound/gtklick/gtklick-0.6.4-r1.ebuild b/media-sound/gtklick/gtklick-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..cf89a50cad7f
--- /dev/null
+++ b/media-sound/gtklick/gtklick-0.6.4-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A simple metronome with an easy-to-use GTK interface"
+HOMEPAGE="http://das.nasophon.de/gtklick/"
+SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
+	media-libs/pyliblo[${PYTHON_USEDEP}]
+	media-sound/klick[osc]
+	${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+
+	# Replace the broken default runner script with a working one.
+	sed \
+		-e "s|[@]sharedir[@]|${EPREFIX}/usr/share/${PN}|g" \
+		-e "s|[@]localedir[@]|${EPREFIX}/usr/share/locale|g" \
+		"${FILESDIR}"/${PN} > "${T}"/${PN} || die
+	python_replicate_script "${T}"/${PN}
+}
diff --git a/media-sound/gtklick/gtklick-0.6.4.ebuild b/media-sound/gtklick/gtklick-0.6.4.ebuild
deleted file mode 100644
index 0c04f65a3903..000000000000
--- a/media-sound/gtklick/gtklick-0.6.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="A simple metronome with an easy-to-use GTK interface"
-HOMEPAGE="http://das.nasophon.de/gtklick/"
-SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
-	media-libs/pyliblo[${PYTHON_USEDEP}]
-	media-sound/klick[osc]
-	${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# Replace the broken default runner script with a working one.
-	sed \
-		-e "s|[@]sharedir[@]|${EPREFIX}/usr/share/${PN}|g" \
-		-e "s|[@]localedir[@]|${EPREFIX}/usr/share/locale|g" \
-		"${FILESDIR}"/${PN} > "${T}"/${PN} || die
-	python_replicate_script "${T}"/${PN}
-}
diff --git a/media-sound/gtklick/metadata.xml b/media-sound/gtklick/metadata.xml
index 1b2becffa26c..c0aa4bcd7bf7 100644
--- a/media-sound/gtklick/metadata.xml
+++ b/media-sound/gtklick/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dsacre/gtklick</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/id3tool/Manifest b/media-sound/id3tool/Manifest
index 54d5fec3e225..8fae822bddbf 100644
--- a/media-sound/id3tool/Manifest
+++ b/media-sound/id3tool/Manifest
@@ -1,3 +1,3 @@
 DIST id3tool-1.2a.tar.gz 74723 BLAKE2B b96e16337dd468ddcba9343fd2286fec0149b6919f006cb6db99e862f449050b6f7bacdc3b40ca769affe233881ecba657e93f93d59f9bbf5f18fef150809ec5 SHA512 518d51794f19605bb3733b0d66f55ad3106ba17826bf2791b4629a0697f92bfbe0193d4442c4e3a5eccc8200ad3c0089085167857652884922a34cbe6683b36a
-EBUILD id3tool-1.2a.ebuild 526 BLAKE2B 16bcaf9d56180beb2020b393043a16579d8665231bf590fd291a22e9c04f34dedffda4d522b0adbabdd5e3935dc959213899f743e6515fdbf7d2881b04161c91 SHA512 8146fb9a1c52b37750832ef198cac854d9d42e44126582b125cd434ad76a9fa6e96df2e609f725a59209e9187d9552b7c54facfb2602cba399799449901aaa58
+EBUILD id3tool-1.2a.ebuild 373 BLAKE2B e9309019b73a6e2d940dd184753a335b79854130085db9806bc3deb41da5394d86a586bfada60fad4502ae5c7ddf76cc327d9c26ecfcc4564bb968c24f988831 SHA512 262be800fa58cfb819adc44753ee12b0b03be3500af476b43fb579337c6d05e3bd32b947017d90d7064788da9e65dab281901b30e14dba53c3c413439f9abec5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/id3tool/id3tool-1.2a.ebuild b/media-sound/id3tool/id3tool-1.2a.ebuild
index 6148a3223cad..018bd6961d12 100644
--- a/media-sound/id3tool/id3tool-1.2a.ebuild
+++ b/media-sound/id3tool/id3tool-1.2a.ebuild
@@ -1,20 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-DESCRIPTION="A command line utility for easy manipulation of the ID3 tags present in MPEG Layer 3 audio files"
+DESCRIPTION="Tool for easy manipulation of the ID3 tags present in MP3 audio files"
 HOMEPAGE="http://nekohako.xware.cx/id3tool"
 SRC_URI="http://nekohako.xware.cx/id3tool/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~arm amd64 ~ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc CHANGELOG README
-}
+KEYWORDS="amd64 ~arm ~ppc ppc64 sparc x86 ~x86-fbsd"
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
index 2d1b82c62e15..7a63d8246ba9 100644
--- a/media-sound/klick/Manifest
+++ b/media-sound/klick/Manifest
@@ -1,5 +1,5 @@
 AUX klick-0.12.2-gcc6.patch 1513 BLAKE2B 70eac0137fc8b4ffa25ccb86789efe7fc45cb9d68ac5160e962e0178637a3406221019c07d4a4035aa4baba00c4d883c005f6190f92cd81888277531ed232c41 SHA512 15d5fadd81f5dcb837ac4f91d62b99834fd192a508d5df9647df994b65807fc3de25eaceccad9b39535dc56abb83feb2f48109cf46d95d1ddb68a8212d096ad3
 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1
 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
-EBUILD klick-0.12.2-r1.ebuild 1028 BLAKE2B ccc840f9041de5d1b45b304eb2f712dc60df598c2dc166ba1c0d1cf1abb46695e05b449fbfd6abee1b9cf2157057eabe46f7573dc66e3a880e76f43f2c542295 SHA512 3be24a91e6279d2381d505a16642143b0f340a3269d53e2ea4b03eb85883442bf9094e778eed7cdbf1c2690749aeeb713160c1ecc42b57c8b518c46473583e7f
-MISC metadata.xml 241 BLAKE2B a584bb38ed8f3409284138457ac176a82c7ca3156daeabfb91b7bda72fa8d355c42b66683d16eca6addaa3548caba23e1beee758c7a10cc38686df9bee658e3a SHA512 7b743e56833b3696355128536d637744b5b2f7236f4818c6f8fda0c03a82c1f2ad1c8f491b700eb6ec45454924414c2e2df506184466b2145ba895e12dfa76fb
+EBUILD klick-0.12.2-r2.ebuild 1088 BLAKE2B 941df16e88b13a62eeef5ba0b5af0c6dc96d7a4817e9d3d1413f0e444ad06e6e3f6c0e390c30b6335254975be634d6f9c958b345766d285ca4a258ff3129075c SHA512 583aaaf49426c003ca1657d24eae09a304859f7258df6c2b527374090c2aa55d7331da857b51df320d69dfd39b6ca41516341b65147ef25da15931e5968fd3d8
+MISC metadata.xml 515 BLAKE2B 2a74e5109388a6bf402aeb0a96682b562a53d50aaec99a52163cc3b6744eafdd8be790af99399871af1d87c20afebc80d900304769303301f26b30df2551441b SHA512 fe2a6ca368b2aa748ba1064bbe484849a502a43f7616456c966fd011999ea73aa607c5ffe8cdb1e53e4400c8276fe3e732733f55b0f0143e140cecffaba8522a
diff --git a/media-sound/klick/klick-0.12.2-r1.ebuild b/media-sound/klick/klick-0.12.2-r1.ebuild
deleted file mode 100644
index 06734a9fa584..000000000000
--- a/media-sound/klick/klick-0.12.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit scons-utils toolchain-funcs
-
-DESCRIPTION="An advanced command-line based metronome for JACK"
-HOMEPAGE="http://das.nasophon.de/klick"
-SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug osc rubberband"
-
-RDEPEND="dev-libs/boost
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	virtual/jack
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sconstruct.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-HTML_DOCS=( doc/manual.html )
-
-src_configure() {
-	MYSCONS=(
-		CXX="$(tc-getCXX)"
-		CXXFLAGS="${CXXFLAGS}"
-		LINKFLAGS="${LDFLAGS}"
-		PREFIX="${EPREFIX}/usr"
-		DESTDIR="${D}"
-		DEBUG=$(usex debug)
-		OSC=$(usex osc)
-		RUBBERBAND=$(usex rubberband)
-	)
-}
-
-src_compile() {
-	escons "${MYSCONS[@]}"
-}
-
-src_install() {
-	escons "${MYSCONS[@]}" install
-	einstalldocs
-}
diff --git a/media-sound/klick/klick-0.12.2-r2.ebuild b/media-sound/klick/klick-0.12.2-r2.ebuild
new file mode 100644
index 000000000000..25f94d2fe96a
--- /dev/null
+++ b/media-sound/klick/klick-0.12.2-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit python-any-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="An advanced command-line based metronome for JACK"
+HOMEPAGE="http://das.nasophon.de/klick"
+SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug osc rubberband"
+
+RDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	virtual/jack
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sconstruct.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+HTML_DOCS=( doc/manual.html )
+
+src_configure() {
+	MYSCONS=(
+		CXX="$(tc-getCXX)"
+		CXXFLAGS="${CXXFLAGS}"
+		LINKFLAGS="${LDFLAGS}"
+		PREFIX="${EPREFIX}/usr"
+		DESTDIR="${D}"
+		DEBUG=$(usex debug)
+		OSC=$(usex osc)
+		RUBBERBAND=$(usex rubberband)
+	)
+}
+
+src_compile() {
+	escons "${MYSCONS[@]}"
+}
+
+src_install() {
+	escons "${MYSCONS[@]}" install
+	einstalldocs
+}
diff --git a/media-sound/klick/metadata.xml b/media-sound/klick/metadata.xml
index e83667d5c945..807ed60afdd3 100644
--- a/media-sound/klick/metadata.xml
+++ b/media-sound/klick/metadata.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="rubberband">Enable rubberband support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">dsacre/klick</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 571420ecfaea..58ffea1b66e9 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,5 +1,5 @@
 AUX linuxsampler-2.0.0-lv2-automagic.patch 727 BLAKE2B 23d836320c5bdd8e022599c65d26c3c757828a348e9ce87d158e1bdc9f3fb82ae174cc08a7ee4b4981378c4fd556fb932b2dcd4cf7bdb88c27920fb8a2033f8f SHA512 95f7b2bf01b293c58dc673cd40d6846d50d3a430a2874260fc268de7afe414a4970d4a443801f5d16417c14c6c16732e4bfdc58f7f997b7a3dd0bc1dc7ac8ddd
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 DIST linuxsampler-2.1.0.tar.bz2 1154834 BLAKE2B 1be8a14bb6c13d90f4068cc2e25211dccc8253a114234ba560136d9da9a806d101db49116698fe53353a649c77513d244700d7bb65be04d0eb4d10ef057898d6 SHA512 503db074437b07e3e8dc8d1cb0aa3a510a62d183148157c1a4757681a4319e531bd6a1486a83c0ab9721dde82e27306150f3be87476c9298b2335438670e19a7
-EBUILD linuxsampler-2.1.0.ebuild 1680 BLAKE2B 68947407aee89f1c052dbe90bc1e44508c2a23b8427d5b6fc609c18716d8d71a3c2a439d74a76b50545e3c19e9be633503b57ba8f181d9b073fc29de43212691 SHA512 707d00fe926eb04d2e4ab5781093c065ff5ba70fa3bec2e83ed32591bba3b5c8cc803fb828bca35a99eb2584d2fde962891c5bd453a53b03d0d5eac1a4798c09
+EBUILD linuxsampler-2.1.0.ebuild 1722 BLAKE2B 53ac46fe27117a50943a131183e15cc4889fe65a3e633b59a3f8d32453f8a9bde49b32fcb062f2857a43e2e3c2662f8f9cb4ee2720096dbc8b8996a2a8e431e3 SHA512 e93256be1864c7b19496cef12d0322b058f62ab98594e7a830a2b4865dee747c98c301c81440dee2a1b632c10a3ceea2addb00529d49c416b589bd7f9ebbcd18
 MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild
index b277175098e2..cb7d364ca292 100644
--- a/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,7 +61,7 @@ src_configure() {
 }
 
 src_compile() {
-	default
+	emake -j1 # fails with parallel jobs, bug #666738
 	use doc && emake docs
 }
 
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 52a2556f632f..202ad3c67937 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,3 +1,5 @@
+DIST lollypop-1.0.11.tar.xz 448424 BLAKE2B 80cbd622b46d667ca566e8aac9f523a83cf8b43e61abe06eb0aeaa6fd22a45611ba38fdfd64dfce7b1e1f946bea8b7a2b589152c6b3c762cbdffb041c4c7de08 SHA512 9a885a88af8a4d58b12ef7da82d35bbc3256cabd2a38ac0b35e8a0753b1e10dfa7e69e8e5f6c7f8ba68d2557cfe47c6003ee1f68ecf6c434e5ab81f18c2ae935
 DIST lollypop-1.0.7.tar.xz 436000 BLAKE2B 8b41a3378e39b0cba59323bbd7946226bcce29f80c878833ac920f337c036fcaca9c81caca2e360972295c6446c67d79e201093f86cad0685f7365a332d0e116 SHA512 ce537e60e3f1c678fcbf26d1305a178a3f2299abd4f75bb3c3a2cf717295e14aa73a8f21fb88d0c1fc790a80a572dbce84d01a0fe3229879124f89f8a5fa8305
+EBUILD lollypop-1.0.11.ebuild 1367 BLAKE2B 53a960bd753f365062a5b188ee12854f1a443225c88dfa83fddb1257f47ca4a3b41c3ca656fc249e19728c99d5dcbc599dfe5ceb9df330680e884a107fb9421f SHA512 275448e4e320a520352a7fe2297545dc6b4901c7520e649f89c4c16630b776011fd1932a4c853b79e219f6d26f0feead6c3b3865b7ca5187b4e3dc9977fac1b0
 EBUILD lollypop-1.0.7.ebuild 1367 BLAKE2B 58e95f8666ace9c74cdba8e8ef4508b3ec8aadd40c5f07bbe1deb713f7da0f200827a66b23b28f73abbf130356cfced8e1309996ba793196e35c4d2ac233bf50 SHA512 8ddf6d570858bbdb8381ac75a419b2b6534d5c9165df166356783c7c02fe0ec6fca1cf79087a954680f17825d35ebfeae8e1ccf147ca701559e2415249825f32
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.0.11.ebuild b/media-sound/lollypop/lollypop-1.0.11.ebuild
new file mode 100644
index 000000000000..d8b5658aa634
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.0.11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+HASH="7127b40865afb12d6a07435c4396f34a"
+inherit python-r1 gnome2-utils meson xdg-utils
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/appstream-glib[introspection]
+	dev-libs/glib:2
+	dev-libs/gobject-introspection[cairo]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/gnome-common
+	x11-libs/gtk+:3
+"
+BDEPEND="${DEPEND}
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	dev-util/intltool
+"
+RDEPEND="${DEPEND}
+	app-crypt/libsecret[introspection]
+	dev-libs/totem-pl-parser
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
+	media-libs/gst-plugins-base:1.0[introspection]
+"
+
+RESTRICT="test"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/meterbridge/Manifest b/media-sound/meterbridge/Manifest
index c87a239b5b63..887eaef6c804 100644
--- a/media-sound/meterbridge/Manifest
+++ b/media-sound/meterbridge/Manifest
@@ -3,5 +3,5 @@ AUX meterbridge-0.9.3-cflags.patch 483 BLAKE2B 02233f99771bdf233e374bedc0f965fa0
 AUX meterbridge-0.9.3-gcc41.patch 488 BLAKE2B 379e5d1967a78c53b112a7dbb8ea41d561d5517879a91335468345f56ab90c0bb438dacc69a308fcd03f1df46f1ca617bd47deb0b4329991a4b9dea8cbc5d0a8 SHA512 df259114e25efb486ad980b44449b8c33b3afe87a726a5c40641831810d0de30a56c671bbcc5fdbe2fec05b860a3b2ed1439947240c967f938c6771e91d5907e
 AUX meterbridge-0.9.3-setrgba.patch 547 BLAKE2B 5b2aa5a2701615dfd034c710faa6e75ffba3f5b03517bba4f880b53c17faa248c9e4dae8b2d7a598cd93aa213add78307a5978189c29df688f7ab6f364e37724 SHA512 2bb8e4c26d33a0383f3867459dcc15f5d7500adbbb5cdc230d7fba1d45c9ba4f0ba46731770c5ef25f6adc8121efbef9ecd0ecdac53ed3c3ced840010e3164d4
 DIST meterbridge-0.9.3.tar.gz 610566 BLAKE2B 3a4a2fc95de1184dbbf614b18814d3e1ce52c67f48c70832fcecfb065e489cd18ded17fbb34fe6f477149728731306eb84dec2068f8408d11f197ff0679c87e5 SHA512 19c49a584ab71a4fbe4a0d3f05382ce464c3c5f3e37a6dbd42b4920a18577d66464d8e1277d32c34cf9248a945da05fda17a3ecd35e770fdd8af6e9f691ab52a
-EBUILD meterbridge-0.9.3.ebuild 807 BLAKE2B d7b4d29b312a81c962dd23874b3d32275a216d08a97fc3fbb6f6cab3dd8b1778f0b9ff9e5d16c4ff0dcbed87449c7606899343ee91e5e6d9e581d9162febbfdb SHA512 532fcd9473911c4b8284cd9e69fbefcd7d7d1eb04da0b3e78f7f4df3b585bb66f81c75aaa8cd6763261027018d4824f917c1a5ef1df0322ab1a0d5d9c6c295e2
+EBUILD meterbridge-0.9.3.ebuild 706 BLAKE2B 937d799dc5d7a324b76de3aaa6221b32f4f30605ce8e8ce5f2be2d393d68a36e26783d1f63bd077a282d0c4c6995a3215602aaa88253d6f951e800b004ecb5d3 SHA512 0d2a149a8dc1447d6c0742bb4264f3906be7a1abcdc538d4aa93a981f4757d850f6a091efb50f74944047076a8f18371b13480191e43deafcf20c2417c0c7576
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/meterbridge/meterbridge-0.9.3.ebuild b/media-sound/meterbridge/meterbridge-0.9.3.ebuild
index 83bb62c55f3d..795b52410328 100644
--- a/media-sound/meterbridge/meterbridge-0.9.3.ebuild
+++ b/media-sound/meterbridge/meterbridge-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Software meterbridge for the UNIX based JACK audio system"
 HOMEPAGE="http://plugin.org.uk/meterbridge/"
@@ -14,12 +14,16 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="media-sound/jack-audio-connection-kit
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
 	>=media-libs/libsdl-1.2
 	>=media-libs/sdl-image-1.2.10[png]
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/jack
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gcc41.patch"
@@ -32,8 +36,3 @@ src_prepare() {
 	default
 	eautoreconf
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog
-}
diff --git a/media-sound/mp3asm/Manifest b/media-sound/mp3asm/Manifest
index c73923941bc7..649adbfd8213 100644
--- a/media-sound/mp3asm/Manifest
+++ b/media-sound/mp3asm/Manifest
@@ -1,3 +1,3 @@
 DIST mp3asm-0.1.3-1.tar.bz2 46530 BLAKE2B 031ce687662f107285e373ccb1702743cd340017dd8b49414576454f12338824d1e417625fa1f6228d5f1dff33879b91c88e88ce2c7ee8deb498d01d2d165b57 SHA512 c22fa3a041940fa7826d3f5ea18dd42807ca9c7d87a56c9ae10cd96606e53d17d8e6259be75a77d1101d6cda033e8b48e2dd2303e91fdca338af19ef3522fb83
-EBUILD mp3asm-0.1.3-r2.ebuild 692 BLAKE2B bf3b4e383881338e90ff48aed68e4f606e777eb1f3f13ce0c170eb6ef3edf313359d6e37d2f50f851d2c2a8902dd96815b334f190eb76e02dfea69d89dbe75db SHA512 9f327c586096610cac855515a4630488edf5ad19ffff16bd98ec773521a145230ab2674099f6cf93cf622a7d85ffbe7704aa84521c58e19a53fcc9e1c5b84b25
+EBUILD mp3asm-0.1.3-r2.ebuild 587 BLAKE2B 554c318a3c70b8e2b80b1cc97edf7cc577fdc0f673b0a559226f09de0d9c9ee5eb0ccfc6dd06d78f4734929a6fe8b3447f1ba2ad735533670d75daa4090cf87d SHA512 bcd9130caf24e1b5d1159eddd8bc1da6ed750499ed2a931099845c69c28bbc3f3086994d53da24bb54e66c255058dbbb9cb4f6bcb0950929668696205f025d64
 MISC metadata.xml 329 BLAKE2B e711686a35811a7bb61cd0fabe8d85630e6f1e86e44a3c497604850813e80f1a6658bd392a8018330e9c19458b80e976063ce94b9aae18ef6361198f4ef1bd9b SHA512 abbfd0fe24ced7e49baded7270f11e905e466e0a0c859001bf09f0b3a1e6501e463a2547577c398d1eeb6b47c1bc91ab73c3c89308963f753d8795a8f58490a7
diff --git a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
index b1c4d173eeb6..467241065e7c 100644
--- a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
+++ b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PV="${PV}-1"  # Patchlevel
 
@@ -14,19 +14,15 @@ SRC_URI="mirror://sourceforge/mp3asm/${PN}-${MY_PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
 
 # the author uses weird numbering...
-S="${WORKDIR}/mp3asm-0.1"
+S="${WORKDIR}/${PN}-0.1"
 
 src_compile() {
-	econf || die "econf failed"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	dobin src/mp3asm || die "install failed"
+	dobin src/mp3asm
 	dodoc Changelog README
 }
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index b66720739cab..a16f7005d709 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,9 +6,11 @@ DIST mpd-0.21.5.tar.xz 667624 BLAKE2B d4de4c55306a42caf4f79ee469db2037c0217563d5
 DIST mpd-0.21.6.tar.xz 669272 BLAKE2B ffd50c35e431791503e5d0137abdb93beb42cf48f7638ac0f394d8c4198ce96f915220c92d078ce99cfe7c9866f8e35e58106b801a6d83cdf0a121442f12976a SHA512 20e752a8db2f8ae0b2419b35018557c37a64c6baff25666ba35fce89cfd354e4df5064c25685791f3fcca7ba9e6e6acef0e4653c0c0ffafde2847085dc51b3fa
 DIST mpd-0.21.7.tar.xz 670268 BLAKE2B 1dc6b923e6c6f66ec1f0769b6c4d785761a798659c192184801cee5cd6df361fba0107275650da3e5982ebad5370fb6fe1fe4f7bb9da8986e9c359e4ec2a7815 SHA512 a6e8848c851ca464cfd26284d6479d561f127bc102128e8a41274bc1d62d87a3720843ff1922b5b64b33280217a6036b512f7aa0ce7d7f6b90cbed9fe787c5ca
 DIST mpd-0.21.8.tar.xz 670508 BLAKE2B 04df23007e5cedd00259b1d5f7d301c36b52993ce8352bf784c794150340e4bf2d0a606eb02de3abedcbb9a76f01aca9dc9191d95efd49d0868a32af385821d2 SHA512 034f1cfe431ce163ed808660bee90c2a63926fcc95ab22f55fd566f24c126878fe0fd6521f3008612ea5dca7b448cc5e5d895e0b0156c768bf632674ea982901
+DIST mpd-0.21.9.tar.xz 671092 BLAKE2B 87e1d8afe42b4ca59b1aa47cc0f6260af2d1c161928411cefdcd1f9e6c1013869cffccd729d2cefcc4ddff4fde18bab887407b1b71c6c46457c930c7802f3337 SHA512 e4c5561df881874a16716b32bc1381b6e3bd3690eac07cf3923d1e273937b9594cf387d1e1aa3b02c7f0d19bd30c4575f43863e11d9a69b6a647205009593a9e
 EBUILD mpd-0.21.4-r1.ebuild 8174 BLAKE2B 35bc9bb4ccf75ab510065b1eee80ad626d1359654a3faadfd0ba8e3d09eb3ab3bca37836f2d540704f1914b2a25fe90dbcc80ad1333e6b57970e0f6b2c227f09 SHA512 b347f5939053b35bc95c1600706a364a762e4e81a3a238d31e38a884970df9d1db8892c6b943d8895cd7a115e21310fab646bb0c13a2731f7037e93ac21dddd2
 EBUILD mpd-0.21.5.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
 EBUILD mpd-0.21.6.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
 EBUILD mpd-0.21.7.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
 EBUILD mpd-0.21.8.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
+EBUILD mpd-0.21.9.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.9.ebuild b/media-sound/mpd/mpd-0.21.9.ebuild
new file mode 100644
index 000000000000..969b82d84813
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.9.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dlibwrap=$(usex tcpd enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index d29ce068780c..416f3e400b70 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,3 +1,3 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
-EBUILD mpg123-1.25.10-r1.ebuild 2864 BLAKE2B 9e8878423760d0bf5873fb18e8d5177474cda541c7e2337862882f1326b9029c1a2a6d075c5e7495a0d581ef0a74cdf9f3c8f95800805f74db237b08607f32c4 SHA512 60d871f0f66c50a56cf6c3973be347a9465e97918ad675163edbdd813b4d68592c40161dee73f63bf8544f13ba40b4368967e6eb675f01d48a121534ab883a70
+EBUILD mpg123-1.25.10-r1.ebuild 2860 BLAKE2B 0d25dbccc63c6788dd6c1e0c3a15fc8766d5e5616decfbcaa8f3567a53b98c01c6fcbbf23a4aab85369b14d8eb30498be411cf3cc1a8d577bf2f73dbc08849cd SHA512 20f23de51561b06b5dc1c6ef2923afb7f855caa234033847259223d8076588197f7c9f84be7421bf70d01f2cef3bacfa6b21cdb05e36c59539e06f9d3918bd44
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
index a2f355c63384..2e0212be220f 100644
--- a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mplay/Manifest b/media-sound/mplay/Manifest
index 7f6a1fef9286..dba79568d454 100644
--- a/media-sound/mplay/Manifest
+++ b/media-sound/mplay/Manifest
@@ -1,3 +1,3 @@
 DIST mplay-0.80.tar.gz 565002 BLAKE2B 10931ee32c7a13e4991f50e54e36e900120941fd3cc6a1c8501303833c14b43e7086ff90dda1080b839666a77eb869f078e984b544870bbf4bd1113576ccad7b SHA512 5791e6ae60fcf63c7bd5c3dcac84c2cc11649c0ee009fc20bfb43871023d85622e4ea879ad740656a807354f0fb7329948094cd5866e3110cfd233b08e30a9b2
-EBUILD mplay-0.80.ebuild 950 BLAKE2B 805bb787598a12f9078e7b0aa422400ac2d67eef55618ca23a09899b3e04cda5348ad37783132e9f6d5064fe610468bb4df7932e61bfd546e77af6e86489951c SHA512 00a4556af40a661e5177ca66f4d637753ce4cef96ac5495bb3502f96aa03d4e66f0feb365fac628daea6850abb53980265d6b393af83bcf1c7ad10f2dc577949
+EBUILD mplay-0.80.ebuild 903 BLAKE2B 4c9e7fcdb30cab1ffc61417078ddb3502adf17ad5b6fb9e49475916379d7481a5c930f668a49e6b47dc8fa687b5b4f381da91d100d348daa7949e1edfe1ccd2f SHA512 e359c2a05736555800a9002a2f01a29d11eb95551d834c98cd3d6124e96cba1777d152e4fb239df6dd16f99ae8d916c98f83145c0052c49b9a479cea1864a518
 MISC metadata.xml 328 BLAKE2B 424543230782dd6d38157522c7d35d5e65aaeae902e89db6bf8d953249a73188e4d5c119c9e9508e567bb93673b826dd380f0229cec5e9a56a9be778cb07b4cd SHA512 284a37a8fc22008a3b753d169fca69017bd548eb8f09ca25b55dbaf771d9e0c434bf0698d78d38fd716063b9b264aa66ae74972f757682d59acc9578b5b89a20
diff --git a/media-sound/mplay/mplay-0.80.ebuild b/media-sound/mplay/mplay-0.80.ebuild
index 3028ace5c923..a3cd7a2a79cf 100644
--- a/media-sound/mplay/mplay-0.80.ebuild
+++ b/media-sound/mplay/mplay-0.80.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="A Curses front-end for mplayer"
 HOMEPAGE="http://mplay.sourceforge.net"
@@ -10,7 +10,6 @@ SRC_URI="mirror://sourceforge/mplay/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=dev-perl/MP3-Info-1.11
@@ -21,19 +20,18 @@ RDEPEND="dev-lang/perl
 	dev-perl/Video-Info
 	media-video/mplayer"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i 's:/usr/local:/usr:g' mplay || die "Unable fix the /usr/local path issues."
+src_prepare() {
+	default
+	sed -i 's:/usr/local:/usr:g' mplay || die "Unable fix the /usr/local path issues"
 }
 
 src_install() {
-	dobin mplay || die
-	dodoc README || die
+	dobin mplay
+	einstalldocs
 
-	cd "${S}"/help
+	cd help || die
 	insinto /usr/share/mplay
-	doins help_en help_de mplayconf || die
+	doins help_en help_de mplayconf
 	doman mplay.1
 }
 
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index 3d3b4708624f..a24e66be631f 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-qt-0.14.1.tar.xz 94948 BLAKE2B e0bbbaa2410220c0e34ff77cb84c783ba682587311eaf20eca286a142e122827b6294e9d0409f2ea5b18d80c06d822bbaed49d60d1402a4a97b7f7210ee2cacd SHA512 55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494
 DIST pavucontrol-qt-0.4.0.tar.xz 34916 BLAKE2B f42f560b125e292ae3a8ab76e2020d1a899019e8ed40d6f4d3e90fe1baa0cc044093310fe9ac11c6529f9cc1abc41d475aa2d445de8f19e6f89ed456525aa7d9 SHA512 62e0c909c98acc4605556ba63981e4599d37b592b99ee16301dc0ba154f3066708a31562e158c042b3530c11603cc43de930080770f027bb998cbb6f79f0f3fb
-EBUILD pavucontrol-qt-0.14.1.ebuild 712 BLAKE2B 50c243cba4eaf2e4288c6565ddbf0f16cf49b4829690788ce75ac117126c235d7c2b6c6035ab18065a4451c3093a114754f05fcb0b00a98b8e15c673cd5cbc7c SHA512 c92ab284966a11118b53cf0c62a78089d0812d1634fb74706fb692dfc4f433a3a6cc9a4b3980587867dba8e497b0e27fbda929b9a286431924668a565ee82468
+EBUILD pavucontrol-qt-0.14.1.ebuild 710 BLAKE2B 38a2c63174e1cb5d61fc5deec8a6940ddbfdb4f605d99eaa48d83498464a69968c13539b0df2c12b9abb47160bcc9985a2e163e27a59d9262769deda2b81c46f SHA512 19ef0dc14229d8a65e6b1314ecdbf7df120075b4a3019f5cb708f20b4878b683c12dff0f2d6c7dae58e199bc525a8686303184175ccaab2152eb15032f281dfc
 EBUILD pavucontrol-qt-0.4.0.ebuild 775 BLAKE2B 6e5b47111723959f49917ff2251d3a617025f0565147648c31d7d4bb35f366a1e8b3670760c22d97cb13c0770971ac30d045286e51b0f7b4d38b571c51340235 SHA512 a777547bb37805a559a89e4aaa488949643f770a6f5ea843d183df50ba2d250dbd5fa4a6449916e9c021099c7287d093a99335f43fcf670dc9f2fb3b7b2b2faf
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
index 834f17c16d20..cff744e1b080 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index cfe44f2a8c15..7ae6edf9f7a3 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,10 +1,10 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
-DIST pulseeffects-4.4.7.tar.gz 1082596 BLAKE2B 3265507191f5fca405282d8bdf9cf078023e80d2ca8f3a8bb999f7828f5220ca61b68ce01dc80e2d066a0d759b83229eabd523aff71106bd4024067afd1a8220 SHA512 243bd23d107f22a2a4b5934fb67bc5c059f278f2ec824814791ea24429e8d53844ffd71c9c21c35209261f4a0a4633827362bfd43355437a10944bbfd9a25421
 DIST pulseeffects-4.5.9.tar.gz 1830876 BLAKE2B 3b80e26eb7b3593f0636d4c3a86ddb05c4c08ec446983d8f521828a4a004b42011ca12cbed6fefe3a0df7d1347197abcee89d5786020a61ed28c3277668d8e57 SHA512 aa47b546f13ef29d03c907dfeeba0ecb531ba07bb5bbb7bc49399bceb75583c58c9e188557c1d77c02b8b50e5cac9562b6fc882750c14d755ec0d294e8b60105
-DIST pulseeffects-4.6.0.tar.gz 1831433 BLAKE2B a5eda0e6880f8a3e62ad62b5e1ed3b5b44118d3ac14821f786532f567974fd40e78f0b4c4a7c51851bb48b94694bf473fe0996e7fb361db0c50b00a467b9c949 SHA512 acadff43f35f7ac5f5028e87efb1c8c0d4d8ed97d367b53fd231475243735ac149d8c1aac9c86281ec9a661814a665f67d43f7fc0d7e591b19524b5cb2124f92
+DIST pulseeffects-4.6.1.tar.gz 1878597 BLAKE2B 5db87915f5e008780bc063580cee95202460f9932533d4227eec89ba49d8ba760d2be44e0268d53279868b07da1556ddae648ff6339cc10304a0c429a8d55eb9 SHA512 336ab9c3a2987a8ca0887fd87c836776619e6989c22bb7442c7e6f3d8603537ea2789e012fea11c142dd943d0a670549fcbfff69949cacbda2621e2da95456b3
+DIST pulseeffects-4.6.3.tar.gz 1885423 BLAKE2B 404ab653c187270d879b497b819206815f47f7bbb74762fb6b4ae055169093599fa5350df53292eec4eea46ab380a058db80c693022a854a71bfb4245fc49e10 SHA512 645a19a6f5f1726474a675edc0048eccd37e7236fd863ecbd8c382028344cd3d4a2cbd5c4a8e830e5fb793ddf50c0b24c45f5d93acb7a880ae32c3c940e8d2ea
 EBUILD pulseeffects-3.2.3-r1.ebuild 1506 BLAKE2B 561117695d98390d646cc6d36263aae5f375b1d6ebbdb4baa271a8ff009e788218952b8bb63d5088e1ce647e2e7fb7f38a1ea27ae634d341bd8e7dd3bc332e65 SHA512 ed37577b50ead9ae9d4a007f343ada566df3ed7dbde12a2114bdce793c1ec2a123296f4e4b059619644d6c293b917bbbb26cf2936c55211c89fbaa2abb68df25
-EBUILD pulseeffects-4.4.7.ebuild 1727 BLAKE2B ca64436e30a37e6a6f42bfec26eda83f55fdba724c15c63dc1f76deebaa504d21664cf14eb4ea8be713c8710e4a39a6fdd54dde84f18fd6c7082a646809911a9 SHA512 587856d36ad596a802eb9441571ba0b37290694dc5c466bbaa450e2dbfbb516c70ef107bd0b5a968e03bb15fa0ac6829219787b5819cbf7b7b473efb85e05e79
 EBUILD pulseeffects-4.5.9.ebuild 1799 BLAKE2B e6ba4eb6229e8aaf31eaef655f770989ef0a5794e06c8673f565b3e3e49689ba5c6745c551e6e2bc5cb6aef84bc79e5eaa68b58c7ca5a4a606feed443b2dc2db SHA512 952d00097cf90bd69273ad8f67a4f8caae9ec2d84d0c424972d5c340a0bd1406442fb0e4b9005489da1691f72b98ddc124e2e148b4ecabdeaf7781a56a76948a
-EBUILD pulseeffects-4.6.0.ebuild 1800 BLAKE2B 8dbf5e6ea883155e4a44f4aa259cdd214ecde1866826409b5ce0daa1b7ac8f9c8fd5814ccd96b7891563bb138d9efc15188a35e04ee1e5fa758802158abff058 SHA512 8af20d569a036a53c150c644b854fb837c395629aa059a071ebbab064ae027579d715605b4e73c3588a08856f34cfaa07e9c6ac769d0f981756f15595bf33562
-EBUILD pulseeffects-9999.ebuild 1792 BLAKE2B 4770e4f7f3fbd013166e2b5c694c5463a71ab4209fd8aac620015c654137ffb92b3e53fe338bad07b1fd69b00423eec2e4d9162730f4830352cc404c8051cafe SHA512 1bae5647fa6d7e53d5d97c60236e53af007ad4c2cff13ef385b45c0bd1cacadc154edce2dc677b008624bc7e41ab8f5edb332acd86c63e8ac70dcb78c32605b9
+EBUILD pulseeffects-4.6.1.ebuild 1799 BLAKE2B e6ba4eb6229e8aaf31eaef655f770989ef0a5794e06c8673f565b3e3e49689ba5c6745c551e6e2bc5cb6aef84bc79e5eaa68b58c7ca5a4a606feed443b2dc2db SHA512 952d00097cf90bd69273ad8f67a4f8caae9ec2d84d0c424972d5c340a0bd1406442fb0e4b9005489da1691f72b98ddc124e2e148b4ecabdeaf7781a56a76948a
+EBUILD pulseeffects-4.6.3.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
+EBUILD pulseeffects-9999.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.4.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.4.7.ebuild
deleted file mode 100644
index e9b3c7a727d1..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.4.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils meson
-
-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}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=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
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-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
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-libs/libsamplerate
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	dev-libs/appstream-glib
-	sys-devel/gettext
-	dev-util/itstool
-"
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.0.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.0.ebuild
deleted file mode 100644
index 451cdef35758..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.6.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-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}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.7[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
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-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
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.1.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.1.ebuild
new file mode 100644
index 000000000000..2717baaa643c
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.6.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+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}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.7[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
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-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
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig
+"
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.3.ebuild
new file mode 100644
index 000000000000..0e6624cf2428
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.6.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+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}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.7[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
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-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
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig
+"
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index e3e2406c171b..0e6624cf2428 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-libs/libsigc++-2.10:2
 	>=x11-libs/gtk+-3.18:3
 	>=media-libs/lilv-0.24.2-r1
-	media-libs/lsp-plugins[lv2]
+	>=media-libs/lsp-plugins-1.1.7[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
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 10a424b6f362..82d06da2160a 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -6,6 +6,6 @@ DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fd
 EBUILD qmmp-1.2.6.ebuild 4221 BLAKE2B 7c67cfa55ac6cf2fdeabfee469ea7e492b81e8acb560a70a2890dae2704daf6963de5ee00d9a25de04c6b84433c91e3462a23786dbb2d26ece85b4d23d316d12 SHA512 d54e4e481244f1abc5817d45f7487e19e4d88ef6d17a42f72e55df62817d2994c499167004f05d8eb6e1e607573d1145454403251ef31c488f219b868a4f9ffc
 EBUILD qmmp-1.3.0.ebuild 4322 BLAKE2B 45ab0e243e10901cd0456c8459b4f751484da95b797c68b2e648ce4a7963ce77613f352dfe23fb4fe98b22f83338c177035a2a16326d8469e6843840d659e693 SHA512 e54d1867d000359ee22b41761e5b4ae7708639aab24b3a05faf3adfd1e8e095e67ed2c3c74a878a131d11b73a6a97e90c8aafed94db3432970e7da99fb4c61ea
 EBUILD qmmp-1.3.1.ebuild 4270 BLAKE2B 0e4a4bdab7e45fdd23db669d2a8e69703e6ca16ecf96f5c06097156aa3feda3c67bd97bb410aa036123cf1ea8c8129ce54d43ec7ffbd9a044651108434dcc142 SHA512 ef99784cbeeba0d8bfcb19c49884033df7e217d92d5b343d77be0bf222ef11aac6601dcca7fb2b78fef129908df5ffc7af9d71acd05455da89e48135e8f06f34
-EBUILD qmmp-1.3.2.ebuild 4270 BLAKE2B 0e4a4bdab7e45fdd23db669d2a8e69703e6ca16ecf96f5c06097156aa3feda3c67bd97bb410aa036123cf1ea8c8129ce54d43ec7ffbd9a044651108434dcc142 SHA512 ef99784cbeeba0d8bfcb19c49884033df7e217d92d5b343d77be0bf222ef11aac6601dcca7fb2b78fef129908df5ffc7af9d71acd05455da89e48135e8f06f34
+EBUILD qmmp-1.3.2.ebuild 4269 BLAKE2B 293b9ee67741158812b5de962afe246b0f2c30a5aceeeabfb48817c0c571b5eb07283943f4b6c2d7aa7627ffbee6639480eee1b558c899170ec7128d1250915c SHA512 afd972d018e0e4263b54c373de893ac950f876033f0721aec12ef195e733285fe1533962ed27597b24a4562c86420246e9803032f1343d4358182a745695b8ea
 EBUILD qmmp-9999.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.2.ebuild b/media-sound/qmmp/qmmp-1.3.2.ebuild
index 611727b19b0e..ddf529cdf62d 100644
--- a/media-sound/qmmp/qmmp-1.3.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://qmmp.ylsoftware.com"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 else
 	QMMP_DEV_BRANCH="1.2"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index aec58e178f83..8ad4be8343b3 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,4 +1,6 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
 DIST qsynth-0.5.5.tar.gz 269061 BLAKE2B e17bb0ced40764c5bef9ae7c793f7ba1ebfe4edd761f434ad129f338d30384c639f27d697ecfdaa93d7fff52c38bed0a3b95cf51fbdad25e13c14abe795d49dd SHA512 4e90b38d428c6b49a78b648ac9604e683f32623898205abe3a98c4136c5b29ab27c101cf63207dbbfdcba105913de2dcb5cc7669a6433def71d071f39cf68429
+DIST qsynth-0.5.6.tar.gz 269583 BLAKE2B 9b06f7be1aa39addebd0b088eff885bce39c6bc245461b64fe45243306afae8879d4b516bd46c30c2a8074e580e412c38a3c264d647a35ff5c81301703731067 SHA512 752b3ac7e478594ef873b2d1c9fcb1a1dcdd1fb33f34cab5f588f628d1f11f01ecd150c9d51021a41040794b68f0538ad6979751773d5c537f53a1f227b3bf88
 EBUILD qsynth-0.5.5.ebuild 1300 BLAKE2B 82eb320196d3d8646e3a9c8b1ae5fde1ef8dacc586055bd5eb4830b21d38dc26b72de819ccc29ff98509b73e32fb2c4c0d6038f846f3e04d16f4ff9ac5ea0eeb SHA512 0c94edb732c059066ffc3e99ec9250139a6ebdb697868e387c7fdad17e00473f63326048a5f8a9d1072d1026f8e8a9912041d8a2607d5e7e355f5c30a7eb2ed8
+EBUILD qsynth-0.5.6.ebuild 1304 BLAKE2B f1e74ad0d5af54165ac556f9a5d3775d2bf9f8c675d9ef886d99b16c0ab3a73e3075a19d210ee058474ad3f3f2428b8dc7bf4d32e8e031beba5ceee784228616 SHA512 635a03e74fa5eb730bb0ecb007e936db9bd0ad908672dfb68c1964c9bafb88f53d09498db7397351f8ef9d9baeb90b16b96f46a7c6d7193edd8d3fa932153825
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.6.ebuild b/media-sound/qsynth/qsynth-0.5.6.ebuild
new file mode 100644
index 000000000000..e4f0b6bb00dc
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.5.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic qmake-utils
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="http://qsynth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa debug jack pulseaudio"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
+	econf \
+		$(use_enable debug)
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_install () {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${ED}/usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/rip/Manifest b/media-sound/rip/Manifest
index e7429b9581aa..bfc23c906170 100644
--- a/media-sound/rip/Manifest
+++ b/media-sound/rip/Manifest
@@ -1,3 +1,3 @@
 DIST rip-1.07.tar.gz 110261 BLAKE2B 93ef85bf4b50e577180d343f033e6f8765ebe7f17992626b8f7e6ecac13be692edf5bab79fbe0a17b9dd64dbc19886323bc769be6edafcb8e133f58888ea80d8 SHA512 4a89b945cb917d07459f1765bd6e19bb20b84d45e762b01a25374e0a80fced79996440ab85e01fc2fb1bf87175eb9407745294e3099b396d2e4dfc6ee652cc87
-EBUILD rip-1.07.ebuild 786 BLAKE2B 95cc417c957dd7dd9995557c0056a0b10d77f0e2b3d63af8570f831a2973a2d2014afde2b58e9c9fe970e7da7b240bebf2fe71e67f6eba098bd4009698847058 SHA512 36cae29e60968c13a5f4d1bcfebf606b2c3ea8dae2ac43cb55b670af735bf6fac1f8efd24b5625bf88ea9045001d923a1c681022a87810ebdd75238deb6a05f9
+EBUILD rip-1.07.ebuild 587 BLAKE2B b25757f97b0de37394e47107c3008a93417f5384e12e0c2f7b646727b8b02302614926986a5ed645ce7291bfcca50e414f0d172611c984df8bd3fec33873f891 SHA512 0c52db348bc19086c0ff0322cd22de188d4e85e6d02442f15a253dbbbcc8e147e302ef2ff960f65f921cf82a0313b91393f658de92eea0309fd7215cd1053e27
 MISC metadata.xml 326 BLAKE2B 14293ba2c8d9da5e7eef3dff49ec33c4f7c816d2df9b75ecf0f1d5dc6adc8f88028fba7bde542f4b5439890d1c225555a4b3243a2d88433a825851ba2a123003 SHA512 9be190109b6b10f56e73609510a59a349a3f4c2e841eb64fabcbbcb35535047f8806fc33a3ebaffd8ead47b1c1057e93e435b9db79ba4eef9e16e6325846c13e
diff --git a/media-sound/rip/rip-1.07.ebuild b/media-sound/rip/rip-1.07.ebuild
index 960ece4d292b..e1f22280db1f 100644
--- a/media-sound/rip/rip-1.07.ebuild
+++ b/media-sound/rip/rip-1.07.ebuild
@@ -1,20 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-IUSE=""
+EAPI=7
 
 DESCRIPTION="A command-line based audio CD ripper and mp3 encoder"
 SRC_URI="http://rip.sourceforge.net/download/${P}.tar.gz"
 HOMEPAGE="http://rip.sourceforge.net"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
-DEPEND=""
-
 RDEPEND="media-sound/cdparanoia
 	virtual/eject
 	dev-lang/perl
@@ -22,18 +18,7 @@ RDEPEND="media-sound/cdparanoia
 	>=dev-perl/MP3-Info-0.91
 	|| ( media-sound/vorbis-tools media-sound/lame media-libs/flac media-sound/bladeenc )"
 
-src_compile() {
-	#the thing itself is just a perl script
-	#so we need an empty method here
-	echo "nothing to be done"
-
-}
-
 src_install () {
-
-	chmod 755 rip
-	dobin rip || die
-
-	# Install documentation.
-	dodoc FAQ README
+	dobin rip
+	einstalldocs
 }
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index c1a280bad9c8..3d50e98629cd 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -9,5 +9,5 @@ AUX sox-14.4.2-CVE-2017-15642.patch 852 BLAKE2B b6d32a2d7909b601953f0603caa678e6
 AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0c04b89ec75c91440a0ce833327af0ed152a1eba1ef46402f198f6394c1787ae899ee1ffc9748d1ec91544fe8f127cecb6 SHA512 dd4023a6bc98f510c2256537e747a20c9b3b8ec35e0f98d19d188a3973f1774566c5d70f8de6cd9083547ade69670d34d10b848836d0724896993e1e56c85c75
 AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5
 DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
-EBUILD sox-14.4.2-r1.ebuild 2621 BLAKE2B 15db996f6aea42581d1c2d8744c7a06769e08366d4c017ea1683ad50a0b94ddabed7b3d9f47e69dafaf7df662533e3fa1492724dcace92c054f058286f711884 SHA512 b82bd81d5c58f1d56416ea4a0de453831b8a199d99a59fdbbc79934898f2a33b77ed86870ea26091df91df5ae8211c62b410e14ea7f0d30d8a3fdb9dd1f4f87f
+EBUILD sox-14.4.2-r1.ebuild 2617 BLAKE2B 16de3a69ba83189cc3285b2886e2f04081fd875f8d0c85fd28986d0e5bab9afaade01fa39b02adc39f21cc92273dc55e65ec8d71f8000ec0adc96229a76e9ece SHA512 b503cec195701776966eab7ee510faf0f76b48f084bd6a2addfdefcdb8c1eb50370cd7ddcf214524da89d06e8ccd57d1859d84ce2ab2d158ac7b5c71eb6fff46
 MISC metadata.xml 579 BLAKE2B 9a129ee262f9147b903659d806b5cb7db559a3cd70adbe6cbf0faca60ae3f2d3c5898ea713813b124bdb43fac7b7e4fa9a6702892bc99dfa9fe3271403160077 SHA512 3b09529397d2d31693f701c05e4db73db553177ec6471a28612254fe3117d1b3574bdf3381a024c23c2e8c7efa02925d0c464548ed4105c573266c612595de2f
diff --git a/media-sound/sox/sox-14.4.2-r1.ebuild b/media-sound/sox/sox-14.4.2-r1.ebuild
index 71356a701013..0f5768a5812d 100644
--- a/media-sound/sox/sox-14.4.2-r1.ebuild
+++ b/media-sound/sox/sox-14.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
 
 RDEPEND="
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 670b5afd7a8d..b2c71580a651 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,11 +1,6 @@
 AUX teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch 4523 BLAKE2B e7193fae5efbaeac62e8366f89e8fc19cc32b0eb5269f74ba2108c2bf656f4fcd22d861e21e6512fab6240cef89a6aae7f1c2f77aba01be78af14aef68a8d223 SHA512 fdfe279bb69e7e48a28b64dd430eaeb74a51a3de7c3ea7ee32d0b399e386188f0d3f8f26064ea90f857d362639ad5cc019696cc28cf04691cb97c119cb47627e
-AUX ts3client-bin 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 AUX ts3client-bin-r1 474 BLAKE2B 79b29de7ea3ceabc88d681e96c871612e9ebcb1da291f2500c3e533433a31593cb9d32e82cf9fd305d2d9c04f7d6df62295594397eb447ffb9a6d3396541872f SHA512 27b6ac42ec3ca05868786ee62d0f9ac4900ed2db9dfed0f2fe9cb951669e7abee7e0d2f8d07db76b03c3fc965fb48f46d94b4e64a5e8dbcd6c24d22e724db938
-DIST TeamSpeak3-Client-linux_amd64-3.2.3.run 76247769 BLAKE2B 2fc226455bf839811ad82735c30f493ac9800e6f5f2f3af2d34bcbce3abd7478144feff329c3afa31d994a891990ecae5f51aa3fa001fe828d4ae0bba60fc6e9 SHA512 6f2a0e366589a3495be3ecbe3e866e1d05db3578ed1e2bf19195e6d6818acc1ddb44b46915aa88ff64ac6cc150d3b88b3347147bb0cde93e013aa7960c10dfab
 DIST TeamSpeak3-Client-linux_amd64-3.2.5.run 76619678 BLAKE2B b8d42a4d633124cab395ea69d3ccbebc65f4d9b5a148c6a81a6d9a3afab48dd59fd99ac3f5cc9551c89daabb7cc51a60c5587034a7a5bec5e3b530ecb3d6e220 SHA512 fdfaa863d3523fffdf46ca0cf9c2b0588e8d847e348ade75c8f82818920f493460740a5192d4cc8d1eafe1e7a03af93b09ae6ddecaa0b166552ab5409508a445
-DIST TeamSpeak3-Client-linux_x86-3.2.3.run 75997823 BLAKE2B 03403430d6409ceebcbdfcdb48b54142327a003c300a3bcbd63f9fb6e40c259f50ee9346fe54fbbb3a19143bacb782248f5b61d2a950f893e8227568a2df1839 SHA512 ad6ea2d5f8237585859c5deac11e0f0b6af6018b2a92fe0aab2a04cfdeab0bd57166bf4fec273d48fedd20819203cba2fd58c3a76b59ec3224e867fc10172808
 DIST TeamSpeak3-Client-linux_x86-3.2.5.run 76311914 BLAKE2B 4a8f4a6ce55bde680f2d9d1f28c1cabe2a01fa6c10f3f3f637931dbe2f652c87cd2a7b61f054b50a8faf3bce461e316ca2e9b68418271535a5f6a3cd0b9d3492 SHA512 90b46a840a6e43bbc7d4cfb526117a81cdb92fb8186194ab9f245e8e501608ec4740a198e8d1de5e3f69bea84ab6281384915193d4e6a1e90aff45b4b80d3d9a
-EBUILD teamspeak-client-3.2.3-r1.ebuild 2442 BLAKE2B 7d2564f54e92a7a78056210990b2f98698b29395640de75e8b1b6851a416580c868e7f5e6a7d3899c9e0ed53c546b76445f187dbcca80d330e8954507bb0f5e5 SHA512 7a3a782284fae46e4195a3273852e30744695fecaaf1f8494f86fcfdf651d48f9d79b08e764e10faf9289441d49a0a0cd5ce2f017944d4229db18809b9641876
-EBUILD teamspeak-client-3.2.3.ebuild 2379 BLAKE2B 057d9457649540a24310cbf2e41e00f13a03dbeef8ddf2eacbe0dc5252f83edc70acfa639d85b275c713fb262f382ca111cc8b0f503b092e2274e35e72c2a625 SHA512 6cb276274f2949f09df682d9479e127fb7191da51ed61e42e0fee1f97800b359f8e70390bf6543b4840e4cbcb4523d48e9eed0eaf43b4303d37f9964271f8de9
 EBUILD teamspeak-client-3.2.5.ebuild 2539 BLAKE2B 567bb70a3c72a3bf13a5cb9c721b40f292b2a7c18260e042b7f6a48401fb78aabd12f095b963336cca6baaf2681f9c41caffab961959d689fe13f1b4c1f2cc58 SHA512 65e2c1006054b428a8d230428abaaf9bf99b6df51c3fa13b8941e6aac4619d1f8e988e4bc0bdfc6bc50972a3ec642119fae23c277a0bc149de24f5fcf77b9540
 MISC metadata.xml 756 BLAKE2B 24d27da6d88662420d55ced31434390eeb7cdb354bdd09c7ae9381c1317d69e6aba654098a11efe3a0a9f86f5dafa53302ef6ba09a84463ab4267a4bcb5cc260 SHA512 5fea4c3f3823d53bb3ab6d9c05fc8e468f45c7441276e94eabb05b680f6253a920d92fff8735433121814b1fe80bf5f51c60cd001b42e714cb10bb22a5609cca
diff --git a/media-sound/teamspeak-client/files/ts3client-bin b/media-sound/teamspeak-client/files/ts3client-bin
deleted file mode 100644
index c59e278f390c..000000000000
--- a/media-sound/teamspeak-client/files/ts3client-bin
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Sets BASEDIR for teamspeak3-client
-BASEDIR="/opt/teamspeak3-client"
-
-# Work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
-export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-
-# Launch teamspeak3-client
-cd "${BASEDIR}" && exec "${BASEDIR}/ts3client" $*
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.3-r1.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.3-r1.ebuild
deleted file mode 100644
index eceaeb9cac4f..000000000000
--- a/media-sound/teamspeak-client/teamspeak-client-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop unpacker xdg-utils
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="A client software for quality voice communication via the internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="teamspeak3"
-SLOT="0"
-IUSE="alsa pulseaudio"
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-RDEPEND="
-	app-arch/snappy:0/1
-	=dev-libs/openssl-1.0*:*
-	dev-libs/quazip
-	<dev-qt/qtcore-5.12.0:5
-	<dev-qt/qtgui-5.12.0:5[accessibility,dbus,xcb]
-	<dev-qt/qtnetwork-5.12.0:5
-	<dev-qt/qtsql-5.12.0:5[sqlite]
-	<dev-qt/qtsvg-5.12.0:5
-	<dev-qt/qtwebchannel-5.12.0:5
-	<dev-qt/qtwebengine-5.12.0:5[geolocation,widgets]
-	<dev-qt/qtwidgets-5.12.0:5
-	net-libs/libsrtp:0
-	sys-libs/libcxx[libcxxabi]
-	sys-libs/zlib:0/1
-	virtual/udev
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
-	opt/teamspeak3-client/error_report
-	opt/teamspeak3-client/package_inst
-	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
-	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
-	opt/teamspeak3-client/ts3client
-	opt/teamspeak3-client/update
-"
-
-src_prepare() {
-	default
-
-	if ! use alsa; then
-		rm -f soundbackends/libalsa_linux_*.so || die
-	fi
-	if ! use pulseaudio ; then
-		rm -f soundbackends/libpulseaudio_linux_*.so || die
-	fi
-
-	mv ts3client_linux_* ts3client || die
-}
-
-src_install() {
-	exeinto /opt/teamspeak3-client
-	doexe error_report package_inst ts3client "${FILESDIR}"/ts3client-bin update
-
-	exeinto /opt/teamspeak3-client/soundbackends
-	doexe soundbackends/*.so
-
-	insinto /opt/teamspeak3-client
-	doins -r gfx html resources sound styles translations
-
-	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
-
-	dodir /opt/bin
-	dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client
-
-	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild
deleted file mode 100644
index 816b907b9fee..000000000000
--- a/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit desktop unpacker xdg-utils
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="A client software for quality voice communication via the internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="teamspeak3"
-SLOT="0"
-IUSE="alsa pulseaudio"
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-RDEPEND="
-	app-arch/snappy:0/1
-	<dev-libs/openssl-1.1:0
-	dev-libs/quazip
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[accessibility,dbus,xcb]
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5[geolocation,widgets]
-	dev-qt/qtwidgets:5
-	net-libs/libsrtp:0
-	sys-libs/libcxx[libcxxabi]
-	sys-libs/zlib:0/1
-	virtual/udev
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
-	opt/teamspeak3-client/error_report
-	opt/teamspeak3-client/package_inst
-	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
-	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
-	opt/teamspeak3-client/ts3client
-	opt/teamspeak3-client/update
-"
-
-src_prepare() {
-	default
-
-	if ! use alsa; then
-		rm -f soundbackends/libalsa_linux_*.so || die
-	fi
-	if ! use pulseaudio ; then
-		rm -f soundbackends/libpulseaudio_linux_*.so || die
-	fi
-
-	mv ts3client_linux_* ts3client || die
-}
-
-src_install() {
-	exeinto /opt/teamspeak3-client
-	doexe error_report package_inst ts3client "${FILESDIR}"/ts3client-bin update
-
-	exeinto /opt/teamspeak3-client/soundbackends
-	doexe soundbackends/*.so
-
-	insinto /opt/teamspeak3-client
-	doins -r gfx html resources sound styles translations
-
-	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
-
-	dodir /opt/bin
-	dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client
-
-	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/vb2rip/Manifest b/media-sound/vb2rip/Manifest
index 124d44ae05f4..d6fe64704ed2 100644
--- a/media-sound/vb2rip/Manifest
+++ b/media-sound/vb2rip/Manifest
@@ -1,3 +1,4 @@
+AUX vb2rip-1.4-makefile.patch 421 BLAKE2B 8e19d04d65c0efe9507aabb62b8b662ebf53bed3ac27d6282b222f46d052058951465302c6a1ea14681f56d1e882214d8ab741b9c0ee8143765ab1a237ff6ba0 SHA512 b0ff12f4c9e7e98ca17897bcdf8bc04032a181707df04f85d669ae2415fcc69dbb3d60611aa4cc15104d61dc344bfaa8e1ba6c34f50a46953eee9faf492ed4c0
 DIST vb2rip14.zip 22254 BLAKE2B 4b1571d07c39558d7e95b3b313b1b109952969143f68a47d06a0538628ff8937f62fd88ccdd7641aeaa814ab86602e028acf83b577ddca30e24ae5814438dad2 SHA512 f84c8bb826a319cb0e0bc6118bc270ace18f52cc73b918ca5ef8d8f674bd7922d23d36fe6034a189f18ac4fb9e6a8f0c460dd407ec350fd1185c1088757678ea
-EBUILD vb2rip-1.4.ebuild 763 BLAKE2B 3b003f310e5d475d41de4f9e082c408b1a94fbad12d4afa1af87af37c919338e037548363154642a8fa1c6f2dc4d6e80674b76ecbc07f8f2f05148759acea2a4 SHA512 fd81d828ee0a532e8977617ed2d10713f1ef0f6cc5b2bb97ee33be26b79e12f8f2b5d0fc9a2f120209c6f54986774ce7de0b5c125f449568155f923c9d4069ad
+EBUILD vb2rip-1.4.ebuild 579 BLAKE2B 88b0d60bb9c96ae50e2d82abeb06608448abba3e0187d439d5280ef3eddab138551ada3dc5ccaba44790c77a709e90da8c0a98fea0bb896501004def605bc976 SHA512 9467ab84a17dbf428857ff0403af1d32a671e5e80571f4ce90ad00f16a2528f77ae80af6581c90e674998a90ed70def0c3fad968813efcb90f201a2721c80774
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/vb2rip/files/vb2rip-1.4-makefile.patch b/media-sound/vb2rip/files/vb2rip-1.4-makefile.patch
new file mode 100644
index 000000000000..0b584086f536
--- /dev/null
+++ b/media-sound/vb2rip/files/vb2rip-1.4-makefile.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,17 +1,4 @@
+-CC=gcc

+-CFLAGS=-O9 -fomit-frame-pointer -Wall

+-LD=gcc

+-LFLAGS=-s

+-

+ OBJECTS=main.o decode.o wav.o lsb.o rip.o fmt.o fmt_raw.o fmt_vb2.o fmt_8.o fmt_msa.o fmt_xa2.o

+ 

+-all: vb2rip

+-

+ vb2rip: $(OBJECTS)

+-	$(LD) $(LFLAGS) $(OBJECTS) -o $@

+-

+-%.o: %.c

+-	$(CC) $(CFLAGS) -c $<

+-

+-clean:

+-	del *.o

++	$(CC) $(LDFLAGS) $(OBJECTS) $(LOADLIBES) $(LDLIBS) -o vb2rip

diff --git a/media-sound/vb2rip/vb2rip-1.4.ebuild b/media-sound/vb2rip/vb2rip-1.4.ebuild
index 0ee16ac10e2d..e9bacb5a23df 100644
--- a/media-sound/vb2rip/vb2rip-1.4.ebuild
+++ b/media-sound/vb2rip/vb2rip-1.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit versionator toolchain-funcs
+inherit toolchain-funcs
 
-MY_PV=$(replace_version_separator '')
+MY_PV=${PV//./}
 
 DESCRIPTION="Konami VB2 sound format ripping utility"
 HOMEPAGE="http://www.neillcorlett.com/vb2rip"
@@ -14,20 +14,18 @@ SRC_URI="http://www.neillcorlett.com/vb2rip/${PN}${MY_PV}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}/src
 
-src_compile() {
+PATCHES=( "${FILESDIR}"/${PN}-1.4-makefile.patch )
+
+src_configure() {
 	tc-export CC
-	echo "vb2rip: main.o decode.o wav.o lsb.o rip.o fmt.o fmt_raw.o fmt_vb2.o fmt_8.o fmt_msa.o fmt_xa2.o" > Makefile
-	echo '	$(CC) $(LDFLAGS) $^ -o $@' >> Makefile
-	emake || die
 }
 
 src_install() {
-	dobin vb2rip || die
-	dodoc "${WORKDIR}/games.txt" "${WORKDIR}/vb2rip.txt"
+	dobin vb2rip
+	dodoc "${WORKDIR}"/{games.txt,vb2rip.txt}
 }
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 049fdb357261..6752fa225cec 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 8419b5a2315f..3fc42174237e 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -5,5 +5,5 @@ DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedf
 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
 EBUILD ffdiaporama-2.2_pre20140701-r1.ebuild 2043 BLAKE2B 0a935a359fa358838f74caa04769cbcf3be6b41ce278b5e0036fc49e40cbebc3d25acecb7c191bdcb868fda58928f32ceb76dfe5591e7ea56db57bd1b9e40e19 SHA512 67cc4b9a694ba1ef521c11dd4f02613d3035e7a59247ed95d5ee87a8ed46f65e9dcdcc03759fdd39e84f5bf98d9fb49ae96a7766e333d6ac439b532603750979
-EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2095 BLAKE2B 8be1f69304106a0530cc03b9218efaac0bcbced68770295cb1649a523c282768bc056b7824b5d3a09fad8eb7ff3461058129dbab688e84bc337a89d1d725d612 SHA512 eaadd825c6d54df49716ca77c272d3458bb027e164d6423f3638ca345feb266e2dfc981f9a44d502a4cd5a07da5754e29820698047738f2df6e48c4a64642ed0
+EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2094 BLAKE2B 710753e7fe91937f6b4fd1e44fa65f73121333294a899104061eba718f804cd2dc8e7f8b7a5ec5ebee51f2fca539247f589fdf44cd1153070dcb12b1b61cc815 SHA512 94b34c9801acc52c9952ceccab4aea3feafe265c28f88a58760c9183a70a45d1d6c39ae9414945fc7d2f81ad40d4cdf1e6013a3874e7db825fcdb31af78c42fe
 MISC metadata.xml 2256 BLAKE2B d224c6932982a05615b3e5094f1f1aa077682cbbe6589ea9806f47a604e7b51063c8382d542b474a078094657690cc8f785889efa696d2aca25f38ea8b3c9369 SHA512 9672bf9ac08cbd33e4effc8456c152edb1d2d7985fd21028ef06b9698077052c509b29d3f72311b5b62d36400c8cda45699026e91cb92f5d63f2f1f10597bbb6
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
index edceb82c0e40..f9cdfff4684f 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://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/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a49326cb224c..1aa089345c77 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -22,6 +22,6 @@ EBUILD ffmpeg-3.4.5.ebuild 15590 BLAKE2B a620d58295d2386f68410999760c9da26c054eb
 EBUILD ffmpeg-3.4.6.ebuild 15588 BLAKE2B d49f5b8411ee48a41af83136a8f0ec673f4feb3a13e194d72716c5d220b929688ff1bb20555091ee113546669ba385df7d1cd880fb724556f90420bffcdb00c7 SHA512 8497f50238398bb270e20bf3a896c95fac17ffae62482d3475aa28df27f7ac23c5d230a0a68de089a9f3230826345cbf9b12cd38a2f6fdbdf76b533fa50b1d84
 EBUILD ffmpeg-4.1.1.ebuild 17072 BLAKE2B 4e3d25a7b01920c2e89740ef5847b3f99aa283e8926efcb641687ce9064f69aac5a25132f1295fd0c1dd1dff0f532d12acda72acaf09671549adb8d626266229 SHA512 3e2f5362b30dc2dc9a14356887304af89768774efb3025c4af7276da03ee75ae0a0ed85afd43c0a04b59c687aee901eba4db868720d130b0e282d25324e77977
 EBUILD ffmpeg-4.1.2.ebuild 17072 BLAKE2B 4e3d25a7b01920c2e89740ef5847b3f99aa283e8926efcb641687ce9064f69aac5a25132f1295fd0c1dd1dff0f532d12acda72acaf09671549adb8d626266229 SHA512 3e2f5362b30dc2dc9a14356887304af89768774efb3025c4af7276da03ee75ae0a0ed85afd43c0a04b59c687aee901eba4db868720d130b0e282d25324e77977
-EBUILD ffmpeg-4.1.3.ebuild 17071 BLAKE2B 26da8429814998dbfa0a37744264e218c835f6284f18e0b9cb6a395fc30d94e325329f7c19251f9810fa37e796953439e9525bfe48246bf628b8c3bf6e11dd67 SHA512 bdee2a23a5eaa224dbf24697d129be94b8967edc4e906f4ec5d10b3b5f3def0067e497ceeec10d29a48103fae392072fdcca695b48780979dd158b29babb62ed
+EBUILD ffmpeg-4.1.3.ebuild 17070 BLAKE2B c04bc55b090d81d9a587a18a19f0518306d65c17255999c8e63c5aa2c9e10b10088b88ad9a549c0576ea33750b5654efecee70ec75017eb2ff8ce542937504e5 SHA512 6d818dafb8835ded68e62fb810e591e41668a21d0a0bd6f0b8d1789df78c9eaf9c47ebc31545ea9ae46c25ced1c93a7164743ff172284e8c8b10fce091970d90
 EBUILD ffmpeg-9999.ebuild 17208 BLAKE2B 0c9c9bbbdf2238d995008d6ac8f6a357993abd976958738747edca1e966caabf6dd5816a70c9da34072157fe08b3fad6b04bf2cc65cfe5a548144d968a116938 SHA512 b6e99a8d554b18afc5719468f80d46b5d6a1f3e71ec1c68beb17797f3c7ef301418afdbf9f365db554617564b290d3596e1ad0e355b4b08da47f76c747ad9aec
 MISC metadata.xml 5992 BLAKE2B 640b4b6e9904cc8653cd5c7788cbd5b0b48579e7a87fdd58b98e5ad88d3e34f05aa181a89830aabca4f9262c1ce9e07ed1b1c323352d40b1da6800b5e0e41fe7 SHA512 542bf49855f46b3391a9061b3c5e8c025ea5fb67af6046f0aa2bd6fb5cdf17bff92d5c2fea181f7e2f7dffb84452f8876ed8ef744b41b7828d0188ce57b184ae
diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
index 683d91455e3b..907398cc03c3 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~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 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index f08b5bce890b..acacc37c9421 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -9,6 +9,6 @@ DIST motion-release-4.1.1.tar.gz 447795 BLAKE2B 8c7dfdad89f49ba8ec39689d268b4bc9
 DIST release-4.0.1.tar.gz 444779 BLAKE2B e74b193f421e4fe165f36fe251eafe44203bbf8825b0062254bd7e0c9a57b286314c1bbb287c1c768db62649d82b83f4876ef236e446a1f21f7baf90d5ce5b4d SHA512 6ccde3890e6af56f28208321987dd1b9d62a55bbe7cbc3ab5600263602e6e8f47589392c2f3a3a6cb54f927ee76aea94d0e83f26ce8e4047890c891b6c2f8976
 EBUILD motion-4.0.1-r1.ebuild 1979 BLAKE2B 943b6b40dad276dc221c61d7d3de0af85992090437bab65fdf4b58ae4ffa22ac53e5e01498e5cf2fa371c751801ecc64d248a655c7c50550520feddad7c2341d SHA512 336da1d0dc347fa610bd810c309dedf82e66137723decba9edaeb44ae68ad0f490483f722fce267f1de8a70406698f6f5701711ec00b11d25cdba1a2a6cb5d95
 EBUILD motion-4.0.1-r2.ebuild 2011 BLAKE2B 29f89ea29bc4dc39aaa4b5beb5dbd96b9094226892eda76b025c7ddf874894cfb70f6ba50bf3dff6cfbe7088f04f9b0d8239280270e9a8d2eefd9cde5d1c5093 SHA512 6429e44d029443192c347ae8d0f309244cc63cc67ccf46b9f78c678c7621c808d085fca85d0120da71964d323e10d817c835513ef0a1fb5857be4b4aea36a305
-EBUILD motion-4.1.1-r1.ebuild 2206 BLAKE2B 40d1332ae002f75b2aa83edce1070f66159ded78c2d5b5ecfe280947b59fc837bcd5d00b976411c8c884ea1d6b457545ee7519eeed47e2cb73eb5c02d0167d97 SHA512 822db0bc6a312ee8c38605cb66eab4ebfd38ab0eda97ea8e15a1eeb8b4ef12a048280c2c28c31e8aab43393cc97a8cd81c3671d2a18a9ba2a6a5d16b5a60695f
+EBUILD motion-4.1.1-r1.ebuild 2205 BLAKE2B f1389721a58c5e943220019dfb7be3aed33a44296359ff663361c969f3901f7d32c54fe5a6d6a733cecad40dad94ec931bb471f64790b29c5623d77c21b7dc03 SHA512 d2e06a1a45328a3f1a76a40d52da49819ed512f5c7a7fb1d3347a29418aadc1c20ddf3a0a15f40deba5c329fdb24beb9efec140a7e19717cdbebb1f9bc6fb9f9
 EBUILD motion-4.1.1.ebuild 2132 BLAKE2B 55a3e637fd7da85402f71a744d05c73cf0a4eb1a1d3a0df6a4bd7d94e6a14e64334e567c912a1d117e8ed3c0cf8fa43ea8040d9911d677b6b99065966a4bd51b SHA512 3882e33512a29332ce013c8a61749dbf986e546ac5c0e4662cabe77a1655ef281ecfa7649504446c52c4edb301524ae5bcd198ab7bf7eb6f781c36fc06aad84d
 MISC metadata.xml 688 BLAKE2B 62d5d1fc2c9581ee8d66557903d17060627060d4cc76d745bee2bbb17980bc81337574986a7bb1b2d6f669041ba09b355fce68655f9961d388f3ae40a65d3fb2 SHA512 f69d8539a16d80a49c147a60f8e831a245814c4853383f9991f4c2762aa2d1b7f22b8993eb7184a49c6c783b75d23ef91a10b6293563aa7e29f561f40fad56d1
diff --git a/media-video/motion/motion-4.1.1-r1.ebuild b/media-video/motion/motion-4.1.1-r1.ebuild
index f4f49ccb2b55..3113cd0a5fcf 100644
--- a/media-video/motion/motion-4.1.1-r1.ebuild
+++ b/media-video/motion/motion-4.1.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ffmpeg libav mmal mysql postgres sqlite v4l webp"
 
 RDEPEND="
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index 63f09b6ce55c..35f4aab7a5fa 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,5 +1,3 @@
-DIST parole-1.0.1.tar.bz2 903754 BLAKE2B 2bd8a8892c04bc145d7ba0bc08c29ad1f9c4507cce533d554952553e46c408e9f293a19820790541d0a494052ac6024d415bfef4864fc09b8d851664688ace3e SHA512 026ece62e6a8175976e7ce218edbd6955a0cdb5074996adad5bed3e536f90108e4d1106f22edcb06d213fb09dd47b04f81bff94f4534710b61f0f53cb0395f72
 DIST parole-1.0.2.tar.bz2 915511 BLAKE2B e6fa116cae5c015a90b4a1d04df70f006ad59dfdb5d849b8ae8c3fdc0665e48790739c82bdb7c35c70f34548b9bee3dcac62f29e28562663d46b10a3a080f13d SHA512 d7e989af7f9dab14080e62bd656a2858d8536a056ba82b5d5ac7d26a7d898f478b74c1ba4371779624691b7f42b695580ad53cfb15da0a4dc209d7570c12a66d
-EBUILD parole-1.0.1.ebuild 1442 BLAKE2B 7c6e7f4209136a9b2215bae72574652e0c54047b7a65aff05708f41466799499a3b82a514b54e0ea929a2c0501c6e4afb6ef01259cc1b6e1856e46868cd1d880 SHA512 eebb71d36da7b352c74a3ab7c18159e13de9aef93775cff90b43ace73ab8d7bdbe2aad5621cb7f8fa935c5de7d00216496e13f619f5f21e2f53e3fdd13c69434
 EBUILD parole-1.0.2.ebuild 1442 BLAKE2B db6d0f6f8ad020030448874f38d2e2d270fb2f7b5446e24f85792d1de574c368f0c6ce352bef0a0834d331089ac42052b8f5662599ed874d836e2b273dc68634 SHA512 985e7c0dcd1f792ee707e47fd34dd52dc4698fa474103a0565905212e55ef7c576bc99cf315664782dec3a4693ee928eb33c58efcaba10a47827c93c8175dde0
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/media-video/parole/parole-1.0.1.ebuild b/media-video/parole/parole-1.0.1.ebuild
deleted file mode 100644
index 04d5007a5f7e..000000000000
--- a/media-video/parole/parole-1.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A simple Xfce4 media player using GStreamer"
-HOMEPAGE="https://docs.xfce.org/apps/parole/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="libnotify taglib"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
-	>=dev-libs/glib-2.32:2=
-	media-libs/gstreamer:1.0=
-	media-libs/gst-plugins-base:1.0=
-	sys-apps/dbus:0=
-	>=x11-libs/gtk+-3.20:3=
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.11:0=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.11:0=
-	>=xfce-base/xfconf-4.10:0=
-	libnotify? ( >=x11-libs/libnotify-0.7:0= )
-	taglib? ( >=media-libs/taglib-1.6:0= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS=( AUTHORS ChangeLog README THANKS TODO )
-
-src_configure() {
-	local myconf=(
-		# clutter backend does not work with new GTK+3 versions
-		--disable-clutter
-		$(use_enable taglib)
-		$(use_enable libnotify notify-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 447930229dc2..b3793f3ca804 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -3,11 +3,10 @@ AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b6
 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d
 AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca775336174dbef69e6054361173886be26d941cabfe2c5b486a05f2b3bee7029b439652d4dfb10e5651a7db68db8b70af SHA512 6bdb6d57be84c1d020c6f2e2f547eda9a0118bfcd0e4d2cdbb940501a0853ec388f359e04a52b8ff9c6c6b38d60f3837ed2c2e127a4df5bf79751486d9ed9ed6
 AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366a0a2e77eea881277d7b8a7928e851d2456f8fe5220ee50ae77296b622187758b7f6f3a4c298c0400becfee0d2fa074e7706e3 SHA512 b330aee54397a3fce5cda3a1244918351831ffe37cc7d45bcfa93384952bdce3166875afd5cd4bae9f1d6e83281b6b6bfc3ad777317a0b2c6c5dcc5593ddcb54
-DIST smplayer-18.10.0.tar.bz2 5167524 BLAKE2B e6c1993057f9249cb0677643816744c3a7e44bdd70865b21bc5d69d6f087c03be53fa01057ac75c42d74a00a6d5b5f6e8be4e6955ffe022196c45bba218becc2 SHA512 7726294c16761900b384db42155a26891f9becae38ef39b35dd9c6a62c2050b5720a8b641a893b33c7bc08a5c98e12a4651196a67311444d6cbed2dbd5895f5c
 DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8
 DIST smplayer-19.1.0.tar.bz2 5169546 BLAKE2B fc15fd33522f137371442696b20ed695dbc4cfeb759ae504cdc688dc30de14fd35da81f6788b3dc2886119012416218f1d39ba64a7d747194dd777544a08d1e0 SHA512 aee009f0ff6dcfe8e5b0b80c99d44c41a02c34d7974c1a15b21235e3daaf3142f5c936adb043327804412309b88e0ff8f0ef440c1835541adb6bf703d486ff79
-EBUILD smplayer-18.10.0.ebuild 3210 BLAKE2B 7d56ba88f1a342374e510b5b1c0359c62658ab65086ac04b7698c960bab229315d53b78193e0f18d183aba0ba6e33cb8af351b46d40c2f651b702e0f9c1031b3 SHA512 1f96d728aaf2e64634ed3740653ecb9eb6af52b65cc1b009fcdfb1ed10b3b8f53c3435d96ac00b4ed5a14184e4a55be53159b1557043640e77f61496e6e5abc5
+DIST smplayer-19.5.0.tar.bz2 5175017 BLAKE2B e7160ca7d404dd6a8d7c316df3c39b2e238410435960d714aec271d2034030f9e1b59997d11d758188e327117f0eb773cb8baccc1defc20cd071e40c87deb07c SHA512 ee19186b3f4eac94b06a1e389e42edb8c2b22f8182b679bdc40e3ae1569a6c69f168260abfee3b2827b71b10eb353e7a3821805798f37aae2600af3b73d25ca1
 EBUILD smplayer-18.6.0.ebuild 3208 BLAKE2B 7c809a0375fc293b2af598e3f2c672a8a4f4bca451e155ad7dbad944adaa80d1e2a489b60ad9a1b133afca472ac59e15b5ec7057652353765f9ed19f4e6a8585 SHA512 21a14fccf5d307cb0b2d2cee864d5ca8bb29d462aa8b821a7654da42e193d6480520d2c71e1c0cc84df0f782aa0494cbaf88b6b977d3bfe056002318a69c4577
 EBUILD smplayer-19.1.0-r1.ebuild 3164 BLAKE2B 0b6fc77b7f22e590325ffb1304868cdf4551eb8c10fe5239b7b1bef43e66a8784c0a325a4c4fcd83350ae3635b82e94cf2c9d553788a3336d5555a35f698a592 SHA512 d78f0e68b457b267195a6124bec53d89c001f7c6007db62c3afb4946a8bf47b6697a1c4fe333bec8cc4d2034c6e22aef53003ce23e7bf24c023f824dbf8ed21d
-EBUILD smplayer-19.1.0.ebuild 3210 BLAKE2B 7d56ba88f1a342374e510b5b1c0359c62658ab65086ac04b7698c960bab229315d53b78193e0f18d183aba0ba6e33cb8af351b46d40c2f651b702e0f9c1031b3 SHA512 1f96d728aaf2e64634ed3740653ecb9eb6af52b65cc1b009fcdfb1ed10b3b8f53c3435d96ac00b4ed5a14184e4a55be53159b1557043640e77f61496e6e5abc5
+EBUILD smplayer-19.5.0.ebuild 3164 BLAKE2B 0b6fc77b7f22e590325ffb1304868cdf4551eb8c10fe5239b7b1bef43e66a8784c0a325a4c4fcd83350ae3635b82e94cf2c9d553788a3336d5555a35f698a592 SHA512 d78f0e68b457b267195a6124bec53d89c001f7c6007db62c3afb4946a8bf47b6697a1c4fe333bec8cc4d2034c6e22aef53003ce23e7bf24c023f824dbf8ed21d
 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/smplayer-18.10.0.ebuild b/media-video/smplayer/smplayer-18.10.0.ebuild
deleted file mode 100644
index 23bf31eaf0a1..000000000000
--- a/media-video/smplayer/smplayer-18.10.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 toolchain-funcs xdg-utils
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://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"
-	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
-	"${FILESDIR}/${PN}-18.3.0-disable-werror.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() {
-	emake CC="$(tc-getCC)"
-
-	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/media-video/smplayer/smplayer-19.1.0.ebuild b/media-video/smplayer/smplayer-19.1.0.ebuild
deleted file mode 100644
index 23bf31eaf0a1..000000000000
--- a/media-video/smplayer/smplayer-19.1.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 toolchain-funcs xdg-utils
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://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"
-	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
-	"${FILESDIR}/${PN}-18.3.0-disable-werror.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() {
-	emake CC="$(tc-getCC)"
-
-	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/media-video/smplayer/smplayer-19.5.0.ebuild b/media-video/smplayer/smplayer-19.5.0.ebuild
new file mode 100644
index 000000000000..a7d7dc8f6ecf
--- /dev/null
+++ b/media-video/smplayer/smplayer-19.5.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2007-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 l10n qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="https://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"
+
+BDEPEND="dev-qt/linguist-tools:5"
+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 )
+"
+RDEPEND="${DEPEND}
+	|| (
+		media-video/mpv[libass,X]
+		media-video/mplayer[bidi?,libass,png,X]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
+	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
+	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
+	"${FILESDIR}/${PN}-18.3.0-disable-werror.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() {
+	emake CC="$(tc-getCC)"
+
+	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_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "If you want URL support with media-video/mpv, please install"
+	elog "net-misc/youtube-dl."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index 21d0b1b0051c..4dd06b9fdbea 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -3,7 +3,9 @@ AUX mongod-wrapper 101 BLAKE2B cc52f011b065322fb7ebec982c5d0b188f4c72859770dec98
 AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2becd9569c8086b568e5c84508f2cc71c81605cc124bc17cd42c884d477b15181dba73544fc254610c1 SHA512 1cd4345daf09a27dcb8528abd076e920e30b6ff7a505acad74fdc291164c94569946cd493563331c5e52cb95c45e18522520aee47555db438fa87c46d07e35c5
 AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474
 DIST unifi-video.Ubuntu16.04_amd64.v3.10.1.deb 162379830 BLAKE2B 8183cf0ea37507059b87f5f51a377a12cb2f5fab31675eac720cffa2f9c60e46e6a8eb68279992703722ba40c3fbe7a9a723596ee20e31ccec0959841851325d SHA512 3ac83e3ff7beb8c765c8908b80c7747807da73e3a9e077a9f5a22aaf3e307c369258c7ea6651e18ca74b570d359fa65b6cbfce0017cb73cb916a2bc8614b374d
+DIST unifi-video.Ubuntu16.04_amd64.v3.10.4.deb 161279504 BLAKE2B a9bac456218a1908e67bcebeadd06672ce6de4a24e62cd99dedc6de4e36774047531e8b00429e0dc8eb536e6ad77de236d89da83edfbaef8d7a7feb04df6c482 SHA512 d45f97905078ee6f9911bbea239d72432dda849c5fa16a11c2576e1dac78a0b612e420ae59f11ff7bdfec3c7eca9396a72d249d4fc90f93f9e92c57571f19093
 DIST unifi-video.Ubuntu16.04_amd64.v3.9.12.deb 117448948 BLAKE2B 83769ec07fccbcd955115493510bcd58b88433b7d7204be29d6329674cf4d6dea7fe4b6aedd0e89f852d89ae9a298a9284386aeb4480f43a91dbe6ea958ab10b SHA512 0e2eaefdee74b6b6c5ae54870673591ce4e2d2e4c07e068987f609597c43a12308aebdce705e316555378e04eeb13aaa0c00b496097123960215773cbfa69348
 EBUILD unifi-video-3.10.1.ebuild 1905 BLAKE2B 616c32a1b7dba5b882a1cf4d6dc573a55e050a88e73d4b8da653b00be06ce700f7458d8a3417ce5fe24eefae1407d704784cba627de9ad386f04870b0da07534 SHA512 a1bfb97ea0f0a9244e6d654e352998cf602dce124c30b7669b971cd34a990d650f2ed2fcdfbaba2af8233bb521155bbbe9b06cdabc5bc2e826f5bb6fc137a73e
+EBUILD unifi-video-3.10.4.ebuild 1897 BLAKE2B e182a17a1b8d00350eb48c384a926f56b705493cee74950a92ccac416540e4d5faf9efb2046f33bde5cd8b4ed2435e19f111c59824c5a2818a68e675415ab691 SHA512 7058a3267310542459a9675d9e0ce0793e6f46d2075f9ce4f860c1387d249d4a2736411afdd7062f4af677e49717a8a78be04731ca0e4b672227eddbf94748e9
 EBUILD unifi-video-3.9.12.ebuild 1968 BLAKE2B 8d4f0bceb418e49bcb75cd63b9d1d9caa1f9cb8b90a44aba0646fc50ca72d68d741dda153f1ee20b2f540d0aee99c744933560319b103a55c61e008cb77a63e8 SHA512 d3c8d2208e22daf7fc2bb2ad5a28d88c08c624c3253e8ffc1d9317a74d4f6f3333b66b92ca7c0a5cb1ea3659b0cda68f1c92371b34bad13f4508af956a4ffdcb
 MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c
diff --git a/media-video/unifi-video/unifi-video-3.10.4.ebuild b/media-video/unifi-video/unifi-video-3.10.4.ebuild
new file mode 100644
index 000000000000..c975418c3dcd
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.10.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+MY_PV="${PV/_beta/-beta.}"
+DESCRIPTION="UniFi Video Server"
+HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
+SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="dev-db/mongodb
+	dev-java/commons-daemon
+	sys-apps/lsb-release
+	sys-libs/libcap
+	virtual/jre:1.8"
+
+S=${WORKDIR}
+QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
+
+pkg_setup() {
+	enewuser ${PN}
+	enewgroup ${PN}
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}"/data.tar.gz
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/commons-daemon-move.patch
+	sed -i usr/sbin/${PN} \
+		-e '/require_root$/d' \
+		-e '/update_limits$/d' \
+		-e '/ulimit/d' \
+		-e '/coredump_filter/d' || die
+	default
+}
+
+src_install() {
+	static_dir="/usr/$(get_libdir)/${PN}"
+	#install static data
+	insinto ${static_dir}
+	doins -r usr/lib/${PN}/*
+	fperms -R +x ${static_dir}/bin
+	fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/
+
+	#prepare runtime-data dirs which live in /var but are symlinked from static
+	#data dir, and are writable by non-root user
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	dosym ../../../var/log/${PN} ${static_dir}/logs
+
+	dodir /var/lib/${PN}/work
+	fowners ${PN}:${PN} /var/lib/${PN}/work
+	dosym ../../../var/lib/${PN}/work ${static_dir}/work
+
+	keepdir /var/lib/${PN}/data
+	fowners ${PN}:${PN} /var/lib/${PN}/data
+	dosym ../../../var/lib/${PN}/data ${static_dir}/data
+
+	echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	into /usr
+	dosbin usr/sbin/${PN}
+	dosym ../../../bin/mongod ${static_dir}/bin/mongod
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 46489cb2a9dc..e911fd28e76c 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,7 +7,7 @@ AUX vlc-3.0.6-libvpx-1.8.0.patch 1147 BLAKE2B b12fa40a02dcc5d6ba319b773cb4bcfa52
 AUX vlc-3.0.6-sftp.patch 979 BLAKE2B b6fd797112363e5fb0f0721eeeb92ee7b5c9a9e1a9450e51a99346dd824f75089775ae09c0dbc48dce7adaa889f3b03570d2d995b2aade6e73ffcd8e8765cf51 SHA512 3f510d9b007ce353211db878b671c43b17abffafd22a03c883e509808ce8b46bf64fa48e64d077c1e8f6ba2cd1f3e08a24e5db48fcda9cba02bdf266ca1a4378
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
-EBUILD vlc-3.0.6-r1.ebuild 13301 BLAKE2B 95b183dc8fcc8c0cacd16f9bb6bba7f16663d3a7ffd9dd359d5c8ea3fcc955d550bed2fb7417b5bd688f14c538b5342ff2886f49fb3a241e431d31b53faeb653 SHA512 f96776595823e4b78fed4199db5105855ae501957c555e9521f6d32c2a3bcf9a30019c7b6c9d985a2471ca201522d6ea0b65f5688a7840c7dde93dd0737a58e4
-EBUILD vlc-3.0.9999.ebuild 13114 BLAKE2B 69b985686f741088f062fe91fdf020006ff19a7972313cba56ff2bcce9d248fd82050dbbd00fa8b67167e587d72e415840c077986e49288ca57cd9550021870b SHA512 3c3ec68976cf4c2a5365f6a88d614b4ffbdd4621f076e9d6caf569315d70a7f848bd5b48edf0dc53be204e60e9c1f64a40ba56143ef48b338e67f0f131fac1bc
-EBUILD vlc-9999.ebuild 12982 BLAKE2B 03b9cf07362f3ec5b144164f870b79f7f20f35dbb396b4d2de738c8a2f9622d3c278b85efc79d13baf0dd6777be8e68430bf6b82314419fbe2b12d2542e8bd5b SHA512 ad5b89f132626ef54c0ee0bd78aeeb0625d3249ea6ebe065ddd5561c187fd812002f969a9c86bf64b995cd66ff42dbcde5dc8984798c753c08ab442c6a431e00
+EBUILD vlc-3.0.6-r1.ebuild 13308 BLAKE2B 69eb584b41942885678439a16b0b99ccba1e00f6c369233a23d190b739d9ce2906e5c7fe2d4a2bff38edd5f03bb047f016a40839c9ea788c60b5824068e64db9 SHA512 fa81f931ed9216997be00835584542224eec9c74086b2df48c6c00ad8d3b15b88e51769402997103ed303fc77e81a35ed087b46a59c2306a1f510260454c5075
+EBUILD vlc-3.0.9999.ebuild 13105 BLAKE2B cb8098cb3cac5c90c57b170bd7e8947ac17a0f12721c0783af940acbbdd41b05362e9160aa3e2d4ee45453f5e105f07fc84ad7dccc91231bc9e4f1e155b74ca8 SHA512 61a250dcc2e246269eab095e3ecc13173471c2f8ef79e20158b3d495f64b7367585d06cb7aea4c0235c928321858b9d303d21953a7ef93449114d51dbb09ad89
+EBUILD vlc-9999.ebuild 12990 BLAKE2B a55dc13a60632cbdb925007c8dd52ebc964125e8d4412557ff281cc206143c35ef9d41ba813b68d1976e5dd1224bc0c030b0bf0819ec7921b2d196da4e0b8820 SHA512 86e8e1e2d58d59d6c3ae5999fa27b025e4b1304c000a10c9935f013bb9c77379a2397b0a13d5447c7f04167a1de9938ded9ea60baf9e071d411ff8a117ffddb4
 MISC metadata.xml 5087 BLAKE2B 57254aa856882b33eb97358623d2600cb07e30d1554316de645d808f1bb6a7442cfb3b3fe6422f5de72dcadab06fbae28aa2c7b1d88d8fa588472de76d20fa23 SHA512 eb14beac4431445a8920190edac1a2a0b818565dc352b5df1e05dcddd4ff15a817e2624bce66a6aea431fa17b2203732bb9165396528e9a13c5dafacfce39274
diff --git a/media-video/vlc/vlc-3.0.6-r1.ebuild b/media-video/vlc/vlc-3.0.6-r1.ebuild
index 42b4075acb27..0ecf3c646c68 100644
--- a/media-video/vlc/vlc-3.0.6-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.6-r1.ebuild
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 -sparc x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86 ~x86-fbsd"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
@@ -180,7 +180,7 @@ RDEPEND="
 		x11-libs/libXinerama
 		x11-libs/libXpm
 	)
-	soxr? ( media-libs/soxr )
+	soxr? ( >=media-libs/soxr-0.1.2 )
 	speex? (
 		>=media-libs/speex-1.2.0
 		media-libs/speexdsp
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 0409bef20e62..5b5892f8acc2 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -33,8 +33,8 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
 	libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack
-	ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
 	+qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
 	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
 	wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
@@ -181,7 +181,7 @@ RDEPEND="
 		x11-libs/libXinerama
 		x11-libs/libXpm
 	)
-	soxr? ( media-libs/soxr )
+	soxr? ( >=media-libs/soxr-0.1.2 )
 	speex? (
 		>=media-libs/speex-1.2.0
 		media-libs/speexdsp
@@ -339,7 +339,6 @@ src_configure() {
 		$(use_enable live live555)
 		$(use_enable lua)
 		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable macosx-qtkit)
 		$(use_enable mad)
 		$(use_enable matroska)
 		$(use_enable modplug mod)
@@ -407,6 +406,7 @@ src_configure() {
 		--disable-goom
 		--disable-kai
 		--disable-kva
+		--disable-macosx-qtkit
 		--disable-maintainer-mode
 		--disable-merge-ffmpeg
 		--disable-mfx
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 092e9f812b31..dea92a28a05c 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -182,7 +182,7 @@ RDEPEND="
 		x11-libs/libXinerama
 		x11-libs/libXpm
 	)
-	soxr? ( media-libs/soxr )
+	soxr? ( >=media-libs/soxr-0.1.2 )
 	speex? (
 		>=media-libs/speex-1.2.0
 		media-libs/speexdsp
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f6b5a256a527..01450535e2d5 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b91e261ffb3c..a5240019f154 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 21 May 2019 08:08:48 +0000
+Sun, 02 Jun 2019 20:08:54 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c4b1c2fc71a9..b2a2a083fd13 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 442809 BLAKE2B 4b7b795575911222fd7fe1e9f9900ced88b7957d15e08d5881ee7e2c91f556beb375085e3842469d53d9c216f6709039908e138283d8726731c25b7aa33c7861 SHA512 ad93d050cf3a9d3cfb5dbce463c01bff4a31f205a3d2773382f89e603197645720db7bb4b45496d26f019ef9161b89ce5d0e4aacd87f89dff11d9c1126c34c46
-TIMESTAMP 2019-05-21T08:08:52Z
+TIMESTAMP 2019-06-02T20:08:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlzjshRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlz0LNlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDOrRAAqQAMciZnVvIfHov6Djsv+kdfQOfz+0gO5makNM1Ahh2hBVpadA/v4FCt
-4ZgI1sr5x8xG5u0rPbPJJP83MmeVwzrb0E+YrOXS0dRzUTjC0miBgCG9y3vJTUO5
-kloKCjrEmhdFnu/WMlJyUk078yjMLHr8RpOJ63FPhDgRuutH/ElCTu6cRqE3VqAl
-fLfnjcR/1fHZ3vKFlichaixq55cg2NB3dk7nse95m8lSjKLon2/qZC5gWO/MhvO7
-YLzFg55uMG+13lZKua4MWJ2RGS6zA806Duw0NToSAGPy1KIhQZD+2Ylz7SzhKKc5
-mUzmLyvp05QBWKigJEMX3lB2qCjNeJZDDAMpLg0wG7Coih4PC7K7wmIDnWiyS01M
-WQQRPm97oulOHXDesdRmMGJk4BH684vd1S12anmrJPU/nqXvCfrJzsII17bdZRua
-JCSK+TCAfu/rJEwn9t1QtZQ6sfGW02KnxpUZcQxnAF7Uo6XjetAbDlL5AF4GdHBR
-LoLcJ06VYfKCOTY6L6xClYrrtHOEetNF4mJQVBE0Cu/DXfiwTIyHxVkX9ZrqMb/W
-56czOP9DDKZByEMpYw7MMEcv2dZwxBM0xDdLWrvQfiazpJy+A1kjhfPF7zrSjuyH
-/r1k8durvM5dU6gYculX9LgkoEKS1IBToxDS/mCPtETykjIlMUc=
-=Wzdp
+klBqlg/8CUvi+kZVGYaJOglw3jsmthz6vuNgr0OGSKRgdlX9WOxJAy/Ku4h0PwCf
+l02TOsDMYQLizfIpbcVvIZKyD9LFVyprATcqwxATWzRA7si/yWyaEz6IPTemZR6N
+ERL/5JRuQrfOwk/Nb1Ir3md9522Aob6my/5fkIbeE4B5KtDHcDjzd6GI3J8MhOGM
+kCDAOEz0D1VD8bIfWu66kpp2Sor97Lg/SFaJNTXpJT/3K9UM/GESWnzGCpJzl+5b
+QX9zuw6ygIC/MuLj50q87CpGIVdoRewMnI3+3y0ATtEQr/YycToN6n/y1hf0qsuE
+rYTcOTn5NhkKszD1lA0t2ywsPNr2VVt77TI/HW5YNiZplEcyec5AqY+PaUsXj/GG
+R0SUiAj+5Y7Cy/grXuhEEmZIjbWsEC+n/5nuGG5++ueZZhdkvWqWY8atVHXs0kxr
+FjPbEy84MWC4ezWMwXPTeN52Ou2/mJyZ7AxOFI149k4r6Ec+NEw20fBZ0xZqrWAy
+691MBMSgZnIy4bqN1u769YRbzC7s6ww2WwqUpT/FlGMt2zdZ+4Yi06VYD3eYkmHz
+Ko5o+kREopix76sLu1h8oMmtSs8piJquykiWG144ujST9T6ya62+juF4b+PhcMAz
+r1KKJzy/396xDTFrhIGPPjwwx5QE2pVA+11jRvt2b0aaa2f8OKE=
+=yfsp
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b33917145f9a..a5240019f154 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 21 May 2019 08:08:49 +0000
+Sun, 02 Jun 2019 20:08:54 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 37508e058b29..62d09c494ac1 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index c46826c55f8d..1ef2bcc8bac8 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1
index 577d69d51a3b..60f9698bbb9c 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1
@@ -4,10 +4,10 @@ DESCRIPTION=Gtk module for bridging AT-SPI to Atk
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-accessibility/at-spi2-core-2.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.30/at-spi2-atk-2.30.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=998d42f8aae22c7715e05148233d86f2
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=7ac7e310d509bed2fd6c31a80b240be5
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.30.1 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.30.1
index d6580f2b7222..e2bba91884e1 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.30.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.30.1
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus accessibility specifications and registration daemon
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=X gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.30/at-spi2-core-2.30.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c254992fdcea7b0cb03d5ba0d46559d6
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=43fc9a4bbc4907badae36b9f50fa7641
diff --git a/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1 b/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1
index 044cf4efd368..228ebbdd6e6d 100644
--- a/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1
+++ b/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Speech synthesizer for English and other languages
 EAPI=6
 HOMEPAGE=http://espeak.sourceforge.net/
 IUSE=portaudio pulseaudio
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) media-sound/sox
 SLOT=0
 SRC_URI=mirror://sourceforge/espeak/espeak-1.48.04-source.zip
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=87b549bf88ecd7e52ef9d49d24016358
+_md5_=0438ce9f13c5c5e148ba22df3e014966
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
index fe9f6133aa46..2fa8193d1101 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
@@ -4,11 +4,11 @@ DESCRIPTION=Speech synthesis interface
 EAPI=6
 HOMEPAGE=http://www.freebsoft.org/speechd
 IUSE=alsa ao +espeak flite nas pulseaudio python static-libs python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python? ( 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(-)] ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.28:2 dev-libs/libltdl:0 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) python? ( dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93ea513d3003e378b9c776da8819aa02
+_md5_=39ace25e5b7861aefae2917650b49b22
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 86920efec09e..bfd89a815f91 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/ansible-2.6.17 b/metadata/md5-cache/app-admin/ansible-2.6.17
new file mode 100644
index 000000000000..d9eb7ed8d8d6
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.6.17
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/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/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[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(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[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/coverage[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/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[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(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.6.17.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=89537dcbd618e096076d591a4b964045
diff --git a/metadata/md5-cache/app-admin/ansible-2.7.11 b/metadata/md5-cache/app-admin/ansible-2.7.11
new file mode 100644
index 000000000000..f6e42ac4bd90
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.7.11
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.7.11.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=00ae625629357bd1c36f973a124cedb2
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.39 b/metadata/md5-cache/app-admin/apache-tools-2.4.39
index a2ea44d73d05..8bbf6a4b0c25 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.39
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.39
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-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
+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.39.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=4538dd52daef91560f206d799f3a82e8
+_md5_=42240db232b78fe20b574ccc8b13f8e8
diff --git a/metadata/md5-cache/app-admin/conserver-8.2.4 b/metadata/md5-cache/app-admin/conserver-8.2.4
new file mode 100644
index 000000000000..07317aadc8e8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/conserver-8.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
+DESCRIPTION=Serial Console Manager
+EAPI=6
+HOMEPAGE=https://www.conserver.com
+IUSE=debug ipv6 freeipmi kerberos libressl pam ssl test tcpd ssl
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD BSD-with-attribution
+RDEPEND=debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) pam? ( sys-auth/pambase )
+SLOT=0
+SRC_URI=https://github.com/conserver/conserver/releases/download/v8.2.4/conserver-8.2.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5d16b6d43ff8c60bdfd4d4d6f551d38e
diff --git a/metadata/md5-cache/app-admin/consul-1.5.1 b/metadata/md5-cache/app-admin/consul-1.5.1
new file mode 100644
index 000000000000..7ea7a3cf7b9d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.5.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=dev-go/gox >=dev-lang/go-1.11:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.10 virtual/pkgconfig
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=6
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.5.1.tar.gz -> consul-1.5.1.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=d63897b50a038f2929743e5a3d45cc5d
diff --git a/metadata/md5-cache/app-admin/cronlocker-0.4.0_p20180710 b/metadata/md5-cache/app-admin/cronlocker-0.4.0_p20180710
new file mode 100644
index 000000000000..f9ca5f3fabf3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/cronlocker-0.4.0_p20180710
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=synchronize a cron job across multiple hosts using the consul lock feature
+EAPI=7
+HOMEPAGE=https://github.com/Barzahlen/cronlocker
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/Barzahlen/cronlocker/archive/c0ac605.tar.gz -> cronlocker-0.4.0_p20180710.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=0c3a6f154cc4d0e073b3aa7200d62588
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.14 b/metadata/md5-cache/app-admin/eselect-1.4.14
index bd0f7a061792..051ff692155a 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.14
+++ b/metadata/md5-cache/app-admin/eselect-1.4.14
@@ -4,11 +4,11 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~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+ || ( 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.14.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ea7220498e202fb2f27f278c86a45bf8
+_md5_=f9c1d5f91b81ffef7afaaf8c055d0405
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.10 b/metadata/md5-cache/app-admin/haskell-updater-1.2.10
index 71909c048c35..389b0acdb822 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.10
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.10
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-lang/ghc-6.12.1
 DESCRIPTION=Rebuild Haskell dependencies in Gentoo
 EAPI=5
-HOMEPAGE=http://haskell.org/haskellwiki/Gentoo#haskell-updater
+HOMEPAGE=https://wiki.haskell.org/Gentoo#haskell-updater
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.10/haskell-updater-1.2.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3df2c4edd1610eac0e69487ca1e78d86
+_md5_=b7c64ba5bd324393b5f2772c3b0ee83c
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1 b/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1
index e05f26b5f176..c810a64afe43 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-lang/ghc-6.12.1
 DESCRIPTION=Rebuild Haskell dependencies in Gentoo
 EAPI=6
-HOMEPAGE=http://haskell.org/haskellwiki/Gentoo#haskell-updater
+HOMEPAGE=https://wiki.haskell.org/Gentoo#haskell-updater
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.12/haskell-updater-1.2.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5008c5f10fa7d0fcfb8ad81d04a5fafd
+_md5_=208d66cb99c0bdd270b14dc217e29832
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.9 b/metadata/md5-cache/app-admin/haskell-updater-1.2.9
index 3597b032bd3b..116e3732fa4a 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.9
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.9
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-lang/ghc-6.12.1
 DESCRIPTION=Rebuild Haskell dependencies in Gentoo
 EAPI=5
-HOMEPAGE=http://haskell.org/haskellwiki/Gentoo#haskell-updater
+HOMEPAGE=https://wiki.haskell.org/Gentoo#haskell-updater
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.9/haskell-updater-1.2.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3df2c4edd1610eac0e69487ca1e78d86
+_md5_=b7c64ba5bd324393b5f2772c3b0ee83c
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.3.1 b/metadata/md5-cache/app-admin/haskell-updater-1.3.1
index a03f2a630c40..f5c20137acfd 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.3.1
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.3.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-lang/ghc-6.12.1
 DESCRIPTION=Rebuild Haskell dependencies in Gentoo
 EAPI=6
-HOMEPAGE=http://haskell.org/haskellwiki/Gentoo#haskell-updater
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+HOMEPAGE=https://wiki.haskell.org/Gentoo#haskell-updater
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.3.1/haskell-updater-1.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5008c5f10fa7d0fcfb8ad81d04a5fafd
+_md5_=34302b02738b675599689a1026335248
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.10.2 b/metadata/md5-cache/app-admin/ksonnet-0.10.2
index cbe242d273c1..066c04a6d7d4 100644
--- a/metadata/md5-cache/app-admin/ksonnet-0.10.2
+++ b/metadata/md5-cache/app-admin/ksonnet-0.10.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare test unpack
 DEPEND=>=dev-lang/go-1.10
 DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
 EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/
+HOMEPAGE=https://github.com/ksonnet/ksonnet https://ksonnet.io/
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.10.2.tar.gz -> ksonnet-0.10.2.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=de0c7b9182f84d4511d2d64c3ce0846a
+_md5_=0e0d0059a599b01a09b8bf85173a80b8
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.11.0 b/metadata/md5-cache/app-admin/ksonnet-0.11.0
index 1dd8ef42d9ff..d11f95d6f21e 100644
--- a/metadata/md5-cache/app-admin/ksonnet-0.11.0
+++ b/metadata/md5-cache/app-admin/ksonnet-0.11.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare test unpack
 DEPEND=>=dev-lang/go-1.10
 DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
 EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/
+HOMEPAGE=https://github.com/ksonnet/ksonnet https://ksonnet.io/
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.11.0.tar.gz -> ksonnet-0.11.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=de0c7b9182f84d4511d2d64c3ce0846a
+_md5_=0e0d0059a599b01a09b8bf85173a80b8
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.13.1 b/metadata/md5-cache/app-admin/ksonnet-0.13.1
index 01cb5e69eef2..daae1155d154 100644
--- a/metadata/md5-cache/app-admin/ksonnet-0.13.1
+++ b/metadata/md5-cache/app-admin/ksonnet-0.13.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare test unpack
 DEPEND=>=dev-lang/go-1.10
 DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
 EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/
+HOMEPAGE=https://github.com/ksonnet/ksonnet https://ksonnet.io/
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.13.1.tar.gz -> ksonnet-0.13.1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=74bfa19bf3c1a81a940b01b4012e7f62
+_md5_=0e0d0059a599b01a09b8bf85173a80b8
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.8.0 b/metadata/md5-cache/app-admin/ksonnet-0.8.0
index 31c3e49c1f84..91c1bffdb00c 100644
--- a/metadata/md5-cache/app-admin/ksonnet-0.8.0
+++ b/metadata/md5-cache/app-admin/ksonnet-0.8.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare test unpack
 DEPEND=>=dev-lang/go-1.10
 DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
 EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/
+HOMEPAGE=https://github.com/ksonnet/ksonnet https://ksonnet.io/
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.8.0.tar.gz -> ksonnet-0.8.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=de0c7b9182f84d4511d2d64c3ce0846a
+_md5_=0e0d0059a599b01a09b8bf85173a80b8
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.9.2 b/metadata/md5-cache/app-admin/ksonnet-0.9.2
index de144690ea30..b45f1289cfad 100644
--- a/metadata/md5-cache/app-admin/ksonnet-0.9.2
+++ b/metadata/md5-cache/app-admin/ksonnet-0.9.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare test unpack
 DEPEND=>=dev-lang/go-1.10
 DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
 EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/
+HOMEPAGE=https://github.com/ksonnet/ksonnet https://ksonnet.io/
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.9.2.tar.gz -> ksonnet-0.9.2.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=de0c7b9182f84d4511d2d64c3ce0846a
+_md5_=0e0d0059a599b01a09b8bf85173a80b8
diff --git a/metadata/md5-cache/app-admin/lsat-0.9.7.1-r2 b/metadata/md5-cache/app-admin/lsat-0.9.7.1-r2
deleted file mode 100644
index 3b0ddbfe3db6..000000000000
--- a/metadata/md5-cache/app-admin/lsat-0.9.7.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=The Linux Security Auditing Tool
-EAPI=6
-HOMEPAGE=http://usat.sourceforge.net/
-IUSE=minimal
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl !minimal? ( app-portage/portage-utils net-analyzer/nmap sys-apps/iproute2 sys-apps/which sys-process/lsof )
-SLOT=0
-SRC_URI=http://usat.sourceforge.net/code/lsat-0.9.7.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd8f1f12b4b158ace29c3421277318a2
diff --git a/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1 b/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1
index dc74f528d47f..873a0fa0e903 100644
--- a/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1
+++ b/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst setup
 DEPEND=!<dev-db/mongodb-3.0.0[mms-agent]
 DESCRIPTION=MongoDB MMS agents
 EAPI=5
-HOMEPAGE=http://mms.mongodb.com
+HOMEPAGE=https://www.mongodb.com/cloud
 IUSE=+monitoring
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( monitoring )
 SLOT=0
 SRC_URI=monitoring? ( amd64? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-3.7.0.212-1.linux_x86_64.tar.gz ) x86? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-3.7.0.212-1.linux_i386.tar.gz ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c53d989341730befe78e7fd6f3824464
+_md5_=4bed47a6840a577347ec59c8c3a4cb9b
diff --git a/metadata/md5-cache/app-admin/mms-agent-6.0.0.381_p1 b/metadata/md5-cache/app-admin/mms-agent-6.0.0.381_p1
index 5212e2bba272..7e644b1f4501 100644
--- a/metadata/md5-cache/app-admin/mms-agent-6.0.0.381_p1
+++ b/metadata/md5-cache/app-admin/mms-agent-6.0.0.381_p1
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst setup
 DEPEND=!<dev-db/mongodb-3.0.0[mms-agent]
 DESCRIPTION=MongoDB MMS agents
 EAPI=6
-HOMEPAGE=http://cloud.mongodb.com
+HOMEPAGE=https://www.mongodb.com/cloud
 IUSE=+monitoring
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( monitoring )
 SLOT=0
 SRC_URI=monitoring? ( https://cloud.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-6.0.0.381-1.linux_x86_64.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24e8bca0de858aadbf5bb368e4989081
+_md5_=d19b9985de457958819f48864a01886d
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.12 b/metadata/md5-cache/app-admin/puppet-5.5.12
deleted file mode 100644
index 96bf81e766fa..000000000000
--- a/metadata/md5-cache/app-admin/puppet-5.5.12
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/rack[ruby_targets_ruby25] dev-ruby/rspec-its[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=https://puppet.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.5.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=eb41526e532862162df8702d1bda2cb0
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.14 b/metadata/md5-cache/app-admin/puppet-5.5.14
index 05c83bc4571c..ffb06cf4016f 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.14
+++ b/metadata/md5-cache/app-admin/puppet-5.5.14
@@ -4,7 +4,7 @@ DESCRIPTION=A system automation and configuration management software.
 EAPI=6
 HOMEPAGE=https://puppet.com/
 IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.5.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=00dfc1b03d52c57c739e835dc1b14f22
+_md5_=54f951f16fab588d81e0c5f250b1c416
diff --git a/metadata/md5-cache/app-admin/puppet-6.3.0 b/metadata/md5-cache/app-admin/puppet-6.3.0
deleted file mode 100644
index d09e218216ee..000000000000
--- a/metadata/md5-cache/app-admin/puppet-6.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/rack[ruby_targets_ruby25] dev-ruby/rspec-its[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=https://puppet.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=268a17261b9f7f6b351b809ee83e4aff
diff --git a/metadata/md5-cache/app-admin/puppet-6.4.2 b/metadata/md5-cache/app-admin/puppet-6.4.2
index b0e3d156f2d9..d629e2d3bf81 100644
--- a/metadata/md5-cache/app-admin/puppet-6.4.2
+++ b/metadata/md5-cache/app-admin/puppet-6.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=A system automation and configuration management software.
 EAPI=6
 HOMEPAGE=https://puppet.com/
 IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4e5230f206fcf1e1e66817ab80dd2e4e
+_md5_=70c623682cd5484a872eb381e70de3f8
diff --git a/metadata/md5-cache/app-admin/puppet-agent-5.5.14 b/metadata/md5-cache/app-admin/puppet-agent-5.5.14
index cc48a2e3ad1d..13a0bb166706 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-5.5.14
+++ b/metadata/md5-cache/app-admin/puppet-agent-5.5.14
@@ -4,11 +4,11 @@ DESCRIPTION=general puppet client utils along with mcollective hiera and facter
 EAPI=6
 HOMEPAGE=https://puppetlabs.com/
 IUSE=puppetdb selinux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.14-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.14-1stretch_i386.deb )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc791856ae2f0aa11b806e19711eeed9
+_md5_=a2369725e620c926c5185ccc66777bb9
diff --git a/metadata/md5-cache/app-admin/puppet-agent-5.5.7 b/metadata/md5-cache/app-admin/puppet-agent-5.5.7
deleted file mode 100644
index 7abbba62c8bf..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-5.5.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
-DESCRIPTION=general puppet client utils along with mcollective hiera and facter
-EAPI=6
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.7-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.7-1stretch_i386.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a516ddc08ef24db2db60cdc1d0a3821
diff --git a/metadata/md5-cache/app-admin/puppetdb-5.2.4 b/metadata/md5-cache/app-admin/puppetdb-5.2.4
deleted file mode 100644
index 2cebfbc6f635..000000000000
--- a/metadata/md5-cache/app-admin/puppetdb-5.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=PuppetDB collects data generated by Puppet.
-EAPI=6
-HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.7.0
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-5.2.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=09671bf19447d8e42efb550690c1a103
diff --git a/metadata/md5-cache/app-admin/puppetdb-5.2.7 b/metadata/md5-cache/app-admin/puppetdb-5.2.7
index 5f0e4a78c7b5..4d70c1d23a77 100644
--- a/metadata/md5-cache/app-admin/puppetdb-5.2.7
+++ b/metadata/md5-cache/app-admin/puppetdb-5.2.7
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=PuppetDB collects data generated by Puppet.
 EAPI=6
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.7.0
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-5.2.7.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=af8f0c009959a18f00386ca3f37e45d9
+_md5_=e6170f30230b5c7e659d4ffbadbf9a79
diff --git a/metadata/md5-cache/app-admin/puppetserver-5.3.5-r1 b/metadata/md5-cache/app-admin/puppetserver-5.3.5-r1
deleted file mode 100644
index 5b3b4ae5714f..000000000000
--- a/metadata/md5-cache/app-admin/puppetserver-5.3.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
-EAPI=6
-HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
-IUSE=puppetdb
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-5.3.5.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=0cd39c3a80f3b952786fc85dedcc25ba
diff --git a/metadata/md5-cache/app-admin/puppetserver-5.3.8 b/metadata/md5-cache/app-admin/puppetserver-5.3.8
index 6c867b7066df..cc9a84a1a11d 100644
--- a/metadata/md5-cache/app-admin/puppetserver-5.3.8
+++ b/metadata/md5-cache/app-admin/puppetserver-5.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
 EAPI=6
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 IUSE=puppetdb
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-5.3.8.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=0cc1c49cf295197c1a36539119c5151e
+_md5_=f541c1b97dd8a3fa55619dd1e3939b91
diff --git a/metadata/md5-cache/app-admin/r10k-1.5.1-r2 b/metadata/md5-cache/app-admin/r10k-1.5.1-r2
deleted file mode 100644
index 14944950a1e0..000000000000
--- a/metadata/md5-cache/app-admin/r10k-1.5.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] =dev-ruby/cri-2.7*[ruby_targets_ruby24] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby24] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby24] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby24] >=dev-ruby/multi_json-1.10[ruby_targets_ruby24] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby24] >=dev-ruby/json-1.8:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/colored-1.2[ruby_targets_ruby25] =dev-ruby/cri-2.7*[ruby_targets_ruby25] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby25] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby25] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby25] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby25] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby25] >=dev-ruby/multi_json-1.10[ruby_targets_ruby25] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby25] >=dev-ruby/json-1.8:0[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Puppet environment and module deployment
-EAPI=5
-HOMEPAGE=https://github.com/puppetlabs/r10k
-IUSE=+git test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] =dev-ruby/cri-2.7*[ruby_targets_ruby24] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby24] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby24] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby24] >=dev-ruby/multi_json-1.10[ruby_targets_ruby24] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby24] >=dev-ruby/json-1.8:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/colored-1.2[ruby_targets_ruby25] =dev-ruby/cri-2.7*[ruby_targets_ruby25] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby25] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby25] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby25] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby25] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby25] >=dev-ruby/multi_json-1.10[ruby_targets_ruby25] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby25] >=dev-ruby/json-1.8:0[ruby_targets_ruby25] ) git? ( >=dev-vcs/git-1.6.6 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/r10k-1.5.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0006f5afdf66b90f2a7cfb1e25f6a8e2
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r4 b/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r4
new file mode 100644
index 000000000000..a8d0175dab88
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r4
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install setup
+DESCRIPTION=Reliability, Availability and Serviceability logging tool
+EAPI=7
+HOMEPAGE=http://www.infradead.org/~mchehab/rasdaemon/
+IUSE=sqlite kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/gettext sys-apps/dmidecode sqlite? ( dev-db/sqlite dev-perl/DBD-SQLite )
+SLOT=0
+SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.2.tar.bz2
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=44563c39190f060edc82ef0728055e0a
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.1905.0 b/metadata/md5-cache/app-admin/rsyslog-8.1905.0
new file mode 100644
index 000000000000..6abd950d59d1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.1905.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=6
+HOMEPAGE=https://www.rsyslog.com/
+IUSE=curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 )
+REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.1905.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.1905.0.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cb9e061645b1fce76c8b21de01f8c77d
diff --git a/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.42 b/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.42
new file mode 100644
index 000000000000..92a0a1bb68ee
--- /dev/null
+++ b/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.42
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Spectre & Meltdown vulnerability/mitigation checker for Linux
+EAPI=7
+HOMEPAGE=https://github.com/speed47/spectre-meltdown-checker
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://github.com/speed47/spectre-meltdown-checker/archive/v0.42.tar.gz -> spectre-meltdown-checker-0.42.tar.gz
+_md5_=cf5ff61034978a9fb91073d0db5ae894
diff --git a/metadata/md5-cache/app-admin/supervisor-4.0.1 b/metadata/md5-cache/app-admin/supervisor-4.0.1
deleted file mode 100644
index 75bf720eef8c..000000000000
--- a/metadata/md5-cache/app-admin/supervisor-4.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/meld3-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DESCRIPTION=A system for controlling process state under UNIX
-EAPI=7
-HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze ZPL BSD HPND GPL-2
-RDEPEND=>=dev-python/meld3-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/supervisor/supervisor-4.0.1.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=4f02931b0e2c2d191bc73c803d7398da
diff --git a/metadata/md5-cache/app-admin/supervisor-4.0.3 b/metadata/md5-cache/app-admin/supervisor-4.0.3
new file mode 100644
index 000000000000..eb4c596d7f71
--- /dev/null
+++ b/metadata/md5-cache/app-admin/supervisor-4.0.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/meld3-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DESCRIPTION=A system for controlling process state under UNIX
+EAPI=7
+HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=repoze ZPL BSD HPND GPL-2
+RDEPEND=>=dev-python/meld3-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/s/supervisor/supervisor-4.0.3.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=4f02931b0e2c2d191bc73c803d7398da
diff --git a/metadata/md5-cache/app-admin/sysstat-12.0.3 b/metadata/md5-cache/app-admin/sysstat-12.0.3
deleted file mode 100644
index c0d35034098c..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-12.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-12.0.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2a91aa2b43d2cd388b95e1ff2e0b3f4d
diff --git a/metadata/md5-cache/app-admin/sysstat-12.0.5 b/metadata/md5-cache/app-admin/sysstat-12.0.5
new file mode 100644
index 000000000000..c131cd37edf0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-12.0.5
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( sys-devel/gettext )
+DESCRIPTION=System performance tools for Linux
+EAPI=7
+HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
+IUSE=debug nls lm_sensors selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) selinux? ( sec-policy/selinux-sysstat )
+SLOT=0
+SRC_URI=https://github.com/sysstat/sysstat/archive/v12.0.5.tar.gz -> sysstat-12.0.5.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=33040006f9effb6a99402be1b8f53222
diff --git a/metadata/md5-cache/app-admin/sysstat-12.1.3 b/metadata/md5-cache/app-admin/sysstat-12.1.3
deleted file mode 100644
index 89f21247a62b..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-12.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-12.1.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2a91aa2b43d2cd388b95e1ff2e0b3f4d
diff --git a/metadata/md5-cache/app-admin/sysstat-12.1.5 b/metadata/md5-cache/app-admin/sysstat-12.1.5
new file mode 100644
index 000000000000..218f787dd466
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-12.1.5
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( sys-devel/gettext )
+DESCRIPTION=System performance tools for Linux
+EAPI=7
+HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
+IUSE=debug nls lm_sensors selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) selinux? ( sec-policy/selinux-sysstat )
+SLOT=0
+SRC_URI=https://github.com/sysstat/sysstat/archive/v12.1.5.tar.gz -> sysstat-12.1.5.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=6d75d61b8ac32709aca135ff7c5ed3a9
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.5.11-r2 b/metadata/md5-cache/app-admin/system-config-printer-1.5.11-r2
new file mode 100644
index 000000000000..f2eb874d1394
--- /dev/null
+++ b/metadata/md5-cache/app-admin/system-config-printer-1.5.11-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] app-text/docbook-xml-dtd:4.1.2 >=app-text/xmlto-0.0.22 dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-python/epydoc ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Graphical user interface for CUPS administration
+EAPI=6
+HOMEPAGE=https://github.com/zdohnal/system-config-printer
+IUSE=doc gnome-keyring policykit python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] dev-python/dbus-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycups[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/urllib3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zdohnal/system-config-printer/releases/download/1.5.11/system-config-printer-1.5.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/system-config-printer-1.5.11-patchset-01.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=cdbbb08f7e547de67af742bc859e6e5b
diff --git a/metadata/md5-cache/app-admin/systemrescuecd-x86-6.0.0 b/metadata/md5-cache/app-admin/systemrescuecd-x86-6.0.0
deleted file mode 100644
index d7b6a963abfb..000000000000
--- a/metadata/md5-cache/app-admin/systemrescuecd-x86-6.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm pretend
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, amd64 variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.0 Apache-2.0 Artistic Artistic-2 BEER-WARE BSD BSD-2 BSD-4 CC0-1.0 CC-BY-SA-3.0 FDL-1.3+ GPL-2 GPL-2+ GPL-3+ icu ISC JasPer2.0 LGPL-2+ LGPL-2.1+ LGPL-3+ linux-firmware MaxMind2 MIT MPL-1.1 MPL-2.0 no-source-code OFL Old-MIT OPENLDAP openssl PSF-2 public-domain Sleepycat unRAR UoI-NCSA vim ZLIB
-RESTRICT=bindist mirror
-SLOT=6.0.0
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/6.0.0/systemrescuecd-6.0.0.iso
-_md5_=0a42209bd423fb854e01b9285964ca46
diff --git a/metadata/md5-cache/app-admin/vault-1.1.2 b/metadata/md5-cache/app-admin/vault-1.1.2
new file mode 100644
index 000000000000..c30759e2d460
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-1.1.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=>=dev-lang/go-1.11:= dev-go/gox filecaps? ( sys-libs/libcap )
+DESCRIPTION=A tool for managing secrets
+EAPI=7
+HOMEPAGE=https://vaultproject.io/
+IUSE=+webui +filecaps
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vault/archive/v1.1.2.tar.gz -> vault-1.1.2.tar.gz webui? ( mirror://gentoo/vault-1.1.2-webui.tar.xz https://dev.gentoo.org/~zmedico/dist/vault-1.1.2-webui.tar.xz )
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=87a70111df03c885d375c719b20624a8
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 57e3f1a2ec8e..811a2870b559 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/clamtk-6.01 b/metadata/md5-cache/app-antivirus/clamtk-6.01
new file mode 100644
index 000000000000..c261b82fb4e8
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamtk-6.01
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm setup unpack
+DESCRIPTION=A graphical front-end for ClamAV
+EAPI=6
+HOMEPAGE=https://dave-theunsub.github.io/clamtk/
+IUSE=kde nautilus nemo +nls thunar python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=app-antivirus/clamav dev-perl/File-chdir dev-perl/Gtk3 dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/LWP-UserAgent-Cached dev-perl/Locale-gettext dev-perl/Text-CSV dev-perl/glib-perl dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 virtual/perl-Time-Piece x11-themes/faenza-icon-theme nautilus? ( dev-python/nautilus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=nautilus? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-6.01.tar.xz kde? ( https://bitbucket.org/davem_/clamtk-kde/downloads/clamtk-kde-0.18.tar.xz ) nautilus? ( https://bitbucket.org/davem_/clamtk-gnome/downloads/clamtk-gnome-0.03.tar.xz ) nemo? ( https://bitbucket.org/davem_/nemo-sendto-clamtk/downloads/nemo-sendto-clamtk-0.04.tar.xz ) thunar? ( https://bitbucket.org/davem_/thunar-sendto-clamtk/downloads/thunar-sendto-clamtk-0.06.tar.xz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	f2e3420aed32cf1abe33b4129b842636	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=158cc067d6fe59c6fcf7b76a126d2dba
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 388e5a775deb..95fa9bc0f2fc 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/engrampa-1.22.1 b/metadata/md5-cache/app-arch/engrampa-1.22.1
deleted file mode 100644
index eb1c8c878ed4..000000000000
--- a/metadata/md5-cache/app-arch/engrampa-1.22.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools dev-util/glib-utils >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.22
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja magic packagekit
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.22/engrampa-1.22.1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=894fde80c4d5b5528bf00d1adc2928e2
diff --git a/metadata/md5-cache/app-arch/engrampa-1.22.1-r1 b/metadata/md5-cache/app-arch/engrampa-1.22.1-r1
new file mode 100644
index 000000000000..74b02ebb5b2f
--- /dev/null
+++ b/metadata/md5-cache/app-arch/engrampa-1.22.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools dev-util/glib-utils >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.22
+DESCRIPTION=Engrampa archive manager for MATE
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=caja magic packagekit
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.22/engrampa-1.22.1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=10d3aca03c57a9ee28485aebf4d13c19
diff --git a/metadata/md5-cache/app-arch/file-roller-3.30.1 b/metadata/md5-cache/app-arch/file-roller-3.30.1
index ee652b88da18..448e15eb6196 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.30.1
+++ b/metadata/md5-cache/app-arch/file-roller-3.30.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-2.22.2 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.30/file-roller-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=e425a72d8c4d36e278c71da21a1b4861
diff --git a/metadata/md5-cache/app-arch/gcab-1.2 b/metadata/md5-cache/app-arch/gcab-1.2
index ad765827addc..6e7141a1963e 100644
--- a/metadata/md5-cache/app-arch/gcab-1.2
+++ b/metadata/md5-cache/app-arch/gcab-1.2
@@ -4,12 +4,12 @@ DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/msitools
 IUSE=gtk-doc +introspection test vala
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcab/1.2/gcab-1.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=91560556706d1962768efa51f3077c97
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=788872f10de6346c774403ea175ddb5e
diff --git a/metadata/md5-cache/app-arch/gnome-autoar-0.2.3 b/metadata/md5-cache/app-arch/gnome-autoar-0.2.3
index 568002b6a4cf..07fd428ca81d 100644
--- a/metadata/md5-cache/app-arch/gnome-autoar-0.2.3
+++ b/metadata/md5-cache/app-arch/gnome-autoar-0.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=Automatic archives creating and extracting library
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-autoar
 IUSE=gtk +introspection vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=app-arch/libarchive-3.2.0 >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3bdf7ad86e6a18c5527f9483f9857514
+_md5_=d49c65bf591f0e2c30fd1bf4748aa6b9
diff --git a/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227 b/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227
new file mode 100644
index 000000000000..7519fa9755f1
--- /dev/null
+++ b/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Parallel bzip2 utility
+EAPI=7
+HOMEPAGE=https://github.com/kjn/lbzip2/
+IUSE=debug symlink
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~whissi/dist/lbzip2/lbzip2-2.5_p20181227.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=450b6a74d22b425b81345a79e63030ce
diff --git a/metadata/md5-cache/app-arch/libarchive-3.3.3 b/metadata/md5-cache/app-arch/libarchive-3.3.3
index 05a5947ab61f..8b69a1d7a640 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.3.3
+++ b/metadata/md5-cache/app-arch/libarchive-3.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=Multi-format archive and compression library
 EAPI=7
 HOMEPAGE=https://www.libarchive.org/
 IUSE=acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0/13
 SRC_URI=https://www.libarchive.org/downloads/libarchive-3.3.3.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=92366ae66ae2b4d44b1fbef6f1c20565
+_md5_=c425a9bfd12656889883567b9df5d847
diff --git a/metadata/md5-cache/app-arch/p7zip-16.02-r4 b/metadata/md5-cache/app-arch/p7zip-16.02-r4
index 2ca760976ec2..cd107bd23987 100644
--- a/metadata/md5-cache/app-arch/p7zip-16.02-r4
+++ b/metadata/md5-cache/app-arch/p7zip-16.02-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Port of 7-Zip archiver for Unix
 EAPI=6
 HOMEPAGE=http://p7zip.sourceforge.net/
 IUSE=abi_x86_x32 doc kde +pch rar static wxwidgets
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=LGPL-2.1 rar? ( unRAR )
 RDEPEND=wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 REQUIRED_USE=kde? ( wxwidgets )
 SLOT=0
 SRC_URI=mirror://sourceforge/p7zip/p7zip_16.02_src_all.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=714d02f278abf8f917b5cc1287b74061
+_md5_=1360d34f9deeba2a93bb5204146455c0
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 065b008cfad3..6112d0dd5c4a 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/bacula-9.4.4 b/metadata/md5-cache/app-backup/bacula-9.4.4
new file mode 100644
index 000000000000..b6c41167cd33
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bacula-9.4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=6
+HOMEPAGE=https://www.bacula.org/
+IUSE=acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !bacula-clientonly? ( !bacula-nosd? ( app-arch/mt-st sys-block/mtx ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
+SLOT=0
+SRC_URI=mirror://sourceforge/bacula/bacula-9.4.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=86d1f34952fc187ddb167671b7489ab0
diff --git a/metadata/md5-cache/app-backup/btrbk-0.28.2 b/metadata/md5-cache/app-backup/btrbk-0.28.2
new file mode 100644
index 000000000000..930d4f3cc394
--- /dev/null
+++ b/metadata/md5-cache/app-backup/btrbk-0.28.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst
+DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
+DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
+EAPI=7
+HOMEPAGE=https://digint.ch/btrbk/
+IUSE=+pv +doc
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-4.12
+SLOT=0
+SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.28.2.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=69ab5cbad2be22ffda0235aa9a27affa
diff --git a/metadata/md5-cache/app-backup/consul-backinator-1.6.5 b/metadata/md5-cache/app-backup/consul-backinator-1.6.5
new file mode 100644
index 000000000000..cb8ed990b769
--- /dev/null
+++ b/metadata/md5-cache/app-backup/consul-backinator-1.6.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-lang/go:=
+DESCRIPTION=consul backup and restore utility
+EAPI=7
+HOMEPAGE=https://github.com/myENA/consul-backinator
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/myENA/consul-backinator/archive/v1.6.5.tar.gz -> consul-backinator-1.6.5.tar.gz https://dev.gentoo.org/~williamh/dist/consul-backinator-1.6.5-vendor.tar.gz
+_md5_=3434fe67ca1efe25f180af78c0ec4c9e
diff --git a/metadata/md5-cache/app-backup/dar-2.6.1 b/metadata/md5-cache/app-backup/dar-2.6.1
deleted file mode 100644
index 35f00948d2c6..000000000000
--- a/metadata/md5-cache/app-backup/dar-2.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] curl? ( net-misc/curl[static-libs] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
-DESCRIPTION=A full featured backup tool, aimed for disks
-EAPI=7
-HOMEPAGE=http://dar.linux.free.fr/
-IUSE=curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
-REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/dar/dar-2.6.1.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=529b9c141d73c54d1ffa1995cb5e0734
diff --git a/metadata/md5-cache/app-backup/dar-2.6.2 b/metadata/md5-cache/app-backup/dar-2.6.2
deleted file mode 100644
index de49e3e71118..000000000000
--- a/metadata/md5-cache/app-backup/dar-2.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] curl? ( net-misc/curl[static-libs] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
-DESCRIPTION=A full featured backup tool, aimed for disks
-EAPI=7
-HOMEPAGE=http://dar.linux.free.fr/
-IUSE=curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
-REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/dar/dar-2.6.2.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=529b9c141d73c54d1ffa1995cb5e0734
diff --git a/metadata/md5-cache/app-backup/dar-2.6.3 b/metadata/md5-cache/app-backup/dar-2.6.3
new file mode 100644
index 000000000000..be043b52b1aa
--- /dev/null
+++ b/metadata/md5-cache/app-backup/dar-2.6.3
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install
+DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] curl? ( net-misc/curl[static-libs] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
+DESCRIPTION=A full featured backup tool, aimed for disks
+EAPI=7
+HOMEPAGE=http://dar.linux.free.fr/
+IUSE=curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
+REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/dar/dar-2.6.3.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9b9512e0b31350030ade5d097a43eb2d
diff --git a/metadata/md5-cache/app-backup/dar-2.6.4 b/metadata/md5-cache/app-backup/dar-2.6.4
new file mode 100644
index 000000000000..de337270219f
--- /dev/null
+++ b/metadata/md5-cache/app-backup/dar-2.6.4
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install
+DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] curl? ( net-misc/curl[static-libs] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
+DESCRIPTION=A full featured backup tool, aimed for disks
+EAPI=7
+HOMEPAGE=http://dar.linux.free.fr/
+IUSE=curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
+REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/dar/dar-2.6.4.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9b9512e0b31350030ade5d097a43eb2d
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index e6f524bc846e..a0d8d5b6ad51 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/bonnie++-1.98 b/metadata/md5-cache/app-benchmarks/bonnie++-1.98
new file mode 100644
index 000000000000..40584c854c1e
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/bonnie++-1.98
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Hard drive bottleneck testing benchmark suite
+EAPI=7
+HOMEPAGE=https://www.coker.com.au/bonnie++/
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.coker.com.au/bonnie++/bonnie++-1.98.tgz
+_md5_=548e18866c7db750303d888c914a6e66
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index fb8a6ddfb78a..9ca2c12983bf 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.34.2 b/metadata/md5-cache/app-crypt/acme-0.34.2
index e05a8e3b7b3b..de56f4fdab8f 100644
--- a/metadata/md5-cache/app-crypt/acme-0.34.2
+++ b/metadata/md5-cache/app-crypt/acme-0.34.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.34.2.tar.gz -> certbot-0.34.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0a478dfd1a533e59ae54da7cefa203e2
+_md5_=dcbc291fa704e48b6562dd08347cf22e
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index 280a8635f322..8eabb596f543 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=dcfd7044805ceca0badda663d4ba4294
+_md5_=b6c4dd4d981e09d5f383f348e46c63fa
diff --git a/metadata/md5-cache/app-crypt/bestcrypt-2.0.14 b/metadata/md5-cache/app-crypt/bestcrypt-2.0.14
deleted file mode 100644
index e75ee2409af9..000000000000
--- a/metadata/md5-cache/app-crypt/bestcrypt-2.0.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=virtual/linux-sources app-shells/bash kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=commercially licensed transparent filesystem encryption
-EAPI=7
-HOMEPAGE=https://www.jetico.com/
-IUSE=kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=bestcrypt
-RDEPEND=kernel_linux? ( virtual/modutils )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://www.jetico.com/linux/BestCrypt-2.0.14.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c58694ff9c24082e4edc431f148e5830
diff --git a/metadata/md5-cache/app-crypt/gcr-3.28.1 b/metadata/md5-cache/app-crypt/gcr-3.28.1
index ad6d7d1a1829..a7ab111c842f 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.28.1
+++ b/metadata/md5-cache/app-crypt/gcr-3.28.1
@@ -4,11 +4,11 @@ DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gcr
 IUSE=debug gtk +introspection +vala test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) !<gnome-base/gnome-keyring-3.3
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.28/gcr-3.28.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4cf164ee558c7df7c716d74253e69c15
+_md5_=feb3d22d8a125c86a5edd8e17be77a14
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.6.0 b/metadata/md5-cache/app-crypt/heimdal-7.6.0
index 29f79a186d00..47d662c82671 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.6.0
+++ b/metadata/md5-cache/app-crypt/heimdal-7.6.0
@@ -5,10 +5,10 @@ DESCRIPTION=Kerberos 5 implementation from KTH
 EAPI=7
 HOMEPAGE=http://www.h5l.org/
 IUSE=afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp +pkinit selinux ssl static-libs test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.6.0/heimdal-7.6.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=aa519ec607665ac01d58bb0d45562a6a
+_md5_=2f42a9b14f54aae87461ea9b55f2eeb7
diff --git a/metadata/md5-cache/app-crypt/jetring-0.25 b/metadata/md5-cache/app-crypt/jetring-0.25
index 29a3f1569bff..e6e44063588e 100644
--- a/metadata/md5-cache/app-crypt/jetring-0.25
+++ b/metadata/md5-cache/app-crypt/jetring-0.25
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=compile install prepare
 DEPEND=app-crypt/gnupg
 DESCRIPTION=GPG keyring maintenance using changesets
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=app-crypt/gnupg dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/j/jetring/jetring_0.25.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b44891adeda657cf64ec8895c97f9d2d
+_md5_=9069b77a055ff6cea97bbfdccd5ddb0a
diff --git a/metadata/md5-cache/app-crypt/jetring-0.27 b/metadata/md5-cache/app-crypt/jetring-0.27
new file mode 100644
index 000000000000..8c389df48b12
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/jetring-0.27
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-crypt/gnupg
+DESCRIPTION=GPG keyring maintenance using changesets
+EAPI=7
+HOMEPAGE=http://joeyh.name/code/jetring/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-crypt/gnupg dev-lang/perl
+SLOT=0
+SRC_URI=mirror://debian/pool/main/j/jetring/jetring_0.27.tar.xz
+_md5_=e86ebe617105979acd30d7ad8482f3f1
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.8 b/metadata/md5-cache/app-crypt/libsecret-0.18.8
index 326d7c65e8d9..b93d4578f80c 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.8
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.8
@@ -4,7 +4,7 @@ DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
 IUSE=+crypt +introspection test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2.1+ Apache-2.0
 PDEPEND=>=gnome-base/gnome-keyring-3
 RDEPEND=>=dev-libs/glib-2.44:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
@@ -12,4 +12,4 @@ REQUIRED_USE=test? ( introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.8.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c34b887d88a5758ee4233ff1cb46ec21
+_md5_=6406398ad149ec8fa978c23ad6c121da
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.2.2-r2 b/metadata/md5-cache/app-crypt/nitrocli-0.2.2-r2
deleted file mode 100644
index 83fd0681743d..000000000000
--- a/metadata/md5-cache/app-crypt/nitrocli-0.2.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/rust-1.31.0 virtual/cargo
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-libs/hidapi
-DESCRIPTION=A command line application for interacting with Nitrokey devices
-EAPI=7
-HOMEPAGE=https://github.com/d-e-s-o/nitrocli
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=dev-libs/hidapi app-crypt/gnupg
-RESTRICT=test
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cc/1.0.28/download -> cc-1.0.28.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.45/download -> libc-0.2.45.crate https://crates.io/api/v1/crates/libc/0.2.45/download -> libc-0.2.45.crate https://crates.io/api/v1/crates/memchr/2.1.2/download -> memchr-2.1.2.crate https://crates.io/api/v1/crates/nitrocli/0.2.2/download -> nitrocli-0.2.2.crate https://crates.io/api/v1/crates/nitrokey/0.3.1/download -> nitrokey-0.3.1.crate https://crates.io/api/v1/crates/nitrokey-sys/3.4.1/download -> nitrokey-sys-3.4.1.crate https://crates.io/api/v1/crates/nitrokey-test/0.1.1/download -> nitrokey-test-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/0.4.24/download -> proc-macro2-0.4.24.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand/0.6.1/download -> rand-0.6.1.crate https://crates.io/api/v1/crates/rand/0.6.1/download -> rand-0.6.1.crate https://crates.io/api/v1/crates/rand_chacha/0.1.0/download -> rand_chacha-0.1.0.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.0/download -> rand_isaac-0.1.0.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.0/download -> rand_xorshift-0.1.0.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.4/download -> regex-syntax-0.6.4.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.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/syn/0.15.23/download -> syn-0.15.23.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=05dd66e0143c88791171346f648222ec
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1 b/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1
index 9395dff78be4..ce73b3680297 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1
@@ -1,15 +1,15 @@
 BDEPEND=>=virtual/rust-1.31.0 virtual/cargo
-DEFINED_PHASES=compile install test unpack
+DEFINED_PHASES=compile install prepare test unpack
 DEPEND=dev-libs/hidapi
 DESCRIPTION=A command line application for interacting with Nitrokey devices
 EAPI=7
 HOMEPAGE=https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cc/1.0.28/download -> cc-1.0.28.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.47/download -> libc-0.2.47.crate https://crates.io/api/v1/crates/memchr/2.1.2/download -> memchr-2.1.2.crate https://crates.io/api/v1/crates/nitrocli/0.2.3/download -> nitrocli-0.2.3.crate https://crates.io/api/v1/crates/nitrokey/0.3.4/download -> nitrokey-0.3.4.crate https://crates.io/api/v1/crates/nitrokey-sys/3.4.3/download -> nitrokey-sys-3.4.3.crate https://crates.io/api/v1/crates/nitrokey-test/0.1.1/download -> nitrokey-test-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/0.4.24/download -> proc-macro2-0.4.24.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_os/0.1.1/download -> rand_os-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.4/download -> regex-syntax-0.6.4.crate https://crates.io/api/v1/crates/syn/0.15.23/download -> syn-0.15.23.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=eeecc006db86cc33f0cf1013e9485939
+_md5_=4488b532e30a242bafb1b42731c3697d
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.2.4 b/metadata/md5-cache/app-crypt/nitrocli-0.2.4
new file mode 100644
index 000000000000..7ff65e9a8e97
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.2.4
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.31.0 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-libs/hidapi
+DESCRIPTION=A command line application for interacting with Nitrokey devices
+EAPI=7
+HOMEPAGE=https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/hidapi app-crypt/gnupg
+RESTRICT=test
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cc/1.0.37/download -> cc-1.0.37.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.57/download -> libc-0.2.57.crate https://crates.io/api/v1/crates/memchr/2.1.3/download -> memchr-2.1.3.crate https://crates.io/api/v1/crates/nitrocli/0.2.4/download -> nitrocli-0.2.4.crate https://crates.io/api/v1/crates/nitrokey/0.3.4/download -> nitrokey-0.3.4.crate https://crates.io/api/v1/crates/nitrokey-sys/3.4.3/download -> nitrokey-sys-3.4.3.crate https://crates.io/api/v1/crates/nitrokey-test/0.1.1/download -> nitrokey-test-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/0.4.26/download -> proc-macro2-0.4.26.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.0/download -> rand_core-0.4.0.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.5/download -> regex-syntax-0.6.5.crate https://crates.io/api/v1/crates/syn/0.15.26/download -> syn-0.15.26.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=b08bfdf44737433d301b9370dfd933ef
diff --git a/metadata/md5-cache/app-crypt/osslsigncode-1.7.1 b/metadata/md5-cache/app-crypt/osslsigncode-1.7.1
index a47aacbe39b4..2a556c0f624b 100644
--- a/metadata/md5-cache/app-crypt/osslsigncode-1.7.1
+++ b/metadata/md5-cache/app-crypt/osslsigncode-1.7.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) curl? ( net-misc/curl ) virtual/pkgconfig
+DEPEND=curl? ( net-misc/curl ) !libressl? ( =dev-libs/openssl-1.0*:0= ) libressl? ( dev-libs/libressl:0= )
 DESCRIPTION=Platform-independent tool for Authenticode signing of EXE/CAB files
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/osslsigncode
 IUSE=curl libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) curl? ( net-misc/curl )
+RDEPEND=curl? ( net-misc/curl ) !libressl? ( =dev-libs/openssl-1.0*:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/osslsigncode/osslsigncode-1.7.1.tar.gz
-_md5_=872ac36e22c62623ec904a4a378e0b34
+_md5_=75067deddbd4156cbc8d64dc525aa5b3
diff --git a/metadata/md5-cache/app-crypt/qca-2.2.0 b/metadata/md5-cache/app-crypt/qca-2.2.0
index 29364bab83db..620829e4a78e 100644
--- a/metadata/md5-cache/app-crypt/qca-2.2.0
+++ b/metadata/md5-cache/app-crypt/qca-2.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Qt Cryptographic Architecture (QCA)
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/QCA
 IUSE=botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.2.0/qca-2.2.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5fb987a86eb87ed8f2310d451a98c862
+_md5_=1bdbbbc4d17c4642111bd61c72e6d3b6
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.30.1.1 b/metadata/md5-cache/app-crypt/seahorse-3.30.1.1
index 523a14184128..6fb25ef4c8c3 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.30.1.1
+++ b/metadata/md5-cache/app-crypt/seahorse-3.30.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=app-crypt/gcr-3.11.91:= >=app-crypt/gpgme-1.7.0 >=x11-libs/gtk+-3.22.0:3 >=app-crypt/gnupg-2.0.12 >=app-crypt/libsecret-0.16 net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.30/seahorse-3.30.1.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b2663cdf515231f4bb1d340545d858d7
diff --git a/metadata/md5-cache/app-crypt/signing-party-2.7 b/metadata/md5-cache/app-crypt/signing-party-2.7
deleted file mode 100644
index 59fad2248e46..000000000000
--- a/metadata/md5-cache/app-crypt/signing-party-2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl app-crypt/libmd
-DESCRIPTION=A collection of several tools related to OpenPGP
-EAPI=7
-HOMEPAGE=https://salsa.debian.org/signing-party-team/signing-party
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl app-crypt/libmd >=app-crypt/gnupg-1.3.92 dev-perl/GnuPG-Interface dev-perl/Text-Template dev-perl/MIME-tools net-mail/qprint >=dev-perl/MailTools-1.62 dev-perl/Net-IDN-Encode virtual/mailx virtual/mta || ( dev-perl/libintl-perl dev-perl/Text-Iconv app-text/recode )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_2.7.orig.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=197a5d6f34803ec0d4cad8e7004ee01d
diff --git a/metadata/md5-cache/app-crypt/signing-party-2.9 b/metadata/md5-cache/app-crypt/signing-party-2.9
index de7168e15127..86db367a88e7 100644
--- a/metadata/md5-cache/app-crypt/signing-party-2.9
+++ b/metadata/md5-cache/app-crypt/signing-party-2.9
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl app-crypt/libmd
 DESCRIPTION=A collection of several tools related to OpenPGP
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/signing-party-team/signing-party
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl app-crypt/libmd >=app-crypt/gnupg-1.3.92 dev-perl/GnuPG-Interface dev-perl/Text-Template dev-perl/MIME-tools net-mail/qprint >=dev-perl/MailTools-1.62 dev-perl/Net-IDN-Encode virtual/mailx virtual/mta || ( dev-perl/libintl-perl dev-perl/Text-Iconv app-text/recode )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_2.9.orig.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0904682e8b929d303908e7c78f663293
+_md5_=8d4bddee8001bedc159ffa7d1ab18bb6
diff --git a/metadata/md5-cache/app-crypt/stoken-0.92 b/metadata/md5-cache/app-crypt/stoken-0.92
index 8b6b87479841..8b3550e07456 100644
--- a/metadata/md5-cache/app-crypt/stoken-0.92
+++ b/metadata/md5-cache/app-crypt/stoken-0.92
@@ -4,10 +4,10 @@ DESCRIPTION=Software Token for Linux/UNIX
 EAPI=6
 HOMEPAGE=https://github.com/cernekee/stoken
 IUSE=gtk
-KEYWORDS=amd64 arm ~arm64 ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/nettle gtk? ( >=x11-libs/gtk+-3.12:3 )
 SLOT=0
 SRC_URI=https://github.com/cernekee/stoken/archive/v0.92.tar.gz -> stoken-0.92.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=42fb07b0626cc7e2fdfc0487bd47870b
+_md5_=5669af1a1c0e1beab38d61c9a34ce365
diff --git a/metadata/md5-cache/app-crypt/tpm2-abrmd-2.0.3 b/metadata/md5-cache/app-crypt/tpm2-abrmd-2.0.3
deleted file mode 100644
index 57e54a5e0f6b..000000000000
--- a/metadata/md5-cache/app-crypt/tpm2-abrmd-2.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/gdbus-codegen >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-apps/dbus:= dev-libs/glib:= app-crypt/tpm2-tss:= test? ( dev-util/cmocka )
-DESCRIPTION=TPM2 Access Broker & Resource Manager
-EAPI=7
-HOMEPAGE=https://github.com/tpm2-software/tpm2-abrmd
-IUSE=static-libs test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=sys-apps/dbus:= dev-libs/glib:= app-crypt/tpm2-tss:=
-SLOT=0
-SRC_URI=https://github.com/tpm2-software/tpm2-abrmd/releases/download/2.0.3/tpm2-abrmd-2.0.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=1761a1e50b803a77001464a3304eb801
diff --git a/metadata/md5-cache/app-crypt/tpm2-abrmd-2.1.1 b/metadata/md5-cache/app-crypt/tpm2-abrmd-2.1.1
new file mode 100644
index 000000000000..9e452c2d3bec
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-abrmd-2.1.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/gdbus-codegen >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=sys-apps/dbus:= dev-libs/glib:= app-crypt/tpm2-tss:= test? ( dev-util/cmocka )
+DESCRIPTION=TPM2 Access Broker & Resource Manager
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-abrmd
+IUSE=static-libs test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=sys-apps/dbus:= dev-libs/glib:= app-crypt/tpm2-tss:=
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-abrmd/releases/download/2.1.1/tpm2-abrmd-2.1.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=5cbad9162c3dbec4259e06658a5f0bac
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-3.1.3 b/metadata/md5-cache/app-crypt/tpm2-tools-3.1.3
deleted file mode 100644
index ba3f84e9f1f2..000000000000
--- a/metadata/md5-cache/app-crypt/tpm2-tools-3.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure
-DEPEND=>=app-crypt/tpm2-tss-2.0 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) test? ( dev-util/cmocka )
-DESCRIPTION=Tools for the TPM 2.0 TSS
-EAPI=7
-HOMEPAGE=https://github.com/tpm2-software/tpm2-tools
-IUSE=libressl test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=app-crypt/tpm2-tss-2.0 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/3.1.3/tpm2-tools-3.1.3.tar.gz
-_md5_=136d4ab66c189cb65be3ce63773e87c0
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-3.1.4 b/metadata/md5-cache/app-crypt/tpm2-tools-3.1.4
new file mode 100644
index 000000000000..07bc67bb7ccf
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-tools-3.1.4
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=>=app-crypt/tpm2-tss-2.0:= net-misc/curl:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) test? ( dev-util/cmocka )
+DESCRIPTION=Tools for the TPM 2.0 TSS
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-tools
+IUSE=libressl test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=app-crypt/tpm2-tss-2.0:= net-misc/curl:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/3.1.4/tpm2-tools-3.1.4.tar.gz
+_md5_=20bec7eaf66b70c9ce9cf680a416d3a5
diff --git a/metadata/md5-cache/app-crypt/tpm2-totp-0.1.1 b/metadata/md5-cache/app-crypt/tpm2-totp-0.1.1
new file mode 100644
index 000000000000..457cde71eac2
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-totp-0.1.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-crypt/tpm2-tss-2.0:= media-gfx/qrencode:=
+DESCRIPTION=Attest the trustworthiness of a device against a human using time-based OTP
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-totp
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=app-crypt/tpm2-tss-2.0:= media-gfx/qrencode:=
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-totp/releases/download/v0.1.1/tpm2-totp-0.1.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=0ce8034f10a031cdc2f6de7e70395e57
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.1.0 b/metadata/md5-cache/app-crypt/tpm2-tss-2.1.0
deleted file mode 100644
index e30ad8402d69..000000000000
--- a/metadata/md5-cache/app-crypt/tpm2-tss-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig ~sys-devel/autoconf-archive-2018.03.13 doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=test? ( dev-util/cmocka )
-DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
-EAPI=7
-HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
-IUSE=doc +gcrypt openssl static-libs test kernel_linux
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=gcrypt? ( !openssl ) openssl? ( !gcrypt ) || ( gcrypt openssl )
-SLOT=0/0
-SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.1.0/tpm2-tss-2.1.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=9ae0dd86a2988854eeb635d75ffff3ad
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3 b/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3
new file mode 100644
index 000000000000..2e0c84b13a4b
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEFINED_PHASES=configure install setup
+DEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= ) test? ( dev-util/cmocka )
+DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
+IUSE=doc +gcrypt openssl static-libs test kernel_linux
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= )
+REQUIRED_USE=gcrypt? ( !openssl ) openssl? ( !gcrypt ) || ( gcrypt openssl )
+SLOT=0/0
+SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.2.3/tpm2-tss-2.2.3.tar.gz
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=e39bf6501bef9b17b71c15411ecb13fb
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.0.0 b/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.0.0
new file mode 100644
index 000000000000..1ca523b383bf
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.0.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=>=app-crypt/tpm2-tss-2.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) test? ( dev-util/cmocka )
+DESCRIPTION=OpenSSL Engine for TPM2 devices
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-tools
+IUSE=libressl test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=app-crypt/tpm2-tss-2.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-tss-engine/releases/download/v1.0.0/tpm2-tss-engine-1.0.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=88e25df5422183dda1169cd7588538bc
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 16d326948da1..3df6b885e2f8 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/gnome-dictionary-3.26.1 b/metadata/md5-cache/app-dicts/gnome-dictionary-3.26.1
index 155730fc560a..90d9104208d0 100644
--- a/metadata/md5-cache/app-dicts/gnome-dictionary-3.26.1
+++ b/metadata/md5-cache/app-dicts/gnome-dictionary-3.26.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.21.2:3 gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-dictionary/3.26/gnome-dictionary-3.26.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=515b0e9a07af181994b1312c3e5628f5
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 264afc9ce7d2..79d03b4c253e 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/eclass-manpages-20190602 b/metadata/md5-cache/app-doc/eclass-manpages-20190602
new file mode 100644
index 000000000000..51ff676b3621
--- /dev/null
+++ b/metadata/md5-cache/app-doc/eclass-manpages-20190602
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/xz-utils sys-apps/gawk
+DESCRIPTION=Collection of Gentoo eclass manpages
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/eclass-to-manpage
+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-20190602.tar.xz
+_md5_=5a77403096a229de874dfd18cb2ec520
diff --git a/metadata/md5-cache/app-doc/zeal-0.6.1 b/metadata/md5-cache/app-doc/zeal-0.6.1
new file mode 100644
index 000000000000..0fdd0c7f6c5a
--- /dev/null
+++ b/metadata/md5-cache/app-doc/zeal-0.6.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-arch/libarchive dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/extra-cmake-modules:5 >=x11-libs/xcb-util-keysyms-0.3.9
+DESCRIPTION=Offline documentation browser inspired by Dash
+EAPI=7
+HOMEPAGE=https://zealdocs.org/
+IUSE=vanilla
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-arch/libarchive dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/extra-cmake-modules:5 >=x11-libs/xcb-util-keysyms-0.3.9 x11-themes/hicolor-icon-theme
+SLOT=0
+SRC_URI=https://github.com/zealdocs/zeal/archive/v0.6.1.tar.gz -> zeal-0.6.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=66fe178aad1dabe59fac9910d3a48c6f
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index ca17b8ef168f..a191a3821608 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/beaver-0.4.1 b/metadata/md5-cache/app-editors/beaver-0.4.1
index 8fa78e1b5246..5a033948cab8 100644
--- a/metadata/md5-cache/app-editors/beaver-0.4.1
+++ b/metadata/md5-cache/app-editors/beaver-0.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 >=x11-libs/gtk+-2.10:2
 SLOT=0
 SRC_URI=mirror://sourceforge/beaver-editor/beaver-0.4.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7d5dada028f278c3678360117ec246c1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=cdb66f41f2223bff77c24e11bddd2fed
diff --git a/metadata/md5-cache/app-editors/gedit-3.32.0-r1 b/metadata/md5-cache/app-editors/gedit-3.32.0-r1
deleted file mode 100644
index 6dee7567eb61..000000000000
--- a/metadata/md5-cache/app-editors/gedit-3.32.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-libs/gtksourceview-4.0.2:4[introspection?] >=dev-libs/libpeas-1.14.1[gtk] >=net-libs/libsoup-2.60:2.4 gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3:3[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) >=app-text/gspell-0.2.5:0= app-text/docbook-xml-dtd:4.1.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1 ) dev-util/itstool >=sys-devel/gettext-0.18 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A text editor for the GNOME desktop
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
-IUSE=+introspection +python gtk-doc vala python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 test
-KEYWORDS=~amd64
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-libs/gtksourceview-4.0.2:4[introspection?] >=dev-libs/libpeas-1.14.1[gtk] >=net-libs/libsoup-2.60:2.4 gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3:3[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) >=app-text/gspell-0.2.5:0= x11-themes/adwaita-icon-theme
-REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gedit/3.32/gedit-3.32.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b80570cd63af3dfee23686aa20ff6c08
diff --git a/metadata/md5-cache/app-editors/gedit-3.32.2 b/metadata/md5-cache/app-editors/gedit-3.32.2
new file mode 100644
index 000000000000..73afcb6533bf
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gedit-3.32.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-libs/gtksourceview-4.0.2:4[introspection?] >=dev-libs/libpeas-1.14.1[gtk] >=net-libs/libsoup-2.60:2.4 gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3:3[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( >=app-text/gspell-0.2.5:0= ) app-text/docbook-xml-dtd:4.1.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1 ) dev-util/itstool >=sys-devel/gettext-0.18 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A text editor for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
+IUSE=+introspection +python gtk-doc spell vala python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-libs/gtksourceview-4.0.2:4[introspection?] >=dev-libs/libpeas-1.14.1[gtk] >=net-libs/libsoup-2.60:2.4 gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3:3[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( >=app-text/gspell-0.2.5:0= ) x11-themes/adwaita-icon-theme
+REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) spell? ( python )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gedit/3.32/gedit-3.32.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=82bd1067c4074115f72b79d7091db45f
diff --git a/metadata/md5-cache/app-editors/gedit-plugins-3.32.2 b/metadata/md5-cache/app-editors/gedit-plugins-3.32.2
new file mode 100644
index 000000000000..1868cb578548
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gedit-plugins-3.32.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=app-editors/gedit-3.16 >=dev-libs/glib-2.32:2 >=dev-libs/libpeas-1.7.0[gtk] >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-editors/gedit-3.16[introspection,python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/dbus-python-0.82[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-3.14:3.0[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6 ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] ) vala? ( || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official plugins for gedit
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ShippedPlugins
+IUSE=+python charmap git terminal vala python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/gedit-3.16 >=dev-libs/glib-2.32:2 >=dev-libs/libpeas-1.7.0[gtk] >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-editors/gedit-3.16[introspection,python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/dbus-python-0.82[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-3.14:3.0[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6 ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] ) vala? ( || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
+REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) terminal? ( python )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gedit-plugins/3.32/gedit-plugins-3.32.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=62c3ee0dca06add7a923e6a8af77713f
diff --git a/metadata/md5-cache/app-editors/le-1.16.5 b/metadata/md5-cache/app-editors/le-1.16.5
index 17b6400821c6..b5aa76112ead 100644
--- a/metadata/md5-cache/app-editors/le-1.16.5
+++ b/metadata/md5-cache/app-editors/le-1.16.5
@@ -3,9 +3,9 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Terminal text editor
 EAPI=6
 HOMEPAGE=http://lav.yar.ru/programs.html
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://lav.yar.ru/download/le/le-1.16.5.tar.gz
-_md5_=33a1fcb3bd713631b6d7afc963175244
+_md5_=7de535c94ebd34e3be9e4a09c386bebc
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index d09abe5aad19..5a1d6a154c62 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/eselect-mode-1.4.14 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.14
index 544ec089fab0..a9c0d580cbbe 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.14
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.14
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=Emacs major mode for editing eselect files
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-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
+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=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.14.tar.xz
 _eclasses_=elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=a0e2f8c2c900a15d68eeccb41818f323
+_md5_=4e8170f8655f7e76f0c55510e596e68b
diff --git a/metadata/md5-cache/app-emacs/ess-15.09.2 b/metadata/md5-cache/app-emacs/ess-15.09.2
deleted file mode 100644
index d35651831b87..000000000000
--- a/metadata/md5-cache/app-emacs/ess-15.09.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-text/texi2html virtual/latex-base >=virtual/emacs-23
-DESCRIPTION=Emacs Speaks Statistics
-EAPI=6
-HOMEPAGE=http://ess.r-project.org/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2+ GPL-3+ Texinfo-manual
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://ess.r-project.org/downloads/ess/ess-15.09-2.tgz
-_eclasses_=elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=1da5ffdc9441badc679354e89782ccc8
diff --git a/metadata/md5-cache/app-emacs/ess-17.11 b/metadata/md5-cache/app-emacs/ess-17.11
index 31f23abed7e3..17f9bbb301da 100644
--- a/metadata/md5-cache/app-emacs/ess-17.11
+++ b/metadata/md5-cache/app-emacs/ess-17.11
@@ -3,11 +3,11 @@ DEPEND=app-text/texi2html virtual/latex-base >=virtual/emacs-23
 DESCRIPTION=Emacs Speaks Statistics
 EAPI=6
 HOMEPAGE=http://ess.r-project.org/
-KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2+ GPL-3+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-17.11.tgz
 _eclasses_=elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=5012b1121d3b30c3ccd5e916cd7e541e
+_md5_=90a00ed9d667eb27c9683562aec0fbbf
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.0 b/metadata/md5-cache/app-emacs/magit-popup-2.13.0
new file mode 100644
index 000000000000..9a87425a3de6
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.0
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/emacs-24
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-emacs/dash-2.13.0 sys-apps/texinfo
+DESCRIPTION=Define prefix-infix-suffix command combos
+EAPI=7
+HOMEPAGE=https://magit.vc/manual/magit-popup
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=virtual/emacs-24
+SLOT=0
+SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.0.tar.gz -> magit-popup-2.13.0.tar.gz
+_eclasses_=elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=4c52fe16f033475f09adc248a2eedf60
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813 b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813
new file mode 100644
index 000000000000..3a213a38d841
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=Emacs major mode for editing Puppet manifests
+EAPI=6
+HOMEPAGE=https://github.com/voxpupuli/puppet-mode
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=virtual/emacs-23
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/7dee1b5a5debac6e56f9107492a413b6c0edb94d.tar.gz -> puppet-mode-0.3.20180813.tar.gz
+_eclasses_=elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=ba46d7426b2765ae50a06e6a33fb7f3d
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.8.3 b/metadata/md5-cache/app-emacs/with-editor-2.8.3
new file mode 100644
index 000000000000..69c93c47ae1b
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/with-editor-2.8.3
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/emacs-24
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-apps/texinfo
+DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
+EAPI=7
+HOMEPAGE=https://magit.vc/manual/with-editor
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
+SLOT=0
+SRC_URI=https://github.com/magit/with-editor/archive/v2.8.3.tar.gz -> with-editor-2.8.3.tar.gz
+_eclasses_=elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=c18c94bc0bd6d8fc4df4fbb9fb46d739
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 1a93768e07ef..3b1b4e409fc4 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/conmon-0.2.0 b/metadata/md5-cache/app-emulation/conmon-0.2.0
new file mode 100644
index 000000000000..ffc71447a96d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/conmon-0.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
+DESCRIPTION=An OCI container runtime monitor
+EAPI=7
+HOMEPAGE=https://github.com/containers/conmon
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
+SLOT=0
+SRC_URI=https://github.com/containers/conmon/archive/v0.2.0.tar.gz -> conmon-0.2.0.tar.gz
+_md5_=a0de61d8ab95b06df3f7cf7d0d50f187
diff --git a/metadata/md5-cache/app-emulation/containers-storage-0_pre20180730 b/metadata/md5-cache/app-emulation/containers-storage-0_pre20180730
deleted file mode 100644
index ec954e13d60d..000000000000
--- a/metadata/md5-cache/app-emulation/containers-storage-0_pre20180730
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) dev-go/go-md2man test? ( sys-fs/btrfs-progs sys-fs/lvm2 sys-apps/util-linux ) >=dev-lang/go-1.10
-DESCRIPTION=containers/storage library
-EAPI=6
-HOMEPAGE=https://github.com/containers/storage
-IUSE=btrfs +device-mapper ostree test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-libs/glib:= dev-util/ostree:= )
-RESTRICT=test? ( userpriv ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/containers/storage/archive/17c7d1fee5603ccf6dd97edc14162fc1510e7e23.tar.gz -> containers-storage-0_pre20180730.tar.gz https://github.com/pquerna/ffjson/archive/af8b230fcd2007c7095168ca8ab94c68b60840c6.tar.gz -> github.com-pquerna-ffjson-af8b230fcd2007c7095168ca8ab94c68b60840c6.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=5053313e14ee1cacc5a8441888568570
diff --git a/metadata/md5-cache/app-emulation/containers-storage-1.12.7 b/metadata/md5-cache/app-emulation/containers-storage-1.12.7
new file mode 100644
index 000000000000..be48c0a33c58
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containers-storage-1.12.7
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) dev-go/go-md2man test? ( sys-fs/btrfs-progs sys-fs/lvm2 sys-apps/util-linux )
+DESCRIPTION=containers/storage library
+EAPI=7
+HOMEPAGE=https://github.com/containers/storage
+IUSE=btrfs +device-mapper ostree test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-libs/glib:= dev-util/ostree:= )
+RESTRICT=test? ( userpriv ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/containers/storage/archive/v1.12.7.tar.gz -> containers-storage-1.12.7.tar.gz https://github.com/pquerna/ffjson/archive/e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz -> github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=149feb948fbd407bec3c1e0443a6560e
diff --git a/metadata/md5-cache/app-emulation/containers-storage-1.12.8 b/metadata/md5-cache/app-emulation/containers-storage-1.12.8
new file mode 100644
index 000000000000..2bf9caf6307b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containers-storage-1.12.8
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) dev-go/go-md2man test? ( sys-fs/btrfs-progs sys-fs/lvm2 sys-apps/util-linux )
+DESCRIPTION=containers/storage library
+EAPI=7
+HOMEPAGE=https://github.com/containers/storage
+IUSE=btrfs +device-mapper ostree test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-libs/glib:= dev-util/ostree:= )
+RESTRICT=test? ( userpriv ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/containers/storage/archive/v1.12.8.tar.gz -> containers-storage-1.12.8.tar.gz https://github.com/pquerna/ffjson/archive/e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz -> github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=149feb948fbd407bec3c1e0443a6560e
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.13.5 b/metadata/md5-cache/app-emulation/cri-o-1.13.5
deleted file mode 100644
index 45ab0253a6b7..000000000000
--- a/metadata/md5-cache/app-emulation/cri-o-1.13.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
-EAPI=6
-HOMEPAGE=https://cri-o.io/
-IUSE=btrfs +device-mapper ostree seccomp selinux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes-sigs/cri-o/archive/v1.13.5.tar.gz -> cri-o-1.13.5.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=7dccaece38a23a6871c3b6147855f644
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.13.7 b/metadata/md5-cache/app-emulation/cri-o-1.13.7
deleted file mode 100644
index 9bb1450dffe3..000000000000
--- a/metadata/md5-cache/app-emulation/cri-o-1.13.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
-DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
-EAPI=7
-HOMEPAGE=https://cri-o.io/
-IUSE=btrfs +device-mapper ostree seccomp selinux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes-sigs/cri-o/archive/v1.13.7.tar.gz -> cri-o-1.13.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=65cc5bc2ce8c73e4f2bd9adb734aa754
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.13.9 b/metadata/md5-cache/app-emulation/cri-o-1.13.9
new file mode 100644
index 000000000000..52d11a479924
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cri-o-1.13.9
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
+DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
+EAPI=7
+HOMEPAGE=https://cri-o.io/
+IUSE=btrfs +device-mapper ostree seccomp selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/kubernetes-sigs/cri-o/archive/v1.13.9.tar.gz -> cri-o-1.13.9.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=72f5af7c12a80a4aae15d80f1b15cd8c
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.14.2 b/metadata/md5-cache/app-emulation/cri-o-1.14.2
new file mode 100644
index 000000000000..d87b6749b2de
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cri-o-1.14.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) selinux? ( sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) dev-go/go-md2man
+DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
+EAPI=7
+HOMEPAGE=https://cri-o.io/
+IUSE=btrfs +device-mapper ostree selinux systemd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) selinux? ( sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) !<app-emulation/libpod-1.3.2-r1
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/cri-o/cri-o/archive/v1.14.2.tar.gz -> cri-o-1.14.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=41a2a005ed24d5958c278f51ac560869
diff --git a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3 b/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
deleted file mode 100644
index 1baa224a1ee7..000000000000
--- a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib virtual/cdrtools X? ( x11-libs/libXt x11-libs/libxkbfile x11-libs/libXext x11-misc/xkeyboard-config dga? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !X? ( sdl? ( media-libs/libsdl ) !sdl? ( sys-libs/ncurses:0= ) ) alsa? ( media-libs/alsa-lib ) !alsa? ( sdl-sound? ( media-libs/sdl-sound ) ) capslib? ( >=games-emulation/caps-20060612 ) X? ( dga? ( x11-base/xorg-proto ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE
-EAPI=6
-HOMEPAGE=http://www.rcdrummond.net/uae/
-IUSE=X dga ncurses sdl alsa oss sdl-sound capslib
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib virtual/cdrtools X? ( x11-libs/libXt x11-libs/libxkbfile x11-libs/libXext x11-misc/xkeyboard-config dga? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !X? ( sdl? ( media-libs/libsdl ) !sdl? ( sys-libs/ncurses:0= ) ) alsa? ( media-libs/alsa-lib ) !alsa? ( sdl-sound? ( media-libs/sdl-sound ) ) capslib? ( >=games-emulation/caps-20060612 )
-SLOT=0
-SRC_URI=http://www.rcdrummond.net/uae/e-uae-0.8.29-WIP4/e-uae-0.8.29-WIP4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=be0af9fe2f281d9fda97b65ff94aa7d1
diff --git a/metadata/md5-cache/app-emulation/free42-2.2.1 b/metadata/md5-cache/app-emulation/free42-2.2.1
new file mode 100644
index 000000000000..9b21af6563c8
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/free42-2.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib )
+DESCRIPTION=An HP-42S Calculator Simulator
+EAPI=7
+HOMEPAGE=http://thomasokken.com/free42/
+IUSE=+alsa
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib ) x11-libs/libX11 x11-libs/libXmu
+SLOT=0
+SRC_URI=http://thomasokken.com/free42/upstream/free42-nologo-2.2.1.tgz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=4ef2b02d75dae732ae0735d7e7481587
diff --git a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.3 b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.3
index d14efa3e3b65..f789134187b9 100644
--- a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.3
+++ b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=media-libs/mesa[d3d9,dri3,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/iXit/wine-nine-standalone/archive/v0.3.tar.gz -> gallium-nine-standalone-0.3.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=aba3f68f7197df6e60b7444bf36a8602
diff --git a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.4 b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.4
index 2e8dc9e6ad66..355885c37eb9 100644
--- a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.4
+++ b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=media-libs/mesa[d3d9,dri3,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/iXit/wine-nine-standalone/archive/v0.4.tar.gz -> gallium-nine-standalone-0.4.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2ac74ef64d0ba288400a9bdf30815f18
diff --git a/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999 b/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999
index 621210b3a140..e5ee9320f5d9 100644
--- a/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999
+++ b/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999
@@ -8,5 +8,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 LICENSE=LGPL-2.1+
 RDEPEND=media-libs/mesa[d3d9,dri3,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2ac74ef64d0ba288400a9bdf30815f18
diff --git a/metadata/md5-cache/app-emulation/libpod-1.1.2 b/metadata/md5-cache/app-emulation/libpod-1.1.2
deleted file mode 100644
index 1bccd28988d0..000000000000
--- a/metadata/md5-cache/app-emulation/libpod-1.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst prepare unpack
-DEPEND=app-crypt/gpgme:= >=app-emulation/cri-o-1.13.0 >=app-emulation/runc-1.0.0_rc6 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
-DESCRIPTION=Library and podman tool for running OCI-based containers in Pods
-EAPI=7
-HOMEPAGE=https://github.com/containers/libpod/
-IUSE=apparmor btrfs ostree +rootless selinux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/gpgme:= >=app-emulation/cri-o-1.13.0 >=app-emulation/runc-1.0.0_rc6 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= )
-REQUIRED_USE=!selinux? ( !ostree )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containers/libpod/archive/v1.1.2.tar.gz -> libpod-1.1.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=066af283456ef94e09fda83e81723139
diff --git a/metadata/md5-cache/app-emulation/libpod-1.2.0 b/metadata/md5-cache/app-emulation/libpod-1.2.0
deleted file mode 100644
index 4d581534bb8d..000000000000
--- a/metadata/md5-cache/app-emulation/libpod-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst prepare unpack
-DEPEND=app-crypt/gpgme:= >=app-emulation/cri-o-1.13.0 >=app-emulation/runc-1.0.0_rc6 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
-DESCRIPTION=Library and podman tool for running OCI-based containers in Pods
-EAPI=7
-HOMEPAGE=https://github.com/containers/libpod/
-IUSE=apparmor btrfs ostree +rootless selinux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/gpgme:= >=app-emulation/cri-o-1.13.0 >=app-emulation/runc-1.0.0_rc6 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= )
-REQUIRED_USE=!selinux? ( !ostree )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containers/libpod/archive/v1.2.0.tar.gz -> libpod-1.2.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e67b33b3f9e889fdf907295469c5f72f
diff --git a/metadata/md5-cache/app-emulation/libpod-1.3.2-r1 b/metadata/md5-cache/app-emulation/libpod-1.3.2-r1
new file mode 100644
index 000000000000..b07a25e8332c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libpod-1.3.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst prepare unpack
+DEPEND=app-crypt/gpgme:= app-emulation/conmon >=app-emulation/runc-1.0.0_rc6 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
+DESCRIPTION=Library and podman tool for running OCI-based containers in Pods
+EAPI=7
+HOMEPAGE=https://github.com/containers/libpod/
+IUSE=apparmor btrfs ostree +rootless selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/gpgme:= app-emulation/conmon >=app-emulation/runc-1.0.0_rc6 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= )
+REQUIRED_USE=!selinux? ( !ostree )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/libpod/archive/v1.3.2.tar.gz -> libpod-1.3.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ab574596d3e7790328cccf522c36e85a
diff --git a/metadata/md5-cache/app-emulation/libvirt-5.2.0-r2 b/metadata/md5-cache/app-emulation/libvirt-5.2.0-r2
index 6bd786cc9c0c..5cd50853b7ad 100644
--- a/metadata/md5-cache/app-emulation/libvirt-5.2.0-r2
+++ b/metadata/md5-cache/app-emulation/libvirt-5.2.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=7
 HOMEPAGE=http://www.libvirt.org/
 IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs kernel_linux
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/5.2.0
 SRC_URI=https://libvirt.org/sources/libvirt-5.2.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=7840526984f39c6e8a5709a2be2904e8
+_md5_=f085d0fd4695dfd0eaacb695aee56336
diff --git a/metadata/md5-cache/app-emulation/qemu-4.0.0-r3 b/metadata/md5-cache/app-emulation/qemu-4.0.0-r3
index d12abf7a351e..ea3f2fb4fe75 100644
--- a/metadata/md5-cache/app-emulation/qemu-4.0.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-4.0.0-r3
@@ -4,12 +4,12 @@ DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_pyt
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-4.0.0.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=46b4ead68f98f4690f12830e1e6d5361
+_md5_=4c4311301996a99c4fa2bf0013927cc8
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index 350dec2c7be1..19498fea419f 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -4,10 +4,10 @@ DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_pyt
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
+IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=556da696ff469f6585057db0b8b4cd7f
+_md5_=64cc8cca843fd01fc9055f4bafd72ad3
diff --git a/metadata/md5-cache/app-emulation/skopeo-0.1.36 b/metadata/md5-cache/app-emulation/skopeo-0.1.36
new file mode 100644
index 000000000000..9937f4462236
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/skopeo-0.1.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-error:= >=sys-fs/btrfs-progs-4.0.1 >=sys-fs/lvm2-2.02.145:= dev-go/go-md2man >=dev-lang/go-1.10
+DESCRIPTION=Command line utility foroperations on container images and image repositories
+EAPI=6
+HOMEPAGE=https://github.com/containers/skopeo
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-error:= >=sys-fs/btrfs-progs-4.0.1 >=sys-fs/lvm2-2.02.145:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/skopeo/archive/v0.1.36.tar.gz -> skopeo-0.1.36.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=30583c7416b16a0fded7a0cade29796d
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.2.1 b/metadata/md5-cache/app-emulation/slirp4netns-0.2.1
deleted file mode 100644
index 2b386bc4138d..000000000000
--- a/metadata/md5-cache/app-emulation/slirp4netns-0.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=User-mode networking for unprivileged network namespaces
-EAPI=6
-HOMEPAGE=https://github.com/rootless-containers/slirp4netns
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.2.1.tar.gz -> slirp4netns-0.2.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=b573697152391069e8c77ab028c0d9b0
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.3.0 b/metadata/md5-cache/app-emulation/slirp4netns-0.3.0
deleted file mode 100644
index 731fcc5c8ed4..000000000000
--- a/metadata/md5-cache/app-emulation/slirp4netns-0.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=postinst prepare
-DESCRIPTION=User-mode networking for unprivileged network namespaces
-EAPI=7
-HOMEPAGE=https://github.com/rootless-containers/slirp4netns
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.3.0.tar.gz -> slirp4netns-0.3.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=d31f5dde188ea67d6bab337151afd863
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.3.0-r1 b/metadata/md5-cache/app-emulation/slirp4netns-0.3.0-r1
new file mode 100644
index 000000000000..eb60fcbd1d9c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/slirp4netns-0.3.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=postinst prepare
+DEPEND=dev-libs/glib:2= dev-libs/libpcre:=
+DESCRIPTION=User-mode networking for unprivileged network namespaces
+EAPI=7
+HOMEPAGE=https://github.com/rootless-containers/slirp4netns
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2= dev-libs/libpcre:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.3.0.tar.gz -> slirp4netns-0.3.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=6ea858baed4e0eec72038bcc0fea3bb1
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.3.0_beta1 b/metadata/md5-cache/app-emulation/slirp4netns-0.3.0_beta1
deleted file mode 100644
index 0a5ba40576c7..000000000000
--- a/metadata/md5-cache/app-emulation/slirp4netns-0.3.0_beta1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=postinst prepare
-DESCRIPTION=User-mode networking for unprivileged network namespaces
-EAPI=7
-HOMEPAGE=https://github.com/rootless-containers/slirp4netns
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.3.0-beta.1.tar.gz -> slirp4netns-0.3.0_beta1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=1071332d71697c0fccf698b7476a81e3
diff --git a/metadata/md5-cache/app-emulation/uae-0.8.29-r2 b/metadata/md5-cache/app-emulation/uae-0.8.29-r2
deleted file mode 100644
index 4811c7497d07..000000000000
--- a/metadata/md5-cache/app-emulation/uae-0.8.29-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sdl? ( media-libs/libsdl media-libs/sdl-gfx x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) ) !sdl? ( x11-libs/libXext x11-libs/gtk+:2 ) alsa? ( media-libs/alsa-lib ) scsi? ( app-cdr/cdrtools ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The Umiquious Amiga Emulator
-EAPI=5
-HOMEPAGE=http://www.amigaemulator.org/
-IUSE=sdl alsa scsi
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sdl? ( media-libs/libsdl media-libs/sdl-gfx x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) ) !sdl? ( x11-libs/libXext x11-libs/gtk+:2 ) alsa? ( media-libs/alsa-lib ) scsi? ( app-cdr/cdrtools )
-SLOT=0
-SRC_URI=ftp://ftp.amigaemulator.org/pub/uae/sources/develop/uae-0.8.29.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e767c394f1f9168c0445508222e5cf49
diff --git a/metadata/md5-cache/app-emulation/wine-staging-4.5 b/metadata/md5-cache/app-emulation/wine-staging-4.5
deleted file mode 100644
index d69c8a457b8d..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.8.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=4.5
-SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.5.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20190316.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v4.5.tar.gz -> wine-staging-4.5.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=02693081260a032c49fedbdd84541271
diff --git a/metadata/md5-cache/app-emulation/wine-staging-4.9 b/metadata/md5-cache/app-emulation/wine-staging-4.9
new file mode 100644
index 000000000000..0c1c9ec9337f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-4.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.8.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=4.9
+SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.9.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v4.9.tar.gz -> wine-staging-4.9.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=543bb836c930718f1d82195cde968019
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.5 b/metadata/md5-cache/app-emulation/wine-vanilla-4.5
deleted file mode 100644
index 920f751c5e20..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.8.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=4.5
-SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.5.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190316.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=03c48ac6cc293f93e964ef30df270149
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.9 b/metadata/md5-cache/app-emulation/wine-vanilla-4.9
new file mode 100644
index 000000000000..5f5186cdd234
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-4.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.8.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=4.9
+SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.9.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=3326a27942803ac02900b3eaaa6d20fb
diff --git a/metadata/md5-cache/app-emulation/winetricks-20170823 b/metadata/md5-cache/app-emulation/winetricks-20170823
deleted file mode 100644
index 0a68220bcb91..000000000000
--- a/metadata/md5-cache/app-emulation/winetricks-20170823
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst unpack
-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
-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 )
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9a4cbca419ef1676ecd370dc4a5557e6
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.12.0-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.12.0-r2
deleted file mode 100644
index 86c74c8cc928..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.12.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=api custom-cflags debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=python_targets_python2_7 ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.12
-SRC_URI=https://downloads.xenproject.org/release/xen/4.12.0/xen-4.12.0.tar.gz https://www.seabios.org/downloads/seabios-1.12.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz -> edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.12.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.12.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-17.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-17.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0869c4e3577073655cdb77b5022f8589
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.12.0-r3 b/metadata/md5-cache/app-emulation/xen-tools-4.12.0-r3
new file mode 100644
index 000000000000..dfc5f6b3cf11
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.12.0-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=api custom-cflags debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=python_targets_python2_7 ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.12
+SRC_URI=https://downloads.xenproject.org/release/xen/4.12.0/xen-4.12.0.tar.gz https://www.seabios.org/downloads/seabios-1.12.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz -> edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.12.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.12.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-18.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-18.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c4d71389838415e1ca29392d4ca9062f
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 69753569ad62..27b622503a95 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-mpg123-0.1 b/metadata/md5-cache/app-eselect/eselect-mpg123-0.1
index 769ad44b33ee..1418d50f9e6c 100644
--- a/metadata/md5-cache/app-eselect/eselect-mpg123-0.1
+++ b/metadata/md5-cache/app-eselect/eselect-mpg123-0.1
@@ -3,8 +3,8 @@ DEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/mpg123-1.14.4-r
 DESCRIPTION=Manage /usr/bin/mpg123 symlink
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/mpg123-1.14.4-r1
 SLOT=0
-_md5_=b69148054e8301949f809f0f8ca2590f
+_md5_=606d7846d3cb7b761db4342d4d8ee6ee
diff --git a/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5 b/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
index 4946c563428d..8b685e7ff44f 100644
--- a/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
+++ b/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
@@ -4,10 +4,10 @@ DESCRIPTION=PHP eselect module
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-php.git/
 IUSE=fpm apache2
-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-2
 RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/eselect-php-0.9.4.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=551610b785fa6812bfe35f33890c6eef
+_md5_=b896a4d481fe8de1997203c2f0f39785
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-7 b/metadata/md5-cache/app-eselect/eselect-repository-7
new file mode 100644
index 000000000000..bd766810c86f
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-repository-7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install setup
+DESCRIPTION=Manage repos.conf via eselect
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/eselect-repository
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-admin/eselect dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-misc/wget
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/eselect-repository/archive/v7.tar.gz -> eselect-repository-7.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=debcf1ccbc383241e00ef5581646f683
diff --git a/metadata/md5-cache/app-eselect/eselect-rust-20190311 b/metadata/md5-cache/app-eselect/eselect-rust-20190311
index 541058beef3d..29faaf4b696c 100644
--- a/metadata/md5-cache/app-eselect/eselect-rust-20190311
+++ b/metadata/md5-cache/app-eselect/eselect-rust-20190311
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst prepare
 DESCRIPTION=Eselect module for management of multiple Rust versions
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Rust
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-rust-20190311.tar.bz2
-_md5_=65dd2c4186c2d9620ac18ea0bcc0d72b
+_md5_=360e82c05a4561d18b65e7b6b105f0fb
diff --git a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529 b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529
index 4adbe959b8c1..27a47e331163 100644
--- a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529
+++ b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Eselect module and wrappers for wxWidgets
 EAPI=7
 HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh 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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.4.13
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/eselect-wxwidgets-20180529.tar.xz https://dev.gentoo.org/~mgorny/dist/eselect-wxwidgets-files.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f75d47c391a33e1689d63b2f0139b8f7
+_md5_=7dfdb2e8bbbc30e96b291bd7ce82bd80
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 547616dfad67..be0098d89978 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/honggfuzz-1.7 b/metadata/md5-cache/app-forensics/honggfuzz-1.7
deleted file mode 100644
index 8be5b6119876..000000000000
--- a/metadata/md5-cache/app-forensics/honggfuzz-1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/binutils-libs:= sys-libs/libunwind
-DESCRIPTION=A general purpose fuzzer with feedback support
-EAPI=6
-HOMEPAGE=http://google.github.io/honggfuzz/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/binutils-libs:= sys-libs/libunwind
-SLOT=0
-SRC_URI=https://github.com/google/honggfuzz/archive/1.7.tar.gz -> honggfuzz-1.7.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=4663219ce25e15d9ccdc6baab26b94fc
diff --git a/metadata/md5-cache/app-forensics/honggfuzz-1.9 b/metadata/md5-cache/app-forensics/honggfuzz-1.9
new file mode 100644
index 000000000000..54b0f5d1b722
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/honggfuzz-1.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind
+DESCRIPTION=A general purpose fuzzer with feedback support
+EAPI=7
+HOMEPAGE=http://google.github.io/honggfuzz/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind
+SLOT=0
+SRC_URI=https://github.com/google/honggfuzz/archive/1.9.tar.gz -> honggfuzz-1.9.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=689354242deb47851462adf0aba8b109
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 619a20185b94..fd6a3a7d2945 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/ibus-1.5.19 b/metadata/md5-cache/app-i18n/ibus-1.5.19
index 0027dbdf159f..8ba6ae36c103 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.19
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.19
@@ -4,11 +4,11 @@ DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=6
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 IUSE=+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
 REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) introspection ) test? ( gtk ) vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.19/ibus-1.5.19.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6dbd1be8d945e9f0495e9272ff2499bf
+_md5_=c57b6dd31a1c02fe87f85e8d21da2c20
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.18 b/metadata/md5-cache/app-i18n/scim-1.4.18
index d0201d36e02a..24879936d451 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.18
+++ b/metadata/md5-cache/app-i18n/scim-1.4.18
@@ -4,10 +4,10 @@ DESCRIPTION=Smart Common Input Method (SCIM) is an Input Method (IM) development
 EAPI=6
 HOMEPAGE=https://github.com/scim-im/scim
 IUSE=doc gtk3
-KEYWORDS=alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) >=dev-libs/atk-1 >=x11-libs/pango-1
 SLOT=0
 SRC_URI=https://github.com/scim-im/scim/archive/1.4.18.tar.gz -> scim-1.4.18.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1bb209264e697313682eeaa7db363750
+_md5_=6d6fdaf79f451342e496b629a3591f92
diff --git a/metadata/md5-cache/app-i18n/unicode-cldr-33.0 b/metadata/md5-cache/app-i18n/unicode-cldr-33.0
index b876b0c71f0b..db5610ef7d34 100644
--- a/metadata/md5-cache/app-i18n/unicode-cldr-33.0
+++ b/metadata/md5-cache/app-i18n/unicode-cldr-33.0
@@ -3,8 +3,8 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Unicode Common Locale Data Repository
 EAPI=6
 HOMEPAGE=http://cldr.unicode.org/
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=unicode
 SLOT=0
 SRC_URI=https://unicode.org/Public/cldr/33/cldr-common-33.0.zip -> unicode-cldr-common-33.0.zip
-_md5_=1021f53b84597562d0a6a3ae0e2450bd
+_md5_=bdac8675dd36dbd2613d9cf0cc18062c
diff --git a/metadata/md5-cache/app-i18n/unicode-data-11.0.0 b/metadata/md5-cache/app-i18n/unicode-data-11.0.0
index 1260d10d90d9..be60cbc3725c 100644
--- a/metadata/md5-cache/app-i18n/unicode-data-11.0.0
+++ b/metadata/md5-cache/app-i18n/unicode-data-11.0.0
@@ -3,8 +3,8 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Unicode data from unicode.org
 EAPI=6
 HOMEPAGE=http://www.unicode.org/ucd/
-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=unicode
 SLOT=0
 SRC_URI=http://www.unicode.org/Public/zipped/11.0.0/UCD.zip -> unicode-data-11.0.0-UCD.zip http://www.unicode.org/Public/zipped/11.0.0/Unihan.zip -> unicode-data-11.0.0-Unihan.zip
-_md5_=006b7bf8632d202b2df963ad7b917fa9
+_md5_=0d29c99e6c2f805cea48d3f3e87b6f54
diff --git a/metadata/md5-cache/app-i18n/unicode-emoji-11.0 b/metadata/md5-cache/app-i18n/unicode-emoji-11.0
index d68a9ed3dbdd..442914d17a3b 100644
--- a/metadata/md5-cache/app-i18n/unicode-emoji-11.0
+++ b/metadata/md5-cache/app-i18n/unicode-emoji-11.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=UTS #51 Unicode Emoji
 EAPI=6
 HOMEPAGE=https://unicode.org/emoji/
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=unicode
 SLOT=0
 SRC_URI=https://unicode.org/Public/emoji/11.0/emoji-data.txt -> unicode-emoji-data-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-sequences.txt -> unicode-emoji-sequences-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-test.txt -> unicode-emoji-test-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-variation-sequences.txt -> unicode-emoji-variation-sequences-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-zwj-sequences.txt -> unicode-emoji-zwj-sequences-11.0.txt
-_md5_=a7d730d5bf8b794e27f6eba3ec972b1b
+_md5_=498f2ede0df077677bdad7f852674c45
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index c5741bb0ca8b..0cedfe4745ed 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.10.0 b/metadata/md5-cache/app-metrics/prometheus-2.10.0
new file mode 100644
index 000000000000..3271e816e531
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-2.10.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=>=dev-lang/go-1.12 >=dev-util/promu-0.3.0 >=dev-lang/go-1.10
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v2.10.0.tar.gz -> prometheus-2.10.0.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=a2ff3b996a373e4c80f5f38c0bcdae1a
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.9.2 b/metadata/md5-cache/app-metrics/prometheus-2.9.2
index 97c8e37ad153..33d53a7d47fa 100644
--- a/metadata/md5-cache/app-metrics/prometheus-2.9.2
+++ b/metadata/md5-cache/app-metrics/prometheus-2.9.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/go-1.12 >=dev-util/promu-0.3.0 >=dev-lang/go-1.10
 DESCRIPTION=Prometheus monitoring system and time series database
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/prometheus
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/prometheus/archive/v2.9.2.tar.gz -> prometheus-2.9.2.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=148b5050a8a1aafa9fab7fe86e032e0b
+_md5_=f8e2d6bc971f59e722f3547bb8ac21fd
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 072b82315cea..b8cf238856c2 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/abduco-0.5 b/metadata/md5-cache/app-misc/abduco-0.5
index 6a6eaedf8772..af9e77bf7ed5 100644
--- a/metadata/md5-cache/app-misc/abduco-0.5
+++ b/metadata/md5-cache/app-misc/abduco-0.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=http://www.brain-dump.org/projects/abduco/abduco-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=34c5eb6cd97936c5572c047227432e8e
diff --git a/metadata/md5-cache/app-misc/abduco-0.6 b/metadata/md5-cache/app-misc/abduco-0.6
index d32df7a13a5b..5205262e1d09 100644
--- a/metadata/md5-cache/app-misc/abduco-0.6
+++ b/metadata/md5-cache/app-misc/abduco-0.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=http://www.brain-dump.org/projects/abduco/abduco-0.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=05518e0cb411cff01a811c8d6308b2c6
diff --git a/metadata/md5-cache/app-misc/dvtm-0.14-r1 b/metadata/md5-cache/app-misc/dvtm-0.14-r1
index 0477b7d1d0eb..0ffcab1ff6a8 100644
--- a/metadata/md5-cache/app-misc/dvtm-0.14-r1
+++ b/metadata/md5-cache/app-misc/dvtm-0.14-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/ncurses:0=[unicode?] !>=sys-libs/ncurses-6.1
 SLOT=0
 SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.14.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=6b18fe2a247e3dfb46cf9d4ccaff1bd3
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r2 b/metadata/md5-cache/app-misc/dvtm-0.15-r2
index 3dd43aec09fa..c697a788dc01 100644
--- a/metadata/md5-cache/app-misc/dvtm-0.15-r2
+++ b/metadata/md5-cache/app-misc/dvtm-0.15-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/ncurses:0=[unicode] !>=sys-libs/ncurses-6.1
 SLOT=0
 SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2c8b1230ec8b3c4bafb5b146bfd8b339
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r3 b/metadata/md5-cache/app-misc/dvtm-0.15-r3
index 51b2a8fc0dcb..9bc0c4654563 100644
--- a/metadata/md5-cache/app-misc/dvtm-0.15-r3
+++ b/metadata/md5-cache/app-misc/dvtm-0.15-r3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/ncurses-6.1:0=[unicode]
 SLOT=0
 SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=e6118ec46e06badb62c8d2ccec8c12ff
diff --git a/metadata/md5-cache/app-misc/dvtm-9999 b/metadata/md5-cache/app-misc/dvtm-9999
index df3cadb860fd..49ca040a3be8 100644
--- a/metadata/md5-cache/app-misc/dvtm-9999
+++ b/metadata/md5-cache/app-misc/dvtm-9999
@@ -7,5 +7,5 @@ IUSE=savedconfig
 LICENSE=MIT
 RDEPEND=>=sys-libs/ncurses-6.1:0=[unicode]
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=ccfcdf31766985ace2c95344014102de
diff --git a/metadata/md5-cache/app-misc/fdupes-1.5.1 b/metadata/md5-cache/app-misc/fdupes-1.5.1
index d34cc912ad2a..0d7532ed5f23 100644
--- a/metadata/md5-cache/app-misc/fdupes-1.5.1
+++ b/metadata/md5-cache/app-misc/fdupes-1.5.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Identify/delete duplicate files residing within specified directories
 EAPI=5
 HOMEPAGE=https://github.com/adrianlopezroche/fdupes
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/adrianlopezroche/fdupes/archive/fdupes-1.51.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=17dc625bb51b6570cfee903191cc3a36
+_md5_=6884bca03ccd2527d1bbb23fb071936e
diff --git a/metadata/md5-cache/app-misc/geoclue-2.4.13 b/metadata/md5-cache/app-misc/geoclue-2.4.13
index b91c0b601d6e..4c2987486062 100644
--- a/metadata/md5-cache/app-misc/geoclue-2.4.13
+++ b/metadata/md5-cache/app-misc/geoclue-2.4.13
@@ -4,10 +4,10 @@ DESCRIPTION=A geoinformation D-Bus service
 EAPI=6
 HOMEPAGE=https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home
 IUSE=+introspection modemmanager zeroconf
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1.6 ) zeroconf? ( >=net-dns/avahi-0.6.10[dbus] ) !<sci-geosciences/geocode-glib-3.10.0 x11-libs/libnotify
 SLOT=2.0
 SRC_URI=https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.4.13/geoclue-2.4.13.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7800084cc3b353e624ecc864dd73d638
+_md5_=bde3ff5fc2823bdc2e204edb62505848
diff --git a/metadata/md5-cache/app-misc/goobook-3.3 b/metadata/md5-cache/app-misc/goobook-3.3
new file mode 100644
index 000000000000..da6602f51698
--- /dev/null
+++ b/metadata/md5-cache/app-misc/goobook-3.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Access your Google contacts from the command line
+EAPI=7
+HOMEPAGE=https://gitlab.com/goobook/goobook
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.6.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/g/goobook/goobook-3.3.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=7053a7ce33d9c9169c23e1be1709b813
diff --git a/metadata/md5-cache/app-misc/i2bits-0.0.2 b/metadata/md5-cache/app-misc/i2bits-0.0.2
deleted file mode 100644
index e4603e8e9a18..000000000000
--- a/metadata/md5-cache/app-misc/i2bits-0.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Utility to convert hex or dec to binary format
-EAPI=6
-HOMEPAGE=https://bitbucket.org/PascalRD/i2bits/
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-SLOT=0
-SRC_URI=http://unixdev.ru/src/i2bits-0.0.2.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=efd73732bf9152a041b355be33bf2fd9
diff --git a/metadata/md5-cache/app-misc/i2bits-0.1.0 b/metadata/md5-cache/app-misc/i2bits-0.1.0
index de3ee2a52167..230cc9073681 100644
--- a/metadata/md5-cache/app-misc/i2bits-0.1.0
+++ b/metadata/md5-cache/app-misc/i2bits-0.1.0
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Utility to convert hex or dec to binary format
 EAPI=6
 HOMEPAGE=https://bitbucket.org/PascalRD/i2bits/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=http://unixdev.ru/src/i2bits-0.1.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=60759718d17455fe2c09498e61a5b466
+_md5_=74c37dab205628b3588b47a956275aee
diff --git a/metadata/md5-cache/app-misc/linux-logo-5.11-r3 b/metadata/md5-cache/app-misc/linux-logo-5.11-r3
deleted file mode 100644
index 7c9ffe1b4706..000000000000
--- a/metadata/md5-cache/app-misc/linux-logo-5.11-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm
-DEPEND=nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=A utility that displays an ANSI/ASCII logo and some system information
-EAPI=5
-HOMEPAGE=http://www.deater.net/weave/vmwprod/linux_logo/
-IUSE=nls
-KEYWORDS=amd64 ~arm hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-5.11.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0b5e41ebc4a28d75362848765e48de2d
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r1 b/metadata/md5-cache/app-misc/lirc-0.10.1-r1
index 84e8a7968898..6b77d69fcac8 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r1
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=decode and send infra-red signals of many commonly used remote contr
 EAPI=7
 HOMEPAGE=http://www.lirc.org/
 IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] dev-python/pygobject[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) inputlirc? ( app-misc/inputlircd )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) gtk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=25541ae44ee919deda796020f0263498
+_md5_=0338281df54d1c9680c1ddcbd00abd7a
diff --git a/metadata/md5-cache/app-misc/mx5000tools-0.1.2 b/metadata/md5-cache/app-misc/mx5000tools-0.1.2
deleted file mode 100644
index fe36344f0a56..000000000000
--- a/metadata/md5-cache/app-misc/mx5000tools-0.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/netpbm:=
-DESCRIPTION=Tools for controlling the LCD on a Logitech MX5000 keyboard
-EAPI=7
-HOMEPAGE=https://web.archive.org/web/20160409073317/http://home.gna.org/mx5000tools/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/netpbm:=
-SLOT=0
-SRC_URI=https://web.archive.org/web/20170225160711/http://download.gna.org/mx5000tools/mx5000tools-0.1.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=538f959361a9b6f26b05aaaf05540c10
diff --git a/metadata/md5-cache/app-misc/mx5000tools-0.1.2-r1 b/metadata/md5-cache/app-misc/mx5000tools-0.1.2-r1
new file mode 100644
index 000000000000..0bef6e5c8fb5
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mx5000tools-0.1.2-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 media-libs/netpbm:=
+DESCRIPTION=Tools for controlling the LCD on a Logitech MX5000 keyboard
+EAPI=7
+HOMEPAGE=https://web.archive.org/web/20160409073317/http://home.gna.org/mx5000tools/
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 media-libs/netpbm:=
+SLOT=0
+SRC_URI=https://web.archive.org/web/20170225160711/http://download.gna.org/mx5000tools/mx5000tools-0.1.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=452808c8e3e30fe0663a2d97e245be3a
diff --git a/metadata/md5-cache/app-misc/skim-0.6.7 b/metadata/md5-cache/app-misc/skim-0.6.7
new file mode 100644
index 000000000000..8a153bab3ab0
--- /dev/null
+++ b/metadata/md5-cache/app-misc/skim-0.6.7
@@ -0,0 +1,13 @@
+BDEPEND=virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=Command-line fuzzy finder
+EAPI=7
+HOMEPAGE=https://github.com/lotabout/skim
+IUSE=tmux vim debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/darling/0.8.6/download -> darling-0.8.6.crate https://crates.io/api/v1/crates/darling_core/0.8.6/download -> darling_core-0.8.6.crate https://crates.io/api/v1/crates/darling_macro/0.8.6/download -> darling_macro-0.8.6.crate https://crates.io/api/v1/crates/derive_builder/0.7.1/download -> derive_builder-0.7.1.crate https://crates.io/api/v1/crates/derive_builder_core/0.4.1/download -> derive_builder_core-0.4.1.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.2.1/download -> fuzzy-matcher-0.2.1.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.50/download -> libc-0.2.50.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/nix/0.13.0/download -> nix-0.13.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.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/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/skim/0.6.7/download -> skim-0.6.7.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.29/download -> syn-0.15.29.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.2.6/download -> tuikit-0.2.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=a2d16e635f5e458f0f17453910040832
diff --git a/metadata/md5-cache/app-misc/tracker-2.1.8 b/metadata/md5-cache/app-misc/tracker-2.1.8
index 88d6111d1a32..0b46957f64e1 100644
--- a/metadata/md5-cache/app-misc/tracker-2.1.8
+++ b/metadata/md5-cache/app-misc/tracker-2.1.8
@@ -4,11 +4,11 @@ DESCRIPTION=A tagging metadata database, search tool and indexer
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
 IUSE=gtk-doc +miners networkmanager stemmer kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 PDEPEND=miners? ( >=app-misc/tracker-miners-2.1 )
 RDEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux
 SLOT=0/2.0
 SRC_URI=mirror://gnome/sources/tracker/2.1/tracker-2.1.8.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4951361215ac1607aa82e8b1cb5c7c7a
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=84c529757c0b856b860a1a16578d5cbd
diff --git a/metadata/md5-cache/app-misc/tracker-miners-2.1.6 b/metadata/md5-cache/app-misc/tracker-miners-2.1.6
index 44d0a17a547e..10df14fa24d3 100644
--- a/metadata/md5-cache/app-misc/tracker-miners-2.1.6
+++ b/metadata/md5-cache/app-misc/tracker-miners-2.1.6
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
 IUSE=cue exif ffmpeg flac gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +taglib +tiff upower +vorbis +xml xmp xps
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.1.0:= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) !gstreamer? ( ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) flac? ( >=media-libs/flac-1.2.1 ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) vorbis? ( >=media-libs/libvorbis-0.22 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) taglib? ( >=media-libs/taglib-1.6 ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
 REQUIRED_USE=cue? ( gstreamer )
 SLOT=0
 SRC_URI=mirror://gnome/sources/tracker-miners/2.1/tracker-miners-2.1.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d902aba61388988651c5d03708cbd9c6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6fe4c6e6cb4d2a7ac9ba2af7fb588226
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 370c628a0e0a..14255102ea8c 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-3.3 b/metadata/md5-cache/app-office/gnucash-3.3
index 1a75f05c5365..0b3c7b29e21f 100644
--- a/metadata/md5-cache/app-office/gnucash-3.3
+++ b/metadata/md5-cache/app-office/gnucash-3.3
@@ -12,4 +12,4 @@ REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.3/gnucash-3.3.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f412925091b38c827f1b8d8b5efe3d67
+_md5_=191fec6aa53e30a75527f3101ef9d225
diff --git a/metadata/md5-cache/app-office/gnucash-3.3-r1 b/metadata/md5-cache/app-office/gnucash-3.3-r1
index 2c975b1b7824..9157cc29b081 100644
--- a/metadata/md5-cache/app-office/gnucash-3.3-r1
+++ b/metadata/md5-cache/app-office/gnucash-3.3-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.3/gnucash-3.3.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=855149dce3d314e9a935aee78f5b0981
+_md5_=3f63915bf7a71edd7bcd3fb1e5fff363
diff --git a/metadata/md5-cache/app-office/gnucash-3.4 b/metadata/md5-cache/app-office/gnucash-3.4
index aacf3d81c8c0..3dc8b8741d5c 100644
--- a/metadata/md5-cache/app-office/gnucash-3.4
+++ b/metadata/md5-cache/app-office/gnucash-3.4
@@ -12,4 +12,4 @@ REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.4/gnucash-3.4.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=dbb78cd992e0e84e868452346f29d41a
+_md5_=24dab66b35de21be361e6487ce0d8ce2
diff --git a/metadata/md5-cache/app-office/gnucash-3.5 b/metadata/md5-cache/app-office/gnucash-3.5
index 54ca9bfd76b3..69c31112f8b6 100644
--- a/metadata/md5-cache/app-office/gnucash-3.5
+++ b/metadata/md5-cache/app-office/gnucash-3.5
@@ -12,4 +12,4 @@ REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.5/gnucash-3.5.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7a30df4782bacf92af304a137d7b7cca
+_md5_=497f32feb7ff51502b4b480188416159
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.4 b/metadata/md5-cache/app-office/kmymoney-5.0.4
index 151fab86cbe2..f6a0994910de 100644
--- a/metadata/md5-cache/app-office/kmymoney-5.0.4
+++ b/metadata/md5-cache/app-office/kmymoney-5.0.4
@@ -5,11 +5,11 @@ DESCRIPTION=Personal finance manager based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://kmymoney.org
 IUSE=activities addressbook calendar hbci holidays ofx quotes webkit weboob test debug +handbook test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kcodecs-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/kjobwidgets-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwallet-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/sonnet-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error activities? ( >=kde-frameworks/kactivities-5.57.0:5 ) addressbook? ( >=kde-apps/akonadi-18.12.3:5 >=kde-apps/kcontacts-18.12.3:5 >=kde-apps/kidentitymanagement-18.12.3:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.6.5 >=sys-libs/gwenhywfar-4.15.3-r1[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.57.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.57.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) weboob? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-qt/qtconcurrent-5.11.1:5 www-client/weboob[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !app-office/kmymoney:4 quotes? ( dev-perl/Finance-Quote ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 REQUIRED_USE=weboob? ( python_targets_python2_7 )
 SLOT=5
 SRC_URI=mirror://kde/stable/kmymoney/5.0.4/src/kmymoney-5.0.4.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6f527f1372a6147acebc0db6001e55e9
+_md5_=06f35a3c3de4bbc9ea8c78e684712702
diff --git a/metadata/md5-cache/app-office/libreoffice-6.2.3.2 b/metadata/md5-cache/app-office/libreoffice-6.2.3.2
deleted file mode 100644
index 8a471648a974..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-6.2.3.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install 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_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.14.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A full office productivity suite
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde ldap +mariadb 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_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-6.2*
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.14.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.2.3.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.2.3.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.2.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.3//libreoffice-6.2.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.3//libreoffice-help-6.2.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.3.2/src/libreoffice-6.2.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.3.2/src/libreoffice-help-6.2.3.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7aeba68ee6b266a1f157ee880fb1705f
diff --git a/metadata/md5-cache/app-office/libreoffice-6.2.4.2 b/metadata/md5-cache/app-office/libreoffice-6.2.4.2
new file mode 100644
index 000000000000..5d0f826f79e5
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-6.2.4.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install 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_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.14.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A full office productivity suite
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde ldap +mariadb 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_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-6.2*
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.14.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.2.4.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.2.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.2.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.4//libreoffice-6.2.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.4//libreoffice-help-6.2.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.4.2/src/libreoffice-6.2.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.4.2/src/libreoffice-help-6.2.4.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=33aa405b4115c8ec1f9a888ddba53bb0
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.1.5.2 b/metadata/md5-cache/app-office/libreoffice-bin-6.1.5.2
index c49364d3202f..30a445346b25 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-6.1.5.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.1.5.2
@@ -7,10 +7,10 @@ IUSE=gnome java kde elibc_FreeBSD java python_targets_python3_6
 KEYWORDS=-* amd64 x86
 LICENSE=LGPL-3
 PDEPEND==app-office/libreoffice-l10n-6.1.5.2*
-RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.65.0 dev-libs/icu:0/63.1 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-7.3.0 >=sys-libs/glibc-2.27 virtual/jpeg:62 python_targets_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/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 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.65.0 dev-libs/icu:0/63.1 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-7.3.0 >=sys-libs/glibc-2.27 virtual/jpeg-compat:62 python_targets_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/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 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) python_targets_python3_6
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-6.1.5.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-6.1.5.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-6.1.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-java-6.1.5.2.xd3 ) ) ) ) x86? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-6.1.5.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-java-6.1.5.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-6.1.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-java-6.1.5.2.xd3 ) ) ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=18e9d9309f1a153356a555e9d66d2be8
+_md5_=89b546abfa5eb3c9cbebc304b385df59
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.2.3.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.2.3.2
deleted file mode 100644
index 822bb67b9a3a..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-l10n-6.2.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Translations for the Libreoffice suite
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-RDEPEND=app-text/hunspell
-RESTRICT=strip
-SLOT=0
-SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.3/rpm/x86/LibreOffice_6.2.3_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.3/rpm/x86/LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.2.3.2_Linux_x86_rpm_langpack_zu.tar.gz )
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	rpm	f52cfa3a435468d86d3b49c357b9cb35
-_md5_=4231539c6910beb5b0b7eaff7ce49253
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.2.4.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.2.4.2
new file mode 100644
index 000000000000..5e81ef4a83a3
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.2.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.4/rpm/x86/LibreOffice_6.2.4_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.4/rpm/x86/LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zu.tar.gz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_md5_=4231539c6910beb5b0b7eaff7ce49253
diff --git a/metadata/md5-cache/app-office/scribus-1.5.5_pre20190429 b/metadata/md5-cache/app-office/scribus-1.5.5_pre20190429
index 39fc39fcbfbd..c626a06a822c 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.5_pre20190429
+++ b/metadata/md5-cache/app-office/scribus-1.5.5_pre20190429
@@ -4,11 +4,11 @@ DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=6
 HOMEPAGE=https://www.scribus.net/
 IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk l10n_af l10n_ar l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_de-CH l10n_de-DE l10n_el l10n_en-AU l10n_en-GB l10n_en-US l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_kab l10n_kn l10n_ko l10n_ku l10n_la l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sa l10n_sk l10n_sl l10n_so l10n_sq l10n_sr l10n_sv l10n_te l10n_th l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW python_targets_python2_7
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
 REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
 SLOT=0
 SRC_URI=https://github.com/scribusproject/scribus/archive/a6cf8dce47922ebe3fca131316236e3aa7ca2d9b.tar.gz -> scribus-1.5.5_pre20190429.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e89df9e70fffc84b7ab3ccf9de132e38
+_md5_=419ed4c079b628d721bfcfb4a69ae134
diff --git a/metadata/md5-cache/app-office/skrooge-2.19.1 b/metadata/md5-cache/app-office/skrooge-2.19.1
index f6bd18b739cb..30f274782695 100644
--- a/metadata/md5-cache/app-office/skrooge-2.19.1
+++ b/metadata/md5-cache/app-office/skrooge-2.19.1
@@ -5,7 +5,7 @@ DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
 EAPI=7
 HOMEPAGE=https://skrooge.org/
 IUSE=activities designer kde ofx webkit test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/knotifyconfig-5.57.0:5 >=kde-frameworks/kparts-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwallet-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.57.0:5 ) kde? ( >=kde-frameworks/krunner-5.57.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) >=dev-qt/qtquickcontrols-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 REQUIRED_USE=test? ( designer )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.19.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c5fe033b75ad53207c8a485c8ef0b3e3
+_md5_=c0c4f863d49f2993a08d02cd10f93b74
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 802e96b890b8..b82f9f3d58a5 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/elicense-1.0.0 b/metadata/md5-cache/app-portage/elicense-1.0.0
deleted file mode 100644
index 8fa8352e0242..000000000000
--- a/metadata/md5-cache/app-portage/elicense-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tool to find installed packages in Gentoo with non-accepted license(s)
-EAPI=7
-HOMEPAGE=https://github.com/Whissi/elicense
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/Whissi/elicense/archive/v1.0.0.tar.gz -> elicense-1.0.0.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=00c197eca5e806cfd5e547a824016295
diff --git a/metadata/md5-cache/app-portage/elicense-1.0.1 b/metadata/md5-cache/app-portage/elicense-1.0.1
new file mode 100644
index 000000000000..dfa57189164a
--- /dev/null
+++ b/metadata/md5-cache/app-portage/elicense-1.0.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tool to find installed packages in Gentoo with non-accepted license(s)
+EAPI=7
+HOMEPAGE=https://github.com/Whissi/elicense
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/Whissi/elicense/archive/v1.0.1.tar.gz -> elicense-1.0.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=10d93a3058aa3c68d7441da1fcb99f84
diff --git a/metadata/md5-cache/app-portage/elicense-9999 b/metadata/md5-cache/app-portage/elicense-9999
index cfb5b9fc7939..496a1e02c35d 100644
--- a/metadata/md5-cache/app-portage/elicense-9999
+++ b/metadata/md5-cache/app-portage/elicense-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=00c197eca5e806cfd5e547a824016295
+_md5_=436839d9454fd25e60b442a762afb5c7
diff --git a/metadata/md5-cache/app-portage/gemato-14.1 b/metadata/md5-cache/app-portage/gemato-14.1
index eb6e4ee548fb..da3e1d9f7af1 100644
--- a/metadata/md5-cache/app-portage/gemato-14.1
+++ b/metadata/md5-cache/app-portage/gemato-14.1
@@ -4,11 +4,11 @@ DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/gemato
 IUSE=+blake2 bzip2 +gpg lzma sha3 test tools python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd
 LICENSE=BSD-2
 RDEPEND=blake2? ( 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_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_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_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-14.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e9e33a631b47320cd1ded45a1a777cba
+_md5_=db787b767143470004eec4228e598e6b
diff --git a/metadata/md5-cache/app-portage/genlop-0.30.10-r2 b/metadata/md5-cache/app-portage/genlop-0.30.10-r2
index b7fc35a1eae2..d958f9199f49 100644
--- a/metadata/md5-cache/app-portage/genlop-0.30.10-r2
+++ b/metadata/md5-cache/app-portage/genlop-0.30.10-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
 DESCRIPTION=A nice emerge.log parser
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/genlop-0.30.10.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4d171b537001bd58bf0193c5e8a73f43
+_md5_=7332ed922c05eace7842378fe9943138
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.0.1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.0.1
deleted file mode 100644
index 1fa69e4cd923..000000000000
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.0.1
+++ /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[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-analyzer/netselect python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dolsen/distfiles/mirrorselect-2.2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a999ac497c9ddbbbf6876682891af74d
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.2 b/metadata/md5-cache/app-portage/mirrorselect-2.2.2
deleted file mode 100644
index a27042000a7a..000000000000
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.2
+++ /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[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/ssl-fetch-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.2.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cb53a078d7f149b58d1ca24dcd73dbed
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.2-r2 b/metadata/md5-cache/app-portage/mirrorselect-2.2.2-r2
deleted file mode 100644
index e069c2e3e80b..000000000000
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.2-r2
+++ /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[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.2.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3c8bac31b097ceb98635a361bc9c8427
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.4 b/metadata/md5-cache/app-portage/mirrorselect-2.2.4
deleted file mode 100644
index 8732519b7810..000000000000
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.4.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e090412ae83c22b77ecb3413b11940bd
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
new file mode 100644
index 000000000000..85fb9cc75a95
--- /dev/null
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.4.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=a78ceefe57ada3903314300ccd6c41bf
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.5 b/metadata/md5-cache/app-portage/mirrorselect-2.2.5
new file mode 100644
index 000000000000..e046027e75a8
--- /dev/null
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.5
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)] >=dev-python/ssl-fetch-0.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.5.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=3cef92f6e189afc2f88d2f58bf93b3ef
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index 3ccf5cdd8232..20b89c4bf965 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -1,12 +1,12 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-analyzer/netselect =dev-python/ssl-fetch-9999[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[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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)] =dev-python/ssl-fetch-9999[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8470304d94f31315a14bd1b1e3a94fba
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=866ae2fbaf4e5578ddee9e7740655b3e
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.80_pre20190530 b/metadata/md5-cache/app-portage/portage-utils-0.80_pre20190530
new file mode 100644
index 000000000000..40812efd9515
--- /dev/null
+++ b/metadata/md5-cache/app-portage/portage-utils-0.80_pre20190530
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/iniparser:0 app-arch/xz-utils static? ( dev-libs/iniparser:0[static-libs] ) qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:0= sys-libs/zlib app-crypt/gpgme )
+DESCRIPTION=Small and fast Portage helper tools written in C
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
+IUSE=nls static openmp +qmanifest
+KEYWORDS=~amd64 ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/iniparser:0
+SLOT=0
+SRC_URI=mirror://gentoo/portage-utils-0.80_pre20190530.tar.xz https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.80_pre20190530.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c6b386180fd796bf7c481cc2c64d1a6a
diff --git a/metadata/md5-cache/app-portage/portage-utils-9999 b/metadata/md5-cache/app-portage/portage-utils-9999
index 86f99e6fa008..95f6c938d471 100644
--- a/metadata/md5-cache/app-portage/portage-utils-9999
+++ b/metadata/md5-cache/app-portage/portage-utils-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure prepare unpack
-DEPEND=dev-libs/iniparser:0 app-arch/xz-utils static? ( dev-libs/iniparser:0[static-libs] ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/iniparser:0 app-arch/xz-utils static? ( dev-libs/iniparser:0[static-libs] ) qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:0= sys-libs/zlib app-crypt/gpgme ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Small and fast Portage helper tools written in C
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
-IUSE=nls static
+IUSE=nls static openmp +qmanifest
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=d7718c9a0742ad78105ee411e75b7075
+_md5_=808fbdfb84476290c8c2561de8f94b85
diff --git a/metadata/md5-cache/app-portage/pram-7 b/metadata/md5-cache/app-portage/pram-7
new file mode 100644
index 000000000000..454a031b3228
--- /dev/null
+++ b/metadata/md5-cache/app-portage/pram-7
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-vcs/git net-misc/wget[ssl] virtual/editor !dev-perl/Gentoo-App-Pram app-crypt/gnupg sys-apps/diffutils )
+DESCRIPTION=Tool to ease merging Pull Requests and git patches
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/pram
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-vcs/git net-misc/wget[ssl] virtual/editor !dev-perl/Gentoo-App-Pram
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mgorny/pram/archive/v7.tar.gz -> pram-7.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=93b453efb2c32e160828d2adc90470b4
diff --git a/metadata/md5-cache/app-portage/prefix-toolkit-1 b/metadata/md5-cache/app-portage/prefix-toolkit-1
new file mode 100644
index 000000000000..6ea9ffeed11b
--- /dev/null
+++ b/metadata/md5-cache/app-portage/prefix-toolkit-1
@@ -0,0 +1,10 @@
+BDEPEND=>sys-apps/portage-2.3.62
+DEFINED_PHASES=configure install unpack
+DESCRIPTION=Utilities for users of Gentoo Prefix
+EAPI=7
+HOMEPAGE=https://prefix.gentoo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=GPL-3
+RDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils prefix-stack? ( >=sys-apps/baselayout-prefix-2.6 )
+SLOT=0
+_md5_=c065bb627b943e59acac97ebae711ab4
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.13 b/metadata/md5-cache/app-portage/repoman-2.3.13
new file mode 100644
index 000000000000..b94b7bd9d94d
--- /dev/null
+++ b/metadata/md5-cache/app-portage/repoman-2.3.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=sys-apps/portage-2.3.43[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=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_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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.43[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.13.tar.bz2
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=bbd1a89d74fae36495700cc03031f890
diff --git a/metadata/md5-cache/app-portage/unsymlink-lib-14 b/metadata/md5-cache/app-portage/unsymlink-lib-14
new file mode 100644
index 000000000000..a04f59198c2c
--- /dev/null
+++ b/metadata/md5-cache/app-portage/unsymlink-lib-14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup test
+DESCRIPTION=Convert your system to SYMLINK_LIB=no
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/unsymlink-lib
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64
+LICENSE=BSD-2
+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 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/unsymlink-lib/archive/v14.tar.gz -> unsymlink-lib-14.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=0015a0edd32cb1af206729ab1333be6f
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 712a0ebf75a5..9dec4adbeac6 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-completion-2.9 b/metadata/md5-cache/app-shells/bash-completion-2.9
index fff1faa3d7ba..17f70c6bb50b 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.9
+++ b/metadata/md5-cache/app-shells/bash-completion-2.9
@@ -4,7 +4,7 @@ DESCRIPTION=Programmable Completion for bash
 EAPI=7
 HOMEPAGE=https://github.com/scop/bash-completion
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-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:0 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.9/bash-completion-2.9.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=7f324a0a86a7a73e2012be744113bd69
+_md5_=9977be8a2c76f33b7620f7c6b45235de
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.9-r1 b/metadata/md5-cache/app-shells/bash-completion-2.9-r1
new file mode 100644
index 000000000000..e0234c63e23a
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-completion-2.9-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prepare setup test
+DEPEND=app-arch/xz-utils test? ( >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib || ( ( dev-lang/python:3.7 dev-python/pexpect[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pytest[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pexpect[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pytest[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pexpect[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pytest[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) )
+DESCRIPTION=Programmable Completion for bash
+EAPI=7
+HOMEPAGE=https://github.com/scop/bash-completion
+IUSE=+eselect test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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:0 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/scop/bash-completion/releases/download/2.9/bash-completion-2.9.tar.xz eselect? ( https://github.com/mgorny/bashcomp2/releases/download/v2.0.3/bashcomp-2.0.3.tar.gz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=17e22ae91cd4cffadc218fe124cbf09b
diff --git a/metadata/md5-cache/app-shells/bash-completion-9999 b/metadata/md5-cache/app-shells/bash-completion-9999
index 2a89c6d7000f..6a629c4d8132 100644
--- a/metadata/md5-cache/app-shells/bash-completion-9999
+++ b/metadata/md5-cache/app-shells/bash-completion-9999
@@ -1,15 +1,14 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst prepare setup test unpack
-DEPEND=app-arch/xz-utils test? ( >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib || ( ( dev-lang/python:3.7 dev-python/pexpect[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pytest[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pexpect[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pytest[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pexpect[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pytest[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) )
+DEPEND=test? ( >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib || ( ( dev-lang/python:3.7 dev-python/pexpect[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pytest[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pexpect[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pytest[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pexpect[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pytest[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) )
 DESCRIPTION=Programmable Completion for bash
 EAPI=7
 HOMEPAGE=https://github.com/scop/bash-completion
-IUSE=test
+IUSE=+eselect test
 LICENSE=GPL-2+
 PDEPEND=>=app-shells/gentoo-bashcomp-20140911
 RDEPEND=>=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=7566c79e84a8f9fcf97964cdcc84fdc6
+_md5_=a3794abe1047bcf7f8e107ccdb7d10e5
diff --git a/metadata/md5-cache/app-shells/fish-3.0.2 b/metadata/md5-cache/app-shells/fish-3.0.2
index 34a9fbf729f1..259cba51ef39 100644
--- a/metadata/md5-cache/app-shells/fish-3.0.2
+++ b/metadata/md5-cache/app-shells/fish-3.0.2
@@ -5,10 +5,10 @@ DESCRIPTION=Friendly Interactive SHell
 EAPI=7
 HOMEPAGE=http://fishshell.com/
 IUSE=doc nls test
-KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-devel/bc sys-libs/ncurses:0=[unicode]
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.0.2/fish-3.0.2.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=62fbf11a12c9229ea884c840b7429c52
+_md5_=6863b86f4b25999ac0027c383e21940e
diff --git a/metadata/md5-cache/app-shells/fzy-1.0 b/metadata/md5-cache/app-shells/fzy-1.0
index ca9af7066109..7546d0a2a3c6 100644
--- a/metadata/md5-cache/app-shells/fzy-1.0
+++ b/metadata/md5-cache/app-shells/fzy-1.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm arm64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/jhawthorn/fzy/releases/download/1.0/fzy-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=af13b07c58961c7e28e8fae060b682f9
diff --git a/metadata/md5-cache/app-shells/fzy-9999 b/metadata/md5-cache/app-shells/fzy-9999
index 8725f5d97ae3..c5c952b61596 100644
--- a/metadata/md5-cache/app-shells/fzy-9999
+++ b/metadata/md5-cache/app-shells/fzy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jhawthorn/fzy
 IUSE=test savedconfig
 LICENSE=MIT
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=956c351c64c85fcc9a0ede0006e7ca0e
diff --git a/metadata/md5-cache/app-shells/ksh-2020.0.0_alpha1 b/metadata/md5-cache/app-shells/ksh-2020.0.0_alpha1
index 00836af2db7d..56aefddf2a83 100644
--- a/metadata/md5-cache/app-shells/ksh-2020.0.0_alpha1
+++ b/metadata/md5-cache/app-shells/ksh-2020.0.0_alpha1
@@ -7,6 +7,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=CPL-1.0 EPL-1.0
 RDEPEND=!app-shells/pdksh
 SLOT=0
-SRC_URI=https://github.com/att/ast/releases/download/2020.0.0-alpha1/ksh-2020.0.0-alpha1.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=cfc1f80be1cefdc4ade28e30b58f0cec
+SRC_URI=https://github.com/att/ast/releases/download/2020.0.0-alpha1/ksh-2020.0.0-alpha1.tar.gz https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ksh-solaris.patch https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ksh-conftab.patch
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=6fd7090e5b6c65a25a140690861bfd3c
diff --git a/metadata/md5-cache/app-shells/mcfly-0.3.4 b/metadata/md5-cache/app-shells/mcfly-0.3.4
new file mode 100644
index 000000000000..10392b4b6f2c
--- /dev/null
+++ b/metadata/md5-cache/app-shells/mcfly-0.3.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=virtual/cargo
+DESCRIPTION=Context-aware bash history search replacement (crtl-r)
+EAPI=6
+HOMEPAGE=https://github.com/cantino/mcfly
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/cantino/mcfly/archive/v0.3.4.tar.gz -> mcfly-0.3.4.tar.gz https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/cc/1.0.18/download -> cc-1.0.18.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/csv/1.0.1/download -> csv-1.0.1.crate https://crates.io/api/v1/crates/csv-core/0.1.4/download -> csv-core-0.1.4.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/failure/0.1.2/download -> failure-0.1.2.crate https://crates.io/api/v1/crates/failure_derive/0.1.2/download -> failure_derive-0.1.2.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.10.0/download -> libsqlite3-sys-0.10.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.4.2/download -> linked-hash-map-0.4.2.crate https://crates.io/api/v1/crates/lru-cache/0.1.1/download -> lru-cache-0.1.1.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.4.20/download -> proc-macro2-0.4.20.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.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/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/relative-path/0.4.0/download -> relative-path-0.4.0.crate https://crates.io/api/v1/crates/rusqlite/0.15.0/download -> rusqlite-0.15.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/serde/1.0.75/download -> serde-1.0.75.crate https://crates.io/api/v1/crates/shellexpand/1.0.0/download -> shellexpand-1.0.0.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.14.9/download -> syn-0.14.9.crate https://crates.io/api/v1/crates/synstructure/0.9.0/download -> synstructure-0.9.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-segmentation/1.2.1/download -> unicode-segmentation-1.2.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.4/download -> vcpkg-0.2.4.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=036ebaadba4a26450ef5d21f14bee786
diff --git a/metadata/md5-cache/app-shells/rc-1.7.4 b/metadata/md5-cache/app-shells/rc-1.7.4
deleted file mode 100644
index 2a443ce3829f..000000000000
--- a/metadata/md5-cache/app-shells/rc-1.7.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=readline? ( sys-libs/readline:0 ) libedit? ( dev-libs/libedit )
-DESCRIPTION=A reimplementation of the Plan 9 shell
-EAPI=5
-HOMEPAGE=http://static.tobold.org/
-IUSE=libedit readline
-KEYWORDS=~amd64 ~x86
-LICENSE=rc
-RDEPEND=readline? ( sys-libs/readline:0 ) libedit? ( dev-libs/libedit )
-SLOT=0
-SRC_URI=http://static.tobold.org/rc/rc-1.7.4.tar.gz
-_md5_=d8c1d7b3fe0cb6adfe8330b42cf793b4
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 01a0624cad83..51526d88886d 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/calibre-3.41.3 b/metadata/md5-cache/app-text/calibre-3.41.3
deleted file mode 100644
index 2d8863f29552..000000000000
--- a/metadata/md5-cache/app-text/calibre-3.41.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=6
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/3.41.3/calibre-3.41.3.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=870a73045a37116b3ffeb3fc8ffccb02
diff --git a/metadata/md5-cache/app-text/calibre-3.43.0 b/metadata/md5-cache/app-text/calibre-3.43.0
new file mode 100644
index 000000000000..54393297fd75
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-3.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/3.43.0/calibre-3.43.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=d2c43b60830f643dc869fdc1a73172b1
diff --git a/metadata/md5-cache/app-text/calibre-3.44.0 b/metadata/md5-cache/app-text/calibre-3.44.0
new file mode 100644
index 000000000000..843711f8b54f
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-3.44.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/3.44.0/calibre-3.44.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=d2c43b60830f643dc869fdc1a73172b1
diff --git a/metadata/md5-cache/app-text/convertlit-1.8-r3 b/metadata/md5-cache/app-text/convertlit-1.8-r3
index d6a3f464f479..1cc7b735a5d0 100644
--- a/metadata/md5-cache/app-text/convertlit-1.8-r3
+++ b/metadata/md5-cache/app-text/convertlit-1.8-r3
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libtommath-0.36-r1 app-arch/unzip
 DESCRIPTION=CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)
 EAPI=6
 HOMEPAGE=http://www.convertlit.com/
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libtommath-0.36-r1
 SLOT=0
 SRC_URI=http://www.convertlit.com/clit18src.zip
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=7530c8c1795f8eed62bde071360ebd7f
+_md5_=e21752619b9f9396d0131a531adcb4da
diff --git a/metadata/md5-cache/app-text/dvipsk-5.999_p20190410 b/metadata/md5-cache/app-text/dvipsk-5.999_p20190410
new file mode 100644
index 000000000000..9b76c38702c8
--- /dev/null
+++ b/metadata/md5-cache/app-text/dvipsk-5.999_p20190410
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/kpathsea-6.2.1
+DESCRIPTION=DVI-to-PostScript translator
+EAPI=7
+HOMEPAGE=http://tug.org/texlive/
+IUSE=doc source
+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
+SLOT=0
+SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz mirror://gentoo/texlive-module-dvips-2019.tar.xz doc? ( mirror://gentoo/texlive-module-dvips.doc-2019.tar.xz )
+_eclasses_=texlive-common	9a9339b2c296eb12e91ef1d8e9a4c6d3
+_md5_=314f108a76986e4eaa8061991573334b
diff --git a/metadata/md5-cache/app-text/ebook-tools-0.2.2-r1 b/metadata/md5-cache/app-text/ebook-tools-0.2.2-r1
index 34621237ecb0..37792a376261 100644
--- a/metadata/md5-cache/app-text/ebook-tools-0.2.2-r1
+++ b/metadata/md5-cache/app-text/ebook-tools-0.2.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for accessing and converting various ebook file formats
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/ebook-tools/
 IUSE=+lit2epub
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=dev-libs/libxml2 dev-libs/libzip:= lit2epub? ( app-text/convertlit )
 SLOT=0
 SRC_URI=mirror://sourceforge/ebook-tools/ebook-tools-0.2.2.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e5abaafb227ae9b2eb8c90160a6df65f
+_md5_=29dd9b9ab224377205204fb372ba42dd
diff --git a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.1 b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.1
index 2ea6d892a49d..e6e87abea043 100644
--- a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.1
+++ b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=EditorConfig core library written in C
 EAPI=6
 HOMEPAGE=https://github.com/editorconfig/editorconfig-core-c/
 IUSE=cli doc
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libpcre:= cli? ( !dev-python/editorconfig-core-py[cli] )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.1.tar.gz -> editorconfig-core-c-0.12.1.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=44e910141a78fcc28fcc6871eb262d5e
+_md5_=059aa3e7db1e01fd8f5f91592c27fca8
diff --git a/metadata/md5-cache/app-text/gtranslator-3.32.0 b/metadata/md5-cache/app-text/gtranslator-3.32.0
index 241b455da489..4442a0c223c4 100644
--- a/metadata/md5-cache/app-text/gtranslator-3.32.0
+++ b/metadata/md5-cache/app-text/gtranslator-3.32.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.36.0:2 >=x11-libs/gtk+-3.22.20:3 gnome-extra/libgda:5= gnome-base/gsettings-desktop-schemas >=app-text/gspell-1.2.0:= >=x11-libs/gtksourceview-4.0.2:4 >=dev-libs/libxml2-2.4.12:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtranslator/3.32/gtranslator-3.32.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=01253e58b3a7eda54f75ee3a37b70149
diff --git a/metadata/md5-cache/app-text/libgepub-0.6.0 b/metadata/md5-cache/app-text/libgepub-0.6.0
index b2fe3d537ac0..f49d0a9cdaad 100644
--- a/metadata/md5-cache/app-text/libgepub-0.6.0
+++ b/metadata/md5-cache/app-text/libgepub-0.6.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgepub/0.6/libgepub-0.6.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=e68e9dc71f380d698c27d7bdceef9938
diff --git a/metadata/md5-cache/app-text/libgxps-0.3.0 b/metadata/md5-cache/app-text/libgxps-0.3.0
index 7b6d1c3168b1..68ab57f91dae 100644
--- a/metadata/md5-cache/app-text/libgxps-0.3.0
+++ b/metadata/md5-cache/app-text/libgxps-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=4113e566613036100fbb60914d9a6f8b
diff --git a/metadata/md5-cache/app-text/libgxps-0.3.1 b/metadata/md5-cache/app-text/libgxps-0.3.1
index 8da57b90d51d..bd8f19ad576c 100644
--- a/metadata/md5-cache/app-text/libgxps-0.3.1
+++ b/metadata/md5-cache/app-text/libgxps-0.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for handling and rendering XPS documents
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libgxps
 IUSE=gtk-doc +introspection jpeg lcms tiff
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 media-libs/libpng:0 >=x11-libs/cairo-1.10[svg] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) tiff? ( media-libs/tiff:0[zlib] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=867eb60b29aeaa784536ca1b451eada3
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=61cb752c49a7e90c25432c08eed9d0ca
diff --git a/metadata/md5-cache/app-text/poppler-0.77.0 b/metadata/md5-cache/app-text/poppler-0.77.0
new file mode 100644
index 000000000000..529dd0d1170c
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-0.77.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1: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 )
+DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
+EAPI=7
+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 ~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 media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1: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 )
+RESTRICT=test
+SLOT=0/88
+SRC_URI=https://poppler.freedesktop.org/poppler-0.77.0.tar.xz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=cfb250772f26db8c206e8b3029cbc2b5
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index 0909c723327f..f0f97bdedd8e 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -10,4 +10,4 @@ RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-lib
 RESTRICT=test
 SLOT=0/9999
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c4bfb9afbf8c47d175f16306897f4a93
+_md5_=21ad1e6cb7e843c52f3bba886bfaab44
diff --git a/metadata/md5-cache/app-text/ps2pkm-1.8_p20190410 b/metadata/md5-cache/app-text/ps2pkm-1.8_p20190410
new file mode 100644
index 000000000000..339ef4dbc367
--- /dev/null
+++ b/metadata/md5-cache/app-text/ps2pkm-1.8_p20190410
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=>=dev-libs/kpathsea-6.2.1
+DESCRIPTION=Tool that converts a PostScript type1 font into a corresponding TeX PK font
+EAPI=7
+HOMEPAGE=http://tug.org/texlive/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-libs/kpathsea-6.2.1
+SLOT=0
+SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz
+_md5_=541949ad9682848442e25f857e470ddc
diff --git a/metadata/md5-cache/app-text/recode-3.6_p20-r1 b/metadata/md5-cache/app-text/recode-3.6_p20-r1
index 4aada0636870..1fcbe62a71f1 100644
--- a/metadata/md5-cache/app-text/recode-3.6_p20-r1
+++ b/metadata/md5-cache/app-text/recode-3.6_p20-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Convert files between various character sets
 EAPI=5
 HOMEPAGE=https://github.com/rrthomas/recode
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 SLOT=0
 SRC_URI=mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_3.6-20.debian.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8864d85540404fb62d76e58a7deff17e
+_md5_=6f973ea2d52cd80f7c8e22203002e33a
diff --git a/metadata/md5-cache/app-text/scdoc-1.9.3-r1 b/metadata/md5-cache/app-text/scdoc-1.9.3-r1
index 96d4cf8c4c36..0c4258430180 100644
--- a/metadata/md5-cache/app-text/scdoc-1.9.3-r1
+++ b/metadata/md5-cache/app-text/scdoc-1.9.3-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Standalone tool for generating man pages with a simple syntax
 EAPI=7
 HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.9.3.tar.gz -> scdoc-1.9.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0674268025e6cead87f2b23c66ce92e1
+_md5_=4a0cf6cb548677b082ceecc5966a43cd
diff --git a/metadata/md5-cache/app-text/sdcv-0.5.2 b/metadata/md5-cache/app-text/sdcv-0.5.2
index 48cf5da5a984..37bb5e85b92b 100644
--- a/metadata/md5-cache/app-text/sdcv-0.5.2
+++ b/metadata/md5-cache/app-text/sdcv-0.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=Console version of Stardict program
 EAPI=6
 HOMEPAGE=https://dushistov.github.io/sdcv/
 IUSE=darkterm nls readline test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6.1 sys-libs/zlib readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=https://github.com/Dushistov/sdcv/archive/v0.5.2.tar.gz -> sdcv-0.5.2.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e5336b12354af655e06aede70d5d862a
+_md5_=1e9a6eb9e16a450ad8e1c6dd4f9bff52
diff --git a/metadata/md5-cache/app-text/texlive-core-2019 b/metadata/md5-cache/app-text/texlive-core-2019
new file mode 100644
index 000000000000..1f5490e5a92c
--- /dev/null
+++ b/metadata/md5-cache/app-text/texlive-core-2019
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/ed sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !dev-tex/luatex sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.7 ) >=app-text/poppler-0.76.1:=
+DESCRIPTION=A complete TeX distribution
+EAPI=7
+HOMEPAGE=https://tug.org/texlive/
+IUSE=cjk X doc source tk +luajittex xetex
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~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 LPPL-1.3c TeX
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !dev-tex/luatex sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.7 ) >=app-text/poppler-0.76.1:= >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
+SLOT=0
+SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz https://dev.gentoo.org/~zlogene/texlive-core-2019-poppler076.patch.xz mirror://gentoo/texlive-module-tetex-2019.tar.xz mirror://gentoo/texlive-module-hyphen-base-2019.tar.xz mirror://gentoo/texlive-module-gsftopk-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra-2019.tar.xz mirror://gentoo/texlive-module-a2ping-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2019.tar.xz mirror://gentoo/texlive-module-arara-2019.tar.xz mirror://gentoo/texlive-module-asymptote-2019.tar.xz mirror://gentoo/texlive-module-bundledoc-2019.tar.xz mirror://gentoo/texlive-module-checklistings-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk-2019.tar.xz mirror://gentoo/texlive-module-ctanify-2019.tar.xz mirror://gentoo/texlive-module-ctanupload-2019.tar.xz mirror://gentoo/texlive-module-ctie-2019.tar.xz mirror://gentoo/texlive-module-cweb-2019.tar.xz mirror://gentoo/texlive-module-de-macro-2019.tar.xz mirror://gentoo/texlive-module-dtl-2019.tar.xz mirror://gentoo/texlive-module-dtxgen-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty-2019.tar.xz mirror://gentoo/texlive-module-dviasm-2019.tar.xz mirror://gentoo/texlive-module-dvicopy-2019.tar.xz mirror://gentoo/texlive-module-dvidvi-2019.tar.xz mirror://gentoo/texlive-module-dviljk-2019.tar.xz mirror://gentoo/texlive-module-dvipos-2019.tar.xz mirror://gentoo/texlive-module-findhyph-2019.tar.xz mirror://gentoo/texlive-module-fragmaster-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2019.tar.xz mirror://gentoo/texlive-module-hyphenex-2019.tar.xz mirror://gentoo/texlive-module-installfont-2019.tar.xz mirror://gentoo/texlive-module-lacheck-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize-2019.tar.xz mirror://gentoo/texlive-module-latex2man-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion-2019.tar.xz mirror://gentoo/texlive-module-latexpand-2019.tar.xz mirror://gentoo/texlive-module-latexindent-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2019.tar.xz mirror://gentoo/texlive-module-ltximg-2019.tar.xz mirror://gentoo/texlive-module-listings-ext-2019.tar.xz mirror://gentoo/texlive-module-make4ht-2019.tar.xz mirror://gentoo/texlive-module-match_parens-2019.tar.xz mirror://gentoo/texlive-module-mflua-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2019.tar.xz mirror://gentoo/texlive-module-patgen-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2019.tar.xz mirror://gentoo/texlive-module-pdftools-2019.tar.xz mirror://gentoo/texlive-module-pdfxup-2019.tar.xz mirror://gentoo/texlive-module-pfarrei-2019.tar.xz mirror://gentoo/texlive-module-pkfix-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2019.tar.xz mirror://gentoo/texlive-module-purifyeps-2019.tar.xz mirror://gentoo/texlive-module-seetexk-2019.tar.xz mirror://gentoo/texlive-module-srcredact-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx-2019.tar.xz mirror://gentoo/texlive-module-synctex-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook-2019.tar.xz mirror://gentoo/texlive-module-texcount-2019.tar.xz mirror://gentoo/texlive-module-texdef-2019.tar.xz mirror://gentoo/texlive-module-texdiff-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten-2019.tar.xz mirror://gentoo/texlive-module-texdoc-2019.tar.xz mirror://gentoo/texlive-module-texfot-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser-2019.tar.xz mirror://gentoo/texlive-module-texosquery-2019.tar.xz mirror://gentoo/texlive-module-texware-2019.tar.xz mirror://gentoo/texlive-module-tie-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2019.tar.xz mirror://gentoo/texlive-module-web-2019.tar.xz mirror://gentoo/texlive-module-collection-binextra-2019.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2019.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2019.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2019.tar.xz mirror://gentoo/texlive-module-arara.doc-2019.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2019.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2019.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2019.tar.xz mirror://gentoo/texlive-module-ctie.doc-2019.tar.xz mirror://gentoo/texlive-module-cweb.doc-2019.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2019.tar.xz mirror://gentoo/texlive-module-dtl.doc-2019.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2019.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2019.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2019.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2019.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2019.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2019.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2019.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2019.tar.xz mirror://gentoo/texlive-module-installfont.doc-2019.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2019.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2019.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2019.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2019.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2019.tar.xz mirror://gentoo/texlive-module-patgen.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2019.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2019.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2019.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2019.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2019.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2019.tar.xz mirror://gentoo/texlive-module-synctex.doc-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2019.tar.xz mirror://gentoo/texlive-module-texcount.doc-2019.tar.xz mirror://gentoo/texlive-module-texdef.doc-2019.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2019.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-texfot.doc-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2019.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2019.tar.xz mirror://gentoo/texlive-module-texware.doc-2019.tar.xz mirror://gentoo/texlive-module-tie.doc-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-web.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2019.tar.xz mirror://gentoo/texlive-module-arara.source-2019.tar.xz mirror://gentoo/texlive-module-checklistings.source-2019.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2019.tar.xz mirror://gentoo/texlive-module-pythontex.source-2019.tar.xz mirror://gentoo/texlive-module-texdef.source-2019.tar.xz mirror://gentoo/texlive-module-texosquery.source-2019.tar.xz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	texlive-common	9a9339b2c296eb12e91ef1d8e9a4c6d3	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1511e2e55984d28bca6a4138b33979e3
diff --git a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20190410 b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20190410
new file mode 100644
index 000000000000..a40e80cfad9d
--- /dev/null
+++ b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20190410
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure
+DESCRIPTION=Freetype 2 based TrueType font to TeX's PK format converter
+EAPI=7
+HOMEPAGE=http://tug.org/texlive/
+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=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1
+SLOT=0
+SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=a65e840f7dbeb6cf4ff4795ed7dd6865
diff --git a/metadata/md5-cache/app-text/wdiff-1.2.2-r1 b/metadata/md5-cache/app-text/wdiff-1.2.2-r1
index e2d24faf6c37..ba050f796393 100644
--- a/metadata/md5-cache/app-text/wdiff-1.2.2-r1
+++ b/metadata/md5-cache/app-text/wdiff-1.2.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Create a diff disregarding formatting
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/wdiff/
 IUSE=experimental test
-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
+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
 LICENSE=GPL-3
 RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gnu/wdiff/wdiff-1.2.2.tar.gz
-_md5_=d24c4b861ee1c5521c87d0784ef0d3c9
+_md5_=e52ad0c275c68a6668bce0d7abd0ce21
diff --git a/metadata/md5-cache/app-text/yelp-tools-3.28.0 b/metadata/md5-cache/app-text/yelp-tools-3.28.0
index 24ca57d79def..7a58be5dcd33 100644
--- a/metadata/md5-cache/app-text/yelp-tools-3.28.0
+++ b/metadata/md5-cache/app-text/yelp-tools-3.28.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gno
 DESCRIPTION=Collection of tools for building and converting documentation
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ freedist ) GPL-2+
 RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.17.3 virtual/awk
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-tools/3.28/yelp-tools-3.28.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a23dc3be5be1672331692f5f9ec196dc
+_md5_=c400245ffce0b62af9d9fe92d2d6d4f1
diff --git a/metadata/md5-cache/app-text/zathura-0.4.3 b/metadata/md5-cache/app-text/zathura-0.4.3
index a51ed523735b..d754ba4afe73 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.3
+++ b/metadata/md5-cache/app-text/zathura-0.4.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/girara-0.3.2 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/download/zathura-0.4.3.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=e580603c7b894a6f339c72335b0898da
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index 43f562014117..36b2083ac866 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -7,5 +7,5 @@ IUSE=+magic seccomp sqlite synctex test test
 LICENSE=ZLIB
 RDEPEND=>=dev-libs/girara-0.3.1 >=dev-libs/glib-2.50:2 dev-python/sphinx >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=656a70a34b53fc0317e44750307d7c3a
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.8 b/metadata/md5-cache/app-text/zathura-cb-0.1.8
index a2d610df50c7..ba5937da0149 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.8
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.8
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=>=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.8.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=526e00e157e33151ddbc6580c01cffa1
diff --git a/metadata/md5-cache/app-text/zathura-cb-9999 b/metadata/md5-cache/app-text/zathura-cb-9999
index a354990b5ad5..72859d0224af 100644
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@@ -7,5 +7,5 @@ HOMEPAGE=https://pwmt.org/projects/zathura-cb/
 LICENSE=ZLIB
 RDEPEND=>=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=e198d1472d4f71941f3c4eced3a5a37b
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.8 b/metadata/md5-cache/app-text/zathura-djvu-0.2.8
index b22e1d23a893..cff56f0827ce 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.8
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.8
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.8.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=41cd223d1d1e6596a503773c2a7f6f91
diff --git a/metadata/md5-cache/app-text/zathura-djvu-9999 b/metadata/md5-cache/app-text/zathura-djvu-9999
index be9f9b606491..1875aed406ae 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-9999
+++ b/metadata/md5-cache/app-text/zathura-djvu-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://pwmt.org/projects/zathura-djvu/
 LICENSE=ZLIB
 RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=6d2e07420725cfbf2c9ea4d1f5c6383f
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.4 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.4
index 73c4286005e8..1f6d00f5021e 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.4
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.4
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/mupdf >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-0.3.4.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=c24ad1bd0b43f6370af5c14a8274a3eb
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
index 2b54a17da0b1..86cf566bae86 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
@@ -7,5 +7,5 @@ HOMEPAGE=https://pwmt.org/projects/zathura-pdf-mupdf/
 LICENSE=ZLIB
 RDEPEND=app-text/mupdf >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=f912bd89fd597846894ff65ee351cb32
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
index acf0573891db..bbdb771b6304 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.9.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=4a1b0d4d2227e2e7ca9c2582b12a33b4
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999 b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
index e5bf1165cffd..878b4fc3ccbc 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -7,5 +7,5 @@ HOMEPAGE=https://pwmt.org/projects/zathura-pdf-poppler
 LICENSE=ZLIB
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=59468750cee85eef2335e0a86adb72f7
diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.6 b/metadata/md5-cache/app-text/zathura-ps-0.2.6
index 00d9113695bb..23da6c465afd 100644
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.6
+++ b/metadata/md5-cache/app-text/zathura-ps-0.2.6
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.6.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=60425c18b2f2d4576c39334b5eff40fe
diff --git a/metadata/md5-cache/app-text/zathura-ps-9999 b/metadata/md5-cache/app-text/zathura-ps-9999
index 064b818fe132..6c6117994676 100644
--- a/metadata/md5-cache/app-text/zathura-ps-9999
+++ b/metadata/md5-cache/app-text/zathura-ps-9999
@@ -7,5 +7,5 @@ HOMEPAGE=https://pwmt.org/projects/zathura-ps/download/
 LICENSE=ZLIB
 RDEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=e8bf62c43a8e00070eb9b865af785044
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 28ff426801bc..e31563753e6e 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/vim-go-1.20 b/metadata/md5-cache/app-vim/vim-go-1.20
new file mode 100644
index 000000000000..3aaee8b5a054
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-go-1.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Go development plugin for Vim
+EAPI=6
+HOMEPAGE=https://github.com/fatih/vim-go
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/fatih/vim-go/archive/v1.20.tar.gz -> vim-go-1.20.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=0bb3b8033ef99c9496e512e1ca9bf352
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 492b9201637d..325ac9061bff 100644
--- a/metadata/md5-cache/app-vim/vim-tmux-3.0.0
+++ b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=vim plugin: tmux support for vim
 EAPI=6
 HOMEPAGE=https://github.com/tmux-plugins/vim-tmux
 KEYWORDS=~alpha alpha amd64 ~arm arm ~arm64 ~hppa ia64 ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd
-LICENSE=vim.org
+LICENSE=public-domain MIT
 RDEPEND=|| ( >=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.tar.gz -> vim-tmux-3.0.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=f322a69d1d79b019c14493bc7bd00855
+_md5_=ac61a78c2b131cea65d1897a8e3ce721
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index e214bd51d5c2..4836da0f670f 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/asis-2018-r1 b/metadata/md5-cache/dev-ada/asis-2018-r1
new file mode 100644
index 000000000000..7771702f21ec
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/asis-2018-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DEPEND=gnat_2017? ( dev-ada/gnat_util[gnat_2017] ) gnat_2018? ( dev-ada/gnat_util[gnat_2018] ) gnat_2019? ( dev-ada/gnat_util[gnat_2019] ) || ( dev-ada/gnatcoll-core[gnat_2017=,gnat_2018=,gnat_2019=,shared] dev-ada/gnatcoll[gnat_2017=,gnat_2018=,gnat_2019=,projects,shared] ) dev-ada/gprbuild[gnat_2017=,gnat_2018=,gnat_2019=]
+DESCRIPTION=To develop tools for Ada software
+EAPI=6
+HOMEPAGE=http://libre.adacore.com/
+IUSE=gnat_2017 +gnat_2018 gnat_2019
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gnat_2017? ( dev-ada/gnat_util[gnat_2017] ) gnat_2018? ( dev-ada/gnat_util[gnat_2018] ) gnat_2019? ( dev-ada/gnat_util[gnat_2019] ) || ( dev-ada/gnatcoll-core[gnat_2017=,gnat_2018=,gnat_2019=,shared] dev-ada/gnatcoll[gnat_2017=,gnat_2018=,gnat_2019=,projects,shared] )
+REQUIRED_USE=|| ( gnat_2017 gnat_2018 gnat_2019 )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8 -> asis-gpl-2018-src.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=d4b5c38796c869bc331fe66000de97e0
diff --git a/metadata/md5-cache/dev-ada/aws-2018-r1 b/metadata/md5-cache/dev-ada/aws-2018-r1
new file mode 100644
index 000000000000..d27ba53d1faf
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/aws-2018-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=,gnat_2019(-)=] dev-ada/xmlada[shared,static-libs] gnat_2016? ( dev-ada/asis[gnat_2016] ) gnat_2017? ( dev-ada/asis[gnat_2017] ) gnat_2018? ( dev-ada/asis[gnat_2018] ) gnat_2019? ( dev-ada/asis[gnat_2019] ) dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=,gnat_2019(-)=]
+DESCRIPTION=A complete Web development framework
+EAPI=6
+HOMEPAGE=http://libre.adacore.com/tools/aws/
+IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=,gnat_2019(-)=] dev-ada/xmlada[shared,static-libs]
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd -> aws-gpl-2018-src.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=fa618a0c80d0e991513c967d42368f4d
diff --git a/metadata/md5-cache/dev-ada/gnat_util-2018-r1 b/metadata/md5-cache/dev-ada/gnat_util-2018-r1
new file mode 100644
index 000000000000..00d6d3daab37
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gnat_util-2018-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DEPEND=gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[gnat_2018(-)?,gnat_2019(-)?]
+DESCRIPTION=Provides access to GNAT compiler internals for AdaCore utilities
+EAPI=6
+HOMEPAGE=http://libre.adacore.com
+IUSE=+gnat_2018 gnat_2019 +shared static-libs static-pic
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=^^ ( gnat_2018 gnat_2019 )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6b -> gnat_util-gpl-2018-src.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=f490c317af66af467b5b5640969552fd
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2018-r1 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2018-r1
new file mode 100644
index 000000000000..e1011e407085
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2018-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+DESCRIPTION=GNAT Component Collection
+EAPI=6
+HOMEPAGE=http://libre.adacore.com
+IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gmp iconv python readline +shared static-libs static-pic syslog python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5 -> gnatcoll-bindings-gpl-2018-src.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=3b17237a8b5eb04cb9cd2848a663c933
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2018-r1 b/metadata/md5-cache/dev-ada/gnatcoll-core-2018-r1
new file mode 100644
index 000000000000..1f5b53cbd243
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-2018-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-ada/libgpr[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] dev-ada/libgpr[shared?,static-libs?,static-pic?] !dev-ada/gnatcoll dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+DESCRIPTION=GNAT Component Collection Core packages
+EAPI=6
+HOMEPAGE=http://libre.adacore.com
+IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-ada/libgpr[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] dev-ada/libgpr[shared?,static-libs?,static-pic?] !dev-ada/gnatcoll
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99 -> gnatcoll-core-gpl-2018-src.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=5be0108bf41d056d01b8353779d928dd
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-db-2018-r1 b/metadata/md5-cache/dev-ada/gnatcoll-db-2018-r1
new file mode 100644
index 000000000000..172e7f351ae8
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gnatcoll-db-2018-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?] dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] ) dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GNAT Component Collection
+EAPI=6
+HOMEPAGE=http://libre.adacore.com
+IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gnatcoll_db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?] dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] )
+REQUIRED_USE=gnatinspect? ( xref ) xref? ( sqlite ) sqlite? ( sql ) gnatcoll_db2ada? ( sql )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6 -> gnatcoll-db-gpl-2018-src.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=a217e765373fe7dfb6a63bae8cf01d51
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2018-r4 b/metadata/md5-cache/dev-ada/gprbuild-2018-r4
new file mode 100644
index 000000000000..184df2e51c90
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gprbuild-2018-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+DESCRIPTION=Multi-Language Management
+EAPI=6
+HOMEPAGE=http://libre.adacore.com/
+IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=!gnat_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 -> gprbuild-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40 -> xmlada-gpl-2018-src.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=3ecdede9ab265b8abdd85d5b70b98904
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2019 b/metadata/md5-cache/dev-ada/gprbuild-2019
new file mode 100644
index 000000000000..02f554208480
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gprbuild-2019
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+DESCRIPTION=Multi-Language Management
+EAPI=6
+HOMEPAGE=http://libre.adacore.com/
+IUSE=gnat_2016 gnat_2017 gnat_2018 +gnat_2019
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=!gnat_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 -> gprbuild-2019-20190517-194D8-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5 -> xmlada-2019-20190429-19B9D-src.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=248e74e936ff01e37d467e6cc7baacde
diff --git a/metadata/md5-cache/dev-ada/gps-2018-r1 b/metadata/md5-cache/dev-ada/gps-2018-r1
index bddd49e36f57..a0cde4ead5f0 100644
--- a/metadata/md5-cache/dev-ada/gps-2018-r1
+++ b/metadata/md5-cache/dev-ada/gps-2018-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 RESTRICT=test
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb -> gps-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 -> libadalang-tools-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 -> gtk+-3.14.15-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	83a68dab6355a0f96b37fe96bc4f317c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=02f2598d20cea76b9f2c23a21ecfaa20
diff --git a/metadata/md5-cache/dev-ada/gtkada-2018-r1 b/metadata/md5-cache/dev-ada/gtkada-2018-r1
new file mode 100644
index 000000000000..88ebfff67cab
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gtkada-2018-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=,gnat_2019(-)=] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A complete Ada graphical toolkit
+EAPI=6
+HOMEPAGE=http://libre.adacore.com//tools/gtkada/
+IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced -> gtkada-gpl-2018-src.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=38b4fb63ab3c66c0149ca271a50c9fcb
diff --git a/metadata/md5-cache/dev-ada/libadalang-2018-r1 b/metadata/md5-cache/dev-ada/libadalang-2018-r1
new file mode 100644
index 000000000000..a613985867b8
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/libadalang-2018-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup test
+DEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-ada/langkit-2018
+DESCRIPTION=high performance semantic engine for the Ada programming language
+EAPI=6
+HOMEPAGE=https://libre.adacore.com/
+IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 gcc-runtime-library-exception-3.1
+RDEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18 -> libadalang-gpl-2018-src.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=3fe0a5a0ee2797722ebb4ce7dcab8240
diff --git a/metadata/md5-cache/dev-ada/libgpr-2018-r1 b/metadata/md5-cache/dev-ada/libgpr-2018-r1
new file mode 100644
index 000000000000..43c89c77b99c
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/libgpr-2018-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] !net-libs/grpc dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DESCRIPTION=Ada library to handle GPRbuild project files
+EAPI=6
+HOMEPAGE=http://libre.adacore.com/
+IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] !net-libs/grpc
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 -> gprbuild-gpl-2018-src.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=aeef14d42f141cf6e20d4f9e4b31df0d
diff --git a/metadata/md5-cache/dev-ada/xmlada-2018-r1 b/metadata/md5-cache/dev-ada/xmlada-2018-r1
new file mode 100644
index 000000000000..2496fda171d5
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/xmlada-2018-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
+EAPI=6
+HOMEPAGE=http://libre.adacore.com/
+IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 -> xmlada-gpl-2018-src.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=a0ba6d9e8e6e83c6b7948b9ddb0a02eb
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index d1e446f660ff..dcd4df151686 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/antlr-cpp-4.7.1 b/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.1
index aa05cb8f006e..4b7e24ccba28 100644
--- a/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.1
+++ b/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.1
@@ -3,9 +3,9 @@ DEPEND=app-arch/zip sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=The ANTLR 4 C++ Runtime
 EAPI=6
 HOMEPAGE=https://www.antlr.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 SLOT=4
 SRC_URI=https://www.antlr.org/download/antlr4-cpp-runtime-4.7.1-source.zip -> antlr-cpp-4.7.1.zip
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=35eacaa418f73b41723e0f3af560b1a0
+_md5_=592bfa434c9ad60226aa840d8f478e95
diff --git a/metadata/md5-cache/dev-cpp/atkmm-2.28.0 b/metadata/md5-cache/dev-cpp/atkmm-2.28.0
index f6552f9ffb31..944ba819cc93 100644
--- a/metadata/md5-cache/dev-cpp/atkmm-2.28.0
+++ b/metadata/md5-cache/dev-cpp/atkmm-2.28.0
@@ -4,10 +4,10 @@ DESCRIPTION=C++ interface for the ATK library
 EAPI=6
 HOMEPAGE=https://www.gtkmm.org
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.46.2:2[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-cpp/gtkmm-2.22.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/atkmm/2.28/atkmm-2.28.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=65d75644e882c2d116700eb23af8a02c
+_md5_=28440b3bd54ca4f42f4f704f2c029e59
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.58.1 b/metadata/md5-cache/dev-cpp/glibmm-2.58.1
index 22c4c9794f38..cd52392d1ab3 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.58.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.58.1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ interface for glib2
 EAPI=6
 HOMEPAGE=https://www.gtkmm.org
 IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.55.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.58/glibmm-2.58.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a4a39f2319577e01a34a54fe5f96a670
+_md5_=4e59fb4d766604ab83d8af3cf3d53655
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.24.1 b/metadata/md5-cache/dev-cpp/gtkmm-3.24.1
index 314a55dbfe84..f272bbd63103 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.24.1
+++ b/metadata/md5-cache/dev-cpp/gtkmm-3.24.1
@@ -4,11 +4,11 @@ DESCRIPTION=C++ interface for GTK+
 EAPI=6
 HOMEPAGE=https://www.gtkmm.org
 IUSE=aqua doc test wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.54.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.35.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/atkmm-2.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/cairomm-1.12.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.38.2:1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=|| ( aqua wayland X )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gtkmm/3.24/gtkmm-3.24.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e663b786174080df92ad130ade4afd9a
+_md5_=d176152345f5d66d20134ea95c1bfc12
diff --git a/metadata/md5-cache/dev-cpp/libcmis-0.5.2 b/metadata/md5-cache/dev-cpp/libcmis-0.5.2
deleted file mode 100644
index 781150fb3357..000000000000
--- a/metadata/md5-cache/dev-cpp/libcmis-0.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig man? ( app-text/docbook2X dev-libs/libxslt ) test? ( dev-util/cppcheck dev-util/cppunit ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/boost:= dev-libs/libxml2 net-misc/curl
-DESCRIPTION=C++ client library for the CMIS interface
-EAPI=7
-HOMEPAGE=https://github.com/tdf/libcmis
-IUSE=man static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 LGPL-2 MPL-1.1 )
-RDEPEND=dev-libs/boost:= dev-libs/libxml2 net-misc/curl
-RESTRICT=test
-SLOT=0.5
-SRC_URI=https://github.com/tdf/libcmis/archive/v0.5.2.tar.gz -> libcmis-0.5.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=d07b25d087ddd65cc18094d1c02aa933
diff --git a/metadata/md5-cache/dev-cpp/libcmis-0.5.2-r1 b/metadata/md5-cache/dev-cpp/libcmis-0.5.2-r1
index 8c283953088f..4ee516b981ae 100644
--- a/metadata/md5-cache/dev-cpp/libcmis-0.5.2-r1
+++ b/metadata/md5-cache/dev-cpp/libcmis-0.5.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=C++ client library for the CMIS interface
 EAPI=7
 HOMEPAGE=https://github.com/tdf/libcmis
 IUSE=man static-libs test tools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 LGPL-2 MPL-1.1 )
 RDEPEND=dev-libs/boost:= dev-libs/libxml2 net-misc/curl
 RESTRICT=test
 SLOT=0.5
 SRC_URI=https://github.com/tdf/libcmis/archive/v0.5.2.tar.gz -> libcmis-0.5.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=4fd4ddac71242e467e89b8809e0fa523
+_md5_=72808f9e9466079f848787415c31d484
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.5.0 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.5.0
index fd61a4281263..693ce54ef719 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.5.0
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.5.0
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.5.0.tar.gz -> nlohmann_json-3.5.0.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=0ce3f42f9991f3c61b8c566b517d3184
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1
index 71d834af11f9..acd75b69b020 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.6.1.tar.gz -> nlohmann_json-3.6.1.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=0ce3f42f9991f3c61b8c566b517d3184
diff --git a/metadata/md5-cache/dev-cpp/sourcetrail-2018.3.55-r1 b/metadata/md5-cache/dev-cpp/sourcetrail-2018.3.55-r1
index ad6c9309243d..54f782fcc849 100644
--- a/metadata/md5-cache/dev-cpp/sourcetrail-2018.3.55-r1
+++ b/metadata/md5-cache/dev-cpp/sourcetrail-2018.3.55-r1
@@ -5,9 +5,10 @@ EAPI=6
 HOMEPAGE=https://www.sourcetrail.com/
 IUSE=examples selinux
 KEYWORDS=~amd64
-LICENSE=Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3 BSD
+LICENSE=Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD
 RDEPEND==dev-libs/openssl-1.0*:* media-libs/fontconfig media-libs/freetype media-libs/libpng:1.2 sys-libs/libudev-compat virtual/opengl x11-libs/libdrm x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXxf86vm selinux? ( sys-libs/libselinux )
+RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://www.sourcetrail.com/downloads/2018.3.55/linux/64bit -> sourcetrail-2018.3.55.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7aaf39e7cbd32740ecf0c338dcf8f05c
+_md5_=11b347b5504d69ad6a5f008cc0c71ae4
diff --git a/metadata/md5-cache/dev-cpp/sourcetrail-2019.1.11 b/metadata/md5-cache/dev-cpp/sourcetrail-2019.1.11
index 387c58b96cd7..16ba39791622 100644
--- a/metadata/md5-cache/dev-cpp/sourcetrail-2019.1.11
+++ b/metadata/md5-cache/dev-cpp/sourcetrail-2019.1.11
@@ -5,9 +5,10 @@ EAPI=6
 HOMEPAGE=https://www.sourcetrail.com/
 IUSE=examples selinux
 KEYWORDS=~amd64
-LICENSE=Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3 BSD
+LICENSE=Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD
 RDEPEND==dev-libs/openssl-1.0*:* media-libs/fontconfig media-libs/freetype media-libs/libpng:1.2 sys-libs/libudev-compat virtual/opengl x11-libs/libdrm x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXxf86vm selinux? ( sys-libs/libselinux )
+RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://www.sourcetrail.com/downloads/2019.1.11/linux/64bit -> sourcetrail-2019.1.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7aaf39e7cbd32740ecf0c338dcf8f05c
+_md5_=11b347b5504d69ad6a5f008cc0c71ae4
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index ebe75b5ec0d0..e38c76b284ca 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/cdb-0.75-r4 b/metadata/md5-cache/dev-db/cdb-0.75-r4
index b5909612579b..414887e23713 100644
--- a/metadata/md5-cache/dev-db/cdb-0.75-r4
+++ b/metadata/md5-cache/dev-db/cdb-0.75-r4
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/sed-4 !dev-db/tinycdb
 DESCRIPTION=Fast, reliable, simple package for creating and reading constant databases
 EAPI=5
 HOMEPAGE=http://cr.yp.to/cdb.html
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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
 LICENSE=public-domain
 RDEPEND=>=sys-apps/sed-4 !dev-db/tinycdb
 SLOT=0
 SRC_URI=http://cr.yp.to/cdb/cdb-0.75.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b42fce75c8d9aa8cad9959f4aa0b5fdb
+_md5_=59700df22ebf615e8fce9520b6b1fc57
diff --git a/metadata/md5-cache/dev-db/cockroach-19.1.1 b/metadata/md5-cache/dev-db/cockroach-19.1.1
new file mode 100644
index 000000000000..6a4ed5ecb3b7
--- /dev/null
+++ b/metadata/md5-cache/dev-db/cockroach-19.1.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install pretend setup
+DEPEND=>=app-arch/xz-utils-5.2.3 >=dev-lang/go-1.8.3 >=dev-util/cmake-3.8.1
+DESCRIPTION=open source database for building cloud services
+EAPI=7
+HOMEPAGE=https://www.cockroachlabs.com
+KEYWORDS=~amd64
+LICENSE=Cockroach Apache-2.0
+SLOT=0
+SRC_URI=https://binaries.cockroachdb.com/cockroach-v19.1.1.src.tgz
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=0ddcc8c3dedadf84dfee1429c331d89e
diff --git a/metadata/md5-cache/dev-db/cockroach-2.1.5 b/metadata/md5-cache/dev-db/cockroach-2.1.5
new file mode 100644
index 000000000000..5acb3e74b421
--- /dev/null
+++ b/metadata/md5-cache/dev-db/cockroach-2.1.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install pretend setup
+DEPEND=>=app-arch/xz-utils-5.2.3 >=dev-lang/go-1.8.3 >=dev-util/cmake-3.8.1
+DESCRIPTION=open source database for building cloud services
+EAPI=7
+HOMEPAGE=https://www.cockroachlabs.com
+KEYWORDS=~amd64
+LICENSE=Cockroach Apache-2.0
+SLOT=0
+SRC_URI=https://binaries.cockroachdb.com/cockroach-v2.1.5.src.tgz
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=5d463d1d71238c798ac4b5ce271b31c8
diff --git a/metadata/md5-cache/dev-db/freetds-1.00.341-r1 b/metadata/md5-cache/dev-db/freetds-1.00.341-r1
index 7b93df59c1f6..e29ab2bdd383 100644
--- a/metadata/md5-cache/dev-db/freetds-1.00.341-r1
+++ b/metadata/md5-cache/dev-db/freetds-1.00.341-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install
 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:0= ) )
 DESCRIPTION=Tabular Datastream Library
 EAPI=7
-HOMEPAGE=http://www.freetds.org/
+HOMEPAGE=https://www.freetds.org/
 IUSE=debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ 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_=e0f189e5e56ed725094e48aed6d795ca
+_md5_=0599b6920b16eca494f8259200297c02
diff --git a/metadata/md5-cache/dev-db/freetds-1.00.558 b/metadata/md5-cache/dev-db/freetds-1.00.558
index 453bd3fea8e5..444519524212 100644
--- a/metadata/md5-cache/dev-db/freetds-1.00.558
+++ b/metadata/md5-cache/dev-db/freetds-1.00.558
@@ -2,13 +2,13 @@ DEFINED_PHASES=configure install
 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:0= ) )
 DESCRIPTION=Tabular Datastream Library
 EAPI=7
-HOMEPAGE=http://www.freetds.org/
+HOMEPAGE=https://www.freetds.org/
 IUSE=debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
+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:0= ) ) 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.558.tar.gz
-_md5_=9089562764eaec2c323b433aca5ea371
+_md5_=26bf6cccca39e16232c0d0b5b9b8edc8
diff --git a/metadata/md5-cache/dev-db/freetds-9999 b/metadata/md5-cache/dev-db/freetds-9999
index 992e42ee482b..8f7ff5f7f718 100644
--- a/metadata/md5-cache/dev-db/freetds-9999
+++ b/metadata/md5-cache/dev-db/freetds-9999
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure prepare unpack
 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 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Tabular Datastream Library
 EAPI=6
-HOMEPAGE=http://www.freetds.org/
+HOMEPAGE=https://www.freetds.org/
 IUSE=gnutls iconv kerberos libressl mssql iodbc odbc ssl
 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
@@ -10,4 +10,4 @@ REQUIRED_USE=?? ( iodbc odbc )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=6dcd4117089f9e8ef8d126b77e15c809
+_md5_=b9a7c070bac811fa28b4b83f47fc8230
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.15 b/metadata/md5-cache/dev-db/mariadb-10.3.15
new file mode 100644
index 000000000000..fb547155f0d7
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.15
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !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 ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) 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= virtual/pkgconfig jdbc? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=https://mariadb.org/
+IUSE=+backup bindist client-libs cracklib debug 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 static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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[static=] )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) !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-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !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 ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) 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] ) ) ) 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 )
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
+RESTRICT=!bindist? ( bindist ) libressl? ( test )
+SLOT=0/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.15/source/mariadb-10.3.15.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=5da1ae167aff2d15d0d1d358971d528d
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.25 b/metadata/md5-cache/dev-db/mysql-5.7.25
index d5ff657476cf..3f4b4aed49c4 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.25
+++ b/metadata/md5-cache/dev-db/mysql-5.7.25
@@ -11,6 +11,6 @@ RDEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncur
 REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
-SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.25.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.25.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.25.tar.gz mirror://gentoo/mysql-extras-20190303-1852Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190303-1852Z.tar.bz2
+SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.25.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.25.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.25.tar.gz mirror://gentoo/mysql-extras-20190524-1046Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190524-1046Z.tar.bz2
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3bb6bfd0c0b4ad3b7d8a52c689e996b2
+_md5_=72c910f123afc82534a490b7bb052ded
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.26 b/metadata/md5-cache/dev-db/mysql-5.7.26
index f2eea8db369f..1dece99eeae7 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.26
+++ b/metadata/md5-cache/dev-db/mysql-5.7.26
@@ -11,6 +11,6 @@ RDEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncur
 REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
-SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.26.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.26.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.26.tar.gz mirror://gentoo/mysql-extras-20190303-1852Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190303-1852Z.tar.bz2
+SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.26.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.26.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.26.tar.gz mirror://gentoo/mysql-extras-20190524-1046Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190524-1046Z.tar.bz2
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8141c7cf3467aee2a745b858710324ed
+_md5_=0adaa715e270b29e964570722fa735a4
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.14 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.14
index 07fee3c0dd9c..a4c152736253 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-8.0.14
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.14
@@ -4,11 +4,11 @@ DESCRIPTION=MySQL Workbench
 EAPI=6
 HOMEPAGE=https://www.mysql.com/products/workbench/
 IUSE=debug doc gnome-keyring python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm dev-cpp/pangomm >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.7.3[server] x11-libs/pango x11-libs/gtk+:3 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1[-mdb] virtual/opengl || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-1.1.8 dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) gnome-keyring? ( gnome-base/libgnome-keyring ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-community-8.0.14-src.tar.gz http://www.antlr.org/download/antlr-4.7.1-complete.jar
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=700fb6ef0bb41f0a39648d5b2c9ac0b0
+_md5_=65c882c5ceccb85b733955f91996ba3d
diff --git a/metadata/md5-cache/dev-db/percona-server-5.7.25.28 b/metadata/md5-cache/dev-db/percona-server-5.7.25.28
index 2466df059609..06a53af7fac2 100644
--- a/metadata/md5-cache/dev-db/percona-server-5.7.25.28
+++ b/metadata/md5-cache/dev-db/percona-server-5.7.25.28
@@ -11,6 +11,6 @@ RDEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncur
 REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
-SRC_URI=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.25-28/source/tarball/percona-server-5.7.25-28.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz mirror://gentoo/mysql-extras-20190303-1852Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190303-1852Z.tar.bz2
+SRC_URI=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.25-28/source/tarball/percona-server-5.7.25-28.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz mirror://gentoo/mysql-extras-20190524-1046Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190524-1046Z.tar.bz2
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d73d2c0c16305330482d38bb6de1e50f
+_md5_=a32197da9a67e5c3889552f2b5e9f6a6
diff --git a/metadata/md5-cache/dev-db/pg_activity-1.2.0 b/metadata/md5-cache/dev-db/pg_activity-1.2.0
deleted file mode 100644
index 1fc5fff95a4b..000000000000
--- a/metadata/md5-cache/dev-db/pg_activity-1.2.0
+++ /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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Realtime PostgreSQL database server monitoring tool
-EAPI=5
-HOMEPAGE=https://github.com/julmon/pg_activity/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=POSTGRESQL
-RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psycopg:2[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://github.com/julmon/pg_activity/archive/v1.2.0.tar.gz -> pg_activity-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2b4affcf624ed4a7fbc4f74a05b8ca55
diff --git a/metadata/md5-cache/dev-db/pg_activity-1.5.0 b/metadata/md5-cache/dev-db/pg_activity-1.5.0
new file mode 100644
index 000000000000..2d07e6aafc41
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pg_activity-1.5.0
@@ -0,0 +1,14 @@
+BDEPEND=python_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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Realtime PostgreSQL database server monitoring tool
+EAPI=7
+HOMEPAGE=https://github.com/julmon/pg_activity/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=POSTGRESQL
+RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psycopg:2[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://github.com/julmon/pg_activity/archive/v1.5.0.tar.gz -> pg_activity-1.5.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=d72c83b94830e3cdb12002c5a3575ae2
diff --git a/metadata/md5-cache/dev-db/pgmodeler-0.9.1 b/metadata/md5-cache/dev-db/pgmodeler-0.9.1
index f8dcafe318c5..55d39ffcc814 100644
--- a/metadata/md5-cache/dev-db/pgmodeler-0.9.1
+++ b/metadata/md5-cache/dev-db/pgmodeler-0.9.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) dev-libs/icu:= dev-libs/libxml2:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/pgmodeler/pgmodeler/archive/v0.9.1.tar.gz -> pgmodeler-0.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=b4859e718a6bf19f1c385d7af2bbd6c6
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.7.10 b/metadata/md5-cache/dev-db/pgpool2-3.7.10
new file mode 100644
index 000000000000..649d7a514aca
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgpool2-3.7.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Connection pool server for PostgreSQL
+EAPI=6
+HOMEPAGE=https://www.pgpool.net/
+IUSE=doc libressl memcached pam ssl static-libs postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+SLOT=0
+SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-3.7.10.tar.gz -> pgpool-II-3.7.10.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=630215f2f7f3bb668a2b3c65b3bfc8d5
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.7.8 b/metadata/md5-cache/dev-db/pgpool2-3.7.8
index e2fe09c45b40..affc1830c29d 100644
--- a/metadata/md5-cache/dev-db/pgpool2-3.7.8
+++ b/metadata/md5-cache/dev-db/pgpool2-3.7.8
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=6
-HOMEPAGE=http://www.pgpool.net/
+HOMEPAGE=https://www.pgpool.net/
 IUSE=doc libressl memcached pam ssl static-libs postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.7.8.tar.gz -> pgpool-II-3.7.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=f37b5243197b16ba92060610364a212c
+SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-3.7.8.tar.gz -> pgpool-II-3.7.8.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=9417a893818561ed378c3ff0e6664caf
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.0.3 b/metadata/md5-cache/dev-db/pgpool2-4.0.3
index d5eb12f42687..b15653a9978d 100644
--- a/metadata/md5-cache/dev-db/pgpool2-4.0.3
+++ b/metadata/md5-cache/dev-db/pgpool2-4.0.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=6
-HOMEPAGE=http://www.pgpool.net/
+HOMEPAGE=https://www.pgpool.net/
 IUSE=doc libressl memcached pam ssl static-libs postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-4.0.3.tar.gz -> pgpool-II-4.0.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=bc30862d78eb6f1723ac72ce39281d3e
+SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.0.3.tar.gz -> pgpool-II-4.0.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=918376ef5b40b67adef2ac439756b6ac
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.0.5 b/metadata/md5-cache/dev-db/pgpool2-4.0.5
new file mode 100644
index 000000000000..e36988879c43
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgpool2-4.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Connection pool server for PostgreSQL
+EAPI=6
+HOMEPAGE=https://www.pgpool.net/
+IUSE=doc libressl memcached pam ssl static-libs postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+SLOT=0
+SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.0.5.tar.gz -> pgpool-II-4.0.5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=21b856f0fecd06329551e31885af99c9
diff --git a/metadata/md5-cache/dev-db/pgpool2-9999 b/metadata/md5-cache/dev-db/pgpool2-9999
index e83ce0ec9cde..74ee1a8225b6 100644
--- a/metadata/md5-cache/dev-db/pgpool2-9999
+++ b/metadata/md5-cache/dev-db/pgpool2-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig doc? ( app-text/openjade dev-libs/libxml2 dev-libs/libxslt ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig doc? ( app-text/openjade dev-libs/libxml2 dev-libs/libxslt ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=6
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc libressl memcached pam ssl static-libs postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
+HOMEPAGE=https://www.pgpool.net/
+IUSE=doc libressl memcached pam ssl static-libs postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4
 LICENSE=BSD
-RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=68c04c1fe944378cd8404db4678f700f
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=f3dba5c6f2950252ced240829047be57
diff --git a/metadata/md5-cache/dev-db/pgrouting-2.5.2 b/metadata/md5-cache/dev-db/pgrouting-2.5.2
index faf3045df83d..345dff92a1c2 100644
--- a/metadata/md5-cache/dev-db/pgrouting-2.5.2
+++ b/metadata/md5-cache/dev-db/pgrouting-2.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=html? ( doc ) pdf? ( doc )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v2.5.2.tar.gz -> pgrouting-2.5.2.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	postgres	86eeb59f48e87b423d9f22122dab9d04	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=54f52629a1a1414f0b260eefed9af87d
diff --git a/metadata/md5-cache/dev-db/pgtap-0.99.0 b/metadata/md5-cache/dev-db/pgtap-0.99.0
index 457df8908d18..1dc24e09af1b 100644
--- a/metadata/md5-cache/dev-db/pgtap-0.99.0
+++ b/metadata/md5-cache/dev-db/pgtap-0.99.0
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://api.pgxn.org/dist/pgtap/0.99.0/pgtap-0.99.0.zip
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=e307e869e204b38c0d84f9352ab4665c
diff --git a/metadata/md5-cache/dev-db/plr-8.3.0.17 b/metadata/md5-cache/dev-db/plr-8.3.0.17
index 64f4929ff9df..8e82c3aef3ab 100644
--- a/metadata/md5-cache/dev-db/plr-8.3.0.17
+++ b/metadata/md5-cache/dev-db/plr-8.3.0.17
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/R postgres_targets_postgres10? ( dev-db/postgresql:10=[server]
 REQUIRED_USE=|| ( postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 )
 SLOT=0
 SRC_URI=https://github.com/postgres-plr/plr/archive/REL8_3_0_17.tar.gz -> plr-8.3.0.17.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=42c0644425c6bf490f2330ed7e1470ae
diff --git a/metadata/md5-cache/dev-db/postgis-2.4.6 b/metadata/md5-cache/dev-db/postgis-2.4.6
index 9e865fe2575d..c220758ce3eb 100644
--- a/metadata/md5-cache/dev-db/postgis-2.4.6
+++ b/metadata/md5-cache/dev-db/postgis-2.4.6
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres11 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.4.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=90ab36ff9b037c51218e8ef861dd509b
diff --git a/metadata/md5-cache/dev-db/postgis-2.4.7 b/metadata/md5-cache/dev-db/postgis-2.4.7
index cbcb86fd8773..b00a02d37dc4 100644
--- a/metadata/md5-cache/dev-db/postgis-2.4.7
+++ b/metadata/md5-cache/dev-db/postgis-2.4.7
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres11 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.4.7.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2c34b228998e9f25f949006ea1cd294b
diff --git a/metadata/md5-cache/dev-db/postgis-2.5.1-r1 b/metadata/md5-cache/dev-db/postgis-2.5.1-r1
index d611d1c17bdc..3e79d6f2620e 100644
--- a/metadata/md5-cache/dev-db/postgis-2.5.1-r1
+++ b/metadata/md5-cache/dev-db/postgis-2.5.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.5.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2b33efc64647ba66fe49ba3d9bc9bd79
diff --git a/metadata/md5-cache/dev-db/postgis-2.5.2 b/metadata/md5-cache/dev-db/postgis-2.5.2
index 2aa72ad6c289..f1fbb9e3e230 100644
--- a/metadata/md5-cache/dev-db/postgis-2.5.2
+++ b/metadata/md5-cache/dev-db/postgis-2.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.5.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=595d528f5451cc8045d92c658990e8a0
diff --git a/metadata/md5-cache/dev-db/postgis-9999 b/metadata/md5-cache/dev-db/postgis-9999
index 56a108cfab22..92cad3467356 100644
--- a/metadata/md5-cache/dev-db/postgis-9999
+++ b/metadata/md5-cache/dev-db/postgis-9999
@@ -9,5 +9,5 @@ RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_
 REQUIRED_USE=test? ( doc )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b5bf78699d88d429ea7accb6a4ca5ee7
diff --git a/metadata/md5-cache/dev-db/postgresql-10.8 b/metadata/md5-cache/dev-db/postgresql-10.8
index ead5abe04ab4..3e1a9351fb60 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.8
+++ b/metadata/md5-cache/dev-db/postgresql-10.8
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://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 kernel_linux 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
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,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_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=10
 SRC_URI=mirror://postgresql/source/v10.8/postgresql-10.8.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c5cbfbc5155b12d1e3bef1d51d2ae6be
+_md5_=c535ecbca38af8cef595f6ea0db078bb
diff --git a/metadata/md5-cache/dev-db/postgresql-11.3 b/metadata/md5-cache/dev-db/postgresql-11.3
index b1d4e0463764..6e490b84e0fe 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.3
+++ b/metadata/md5-cache/dev-db/postgresql-11.3
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl llvm 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 kernel_linux 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
-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=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) 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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,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:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=11
 SRC_URI=mirror://postgresql/source/v11.3/postgresql-11.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=14008a6414fe5fd62a5c7e29c6c1e581
+_md5_=ba17590dcc1cdff84cf30eae2a1fbdfd
diff --git a/metadata/md5-cache/dev-db/postgresql-12_beta1 b/metadata/md5-cache/dev-db/postgresql-12_beta1
new file mode 100644
index 000000000000..5f3235d47520
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-12_beta1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) 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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,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 ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=6
+HOMEPAGE=http://www.postgresql.org/
+IUSE=doc kerberos kernel_linux ldap libressl llvm 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 kernel_linux 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
+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=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) 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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,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:12 !dev-db/postgresql-base:12 !dev-db/postgresql-server:12 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=12
+SRC_URI=mirror://postgresql/source/v12beta1/postgresql-12beta1.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=fe5a942c51c239122aa98537b4a9eebd
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.22 b/metadata/md5-cache/dev-db/postgresql-9.4.22
index 5fd34d2f4c42..23093982a0f9 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.22
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.22
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://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 kernel_linux 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
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,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_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.22/postgresql-9.4.22.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=44987a3fb18d4589a1e183999a2d5e34
+_md5_=821f63d38eca2fbba1dc88e0e52e0fa7
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.17 b/metadata/md5-cache/dev-db/postgresql-9.5.17
index c0e29b56c612..7cdc820d4b44 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.17
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.17
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://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 kernel_linux 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
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,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_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.17/postgresql-9.5.17.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3967a5c11c0979059fcd64e8317d96f4
+_md5_=30cd2fdd096035549d2452ea6ba90214
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.13 b/metadata/md5-cache/dev-db/postgresql-9.6.13
index db24d6beb9fc..a4bfba1ca44a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.13
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.13
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://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 kernel_linux 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
-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=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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,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_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.6
 SRC_URI=mirror://postgresql/source/v9.6.13/postgresql-9.6.13.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f0c762875fa0ab142cc3533a9266c978
+_md5_=a46b66c4b249c32298011c211c91999f
diff --git a/metadata/md5-cache/dev-db/postgresql-9999 b/metadata/md5-cache/dev-db/postgresql-9999
index b88eec3dd038..d2cd6c3ba709 100644
--- a/metadata/md5-cache/dev-db/postgresql-9999
+++ b/metadata/md5-cache/dev-db/postgresql-9999
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://www.postgresql.org/
 IUSE=kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux systemd ssl static-libs tcl threads uuid xml zlib l10n_af l10n_cs l10n_de l10n_en l10n_es l10n_fa l10n_fr l10n_hr l10n_hu l10n_it l10n_ko l10n_nb l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_tr l10n_zh-CN l10n_zh-TW elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) 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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,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:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) 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:12 !dev-db/postgresql-base:12 !dev-db/postgresql-server:12 selinux? ( sec-policy/selinux-postgresql )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) 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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,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:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) 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:13 !dev-db/postgresql-base:13 !dev-db/postgresql-server:13 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=12
+SLOT=13
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2fd85c37e1a4c12ae51446c464348bae
+_md5_=de97ff6caa35a929faac335e9d6d2544
diff --git a/metadata/md5-cache/dev-db/rethinkdb-2.3.6 b/metadata/md5-cache/dev-db/rethinkdb-2.3.6
deleted file mode 100644
index 7e8ec81d2e6c..000000000000
--- a/metadata/md5-cache/dev-db/rethinkdb-2.3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install prepare setup
-DEPEND=>=dev-libs/re2-0.2016.05.01 dev-cpp/gtest dev-libs/boost dev-libs/protobuf-c net-misc/curl sys-libs/libunwind sys-libs/ncurses:= jemalloc? ( >=dev-libs/jemalloc-4.0 ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig
-DESCRIPTION=The open-source database for the realtime web.
-EAPI=6
-HOMEPAGE=https://www.rethinkdb.com
-IUSE=doc +jemalloc tcmalloc
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=>=dev-libs/re2-0.2016.05.01 dev-cpp/gtest dev-libs/boost dev-libs/protobuf-c net-misc/curl sys-libs/libunwind sys-libs/ncurses:= jemalloc? ( >=dev-libs/jemalloc-4.0 ) tcmalloc? ( dev-util/google-perftools )
-REQUIRED_USE=?? ( tcmalloc jemalloc )
-SLOT=0
-SRC_URI=https://download.rethinkdb.com/dist/rethinkdb-2.3.6.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=05c7696963bf694a436ba925151bad24
diff --git a/metadata/md5-cache/dev-db/slony1-2.2.6 b/metadata/md5-cache/dev-db/slony1-2.2.6
index 2ee431f344b2..0221aec1e62e 100644
--- a/metadata/md5-cache/dev-db/slony1-2.2.6
+++ b/metadata/md5-cache/dev-db/slony1-2.2.6
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10=[server,threads] ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=http://main.slony.info/downloads/2.2/source/slony1-2.2.6.tar.bz2 http://main.slony.info/downloads/2.2/source/slony1-2.2.6-docs.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4d627ff01e9eb780f7c3282c2d2dd9b1
diff --git a/metadata/md5-cache/dev-db/sqlite-3.28.0 b/metadata/md5-cache/dev-db/sqlite-3.28.0
index 89120e47dd86..39b8cac51705 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.28.0
+++ b/metadata/md5-cache/dev-db/sqlite-3.28.0
@@ -5,11 +5,11 @@ DESCRIPTION=SQL database engine
 EAPI=7
 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~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=public-domain
 RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=doc? ( https://sqlite.org/2019/sqlite-doc-3280000.zip ) tcl? ( https://sqlite.org/2019/sqlite-src-3280000.zip ) test? ( https://sqlite.org/2019/sqlite-src-3280000.zip ) tools? ( https://sqlite.org/2019/sqlite-src-3280000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2019/sqlite-autoconf-3280000.tar.gz ) ) )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f202d7b3953150f47e50b650031ea69c
+_md5_=b9c8b72919fc67b770d4ea6ddf9c9b91
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 75ef5508c2fa..ca05e2dc100d 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.6 b/metadata/md5-cache/dev-embedded/esptool-2.6
new file mode 100644
index 000000000000..09c765155a64
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/esptool-2.6
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/ecdsa[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/pyaes[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/pyserial-3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyelftools[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=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
+EAPI=7
+HOMEPAGE=https://github.com/espressif/esptool
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/ecdsa[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/pyaes[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/pyserial-3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/espressif/esptool/archive/v2.6.tar.gz -> esptool-2.6.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c43012d9bbb45bb319b57a6f6d36b13c
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index 3513d14c74f3..428b7c63f189 100644
--- a/metadata/md5-cache/dev-erlang/Manifest.gz
+++ b/metadata/md5-cache/dev-erlang/Manifest.gz
diff --git a/metadata/md5-cache/dev-erlang/fast_tls-1.0.26 b/metadata/md5-cache/dev-erlang/fast_tls-1.0.26
index bcd4a7220057..0dd32f1aa7e4 100644
--- a/metadata/md5-cache/dev-erlang/fast_tls-1.0.26
+++ b/metadata/md5-cache/dev-erlang/fast_tls-1.0.26
@@ -4,10 +4,10 @@ DESCRIPTION=TLS/SSL native driver for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/fast_tls
 IUSE=libressl
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/fast_tls/archive/1.0.26.tar.gz -> fast_tls-1.0.26.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=f40ad50d81c85b89c04e564dbbcb965e
+_md5_=00197ef07ac5b3cf2b2d58a9233a13da
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.13 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.13
index 5b0e9c73209f..c6da167b0f48 100644
--- a/metadata/md5-cache/dev-erlang/p1_utils-1.0.13
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.13
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=Erlang utility modules from ProcessOne
 EAPI=6
 HOMEPAGE=https://github.com/processone/p1_utils
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/p1_utils/archive/1.0.13.tar.gz -> p1_utils-1.0.13.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=99c2acdf9c16224ae8853c0c2dccf45a
+_md5_=eca04184965e3285ccbe09c929f3d77f
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 13c45fc14e8d..16ec64ec3109 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/physfs-3.0.2 b/metadata/md5-cache/dev-games/physfs-3.0.2
index c9fce69369eb..5db836b08683 100644
--- a/metadata/md5-cache/dev-games/physfs-3.0.2
+++ b/metadata/md5-cache/dev-games/physfs-3.0.2
@@ -4,9 +4,9 @@ DESCRIPTION=Abstraction layer for filesystem and archive access
 EAPI=7
 HOMEPAGE=https://icculus.org/physfs/
 IUSE=7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ppc64 x86 ~x86-fbsd
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://icculus.org/physfs/downloads/physfs-3.0.2.tar.bz2
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4a1cf58cbe064f639ac2d61d14907465
+_md5_=38b455191e5750aff946e5d7049f4efe
diff --git a/metadata/md5-cache/dev-games/simgear-2018.3.2 b/metadata/md5-cache/dev-games/simgear-2018.3.2
index decb4e990038..5b5dc1bfb72b 100644
--- a/metadata/md5-cache/dev-games/simgear-2018.3.2
+++ b/metadata/md5-cache/dev-games/simgear-2018.3.2
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/expat <dev-games/openscenegraph-3.5.6:= media-libs/openal net-m
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/simgear-2018.3.2.tar.bz2
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=273f2dd8eb930558769f1b6a24ea0ad8
+_md5_=f21e120009d681f138ae7b587faedbee
diff --git a/metadata/md5-cache/dev-games/tiled-1.2.4 b/metadata/md5-cache/dev-games/tiled-1.2.4
new file mode 100644
index 000000000000..f0654b6442b0
--- /dev/null
+++ b/metadata/md5-cache/dev-games/tiled-1.2.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=>=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtwidgets-5.9:5 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] )
+DESCRIPTION=A general purpose tile map editor
+EAPI=7
+HOMEPAGE=https://www.mapeditor.org/
+IUSE=examples python python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD BSD-2 GPL-2+
+RDEPEND=>=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtwidgets-5.9:5 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] )
+REQUIRED_USE=python? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/bjorn/tiled/archive/v1.2.4/tiled-1.2.4.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=2bb674138baaa75f317ce73ef9c0e937
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index ec6829bd78f7..ba6642698678 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/async-2.1.1 b/metadata/md5-cache/dev-haskell/async-2.1.1
index 56cd845269d4..3522f86d4c2f 100644
--- a/metadata/md5-cache/dev-haskell/async-2.1.1
+++ b/metadata/md5-cache/dev-haskell/async-2.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Run IO operations asynchronously and wait for their results
 EAPI=6
 HOMEPAGE=https://github.com/simonmar/async
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.1.1
 SRC_URI=mirror://hackage/packages/archive/async/2.1.1/async-2.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=232866e2cc5366eab5a2ded01fd2dec7
+_md5_=a42202a8bd02354425d1c9ab5a3fb8b4
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-0.13.1.0 b/metadata/md5-cache/dev-haskell/attoparsec-0.13.1.0
index dcb43645c45d..9d808e779553 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-0.13.1.0
+++ b/metadata/md5-cache/dev-haskell/attoparsec-0.13.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Fast combinator parsing for bytestrings and text
 EAPI=6
 HOMEPAGE=https://github.com/bos/attoparsec
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.13.1.0
 SRC_URI=mirror://hackage/packages/archive/attoparsec/0.13.1.0/attoparsec-0.13.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9761b0514d0a3f0779d1deaaff236040
+_md5_=9ebbede338676a12824dbedc2532ebe9
diff --git a/metadata/md5-cache/dev-haskell/base-compat-0.9.1 b/metadata/md5-cache/dev-haskell/base-compat-0.9.1
index 785974793c0c..c7975d90fff9 100644
--- a/metadata/md5-cache/dev-haskell/base-compat-0.9.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-0.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=A compatibility layer for base
 EAPI=6
 HOMEPAGE=http://hackage.haskell.org/package/base-compat
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.9.1
 SRC_URI=mirror://hackage/packages/archive/base-compat/0.9.1/base-compat-0.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ac9d1d47e919f747a3e2292bbe3e054d
+_md5_=c296ffa94b07bfb092246669e8b33204
diff --git a/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.6 b/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.6
index b8d7c0346a22..6d76b48e30bc 100644
--- a/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.6
+++ b/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Fast base16 (hex) encoding and decoding for ByteStrings
 EAPI=5
 HOMEPAGE=https://github.com/bos/base16-bytestring
 IUSE=doc hscolour profile
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.1.6
 SRC_URI=mirror://hackage/packages/archive/base16-bytestring/0.1.1.6/base16-bytestring-0.1.1.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c0b546be8d1b7b24d6bf63216dafb61
+_md5_=960ee1eec617f7f268031e659d3a268e
diff --git a/metadata/md5-cache/dev-haskell/byteable-0.1.1 b/metadata/md5-cache/dev-haskell/byteable-0.1.1
index 3c7bb9536723..8dc84e38ab4f 100644
--- a/metadata/md5-cache/dev-haskell/byteable-0.1.1
+++ b/metadata/md5-cache/dev-haskell/byteable-0.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Type class for sequence of bytes
 EAPI=5
 HOMEPAGE=https://github.com/vincenthz/hs-byteable
 IUSE=doc hscolour profile
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.1
 SRC_URI=mirror://hackage/packages/archive/byteable/0.1.1/byteable-0.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e807311cafc2fa0c9b3ae512991ea8d
+_md5_=ad1fe06b5095abe0ef71b2a0a61cf984
diff --git a/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.1.0 b/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.1.0
index b4e5e8a24aff..1192dd1f6a72 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.1.0
+++ b/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=The new bytestring builder, packaged outside of GHC
 EAPI=6
 HOMEPAGE=http://hackage.haskell.org/package/bytestring-builder
 IUSE=profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.10.8.1.0
 SRC_URI=mirror://hackage/packages/archive/bytestring-builder/0.10.8.1.0/bytestring-builder-0.10.8.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7c62a82c830e185cc920194b8ad5d02e
+_md5_=4104589399257785f870501734af5cf7
diff --git a/metadata/md5-cache/dev-haskell/colour-2.3.3-r1 b/metadata/md5-cache/dev-haskell/colour-2.3.3-r1
index 1fc6a768fc93..59b52bd26f9e 100644
--- a/metadata/md5-cache/dev-haskell/colour-2.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/colour-2.3.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A model for human colour/color perception
 EAPI=5
 HOMEPAGE=http://www.haskell.org/haskellwiki/Colour
 IUSE=doc hscolour profile
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/2.3.3
 SRC_URI=mirror://hackage/packages/archive/colour/2.3.3/colour-2.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6174f5bbc639df1d931a3175ff39b5f
+_md5_=388797682f573268eff32512f08602a4
diff --git a/metadata/md5-cache/dev-haskell/conduit-1.2.12.1 b/metadata/md5-cache/dev-haskell/conduit-1.2.12.1
index 6f31d7ad1a75..347bda53a242 100644
--- a/metadata/md5-cache/dev-haskell/conduit-1.2.12.1
+++ b/metadata/md5-cache/dev-haskell/conduit-1.2.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=Streaming data processing library
 EAPI=6
 HOMEPAGE=https://github.com/snoyberg/conduit
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.2.12.1
 SRC_URI=mirror://hackage/packages/archive/conduit/1.2.12.1/conduit-1.2.12.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b6c5dd69701b7b5956d9d476bae6c755
+_md5_=d1e8cbf6676e697f4f5fe37b00913621
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-0.11.9 b/metadata/md5-cache/dev-haskell/cryptohash-0.11.9
index f0525f0aa937..f5324fb9bf30 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-0.11.9
+++ b/metadata/md5-cache/dev-haskell/cryptohash-0.11.9
@@ -4,10 +4,10 @@ DESCRIPTION=collection of crypto hashes, fast, pure and practical
 EAPI=5
 HOMEPAGE=https://github.com/vincenthz/hs-cryptohash
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.11.9
 SRC_URI=mirror://hackage/packages/archive/cryptohash/0.11.9/cryptohash-0.11.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f68de14aad84f2671e91928a983e5851
+_md5_=85bb8146f62fcedcf7bbb05ac0a1697e
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-0.21 b/metadata/md5-cache/dev-haskell/cryptonite-0.21
index 3ed30d538688..0fb64092011d 100644
--- a/metadata/md5-cache/dev-haskell/cryptonite-0.21
+++ b/metadata/md5-cache/dev-haskell/cryptonite-0.21
@@ -4,10 +4,10 @@ DESCRIPTION=Cryptography Primitives sink
 EAPI=6
 HOMEPAGE=https://github.com/haskell-crypto/cryptonite
 IUSE=+integer-gmp +support_aesni support_blake2_sse +support_deepseq support_pclmuldq +support_rdrand doc hscolour profile test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/memory-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.21
 SRC_URI=mirror://hackage/packages/archive/cryptonite/0.21/cryptonite-0.21.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d5d1a32dda94c001adb0e31bf4e18a05
+_md5_=d06ab4604340a699b877890921a62f43
diff --git a/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0 b/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
index dfd5d72b0e27..12999acd337a 100644
--- a/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
+++ b/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=Set and bag operations on ordered lists
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/data-ordlist
 IUSE=doc hscolour profile
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.7.0
 SRC_URI=mirror://hackage/packages/archive/data-ordlist/0.4.7.0/data-ordlist-0.4.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f00537bebc4a5f52fa37b74b7d15400
+_md5_=37082172eee985214c76aed729e23ec0
diff --git a/metadata/md5-cache/dev-haskell/digest-0.0.1.2 b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
index 10c4ed1df243..7758a34f1788 100644
--- a/metadata/md5-cache/dev-haskell/digest-0.0.1.2
+++ b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Various cryptographic hashes for bytestrings; CRC32 and Adler32 for
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/digest
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/zlib
 SLOT=0/0.0.1.2
 SRC_URI=mirror://hackage/packages/archive/digest/0.0.1.2/digest-0.0.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=008cd1fea0b561a2e55faf5f8b68dafb
+_md5_=0c7b8ee60d5e5799eab8525f3f1a0a2d
diff --git a/metadata/md5-cache/dev-haskell/exceptions-0.8.3 b/metadata/md5-cache/dev-haskell/exceptions-0.8.3
index aae638987f89..21a119c460ad 100644
--- a/metadata/md5-cache/dev-haskell/exceptions-0.8.3
+++ b/metadata/md5-cache/dev-haskell/exceptions-0.8.3
@@ -4,10 +4,10 @@ DESCRIPTION=Extensible optionally-pure exceptions
 EAPI=6
 HOMEPAGE=https://github.com/ekmett/exceptions/
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.8.3
 SRC_URI=mirror://hackage/packages/archive/exceptions/0.8.3/exceptions-0.8.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d40f45ef01654a5ab1f38eeda282b23c
+_md5_=5f21f52f47c41a163bf3e359c0d2c6d0
diff --git a/metadata/md5-cache/dev-haskell/fail-4.9.0.0 b/metadata/md5-cache/dev-haskell/fail-4.9.0.0
index 574650b99a1c..b43990249617 100644
--- a/metadata/md5-cache/dev-haskell/fail-4.9.0.0
+++ b/metadata/md5-cache/dev-haskell/fail-4.9.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Forward-compatible MonadFail class
 EAPI=5
 HOMEPAGE=https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail
 IUSE=profile
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/4.9.0.0
 SRC_URI=mirror://hackage/packages/archive/fail/4.9.0.0/fail-4.9.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4c99b4a0a35871c2f955a50d377f52f9
+_md5_=69abc1508c80e615912e8f748f61a202
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.5.3.0 b/metadata/md5-cache/dev-haskell/fgl-5.5.3.0
index 83f93b3c3714..b5ffad27c478 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.5.3.0
+++ b/metadata/md5-cache/dev-haskell/fgl-5.5.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Martin Erwig's Functional Graph Library
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/fgl
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/5.5.3.0
 SRC_URI=mirror://hackage/packages/archive/fgl/5.5.3.0/fgl-5.5.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=405acc480d4ba051557ba5fbc74f833b
+_md5_=14a3cc5841bb14a6f963f3b394423139
diff --git a/metadata/md5-cache/dev-haskell/graphviz-2999.18.1.2 b/metadata/md5-cache/dev-haskell/graphviz-2999.18.1.2
index 50beac696781..59f82e94a504 100644
--- a/metadata/md5-cache/dev-haskell/graphviz-2999.18.1.2
+++ b/metadata/md5-cache/dev-haskell/graphviz-2999.18.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Bindings to Graphviz for graph visualisation
 EAPI=6
 HOMEPAGE=http://projects.haskell.org/graphviz/
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?] >=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] <dev-haskell/polyparse-1.13:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/wl-pprint-text-1.1.0.0:=[profile?] <dev-haskell/wl-pprint-text-1.2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2999.18.1.2
 SRC_URI=mirror://hackage/packages/archive/graphviz/2999.18.1.2/graphviz-2999.18.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=309544dfc65fa3caf9740a47be2aa7c7
+_md5_=b6abb5f645e54a6bf16fb20c66bcf9cc
diff --git a/metadata/md5-cache/dev-haskell/hashable-1.2.4.0 b/metadata/md5-cache/dev-haskell/hashable-1.2.4.0
index be5f110da069..03bd47b6ab68 100644
--- a/metadata/md5-cache/dev-haskell/hashable-1.2.4.0
+++ b/metadata/md5-cache/dev-haskell/hashable-1.2.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=A class for types that can be converted to a hash value
 EAPI=5
 HOMEPAGE=https://github.com/tibbe/hashable
 IUSE=+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 doc hscolour profile test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.4.0
 SRC_URI=mirror://hackage/packages/archive/hashable/1.2.4.0/hashable-1.2.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56c06c94ce139227dfbc9272a2015551
+_md5_=606b6779bd2bc6a8393e9365cf1587a6
diff --git a/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11 b/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11
index be93ca17b7bc..4f8d1770e82d 100644
--- a/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11
+++ b/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11
@@ -4,10 +4,10 @@ DESCRIPTION=Hashed file storage support code
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/hashed-storage
 IUSE=diff hpc test doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/dataenc:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= diff? ( dev-haskell/lcs:=[profile?] )
 SLOT=0/0.5.11
 SRC_URI=mirror://hackage/packages/archive/hashed-storage/0.5.11/hashed-storage-0.5.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eec054c5c2f10e3facf60bba2eeab2b7
+_md5_=9eca0d587b47715cbd52badc16ec3558
diff --git a/metadata/md5-cache/dev-haskell/haskeline-0.7.2.3 b/metadata/md5-cache/dev-haskell/haskeline-0.7.2.3
index 78a096d7aab6..cc313c9613eb 100644
--- a/metadata/md5-cache/dev-haskell/haskeline-0.7.2.3
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.7.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=A command-line interface for user input, written in Haskell
 EAPI=6
 HOMEPAGE=https://github.com/judah/haskeline
 IUSE=legacy-encoding libiconv +terminfo doc hscolour profile
-KEYWORDS=amd64 x86 ~x86-fbsd ~x86-macos
+KEYWORDS=amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
 SLOT=0/0.7.2.3
 SRC_URI=mirror://hackage/packages/archive/haskeline/0.7.2.3/haskeline-0.7.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16352e7634785a09a78bb0b5a958d639
+_md5_=85ae563116fc12a5eea6463d0d6a4cdb
diff --git a/metadata/md5-cache/dev-haskell/http-4000.3.5 b/metadata/md5-cache/dev-haskell/http-4000.3.5
index 84c9cd1cbbc6..92ecfe599e5b 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.3.5
+++ b/metadata/md5-cache/dev-haskell/http-4000.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=A library for client-side HTTP
 EAPI=6
 HOMEPAGE=https://github.com/haskell/HTTP
 IUSE=conduit10 +network-uri doc hscolour profile test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.2.1.8:=[profile?] <dev-haskell/network-2.6:=[profile?] )
 SLOT=0/4000.3.5
 SRC_URI=mirror://hackage/packages/archive/HTTP/4000.3.5/HTTP-4000.3.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=abdbec35da551f8bc74c8adece95a8a0
+_md5_=7e88084c63f43aade80a306f918d8a8f
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.10 b/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.10
index 3e3b2d6ce4fc..3aa0fce54276 100644
--- a/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.10
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.10
@@ -4,10 +4,10 @@ DESCRIPTION=lifted IO operations from the base library
 EAPI=6
 HOMEPAGE=https://github.com/basvandijk/lifted-base
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.3.10
 SRC_URI=mirror://hackage/packages/archive/lifted-base/0.2.3.10/lifted-base-0.2.3.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0d9b70a6d665532cd22d5e7c09eae2a5
+_md5_=750c35be2220797193652598238e2d06
diff --git a/metadata/md5-cache/dev-haskell/memory-0.14.1 b/metadata/md5-cache/dev-haskell/memory-0.14.1
index 7fb0cdd2a53d..67e4e9d503e1 100644
--- a/metadata/md5-cache/dev-haskell/memory-0.14.1
+++ b/metadata/md5-cache/dev-haskell/memory-0.14.1
@@ -4,10 +4,10 @@ DESCRIPTION=memory and related abstraction stuff
 EAPI=6
 HOMEPAGE=https://github.com/vincenthz/hs-memory
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.14.1
 SRC_URI=mirror://hackage/packages/archive/memory/0.14.1/memory-0.14.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e1e8f27fc6e27293eda23167b718e282
+_md5_=3cc88ff162b69f7d1e317d92539a7059
diff --git a/metadata/md5-cache/dev-haskell/mmap-0.5.9 b/metadata/md5-cache/dev-haskell/mmap-0.5.9
index 142f1a4a20d2..127e5f927de8 100644
--- a/metadata/md5-cache/dev-haskell/mmap-0.5.9
+++ b/metadata/md5-cache/dev-haskell/mmap-0.5.9
@@ -4,11 +4,11 @@ DESCRIPTION=Memory mapped files for POSIX and Windows
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/mmap
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.5.9
 SRC_URI=mirror://hackage/packages/archive/mmap/0.5.9/mmap-0.5.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf4269ea0fb5d5d17b7163fc6a7da8f3
+_md5_=435b77b65aa41334cef3f8c251126bf7
diff --git a/metadata/md5-cache/dev-haskell/mmorph-1.0.9 b/metadata/md5-cache/dev-haskell/mmorph-1.0.9
index 0fd6960677b3..e6877396f70e 100644
--- a/metadata/md5-cache/dev-haskell/mmorph-1.0.9
+++ b/metadata/md5-cache/dev-haskell/mmorph-1.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=Monad morphisms
 EAPI=6
 HOMEPAGE=http://hackage.haskell.org/package/mmorph
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.0.9
 SRC_URI=mirror://hackage/packages/archive/mmorph/1.0.9/mmorph-1.0.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=72488d69797c071c4c28780efcc739a2
+_md5_=d7634c370a7339ac7b7d37991f08da4d
diff --git a/metadata/md5-cache/dev-haskell/monad-control-1.0.1.0 b/metadata/md5-cache/dev-haskell/monad-control-1.0.1.0
index 286d6f7ae235..4f9af76857cc 100644
--- a/metadata/md5-cache/dev-haskell/monad-control-1.0.1.0
+++ b/metadata/md5-cache/dev-haskell/monad-control-1.0.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lift control operations, like exception catching, through monad tran
 EAPI=5
 HOMEPAGE=https://github.com/basvandijk/monad-control
 IUSE=doc hscolour profile
-KEYWORDS=amd64 x86 ~amd64-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.0
 SRC_URI=mirror://hackage/packages/archive/monad-control/1.0.1.0/monad-control-1.0.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e760442f1fcc94b75c2cf73bae9926fd
+_md5_=53e972473fd2f0282eb62f780a8e2c73
diff --git a/metadata/md5-cache/dev-haskell/nats-1 b/metadata/md5-cache/dev-haskell/nats-1
index ee8d9f5e81e4..4f4582a36dfd 100644
--- a/metadata/md5-cache/dev-haskell/nats-1
+++ b/metadata/md5-cache/dev-haskell/nats-1
@@ -4,10 +4,10 @@ DESCRIPTION=Natural numbers
 EAPI=5
 HOMEPAGE=https://github.com/ekmett/nats/
 IUSE=+hashable profile
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
 SLOT=0/1
 SRC_URI=mirror://hackage/packages/archive/nats/1/nats-1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=206da0fd81c7d71313b439d833eccb18
+_md5_=765057a12704737cef10fe31b3d37a65
diff --git a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7 b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
index a7c3f6db9d6a..a12c7b541088 100644
--- a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
+++ b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=locale library
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/old-locale
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.0.7
 SRC_URI=mirror://hackage/packages/archive/old-locale/1.0.0.7/old-locale-1.0.0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ebf9830a2ce62bd48a89b6e3f2044ed
+_md5_=40e6bcd466425b34ad81cdb315ba849d
diff --git a/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1 b/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
index bd9b94ba97dc..56474ffff9b1 100644
--- a/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
+++ b/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Time library
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/old-time
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.3
 SRC_URI=mirror://hackage/packages/archive/old-time/1.1.0.3/old-time-1.1.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d4145fe57d3b97e035c67843f5e01bb8
+_md5_=f9766a2eea4395e06b055ecf910cee70
diff --git a/metadata/md5-cache/dev-haskell/polyparse-1.11 b/metadata/md5-cache/dev-haskell/polyparse-1.11
index 75bae2153835..5c6b75dedd53 100644
--- a/metadata/md5-cache/dev-haskell/polyparse-1.11
+++ b/metadata/md5-cache/dev-haskell/polyparse-1.11
@@ -4,10 +4,10 @@ DESCRIPTION=A variety of alternative parser combinator libraries
 EAPI=5
 HOMEPAGE=http://code.haskell.org/~malcolm/polyparse/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.11
 SRC_URI=mirror://hackage/packages/archive/polyparse/1.11/polyparse-1.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0ec8a3a3f9adec43ceb62e7e6c3f3034
+_md5_=fbea45b1b558b29aaaa3cde49594d491
diff --git a/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3 b/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3
index f9feb4fa5a30..e2ea02c9d338 100644
--- a/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3
+++ b/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=Regex-based parsing with applicative interface
 EAPI=5
 HOMEPAGE=https://github.com/feuerbach/regex-applicative
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=mirror://hackage/packages/archive/regex-applicative/0.3.3/regex-applicative-0.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca88c436fe7a8e28e21c0e19b83cb5d4
+_md5_=552a6cc44c8396225e7b7ed79fe2185d
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4 b/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
index d4190085080f..3393f79404a9 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
+++ b/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=Unicode Support version of Text.Regex, using regex-tdfa
 EAPI=5
 HOMEPAGE=https://hub.darcs.net/shelarcy/regex-compat-tdfa
 IUSE=doc hscolour profile
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-tdfa-1.1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.95.1.4
 SRC_URI=mirror://hackage/packages/archive/regex-compat-tdfa/0.95.1.4/regex-compat-tdfa-0.95.1.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7502ce0e90dc49871bf880a9fac5d7fd
+_md5_=f08c9e54a1878704862bf08e2576dabf
diff --git a/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2 b/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2
index 1105d94caea6..8532bb6159f6 100644
--- a/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=Replaces/Enhances Text.Regex
 EAPI=6
 HOMEPAGE=https://github.com/ChrisKuklewicz/regex-tdfa
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.2
 SRC_URI=mirror://hackage/packages/archive/regex-tdfa/1.2.2/regex-tdfa-1.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a52d3bf9bda7fcb55a2c0d344ddbb2c
+_md5_=e7982d2649c1a3128fb6a66d96f90b21
diff --git a/metadata/md5-cache/dev-haskell/resourcet-1.1.9 b/metadata/md5-cache/dev-haskell/resourcet-1.1.9
index 5280eacac471..e3edba8f973a 100644
--- a/metadata/md5-cache/dev-haskell/resourcet-1.1.9
+++ b/metadata/md5-cache/dev-haskell/resourcet-1.1.9
@@ -4,10 +4,10 @@ DESCRIPTION=Deterministic allocation and freeing of scarce resources
 EAPI=6
 HOMEPAGE=https://github.com/snoyberg/conduit
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.9
 SRC_URI=mirror://hackage/packages/archive/resourcet/1.1.9/resourcet-1.1.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a19120b4a1848e65194b47837f6f24d6
+_md5_=432df49742d555b79c3cc037f54afd1a
diff --git a/metadata/md5-cache/dev-haskell/sandi-0.4.0 b/metadata/md5-cache/dev-haskell/sandi-0.4.0
index 1c0cf048db27..a9d4c9ab0ba2 100644
--- a/metadata/md5-cache/dev-haskell/sandi-0.4.0
+++ b/metadata/md5-cache/dev-haskell/sandi-0.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Data encoding library
 EAPI=6
 HOMEPAGE=http://hackage.haskell.org/package/sandi
 IUSE=+with-conduit doc hscolour profile test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= with-conduit? ( >=dev-haskell/conduit-1.2:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] )
 SLOT=0/0.4.0
 SRC_URI=mirror://hackage/packages/archive/sandi/0.4.0/sandi-0.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5758fce45b4f7ed33d8c20152eec6a92
+_md5_=520975da5169ff22e0966c43a5004add
diff --git a/metadata/md5-cache/dev-haskell/scientific-0.3.4.9 b/metadata/md5-cache/dev-haskell/scientific-0.3.4.9
index 8a3e269d4f23..8ff2fc3f9a33 100644
--- a/metadata/md5-cache/dev-haskell/scientific-0.3.4.9
+++ b/metadata/md5-cache/dev-haskell/scientific-0.3.4.9
@@ -4,10 +4,10 @@ DESCRIPTION=Numbers represented using scientific notation
 EAPI=6
 HOMEPAGE=https://github.com/basvandijk/scientific
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.4.9
 SRC_URI=mirror://hackage/packages/archive/scientific/0.3.4.9/scientific-0.3.4.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e6b2a7cdd4bfedc7e89090f343d5405
+_md5_=a8fd71f8b07472df5660babb669591a9
diff --git a/metadata/md5-cache/dev-haskell/semigroups-0.18.2 b/metadata/md5-cache/dev-haskell/semigroups-0.18.2
index 11d2e0dc0535..63e4cb895b9b 100644
--- a/metadata/md5-cache/dev-haskell/semigroups-0.18.2
+++ b/metadata/md5-cache/dev-haskell/semigroups-0.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=Anything that associates
 EAPI=6
 HOMEPAGE=https://github.com/ekmett/semigroups/
 IUSE=+binary +transformers doc hscolour profile
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= binary? ( dev-haskell/binary:=[profile?] ) transformers? ( >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] )
 SLOT=0/0.18.2
 SRC_URI=mirror://hackage/packages/archive/semigroups/0.18.2/semigroups-0.18.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a10ab5023f3a0f690e8c4d2caec2fba
+_md5_=f3c58cc1ca40483cc474505e404d406b
diff --git a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6 b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6
index fe292850c397..380f89c51b19 100644
--- a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6
+++ b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6
@@ -4,10 +4,10 @@ DESCRIPTION=Fast searching, splitting and replacing of ByteStrings
 EAPI=5
 HOMEPAGE=https://bitbucket.org/dafis/stringsearch
 IUSE=doc hscolour profile
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.6.6
 SRC_URI=mirror://hackage/packages/archive/stringsearch/0.3.6.6/stringsearch-0.3.6.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e13a3bc8d99de9da9d83a3a108712c3d
+_md5_=9917e4bfaa8998be13741993de80cf7c
diff --git a/metadata/md5-cache/dev-haskell/tagged-0.8.4 b/metadata/md5-cache/dev-haskell/tagged-0.8.4
index b4ea66ae9c47..9992b553dcf8 100644
--- a/metadata/md5-cache/dev-haskell/tagged-0.8.4
+++ b/metadata/md5-cache/dev-haskell/tagged-0.8.4
@@ -4,10 +4,10 @@ DESCRIPTION=Haskell 98 phantom types to avoid unsafely passing dummy arguments
 EAPI=6
 HOMEPAGE=https://github.com/ekmett/tagged
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.8.4
 SRC_URI=mirror://hackage/packages/archive/tagged/0.8.4/tagged-0.8.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=355708a67cfb08c4e8b70b6c4ad82281
+_md5_=0b90d782e59b9abd3b74250af48e35c6
diff --git a/metadata/md5-cache/dev-haskell/tar-0.5.1.0 b/metadata/md5-cache/dev-haskell/tar-0.5.1.0
index 444ab4807740..71400d06b610 100644
--- a/metadata/md5-cache/dev-haskell/tar-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/tar-0.5.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Reading, writing and manipulating '.tar' archive files
 EAPI=6
 HOMEPAGE=http://hackage.haskell.org/package/tar
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~x86-macos
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.1.0
 SRC_URI=mirror://hackage/packages/archive/tar/0.5.1.0/tar-0.5.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a791ab16137122c0da4503f6909e608b
+_md5_=8e26ac0fa382ef0ec086fce9f6f7ff7f
diff --git a/metadata/md5-cache/dev-haskell/temporary-1.2.0.4 b/metadata/md5-cache/dev-haskell/temporary-1.2.0.4
index f1a0d794f77a..32a3dfc9be85 100644
--- a/metadata/md5-cache/dev-haskell/temporary-1.2.0.4
+++ b/metadata/md5-cache/dev-haskell/temporary-1.2.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=Portable temporary file and directory support for Windows and Unix
 EAPI=5
 HOMEPAGE=http://www.github.com/feuerbach/temporary
 IUSE=doc hscolour profile
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.0.4
 SRC_URI=mirror://hackage/packages/archive/temporary/1.2.0.4/temporary-1.2.0.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=31592cb51ae06e1a2ff86d4d195e8b8c
+_md5_=49cbd0e2d3266914f665aa3b07b13f0d
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.4.0.2 b/metadata/md5-cache/dev-haskell/terminfo-0.4.0.2
index 9b2bc4433233..9d8f2ad0383e 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.4.0.2
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.4.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Haskell bindings to the terminfo library
 EAPI=5
 HOMEPAGE=https://github.com/judah/terminfo
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.0.2
 SRC_URI=mirror://hackage/packages/archive/terminfo/0.4.0.2/terminfo-0.4.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=872673b65f042498f860a4a3c51520de
+_md5_=cc945b21102bc87df0f29a9104b82bc5
diff --git a/metadata/md5-cache/dev-haskell/transformers-base-0.4.4 b/metadata/md5-cache/dev-haskell/transformers-base-0.4.4
index bbd2620ee6c8..373c89f75ea5 100644
--- a/metadata/md5-cache/dev-haskell/transformers-base-0.4.4
+++ b/metadata/md5-cache/dev-haskell/transformers-base-0.4.4
@@ -4,10 +4,10 @@ DESCRIPTION=Lift computations from the bottom of a transformer stack
 EAPI=5
 HOMEPAGE=https://github.com/mvv/transformers-base
 IUSE=+orphaninstances doc hscolour profile
-KEYWORDS=amd64 x86 ~amd64-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/transformers-compat-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.4
 SRC_URI=mirror://hackage/packages/archive/transformers-base/0.4.4/transformers-base-0.4.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fbdfd9e9a68a26bc61523ce08cb0a72b
+_md5_=746dc128f4af98d207a9838216b700c5
diff --git a/metadata/md5-cache/dev-haskell/transformers-compat-0.5.1.4 b/metadata/md5-cache/dev-haskell/transformers-compat-0.5.1.4
index aa014779b6ce..f93a0fa7f9a1 100644
--- a/metadata/md5-cache/dev-haskell/transformers-compat-0.5.1.4
+++ b/metadata/md5-cache/dev-haskell/transformers-compat-0.5.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=A small compatibility shim for dev-haskell/transformers
 EAPI=5
 HOMEPAGE=https://github.com/ekmett/transformers-compat/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.3:=[profile?]
 SLOT=0/0.5.1.4
 SRC_URI=mirror://hackage/packages/archive/transformers-compat/0.5.1.4/transformers-compat-0.5.1.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e0789b109d51a35822ec74976cf893fe
+_md5_=aa1584abc371472b6f9e2aab14cacaef
diff --git a/metadata/md5-cache/dev-haskell/unix-compat-0.4.3.1 b/metadata/md5-cache/dev-haskell/unix-compat-0.4.3.1
index a2604db1cd2f..202694831d71 100644
--- a/metadata/md5-cache/dev-haskell/unix-compat-0.4.3.1
+++ b/metadata/md5-cache/dev-haskell/unix-compat-0.4.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Portable POSIX-compatibility layer
 EAPI=6
 HOMEPAGE=https://github.com/jystic/unix-compat
 IUSE=old-time doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.3.1
 SRC_URI=mirror://hackage/packages/archive/unix-compat/0.4.3.1/unix-compat-0.4.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90e095fc1b850649cb840926a407e807
+_md5_=995534cd6f9a8630085610742c4d2e89
diff --git a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.7.2 b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.7.2
index e46c09e36b3f..79cce96fbf3a 100644
--- a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.7.2
+++ b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Efficient hashing-based container types
 EAPI=6
 HOMEPAGE=https://github.com/tibbe/unordered-containers
 IUSE=debug doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.2.7.2
 SRC_URI=mirror://hackage/packages/archive/unordered-containers/0.2.7.2/unordered-containers-0.2.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5ec398cf74348deb4bb6d8ad3f466c3e
+_md5_=1b768049ce1be87074f31e1a3fa8865d
diff --git a/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1 b/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
index 350455618acd..b25531514bfb 100644
--- a/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
+++ b/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Support for reading and writing UTF8 Strings
 EAPI=5
 HOMEPAGE=https://github.com/glguy/utf8-string/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.1
 SRC_URI=mirror://hackage/packages/archive/utf8-string/1.0.1.1/utf8-string-1.0.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fb60a7cbc4c014396a1c4bf2eb5053c5
+_md5_=b2c0f06317d72836b188a22050c484bf
diff --git a/metadata/md5-cache/dev-haskell/void-0.7.1 b/metadata/md5-cache/dev-haskell/void-0.7.1
index 42ee8ad0efc0..58fe56aa2d99 100644
--- a/metadata/md5-cache/dev-haskell/void-0.7.1
+++ b/metadata/md5-cache/dev-haskell/void-0.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=A Haskell 98 logically uninhabited data type
 EAPI=5
 HOMEPAGE=https://github.com/ekmett/void
 IUSE=safe doc hscolour profile
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.1
 SRC_URI=mirror://hackage/packages/archive/void/0.7.1/void-0.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c967bef8f41359c3c29888932421139
+_md5_=bc76e29465f87bc72df9c72cf7d78dc2
diff --git a/metadata/md5-cache/dev-haskell/wl-pprint-text-1.1.1.0 b/metadata/md5-cache/dev-haskell/wl-pprint-text-1.1.1.0
index b73792026188..6ac39c6fadfa 100644
--- a/metadata/md5-cache/dev-haskell/wl-pprint-text-1.1.1.0
+++ b/metadata/md5-cache/dev-haskell/wl-pprint-text-1.1.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Wadler/Leijen Pretty Printer for Text values
 EAPI=6
 HOMEPAGE=http://hackage.haskell.org/package/wl-pprint-text
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.1.0
 SRC_URI=mirror://hackage/packages/archive/wl-pprint-text/1.1.1.0/wl-pprint-text-1.1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf63566179118ee9f662eee4d1c0c542
+_md5_=61182f56a0bb5a9bda8a68c141c413fd
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.2.3.7 b/metadata/md5-cache/dev-haskell/zip-archive-0.2.3.7
index 673bb3bb92be..07ed59e6c7b0 100644
--- a/metadata/md5-cache/dev-haskell/zip-archive-0.2.3.7
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.2.3.7
@@ -4,10 +4,10 @@ DESCRIPTION=Library for creating and modifying zip archives
 EAPI=5
 HOMEPAGE=https://github.com/jgm/zip-archive
 IUSE=executable doc hscolour profile test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.5:=[profile?] >=dev-haskell/digest-0.0.0.1:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.3.7
 SRC_URI=mirror://hackage/packages/archive/zip-archive/0.2.3.7/zip-archive-0.2.3.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8535c6fa4023995a2370e9cd725c4c6
+_md5_=b8392e7bfacc4da2523da8741c572054
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.6.1.2 b/metadata/md5-cache/dev-haskell/zlib-0.6.1.2
index bf157a1269ba..3fa4ab0c4334 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.6.1.2
+++ b/metadata/md5-cache/dev-haskell/zlib-0.6.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Compression and decompression in the gzip and zlib formats
 EAPI=6
 HOMEPAGE=http://hackage.haskell.org/package/zlib
 IUSE=non-blocking-ffi doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
 SLOT=0/0.6.1.2
 SRC_URI=mirror://hackage/packages/archive/zlib/0.6.1.2/zlib-0.6.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=207ce34b620001d462779962332300d4
+_md5_=930c9bc1d03d69a671cf576a1f788d8a
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 1777272c53e9..5b4f6aaa0fcd 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/icedtea-bin-3.10.0-r1 b/metadata/md5-cache/dev-java/icedtea-bin-3.10.0-r1
deleted file mode 100644
index 55d9deb377f1..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.10.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 ~arm arm64 ppc64 x86
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=sys-devel/gcc-6.4.0[multilib?] >=sys-libs/glibc-2.26[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.42:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.11:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.42:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.9:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
-RESTRICT=preserve-libs strip
-SLOT=8
-SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.10.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.10.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-r1-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-r1-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-r1-x86.tar.xz ) )
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=819608bc981ead5281c4aabbd53347b2
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.10.0-r2 b/metadata/md5-cache/dev-java/icedtea-bin-3.10.0-r2
new file mode 100644
index 000000000000..c2bdcdef61b2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.10.0-r2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
+EAPI=6
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* amd64 ~arm arm64 ppc64 x86
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+RDEPEND=>=sys-devel/gcc-6.4.0[multilib?] >=sys-libs/glibc-2.26[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.42:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.11:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg-compat:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.42:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.9:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg-compat:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
+RESTRICT=preserve-libs strip
+SLOT=8
+SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.10.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.10.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-r1-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-r1-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-r1-x86.tar.xz ) )
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6727ea8ae1d0cd7a44dd35f689841e5f
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.12.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.12.0
deleted file mode 100644
index 7dfd6e057dc9..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64 ~ppc64 ~x86
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=sys-devel/gcc-8.2.0[multilib?] >=sys-libs/glibc-2.28[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.58:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.13:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.28.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.42[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.58:2 >=media-libs/fontconfig-2.13:1.0 >=media-libs/freetype-2.9.1:2 >=media-libs/lcms-2.9:2 >=sys-libs/zlib-1.2.11-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.28.1 >=x11-libs/cairo-1.16.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.42 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
-RESTRICT=preserve-libs strip
-SLOT=8
-SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.12.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.12.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-amd64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-x86.tar.xz ) )
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2ce157bef56e9f1554a84af5dce3de73
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.12.0-r1 b/metadata/md5-cache/dev-java/icedtea-bin-3.12.0-r1
new file mode 100644
index 000000000000..fa304b6d3ee5
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.12.0-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
+EAPI=6
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+RDEPEND=>=sys-devel/gcc-8.2.0[multilib?] >=sys-libs/glibc-2.28[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.58:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.13:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg-compat:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.28.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.42[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.58:2 >=media-libs/fontconfig-2.13:1.0 >=media-libs/freetype-2.9.1:2 >=media-libs/lcms-2.9:2 >=sys-libs/zlib-1.2.11-r1 virtual/jpeg-compat:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.28.1 >=x11-libs/cairo-1.16.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.42 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
+RESTRICT=preserve-libs strip
+SLOT=8
+SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.12.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.12.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-x86.tar.xz ) )
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=5c1213d910ff144dc69f5012ac1b52c5
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.5 b/metadata/md5-cache/dev-java/maven-bin-3.0.5
deleted file mode 100644
index 4d0e2e59e593..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=6
-HOMEPAGE=https://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=app-eselect/eselect-java >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3
-SLOT=3.0
-SRC_URI=mirror://apache/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=20624059dd917ef58327455f83cd1ba5
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.5-r1 b/metadata/md5-cache/dev-java/maven-bin-3.0.5-r1
new file mode 100644
index 000000000000..fbab92269064
--- /dev/null
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Project Management and Comprehension Tool for Java
+EAPI=6
+HOMEPAGE=https://maven.apache.org/
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+SLOT=3.0
+SRC_URI=mirror://apache/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=001e4b13d1e564d10e8f5b0ed801b4a0
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.1.1 b/metadata/md5-cache/dev-java/maven-bin-3.1.1
deleted file mode 100644
index ecb0b6ce53d2..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=5
-HOMEPAGE=https://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
-SLOT=3.1
-SRC_URI=mirror://apache/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=277d86b417e86c8ff3a9898cc9ec8de1
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.1.1-r1 b/metadata/md5-cache/dev-java/maven-bin-3.1.1-r1
new file mode 100644
index 000000000000..0fee53560915
--- /dev/null
+++ b/metadata/md5-cache/dev-java/maven-bin-3.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Project Management and Comprehension Tool for Java
+EAPI=6
+HOMEPAGE=https://maven.apache.org/
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+SLOT=3.1
+SRC_URI=mirror://apache/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=6c91c1147fa991c6eb7751a701f38dbb
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.2.5 b/metadata/md5-cache/dev-java/maven-bin-3.2.5
deleted file mode 100644
index b9bdeacc2c60..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=5
-HOMEPAGE=https://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.6 >=virtual/jre-1.6 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
-SLOT=3.2
-SRC_URI=mirror://apache/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=86b7510892969fba322e3632bc803cdc
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.2.5-r1 b/metadata/md5-cache/dev-java/maven-bin-3.2.5-r1
new file mode 100644
index 000000000000..298c5dc3de30
--- /dev/null
+++ b/metadata/md5-cache/dev-java/maven-bin-3.2.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Project Management and Comprehension Tool for Java
+EAPI=6
+HOMEPAGE=https://maven.apache.org/
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+SLOT=3.2
+SRC_URI=mirror://apache/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=e9549aa5ed3e99b54395a4b1f0750da4
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.3.9 b/metadata/md5-cache/dev-java/maven-bin-3.3.9
deleted file mode 100644
index 6e9431bdd0ea..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.3.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=5
-HOMEPAGE=https://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=3.3
-SRC_URI=mirror://apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=dc7cc990a624af20b6b69ad35be0df93
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.3.9-r1 b/metadata/md5-cache/dev-java/maven-bin-3.3.9-r1
new file mode 100644
index 000000000000..0693005df6ac
--- /dev/null
+++ b/metadata/md5-cache/dev-java/maven-bin-3.3.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Project Management and Comprehension Tool for Java
+EAPI=6
+HOMEPAGE=https://maven.apache.org/
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+SLOT=3.3
+SRC_URI=mirror://apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=b342c71c21fcf077be37d0170c184e1b
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.6.0 b/metadata/md5-cache/dev-java/maven-bin-3.6.0
deleted file mode 100644
index a48d3101cfc1..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=6
-HOMEPAGE=https://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=3.6
-SRC_URI=mirror://apache/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c108eb32058d411ffeecb51ccaee91f2
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.6.1 b/metadata/md5-cache/dev-java/maven-bin-3.6.1
deleted file mode 100644
index dc35aae745e6..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=6
-HOMEPAGE=https://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=3.6
-SRC_URI=mirror://apache/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6da732ef906f78ba3a8d35a6e6f3c7d2
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.6.1-r1 b/metadata/md5-cache/dev-java/maven-bin-3.6.1-r1
new file mode 100644
index 000000000000..2ff05c943f31
--- /dev/null
+++ b/metadata/md5-cache/dev-java/maven-bin-3.6.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Project Management and Comprehension Tool for Java
+EAPI=6
+HOMEPAGE=https://maven.apache.org/
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+SLOT=3.6
+SRC_URI=mirror://apache/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=805e8df361f0d498ddeac0a0f8e7d622
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r3 b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r3
index d0af8fab80ac..2ede1c14ecdc 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r3
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r3
@@ -11,4 +11,4 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.3+7.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=89b105c0d91568a28bd1217087dbe8a0
+_md5_=67ff5b34836223a3c0b59d5967cb931a
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4 b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4
new file mode 100644
index 000000000000..265ff1a10aa5
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11 ) || ( dev-java/openjdk-bin:11 dev-java/openjdk:11 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Open source implementation of the Java programming language
+EAPI=6
+HOMEPAGE=https://openjdk.java.net
+IUSE=alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap +webstart elibc_FreeBSD
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=GPL-2
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+REQUIRED_USE=javafx? ( alsa !headless-awt )
+SLOT=11
+SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.3+7.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=2ec9354c5f5f70822994b541fb380669
diff --git a/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3 b/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3
index 50d090212cf2..386bf2f3048c 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3
+++ b/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3
@@ -11,4 +11,4 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/ba
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u212-b03.tar.bz2 -> openjdk-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u212-b03.tar.bz2 -> openjdk-corba-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u212-b03.tar.bz2 -> openjdk-hotspot-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u212-b03.tar.bz2 -> openjdk-jaxp-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u212-b03.tar.bz2 -> openjdk-jaxws-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u212-b03.tar.bz2 -> openjdk-jdk-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u212-b03.tar.bz2 -> openjdk-langtools-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u212-b03.tar.bz2 -> openjdk-nashorn-8.212_p03.tar.bz2
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=49b254d97072991381ac24e534a5a5b4
+_md5_=80bad89b35f460248e65b95562f69aed
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.3_p1 b/metadata/md5-cache/dev-java/openjfx-11.0.3_p1
new file mode 100644
index 000000000000..b9148001f788
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.3_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 media-libs/fontconfig:1.0 media-video/ffmpeg:0= x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/cairo[glib] x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/jpeg virtual/opengl || ( dev-java/openjdk-bin:11[doc?] dev-java/openjdk:11[doc?] ) app-arch/unzip app-arch/zip >=dev-java/ant-core-1.10.5-r2:0 dev-java/antlr:0 dev-java/antlr:3.5 dev-java/hamcrest-core:0 dev-java/stringtemplate:0 virtual/ttf-fonts virtual/pkgconfig >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Java OpenJFX client application platform
+EAPI=6
+HOMEPAGE=https://openjfx.io
+IUSE=cpu_flags_x86_sse2 debug doc source +media elibc_FreeBSD
+KEYWORDS=-* ~amd64
+LICENSE=GPL-2-with-classpath-exception
+RDEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 media-libs/fontconfig:1.0 media-video/ffmpeg:0= x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/cairo[glib] x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/jpeg virtual/opengl || ( dev-java/openjdk-bin:11[doc?] dev-java/openjdk:11[doc?] ) >=dev-java/java-config-2.2.0-r3
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=11
+SRC_URI=https://hg.openjdk.java.net/openjfx/11/rt/archive/11.0.3+1.tar.bz2 -> openjfx-11.0.3_p1.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.8-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo.maven.apache.org/maven2/org/antlr/antlr-complete/3.5.2/antlr-complete-3.5.2.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=bfa67fae2c8d7ff53c12caa4721a6545
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index f5ea645e3006..863613807cb7 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/crystal-0.24.2 b/metadata/md5-cache/dev-lang/crystal-0.24.2
deleted file mode 100644
index 67b8a07065e9..000000000000
--- a/metadata/md5-cache/dev-lang/crystal-0.24.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-devel/llvm:5 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0
-DESCRIPTION=The Crystal Programming Language
-EAPI=6
-HOMEPAGE=https://crystal-lang.org
-IUSE=doc debug examples blocking-stdio-hack +xml +yaml
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/llvm:5 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml )
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/crystal/archive/0.24.2.tar.gz -> crystal-0.24.2.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.24.2/crystal-0.23.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.24.2/crystal-0.23.0-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a41ee8103aebcc63f36f0cb833ce3c72
diff --git a/metadata/md5-cache/dev-lang/crystal-0.25.0 b/metadata/md5-cache/dev-lang/crystal-0.25.0
deleted file mode 100644
index aa1d51eaf243..000000000000
--- a/metadata/md5-cache/dev-lang/crystal-0.25.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0
-DESCRIPTION=The Crystal Programming Language
-EAPI=6
-HOMEPAGE=https://crystal-lang.org
-IUSE=doc debug examples blocking-stdio-hack +xml +yaml
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml )
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/crystal/archive/0.25.0.tar.gz -> crystal-0.25.0.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.24.2/crystal-0.24.2-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.24.2/crystal-0.24.2-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=be4cf8a5292cf2147e33c2be403a519d
diff --git a/metadata/md5-cache/dev-lang/crystal-0.26.0 b/metadata/md5-cache/dev-lang/crystal-0.26.0
deleted file mode 100644
index 650b785fc1ae..000000000000
--- a/metadata/md5-cache/dev-lang/crystal-0.26.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0
-DESCRIPTION=The Crystal Programming Language
-EAPI=6
-HOMEPAGE=https://crystal-lang.org
-IUSE=doc debug examples blocking-stdio-hack +xml +yaml
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml )
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/crystal/archive/0.26.0.tar.gz -> crystal-0.26.0.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.25.1/crystal-0.25.1-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.25.1/crystal-0.25.1-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=9b44b89a060bf32f8649813870c28c58
diff --git a/metadata/md5-cache/dev-lang/crystal-0.26.1 b/metadata/md5-cache/dev-lang/crystal-0.26.1
index 7b60017b6b61..457d5d897dea 100644
--- a/metadata/md5-cache/dev-lang/crystal-0.26.1
+++ b/metadata/md5-cache/dev-lang/crystal-0.26.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml )
 SLOT=0
 SRC_URI=https://github.com/crystal-lang/crystal/archive/0.26.1.tar.gz -> crystal-0.26.1.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.26.0/crystal-0.26.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.26.0/crystal-0.26.0-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	83a68dab6355a0f96b37fe96bc4f317c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=3c862641c7047f934beca62c39c46945
diff --git a/metadata/md5-cache/dev-lang/crystal-0.27.0 b/metadata/md5-cache/dev-lang/crystal-0.27.0
deleted file mode 100644
index 105b894d3e6f..000000000000
--- a/metadata/md5-cache/dev-lang/crystal-0.27.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0
-DESCRIPTION=The Crystal Programming Language
-EAPI=6
-HOMEPAGE=https://crystal-lang.org
-IUSE=doc debug examples blocking-stdio-hack +xml +yaml
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml )
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/crystal/archive/0.27.0.tar.gz -> crystal-0.27.0.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.27.0/crystal-0.27.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.27.0/crystal-0.27.0-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a7b63fc8ea00262c34bf249abe34bde3
diff --git a/metadata/md5-cache/dev-lang/crystal-0.27.1 b/metadata/md5-cache/dev-lang/crystal-0.27.1
deleted file mode 100644
index da9044bd6f29..000000000000
--- a/metadata/md5-cache/dev-lang/crystal-0.27.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0
-DESCRIPTION=The Crystal Programming Language
-EAPI=6
-HOMEPAGE=https://crystal-lang.org
-IUSE=doc debug examples blocking-stdio-hack +xml +yaml
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml )
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/crystal/archive/0.27.1.tar.gz -> crystal-0.27.1.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.27.0/crystal-0.27.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.27.0/crystal-0.27.0-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=5ed2009f3dd7fd3a4d94ab547adb2ea4
diff --git a/metadata/md5-cache/dev-lang/crystal-0.27.2 b/metadata/md5-cache/dev-lang/crystal-0.27.2
index d55f0f255fb7..07debf9dd4c7 100644
--- a/metadata/md5-cache/dev-lang/crystal-0.27.2
+++ b/metadata/md5-cache/dev-lang/crystal-0.27.2
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatom
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crystal-lang/crystal/archive/0.27.2.tar.gz -> crystal-0.27.2.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.27.0/crystal-0.27.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.27.0/crystal-0.27.0-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	83a68dab6355a0f96b37fe96bc4f317c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=f780efe5688165560a22c2f39ff4df03
diff --git a/metadata/md5-cache/dev-lang/crystal-0.28.0 b/metadata/md5-cache/dev-lang/crystal-0.28.0
index 68c2062480af..5ba28b541a6c 100644
--- a/metadata/md5-cache/dev-lang/crystal-0.28.0
+++ b/metadata/md5-cache/dev-lang/crystal-0.28.0
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatom
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crystal-lang/crystal/archive/0.28.0.tar.gz -> crystal-0.28.0.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.28.0/crystal-0.28.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.28.0/crystal-0.28.0-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	83a68dab6355a0f96b37fe96bc4f317c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=123bb4e73d219ec1aa06f0774a42ebae
diff --git a/metadata/md5-cache/dev-lang/erlang-21.3-r1 b/metadata/md5-cache/dev-lang/erlang-21.3-r1
new file mode 100644
index 000000000000..4338e40d8905
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/erlang-21.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
+EAPI=6
+HOMEPAGE=https://www.erlang.org/
+IUSE=doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=https://github.com/erlang/otp/archive/OTP-21.3.tar.gz -> erlang-21.3.tar.gz http://erlang.org/download/otp_doc_man_21.3.tar.gz -> erlang_doc_man_21.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_21.3.tar.gz -> erlang_doc_html_21.3.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89
+_md5_=20109eac313379bad3185105f294d9ef
diff --git a/metadata/md5-cache/dev-lang/ghc-8.0.2 b/metadata/md5-cache/dev-lang/ghc-8.0.2
index 2f8552461fca..6d6b7c191b83 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.0.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.0.2
@@ -12,4 +12,4 @@ 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? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-alpha.tbz2 ) arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/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? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ia64-unknown-linux-gnu.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/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	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a5b615e6c522f70ca09983a9ec1f9723
+_md5_=6cbe1e9c9dbe7ad4d422ff52f8913f3f
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
index 6b8b1f45734b..feb074c07008 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45183572c51e158467a6161304134d93
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017 b/metadata/md5-cache/dev-lang/gnat-gpl-2017
index a5fce20c041f..0447a7ec6e6e 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=00d62e03c29674824736bddeeb05fd2a
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r1
deleted file mode 100644
index 917a39b0cb21..000000000000
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=!sys-devel/gcc:7.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 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:0= ) >=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 )
-DESCRIPTION=GNAT Ada Compiler - GPL version
-EAPI=5
-HOMEPAGE=http://libre.adacore.com/
-IUSE=+bootstrap regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
-RDEPEND=!sys-devel/gcc:7.3.1 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:0= )
-RESTRICT=strip
-SLOT=7.3.1
-SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.6.tar.bz2 http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ebc638ce4adeb123ca5610ca9a2c89de
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
index 68a583dff494..95933cb8961b 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
@@ -4,12 +4,12 @@ DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=5
 HOMEPAGE=http://libre.adacore.com/
 IUSE=+bootstrap regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=!sys-devel/gcc:7.3.1 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:0= )
 RESTRICT=strip
 SLOT=7.3.1
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=882aaab60c18f06c8042cf4237edbf9a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=58f1045786d345e6bba40cebaff1afb3
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2019 b/metadata/md5-cache/dev-lang/gnat-gpl-2019
new file mode 100644
index 000000000000..9cc100b61e5a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2019
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=!sys-devel/gcc:8.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 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:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) systemtap? ( dev-util/systemtap )
+DESCRIPTION=GNAT Ada Compiler - GPL version
+EAPI=6
+HOMEPAGE=http://libre.adacore.com/
+IUSE=+bootstrap test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
+RDEPEND=!sys-devel/gcc:8.3.1 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:0= )
+RESTRICT=strip
+SLOT=8.3.1
+SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49 -> gnat-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049 -> gcc-8-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50 -> gcc-interface-8-2019-20190510-18F59-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c81182f2ed119470411800db2c813352
diff --git a/metadata/md5-cache/dev-lang/go-1.11.10 b/metadata/md5-cache/dev-lang/go-1.11.10
index 9e0304184b2c..db3b29f05f84 100644
--- a/metadata/md5-cache/dev-lang/go-1.11.10
+++ b/metadata/md5-cache/dev-lang/go-1.11.10
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
 IUSE=gccgo system-bootstrap
-KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.11.10
 SRC_URI=https://storage.googleapis.com/golang/go1.11.10.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=12deb001e55ae6b1887b5e07d313b019
+_md5_=251147e45e958a498862292290d5455e
diff --git a/metadata/md5-cache/dev-lang/go-1.11.6 b/metadata/md5-cache/dev-lang/go-1.11.6
deleted file mode 100644
index 70c04e1f29c8..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.11.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DEFINED_PHASES=compile install pretend test unpack
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-IUSE=gccgo
-KEYWORDS=-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.11.6
-SRC_URI=https://storage.googleapis.com/golang/go1.11.6.src.tar.gz !gccgo? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=89198e32b131b62e74ee04b57e70f48e
diff --git a/metadata/md5-cache/dev-lang/go-1.11.7 b/metadata/md5-cache/dev-lang/go-1.11.7
deleted file mode 100644
index 4520dd5ba1c5..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.11.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DEFINED_PHASES=compile install pretend test unpack
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-IUSE=gccgo
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.11.7
-SRC_URI=https://storage.googleapis.com/golang/go1.11.7.src.tar.gz !gccgo? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=367a86185a57574abf7278220016db13
diff --git a/metadata/md5-cache/dev-lang/go-1.11.8 b/metadata/md5-cache/dev-lang/go-1.11.8
deleted file mode 100644
index 85286c36646c..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.11.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DEFINED_PHASES=compile install pretend test unpack
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-IUSE=gccgo
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.11.8
-SRC_URI=https://storage.googleapis.com/golang/go1.11.8.src.tar.gz !gccgo? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=367a86185a57574abf7278220016db13
diff --git a/metadata/md5-cache/dev-lang/go-1.11.9 b/metadata/md5-cache/dev-lang/go-1.11.9
deleted file mode 100644
index cf9f8102f97e..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.11.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DEFINED_PHASES=compile install pretend test unpack
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-IUSE=gccgo system-bootstrap
-KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.11.9
-SRC_URI=https://storage.googleapis.com/golang/go1.11.9.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=12deb001e55ae6b1887b5e07d313b019
diff --git a/metadata/md5-cache/dev-lang/go-1.12.1 b/metadata/md5-cache/dev-lang/go-1.12.1
deleted file mode 100644
index 4b8b2673fbcc..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DEFINED_PHASES=compile install pretend test unpack
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-IUSE=gccgo
-KEYWORDS=-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.12.1
-SRC_URI=https://storage.googleapis.com/golang/go1.12.1.src.tar.gz !gccgo? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=89198e32b131b62e74ee04b57e70f48e
diff --git a/metadata/md5-cache/dev-lang/go-1.12.2 b/metadata/md5-cache/dev-lang/go-1.12.2
deleted file mode 100644
index c91d9b85e8c0..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.12.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DEFINED_PHASES=compile install pretend test unpack
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-IUSE=gccgo
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.12.2
-SRC_URI=https://storage.googleapis.com/golang/go1.12.2.src.tar.gz !gccgo? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=367a86185a57574abf7278220016db13
diff --git a/metadata/md5-cache/dev-lang/go-1.12.3 b/metadata/md5-cache/dev-lang/go-1.12.3
deleted file mode 100644
index fa33bbc34db5..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DEFINED_PHASES=compile install pretend test unpack
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-IUSE=gccgo
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.12.3
-SRC_URI=https://storage.googleapis.com/golang/go1.12.3.src.tar.gz !gccgo? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=367a86185a57574abf7278220016db13
diff --git a/metadata/md5-cache/dev-lang/go-1.12.4 b/metadata/md5-cache/dev-lang/go-1.12.4
deleted file mode 100644
index 03feb2d14804..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DEFINED_PHASES=compile install pretend test unpack
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-IUSE=gccgo system-bootstrap
-KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.12.4
-SRC_URI=https://storage.googleapis.com/golang/go1.12.4.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=12deb001e55ae6b1887b5e07d313b019
diff --git a/metadata/md5-cache/dev-lang/go-1.12.5 b/metadata/md5-cache/dev-lang/go-1.12.5
index 7adbafc990d9..24698f763274 100644
--- a/metadata/md5-cache/dev-lang/go-1.12.5
+++ b/metadata/md5-cache/dev-lang/go-1.12.5
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
 IUSE=gccgo system-bootstrap
-KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.12.5
 SRC_URI=https://storage.googleapis.com/golang/go1.12.5.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=12deb001e55ae6b1887b5e07d313b019
+_md5_=251147e45e958a498862292290d5455e
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.12.1 b/metadata/md5-cache/dev-lang/jsonnet-0.12.1
index d05fa15b730d..10730dc80f81 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.12.1
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.12.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install test
 DEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=A data templating language for app and tool developers
 EAPI=7
-HOMEPAGE=http://jsonnet.org/
+HOMEPAGE=https://jsonnet.org/
 IUSE=python python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.12.1.tar.gz -> jsonnet-0.12.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=22c67cbb202cfff6c1adb5243ca1e5ac
+_md5_=a19c3877cf9dd928c98afbe20847e416
diff --git a/metadata/md5-cache/dev-lang/julia-1.1.1 b/metadata/md5-cache/dev-lang/julia-1.1.1
new file mode 100644
index 000000000000..5db8c3a2f0b3
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/julia-1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-vcs/git dev-util/patchelf virtual/pkgconfig
+DESCRIPTION=High-performance programming language for technical computing
+EAPI=7
+HOMEPAGE=https://julialang.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.1.1/julia-1.1.1.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/2348256acf5759a544e5ca7935f638d2bc091d60 -> julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/97ef668b312b96382714dbb8eaac4affce0816e6 -> julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz http://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz -> julia-llvm-6.0.1.src.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=4ad05a01843680fec50ac8b1beb49fad
diff --git a/metadata/md5-cache/dev-lang/julia-9999 b/metadata/md5-cache/dev-lang/julia-9999
index 23c5d2fb1d0f..aaa5e5145950 100644
--- a/metadata/md5-cache/dev-lang/julia-9999
+++ b/metadata/md5-cache/dev-lang/julia-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-6.0.0:= >=sys-devel/clang-6.0.0:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=3425b0684adb1bd0780f2ec8d9ffbe4d
diff --git a/metadata/md5-cache/dev-lang/julia-bin-1.0.3 b/metadata/md5-cache/dev-lang/julia-bin-1.0.3
deleted file mode 100644
index f3e61b5a1dee..000000000000
--- a/metadata/md5-cache/dev-lang/julia-bin-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!dev-lang/julia
-DESCRIPTION=High-performance programming language for technical computing
-EAPI=7
-HOMEPAGE=https://julialang.org/
-IUSE=elibc_glibc elibc_FreeBSD
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
-LICENSE=MIT
-RDEPEND=!dev-lang/julia
-SLOT=0
-SRC_URI=x86? ( https://julialang-s3.julialang.org/bin/linux/x86/1.0/julia-1.0.3-linux-i686.tar.gz ) amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/1.0/julia-1.0.3-linux-x86_64.tar.gz ) arm? ( https://julialang-s3.julialang.org/bin/linux/armv7l/1.0/julia-1.0.3-linux-armv7l.tar.gz ) arm64? ( https://julialang-s3.julialang.org/bin/linux/aarch64/1.0/julia-1.0.3-linux-aarch64.tar.gz ) amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/1.0/julia-1.0.3-freebsd-x86_64.tar.gz )
-_md5_=ac95bcd35be201fe461bf99d93bfd5c2
diff --git a/metadata/md5-cache/dev-lang/julia-bin-1.1.0 b/metadata/md5-cache/dev-lang/julia-bin-1.1.0
index d8d722daa336..d49f5e7c0962 100644
--- a/metadata/md5-cache/dev-lang/julia-bin-1.1.0
+++ b/metadata/md5-cache/dev-lang/julia-bin-1.1.0
@@ -7,6 +7,7 @@ IUSE=elibc_glibc elibc_FreeBSD
 KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=!dev-lang/julia
+RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( https://julialang-s3.julialang.org/bin/linux/x86/1.1/julia-1.1.0-linux-i686.tar.gz ) amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/1.1/julia-1.1.0-linux-x86_64.tar.gz ) amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/1.1/julia-1.1.0-freebsd-x86_64.tar.gz )
-_md5_=d7849e25662aa64d00cc656e0cc043af
+_md5_=9331758f0928021a66e6e62d62504812
diff --git a/metadata/md5-cache/dev-lang/julia-bin-1.1.1 b/metadata/md5-cache/dev-lang/julia-bin-1.1.1
new file mode 100644
index 000000000000..36c4e4f78727
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/julia-bin-1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=!dev-lang/julia
+DESCRIPTION=High-performance programming language for technical computing
+EAPI=7
+HOMEPAGE=https://julialang.org/
+IUSE=elibc_glibc elibc_FreeBSD
+KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd
+LICENSE=MIT
+RDEPEND=!dev-lang/julia
+RESTRICT=strip
+SLOT=0
+SRC_URI=x86? ( https://julialang-s3.julialang.org/bin/linux/x86/1.1/julia-1.1.1-linux-i686.tar.gz ) amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/1.1/julia-1.1.1-linux-x86_64.tar.gz ) amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/1.1/julia-1.1.1-freebsd-x86_64.tar.gz )
+_md5_=9331758f0928021a66e6e62d62504812
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.5 b/metadata/md5-cache/dev-lang/mujs-1.0.5
index 8be52dd32bb6..0b2415c12409 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.5
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install prepare
 DEPEND=sys-libs/readline:0=
 DESCRIPTION=An embeddable Javascript interpreter in C.
 EAPI=7
-HOMEPAGE=http://mujs.com/ https://github.com/ccxvii/mujs/
+HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs/
 IUSE=static-libs
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.5.tar.gz -> mujs-1.0.5.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=81f10e957b9b83c65e99ad79aaa8c9fa
+_md5_=53afcef8d000cf44d6e7210e795a9e95
diff --git a/metadata/md5-cache/dev-lang/perl-5.26.9999 b/metadata/md5-cache/dev-lang/perl-5.26.9999
deleted file mode 100644
index 76769eda1791..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.26.9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib !prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) )
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=6
-HOMEPAGE=https://www.perl.org/
-IUSE=berkdb debug doc gdbm ithreads
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
-SLOT=0/5.26
-SRC_URI=mirror://cpan/src/5.0/perl-5.26.2.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.26.2.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.26.2-patches-1/perl-5.26.2-patches-1.tar.xz mirror://gentoo/perl-5.26.2-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.26.2-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.9/perl-cross-1.1.9.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=329ade81652b43dfb81517967f4d4bc2
diff --git a/metadata/md5-cache/dev-lang/perl-5.28.2-r1 b/metadata/md5-cache/dev-lang/perl-5.28.2-r1
index d84e095b7dc3..3b34dc877952 100644
--- a/metadata/md5-cache/dev-lang/perl-5.28.2-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.28.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=6
 HOMEPAGE=https://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.28
 SRC_URI=mirror://cpan/src/5.0/perl-5.28.2.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.28.2.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.28.2-patches-4/perl-5.28.2-patches-4.tar.xz mirror://gentoo/perl-5.28.2-patches-4.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.28.2-patches-4.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.3/perl-cross-1.2.3.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae44a2bd206e37e89fb85ac8b46ca981
+_md5_=05d7d8d644c2f60045227897db089378
diff --git a/metadata/md5-cache/dev-lang/perl-5.28.9999 b/metadata/md5-cache/dev-lang/perl-5.28.9999
index 6aee6fab2085..60c5b01c8738 100644
--- a/metadata/md5-cache/dev-lang/perl-5.28.9999
+++ b/metadata/md5-cache/dev-lang/perl-5.28.9999
@@ -10,4 +10,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzi
 SLOT=0/5.28
 SRC_URI=mirror://cpan/src/5.0/perl-5.28.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.28.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.28.0-patches-1/perl-5.28.0-patches-1.tar.xz mirror://gentoo/perl-5.28.0-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.28.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.2/perl-cross-1.2.2.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=457e3d221bf14dc5610671fc4a014c6e
+_md5_=8af9b285e5a1ab316b8486b82a9ae9eb
diff --git a/metadata/md5-cache/dev-lang/perl-5.30.0 b/metadata/md5-cache/dev-lang/perl-5.30.0
new file mode 100644
index 000000000000..ee40474dfd8c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/perl-5.30.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib !prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) )
+DESCRIPTION=Larry Wall's Practical Extraction and Report Language
+EAPI=6
+HOMEPAGE=https://www.perl.org/
+IUSE=berkdb debug doc gdbm ithreads
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
+SLOT=0/5.30
+SRC_URI=mirror://cpan/src/5.0/perl-5.30.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.30.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.30.0-patches-1/perl-5.30.0-patches-1.tar.xz mirror://gentoo/perl-5.30.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.30.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.2/perl-cross-1.2.2.tar.gz
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=06e7c0a65d74e659b42a1ef7f0c34faa
diff --git a/metadata/md5-cache/dev-lang/perl-5.30.0_rc2 b/metadata/md5-cache/dev-lang/perl-5.30.0_rc2
deleted file mode 100644
index d488cdcbf226..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.30.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib !prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) )
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=6
-HOMEPAGE=https://www.perl.org/
-IUSE=berkdb debug doc gdbm ithreads
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
-SLOT=0/5.30
-SRC_URI=mirror://cpan/src/5.0/perl-5.30.0-RC2.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.30.0-RC2.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.30.0-patches-1/perl-5.30.0-patches-1.tar.xz mirror://gentoo/perl-5.30.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.30.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.2/perl-cross-1.2.2.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d970de699b6fd6bec7349f40edb6a4db
diff --git a/metadata/md5-cache/dev-lang/php-5.6.40-r4 b/metadata/md5-cache/dev-lang/php-5.6.40-r4
new file mode 100644
index 000000000000..352c60ad92c2
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.6.40-r4
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
+SLOT=5.6
+SRC_URI=https://php.net/distributions/php-5.6.40.tar.xz https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-7.1.30bp.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=d35da7084e4c7c2edb6166772374c75a
diff --git a/metadata/md5-cache/dev-lang/php-7.1.27 b/metadata/md5-cache/dev-lang/php-7.1.27
index 28161ab15dc7..0534ca7b1714 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.27
+++ b/metadata/md5-cache/dev-lang/php-7.1.27
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
 SLOT=7.1
 SRC_URI=https://php.net/distributions/php-7.1.27.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=6283e1dd98283c5dc3adab1903a40cf9
+_md5_=afecea77b8f419523d7189d4f005b723
diff --git a/metadata/md5-cache/dev-lang/php-7.1.30 b/metadata/md5-cache/dev-lang/php-7.1.30
new file mode 100644
index 000000000000..8bcb8a6439d5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.1.30
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
+SLOT=7.1
+SRC_URI=https://php.net/distributions/php-7.1.30.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=887df4066e8eae64b5783a62efb0d123
diff --git a/metadata/md5-cache/dev-lang/php-7.2.16 b/metadata/md5-cache/dev-lang/php-7.2.16
index f37e756c2755..99d09dd54863 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.16
+++ b/metadata/md5-cache/dev-lang/php-7.2.16
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
 SLOT=7.2
 SRC_URI=https://php.net/distributions/php-7.2.16.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=641491379b20d149b12c0e8f36c0ef7c
+_md5_=ef6d54c518b2452076c21c766c290fff
diff --git a/metadata/md5-cache/dev-lang/php-7.2.19 b/metadata/md5-cache/dev-lang/php-7.2.19
new file mode 100644
index 000000000000..4ce205e43967
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.2.19
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
+SLOT=7.2
+SRC_URI=https://php.net/distributions/php-7.2.19.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=359396cf3ca124f7c203fa3fd32d47ac
diff --git a/metadata/md5-cache/dev-lang/php-7.3.5 b/metadata/md5-cache/dev-lang/php-7.3.5
index faed5826c7ff..0d7b5c0ea369 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.5
+++ b/metadata/md5-cache/dev-lang/php-7.3.5
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
 SLOT=7.3
 SRC_URI=https://php.net/distributions/php-7.3.5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=873712911866d0cef32a2012b566147a
+_md5_=dc51eec798ddc4fddf511f6b7e7b2411
diff --git a/metadata/md5-cache/dev-lang/php-7.3.6 b/metadata/md5-cache/dev-lang/php-7.3.6
new file mode 100644
index 000000000000..61546a669dc3
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.3.6
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+SLOT=7.3
+SRC_URI=https://php.net/distributions/php-7.3.6.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=873712911866d0cef32a2012b566147a
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.6 b/metadata/md5-cache/dev-lang/ruby-2.4.6
index 770cd2e028e4..01a304efd2f2 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.4.6
+++ b/metadata/md5-cache/dev-lang/ruby-2.4.6
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs
-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.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] ) 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] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.4
 SRC_URI=mirror://ruby/2.4/ruby-2.4.6.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c508cced4ba6001660cc6d3d54f558d6
+_md5_=ec2da6f6e6585eeb1a821d0d92eaa974
diff --git a/metadata/md5-cache/dev-lang/rust-1.29.2-r1 b/metadata/md5-cache/dev-lang/rust-1.29.2-r1
index 7464dc92141b..0baaa27b4d4f 100644
--- a/metadata/md5-cache/dev-lang/rust-1.29.2-r1
+++ b/metadata/md5-cache/dev-lang/rust-1.29.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 cargo? ( !dev-util/cargo ) ru
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.29
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.29.2-src.tar.xz -> rustc-1.29.2-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.28.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.28.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.28.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.28.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.28.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.28.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=8a3d98fc8ec760fac43ba553a5eb19e9
diff --git a/metadata/md5-cache/dev-lang/rust-1.30.1-r1 b/metadata/md5-cache/dev-lang/rust-1.30.1-r1
index dd136c251d70..db45e8d6085b 100644
--- a/metadata/md5-cache/dev-lang/rust-1.30.1-r1
+++ b/metadata/md5-cache/dev-lang/rust-1.30.1-r1
@@ -10,5 +10,5 @@ RDEPEND=jemalloc? ( dev-libs/jemalloc ) sys-libs/zlib !libressl? ( dev-libs/open
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.30
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.30.1-src.tar.xz -> rustc-1.30.1-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.29.2-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.29.2-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.29.2-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.29.2-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.29.2-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.29.2-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.29.2-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.29.2-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=85cd061320065d4ed04ffa8c7ae2b545
diff --git a/metadata/md5-cache/dev-lang/rust-1.31.1 b/metadata/md5-cache/dev-lang/rust-1.31.1
index c3ab8a6076de..ac255a66b19e 100644
--- a/metadata/md5-cache/dev-lang/rust-1.31.1
+++ b/metadata/md5-cache/dev-lang/rust-1.31.1
@@ -10,5 +10,5 @@ RDEPEND=jemalloc? ( dev-libs/jemalloc ) sys-libs/zlib !libressl? ( dev-libs/open
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.31
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.31.1-src.tar.xz -> rustc-1.31.1-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.30.1-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.30.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.30.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.30.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.30.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.30.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.30.1-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.30.1-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=10b548415d705b481be44e46be8ebdeb
diff --git a/metadata/md5-cache/dev-lang/rust-1.32.0 b/metadata/md5-cache/dev-lang/rust-1.32.0
index 470368819d68..eab2ba0eed02 100644
--- a/metadata/md5-cache/dev-lang/rust-1.32.0
+++ b/metadata/md5-cache/dev-lang/rust-1.32.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.32
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.32.0-src.tar.xz -> rustc-1.32.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.31.1-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.31.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.31.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.31.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.31.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.31.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.31.1-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.31.1-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24442b3e6213484196ee8a1b4b8d599b
diff --git a/metadata/md5-cache/dev-lang/rust-1.33.0 b/metadata/md5-cache/dev-lang/rust-1.33.0
index f14c6dd601e4..6278be95dd72 100644
--- a/metadata/md5-cache/dev-lang/rust-1.33.0
+++ b/metadata/md5-cache/dev-lang/rust-1.33.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.33
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz -> rustc-1.33.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.32.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.32.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.32.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.32.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.32.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.32.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.32.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.32.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d6b9c12f65c2de6f3ea25d13904fcc8
diff --git a/metadata/md5-cache/dev-lang/rust-1.34.2 b/metadata/md5-cache/dev-lang/rust-1.34.2
index 46f9e29f21de..421253ece861 100644
--- a/metadata/md5-cache/dev-lang/rust-1.34.2
+++ b/metadata/md5-cache/dev-lang/rust-1.34.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.34
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.34.2-src.tar.xz -> rustc-1.34.2-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.33.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.33.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.33.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.33.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc258e35518e6c7b0e7732adcba98c71
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5c62b8ab7183b87ea070d319533c58f0
diff --git a/metadata/md5-cache/dev-lang/rust-1.35.0 b/metadata/md5-cache/dev-lang/rust-1.35.0
new file mode 100644
index 000000000000..e95e19ed01a5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.35.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( || ( sys-devel/llvm:8[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-8* ) ) <sys-devel/llvm-9:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 arm64 ~ppc64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( || ( sys-devel/llvm:8[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-8* ) ) <sys-devel/llvm-9:= ) >=app-eselect/eselect-rust-20190311 !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
+SLOT=stable/1.35
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.35.0-src.tar.xz -> rustc-1.35.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.34.2-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.34.2-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.34.2-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.34.2-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.34.2-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.34.2-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.34.2-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.34.2-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=bec240ab0f31622870865d73513f0000
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.29.2-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.29.2-r1
index ada780556256..12c6817e9997 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.29.2-r1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.29.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 cargo? ( sys-libs/zlib !libre
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.29.2-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.29.2-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.29.2-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.29.2-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.29.2-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.29.2-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.29.2-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.29.2-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=167150384bd11376ab2ab0e9983ad82a
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.30.1-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.30.1-r1
index 232d35df5a8e..8d15629f6cca 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.30.1-r1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.30.1-r1
@@ -9,5 +9,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.30.1-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.30.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.30.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.30.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.30.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.30.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.30.1-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.30.1-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9ff5a9d50f3fe47c8f596a61ae31a3a0
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.31.1 b/metadata/md5-cache/dev-lang/rust-bin-1.31.1
index eb73e95ba575..5e5ec3bcb9f9 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.31.1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.31.1
@@ -9,5 +9,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.31.1-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.31.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.31.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.31.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.31.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.31.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.31.1-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.31.1-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=57f6baf4db14e6cee722b1d3a6f6ff9e
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.32.0 b/metadata/md5-cache/dev-lang/rust-bin-1.32.0
index a723be50c018..be39976e05e8 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.32.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.32.0
@@ -9,5 +9,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.32.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.32.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.32.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.32.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.32.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.32.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.32.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.32.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=262cc511cb0b99779e700d7ce14c6bd3
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.33.0 b/metadata/md5-cache/dev-lang/rust-bin-1.33.0
index bcaadcfc8b4e..b8af6069418c 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.33.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.33.0
@@ -9,5 +9,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.33.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.33.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.33.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.33.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=262cc511cb0b99779e700d7ce14c6bd3
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.34.2 b/metadata/md5-cache/dev-lang/rust-bin-1.34.2
index 846a5f9cfdfe..f752925c4974 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.34.2
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.34.2
@@ -9,5 +9,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.34.2-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.34.2-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.34.2-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.34.2-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.34.2-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.34.2-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.34.2-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.34.2-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f1d90899ee7128d6c982285f790e8a35
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.35.0 b/metadata/md5-cache/dev-lang/rust-bin-1.35.0
new file mode 100644
index 000000000000..75a4b8dc201a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.35.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm pretend unpack
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 doc libressl rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-misc/curl[ssl] !dev-lang/rust:0 !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
+REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
+SLOT=stable
+SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.35.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.35.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.35.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.35.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.35.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.35.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.35.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.35.0-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9d5cabf6e88d0f40f556fa3b7306e365
diff --git a/metadata/md5-cache/dev-lang/sassc-3.5.0 b/metadata/md5-cache/dev-lang/sassc-3.5.0
index 8b0b6a348a91..5b17e20846f8 100644
--- a/metadata/md5-cache/dev-lang/sassc-3.5.0
+++ b/metadata/md5-cache/dev-lang/sassc-3.5.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libsass-3.5:= >=app-portage/elt-patches-20170815 !<sys-devel/g
 DESCRIPTION=A libsass command line driver
 EAPI=6
 HOMEPAGE=https://github.com/sass/sassc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/libsass-3.5:=
 SLOT=0
 SRC_URI=https://github.com/sass/sassc/archive/3.5.0.tar.gz -> sassc-3.5.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e307355b773fd4e3d653114c582ee9f8
+_md5_=eb8ceab84a02d760b51db53ff3deeb58
diff --git a/metadata/md5-cache/dev-lang/sassc-3.6.0 b/metadata/md5-cache/dev-lang/sassc-3.6.0
new file mode 100644
index 000000000000..aa23800c532c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/sassc-3.6.0
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/libsass:=
+DESCRIPTION=A libsass command line driver
+EAPI=7
+HOMEPAGE=https://github.com/sass/sassc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=dev-libs/libsass:=
+SLOT=0
+SRC_URI=https://github.com/sass/sassc/archive/3.6.0.tar.gz -> sassc-3.6.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ec6a72d44aad6000dda648b4ae38c73c
diff --git a/metadata/md5-cache/dev-lang/sassc-9999 b/metadata/md5-cache/dev-lang/sassc-9999
deleted file mode 100644
index 4c6702f18233..000000000000
--- a/metadata/md5-cache/dev-lang/sassc-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=>=dev-libs/libsass-3.5:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A libsass command line driver
-EAPI=6
-HOMEPAGE=https://github.com/sass/sassc
-LICENSE=MIT
-RDEPEND=>=dev-libs/libsass-3.5:=
-SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=02bc332bc95244aff5c0636b5001f316
diff --git a/metadata/md5-cache/dev-lang/scala-bin-2.11.8 b/metadata/md5-cache/dev-lang/scala-bin-2.11.8
deleted file mode 100644
index 98996c714db3..000000000000
--- a/metadata/md5-cache/dev-lang/scala-bin-2.11.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The Scala Programming Language
-EAPI=6
-HOMEPAGE=http://scala.epfl.ch/
-IUSE=doc elibc_FreeBSD doc
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ed462458da5d044332cdcbcb052fd69f
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.5 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.5
new file mode 100644
index 000000000000..aa05e9ec9c68
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=versatile implementation of the Prolog programming language
+EAPI=6
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.5.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=70c536ffb2489bc355f88e238ebb32af
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.19 b/metadata/md5-cache/dev-lang/vala-0.36.19
index eb6d0f3de2fe..03c49c6fbef4 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.19
+++ b/metadata/md5-cache/dev-lang/vala-0.36.19
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.19
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.19.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2e4bd67342ae38707eddf276e5703767
+_md5_=6d713ebd7662361c3be8a4dc8de66120
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.15 b/metadata/md5-cache/dev-lang/vala-0.40.15
index 3591417d0db6..3e8e50390bab 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.15
+++ b/metadata/md5-cache/dev-lang/vala-0.40.15
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.15 valadoc? ( >=media-gfx/graphviz-2.16 )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.15.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=467e0c441514336a52ed42c574117af4
+_md5_=9138c0c71ccb2f41a5571cbc42037b61
diff --git a/metadata/md5-cache/dev-lang/vala-0.42.7 b/metadata/md5-cache/dev-lang/vala-0.42.7
index 2672fcf2e11b..e0893211c898 100644
--- a/metadata/md5-cache/dev-lang/vala-0.42.7
+++ b/metadata/md5-cache/dev-lang/vala-0.42.7
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.42.7 valadoc? ( >=media-gfx/graphviz-2.16 )
 SLOT=0.42
 SRC_URI=mirror://gnome/sources/vala/0.42/vala-0.42.7.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a82cca9d07041d22cb48655d430c6c10
+_md5_=55835251f64f433a2f6e5b1b38f812b4
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 9c0f96ad4e4a..baca39214d49 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/amdgpu-pro-opencl-17.50.552542 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.50.552542
deleted file mode 100644
index 4875a08ff3e7..000000000000
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.50.552542
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst prepare unpack
-DEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd dev-util/patchelf
-DESCRIPTION=Proprietary OpenCL implementation for AMD GPUs
-EAPI=7
-HOMEPAGE=https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-with-Vulkan-1.1-support.aspx
-KEYWORDS=~amd64
-LICENSE=AMD-GPU-PRO-EULA
-RDEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd
-RESTRICT=mirror fetch strip
-SLOT=0
-SRC_URI=amdgpu-pro-17.50-552542.tar.xz
-_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=6bcf85f6650cd975821247a06797a359
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.606296 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.606296
deleted file mode 100644
index de6dede47a42..000000000000
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.606296
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst unpack
-DEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd
-DESCRIPTION=Proprietary OpenCL implementation for AMD GPUs
-EAPI=7
-HOMEPAGE=https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-Release-Notes.aspx
-KEYWORDS=~amd64
-LICENSE=AMD-GPU-PRO-EULA
-RDEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd
-RESTRICT=mirror fetch strip
-SLOT=0
-SRC_URI=amdgpu-pro-18.20-606296.tar.xz
-_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=bc9eb9673bd8e23797d151b13a679760
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
index d8e8923729b9..c601dcc36257 100644
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
@@ -4,7 +4,7 @@ DESCRIPTION=Proprietary OpenCL implementation for AMD GPUs
 EAPI=7
 HOMEPAGE=https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-Release-Notes.aspx
 IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=AMD-GPU-PRO-EULA
 RDEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
@@ -12,4 +12,4 @@ RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=aeb6125ef05bf91eaad738dd40919c19
+_md5_=88ee88aac46e6224d3e49202575ec1f9
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425
new file mode 100644
index 000000000000..8efa8ef2d462
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=compile configure install nofetch postinst test unpack
+DEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd
+DESCRIPTION=Proprietary OpenCL implementation for AMD GPUs
+EAPI=7
+HOMEPAGE=https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-10-unified
+IUSE=abi_x86_32 abi_x86_64
+KEYWORDS=~amd64
+LICENSE=AMD-GPU-PRO-EULA
+RDEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+RESTRICT=mirror fetch strip
+SLOT=0
+SRC_URI=amdgpu-pro-19.10-785425-ubuntu-18.04.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=c960b4eec1ee1122f5d79984cb8b8687
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425-r1 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425-r1
new file mode 100644
index 000000000000..50a3e53fc275
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=compile configure install nofetch postinst test unpack
+DEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd
+DESCRIPTION=Proprietary OpenCL implementation for AMD GPUs
+EAPI=7
+HOMEPAGE=https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-10-unified
+IUSE=abi_x86_32 abi_x86_64
+KEYWORDS=~amd64
+LICENSE=AMD-GPU-PRO-EULA
+RDEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd !media-libs/mesa[opencl]
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+RESTRICT=mirror fetch strip
+SLOT=0
+SRC_URI=amdgpu-pro-19.10-785425-ubuntu-18.04.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=cf2883a0b4cd505dfdf990204e510915
diff --git a/metadata/md5-cache/dev-libs/appstream-0.12.6 b/metadata/md5-cache/dev-libs/appstream-0.12.6
index 696c1bada21c..5223f1a8ad46 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.12.6
+++ b/metadata/md5-cache/dev-libs/appstream-0.12.6
@@ -5,10 +5,10 @@ DESCRIPTION=Cross-distro effort for providing metadata for software in the Linux
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Distributions/AppStream/
 IUSE=apt +introspection qt5 test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.54:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 )
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.12.6.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0c774d58b40a390349bd9c48584aa2cd
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=ae161722806f8a196d91516d9d1ba548
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.15 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.15
index e53d6b2bc0f2..51455b8f5231 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.15
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.15
@@ -4,10 +4,10 @@ DESCRIPTION=Provides GObjects and helper methods to read and write AppStream met
 EAPI=6
 HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
 IUSE=gtk-doc fonts +introspection stemmer
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.45.8:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.15.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b7727513b7a5368c24fe1a34ae1c179f
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=2642e04ddf9a5d44c97039fbe669e513
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.9 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
index 22a287b9318c..07c0dd41fbc8 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.45.8:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] app-arch/gcab x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.9.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=44ac19025a8a4c8c9de82edb7cf35955
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r3 b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r3
index 3debc0dfa281..417689db0d25 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r3
+++ b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Apache Portable Runtime Utility Library
 EAPI=7
 HOMEPAGE=https://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 ~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 ~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=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? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) 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	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=944be499e1186a566ba5a640d7165901
+_md5_=a14502958668b20f1a3cad82b1229c0d
diff --git a/metadata/md5-cache/dev-libs/atk-2.30.0 b/metadata/md5-cache/dev-libs/atk-2.30.0
index 99e8ad8621b3..cf44f1564e43 100644
--- a/metadata/md5-cache/dev-libs/atk-2.30.0
+++ b/metadata/md5-cache/dev-libs/atk-2.30.0
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.30/atk-2.30.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fcdd07692ba34f077b0d77ec06df1e65
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=b4745e196b3e93c874a89d0b9c9eaa45
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.2 b/metadata/md5-cache/dev-libs/beignet-1.3.2
index cc67b9253404..35db98ba5d17 100644
--- a/metadata/md5-cache/dev-libs/beignet-1.3.2
+++ b/metadata/md5-cache/dev-libs/beignet-1.3.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-devel/clang-6.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-eselect/eselect-opencl
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b480d12bb8ffec34c7f16894f39d2a9a
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.2-r1 b/metadata/md5-cache/dev-libs/beignet-1.3.2-r1
deleted file mode 100644
index 8917b1027426..000000000000
--- a/metadata/md5-cache/dev-libs/beignet-1.3.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-devel/clang-6.0.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ocl-icd? ( dev-libs/ocl-icd ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=OpenCL implementation for Intel GPUs
-EAPI=6
-HOMEPAGE=https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet
-IUSE=ocl-icd ocl20 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-devel/clang-6.0.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-eselect/eselect-opencl
-SLOT=0
-SRC_URI=https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1231182a5bb2611cb5107ae0a595bc39
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.2-r2 b/metadata/md5-cache/dev-libs/beignet-1.3.2-r2
index 9f23c72491d6..8d4f1970b911 100644
--- a/metadata/md5-cache/dev-libs/beignet-1.3.2-r2
+++ b/metadata/md5-cache/dev-libs/beignet-1.3.2-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=app-eselect/eselect-opencl media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-devel/clang-6.0.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ocl-icd? ( dev-libs/ocl-icd )
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=d95d499cbdda7a2a9c3e74eefd6aefda
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.2-r3 b/metadata/md5-cache/dev-libs/beignet-1.3.2-r3
new file mode 100644
index 000000000000..42b24a298a6a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/beignet-1.3.2-r3
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=app-eselect/eselect-opencl media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-devel/clang-7.0.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ocl-icd? ( dev-libs/ocl-icd )
+DESCRIPTION=OpenCL implementation for Intel Sandy Bridge, Ivy Bridge and Haswell GPUs
+EAPI=7
+HOMEPAGE=https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet
+IUSE=ocl-icd ocl20 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1+
+RDEPEND=app-eselect/eselect-opencl media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-devel/clang-7.0.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ocl-icd? ( dev-libs/ocl-icd )
+SLOT=0
+SRC_URI=https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f5247ce1050ee27e872d9a8e478935d1
diff --git a/metadata/md5-cache/dev-libs/beignet-9999 b/metadata/md5-cache/dev-libs/beignet-9999
deleted file mode 100644
index 9dff3b456e0c..000000000000
--- a/metadata/md5-cache/dev-libs/beignet-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=media-libs/mesa sys-devel/clang:= sys-devel/llvm:= >=x11-libs/libdrm-2.4.70[video_cards_intel] x11-libs/libXext x11-libs/libXfixes || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ocl-icd? ( dev-libs/ocl-icd ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=OpenCL implementation for Intel GPUs
-EAPI=6
-HOMEPAGE=https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet
-IUSE=ocl-icd ocl20 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/mesa sys-devel/clang:= sys-devel/llvm:= >=x11-libs/libdrm-2.4.70[video_cards_intel] x11-libs/libXext x11-libs/libXfixes app-eselect/eselect-opencl
-SLOT=0
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=02c7ca4ff36ac21f8a7904fb34e33551
diff --git a/metadata/md5-cache/dev-libs/crypto++-8.2.0 b/metadata/md5-cache/dev-libs/crypto++-8.2.0
new file mode 100644
index 000000000000..e1c0ae66290a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/crypto++-8.2.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install prepare setup
+DESCRIPTION=C++ class library of cryptographic schemes
+EAPI=7
+HOMEPAGE=https://cryptopp.com
+IUSE=+asm static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=Boost-1.0
+SLOT=0/8
+SRC_URI=https://www.cryptopp.com/cryptopp820.zip
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=78c90cc69f1c3b86e29f302e55016f8a
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.6.1 b/metadata/md5-cache/dev-libs/ding-libs-0.6.1
index 18364c752c13..44aa6d82a4f9 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.6.1
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.6.1
@@ -4,9 +4,9 @@ DESCRIPTION=set of utility libraries (mostly used by sssd)
 EAPI=6
 HOMEPAGE=https://pagure.io/SSSD/ding-libs
 IUSE=test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
 SLOT=0
 SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.6.1.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=27f32ad5a21c079dac1fe90a3ce36f7a
+_md5_=daf9fac98be9284ced623f30081ffef6
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.1.4-r1 b/metadata/md5-cache/dev-libs/double-conversion-3.1.4-r1
index 06da0042c8d5..b30a8708a5be 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.1.4-r1
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.1.4-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Binary-decimal and decimal-binary conversion routines for IEEE doubl
 EAPI=7
 HOMEPAGE=https://github.com/google/double-conversion
 IUSE=static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0/3
 SRC_URI=https://github.com/google/double-conversion/archive/v3.1.4.tar.gz -> double-conversion-3.1.4.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7035d0a02991898a76e1b28476cdfe8c
+_md5_=725adacda26efe46b4e7ebf5a6d27dcf
diff --git a/metadata/md5-cache/dev-libs/efl-1.20.7-r3 b/metadata/md5-cache/dev-libs/efl-1.20.7-r3
deleted file mode 100644
index 093599fe08ae..000000000000
--- a/metadata/md5-cache/dev-libs/efl-1.20.7-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles2? ( media-libs/mesa[egl,gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( >=media-video/vlc-3.0.0 ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
-EAPI=6
-HOMEPAGE=https://www.enlightenment.org/
-IUSE=avahi +bmp dds connman debug doc drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles2? ( media-libs/mesa[egl,gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( >=media-video/vlc-3.0.0 ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) !media-libs/elementary !media-plugins/emotion_generic_players !media-plugins/evas_generic_loaders
-REQUIRED_USE=?? ( gles2 opengl ) fbcon? ( !tslib ) gles2? ( || ( wayland X ) !sdl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( fbcon X ) wayland? ( gles2 !opengl ) xim? ( X )
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.20.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5e0986d37290af4f41276d91df715e2a
diff --git a/metadata/md5-cache/dev-libs/efl-1.21.1-r3 b/metadata/md5-cache/dev-libs/efl-1.21.1-r3
index 41a40a1924e7..4e98353ec6e3 100644
--- a/metadata/md5-cache/dev-libs/efl-1.21.1-r3
+++ b/metadata/md5-cache/dev-libs/efl-1.21.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=6
 HOMEPAGE=https://www.enlightenment.org
 IUSE=+bmp dds connman debug drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
 RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
 REQUIRED_USE=?? ( gles2 opengl ) fbcon? ( !tslib ) gles2? ( || ( wayland X ) !sdl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( fbcon X ) wayland? ( gles2 !opengl ) xim? ( X ) xpresent? ( X )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.21.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c9c7339356f1d1916ef0130cb61b279b
+_md5_=c42ff457065172e39539ba342c636ed3
diff --git a/metadata/md5-cache/dev-libs/ell-0.18 b/metadata/md5-cache/dev-libs/ell-0.18
index f47161702fd6..236c5c11a1f1 100644
--- a/metadata/md5-cache/dev-libs/ell-0.18
+++ b/metadata/md5-cache/dev-libs/ell-0.18
@@ -4,10 +4,10 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.18.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=51665903dfc9c2aa6a8f3096e16d408c
+_md5_=802bf645fa65acd3c50cce8097b0959f
diff --git a/metadata/md5-cache/dev-libs/ell-0.19 b/metadata/md5-cache/dev-libs/ell-0.19
index 6e6bf3cf31a1..6a97f5007542 100644
--- a/metadata/md5-cache/dev-libs/ell-0.19
+++ b/metadata/md5-cache/dev-libs/ell-0.19
@@ -4,10 +4,10 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.19.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=3a7e4b2ce034ae917703c79e5a590aec
+_md5_=9d0f63d72d46260ab770d4434d3b050b
diff --git a/metadata/md5-cache/dev-libs/ell-0.20 b/metadata/md5-cache/dev-libs/ell-0.20
index f39f3a3996b1..976d0ab1c977 100644
--- a/metadata/md5-cache/dev-libs/ell-0.20
+++ b/metadata/md5-cache/dev-libs/ell-0.20
@@ -4,10 +4,10 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.20.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=51665903dfc9c2aa6a8f3096e16d408c
+_md5_=802bf645fa65acd3c50cce8097b0959f
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-1.11.0 b/metadata/md5-cache/dev-libs/flatbuffers-1.11.0
new file mode 100644
index 000000000000..a6426d897536
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/flatbuffers-1.11.0
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Memory efficient serialization library
+EAPI=7
+HOMEPAGE=https://google.github.io/flatbuffers/
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/google/flatbuffers/archive/v1.11.0.tar.gz -> flatbuffers-1.11.0.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=04dc0dfa5391324a7055eec398cade33
diff --git a/metadata/md5-cache/dev-libs/fstrm-0.3.0 b/metadata/md5-cache/dev-libs/fstrm-0.3.0
index 20a5382b9a75..6da59bbb1ca3 100644
--- a/metadata/md5-cache/dev-libs/fstrm-0.3.0
+++ b/metadata/md5-cache/dev-libs/fstrm-0.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Frame Streams implementation in C
 EAPI=6
 HOMEPAGE=https://github.com/farsightsec/fstrm
 IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=utils? ( dev-libs/libevent[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/farsightsec/fstrm/archive/v0.3.0.tar.gz -> fstrm-0.3.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ecaa1f52fd3a9df10dfaadb71ad90f89
+_md5_=097dd40a01e87c2e47cbfaed658bd30d
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.1 b/metadata/md5-cache/dev-libs/girara-0.3.1
index ab24c8d7398b..fcdaf2f1c05a 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.1
+++ b/metadata/md5-cache/dev-libs/girara-0.3.1
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=dev-libs/glib:2 dev-libs/json-c >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.1.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=fc28f39c73b104bfb78310380cec4a16
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.2 b/metadata/md5-cache/dev-libs/girara-0.3.2
index 0fb136d71bb6..93903a6ddd69 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.2
+++ b/metadata/md5-cache/dev-libs/girara-0.3.2
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=dev-libs/glib:2 dev-libs/json-c >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.2.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=410ae53982d05ca88efd780687e2f231
diff --git a/metadata/md5-cache/dev-libs/girara-9999 b/metadata/md5-cache/dev-libs/girara-9999
index de870744dfef..b4541a27fae4 100644
--- a/metadata/md5-cache/dev-libs/girara-9999
+++ b/metadata/md5-cache/dev-libs/girara-9999
@@ -8,5 +8,5 @@ IUSE=doc libnotify test test
 LICENSE=ZLIB
 RDEPEND=dev-libs/glib:2 dev-libs/json-c >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=8f6aa51bbc5c6103abb0f4ccb50cc43e
diff --git a/metadata/md5-cache/dev-libs/gjs-1.54.3 b/metadata/md5-cache/dev-libs/gjs-1.54.3
index b29a0b8b92bb..2cd5a0b82cf4 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.54.3
+++ b/metadata/md5-cache/dev-libs/gjs-1.54.3
@@ -4,11 +4,11 @@ DESCRIPTION=Javascript bindings for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 IUSE=+cairo examples gtk readline test test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.54.0 >=dev-libs/gobject-introspection-1.53.4:= readline? ( sys-libs/readline:0= ) dev-lang/spidermonkey:60 virtual/libffi:= cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.54/gjs-1.54.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7c492e06fec8e81f62ab217f111410a3
+_md5_=9089795241c8ca2c5b962684a4a9233a
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.58.3 b/metadata/md5-cache/dev-libs/gobject-introspection-1.58.3
index 6e3ed7477f51..82c0140ed2a0 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.58.3
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.58.3
@@ -4,7 +4,7 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=cairo doctool test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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+ GPL-2+
 PDEPEND=cairo? ( x11-libs/cairo[glib] )
 RDEPEND=>=dev-libs/gobject-introspection-common-1.58.3 >=dev-libs/glib-2.58.0:2 doctool? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.58/gobject-introspection-1.58.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=de388b929c63e8e8a02c3aedc59c653f
+_md5_=502c0e3e970b6235b8f8adcae2569b57
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.58.3 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.58.3
index 8e6a3dd29e85..ad6f7c72160a 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.58.3
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.58.3
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-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=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.58.3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.58/gobject-introspection-1.58.3.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1ae08c5b73e59ef5b2570bbde3f34e51
+_md5_=0af7aa1999809ed7cc2932bb8d944f04
diff --git a/metadata/md5-cache/dev-libs/grantlee-5.1.0 b/metadata/md5-cache/dev-libs/grantlee-5.1.0
index 7a66880dfc96..19a82665d0be 100644
--- a/metadata/md5-cache/dev-libs/grantlee-5.1.0
+++ b/metadata/md5-cache/dev-libs/grantlee-5.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=C++ string template engine based on the Django template system
 EAPI=6
 HOMEPAGE=https://github.com/steveire/grantlee
 IUSE=debug doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5
 RESTRICT=test
 SLOT=5
 SRC_URI=http://downloads.grantlee.org/grantlee-5.1.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4afd885003624081ce23318702923142
+_md5_=2f058f6d018fa0e2146d70bf6655c474
diff --git a/metadata/md5-cache/dev-libs/icu-64.1 b/metadata/md5-cache/dev-libs/icu-64.1
deleted file mode 100644
index 9e515a1893dd..000000000000
--- a/metadata/md5-cache/dev-libs/icu-64.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=International Components for Unicode
-EAPI=7
-HOMEPAGE=http://www.icu-project.org/
-IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=BSD
-SLOT=0/64.1
-SRC_URI=http://download.icu-project.org/files/icu4c/64.1/icu4c-64_1-src.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e2adc1df04379d4bbdbbd4902cc1be97
diff --git a/metadata/md5-cache/dev-libs/icu-64.2 b/metadata/md5-cache/dev-libs/icu-64.2
index 2e65f352c46b..5faba5665cc0 100644
--- a/metadata/md5-cache/dev-libs/icu-64.2
+++ b/metadata/md5-cache/dev-libs/icu-64.2
@@ -1,13 +1,12 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen[dot] )
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=International Components for Unicode
 EAPI=7
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~x86-winnt
 LICENSE=BSD
 SLOT=0/64.2
 SRC_URI=http://download.icu-project.org/files/icu4c/64.2/icu4c-64_2-src.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bb5867daee36e71d422b350999a070a8
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=0a840a48d6a93ef88f4615b5779d0e99
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-64.1 b/metadata/md5-cache/dev-libs/icu-layoutex-64.1
deleted file mode 100644
index 7680dfcb4915..000000000000
--- a/metadata/md5-cache/dev-libs/icu-layoutex-64.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/icu-64.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=External layout part of International Components for Unicode
-EAPI=7
-HOMEPAGE=http://www.icu-project.org/
-IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=~dev-libs/icu-64.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/64.1
-SRC_URI=http://download.icu-project.org/files/icu4c/64.1/icu4c-64_1-src.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c9306b36e63cd4fa21c6a92d855a7f99
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-64.2 b/metadata/md5-cache/dev-libs/icu-layoutex-64.2
index 01a5438cafa8..61a0aeed3427 100644
--- a/metadata/md5-cache/dev-libs/icu-layoutex-64.2
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-64.2
@@ -5,10 +5,10 @@ DESCRIPTION=External layout part of International Components for Unicode
 EAPI=7
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=~dev-libs/icu-64.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/64.2
 SRC_URI=http://download.icu-project.org/files/icu4c/64.2/icu4c-64_2-src.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a1b0d64a6967c6a3616a2459d49d09e7
+_md5_=9791680ce5e3142069bddb28087b485b
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.4 b/metadata/md5-cache/dev-libs/ivykis-0.42.4
new file mode 100644
index 000000000000..b254e9d4d762
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.4
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Library for asynchronous I/O readiness notification
+EAPI=7
+HOMEPAGE=https://github.com/buytenh/ivykis
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.4.tar.gz -> ivykis-0.42.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=21156aa55214b0866102e166a9a8d78b
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.4.4 b/metadata/md5-cache/dev-libs/json-glib-1.4.4
index 4790b7de0aab..9372e62fd6da 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.4.4
+++ b/metadata/md5-cache/dev-libs/json-glib-1.4.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/json-glib/1.4/json-glib-1.4.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=332e21467acd5a1963d07a24070c5e1d
diff --git a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.30.1 b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.30.1
index 93be79b4c6af..8ca4b3395ce3 100644
--- a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.30.1
+++ b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.30.1
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/jsonrpc-glib/3.30/jsonrpc-glib-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ae9e17b2ca77a4edb442e90ec7b656ac
diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.6.1-r1 b/metadata/md5-cache/dev-libs/kdiagram-2.6.1-r1
index a3a7a260c98f..43e9ebcf3571 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.6.1-r1
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.6.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Powerful libraries (KChart, KGantt) for creating business diagrams
 EAPI=7
 HOMEPAGE=https://kde.org/ https://www.kdab.com/development-resources/qt-tools/kd-chart/
 IUSE=test debug examples doc test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 REQUIRED_USE=test? ( examples )
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiagram/2.6.1/kdiagram-2.6.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=dd29793ed9048a9c391dbf044650a19e
+_md5_=610f6115a82a2aac704b81717ed86973
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.1 b/metadata/md5-cache/dev-libs/keystone-0.9.1
index fa3c5a4e7930..218043669476 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) || ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 )
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.1.tar.gz -> keystone-0.9.1.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ba2ed58f6adc9aa94d21263ee2a62aaa
diff --git a/metadata/md5-cache/dev-libs/kpathsea-6.3.1_p20190410 b/metadata/md5-cache/dev-libs/kpathsea-6.3.1_p20190410
new file mode 100644
index 000000000000..a4d005ca044f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/kpathsea-6.3.1_p20190410
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst postrm prepare
+DESCRIPTION=Path searching library for TeX-related files
+EAPI=7
+HOMEPAGE=http://tug.org/texlive/
+IUSE=doc source static-libs
+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
+SLOT=0/6.3.1
+SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz mirror://gentoo/kpathsea-texmf.d-9.tar.xz mirror://gentoo/texlive-module-kpathsea-2019.tar.xz doc? ( mirror://gentoo/texlive-module-kpathsea.doc-2019.tar.xz )
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	texlive-common	9a9339b2c296eb12e91ef1d8e9a4c6d3	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8cfd4739ebe12af70d7712f0b265f09d
diff --git a/metadata/md5-cache/dev-libs/leveldb-1.20 b/metadata/md5-cache/dev-libs/leveldb-1.20
index d0a9ce359e4f..c91f5ac2a5d1 100644
--- a/metadata/md5-cache/dev-libs/leveldb-1.20
+++ b/metadata/md5-cache/dev-libs/leveldb-1.20
@@ -4,11 +4,11 @@ DESCRIPTION=a fast key-value storage library written at Google
 EAPI=7
 HOMEPAGE=http://leveldb.org/ https://github.com/google/leveldb
 IUSE=+snappy static-libs kernel_FreeBSD +tcmalloc test
-KEYWORDS=amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=tcmalloc? ( dev-util/google-perftools ) snappy? ( app-arch/snappy:= )
 REQUIRED_USE=snappy? ( !static-libs )
 SLOT=0/1
 SRC_URI=https://github.com/google/leveldb/archive/v1.20.tar.gz -> leveldb-1.20.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=fa657e8a79f195a0156b91ed8f9cfbc3
+_md5_=78bab36fa69938f70941004445a4b119
diff --git a/metadata/md5-cache/dev-libs/libatasmart-0.19-r2 b/metadata/md5-cache/dev-libs/libatasmart-0.19-r2
index a4818b1cd8cd..6cca240cd529 100644
--- a/metadata/md5-cache/dev-libs/libatasmart-0.19-r2
+++ b/metadata/md5-cache/dev-libs/libatasmart-0.19-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A small and lightweight parser library for ATA S.M.A.R.T. hard disks
 EAPI=6
 HOMEPAGE=http://0pointer.de/blog/projects/being-smart.html
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libudev:=
 SLOT=0/4
 SRC_URI=http://0pointer.de/public/libatasmart-0.19.tar.xz mirror://debian/pool/main/liba/libatasmart/libatasmart_0.19-2.debian.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a29cab96d1d93df82127ce30a6dda4d8
+_md5_=2079556fcc4542f39a22f227fa0af4ca
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.20190404 b/metadata/md5-cache/dev-libs/libbpf-0.20190404
index 48cfda473d9e..c63011e9a90b 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.20190404
+++ b/metadata/md5-cache/dev-libs/libbpf-0.20190404
@@ -4,10 +4,10 @@ DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
 EAPI=7
 HOMEPAGE=https://github.com/libbpf/libbpf
 IUSE=static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
 SLOT=0/0.20190404
 SRC_URI=https://github.com/libbpf/libbpf/archive/7c27c6306160f630c3c4f4b4971deb657126d681.tar.gz -> libbpf-0.20190404.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=95be3679b03035480ca89cb3c11c423b
+_md5_=dcf0d5999815a562b017e285cb431445
diff --git a/metadata/md5-cache/dev-libs/libcaldav-0.6.2 b/metadata/md5-cache/dev-libs/libcaldav-0.6.2
deleted file mode 100644
index 37f9dd569fe7..000000000000
--- a/metadata/md5-cache/dev-libs/libcaldav-0.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/glib net-misc/curl[ssl,gnutls(+),curl_ssl_gnutls(+)] doc? ( app-doc/doxygen virtual/latex-base dev-texlive/texlive-latexextra )
-DESCRIPTION=C library implementing client support for CalDAV
-EAPI=4
-HOMEPAGE=http://libcaldav.sourceforge.net/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib net-misc/curl[ssl,gnutls(+),curl_ssl_gnutls(+)]
-SLOT=0
-SRC_URI=mirror://sourceforge/libcaldav/libcaldav-0.6.2.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8afddb808d187c204d06ed27f2d16366
diff --git a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20180915 b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20180915
deleted file mode 100644
index c59a33d10258..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20180915
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure prepare setup
-DEPEND=|| ( sys-devel/clang:7 sys-devel/clang:6 sys-devel/clang:5 sys-devel/clang:4 >=sys-devel/clang-3.9:0 ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 )
-DESCRIPTION=OpenCL C library
-EAPI=6
-HOMEPAGE=http://libclc.llvm.org/
-IUSE=video_cards_nvidia video_cards_r600 video_cards_radeonsi
-KEYWORDS=amd64 x86
-LICENSE=|| ( MIT BSD )
-REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
-SLOT=0
-SRC_URI=https://github.com/llvm-mirror/libclc/archive/dabae5a2afb78cba0320a86e3f5f0b5dc83e077c.tar.gz -> libclc-0.2.0_pre20180915.tar.gz
-_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f4978d9b373c9699f57f9f5f591a859d
diff --git a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20190313 b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20190313
index 4eeb78a5b162..c618febe2faf 100644
--- a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20190313
+++ b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20190313
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm-mirror/libclc/archive/45017385361603d6328997a2272d140e50786686.tar.gz -> libclc-0.2.0_pre20190313.tar.gz
-_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=204060bdc67e2deb0cf6377845c05b86
diff --git a/metadata/md5-cache/dev-libs/libcroco-0.6.13 b/metadata/md5-cache/dev-libs/libcroco-0.6.13
index be6ed601240b..27e083e8bc50 100644
--- a/metadata/md5-cache/dev-libs/libcroco-0.6.13
+++ b/metadata/md5-cache/dev-libs/libcroco-0.6.13
@@ -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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0.6
 SRC_URI=mirror://gnome/sources/libcroco/0.6/libcroco-0.6.13.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c39cbea9314c2d6375f8eb3e5335717c
+_md5_=1de30b11717159fe1ebf2e27b05117a6
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.30.2 b/metadata/md5-cache/dev-libs/libdazzle-3.30.2
index 22b8ae73d9a7..4304428cd295 100644
--- a/metadata/md5-cache/dev-libs/libdazzle-3.30.2
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.30.2
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libdazzle/3.30/libdazzle-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=94931e45aee080f93eba60b6d76797fe
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r2 b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r2
index cde344ea724d..31cbab09d08e 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing Qt implementation of DBusMenu specification
 EAPI=6
 HOMEPAGE=https://launchpad.net/libdbusmenu-qt/
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a70aed8ebf62e35b5ffc0769f8973f89
+_md5_=8607bf5d4ba6914d8142ce38ed86eb36
diff --git a/metadata/md5-cache/dev-libs/libebml-1.3.6 b/metadata/md5-cache/dev-libs/libebml-1.3.6
index 7e143e601a2c..177ecba7c8da 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.3.6
+++ b/metadata/md5-cache/dev-libs/libebml-1.3.6
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Extensible binary format library (kinda like XML)
 EAPI=6
 HOMEPAGE=https://www.matroska.org/ https://github.com/Matroska-Org/libebml/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 SLOT=0/4
 SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.3.6.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e1946b2905f967965df36dac3d502766
+_md5_=1bc2a636341b1da5dddc4cdead96c9e1
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.10 b/metadata/md5-cache/dev-libs/libevent-2.1.10
new file mode 100644
index 000000000000..ba5af2082bec
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+DESCRIPTION=Library to execute a function when a specific event occurs on a file descriptor
+EAPI=7
+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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.10-stable/libevent-2.1.10-stable.tar.gz -> libevent-2.1.10.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=b4e71ff02a484287481062899fcc12cb
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1 b/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
index 2550e781910d..fc770677bbf0 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
+++ b/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GLib-based library for accessing online service APIs using the GData
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
 IUSE=+crypt gnome-online-accounts +introspection static-libs test vala
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=gnome-online-accounts? ( crypt ) vala? ( introspection )
 SLOT=0/22
 SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.9.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a4217aeaac3e55e00ccb938ec50fee53
+_md5_=c9052adc52e69c1102c8405322dd55d6
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.26.8 b/metadata/md5-cache/dev-libs/libgit2-0.26.8
index defc4a4df048..d579df0c2763 100644
--- a/metadata/md5-cache/dev-libs/libgit2-0.26.8
+++ b/metadata/md5-cache/dev-libs/libgit2-0.26.8
@@ -4,10 +4,10 @@ DESCRIPTION=A linkable library for Git
 EAPI=6
 HOMEPAGE=https://libgit2.github.com/
 IUSE=+curl examples gssapi libressl +ssh test +threads trace
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 SLOT=0/26
 SRC_URI=https://github.com/libgit2/libgit2/archive/v0.26.8.tar.gz -> libgit2-0.26.8.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=78068c0287eae86a5d32d6dad8ff70cb
+_md5_=e91e0eeb221a43b4b82cbe896b6912ef
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.28.2 b/metadata/md5-cache/dev-libs/libgit2-0.28.2
new file mode 100644
index 000000000000..b92b89f407ef
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-0.28.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig
+DESCRIPTION=A linkable library for Git
+EAPI=7
+HOMEPAGE=https://libgit2.github.com/
+IUSE=examples gssapi libressl +ssh test +threads trace
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+RESTRICT=!test? ( test )
+SLOT=0/28
+SRC_URI=https://github.com/libgit2/libgit2/archive/v0.28.2.tar.gz -> libgit2-0.28.2.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=81482d9897f76f8972074f3dcda5ba71
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.26.4 b/metadata/md5-cache/dev-libs/libgit2-glib-0.26.4
index 0dd80bfd52af..30ebcf9fee12 100644
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.26.4
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.26.4
@@ -4,11 +4,11 @@ DESCRIPTION=Git library for GLib
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
 IUSE=python +ssh +vala python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1110da185be6a0f7c993dec0a14e9cb2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=21833e8a22a10adf125dc50b83bc2556
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.27.8-r1 b/metadata/md5-cache/dev-libs/libgit2-glib-0.27.8-r1
index adb7cb069029..00228168597c 100644
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.27.8-r1
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.27.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 <dev-
 REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgit2-glib/0.27/libgit2-glib-0.27.8.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1e4f9502a09b5278f36a1b9dda470e92
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.28.0.1 b/metadata/md5-cache/dev-libs/libgit2-glib-0.28.0.1
index 617d0d09f23f..e478ac9342d7 100644
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.28.0.1
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.28.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 <dev-
 REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgit2-glib/0.28/libgit2-glib-0.28.0.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1e4f9502a09b5278f36a1b9dda470e92
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.28.3 b/metadata/md5-cache/dev-libs/libgweather-3.28.3
index 424d64e28500..e24ec2879a50 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.28.3
+++ b/metadata/md5-cache/dev-libs/libgweather-3.28.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-15
 SRC_URI=mirror://gnome/sources/libgweather/3.28/libgweather-3.28.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=462613ce5725639b303108922a0869e7
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.32.1 b/metadata/md5-cache/dev-libs/libgweather-3.32.1
index cbef22df1fea..caa786fe1300 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.32.1
+++ b/metadata/md5-cache/dev-libs/libgweather-3.32.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-15
 SRC_URI=mirror://gnome/sources/libgweather/3.32/libgweather-3.32.1.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=066baf71f77a20327d64b692548d5a55
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.4 b/metadata/md5-cache/dev-libs/libical-3.0.4
index 3a083aaaac78..42f4f08364ad 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.4
+++ b/metadata/md5-cache/dev-libs/libical-3.0.4
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) sys-libs/timezone-data
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.4/libical-3.0.4.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6de71bc7fdeb03dc04c52a6b32eb10bc
+_md5_=9dfb84f471928531ac1a8556ce229302
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.5 b/metadata/md5-cache/dev-libs/libical-3.0.5
new file mode 100644
index 000000000000..ff689d429384
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libical-3.0.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= )
+DESCRIPTION=An implementation of basic iCAL protocols
+EAPI=7
+HOMEPAGE=https://github.com/libical/libical
+IUSE=berkdb doc examples static-libs test
+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-2.0 LGPL-2.1 )
+RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) sys-libs/timezone-data
+SLOT=0/3
+SRC_URI=https://github.com/libical/libical/releases/download/v3.0.5/libical-3.0.5.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=85a328314d4bc3c606dd093edb7926d1
diff --git a/metadata/md5-cache/dev-libs/libidmef-1.0.3 b/metadata/md5-cache/dev-libs/libidmef-1.0.3
deleted file mode 100644
index 04df867dac63..000000000000
--- a/metadata/md5-cache/dev-libs/libidmef-1.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-libs/libxml2-2.5.10
-DESCRIPTION=Implementation of the IDMEF XML draft
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/libidmef/
-IUSE=debug static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.5.10
-SLOT=0
-SRC_URI=mirror://sourceforge/libidmef/libidmef-1.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d43e064dbad39d566ea643f35b1b0623
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
index 5f9dae46bc8f..d11d0126b272 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
@@ -4,10 +4,10 @@ DESCRIPTION=A set of symbols and convience functions that all indicators would l
 EAPI=5
 HOMEPAGE=https://launchpad.net/libindicator
 IUSE=test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=3
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=36126d7fd88ef63ffdcf61c8f30f9cea
+_md5_=71540c4ac93a81de667a51794e541bcd
diff --git a/metadata/md5-cache/dev-libs/libinput-1.12.6 b/metadata/md5-cache/dev-libs/libinput-1.12.6
index c4a332a8cbfa..006967a86e77 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.12.6
+++ b/metadata/md5-cache/dev-libs/libinput-1.12.6
@@ -11,5 +11,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.12.6.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=8d168ceef1d43bbd2cc898e9f9b9c408
diff --git a/metadata/md5-cache/dev-libs/libinput-1.13.1 b/metadata/md5-cache/dev-libs/libinput-1.13.1
index 1bb3137a766b..d6460ba5deb5 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.13.1
+++ b/metadata/md5-cache/dev-libs/libinput-1.13.1
@@ -11,5 +11,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.13.1.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=a72b4e0dd369c0aeccc622f25311718e
diff --git a/metadata/md5-cache/dev-libs/libinput-1.13.2 b/metadata/md5-cache/dev-libs/libinput-1.13.2
index 608d109ba40f..7a32d54097a5 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.13.2
+++ b/metadata/md5-cache/dev-libs/libinput-1.13.2
@@ -11,5 +11,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.13.2.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=a72b4e0dd369c0aeccc622f25311718e
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-1.3.2 b/metadata/md5-cache/dev-libs/libmaxminddb-1.3.2
index 732d3959e06f..2bfaf50218e7 100644
--- a/metadata/md5-cache/dev-libs/libmaxminddb-1.3.2
+++ b/metadata/md5-cache/dev-libs/libmaxminddb-1.3.2
@@ -3,8 +3,8 @@ DESCRIPTION=C library for the MaxMind DB file format
 EAPI=6
 HOMEPAGE=https://github.com/maxmind/libmaxminddb
 IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
 SLOT=0/0.0.7
 SRC_URI=https://github.com/maxmind/libmaxminddb/releases/download/1.3.2/libmaxminddb-1.3.2.tar.gz
-_md5_=67eb9c05cf2adab8665001ae8cf153d0
+_md5_=eeb861ef8a7d51afa499248384e23b44
diff --git a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4 b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
index a9880db222ea..71fd9ade9088 100644
--- a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
+++ b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
@@ -3,9 +3,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=libmcrypt provides uniform interface to access several encryption algorithms
 EAPI=7
 HOMEPAGE=http://mcrypt.sourceforge.net/
-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 ~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 ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=8be59db53e7f0f5a524d1984c77d8e6d
+_md5_=36bc69da64759996310b24ef17bc3786
diff --git a/metadata/md5-cache/dev-libs/libowfat-0.32-r1 b/metadata/md5-cache/dev-libs/libowfat-0.32-r1
index 0c4a9201e3bd..81ee25066c8e 100644
--- a/metadata/md5-cache/dev-libs/libowfat-0.32-r1
+++ b/metadata/md5-cache/dev-libs/libowfat-0.32-r1
@@ -4,10 +4,10 @@ DESCRIPTION=reimplement libdjb - excellent libraries from Dan Bernstein
 EAPI=7
 HOMEPAGE=https://www.fefe.de/libowfat/
 IUSE=diet
-KEYWORDS=~amd64 hppa sparc x86
+KEYWORDS=amd64 hppa sparc x86
 LICENSE=GPL-2
 RDEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
 SLOT=0
 SRC_URI=https://www.fefe.de/libowfat/libowfat-0.32.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=5e1639d76a70832b08d199dce9d2e9a1
+_md5_=cbcf5fc81fc87bc77d7235a936ede6ee
diff --git a/metadata/md5-cache/dev-libs/libp11-0.4.10 b/metadata/md5-cache/dev-libs/libp11-0.4.10
index 5f594eadee4a..c370c18235d3 100644
--- a/metadata/md5-cache/dev-libs/libp11-0.4.10
+++ b/metadata/md5-cache/dev-libs/libp11-0.4.10
@@ -4,9 +4,9 @@ DESCRIPTION=Abstraction layer to simplify PKCS#11 API
 EAPI=7
 HOMEPAGE=https://github.com/opensc/libp11/wiki
 IUSE=libressl bindist doc static-libs
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=!libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( >=dev-libs/libressl-2.8:0= )
 SLOT=0
 SRC_URI=https://github.com/OpenSC/libp11/releases/download/libp11-0.4.10/libp11-0.4.10.tar.gz
-_md5_=e4c4ed8fe2c96692a3a5ebe227d74393
+_md5_=90998e7ca8f5e3ea98284b761c9e5304
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.3.1 b/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
index 08f3516392d0..07a920fa534f 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
@@ -5,10 +5,10 @@ DESCRIPTION=A Qt implementation of XDG standards
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/libqtxdg/3.3.1/libqtxdg-3.3.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=33d509d6c39699a2d9398337e36938df
+_md5_=ee349a5a653be40fef0a5eb232ac72aa
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.9 b/metadata/md5-cache/dev-libs/libratbag-0.9
index c6e44827bea3..884fb7ea698c 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.9
+++ b/metadata/md5-cache/dev-libs/libratbag-0.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevdev virtual/libudev
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.9.tar.gz -> libratbag-0.9.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=44850f6152995a59cceb90d025aaa2c5
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.0.1 b/metadata/md5-cache/dev-libs/librdkafka-1.0.1
new file mode 100644
index 000000000000..d5cb99d50797
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install test
+DEPEND=lz4? ( app-arch/lz4:=[static-libs(-)?] ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib virtual/pkgconfig
+DESCRIPTION=Apache Kafka C/C++ client library
+EAPI=7
+HOMEPAGE=https://github.com/edenhill/librdkafka
+IUSE=lz4 sasl ssl static-libs zstd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~x86
+LICENSE=BSD-2
+RDEPEND=lz4? ( app-arch/lz4:=[static-libs(-)?] ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib
+SLOT=0/1
+SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.0.1.tar.gz -> librdkafka-1.0.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=cdc5218970898866e1a12ea9d3ead66b
diff --git a/metadata/md5-cache/dev-libs/libressl-2.9.2 b/metadata/md5-cache/dev-libs/libressl-2.9.2
new file mode 100644
index 000000000000..1e04b8d712d1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libressl-2.9.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dev-libs/openssl:0 >=app-portage/elt-patches-20170815
+DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
+EAPI=6
+HOMEPAGE=https://www.libressl.org/
+IUSE=+asm static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=ISC openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=!dev-libs/openssl:0
+REQUIRED_USE=test? ( static-libs )
+SLOT=0/47
+SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.2.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=fc9eb9d69c8631f9bbc789a66004104d
diff --git a/metadata/md5-cache/dev-libs/libsass-3.5.5 b/metadata/md5-cache/dev-libs/libsass-3.5.5
index da0ae332dd2c..28e7cd715254 100644
--- a/metadata/md5-cache/dev-libs/libsass-3.5.5
+++ b/metadata/md5-cache/dev-libs/libsass-3.5.5
@@ -4,9 +4,9 @@ DESCRIPTION=A C/C++ implementation of a Sass CSS compiler
 EAPI=7
 HOMEPAGE=https://github.com/sass/libsass
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=https://github.com/sass/libsass/archive/3.5.5.tar.gz -> libsass-3.5.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ae50772f6fd59c826b421a34e7f9ea05
+_md5_=b938f39d0b5851ca3a89704cf90b814d
diff --git a/metadata/md5-cache/dev-libs/libslz-1.1.0 b/metadata/md5-cache/dev-libs/libslz-1.1.0
index 76e4a6044163..2939508b0726 100644
--- a/metadata/md5-cache/dev-libs/libslz-1.1.0
+++ b/metadata/md5-cache/dev-libs/libslz-1.1.0
@@ -3,9 +3,9 @@ DESCRIPTION=stateless, zlib-compatible, and very fast compression library
 EAPI=6
 HOMEPAGE=http://1wt.eu/projects/libslz
 IUSE=static-libs tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ppc x86
+KEYWORDS=amd64 arm ~arm64 ppc x86
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=http://git.1wt.eu/web?p=libslz.git;a=snapshot;h=v1.1.0;sf=tbz2 -> libslz-1.1.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=486d328ad00882f85eb190be0b892240
+_md5_=53cccde18525cc2ee3e75f5a61ff6078
diff --git a/metadata/md5-cache/dev-libs/libuv-1.28.0 b/metadata/md5-cache/dev-libs/libuv-1.28.0
index 257811188a8a..4e32354cc0c1 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.28.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.28.0
@@ -5,10 +5,10 @@ DESCRIPTION=Cross-platform asychronous I/O
 EAPI=7
 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_riscv_lp64d abi_riscv_lp64 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
+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.28.0.tar.gz -> libuv-1.28.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=1a50db7268533bd2a3ad78622624501a
+_md5_=46e796d4ebd6df6731d88f190a471e47
diff --git a/metadata/md5-cache/dev-libs/libuv-1.29.1 b/metadata/md5-cache/dev-libs/libuv-1.29.1
new file mode 100644
index 000000000000..f6e2ebbe4ff3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuv-1.29.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Cross-platform asychronous I/O
+EAPI=7
+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_riscv_lp64d abi_riscv_lp64 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.29.1.tar.gz -> libuv-1.29.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1a50db7268533bd2a3ad78622624501a
diff --git a/metadata/md5-cache/dev-libs/libvarlink-16 b/metadata/md5-cache/dev-libs/libvarlink-16
index a8ff9f0b36df..92f837e48afa 100644
--- a/metadata/md5-cache/dev-libs/libvarlink-16
+++ b/metadata/md5-cache/dev-libs/libvarlink-16
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/varlink/libvarlink/archive/16.tar.gz -> libvarlink-16.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=34baba02f809adce677a03829d3bf935
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.9-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.9-r1
index 12d511cb52d6..193848716273 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.9-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=XML C parser and toolkit
 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_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 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=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.9.tar.gz https://dev.gentoo.org/~leio/distfiles/libxml2-2.9.9-patchset.tar.xz 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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f81d9fd1cbad52ff8b59f3544ab95fb8
+_md5_=ab65b5a0b11b6bae0c4aa28d1eb3142d
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.10 b/metadata/md5-cache/dev-libs/libxmlb-0.1.10
index db99a8bef622..f72000d1bb8d 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.10
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.1.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.10.tar.gz -> libxmlb-0.1.10.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=1115e4afaf382d9b1ee930602b2b1102
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.8 b/metadata/md5-cache/dev-libs/libxmlb-0.1.8
index dc4bda0e48ef..bcabecf0d07a 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.8
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.1.8
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.8.tar.gz -> libxmlb-0.1.8.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=7d32ebbd9abaf28d7a17179bac5a3168
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.9 b/metadata/md5-cache/dev-libs/libxmlb-0.1.9
index d216daf3dee8..4fa88f613b0d 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.9
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.1.9
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.9.tar.gz -> libxmlb-0.1.9.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=1115e4afaf382d9b1ee930602b2b1102
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.33-r1 b/metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
index 69c29609a762..f4f3bdc0eee9 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
@@ -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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~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=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.33.tar.gz https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch -> libxslt-1.1.33-CVE-2019-11068.patch
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=71fb7d45aa8af92c40bd46d24ea4731e
+_md5_=f761198d1a807f2651995746ac1eab02
diff --git a/metadata/md5-cache/dev-libs/libzip-1.5.1 b/metadata/md5-cache/dev-libs/libzip-1.5.1
index 1931d9e42f0f..5d242ed24a44 100644
--- a/metadata/md5-cache/dev-libs/libzip-1.5.1
+++ b/metadata/md5-cache/dev-libs/libzip-1.5.1
@@ -5,10 +5,10 @@ DESCRIPTION=Library for manipulating zip archives
 EAPI=7
 HOMEPAGE=https://nih.at/libzip/
 IUSE=bzip2 doc gnutls libressl ssl static-libs test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 SLOT=0/5
 SRC_URI=https://www.nih.at/libzip/libzip-1.5.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ca4bd112c2bad3ad8ab8a583be745962
+_md5_=87cddb0e650236d1f7c74ea2eb35f3c9
diff --git a/metadata/md5-cache/dev-libs/log4shib-1.0.4 b/metadata/md5-cache/dev-libs/log4shib-1.0.4
index 6c8236173505..1808cf66bf96 100644
--- a/metadata/md5-cache/dev-libs/log4shib-1.0.4
+++ b/metadata/md5-cache/dev-libs/log4shib-1.0.4
@@ -7,5 +7,5 @@ IUSE=debug doc static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
-SRC_URI=http://shibboleth.internet2.edu/downloads/log4shib/1.0.4/log4shib-1.0.4.tar.gz
-_md5_=f9209209c7cebdd72e52d34099eb7d86
+SRC_URI=https://shibboleth.net/downloads/log4shib/1.0.4/log4shib-1.0.4.tar.gz
+_md5_=209f5f6fec1693167d37c6fa0275ea54
diff --git a/metadata/md5-cache/dev-libs/log4shib-1.0.4-r1 b/metadata/md5-cache/dev-libs/log4shib-1.0.4-r1
new file mode 100644
index 000000000000..b23a9b43df43
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/log4shib-1.0.4-r1
@@ -0,0 +1,11 @@
+BDEPEND=doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure
+DESCRIPTION=Internet2 version for OpenSAML of log4cpp logging framework
+EAPI=7
+HOMEPAGE=https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib
+IUSE=debug doc static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://shibboleth.net/downloads/log4shib/1.0.4/log4shib-1.0.4.tar.gz
+_md5_=d4ff873afac69242ba8bd1929dc00ccc
diff --git a/metadata/md5-cache/dev-libs/mm-1.4.2-r2 b/metadata/md5-cache/dev-libs/mm-1.4.2-r2
index 5fc32fa78d0f..dc2aec89ff58 100644
--- a/metadata/md5-cache/dev-libs/mm-1.4.2-r2
+++ b/metadata/md5-cache/dev-libs/mm-1.4.2-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install prepare test
 DESCRIPTION=Shared Memory Abstraction Library
 EAPI=6
 HOMEPAGE=http://www.ossp.org/pkg/lib/mm/
-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=mm
 SLOT=1.2
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/mm/mm-1.4.2.tar.gz
-_md5_=e4d9dfaf504765f8431a1fb6ef4c1657
+_md5_=649840d435f1e02e1aef9f8f2ce635d2
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.15 b/metadata/md5-cache/dev-libs/newt-0.52.15
deleted file mode 100644
index e09fc9f4ba3b..000000000000
--- a/metadata/md5-cache/dev-libs/newt-0.52.15
+++ /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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Redhat's Newt windowing toolkit development files
-EAPI=5
-HOMEPAGE=https://pagure.io/newt
-IUSE=gpm tcl nls python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=LGPL-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_python2_7(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://releases.pagure.org/newt/newt-0.52.15.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3a4091b0c74eb51f93c88f3dc3ff9f09
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.18 b/metadata/md5-cache/dev-libs/newt-0.52.18
deleted file mode 100644
index a48a89b6347e..000000000000
--- a/metadata/md5-cache/dev-libs/newt-0.52.18
+++ /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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Redhat's Newt windowing toolkit development files
-EAPI=5
-HOMEPAGE=https://pagure.io/newt
-IUSE=gpm tcl nls python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=LGPL-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_python2_7(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://releases.pagure.org/newt/newt-0.52.18.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5b282814855dce9567bfb967493b720c
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.20 b/metadata/md5-cache/dev-libs/newt-0.52.20
index 45906956ee1f..7fd5325eb75f 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.20
+++ b/metadata/md5-cache/dev-libs/newt-0.52.20
@@ -4,11 +4,11 @@ DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=6
 HOMEPAGE=https://pagure.io/newt
 IUSE=gpm nls tcl python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses:0= ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://releases.pagure.org/newt/newt-0.52.20.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=073e85077723ba4e780795ebf5489a0e
+_md5_=0244951dcbaef5dc421df1b74ed8d6ef
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.21 b/metadata/md5-cache/dev-libs/newt-0.52.21
new file mode 100644
index 000000000000..47edee1bd43d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/newt-0.52.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses:0= ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Redhat's Newt windowing toolkit development files
+EAPI=6
+HOMEPAGE=https://pagure.io/newt
+IUSE=gpm nls tcl python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses:0= ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://releases.pagure.org/newt/newt-0.52.21.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=80a465df0fbbdac14c47fd638fc1143f
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-8.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-8.0.0
index ae48ed9dc49c..fced45207149 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-8.0.0
+++ b/metadata/md5-cache/dev-libs/opencl-clang-8.0.0
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=sys-devel/clang:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=8
 SRC_URI=https://github.com/intel/opencl-clang/archive/v8.0.0.tar.gz -> opencl-clang-8.0.0.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=99f1915b9b9812786f0ff04c2a0adbce
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2s b/metadata/md5-cache/dev-libs/openssl-1.0.2s
new file mode 100644
index 000000000000..58342c858d16
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2s
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=mirror://openssl/source/openssl-1.0.2s.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2s_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2s_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2s_ectest.c )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b54ea3fa2cc25ef7af324eec5c1d8a82
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2s-r200 b/metadata/md5-cache/dev-libs/openssl-1.0.2s-r200
new file mode 100644
index 000000000000..0e35f1d1b7cf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2s-r200
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=dev-libs/openssl-1.0.2*:0 >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=openssl
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=dev-libs/openssl-1.0.2*:0
+RESTRICT=test
+SLOT=1.0.0
+SRC_URI=mirror://openssl/source/openssl-1.0.2s.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2s_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2s_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2s_ectest.c )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9f5d5f2d59872a2f4c47b9c2e5e2e596
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.0k b/metadata/md5-cache/dev-libs/openssl-1.1.0k
new file mode 100644
index 000000000000..160572c68409
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.0k
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=6
+HOMEPAGE=https://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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.0k.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_ectest.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-build.patch?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-ec-curves.patch?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0-ec-curves_d2ede125556ac99aa0faa7744c703af3f559094e.patch )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=baa5a14fb15711dbad0ce5f08749aee4
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1c b/metadata/md5-cache/dev-libs/openssl-1.1.1c
new file mode 100644
index 000000000000..8ec9229b1b92
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1c
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.1c.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f29 -> openssl-1.1.1c_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f29 -> openssl-1.1.1c_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f29 -> openssl-1.1.1c_ectest.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.1-ec-curves.patch?h=f29 -> openssl-1.1.1-ec-curves.patch )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=667116b833897db9ecbadb599282a8d9
diff --git a/metadata/md5-cache/dev-libs/ptexenc-1.3.7_p20190410 b/metadata/md5-cache/dev-libs/ptexenc-1.3.7_p20190410
new file mode 100644
index 000000000000..494ab4c4a1c8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ptexenc-1.3.7_p20190410
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=iconv? ( virtual/libiconv ) dev-libs/kpathsea
+DESCRIPTION=Library for Japanese pTeX providing a better way of handling character encodings
+EAPI=7
+HOMEPAGE=http://tutimura.ath.cx/ptexlive/?ptexenc
+IUSE=iconv static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=iconv? ( virtual/libiconv ) dev-libs/kpathsea
+SLOT=0
+SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8f9f5604b85b3aff286d6ee353e6c311
diff --git a/metadata/md5-cache/dev-libs/quazip-0.8.1 b/metadata/md5-cache/dev-libs/quazip-0.8.1
new file mode 100644
index 000000000000..2d719997767f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/quazip-0.8.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 sys-libs/zlib[minizip]
+DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
+EAPI=7
+HOMEPAGE=https://stachenov.github.io/quazip/
+IUSE=static-libs
+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=https://github.com/stachenov/quazip/archive/v0.8.1.tar.gz -> quazip-0.8.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=bec9e9f5871c2e7053764040910536de
diff --git a/metadata/md5-cache/dev-libs/rapidjson-9999 b/metadata/md5-cache/dev-libs/rapidjson-9999
index efd9317d0200..50847ef35817 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-9999
+++ b/metadata/md5-cache/dev-libs/rapidjson-9999
@@ -7,4 +7,4 @@ IUSE=doc examples test
 LICENSE=MIT
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4fa75bf977799794f3f070ee695ff822
+_md5_=ad9c3912f01cc0c0f057b95250ed6d68
diff --git a/metadata/md5-cache/dev-libs/rasqal-0.9.33 b/metadata/md5-cache/dev-libs/rasqal-0.9.33
index 1c0748e2665e..01a075426f16 100644
--- a/metadata/md5-cache/dev-libs/rasqal-0.9.33
+++ b/metadata/md5-cache/dev-libs/rasqal-0.9.33
@@ -5,10 +5,10 @@ DESCRIPTION=Library that handles Resource Description Framework (RDF)
 EAPI=7
 HOMEPAGE=http://librdf.org/rasqal/
 IUSE=+crypt gmp kernel_linux +mhash pcre static-libs test xml
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/raptor-2.0.15 crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mhash? ( app-crypt/mhash ) ) !gmp? ( dev-libs/mpfr:= ) gmp? ( dev-libs/gmp:= ) kernel_linux? ( >=sys-apps/util-linux-2.19 ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/rasqal-0.9.33.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0283606765a14a962582bc65d08a70d5
+_md5_=1b3af28a40c0fe990df9e17a8baded15
diff --git a/metadata/md5-cache/dev-libs/re2-0.2018.10.01 b/metadata/md5-cache/dev-libs/re2-0.2018.10.01
index 9a07d578c639..e1d16c37c528 100644
--- a/metadata/md5-cache/dev-libs/re2-0.2018.10.01
+++ b/metadata/md5-cache/dev-libs/re2-0.2018.10.01
@@ -5,10 +5,10 @@ DESCRIPTION=An efficient, principled regular expression library
 EAPI=7
 HOMEPAGE=https://github.com/google/re2
 IUSE=icu abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/gentoo-2017-03-01
 SRC_URI=https://github.com/google/re2/archive/2018-10-01.tar.gz -> re2-2018-10-01.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=62a92ede2a9e9346b930396eebfb2361
+_md5_=e9781ce5a6a20a98b5e8b7ff10046258
diff --git a/metadata/md5-cache/dev-libs/redland-1.0.17-r2 b/metadata/md5-cache/dev-libs/redland-1.0.17-r2
index c38e63d6123f..8a82aea9eb6b 100644
--- a/metadata/md5-cache/dev-libs/redland-1.0.17-r2
+++ b/metadata/md5-cache/dev-libs/redland-1.0.17-r2
@@ -5,10 +5,10 @@ DESCRIPTION=High-level interface for the Resource Description Framework
 EAPI=7
 HOMEPAGE=http://librdf.org/
 IUSE=berkdb iodbc mysql odbc postgres sqlite static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( dev-db/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-1.0.17.tar.gz
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e4b10ea84a673d14c5cca70e9cd7fa72
+_md5_=a731a771c3f14515fd18698c32742b05
diff --git a/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2 b/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2
index 2837439d1cd5..5111ec28aff9 100644
--- a/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2
+++ b/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Language bindings for Redland
 EAPI=5
 HOMEPAGE=http://librdf.org/bindings/
 IUSE=lua perl python php ruby python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/redland-1.0.14 lua? ( >=dev-lang/lua-5.1:0 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( dev-lang/ruby:* dev-ruby/log4r )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-bindings-1.0.14.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93e24929740cd7332ea4557f0b58e0e5
+_md5_=1094bd0bb5bdfe077b4ebaa2108e7c2d
diff --git a/metadata/md5-cache/dev-libs/serd-0.28.0-r1 b/metadata/md5-cache/dev-libs/serd-0.28.0-r1
index 98be1f14f25f..72ed5960a894 100644
--- a/metadata/md5-cache/dev-libs/serd-0.28.0-r1
+++ b/metadata/md5-cache/dev-libs/serd-0.28.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/serd/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=http://download.drobilla.net/serd-0.28.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=65dc6058ac8fb1e33940ccb5250f1d8d
+_md5_=14f09b3ad8f46569f0725eb8767ee546
diff --git a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325 b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
index b44309d7a0c3..8e4ed10417b2 100644
--- a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
+++ b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
@@ -3,9 +3,9 @@ DESCRIPTION=All you need to include the snowball stemming algorithms into a C pr
 EAPI=5
 HOMEPAGE=https://snowballstem.org/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/libstemmer_c-20140325.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cae01ad1084e00699fe1eba4913890cf
+_md5_=f4075186dc009df6f8ad505ce9e5c4cb
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.0-r1 b/metadata/md5-cache/dev-libs/sord-0.16.0-r1
index 0884864e575a..ec73c7347467 100644
--- a/metadata/md5-cache/dev-libs/sord-0.16.0-r1
+++ b/metadata/md5-cache/dev-libs/sord-0.16.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for storing RDF data in memory
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/sord/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-libs/serd-0.28.0-r1
 SLOT=0
 SRC_URI=http://download.drobilla.net/sord-0.16.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=adc0e5d74b26df03a1b2e15e1ef0bba3
+_md5_=ac69994b86ee3eeddbddd6da5e6066fd
diff --git a/metadata/md5-cache/dev-libs/template-glib-3.32.0 b/metadata/md5-cache/dev-libs/template-glib-3.32.0
index 704df07527d3..980dd92df59d 100644
--- a/metadata/md5-cache/dev-libs/template-glib-3.32.0
+++ b/metadata/md5-cache/dev-libs/template-glib-3.32.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:=
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/template-glib/3.32/template-glib-3.32.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f18a5ab49283b0d4fc09364402978cd7
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3 b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3
index 4211f3154ad3..23a95ad210dc 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3
@@ -5,10 +5,10 @@ DESCRIPTION=Playlist parsing library
 EAPI=7
 HOMEPAGE=https://developer.gnome.org/totem-pl-parser/stable/
 IUSE=archive crypt gtk-doc +introspection +quvi test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 quvi? ( >=media-libs/libquvi-0.9.1:0= ) archive? ( >=app-arch/libarchive-3:0= ) dev-libs/libxml2:2 crypt? ( dev-libs/libgcrypt:0= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 SLOT=0/18
 SRC_URI=mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.3.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0c923090408e603f4fec2ade74ff19a5
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=85d1cb7afcf50a65392705fd033511dc
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.42.7 b/metadata/md5-cache/dev-libs/vala-common-0.42.7
index 663533a3a114..2d95c3de8cc9 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.42.7
+++ b/metadata/md5-cache/dev-libs/vala-common-0.42.7
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!<dev-lang/vala-0.10.4-r2 !<dev-lang/vala-0.12.1-r1:0.12 !<dev-lang/vala-0.14.2-r2:0.14 !<dev-lang/vala-0.16.1-r2:0.16 !<dev-lang/vala-0.17.5:0.18
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.42/vala-0.42.7.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=04698f2814e0c11690b7e1f6c21d63e9
+_md5_=f4900ffdfd80f540a69f1b79deeb3b41
diff --git a/metadata/md5-cache/dev-libs/weston-6.0.0 b/metadata/md5-cache/dev-libs/weston-6.0.0
index bf921e00c94e..1a1beff6f42e 100644
--- a/metadata/md5-cache/dev-libs/weston-6.0.0
+++ b/metadata/md5-cache/dev-libs/weston-6.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-p
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/weston-6.0.0.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b40b10f27368325238c39081cc44e1a6
diff --git a/metadata/md5-cache/dev-libs/weston-9999 b/metadata/md5-cache/dev-libs/weston-9999
index d3b88aab1b49..fc04b12bd34c 100644
--- a/metadata/md5-cache/dev-libs/weston-9999
+++ b/metadata/md5-cache/dev-libs/weston-9999
@@ -9,5 +9,5 @@ LICENSE=MIT CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.17 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=a88c3e009b2fb58afb19b13aa8b786e7
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.7 b/metadata/md5-cache/dev-libs/xapian-1.4.7
index ebfd8e0cb701..dacd0d128d9e 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.7
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.7
@@ -4,11 +4,11 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=https://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 REQUIRED_USE=inmemory? ( chert )
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.7/xapian-core-1.4.7.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f00f093e21e991d8f23550d08f8835f5
+_md5_=de7e5a08b98f6df1bd45d02292bebc22
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.28 b/metadata/md5-cache/dev-libs/xmlsec-1.2.28
index fab6f71ba178..dfa0ee5b7ea8 100644
--- a/metadata/md5-cache/dev-libs/xmlsec-1.2.28
+++ b/metadata/md5-cache/dev-libs/xmlsec-1.2.28
@@ -5,11 +5,11 @@ DESCRIPTION=Command line tool for signing, verifying, encrypting and decrypting
 EAPI=7
 HOMEPAGE=https://www.aleksey.com/xmlsec
 IUSE=doc gcrypt gnutls libressl nss +openssl static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.7.4:= >=dev-libs/libxslt-1.0.20:= gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) gnutls? ( >=net-libs/gnutls-2.8.0:= ) nss? ( >=dev-libs/nspr-4.4.1:= >=dev-libs/nss-3.9:= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
 SLOT=0
 SRC_URI=https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.28.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=4b3512a58001103c579084cc8e5be131
+_md5_=c7da7cc571159f13444ac3a1170c4b34
diff --git a/metadata/md5-cache/dev-libs/yajl-2.1.0-r2 b/metadata/md5-cache/dev-libs/yajl-2.1.0-r2
index d4121ade438e..d3713037cc01 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.1.0-r2
+++ b/metadata/md5-cache/dev-libs/yajl-2.1.0-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Small event-driven (SAX-style) JSON parser
 EAPI=6
 HOMEPAGE=https://lloyd.github.com/yajl/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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 ~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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
 SLOT=0/2
 SRC_URI=https://github.com/lloyd/yajl/tarball/2.1.0 -> yajl-2.1.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8c0badc59ec1a719e7f29367e94e282a
+_md5_=10723aeba42c57737f0f493b907ae952
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 4d12077a6cd2..d5b7be61ce06 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.5.3 b/metadata/md5-cache/dev-lisp/sbcl-1.5.3
new file mode 100644
index 000000000000..afe03e7caab4
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lisp/asdf-3.1:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) pax_kernel? ( sys-apps/elfix )
+DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
+EAPI=6
+HOMEPAGE=http://sbcl.sourceforge.net/
+IUSE=debug doc source +threads +unicode pax_kernel zlib
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
+SLOT=0/1.5.3
+SRC_URI=mirror://sourceforge/sbcl/sbcl-1.5.3-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.5.3-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=38ddc05b34f3ebef3677218682f838b9
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index dd48763617ab..caf9d6b3cdb0 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/busted-2.0_rc12_p1 b/metadata/md5-cache/dev-lua/busted-2.0_rc12_p1
index c5adf2f02e53..0d9afa02766c 100644
--- a/metadata/md5-cache/dev-lua/busted-2.0_rc12_p1
+++ b/metadata/md5-cache/dev-lua/busted-2.0_rc12_p1
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
 DESCRIPTION=Elegant Lua unit testing
 EAPI=6
 HOMEPAGE=http://olivinelabs.com/busted/
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:= >=dev-lua/lua_cliargs-3.0 >=dev-lua/luafilesystem-1.5.0 >=dev-lua/luasystem-0.2.0 >=dev-lua/dkjson-2.1.0 >=dev-lua/say-1.3 >=dev-lua/luassert-1.7.8 >=dev-lua/lua-term-0.1_p1 >=dev-lua/penlight-1.3.2 >=dev-lua/mediator_lua-1.1.1_p0
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/busted/archive/v2.0.rc12-1.tar.gz -> busted-2.0_rc12_p1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=7cf08cf0137e942c5d906181b1f45618
+_md5_=7c93ecb3fad424c510ebb57e7c1bf724
diff --git a/metadata/md5-cache/dev-lua/dkjson-2.5 b/metadata/md5-cache/dev-lua/dkjson-2.5
index 9b8907a21ce8..41253fafe2a5 100644
--- a/metadata/md5-cache/dev-lua/dkjson-2.5
+++ b/metadata/md5-cache/dev-lua/dkjson-2.5
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/lua-5.1:= !>=dev-lang/lua-5.4 virtual/pkgconfig
 DESCRIPTION=David Kolf's JSON module for Lua
 EAPI=5
 HOMEPAGE=http://dkolf.de/src/dkjson-lua.fsl/
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:= !>=dev-lang/lua-5.4
 SLOT=0
 SRC_URI=http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.5.tar.gz?uuid=release_2_5 -> dkjson-2.5.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=d6d6ab82fab8292ab20ec3dbf31ecef7
+_md5_=a7591dd1a42fa0da2bd47fa629f1a205
diff --git a/metadata/md5-cache/dev-lua/ldoc-1.4.6 b/metadata/md5-cache/dev-lua/ldoc-1.4.6
index b40d6c636fca..bb2b80f649aa 100644
--- a/metadata/md5-cache/dev-lua/ldoc-1.4.6
+++ b/metadata/md5-cache/dev-lua/ldoc-1.4.6
@@ -3,10 +3,10 @@ DEPEND=dev-lua/penlight
 DESCRIPTION=A LuaDoc-compatible documentation generation system
 EAPI=6
 HOMEPAGE=https://stevedonovan.github.io/ldoc/
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-lua/penlight
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/stevedonovan/LDoc/archive/1.4.6.tar.gz -> ldoc-1.4.6.tar.gz
-_md5_=7140f2b11e839f9e15c9d69d59e828dd
+_md5_=63fda596f33d721e77aa98fd0a2831ad
diff --git a/metadata/md5-cache/dev-lua/lua-term-0.3 b/metadata/md5-cache/dev-lua/lua-term-0.3
index e85142923682..400202e7d511 100644
--- a/metadata/md5-cache/dev-lua/lua-term-0.3
+++ b/metadata/md5-cache/dev-lua/lua-term-0.3
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
 DESCRIPTION=Terminal functions for Lua
 EAPI=5
 HOMEPAGE=https://github.com/hoelzro/lua-term
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:=
 SLOT=0
 SRC_URI=https://github.com/hoelzro/lua-term/archive/0.03.tar.gz -> lua-term-0.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=b8656f73ac5b3931eefbed3bfe1a8e8f
+_md5_=b9d4713222b715577a11a9f9e77250d4
diff --git a/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p1 b/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p1
index 864432eef6b1..0fd2b61cd1d9 100644
--- a/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p1
+++ b/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p1
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
 DESCRIPTION=A command-line argument parser.
 EAPI=6
 HOMEPAGE=https://github.com/amireh/lua_cliargs
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:=
 SLOT=0
 SRC_URI=https://github.com/amireh/lua_cliargs/archive/v3.0-1.tar.gz -> lua_cliargs-3.0_p1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=b294b16214bcbedb6abffacb6c5b81b9
+_md5_=62cb73a65a22c1543f2ed0b33b38e67b
diff --git a/metadata/md5-cache/dev-lua/luacheck-0.20.0 b/metadata/md5-cache/dev-lua/luacheck-0.20.0
index 3068f8813096..1feb6542a94c 100644
--- a/metadata/md5-cache/dev-lua/luacheck-0.20.0
+++ b/metadata/md5-cache/dev-lua/luacheck-0.20.0
@@ -4,10 +4,10 @@ DESCRIPTION=A tool for linting and static analysis of Lua code
 EAPI=6
 HOMEPAGE=https://github.com/mpeterv/luacheck
 IUSE=doc luajit test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-lua/luafilesystem[luajit=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
 SLOT=0
 SRC_URI=https://github.com/mpeterv/luacheck/archive/0.20.0.tar.gz -> luacheck-0.20.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=1727daac463a59154f0ca5c9510cb7e0
+_md5_=f6301dfe9763e470a8f765dd6a24c508
diff --git a/metadata/md5-cache/dev-lua/luafilesystem-1.6.3 b/metadata/md5-cache/dev-lua/luafilesystem-1.6.3
index 9a8f39bdb57b..ec6547394e3a 100644
--- a/metadata/md5-cache/dev-lua/luafilesystem-1.6.3
+++ b/metadata/md5-cache/dev-lua/luafilesystem-1.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=File System Library for the Lua Programming Language
 EAPI=6
 HOMEPAGE=https://keplerproject.github.io/luafilesystem/
 IUSE=luajit
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=!luajit? ( >=dev-lang/lua-5.1 ) luajit? ( dev-lang/luajit:2 )
 SLOT=0
 SRC_URI=https://github.com/keplerproject/luafilesystem/archive/v1_6_3.tar.gz -> luafilesystem-1.6.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c84d8d37b1bba4dd01946dda87f092bd
+_md5_=63130bbb6f2f3776734763d9c90d4048
diff --git a/metadata/md5-cache/dev-lua/luassert-1.7.10 b/metadata/md5-cache/dev-lua/luassert-1.7.10
index 4556ed919dee..8d515409a210 100644
--- a/metadata/md5-cache/dev-lua/luassert-1.7.10
+++ b/metadata/md5-cache/dev-lua/luassert-1.7.10
@@ -4,10 +4,10 @@ DESCRIPTION=Lua Assertions Extension
 EAPI=6
 HOMEPAGE=http://olivinelabs.com/busted/
 IUSE=luajit test
-KEYWORDS=~amd64 arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) >=dev-lua/say-1.2_p1[luajit=]
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/luassert/archive/v1.7.10.tar.gz -> luassert-1.7.10.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e1fd120131a4a1095c3a55649c410a20
+_md5_=3dc4aaf5f883c933a7e8d024537baac8
diff --git a/metadata/md5-cache/dev-lua/luasystem-0.2.0_p0 b/metadata/md5-cache/dev-lua/luasystem-0.2.0_p0
index a17189ab04b0..ea38bca8ee6a 100644
--- a/metadata/md5-cache/dev-lua/luasystem-0.2.0_p0
+++ b/metadata/md5-cache/dev-lua/luasystem-0.2.0_p0
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
 DESCRIPTION=platform independent system calls for lua
 EAPI=6
 HOMEPAGE=https://github.com/LuaDist2/luasystem
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:=
 SLOT=0
 SRC_URI=https://github.com/LuaDist2/luasystem/archive/0.2.0-0.tar.gz -> luasystem-0.2.0_p0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=b39284fedc38e1a947f5c82a03c7b470
+_md5_=3fded8880e78b21f241373ac49e05e79
diff --git a/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0 b/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0
index cecd3c2e28e9..d903cb27d943 100644
--- a/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0
+++ b/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
 DESCRIPTION=Event handling through channels
 EAPI=5
 HOMEPAGE=http://olivinelabs.com/mediator_lua/,
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:=
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz -> mediator_lua-1.1.2_p0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=2320e8356f2c9c5131a7109f62276c41
+_md5_=5fdf181f79d624cad63c5d078cc0849b
diff --git a/metadata/md5-cache/dev-lua/penlight-1.3.2 b/metadata/md5-cache/dev-lua/penlight-1.3.2
index 31a380d354ec..1d46181a3bd8 100644
--- a/metadata/md5-cache/dev-lua/penlight-1.3.2
+++ b/metadata/md5-cache/dev-lua/penlight-1.3.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/lua-5.1:= app-arch/unzip virtual/pkgconfig
 DESCRIPTION=Lua utility libraries loosely based on the Python standard libraries
 EAPI=5
 HOMEPAGE=http://stevedonovan.github.com/Penlight,
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:= dev-lua/luafilesystem
 SLOT=0
 SRC_URI=http://stevedonovan.github.io/files/penlight-1.3.2-core.zip
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=fa133c83de2aceb2daf54bf1fe8006f1
+_md5_=b0a364f44565b6cfec6d55a0cb7d8f0e
diff --git a/metadata/md5-cache/dev-lua/say-1.3_p1-r1 b/metadata/md5-cache/dev-lua/say-1.3_p1-r1
index ca20eb15001c..5c4c617cd4a2 100644
--- a/metadata/md5-cache/dev-lua/say-1.3_p1-r1
+++ b/metadata/md5-cache/dev-lua/say-1.3_p1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Lua String Hashing/Indexing Library
 EAPI=6
 HOMEPAGE=http://olivinelabs.com/busted/
 IUSE=luajit test
-KEYWORDS=~amd64 arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz -> say-1.3_p1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=aa3d426575631ab6772acc979ab127a0
+_md5_=80703be2619484c43fd9c14bca4fa72a
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index cb263f02cefb..7e6becfec5cf 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.1
deleted file mode 100644
index f7f74662a2bf..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-4.0.1:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-4.0.1:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?] !sys-devel/llvm[ocaml(-)]
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-SLOT=0/4.0.1
-SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a87913004b08a415b168591759b4383e
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.2 b/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.2
index 46c7e51688d8..78bb676d88e7 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.2
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.2:=
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=0/5.0.2
 SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b43a74182fa50885f22cd00b5d3e1fc1
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.1
index da1f3e15443d..190b41f2b044 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/6.0.1
 SRC_URI=https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=51ff3d0f7375bd578e35a9ef3c01d5e6
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-7.1.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-7.1.0
index 3b6ea464d53b..e40354776fb5 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-7.1.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-7.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/7.1.0
 SRC_URI=https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=dfc61294ecf998e4f4a3c95b75ec629b
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.0
index 90c60905cdec..8fc315459954 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/8.0.0
 SRC_URI=https://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f0375fd9b8e8698a2ab15d2ed3fe2d1f
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.9999
index ba8b13083588..18a3a52fc27d 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-8.0.999
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore )
 RESTRICT=!test? ( test )
 SLOT=0/8.0.9999
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ef31683e8c8e9cdda5dbd927dae7b67a
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-9999
index 17f06ea9dd74..4819022617f5 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9999:=[
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=971b97105aa7d4f1c510eb6dee995798
diff --git a/metadata/md5-cache/dev-perl/Devel-SmallProf-2.20.0-r4 b/metadata/md5-cache/dev-perl/Devel-SmallProf-2.20.0-r4
index 3df57e61dea9..0d770342951f 100644
--- a/metadata/md5-cache/dev-perl/Devel-SmallProf-2.20.0-r4
+++ b/metadata/md5-cache/dev-perl/Devel-SmallProf-2.20.0-r4
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=Per-line Perl profiler
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Devel-SmallProf
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=amd64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Devel-SmallProf-2.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=25571fa03d4d1dc8bf4805b7bca00531
+_md5_=8e4c86ee69f678e14655c00581be9ec6
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0 b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0
index a77c3f8a0613..7f7d7ae08dc2 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0
@@ -4,10 +4,10 @@ DESCRIPTION=Easily build XS extensions that depend on XS extensions
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/ExtUtils-Depends
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.405.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=550fabd07a7ad5d3517f14b34fa190e0
+_md5_=b5bcdb73b7a30e5311cfd634947931aa
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0 b/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0
index e6f3fa96ebf8..4dcbd97c1f67 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl:=
 DESCRIPTION=Simplistic perl interface to pkg-config
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/ExtUtils-PkgConfig
-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+
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=581c948d02065fae95499a1160351d4d
+_md5_=2e66c164c743c010e465327f61dfd00d
diff --git a/metadata/md5-cache/dev-perl/GD-2.560.0-r1 b/metadata/md5-cache/dev-perl/GD-2.560.0-r1
index def3442fca88..368527d9a544 100644
--- a/metadata/md5-cache/dev-perl/GD-2.560.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-2.560.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Interface to Thomas Boutell's gd library
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/GD
 IUSE=animgif gif jpeg png truetype xpm
-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
+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=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Math-Complex >=media-libs/gd-2.0.33 png? ( media-libs/gd[png] media-libs/libpng:0 sys-libs/zlib ) jpeg? ( media-libs/gd[jpeg] virtual/jpeg:0 ) truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) gif? ( media-libs/giflib ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/GD-2.56.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=d126a8be98d3f45f4bdbccaae6683be4
+_md5_=6ddd1ed9ab675d4d874e0dce5fc33c19
diff --git a/metadata/md5-cache/dev-perl/Log-Agent-1.1.0 b/metadata/md5-cache/dev-perl/Log-Agent-1.1.0
index df8ad3a12eea..f4eaf6d293ce 100644
--- a/metadata/md5-cache/dev-perl/Log-Agent-1.1.0
+++ b/metadata/md5-cache/dev-perl/Log-Agent-1.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A general logging framework
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Log-Agent
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MR/MROGASKI/Log-Agent-1.001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=68f8f492da416208a2aeae1524896762
+_md5_=770eff6b2763c9a9aee45242c84514d8
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 9f2df6e5d9fa..f331bb7e40ad 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/XML-DOM-1.460.0-r1 b/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
index 02bdf7750bbd..f1c3e49bdde1 100644
--- a/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A Perl module for an DOM Level 1 compliant interface
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-DOM
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl >=dev-perl/XML-Parser-2.300.0 dev-perl/XML-RegExp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.46.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=ff72aed692efe4fccc334c6173935cd5
+_md5_=3c8d0edb136f9891812e832cc78d5b83
diff --git a/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1 b/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
index ec50a94b1880..bbff2b5647c8 100644
--- a/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Regular expressions for XML tokens
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/XML-RegExp
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.04.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5522e6e5a39792e4500c2157aa1b841b
+_md5_=fe5e1f6f5a284d422ccd453ac92577d9
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.326.0 b/metadata/md5-cache/dev-perl/glib-perl-1.326.0
index fe15b84aeb02..d514fad2b0db 100644
--- a/metadata/md5-cache/dev-perl/glib-perl-1.326.0
+++ b/metadata/md5-cache/dev-perl/glib-perl-1.326.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2 virtual/perl-ExtUtils-MakeMaker >=dev-perl/ExtUtils-Dep
 DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
 EAPI=6
 HOMEPAGE=http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-1.326.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=e41ebd2654591525e363b457a8a7fa7b
+_md5_=73aafc1f994d9b4351d254ac8b4f7533
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 85dfd4b75a80..f015e01ea8f7 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.4.4 b/metadata/md5-cache/dev-php/pecl-imagick-3.4.4
new file mode 100644
index 000000000000..42799faaa554
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.4.4
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+DESCRIPTION=PHP wrapper for the ImageMagick library
+EAPI=7
+HOMEPAGE=https://pecl.php.net/imagick https://github.com/mkoppanen/imagick
+IUSE=examples test php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/imagick-3.4.4.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=71f93abf68c8d232c1a8497723b1d7ec
diff --git a/metadata/md5-cache/dev-python/3to2-1.1.1-r1 b/metadata/md5-cache/dev-python/3to2-1.1.1-r1
index 9968705ee027..f70eba8758e1 100644
--- a/metadata/md5-cache/dev-python/3to2-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/3to2-1.1.1-r1
@@ -1,14 +1,14 @@
+BDEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip 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=Tool to refactor valid 3.x syntax into valid 2.x syntax
-EAPI=5
+EAPI=7
 HOMEPAGE=https://pypi.org/project/3to2/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=Apache-1.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/3/3to2/3to2-1.1.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e794e1b1a9213cc04344bf0c8e983f51
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=86c04a18fc9e048eea2ee18fccbc661f
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 3480b01a8ff6..915864651201 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/PyQt5-5.10.1-r1 b/metadata/md5-cache/dev-python/PyQt5-5.10.1-r1
index f230f4e20012..b3eb0753687d 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.10.1-r1
+++ b/metadata/md5-cache/dev-python/PyQt5-5.10.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
 IUSE=bluetooth dbus debug declarative designer examples gles2 gui help location multimedia network opengl positioning printsupport sensors serialport sql svg testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sip-4.19.6:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 bluetooth? ( >=dev-qt/qtbluetooth-5.9.4:5 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-qt/qtdbus-5.9.4:5 ) declarative? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets?] ) designer? ( >=dev-qt/designer-5.9.4:5 ) gui? ( >=dev-qt/qtgui-5.9.4:5[gles2=] ) help? ( >=dev-qt/qthelp-5.9.4:5 ) location? ( >=dev-qt/qtlocation-5.9.4:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.9.4:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.9.4:5 ) opengl? ( >=dev-qt/qtopengl-5.9.4:5 ) positioning? ( >=dev-qt/qtpositioning-5.9.4:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.4:5 ) sensors? ( >=dev-qt/qtsensors-5.9.4:5 ) serialport? ( >=dev-qt/qtserialport-5.9.4:5 ) sql? ( >=dev-qt/qtsql-5.9.4:5 ) svg? ( >=dev-qt/qtsvg-5.9.4:5 ) testlib? ( >=dev-qt/qttest-5.9.4:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.9.4:5 ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets?] ) webkit? ( >=dev-qt/qtwebkit-5.9:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.9.4:5 ) widgets? ( >=dev-qt/qtwidgets-5.9.4:5 ) x11extras? ( >=dev-qt/qtx11extras-5.9.4:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.9.4:5 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webengine? ( network widgets? ( printsupport webchannel ) ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
 SLOT=0
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/PyQt5/5.10.1/PyQt5_gpl-5.10.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0effa6a81a749e6d4ac72bf1799af3cb
+_md5_=09ba7ef37146be50d2903fd1cc88934a
diff --git a/metadata/md5-cache/dev-python/autobahn-18.3.1 b/metadata/md5-cache/dev-python/autobahn-18.3.1
index d4e7f7fbb858..10e977a80d9e 100644
--- a/metadata/md5-cache/dev-python/autobahn-18.3.1
+++ b/metadata/md5-cache/dev-python/autobahn-18.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=WebSocket and WAMP for Twisted and Asyncio
 EAPI=5
 HOMEPAGE=https://pypi.org/project/autobahn/ https://crossbar.io/autobahn/ https://github.com/crossbario/autobahn-python
 IUSE=crypt test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lz4-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.8.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snappy-0.5[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/twisted-16.6.0-r2[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/txaio-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wsaccel-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-3.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-16.0.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-18.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2e839e0318272907075fd18c8f0b97a3
+_md5_=4c7d2d892ae58d6f15ea0f787e14fb83
diff --git a/metadata/md5-cache/dev-python/brython-3.6.0 b/metadata/md5-cache/dev-python/brython-3.6.0
deleted file mode 100644
index a7595de78efe..000000000000
--- a/metadata/md5-cache/dev-python/brython-3.6.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 Python 3 implementation for client-side web programming
-EAPI=6
-HOMEPAGE=http://www.brython.info
-IUSE=vhosts 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
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=>=app-admin/webapp-config-1.50.15
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=3.6.0
-SRC_URI=https://github.com/brython-dev/brython/archive/3.6.0.tar.gz -> brython-3.6.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=89ccb7269810f0234efaeb32dd3b2a5e
diff --git a/metadata/md5-cache/dev-python/brython-3.6.2 b/metadata/md5-cache/dev-python/brython-3.6.2
deleted file mode 100644
index 1a72e2437be2..000000000000
--- a/metadata/md5-cache/dev-python/brython-3.6.2
+++ /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 Python 3 implementation for client-side web programming
-EAPI=6
-HOMEPAGE=http://www.brython.info
-IUSE=vhosts 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
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-admin/webapp-config-1.50.15
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=3.6.2
-SRC_URI=https://github.com/brython-dev/brython/archive/3.6.2.tar.gz -> brython-3.6.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=ae5e2bb35207e64193290e2d9d4ce7ea
diff --git a/metadata/md5-cache/dev-python/brython-3.7.0 b/metadata/md5-cache/dev-python/brython-3.7.0
index 35a33f8556a2..ac0fbb61dade 100644
--- a/metadata/md5-cache/dev-python/brython-3.7.0
+++ b/metadata/md5-cache/dev-python/brython-3.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Python 3 implementation for client-side web programming
 EAPI=6
 HOMEPAGE=http://www.brython.info
 IUSE=vhosts python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=app-admin/webapp-config-1.50.15
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=3.7.0
 SRC_URI=https://github.com/brython-dev/brython/archive/3.7.0.tar.gz -> brython-3.7.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=ae5e2bb35207e64193290e2d9d4ce7ea
+_md5_=89ccb7269810f0234efaeb32dd3b2a5e
diff --git a/metadata/md5-cache/dev-python/brython-3.7.2 b/metadata/md5-cache/dev-python/brython-3.7.2
new file mode 100644
index 000000000000..eda7f0cb3e1c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/brython-3.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A Python 3 implementation for client-side web programming
+EAPI=6
+HOMEPAGE=http://www.brython.info
+IUSE=vhosts python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-admin/webapp-config-1.50.15
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=3.7.2
+SRC_URI=https://github.com/brython-dev/brython/archive/3.7.2.tar.gz -> brython-3.7.2.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=ae5e2bb35207e64193290e2d9d4ce7ea
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.2.4 b/metadata/md5-cache/dev-python/bsddb3-6.2.4
index 079974d058bc..52fe70464b34 100644
--- a/metadata/md5-cache/dev-python/bsddb3-6.2.4
+++ b/metadata/md5-cache/dev-python/bsddb3-6.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for Berkeley DB
 EAPI=6
 HOMEPAGE=https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=<sys-libs/db-6.3:= || ( sys-libs/db:6.2 sys-libs/db:6.1 sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.2.4.tar.gz
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7263b2f5ef4d38b3842ccfd2b45b662c
+_md5_=5d471459d73b7470ec7fc4ec4fa1357c
diff --git a/metadata/md5-cache/dev-python/cachetools-3.1.1 b/metadata/md5-cache/dev-python/cachetools-3.1.1
new file mode 100644
index 000000000000..9b8ba259f690
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cachetools-3.1.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Extensible memoizing collections and decorators
+EAPI=7
+HOMEPAGE=https://pypi.org/project/cachetools/
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cachetools/cachetools-3.1.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=4bfc463d0878ab7d1c51b9a9a24186a5
diff --git a/metadata/md5-cache/dev-python/clang-python-4.0.1 b/metadata/md5-cache/dev-python/clang-python-4.0.1
deleted file mode 100644
index fcf44a7db2b8..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-4.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=>=sys-devel/clang-4.0.1:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=UoI-NCSA
-RDEPEND=>=sys-devel/clang-4.0.1:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://releases.llvm.org/4.0.1/cfe-4.0.1.src.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f76881df3a7b654f79b27a64b5daf1e2
diff --git a/metadata/md5-cache/dev-python/click-7.0 b/metadata/md5-cache/dev-python/click-7.0
index cf96311da2bb..a70b478cbea2 100644
--- a/metadata/md5-cache/dev-python/click-7.0
+++ b/metadata/md5-cache/dev-python/click-7.0
@@ -5,11 +5,11 @@ DESCRIPTION=A Python package for creating beautiful command line interfaces
 EAPI=7
 HOMEPAGE=https://palletsprojects.com/p/click/ https://pypi.org/project/click/
 IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pallets/click/archive/7.0.tar.gz -> click-7.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=d3db399ea325ab1bbe5ae319699b79bd
+_md5_=f18d5b6afc6b034d0a29469e226623f0
diff --git a/metadata/md5-cache/dev-python/click-plugins-1.0.3 b/metadata/md5-cache/dev-python/click-plugins-1.0.3
index 1616078b7121..272772a0bdcb 100644
--- a/metadata/md5-cache/dev-python/click-plugins-1.0.3
+++ b/metadata/md5-cache/dev-python/click-plugins-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Module for click to enable registering CLI commands via setuptools e
 EAPI=6
 HOMEPAGE=https://pypi.org/project/click-plugins/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-plugins/click-plugins-1.0.3.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=076fe0e2e8a540e276dc5b5da344f677
+_md5_=e4f21535614399c5bf1f307584314a11
diff --git a/metadata/md5-cache/dev-python/croniter-0.3.30 b/metadata/md5-cache/dev-python/croniter-0.3.30
new file mode 100644
index 000000000000..0914f8eb2259
--- /dev/null
+++ b/metadata/md5-cache/dev-python/croniter-0.3.30
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Python module to provide iteration for datetime object
+EAPI=7
+HOMEPAGE=https://github.com/kiorky/croniter https://pypi.org/project/croniter/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/c/croniter/croniter-0.3.30.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=3f7a2fb0a4f2de61f7df91304d4d9460
diff --git a/metadata/md5-cache/dev-python/cython-0.29.5 b/metadata/md5-cache/dev-python/cython-0.29.5
deleted file mode 100644
index ea98cc9848f2..000000000000
--- a/metadata/md5-cache/dev-python/cython-0.29.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=A Python to C compiler
-EAPI=7
-HOMEPAGE=https://cython.org https://pypi.org/project/Cython/
-IUSE=doc emacs test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/C/Cython/Cython-0.29.5.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a616e85f6127165e70b0bbd16a85f1ac
diff --git a/metadata/md5-cache/dev-python/cython-0.29.6 b/metadata/md5-cache/dev-python/cython-0.29.6
deleted file mode 100644
index 36afa016365b..000000000000
--- a/metadata/md5-cache/dev-python/cython-0.29.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=A Python to C compiler
-EAPI=7
-HOMEPAGE=https://cython.org https://pypi.org/project/Cython/
-IUSE=doc emacs test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/C/Cython/Cython-0.29.6.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a616e85f6127165e70b0bbd16a85f1ac
diff --git a/metadata/md5-cache/dev-python/cython-0.29.9 b/metadata/md5-cache/dev-python/cython-0.29.9
new file mode 100644
index 000000000000..14721d2e6a19
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cython-0.29.9
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( virtual/emacs ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=A Python to C compiler
+EAPI=7
+HOMEPAGE=https://cython.org https://pypi.org/project/Cython/
+IUSE=doc emacs test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/C/Cython/Cython-0.29.9.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=54f4f54614c2a9b7a12a724f9ad6c12f
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.18.2 b/metadata/md5-cache/dev-python/dbusmock-0.18.2
index dd25f335b2d4..4a1142a8384b 100644
--- a/metadata/md5-cache/dev-python/dbusmock-0.18.2
+++ b/metadata/md5-cache/dev-python/dbusmock-0.18.2
@@ -5,11 +5,11 @@ DESCRIPTION=Easily create mock objects on D-Bus for software testing
 EAPI=7
 HOMEPAGE=https://github.com/martinpitt/python-dbusmock
 IUSE=test python_targets_python2_7 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-3+
 RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[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[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_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/martinpitt/python-dbusmock/releases/download/0.18.2/python-dbusmock-0.18.2.tar.gz -> dbusmock-0.18.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=07c96a2ad9aa42da24069a2760199ee8
+_md5_=765ce48c5cd8e087554a38b02e243850
diff --git a/metadata/md5-cache/dev-python/djangocms-attributes-field-0.2.0 b/metadata/md5-cache/dev-python/djangocms-attributes-field-0.2.0
deleted file mode 100644
index f81d90e0fcba..000000000000
--- a/metadata/md5-cache/dev-python/djangocms-attributes-field-0.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=File plugin for django CMS
-EAPI=6
-HOMEPAGE=https://github.com/divio/djangocms-attributes-field
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/divio/djangocms-attributes-field/archive/0.2.0.tar.gz -> djangocms-attributes-field-0.2.0.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=03ed3f845b584137178a3ea1f175b1b8
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.2 b/metadata/md5-cache/dev-python/docutils-glep-1.2
new file mode 100644
index 000000000000..5e7a8fe208a1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=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_5 python_targets_python3_6 python_targets_python3_7
+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=public-domain
+RDEPEND=>=dev-python/docutils-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/d/docutils_glep/docutils_glep-1.2.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6296e1b24ec1f2bdc53f1100a15032b4
diff --git a/metadata/md5-cache/dev-python/fido2-0.6.0 b/metadata/md5-cache/dev-python/fido2-0.6.0
new file mode 100644
index 000000000000..12a2fe15097c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fido2-0.6.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) examples? ( dev-python/flask[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/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyfakefs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Python based FIDO 2.0 library
+EAPI=7
+HOMEPAGE=https://github.com/Yubico/python-fido2
+IUSE=examples test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD-2 MIT MPL-2.0
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) examples? ( dev-python/flask[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/pyopenssl[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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.6.0/fido2-0.6.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=0300f09c96bb4e433bc481f0976401a0
diff --git a/metadata/md5-cache/dev-python/graph-tool-2.19 b/metadata/md5-cache/dev-python/graph-tool-2.19
index 943f3f42213c..1e89f2aabd3c 100644
--- a/metadata/md5-cache/dev-python/graph-tool-2.19
+++ b/metadata/md5-cache/dev-python/graph-tool-2.19
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare pretend setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-cpp/sparsehash virtual/pkgconfig
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-libs/boost-1.70:=[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-cpp/sparsehash virtual/pkgconfig
 DESCRIPTION=An efficient python module for manipulation and statistical analysis of graphs
 EAPI=6
 HOMEPAGE=https://graph-tool.skewed.de/
 IUSE=+cairo openmp python_targets_python2_7 python_targets_python3_5
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-libs/boost-1.70:=[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://downloads.skewed.de/graph-tool/graph-tool-2.19.tar.bz2
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0d460fda6c7d5a020586dc0d2b803eda
+_md5_=234054eb2847cceb5a8f0f4317f591a1
diff --git a/metadata/md5-cache/dev-python/graph-tool-2.23 b/metadata/md5-cache/dev-python/graph-tool-2.23
index fcd15f70181d..5ca452c5d540 100644
--- a/metadata/md5-cache/dev-python/graph-tool-2.23
+++ b/metadata/md5-cache/dev-python/graph-tool-2.23
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare pretend setup
-DEPEND=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(-)] dev-libs/boost:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-cpp/sparsehash virtual/pkgconfig
+DEPEND=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(-)] <dev-libs/boost-1.70:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-cpp/sparsehash virtual/pkgconfig
 DESCRIPTION=An efficient python module for manipulation and statistical analysis of graphs
 EAPI=6
 HOMEPAGE=https://graph-tool.skewed.de/
 IUSE=+cairo openmp python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/boost:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-libs/boost-1.70:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://downloads.skewed.de/graph-tool/graph-tool-2.23.tar.bz2
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c3135ef2f03a8e7cab55830e53e0db18
+_md5_=80ac43430044fa39561978fe7499f046
diff --git a/metadata/md5-cache/dev-python/graph-tool-2.26 b/metadata/md5-cache/dev-python/graph-tool-2.26
index d4937b6c128d..c0b245399970 100644
--- a/metadata/md5-cache/dev-python/graph-tool-2.26
+++ b/metadata/md5-cache/dev-python/graph-tool-2.26
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare pretend setup
-DEPEND=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(-)] dev-libs/boost:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-cpp/sparsehash virtual/pkgconfig
+DEPEND=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(-)] <dev-libs/boost-1.70:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-cpp/sparsehash virtual/pkgconfig
 DESCRIPTION=An efficient python module for manipulation and statistical analysis of graphs
 EAPI=6
 HOMEPAGE=https://graph-tool.skewed.de/
 IUSE=+cairo openmp python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/boost:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-libs/boost-1.70:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://downloads.skewed.de/graph-tool/graph-tool-2.26.tar.bz2
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=64a50b532af697fd6cebc1365eb61a8d
+_md5_=b88676a8d43e2dd530afa52d7f2b638b
diff --git a/metadata/md5-cache/dev-python/graph-tool-2.27 b/metadata/md5-cache/dev-python/graph-tool-2.27
new file mode 100644
index 000000000000..19adf0adcd92
--- /dev/null
+++ b/metadata/md5-cache/dev-python/graph-tool-2.27
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/boost-1.70:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/expat:= dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-mathematics/cgal:= cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-cpp/sparsehash
+DESCRIPTION=An efficient python module for manipulation and statistical analysis of graphs
+EAPI=7
+HOMEPAGE=https://graph-tool.skewed.de/
+IUSE=+cairo openmp python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/boost-1.70:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/expat:= dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-mathematics/cgal:= cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://downloads.skewed.de/graph-tool/graph-tool-2.27.tar.bz2
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=70a368e34ad27959af20713477b3deec
diff --git a/metadata/md5-cache/dev-python/graph-tool-9999 b/metadata/md5-cache/dev-python/graph-tool-9999
index 3ba6a713153c..5c03b92969ae 100644
--- a/metadata/md5-cache/dev-python/graph-tool-9999
+++ b/metadata/md5-cache/dev-python/graph-tool-9999
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=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(-)] dev-libs/boost:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-cpp/sparsehash virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/boost-1.70:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/expat:= dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-mathematics/cgal:= cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-cpp/sparsehash
 DESCRIPTION=An efficient python module for manipulation and statistical analysis of graphs
-EAPI=6
+EAPI=7
 HOMEPAGE=https://graph-tool.skewed.de/
-IUSE=+cairo openmp python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=+cairo openmp python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/boost:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/boost-1.70:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/expat:= dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-mathematics/cgal:= cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=64a50b532af697fd6cebc1365eb61a8d
+_md5_=70a368e34ad27959af20713477b3deec
diff --git a/metadata/md5-cache/dev-python/grpcio-1.21.1 b/metadata/md5-cache/dev-python/grpcio-1.21.1
new file mode 100644
index 000000000000..2aa8a12db3b3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/grpcio-1.21.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=High-performance RPC framework (python libraries)
+EAPI=7
+HOMEPAGE=https://grpc.io
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/g/grpcio/grpcio-1.21.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=6d78f5b5aba05c3957cf9aeb96e5462c
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.21.1 b/metadata/md5-cache/dev-python/grpcio-testing-1.21.1
new file mode 100644
index 000000000000..c1c6b560d545
--- /dev/null
+++ b/metadata/md5-cache/dev-python/grpcio-testing-1.21.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-python/grpcio-1.21.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Testing utilities for gRPC Python
+EAPI=7
+HOMEPAGE=https://grpc.io
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-python/grpcio-1.21.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.21.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=43d68cb9770ca328291b622d4145e96d
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.21.1 b/metadata/md5-cache/dev-python/grpcio-tools-1.21.1
new file mode 100644
index 000000000000..0592c8bdd58d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/grpcio-tools-1.21.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/grpcio-1.21.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<net-libs/grpc-1.16.0[tools] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Protobuf code generator for gRPC
+EAPI=7
+HOMEPAGE=https://grpc.io
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/grpcio-1.21.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<net-libs/grpc-1.16.0[tools] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.21.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8d00ec1e8a638721730523df6d7f3adf
diff --git a/metadata/md5-cache/dev-python/hcloud-python-1.2.1 b/metadata/md5-cache/dev-python/hcloud-python-1.2.1
index 6e5c22dfb135..9bf91a352803 100644
--- a/metadata/md5-cache/dev-python/hcloud-python-1.2.1
+++ b/metadata/md5-cache/dev-python/hcloud-python-1.2.1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=https://github.com/hetznercloud/hcloud-python/archive/v1.2.1.tar.gz -> hcloud-python-1.2.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=9234fe0fafe65e062320f813d8962916
+_md5_=bf21c9faf92206b5df92522358ae6df6
diff --git a/metadata/md5-cache/dev-python/hiredis-0.2.0 b/metadata/md5-cache/dev-python/hiredis-0.2.0
deleted file mode 100644
index 59fc690ecd1f..000000000000
--- a/metadata/md5-cache/dev-python/hiredis-0.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/hiredis-0.13.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python extension that wraps hiredis
-EAPI=5
-HOMEPAGE=https://github.com/pietern/hiredis-py
-IUSE=python_targets_python2_7 python_targets_python3_5
-KEYWORDS=amd64 arm x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/hiredis-0.13.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hiredis/hiredis-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f8227d8453b0f3f08f1daee821084d66
diff --git a/metadata/md5-cache/dev-python/httpbin-0.4.1 b/metadata/md5-cache/dev-python/httpbin-0.4.1
index 7488fd9e9edf..20960f0bd01f 100644
--- a/metadata/md5-cache/dev-python/httpbin-0.4.1
+++ b/metadata/md5-cache/dev-python/httpbin-0.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP Request and Response Service
 EAPI=5
 HOMEPAGE=https://github.com/Runscope/httpbin https://pypi.org/project/httpbin/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/decorator[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/itsdangerous[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httpbin/httpbin-0.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7b3d58b209dc00662a2a61d5ea1e4e62
+_md5_=d7e6e6a86dab12b103695cb789275cde
diff --git a/metadata/md5-cache/dev-python/isodate-0.5.4 b/metadata/md5-cache/dev-python/isodate-0.5.4
index 7ef93b6d3a53..347ed5eb804a 100644
--- a/metadata/md5-cache/dev-python/isodate-0.5.4
+++ b/metadata/md5-cache/dev-python/isodate-0.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=ISO 8601 date/time/duration parser and formatter
 EAPI=6
 HOMEPAGE=https://pypi.org/project/isodate/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm 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=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/isodate/isodate-0.5.4.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b8a6eb317f8f2dd614f5461d277ffa83
+_md5_=fb754d5c0d536e14abacffd5f5fdbb8f
diff --git a/metadata/md5-cache/dev-python/jellyfish-0.5.6 b/metadata/md5-cache/dev-python/jellyfish-0.5.6
deleted file mode 100644
index 62261afc6c6c..000000000000
--- a/metadata/md5-cache/dev-python/jellyfish-0.5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[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/unicodecsv[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python module for doing approximate and phonetic matching of strings
-EAPI=6
-HOMEPAGE=https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jellyfish/jellyfish-0.5.6.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=86a897583d5ce890a124452b7849e7fb
diff --git a/metadata/md5-cache/dev-python/jellyfish-0.7.1 b/metadata/md5-cache/dev-python/jellyfish-0.7.1
new file mode 100644
index 000000000000..574c271b222d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jellyfish-0.7.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest-runner[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unicodecsv[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Python module for doing approximate and phonetic matching of strings
+EAPI=7
+HOMEPAGE=https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/
+IUSE=doc test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jellyfish/jellyfish-0.7.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=3b2b5be3f4db8924cdfad680ccdff302
diff --git a/metadata/md5-cache/dev-python/jinja-2.10.1 b/metadata/md5-cache/dev-python/jinja-2.10.1
index 2d666e7e0cc1..ae5b8d46abd3 100644
--- a/metadata/md5-cache/dev-python/jinja-2.10.1
+++ b/metadata/md5-cache/dev-python/jinja-2.10.1
@@ -5,7 +5,7 @@ DESCRIPTION=A full-featured template engine for Python
 EAPI=7
 HOMEPAGE=http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/
 IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=BSD
 RDEPEND=dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !dev-python/jinja:compat 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_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/2.10.1.tar.gz -> jinja-2.10.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=78c907ce4204e91d0511bdace651bc25
+_md5_=6c0087773e06f4d21cc110bd8dceb785
diff --git a/metadata/md5-cache/dev-python/jmespath-0.9.3 b/metadata/md5-cache/dev-python/jmespath-0.9.3
deleted file mode 100644
index dd83f45d19a6..000000000000
--- a/metadata/md5-cache/dev-python/jmespath-0.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=JSON Matching Expressions
-EAPI=5
-HOMEPAGE=https://github.com/boto/jmespath https://pypi.org/project/jmespath/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86 ~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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jmespath/jmespath-0.9.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f25636ea39c9f5c56e9eeb61355c8948
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.2.0 b/metadata/md5-cache/dev-python/libvirt-python-5.2.0
index fc12ae459052..ca020ba2a207 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-5.2.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-5.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=libvirt Python bindings
 EAPI=7
 HOMEPAGE=https://www.libvirt.org
 IUSE=examples test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:0/5.2.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-5.2.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=6a57de527cdc5c36588432e1b374014b
+_md5_=775042d0f29b0f8a1074699ec4d11e65
diff --git a/metadata/md5-cache/dev-python/lit-4.0.1 b/metadata/md5-cache/dev-python/lit-4.0.1
deleted file mode 100644
index 11373e587942..000000000000
--- a/metadata/md5-cache/dev-python/lit-4.0.1
+++ /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(-)] sys-devel/llvm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A stand-alone install of the LLVM suite testing tool
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=UoI-NCSA
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8757a346c3f9841a88e45447612f54ab
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.20.0 b/metadata/md5-cache/dev-python/llvmlite-0.20.0
deleted file mode 100644
index 947aa71e7198..000000000000
--- a/metadata/md5-cache/dev-python/llvmlite-0.20.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/llvm:4 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python wrapper around the llvm C++ library
-EAPI=6
-HOMEPAGE=http://llvmlite.pydata.org/
-IUSE=examples python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/llvm:4 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/l/llvmlite/llvmlite-0.20.0.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c5ccd5a27d1d9bea19f48c2f5f727b03
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.22.0 b/metadata/md5-cache/dev-python/llvmlite-0.22.0
index 41c15c742541..105626353159 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.22.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.22.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.22.0.tar.gz -> llvmlite-0.22.0.gh.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	llvm	83a68dab6355a0f96b37fe96bc4f317c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=de6bbc5a8a18c63a0c97bf95ba78c93e
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.26.0 b/metadata/md5-cache/dev-python/llvmlite-0.26.0
index 06d36b4b2a01..c918447430b9 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.26.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.26.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.26.0.tar.gz -> llvmlite-0.26.0.gh.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	llvm	83a68dab6355a0f96b37fe96bc4f317c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c820e795a0b935c32ebade97ea7b8593
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.27.0 b/metadata/md5-cache/dev-python/llvmlite-0.27.0
deleted file mode 100644
index 0fd979773a03..000000000000
--- a/metadata/md5-cache/dev-python/llvmlite-0.27.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/llvm:7 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Python wrapper around the llvm C++ library
-EAPI=6
-HOMEPAGE=http://llvmlite.pydata.org/
-IUSE=examples python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/llvm:7 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/numba/llvmlite/archive/v0.27.0.tar.gz -> llvmlite-0.27.0.gh.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4d77fc7bf0bc08920fd4a9b1347f73ea
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.27.1 b/metadata/md5-cache/dev-python/llvmlite-0.27.1
deleted file mode 100644
index bc89ac07612e..000000000000
--- a/metadata/md5-cache/dev-python/llvmlite-0.27.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/llvm:7 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Python wrapper around the llvm C++ library
-EAPI=6
-HOMEPAGE=http://llvmlite.pydata.org/
-IUSE=examples python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/llvm:7 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/numba/llvmlite/archive/v0.27.1.tar.gz -> llvmlite-0.27.1.gh.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4d77fc7bf0bc08920fd4a9b1347f73ea
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.28.0 b/metadata/md5-cache/dev-python/llvmlite-0.28.0
index 4c2a534d4568..1aca23bf7fd6 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.28.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.28.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.28.0.tar.gz -> llvmlite-0.28.0.gh.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	llvm	83a68dab6355a0f96b37fe96bc4f317c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=6cd73d40fdb46d75affa716c47e4245d
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.29.0 b/metadata/md5-cache/dev-python/llvmlite-0.29.0
new file mode 100644
index 000000000000..9e9b27db0353
--- /dev/null
+++ b/metadata/md5-cache/dev-python/llvmlite-0.29.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/llvm:8 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Python wrapper around the llvm C++ library
+EAPI=7
+HOMEPAGE=http://llvmlite.pydata.org/
+IUSE=examples python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/llvm:8 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/numba/llvmlite/archive/v0.29.0.tar.gz -> llvmlite-0.29.0.gh.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	llvm	83a68dab6355a0f96b37fe96bc4f317c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c74eca4e78e6086e4e93b19f09cb9b6a
diff --git a/metadata/md5-cache/dev-python/lmdb-0.92 b/metadata/md5-cache/dev-python/lmdb-0.92
index 5652be2251f3..a6e7dffdc2b7 100644
--- a/metadata/md5-cache/dev-python/lmdb-0.92
+++ b/metadata/md5-cache/dev-python/lmdb-0.92
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for the Lightning Database
 EAPI=7
 HOMEPAGE=https://github.com/dw/py-lmdb/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=OPENLDAP
 RDEPEND=dev-db/lmdb:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lmdb/lmdb-0.92.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a5787f15edc169768401e64ff41bcbc3
+_md5_=cc26bc6743d69c3738e4d4e093fdd30d
diff --git a/metadata/md5-cache/dev-python/lz4-0.10.1 b/metadata/md5-cache/dev-python/lz4-0.10.1
index b58b13dfb6a2..6d819ae8d7a9 100644
--- a/metadata/md5-cache/dev-python/lz4-0.10.1
+++ b/metadata/md5-cache/dev-python/lz4-0.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=LZ4 Bindings for Python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-0.10.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a4d83795b8e39b68cf446ae6af8257b2
+_md5_=3bcc2bba808ac9f4f2b37613dddf3007
diff --git a/metadata/md5-cache/dev-python/lz4-2.1.6 b/metadata/md5-cache/dev-python/lz4-2.1.6
index b15494939466..529fdcbcd405 100644
--- a/metadata/md5-cache/dev-python/lz4-2.1.6
+++ b/metadata/md5-cache/dev-python/lz4-2.1.6
@@ -5,11 +5,11 @@ DESCRIPTION=LZ4 Bindings for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-arch/lz4 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-2.1.6.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=1381e3f24aaafba4c746afcece934b7d
+_md5_=854c16bf866a23ee8367bad40c7b7569
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20190210 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20190210
deleted file mode 100644
index 7809309993b9..000000000000
--- a/metadata/md5-cache/dev-python/miniupnpc-2.1.20190210
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/miniupnpc-2.1.20190210:0= dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python bindings for UPnP client library
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=>=net-libs/miniupnpc-2.1.20190210:0= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190210.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a8aebb2e0e03bd33ecf55360a06acbc4
diff --git a/metadata/md5-cache/dev-python/msgpack-0.5.6 b/metadata/md5-cache/dev-python/msgpack-0.5.6
index 276c6e5d3999..363a4f510a7b 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.5.6
+++ b/metadata/md5-cache/dev-python/msgpack-0.5.6
@@ -4,11 +4,11 @@ DESCRIPTION=MessagePack (de)serializer for Python
 EAPI=6
 HOMEPAGE=https://msgpack.org https://github.com/msgpack/msgpack-python/ https://pypi.org/project/msgpack/
 IUSE=+native-extensions test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc x86
 LICENSE=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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack/msgpack-0.5.6.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fe55c453f20967bfc55d2e64a3738f99
+_md5_=5f7f123fa38636037f0e6a6cd1e6a87a
diff --git a/metadata/md5-cache/dev-python/newt_syrup-0.1.2-r1 b/metadata/md5-cache/dev-python/newt_syrup-0.1.2-r1
deleted file mode 100644
index 44f273243cfd..000000000000
--- a/metadata/md5-cache/dev-python/newt_syrup-0.1.2-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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A Python framework for creating text-based applications
-EAPI=5
-HOMEPAGE=http://fedorahosted.org/newt-syrup/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/newt-0.52.11 python_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://mcpierce.fedorapeople.org/rpms/newt_syrup-0.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8ca77bff8490d25e53c915d14eb11003
diff --git a/metadata/md5-cache/dev-python/paho-mqtt-1.4.0 b/metadata/md5-cache/dev-python/paho-mqtt-1.4.0
index fd04c1533304..543cf057f9c5 100644
--- a/metadata/md5-cache/dev-python/paho-mqtt-1.4.0
+++ b/metadata/md5-cache/dev-python/paho-mqtt-1.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=A client class with support for both MQTT v3.1 and v3.1.1
 EAPI=6
 HOMEPAGE=https://www.eclipse.org/paho/clients/python/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=EPL-1.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/eclipse/paho.mqtt.python/archive/v1.4.0.tar.gz -> paho-mqtt-1.4.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2b1e5fe487186c34e02cad22de2628ab
+_md5_=ce8062e40792f21f8f7917e71ba12c86
diff --git a/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2 b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
index 72086e95ce15..1a69872a48e3 100644
--- a/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
+++ b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
@@ -5,11 +5,11 @@ DESCRIPTION=Sphinx themes for Pallets and related projects
 EAPI=7
 HOMEPAGE=https://github.com/pallets/pallets-sphinx-themes
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/jinja[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pallets/pallets-sphinx-themes/archive/1.1.2.tar.gz -> pallets-sphinx-themes-1.1.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=5b1141e18ced87725c83c2d9305a6257
+_md5_=37b06abf0cf2f1495a1cf40865655448
diff --git a/metadata/md5-cache/dev-python/pathtools-0.1.2-r2 b/metadata/md5-cache/dev-python/pathtools-0.1.2-r2
index 8e0c3a014fac..df0d386430df 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2-r2
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Pattern matching and various utilities for file systems paths
 EAPI=5
 HOMEPAGE=https://pypi.org/project/pathtools/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathtools/pathtools-0.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2c1aa137afc4657cf0e5a0229a3fc930
+_md5_=ea73182699524e1fb5a58776281adc07
diff --git a/metadata/md5-cache/dev-python/pep257-2.1.1 b/metadata/md5-cache/dev-python/pep257-2.1.1
index 7387778e1051..eda864898597 100644
--- a/metadata/md5-cache/dev-python/pep257-2.1.1
+++ b/metadata/md5-cache/dev-python/pep257-2.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python docstring style checker
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/pep257
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/pydocstyle/archive/2.1.1.tar.gz -> pep257-2.1.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e0bd7723f2bf9997f92e4641d8d6c917
+_md5_=0dd893016c11b123002fcc6af0a1a0c6
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.4.0 b/metadata/md5-cache/dev-python/pkgconfig-1.4.0
index 27cb52770718..4fc6884f6425 100644
--- a/metadata/md5-cache/dev-python/pkgconfig-1.4.0
+++ b/metadata/md5-cache/dev-python/pkgconfig-1.4.0
@@ -5,7 +5,7 @@ DESCRIPTION=Interface Python with pkg-config
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=virtual/pkgconfig python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgconfig/pkgconfig-1.4.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=31f12c5f841b5f92ec257a9ef22de302
+_md5_=370e94d2e877c05ebe9e767b0576c4ea
diff --git a/metadata/md5-cache/dev-python/progressbar-2.5 b/metadata/md5-cache/dev-python/progressbar-2.5
new file mode 100644
index 000000000000..d834c0ee4c3d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/progressbar-2.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Text progressbar library for python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/progressbar/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-2.1 BSD )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/progressbar/progressbar-2.5.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=bc8792ae10cdb26182dc8d8f2e15fbed
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.39.3 b/metadata/md5-cache/dev-python/progressbar2-3.39.3
new file mode 100644
index 000000000000..29558e2c6865
--- /dev/null
+++ b/metadata/md5-cache/dev-python/progressbar2-3.39.3
@@ -0,0 +1,14 @@
+BDEPEND=!dev-python/progressbar[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-utils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Text progressbar library for python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/progressbar2/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=!dev-python/progressbar[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-utils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.39.3.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ead9aae50f771b3010c51617e63df698
diff --git a/metadata/md5-cache/dev-python/py-ubjson-0.11.0 b/metadata/md5-cache/dev-python/py-ubjson-0.11.0
index 209cc88b83eb..00b49e1e1645 100644
--- a/metadata/md5-cache/dev-python/py-ubjson-0.11.0
+++ b/metadata/md5-cache/dev-python/py-ubjson-0.11.0
@@ -4,11 +4,11 @@ DESCRIPTION=Universal Binary JSON encoder/decoder
 EAPI=6
 HOMEPAGE=https://github.com/Iotic-Labs/py-ubjson https://pypi.org/project/py-ubjson/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-ubjson/py-ubjson-0.11.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=98480519b465b61dbf3214e96d362bd2
+_md5_=da4ef00da6619d61e49cae25cb9d411b
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.73-r2 b/metadata/md5-cache/dev-python/pycups-1.9.73-r2
new file mode 100644
index 000000000000..1302715a88fe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycups-1.9.73-r2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=net-print/cups doc? ( dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Python bindings for the CUPS API
+EAPI=7
+HOMEPAGE=http://cyberelk.net/tim/data/pycups/
+IUSE=doc examples python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pycups/pycups-1.9.73.tar.bz2
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=5156b0e273409737e96c97ad6750ca8d
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4
deleted file mode 100644
index 76f11b3c60ac..000000000000
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[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(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 dev-python/cython[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=Reimplementation of portions of the pygame API using SDL2
-EAPI=6
-HOMEPAGE=https://github.com/renpy/pygame_sdl2
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 ZLIB
-RDEPEND=dev-python/numpy[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(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 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=http://www.renpy.org/dl/6.99.12.4/pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=142a902435b427f60ef2c20e2a39a46c
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r1 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r1
index b5028f691cc9..38ad3b35e415 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r1
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r1
@@ -1,15 +1,14 @@
-BDEPEND=dev-python/cython[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(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[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(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] >=media-libs/sdl2-mixer-2.0.2 media-libs/sdl2-ttf virtual/jpeg:62
+DEPEND=dev-python/numpy[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(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] media-libs/sdl2-mixer:= media-libs/sdl2-ttf:= virtual/jpeg:0 dev-python/cython[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=Reimplementation of portions of the pygame API using SDL2
-EAPI=7
+EAPI=6
 HOMEPAGE=https://github.com/renpy/pygame_sdl2
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 ZLIB
-RDEPEND=dev-python/numpy[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(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] >=media-libs/sdl2-mixer-2.0.2 media-libs/sdl2-ttf virtual/jpeg:62 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(-)]
+RDEPEND=dev-python/numpy[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(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] media-libs/sdl2-mixer:= media-libs/sdl2-ttf:= virtual/jpeg:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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=http://www.renpy.org/dl/6.99.12.4/pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bd937370954527b81f5c3a67cd57d07c
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=01b6b9bb7687543888d9b45608984715
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r2 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r2
new file mode 100644
index 000000000000..d1da9be0e99d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cython[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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[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(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= virtual/jpeg:0
+DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
+EAPI=7
+HOMEPAGE=https://github.com/renpy/pygame_sdl2
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~x86
+LICENSE=LGPL-2.1 ZLIB
+RDEPEND=dev-python/numpy[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(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= virtual/jpeg:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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=http://www.renpy.org/dl/6.99.12.4/pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=2328864cf52e3885943b7ce13ea2e54c
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1
deleted file mode 100644
index 99e770217e0e..000000000000
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[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(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 dev-python/cython[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=Reimplementation of portions of the pygame API using SDL2
-EAPI=6
-HOMEPAGE=https://github.com/renpy/pygame_sdl2
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 ZLIB
-RDEPEND=dev-python/numpy[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(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 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=http://www.renpy.org/dl/6.99.6/pygame_sdl2-for-renpy-6.99.6.tar.bz2
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8eb48dbe65feaefdc3825cab15123f42
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r2 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r2
new file mode 100644
index 000000000000..ba74fc452fad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[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(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] media-libs/sdl2-mixer:= media-libs/sdl2-ttf:= virtual/jpeg:0 dev-python/cython[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=Reimplementation of portions of the pygame API using SDL2
+EAPI=6
+HOMEPAGE=https://github.com/renpy/pygame_sdl2
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 ZLIB
+RDEPEND=dev-python/numpy[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(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] media-libs/sdl2-mixer:= media-libs/sdl2-ttf:= virtual/jpeg:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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=http://www.renpy.org/dl/6.99.6/pygame_sdl2-for-renpy-6.99.6.tar.bz2
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=90eb1b0aa7d75fd4027634a14ac2d403
diff --git a/metadata/md5-cache/dev-python/pygit2-0.28.2 b/metadata/md5-cache/dev-python/pygit2-0.28.2
new file mode 100644
index 000000000000..6098f15d809b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygit2-0.28.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-libs/libgit2-0.28* >=dev-python/cffi-1.0:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Python bindings for libgit2
+EAPI=6
+HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2-with-linking-exception
+RDEPEND==dev-libs/libgit2-0.28* >=dev-python/cffi-1.0:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pygit2/pygit2-0.28.2.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6b1da62a320373b4b667316cc0d2f39b
diff --git a/metadata/md5-cache/dev-python/pygments-2.3.1 b/metadata/md5-cache/dev-python/pygments-2.3.1
index 0109f3000698..2410aedce3a3 100644
--- a/metadata/md5-cache/dev-python/pygments-2.3.1
+++ b/metadata/md5-cache/dev-python/pygments-2.3.1
@@ -5,11 +5,11 @@ DESCRIPTION=Pygments is a syntax highlighting package written in Python
 EAPI=7
 HOMEPAGE=http://pygments.org/ https://pypi.org/project/Pygments/
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.3.1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bd17d5b1f1ac392e0fd2e93c4c95d9fe
+_md5_=ea9207ce92ab60d20da3b16db28c8dc9
diff --git a/metadata/md5-cache/dev-python/pygobject-3.32.0 b/metadata/md5-cache/dev-python/pygobject-3.32.0
index a6eedfa92fad..c5754821e1a9 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.32.0
+++ b/metadata/md5-cache/dev-python/pygobject-3.32.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.32/pygobject-3.32.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=968ce334e56c1ace991c846050bd24a9
diff --git a/metadata/md5-cache/dev-python/pygobject-3.32.1 b/metadata/md5-cache/dev-python/pygobject-3.32.1
index b3220b5c0321..5e1c6ae87ba3 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.32.1
+++ b/metadata/md5-cache/dev-python/pygobject-3.32.1
@@ -5,12 +5,12 @@ DESCRIPTION=Python bindings for GObject Introspection
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/PyGObject
 IUSE=+cairo examples test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= virtual/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/cairo[glib] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.32/pygobject-3.32.1.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1713c09f99cb6a1d8302a8500fbffd46
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=695ec1eb5e870db84c0972183faf99bd
diff --git a/metadata/md5-cache/dev-python/pygpgme-0.3-r1 b/metadata/md5-cache/dev-python/pygpgme-0.3-r1
index 9ed7c6bc1175..df1c02cece9d 100644
--- a/metadata/md5-cache/dev-python/pygpgme-0.3-r1
+++ b/metadata/md5-cache/dev-python/pygpgme-0.3-r1
@@ -1,14 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-crypt/gpgme python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=app-crypt/gpgme
 DESCRIPTION=A Python wrapper for the GPGME library
-EAPI=6
+EAPI=7
 HOMEPAGE=https://launchpad.net/pygpgme
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
-RDEPEND=app-crypt/gpgme python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=app-crypt/gpgme python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/pygpgme/trunk/0.3/+download/pygpgme-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=25366f1d7ed5cc23002e0d9e22ab0f6a
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=77b88fc573f6f8af4197969003134ac7
diff --git a/metadata/md5-cache/dev-python/pygresql-5.0.4 b/metadata/md5-cache/dev-python/pygresql-5.0.4
index 6ca074bca5ad..0d4c9efcfdd7 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.0.4
+++ b/metadata/md5-cache/dev-python/pygresql-5.0.4
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_
 REQUIRED_USE=|| ( postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.0.4.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	86eeb59f48e87b423d9f22122dab9d04	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=6e9294696313c224cde6af0eaaa57c3a
diff --git a/metadata/md5-cache/dev-python/pygresql-5.0.6 b/metadata/md5-cache/dev-python/pygresql-5.0.6
index fa506005b1ce..fb412a4bfbfd 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.0.6
+++ b/metadata/md5-cache/dev-python/pygresql-5.0.6
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.0.6.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	86eeb59f48e87b423d9f22122dab9d04	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=dedbd67e9cc6a98028f23cca4bb3fb2d
diff --git a/metadata/md5-cache/dev-python/pyicu-2.3.1 b/metadata/md5-cache/dev-python/pyicu-2.3.1
new file mode 100644
index 000000000000..0baea02c9c15
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyicu-2.3.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/icu:= test? ( dev-python/pytest dev-python/six )
+DESCRIPTION=Python bindings for dev-libs/icu
+EAPI=7
+HOMEPAGE=https://github.com/ovalhub/pyicu
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/icu:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyICU/PyICU-2.3.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e0c05cd9dea32144c0babed6f089085e
diff --git a/metadata/md5-cache/dev-python/pynacl-1.3.0 b/metadata/md5-cache/dev-python/pynacl-1.3.0
index be93601f189b..2300243f7243 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.3.0
+++ b/metadata/md5-cache/dev-python/pynacl-1.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
 EAPI=7
 HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/libsodium:0/23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.3.0.tar.gz -> pynacl-1.3.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=4b2229135493f569b7b9edd106c97e61
+_md5_=ddfbabfb08197fef7ff5a258d28dde52
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.1.0 b/metadata/md5-cache/dev-python/pyopengl-3.1.0
index b0a5af7305f2..2db4ac5fa0b6 100644
--- a/metadata/md5-cache/dev-python/pyopengl-3.1.0
+++ b/metadata/md5-cache/dev-python/pyopengl-3.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python OpenGL bindings
 EAPI=5
 HOMEPAGE=http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/
 IUSE=tk python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyOpenGL/PyOpenGL-3.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fef9765237195f1c176da825412b7238
+_md5_=813b190b5e1f274348acc1ac18fe50cb
diff --git a/metadata/md5-cache/dev-python/pypax-0.9.5 b/metadata/md5-cache/dev-python/pypax-0.9.5
index bb756bd33980..2f63aff2aee5 100644
--- a/metadata/md5-cache/dev-python/pypax-0.9.5
+++ b/metadata/md5-cache/dev-python/pypax-0.9.5
@@ -4,11 +4,11 @@ DESCRIPTION=Python module to get or set either PT_PAX and/or XATTR_PAX flags
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~blueness/elfix/ https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
 IUSE=+ptpax +xtpax python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-3
 RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/elfix/elfix-0.9.5.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c871dc8c8de2eac27a4c1c9534981a19
+_md5_=8eb83db22aebfff8eedf28f704e49d67
diff --git a/metadata/md5-cache/dev-python/pypng-0.0.18 b/metadata/md5-cache/dev-python/pypng-0.0.18
index 21e217d5f489..592f74569c69 100644
--- a/metadata/md5-cache/dev-python/pypng-0.0.18
+++ b/metadata/md5-cache/dev-python/pypng-0.0.18
@@ -4,11 +4,11 @@ DESCRIPTION=Pure Python PNG image encoder/decoder
 EAPI=6
 HOMEPAGE=https://github.com/drj11/pypng https://pypi.org/project/pypng/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypng/pypng-0.0.18.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3c8be63de74e4d2fd24b53237361c8e8
+_md5_=90772fa65356a86bdec39e1392aff449
diff --git a/metadata/md5-cache/dev-python/pypy-6.0.0 b/metadata/md5-cache/dev-python/pypy-6.0.0
deleted file mode 100644
index 1e9ede1b2f5a..000000000000
--- a/metadata/md5-cache/dev-python/pypy-6.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0 !low-memory? ( || ( dev-python/pypy dev-python/pypy-bin ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DESCRIPTION=A fast, compliant alternative implementation of the Python language
-EAPI=6
-HOMEPAGE=http://pypy.org/
-IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0
-SLOT=0/41
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.14-0.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bfcda38e6e1490b5f890f026c8389366
diff --git a/metadata/md5-cache/dev-python/pypy-7.0.0-r1 b/metadata/md5-cache/dev-python/pypy-7.0.0-r1
deleted file mode 100644
index f7aa0f23cd60..000000000000
--- a/metadata/md5-cache/dev-python/pypy-7.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0 !low-memory? ( || ( dev-python/pypy dev-python/pypy-bin ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DESCRIPTION=A fast, compliant alternative implementation of the Python language
-EAPI=7
-HOMEPAGE=http://pypy.org/
-IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0
-SLOT=0/41-py27
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.15.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=636a9817f52b09788fb8d99650f20815
diff --git a/metadata/md5-cache/dev-python/pypy-7.1.0 b/metadata/md5-cache/dev-python/pypy-7.1.0
deleted file mode 100644
index 8efddc5ad8ea..000000000000
--- a/metadata/md5-cache/dev-python/pypy-7.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0 !low-memory? ( || ( dev-python/pypy dev-python/pypy-bin ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DESCRIPTION=A fast, compliant alternative implementation of the Python language
-EAPI=7
-HOMEPAGE=http://pypy.org/
-IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0
-SLOT=0/41-py27
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.1.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.15.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=636a9817f52b09788fb8d99650f20815
diff --git a/metadata/md5-cache/dev-python/pypy-bin-6.0.0 b/metadata/md5-cache/dev-python/pypy-bin-6.0.0
deleted file mode 100644
index 9450beb31a9e..000000000000
--- a/metadata/md5-cache/dev-python/pypy-bin-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/0[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0 app-arch/lzip app-arch/xz-utils
-DESCRIPTION=Pre-built version of PyPy
-EAPI=6
-HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/0[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
-SLOT=0/41
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python-gentoo-patches-2.7.14-0.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-amd64+bzip2+ncurses.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+ncurses.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.tar.lz ) ) ) )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5e0dab1b50323c945ef049ff8e93ce13
diff --git a/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100 b/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100
deleted file mode 100644
index 4b32e41ef654..000000000000
--- a/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/0[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0 app-arch/lzip app-arch/xz-utils
-DESCRIPTION=Pre-built version of PyPy
-EAPI=6
-HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/0[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
-SLOT=0/41
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python-gentoo-patches-2.7.14-0.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.ffi7.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.ffi7.tar.lz ) ) ) )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0467acfb88ac92740ebfb3ab901c97f9
diff --git a/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r200 b/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r200
deleted file mode 100644
index 07d827d07624..000000000000
--- a/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r200
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/1.1[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0 app-arch/lzip app-arch/xz-utils
-DESCRIPTION=Pre-built version of PyPy
-EAPI=6
-HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/1.1[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
-SLOT=0/41
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python-gentoo-patches-2.7.14-0.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7.ossl11/pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.ossl11.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7.ossl11/pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.ossl11.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.ffi7.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7.ossl11/pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.ossl11.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7.ossl11/pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.ossl11.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7.ossl11/pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.ossl11.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.ffi7.tar.lz ) ) ) )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4c747712498ed47355d50b35fa084e9d
diff --git a/metadata/md5-cache/dev-python/pypy-bin-7.0.0-r1 b/metadata/md5-cache/dev-python/pypy-bin-7.0.0-r1
deleted file mode 100644
index 91179081d66e..000000000000
--- a/metadata/md5-cache/dev-python/pypy-bin-7.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* >=sys-libs/glibc-2.28 sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/1.1[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0 app-arch/lzip app-arch/xz-utils
-DESCRIPTION=Pre-built version of PyPy
-EAPI=7
-HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* >=sys-libs/glibc-2.28 sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/1.1[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
-SLOT=0/41-py27
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.15.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.0.0/pypy-bin-7.0.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.0.0/pypy-bin-7.0.0-amd64+bzip2+ncurses.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.0.0/pypy-bin-7.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.0.0/pypy-bin-7.0.0-amd64+bzip2+libressl+ncurses.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.0.0/pypy-bin-7.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.0.0/pypy-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.0.0/pypy-bin-7.0.0-x86+bzip2+ncurses.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.0.0/pypy-bin-7.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.0.0/pypy-bin-7.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.0.0/pypy-bin-7.0.0-x86+bzip2+libressl+ncurses.tar.lz ) ) ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=b052ba08d25d52319d73376d7f95d775
diff --git a/metadata/md5-cache/dev-python/pypy-bin-7.1.0 b/metadata/md5-cache/dev-python/pypy-bin-7.1.0
deleted file mode 100644
index fd4d467156f9..000000000000
--- a/metadata/md5-cache/dev-python/pypy-bin-7.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* >=sys-libs/glibc-2.28 sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/1.1[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0 app-arch/lzip app-arch/xz-utils
-DESCRIPTION=Pre-built version of PyPy
-EAPI=7
-HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* >=sys-libs/glibc-2.28 sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/1.1[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
-SLOT=0/41-py27
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.1.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.15.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.1.0/pypy-bin-7.1.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.1.0/pypy-bin-7.1.0-amd64+bzip2+ncurses.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.1.0/pypy-bin-7.1.0-amd64+bzip2+jit+libressl+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.1.0/pypy-bin-7.1.0-amd64+bzip2+libressl+ncurses.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.1.0/pypy-bin-7.1.0-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.1.0/pypy-bin-7.1.0-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.1.0/pypy-bin-7.1.0-x86+bzip2+ncurses.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.1.0/pypy-bin-7.1.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.1.0/pypy-bin-7.1.0-x86+bzip2+libressl+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/7.1.0/pypy-bin-7.1.0-x86+bzip2+libressl+ncurses.tar.lz ) ) ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=b052ba08d25d52319d73376d7f95d775
diff --git a/metadata/md5-cache/dev-python/pypy3-6.0.0 b/metadata/md5-cache/dev-python/pypy3-6.0.0
deleted file mode 100644
index 0056ca94330e..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-6.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0 low-memory? ( virtual/pypy ) !low-memory? ( || ( virtual/pypy ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.5) language
-EAPI=6
-HOMEPAGE=http://pypy.org/
-IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
-SLOT=0/60
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-src.tar.bz2
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=430b348c8fa1dc946d50b36610bde227
diff --git a/metadata/md5-cache/dev-python/pypy3-7.0.0-r1 b/metadata/md5-cache/dev-python/pypy3-7.0.0-r1
deleted file mode 100644
index 90be661f347f..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-7.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0 low-memory? ( virtual/pypy ) !low-memory? ( || ( virtual/pypy ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.5) language
-EAPI=7
-HOMEPAGE=http://pypy.org/
-IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
-SLOT=0/71
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3.5-v7.0.0-src.tar.bz2
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=2fcbb782667cb2b17fbe87cf897e2d68
diff --git a/metadata/md5-cache/dev-python/pypy3-7.1.0 b/metadata/md5-cache/dev-python/pypy3-7.1.0
deleted file mode 100644
index 6ff634b59064..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-7.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0 low-memory? ( virtual/pypy ) !low-memory? ( || ( virtual/pypy ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.6) language
-EAPI=7
-HOMEPAGE=http://pypy.org/
-IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
-SLOT=0/71-py36
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.1.0-src.tar.bz2
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=244f33bf49320f7b7b87411f273722e7
diff --git a/metadata/md5-cache/dev-python/pypy3-9999 b/metadata/md5-cache/dev-python/pypy3-9999
index c41b7f1503c5..35346c222b0a 100644
--- a/metadata/md5-cache/dev-python/pypy3-9999
+++ b/metadata/md5-cache/dev-python/pypy3-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0 low-memory? ( virtual/pypy ) !low-memory? ( || ( virtual/pypy ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-vcs/mercurial
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.5) language
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.6) language
 EAPI=7
 HOMEPAGE=http://pypy.org/
 IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
-SLOT=0/71
+SLOT=0/71-py36
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=aa949228bb842dc92a02fad3c704138a
+_md5_=097222603d6dc8a4aeea03f0eb64e682
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0 b/metadata/md5-cache/dev-python/pypy3-bin-6.0.0
deleted file mode 100644
index 10f23291abf6..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0 app-arch/lzip app-arch/xz-utils test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) )
-DESCRIPTION=A fast, compliant alternative implementation of Python 3.3 (binary package)
-EAPI=6
-HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
-SLOT=0/60
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0/pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0/pypy3-bin-6.0.0-amd64+bzip2+ncurses.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0/pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0/pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0/pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz ) ) )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=13d954f74f12f1b12c6fc56bf8a08ce4
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100 b/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100
deleted file mode 100644
index ab405cae2406..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0 app-arch/lzip app-arch/xz-utils test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) )
-DESCRIPTION=A fast, compliant alternative implementation of Python 3.3 (binary package)
-EAPI=6
-HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
-SLOT=0/60
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0.ffi7/pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0.ffi7/pypy3-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0.ffi7/pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0.ffi7/pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0.ffi7/pypy3-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz ) ) )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cf0e9b55d594ee7d13bc3cff5763ecc1
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-7.0.0-r1 b/metadata/md5-cache/dev-python/pypy3-bin-7.0.0-r1
deleted file mode 100644
index ab10108f0c7b..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-bin-7.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* >=sys-libs/glibc-2.28 sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0 app-arch/lzip app-arch/xz-utils test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) )
-DESCRIPTION=A fast, compliant alternative implementation of Python 3.5 (binary package)
-EAPI=7
-HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* >=sys-libs/glibc-2.28 sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
-SLOT=0/71
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3.5-v7.0.0-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/7.0.0/pypy3-bin-7.0.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/7.0.0/pypy3-bin-7.0.0-amd64+bzip2+ncurses.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/7.0.0/pypy3-bin-7.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/7.0.0/pypy3-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/7.0.0/pypy3-bin-7.0.0-x86+bzip2+ncurses.tar.lz ) ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=2ccc0b6419310e0eea147bae69572009
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-7.1.0 b/metadata/md5-cache/dev-python/pypy3-bin-7.1.0
deleted file mode 100644
index 0ed2d349cabc..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-bin-7.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* >=sys-libs/glibc-2.28 sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0 app-arch/lzip app-arch/xz-utils test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) )
-DESCRIPTION=A fast, compliant alternative implementation of Python 3.6 (binary package)
-EAPI=7
-HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* >=sys-libs/glibc-2.28 sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
-SLOT=0/71-py36
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.1.0-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/7.1.0/pypy3-bin-7.1.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/7.1.0/pypy3-bin-7.1.0-amd64+bzip2+ncurses.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/7.1.0/pypy3-bin-7.1.0-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/7.1.0/pypy3-bin-7.1.0-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/7.1.0/pypy3-bin-7.1.0-x86+bzip2+ncurses.tar.lz ) ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=74a8b1ee5a1dcf444214fea258827e49
diff --git a/metadata/md5-cache/dev-python/pyqrcode-1.2.1 b/metadata/md5-cache/dev-python/pyqrcode-1.2.1
index eada937ab1bd..c174f969bb22 100644
--- a/metadata/md5-cache/dev-python/pyqrcode-1.2.1
+++ b/metadata/md5-cache/dev-python/pyqrcode-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=A pure Python QR code generator with SVG, EPS, PNG and terminal outp
 EAPI=6
 HOMEPAGE=https://github.com/mnooner256/pyqrcode https://pypi.org/project/PyQRCode/
 IUSE=png python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=png? ( dev-python/pypng[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQRCode/PyQRCode-1.2.1.tar.gz -> pyqrcode-1.2.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5dc51d257e694515fe06322f8ec63070
+_md5_=ec3c6b02a548d087e17738fe50dcce80
diff --git a/metadata/md5-cache/dev-python/pytest-flakes-4.0.0 b/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
index afbf60dab1d0..f8759f71fa78 100644
--- a/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
+++ b/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of small Python functions & classes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/python-utils/
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-flakes/pytest-flakes-4.0.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=71b1c66bb87be0bde224acf6782fdb35
+_md5_=ee25ab0544e13ecf24ec0d801058b914
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.28.0 b/metadata/md5-cache/dev-python/pytest-xdist-1.28.0
new file mode 100644
index 000000000000..b780d3e66365
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-xdist-1.28.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/execnet[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-4.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-forked[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/filelock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Distributed testing and loop-on-failing modes
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/execnet[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-4.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-forked[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-1.28.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=d32b64a630457fad0614af59530aa815
diff --git a/metadata/md5-cache/dev-python/python-axolotl-0.2.3 b/metadata/md5-cache/dev-python/python-axolotl-0.2.3
new file mode 100644
index 000000000000..20e485a2e46b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-axolotl-0.2.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-axolotl-curve25519[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A python module for the axolotl protocol
+EAPI=7
+HOMEPAGE=https://github.com/tgalal/python-axolotl
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-axolotl-curve25519[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/tgalal/python-axolotl/archive/0.2.3.tar.gz -> python-axolotl-0.2.3.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=f87c3953be192887511600611f26579c
diff --git a/metadata/md5-cache/dev-python/python-ethtool-0.11 b/metadata/md5-cache/dev-python/python-ethtool-0.11
deleted file mode 100644
index 243f3fe9c8b5..000000000000
--- a/metadata/md5-cache/dev-python/python-ethtool-0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libnl:3 python_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=Ethernet settings python bindings
-EAPI=5
-HOMEPAGE=https://fedorahosted.org/python-ethtool/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/libnl:3 python_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://fedorahosted.org/releases/p/y/python-ethtool/python-ethtool-0.11.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=bae7bd64ba4c1d4543aad86aa4f8944b
diff --git a/metadata/md5-cache/dev-python/python-rethinkdb-2.3.0 b/metadata/md5-cache/dev-python/python-rethinkdb-2.3.0
deleted file mode 100644
index eedac7b4ec8d..000000000000
--- a/metadata/md5-cache/dev-python/python-rethinkdb-2.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python driver library for the RethinkDB database server.
-EAPI=6
-HOMEPAGE=https://rethinkdb.com/api/python/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/rethinkdb/rethinkdb-2.3.0.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0aa22b92f452a3af618ff0c929a6958f
diff --git a/metadata/md5-cache/dev-python/python-utils-2.3.0 b/metadata/md5-cache/dev-python/python-utils-2.3.0
index 32a50e2d2573..69c8d4e98433 100644
--- a/metadata/md5-cache/dev-python/python-utils-2.3.0
+++ b/metadata/md5-cache/dev-python/python-utils-2.3.0
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytest-flakes[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-flakes[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of small Python functions & classes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/python-utils/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 )
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-utils/python-utils-2.3.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ad9a3462887281161a3e245f60b34468
+_md5_=5b4972ffc555083414fd62c8f43c2484
diff --git a/metadata/md5-cache/dev-python/pytrie-0.3.1 b/metadata/md5-cache/dev-python/pytrie-0.3.1
index ec71977ece6f..fd2b2521ad0f 100644
--- a/metadata/md5-cache/dev-python/pytrie-0.3.1
+++ b/metadata/md5-cache/dev-python/pytrie-0.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=A pure Python implementation of the trie data structure
 EAPI=6
 HOMEPAGE=https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyTrie/PyTrie-0.3.1.tar.gz -> pytrie-0.3.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1054de035f230765e791e86daaab12e7
+_md5_=3f80c3081d8db82df9ca09ae5d1129a3
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.25-r1 b/metadata/md5-cache/dev-python/pyxdg-0.25-r1
index d1a3485f8980..879af07f2d14 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.25-r1
+++ b/metadata/md5-cache/dev-python/pyxdg-0.25-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python module to deal with freedesktop.org specifications
 EAPI=5
 HOMEPAGE=https://freedesktop.org/wiki/Software/pyxdg https://cgit.freedesktop.org/xdg/pyxdg/
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~takluyver/pyxdg-0.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6b8a057531db5d0ecd04bafa009f42c1
+_md5_=d657d0e90de9a2f81edfc51933d5f6de
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.1 b/metadata/md5-cache/dev-python/pyyaml-5.1
index 9c6763040653..024b28568d0e 100644
--- a/metadata/md5-cache/dev-python/pyyaml-5.1
+++ b/metadata/md5-cache/dev-python/pyyaml-5.1
@@ -5,11 +5,11 @@ DESCRIPTION=YAML parser and emitter for Python
 EAPI=7
 HOMEPAGE=https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/
 IUSE=examples libyaml python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=libyaml? ( dev-libs/libyaml ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://pyyaml.org/download/pyyaml/PyYAML-5.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=21961533afd75fcd16c350672ccd9892
+_md5_=4a75e933e9a960916ca878a7092ecc63
diff --git a/metadata/md5-cache/dev-python/rdflib-4.2.2 b/metadata/md5-cache/dev-python/rdflib-4.2.2
index 1676c19d3ea7..d138cb02e36e 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.2.2
+++ b/metadata/md5-cache/dev-python/rdflib-4.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=RDF library containing a triple store and parser/serializer
 EAPI=6
 HOMEPAGE=https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/
 IUSE=doc berkdb examples mysql redland sqlite test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-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=BSD
 RDEPEND=dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[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(-)] berkdb? ( dev-python/bsddb3[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(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redland? ( dev-libs/redland-bindings[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.2.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3903094d199f6e904cc9af799db525ab
+_md5_=8de2484d56f1a0dccfb416085a469699
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.13-r1 b/metadata/md5-cache/dev-python/reportlab-3.5.13-r1
index 8d91f5333a7c..d6d8cc0f1922 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.5.13-r1
+++ b/metadata/md5-cache/dev-python/reportlab-3.5.13-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Tools for generating printable PDF documents from any data source
 EAPI=7
 HOMEPAGE=http://www.reportlab.com/
 IUSE=doc examples python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-libs/libart_lgpl sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reportlab/reportlab-3.5.13.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a79aab26ead3e9b41bbe10fdd379b1ed
+_md5_=e80ec813d3c8500c01687e31ef8c51a8
diff --git a/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1 b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1
index 7433be7d9329..0f97153682a1 100644
--- a/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx extension: auto-generates API docs from Zope interfaces
 EAPI=5
 HOMEPAGE=https://pypi.org/project/repoze.sphinx.autointerface/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=repoze
 RDEPEND=dev-python/namespace-repoze[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.sphinx.autointerface/repoze.sphinx.autointerface-0.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=513e59bc2bd6f41d7692920f71351b2b
+_md5_=499b9589f2c9f7896c12a03165fb2b6a
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.96 b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.96
new file mode 100644
index 000000000000..0020933ab2dc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.96
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/flake8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ruamel-std-pathlib[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(-)]
+DESCRIPTION=YAML parser/emitter that supports roundtrip comment preservation
+EAPI=6
+HOMEPAGE=https://pypi.org/project/ruamel.yaml/ https://bitbucket.org/ruamel/yaml
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://bitbucket.org/ruamel/yaml/get/0.15.96.tar.gz -> ruamel-yaml-0.15.96.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=2facf293332a084b1336e982a5a45bc1
diff --git a/metadata/md5-cache/dev-python/runsnakerun-2.0.4 b/metadata/md5-cache/dev-python/runsnakerun-2.0.4
index c23322268d6c..0cd7113665c2 100644
--- a/metadata/md5-cache/dev-python/runsnakerun-2.0.4
+++ b/metadata/md5-cache/dev-python/runsnakerun-2.0.4
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.vrplumber.com/programming/runsnakerun/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/squaremap dev-python/wxpython python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/squaremap dev-python/wxpython:3.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/R/RunSnakeRun/RunSnakeRun-2.0.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f6985bb78cbab1c5898e720f91fd5930
+_md5_=a46b6244996463c1a2d435ded3b3f87d
diff --git a/metadata/md5-cache/dev-python/scandir-1.10.0 b/metadata/md5-cache/dev-python/scandir-1.10.0
index 940ea017ee9b..19b8ea39cb0a 100644
--- a/metadata/md5-cache/dev-python/scandir-1.10.0
+++ b/metadata/md5-cache/dev-python/scandir-1.10.0
@@ -5,11 +5,11 @@ DESCRIPTION=A better directory iterator and faster os.walk()
 EAPI=7
 HOMEPAGE=https://github.com/benhoyt/scandir
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.10.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=936fc96ee768dff8821e936fad5aa92c
+_md5_=ba5b3bb8ad67ec0828e737fd9d02a036
diff --git a/metadata/md5-cache/dev-python/scandir-1.9.0 b/metadata/md5-cache/dev-python/scandir-1.9.0
deleted file mode 100644
index f60ab6518c95..000000000000
--- a/metadata/md5-cache/dev-python/scandir-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A better directory iterator and faster os.walk()
-EAPI=6
-HOMEPAGE=https://github.com/benhoyt/scandir
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/s/scandir/scandir-1.9.0.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1cecf83905f1f6d7d10f55ad369c2cb0
diff --git a/metadata/md5-cache/dev-python/sdnotify-0.3.2 b/metadata/md5-cache/dev-python/sdnotify-0.3.2
index 87f9103d736c..f1f394beca09 100644
--- a/metadata/md5-cache/dev-python/sdnotify-0.3.2
+++ b/metadata/md5-cache/dev-python/sdnotify-0.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python implementation of systemd's service notification protocol (sd
 EAPI=6
 HOMEPAGE=https://github.com/bb4242/sdnotify https://pypi.org/project/sdnotify/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sdnotify/sdnotify-0.3.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=90f054e654a03852e98b8ea25ec59fb4
+_md5_=d675a6a9876d922637e60d24dd8bdb0c
diff --git a/metadata/md5-cache/dev-python/shutilwhich-1.1.0 b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
index 6bb53d7e51f5..0086414a9730 100644
--- a/metadata/md5-cache/dev-python/shutilwhich-1.1.0
+++ b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=A copy & paste backport of Python 3.3's shutil.which function
 EAPI=6
 HOMEPAGE=https://pypi.org/project/shutilwhich/ https://github.com/mbr/shutilwhich
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=PSF-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/shutilwhich/shutilwhich-1.1.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=14f2ca4699b04edb2f9dec3bdae45a0f
+_md5_=ff4405a711a0913a9c03218e7f842277
diff --git a/metadata/md5-cache/dev-python/sip-4.19.13 b/metadata/md5-cache/dev-python/sip-4.19.13
index b1b46456daf4..26590994052a 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.13
+++ b/metadata/md5-cache/dev-python/sip-4.19.13
@@ -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_5 python_targets_python3_6 python_targets_python3_7
-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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0/12
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.13/sip-4.19.13.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=9913fe63bc7a1f4dbbb6898277f23f22
+_md5_=70e9ff594685776289bad92971351149
diff --git a/metadata/md5-cache/dev-python/snappy-0.5-r2 b/metadata/md5-cache/dev-python/snappy-0.5-r2
index dfe95ba061ba..b4ea75914603 100644
--- a/metadata/md5-cache/dev-python/snappy-0.5-r2
+++ b/metadata/md5-cache/dev-python/snappy-0.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for the snappy compression library from Google
 EAPI=5
 HOMEPAGE=https://pypi.org/project/python-snappy/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=app-arch/snappy-1.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-snappy/python-snappy-0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8ed55561aaf534615624c3a9723a5a8e
+_md5_=fbb31475c7a0b938174314c7babcfbbf
diff --git a/metadata/md5-cache/dev-python/snappy-0.5.1 b/metadata/md5-cache/dev-python/snappy-0.5.1
index 0628f1adfff7..1954d2ac0988 100644
--- a/metadata/md5-cache/dev-python/snappy-0.5.1
+++ b/metadata/md5-cache/dev-python/snappy-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for the snappy compression library from Google
 EAPI=6
 HOMEPAGE=https://pypi.org/project/python-snappy/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=app-arch/snappy-1.0.2:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-snappy/python-snappy-0.5.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=34c2a8a6e75951af445f1c7b0499c1f3
+_md5_=afee4fe11c37cdb53220c131d103e762
diff --git a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0 b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0
index fa7e8613dca4..c7c2a6c1433a 100644
--- a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0
+++ b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Wrapper around a SPARQL service
 EAPI=6
 HOMEPAGE=https://pypi.org/project/SPARQLWrapper/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=W3C
 RDEPEND=>=dev-python/rdflib-2.4.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-1.8.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cf4e984ffcb2beb722a67da5bfaabf6e
+_md5_=91f4bfeca4eb9970d3f00d14edc815a1
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.3 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.3
index faa7286afacd..2de8598dec2d 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.3
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=doc examples +sqlite test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.3.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0296351cdc688e6d3f7d60f154446133
+_md5_=9b994fa75f82dee6ffb31cbab7246b5e
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.4 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.4
new file mode 100644
index 000000000000..e2fdbd003485
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.4
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=7
+HOMEPAGE=http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
+IUSE=doc examples +sqlite test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.4.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e1b42546b78ebcfeebc3e16555182103
diff --git a/metadata/md5-cache/dev-python/squaremap-1.0.4 b/metadata/md5-cache/dev-python/squaremap-1.0.4
index 3d3b73b68f55..e23c1a138c35 100644
--- a/metadata/md5-cache/dev-python/squaremap-1.0.4
+++ b/metadata/md5-cache/dev-python/squaremap-1.0.4
@@ -6,9 +6,9 @@ HOMEPAGE=https://pypi.org/project/SquareMap/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SquareMap/SquareMap-1.0.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cf3997cb0d3d848aaafe8bef7525ec52
+_md5_=2f2c48b2004d5313c85bf16bf9382765
diff --git a/metadata/md5-cache/dev-python/tox-3.10.0 b/metadata/md5-cache/dev-python/tox-3.10.0
deleted file mode 100644
index c5858590e7aa..000000000000
--- a/metadata/md5-cache/dev-python/tox-3.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/filelock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pluggy-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/py[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/toml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/flaky-3.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/flaky-4 >=dev-python/freezegun-0.3.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-mock-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=7
-HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/filelock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pluggy-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/py[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/toml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/tox/archive/3.10.0.tar.gz -> tox-3.10.0.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=029c201f6ea38d8033427d63f37f7769
diff --git a/metadata/md5-cache/dev-python/tox-3.12.1 b/metadata/md5-cache/dev-python/tox-3.12.1
new file mode 100644
index 000000000000..16e0a6571253
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-3.12.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pluggy-1.0[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/flaky-3.4.0[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/flaky-4 >=dev-python/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-mock-2.0[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=virtualenv-based automation of test activities
+EAPI=7
+HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
+IUSE=test python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pluggy-1.0[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/tox/archive/3.12.1.tar.gz -> tox-3.12.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=470e542d67fcddc766e09085377bedc9
diff --git a/metadata/md5-cache/dev-python/treq-17.8.0 b/metadata/md5-cache/dev-python/treq-17.8.0
index f6aa87e1af23..fd2a8e6676df 100644
--- a/metadata/md5-cache/dev-python/treq-17.8.0
+++ b/metadata/md5-cache/dev-python/treq-17.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=A requests-like API built on top of twisted.web's Agent
 EAPI=6
 HOMEPAGE=https://github.com/twisted/treq https://pypi.org/project/treq/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.4.0[crypt,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-17.8.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=89eb072e9f8b95311315784bdae6f017
+_md5_=34c506735db570c98e43c454dae578b2
diff --git a/metadata/md5-cache/dev-python/txaio-2.9.0 b/metadata/md5-cache/dev-python/txaio-2.9.0
index c39b9d2bd7dc..a0650a2b236e 100644
--- a/metadata/md5-cache/dev-python/txaio-2.9.0
+++ b/metadata/md5-cache/dev-python/txaio-2.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Compatibility API between asyncio/Twisted/Trollius
 EAPI=6
 HOMEPAGE=https://github.com/crossbario/txaio https://pypi.org/project/txaio/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/txaio/txaio-2.9.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d9b7c645582d0f61c6d6a8e15c69b2cc
+_md5_=fd1652ca7023d786016942a6afcaed5c
diff --git a/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1 b/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
index 405b055ca959..93d89901410e 100644
--- a/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
+++ b/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Twisted-based Tor controller client, with state-tracking and config
 EAPI=6
 HOMEPAGE=https://github.com/meejah/txtorcon https://pypi.org/project/txtorcon/ https://txtorcon.readthedocs.org
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
 RDEPEND=dev-python/automat[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/incremental[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),crypt] >=dev-python/zope-interface-3.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/automat[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/repoze-sphinx-autointerface[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/zope-interface-3.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/txtorcon/txtorcon-0.19.3.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5b7a2b92d67e756e7eec9db1686ed11c
+_md5_=b0b7f9518e7e4f1af04eb8e1d8104e55
diff --git a/metadata/md5-cache/dev-python/watchdog-0.9.0 b/metadata/md5-cache/dev-python/watchdog-0.9.0
index 48a0da7c0716..d449a759dcaa 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.9.0
+++ b/metadata/md5-cache/dev-python/watchdog-0.9.0
@@ -5,11 +5,11 @@ DESCRIPTION=Python API and shell utilities to monitor file system events
 EAPI=7
 HOMEPAGE=https://github.com/gorakhargosh/watchdog
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/argh[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pathtools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v0.9.0.tar.gz -> watchdog-0.9.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=b9ad7984dce20749c4245066e13250d1
+_md5_=fd74a8ec58543d9e9346d448fb72b18b
diff --git a/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108 b/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
index 423e9fb4f674..a234c019393a 100644
--- a/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
+++ b/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
@@ -4,11 +4,11 @@ DESCRIPTION=Accelerator for ws4py, autobahn and tornado
 EAPI=5
 HOMEPAGE=https://pypi.org/project/wsaccel/ https://github.com/methane/wsaccel
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/methane/wsaccel/archive/0fbd074c257c51b73de05b25ccb6488801320a32.zip -> wsaccel-0.6.2_p20170108.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ea7dab1772c842be48b2a1a8f093d318
+_md5_=819fa7cc0d0a5e388be41364fdc1e4ea
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4
deleted file mode 100644
index d21c2b07d0b2..000000000000
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[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/webob[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webtest-2.0.17[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/socketpool[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/restkit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=HTTP proxying tools for WSGI apps
-EAPI=5
-HOMEPAGE=https://pypi.org/project/WSGIProxy2/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[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/webob[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8e64fbd8ef6647fba11437fc4e93e0fd
diff --git a/metadata/md5-cache/dev-python/wxpython-3.0.2.0 b/metadata/md5-cache/dev-python/wxpython-3.0.2.0
index a6d717014cc7..95ed262dcea0 100644
--- a/metadata/md5-cache/dev-python/wxpython-3.0.2.0
+++ b/metadata/md5-cache/dev-python/wxpython-3.0.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=A blending of the wxWindows C++ class library with Python
 EAPI=5
 HOMEPAGE=http://www.wxpython.org/
 IUSE=cairo examples libnotify opengl python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=wxWinLL-3
 RDEPEND=dev-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/wxGTK-3.0.2.0:3.0=[libnotify=,opengl?,tiff,X] dev-libs/glib:2 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg x11-libs/gtk+:2 x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( dev-python/pyopengl[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=3.0
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.2.0.tar.bz2 examples? ( mirror://sourceforge/wxpython/wxPython-demo-3.0.2.0.tar.bz2 )
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f6cff7eb4cb50a67a4820d7108b4ee91
+_md5_=38c87190489f261f3a56eaaaa1bfecb7
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.6 b/metadata/md5-cache/dev-python/wxpython-4.0.6
new file mode 100644
index 000000000000..31f69330055e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 app-doc/doxygen dev-python/pathlib2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A blending of the wxWindows C++ class library with Python
+EAPI=6
+HOMEPAGE=http://www.wxpython.org/
+IUSE=test webkit python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=wxWinLL-3
+RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=4.0
+SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=bba57463587500e017698bae6aafb381
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-0.9.8 b/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
index a05e8ca5f08e..b3643b0d49e3 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
+++ b/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
@@ -4,11 +4,11 @@ DESCRIPTION=Python module for creating Excel XLSX files
 EAPI=6
 HOMEPAGE=https://github.com/jmcnamara/XlsxWriter
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/X/XlsxWriter/XlsxWriter-0.9.8.tar.gz test? ( https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_0.9.8.zip -> xlsxwriter-0.9.8-tests.zip )
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=010e7707570e627696616c45f17f028e
+_md5_=d23f9d3e5455b5035fac35d1c3d793ec
diff --git a/metadata/md5-cache/dev-python/yapps-2.2.0-r1 b/metadata/md5-cache/dev-python/yapps-2.2.0-r1
deleted file mode 100644
index 9da00f46de5f..000000000000
--- a/metadata/md5-cache/dev-python/yapps-2.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An easy to use parser generator
-EAPI=5
-HOMEPAGE=https://github.com/smurfix/yapps
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/Y/Yapps/Yapps-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6bb876adb9e069b58b22e8e9b3ead3cc
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index f5f3f67be381..319041e7e1c6 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/assistant-5.11.3 b/metadata/md5-cache/dev-qt/assistant-5.11.3
index 594a21011278..3e2bd1d8a5a4 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.11.3
+++ b/metadata/md5-cache/dev-qt/assistant-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qthelp-5.11.3 ~dev-qt
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c530633bc4dbda399e09b3a9e0215c36
diff --git a/metadata/md5-cache/dev-qt/assistant-5.12.3 b/metadata/md5-cache/dev-qt/assistant-5.12.3
index 9854f77181b4..3850d0bb481e 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.12.3
+++ b/metadata/md5-cache/dev-qt/assistant-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=webkit debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qthelp-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtsql-5.12.3[sqlite] ~dev-qt/qtwidgets-5.12.3 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=79f0270ebe5372049e7772fb768deedf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=5eb3c336047ee22eac8d5b09efab10d1
diff --git a/metadata/md5-cache/dev-qt/designer-5.11.3 b/metadata/md5-cache/dev-qt/designer-5.11.3
index 39d57b409f95..62cd6bd7d94e 100644
--- a/metadata/md5-cache/dev-qt/designer-5.11.3
+++ b/metadata/md5-cache/dev-qt/designer-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtnetwork-5.11.3 ~dev
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5b940c65fed1d63410a190f2007148d2
diff --git a/metadata/md5-cache/dev-qt/designer-5.12.3 b/metadata/md5-cache/dev-qt/designer-5.12.3
index e63399232670..0b83b82eee37 100644
--- a/metadata/md5-cache/dev-qt/designer-5.12.3
+++ b/metadata/md5-cache/dev-qt/designer-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=WYSIWYG tool for designing and building graphical user interfaces wi
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=declarative webkit debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtwidgets-5.12.3 ~dev-qt/qtxml-5.12.3 declarative? ( ~dev-qt/qtdeclarative-5.12.3[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b0f21e619838dd409029154cfe3f5efb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=fed21c047462d189887eec93aada2fe7
diff --git a/metadata/md5-cache/dev-qt/linguist-5.11.3 b/metadata/md5-cache/dev-qt/linguist-5.11.3
index 47773cfa81df..c889abd52473 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.11.3
+++ b/metadata/md5-cache/dev-qt/linguist-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.11.3 ~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f2599c72d4c50da910290722e471380c
diff --git a/metadata/md5-cache/dev-qt/linguist-5.12.3 b/metadata/md5-cache/dev-qt/linguist-5.12.3
index 09e8caef1c97..1a7107fcf7ed 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.12.3
+++ b/metadata/md5-cache/dev-qt/linguist-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/designer-5.12.3 ~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtwidgets-5.12.3 ~dev-qt/qtxml-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fb8bbe03cdfbe6987836c71a98c93101
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=9035044e51d74900f92510a82f86f265
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.11.3 b/metadata/md5-cache/dev-qt/linguist-tools-5.11.3
index 55bbc346c050..1404ab2b6870 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.11.3
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtxml-5.11.3 qml? ( ~dev-qt/qtdeclarative-
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=38fec8cbc5051a8fe703eb35a21cfec3
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.12.3 b/metadata/md5-cache/dev-qt/linguist-tools-5.12.3
index cacdc8528f51..ccea77d7b48c 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.12.3
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Tools for working with Qt translation data files
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtxml-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=9c093e21893380d4f3aa85236e4c0da6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=138d33d663ba0e30fcc1987592a6e2c6
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.11.3 b/metadata/md5-cache/dev-qt/pixeltool-5.11.3
index 190c85c65087..1a1465060e1f 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.11.3
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtwidgets-5.11.3 dev-
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=b5222f88163fc3a78a032d8646be4ca2
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.12.3 b/metadata/md5-cache/dev-qt/pixeltool-5.12.3
index 7f4e0dfcd1e9..ee18469653cd 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.12.3
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt screen magnifier
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=d6be7c6e86fe8a1b12632a95bd2ac228
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=7a5033a84d49c96d88bd1d59fb58e9ad
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.11.3 b/metadata/md5-cache/dev-qt/qdbus-5.11.3
index 261f99f15156..f480d902549b 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.11.3
+++ b/metadata/md5-cache/dev-qt/qdbus-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdbus-5.11.3 ~dev-qt/qtxml-5.11.3 dev-qt/
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=cc6cf22f84a3a73406863b4a07d54fee
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.12.3 b/metadata/md5-cache/dev-qt/qdbus-5.12.3
index eb3c62f9aca6..2610816484c4 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.12.3
+++ b/metadata/md5-cache/dev-qt/qdbus-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Interface to Qt applications communicating over D-Bus
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 ~dev-qt/qtxml-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=e5c19a4066a1551f8d75f8ebfb86dad3
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=b2c431fbc24b7349d8c56c8224b33488
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.3 b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.3
index afb1677efa3b..d8fa5f6c0227 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.3
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdbus-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=d9e6335083ef20f9fa12f6ea548a9a6b
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3 b/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3
index 1f3727ea1373..ff2269db690c 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 ~dev-qt/qtxml-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1a3aa6592e2f47265c7e24d1edcaeea2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=878a314c682ca309f9f8af9db20bee11
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.11.3 b/metadata/md5-cache/dev-qt/qdoc-5.11.3
index f43de442b0a3..e346bde32b0e 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.11.3
+++ b/metadata/md5-cache/dev-qt/qdoc-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.1
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=c9fab24fdda092b5b67694c068f63c73
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.12.3 b/metadata/md5-cache/dev-qt/qdoc-5.12.3
index 99cb8ea5cd7e..9377d8a1597e 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.12.3
+++ b/metadata/md5-cache/dev-qt/qdoc-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt documentation generator
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=cb070a26c58e051f90dcb1f472b3f961
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=3932d00b3122e7d9ea6fc14f5b2e6ed2
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.6.2 b/metadata/md5-cache/dev-qt/qt-creator-4.6.2
index e127914d731a..e00b759e4fb2 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-4.6.2
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.6.2
@@ -9,5 +9,5 @@ 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-5:= ) designer? ( >=dev-qt/designer-5.6.2:5 ) qbs? ( ~dev-util/qbs-1.11.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-5:* ) 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.6/4.6.2/qt-creator-opensource-src-4.6.2.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	83a68dab6355a0f96b37fe96bc4f317c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=e1cf4740b332f2b312e2cf89fe665290
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.8.0 b/metadata/md5-cache/dev-qt/qt-creator-4.8.0
index 67eff7d03746..7fe5ee4d622d 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-4.8.0
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/botan-2.8:2=[-bindist] >=dev-qt/qtconcurrent-5.9.0:5 >=dev-qt/qtcore-5.9.0:5 >=dev-qt/qtdeclarative-5.9.0:5[widgets] >=dev-qt/qtgui-5.9.0:5 >=dev-qt/qtnetwork-5.9.0:5[ssl] >=dev-qt/qtprintsupport-5.9.0:5 >=dev-qt/qtquickcontrols-5.9.0:5 >=dev-qt/qtscript-5.9.0:5 >=dev-qt/qtsql-5.9.0:5[sqlite] >=dev-qt/qtsvg-5.9.0:5 >=dev-qt/qtwidgets-5.9.0:5 >=dev-qt/qtx11extras-5.9.0:5 >=dev-qt/qtxml-5.9.0:5 clang? ( >=sys-devel/clang-6:= ) designer? ( >=dev-qt/designer-5.9.0:5 ) help? ( >=dev-qt/qthelp-5.9.0:5 webengine? ( >=dev-qt/qtwebengine-5.9.0:5[widgets] ) ) qbs? ( ~dev-util/qbs-1.12.2 ) serialterminal? ( >=dev-qt/qtserialport-5.9.0:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) cmake? ( dev-util/cmake[server(+)] ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_da? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_de? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.9.0:5 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtcreator/4.8/4.8.0/qt-creator-opensource-src-4.8.0.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	83a68dab6355a0f96b37fe96bc4f317c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=42249c16ef4f7c7284b9b8d3ae40b955
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.8.2 b/metadata/md5-cache/dev-qt/qt-creator-4.8.2
index e009d59bf5f9..b9ba5ef5d4e2 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-4.8.2
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/botan-2.8:2=[-bindist] >=dev-qt/qtconcurrent-5.9.0:5 >=dev-qt/qtcore-5.9.0:5 >=dev-qt/qtdeclarative-5.9.0:5[widgets] >=dev-qt/qtgui-5.9.0:5 >=dev-qt/qtnetwork-5.9.0:5[ssl] >=dev-qt/qtprintsupport-5.9.0:5 >=dev-qt/qtquickcontrols-5.9.0:5 >=dev-qt/qtscript-5.9.0:5 >=dev-qt/qtsql-5.9.0:5[sqlite] >=dev-qt/qtsvg-5.9.0:5 >=dev-qt/qtwidgets-5.9.0:5 >=dev-qt/qtx11extras-5.9.0:5 >=dev-qt/qtxml-5.9.0:5 clang? ( >=sys-devel/clang-6:= ) designer? ( >=dev-qt/designer-5.9.0:5 ) help? ( >=dev-qt/qthelp-5.9.0:5 webengine? ( >=dev-qt/qtwebengine-5.9.0:5[widgets] ) ) qbs? ( ~dev-util/qbs-1.12.2 ) serialterminal? ( >=dev-qt/qtserialport-5.9.0:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) cmake? ( dev-util/cmake[server(+)] ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_da? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_de? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.9.0:5 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtcreator/4.8/4.8.2/qt-creator-opensource-src-4.8.2.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	83a68dab6355a0f96b37fe96bc4f317c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=6ca1d4909dd931330e72d6d89945092a
diff --git a/metadata/md5-cache/dev-qt/qt-creator-9999 b/metadata/md5-cache/dev-qt/qt-creator-9999
index e6407b110955..dc03cdf4265f 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-9999
+++ b/metadata/md5-cache/dev-qt/qt-creator-9999
@@ -7,5 +7,5 @@ IUSE=doc systemd test +webengine android autotools baremetal bazaar +clang clear
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/botan-2.8:2=[-bindist] >=dev-qt/qtconcurrent-5.9.0:5 >=dev-qt/qtcore-5.9.0:5 >=dev-qt/qtdeclarative-5.9.0:5[widgets] >=dev-qt/qtgui-5.9.0:5 >=dev-qt/qtnetwork-5.9.0:5[ssl] >=dev-qt/qtprintsupport-5.9.0:5 >=dev-qt/qtquickcontrols-5.9.0:5 >=dev-qt/qtscript-5.9.0:5 >=dev-qt/qtsql-5.9.0:5[sqlite] >=dev-qt/qtsvg-5.9.0:5 >=dev-qt/qtwidgets-5.9.0:5 >=dev-qt/qtx11extras-5.9.0:5 >=dev-qt/qtxml-5.9.0:5 clang? ( >=sys-devel/clang-6:= ) designer? ( >=dev-qt/designer-5.9.0:5 ) help? ( >=dev-qt/qthelp-5.9.0:5 webengine? ( >=dev-qt/qtwebengine-5.9.0:5[widgets] ) ) qbs? ( >=dev-util/qbs-1.13.0 ) serialterminal? ( >=dev-qt/qtserialport-5.9.0:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) cmake? ( dev-util/cmake[server(+)] ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_da? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_de? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.9.0:5 )
 SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=a3716bfaa914ac638714bc6d4a37674a
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302 b/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302
index 71c97acf386f..e16bb3e72959 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302
@@ -4,9 +4,9 @@ DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
 EAPI=7
 HOMEPAGE=https://doc.qt.io/
 IUSE=3d bluetooth charts datavis declarative graphicaleffects +html location multimedia networkauth +qch script sensors virtualkeyboard webengine
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=FDL-1.3
 REQUIRED_USE=|| ( html qch )
 SLOT=5
 SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc/5.12.3-0-201904161302qt-everywhere-documentation.7z charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtcharts/5.12.3-0-201904161302qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtdatavis3d/5.12.3-0-201904161302qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtnetworkauth/5.12.3-0-201904161302qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtscript/5.12.3-0-201904161302qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtscript/5.12.3-0-201904161302qtscripttools-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtvirtualkeyboard/5.12.3-0-201904161302qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtwebengine/5.12.3-0-201904161302qtwebengine-documentation.7z )
-_md5_=0fe0457a5fdbb5e7e9a7cbf3f8a9789d
+_md5_=243d15ee9ab6a8babb7d8a298a07ceab
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.11.3 b/metadata/md5-cache/dev-qt/qt3d-5.11.3
index 2ab7f5f222a6..994cf5d7acb3 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.11.3
+++ b/metadata/md5-cache/dev-qt/qt3d-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.11.3 ~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=7eff9092c4ec4bae16380f183de2251f
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.12.3 b/metadata/md5-cache/dev-qt/qt3d-5.12.3
index adfee5b6e07a..ec1002adda88 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.12.3
+++ b/metadata/md5-cache/dev-qt/qt3d-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=3D rendering module for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtconcurrent-5.12.3 ~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.12.3[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=53936cc9d8d6242984f352396a556371
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=726cd98c2f18810f190dc47f46a15f9b
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.11.3 b/metadata/md5-cache/dev-qt/qtbluetooth-5.11.3
index 38a4b51a1828..7c0cede3f7fa 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.11.3 ~dev-qt/qtcore-5.11.3 ~dev-qt/qtdbus-5.11.3
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=d6fea1697858a8ced3bc6036b31acd4d
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3 b/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3
index d2e39be575c2..003dc50c1b4c 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtconcurrent-5.12.3 ~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=8ec4abe4e18413045646a633c0965588
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=49135aa8a3fc8b989ba7449faabd07f1
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.11.3 b/metadata/md5-cache/dev-qt/qtcharts-5.11.3
index 602f27c54a3a..c2067e953c7d 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtwidgets-5.11.3 qml?
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtcharts-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=6d4eda0df150c5a961fbe95253f9e9b5
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.12.3 b/metadata/md5-cache/dev-qt/qtcharts-5.12.3
index 086f4d234426..a52cc51cd2c9 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.12.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 qml?
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtcharts-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=8f40eaa54286f84f4d56f43304f5abcc
diff --git a/metadata/md5-cache/dev-qt/qtchooser-66 b/metadata/md5-cache/dev-qt/qtchooser-66
index 34429fca69a5..c8faf7c3f81a 100644
--- a/metadata/md5-cache/dev-qt/qtchooser-66
+++ b/metadata/md5-cache/dev-qt/qtchooser-66
@@ -4,9 +4,9 @@ DESCRIPTION=Tool to quickly switch between multiple Qt installations
 EAPI=7
 HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 SLOT=0
 SRC_URI=http://download.qt.io/official_releases/qtchooser/qtchooser-66.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=31daaa44a1f4757781fda993a574327c
+_md5_=a983deaac5870a870a4da7d0a92db62d
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.11.3 b/metadata/md5-cache/dev-qt/qtconcurrent-5.11.3
index 8ac3e4cfd8bb..de95d2618a5a 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=3d251d3162b7bdc2f2664cc742c0d141
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3 b/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3
index 1df95c1e11b1..4e473fd25903 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=7828ecf3a6a3e7c3b74c2e2c52b7b351
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=2348466301958757771021396efec1c7
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.11.3-r2 b/metadata/md5-cache/dev-qt/qtcore-5.11.3-r2
index 7657c96ab523..06255c690d6a 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.11.3-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.11.3-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,un
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=897597d5bcf536ec9e96c0e7c06a8b40
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.12.3 b/metadata/md5-cache/dev-qt/qtcore-5.12.3
index 20387f6ee5ec..ae4ac0e5d035 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=icu systemd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=62e011e02261f00cb3721954c773088d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=2224c70849efe4c7f79933c3d2f6c8de
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.3 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.3
index fa54b53d23ba..3cf89f148b55 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[gles2=] qml? ( ~dev-qt/qtdecl
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtdatavis3d-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=1f30d81a0a322cb4de3407720582a85d
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.12.3 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.12.3
index 3e3b04b2cd9e..14804b68837e 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=3D data visualization library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] qml? ( ~dev-qt/qtdeclarative-5.12.3[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtdatavis3d-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c91c41a28e6352045b7b2a28baee24bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=0d79bbe3820631039b4d94d25fddbd6c
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.11.3 b/metadata/md5-cache/dev-qt/qtdbus-5.11.3
index 7ecd8dc2202c..aaecaa35c5c7 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=270a8a9d6a00f78d03b8de819852e0a8
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.12.3 b/metadata/md5-cache/dev-qt/qtdbus-5.12.3
index a921a422651d..d8d4c861da15 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=d79af3418f1f71981d56dbefa6be8807
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=62ce1f55977101db52c0d486e68ca938
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.11.3 b/metadata/md5-cache/dev-qt/qtdeclarative-5.11.3
index e669d9b3b45c..3694867e0480 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[gles2=] ~dev-qt/qtnetwork-5.1
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=a89ecce04f62dd612c8c696ded64e08c
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3 b/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3
index d35c43be97e3..5613c2e902f5 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=The QML and Quick modules for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 +jit localstorage +widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qttest-5.12.3 localstorage? ( ~dev-qt/qtsql-5.12.3 ) widgets? ( ~dev-qt/qtwidgets-5.12.3[gles2=] ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=5321a2084d154cae00b38d7ad1a8b542
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=a83a2906a3bc899491760f1751618cc2
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.11.3 b/metadata/md5-cache/dev-qt/qtdiag-5.11.3
index 5643d99c3a42..ea6ec767e824 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 network? ( ~dev-qt/qtnetwork-
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=287f344c2171bd4144a1f0889440c749
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.12.3 b/metadata/md5-cache/dev-qt/qtdiag-5.12.3
index 124d3df0d3ac..c82f674c45a4 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.12.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 network? ( ~dev-qt/qtnetwork-
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=622c8b450791a0e0b46a5f5cacd32837
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.3 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.3
index 20c7bdb0807b..657cdc4014b4 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=a94c1ae269b0b2e7cd951929aed7b3b9
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3
index 343ee4033693..82500c7cf3dc 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of QML types for adding visual effects to user interfaces
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=6e88b2b6fd0b4587e9d572a1537eac9f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=cadc6c4f2b85b73e993468eeca154273
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.11.3 b/metadata/md5-cache/dev-qt/qtgui-5.11.3
index 5e6ea7ed768d..0987e9040891 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtgui-5.11.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? (
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=9b67939f113ca6924fc19312b6598424
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1 b/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1
index 9dff96ed9993..78409553a05d 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus )
 RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.12.3 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= virtual/opengl dbus? ( ~dev-qt/qtdbus-5.12.3 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.12.3 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.12.3 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? (
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=146bf542a4b8e21b0de5a9125d042514
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=3c1869fd429bbd53278c3675f248f127
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.11.3 b/metadata/md5-cache/dev-qt/qthelp-5.11.3
index 5c870713975b..38d2137a52a2 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.11.3
+++ b/metadata/md5-cache/dev-qt/qthelp-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtnetwork-5.11.3 ~dev
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=16508bf420be8876c90365c869e8e3d8
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.12.3 b/metadata/md5-cache/dev-qt/qthelp-5.12.3
index 384435148f4e..18ed013894b3 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.12.3
+++ b/metadata/md5-cache/dev-qt/qthelp-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating online documentation into applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtsql-5.12.3[sqlite] ~dev-qt/qtwidgets-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=fc8112e2eb6691f510c5d768780d5060
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=0e1dfbfe4cd0031fa7d2b4c2732ba002
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.11.3 b/metadata/md5-cache/dev-qt/qtimageformats-5.11.3
index 8821114144a7..f205bade737f 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 media-libs/libwebp:= media-li
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=e2e2399303cbabfc91e9c9dd0e65ed23
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.12.3 b/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
index bc653fe1adf2..598be227444e 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=jpeg2k mng debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=ba25c26891ee658bf1bc13370c56c540
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=19a578a929c15d261fa913e6aea35cb9
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.11.3-r1 b/metadata/md5-cache/dev-qt/qtlocation-5.11.3-r1
index 80f56fb0b77c..37b9616f4ddf 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.11.3-r1
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.11.3-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=2628c7eccd932b55b6d3ce50729baea4
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.12.3 b/metadata/md5-cache/dev-qt/qtlocation-5.12.3
index 6219b65e26a6..919af7d308bd 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Location (places, maps, navigation) library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtpositioning-5.12.3[qml] ~dev-qt/qtsql-5.12.3 sys-libs/zlib dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=82cf244287ec4993562750dade210561
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=976a49377d178f459beb86d3fd738998
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.11.3 b/metadata/md5-cache/dev-qt/qtmultimedia-5.11.3
index 093fdda17c4b..b5183d5a6e8d 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[gles2=] ~dev-qt/qtnetwork-5.1
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=88522289df6c54883178f9e45b5ebd7e
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3 b/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3
index a81a462fa1cb..c6c9ae5690a0 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framewo
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtnetwork-5.12.3 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( ~dev-qt/qtdeclarative-5.12.3 gles2? ( ~dev-qt/qtgui-5.12.3[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.12.3 ~dev-qt/qtwidgets-5.12.3[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=67f987bc6735b410701f447b0d720ad5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=126c43a9e29c2c2c5e767b9b6311d7f5
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.11.3 b/metadata/md5-cache/dev-qt/qtnetwork-5.11.3
index 24a560882f9e..c21a125e9e3a 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=ad8f2c34872347ff0400c8d3ca43c7a4
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.12.3 b/metadata/md5-cache/dev-qt/qtnetwork-5.12.3
index 045bbbc54f9e..92d9b8bfdebd 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Network abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=bindist connman libproxy networkmanager sctp +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.12.3 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.12.3 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( dev-libs/openssl:0=[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=eafdaca374a141d67ba10039eb699728
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=079d5589d49f273fa6c32b1a4c17fd02
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.3 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.3
index e70e94e422b9..52caef69aef3 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtnetwork-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtnetworkauth-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=27c1d5d68310ee4a823023df03eff122
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.12.3 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.12.3
index 594dfb00727d..f9ef4e39bcf3 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Network authorization library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtnetwork-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=3a111ea98172c225f326dc7ef460728d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=012008ed0448d396bda6e1086dca16bf
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.11.3 b/metadata/md5-cache/dev-qt/qtopengl-5.11.3
index 94718072d7d1..2d3576db877a 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[gles2=] ~dev-qt/qtwidgets-5.1
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=b98dc2d9544788994ed69490f6cc8325
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.12.3 b/metadata/md5-cache/dev-qt/qtopengl-5.12.3
index 5daae6b24c76..8273c87de527 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtwidgets-5.12.3[gles2=] virtual/opengl dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=1c57150ca1d8cdb9e79dd8d6c61c2f12
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=c8cb5f342350e5a0ae17a65be1078e53
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.11.3 b/metadata/md5-cache/dev-qt/qtpaths-5.11.3
index 37ec86dd24b9..c8b6f833fd05 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=f020a0976f4911e1edf91436610bc78f
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.12.3 b/metadata/md5-cache/dev-qt/qtpaths-5.12.3
index 078cc003aba3..ad7cc8c9db6b 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Command line client to QStandardPaths
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=cf6765048b91005d32188a6fe2e90a04
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=1621dbfbc24f12242688bc05d08a02d2
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.11.3 b/metadata/md5-cache/dev-qt/qtplugininfo-5.11.3
index a56e0a30be62..0719766afaca 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=d1eb1ef7824fc56787216926732c38ea
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.12.3 b/metadata/md5-cache/dev-qt/qtplugininfo-5.12.3
index 527a5992607b..88b92d6cad3a 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.12.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=5b510814918b7a5b43c7ef436aca015c
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.11.3 b/metadata/md5-cache/dev-qt/qtpositioning-5.11.3
index 0b0f70f284a9..b7580f78e876 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.11.3
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 geoclue? ( ~dev-qt/qtdbus-5.11.3 ) qml? ( ~dev-qt/
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.11.3-geoclue2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=5149df36f2dd8ff3d7726ed0b48ecb14
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.12.3 b/metadata/md5-cache/dev-qt/qtpositioning-5.12.3
index 77666d90d153..6a039c50d665 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.12.3
@@ -4,12 +4,12 @@ DESCRIPTION=Physical position determination library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=geoclue +qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:2.0 )
 RDEPEND=~dev-qt/qtcore-5.12.3 geoclue? ( ~dev-qt/qtdbus-5.12.3 ) qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=31b79ad3d0773b2f402af22eb467e7d9
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=340b35e2f06dcae8ebfec6d7dfaf3a19
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.11.3 b/metadata/md5-cache/dev-qt/qtprintsupport-5.11.3
index 319f31807ba8..ce2e4dcb050c 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[gles2=] ~dev-qt/qtwidgets-5.1
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=49b1091d065d8ae817fe65cb04fcfbc4
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3 b/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3
index 8a2df86eabbf..b44333bd634c 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Printing support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=cups gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtwidgets-5.12.3[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=57f5ad085f264c0d972ecf2abc755924
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=e81e7f97d2ecc1c0bbb7c31a16cf4bc8
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.3 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.3
index 8f1da21a38d1..a2ed6ac735a9 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=7f935fc8446dadf4187a374387e2efed
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3
index 6fa52c080e5d..b42b1de26d9c 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of Qt Quick controls to create complete user interfaces (depreca
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 widgets? ( ~dev-qt/qtwidgets-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c3fae7a093cd2ebdf16c32bba7864363
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=6ba033ece5a6b9251d103421411e9da6
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.3 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.3
index b1150e26d513..118973984d3e 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=544dd37287338575a6a3c358812b05d9
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3
index 2bea7b34012a..04ccb8f79df1 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 widgets? ( ~dev-qt/qtwidgets-5.12.3 ) ~dev-qt/qtgraphicaleffects-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=fedfff200a97b841a770291ee8013bff
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=a01b1dcd758720d7eab013782870e805
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.11.3 b/metadata/md5-cache/dev-qt/qtscript-5.11.3
index b005ebcd3031..530fee4ad2f1 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtscript-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 scripttools? ( ~dev-qt/qtgui-5.11.3 ~dev-qt/qtwidg
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=cbfb9eba79945b0b4588b1d875f056d3
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.12.3 b/metadata/md5-cache/dev-qt/qtscript-5.12.3
index 374e6c864b06..92fc4c987047 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtscript-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+jit scripttools debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 scripttools? ( ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=5b8820182f2c47fc43f100891e9b0f8d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=2ceffab6b4bda93ce1e36370d047b9f1
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.11.3 b/metadata/md5-cache/dev-qt/qtscxml-5.11.3
index 8272eb0a3998..2abf1f436c01 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=393b5b27c510e952d46a08c419289a78
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.12.3 b/metadata/md5-cache/dev-qt/qtscxml-5.12.3
index d11ef365bda6..cbcebd3649ac 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtscxml-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=fbdc051df65217caf10948ea179db364
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=0da59c9f126883c6293a4d51a856b18d
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.11.3 b/metadata/md5-cache/dev-qt/qtsensors-5.11.3
index e88acc0ce500..470d249eeaad 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdbus-5.11.3 qml? ( ~dev-qt/qtdeclarative
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=03f4b0e4f0bfdffc522a75abddf0ae2c
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.12.3 b/metadata/md5-cache/dev-qt/qtsensors-5.12.3
index fd370c656e25..402f949385b6 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware sensor access library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c7db0f4612441fc66451ae3d87783ef8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=c435e26582396f31e9bd5c20f8885de8
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.11.3 b/metadata/md5-cache/dev-qt/qtserialbus-5.11.3
index 077b93e642d0..f52c31a40ad6 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtnetwork-5.11.3 ~dev-qt/qtserialport-5.11
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtserialbus-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=06701ed2c813e1071598dc8a25fac437
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.12.3 b/metadata/md5-cache/dev-qt/qtserialbus-5.12.3
index 0acd80e973c7..e8aaf9d39e1c 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.12.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtserialport-5.12
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtserialbus-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=9f8e68f8060fbc9c1893595ab4746b19
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.11.3 b/metadata/md5-cache/dev-qt/qtserialport-5.11.3
index 4171c0cd0824..c68166c64749 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=aa5d980652d81dc295f68752752674e8
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.12.3 b/metadata/md5-cache/dev-qt/qtserialport-5.12.3
index 6b3f8b6e91bd..c8f8ad8611d8 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c2a7e7edbd683c419b3222c057e600fa
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=3d86f47862aa92fd09dbc886f9c3557d
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.11.3 b/metadata/md5-cache/dev-qt/qtspeech-5.11.3
index 93ccb58fea56..6c540eaaa575 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.11.3 dev-qt
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtspeech-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=7e34eba5779d8a078588599c1539314f
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.12.3 b/metadata/md5-cache/dev-qt/qtspeech-5.12.3
index 728532f00039..d7b9eab0b75b 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Text-to-speech library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c74d5aaa4bd551325ca011692ca070d8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=28eb2235aec39ba39d62f15e5a9fcf0b
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.11.3 b/metadata/md5-cache/dev-qt/qtsql-5.11.3
index 846960c7dfea..2ea441cdf16b 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtsql-5.11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.11.3
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=edcf3966638a371d5ef1308ba5a696af
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.12.3 b/metadata/md5-cache/dev-qt/qtsql-5.12.3
index 70473215cb01..819ae506bde4 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtsql-5.12.3
@@ -4,12 +4,12 @@ DESCRIPTION=SQL abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) dev-qt/qtchooser
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.12.3
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c627714ccc277258397b215697dab099
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=2863f322d3acf9418efba8344d4e0983
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.11.3 b/metadata/md5-cache/dev-qt/qtsvg-5.11.3
index e865e59eb8ff..0d47557a283e 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtwidgets-5.11.3 >=sy
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=712f2b35036f76605671bb8cdd6240ab
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.12.3 b/metadata/md5-cache/dev-qt/qtsvg-5.12.3
index 887ab5c0e279..3d50aa51db98 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=SVG rendering library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 sys-libs/zlib:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=a06ef2524296fa4bac851ce73670ae92
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=2f139e7be836595beb6284cff6b142a0
diff --git a/metadata/md5-cache/dev-qt/qttest-5.11.3 b/metadata/md5-cache/dev-qt/qttest-5.11.3
index a876c37d6d77..de4b0bd35ec5 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.11.3
+++ b/metadata/md5-cache/dev-qt/qttest-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=eccc8f44980176fd2ab6f9b701235908
diff --git a/metadata/md5-cache/dev-qt/qttest-5.12.3 b/metadata/md5-cache/dev-qt/qttest-5.12.3
index a0c39b670d61..1f9418d16ccd 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.12.3
+++ b/metadata/md5-cache/dev-qt/qttest-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Unit testing library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=6d9f5f21a598f3cf87e9407e965764c7
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=2ebe76ad893a728461c767570ed56e9e
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.11.3 b/metadata/md5-cache/dev-qt/qttranslations-5.11.3
index 488a8f23953c..afc13cd20265 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.11.3
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttranslations-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=85a89c8067014ceb9c9bd3cbf05617a0
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.12.3 b/metadata/md5-cache/dev-qt/qttranslations-5.12.3
index aab6d7bff20b..913eac65392c 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.12.3
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Translation files for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=111169ffcf5dca1be539356958273ddd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=28f134cb0e9e8040126b90db05674443
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.3 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.3
index 05b7193614fb..5ae55c56796c 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=8ef1186d2c09b314f3af8e106b4891db
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3
index b278fcf990bf..600f95526947 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Customizable input framework and virtual keyboard for Qt
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=handwriting +spell +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm arm64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtsvg-5.12.3 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=d24a6c7f15df24ba368357560e2855df
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=1d2b7f14685f5e8d82c9ffb837c4e493
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.11.3 b/metadata/md5-cache/dev-qt/qtwayland-5.11.3
index 60bbe81d1828..2836ca7944f5 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.1
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=6b9423202154c0cd7086e43f0d8793f1
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.12.3 b/metadata/md5-cache/dev-qt/qtwayland-5.12.3
index e3bba9173d90..058200631f04 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Wayland platform plugin for Qt
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+libinput xcomposite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3[egl,libinput=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=f4645ea807e4df85ef43cbb898191fe5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=5085b23250a6bc851b5a2b83b40f1117
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.3 b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.3
index 69ba83751f44..f787c6ac24e0 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 qml? ( ~dev-qt/qtdeclarative-5.11.3 ) dev-qt/qtcho
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=a22b6d3242f26c85d84d36fb4e8de3fb
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3 b/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3
index cb1cd1becedb..b92c0e06e0f6 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaSc
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=1459a065827bed06db1d43d7c1c735ac
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=240acdaedea09a3da6c16ebd53e8caea
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.11.3 b/metadata/md5-cache/dev-qt/qtwebengine-5.11.3
index 329b41a3a2ce..2a11faf04a16 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=118d387d0360510aac5c441ad38cde64
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.12.3 b/metadata/md5-cache/dev-qt/qtwebengine-5.12.3
index f78ecd5537a3..20a4fc4129dc 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.12.3
@@ -4,12 +4,12 @@ DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applica
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtwebchannel-5.12.3[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 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 alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.12.3 ) geolocation? ( ~dev-qt/qtpositioning-5.12.3 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.12.3[widgets] ~dev-qt/qtwidgets-5.12.3 ) dev-qt/qtchooser
 REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=395c63990f65c0f51756af3a2e4fd422
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=f61095ebb834f0090a684649345e1a72
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120 b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
index 169fac7424c1..1b9451407190 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
@@ -4,11 +4,11 @@ DESCRIPTION=WebKit rendering library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X
-KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=BSD LGPL-2+
 RDEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5= media-libs/libpng:0= virtual/jpeg:0 geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-bad:1.0 ) hyphen? ( dev-libs/hyphen ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5[gles2=] ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtwebchannel-5.9.1:5[qml] ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender )
 REQUIRED_USE=nsplugin? ( X ) qml? ( opengl ) ?? ( gstreamer multimedia )
 SLOT=5/5.212
 SRC_URI=mirror://gentoo/qtwebkit-5.212.0_pre20180120.tar.gz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8b4013757950afa859d2a1d27ff0d35e
+_md5_=1ea4bb3d38f3620e8149677b78e57b61
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.3 b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.3
index 6e16216cffee..65e28f78c7db 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtnetwork-5.11.3[ssl=] qml? ( ~dev-qt/qtde
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=beaabcda6870b8c38274677339879734
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3 b/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3
index 901a57763c64..be5f9f98775a 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtnetwork-5.12.3[ssl=] qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=051c69b713eb37976ee6bf0468a930df
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=35106d08e1bb973ff6bc86ca7ede6785
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.11.3 b/metadata/md5-cache/dev-qt/qtwebview-5.11.3
index ee802da47eda..bc2930c0489e 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebview-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=ef6a6dde3bffb10cfcc18e36d4521f7f
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.12.3 b/metadata/md5-cache/dev-qt/qtwebview-5.12.3
index 4529ef8c37b7..4b5e97c1572b 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.12.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebview-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=833884a8416d2d2652db58811ab2ecf9
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.11.3 b/metadata/md5-cache/dev-qt/qtwidgets-5.11.3
index 3e2a18e09dbe..c60952f354a0 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[gles2=,png=,xcb?] gtk? ( ~dev
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=476caab411b5ceac3a74dbd47227c12f
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.12.3 b/metadata/md5-cache/dev-qt/qtwidgets-5.12.3
index 6f410de8a88e..255213257703 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 gtk +png +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.12.3[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=b3f9b8531940ff0776168abbda939a0e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=1333c43c902d49453ada74d840892599
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.11.3 b/metadata/md5-cache/dev-qt/qtx11extras-5.11.3
index 1c31915f4c73..78877c4a4844 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=a7627e97c895ddbf0720e9a5b5f9409e
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.12.3 b/metadata/md5-cache/dev-qt/qtx11extras-5.12.3
index 1b1b10ca1723..6913f1c48dee 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=d51783cc795dbe4f1f416558aa6e4029
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=4b8c51f713a348296ac480f8033f3c06
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.11.3 b/metadata/md5-cache/dev-qt/qtxml-5.11.3
index 0c00a3e867d0..566cce4b8362 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtxml-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=d3b088ee12285a786ab451e0ab6253bb
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.12.3 b/metadata/md5-cache/dev-qt/qtxml-5.12.3
index 3479d20c6e3d..e91d4f7963e5 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtxml-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=bcf4120de1da275c8b9bb4552ee9edeb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=c1afc3ba7057b03049aef72cf59793f1
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.3 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.3
index be3ad82508e9..8a46650933b5 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtnetwork-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=a2b6ad2caeb7d78fe4a1785aacdb79c8
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3
index 83bc95de9110..aabaf0cafeef 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 f
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtnetwork-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=5a6b69f3caf4da276aed363552e04f1f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	aea449c80f3d26d449f3a71157fa6f5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=3b7d6da7cd07f29f9a3aa4163a4a4f49
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index d8bbe2a76414..1d8e61b343d6 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.1 b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.1
new file mode 100644
index 000000000000..ca4325d1d170
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/imu_complementary_filter https://github.com/ccny-ros-pkg/imu_tools
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.1.tar.gz -> imu_tools-1.2.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=27d06068df0c28cd50786f7579a623c5
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.1 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.1
new file mode 100644
index 000000000000..347735e6d410
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure dev-libs/boost:=[threads] test? ( dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/imu_filter_madgwick https://github.com/ccny-ros-pkg/imu_tools
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.1.tar.gz -> imu_tools-1.2.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6868245c8b7f73e8c70a302ff83ddf6a
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
new file mode 100644
index 000000000000..994fb21a1152
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),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://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=5ad412319fe00f2a38c78d2b3601abef
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.4 b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
new file mode 100644
index 000000000000..4bb2cc90352b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/xacro[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://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=bdf8201b4afc3fe31688b34f0da72f8a
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.4 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
new file mode 100644
index 000000000000..30498c9f5b67
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=85b2fd0252f07ba19f84b65930f278c6
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
new file mode 100644
index 000000000000..bbb1889b6a5f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=3a96d9f43547be20dfe29f3e912200c7
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.11.1 b/metadata/md5-cache/dev-ros/rosapi-0.11.1
new file mode 100644
index 000000000000..400df401818f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosapi-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Provides service calls for getting ros meta-information, like list of topics, services, params, etc.
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosapi https://github.com/RobotWebTools/rosbridge_suite
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.1.tar.gz -> rosbridge_suite-0.11.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=464b4edce9530738b949ffec504bc30c
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.1 b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.1
new file mode 100644
index 000000000000..ca1f0c48fa05
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cbor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy_tutorials[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/stereo_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/trajectory_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosbridge_library https://github.com/RobotWebTools/rosbridge_suite
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cbor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.1.tar.gz -> rosbridge_suite-0.11.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=24e47598c81babba9e84a191baf13ba2
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.1 b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.1
new file mode 100644
index 000000000000..13a6ea5bde1a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A WebSocket interface to rosbridge
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosbridge_server https://github.com/RobotWebTools/rosbridge_suite
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[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://github.com/RobotWebTools/rosbridge_suite/archive/0.11.1.tar.gz -> rosbridge_suite-0.11.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=51974de511e79a491f07975a3e25c048
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.9.1 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.9.1
new file mode 100644
index 000000000000..8ca7fedb61fe
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Attempts to show the features of ROS step-by-step, including using messages, servers, parameters
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/roscpp_tutorials https://github.com/ros/ros_tutorials
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_tutorials/archive/0.9.1.tar.gz -> ros_tutorials-0.9.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=1e0fdf56113f068c28540eaa043cf467
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.9.1 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.9.1
new file mode 100644
index 000000000000..499a0e0e02d6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Attempts to show the features of ROS step-by-step, including using messages, servers, parameters
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rospy_tutorials https://github.com/ros/ros_tutorials
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_tutorials/archive/0.9.1.tar.gz -> ros_tutorials-0.9.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=18e6b69d6b8d45266a13b2295d0c1e45
diff --git a/metadata/md5-cache/dev-ros/rviz-1.13.3 b/metadata/md5-cache/dev-ros/rviz-1.13.3
new file mode 100644
index 000000000000..0d8442ba8fa2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rviz-1.13.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:= virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=3D visualization tool for ROS
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:= virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rviz/archive/1.13.3.tar.gz -> rviz-1.13.3.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=245be5a30dc511d5b1d3d2dd534d85f1
diff --git a/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.1 b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.1
new file mode 100644
index 000000000000..5fbdb2d2881e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=RVIZ plugin for IMU visualization
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rviz_imu_plugin https://github.com/ccny-ros-pkg/imu_tools
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.1.tar.gz -> imu_tools-1.2.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=d45f1d29b4e505fb374221c20969cb86
diff --git a/metadata/md5-cache/dev-ros/std_msgs-0.5.12 b/metadata/md5-cache/dev-ros/std_msgs-0.5.12
new file mode 100644
index 000000000000..5e2427bec97a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/std_msgs-0.5.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Standard ROS Messages
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/std_msgs https://github.com/ros/std_msgs
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/std_msgs/archive/0.5.12.tar.gz -> std_msgs-0.5.12.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=cd11e9144f6e0f738ed5a13c5e56d39a
diff --git a/metadata/md5-cache/dev-ros/turtlesim-0.9.1 b/metadata/md5-cache/dev-ros/turtlesim-0.9.1
new file mode 100644
index 000000000000..d10ce3cafa24
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Tool made for teaching ROS and ROS packages
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/turtlesim https://github.com/ros/ros_tutorials
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_tutorials/archive/0.9.1.tar.gz -> ros_tutorials-0.9.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=21bef44e047a89868b17c76401d7e0c6
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 90b95023c7d6..81bdb73756c9 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/acme-client-2.0.3 b/metadata/md5-cache/dev-ruby/acme-client-2.0.3
new file mode 100644
index 000000000000..83436d427fb7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/acme-client-2.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/vcr-2.9.3[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/vcr-2.9.3[ruby_targets_ruby25] dev-ruby/webmock[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/vcr-2.9.3[ruby_targets_ruby26] dev-ruby/webmock[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A Ruby client for the letsencrypt's ACME protocol.
+EAPI=6
+HOMEPAGE=https://github.com/unixcharles/acme-client
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/unixcharles/acme-client/archive/v2.0.3.tar.gz -> acme-client-2.0.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=6b9a62dfa2d612ee8a50c4d90f297658
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
new file mode 100644
index 000000000000..74eb1ce8b9b1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] dev-ruby/rspec-expectations:*[ruby_targets_ruby24] dev-ruby/asciimath[ruby_targets_ruby24] dev-ruby/coderay[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/haml[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/slim[ruby_targets_ruby24] dev-ruby/thread_safe[ruby_targets_ruby24] dev-ruby/tilt[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25] dev-ruby/rspec-expectations:*[ruby_targets_ruby25] dev-ruby/asciimath[ruby_targets_ruby25] dev-ruby/coderay[ruby_targets_ruby25] dev-ruby/erubis[ruby_targets_ruby25] dev-ruby/haml[ruby_targets_ruby25] dev-ruby/nokogiri[ruby_targets_ruby25] dev-ruby/slim[ruby_targets_ruby25] dev-ruby/thread_safe[ruby_targets_ruby25] dev-ruby/tilt[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26] dev-ruby/rspec-expectations:*[ruby_targets_ruby26] dev-ruby/asciimath[ruby_targets_ruby26] dev-ruby/coderay[ruby_targets_ruby26] dev-ruby/erubis[ruby_targets_ruby26] dev-ruby/haml[ruby_targets_ruby26] dev-ruby/nokogiri[ruby_targets_ruby26] dev-ruby/slim[ruby_targets_ruby26] dev-ruby/thread_safe[ruby_targets_ruby26] dev-ruby/tilt[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats
+EAPI=6
+HOMEPAGE=https://github.com/asciidoctor/asciidoctor
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.10.tar.gz -> asciidoctor-2.0.10.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=36a178caf2e85d75215effbc168b9773
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.17 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.17
new file mode 100644
index 000000000000..6405fb790943
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby24] <dev-ruby/asciidoctor-3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby25] <dev-ruby/asciidoctor-3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby26] <dev-ruby/asciidoctor-3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A set of Asciidoctor extensions that enable you to add diagrams
+EAPI=6
+HOMEPAGE=https://github.com/asciidoctor/asciidoctor-diagram
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby24] <dev-ruby/asciidoctor-3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby25] <dev-ruby/asciidoctor-3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby26] <dev-ruby/asciidoctor-3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v1.5.17.tar.gz -> asciidoctor-diagram-1.5.17.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=70dffb82876c0aab9ad5fa44e9fc15f3
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.18 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.18
new file mode 100644
index 000000000000..d0e7f3b75c8d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby24] <dev-ruby/asciidoctor-3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby25] <dev-ruby/asciidoctor-3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby26] <dev-ruby/asciidoctor-3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A set of Asciidoctor extensions that enable you to add diagrams
+EAPI=6
+HOMEPAGE=https://github.com/asciidoctor/asciidoctor-diagram
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby24] <dev-ruby/asciidoctor-3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby25] <dev-ruby/asciidoctor-3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby26] <dev-ruby/asciidoctor-3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v1.5.18.tar.gz -> asciidoctor-diagram-1.5.18.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=70dffb82876c0aab9ad5fa44e9fc15f3
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.4.5 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.4.5
deleted file mode 100644
index e20bdf7cc4ea..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rails[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/rspec-rails[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=6
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=9
-SRC_URI=mirror://rubygems/autoprefixer-rails-9.4.5.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=13a89f50c89c799d94438a5cf406c7dc
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.4.7 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.4.7
deleted file mode 100644
index 8d79a1c43ec1..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rails[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/rspec-rails[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=6
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=9
-SRC_URI=mirror://rubygems/autoprefixer-rails-9.4.7.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=13a89f50c89c799d94438a5cf406c7dc
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.5.1.1 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.5.1.1
new file mode 100644
index 000000000000..e3a359c9f9c0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.5.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/rspec-rails[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby26] dev-ruby/rake[ruby_targets_ruby26] dev-ruby/rspec-rails[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
+EAPI=6
+HOMEPAGE=https://github.com/ai/autoprefixer-rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=9
+SRC_URI=mirror://rubygems/autoprefixer-rails-9.5.1.1.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=4a3acb92e770c0a12924bf585e7d2a2f
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.7 b/metadata/md5-cache/dev-ruby/barby-0.6.7
new file mode 100644
index 000000000000..ac7bec08a011
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby24] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby25] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby25] ) ) ) test? ( ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby25] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby25] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby25] ) ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Ruby barcode generator that doesn't rely on 3rd party libraries
+EAPI=6
+HOMEPAGE=http://toreto.re/barby/
+IUSE=test qrcode rmagick prawn png cairo test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby24] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby25] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby25] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby25] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=prawn? ( test )
+SLOT=0
+SRC_URI=https://github.com/toretore/barby/archive/v0.6.7.tar.gz -> barby-0.6.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=5803d623956648eb2b897df8a7b77ab1
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.8 b/metadata/md5-cache/dev-ruby/barby-0.6.8
new file mode 100644
index 000000000000..870cf4e38d17
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby24] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby25] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby25] ) ) ) test? ( ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby25] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby25] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby25] ) ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Ruby barcode generator that doesn't rely on 3rd party libraries
+EAPI=6
+HOMEPAGE=http://toreto.re/barby/
+IUSE=test qrcode rmagick prawn png cairo test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby24] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby25] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby25] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby25] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=prawn? ( test )
+SLOT=0
+SRC_URI=https://github.com/toretore/barby/archive/v0.6.8.tar.gz -> barby-0.6.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=5803d623956648eb2b897df8a7b77ab1
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.12 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.12
index 5817746f7b42..40e51cda4c0f 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.12
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.12
@@ -4,11 +4,11 @@ DESCRIPTION=An easy way to keep your users' passwords secure
 EAPI=6
 HOMEPAGE=https://github.com/codahale/bcrypt-ruby
 IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcrypt-3.1.12.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9dc208bd3d97c74dbbd52261af7d209a
+_md5_=2712dca0acbf6b030650beb23d431812
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.13 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.13
new file mode 100644
index 000000000000..b2f1ed1551a8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=An easy way to keep your users' passwords secure
+EAPI=6
+HOMEPAGE=https://github.com/codahale/bcrypt-ruby
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/bcrypt-3.1.13.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9dc208bd3d97c74dbbd52261af7d209a
diff --git a/metadata/md5-cache/dev-ruby/bson-4.5.0 b/metadata/md5-cache/dev-ruby/bson-4.5.0
new file mode 100644
index 000000000000..9c687221ad84
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bson-4.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
+EAPI=6
+HOMEPAGE=https://www.mongodb.org/
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=APSL-2
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=4
+SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.5.0.tar.gz -> bson-4.5.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=04b9180fa65f193af26a354a37536b94
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.15.0 b/metadata/md5-cache/dev-ruby/capybara-3.15.0
deleted file mode 100644
index fbca2fd4ca67..000000000000
--- a/metadata/md5-cache/dev-ruby/capybara-3.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( || ( www-client/firefox www-client/firefox-bin ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby24] dev-ruby/sinatra:2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby25] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby25] dev-ruby/sinatra:2[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
-EAPI=6
-HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=3
-SRC_URI=mirror://rubygems/capybara-3.15.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=9089d16e560a9396c87a34c4057fa41a
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.16.2 b/metadata/md5-cache/dev-ruby/capybara-3.16.2
index 82a719ae6961..a2c7e629f196 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.16.2
+++ b/metadata/md5-cache/dev-ruby/capybara-3.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Capybara aims to simplify the process of integration testing Rack ap
 EAPI=6
 HOMEPAGE=https://github.com/jnicklas/capybara
 IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=3
 SRC_URI=mirror://rubygems/capybara-3.16.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=7fcd09df03873fdd111ad13b8b49cfcd
+_md5_=c0db59d72a67f3d35c50e7b5384a2dbc
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.18.0 b/metadata/md5-cache/dev-ruby/capybara-3.18.0
index 97840119fd4f..316b57a7d96a 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.18.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.18.0
@@ -4,11 +4,11 @@ DESCRIPTION=Capybara aims to simplify the process of integration testing Rack ap
 EAPI=6
 HOMEPAGE=https://github.com/jnicklas/capybara
 IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=mirror://rubygems/capybara-3.18.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=ad89786d2abf73ef7551f1b9ff678c2c
+_md5_=13cb9fc8780a68351a0de7e6d88fea4a
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.19.0 b/metadata/md5-cache/dev-ruby/capybara-3.19.0
deleted file mode 100644
index 7c240ed590ee..000000000000
--- a/metadata/md5-cache/dev-ruby/capybara-3.19.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( || ( www-client/firefox www-client/firefox-bin ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby24] dev-ruby/sinatra:2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby25] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby25] dev-ruby/sinatra:2[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby26] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby26] dev-ruby/sinatra:2[ruby_targets_ruby26] www-servers/puma[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
-EAPI=6
-HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=3
-SRC_URI=mirror://rubygems/capybara-3.19.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=ad89786d2abf73ef7551f1b9ff678c2c
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.20.1 b/metadata/md5-cache/dev-ruby/capybara-3.20.1
deleted file mode 100644
index a32fbf70ee1b..000000000000
--- a/metadata/md5-cache/dev-ruby/capybara-3.20.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( || ( www-client/firefox www-client/firefox-bin ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby24] dev-ruby/sinatra:2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby25] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby25] dev-ruby/sinatra:2[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby26] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby26] dev-ruby/sinatra:2[ruby_targets_ruby26] www-servers/puma[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] dev-ruby/uglifier:*[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] dev-ruby/uglifier:*[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] dev-ruby/uglifier:*[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
-EAPI=6
-HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] dev-ruby/uglifier:*[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] dev-ruby/uglifier:*[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] dev-ruby/uglifier:*[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=3
-SRC_URI=mirror://rubygems/capybara-3.20.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=b705b187257b810a988af5e55b1246d6
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.20.2 b/metadata/md5-cache/dev-ruby/capybara-3.20.2
new file mode 100644
index 000000000000..9d2015de16dd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-3.20.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( || ( www-client/firefox www-client/firefox-bin ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby24] dev-ruby/sinatra:2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby25] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby25] dev-ruby/sinatra:2[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby26] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby26] dev-ruby/sinatra:2[ruby_targets_ruby26] www-servers/puma[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] dev-ruby/uglifier:*[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] dev-ruby/uglifier:*[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] dev-ruby/uglifier:*[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
+EAPI=6
+HOMEPAGE=https://github.com/jnicklas/capybara
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] dev-ruby/uglifier:*[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] dev-ruby/uglifier:*[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] dev-ruby/uglifier:*[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/capybara-3.20.2.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=b705b187257b810a988af5e55b1246d6
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.21.0 b/metadata/md5-cache/dev-ruby/capybara-3.21.0
new file mode 100644
index 000000000000..7d893f19600c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-3.21.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( || ( www-client/firefox www-client/firefox-bin ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby24] dev-ruby/sinatra:2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby25] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby25] dev-ruby/sinatra:2[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby26] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby26] dev-ruby/sinatra:2[ruby_targets_ruby26] www-servers/puma[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
+EAPI=6
+HOMEPAGE=https://github.com/jnicklas/capybara
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/capybara-3.21.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=ad89786d2abf73ef7551f1b9ff678c2c
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.22.0 b/metadata/md5-cache/dev-ruby/capybara-3.22.0
new file mode 100644
index 000000000000..b9bf2af51637
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-3.22.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( || ( www-client/firefox www-client/firefox-bin ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby24] dev-ruby/sinatra:2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby25] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby25] dev-ruby/sinatra:2[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby26] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby26] dev-ruby/sinatra:2[ruby_targets_ruby26] www-servers/puma[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
+EAPI=6
+HOMEPAGE=https://github.com/jnicklas/capybara
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/capybara-3.22.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=9c1cd1964a2c9007b5669512bf566080
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
index d5a9e8f5af70..66ac247604f9 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=Modern concurrency tools including agents, futures, promises, thread
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/concurrent-ruby
 IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.0.5.tar.gz -> concurrent-ruby-1.0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=31b9ac8ba480266bbae83b43265e1e3e
+_md5_=936414de1be4459db0364e4f4321b20e
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.1 b/metadata/md5-cache/dev-ruby/cri-2.15.1
deleted file mode 100644
index 38e152c99425..000000000000
--- a/metadata/md5-cache/dev-ruby/cri-2.15.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/colored-1.2[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/yard[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Cri is a library for building easy-to-use commandline tools
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/cri
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/colored-1.2[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/cri-2.15.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4d2050ad00fec9d4af1806a8e06e5b1b
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.2 b/metadata/md5-cache/dev-ruby/cri-2.15.2
deleted file mode 100644
index 728f306810d6..000000000000
--- a/metadata/md5-cache/dev-ruby/cri-2.15.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/colored-1.2[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/yard[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Cri is a library for building easy-to-use commandline tools
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/cri
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/colored-1.2[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/cri-2.15.2.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d25da3d83b09ef7f9c803295be9b3078
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.3 b/metadata/md5-cache/dev-ruby/cri-2.15.3
deleted file mode 100644
index 56a12c006bb4..000000000000
--- a/metadata/md5-cache/dev-ruby/cri-2.15.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/colored-1.2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/colored-1.2[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/yard[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) test? ( dev-ruby/yard[ruby_targets_ruby26] dev-ruby/minitest[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=Cri is a library for building easy-to-use commandline tools
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/cri
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/colored-1.2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/colored-1.2[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=mirror://rubygems/cri-2.15.3.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=09a59f9bf2ad9ce38efb73edf331ff10
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.7 b/metadata/md5-cache/dev-ruby/cri-2.15.7
new file mode 100644
index 000000000000..0c7e080dc2ae
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/cri-2.15.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/yard[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) test? ( dev-ruby/yard[ruby_targets_ruby26] dev-ruby/minitest[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Cri is a library for building easy-to-use commandline tools
+EAPI=6
+HOMEPAGE=https://rubygems.org/gems/cri
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/cri-2.15.7.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=e1ea6ebc0032c51ca47b237a4144152b
diff --git a/metadata/md5-cache/dev-ruby/cri-2.7.1 b/metadata/md5-cache/dev-ruby/cri-2.7.1
deleted file mode 100644
index 8ea9f2484a7f..000000000000
--- a/metadata/md5-cache/dev-ruby/cri-2.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/colored-1.2[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/yard[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Cri is a library for building easy-to-use commandline tools
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/cri
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/colored-1.2[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/cri-2.7.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7507b179ad330b172faf8132ee940ccf
diff --git a/metadata/md5-cache/dev-ruby/delayer-1.0.0 b/metadata/md5-cache/dev-ruby/delayer-1.0.0
new file mode 100644
index 000000000000..8ea6877fcd34
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/delayer-1.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Delay the processing
+EAPI=6
+HOMEPAGE=https://rubygems.org/gems/delayer
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1
+SRC_URI=mirror://rubygems/delayer-1.0.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=124d85731e80d9b23867578ad7bda51b
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-2.1.0 b/metadata/md5-cache/dev-ruby/delayer-deferred-2.1.0
new file mode 100644
index 000000000000..8fc221013313
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/delayer-deferred-2.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/delayer:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/delayer:1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/delayer:1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby implementation of JSDeferred
+EAPI=6
+HOMEPAGE=https://github.com/toshia/delayer-deferred
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/delayer:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/delayer:1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/delayer:1[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/delayer-deferred-2.1.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=3e12ddb5db60d696f1b5d989aa2721d0
diff --git a/metadata/md5-cache/dev-ruby/diva-1.0.0 b/metadata/md5-cache/dev-ruby/diva-1.0.0
new file mode 100644
index 000000000000..6bbc7f2cd261
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/diva-1.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( <dev-ruby/addressable-2.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/addressable-2.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( <dev-ruby/addressable-2.7[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Implementation of expression for handling things.
+EAPI=6
+HOMEPAGE=https://github.com/toshia/diva
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( <dev-ruby/addressable-2.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/addressable-2.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( <dev-ruby/addressable-2.7[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/toshia/diva/archive/v1.0.0.tar.gz -> diva-1.0.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=bda664a5620b95ff66d560302cbab27b
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.0 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.0
new file mode 100644
index 000000000000..304580e37a42
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby24] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby25] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby26] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/ansi[ruby_targets_ruby24] dev-ruby/elasticsearch-transport[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/shoulda-context[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/ansi[ruby_targets_ruby25] dev-ruby/elasticsearch-transport[ruby_targets_ruby25] dev-ruby/mocha:1.0[ruby_targets_ruby25] dev-ruby/pry[ruby_targets_ruby25] dev-ruby/shoulda-context[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) test? ( dev-ruby/ansi[ruby_targets_ruby26] dev-ruby/elasticsearch-transport[ruby_targets_ruby26] dev-ruby/mocha:1.0[ruby_targets_ruby26] dev-ruby/pry[ruby_targets_ruby26] dev-ruby/shoulda-context[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby integrations for ES, elasticsearch module
+EAPI=6
+HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby24? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby24] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby25] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby26] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=test
+SLOT=6
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.0.tar.gz -> elasticsearch-ruby-6.8.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=affd8182ee7aefa4684c12298664a4a8
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.0 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.0
new file mode 100644
index 000000000000..809566d43999
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/multi_json[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/multi_json[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/multi_json[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/ansi[ruby_targets_ruby24] dev-ruby/elasticsearch-transport[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/shoulda-context[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/ansi[ruby_targets_ruby25] dev-ruby/elasticsearch-transport[ruby_targets_ruby25] dev-ruby/mocha:1.0[ruby_targets_ruby25] dev-ruby/pry[ruby_targets_ruby25] dev-ruby/shoulda-context[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) test? ( dev-ruby/ansi[ruby_targets_ruby26] dev-ruby/elasticsearch-transport[ruby_targets_ruby26] dev-ruby/mocha:1.0[ruby_targets_ruby26] dev-ruby/pry[ruby_targets_ruby26] dev-ruby/shoulda-context[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby integrations for ES, elasticsearch-api module
+EAPI=6
+HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/multi_json[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/multi_json[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/multi_json[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.0.tar.gz -> elasticsearch-ruby-6.8.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=4abc425e6b6e34b474d6046a1f3c5e0a
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.0 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.0
new file mode 100644
index 000000000000..40c187288282
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/faraday[ruby_targets_ruby24] dev-ruby/multi_json[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/faraday[ruby_targets_ruby25] dev-ruby/multi_json[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/faraday[ruby_targets_ruby26] dev-ruby/multi_json[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/ansi[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/shoulda-context[ruby_targets_ruby24] dev-ruby/curb[ruby_targets_ruby24] dev-ruby/patron[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/ansi[ruby_targets_ruby25] dev-ruby/mocha:1.0[ruby_targets_ruby25] dev-ruby/pry[ruby_targets_ruby25] dev-ruby/shoulda-context[ruby_targets_ruby25] dev-ruby/curb[ruby_targets_ruby25] dev-ruby/patron[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) test? ( dev-ruby/ansi[ruby_targets_ruby26] dev-ruby/mocha:1.0[ruby_targets_ruby26] dev-ruby/pry[ruby_targets_ruby26] dev-ruby/shoulda-context[ruby_targets_ruby26] dev-ruby/curb[ruby_targets_ruby26] dev-ruby/patron[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby integrations for ES, elasticsearch-transport module
+EAPI=6
+HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/faraday[ruby_targets_ruby24] dev-ruby/multi_json[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/faraday[ruby_targets_ruby25] dev-ruby/multi_json[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/faraday[ruby_targets_ruby26] dev-ruby/multi_json[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.0.tar.gz -> elasticsearch-ruby-6.8.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=3aa1a9a7aa5fb1b51b4b6c9a58ba7e32
diff --git a/metadata/md5-cache/dev-ruby/facter-3.12.3 b/metadata/md5-cache/dev-ruby/facter-3.12.3
index 01182e130b50..dac3419cdfc0 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.12.3
+++ b/metadata/md5-cache/dev-ruby/facter-3.12.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=6
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.12.3.tar.gz -> facter-3.12.3.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=aeb82aa9abea942d61fa50fc381e311c
+_md5_=fa89c585427d9efb4a0b2b978ae8c6e1
diff --git a/metadata/md5-cache/dev-ruby/facter-3.12.4 b/metadata/md5-cache/dev-ruby/facter-3.12.4
index d2a8fddd1e50..4ecd14ed14ae 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.12.4
+++ b/metadata/md5-cache/dev-ruby/facter-3.12.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=6
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.12.4.tar.gz -> facter-3.12.4.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=aeb82aa9abea942d61fa50fc381e311c
+_md5_=fa89c585427d9efb4a0b2b978ae8c6e1
diff --git a/metadata/md5-cache/dev-ruby/facter-3.13.0 b/metadata/md5-cache/dev-ruby/facter-3.13.0
index 5b23174b96a6..4d546a4af903 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.13.0
+++ b/metadata/md5-cache/dev-ruby/facter-3.13.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=6
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.13.0.tar.gz -> facter-3.13.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=aeb82aa9abea942d61fa50fc381e311c
+_md5_=fa89c585427d9efb4a0b2b978ae8c6e1
diff --git a/metadata/md5-cache/dev-ruby/facter-3.13.2 b/metadata/md5-cache/dev-ruby/facter-3.13.2
deleted file mode 100644
index d87082b813e0..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.13.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=6
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.13.2.tar.gz -> facter-3.13.2.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9a4044c1f3dcb40edf49a5b02c4848f9
diff --git a/metadata/md5-cache/dev-ruby/facter-3.13.2-r1 b/metadata/md5-cache/dev-ruby/facter-3.13.2-r1
new file mode 100644
index 000000000000..3e1b2ee8fc53
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/facter-3.13.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
+EAPI=6
+HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/puppetlabs/facter/archive/3.13.2.tar.gz -> facter-3.13.2.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=3b61f105ef5d40b0605e87940b764d3b
diff --git a/metadata/md5-cache/dev-ruby/facter-3.9.2 b/metadata/md5-cache/dev-ruby/facter-3.9.2
deleted file mode 100644
index 95d7dfffedde..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.9.2
+++ /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.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=6
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby24
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 sparc 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.9.2.tar.gz -> facter-3.9.2.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=58710b72d38a31960e7b746f34e4e6e4
diff --git a/metadata/md5-cache/dev-ruby/facter-3.9.2-r1 b/metadata/md5-cache/dev-ruby/facter-3.9.2-r1
new file mode 100644
index 000000000000..d04711cc72f3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/facter-3.9.2-r1
@@ -0,0 +1,14 @@
+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:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
+EAPI=6
+HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby24
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 sparc x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/openssl:0= 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_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/puppetlabs/facter/archive/3.9.2.tar.gz -> facter-3.9.2.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=258e58f5135029f3ac460dd473199e8c
diff --git a/metadata/md5-cache/dev-ruby/facter-9999 b/metadata/md5-cache/dev-ruby/facter-9999
index b785f657c139..21b94796971f 100644
--- a/metadata/md5-cache/dev-ruby/facter-9999
+++ b/metadata/md5-cache/dev-ruby/facter-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=6
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=db52d6b57bb22edaa027290fa6a054f2
+_md5_=a90780e1ee0d800253eeacb54be75ac7
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.11.3 b/metadata/md5-cache/dev-ruby/fakefs-0.11.3
deleted file mode 100644
index d91a6a726783..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-0.11.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A fake filesystem. Use it in your tests
-EAPI=6
-HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby24 doc test
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/defunkt/fakefs/archive/v0.11.3.tar.gz -> fakefs-0.11.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a002c8fccdca8aa8a9e4555f690fa782
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.19.2 b/metadata/md5-cache/dev-ruby/fakefs-0.19.2
index cfaa6019b928..4e6e70fadc17 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.19.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.19.2
@@ -4,11 +4,11 @@ DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=6
 HOMEPAGE=https://github.com/defunkt/fakefs
 IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v0.19.2.tar.gz -> fakefs-0.19.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=29f4a1da0326c2453dabd7297977ce9c
+_md5_=001a51dd0de47480c03d9e27d720733c
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.11.1 b/metadata/md5-cache/dev-ruby/ffi-1.11.1
new file mode 100644
index 000000000000..be4f2c3023c3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ffi-1.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=virtual/libffi ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
+EAPI=6
+HOMEPAGE=https://wiki.github.com/ffi/ffi
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=virtual/libffi ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/ffi/ffi/archive/1.11.1.tar.gz -> ffi-git-1.11.1.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0e616b720257b0a0f759093bc880fbd4
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.8.0 b/metadata/md5-cache/dev-ruby/google-protobuf-3.8.0
new file mode 100644
index 000000000000..f49622d0ff5b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( >=dev-libs/protobuf-3.7.0 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Protocol Buffers are Google's data interchange format
+EAPI=6
+HOMEPAGE=https://developers.google.com/protocol-buffers
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz -> google-protobuf-3.8.0-ruby.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=556bc9a52d9c0cdea4786996ca912918
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.18 b/metadata/md5-cache/dev-ruby/gpgme-2.0.18
index aca32d1f04f2..b842da6d5cec 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.18
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEPEND=>=app-crypt/gpgme-1.1.3 test? ( >=app-crypt/gpgme-1.13.0 ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Ruby language binding for GnuPG Made Easy
 EAPI=6
 HOMEPAGE=https://github.com/ueno/ruby-gpgme
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/v2.0.18.tar.gz -> ruby-gpgme-2.0.18.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=656cc491e6620fa9cab93aa4d301ebb0
+_md5_=f343291f0bd9ddafae7fd417988d58b7
diff --git a/metadata/md5-cache/dev-ruby/haml-5.1.1 b/metadata/md5-cache/dev-ruby/haml-5.1.1
new file mode 100644
index 000000000000..d9f27c6e5599
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/haml-5.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby24] dev-ruby/tilt:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby25] dev-ruby/tilt:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby26] dev-ruby/tilt:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/railties:5.2[ruby_targets_ruby24] dev-ruby/activemodel:5.2[ruby_targets_ruby24] dev-ruby/actionpack:5.2[ruby_targets_ruby24] ) doc? ( dev-ruby/yard[ruby_targets_ruby24] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/nokogiri[ruby_targets_ruby25] dev-ruby/railties:5.2[ruby_targets_ruby25] dev-ruby/activemodel:5.2[ruby_targets_ruby25] dev-ruby/actionpack:5.2[ruby_targets_ruby25] ) doc? ( dev-ruby/yard[ruby_targets_ruby25] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/nokogiri[ruby_targets_ruby26] dev-ruby/railties:5.2[ruby_targets_ruby26] dev-ruby/activemodel:5.2[ruby_targets_ruby26] dev-ruby/actionpack:5.2[ruby_targets_ruby26] ) doc? ( dev-ruby/yard[ruby_targets_ruby26] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A ruby web page templating engine
+EAPI=6
+HOMEPAGE=http://haml.info/
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~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-4.0.7-r2 ruby_targets_ruby24? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby24] dev-ruby/tilt:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby25] dev-ruby/tilt:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby26] dev-ruby/tilt:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=5
+SRC_URI=https://github.com/haml/haml/archive/v5.1.1.tar.gz -> haml-5.1.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=375b18481e014c9b4ac26393e1b87e1b
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1 b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
new file mode 100644
index 000000000000..a623aeee70bb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby24] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby24] >=dev-ruby/railties-5.1:*[ruby_targets_ruby24] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby24] <dev-ruby/haml-6:*[ruby_targets_ruby24] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby25] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby25] >=dev-ruby/railties-5.1:*[ruby_targets_ruby25] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby25] <dev-ruby/haml-6:*[ruby_targets_ruby25] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby26] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby26] >=dev-ruby/railties-5.1:*[ruby_targets_ruby26] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby26] <dev-ruby/haml-6:*[ruby_targets_ruby26] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Provides Haml generators for Rails 4
+EAPI=6
+HOMEPAGE=https://github.com/indirect/haml-rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby24] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby24] >=dev-ruby/railties-5.1:*[ruby_targets_ruby24] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby24] <dev-ruby/haml-6:*[ruby_targets_ruby24] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby25] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby25] >=dev-ruby/railties-5.1:*[ruby_targets_ruby25] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby25] <dev-ruby/haml-6:*[ruby_targets_ruby25] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby26] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby26] >=dev-ruby/railties-5.1:*[ruby_targets_ruby26] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby26] <dev-ruby/haml-6:*[ruby_targets_ruby26] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=mirror://rubygems/haml-rails-2.0.1.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=fd8d80781226dad5e3f1d94cb14f38d3
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.3.7 b/metadata/md5-cache/dev-ruby/hashdiff-0.3.7
deleted file mode 100644
index 5ecb28f61496..000000000000
--- a/metadata/md5-cache/dev-ruby/hashdiff-0.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Simple Hash extension to make working with nested hashes easier
-EAPI=6
-HOMEPAGE=https://github.com/liufengyun/hashdiff
-IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/hashdiff-0.3.7.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=189822852246c6ea0fafe84cb50ea5d2
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.4.0 b/metadata/md5-cache/dev-ruby/hashdiff-0.4.0
new file mode 100644
index 000000000000..e9004a276584
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hashdiff-0.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Simple Hash extension to make working with nested hashes easier
+EAPI=6
+HOMEPAGE=https://github.com/liufengyun/hashdiff
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/hashdiff-0.4.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=68c4bff7f61f08d0d0be8ebd42168860
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6-r1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6-r1
deleted file mode 100644
index f3f02570330b..000000000000
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby24? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A GPG backend for hiera-eyaml
-EAPI=5
-HOMEPAGE=https://github.com/sihil/hiera-eyaml-gpg
-IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby25] ) ruby_targets_ruby24? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.6.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b9d7a28ba452ab182308e0647fbb13cf
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.18.0 b/metadata/md5-cache/dev-ruby/hoe-3.18.0
new file mode 100644
index 000000000000..5b4928f4d05f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hoe-3.18.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby25] <dev-ruby/rake-13.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby26] <dev-ruby/rake-13.0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Hoe extends rake to provide full project automation
+EAPI=6
+HOMEPAGE=https://www.zenspider.com/projects/hoe.html
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby25] <dev-ruby/rake-13.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby26] <dev-ruby/rake-13.0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/hoe-3.18.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ebde5cf14e5242fad0c135e7f2f72428
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.2.0 b/metadata/md5-cache/dev-ruby/jwt-2.2.0
new file mode 100644
index 000000000000..1d2bd0dc936d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/jwt-2.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A Ruby implementation of JSON Web Token draft 06
+EAPI=6
+HOMEPAGE=https://github.com/jwt/ruby-jwt
+IUSE=elibc_FreeBSD ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.2.0.tar.gz -> jwt-2.2.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=6acef5fad166acdb24abaa9970453be0
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.2.1 b/metadata/md5-cache/dev-ruby/jwt-2.2.1
new file mode 100644
index 000000000000..5dcaa575470c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/jwt-2.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A Ruby implementation of JSON Web Token draft 06
+EAPI=6
+HOMEPAGE=https://github.com/jwt/ruby-jwt
+IUSE=elibc_FreeBSD ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.2.1.tar.gz -> jwt-2.2.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=6acef5fad166acdb24abaa9970453be0
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.4 b/metadata/md5-cache/dev-ruby/metasm-1.0.4
new file mode 100644
index 000000000000..4b15dee9f2ac
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=cross-architecture assembler, disassembler, linker, and debugger
+EAPI=6
+HOMEPAGE=https://metasm.cr0.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1.0.4
+SRC_URI=mirror://rubygems/metasm-1.0.4.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f51e1854a3392de3a1987d1c3171b06a
diff --git a/metadata/md5-cache/dev-ruby/minitest-around-0.5.0 b/metadata/md5-cache/dev-ruby/minitest-around-0.5.0
new file mode 100644
index 000000000000..d3624c4603b5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/minitest-around-0.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/minitest:5[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/minitest:5[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] dev-util/cucumber[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26] dev-util/cucumber[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Alternative for setup/teardown dance
+EAPI=6
+HOMEPAGE=https://github.com/splattael/minitest-around
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/minitest:5[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/minitest:5[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/minitest-around-0.5.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=d3bf42ed4b26b0392e8cdda21b6257ff
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.8.0 b/metadata/md5-cache/dev-ruby/mocha-1.8.0
index 068147767c99..8b9c2e4725b5 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.8.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=6
 HOMEPAGE=https://mocha.jamesmead.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/mocha-1.8.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9372d01fb45aa4eff49d1bf35e4bde99
+_md5_=761ea3855ea80995425b8e60012198b2
diff --git a/metadata/md5-cache/dev-ruby/ox-2.10.1 b/metadata/md5-cache/dev-ruby/ox-2.10.1
new file mode 100644
index 000000000000..f5f02adf15d8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ox-2.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A fast XML parser and Object marshaller
+EAPI=6
+HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/ohler55/ox/archive/v2.10.1.tar.gz -> ox-2.10.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f1a142d421a04b70f3a4e436bf41f2de
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.13 b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
index c1ca74d66d56..67bc869aad48 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.13
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/network_interface:0[ruby_targets_ruby24] dev-ruby/pcaprub:0.12[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/network_interface:0[ruby_targets_ruby25] dev-ruby/pcaprub:0.12[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby24] ) dev-ruby/bundler[ruby_targets_ruby24] ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby25] ) dev-ruby/bundler[ruby_targets_ruby25] ) !dev-ruby/packetfu:0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/network_interface:0[ruby_targets_ruby24] dev-ruby/pcaprub:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/network_interface:0[ruby_targets_ruby25] dev-ruby/pcaprub:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/network_interface:0[ruby_targets_ruby26] dev-ruby/pcaprub:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby24] ) dev-ruby/bundler[ruby_targets_ruby24] ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby25] ) dev-ruby/bundler[ruby_targets_ruby25] ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby26] ) dev-ruby/bundler[ruby_targets_ruby26] ) !dev-ruby/packetfu:0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A mid-level packet manipulation library
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/packetfu
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/network_interface:0[ruby_targets_ruby24] dev-ruby/pcaprub:0.12[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/network_interface:0[ruby_targets_ruby25] dev-ruby/pcaprub:0.12[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/network_interface:0[ruby_targets_ruby24] dev-ruby/pcaprub:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/network_interface:0[ruby_targets_ruby25] dev-ruby/pcaprub:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/network_interface:0[ruby_targets_ruby26] dev-ruby/pcaprub:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1.1.13
 SRC_URI=mirror://rubygems/packetfu-1.1.13.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4d33af41e5bcbecc0291486b5951e0bd
+_md5_=d3c130db2f9dc62eee0fa8eb22ede184
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.0.2 b/metadata/md5-cache/dev-ruby/path_expander-1.0.2
deleted file mode 100644
index 1b83559881a0..000000000000
--- a/metadata/md5-cache/dev-ruby/path_expander-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Pre-process CLI arguments expanding directories into their constituent files
-EAPI=6
-HOMEPAGE=https://github.com/seattlerb/path_expander
-IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=1
-SRC_URI=mirror://rubygems/path_expander-1.0.2.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9d831a15a4ab1bc7c2d705a17d51219b
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.0.4 b/metadata/md5-cache/dev-ruby/path_expander-1.0.4
new file mode 100644
index 000000000000..51e90daa0007
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/path_expander-1.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Pre-process CLI arguments expanding directories into their constituent files
+EAPI=6
+HOMEPAGE=https://github.com/seattlerb/path_expander
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1
+SRC_URI=mirror://rubygems/path_expander-1.0.4.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=d0c8b33ff149a559ad08a7f49a52c488
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.3 b/metadata/md5-cache/dev-ruby/patron-0.13.3
new file mode 100644
index 000000000000..fa5ad9ab632e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=net-misc/curl ruby_targets_ruby24? ( test? ( www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( www-servers/puma[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
+EAPI=6
+HOMEPAGE=https://toland.github.com/patron/
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/patron-0.13.3.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=190f8600c0d8652b797474cd88dea240
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1 b/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1
deleted file mode 100644
index a6b51eaa360d..000000000000
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/delayer[ruby_targets_ruby24] dev-ruby/instance_storage:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/delayer[ruby_targets_ruby25] dev-ruby/instance_storage:0[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Pluggaloid is extensible plugin system for mikutter
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/pluggaloid/
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/delayer[ruby_targets_ruby24] dev-ruby/instance_storage:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/delayer[ruby_targets_ruby25] dev-ruby/instance_storage:0[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/pluggaloid-1.1.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=06a629800dd94549827eaf0a6fd2840a
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.2.0 b/metadata/md5-cache/dev-ruby/pluggaloid-1.2.0
new file mode 100644
index 000000000000..bd7df7df41ce
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/delayer:1[ruby_targets_ruby24] dev-ruby/instance_storage:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/delayer:1[ruby_targets_ruby25] dev-ruby/instance_storage:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/delayer:1[ruby_targets_ruby26] dev-ruby/instance_storage:0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Pluggaloid is extensible plugin system for mikutter
+EAPI=6
+HOMEPAGE=https://rubygems.org/gems/pluggaloid/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/delayer:1[ruby_targets_ruby24] dev-ruby/instance_storage:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/delayer:1[ruby_targets_ruby25] dev-ruby/instance_storage:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/delayer:1[ruby_targets_ruby26] dev-ruby/instance_storage:0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/pluggaloid-1.2.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=1d51c011f51fa1641230b12bb13c326b
diff --git a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2 b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
index 1638c6f3fd9b..9b126bcc7684 100644
--- a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/ruby-mp3info[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ruby-mp3info[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/ruby-mp3info[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ruby-mp3info[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ruby-mp3info[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A pure Ruby library for generating podcasts from mp3 files
 EAPI=5
 HOMEPAGE=http://podcast.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/ruby-mp3info[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ruby-mp3info[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/ruby-mp3info[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ruby-mp3info[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ruby-mp3info[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/podcast-0.0.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=663c650559716885685e89b718a63f81
+_md5_=0a54eb6ac5b341488d3cf69146afd251
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-3.1.0 b/metadata/md5-cache/dev-ruby/public_suffix-3.1.0
new file mode 100644
index 000000000000..a767fbc06eb7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/public_suffix-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Parse and decompose a domain name into top level domain, domain and subdomains
+EAPI=6
+HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/public_suffix-3.1.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=96c1a212b0f90bc7340dbc8f969ca482
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.4 b/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.4
deleted file mode 100644
index f1d5108a548e..000000000000
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.4
+++ /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/puppet5/p/puppetdb-termini/puppetdb-termini_5.2.4-1xenial_all.deb
-_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=1ae1a32e45b50588cb50c13be436e9fe
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.7 b/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.7
index 4b1bde308990..b934eb450342 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.7
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.7
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Library needed to connect puppet to puppetdb
 EAPI=5
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/xenial/puppet5/p/puppetdb-termini/puppetdb-termini_5.2.7-1xenial_all.deb
 _eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=2ed8ebe8b42f746540aa9d45f152ed2c
+_md5_=f918d15f0452f0f85286a0aad69dd387
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1 b/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1
index b9cab333d1d0..cba8e6a91cb0 100644
--- a/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1
+++ b/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-ruby/rake-compiler[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake-compiler[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-ruby/rake-compiler[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake-compiler[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rake-compiler[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Pygments syntax highlighting in ruby
 EAPI=6
 HOMEPAGE=https://github.com/tmm1/pygments.rb
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test test python_targets_python2_7
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test python_targets_python2_7
 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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/pygments.rb-1.2.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8a57738c10ddebe8e8f52199ca91da7d
+_md5_=b405841f60e50018cf7f32a033f24204
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.0.0 b/metadata/md5-cache/dev-ruby/rack-attack-6.0.0
index efb3d7fd2ad8..c953fa441c6c 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.0.0
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/actionpack[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/actionpack[ruby_targets_ruby25] dev-ruby/activesupport[ruby_targets_ruby25] dev-ruby/rack-test[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/actionpack[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/actionpack[ruby_targets_ruby25] dev-ruby/activesupport[ruby_targets_ruby25] dev-ruby/rack-test[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/actionpack[ruby_targets_ruby26] dev-ruby/activesupport[ruby_targets_ruby26] dev-ruby/rack-test[ruby_targets_ruby26] dev-ruby/minitest[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A DSL for blocking & throttling abusive clients
 EAPI=6
 HOMEPAGE=https://github.com/kickstarter/rack-attack
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6
 SRC_URI=mirror://rubygems/rack-attack-6.0.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=822cb6d2113bbffe0f10ebdd2afa6c53
+_md5_=1df78447a2403034accefb94ff28e26f
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0 b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
index b7563af06770..12cee9e3c8f7 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
 EAPI=6
 HOMEPAGE=https://github.com/nex3/rb-inotify
 IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 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_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ffi[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.10.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=eb5fce53ffa1a29c9e626dd1265da5db
+_md5_=534b1883632f39913f9a8f9cd1b419d1
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-6.0.0 b/metadata/md5-cache/dev-ruby/rbnacl-6.0.0
deleted file mode 100644
index d56cf3e16467..000000000000
--- a/metadata/md5-cache/dev-ruby/rbnacl-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-libs/libsodium ) test? ( ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ffi[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=Provides a high-level toolkit for building cryptographic systems and protocols
-EAPI=6
-HOMEPAGE=https://github.com/cryptosphere/rbnacl
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libsodium ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ffi[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=6
-SRC_URI=mirror://rubygems/rbnacl-6.0.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d6792ee11eb2e24eb8cda335baf3c600
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-7.0.0 b/metadata/md5-cache/dev-ruby/rbnacl-7.0.0
new file mode 100644
index 000000000000..2b06ed06b986
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbnacl-7.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-libs/libsodium ) test? ( ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ffi[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Provides a high-level toolkit for building cryptographic systems and protocols
+EAPI=6
+HOMEPAGE=https://github.com/cryptosphere/rbnacl
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libsodium ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ffi[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6
+SRC_URI=mirror://rubygems/rbnacl-7.0.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0809e72b137de8287679f13c04a38e74
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.8 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.8
new file mode 100644
index 000000000000..8f67bcd2350c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.19.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/htmlentities[ruby_targets_ruby25] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/htmlentities[ruby_targets_ruby26] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby on Rails RBPDF plugin
+EAPI=6
+HOMEPAGE=https://github.com/naitoh/rbpdf
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/htmlentities[ruby_targets_ruby25] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/htmlentities[ruby_targets_ruby26] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/naitoh/rbpdf/archive/1.19.8.tar.gz -> rbpdf-1.19.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=16dfb2b8ae3bd344e339438135e06c4b
diff --git a/metadata/md5-cache/dev-ruby/recog-2.3.2 b/metadata/md5-cache/dev-ruby/recog-2.3.2
new file mode 100644
index 000000000000..9e00410f4268
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/recog-2.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/nokogiri[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/nokogiri[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/regexp_parser:0[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] dev-util/aruba[ruby_targets_ruby24] dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/regexp_parser:0[ruby_targets_ruby25] dev-ruby/rspec:3[ruby_targets_ruby25] dev-util/aruba[ruby_targets_ruby25] dev-util/cucumber[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/regexp_parser:0[ruby_targets_ruby26] dev-ruby/rspec:3[ruby_targets_ruby26] dev-util/aruba[ruby_targets_ruby26] dev-util/cucumber[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Pattern recognition for hosts, services, and content
+EAPI=6
+HOMEPAGE=https://github.com/rapid7/recog
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/nokogiri[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/nokogiri[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=mirror://rubygems/recog-2.3.2.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=74755f9364d956de4c38a2327d50f46c
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0 b/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
index 6fd959fa2814..c6334f13a34a 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
 EAPI=6
 HOMEPAGE=https://github.com/ammar/regexp_parser
-IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v0.5.0.tar.gz -> regexp_parser-0.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=48d2f23e426242fc96ea39cc5c0402f5
+_md5_=e9d67365e1806de7bfcb2ca8ee891763
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.4.0 b/metadata/md5-cache/dev-ruby/regexp_parser-1.4.0
index 120f438fa835..d87f747cd983 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-1.4.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressio
 EAPI=6
 HOMEPAGE=https://github.com/ammar/regexp_parser
 IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.4.0.tar.gz -> regexp_parser-1.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=20932426f4d7c2569edd67ae20659e64
+_md5_=63c5cfabf6b137adac45201b96e558eb
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.5.1 b/metadata/md5-cache/dev-ruby/regexp_parser-1.5.1
new file mode 100644
index 000000000000..9536bf28fbe8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-1.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND==dev-util/ragel-6* ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby25] dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby26] dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
+EAPI=6
+HOMEPAGE=https://github.com/ammar/regexp_parser
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1
+SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.5.1.tar.gz -> regexp_parser-1.5.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=7946012f5dddb6e18be43697a5a63ebe
diff --git a/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.6 b/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.6
index 74662ac53168..e310cf5bccaf 100644
--- a/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.6
+++ b/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-struct2[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-struct2[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-core[ruby_targets_ruby26] dev-ruby/rex-struct2[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=suite of tools for analyzing executables to find specific chunks of code
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-bin_tools
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-struct2[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-struct2[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-core[ruby_targets_ruby26] dev-ruby/rex-struct2[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-bin_tools-0.1.6.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6389ddc8b0a749b3b6bf6d997a4b4dbc
+_md5_=d65c20004900d87f01879e0bc77616bf
diff --git a/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4 b/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4
index 346fd99cabff..826fc8263dc9 100644
--- a/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4
+++ b/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=provides the basis for all of the polymorphic encoders that Metasploit uses
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-encoder
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-encoder-0.1.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4d08e1c902396ab8cde3532b2d7596f5
+_md5_=a64e16f0c994ca76dabc6a25fafe0a25
diff --git a/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.20 b/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.20
index f6fad64b4910..7c01c901fdf2 100644
--- a/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.20
+++ b/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.20
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/jsobfu:*[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-encoder[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/jsobfu:*[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-encoder[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/jsobfu:*[ruby_targets_ruby26] dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/rex-encoder[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=various helper mechanisms for creating exploits
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-exploitation
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/jsobfu:*[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-encoder[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/jsobfu:*[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-encoder[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/jsobfu:*[ruby_targets_ruby26] dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/rex-encoder[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-exploitation-0.1.20.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5577915cbe25dcb37661e5165413efe8
+_md5_=175e75dc0e245e432fbc30c80d1c551a
diff --git a/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.3 b/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.3
index 12fc6c798167..4df7f55b9961 100644
--- a/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.3
+++ b/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-core[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Ruby Exploitation(Rex) Library for building ROP chains
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-rop_builder
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-core[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-rop_builder-0.1.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=58dcd78369b1a8a747832b63a4e83c47
+_md5_=4fc347fb6bee45000f4690c06c7f38d4
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
new file mode 100644
index 000000000000..42fcfd42e022
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ~net-analyzer/rrdtool-1.7.2[graph] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Ruby bindings for rrdtool
+EAPI=6
+HOMEPAGE=https://oss.oetiker.ch/rrdtool/
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=~net-analyzer/rrdtool-1.7.2[graph=] ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ba5dffa754fcbde7e0f2555c3df09ce0
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-atk-3.3.6
new file mode 100644
index 000000000000..97b8eb6b942d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/atk test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Atk bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=dev-libs/atk ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9e2d33ca12ffe7932ac9111c868b53e2
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.2.9 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.2.9
deleted file mode 100644
index 027504e86b32..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/cairo test? ( ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.2.9[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25] >=dev-ruby/ruby-glib2-3.2.9[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] )
-DESCRIPTION=Ruby cairo-gobject bindings
-EAPI=6
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Ruby
-RDEPEND=x11-libs/cairo ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.2.9[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25] >=dev-ruby/ruby-glib2-3.2.9[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.2.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3aeab4bc876be5ef456140ee92fdf0c2
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.6
new file mode 100644
index 000000000000..2fd3a9a3f271
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/cairo test? ( ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby cairo-gobject bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/cairo ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9d9f2b23a741f8cd543c5504b878d3e0
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.6
new file mode 100644
index 000000000000..bcb46a635b55
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=media-libs/clutter ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Clutter bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=media-libs/clutter ruby_targets_ruby24? ( >=dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=affa2b790d06eb8afae6262c1854847c
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.6
new file mode 100644
index 000000000000..9d6c6d1311d6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby binding of GDK specific API of Clutter
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=media-libs/clutter[gtk] ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=065dd9c0bd8c985f786fe56064a63888
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.6
new file mode 100644
index 000000000000..58d70a906676
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=media-libs/clutter-gst test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Clutter bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=0b8dbe49b7eb8e99d5a9a7435d0c1076
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.6
new file mode 100644
index 000000000000..d72d2dbf4576
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Clutter bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=bcbd32b04c53d5c78cbf86a68f36fd5b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.6
new file mode 100644
index 000000000000..a5aa12b8fc41
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/gtk+:3 test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby GDK-3.x bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby24? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=a5850b3119fb8a2109dce20be77d9bde
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.6
new file mode 100644
index 000000000000..9c55c21ce9d1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby GdkPixbuf2 bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby24? ( ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9913db81ac37b2033bd1286d60812b58
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.6
new file mode 100644
index 000000000000..5371649f61a6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby binding of GooCanvas
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=39433f565b61817a27113f7f6fd00d73
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.6
new file mode 100644
index 000000000000..11bc8357f7e6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/glib-2 ruby_targets_ruby24? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby24] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby25] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby26] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Glib2 bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=Ruby
+RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=2fd8b12a3a2daaa597ca6b5f4a7addf4
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.6
new file mode 100644
index 000000000000..088715822cbd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gstreamer-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gtk-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview3-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-poppler-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-rsvg-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-vte-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-vte3-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-webkit2-gtk-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gstreamer-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gtk-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtksourceview-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtksourceview3-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-poppler-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-rsvg-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-vte-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-vte3-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-webkit2-gtk-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gstreamer-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gtk-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtksourceview-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtksourceview3-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-poppler-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-rsvg-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-vte-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-vte3-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-webkit2-gtk-3.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Ruby Gnome2 bindings
+EAPI=6
+HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gstreamer-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gtk-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview3-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-poppler-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-rsvg-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-vte-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-vte3-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-webkit2-gtk-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gstreamer-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gtk-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtksourceview-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtksourceview3-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-poppler-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-rsvg-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-vte-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-vte3-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-webkit2-gtk-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gstreamer-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gdk-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gtk-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gstreamer-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtksourceview-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtksourceview3-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-poppler-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-rsvg-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-vte-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-vte3-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-webkit2-gtk-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=67cbf401ef8f0071c61dc01f3a3e01cc
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.6
new file mode 100644
index 000000000000..1c847f2bcef9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/gobject-introspection test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby GObjectIntrospection bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=19bda9475408741c79d558e8c89e421a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.6
new file mode 100644
index 000000000000..1565a0845a2a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/gobject-introspection media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby GStreamer bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=c2b2afe78f359166eac40d7608c48cd8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.6
new file mode 100644
index 000000000000..d378cedf8d68
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/gtk+:2 x11-themes/hicolor-icon-theme test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Gtk2 bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=3069288dbe8f500e1db4ed9dc915cca5
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.6
new file mode 100644
index 000000000000..68db3a4944c5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/gtk+:3 ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Gtk3 bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-atk-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=50a570bfe9d61d22b23f1cb86274cbc7
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.6
new file mode 100644
index 000000000000..8b0b11d89638
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/gtksourceview:2.0 test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby bindings for gtksourceview
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=df972630181dea9328825eb3f75bd0bf
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.6
new file mode 100644
index 000000000000..95b0096c9624
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Gtk3 bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=91ef8bd67649ca6fd2a12cfd6863a7fa
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-pango-3.3.6
new file mode 100644
index 000000000000..2abd0d1d92ff
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=x11-libs/pango-1.2.1 test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Pango bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby24? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=156aa4d65346a24c31e90e18c276ea0b
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.6
new file mode 100644
index 000000000000..8d682983608c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-text/poppler[cairo] test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby poppler-glib bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=app-text/poppler[cairo] ruby_targets_ruby24? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-gio2-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=3e938548fc8a14a75ed77d48b7a9e234
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-0.18.0 b/metadata/md5-cache/dev-ruby/ruby-prof-0.18.0
new file mode 100644
index 000000000000..207657732187
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-0.18.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26] dev-ruby/minitest[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A module for profiling Ruby code
+EAPI=6
+HOMEPAGE=https://github.com/ruby-prof/ruby-prof
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/0.18.0.tar.gz -> ruby-prof-0.18.0.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=8902800eae40d03885aad12acd8f2e80
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1
new file mode 100644
index 000000000000..bb06e2ee284e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby24] dev-ruby/timecop[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby25] dev-ruby/timecop[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby26] dev-ruby/timecop[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A Text Progress Bar Library for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/jfelchner/ruby-progressbar/archive/releases/v1.10.1.tar.gz -> ruby-progressbar-1.10.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=80e73f9703ae5d765821fba38773ad22
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.6
new file mode 100644
index 000000000000..bfd9e7786c7d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=gnome-base/librsvg-2.16.1 test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby bindings for librsvg
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=>=gnome-base/librsvg-2.16.1 ruby_targets_ruby24? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby24] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby25] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.6[ruby_targets_ruby26] ~dev-ruby/ruby-gdkpixbuf2-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=dec912750f6e3daf43b1f2dd0f67f1c8
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-vte-3.3.6
new file mode 100644
index 000000000000..0a282943c587
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=x11-libs/vte-0.12.1:0 test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby vte bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk2-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9ed45f41db6f8ce16d60891502781b10
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.6
new file mode 100644
index 000000000000..d92c53055b2d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/vte:2.91 ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.6[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby VTE bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/vte:2.91 ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=e2d2a68880e582608f31d023cfb13318
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.6 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.6
new file mode 100644
index 000000000000..da61d6bf01c7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=net-libs/webkit-gtk:4 test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby WebKitGtk+ for Gtk 3.0 bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby24? ( >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gobject-introspection-3.3.6[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.6[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=9f374416def7c4b4f6578d338ac4be90
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.0.3-r1 b/metadata/md5-cache/dev-ruby/rubygems-3.0.3-r1
new file mode 100644
index 000000000000..7e6b80712070
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.0.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/json[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/json[ruby_targets_ruby25] dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/json[ruby_targets_ruby26] dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Centralized Ruby extension management system
+EAPI=6
+HOMEPAGE=https://rubygems.org/
+IUSE=server test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
+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 || ( Ruby MIT )
+PDEPEND=server? ( =dev-ruby/builder-3* )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://rubygems.org/rubygems/rubygems-3.0.3.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=344c8b5c6ebc629f92357685ec989be6
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.2.3 b/metadata/md5-cache/dev-ruby/rubyzip-1.2.3
new file mode 100644
index 000000000000..6b1b83687a3b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-arch/zip ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A ruby library for reading and writing zip files
+EAPI=6
+HOMEPAGE=https://github.com/rubyzip/rubyzip
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1
+SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.2.3.tar.gz -> rubyzip-1.2.3-git.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=6bc5bc4a61a42473491780dc90336bc8
diff --git a/metadata/md5-cache/dev-ruby/sassc-2.0.1-r1 b/metadata/md5-cache/dev-ruby/sassc-2.0.1-r1
new file mode 100644
index 000000000000..6e6814e01626
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sassc-2.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby26] dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test_construct[ruby_targets_ruby24] dev-ruby/minitest-around[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test_construct[ruby_targets_ruby25] dev-ruby/minitest-around[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test_construct[ruby_targets_ruby26] dev-ruby/minitest-around[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Use libsass with Ruby
+EAPI=6
+HOMEPAGE=https://github.com/sass/sassc-ruby
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-libs/libsass-3.5.5 ruby_targets_ruby24? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby26] dev-ruby/rake[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=mirror://rubygems/sassc-2.0.1.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=325aaaa8eb29e1f002e5e233aa5e5720
diff --git a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.1 b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.1
new file mode 100644
index 000000000000..5d618f73df90
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby24] dev-ruby/tilt:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby24] dev-ruby/sprockets-rails:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby25] dev-ruby/tilt:*[ruby_targets_ruby25] >=dev-ruby/railties-4:*[ruby_targets_ruby25] >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby25] dev-ruby/sprockets-rails:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby26] dev-ruby/tilt:*[ruby_targets_ruby26] >=dev-ruby/railties-4:*[ruby_targets_ruby26] >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby26] dev-ruby/sprockets-rails:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26] dev-ruby/mocha[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Integrate SassC-Ruby with Rails
+EAPI=6
+HOMEPAGE=https://github.com/sass/sassc-rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby24] dev-ruby/tilt:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby24] dev-ruby/sprockets-rails:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby25] dev-ruby/tilt:*[ruby_targets_ruby25] >=dev-ruby/railties-4:*[ruby_targets_ruby25] >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby25] dev-ruby/sprockets-rails:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby26] dev-ruby/tilt:*[ruby_targets_ruby26] >=dev-ruby/railties-4:*[ruby_targets_ruby26] >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby26] dev-ruby/sprockets-rails:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=mirror://rubygems/sassc-rails-2.1.1.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=6b6168151ff00823f65c54ac77598c40
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9.2 b/metadata/md5-cache/dev-ruby/shotgun-0.9.2
index 8a451bef6e5d..6381e6126002 100644
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9.2
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bacon[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bacon[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bacon[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Forking implementation of rackup
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/shotgun
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/shotgun-0.9.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=16b806b30055cce40fc35e891751ef03
+_md5_=d0b63da8112c3aefa524b9022c46f5dd
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-1.2.4 b/metadata/md5-cache/dev-ruby/spreadsheet-1.2.4
new file mode 100644
index 000000000000..c4c96e824322
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-1.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby library to read and write spreadsheet documents
+EAPI=6
+HOMEPAGE=https://github.com/zdavatz/spreadsheet
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/zdavatz/spreadsheet/archive/1.2.4.tar.gz -> spreadsheet-1.2.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=c270dd89391aabed6e46c0e1c75fdf2b
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.6.0 b/metadata/md5-cache/dev-ruby/stamp-0.6.0
index 5f33da21e35a..d51cb2784efb 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.6.0
+++ b/metadata/md5-cache/dev-ruby/stamp-0.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Date and time formatting for humans
 EAPI=5
 HOMEPAGE=https://github.com/jeremyw/stamp
-IUSE=doc elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/jeremyw/stamp/archive/v0.6.0.tar.gz -> stamp-0.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0011f30182c648282ea99f0cdeec347b
+_md5_=21784da21bdda811a853cf3e78b2b6e4
diff --git a/metadata/md5-cache/dev-ruby/strptime-0.2.3 b/metadata/md5-cache/dev-ruby/strptime-0.2.3
index 092caead5089..e5615852423b 100644
--- a/metadata/md5-cache/dev-ruby/strptime-0.2.3
+++ b/metadata/md5-cache/dev-ruby/strptime-0.2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A fast strptime/strftime engine which uses VM
 EAPI=6
 HOMEPAGE=https://github.com/nurse/strptime
-IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/nurse/strptime/archive/v0.2.3.tar.gz -> strptime-0.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=eca5f70e86a457516bec2d730cd6093a
+_md5_=f03ff2d44eb2a7beda20beb8ba4526fb
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.2 b/metadata/md5-cache/dev-ruby/test_construct-2.0.2
new file mode 100644
index 000000000000..bba5b78e628a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby25] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby25] dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby26] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby26] dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Creates temporary files and directories for testing
+EAPI=6
+HOMEPAGE=https://github.com/bhb/test_construct
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/test_construct-2.0.2.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=fbd0badb6d6db6eacc137a3a70963fbd
diff --git a/metadata/md5-cache/dev-ruby/textpow-1.4.0 b/metadata/md5-cache/dev-ruby/textpow-1.4.0
index 61073463ab71..3f1413e1d14c 100644
--- a/metadata/md5-cache/dev-ruby/textpow-1.4.0
+++ b/metadata/md5-cache/dev-ruby/textpow-1.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A library to parse and process Textmate bundles
 EAPI=5
 HOMEPAGE=http://textpow.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/grosser/textpow/archive/v1.4.0.tar.gz -> textpow-1.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a54f635fcfe9ff67b3a4e578eec9302e
+_md5_=38df8b2274ba369d88e9c7f6184c432f
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.8.1 b/metadata/md5-cache/dev-ruby/timecop-0.8.1
index 5d23242cb17c..901760acd4a2 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.8.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=5
 HOMEPAGE=https://github.com/travisjeffery/timecop
 IUSE=elibc_FreeBSD ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.8.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c25f0e0c8c8fb0becd442297908f0c58
+_md5_=abf3dee5a898fd9364b80eb4666a9f5e
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.1 b/metadata/md5-cache/dev-ruby/timecop-0.9.1
index ffc128a8f538..8d2be0848d6e 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=6
 HOMEPAGE=https://github.com/travisjeffery/timecop
 IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.9.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=20e26f8a034f9443d1446d67dfc0c8a3
+_md5_=2677574c3a7f7bb64f018e6be40a75d0
diff --git a/metadata/md5-cache/dev-ruby/timers-4.3.0 b/metadata/md5-cache/dev-ruby/timers-4.3.0
new file mode 100644
index 000000000000..71bedbab666c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/timers-4.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Pure Ruby one-shot and periodic timers
+EAPI=6
+HOMEPAGE=https://github.com/tarcieri/timers
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=4
+SRC_URI=mirror://rubygems/timers-4.3.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=69824c71c88a01107ff5848d0bfdbf37
diff --git a/metadata/md5-cache/dev-ruby/tins-1.20.3 b/metadata/md5-cache/dev-ruby/tins-1.20.3
new file mode 100644
index 000000000000..8ca22f1943aa
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tins-1.20.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=All the stuff that isn't good enough for a real library
+EAPI=6
+HOMEPAGE=https://github.com/flori/tins
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/tins-1.20.3.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f6d410a18ce76d81d4aaebee427efc08
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-3.0.0 b/metadata/md5-cache/dev-ruby/twitter-text-3.0.0
index 2d6e43c90039..cc0afe80ffac 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-3.0.0
+++ b/metadata/md5-cache/dev-ruby/twitter-text-3.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/idn-ruby[ruby_targets_ruby24] =dev-ruby/unf-0.1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/idn-ruby[ruby_targets_ruby25] =dev-ruby/unf-0.1*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8.0[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/idn-ruby[ruby_targets_ruby24] =dev-ruby/unf-0.1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/idn-ruby[ruby_targets_ruby25] =dev-ruby/unf-0.1*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/idn-ruby[ruby_targets_ruby26] =dev-ruby/unf-0.1*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8.0[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8.0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Text handling for Twitter
 EAPI=6
 HOMEPAGE=https://github.com/twitter/twitter-text
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/idn-ruby[ruby_targets_ruby24] =dev-ruby/unf-0.1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/idn-ruby[ruby_targets_ruby25] =dev-ruby/unf-0.1*[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/idn-ruby[ruby_targets_ruby24] =dev-ruby/unf-0.1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/idn-ruby[ruby_targets_ruby25] =dev-ruby/unf-0.1*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/idn-ruby[ruby_targets_ruby26] =dev-ruby/unf-0.1*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3.0
 SRC_URI=mirror://rubygems/twitter-text-3.0.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=84a6278bc3d1f7699468c10253ade9c5
+_md5_=5e15648e2a7fc8f184ff02d8903cbcc3
diff --git a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1 b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
index 54b06238f33a..a76e8a62d504 100644
--- a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A syntax highlighting engine based on Textpow
 EAPI=5
 HOMEPAGE=https://github.com/grosser/ultraviolet
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/ultraviolet-1.0.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ac9348b677907b769b2023886b44316c
+_md5_=8d39a8730a24d8bdae062601ca3e3d71
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 8df09f7369c4..b5c5c094b1bd 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/bibtexu-3.71_p20190410 b/metadata/md5-cache/dev-tex/bibtexu-3.71_p20190410
new file mode 100644
index 000000000000..9302c646bb16
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/bibtexu-3.71_p20190410
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DESCRIPTION=8-bit Implementation of BibTeX 0.99 with a Very Large Capacity
+EAPI=7
+HOMEPAGE=http://tug.org/texlive/
+IUSE=doc source
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/kpathsea-6.2.1:= >=dev-libs/icu-4.4:=
+SLOT=0
+SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz mirror://gentoo/texlive-module-bibtex8-2019.tar.xz mirror://gentoo/texlive-module-bibtexu-2019.tar.xz doc? ( mirror://gentoo/texlive-module-bibtex8.doc-2019.tar.xz mirror://gentoo/texlive-module-bibtexu.doc-2019.tar.xz )
+_md5_=38a31736409669512c3a614d9eb51f6b
diff --git a/metadata/md5-cache/dev-tex/rcsinfo-1.9 b/metadata/md5-cache/dev-tex/rcsinfo-1.9
deleted file mode 100644
index 54ab8c958667..000000000000
--- a/metadata/md5-cache/dev-tex/rcsinfo-1.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=dev-tex/latex2html virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=A LaTeX module to acces RCS/CVS version info
-EAPI=0
-HOMEPAGE=http://www.ctan.org/pkg/rcsinfo
-KEYWORDS=~x86 ~amd64
-LICENSE=LPPL-1.2
-RDEPEND=virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gentoo/rcsinfo-1.9.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3bddd62aad0f57e654953db260b8b8b8
diff --git a/metadata/md5-cache/dev-tex/xcolor-2.11 b/metadata/md5-cache/dev-tex/xcolor-2.11
deleted file mode 100644
index 62c887a8cceb..000000000000
--- a/metadata/md5-cache/dev-tex/xcolor-2.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=dev-texlive/texlive-latex doc? ( dev-texlive/texlive-pstricks dev-texlive/texlive-latexextra ) app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=xcolor -- easy driver-independent access to colors
-EAPI=0
-HOMEPAGE=http://www.ukern.de/tex/xcolor.html
-IUSE=doc
-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 ~x64-solaris ~x86-solaris
-LICENSE=LPPL-1.2
-RDEPEND=dev-texlive/texlive-latex virtual/latex-base
-SLOT=0
-SRC_URI=http://www.ukern.de/tex/xcolor/ctan/xcolor211.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8beb410d360c96d20522f4f8da0e2ee
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index a83f88c4e4cd..90046f634616 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/bcc-0.9.0-r1 b/metadata/md5-cache/dev-util/bcc-0.9.0-r1
index c25c5dae2f4b..003441af40b4 100644
--- a/metadata/md5-cache/dev-util/bcc-0.9.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.9.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and m
 EAPI=7
 HOMEPAGE=https://iovisor.github.io/bcc/
 IUSE=+luajit kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/libbpf:= >=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.9.0.tar.gz -> bcc-0.9.0.tar.gz mirror://gentoo/bcc-0.9.0-linux-5-bpf.patch.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=36979db66a8c46bb4d9245bb627054b2
+_md5_=5ed0daeaeed983bc71cbb912cc1c13ca
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.9-r1 b/metadata/md5-cache/dev-util/bpftrace-0.9-r1
index 9ca46a94e449..78c10fb6ba66 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.9-r1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.9-r1
@@ -5,11 +5,11 @@ DESCRIPTION=High-level tracing language for eBPF
 EAPI=7
 HOMEPAGE=https://github.com/iovisor/bpftrace
 IUSE=test kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] >=dev-util/bcc-0.9.0:= virtual/libelf
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.9.tar.gz -> bpftrace-0.9.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7253742f93d9e98006ac66ba2037e1f6
+_md5_=184349bdf042edebd37141a71e6ef60c
diff --git a/metadata/md5-cache/dev-util/bpftrace-9999 b/metadata/md5-cache/dev-util/bpftrace-9999
index bfd4b0d2c913..e80a97b07ca9 100644
--- a/metadata/md5-cache/dev-util/bpftrace-9999
+++ b/metadata/md5-cache/dev-util/bpftrace-9999
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_target
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7253742f93d9e98006ac66ba2037e1f6
+_md5_=184349bdf042edebd37141a71e6ef60c
diff --git a/metadata/md5-cache/dev-util/cargo-0.30.0-r1 b/metadata/md5-cache/dev-util/cargo-0.30.0-r1
index 404c4021516e..31b27ff921c5 100644
--- a/metadata/md5-cache/dev-util/cargo-0.30.0-r1
+++ b/metadata/md5-cache/dev-util/cargo-0.30.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 sys-libs/zlib !libressl? ( de
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/rust-lang/cargo/archive/0.30.0.tar.gz -> cargo-0.30.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.8/download -> aho-corasick-0.6.8.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cargo/0.30.0/download -> cargo-0.30.0.crate https://crates.io/api/v1/crates/cc/1.0.25/download -> cc-1.0.25.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.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.6.1/download -> core-foundation-0.6.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.1/download -> core-foundation-sys-0.6.1.crate https://crates.io/api/v1/crates/crates-io/0.18.0/download -> crates-io-0.18.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.2.6/download -> crossbeam-channel-0.2.6.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.6.0/download -> crossbeam-epoch-0.6.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.5.0/download -> crossbeam-utils-0.5.0.crate https://crates.io/api/v1/crates/crypto-hash/0.3.1/download -> crypto-hash-0.3.1.crate https://crates.io/api/v1/crates/curl/0.4.17/download -> curl-0.4.17.crate https://crates.io/api/v1/crates/curl-sys/0.4.12/download -> curl-sys-0.4.12.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/failure/0.1.2/download -> failure-0.1.2.crate https://crates.io/api/v1/crates/failure_derive/0.1.2/download -> failure_derive-0.1.2.crate https://crates.io/api/v1/crates/filetime/0.2.1/download -> filetime-0.2.1.crate https://crates.io/api/v1/crates/flate2/1.0.2/download -> flate2-1.0.2.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.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.7.5/download -> git2-0.7.5.crate https://crates.io/api/v1/crates/git2-curl/0.8.1/download -> git2-curl-0.8.1.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.4.2/download -> globset-0.4.2.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/home/0.3.3/download -> home-0.3.3.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/ignore/0.4.4/download -> ignore-0.4.4.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.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/1.1.0/download -> lazy_static-1.1.0.crate https://crates.io/api/v1/crates/lazycell/1.2.0/download -> lazycell-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.8/download -> libgit2-sys-0.7.8.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.11/download -> libssh2-sys-0.2.11.crate https://crates.io/api/v1/crates/libz-sys/1.0.22/download -> libz-sys-1.0.22.crate https://crates.io/api/v1/crates/lock_api/0.1.3/download -> lock_api-0.1.3.crate https://crates.io/api/v1/crates/log/0.4.5/download -> log-0.4.5.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.1.0/download -> memchr-2.1.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.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.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.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.10.12/download -> openssl-0.10.12.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-src/110.0.7+1.1.0i/download -> openssl-src-110.0.7+1.1.0i.crate https://crates.io/api/v1/crates/openssl-sys/0.9.36/download -> openssl-sys-0.9.36.crate https://crates.io/api/v1/crates/owning_ref/0.3.3/download -> owning_ref-0.3.3.crate https://crates.io/api/v1/crates/parking_lot/0.6.4/download -> parking_lot-0.6.4.crate https://crates.io/api/v1/crates/parking_lot_core/0.3.1/download -> parking_lot_core-0.3.1.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.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/proc-macro2/0.4.19/download -> proc-macro2-0.4.19.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.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/1.0.5/download -> regex-1.0.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.2/download -> regex-syntax-0.6.2.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustfix/0.4.2/download -> rustfix-0.4.2.crate https://crates.io/api/v1/crates/ryu/0.2.6/download -> ryu-0.2.6.crate https://crates.io/api/v1/crates/same-file/1.0.3/download -> same-file-1.0.3.crate https://crates.io/api/v1/crates/schannel/0.1.13/download -> schannel-0.1.13.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.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.79/download -> serde-1.0.79.crate https://crates.io/api/v1/crates/serde_derive/1.0.79/download -> serde_derive-1.0.79.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.28/download -> serde_json-1.0.28.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/smallvec/0.6.5/download -> smallvec-0.6.5.crate https://crates.io/api/v1/crates/socket2/0.3.8/download -> socket2-0.3.8.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.14.9/download -> syn-0.14.9.crate https://crates.io/api/v1/crates/syn/0.15.4/download -> syn-0.15.4.crate https://crates.io/api/v1/crates/synstructure/0.9.0/download -> synstructure-0.9.0.crate https://crates.io/api/v1/crates/tar/0.4.16/download -> tar-0.4.16.crate https://crates.io/api/v1/crates/tempfile/3.0.4/download -> tempfile-3.0.4.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.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.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.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.7.1/download -> url-1.7.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.1/download -> utf8-ranges-1.0.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.4/download -> version_check-0.1.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.2.5/download -> walkdir-2.2.5.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.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/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.1/download -> winapi-util-0.1.1.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate amd64? ( https://static.rust-lang.org/dist/cargo-0.29.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/cargo-0.29.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.29.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/cargo-0.29.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/cargo-0.29.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/cargo-0.29.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/cargo-0.29.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/cargo-0.29.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	rust-toolchain	e68df44640df5d971dcf4e0c7de60517	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=21e40ea0a006db19994b27a493c41fed
diff --git a/metadata/md5-cache/dev-util/catkin-0.7.11 b/metadata/md5-cache/dev-util/catkin-0.7.11
deleted file mode 100644
index d2d899046d0a..000000000000
--- a/metadata/md5-cache/dev-util/catkin-0.7.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/catkin
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ros/catkin/archive/0.7.11.tar.gz -> catkin-0.7.11.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9c7a346646f11204353661ca9c9a4607
diff --git a/metadata/md5-cache/dev-util/catkin-0.7.12 b/metadata/md5-cache/dev-util/catkin-0.7.12
deleted file mode 100644
index 487b3a497680..000000000000
--- a/metadata/md5-cache/dev-util/catkin-0.7.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/catkin
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ros/catkin/archive/0.7.12.tar.gz -> catkin-0.7.12.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9c7a346646f11204353661ca9c9a4607
diff --git a/metadata/md5-cache/dev-util/catkin-0.7.17 b/metadata/md5-cache/dev-util/catkin-0.7.17
new file mode 100644
index 000000000000..397b0f63d40a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catkin-0.7.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/catkin
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/ros/catkin/archive/0.7.17.tar.gz -> catkin-0.7.17.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=07f27bedd5c733f36da0534ead6cb329
diff --git a/metadata/md5-cache/dev-util/catkin-9999 b/metadata/md5-cache/dev-util/catkin-9999
index 69158af0ae8d..d1b02f08848d 100644
--- a/metadata/md5-cache/dev-util/catkin-9999
+++ b/metadata/md5-cache/dev-util/catkin-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9c7a346646f11204353661ca9c9a4607
+_md5_=07f27bedd5c733f36da0534ead6cb329
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.8.7 b/metadata/md5-cache/dev-util/cbindgen-0.8.7
new file mode 100644
index 000000000000..6bc6e83f2b36
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cbindgen-0.8.7
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/cargo-1.30.0 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=A tool for generating C bindings to Rust code
+EAPI=7
+HOMEPAGE=https://github.com/eqrion/cbindgen/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.2/download -> autocfg-0.1.2.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cbindgen/0.8.7/download -> cbindgen-0.8.7.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/libc/0.2.47/download -> libc-0.2.47.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/proc-macro2/0.4.25/download -> proc-macro2-0.4.25.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand/0.6.4/download -> rand-0.6.4.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_os/0.1.1/download -> rand_os-0.1.1.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.50/download -> redox_syscall-0.1.50.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/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/0.2.7/download -> ryu-0.2.7.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.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.84/download -> serde-1.0.84.crate https://crates.io/api/v1/crates/serde_derive/1.0.84/download -> serde_derive-1.0.84.crate https://crates.io/api/v1/crates/serde_json/1.0.36/download -> serde_json-1.0.36.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.26/download -> syn-0.15.26.crate https://crates.io/api/v1/crates/tempfile/3.0.5/download -> tempfile-3.0.5.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/toml/0.4.10/download -> toml-0.4.10.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=09046d6a2662c1103e63f3a84f2d4896
diff --git a/metadata/md5-cache/dev-util/ccache-3.6 b/metadata/md5-cache/dev-util/ccache-3.6
index b880f27eaade..a65f3f22fd88 100644
--- a/metadata/md5-cache/dev-util/ccache-3.6
+++ b/metadata/md5-cache/dev-util/ccache-3.6
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils sys-libs/zlib
 DESCRIPTION=fast compiler cache
 EAPI=7
 HOMEPAGE=https://ccache.samba.org/
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.6.tar.xz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=8efcce13e487590089b365e86e0d6788
+_md5_=59e52a27edfbb8e2e4da83fc891950ac
diff --git a/metadata/md5-cache/dev-util/cccc-3.1.5-r1 b/metadata/md5-cache/dev-util/cccc-3.1.5-r1
new file mode 100644
index 000000000000..0eb1d3a3d25d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cccc-3.1.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=apidoc? ( app-doc/doxygen[dot] )
+DESCRIPTION=Source metrics (line counts, complexity, etc) for Java and C++
+EAPI=6
+HOMEPAGE=http://sarnold.github.io/cccc/
+IUSE=apidoc debug doc mfc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/sarnold/cccc/archive/3.1.5.tar.gz -> cccc-3.1.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a79dd28cf2a7163847861d434d72c9fb
diff --git a/metadata/md5-cache/dev-util/cmake-3.14.3 b/metadata/md5-cache/dev-util/cmake-3.14.3
index 0044f374bd6e..61a63cc517be 100644
--- a/metadata/md5-cache/dev-util/cmake-3.14.3
+++ b/metadata/md5-cache/dev-util/cmake-3.14.3
@@ -5,10 +5,10 @@ DESCRIPTION=Cross platform Make
 EAPI=7
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs system-jsoncpp ncurses qt5 test test
-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
+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=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.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.14/cmake-3.14.3.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fdef28ce26780ae656a7c01d4edca920
+_md5_=29e6629666ed9e088b9d3e12f76684c6
diff --git a/metadata/md5-cache/dev-util/cmake-3.14.5 b/metadata/md5-cache/dev-util/cmake-3.14.5
new file mode 100644
index 000000000000..209525b12e47
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.14.5
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.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= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cross platform Make
+EAPI=7
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs system-jsoncpp ncurses qt5 test test
+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=CMake
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.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.14/cmake-3.14.5.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=76eb95edd96deb9b39751cdef031d64f
diff --git a/metadata/md5-cache/dev-util/cmocka-1.1.5 b/metadata/md5-cache/dev-util/cmocka-1.1.5
index a02d1fa56571..79c7c70d4d0a 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.1.5
+++ b/metadata/md5-cache/dev-util/cmocka-1.1.5
@@ -4,9 +4,9 @@ DESCRIPTION=Unit testing framework for C
 EAPI=7
 HOMEPAGE=https://cmocka.org/
 IUSE=doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://cmocka.org/files/1.1/cmocka-1.1.5.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cf490cef91202e2b39e0461b515a66f3
+_md5_=635d8801f923b813b193ef8d2b497135
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.87 b/metadata/md5-cache/dev-util/cppcheck-1.87
new file mode 100644
index 000000000000..69b3000e58d4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cppcheck-1.87
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[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(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig
+DESCRIPTION=Static analyzer of C/C++ code
+EAPI=7
+HOMEPAGE=https://github.com/danmar/cppcheck
+IUSE=htmlreport pcre qt5 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[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(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 ) 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/danmar/cppcheck/archive/1.87.tar.gz -> cppcheck-1.87.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=7b999da205de873bf0115e1fae49f1b2
diff --git a/metadata/md5-cache/dev-util/cppcheck-9999 b/metadata/md5-cache/dev-util/cppcheck-9999
index 91bdbedc016b..c78c656b346b 100644
--- a/metadata/md5-cache/dev-util/cppcheck-9999
+++ b/metadata/md5-cache/dev-util/cppcheck-9999
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=900231faea9320fce8cffeecee11d141
+_md5_=bfb0f25ee35b39055f24c9272b82e5d2
diff --git a/metadata/md5-cache/dev-util/cram-0.7 b/metadata/md5-cache/dev-util/cram-0.7
index efedae9c18a8..b1d163ffdba6 100644
--- a/metadata/md5-cache/dev-util/cram-0.7
+++ b/metadata/md5-cache/dev-util/cram-0.7
@@ -1,14 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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=Functional testing framework for command line applications
-EAPI=6
+EAPI=7
 HOMEPAGE=https://bitheap.org/cram/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cram/cram-0.7.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=526b54c2d09662ed35cf6f665b3691a4
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=73605c4f495b7252788bcdd4f9f62b3e
diff --git a/metadata/md5-cache/dev-util/creduce-2.7.0 b/metadata/md5-cache/dev-util/creduce-2.7.0
deleted file mode 100644
index 13acbf600cf4..000000000000
--- a/metadata/md5-cache/dev-util/creduce-2.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:4 sys-devel/flex dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=C-Reduce - a plugin-based C program reducer
-EAPI=6
-HOMEPAGE=https://embed.cs.utah.edu/creduce/
-KEYWORDS=~amd64 ~x86
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:4 dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU
-SLOT=0
-SRC_URI=https://embed.cs.utah.edu/creduce/creduce-2.7.0.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2f69fd6f2a46b09a74999df5a544679b
diff --git a/metadata/md5-cache/dev-util/creduce-2.7.0-r1 b/metadata/md5-cache/dev-util/creduce-2.7.0-r1
index 41fd14753726..4ae63017032e 100644
--- a/metadata/md5-cache/dev-util/creduce-2.7.0-r1
+++ b/metadata/md5-cache/dev-util/creduce-2.7.0-r1
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:5 dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU
 SLOT=0
 SRC_URI=https://embed.cs.utah.edu/creduce/creduce-2.7.0.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=e0340f4ff0ee0c0efd29272210b10a1a
diff --git a/metadata/md5-cache/dev-util/creduce-2.8.0 b/metadata/md5-cache/dev-util/creduce-2.8.0
index 28006b32f18c..4900d0f9c9de 100644
--- a/metadata/md5-cache/dev-util/creduce-2.8.0
+++ b/metadata/md5-cache/dev-util/creduce-2.8.0
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:7 dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common
 SLOT=0
 SRC_URI=https://embed.cs.utah.edu/creduce/creduce-2.8.0.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=3f914304a6ae8633eda6ad0ec590ca0e
diff --git a/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411 b/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411
index 48c6c9e32e6f..028c48823556 100644
--- a/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411
+++ b/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:6 dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU
 SLOT=0
 SRC_URI=https://github.com/csmith-project/creduce/archive/48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz -> creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=75b2f57de487cbe35d0633d6926d41a8
diff --git a/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411-r1 b/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411-r1
index 16658e8ab93a..aa4f4fb1ff77 100644
--- a/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411-r1
+++ b/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411-r1
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:7 dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU
 SLOT=0
 SRC_URI=https://github.com/csmith-project/creduce/archive/48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz -> creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5f40e5dea2eede4c4c6c787d228108c7
diff --git a/metadata/md5-cache/dev-util/creduce-2.9.0_pre20190414-r1 b/metadata/md5-cache/dev-util/creduce-2.9.0_pre20190414-r1
index 1ed57cd130ba..91235748d07f 100644
--- a/metadata/md5-cache/dev-util/creduce-2.9.0_pre20190414-r1
+++ b/metadata/md5-cache/dev-util/creduce-2.9.0_pre20190414-r1
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:7 dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common
 SLOT=0
 SRC_URI=https://github.com/csmith-project/creduce/archive/095c551a5f9ccaf2986edb836e7be9872d36c233.tar.gz -> creduce-095c551a5f9ccaf2986edb836e7be9872d36c233.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f3b2e4b43cf24dc13ff953c1885f3e69
diff --git a/metadata/md5-cache/dev-util/creduce-9999 b/metadata/md5-cache/dev-util/creduce-9999
index 8eac901faa51..23d199e69124 100644
--- a/metadata/md5-cache/dev-util/creduce-9999
+++ b/metadata/md5-cache/dev-util/creduce-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://embed.cs.utah.edu/creduce/
 LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:7 dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common
 SLOT=0
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f8e85da0afe119a2e6195e49b2a0e50d
diff --git a/metadata/md5-cache/dev-util/dbus-test-runner-15.04.0_p100 b/metadata/md5-cache/dev-util/dbus-test-runner-15.04.0_p100
index b403951c94ee..a04bcdfdee38 100644
--- a/metadata/md5-cache/dev-util/dbus-test-runner-15.04.0_p100
+++ b/metadata/md5-cache/dev-util/dbus-test-runner-15.04.0_p100
@@ -4,11 +4,11 @@ DESCRIPTION=Run executables under a new DBus session for testing
 EAPI=6
 HOMEPAGE=https://launchpad.net/dbus-test-runner
 IUSE=test python_targets_python3_5 python_targets_python3_6 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-3
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.34:2 dev-python/dbusmock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/dbus-test-runner-15.04.0_p100.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d59d2a757e9a6552189c891eee8936bb
+_md5_=abbd04aa7e81dc1457e300199e1f682d
diff --git a/metadata/md5-cache/dev-util/devhelp-3.30.1 b/metadata/md5-cache/dev-util/devhelp-3.30.1
index 843363ed35bc..24cefa0f7df9 100644
--- a/metadata/md5-cache/dev-util/devhelp-3.30.1
+++ b/metadata/md5-cache/dev-util/devhelp-3.30.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs
 REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0/3-6
 SRC_URI=mirror://gnome/sources/devhelp/3.30/devhelp-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f19010d231f295421c4edbc506883a28
diff --git a/metadata/md5-cache/dev-util/dwarves-1.13 b/metadata/md5-cache/dev-util/dwarves-1.13
new file mode 100644
index 000000000000..e518ebf71750
--- /dev/null
+++ b/metadata/md5-cache/dev-util/dwarves-1.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
+EAPI=6
+HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
+IUSE=debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.13.tar.xz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=7ad663ec6b255dd23628f0713e32a8fa
diff --git a/metadata/md5-cache/dev-util/edi-0.7.1 b/metadata/md5-cache/dev-util/edi-0.7.1
index c2f35c0b2a57..9358345a50e0 100644
--- a/metadata/md5-cache/dev-util/edi-0.7.1
+++ b/metadata/md5-cache/dev-util/edi-0.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1-with-linking-exception
 RDEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) >=dev-libs/efl-1.22.0[eet] clang? ( sys-devel/clang:= )
 SLOT=0
 SRC_URI=https://github.com/Enlightenment/edi/archive/v0.7.1.tar.gz -> edi-0.7.1.tar.gz
-_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=48bb625c7cd5194d7f50da44a183de16
diff --git a/metadata/md5-cache/dev-util/flawfinder-2.0.8 b/metadata/md5-cache/dev-util/flawfinder-2.0.8
new file mode 100644
index 000000000000..faf2810458ef
--- /dev/null
+++ b/metadata/md5-cache/dev-util/flawfinder-2.0.8
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Examines C/C++ source code for security flaws
+EAPI=7
+HOMEPAGE=https://www.dwheeler.com/flawfinder/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://www.dwheeler.com/flawfinder/flawfinder-2.0.8.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=41b8b779947e0585b0939e643aa7a5d0
diff --git a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2 b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
new file mode 100644
index 000000000000..9bf207211a16
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
@@ -0,0 +1,11 @@
+BDEPEND=sys-devel/bison
+DEFINED_PHASES=prepare
+DESCRIPTION=A 100% compatible, enhanced implementation of the make alternative Jam
+EAPI=7
+HOMEPAGE=http://freetype.sourceforge.net/jam/index.html
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=perforce GPL-2
+SLOT=0
+SRC_URI=http://david.freetype.org/jam/ftjam-2.5.3rc2.tar.bz2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=eeddf5b9c406bdd5f8958a6a7c59140c
diff --git a/metadata/md5-cache/dev-util/geany-1.34.1 b/metadata/md5-cache/dev-util/geany-1.34.1
index 3265d87cbf6b..be6ad982bdb3 100644
--- a/metadata/md5-cache/dev-util/geany-1.34.1
+++ b/metadata/md5-cache/dev-util/geany-1.34.1
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ based fast and lightweight IDE
 EAPI=6
 HOMEPAGE=https://www.geany.org
 IUSE=+gtk3 +vte
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ HPND
 RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
 SLOT=0
 SRC_URI=https://download.geany.org/geany-1.34.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=47c8d1667aa8f61768df50381fb08df6
+_md5_=a5324c66ef9aaf4f85fdbfdf8e1df458
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.34 b/metadata/md5-cache/dev-util/geany-plugins-1.34
index 6c0298f5acf9..b567e7536c40 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.34
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.34
@@ -5,11 +5,11 @@ DESCRIPTION=A collection of different plugins for Geany
 EAPI=7
 HOMEPAGE=https://plugins.geany.org
 IUSE=+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.34[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk ) multiterm? ( || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
 REQUIRED_USE=gtk3? ( !debugger !multiterm !python ) !gtk3? ( !markdown ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.34.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae
-_md5_=37b56b6d020c2c4fb0a4abe95c4bb812
+_md5_=16a94d44c99848e2a91901bbddf0da8f
diff --git a/metadata/md5-cache/dev-util/glade-3.20.4 b/metadata/md5-cache/dev-util/glade-3.20.4
index c8c43de45379..33cbb9ec3a8b 100644
--- a/metadata/md5-cache/dev-util/glade-3.20.4
+++ b/metadata/md5-cache/dev-util/glade-3.20.4
@@ -4,11 +4,11 @@ DESCRIPTION=A user interface designer for GTK+ and GNOME
 EAPI=6
 HOMEPAGE=https://glade.gnome.org/
 IUSE=debug +introspection python python_targets_python2_7 test
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=3.10/6
 SRC_URI=mirror://gnome/sources/glade/3.20/glade-3.20.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7560f6a83e03a9e3b9aefd615a231525
+_md5_=41dad549ff084bb8c9f3205b378dc2a7
diff --git a/metadata/md5-cache/dev-util/gn-0.1583 b/metadata/md5-cache/dev-util/gn-0.1583
new file mode 100644
index 000000000000..2110589ba001
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gn-0.1583
@@ -0,0 +1,12 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja
+DEFINED_PHASES=compile configure install setup test
+DESCRIPTION=GN is a meta-build system that generates build files for Ninja
+EAPI=7
+HOMEPAGE=https://gn.googlesource.com/
+IUSE=vim-syntax
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~floppym/dist/gn-0.1583.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ebcaa127604349d34f041546f942cf29
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.30.3 b/metadata/md5-cache/dev-util/gnome-builder-3.30.3
index 8309f8866560..0ebab5688808 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-3.30.3
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.30.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libdazzle-3.30.2[introspection,vala?] >=dev-libs/glib-2.58.0:
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/3.30/gnome-builder-3.30.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=fef86d89750247c6a749b0a5af37b385
diff --git a/metadata/md5-cache/dev-util/goland-2018.3.4 b/metadata/md5-cache/dev-util/goland-2018.3.4
deleted file mode 100644
index 740507f8e7de..000000000000
--- a/metadata/md5-cache/dev-util/goland-2018.3.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Golang IDE by JetBrains
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/go
-KEYWORDS=~amd64
-LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-RDEPEND=dev-lang/go
-SLOT=0
-SRC_URI=http://download.jetbrains.com/go/goland-2018.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a122af185225baf212543870eb10707
diff --git a/metadata/md5-cache/dev-util/goland-2019.1.1 b/metadata/md5-cache/dev-util/goland-2019.1.1
deleted file mode 100644
index b80743e0eaf1..000000000000
--- a/metadata/md5-cache/dev-util/goland-2019.1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Golang IDE by JetBrains
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/go
-KEYWORDS=~amd64
-LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-RDEPEND=dev-lang/go
-SLOT=0
-SRC_URI=http://download.jetbrains.com/go/goland-2019.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a122af185225baf212543870eb10707
diff --git a/metadata/md5-cache/dev-util/goland-2019.1.2 b/metadata/md5-cache/dev-util/goland-2019.1.2
new file mode 100644
index 000000000000..2649bbd0fc75
--- /dev/null
+++ b/metadata/md5-cache/dev-util/goland-2019.1.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Golang IDE by JetBrains
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/go
+KEYWORDS=~amd64
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=dev-lang/go
+SLOT=0
+SRC_URI=http://download.jetbrains.com/go/goland-2019.1.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4a122af185225baf212543870eb10707
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.7 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.7
index 2a7e4c48066f..680a58d52816 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.7
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.7
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache/-/archive/3.24.7/gtk-update-icon-cache-3.24.7.tar.bz2
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=5640c505e9f5a3b87cc69b50246d5db2
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8
index d9090eafb24e..cde64a48ef99 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.2
 DESCRIPTION=GTK update icon cache
 EAPI=6
 HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache/-/archive/3.24.8/gtk-update-icon-cache-3.24.8.tar.bz2
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=cde9f596691a5df0dda1ea46785e7ebd
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9437ff1e1bbbe79563a5058481e8efe1
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-4.0-r2 b/metadata/md5-cache/dev-util/include-what-you-use-4.0-r2
deleted file mode 100644
index 47614f442650..000000000000
--- a/metadata/md5-cache/dev-util/include-what-you-use-4.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:4 sys-devel/clang:4 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Find unused include directives in C/C++ programs
-EAPI=6
-HOMEPAGE=https://include-what-you-use.org/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/llvm:4 sys-devel/clang:4 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_4.0.tar.gz -> include-what-you-use-4.0.src.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1a2fe1260e450e9aad4f64c242f7a668
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-5.0 b/metadata/md5-cache/dev-util/include-what-you-use-5.0
index 8261eac28208..d67deb56e028 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-5.0
+++ b/metadata/md5-cache/dev-util/include-what-you-use-5.0
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:5 sys-devel/clang:5 python_single_target_python2_7? ( >=d
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_5.0.tar.gz -> include-what-you-use-5.0.src.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=9ba91e2fe5dba8c5e1c31d3036579c29
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-6.0 b/metadata/md5-cache/dev-util/include-what-you-use-6.0
index e6a91e14217f..cbca7be57208 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-6.0
+++ b/metadata/md5-cache/dev-util/include-what-you-use-6.0
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:6 sys-devel/clang:6 python_single_target_python2_7? ( >=d
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_6.0.tar.gz -> include-what-you-use-6.0.src.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ec03f613f84399ce77669e403f972240
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-7.0 b/metadata/md5-cache/dev-util/include-what-you-use-7.0
index ed72e2b46d41..20b31de914ad 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-7.0
+++ b/metadata/md5-cache/dev-util/include-what-you-use-7.0
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:7 sys-devel/clang:7 python_single_target_python2_7? ( >=d
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_7.0.tar.gz -> include-what-you-use-7.0.src.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=77b368f54bb07aba062a08e39ec46061
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-8.0 b/metadata/md5-cache/dev-util/include-what-you-use-8.0
index 0d51a412126b..824b12a44c3e 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-8.0
+++ b/metadata/md5-cache/dev-util/include-what-you-use-8.0
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:8 sys-devel/clang:8 python_single_target_python2_7? ( >=d
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_8.0.tar.gz -> include-what-you-use-8.0.src.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=7d4cfb1cf293b633b53a5bd1a9e0ccc3
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.3 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.3
index 84b83e4aee2b..8e1c691567ba 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.3
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-devel/llvm:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/opencl-clang:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.3.tar.gz -> intel-graphics-compiler-1.0.3.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=2d53337fac4df57b2fbaf89b23e85b68
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4
new file mode 100644
index 000000000000..3b4e58a98725
--- /dev/null
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=sys-devel/llvm:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/opencl-clang:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=LLVM-based OpenCL compiler targetting Intel Gen graphics hardware
+EAPI=7
+HOMEPAGE=https://github.com/intel/intel-graphics-compiler
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=sys-devel/llvm:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/opencl-clang:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.4.tar.gz -> intel-graphics-compiler-1.0.4.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0741cc6ded8d42f234f5257bbc71873d
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.0 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.0
new file mode 100644
index 000000000000..28587efbb51c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.57.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils
+DESCRIPTION=LL(1) parser generator used mainly by KDevelop language plugins
+EAPI=7
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop-pg-qt/2.2.0/src/kdevelop-pg-qt-2.2.0.tar.xz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=129fb5699dd20ed7308a61c1d0e3f74d
diff --git a/metadata/md5-cache/dev-util/lcov-1.11 b/metadata/md5-cache/dev-util/lcov-1.11
index 0f0d03f5f078..6da3e28d880b 100644
--- a/metadata/md5-cache/dev-util/lcov-1.11
+++ b/metadata/md5-cache/dev-util/lcov-1.11
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
 EAPI=4
 HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 dev-perl/GD[png]
 SLOT=0
 SRC_URI=mirror://sourceforge/ltp/lcov-1.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a05a7951589fd1fed85988cac3a39e10
+_md5_=bf93e92e1d4ce0c7e256f8d84e4398fa
diff --git a/metadata/md5-cache/dev-util/lldb-7.1.0 b/metadata/md5-cache/dev-util/lldb-7.1.0
index cd80f1eea682..4f515cfeb8a1 100644
--- a/metadata/md5-cache/dev-util/lldb-7.1.0
+++ b/metadata/md5-cache/dev-util/lldb-7.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.1.0/lldb-7.1.0.src.tar.xz test? ( https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz )
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f1d9711795a0c4ceaa7ce946f8b1ceda
diff --git a/metadata/md5-cache/dev-util/lldb-8.0.0 b/metadata/md5-cache/dev-util/lldb-8.0.0
index 83ea452b5596..cca68f1e0760 100644
--- a/metadata/md5-cache/dev-util/lldb-8.0.0
+++ b/metadata/md5-cache/dev-util/lldb-8.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/8.0.0/lldb-8.0.0.src.tar.xz test? ( https://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz )
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ad012ed0a9b530d1d39b9dab2b6a306f
diff --git a/metadata/md5-cache/dev-util/lldb-8.0.9999 b/metadata/md5-cache/dev-util/lldb-8.0.9999
index 5b0e4c71421a..01891e3a83e0 100644
--- a/metadata/md5-cache/dev-util/lldb-8.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-8.0.9999
@@ -9,5 +9,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=
 REQUIRED_USE=python_targets_python2_7
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5eaa758c99554b4e9cd0512d02c5c0bc
diff --git a/metadata/md5-cache/dev-util/lldb-9999 b/metadata/md5-cache/dev-util/lldb-9999
index da60e3cf18cc..fb5bb9e0e4fe 100644
--- a/metadata/md5-cache/dev-util/lldb-9999
+++ b/metadata/md5-cache/dev-util/lldb-9999
@@ -9,5 +9,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=
 REQUIRED_USE=python_targets_python2_7
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=9c6d9801c04f04d0a1ed0e9c681819be
diff --git a/metadata/md5-cache/dev-util/lxqt-build-tools-0.6.0 b/metadata/md5-cache/dev-util/lxqt-build-tools-0.6.0
index 08cdff350c46..9a6e80d4a5ab 100644
--- a/metadata/md5-cache/dev-util/lxqt-build-tools-0.6.0
+++ b/metadata/md5-cache/dev-util/lxqt-build-tools-0.6.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5
 DESCRIPTION=LXQt Build tools
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-build-tools/0.6.0/lxqt-build-tools-0.6.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d20ffdbd9128069c0a4610d3a8b4825a
+_md5_=400acd038b25620d4b5cfd12b8c7fa02
diff --git a/metadata/md5-cache/dev-util/oprofile-1.3.0 b/metadata/md5-cache/dev-util/oprofile-1.3.0
index 50885eb36734..ae470c091417 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.3.0
+++ b/metadata/md5-cache/dev-util/oprofile-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=A transparent low-overhead system-wide profiler
 EAPI=6
 HOMEPAGE=http://oprofile.sourceforge.net
 IUSE=java pch elibc_FreeBSD java kernel_linux
-KEYWORDS=alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) ppc64? ( dev-libs/libpfm ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c9f7358616c83db15c297379bce9e9de
+_md5_=fd9c56ec480b9f451294c7f07153d2d8
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2018.3.4 b/metadata/md5-cache/dev-util/pycharm-community-2018.3.4
deleted file mode 100644
index acbdcf632b0c..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-community-2018.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
-RDEPEND=>=virtual/jre-1.8 dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-community-2018.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6e7ee47c16d469a41b9922f780c94f7f
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2018.3.5 b/metadata/md5-cache/dev-util/pycharm-community-2018.3.5
deleted file mode 100644
index bca66675adeb..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-community-2018.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
-RDEPEND=>=virtual/jre-1.8 dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-community-2018.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=957aff7fa620c0baaffd152bfb9ae109
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2019.1 b/metadata/md5-cache/dev-util/pycharm-community-2019.1
deleted file mode 100644
index ff8cc9280a3d..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-community-2019.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
-RDEPEND=>=virtual/jre-1.8 dev-libs/libdbusmenu dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-community-2019.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3bc6af74ae159dbca6f38d40725fd510
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2019.1.1 b/metadata/md5-cache/dev-util/pycharm-community-2019.1.1
index b3e86273b142..79b33b52f76d 100644
--- a/metadata/md5-cache/dev-util/pycharm-community-2019.1.1
+++ b/metadata/md5-cache/dev-util/pycharm-community-2019.1.1
@@ -3,11 +3,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
 EAPI=6
 HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
 RDEPEND=>=virtual/jre-1.8 dev-libs/libdbusmenu dev-python/pip
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-community-2019.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3bc6af74ae159dbca6f38d40725fd510
+_md5_=90e3051df5d9a99c89f9a30538aeac8d
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2018.3.4 b/metadata/md5-cache/dev-util/pycharm-professional-2018.3.4
deleted file mode 100644
index 2b7b496a05b6..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-professional-2018.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=amd64 x86
-LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
-RDEPEND=>=virtual/jre-1.8 dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2018.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6f923d30293847f04e84c825df143242
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2018.3.5 b/metadata/md5-cache/dev-util/pycharm-professional-2018.3.5
deleted file mode 100644
index 8c2e6c142502..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-professional-2018.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
-LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
-RDEPEND=>=virtual/jre-1.8 dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2018.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e39fff5ac924ee8bc1c5e9d57e5efb4b
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2019.1 b/metadata/md5-cache/dev-util/pycharm-professional-2019.1
deleted file mode 100644
index b641b3e45b57..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-professional-2019.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
-LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
-RDEPEND=>=virtual/jre-1.8 dev-libs/libdbusmenu dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2019.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=782a89086436a6b488be9cca7d46f263
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2019.1.1 b/metadata/md5-cache/dev-util/pycharm-professional-2019.1.1
index 1a051f349161..0764e776ffca 100644
--- a/metadata/md5-cache/dev-util/pycharm-professional-2019.1.1
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2019.1.1
@@ -3,11 +3,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
 EAPI=6
 HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
 RDEPEND=>=virtual/jre-1.8 dev-libs/libdbusmenu dev-python/pip
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2019.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=782a89086436a6b488be9cca7d46f263
+_md5_=8efda538770d1a9d09ad527596c73a83
diff --git a/metadata/md5-cache/dev-util/scons-3.0.5 b/metadata/md5-cache/dev-util/scons-3.0.5
index b48ae12fc333..ef510093414b 100644
--- a/metadata/md5-cache/dev-util/scons-3.0.5
+++ b/metadata/md5-cache/dev-util/scons-3.0.5
@@ -4,12 +4,12 @@ DESCRIPTION=Extensible Python-based build utility
 EAPI=6
 HOMEPAGE=http://www.scons.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-3.0.5.tar.gz doc? ( http://www.scons.org/doc/3.0.5/PDF/scons-user.pdf -> scons-3.0.5-user.pdf http://www.scons.org/doc/3.0.5/HTML/scons-user.html -> scons-3.0.5-user.html ) test? ( https://github.com/scons/scons/archive/3.0.5.tar.gz -> scons-3.0.5.gh.tar.gz )
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d5686eeb9692df1c1981f12248f5857a
+_md5_=2839b34c709be27dae234cf04804c8d4
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1 b/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1
index 4163596b4e14..86a3b0a55779 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=sys-devel/llvm:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=8
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v8.0.0-1.tar.gz -> spirv-llvm-translator-8.0.0.1.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=4da46ee43895441f4f0509b330ccea50
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1-r1 b/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1-r1
index 7a73712e4a74..f8c798fd8f59 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1-r1
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=sys-devel/llvm:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=8
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v8.0.0-1.tar.gz -> spirv-llvm-translator-8.0.0.1.tar.gz https://dev.gentoo.org/~marecki/dists/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-LowerOpenCL_new_block_representation.patch.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=087c6652d29aeb873ddf6c3bcde17588
diff --git a/metadata/md5-cache/dev-util/splint-3.1.2-r2 b/metadata/md5-cache/dev-util/splint-3.1.2-r2
index 75c6452d844b..f2245a8c0460 100644
--- a/metadata/md5-cache/dev-util/splint-3.1.2-r2
+++ b/metadata/md5-cache/dev-util/splint-3.1.2-r2
@@ -3,9 +3,9 @@ DEPEND=sys-devel/flex >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.1
 DESCRIPTION=Check C programs for vulnerabilities and programming mistakes
 EAPI=5
 HOMEPAGE=http://lclint.cs.virginia.edu/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.splint.org/downloads/splint-3.1.2.src.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d315380f527794c9964f83eb8cbf90f
+_md5_=f2b0ddeec125df082054e89dcbf70084
diff --git a/metadata/md5-cache/dev-util/strace-4.26 b/metadata/md5-cache/dev-util/strace-4.26
index 6993f0bdbb10..0bdee31c8e1b 100644
--- a/metadata/md5-cache/dev-util/strace-4.26
+++ b/metadata/md5-cache/dev-util/strace-4.26
@@ -4,11 +4,11 @@ DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=6
 HOMEPAGE=https://strace.io/
 IUSE=aio perl static unwind elfutils
-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=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 SRC_URI=https://github.com/strace/strace/releases/download/v4.26/strace-4.26.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d2f5172884472d66a326d6204935403
+_md5_=26e311ee449ed148151de344fdc31f7a
diff --git a/metadata/md5-cache/dev-util/strace-5.1 b/metadata/md5-cache/dev-util/strace-5.1
new file mode 100644
index 000000000000..140d346b1a07
--- /dev/null
+++ b/metadata/md5-cache/dev-util/strace-5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=7
+HOMEPAGE=https://strace.io/
+IUSE=aio perl static unwind elfutils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
+REQUIRED_USE=?? ( unwind elfutils )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v5.1/strace-5.1.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=14ef7503d004a615127a0e0e6731b05e
diff --git a/metadata/md5-cache/dev-util/strace-9999 b/metadata/md5-cache/dev-util/strace-9999
index e3c68d30b9b2..db8c40a70ecf 100644
--- a/metadata/md5-cache/dev-util/strace-9999
+++ b/metadata/md5-cache/dev-util/strace-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare test unpack
-DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
 DESCRIPTION=A useful diagnostic, instructional, and debugging tool
-EAPI=6
+EAPI=7
 HOMEPAGE=https://strace.io/
 IUSE=aio perl static unwind elfutils
 LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee6b1b4c59b99ac7335a0c0f7b50b4c3
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=14ef7503d004a615127a0e0e6731b05e
diff --git a/metadata/md5-cache/dev-util/sysdig-0.24.2 b/metadata/md5-cache/dev-util/sysdig-0.24.2
deleted file mode 100644
index 9f0d60719af9..000000000000
--- a/metadata/md5-cache/dev-util/sysdig-0.24.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= app-arch/xz-utils virtual/os-headers modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) ) dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=A system exploration and troubleshooting tool
-EAPI=6
-HOMEPAGE=https://www.sysdig.org/
-IUSE=libressl +modules kernel_linux kernel_linux modules
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 modules? ( || ( MIT GPL-2 ) )
-RDEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= modules? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-SRC_URI=https://github.com/draios/sysdig/archive/0.24.2.tar.gz -> sysdig-0.24.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=62e7b16d63149bb860451b45bee7a27e
diff --git a/metadata/md5-cache/dev-util/sysdig-0.26.1 b/metadata/md5-cache/dev-util/sysdig-0.26.1
new file mode 100644
index 000000000000..9d3c21d68f74
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sysdig-0.26.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= app-arch/xz-utils virtual/os-headers modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=A system exploration and troubleshooting tool
+EAPI=7
+HOMEPAGE=https://www.sysdig.org/
+IUSE=libressl +modules kernel_linux kernel_linux modules
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 modules? ( || ( MIT GPL-2 ) )
+RDEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= modules? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=https://github.com/draios/sysdig/archive/0.26.1.tar.gz -> sysdig-0.26.1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=a761e99975d928a371faeedf01acd280
diff --git a/metadata/md5-cache/dev-util/sysprof-3.30.2-r1 b/metadata/md5-cache/dev-util/sysprof-3.30.2-r1
index 5b3a49e9627a..4818aef9a0ae 100644
--- a/metadata/md5-cache/dev-util/sysprof-3.30.2-r1
+++ b/metadata/md5-cache/dev-util/sysprof-3.30.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 sys-auth/polkit gtk? ( >=x11-libs/gtk+-3.22.0:3 )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sysprof/3.30/sysprof-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=dd9cfa3b61e03fe2fa530bc02ebf12b4
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 8df6f3e0ab91..674c4f3691f8 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/darcs-2.12.5 b/metadata/md5-cache/dev-vcs/darcs-2.12.5
index c4fa7d76b6f8..e4a5598d16e6 100644
--- a/metadata/md5-cache/dev-vcs/darcs-2.12.5
+++ b/metadata/md5-cache/dev-vcs/darcs-2.12.5
@@ -4,10 +4,10 @@ DESCRIPTION=a distributed, interactive, smart revision control system
 EAPI=6
 HOMEPAGE=http://darcs.net/
 IUSE=+curl +network-uri +terminfo +threaded doc hscolour profile test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.5:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.10.1:= curl? ( net-misc/curl ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
 SLOT=0/2.12.5
 SRC_URI=mirror://hackage/packages/archive/darcs/2.12.5/darcs-2.12.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd4c16284cc7f2419ed55b0729bb54df
+_md5_=9827b1deb0433e3e10ac47f92f51fc09
diff --git a/metadata/md5-cache/dev-vcs/git-2.22.0_rc1 b/metadata/md5-cache/dev-vcs/git-2.22.0_rc1
deleted file mode 100644
index 82431327d648..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.22.0_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-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 ) iconv? ( virtual/libiconv ) 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=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-LICENSE=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 ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
-SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/testing/git-2.22.0.rc1.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.22.0.rc1.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.22.0.rc1.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=2c6e19151ff9d565c93b4e3d3eb91046
diff --git a/metadata/md5-cache/dev-vcs/git-2.22.0_rc2 b/metadata/md5-cache/dev-vcs/git-2.22.0_rc2
new file mode 100644
index 000000000000..b6fdedb6a310
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.22.0_rc2
@@ -0,0 +1,13 @@
+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 ) iconv? ( virtual/libiconv ) 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=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+LICENSE=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 ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=mirror://kernel/software/scm/git/testing/git-2.22.0.rc2.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.22.0.rc2.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.22.0.rc2.tar.xz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=2c6e19151ff9d565c93b4e3d3eb91046
diff --git a/metadata/md5-cache/dev-vcs/git-lfs-2.6.1 b/metadata/md5-cache/dev-vcs/git-lfs-2.6.1
index edbeea737d0a..fafccd259692 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-2.6.1
+++ b/metadata/md5-cache/dev-vcs/git-lfs-2.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=command line extension and specification for managing large files wi
 EAPI=6
 HOMEPAGE=https://git-lfs.github.com/
 IUSE=+doc
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT BSD BSD-2 BSD-4 Apache-2.0
 RDEPEND=dev-vcs/git
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/git-lfs/git-lfs/archive/v2.6.1.tar.gz -> git-lfs-2.6.1.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=8e044e27a6ce845d02ee0221ebdb5a9e
+_md5_=c8f45e38fb44bcb31046a4b14182e213
diff --git a/metadata/md5-cache/dev-vcs/gitg-3.30.1 b/metadata/md5-cache/dev-vcs/gitg-3.30.1
index bf48abc26272..0e6eccbfb864 100644
--- a/metadata/md5-cache/dev-vcs/gitg-3.30.1
+++ b/metadata/md5-cache/dev-vcs/gitg-3.30.1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret[vala] >=app-text/gtkspell-3.0.3:3[vala] >=dev-libs/g
 REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gitg/3.30/gitg-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=fe59a2f9556c0842a292426769eb1da1
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-8.3.3 b/metadata/md5-cache/dev-vcs/hg-evolve-8.3.3
deleted file mode 100644
index 8a8cd96c0971..000000000000
--- a/metadata/md5-cache/dev-vcs/hg-evolve-8.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_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(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/mercurial-4.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx )
-DESCRIPTION=enables the changeset evolution feature of Mercurial
-EAPI=7
-HOMEPAGE=https://www.mercurial-scm.org/doc/evolution/
-IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-vcs/mercurial-4.3[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-evolve/hg-evolve-8.3.3.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=227be8e2171447f832c2154b40f1b8b4
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-8.4.0 b/metadata/md5-cache/dev-vcs/hg-evolve-8.4.0
deleted file mode 100644
index fc06c77a69c3..000000000000
--- a/metadata/md5-cache/dev-vcs/hg-evolve-8.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_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(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/mercurial-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx )
-DESCRIPTION=enables the changeset evolution feature of Mercurial
-EAPI=7
-HOMEPAGE=https://www.mercurial-scm.org/doc/evolution/
-IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-vcs/mercurial-4.4[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-evolve/hg-evolve-8.4.0.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0651a00b5142a46aa31876984982d805
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-8.5.1 b/metadata/md5-cache/dev-vcs/hg-evolve-8.5.1
new file mode 100644
index 000000000000..89f541a4c865
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/hg-evolve-8.5.1
@@ -0,0 +1,15 @@
+BDEPEND=python_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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-vcs/mercurial-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx )
+DESCRIPTION=enables the changeset evolution feature of Mercurial
+EAPI=7
+HOMEPAGE=https://www.mercurial-scm.org/doc/evolution/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-vcs/mercurial-4.4[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-evolve/hg-evolve-8.5.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=0651a00b5142a46aa31876984982d805
diff --git a/metadata/md5-cache/dev-vcs/svneverever-1.3.1 b/metadata/md5-cache/dev-vcs/svneverever-1.3.1
new file mode 100644
index 000000000000..1168fec8faa9
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/svneverever-1.3.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tool collecting path entries across SVN history
+EAPI=7
+HOMEPAGE=https://github.com/hartwork/svneverever
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/pysvn[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/hartwork/svneverever/archive/v1.3.1.tar.gz -> svneverever-1.3.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8c06e74b2735108223b7d8cc8d48efaa
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index e3a821a6a8d1..4748864277f0 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/descent3-1.4.0b-r2 b/metadata/md5-cache/games-action/descent3-1.4.0b-r2
index 0cf06b997d83..8252265929b1 100644
--- a/metadata/md5-cache/games-action/descent3-1.4.0b-r2
+++ b/metadata/md5-cache/games-action/descent3-1.4.0b-r2
@@ -7,8 +7,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LOKI-EULA
 PROPERTIES=interactive
 RDEPEND=sys-libs/glibc media-libs/libsdl[abi_x86_32(-)] media-libs/smpeg[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=strip
+RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/descent3/descent3-1.4.0a-x86.run mirror://lokigames/descent3/descent3-1.4.0b-x86.run
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a1821063d044737b4f5a786ed553873d
+_md5_=1a3f882e02e0c3d4a31f0345c1c2bd61
diff --git a/metadata/md5-cache/games-action/fakk2-1.02-r1 b/metadata/md5-cache/games-action/fakk2-1.02-r1
index c439242ca727..a6f0ddab4fc2 100644
--- a/metadata/md5-cache/games-action/fakk2-1.02-r1
+++ b/metadata/md5-cache/games-action/fakk2-1.02-r1
@@ -7,7 +7,7 @@ KEYWORDS=~x86
 LICENSE=LOKI-EULA
 PROPERTIES=interactive
 RDEPEND=virtual/opengl
-RESTRICT=strip
+RESTRICT=strip bindist
 SLOT=0
 _eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=267f43ea65dc4373e42a43bd2e49fe4d
+_md5_=e0058bcc9cd433191f3c2203ed0861ff
diff --git a/metadata/md5-cache/games-action/guacamelee-20140222 b/metadata/md5-cache/games-action/guacamelee-20140222
new file mode 100644
index 000000000000..d09750eff01f
--- /dev/null
+++ b/metadata/md5-cache/games-action/guacamelee-20140222
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch postinst postrm unpack
+DESCRIPTION=A Metroidvania-style action-platformer set in a magical Mexican-inspired world
+EAPI=7
+HOMEPAGE=http://guacamelee.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/libsdl2[abi_x86_32,joystick,opengl,sound,threads,video] virtual/opengl[abi_x86_32]
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=Guacamelee_linux_1393037377.sh
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=a9aa7c1257c7c14a1073935eeb35dfcc
diff --git a/metadata/md5-cache/games-action/heretic2-1.06c-r1 b/metadata/md5-cache/games-action/heretic2-1.06c-r1
index b625bcf179ae..94de7bfc2650 100644
--- a/metadata/md5-cache/games-action/heretic2-1.06c-r1
+++ b/metadata/md5-cache/games-action/heretic2-1.06c-r1
@@ -7,8 +7,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LOKI-EULA
 PROPERTIES=interactive
 RDEPEND=virtual/opengl amd64? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] ) x86? ( x11-libs/libX11 x11-libs/libXext ) games-misc/games-envd
-RESTRICT=strip
+RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/heretic2/heretic2-1.06b-unified-x86.run mirror://lokigames/heretic2/heretic2-1.06c-unified-x86.run mirror://lokigames/heretic2/heretic2-maps-1.0.run
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=905ed7b1bbb2f0f660e5951851aa7808
+_md5_=f1f8ec0176672c97b287cfedf4baf03f
diff --git a/metadata/md5-cache/games-action/heretic2-demo-1.06a b/metadata/md5-cache/games-action/heretic2-demo-1.06a
index a0a3f710b15f..af0b120b6ae7 100644
--- a/metadata/md5-cache/games-action/heretic2-demo-1.06a
+++ b/metadata/md5-cache/games-action/heretic2-demo-1.06a
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.lokigames.com/products/heretic2/ http://www.hereticii.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=LOKI-EULA
 RDEPEND=x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=strip
+RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/loki_demos/heretic2-demo.run
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6926969b65dd6d775746911f10da0946
+_md5_=a81997323ddb2da815f17ddba67c93b1
diff --git a/metadata/md5-cache/games-action/mutantstorm-demo-1.33-r1 b/metadata/md5-cache/games-action/mutantstorm-demo-1.33-r1
index 65b9aa9bb3ea..6ad421dd3040 100644
--- a/metadata/md5-cache/games-action/mutantstorm-demo-1.33-r1
+++ b/metadata/md5-cache/games-action/mutantstorm-demo-1.33-r1
@@ -5,8 +5,8 @@ HOMEPAGE=http://www.pompomgames.com/
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=POMPOM
 RDEPEND=media-libs/libsdl[abi_x86_32(-)] sys-libs/lib-compat x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
-RESTRICT=strip
+RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=ftp://ggdev-1.homelan.com/mutantstorm/MutantStormDemo_1_33.sh.bin
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=268ab149ced8cc0ea43d4e99cb83ad59
+_md5_=512367f0b0b7ab01c04cde756b14c4f3
diff --git a/metadata/md5-cache/games-action/postalplus-1-r1 b/metadata/md5-cache/games-action/postalplus-1-r1
index a326252efe3b..062811c04f2d 100644
--- a/metadata/md5-cache/games-action/postalplus-1-r1
+++ b/metadata/md5-cache/games-action/postalplus-1-r1
@@ -5,7 +5,7 @@ HOMEPAGE=http://www.lokigames.com/products/postal/
 KEYWORDS=~x86
 LICENSE=LOKI-EULA
 PROPERTIES=interactive
-RESTRICT=strip
+RESTRICT=strip bindist
 SLOT=0
 _eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=006bfa01d7534938cb31a821743502d5
+_md5_=62ad9c664761ee57358c52e79d52b2c7
diff --git a/metadata/md5-cache/games-action/rune-1.07-r3 b/metadata/md5-cache/games-action/rune-1.07-r3
index 98ca5a9c9bec..bcb92c019ca7 100644
--- a/metadata/md5-cache/games-action/rune-1.07-r3
+++ b/metadata/md5-cache/games-action/rune-1.07-r3
@@ -6,8 +6,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LOKI-EULA
 PROPERTIES=interactive
 RDEPEND=dev-util/xdelta:0 >=media-libs/libsdl-1.2.9-r1[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
-RESTRICT=strip
+RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://gentoo/rune-all-0.2.tar.bz2
 _eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=33dba71bfd8b48a00b92a1d8681d03bd
+_md5_=09a5a5f054ff91ab48c259f250a818e2
diff --git a/metadata/md5-cache/games-action/spacetripper-demo-1-r1 b/metadata/md5-cache/games-action/spacetripper-demo-1-r1
index 26c74ddc1afd..5e8a8e7e8181 100644
--- a/metadata/md5-cache/games-action/spacetripper-demo-1-r1
+++ b/metadata/md5-cache/games-action/spacetripper-demo-1-r1
@@ -5,8 +5,8 @@ HOMEPAGE=http://www.pompomgames.com/
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=POMPOM
 RDEPEND=>=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-),X,video,joystick,opengl,sound]
-RESTRICT=strip
+RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=http://www.btinternet.com/~bongpig/spacetripperdemo.sh
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ba598f0a211a99a37b1ebf89a2426b3
+_md5_=78d732a8c6572190eff540f78e036bea
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 25db31af41e8..dc8e90a861ec 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.30.1 b/metadata/md5-cache/games-board/gnome-chess-3.30.1
index 7bb9bc6b2349..6b6b8eb10335 100644
--- a/metadata/md5-cache/games-board/gnome-chess-3.30.1
+++ b/metadata/md5-cache/games-board/gnome-chess-3.30.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20.0:3 >=gnome-base/librsvg-2.32.0:2[vala]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/3.30/gnome-chess-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=294f25b4745442533e5153a90ea782b4
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.30.1.1 b/metadata/md5-cache/games-board/gnome-mines-3.30.1.1
index bf5484ed0afd..dee7a57f35b1 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.30.1.1
+++ b/metadata/md5-cache/games-board/gnome-mines-3.30.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8 >=x11-libs/gtk+-3.12:3 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.30/gnome-mines-3.30.1.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5ef78f702002adf408f4748971043874
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index e7f55ec302e4..1fe2263742dd 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/dolphin-5.0 b/metadata/md5-cache/games-emulation/dolphin-5.0
index 0f42056b583e..69f732b3b4cf 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/5.0.zip -> dolphin-5.0.zip
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=53700fefc0602964510d85b69aff4aa2
+_md5_=e0c0a04a803c6f023c9c675b9f91b2da
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.4.0 b/metadata/md5-cache/games-emulation/pcsx2-1.4.0
deleted file mode 100644
index 400d971c639b..000000000000
--- a/metadata/md5-cache/games-emulation/pcsx2-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),X] >=app-eselect/eselect-opengl-1.3.1 dev-cpp/pngpp >=dev-cpp/sparsehash-1.5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A PlayStation 2 emulator
-EAPI=5
-HOMEPAGE=https://www.pcsx2.net
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),X]
-SLOT=0
-SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.4.0.tar.gz -> pcsx2-1.4.0.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c5df337d2205f67ce6b9c31f80c61768
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r1 b/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r1
new file mode 100644
index 000000000000..c57d920b1047
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),X] >=app-eselect/eselect-opengl-1.3.1 dev-cpp/pngpp >=dev-cpp/sparsehash-1.5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A PlayStation 2 emulator
+EAPI=5
+HOMEPAGE=https://www.pcsx2.net
+KEYWORDS=-* amd64 x86
+LICENSE=GPL-3
+RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),X]
+SLOT=0
+SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.4.0.tar.gz -> pcsx2-1.4.0.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=e5c5534a0eb86f81e4218c4a179e97d3
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index 2b1287a9028a..ae917ccc1d9c 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X] >=app-eselect/eselect-opengl-1.3.1 dev-cpp/pngpp >=dev-cpp/sparsehash-1.5 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X] >=app-eselect/eselect-opengl-1.3.1 dev-cpp/pngpp >=dev-cpp/sparsehash-1.5 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A PlayStation 2 emulator
 EAPI=6
 HOMEPAGE=https://www.pcsx2.net
 LICENSE=GPL-3
-RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X]
+RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X]
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f6059e0ac456cd26c57db62855d6a221
+_md5_=d82e2d31464520e21c0c1484c9c44a30
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.59.2 b/metadata/md5-cache/games-emulation/snes9x-1.59.2
index 3aa9b462a6f4..2fd876d88769 100644
--- a/metadata/md5-cache/games-emulation/snes9x-1.59.2
+++ b/metadata/md5-cache/games-emulation/snes9x-1.59.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:=[minizip] x11-libs/libX11 x11-libs/libXext png? ( media-l
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://github.com/snes9xgit/snes9x/archive/1.59.2.tar.gz -> snes9x-1.59.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=a23245eaf34770987122d086c5730f8f
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index b7888faade5b..2f8fecad5a5a 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/etqw-bin-1.5-r1 b/metadata/md5-cache/games-fps/etqw-bin-1.5-r1
deleted file mode 100644
index 4df50ac7b9be..000000000000
--- a/metadata/md5-cache/games-fps/etqw-bin-1.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Enemy Territory: Quake Wars
-EAPI=5
-HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/
-IUSE=cdinstall
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=ETQW
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/jpeg-62:62[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] cdinstall? ( games-fps/etqw-data ) games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=ftp://ftp.i3d.net/Games/Enemy%20Territory%20Quake%20Wars/Patches/ETQW-client-1.5-full.x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0d7fabdb983e5008e0c80b5b9718356f
diff --git a/metadata/md5-cache/games-fps/etqw-bin-1.5-r2 b/metadata/md5-cache/games-fps/etqw-bin-1.5-r2
new file mode 100644
index 000000000000..87a156c8f1b8
--- /dev/null
+++ b/metadata/md5-cache/games-fps/etqw-bin-1.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Enemy Territory: Quake Wars
+EAPI=5
+HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/
+IUSE=cdinstall
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=ETQW
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] virtual/jpeg-compat:62[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] cdinstall? ( games-fps/etqw-data ) games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=ftp://ftp.i3d.net/Games/Enemy%20Territory%20Quake%20Wars/Patches/ETQW-client-1.5-full.x86.run
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b0f13070af3a9459f6131cc06e3abdc7
diff --git a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r1 b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r1
deleted file mode 100644
index b8d53efaea57..000000000000
--- a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Enemy Territory: Quake Wars demo
-EAPI=5
-HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/
-KEYWORDS=~amd64 ~x86
-LICENSE=ETQW
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/jpeg-62:62[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=mirror://idsoftware/etqw/ETQW-demo2-client-full.r1.x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=32b3bfa88d8d86bf8bed408168861f9b
diff --git a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2 b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2
new file mode 100644
index 000000000000..30f307572997
--- /dev/null
+++ b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Enemy Territory: Quake Wars demo
+EAPI=5
+HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/
+KEYWORDS=~amd64 ~x86
+LICENSE=ETQW
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] virtual/jpeg-compat:62[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=mirror://idsoftware/etqw/ETQW-demo2-client-full.r1.x86.run
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=c699f9a86101f5c55ced7166ba01b23c
diff --git a/metadata/md5-cache/games-fps/freedoom-0.10.1-r1 b/metadata/md5-cache/games-fps/freedoom-0.10.1-r1
deleted file mode 100644
index d23994f48b50..000000000000
--- a/metadata/md5-cache/games-fps/freedoom-0.10.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-arch/unzip
-DESCRIPTION=Freedoom - Open Source Doom resources
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/freedoom/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedoom-0.10.1.zip https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedm-0.10.1.zip
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=8692ada031f3b3a1ef2e1c005621b824
diff --git a/metadata/md5-cache/games-fps/freedoom-0.11.3 b/metadata/md5-cache/games-fps/freedoom-0.11.3
new file mode 100644
index 000000000000..5a2b90513741
--- /dev/null
+++ b/metadata/md5-cache/games-fps/freedoom-0.11.3
@@ -0,0 +1,10 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst
+DESCRIPTION=Free game content for the Doom engine
+EAPI=7
+HOMEPAGE=https://freedoom.github.io
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/freedoom/freedoom/releases/download/v0.11.3/freedoom-0.11.3.zip https://github.com/freedoom/freedoom/releases/download/v0.11.3/freedm-0.11.3.zip
+_md5_=e54242d3d19903df1c730e5cb1ac7b7b
diff --git a/metadata/md5-cache/games-fps/gzdoom-4.1.2 b/metadata/md5-cache/games-fps/gzdoom-4.1.2
new file mode 100644
index 000000000000..698c0c214f94
--- /dev/null
+++ b/metadata/md5-cache/games-fps/gzdoom-4.1.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-libs/libsdl2[opengl] sys-libs/zlib virtual/jpeg:0 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A modder-friendly OpenGL source port based on the DOOM engine
+EAPI=7
+HOMEPAGE=https://zdoom.org
+IUSE=fluidsynth gtk gtk2 openal openmp
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD BZIP2 cephes DUMB-0.9.2 GPL-3 LGPL-3 MIT
+RDEPEND=media-libs/libsdl2[opengl] sys-libs/zlib virtual/jpeg:0 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) fluidsynth? ( media-sound/fluidsynth ) openal? ( media-libs/libsndfile media-libs/openal media-sound/mpg123 )
+SLOT=0
+SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.1.2.tar.gz -> gzdoom-4.1.2.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=de2f5e29cb93889d889144d61d62796a
diff --git a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1 b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
index b998ad408e42..562747f75e4d 100644
--- a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
+++ b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
@@ -7,8 +7,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LOKI-EULA
 PROPERTIES=interactive
 RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x86_32(-)] media-libs/libsdl[X,opengl,sound,abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] media-libs/smpeg[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=strip
+RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/sof/sof-1.06a-cdrom-x86.run
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=67072d9e842a580585df909382e9b4f6
+_md5_=56b641b177d29569c14d33e869d3081d
diff --git a/metadata/md5-cache/games-fps/tribes2-25034 b/metadata/md5-cache/games-fps/tribes2-25034
index b0c0e6444557..5319b5c5c73a 100644
--- a/metadata/md5-cache/games-fps/tribes2-25034
+++ b/metadata/md5-cache/games-fps/tribes2-25034
@@ -7,8 +7,8 @@ KEYWORDS=-amd64 ~x86
 LICENSE=LOKI-EULA
 PROPERTIES=interactive
 RDEPEND=sys-libs/glibc games-util/loki_patch virtual/opengl games-misc/games-envd
-RESTRICT=mirror strip
+RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/tribes2/release/tribes2-25034-cdrom-x86.run mirror://3dgamers/tribes2/tribes2-25034-cdrom-x86.run
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dfa29ee226650165e704480f0e524231
+_md5_=27818fbb4581d1c5aab035cdcb8ef702
diff --git a/metadata/md5-cache/games-mud/Manifest.gz b/metadata/md5-cache/games-mud/Manifest.gz
index 1841bc973205..dec10913333f 100644
--- a/metadata/md5-cache/games-mud/Manifest.gz
+++ b/metadata/md5-cache/games-mud/Manifest.gz
diff --git a/metadata/md5-cache/games-mud/gnome-mud-9999 b/metadata/md5-cache/games-mud/gnome-mud-9999
index 95ea48684c02..a54fa8d906af 100644
--- a/metadata/md5-cache/games-mud/gnome-mud-9999
+++ b/metadata/md5-cache/games-mud/gnome-mud-9999
@@ -7,5 +7,5 @@ IUSE=debug gstreamer
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.48:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/vte-0.37:2.91 dev-libs/libpcre sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ac599acc12225fa648acb465aae475ff
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index c6004db2a394..f71f9af2b778 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/five-or-more-3.30.0 b/metadata/md5-cache/games-puzzle/five-or-more-3.30.0
index b64de44a2004..37c0941422b4 100644
--- a/metadata/md5-cache/games-puzzle/five-or-more-3.30.0
+++ b/metadata/md5-cache/games-puzzle/five-or-more-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.20:3 dev-libs/libgnome-games-support:= >=gnome-base/librsvg-2.32:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/five-or-more/3.30/five-or-more-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=4192c7c14cbe16dd2b6464e7be05ef55
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.30.0 b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.30.0
index ed14930a28e2..000fb316b8d5 100644
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.30.0
+++ b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.19.0:3[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sudoku/3.30/gnome-sudoku-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=a332214834468491dbb5f44363308bd9
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.30.0 b/metadata/md5-cache/games-puzzle/lightsoff-3.30.0
index a8a35ece3641..d9750327b091 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.30.0
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.38.0:2 >=x11-libs/gtk+-3.13.4:3 >=media-libs/clutter-1.14.0:1.0 >=media-libs/clutter-gtk-1.5.5:1.0 >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.30/lightsoff-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=63f77bcfb4f12e6ddace213cb93ca915
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.30.0 b/metadata/md5-cache/games-puzzle/swell-foop-3.30.0
index 2f21fcc9ceae..4e43316fb5e6 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.30.0
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gtk+-3.12:3 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.30/swell-foop-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=417d1fc52bdc00db18b6cda8958ed2b0
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 679a9c283eda..8f799b7bd0cd 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/eternal-lands-1.9.5.3 b/metadata/md5-cache/games-rpg/eternal-lands-1.9.5.3
new file mode 100644
index 000000000000..ac35e551331c
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/eternal-lands-1.9.5.3
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl[X,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl-image media-libs/sdl-net sys-libs/zlib[minizip] virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext app-eselect/eselect-opengl media-libs/glew virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz )
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=app-arch/unzip dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl[X,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl-image media-libs/sdl-net sys-libs/zlib[minizip] virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext app-eselect/eselect-opengl media-libs/glew dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A 3D fantasy MMORPG written in C and SDL
+EAPI=7
+HOMEPAGE=http://www.eternal-lands.com
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=eternal_lands
+RDEPEND=app-arch/unzip dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl[X,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl-image media-libs/sdl-net sys-libs/zlib[minizip] virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext
+SLOT=0
+SRC_URI=https://github.com/raduprv/Eternal-Lands/archive/1.9.5.3.tar.gz -> eternal-lands-1.9.5.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f218403626fc67762f7254305cb5c72c
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 39a74a34c5fa..898a29362a9d 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.14.2 b/metadata/md5-cache/games-server/minecraft-server-1.14.2
new file mode 100644
index 000000000000..65c00559901f
--- /dev/null
+++ b/metadata/md5-cache/games-server/minecraft-server-1.14.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup unpack
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=The official server for the sandbox video game
+EAPI=6
+HOMEPAGE=https://www.minecraft.net/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Mojang
+RDEPEND=app-misc/screen >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://launcher.mojang.com/v1/objects/808be3869e2ca6b62378f9f4b33c946621620019/server.jar -> minecraft-server-1.14.2.jar
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=1990ea3d7993c25a1d94a56e888d0471
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 6d8c43c3feee..d69a103cba4d 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/heroes3-1.3.1a-r2 b/metadata/md5-cache/games-strategy/heroes3-1.3.1a-r2
index f7207c4cb01f..a28377a5cc43 100644
--- a/metadata/md5-cache/games-strategy/heroes3-1.3.1a-r2
+++ b/metadata/md5-cache/games-strategy/heroes3-1.3.1a-r2
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LOKI-EULA
 PROPERTIES=interactive
 RDEPEND=!ppc? ( sys-libs/lib-compat-loki ) games-misc/games-envd
-RESTRICT=strip
+RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=x86? ( mirror://lokigames/heroes3/heroes3-1.3.1a-cdrom-x86.run ) amd64? ( mirror://lokigames/heroes3/heroes3-1.3.1a-cdrom-x86.run ) ppc? ( mirror://lokigames/heroes3/heroes3-1.3.1a-ppc.run )
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=491f821945f5c93f12ff0187b305461d
+_md5_=63f3d0302c41e26b0e175820f9a527cc
diff --git a/metadata/md5-cache/games-strategy/smac-6.0a b/metadata/md5-cache/games-strategy/smac-6.0a
index 707e7c4b627d..3fe76ff269f1 100644
--- a/metadata/md5-cache/games-strategy/smac-6.0a
+++ b/metadata/md5-cache/games-strategy/smac-6.0a
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LOKI-EULA
 PROPERTIES=interactive
 RDEPEND=sys-libs/glibc x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp !ppc? ( sys-libs/lib-compat-loki ) media-libs/libsdl[sound,video] media-libs/sdl-ttf media-libs/sdl-mixer media-libs/smpeg media-libs/freetype sys-libs/zlib games-misc/games-envd
-RESTRICT=strip
+RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=x86? ( mirror://lokigames/smac/smac-6.0a-x86.run ) amd64? ( mirror://lokigames/smac/smac-6.0a-x86.run ) ppc? ( http://mirrors.dotsrc.org/lokigames/installers/smac/smac-install-ppc.run )
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2530ab3e491cc4e81b36d0a4180fd057
+_md5_=c765fc6d0fa5836dd4a6fc73d944a6f9
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 892874d9314e..da2e449a599f 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/gamemode-1.2 b/metadata/md5-cache/games-util/gamemode-1.2
index 9b0524dfebb2..1900b0a33cdc 100644
--- a/metadata/md5-cache/games-util/gamemode-1.2
+++ b/metadata/md5-cache/games-util/gamemode-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://github.com/FeralInteractive/gamemode/releases/download/1.2/gamemode-1.2.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=5f90faf8204f60e1c27e14533d03a2a0
diff --git a/metadata/md5-cache/games-util/gamemode-9999 b/metadata/md5-cache/games-util/gamemode-9999
index 6219235c5b64..5bcdcc0ab82f 100644
--- a/metadata/md5-cache/games-util/gamemode-9999
+++ b/metadata/md5-cache/games-util/gamemode-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=5f90faf8204f60e1c27e14533d03a2a0
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index fbd206968bb4..68f81950235a 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/dconf-0.30.1 b/metadata/md5-cache/gnome-base/dconf-0.30.1
index 6fe3895020e3..dc2449e7fce6 100644
--- a/metadata/md5-cache/gnome-base/dconf-0.30.1
+++ b/metadata/md5-cache/gnome-base/dconf-0.30.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple low-level configuration system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/dconf
 IUSE=gtk-doc test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf/0.30/dconf-0.30.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=94c5b4cb368feb8aa93a8f623f28cecd
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=ab23f05e774c21fc2134d3572389fef3
diff --git a/metadata/md5-cache/gnome-base/dconf-editor-3.30.2 b/metadata/md5-cache/gnome-base/dconf-editor-3.30.2
index 8544d446e3a9..d0ec3990f125 100644
--- a/metadata/md5-cache/gnome-base/dconf-editor-3.30.2
+++ b/metadata/md5-cache/gnome-base/dconf-editor-3.30.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=gnome-base/dconf-0.26.1 >=dev-libs/glib-2.55.1:2 >=x11-libs/gtk+-3.22.27:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf-editor/3.30/dconf-editor-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=14d0aa0855f017b718fa12e084363641
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.30.3-r1 b/metadata/md5-cache/gnome-base/gnome-control-center-3.30.3-r1
index 1a8c080064d0..eabf51e4bdf0 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.30.3-r1
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.30.3-r1
@@ -11,5 +11,5 @@ RDEPEND=gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) >=m
 REQUIRED_USE=flickr? ( gnome-online-accounts ) ^^ ( elogind systemd )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.30/gnome-control-center-3.30.3.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-control-center-3.30.3-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=40f482510358b07824c77e4f84b378bf
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.30.2.1 b/metadata/md5-cache/gnome-base/gnome-desktop-3.30.2.1
index a245348d6c86..e801f5876a0f 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.30.2.1
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.30.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library with common API for various GNOME modules
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
 IUSE=debug +introspection seccomp udev test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.53.0:2 >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.27.0 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) seccomp? ( sys-libs/libseccomp ) udev? ( sys-apps/hwids virtual/libudev:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] seccomp? ( sys-apps/bubblewrap )
 SLOT=3/17
 SRC_URI=mirror://gnome/sources/gnome-desktop/3.30/gnome-desktop-3.30.2.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-desktop-3.30.2.1-patchset.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=da3266e63011b779fda0e2a065e67add
+_md5_=7083d9cecebc845049117c0103fecd74
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.30.1-r1 b/metadata/md5-cache/gnome-base/gnome-session-3.30.1-r1
index 8d3a1c66ae9d..39e776f88916 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.30.1-r1
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.30.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-li
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.30/gnome-session-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5c984de26f53fe3c157eb41b330a226b
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1
index 2e0a899ba18e..3b941052065d 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.53.0:2 >=gnome-bas
 REQUIRED_USE=^^ ( elogind systemd ) input_devices_wacom? ( udev ) wayland? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.30/gnome-settings-daemon-3.30.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-settings-daemon-3.30.2-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=00e77efba0b949e1ac3693a6ef198d6b
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4 b/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4
index b32d9e36d946..3bf7f5d2ab5b 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.26/gnome-shell-3.26.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-3.26.2-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=bdb536ae366a03ac69296ad693fc9586
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r2 b/metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r2
index d71c6bc6789d..be9a42924e65 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r2
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.30/gnome-shell-3.30.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-3.30.2-r2-patchset.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c7b6ff977887198e4f4932e525db98bd
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.28.1 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.28.1
index 98ee27ea4079..87e3e1c4737f 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.28.1
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.28.1
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of GSettings schemas for GNOME desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-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 ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.28/gsettings-desktop-schemas-3.28.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4587eff5f1918f8633b3ec2ddd89032f
+_md5_=4c966121b40770ae847c83168bfde47d
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.38.2 b/metadata/md5-cache/gnome-base/gvfs-1.38.2
index bba620c5f0f4..0caeb414f972 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.38.2
+++ b/metadata/md5-cache/gnome-base/gvfs-1.38.2
@@ -4,11 +4,11 @@ DESCRIPTION=Virtual filesystem implementation for GIO
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
 IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.57.2:2 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-2.42.0:2.4 ) zeroconf? ( >=net-dns/avahi-0.6 ) udev? ( >=virtual/libgudev-147:= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8 ) net-misc/openssh
 REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.38/gvfs-1.38.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7a0b6d0a78f892993a86da6e35dc281c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=d6bc654639979dadb40b791d040dbb74
diff --git a/metadata/md5-cache/gnome-base/libgtop-2.38.0 b/metadata/md5-cache/gnome-base/libgtop-2.38.0
index 626a5abaaa07..29249f706fb5 100644
--- a/metadata/md5-cache/gnome-base/libgtop-2.38.0
+++ b/metadata/md5-cache/gnome-base/libgtop-2.38.0
@@ -4,10 +4,10 @@ DESCRIPTION=A library that provides top functionality to applications
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/libgtop
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.26:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=2/11
 SRC_URI=mirror://gnome/sources/libgtop/2.38/libgtop-2.38.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=23e485cc9271c1af96dca5dff4b28878
+_md5_=1a133776cfc3f9e303b1b15c3ce134bb
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.20 b/metadata/md5-cache/gnome-base/librsvg-2.40.20
index edcf52414e0c..e50a4e121513 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.20
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.20
@@ -4,7 +4,7 @@ DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
 IUSE=+introspection tools +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-linux ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.38.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libcroco-0.6.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) tools? ( >=x11-libs/gtk+-3.10.0:3 )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.40/librsvg-2.40.20.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7b4a554d37c5a7458047e21191e9195a
+_md5_=68a99ba61ca17810d81fd786ccae202b
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.28.1 b/metadata/md5-cache/gnome-base/nautilus-3.28.1
index bb2c7eb4fa97..f2a8d3e08201 100644
--- a/metadata/md5-cache/gnome-base/nautilus-3.28.1
+++ b/metadata/md5-cache/gnome-base/nautilus-3.28.1
@@ -10,5 +10,5 @@ PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sush
 RDEPEND=>=dev-libs/glib-2.55.1:2 >=media-libs/gexiv2-0.10.0 >=app-arch/gnome-autoar-0.2.1 >=gnome-base/gnome-desktop-3.0.0:3= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.22.26:3[X,introspection?] selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) packagekit? ( app-admin/packagekit-base ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/3.28/nautilus-3.28.1.tar.xz https://dev.gentoo.org/~leio/distfiles/nautilus-3.28.1-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=7233c3f1a56ce9718020cf861e7028d3
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.30.5 b/metadata/md5-cache/gnome-base/nautilus-3.30.5
index fab4e77ec8e9..6e58c34484ed 100644
--- a/metadata/md5-cache/gnome-base/nautilus-3.30.5
+++ b/metadata/md5-cache/gnome-base/nautilus-3.30.5
@@ -4,11 +4,11 @@ DESCRIPTION=Default file manager for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
 IUSE=gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3+ LGPL-2.1+
 PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
 RDEPEND=>=dev-libs/glib-2.55.1:2 >=media-libs/gexiv2-0.10.0 >=app-arch/gnome-autoar-0.2.1 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.27:3[X,introspection?] seccomp? ( sys-libs/libseccomp ) >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) packagekit? ( app-admin/packagekit-base ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/3.30/nautilus-3.30.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=92cde09836022ba5090d3b1afb4751b2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=b4ed62fed9e9699f098e7d246121b8cc
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index f428ef4d7c46..7756160dbaf1 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2 b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
index fbe4e95de14c..8e9c0a37a3cf 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=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(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] >=gnome-extra/cinnamon-menus-3.6[introspection] >=gnome-extra/cjs-3.6.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.6.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
 EAPI=6
-HOMEPAGE=http://developer.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.6.6.tar.gz -> cinnamon-3.6.6.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=45b6e05dbe1ebdace80c0d7df14d3991
+_md5_=4c307b442aba8d1c34f14e6759b5ea6d
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-3.8.8 b/metadata/md5-cache/gnome-extra/cinnamon-3.8.8
index dead09b05ec9..ed66d4ecc668 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-3.8.8
+++ b/metadata/md5-cache/gnome-extra/cinnamon-3.8.8
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=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(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] >=gnome-extra/cinnamon-menus-3.6[introspection] >=gnome-extra/cjs-3.8.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.8.0[introspection] python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
 EAPI=6
-HOMEPAGE=http://developer.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+nls python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.8.8.tar.gz -> cinnamon-3.8.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=85dc5475753aa41f218150e08b3c430f
+_md5_=345a0c4cecb36502351ec2a79c191f2c
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-4.0.3 b/metadata/md5-cache/gnome-extra/cinnamon-4.0.3
index 73b5f3b4468e..b7c294f78aec 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-4.0.3
+++ b/metadata/md5-cache/gnome-extra/cinnamon-4.0.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=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(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-4.0:0=[introspection] >=gnome-extra/cinnamon-menus-4.0[introspection] >=gnome-extra/cjs-4.0.0[cairo] >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-4.0.0[introspection] dev-libs/keybinder:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
 EAPI=6
-HOMEPAGE=http://developer.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+nls python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/4.0.3.tar.gz -> cinnamon-4.0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=bd5540b6dc84b23ed46c172f7111b935
+_md5_=ac54561463a29916c00a3db3f784ad43
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-4.0.3-r1 b/metadata/md5-cache/gnome-extra/cinnamon-4.0.3-r1
index 1b9c7b117709..37f1e5d3a131 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-4.0.3-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-4.0.3-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=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(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/librsvg >=gnome-extra/cinnamon-desktop-4.0:0=[introspection] >=gnome-extra/cinnamon-menus-4.0[introspection] >=gnome-extra/cjs-4.0.0[cairo] >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-4.0.0[introspection] dev-libs/keybinder:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
 EAPI=6
-HOMEPAGE=http://developer.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+nls python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/4.0.3.tar.gz -> cinnamon-4.0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=120b4b113e7961e7dcdec8f34e255bc8
+_md5_=d669983c6f668ad209ab829d4e82501e
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-4.0.3-r2 b/metadata/md5-cache/gnome-extra/cinnamon-4.0.3-r2
new file mode 100644
index 000000000000..c099fdf6b5e2
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-4.0.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=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(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/librsvg >=gnome-extra/cinnamon-desktop-4.0:0=[introspection] >=gnome-extra/cinnamon-menus-4.0[introspection] >=gnome-extra/cjs-4.0.0[cairo] >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-4.0.0[introspection] dev-libs/keybinder:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
+EAPI=6
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
+IUSE=+nls python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=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(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/librsvg >=gnome-extra/cinnamon-desktop-4.0:0=[introspection] >=gnome-extra/cinnamon-menus-4.0[introspection] >=gnome-extra/cjs-4.0.0[cairo] >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-4.0.0[introspection] dev-libs/keybinder:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] sys-power/upower[introspection] >=gnome-extra/cinnamon-session-4.0 >=gnome-extra/cinnamon-settings-daemon-4.0 >=app-accessibility/caribou-0.3 x11-misc/xdg-utils x11-libs/xapps[introspection] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) x11-themes/gnome-themes-standard x11-themes/adwaita-icon-theme >=gnome-extra/nemo-4.0 >=gnome-extra/cinnamon-control-center-4.0 >=gnome-extra/cinnamon-screensaver-4.0 gnome-extra/polkit-gnome nls? ( >=gnome-extra/cinnamon-translations-4.0 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 ) || ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/Cinnamon/archive/4.0.3.tar.gz -> cinnamon-4.0.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=eb3a787193d9304b7eb6ebd776edbbd1
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
index 879bcc221587..b713e8a381c0 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) app-text/iso-codes x11-base/xorg-proto dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cinnamons's main interface to configure various aspects of the desktop
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+colord +cups debug input_devices_wacom systemd
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/3.6.5.tar.gz -> cinnamon-control-center-3.6.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2b0365e8362fe12e0f7784b9c76a3c16
+_md5_=326ed0efa29f61e66cc6f1622931cc33
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.8.0 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.8.0
index 191df54b7ff5..0a17a4748a75 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.8.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.8.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) app-text/iso-codes x11-base/xorg-proto dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cinnamons's main interface to configure various aspects of the desktop
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+colord +cups debug input_devices_wacom systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/3.8.0.tar.gz -> cinnamon-control-center-3.8.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a20bec70eb33093600c23e38a0589dda
+_md5_=d23dab12f649648448575074675d6009
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-4.0.0 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-4.0.0
index bef03b8dc653..e52394d719f1 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-4.0.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-4.0.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) app-text/iso-codes x11-base/xorg-proto dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cinnamons's main interface to configure various aspects of the desktop
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+colord +cups debug input_devices_wacom systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/4.0.0.tar.gz -> cinnamon-control-center-4.0.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=22ecc02f492ac7059ddd9802debf0542
+_md5_=02bcefaba2cfcc89437fcfa150765298
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
index 31113db96f12..8de7b13b6220 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A collection of libraries and utilites used by Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+introspection systemd python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 SLOT=0/4
 SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/3.6.2.tar.gz -> cinnamon-desktop-3.6.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c3f5786f4603c3e8a8124a2b72b00c67
+_md5_=604bb7a88787e1c610401fb085f9a6a6
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
index 409b19b60a78..8cce5cb26e03 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup t
 DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common x11-base/xorg-proto virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A collection of libraries and utilites used by Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+introspection systemd python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0/4
 SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/3.8.1.tar.gz -> cinnamon-desktop-3.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4fbc20c6e59e130e761bef5abca9bbcd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0bc1328707c9331de701921eafa6ed49
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1
index 8657992f3fc6..07071e39f95d 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup t
 DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common x11-base/xorg-proto virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A collection of libraries and utilites used by Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+introspection systemd python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0/4
 SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/4.0.1.tar.gz -> cinnamon-desktop-4.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4fbc20c6e59e130e761bef5abca9bbcd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0bc1328707c9331de701921eafa6ed49
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0 b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0
index 877f26e1082b..c9e73a6188a9 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) dev-libs/gobject-introspection-common >=dev-util/intltool-0.40 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cinnamon's library for the Desktop Menu fd.o specification
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=debug +introspection
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspect
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/3.6.0.tar.gz -> cinnamon-menus-3.6.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2cccdbedfcb49b194d2f35c2e8262a7f
+_md5_=6039106d53215a8d306de57f59fe3603
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.8.2 b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.8.2
index 9eb9a426004d..a3d3997319de 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.8.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.8.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) dev-libs/gobject-introspection-common >=dev-util/intltool-0.40 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cinnamon's library for the Desktop Menu fd.o specification
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=debug +introspection
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspect
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/3.8.2.tar.gz -> cinnamon-menus-3.8.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=133daba6714cf25d9b9d890ebf7be455
+_md5_=55073badf87b03cb6a977a058e9d47b0
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-menus-4.0.0 b/metadata/md5-cache/gnome-extra/cinnamon-menus-4.0.0
index 453b9a7299e3..d4610276631c 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-menus-4.0.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-menus-4.0.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) dev-libs/gobject-introspection-common >=dev-util/intltool-0.40 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cinnamon's library for the Desktop Menu fd.o specification
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=debug +introspection
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspect
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/4.0.0.tar.gz -> cinnamon-menus-4.0.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f1a378b0f09289b62788d5a903db5518
+_md5_=87c33559f1127d5529c0cb7c9cb39f17
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1
index 72a879f7f13d..aac249f478eb 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) >=dev-util/intltool-0.35 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Screensaver for Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=debug doc pam systemd xinerama python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/3.6.1.tar.gz -> cinnamon-screensaver-3.6.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ecda1a65da9ab605730f6b69e9d1ba01
+_md5_=c34819e4ec4cdd50c702df4047a7c90a
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.8.0 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.8.0
index 11529f6c8636..78375c4052f4 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.8.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.8.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) >=dev-util/intltool-0.35 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Screensaver for Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=debug doc pam systemd xinerama python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/3.8.0.tar.gz -> cinnamon-screensaver-3.8.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=753089eb2963162b70962006e7443d8d
+_md5_=fd742f8050edde52d0d36c873f968374
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-4.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-4.0.1
index 5bab37241e83..04a2b26b30aa 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-4.0.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-4.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) >=dev-util/intltool-0.35 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Screensaver for Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=debug doc pam systemd xinerama python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/4.0.1.tar.gz -> cinnamon-screensaver-4.0.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2bb90110ddb247788e399e674455585c
+_md5_=296a80830cf3dbf169d6489c828adbbf
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r5 b/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r5
index 8568238c015f..b1673f7b75a7 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r5
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl systemd? ( >=sys-apps/systemd-183 sys-auth/polkit ) elogind? ( sys-power/upower sys-auth/polkit[elogind] ) dev-libs/libxslt >=dev-util/intltool-0.40.6 virtual/pkgconfig doc? ( app-text/xmlto ) gnome-base/gnome-common >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cinnamon session manager
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=doc elogind ipv6 systemd
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/3.6.1.tar.gz -> cinnamon-session-3.6.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=26f37ea625419b974ae9452f70161db5
+_md5_=70c510f32947216d554b787a61a46054
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0-r1 b/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0-r1
index 5fbe9fc943e9..3d692cf2936f 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] >=x11-libs/xapps-1.0.4 virtual/opengl systemd? ( >=sys-apps/systemd-183 sys-auth/polkit ) elogind? ( sys-power/upower sys-auth/polkit[elogind] ) dev-libs/libxslt >=dev-util/intltool-0.40.6 virtual/pkgconfig doc? ( app-text/xmlto ) gnome-base/gnome-common >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cinnamon session manager
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=doc elogind ipv6 systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberr
 REQUIRED_USE=^^ ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/3.8.0.tar.gz -> cinnamon-session-3.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=957bf66daef780338377a32c6a3fe725
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0fac3dda32722c42dd457338a53fefd2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-4.0.0-r1 b/metadata/md5-cache/gnome-extra/cinnamon-session-4.0.0-r1
index 04a5325b40fc..e40130d45625 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-4.0.0-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-4.0.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] >=x11-libs/xapps-1.0.4 virtual/opengl systemd? ( >=sys-apps/systemd-183 sys-auth/polkit ) elogind? ( sys-power/upower sys-auth/polkit[elogind] ) dev-libs/libxslt >=dev-util/intltool-0.40.6 virtual/pkgconfig doc? ( app-text/xmlto ) gnome-base/gnome-common >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cinnamon session manager
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=doc elogind ipv6 systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberr
 REQUIRED_USE=^^ ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/4.0.0.tar.gz -> cinnamon-session-4.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=957bf66daef780338377a32c6a3fe725
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0fac3dda32722c42dd457338a53fefd2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
index 10b1fe409d63..2e49e2a787a7 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-2.8.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] sys-apps/dbus >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/libgudev:= >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= ) dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Cinnamon's settings daemon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+colord cups input_devices_wacom smartcard systemd test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/3.6.1.tar.gz -> cinnamon-settings-daemon-3.6.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=08f75d86703479fe8a572e917b2f860e
+_md5_=12aa7f9b09079cf85a1777183b6e4ae5
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.8.4 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.8.4
index 5227a69bfa6a..7836bc8f95b8 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.8.4
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.8.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-2.8.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] sys-apps/dbus >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/libgudev:= >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= ) dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Cinnamon's settings daemon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+colord cups input_devices_wacom smartcard systemd test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/3.8.4.tar.gz -> cinnamon-settings-daemon-3.8.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=98d6476a16b674759fc3799fd87d9af3
+_md5_=bdca4666526aea360cb4aab8e3465da4
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-4.0.2 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-4.0.2
index 296608714073..271f87c529b9 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-4.0.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-4.0.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-2.8.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] sys-apps/dbus >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/libgudev:= >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= ) dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Cinnamon's settings daemon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+colord cups input_devices_wacom smartcard systemd test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/4.0.2.tar.gz -> cinnamon-settings-daemon-4.0.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4520ed03c81981bbb1e278fac7a314e0
+_md5_=cb4438895a288ec3e0d097cf1a63f182
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3 b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3
index 82714891859a..a78f3b04eea6 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install
 DESCRIPTION=Translation data for Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/3.6.3.tar.gz -> cinnamon-translations-3.6.3.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b
-_md5_=697d5626c05c46ecca189ab89d9ede14
+_md5_=117bd69d719ff05e5bbaaf20e641522c
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3-r1 b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3-r1
index 2c6c63976857..bbbff1bd891a 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install
 DEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
 DESCRIPTION=Translation data for Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/3.6.3.tar.gz -> cinnamon-translations-3.6.3.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b
-_md5_=ec415cb57dae1a2783b51af3fe99a3a8
+_md5_=491679f06c340cb2819e3812439c7701
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-3.8.2 b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.8.2
index 453d4cc23694..ef906d46b00c 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-3.8.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.8.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install
 DEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
 DESCRIPTION=Translation data for Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/3.8.2.tar.gz -> cinnamon-translations-3.8.2.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b
-_md5_=ec415cb57dae1a2783b51af3fe99a3a8
+_md5_=491679f06c340cb2819e3812439c7701
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-4.0.0 b/metadata/md5-cache/gnome-extra/cinnamon-translations-4.0.0
index 84a26243961f..3f970f578924 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-4.0.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-4.0.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install
 DEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
 DESCRIPTION=Translation data for Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/4.0.0.tar.gz -> cinnamon-translations-4.0.0.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b
-_md5_=0892ee2b0a20f3e82a4cee0bbf9597b6
+_md5_=5bff9d2f92dc69034d2d2e83dfa57c18
diff --git a/metadata/md5-cache/gnome-extra/cjs-3.6.1 b/metadata/md5-cache/gnome-extra/cjs-3.6.1
index 5bb6f2ba18f3..6c75951e567b 100644
--- a/metadata/md5-cache/gnome-extra/cjs-3.6.1
+++ b/metadata/md5-cache/gnome-extra/cjs-3.6.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-lang/spidermonkey:38 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0 virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+cairo examples gtk test test
 KEYWORDS=amd64 x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/3.6.1.tar.gz -> cjs-3.6.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8978e75e0da9e335f7beb6ec64eb6373
+_md5_=bd9e9002540549955aa09d0ad79cf4db
diff --git a/metadata/md5-cache/gnome-extra/cjs-3.8.0 b/metadata/md5-cache/gnome-extra/cjs-3.8.0
index 017604ec9a05..42f7bf7f01f0 100644
--- a/metadata/md5-cache/gnome-extra/cjs-3.8.0
+++ b/metadata/md5-cache/gnome-extra/cjs-3.8.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-lang/spidermonkey:52 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0 virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+cairo examples gtk test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/3.8.0.tar.gz -> cjs-3.8.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b857d6413d2080c7654c9dc3367de5ae
+_md5_=92e394a3c6b687a1392f33eda480c386
diff --git a/metadata/md5-cache/gnome-extra/cjs-4.0.0 b/metadata/md5-cache/gnome-extra/cjs-4.0.0
index 9c6b56bac3ae..fe9115b39d11 100644
--- a/metadata/md5-cache/gnome-extra/cjs-4.0.0
+++ b/metadata/md5-cache/gnome-extra/cjs-4.0.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-lang/spidermonkey:52 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0 virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+cairo examples gtk test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/4.0.0.tar.gz -> cjs-4.0.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b857d6413d2080c7654c9dc3367de5ae
+_md5_=92e394a3c6b687a1392f33eda480c386
diff --git a/metadata/md5-cache/gnome-extra/cjs-4.0.0-r1 b/metadata/md5-cache/gnome-extra/cjs-4.0.0-r1
index b223d83b3974..b7c1fa47d503 100644
--- a/metadata/md5-cache/gnome-extra/cjs-4.0.0-r1
+++ b/metadata/md5-cache/gnome-extra/cjs-4.0.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-lang/spidermonkey:52 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0= virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+cairo examples gtk test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/4.0.0.tar.gz -> cjs-4.0.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=10aa156c487b737d5bb28f33195c471a
+_md5_=7fda2fb83d9cb49e85427a55e8be00ac
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.30.3 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.30.3
index 85c41e5902a8..f01468f7a4c9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.30.3
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.30.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ CC-BY-2.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.52:2 >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.20:3[introspection] >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+),vala] >=sys-libs/libosinfo-1.1.0[vala] app-crypt/libsecret[vala] >=net-libs/libsoup-2.44:2.4[vala] virtual/libusb:1 >=app-emulation/libvirt-glib-0.2.3[vala] >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir,vala] app-misc/tracker:0/2.0 net-libs/webkit-gtk:4 >=virtual/libgudev-165:= rdp? ( net-misc/freerdp:= ) >=app-misc/tracker-miners-2[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools virtual/cdrtools sys-auth/polkit
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.30/gnome-boxes-3.30.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=21ead0a7e426f322e08406bc866fae4c
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1 b/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1
index a48a4582abb4..1fc1d10e0c2e 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.19.3:3 >=x11-libs/gtksourceview-3.15.1:3.0[vala] >=net-libs/libsoup-2.42:2.4 dev-libs/libxml2:2 dev-libs/mpc:= dev-libs/mpfr:0=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/3.30/gnome-calculator-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=00be2c27975d8c9454e8ac5b81b7e527
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-3.30.1 b/metadata/md5-cache/gnome-extra/gnome-calendar-3.30.1
index 9b96247672ce..d3e2068a18d2 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-3.30.1
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-3.30.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calendar/3.30/gnome-calendar-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=aa9c170d71b5ac5a363cf5b773b9812e
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-characters-3.30.0
index 3b062871aa28..9d0ddcbc490b 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ BSD
 RDEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/3.30/gnome-characters-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=49aa5538e1feefe6a188269865c9bdfd
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.30.1 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.30.1
index 2eaa66f16324..c0071b965080 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-3.30.1
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-3.30.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.27.2:2=[vala] >=gnome-base/gnome-desktop-3.8:3= >=media-libs/gsound-0.98[vala] >=sci-geosciences/geocode-glib-1 >=app-misc/geoclue-2.4:2.0 >=x11-libs/gtk+-3.20:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/3.30/gnome-clocks-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=9d291b9757828a9f01fb65f7659b3549
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
index d10e67d3ed75..4273c8949aad 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2:0= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-color-manager/3.30/gnome-color-manager-3.30.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=4f82e022b182bab0fbf300c494187ad7
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.30.2 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.30.2
index fe18de169276..23cdddd85a4a 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.30.2
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.30.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.44:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.22:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/3.30/gnome-contacts-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=3778272d6e76be3635de8d8ea8aefada
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.30.1 b/metadata/md5-cache/gnome-extra/gnome-documents-3.30.1
index 713b9d5b1ad7..c6508d5d2c34 100644
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.30.1
+++ b/metadata/md5-cache/gnome-extra/gnome-documents-3.30.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-text/evince-3.13.3[introspection] app-misc/tracker:0/2.0 >=dev-libs/gjs-1.48.0 >=dev-libs/glib-2.39.3:2 gnome-base/gnome-desktop:3=[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.15:3[introspection] >=net-libs/libsoup-2.41.3:2.4 >=net-libs/webkit-gtk-2.6:4[introspection] >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] >=app-text/libgepub-0.6[introspection] <app-text/libgepub-0.7 >=net-libs/gnome-online-accounts-3.2.0[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] >=app-misc/tracker-miners-2 net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-documents/3.30/gnome-documents-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=6931a2a0ef966e1e6a647e4a098b5edf
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-logs-3.30.0
index 0281a9e235c7..d0be6654e223 100644
--- a/metadata/md5-cache/gnome-extra/gnome-logs-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-logs-3.30.0
@@ -10,5 +10,5 @@ RDEPEND=gnome-base/gsettings-desktop-schemas >=dev-libs/glib-2.43.90:2 >=x11-lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-logs/3.30/gnome-logs-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=cca551008464e958d01debee591b4c56
diff --git a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0
index a8a260bfeddc..84646093dc0d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.15.3:3 >=app-admin/packagekit-base-0.9.1 systemd? ( sys-auth/polkit >=sys-apps/systemd-42 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-packagekit/3.30/gnome-packagekit-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=0e1118b1f9d84d1665855430dba6027f
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0
index 2d64ba69c87d..c0d283af0e58 100644
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-power-manager/3.30/gnome-power-manager-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c875638f49ca19ac662fc314cb3acaea
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.1 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.1
index e54163f9af71..b1fdc92a4a9c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.30.0 >=gnome-base/nautilus-3.30.4 sys-apps/xdg-desktop-portal
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/uploads/c15ece9cbe50ca428e195eba96e12fd4/desktop-icons-19.01.1.tar.xz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=e8733c9a1cb471df243bbefb7a51f009
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.3 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.3
index 37149996b5b4..bf2a978d4509 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.3
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.30.0 >=gnome-base/nautilus-3.30.4 sys-apps/xdg-desktop-portal
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/uploads/5de9fa81ff4ef1d16edcd96041063f91/desktop-icons-19.01.3.tar.xz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f03dfa5b8831993ba7b247a5670dc5e3
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-23 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-23
index 0b14b903c28e..681276902130 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-23
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-23
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 >=gnome-base/gnome-shell-3.28 gnome-base/gvfs || ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks ) || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
 SLOT=0
 SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v23.tar.gz -> gnome-shell-extension-gsconnect-23.tar.gz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5adcc6767d74ee6bb95327e5a1f44039
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-24 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-24
index ae806d57619f..2bfd892ce626 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-24
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-24
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 >=gnome-base/gnome-shell-3.28 gnome-base/gvfs || ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks ) || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
 SLOT=0
 SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v24.tar.gz -> gnome-shell-extension-gsconnect-24.tar.gz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=4147dbcf18135bcc21fc92edd8ef087b
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.30.1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.30.1
index f3c47cc6cc69..25253baefea5 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.30.1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.30.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.30/gnome-shell-extensions-3.30.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=bc5be8b81d15450b486cd873f9e93ec0
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-3.30.6 b/metadata/md5-cache/gnome-extra/gnome-software-3.30.6
index 033fd8dd7bfa..5d6655373318 100644
--- a/metadata/md5-cache/gnome-extra/gnome-software-3.30.6
+++ b/metadata/md5-cache/gnome-extra/gnome-software-3.30.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/appstream-glib-0.7.14:0 >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22.4:3 >=dev-libs/json-glib-1.2.0 app-crypt/libsecret >=net-libs/libsoup-2.52.0:2.4 gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= ) spell? ( app-text/gspell:= ) sys-auth/polkit packagekit? ( >=app-admin/packagekit-base-1.1.0 ) firmware? ( >=sys-apps/fwupd-1.0.3 ) udev? ( virtual/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-software/3.30/gnome-software-3.30.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=773c27769080f6a0f030d4106b410892
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.30.0
index 789964d05c19..569fed63c62f 100644
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.30.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-cpp/glibmm-2.46:2 >=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=gnome-base/libgtop-2.37.2:2= >=gnome-base/librsvg-2.35:2 >=dev-libs/libxml2-2.0:2 X? ( >=x11-libs/libwnck-2.91.0:3 ) systemd? ( >=sys-apps/systemd-44:0= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.30/gnome-system-monitor-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=abe26891bfef58b4697aa7cdc7d1110b
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.30.2 b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.30.2
index 8233a4eb8537..4fa1bc1940ea 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.30.2
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.30.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweaks/3.30/gnome-tweaks-3.30.2.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=16e42652b7fcecf911b849802aa473e3
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-11.0.3 b/metadata/md5-cache/gnome-extra/gucharmap-11.0.3
index 7ff2a71b7e09..7e291d26adbd 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-11.0.3
+++ b/metadata/md5-cache/gnome-extra/gucharmap-11.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
 IUSE=debug +introspection test vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-3+
 RDEPEND==app-i18n/unicode-data-11.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] media-libs/freetype:2 introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/11.0/gucharmap-11.0.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7e1277b4ea2df7a5d95155bb79385c1b
+_md5_=3d28597b58b48c1b2a4d36707fc00506
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.43 b/metadata/md5-cache/gnome-extra/libgsf-1.14.43
index f2dac0c48f63..5b4351312e37 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.43
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.43
@@ -4,10 +4,10 @@ DESCRIPTION=The GNOME Structured File Library
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/gsf/
 IUSE=bzip2 gtk +introspection
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.43.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ef1a1f7a54c179c6272e6291ff58e478
+_md5_=8085ef87afc965a4a3e750bd75ca6e64
diff --git a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6 b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
index 97fdc9a8e447..01c7ce36c44f 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
+++ b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
@@ -4,10 +4,10 @@ DESCRIPTION=A nautilus extension for sending files to locations
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/nautilus-sendto/
 IUSE=debug
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.25.9:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus-sendto/3.8/nautilus-sendto-3.8.6.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1678bef31adaf7bfd8541949a40a4645
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=083160bca37758b8abfd2dd221674792
diff --git a/metadata/md5-cache/gnome-extra/nemo-3.6.4-r1 b/metadata/md5-cache/gnome-extra/nemo-3.6.4-r1
index 9677d2fdfc09..412779242db8 100644
--- a/metadata/md5-cache/gnome-extra/nemo-3.6.4-r1
+++ b/metadata/md5-cache/gnome-extra/nemo-3.6.4-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup t
 DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.18:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) sys-libs/libselinux || ( dev-lang/python:3.6 dev-lang/python:3.5 ) || ( ( dev-lang/python:3.6 dev-python/polib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/polib[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=exif +introspection +nls packagekit tracker xmp test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/3.6.4.tar.gz -> nemo-3.6.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d59fe6cbc9995c0e4db4a1301621f246
+_md5_=558a14307a0533e423301dee2f3e1b8e
diff --git a/metadata/md5-cache/gnome-extra/nemo-3.8.6-r1 b/metadata/md5-cache/gnome-extra/nemo-3.8.6-r1
index 5b744cc3f53e..a390c9ce03b4 100644
--- a/metadata/md5-cache/gnome-extra/nemo-3.8.6-r1
+++ b/metadata/md5-cache/gnome-extra/nemo-3.8.6-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup t
 DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) selinux? ( sys-libs/libselinux ) || ( dev-lang/python:3.6 dev-lang/python:3.5 ) || ( ( dev-lang/python:3.6 dev-python/polib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/polib[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=exif +introspection +nls packagekit selinux tracker xmp test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/3.8.6.tar.gz -> nemo-3.8.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=002e6526edf46658ac643544b5f44271
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=1a468b6e530419cec96ca7f90ac0bb6e
diff --git a/metadata/md5-cache/gnome-extra/nemo-4.0.6 b/metadata/md5-cache/gnome-extra/nemo-4.0.6
index 395564fe87fa..6ecdf095e36f 100644
--- a/metadata/md5-cache/gnome-extra/nemo-4.0.6
+++ b/metadata/md5-cache/gnome-extra/nemo-4.0.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup t
 DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.4.0 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) selinux? ( sys-libs/libselinux ) || ( dev-lang/python:3.6 dev-lang/python:3.5 ) || ( ( dev-lang/python:3.6 dev-python/polib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/polib[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=exif +introspection +nls packagekit selinux tracker xmp test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/4.0.6.tar.gz -> nemo-4.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6d19d36c148a4518d1fb5fee8b80e9f0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0cc93eaa6554375527fa416bbad0daed
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-3.30.1 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.30.1
index 1e7262048f3b..ba897c4e89c6 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-3.30.1
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-3.30.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/intltoo
 DESCRIPTION=XSL stylesheets for yelp
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/yelp-xsl
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
 RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-xsl/3.30/yelp-xsl-3.30.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=42e65699ced3c24bd661919a4d49b1f8
+_md5_=ef188807d0da2c9bbbdeabc9deda8deb
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index f41779beefcd..15df42bb84b8 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/mako-1.3 b/metadata/md5-cache/gui-apps/mako-1.3
index b786340c2f2f..e6111ced8e2f 100644
--- a/metadata/md5-cache/gui-apps/mako-1.3
+++ b/metadata/md5-cache/gui-apps/mako-1.3
@@ -5,10 +5,10 @@ DESCRIPTION=A lightweight notification daemon for Wayland. Works on Sway.
 EAPI=7
 HOMEPAGE=https://github.com/emersion/mako
 IUSE=+icons
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/pango x11-libs/cairo || ( sys-apps/systemd sys-auth/elogind ) sys-apps/dbus[user-session] icons? ( x11-libs/gtk+:3 x11-libs/gdk-pixbuf )
 SLOT=0
 SRC_URI=https://github.com/emersion/mako/archive/v1.3.tar.gz -> mako-1.3.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=fb6a07176721db67e60b5e10b3abb870
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=82b0cbbb6af2ce10dbe74a46580a1be8
diff --git a/metadata/md5-cache/gui-apps/mako-9999 b/metadata/md5-cache/gui-apps/mako-9999
index 5ac4f6f3f52d..51bc867dc999 100644
--- a/metadata/md5-cache/gui-apps/mako-9999
+++ b/metadata/md5-cache/gui-apps/mako-9999
@@ -8,5 +8,5 @@ IUSE=+icons
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/pango x11-libs/cairo || ( sys-apps/systemd sys-auth/elogind ) sys-apps/dbus[user-session] icons? ( x11-libs/gtk+:3 x11-libs/gdk-pixbuf )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=8f32dfe76f36e5bada6568c87347f2e4
diff --git a/metadata/md5-cache/gui-apps/swaybg-1.0 b/metadata/md5-cache/gui-apps/swaybg-1.0
index d9aa97ee0db4..9bfc4b929e7b 100644
--- a/metadata/md5-cache/gui-apps/swaybg-1.0
+++ b/metadata/md5-cache/gui-apps/swaybg-1.0
@@ -5,10 +5,10 @@ DESCRIPTION=A wallpaper utility for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swaybg
 IUSE=+man
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland !<gui-wm/sway-1.1_alpha1
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaybg/archive/1.0.tar.gz -> swaybg-1.0.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=517523ed0d000e37720f4f17ecdae7e7
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9462f7e5ca1c3ad231114f473c5337bf
diff --git a/metadata/md5-cache/gui-apps/swaybg-9999 b/metadata/md5-cache/gui-apps/swaybg-9999
index fd60e9ddc27c..a5a05c609b49 100644
--- a/metadata/md5-cache/gui-apps/swaybg-9999
+++ b/metadata/md5-cache/gui-apps/swaybg-9999
@@ -8,5 +8,5 @@ IUSE=+man
 LICENSE=MIT
 RDEPEND=dev-libs/wayland !<gui-wm/sway-1.1_alpha1
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=517523ed0d000e37720f4f17ecdae7e7
diff --git a/metadata/md5-cache/gui-apps/swayidle-1.2 b/metadata/md5-cache/gui-apps/swayidle-1.2
index 8668c681f304..b6be5ed5c072 100644
--- a/metadata/md5-cache/gui-apps/swayidle-1.2
+++ b/metadata/md5-cache/gui-apps/swayidle-1.2
@@ -5,11 +5,11 @@ DESCRIPTION=Idle management daemon for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swayidle
 IUSE=elogind fish-completion +man systemd zsh-completion
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] ) !<=gui-wm/sway-1.0_beta1 !~gui-wm/sway-1.0_beta2[swayidle]
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swayidle/archive/1.2.tar.gz -> swayidle-1.2.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=813eb5b2a0eff1d0da12e333e37619bc
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=2e3132f6cb46ba1079cb93f0aac49364
diff --git a/metadata/md5-cache/gui-apps/swayidle-1.3 b/metadata/md5-cache/gui-apps/swayidle-1.3
index cecf578a73b1..c9302bf14bbf 100644
--- a/metadata/md5-cache/gui-apps/swayidle-1.3
+++ b/metadata/md5-cache/gui-apps/swayidle-1.3
@@ -5,11 +5,11 @@ DESCRIPTION=Idle management daemon for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swayidle
 IUSE=elogind fish-completion +man systemd zsh-completion
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] ) !<=gui-wm/sway-1.0_beta1 !~gui-wm/sway-1.0_beta2[swayidle]
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swayidle/archive/1.3.tar.gz -> swayidle-1.3.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=2fee6767df9e656ae5954e44262579b3
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=2e3132f6cb46ba1079cb93f0aac49364
diff --git a/metadata/md5-cache/gui-apps/swayidle-9999 b/metadata/md5-cache/gui-apps/swayidle-9999
index 17d886bd8396..ca9868874970 100644
--- a/metadata/md5-cache/gui-apps/swayidle-9999
+++ b/metadata/md5-cache/gui-apps/swayidle-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] ) !<=gui-wm/sway-1.0_beta1 !~gui-wm/sway-1.0_beta2[swayidle]
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2fee6767df9e656ae5954e44262579b3
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.3 b/metadata/md5-cache/gui-apps/swaylock-1.3
index 86fa26307136..a839900a6d30 100644
--- a/metadata/md5-cache/gui-apps/swaylock-1.3
+++ b/metadata/md5-cache/gui-apps/swaylock-1.3
@@ -5,10 +5,10 @@ DESCRIPTION=Screen locker for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swaylock
 IUSE=fish-completion +gdk-pixbuf +man +pam zsh-completion +filecaps
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( virtual/pam ) !<=gui-libs/sway-1.0_beta2[swaylock]
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaylock/archive/1.3.tar.gz -> swaylock-1.3.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a6058fada58fb5b6318d7dafe71b9cb1
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c15ffc2d1ccf4e9265c07cada5a76660
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.4 b/metadata/md5-cache/gui-apps/swaylock-1.4
index 7ed40d9e816f..03c392d3a1cf 100644
--- a/metadata/md5-cache/gui-apps/swaylock-1.4
+++ b/metadata/md5-cache/gui-apps/swaylock-1.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( virtual/pam ) !<=gui-wm/sway-1.0_beta2[swaylock]
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaylock/archive/1.4.tar.gz -> swaylock-1.4.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=436faa5e09d871a43575c3efa3b5939a
diff --git a/metadata/md5-cache/gui-apps/swaylock-9999 b/metadata/md5-cache/gui-apps/swaylock-9999
index ea68649aedbd..9627b8942d57 100644
--- a/metadata/md5-cache/gui-apps/swaylock-9999
+++ b/metadata/md5-cache/gui-apps/swaylock-9999
@@ -8,5 +8,5 @@ IUSE=fish-completion +gdk-pixbuf +man +pam zsh-completion +filecaps
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( virtual/pam ) !<=gui-wm/sway-1.0_beta2[swaylock]
 SLOT=0
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=436faa5e09d871a43575c3efa3b5939a
diff --git a/metadata/md5-cache/gui-apps/wl-clipboard-1.0.0 b/metadata/md5-cache/gui-apps/wl-clipboard-1.0.0
index 7e212bc0226f..e6a34743d2e2 100644
--- a/metadata/md5-cache/gui-apps/wl-clipboard-1.0.0
+++ b/metadata/md5-cache/gui-apps/wl-clipboard-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/wayland
 SLOT=0
 SRC_URI=https://github.com/bugaevc/wl-clipboard/archive/v1.0.0.tar.gz -> wl-clipboard-1.0.0.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=3d4c7f47817920f7b11f31d749b2c2b5
diff --git a/metadata/md5-cache/gui-apps/wl-clipboard-9999 b/metadata/md5-cache/gui-apps/wl-clipboard-9999
index 4c9546934ced..72178e17748e 100644
--- a/metadata/md5-cache/gui-apps/wl-clipboard-9999
+++ b/metadata/md5-cache/gui-apps/wl-clipboard-9999
@@ -7,5 +7,5 @@ HOMEPAGE=https://github.com/bugaevc/wl-clipboard
 LICENSE=GPL-3
 RDEPEND=dev-libs/wayland
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=8c4aaab0390322160019f154cdc6da3b
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 073fa3ddb01b..08d3d10998ae 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.4.1 b/metadata/md5-cache/gui-libs/wlroots-0.4.1
index 7969a041b61d..4b12316845bf 100644
--- a/metadata/md5-cache/gui-libs/wlroots-0.4.1
+++ b/metadata/md5-cache/gui-libs/wlroots-0.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libinput-1.7.0:0= >=dev-libs/wayland-1.16.0 media-libs/mesa[e
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/wlroots/archive/0.4.1.tar.gz -> wlroots-0.4.1.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=6607767988f98016342f7ae725d80f50
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.5.0 b/metadata/md5-cache/gui-libs/wlroots-0.5.0
index 91cee62911da..de465007cea3 100644
--- a/metadata/md5-cache/gui-libs/wlroots-0.5.0
+++ b/metadata/md5-cache/gui-libs/wlroots-0.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/wlroots
 IUSE=elogind icccm rootston systemd x11-backend X +filecaps
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.7.0:0= >=dev-libs/wayland-1.16.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/wlroots/archive/0.5.0.tar.gz -> wlroots-0.5.0.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c01dd1dbe364f16cae20b4cf72c9fb86
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e957d01bdb84ba1993d11d035f474bdc
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.6.0 b/metadata/md5-cache/gui-libs/wlroots-0.6.0
index c331d2677748..584bc1bad6ae 100644
--- a/metadata/md5-cache/gui-libs/wlroots-0.6.0
+++ b/metadata/md5-cache/gui-libs/wlroots-0.6.0
@@ -5,11 +5,11 @@ DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/wlroots
 IUSE=elogind icccm rootston systemd x11-backend X +filecaps
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.17.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/wlroots/archive/0.6.0.tar.gz -> wlroots-0.6.0.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=dd68c3a36b3f59cf574c81442ea003c4
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=f4dcce4e05ed309ff09990677a983bbb
diff --git a/metadata/md5-cache/gui-libs/wlroots-9999 b/metadata/md5-cache/gui-libs/wlroots-9999
index b23203f41df6..f46d32c5b265 100644
--- a/metadata/md5-cache/gui-libs/wlroots-9999
+++ b/metadata/md5-cache/gui-libs/wlroots-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.17.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=dd68c3a36b3f59cf574c81442ea003c4
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index af8670b3f98e..7f86867446aa 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/sway-1.0 b/metadata/md5-cache/gui-wm/sway-1.0
index 29c90f9e5562..9ebd030955c6 100644
--- a/metadata/md5-cache/gui-wm/sway-1.0
+++ b/metadata/md5-cache/gui-wm/sway-1.0
@@ -5,11 +5,11 @@ DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
 IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( x11-libs/gdk-pixbuf:2 ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.5.0[elogind=,systemd=,X=]
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
 SLOT=0
 SRC_URI=https://github.com/swaywm/sway/archive/1.0.tar.gz -> sway-1.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=56384a88a0baf53a256813eb873b56de
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=524f7b0bfa86067eef78d91349d14cf0
diff --git a/metadata/md5-cache/gui-wm/sway-1.0_rc5 b/metadata/md5-cache/gui-wm/sway-1.0_rc5
index ef6500b4ead0..00ee1b990e30 100644
--- a/metadata/md5-cache/gui-wm/sway-1.0_rc5
+++ b/metadata/md5-cache/gui-wm/sway-1.0_rc5
@@ -11,5 +11,5 @@ RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
 SLOT=0
 SRC_URI=https://github.com/swaywm/sway/archive/1.0-rc5.tar.gz -> sway-1.0_rc5.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=015d3e9af442dea5d64b072a62815d1c
diff --git a/metadata/md5-cache/gui-wm/sway-1.1_rc2 b/metadata/md5-cache/gui-wm/sway-1.1_rc2
deleted file mode 100644
index a53c0d056a4e..000000000000
--- a/metadata/md5-cache/gui-wm/sway-1.1_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.6.0[elogind=,systemd=,X=]
-DESCRIPTION=i3-compatible Wayland window manager
-EAPI=7
-HOMEPAGE=https://swaywm.org
-IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.6.0[elogind=,systemd=,X=]
-REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
-SLOT=0
-SRC_URI=https://github.com/swaywm/sway/archive/1.1-rc2.tar.gz -> sway-1.1_rc2.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c60b3e3651382762c9d934ec1424eece
diff --git a/metadata/md5-cache/gui-wm/sway-1.1_rc3 b/metadata/md5-cache/gui-wm/sway-1.1_rc3
new file mode 100644
index 000000000000..7db87807283e
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/sway-1.1_rc3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.6.0[elogind=,systemd=,X=]
+DESCRIPTION=i3-compatible Wayland window manager
+EAPI=7
+HOMEPAGE=https://swaywm.org
+IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.6.0[elogind=,systemd=,X=]
+REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
+SLOT=0
+SRC_URI=https://github.com/swaywm/sway/archive/1.1-rc3.tar.gz -> sway-1.1_rc3.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c60b3e3651382762c9d934ec1424eece
diff --git a/metadata/md5-cache/gui-wm/sway-9999 b/metadata/md5-cache/gui-wm/sway-9999
index c041e860b967..a4552ecbbc10 100644
--- a/metadata/md5-cache/gui-wm/sway-9999
+++ b/metadata/md5-cache/gui-wm/sway-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999[elogind=,systemd=,X=]
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=c60b3e3651382762c9d934ec1424eece
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index c905af12acd7..be2137c7a0b6 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/khelpcenter-18.12.3 b/metadata/md5-cache/kde-apps/khelpcenter-18.12.3
index 48fd980327ce..024862f68d27 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-18.12.3
+++ b/metadata/md5-cache/kde-apps/khelpcenter-18.12.3
@@ -5,10 +5,10 @@ DESCRIPTION=The KDE Help Center
 EAPI=7
 HOMEPAGE=https://kde.org/ https://userbase.kde.org/KHelpCenter
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kbookmarks-5.57.0:5 >=kde-frameworks/kcodecs-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdoctools-5.57.0:5 >=kde-frameworks/khtml-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kinit-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kparts-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.14.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.12.3/src/khelpcenter-18.12.3.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=692d8a08fa8639822ec608d4b43cf330
+_md5_=2f1f50bd08da91ae9b24870f0051896a
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.12.3 b/metadata/md5-cache/kde-apps/kio-extras-18.12.3
index 5fb652afc815..900492c31a6b 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-18.12.3
+++ b/metadata/md5-cache/kde-apps/kio-extras-18.12.3
@@ -5,11 +5,11 @@ DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kio-extras.git
 IUSE=activities +man mtp openexr phonon samba +sftp taglib test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.57.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.57.0:5 >=kde-frameworks/kcodecs-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdnssd-5.57.0:5 >=kde-frameworks/kguiaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kparts-5.57.0:5 >=kde-frameworks/kpty-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/solid-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 activities? ( >=kde-frameworks/kactivities-5.57.0:5 >=dev-qt/qtsql-5.11.1:5 ) man? ( >=kde-frameworks/khtml-5.57.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) openexr? ( media-libs/openexr:= ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.57.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.12.3/src/kio-extras-18.12.3.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=07920852c946f2bfb095327b89ee50a4
+_md5_=f80216b521051dc992d1461d6bb1ac5c
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.12.3-r1 b/metadata/md5-cache/kde-apps/messagelib-18.12.3-r1
deleted file mode 100644
index 0896560f3f79..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-18.12.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.57.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcodecs-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/kjobwidgets-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/sonnet-5.57.0:5 >=kde-frameworks/syntax-highlighting-5.57.0:5 >=kde-apps/akonadi-18.12.3-r1:5 >=kde-apps/akonadi-contacts-18.12.3:5 >=kde-apps/akonadi-mime-18.12.3:5 >=kde-apps/grantleetheme-18.12.3:5 >=kde-apps/incidenceeditor-18.12.3:5 >=kde-apps/kcalcore-18.12.3:5 >=kde-apps/kcontacts-18.12.3:5 >=kde-apps/kdepim-apps-libs-18.12.3:5 >=kde-apps/kidentitymanagement-18.12.3:5 >=kde-apps/kldap-18.12.3:5 >=kde-apps/kmailtransport-18.12.3:5 >=kde-apps/kmbox-18.12.3:5 >=kde-apps/kmime-18.12.3:5 >=kde-apps/kpimtextedit-18.12.3:5 >=kde-apps/libgravatar-18.12.3:5 >=kde-apps/libkdepim-18.12.3:5 >=kde-apps/libkleo-18.12.3:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils
-DESCRIPTION=Libraries for messaging functions
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcodecs-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/kjobwidgets-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/sonnet-5.57.0:5 >=kde-frameworks/syntax-highlighting-5.57.0:5 >=kde-apps/akonadi-18.12.3-r1:5 >=kde-apps/akonadi-contacts-18.12.3:5 >=kde-apps/akonadi-mime-18.12.3:5 >=kde-apps/grantleetheme-18.12.3:5 >=kde-apps/incidenceeditor-18.12.3:5 >=kde-apps/kcalcore-18.12.3:5 >=kde-apps/kcontacts-18.12.3:5 >=kde-apps/kdepim-apps-libs-18.12.3:5 >=kde-apps/kidentitymanagement-18.12.3:5 >=kde-apps/kldap-18.12.3:5 >=kde-apps/kmailtransport-18.12.3:5 >=kde-apps/kmbox-18.12.3:5 >=kde-apps/kmime-18.12.3:5 >=kde-apps/kpimtextedit-18.12.3:5 >=kde-apps/libgravatar-18.12.3:5 >=kde-apps/libkdepim-18.12.3:5 >=kde-apps/libkleo-18.12.3:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.3/src/messagelib-18.12.3.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5b22ec04077f90f53401513022feab12
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.12.3-r2 b/metadata/md5-cache/kde-apps/messagelib-18.12.3-r2
new file mode 100644
index 000000000000..569d9671c710
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/messagelib-18.12.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.57.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcodecs-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/kjobwidgets-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/sonnet-5.57.0:5 >=kde-frameworks/syntax-highlighting-5.57.0:5 >=kde-apps/akonadi-18.12.3-r1:5 >=kde-apps/akonadi-contacts-18.12.3:5 >=kde-apps/akonadi-mime-18.12.3:5 >=kde-apps/grantleetheme-18.12.3:5 >=kde-apps/incidenceeditor-18.12.3:5 >=kde-apps/kcalcore-18.12.3:5 >=kde-apps/kcontacts-18.12.3:5 >=kde-apps/kdepim-apps-libs-18.12.3:5 >=kde-apps/kidentitymanagement-18.12.3:5 >=kde-apps/kldap-18.12.3:5 >=kde-apps/kmailtransport-18.12.3:5 >=kde-apps/kmbox-18.12.3:5 >=kde-apps/kmime-18.12.3:5 >=kde-apps/kpimtextedit-18.12.3:5 >=kde-apps/libgravatar-18.12.3:5 >=kde-apps/libkdepim-18.12.3:5 >=kde-apps/libkleo-18.12.3:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils
+DESCRIPTION=Libraries for messaging functions
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcodecs-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/kjobwidgets-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/sonnet-5.57.0:5 >=kde-frameworks/syntax-highlighting-5.57.0:5 >=kde-apps/akonadi-18.12.3-r1:5 >=kde-apps/akonadi-contacts-18.12.3:5 >=kde-apps/akonadi-mime-18.12.3:5 >=kde-apps/grantleetheme-18.12.3:5 >=kde-apps/incidenceeditor-18.12.3:5 >=kde-apps/kcalcore-18.12.3:5 >=kde-apps/kcontacts-18.12.3:5 >=kde-apps/kdepim-apps-libs-18.12.3:5 >=kde-apps/kidentitymanagement-18.12.3:5 >=kde-apps/kldap-18.12.3:5 >=kde-apps/kmailtransport-18.12.3:5 >=kde-apps/kmbox-18.12.3:5 >=kde-apps/kmime-18.12.3:5 >=kde-apps/kpimtextedit-18.12.3:5 >=kde-apps/libgravatar-18.12.3:5 >=kde-apps/libkdepim-18.12.3:5 >=kde-apps/libkleo-18.12.3:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.3/src/messagelib-18.12.3.tar.xz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=20b582d1bee6130ad4d164f233e5cab4
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 8b514ca95fb9..4bf6ee77b7cb 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/attica-5.57.0 b/metadata/md5-cache/kde-frameworks/attica-5.57.0
index 51a6174d0d34..8541aa9e635a 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing access to Open Collaboration Services
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/attica-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=94a2e60eba52b275e6fcdf54f66e2a86
+_md5_=ad8a5a5d782f1c52809857de24cc1ae3
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.57.0 b/metadata/md5-cache/kde-frameworks/baloo-5.57.0
index f00b290de846..4eb1c0ceff93 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for searching and managing metadata
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kcrash-5.57:5 >=kde-frameworks/kdbusaddons-5.57:5 >=kde-frameworks/kfilemetadata-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kidletime-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/solid-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/baloo-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b576c8ba9a6ec8d74d83b6f1015baabe
+_md5_=ef6adad1b8e14c003d20efae4eecb8bc
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.57.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.57.0
index 64196124c7b1..a6bf70b708fb 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Qt wrapper for Bluez 5 DBus API
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/bluez-qt-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c895c9e0d8b60e95e89f98af86df6477
+_md5_=af0f3808d23351a9c52bcc1abdedd346
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.57.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.57.0
index 0e2baa1991bc..58f6414eefa4 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.57.0
@@ -5,9 +5,9 @@ DESCRIPTION=Breeze SVG icon theme
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-3
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/breeze-icons-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6b9f6f95fbe6297036823a0537ed4be7
+_md5_=7e9e17e48916375dc0df5dfd914e1a47
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.57.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.57.0
index a8bec6d39c7e..fbbde056c1c7 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.57.0
@@ -5,9 +5,9 @@ DESCRIPTION=Breeze SVG icon theme binary resource
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-3
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/breeze-icons-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=55927a29f72b4b3525ec766011645208
+_md5_=5600c953463d939afeb25a523b20742a
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.57.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.57.0
index 62add5a15497..6cbf2906bada 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Extra modules and scripts for CMake
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
 IUSE=doc test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
 LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/extra-cmake-modules-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=09fa2e8b9aacac3e9b51225a4e1a8800
+_md5_=2df2c3e6eda47fa5392574b3c0571014
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.57.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.57.0
index 50d3bc76100c..db82ef9936da 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=appstream X test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/knewstuff-5.57:5 >=kde-frameworks/knotifications-5.57:5 >=kde-frameworks/kpackage-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/frameworkintegration-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a907291c8160c1bac77766d73e57cc35
+_md5_=4ae7ac84c281f1d41b349347b70b8c06
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.58.1 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.58.1
deleted file mode 100644
index 4d0593e894ba..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.58.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.58:5 >=kde-frameworks/kconfigwidgets-5.58:5 >=kde-frameworks/ki18n-5.58:5 >=kde-frameworks/kiconthemes-5.58:5 >=kde-frameworks/knewstuff-5.58:5 >=kde-frameworks/knotifications-5.58:5 >=kde-frameworks/kpackage-5.58:5 >=kde-frameworks/kwidgetsaddons-5.58:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils
-DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=appstream X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.58:5 >=kde-frameworks/kconfigwidgets-5.58:5 >=kde-frameworks/ki18n-5.58:5 >=kde-frameworks/kiconthemes-5.58:5 >=kde-frameworks/knewstuff-5.58:5 >=kde-frameworks/knotifications-5.58:5 >=kde-frameworks/kpackage-5.58:5 >=kde-frameworks/kwidgetsaddons-5.58:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5/5.58
-SRC_URI=mirror://kde/stable/frameworks/5.58/frameworkintegration-5.58.1.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0999e16227b02dc6342acda9113d6a30
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.58.2 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.58.2
new file mode 100644
index 000000000000..19900ce61a34
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.58.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.58:5 >=kde-frameworks/kconfigwidgets-5.58:5 >=kde-frameworks/ki18n-5.58:5 >=kde-frameworks/kiconthemes-5.58:5 >=kde-frameworks/knewstuff-5.58:5 >=kde-frameworks/knotifications-5.58:5 >=kde-frameworks/kpackage-5.58:5 >=kde-frameworks/kwidgetsaddons-5.58:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils
+DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=appstream X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.58:5 >=kde-frameworks/kconfigwidgets-5.58:5 >=kde-frameworks/ki18n-5.58:5 >=kde-frameworks/kiconthemes-5.58:5 >=kde-frameworks/knewstuff-5.58:5 >=kde-frameworks/knotifications-5.58:5 >=kde-frameworks/kpackage-5.58:5 >=kde-frameworks/kwidgetsaddons-5.58:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5/5.58
+SRC_URI=mirror://kde/stable/frameworks/5.58/frameworkintegration-5.58.2.tar.xz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0999e16227b02dc6342acda9113d6a30
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.57.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.57.0
index 93876c09a3d7..d5d38db4d21d 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for working with KDE activities
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=kde-plasma/kactivitymanagerd-5.14.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kactivities-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=73ab0dbe3bd4b05c24161d97b0d12895
+_md5_=cc9e4f997c95971d171e629668c23625
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.57.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.57.0
index ff5256846a6a..5b1711f885ba 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for getting the usage statistics collected by the activiti
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=kde-frameworks/kactivities-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kactivities-stats-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fe88abd5fd4b12f1fb928bb2f2931479
+_md5_=f5f33cc1b50d970ec59f4a31209d2523
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.57.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.57.0
index 0f1b4be0aaaa..f4966c81b0ee 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for building KDE API documentation in a standard format an
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD-2
 RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/graphviz[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] doc? ( >=dev-qt/qt-docs-5.11.1:5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kapidox-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9c614aa9784f5a4cbff5959f66db189d
+_md5_=4912a9b2b030bcafe7fd8eb8ab78ab8e
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.57.0 b/metadata/md5-cache/kde-frameworks/karchive-5.57.0
index 09fa8df45be9..874de0e150e6 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for reading, creation, and manipulation of various archive
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+bzip2 +lzma debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/karchive-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ee515d6a56f0b67b76eb8e714e05fc38
+_md5_=5f886182dee9a2d56aa2c6c70e1ef6af
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.57.0 b/metadata/md5-cache/kde-frameworks/kauth-5.57.0
index 85d6f9728704..bae5f0f0cab8 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework to let applications perform actions as a privileged user
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls +policykit test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+
 PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kauth-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=15ba52d7c98a5dcc53cc4c5470f6d5c6
+_md5_=7dd5f999d432100eb2d571fbc8be244e
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.57.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.57.0
index 299c08757b81..2bc6a7720600 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for managing bookmarks stored in XBEL format
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kbookmarks-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4c3f89b4cb7ba90ad4206cb500eaa375
+_md5_=38476b89607906bc2e037c877d20b7f2
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.57.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.57.0
index 3f78f8bf02aa..e7c32aad5e68 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework to work with KDE System Settings modules
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kdeclarative-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kitemviews-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kcmutils-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7f2d3e3936f17951118856e63797e1af
+_md5_=0b56c127c2071cbfd2f27ec36d03d18f
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.57.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.57.0
index 1aa3758a36cc..254125ba25b5 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for manipulating strings using various encodings
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kcodecs-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=624ce61d7a6ed79a3b228f789cd03e84
+_md5_=821f7ab92eac40e01750a109d522f214
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.57.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.57.0
index d1a6aafaa3b5..830f725c1511 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for common completion tasks such as filename or URL comple
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kcompletion-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2a0bc5bd944cdcb98c54e32567aa1767
+_md5_=d6aba4576e1399ef76478af7a96d6463
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.57.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.57.0
index 8d8e1b874737..69f719e0c039 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for reading and writing configuration
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=dbus nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dbus? ( >=dev-qt/qtdbus-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kconfig-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2be0c4e4463fca2350dcb8904f8c8e92
+_md5_=b3ff7815360f0d2206b9b80e22d226d5
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.57.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.57.0
index 42bfc26ec3fd..bcdf1aa6451d 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing an assortment of configuration-related widgets
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+man test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.57:5 >=kde-frameworks/kcodecs-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kguiaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kconfigwidgets-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=20a362aba81c2b7387e28948661f082d
+_md5_=51a75ac1e190699246c02d6f3d27caaf
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.57.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.57.0
index d9ff8dd7789d..44e819a08602 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for solving common problems such as caching, randomisation
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=fam nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.11.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kcoreaddons-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b4a61aeb0e6906f5a59de2367ca7ec0c
+_md5_=c9f51f12599118cbb1d1ebd4754b1b96
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.57.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.57.0
index de1d1d827d0f..1c11b262e05c 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for intercepting and handling application crashes
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kcrash-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b43340cbf5f03bfb5c54cf19d2ebd6ff
+_md5_=57a343700f6ff87b446422889de77ab3
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.57.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.57.0
index 3c78b84acb99..8bd41cb3fb09 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for registering services and applications per freedesktop
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls X debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kdbusaddons-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4958f4f76b33890d50589c64da8123dc
+_md5_=466f8e982ad9ec3f17a657b3c2673337
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.57.0-r1 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.57.0-r1
index b2a82ae438f4..21a358cf4e0c 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.57.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.57.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing integration of QML and KDE work spaces
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kglobalaccel-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kpackage-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kdeclarative-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=427ddad1b3ad10a40cb26c6ca35fa43a
+_md5_=1c4ed542eddef0cb70fc6d2836bda577
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.57.0 b/metadata/md5-cache/kde-frameworks/kded-5.57.0
index 16c585499f24..7a093753149d 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Central daemon of KDE workspaces
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+man debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kcrash-5.57:5 >=kde-frameworks/kdbusaddons-5.57:5 >=kde-frameworks/kinit-5.57:5 >=kde-frameworks/kservice-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kded-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8fdcabaccf43a491a7de5d3ad1bb82a0
+_md5_=870302729c385b12c410ddfc67b221c0
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.57.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.57.0
index f004daf4288b..67c7aea50e8d 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=libressl X test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.57:5 >=kde-frameworks/kcodecs-5.57:5 >=kde-frameworks/kcompletion-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kcrash-5.57:5 >=kde-frameworks/kdbusaddons-5.57:5 >=kde-frameworks/kded-5.57:5 >=kde-frameworks/kdesignerplugin-5.57:5 >=kde-frameworks/kdoctools-5.57:5 >=kde-frameworks/kemoticons-5.57:5 >=kde-frameworks/kglobalaccel-5.57:5 >=kde-frameworks/kguiaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kitemviews-5.57:5 >=kde-frameworks/kjobwidgets-5.57:5 >=kde-frameworks/knotifications-5.57:5 >=kde-frameworks/kparts-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/ktextwidgets-5.57:5 >=kde-frameworks/kunitconversion-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=kde-frameworks/solid-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qttest-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kinit-5.57:5 >=kde-frameworks/kitemmodels-5.57:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/portingAids/kdelibs4support-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e1fa1d228377215b0d2c6f66edbfdc0f
+_md5_=b19a16a052094ce4e744a3a65089178b
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.57.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.57.0
index ac5cb5fba4c5..6afe743f946c 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesig
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=designer nls webkit debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 designer? ( >=dev-qt/designer-5.11.1:5 >=kde-frameworks/kcompletion-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kitemviews-5.57:5 >=kde-frameworks/kplotting-5.57:5 >=kde-frameworks/ktextwidgets-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=kde-frameworks/sonnet-5.57:5 ) webkit? ( >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kdewebkit-5.57:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kdesignerplugin-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1ae62c82a7b72c034960e7662fae056e
+_md5_=9344cb7aca0816ea5a69fa99f0ed094e
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.57.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.57.0
index 9900d29558cb..45d7e1c7819d 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework to handle super user actions
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=X debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kpty-5.57:5 >=kde-frameworks/kservice-5.57:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kdesu-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fb1c504b366bc17ac15808e72f029b95
+_md5_=a843ff06b485fd1268dba52a452b4b27
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.57.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.57.0
index e11412f65729..954339225a22 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing KDE integration of QtWebKit
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kjobwidgets-5.57:5 >=kde-frameworks/kparts-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/kwallet-5.57:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kdewebkit-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=349bf5cddc12e0e0f58b501caacab02d
+_md5_=b349897e5c8f00d74cd5c730ac88ebb6
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.57.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.57.0
index eb33b964132c..95b8ef5dbe80 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for network service discovery using Zeroconf
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls zeroconf debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.11.1:5 zeroconf? ( >=dev-qt/qtdbus-5.11.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kdnssd-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2ae127bf3360668cf17c67f7b53a5846
+_md5_=02a8e747ba7197e6cb535ff0ae51c08c
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.57.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.57.0
index bc67316ba909..fe30effcbce0 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Tools to generate documentation in various formats from DocBook file
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.57:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kdoctools-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ca3dc46c017d961b9543b2a7ef7d74a6
+_md5_=386eae76ad658b7c761e1bca232dca6c
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.57.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.57.0
index e3f34331f5bd..6f37a5a96093 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for converting text emoticons to graphical representations
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kservice-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kemoticons-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=db8c9b2fe88a3612e53345cbcef624e3
+_md5_=d68718b87f3472feb0e14d936e92b30a
diff --git a/metadata/md5-cache/kde-frameworks/kf-env-5 b/metadata/md5-cache/kde-frameworks/kf-env-5
index e3aa8c7bd4e9..0cabfcab994e 100644
--- a/metadata/md5-cache/kde-frameworks/kf-env-5
+++ b/metadata/md5-cache/kde-frameworks/kf-env-5
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Environment setting required for all KDE Frameworks apps to run
 EAPI=7
 HOMEPAGE=https://community.kde.org/Frameworks
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-misc/xdg-utils-1.1.1-r1
 SLOT=5
-_md5_=c2ab9e613059d1669c8d8e64f10245e5
+_md5_=b266d8938733773ef845312de6854a69
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.57.0-r1 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.57.0-r1
index f6259023971a..221f528557c0 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.57.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.57.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Library for extracting file metadata
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=epub exif ffmpeg kernel_linux libav office pdf taglib debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=dev-qt/qtxml-5.11.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.57:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kfilemetadata-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ed25dbc8ff1b30bd351387591a5896b8
+_md5_=4a792e6d5d723408dd49473c499f89d7
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.57.0-r2 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.57.0-r2
index 2010f4904126..153eced6cb9e 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.57.0-r2
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.57.0-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Framework to handle global shortcuts
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kcrash-5.57:5 >=kde-frameworks/kdbusaddons-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5[X] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kglobalaccel-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=76ba5793a389ad8eb0767adc4335892b
+_md5_=dd32afb1432f017741e435d2c2f31c96
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.57.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.57.0
index 29ee70d7d64a..70ebbcc41532 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing assorted high-level user interface components
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kguiaddons-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8318e9123c7ecfaa5f21711d0373c988
+_md5_=ffe7338cf0c159ebdb4983e35c3c5b3f
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.57.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.57.0
index 19589b8eb904..c3b83224cec6 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Library to determine holidays and other special events for a geograp
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.11.1:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kholidays-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e0d53b34ae4d3188ff912d03ba9bf64e
+_md5_=70351dade8a8ff25de6501948d51afc4
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.57.0 b/metadata/md5-cache/kde-frameworks/khtml-5.57.0
index f92a86d85ffe..78825c92c6e9 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=KHTML web rendering engine
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=libressl X test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.57:5 >=kde-frameworks/kcodecs-5.57:5 >=kde-frameworks/kcompletion-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kglobalaccel-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kjobwidgets-5.57:5 >=kde-frameworks/kjs-5.57:5 >=kde-frameworks/knotifications-5.57:5 >=kde-frameworks/kparts-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/ktextwidgets-5.57:5 >=kde-frameworks/kwallet-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=kde-frameworks/sonnet-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/portingAids/khtml-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c59cdd4a35a89e085f6d7c21d6500585
+_md5_=ac16953ea26b3557fcf9563c464782a0
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.57.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.57.0
index e5b6e2bab0d4..87e527e57b17 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework based on Gettext for internationalizing user interface tex
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 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 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtdeclarative-5.11.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/ki18n-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cd12a724f5422bc76b976feeed138c6f
+_md5_=005b948a892efccc851e94174f39fc53
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.57.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.57.0
index 7135aa61355c..7f9de90960a0 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for icon theming and configuration
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kitemviews-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kiconthemes-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=11b42e6f449f3352e7248ac3c6fa4bc4
+_md5_=792fad6dbeb3ea7483add4246a6b6253
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.57.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.57.0
index 95a55448c9b3..16d7dbb3c9db 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for detection and notification of device idle time
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=X xscreensaver debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.11.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kidletime-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c6f61744c47218a3398acea942b781f5
+_md5_=0093197a0af65ab5a7390d01be870fb5
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.57.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.57.0
index 70b94e8e5f30..0dd4110c46c8 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing additional format plugins for Qt's image I/O sys
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=eps openexr test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.57:5 >=dev-qt/qtgui-5.11.1:5 eps? ( >=dev-qt/qtprintsupport-5.11.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kimageformats-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=834ee23fa7bc460572c40fc8650ffe73
+_md5_=95da2c725e572842a9664c35ba6cb35a
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.57.0 b/metadata/md5-cache/kde-frameworks/kinit-5.57.0
index ae5e7346d983..050b06888b2a 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+caps +man X debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kcrash-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kinit-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3043f076babea5e2564cb7ac27dcd379
+_md5_=3adc8909605206784dd5add43a2929a9
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.57.0 b/metadata/md5-cache/kde-frameworks/kio-5.57.0
index 3897906f4578..4c38650eb86c 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.57.0
@@ -5,7 +5,7 @@ DESCRIPTION=Framework providing transparent file and data management
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=acl +handbook kerberos +kwallet X test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 PDEPEND=>=kde-frameworks/kded-5.57:5
 RDEPEND=>=kde-frameworks/kauth-5.57:5 >=kde-frameworks/karchive-5.57:5 >=kde-frameworks/kbookmarks-5.57:5 >=kde-frameworks/kcodecs-5.57:5 >=kde-frameworks/kcompletion-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kcrash-5.57:5 >=kde-frameworks/kdbusaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kitemviews-5.57:5 >=kde-frameworks/kjobwidgets-5.57:5 >=kde-frameworks/knotifications-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/ktextwidgets-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=kde-frameworks/solid-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5=[ssl] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.57:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.57:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kio-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e6cac0fc5ce01702164c91f8cee5d5e2
+_md5_=506b4db80aaa151a3a9c9a925518518d
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.57.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.57.0
index c7c543cdaf5a..52a7fcaceeb4 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Lightweight user interface framework for mobile and convergent appli
 EAPI=7
 HOMEPAGE=https://techbase.kde.org/Kirigami
 IUSE=debug examples test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kirigami2-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2adb02b29f48256fd4391c9eb40acbae
+_md5_=15ffed2aa6ec94e248eb683701372259
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.57.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.57.0
index 824198e7eb3b..702f9871e367 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing data models to help with tasks such as sorting a
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kitemmodels-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d60d28e19802a01cfd153165e61ce5f8
+_md5_=58d1bea6109fff2bc6b3b0565d2f9d29
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.57.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.57.0
index bf772430f740..7e53cf70223f 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing additional widgets for item models
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kitemviews-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=eff3b8266d4613f5f9287ec85a6b650a
+_md5_=702a65a9760ec373383266c337261635
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.57.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.57.0
index 30385e6cf6b6..2e1ea14764ad 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing assorted widgets for showing the progress of job
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls X debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kjobwidgets-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=59d3b91402c947a9b44333421ee33cb5
+_md5_=bd7c780fed1d0c12ae93b59208c161b4
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.57.0 b/metadata/md5-cache/kde-frameworks/kjs-5.57.0
index 3d48ee27cbf0..af069b096aa6 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=ECMAScipt compatible parser and engine
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/portingAids/kjs-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=53b710452aa9b00948b955887e449f08
+_md5_=91c3176af205d32df2731b94ed511548
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.57.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.57.0
index 781f8cefd451..b1757c2316be 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework binding JavaScript objects to QObjects
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kjs-5.57:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/portingAids/kjsembed-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=eb7187a4f79f2f2feaa18158937013fe
+_md5_=5c9690f3ebe4642513459a81adcfb790
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.57.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.57.0
index 4a80e3250ef4..57fec922930e 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing a common interface for KParts that can play medi
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug test
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/portingAids/kmediaplayer-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8dd7e6be0c51d8f5b0c93a73325050f9
+_md5_=d725bf6277d797c32a3f1d90e79642da
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.57.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.57.0
index 6b5b755721ff..8156f39bb25f 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for downloading and sharing additional application data
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.57:5 >=kde-frameworks/karchive-5.57:5 >=kde-frameworks/kcompletion-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kitemviews-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/ktextwidgets-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kirigami-5.57:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/knewstuff-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d31fb55b6d44852627383a38ed94c831
+_md5_=48669c605da5b3e468b7c2467ef62bb4
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.57.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.57.0
index 8dae3bb2b365..f7c40e2cea23 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for notifying the user of an event
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=dbus nls phonon speech X debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.11.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/knotifications-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=64ab2f765571f3f770e1f7c7538de56d
+_md5_=33b4b5b93cdc1ed2da31d83699dd6cb9
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.57.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.57.0
index 53115ccc9ea4..557f7def1af6 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for configuring desktop notifications
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=phonon debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kio-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/knotifyconfig-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d2a659ff5bcbefe2c007b41bf330c4a1
+_md5_=c38c2f3e1226d25f2fd5c2972b166e3d
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.57.0-r1 b/metadata/md5-cache/kde-frameworks/kpackage-5.57.0-r1
index 247ce3a1e6ff..b5ed403b9d60 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.57.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.57.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Framework to install and load packages of non binary content
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kpackage-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b2aa78725ea990221fe0a400b65671ef
+_md5_=b1384e545e33dbe7acd765147b179582
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.57.0 b/metadata/md5-cache/kde-frameworks/kparts-5.57.0
index 0d9fbff6f32e..9c859b4040c5 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing elaborate user-interface components
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kjobwidgets-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kparts-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6743d868dfbe6f73e3ac91d36114a459
+_md5_=b5d02ea0c87530f28b9f33fbb5623706
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.57.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.57.0
index d4c91b7d28c7..f8f746295c59 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=KDE contact person abstraction library
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kpeople.git
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kitemviews-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kpeople-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cbecccd3369d2dc7da4560fba7b8e36b
+_md5_=6f65a931c9f491c6b690c23f01923701
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.57.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.57.0
index 4b228b333184..f1c9a3bec93d 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing easy data-plotting functions
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kplotting-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=218ea047f0fea8d6de974dfd125fb380
+_md5_=125961b7e643c462d2b29060b16fcf0a
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.57.0 b/metadata/md5-cache/kde-frameworks/kpty-5.57.0
index 3a9c1dc5b363..e30704033628 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for pseudo terminal devices and running child processes
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kpty-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=39784f3090ec221473b314585fba18f6
+_md5_=f3a379fe38744a1c5314bea149339e44
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.57.0 b/metadata/md5-cache/kde-frameworks/kross-5.57.0
index c5b23e0638ce..489b3a79a31f 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for embedding scripting into applications
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kparts-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/portingAids/kross-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6574312d099a33138234d1d7177e12de
+_md5_=46259dbc21cf36b2040bab5c4f0a34ee
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.57.0 b/metadata/md5-cache/kde-frameworks/krunner-5.57.0
index 7617bd500b95..c48d121f05b2 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for providing different actions given a string query
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/plasma-5.57:5 >=kde-frameworks/solid-5.57:5 >=kde-frameworks/threadweaver-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/krunner-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a36317ce563170c1aa53c9b084304063
+_md5_=16cd4abf6666ff533ace822d8a5e6136
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.57.0 b/metadata/md5-cache/kde-frameworks/kservice-5.57.0
index e4cb3e7660c0..01712a78042f 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Advanced plugin and service introspection
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2 LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kcrash-5.57:5 >=kde-frameworks/kdbusaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kservice-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=226db57d130c735fdccfec754c6f3bbb
+_md5_=0e27ed9374cf9a2179891862e05e80de
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.57.0-r1 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.57.0-r1
index c03e05f4c7fc..451c473bd13c 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.57.0-r1
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.57.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing a full text editor component
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=editorconfig git test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.57:5 >=kde-frameworks/kauth-5.57:5 >=kde-frameworks/kcodecs-5.57:5 >=kde-frameworks/kcompletion-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kguiaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kitemviews-5.57:5 >=kde-frameworks/kjobwidgets-5.57:5 >=kde-frameworks/kparts-5.57:5 >=kde-frameworks/ktextwidgets-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=kde-frameworks/sonnet-5.57:5 >=kde-frameworks/syntax-highlighting-5.57:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/ktexteditor-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4f43be56825025de44c417b401452363
+_md5_=06b9e195c0c7ced00f3d5d480399a35f
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.57.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.57.0
index b3e04f730953..8c62938d6cb8 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing an assortment of widgets for displaying and edit
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=speech test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5 >=kde-frameworks/sonnet-5.57:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 speech? ( >=dev-qt/qtspeech-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/ktextwidgets-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2068cc592749167b44e11d64eb60083a
+_md5_=2d19072f46fbf740052f6f45717f7882
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.57.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.57.0
index 267d90cead32..b8bb6f2a4cc6 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for converting units
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.57:5 >=dev-qt/qtnetwork-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kunitconversion-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c8639947e16899e889c40a04c7b0b6e1
+_md5_=4bbb1e5eb8312ee849ff67b846d7b3ed
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.57.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.57.0
index 2ad6e232310a..45514ff37494 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing desktop-wide storage for passwords
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=gpg +man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kdbusaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/knotifications-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kwallet-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=762ad5ecf23549747b64133a61afe910
+_md5_=62f890378ec76e82dc27d4e97b3c0509
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.57.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.57.0
index d4f314c159c6..11e32793d842 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kwayland.git
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.11.1:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kwayland-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=15fe28e2cfbf37ebe81e640edbd3ee02
+_md5_=05baf296545a3beb717fe41ea4d93e89
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.57.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.57.0
index fd6cc7bada0c..be8eb5a61e58 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=An assortment of high-level widgets for common tasks
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kwidgetsaddons-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3aead6719c0cfd175faa89f745e390e7
+_md5_=abbff0774b4ba0e293b35741b661395f
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.57.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.57.0
index cfd48a342244..c08e40dcdb71 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing access to properties and features of the window
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls X test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kwindowsystem-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fd1349860f7a4a6f10e3f331ca3320d6
+_md5_=a0885490603b8700b58e9f23fe7402b7
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.57.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.57.0
index 0ab286a134eb..ec77387f32b8 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=attica test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kglobalaccel-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kitemviews-5.57:5 >=kde-frameworks/ktextwidgets-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5 >=dev-qt/qtcore-5.11.1:5= >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 attica? ( >=kde-frameworks/attica-5.57:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kxmlgui-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=28fd89f08e82cf4e637ffb280990f7c1
+_md5_=6be1ee2212b0f516319ab7914a9fe65c
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.57.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.57.0
index 44a05d18323a..f30b83e6ef29 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kio-5.57:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/kxmlrpcclient-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=795f5db1f61ee96fd7a052d402f67fa2
+_md5_=0f609e16d03f09a43f4833207763eb77
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.57.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.57.0
index bc5c1bfb59d2..e48f727785e7 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=ModemManager bindings for Qt
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/modemmanager-qt-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d328aa8b7f1c07cd48767156151664ee
+_md5_=57dc2c72d0eb5c79690bc7c18e144277
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.57.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.57.0
index 5947bc0a9510..aa7278530a77 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=NetworkManager bindings for Qt
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=teamd debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] !net-libs/libnm-qt:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit] >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/networkmanager-qt-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=84c3bf43dd50ac3a6f8841a77860e4db
+_md5_=4205581b4fc59a570373f1330c09a1d5
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.57.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.57.0
index 3ded8e37d972..6858120a0496 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Oxygen SVG icon theme
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=!kde-frameworks/oxygen-icons:4
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/oxygen-icons5-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6044ae410bb773ca1be457490bf1eda3
+_md5_=4752b0708b985bb477696a83380c3803
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.57.0 b/metadata/md5-cache/kde-frameworks/plasma-5.57.0
index 4e840ac4fe0d..5547b92b8252 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Plasma framework
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=gles2 wayland X test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kactivities-5.57:5 >=kde-frameworks/karchive-5.57:5 >=kde-frameworks/kconfig-5.57:5 >=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/kdeclarative-5.57:5 >=kde-frameworks/kglobalaccel-5.57:5 >=kde-frameworks/kguiaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kio-5.57:5 >=kde-frameworks/kirigami-5.57:5 >=kde-frameworks/knotifications-5.57:5 >=kde-frameworks/kpackage-5.57:5 >=kde-frameworks/kservice-5.57:5 >=kde-frameworks/kwidgetsaddons-5.57:5 >=kde-frameworks/kwindowsystem-5.57:5 >=kde-frameworks/kxmlgui-5.57:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[gles2=] >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.57:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/plasma-framework-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=56bd2d742b93012be677b0d7ebe78761
+_md5_=a5224a61961f610f0196eb1d2e75780c
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.57.0 b/metadata/md5-cache/kde-frameworks/prison-5.57.0
index a6a0b54e7b7a..e87e496aee5c 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=QRCode and data matrix barcode library
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/prison.git
 IUSE=qml debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/prison-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b466a58a3285fa3b1ea7fae62d6aad68
+_md5_=367cae885cb95873f1c57faeaee8c7d7
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.57.0 b/metadata/md5-cache/kde-frameworks/purpose-5.57.0
index 96f79e27b5ff..15526c2d0319 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.57.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for providing abstractions to get the developer's purposes f
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+kaccounts debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57:5 >=kde-frameworks/ki18n-5.57:5 >=kde-frameworks/kio-5.57:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-18.12.3:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/purpose-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cca946d79f22aceff7f0da77ecc8b7cf
+_md5_=efe1f3771e9d57c4a539c64705b97fd9
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.57.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.57.0
index c51a1180b338..c793fe450688 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=|| ( GPL-2+ LGPL-3+ )
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.57:5 >=kde-frameworks/kiconthemes-5.57:5 >=kde-frameworks/kirigami-5.57:5 >=dev-qt/qtdeclarative-5.11.1:5= >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/qqc2-desktop-style-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f0e317f76bc899211cb23a01f17c925b
+_md5_=94fc72bae3022e1a8e5b8317950ded2f
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.57.0-r1 b/metadata/md5-cache/kde-frameworks/solid-5.57.0-r1
index f6185685dfe2..17e5eaa2fc99 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.57.0-r1
+++ b/metadata/md5-cache/kde-frameworks/solid-5.57.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Provider for platform independent hardware discovery, abstraction an
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls udev test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-fs/udisks:2 udev? ( virtual/libudev:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/solid-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1a0dc8ff7017b666e6826fee22446347
+_md5_=f42cec053729b0a1a198d55182e16eae
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.57.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.57.0
index 963bdefc852c..c7718d0972ab 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for providing spell-checking through abstraction of popula
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=aspell +hunspell nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/sonnet-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3dd9637dabe31df382223a7aebadc106
+_md5_=dd7ee658dc8b1d017125f7783ca5894a
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.57.0 b/metadata/md5-cache/kde-frameworks/syndication-5.57.0
index 67028677dd5c..ba2b20e97941 100644
--- a/metadata/md5-cache/kde-frameworks/syndication-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Library for parsing RSS and Atom feeds
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.57:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/syndication-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6a6db238d3a127f61b00402ed4adea16
+_md5_=62d0dde3569cebcf7fb07ef73b0d5424
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.57.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.57.0
index 35c063d14251..29ea7c3696ec 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for syntax highlighting
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/syntax-highlighting-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6ed003b9f131294312bda6f0d158a3de
+_md5_=68492c8d951471b732c3826a0c1348df
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.57.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.57.0
index 7be2b831f7e1..9c4e539521fe 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.57.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.57.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for managing threads using job and queue-based interfaces
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.57
 SRC_URI=mirror://kde/stable/frameworks/5.57/threadweaver-5.57.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a5715fd1bbc3acc6c2e4530da9d319b3
+_md5_=cc9d6396b36c219b189061d9bc6465bb
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 0f00b825a86d..a4328b5e1b83 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/tellico-3.2 b/metadata/md5-cache/kde-misc/tellico-3.2
new file mode 100644
index 000000000000..a337b48bb550
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/tellico-3.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.57.0:5 handbook? ( >=kde-frameworks/kdoctools-5.57.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcodecs-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kguiaddons-5.57.0:5 >=kde-frameworks/khtml-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kjobwidgets-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/kparts-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwallet-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/solid-5.57.0:5 >=kde-frameworks/sonnet-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/libxml2 dev-libs/libxslt >=dev-perl/Text-BibTeX-0.780.0-r1 cddb? ( >=kde-apps/libkcddb-18.12.3:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-18.12.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.57.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils
+DESCRIPTION=Collection manager based on KDE Frameworks
+EAPI=7
+HOMEPAGE=http://tellico-project.org/
+IUSE=cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcodecs-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kguiaddons-5.57.0:5 >=kde-frameworks/khtml-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kjobwidgets-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/kparts-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwallet-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/solid-5.57.0:5 >=kde-frameworks/sonnet-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/libxml2 dev-libs/libxslt >=dev-perl/Text-BibTeX-0.780.0-r1 cddb? ( >=kde-apps/libkcddb-18.12.3:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-18.12.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.57.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=http://tellico-project.org/files/tellico-3.2.tar.xz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=3f0a9b030f962235f105ff8792327af9
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.1.1 b/metadata/md5-cache/kde-misc/wacomtablet-3.1.1
index 1556c77d1a38..bf7dc7d42ae3 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.1.1
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.1.1
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0
 SLOT=5
 SRC_URI=mirror://kde/stable/wacomtablet/3.1.1/wacomtablet-3.1.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3b35e6335e283e675d1c6e7959881cb8
+_md5_=0a670d10f1ee383ecdde32f6c6240875
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 0fbc25540148..fbc8b0eef7df 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.15.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.15.5
index a15dc4b5d9f9..531cbc1f97f1 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.15.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Bluetooth stack for KDE Plasma
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/bluedevil.git
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/bluez-qt-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kded-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/plasma-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/bluedevil-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=01a28243197da73d85bf91bf09d9db05
+_md5_=d9758680037aeee292637da9e09b2c1c
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.15.5 b/metadata/md5-cache/kde-plasma/breeze-5.15.5
index fe4ae20fc4ae..0ba1985d8036 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.15.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.15.5
@@ -5,11 +5,11 @@ DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/breeze.git
 IUSE=wayland X debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-frameworks/breeze-icons-5.57.0:5 >=kde-plasma/kde-cli-tools-5.15.5:5
 RDEPEND=>=kde-frameworks/frameworkintegration-5.57.0:5 >=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kguiaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-plasma/kdecoration-5.15.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.57.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/breeze-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a2a44701250020451591577f94eca164
+_md5_=bee6b297b26d94d545e6df0fcfdd5235
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.15.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.15.5
index 05f135565402..286b2a0e9567 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.15.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.15.5
@@ -4,9 +4,9 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-fi
 DESCRIPTION=Breeze theme for GRUB
 EAPI=7
 HOMEPAGE=https://kde.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/breeze-grub-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=04a3533ee6a6c5b0ee4ca80e884250bb
+_md5_=1afbe98fc67b17e83e163e73230718b7
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.15.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.15.5
index 954ff387ad6f..c213ec9467b3 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.15.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/breeze-gtk.git
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/breeze-gtk-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8c8d352b9512c433fbe07cb7583497cd
+_md5_=8f231defd80fec3a0d5d1fec88f7e696
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.15.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.15.5
index 9741b34c547f..91176098656f 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.15.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Breeze theme for Plymouth
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/breeze-plymouth-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=66a0188ef221caa56562382ea4c0404a
+_md5_=9b09e001d3e00074e3d91a1edc12a900
diff --git a/metadata/md5-cache/kde-plasma/discover-5.15.5 b/metadata/md5-cache/kde-plasma/discover-5.15.5
index ec832e8b3870..7e2d29da4ca0 100644
--- a/metadata/md5-cache/kde-plasma/discover-5.15.5
+++ b/metadata/md5-cache/kde-plasma/discover-5.15.5
@@ -5,10 +5,11 @@ DESCRIPTION=KDE Plasma resources management GUI
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/Discover
 IUSE=+firmware test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/attica-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kirigami-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 firmware? ( sys-apps/fwupd ) >=kde-frameworks/kirigami-5.57.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/discover-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=924bce7a2c1eddd7aa5581cf080a9b64
+_md5_=a31a3d692e34b7346d6bd9b64aa20153
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.15.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.15.5
index a383645d10b3..9e711f820b9f 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.15.5
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=X debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kidletime-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kjobwidgets-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kwallet-5.57.0:5 >=kde-frameworks/kwayland-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlrpcclient-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/drkonqi-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1ce401fa4a3f918459933eeb676495fd
+_md5_=6ec8bd1b5fdb12fedfd9c46759c13975
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.15.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.15.5
index be6b6c5bb288..f1b3672115e6 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=System service to manage user's activities, track the usage patterns
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kglobalaccel-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kactivitymanagerd-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=02328efd0811f04d91da80dd1b157de6
+_md5_=c20a8d0f78976d8166ba171f6e06a3c1
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.15.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.15.5
index c179c5b9cc58..3a671eb7f0eb 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.15.5
@@ -5,11 +5,11 @@ DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kde-cli-tools.git
 IUSE=+kdesu X test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.57.0:5 >=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-plasma/libkworkspace-5.15.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.57.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kde-cli-tools-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=74f1fa22a76f0ee2ac19dd122e05d15e
+_md5_=1b1c76cdeb09f7b3e12c2c37de2f47f5
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.15.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.15.5
index 2962e2616488..d0f292d71d28 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
 IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kde-gtk-config-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=526afd6887de1285d3936c8f64c2bbc2
+_md5_=acda620052b286c0b54b1a8e5d60b334
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.15.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.15.5
index cbe67834e22d..a61ad3b0183e 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Plugin based library to create window decorations
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/ki18n-5.57.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kdecoration-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fe3a51d3d036a346dbdc859ee9533a78
+_md5_=aa7e9a50dc52ffb9457f6a2dde076c9d
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.15.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.15.5
index 318be9e9898c..bae3f7fc4147 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Extra Plasma applets and engines
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=share webengine debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/kholidays-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kpackage-5.57.0:5 >=kde-frameworks/kross-5.57.0:5 >=kde-frameworks/krunner-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kunitconversion-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/plasma-5.57.0:5 >=kde-frameworks/sonnet-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.57.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) >=kde-plasma/plasma-workspace-5.15.5:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kdeplasma-addons-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0bccdd19d66886458c1dc5b0e8a7e438
+_md5_=1a9b9c394530b244e978db807e61f946
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.15.5 b/metadata/md5-cache/kde-plasma/kgamma-5.15.5
index 584efdd53464..11dc08350e1e 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Screen gamma values kcontrol module
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kgamma5-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d0dbe456fd2193d9232b0ef66de4d168
+_md5_=2fc6835920277c8e5eadff23693cd7f8
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.15.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.15.5
index c59a5d95b559..6c0e75dd2e1d 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.15.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma workspace hotkey module
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdelibs4support-5.57.0:5[X] >=kde-frameworks/kglobalaccel-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-plasma/libkworkspace-5.15.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.57.0:5 >=kde-plasma/kde-cli-tools-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/khotkeys-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6b1ab5b2ca73f7ab2e36004ae4eaf31c
+_md5_=96d8aee249079e652b28da07a289c02b
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.15.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.15.5
index 93648edb3975..ef1cd3238a3e 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.15.5
@@ -5,11 +5,11 @@ DESCRIPTION=Utility providing information about the computer hardware
 EAPI=7
 HOMEPAGE=https://kde.org/applications/system/kinfocenter/
 IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kpackage-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/solid-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.57.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.15.5:5 >=dev-qt/qtquickcontrols2-5.11.1:5 !kde-apps/kcontrol:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kinfocenter-5.15.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=13084dbe3ecf508b2882b0706f63f855
+_md5_=216c26cb84963353b2e8f38990dcbd94
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.15.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.15.5
index 7a6c969aab30..1c99fa7a7c81 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma menu editor
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kmenuedit.git
 IUSE=+hotkeys debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdelibs4support-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/sonnet-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.15.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kmenuedit-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f91770e2511ba2fc6e841d88d8c76115
+_md5_=232776e43fe1fef93019f2b46b3c1804
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.15.5 b/metadata/md5-cache/kde-plasma/kscreen-5.15.5
index af2c46955e72..90992c05475c 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.15.5
@@ -5,11 +5,11 @@ DESCRIPTION=KDE Plasma screen management
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kscreen.git
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kglobalaccel-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/plasma-5.57.0:5 >=kde-plasma/libkscreen-5.15.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.15.5:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kscreen-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=72ffea4b87caa12c6bc77e68dafa0248
+_md5_=054473f9122491bf18d7caf889acd29a
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.15.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.15.5
index e2234d169390..fb5ac72a58df 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.15.5
@@ -5,7 +5,7 @@ DESCRIPTION=Library and components for secure lock screen architecture
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=consolekit +pam seccomp test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.15.5:5
 RDEPEND=>=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/kglobalaccel-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kidletime-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kpackage-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwayland-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/solid-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kscreenlocker-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=329d839e1bb8b83543722dd5a111a29a
+_md5_=2fbef7bf632f15f8debe2f031640a473
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.15.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.15.5
index b0d9c1b8eb27..7b79721b641d 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.15.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kwallet-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/ksshaskpass-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6b550801c966bed6ea854a64aad5750e
+_md5_=b697af764a15b51adb2e3c5257318456
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.15.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.15.5
index 07bd0cf3d6a1..da968cd06766 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.15.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=lm_sensors debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kinit-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-plasma/libksysguard-5.15.5:5[-minimal(-)] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/ksysguard-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9f4f853cadb25825fde63b70ba8930e0
+_md5_=422577308b3b8a733456bc1aaa0af2f4
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.15.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.15.5
index f3c1f61b2318..35997826d882 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=KWallet PAM module to not enter password again
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 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.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kwallet-pam-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8f132a37b3dd3d6b16eec613869096c3
+_md5_=2446bc5a30756ff7c64e265514d1c3fe
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.15.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.15.5
index 3b2ad579d758..0c3e4f69603e 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.15.5
@@ -5,11 +5,11 @@ DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kidletime-5.57.0:5 >=kde-frameworks/kwayland-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kwayland-integration-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d8289895264193d1d5be173287c8a58d
+_md5_=73e8e88ec909c4e20895c14cc4f2c6a4
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.15.5 b/metadata/md5-cache/kde-plasma/kwin-5.15.5
index 4f30f03db0d2..00430d486c1a 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.15.5
@@ -5,7 +5,7 @@ DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=caps gles2 multimedia test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
 PDEPEND=>=kde-plasma/kde-cli-tools-5.15.5:5
 RDEPEND=>=kde-frameworks/kactivities-5.57.0:5 >=kde-frameworks/kauth-5.57.0:5 >=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/kglobalaccel-5.57.0:5= >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kidletime-5.57.0:5= >=kde-frameworks/kinit-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kpackage-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwayland-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5[X] >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/plasma-5.57.0:5 >=kde-plasma/breeze-5.15.5:5 >=kde-plasma/kdecoration-5.15.5:5 >=kde-plasma/kscreenlocker-5.15.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=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 x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtvirtualkeyboard-5.11.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.11.1:5[gstreamer,qml] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kwin-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1c1a924b68431ac9396740c8f573fd59
+_md5_=3ab35fb183370121403daac38b740796
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.15.5 b/metadata/md5-cache/kde-plasma/kwrited-5.15.5
index d300f2898924..07961f177792 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.15.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma daemon listening for wall and write messages
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kpty-5.57.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/kwrited-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=82351dae50c70a71a50f99980ec4618e
+_md5_=dde59fecfb0e4d47417630785d36259e
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.15.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.15.5
index 8c58c624aee9..0243bc8e0cd6 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.15.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.15.5
@@ -5,11 +5,11 @@ DESCRIPTION=Plasma screen management library
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kwayland-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.15.5/libkscreen-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=302389e755b9251d21e76c581735b9b8
+_md5_=6f2cf40e3693b8d73db1aee944700384
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.15.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.15.5
index fcfba7c38e44..bc01eb77d005 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.15.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Task management and system monitoring library
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=minimal webengine X test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/libksysguard-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f043012894a17235a87d8435bdb0db6e
+_md5_=e0c036d304b6ad004a007ae13cf48826
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.15.5 b/metadata/md5-cache/kde-plasma/libkworkspace-5.15.5
index 36897966c3ca..81c840160276 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.15.5
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Workspace library to interact with the Plasma session manager
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/plasma-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5b626edbb3705f66c51892b9081adfdd
+_md5_=b27b5f1c26d14cc78c0b8a970c1b034f
diff --git a/metadata/md5-cache/kde-plasma/milou-5.15.5 b/metadata/md5-cache/kde-plasma/milou-5.15.5
index 64a2c3f7cc60..b73a845e89f5 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.15.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Dedicated search application built on top of Baloo
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/milou.git
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/krunner-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/plasma-5.57.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/milou-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d28525a7ed6e6a8e03e6ae242b82363a
+_md5_=c22c822afa555b430bf61ad5326c8701
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.15.5 b/metadata/md5-cache/kde-plasma/oxygen-5.15.5
index 7a9d0a3117e9..8299dec9b549 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.15.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.15.5
@@ -5,11 +5,11 @@ DESCRIPTION=Oxygen visual style for the Plasma desktop
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/oxygen.git
 IUSE=wayland debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.15.5:5
 RDEPEND=>=kde-frameworks/frameworkintegration-5.57.0:5 >=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kguiaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-plasma/kdecoration-5.15.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.57.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/oxygen-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=86a63bdb95f8397b3d1493570c88bb0c
+_md5_=c7f8859471b05c8b53437314c0bbfc1d
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.15.5 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.15.5
index 98efd1514c37..f83fd9156637 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.15.5
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensio
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-3+
 RDEPEND=>=kde-frameworks/kactivities-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/krunner-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plasma-browser-integration-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ba1fe8eec70761777eea599308d68a9e
+_md5_=70deecf906430daf136a357fddf7dd6a
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.15.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.15.5
index bcf11fda9868..db1da118cd56 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.15.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma desktop
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/attica-5.57.0:5 >=kde-frameworks/kactivities-5.57.0:5 >=kde-frameworks/kactivities-stats-5.57.0:5 >=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kauth-5.57.0:5 >=kde-frameworks/kbookmarks-5.57.0:5 >=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kcodecs-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/kded-5.57.0:5 >=kde-frameworks/kdelibs4support-5.57.0:5 >=kde-frameworks/kemoticons-5.57.0:5 >=kde-frameworks/kglobalaccel-5.57.0:5 >=kde-frameworks/kguiaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/kjobwidgets-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/knotifyconfig-5.57.0:5 >=kde-frameworks/kparts-5.57.0:5 >=kde-frameworks/kpeople-5.57.0:5 >=kde-frameworks/krunner-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kwallet-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/plasma-5.57.0:5 >=kde-frameworks/solid-5.57.0:5 >=kde-frameworks/sonnet-5.57.0:5 >=kde-plasma/kwin-5.15.5:5 >=kde-plasma/plasma-workspace-5.15.5:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.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-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.57.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/kirigami-5.57.0:5 >=kde-frameworks/qqc2-desktop-style-5.57.0:5 >=kde-plasma/breeze-5.15.5:5 >=kde-plasma/kde-cli-tools-5.15.5:5 >=kde-plasma/oxygen-5.15.5:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 sys-apps/util-linux x11-apps/setxkbmap !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plasma-desktop-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=765aa9aecb6c77b84bbaf93f0c01c729
+_md5_=4dc017de9ae231cb6d9340d74cef94bd
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.15.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.15.5
index 935dcbb7dab7..a97d55c7edbb 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.15.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.15.5
@@ -5,11 +5,11 @@ DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kjobwidgets-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwayland-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-plasma/breeze-5.15.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plasma-integration-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=923313a4486f980e31c0e09c9ebef2e0
+_md5_=331835a35da48020c7a4e0f9e5f6787a
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.15.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.15.5
index 7d767854baee..57be93e803ea 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.15.5
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.15.5
@@ -3,9 +3,9 @@ DESCRIPTION=Merge this to pull in all Plasma 5 packages
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=bluetooth +browser-integration consolekit crypt +desktop-portal discover +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.15.5:5 >=kde-plasma/drkonqi-5.15.5:5 >=kde-plasma/kactivitymanagerd-5.15.5:5 >=kde-plasma/kde-cli-tools-5.15.5:5 >=kde-plasma/kdecoration-5.15.5:5 >=kde-plasma/kdeplasma-addons-5.15.5:5 >=kde-plasma/kgamma-5.15.5:5 >=kde-plasma/khotkeys-5.15.5:5 >=kde-plasma/kinfocenter-5.15.5:5 >=kde-plasma/kmenuedit-5.15.5:5 >=kde-plasma/kscreen-5.15.5:5 >=kde-plasma/kscreenlocker-5.15.5:5 >=kde-plasma/ksshaskpass-5.15.5:5 >=kde-plasma/ksysguard-5.15.5:5 >=kde-plasma/kwayland-integration-5.15.5:5 >=kde-plasma/kwin-5.15.5:5 >=kde-plasma/kwrited-5.15.5:5 >=kde-plasma/libkscreen-5.15.5:5 >=kde-plasma/libksysguard-5.15.5:5 >=kde-plasma/milou-5.15.5:5 >=kde-plasma/oxygen-5.15.5:5 >=kde-plasma/plasma-desktop-5.15.5:5 >=kde-plasma/plasma-integration-5.15.5:5 >=kde-plasma/plasma-workspace-5.15.5:5 >=kde-plasma/polkit-kde-agent-5.15.5:5 >=kde-plasma/powerdevil-5.15.5:5 >=kde-plasma/systemsettings-5.15.5:5 >=kde-plasma/user-manager-5.15.5:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.15.5:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.15.5:5 ) consolekit? ( >=sys-auth/consolekit-1.0.1 pm-utils? ( sys-power/pm-utils ) ) crypt? ( >=kde-plasma/plasma-vault-5.15.5:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.15.5:5 ) discover? ( >=kde-plasma/discover-5.15.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.15.5:5 x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.15.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.15.5:5 >=kde-plasma/kde-gtk-config-5.15.5:5 ) handbook? ( kde-apps/khelpcenter:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.15.5:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.15.5:5 net-misc/networkmanager[consolekit?,elogind?,systemd?] ) pam? ( >=kde-plasma/kwallet-pam-5.15.5:5 sys-auth/pambase[consolekit?,elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.15.5:5 >=kde-plasma/plymouth-kcm-5.15.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.15.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.15.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.15.5:5 )
 REQUIRED_USE=?? ( consolekit elogind systemd )
 SLOT=5
-_md5_=290205f441da69e30fd453ea2e497112
+_md5_=d4f56bd9a83ad4ec9c7f17a1aef5c4ec
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.15.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.15.5
index 209f17683c25..05caddcc9d3e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.15.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kwallet-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/networkmanager-qt-5.57.0:5[teamd=] >=kde-frameworks/plasma-5.57.0:5 >=kde-frameworks/solid-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.57.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plasma-nm-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=eaacda4b5fa350546289e948a7fa29a8
+_md5_=065f69e52ac654cea1ca5314484fc86f
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.15.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.15.5
index b0dc3219f4b4..050401d57352 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.15.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma applet for audio volume management using PulseAudio
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/kglobalaccel-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/plasma-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kirigami-5.57.0:5 >=dev-qt/qtquickcontrols-5.11.1:5 media-libs/libcanberra x11-themes/sound-theme-freedesktop >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plasma-pa-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6d725423d2b33d04b7a2300d6564f290
+_md5_=ba7bab5dd77df921b046f8b0f57af8dc
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.15.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.15.5
index 045eed512665..e8eb6633b390 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.15.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Useful applications for Plasma development
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kpackage-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktexteditor-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/plasma-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kirigami-5.57.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plasma-sdk-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4bcb776ea508c950d0df4ceeaec6b0a5
+_md5_=13e01a2e1da108b9f69786b9dcd3f5af
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.15.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.15.5
index 5283aa7b4b4a..fa5112608e0c 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.15.5
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma applet and services for creating encrypted vaults
 EAPI=7
 HOMEPAGE=https://kde.org/ https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
 IUSE=networkmanager debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-3
 RDEPEND=>=kde-frameworks/kactivities-5.57.0:5 >=kde-frameworks/kcodecs-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/plasma-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-plasma/libksysguard-5.15.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.57.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plasma-vault-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2dbdd35bc30598b368af8fd19aeecf1e
+_md5_=324f18e6f8e90176a22aab6c1292875f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.15.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.15.5
index d7ef7986ee53..020baca3117a 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.15.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.15.5
@@ -5,7 +5,7 @@ DESCRIPTION=KDE Plasma workspace
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.15.5:5
 RDEPEND=>=kde-frameworks/kactivities-5.57.0:5 >=kde-frameworks/kauth-5.57.0:5 >=kde-frameworks/kbookmarks-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/kded-5.57.0:5 >=kde-frameworks/kdelibs4support-5.57.0:5 >=kde-frameworks/kglobalaccel-5.57.0:5 >=kde-frameworks/kguiaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kidletime-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/kjobwidgets-5.57.0:5 >=kde-frameworks/kjs-5.57.0:5 >=kde-frameworks/kjsembed-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/knotifyconfig-5.57.0:5 >=kde-frameworks/kpackage-5.57.0:5 >=kde-frameworks/krunner-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/ktexteditor-5.57.0:5 >=kde-frameworks/ktextwidgets-5.57.0:5 >=kde-frameworks/kwallet-5.57.0:5 >=kde-frameworks/kwayland-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/plasma-5.57.0:5 >=kde-frameworks/solid-5.57.0:5 >=kde-plasma/kscreenlocker-5.15.5:5 >=kde-plasma/kwin-5.15.5:5 >=kde-plasma/libksysguard-5.15.5:5 >=kde-plasma/libkworkspace-5.15.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.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-frameworks/kholidays-5.57.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.57.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.57.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.57.0:5 ) >=kde-frameworks/kdesu-5.57.0:5 >=kde-frameworks/kirigami-5.57.0:5 >=kde-apps/kio-extras-18.12.3:5 >=kde-plasma/ksysguard-5.15.5:5 >=kde-plasma/milou-5.15.5:5 >=kde-plasma/plasma-integration-5.15.5:5 >=dev-qt/qdbus-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtpaths-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5[widgets] >=dev-qt/qtquickcontrols2-5.11.1:5 app-text/iso-codes x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.14.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8ab0fbf196283c4b561ca9b5627d2ff6
+_md5_=a60d2dfdd85cb2b0ee8a8df1004b8f84
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.15.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.15.5
index 8ebeb928089d..8629bf333936 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.15.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.15.5
@@ -4,9 +4,9 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-fi
 DESCRIPTION=Additional wallpapers for the Plasma workspace
 EAPI=7
 HOMEPAGE=https://kde.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plasma-workspace-wallpapers-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7260d9cc2a0b15d444f470c6fc25f8dc
+_md5_=267dd90b50f2538abe1ccbd82badb222
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.15.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.15.5
index c885c871ed4c..67f26db1d5d6 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.15.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma control module for Plymouth
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kauth-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plymouth-kcm-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7809bd56093f92920118ac4e200da2c1
+_md5_=0efb25140844a41b3e472f9cebc06817
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.15.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.15.5
index a3aa21e26589..6b2f19288504 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.15.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=PolKit agent module for KDE Plasma
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1: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.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/polkit-kde-agent-1-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0185818745be6deed406428025feeb01
+_md5_=7a6860ff12b7872667e26e0467de9eb6
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.15.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.15.5
index 2bec3904ee64..73187c437b8f 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.15.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/powerdevil.git
 IUSE=brightness-control +wireless debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.57.0:5 >=kde-frameworks/kauth-5.57.0:5[policykit] >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kglobalaccel-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kidletime-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/knotifyconfig-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kwayland-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-frameworks/solid-5.57.0:5 >=kde-plasma/libkscreen-5.15.5:5 >=kde-plasma/libkworkspace-5.15.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.57.0:5 >=kde-frameworks/networkmanager-qt-5.57.0:5 ) >=kde-plasma/kde-cli-tools-5.15.5:5 >=sys-power/upower-0.9.23 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/powerdevil-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e34a40b87690334de60118ab486169b0
+_md5_=ce8f2d64c588c0899c17ac5c43bfbb25
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.15.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.15.5
index 361f79ed8824..5090c924c262 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.15.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma control module for SDDM
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kauth-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.15.5:5 x11-misc/sddm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/sddm-kcm-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=112c499d2450a1096d5ac1cd33121621
+_md5_=514a606ff720a7871299a04c26a6d4f2
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.15.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.15.5
index cf393659ca93..ce1630e009bb 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.15.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=System settings utility
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=classic gtk debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.57.0:5 >=kde-frameworks/kactivities-stats-5.57.0:5 >=kde-frameworks/kauth-5.57.0:5 >=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/kpackage-5.57.0:5 >=kde-frameworks/kservice-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-plasma/libkworkspace-5.15.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.57.0:5 ) >=kde-frameworks/kirigami-5.57.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.15.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/systemsettings-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5fdaf92d3c8edf4abaeeaef6aeab30ef
+_md5_=f8d1da0a281a781e6c9bd79ef24313a7
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.15.5 b/metadata/md5-cache/kde-plasma/user-manager-5.15.5
index 7c4069b34f4c..7c8c26a4fafa 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.15.5
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Simple system settings module to manage the users of your system
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.57.0:5 >=kde-frameworks/kcmutils-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/user-manager-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d2a32b88d6d1cd503de145f265bd08fa
+_md5_=af4cabf35f35a225f2b95e4b5122184c
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.15.5 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.15.5
deleted file mode 100644
index 9147533d2aa2..000000000000
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.15.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.57.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5[cups] >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kwayland-5.57.0:5 >=dev-qt/qtconcurrent-5.11.1:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils
-DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5[cups] >=dev-qt/qtwidgets-5.11.1:5 sys-apps/xdg-desktop-portal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.15.5/xdg-desktop-portal-kde-5.15.5.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=11277118af62926872d9e268b1898b4c
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.15.5-r1 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.15.5-r1
index 9628b849266e..3dcfee128fc3 100644
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.15.5-r1
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.15.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE F
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5[cups] >=dev-qt/qtwidgets-5.11.1:5 sys-apps/xdg-desktop-portal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/xdg-desktop-portal-kde-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ec430aac10c08257b622793390fe852b
+_md5_=3d0a29d017222d09a6d1602ae44f0fce
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.15.5 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.15.5
index 7ac80b45cad7..1f53cbbbdbaa 100644
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.15.5
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.15.5
@@ -5,10 +5,10 @@ DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/extra-cmake-modules-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=81bc1e5d04fa2906e47bc82088637c67
+_md5_=b9178fd987d97abc249c9d64563d5a9a
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index 6e676d523a30..47234657923a 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/lxde-meta-0.5.5-r5 b/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r5
deleted file mode 100644
index 9ee306022f8f..000000000000
--- a/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Meta ebuild for LXDE, the Lightweight X11 Desktop Environment
-EAPI=6
-HOMEPAGE=https://lxde.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ppc x86
-LICENSE=metapackage
-RDEPEND=>=lxde-base/menu-cache-0.3.3 >=lxde-base/lxappearance-0.5.5 >=lxde-base/lxde-icon-theme-0.5.0 >=lxde-base/lxde-common-0.5.5 >=lxde-base/lxmenu-data-0.1.4 >=lxde-base/lxinput-0.3.2 >=lxde-base/lxpanel-0.5.10 >=lxde-base/lxrandr-0.1.2 >=lxde-base/lxsession-0.5.2 || ( >=x11-libs/libfm-1.2.0 =lxde-base/lxshortcut-0.1* ) >=lxde-base/lxtask-0.1.6 >=lxde-base/lxterminal-0.1.11 media-gfx/gpicview x11-misc/pcmanfm x11-wm/openbox >=x11-misc/obconf-2.0.3_p20111019
-SLOT=0
-_md5_=93a9d69689353f3a16ba620290b79d67
diff --git a/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2 b/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2
index 9218bd22dc9c..bf54d2f15a94 100644
--- a/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2
+++ b/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2
@@ -5,11 +5,11 @@ DESCRIPTION=LXDE Display Manager
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXDM
 IUSE=consolekit debug elogind +gtk3 nls pam systemd
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~x86
 LICENSE=GPL-3
 RDEPEND=consolekit? ( sys-auth/consolekit ) x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) elogind? ( sys-auth/elogind[pam] ) systemd? ( sys-apps/systemd[pam] )
 REQUIRED_USE=?? ( consolekit elogind systemd ) elogind? ( pam ) systemd? ( pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxdm-0.5.3.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=7854828a59a9acc68450d573e13d250b
+_md5_=a21ef21fc63ee2de66eaadebee0975b5
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.5.4 b/metadata/md5-cache/lxde-base/lxsession-0.5.4
new file mode 100644
index 000000000000..0065daecf30a
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxsession-0.5.4
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/glib:2 dev-libs/dbus-glib dev-libs/libgee:0 dev-libs/libunique:1 lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=LXDE session manager
+EAPI=7
+HOMEPAGE=https://wiki.lxde.org/en/LXSession
+IUSE=nls upower
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/dbus-glib dev-libs/libgee:0 dev-libs/libunique:1 lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit sys-apps/lsb-release upower? ( sys-power/upower )
+SLOT=0
+SRC_URI=mirror://sourceforge/lxde/lxsession-0.5.4.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae
+_md5_=7aadedbe7ba12de1130a14dc77956c3a
diff --git a/metadata/md5-cache/lxde-base/lxtask-0.1.9 b/metadata/md5-cache/lxde-base/lxtask-0.1.9
new file mode 100644
index 000000000000..acbc65000f22
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxtask-0.1.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0
+DESCRIPTION=LXDE Task manager
+EAPI=7
+HOMEPAGE=https://wiki.lxde.org/en/LXTask
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
+SLOT=0
+SRC_URI=mirror://sourceforge/lxde/lxtask-0.1.9.tar.xz
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b
+_md5_=59d37e982fc55240624fd81936035e2a
diff --git a/metadata/md5-cache/lxqt-base/Manifest.gz b/metadata/md5-cache/lxqt-base/Manifest.gz
index 3d85780ad92f..568c649240f0 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/liblxqt-0.14.1 b/metadata/md5-cache/lxqt-base/liblxqt-0.14.1
index 17d21e7b378e..b032b228b909 100644
--- a/metadata/md5-cache/lxqt-base/liblxqt-0.14.1
+++ b/metadata/md5-cache/lxqt-base/liblxqt-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=Common base library for the LXQt desktop environment
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+ BSD
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] sys-auth/polkit-qt x11-libs/libX11 x11-libs/libXScrnSaver !lxqt-base/lxqt-l10n
 SLOT=0/0.14
 SRC_URI=https://downloads.lxqt.org/downloads/liblxqt/0.14.1/liblxqt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=46acd66d3ce36d6b52b42609f6309c9b
+_md5_=36720386cb8684bbb74a2a39b354e51d
diff --git a/metadata/md5-cache/lxqt-base/libsysstat-0.4.2 b/metadata/md5-cache/lxqt-base/libsysstat-0.4.2
index 33654de21b78..a9c0de9f85e4 100644
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.4.2
+++ b/metadata/md5-cache/lxqt-base/libsysstat-0.4.2
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5
 DESCRIPTION=A Qt-based interface to system statistics
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/libsysstat/0.4.2/libsysstat-0.4.2.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7e49546974c347cebba11f574489a9d1
+_md5_=cb56ebafe1dc343c1b3f0ec5540c35a4
diff --git a/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1
index 2e4e25d6f21a..fd11e14ad355 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets
 DESCRIPTION=LXQt about dialog
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-about/0.14.1/lxqt-about-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d2b5d5e4ca5302254388350d28af1cf3
+_md5_=554b2361dbd5415a2d6f2ec7f59a5afa
diff --git a/metadata/md5-cache/lxqt-base/lxqt-admin-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-admin-0.14.1
index 56a00d2191b1..22d15cd6302f 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-admin-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-admin-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-b
 DESCRIPTION=LXQt system administration tool
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* kde-frameworks/kwindowsystem:5 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-admin/0.14.1/lxqt-admin-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b81a942c982349cb8ef4dd2eccd88c28
+_md5_=a366ad0d1cc5a6896b2cb1525b5af45a
diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1
index 5ecaf3fef66f..3caf52927d20 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=LXQt system configuration control center
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+monitor +touchpad
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.14* sys-libs/zlib:= x11-apps/setxkbmap x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes monitor? ( kde-plasma/libkscreen:5= ) touchpad? ( virtual/libudev x11-drivers/xf86-input-libinput x11-libs/libXext ) !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-config/0.14.1/lxqt-config-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a431482fa455dfc22f764a28d20d71ee
+_md5_=5634fd0efb7b458265a8c600c9ad391f
diff --git a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1
index 2f4c54851597..b132eb9b7c3d 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=Daemon and library for global keyboard shortcuts registration
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 =lxqt-base/liblxqt-0.14* kde-frameworks/kwindowsystem:5 x11-libs/libX11 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-globalkeys/0.14.1/lxqt-globalkeys-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=339cf11a6469dd733b1c2b53560e73d2
+_md5_=f6887b235cc5441cc495f3cd3687eb0a
diff --git a/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1 b/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1
index 6c2729af1a32..699d2474adbb 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1
+++ b/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Meta ebuild for LXQt, the Lightweight Desktop Environment
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+about admin +filemanager lightdm lximage minimal nls +policykit powermanagement processviewer screenshot sddm ssh-askpass sudo terminal +trash
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=metapackage
 RDEPEND=kde-frameworks/oxygen-icons >=lxde-base/lxmenu-data-0.1.5 =lxqt-base/lxqt-config-0.14* =lxqt-base/lxqt-globalkeys-0.14* =lxqt-base/lxqt-notificationd-0.14* =lxqt-base/lxqt-panel-0.14* =lxqt-base/lxqt-qtplugin-0.14* =lxqt-base/lxqt-runner-0.14* =lxqt-base/lxqt-session-0.14* virtual/ttf-fonts =x11-themes/lxqt-themes-0.14* about? ( =lxqt-base/lxqt-about-0.14* ) admin? ( =lxqt-base/lxqt-admin-0.14* ) filemanager? ( =x11-misc/pcmanfm-qt-0.14* ) lightdm? ( x11-misc/lightdm ) lximage? ( media-gfx/lximage-qt ) !minimal? ( x11-wm/openbox x11-misc/obconf-qt ) nls? ( dev-qt/qttranslations:5 ) policykit? ( =lxqt-base/lxqt-policykit-0.14* ) powermanagement? ( =lxqt-base/lxqt-powermanagement-0.14* ) processviewer? ( x11-misc/qps:0 ) screenshot? ( x11-misc/screengrab:0 ) sddm? ( >=x11-misc/sddm-0.11.0 ) ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-0.14* ) sudo? ( =lxqt-base/lxqt-sudo-0.14* ) terminal? ( x11-terms/qterminal:0 ) trash? ( gnome-base/gvfs )
 REQUIRED_USE=trash? ( filemanager )
 SLOT=0
-_md5_=32b1c7f105b07a104a531aa6b9763662
+_md5_=5f9bac28b697bd8a9ed4132437d751f1
diff --git a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1
index ce27624727fb..5ec8758149bc 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt notification daemon and library
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-notificationd/0.14.1/lxqt-notificationd-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f626dfa7675f7fbc88f1a4a39d82136a
+_md5_=a654b03139a0dfe48b4cc4b33d0c1097
diff --git a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1
index babc397f12ca..b4cc9a180e1c 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14*
 DESCRIPTION=LXQt OpenSSH user password prompt tool
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-openssh-askpass/0.14.1/lxqt-openssh-askpass-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=94dd561585859425d74cfceb56c3c97c
+_md5_=f588f2c485e31c17ced7a3d04ef9e7ac
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1
index f6a9650cb9da..938d5caa462f 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1
@@ -5,11 +5,11 @@ DESCRIPTION=LXQt desktop panel and plugins
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop +spacer statusnotifier sysstat +taskbar +tray +volume +worldclock
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/menu-cache-1.1.0 =lxqt-base/liblxqt-0.14* =lxqt-base/lxqt-globalkeys-0.14* x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) tray? ( x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/xcb-util ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pavucontrol-qt media-sound/pulseaudio ) ) !lxqt-base/lxqt-l10n
 REQUIRED_USE=|| ( desktopswitch mainmenu showdesktop taskbar ) volume? ( || ( alsa pulseaudio ) )
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-panel/0.14.1/lxqt-panel-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a828a390813f4510dae0d6eccc5436d6
+_md5_=b2f6f20b7f2a4fe3a48e601384cfb38e
diff --git a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1
index 0fb83b5f220d..aa4c4c461de3 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt PolKit authentication agent
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* sys-auth/polkit-qt[qt5(+)] !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-policykit/0.14.1/lxqt-policykit-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=399eca2fa6439f2691ab8435846cd6f5
+_md5_=c6f48d1316d1fc0e5982f0cd67e25efa
diff --git a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.14.1
index 3cd5f82ba016..b4afe5a4f79c 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt daemon for power management and auto-suspend
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kidletime:5 kde-frameworks/solid:5 =lxqt-base/liblxqt-0.14* sys-power/upower !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-powermanagement/0.14.1/lxqt-powermanagement-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9849743a55c773a0ee1ba357800d29b6
+_md5_=5dcb760b2e6a3349817cc90a1d91c3ea
diff --git a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0 b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0
index e8a1d3c1d120..8d789613fcc2 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore
 DESCRIPTION=LXQt system integration plugin for Qt
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.14*
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-qtplugin/0.14.0/lxqt-qtplugin-0.14.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ea668b1243214576cf0592750b9231d4
+_md5_=d8b385cd76bf7fcc764fc2f6d43d0a3b
diff --git a/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1
index 5ddc0865ee67..1094f35f1341 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-
 DESCRIPTION=LXQt quick launcher
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 >=lxde-base/menu-cache-0.5.1 =lxqt-base/liblxqt-0.14* =lxqt-base/lxqt-globalkeys-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-runner/0.14.1/lxqt-runner-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cda773fbc9c403aab875169f326790c3
+_md5_=88418133c567dcbc7103281bc15d19c0
diff --git a/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1
index ad00f40b4f42..8c205b6f56c4 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=LXQT session manager
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+themes +udev
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5[X] =lxqt-base/liblxqt-0.14* x11-libs/libX11 x11-misc/xdg-user-dirs themes? ( =x11-themes/lxqt-themes-0.14* ) udev? ( virtual/libudev ) !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-session/0.14.1/lxqt-session-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1c6d7f3b135cec108a3fc816e33967cd
+_md5_=21716734026e00591bf53cb3304f6dd7
diff --git a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.14.1
index 09251f7e86fa..044f6aba5b10 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.14.1
@@ -4,10 +4,10 @@ DEPEND=app-admin/sudo >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtwidgets
 DESCRIPTION=LXQt GUI frontend for sudo
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-admin/sudo >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-sudo/0.14.1/lxqt-sudo-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f2401bc4496bba31db173824d27d24b7
+_md5_=33fba69e9060b18cd5568be18bffecd1
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 1c4119f2f058..b1ed7e044a27 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/geary-3.32.0-r1 b/metadata/md5-cache/mail-client/geary-3.32.0-r1
index 752d521946e4..6afe8aef2b12 100644
--- a/metadata/md5-cache/mail-client/geary-3.32.0-r1
+++ b/metadata/md5-cache/mail-client/geary-3.32.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.54:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=net-libs/webkit-gtk-2.20:4=[introspection] app-text/iso-codes >=dev-db/sqlite-3.12:3 >=net-libs/libsoup-2.48:2.4[introspection] net-libs/gnome-online-accounts >=dev-libs/libgee-0.8.5:0.8=[introspection] >=x11-libs/libnotify-0.7.5[introspection] >=media-libs/libcanberra-0.28 >=dev-libs/gmime-2.6.17:2.6 >=app-crypt/libsecret-0.11[introspection,vala] >=dev-libs/libxml2-2.7.8:2 >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] app-text/enchant >=dev-libs/folks-0.11:0 dev-libs/json-glib unwind? ( >=sys-libs/libunwind-1.1:7 ) gnome-base/dconf gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/geary/3.32/geary-3.32.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=87346cb37700268a260cd617c0186c6f
diff --git a/metadata/md5-cache/mail-client/mutt-1.12.0 b/metadata/md5-cache/mail-client/mutt-1.12.0
new file mode 100644
index 000000000000..050126be64ad
--- /dev/null
+++ b/metadata/md5-cache/mail-client/mutt-1.12.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=http://www.mutt.org/
+IUSE=berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
+REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
+SLOT=0
+SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.12.0.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.12.0.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.12.0-patches-r0.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0aa4b3b027d1eb8c8f3c9d7af5214fb2
diff --git a/metadata/md5-cache/mail-client/thunderbird-60.6.1 b/metadata/md5-cache/mail-client/thunderbird-60.6.1
index 2fc79b1823c6..3c170151cd41 100644
--- a/metadata/md5-cache/mail-client/thunderbird-60.6.1
+++ b/metadata/md5-cache/mail-client/thunderbird-60.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=wifi? ( dbus )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/ar.xpi -> thunderbird-60.6.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/ast.xpi -> thunderbird-60.6.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/be.xpi -> thunderbird-60.6.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/bg.xpi -> thunderbird-60.6.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/br.xpi -> thunderbird-60.6.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/ca.xpi -> thunderbird-60.6.1-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/cs.xpi -> thunderbird-60.6.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/cy.xpi -> thunderbird-60.6.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/da.xpi -> thunderbird-60.6.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/de.xpi -> thunderbird-60.6.1-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/el.xpi -> thunderbird-60.6.1-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/en-GB.xpi -> thunderbird-60.6.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/es-AR.xpi -> thunderbird-60.6.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/es-ES.xpi -> thunderbird-60.6.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/et.xpi -> thunderbird-60.6.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/eu.xpi -> thunderbird-60.6.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/fi.xpi -> thunderbird-60.6.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/fr.xpi -> thunderbird-60.6.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.6.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.6.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/gd.xpi -> thunderbird-60.6.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/gl.xpi -> thunderbird-60.6.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/he.xpi -> thunderbird-60.6.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/hr.xpi -> thunderbird-60.6.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/hsb.xpi -> thunderbird-60.6.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/hu.xpi -> thunderbird-60.6.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.6.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/id.xpi -> thunderbird-60.6.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/is.xpi -> thunderbird-60.6.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/it.xpi -> thunderbird-60.6.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/ja.xpi -> thunderbird-60.6.1-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/ko.xpi -> thunderbird-60.6.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/lt.xpi -> thunderbird-60.6.1-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.6.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/nl.xpi -> thunderbird-60.6.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.6.1-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/pl.xpi -> thunderbird-60.6.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.6.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.6.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/rm.xpi -> thunderbird-60.6.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/ro.xpi -> thunderbird-60.6.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/ru.xpi -> thunderbird-60.6.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/si.xpi -> thunderbird-60.6.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/sk.xpi -> thunderbird-60.6.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/sl.xpi -> thunderbird-60.6.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/sq.xpi -> thunderbird-60.6.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/sr.xpi -> thunderbird-60.6.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.6.1-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/tr.xpi -> thunderbird-60.6.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/uk.xpi -> thunderbird-60.6.1-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/vi.xpi -> thunderbird-60.6.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.6.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.6.1-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.6.1/source/thunderbird-60.6.1.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-06.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-06.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-06.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-06.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	de4a7cb850530155c3333776cdbe9308	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	50181e8c428d5e8bd3a2883c4a0bbb67	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=a3431d22c1d6294d879c4ee02e9b519a
diff --git a/metadata/md5-cache/mail-client/thunderbird-60.7.0 b/metadata/md5-cache/mail-client/thunderbird-60.7.0
index 51fd2e253a26..4226d8da9b30 100644
--- a/metadata/md5-cache/mail-client/thunderbird-60.7.0
+++ b/metadata/md5-cache/mail-client/thunderbird-60.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=wifi? ( dbus )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/ar.xpi -> thunderbird-60.7.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/ast.xpi -> thunderbird-60.7.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/be.xpi -> thunderbird-60.7.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/bg.xpi -> thunderbird-60.7.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/br.xpi -> thunderbird-60.7.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/ca.xpi -> thunderbird-60.7.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/cs.xpi -> thunderbird-60.7.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/cy.xpi -> thunderbird-60.7.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/da.xpi -> thunderbird-60.7.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/de.xpi -> thunderbird-60.7.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/el.xpi -> thunderbird-60.7.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/en-GB.xpi -> thunderbird-60.7.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/es-AR.xpi -> thunderbird-60.7.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/es-ES.xpi -> thunderbird-60.7.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/et.xpi -> thunderbird-60.7.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/eu.xpi -> thunderbird-60.7.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/fi.xpi -> thunderbird-60.7.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/fr.xpi -> thunderbird-60.7.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.7.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.7.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/gd.xpi -> thunderbird-60.7.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/gl.xpi -> thunderbird-60.7.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/he.xpi -> thunderbird-60.7.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/hr.xpi -> thunderbird-60.7.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/hsb.xpi -> thunderbird-60.7.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/hu.xpi -> thunderbird-60.7.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.7.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/id.xpi -> thunderbird-60.7.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/is.xpi -> thunderbird-60.7.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/it.xpi -> thunderbird-60.7.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/ja.xpi -> thunderbird-60.7.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/ko.xpi -> thunderbird-60.7.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/lt.xpi -> thunderbird-60.7.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.7.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/nl.xpi -> thunderbird-60.7.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.7.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/pl.xpi -> thunderbird-60.7.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.7.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.7.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/rm.xpi -> thunderbird-60.7.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/ro.xpi -> thunderbird-60.7.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/ru.xpi -> thunderbird-60.7.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/si.xpi -> thunderbird-60.7.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/sk.xpi -> thunderbird-60.7.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/sl.xpi -> thunderbird-60.7.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/sq.xpi -> thunderbird-60.7.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/sr.xpi -> thunderbird-60.7.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.7.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/tr.xpi -> thunderbird-60.7.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/uk.xpi -> thunderbird-60.7.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/vi.xpi -> thunderbird-60.7.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.7.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.7.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.7.0/source/thunderbird-60.7.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	de4a7cb850530155c3333776cdbe9308	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	50181e8c428d5e8bd3a2883c4a0bbb67	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=20df7e4fa9c1e65c87705f6bb09cbd1f
diff --git a/metadata/md5-cache/mail-client/trojita-9999 b/metadata/md5-cache/mail-client/trojita-9999
index 2bed0d4add09..da0af4e5f33e 100644
--- a/metadata/md5-cache/mail-client/trojita-9999
+++ b/metadata/md5-cache/mail-client/trojita-9999
@@ -1,13 +1,13 @@
 BDEPEND=dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) zlib? ( virtual/pkgconfig ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 addressbook? ( kde-apps/akonadi-contacts:5 ) crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) spell? ( kde-frameworks/sonnet:5 ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A Qt IMAP e-mail client
 EAPI=7
 HOMEPAGE=http://trojita.flaska.net/
-IUSE=+crypt +dbus debug +password test +zlib test
+IUSE=addressbook +crypt +dbus debug +password +spell test +zlib test
 LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) zlib? ( sys-libs/zlib )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 addressbook? ( kde-apps/akonadi-contacts:5 ) crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) spell? ( kde-frameworks/sonnet:5 ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=password? ( dbus )
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ffd7501103251bfe4dbcbaed9bb908ae
+_md5_=cd7b6ee57d97cdb47506386b156ffa48
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 54a73fbc5991..f7901c66f73c 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/spamass-milter-0.3.2 b/metadata/md5-cache/mail-filter/spamass-milter-0.3.2
deleted file mode 100644
index 9a35d90d9ae7..000000000000
--- a/metadata/md5-cache/mail-filter/spamass-milter-0.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) >=mail-filter/spamassassin-3.1.0
-DESCRIPTION=A milter for SpamAssassin
-EAPI=4
-HOMEPAGE=https://savannah.nongnu.org/projects/spamass-milt/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) >=mail-filter/spamassassin-3.1.0
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/spamass-milt/spamass-milter-0.3.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d38fec1f9016f7602193653bc103c56
diff --git a/metadata/md5-cache/mail-filter/zdkimfilter-1.1 b/metadata/md5-cache/mail-filter/zdkimfilter-1.1
deleted file mode 100644
index 2fe2ab251d76..000000000000
--- a/metadata/md5-cache/mail-filter/zdkimfilter-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=mail-filter/opendkim-2.2.0 mail-mta/courier opendbx? ( >=dev-db/opendbx-1.4.0 ) dev-libs/nettle
-DESCRIPTION=DKIM filter for Courier-MTA
-EAPI=5
-HOMEPAGE=http://www.tana.it/sw/zdkimfilter
-IUSE=debug opendbx
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=mail-filter/opendkim-2.2.0 mail-mta/courier opendbx? ( >=dev-db/opendbx-1.4.0 ) dev-libs/nettle
-SLOT=0
-SRC_URI=http://www.tana.it/sw/zdkimfilter/zdkimfilter-1.1.tar.gz
-_md5_=9d833a46f237469dc94457f0e585bcd0
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index c0d8047df638..4ba671ed0f25 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/courier-0.75.0 b/metadata/md5-cache/mail-mta/courier-0.75.0
deleted file mode 100644
index 60f7839d86e6..000000000000
--- a/metadata/md5-cache/mail-mta/courier-0.75.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=>=net-libs/courier-authlib-0.66.3 >=net-libs/courier-unicode-1.3 !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:= ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
-DESCRIPTION=An MTA designed specifically for maildirs
-EAPI=5
-HOMEPAGE=http://www.courier-mta.org/
-IUSE=postgres ldap mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc s390 sparc x86
-LICENSE=GPL-2
-PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
-RDEPEND=>=net-libs/courier-authlib-0.66.3 >=net-libs/courier-unicode-1.3 !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:= ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/courier-0.75.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dbabda3861151319e3a7e3aab842eb89
diff --git a/metadata/md5-cache/mail-mta/courier-0.75.0-r1 b/metadata/md5-cache/mail-mta/courier-0.75.0-r1
deleted file mode 100644
index 2991fe16f02d..000000000000
--- a/metadata/md5-cache/mail-mta/courier-0.75.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=>=net-libs/courier-authlib-0.66.3 >=net-libs/courier-unicode-1.3 gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
-DESCRIPTION=An MTA designed specifically for maildirs
-EAPI=5
-HOMEPAGE=http://www.courier-mta.org/
-IUSE=postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86
-LICENSE=GPL-2
-PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
-RDEPEND=>=net-libs/courier-authlib-0.66.3 >=net-libs/courier-unicode-1.3 gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/courier-0.75.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eca32443b06e2b3c2a2fd4c65f6d6451
diff --git a/metadata/md5-cache/mail-mta/courier-0.76.4 b/metadata/md5-cache/mail-mta/courier-0.76.4
deleted file mode 100644
index 2bd7a816dac8..000000000000
--- a/metadata/md5-cache/mail-mta/courier-0.76.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=>=net-libs/courier-authlib-0.66.3 >=net-libs/courier-unicode-1.4 gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
-DESCRIPTION=An MTA designed specifically for maildirs
-EAPI=5
-HOMEPAGE=http://www.courier-mta.org/
-IUSE=postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
-RDEPEND=>=net-libs/courier-authlib-0.66.3 >=net-libs/courier-unicode-1.4 gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/courier-0.76.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a6a9b807f8b7e8352c7d7895010af183
diff --git a/metadata/md5-cache/mail-mta/courier-0.78.2 b/metadata/md5-cache/mail-mta/courier-0.78.2
deleted file mode 100644
index a0fd34d846e4..000000000000
--- a/metadata/md5-cache/mail-mta/courier-0.78.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=>=net-libs/courier-authlib-0.68.0 >=net-libs/courier-unicode-2.0 gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
-DESCRIPTION=An MTA designed specifically for maildirs
-EAPI=6
-HOMEPAGE=http://www.courier-mta.org/
-IUSE=postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
-RDEPEND=>=net-libs/courier-authlib-0.68.0 >=net-libs/courier-unicode-2.0 gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/courier-0.78.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd33d6e92d9a260ccd0b0bf703d196b8
diff --git a/metadata/md5-cache/mail-mta/postfix-3.3.4 b/metadata/md5-cache/mail-mta/postfix-3.3.4
index 769b7ef9e6bf..4d758aed27fb 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.3.4
+++ b/metadata/md5-cache/mail-mta/postfix-3.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.postfix.org/
 IUSE=+berkdb cdb 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=|| ( IBM EPL-2.0 )
 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? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) 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 ) ) 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/official/postfix-3.3.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=57b08c73bfd195680dc8fee5238f5dcb
+_md5_=e82ff3a9ef1214c6be2f99eff9bb3c7d
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.5 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.5
new file mode 100644
index 000000000000..68e5df822b01
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
+EAPI=7
+HOMEPAGE=https://protonmail.com/bridge/
+KEYWORDS=~amd64
+LICENSE=MIT protonmail-bridge-EULA
+RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio[glib] sys-apps/dbus virtual/opengl media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://protonmail.com/download/protonmail-bridge-1.1.5-1.x86_64.rpm
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_md5_=e9986f7a6cdcf1a04d86b96c04f2aa41
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index cbd2a8db5675..433ff5f600ae 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/cantarell-0.101 b/metadata/md5-cache/media-fonts/cantarell-0.101
index 4d44312460c8..4569cb5d74ab 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.101
+++ b/metadata/md5-cache/media-fonts/cantarell-0.101
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.101/cantarell-fonts-0.101.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3e16bdff3ec29f3191d046928c130768
diff --git a/metadata/md5-cache/media-fonts/cantarell-0.111 b/metadata/md5-cache/media-fonts/cantarell-0.111
index 3bbaa275fd8c..07cb93f23d14 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.111
+++ b/metadata/md5-cache/media-fonts/cantarell-0.111
@@ -4,11 +4,11 @@ DESCRIPTION=Default fontset for GNOME Shell
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
 IUSE=X
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=OFL-1.1
 RDEPEND=media-libs/fontconfig
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.111/cantarell-fonts-0.111.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2debe01c2768c00ea2ed6b1e585dc15c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=28f819288c24748de4a8eb80dcc71b97
diff --git a/metadata/md5-cache/media-fonts/noto-20181024 b/metadata/md5-cache/media-fonts/noto-20181024
index 8220d36ff2a7..78ed3d2fa93f 100644
--- a/metadata/md5-cache/media-fonts/noto-20181024
+++ b/metadata/md5-cache/media-fonts/noto-20181024
@@ -4,11 +4,11 @@ DESCRIPTION=Google's font family that aims to support all the world's languages
 EAPI=6
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts
 IUSE=cjk X
-KEYWORDS=alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86
 LICENSE=OFL-1.1
 RDEPEND=cjk? ( media-fonts/noto-cjk )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-fonts/archive/d7af81e614086435102cca95961b141b3530a027.tar.gz -> noto-20181024.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1351729a054122a2fa621b9b56b7ff24
+_md5_=0fa32e2d002df1a628b8e257a9c86f83
diff --git a/metadata/md5-cache/media-fonts/noto-20190524 b/metadata/md5-cache/media-fonts/noto-20190524
new file mode 100644
index 000000000000..fe023b77ed82
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/noto-20190524
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
+DESCRIPTION=Google's font family that aims to support all the world's languages
+EAPI=6
+HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts
+IUSE=cjk +extra X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=OFL-1.1
+RDEPEND=cjk? ( media-fonts/noto-cjk )
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/googlei18n/noto-fonts/archive/34e98229863e627d0f841e124a8657d5d0348b04.tar.gz -> noto-20190524.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=50a1a3ce85a601c203c250c9624f5305
diff --git a/metadata/md5-cache/media-fonts/noto-cjk-20170602 b/metadata/md5-cache/media-fonts/noto-cjk-20170602
index 99928e13efdc..c3f7cede0dc1 100644
--- a/metadata/md5-cache/media-fonts/noto-cjk-20170602
+++ b/metadata/md5-cache/media-fonts/noto-cjk-20170602
@@ -4,10 +4,10 @@ DESCRIPTION=Google's CJK font family
 EAPI=6
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk
 IUSE=X
-KEYWORDS=alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-cjk/archive/32a5844539f2e348ed36b44e990f9b06d7fb89fe.tar.gz -> noto-cjk-20170602.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c1cba0aade2c7752584c716756f460f
+_md5_=d8f4b9ebf2767cab3eb7fc49543e8cbd
diff --git a/metadata/md5-cache/media-fonts/noto-cjk-20190416 b/metadata/md5-cache/media-fonts/noto-cjk-20190416
new file mode 100644
index 000000000000..24887f660f96
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/noto-cjk-20190416
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
+DESCRIPTION=Google's CJK font family
+EAPI=6
+HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=OFL-1.1
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/googlei18n/noto-cjk/archive/be6c059ac1587e556e2412b27f5155c8eb3ddbe6.tar.gz -> noto-cjk-20190416.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5a34f5d57eeb180b81624c7bd6bae013
diff --git a/metadata/md5-cache/media-fonts/noto-emoji-20190328 b/metadata/md5-cache/media-fonts/noto-emoji-20190328
new file mode 100644
index 000000000000..d9a6087caff3
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/noto-emoji-20190328
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zopfli dev-python/fonttools dev-python/nototools media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
+DESCRIPTION=Google Noto Emoji fonts
+EAPI=6
+HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-emoji
+IUSE=X
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/googlei18n/noto-emoji/archive/e7490e1841094da518f4672398bdd74ee3c5fcac.tar.gz -> noto-emoji-20190328.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a9e619f4470ec34567a507e169b4697c
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index f643cdcb10b4..daee03bd8ee8 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/argyllcms-2.1.1 b/metadata/md5-cache/media-gfx/argyllcms-2.1.1
new file mode 100644
index 000000000000..43a2839af393
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/argyllcms-2.1.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst
+DEPEND=dev-libs/openssl:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver app-arch/unzip dev-util/ftjam
+DESCRIPTION=Open source, ICC compatible color management system
+EAPI=7
+HOMEPAGE=http://www.argyllcms.com/
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 hppa ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-libs/openssl:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver
+SLOT=0
+SRC_URI=http://www.argyllcms.com/Argyll_V2.1.1_src.zip
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=745712af50e9dba37b118ddc4fb6a1c7
diff --git a/metadata/md5-cache/media-gfx/argyllcms-2.1.1-r1 b/metadata/md5-cache/media-gfx/argyllcms-2.1.1-r1
new file mode 100644
index 000000000000..76850ef4f7e1
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/argyllcms-2.1.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst
+DEPEND=media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) app-arch/unzip dev-util/ftjam
+DESCRIPTION=Open source, ICC compatible color management system
+EAPI=7
+HOMEPAGE=http://www.argyllcms.com/
+IUSE=doc libressl
+KEYWORDS=~amd64 ~arm64 ~hppa ~x86
+LICENSE=AGPL-3
+RDEPEND=media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=http://www.argyllcms.com/Argyll_V2.1.1_src.zip
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=ed77d80f94be66ebde0785e8757707e2
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.49 b/metadata/md5-cache/media-gfx/asymptote-2.49
new file mode 100644
index 000000000000..e4f27e7eff38
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/asymptote-2.49
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=A vector graphics language that provides a framework for technical drawing
+EAPI=6
+HOMEPAGE=http://asymptote.sourceforge.net/
+IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) offscreen? ( opengl ) doc? ( boehm-gc )
+SLOT=0
+SRC_URI=mirror://sourceforge/asymptote/asymptote-2.49.src.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	latex-package	17f13abe0de88340745e52e6b627aee7	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ee60cf3e725b5bacfad803f6126c932d
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.7.1.2 b/metadata/md5-cache/media-gfx/displaycal-3.7.1.2
deleted file mode 100644
index 3bc03bdd1281..000000000000
--- a/metadata/md5-cache/media-gfx/displaycal-3.7.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Display calibration and characterization powered by Argyll CMS
-EAPI=6
-HOMEPAGE=https://displaycal.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 >=dev-python/numpy-1.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.7.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=224d9c8c09c9ab5b793ff33b1b2b68cb
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.7.1.3 b/metadata/md5-cache/media-gfx/displaycal-3.7.1.3
deleted file mode 100644
index bfc38b750714..000000000000
--- a/metadata/md5-cache/media-gfx/displaycal-3.7.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Display calibration and characterization powered by Argyll CMS
-EAPI=6
-HOMEPAGE=https://displaycal.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 >=dev-python/numpy-1.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.7.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=224d9c8c09c9ab5b793ff33b1b2b68cb
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.7.1.4 b/metadata/md5-cache/media-gfx/displaycal-3.7.1.4
deleted file mode 100644
index c07808ee5895..000000000000
--- a/metadata/md5-cache/media-gfx/displaycal-3.7.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Display calibration and characterization powered by Argyll CMS
-EAPI=6
-HOMEPAGE=https://displaycal.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 >=dev-python/numpy-1.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.7.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=db12da52ed673c6a1b29ae2b1b7dfcb7
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.7.2.0 b/metadata/md5-cache/media-gfx/displaycal-3.7.2.0
deleted file mode 100644
index 0eca43081169..000000000000
--- a/metadata/md5-cache/media-gfx/displaycal-3.7.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Display calibration and characterization powered by Argyll CMS
-EAPI=6
-HOMEPAGE=https://displaycal.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 >=dev-python/numpy-1.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.7.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=db12da52ed673c6a1b29ae2b1b7dfcb7
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.8.1.1 b/metadata/md5-cache/media-gfx/displaycal-3.8.1.1
new file mode 100644
index 000000000000..248e09eedea1
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/displaycal-3.8.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Display calibration and characterization powered by Argyll CMS
+EAPI=6
+HOMEPAGE=https://displaycal.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 dev-python/faulthandler[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.2.1[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://sourceforge/dispcalgui/DisplayCAL-3.8.1.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0021967a7c3455e3794fbea87254c0f2
diff --git a/metadata/md5-cache/media-gfx/eog-3.28.4 b/metadata/md5-cache/media-gfx/eog-3.28.4
index 0f19b9edb81d..4a421218b40e 100644
--- a/metadata/md5-cache/media-gfx/eog-3.28.4
+++ b/metadata/md5-cache/media-gfx/eog-3.28.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gn
 REQUIRED_USE=exif? ( jpeg )
 SLOT=1
 SRC_URI=mirror://gnome/sources/eog/3.28/eog-3.28.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=a8ffeca8ee7cd07e44ca5bb8d7d3fb1f
diff --git a/metadata/md5-cache/media-gfx/fbida-9999 b/metadata/md5-cache/media-gfx/fbida-9999
index 7fe51bac2bc5..9449b989bd14 100644
--- a/metadata/md5-cache/media-gfx/fbida-9999
+++ b/metadata/md5-cache/media-gfx/fbida-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 IJG
 RDEPEND=!media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 >=x11-libs/motif-2.3:0 app-text/poppler media-libs/giflib:= media-libs/libepoxy media-libs/libexif media-libs/libpng:* media-libs/libwebp media-libs/mesa media-libs/tiff:* net-misc/curl virtual/jpeg:* virtual/ttf-fonts x11-libs/cairo[opengl] x11-libs/libX11 x11-libs/libXpm x11-libs/libXt x11-libs/libdrm
 SLOT=0
 SRC_URI=mirror://gentoo/ida.png.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=b53bcc901e68d864acec51ba29245d2a
diff --git a/metadata/md5-cache/media-gfx/frogr-1.5 b/metadata/md5-cache/media-gfx/frogr-1.5
index 985dadaf282f..5f7303de5d41 100644
--- a/metadata/md5-cache/media-gfx/frogr-1.5
+++ b/metadata/md5-cache/media-gfx/frogr-1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2 >=x11-libs/gtk+-3.16:3[introspection] >=media-libs/libexif-0.6.14 >=dev-libs/libxml2-2.6.8:2 media-libs/gstreamer:1.0 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libgcrypt-1.5:*
 SLOT=0
 SRC_URI=mirror://gnome/sources/frogr/1.5/frogr-1.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=d0869a70de2179570154ac2a5b5388a7
diff --git a/metadata/md5-cache/media-gfx/gnome-font-viewer-3.30.0 b/metadata/md5-cache/media-gfx/gnome-font-viewer-3.30.0
index 2d424729f408..e9627d4a87bb 100644
--- a/metadata/md5-cache/media-gfx/gnome-font-viewer-3.30.0
+++ b/metadata/md5-cache/media-gfx/gnome-font-viewer-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gtk+-3.20:3 >=media-libs/harfbuzz-0.9.9 media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:3=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-font-viewer/3.30/gnome-font-viewer-3.30.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=1a87866dcd412fc8f8b50b8c51cfc3f8
diff --git a/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0 b/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
index fa0aaebcd096..2834c76810c7 100644
--- a/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
+++ b/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=dev-libs/glib-2.35.1:2[dbus] >=x11-libs/gtk+-3.0.3:3 >=media-libs/libcanberra-0.26-r2[gtk3] >=gnome-base/gsettings-desktop-schemas-0.1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-screenshot/3.30/gnome-screenshot-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=6f9dd9304784eba271f71d5dc9c7db2e
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.13 b/metadata/md5-cache/media-gfx/graphite2-1.3.13
index fff1cd95e312..a538bbb0be29 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.13
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.13
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing rendering capabilities for complex non-Roman writi
 EAPI=6
 HOMEPAGE=https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home
 IUSE=perl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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=perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.3.13.tgz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3c1f825ce9f6aa8b2da691cdf84235b6
+_md5_=457a6ae4518a48473b198fdea99fcac5
diff --git a/metadata/md5-cache/media-gfx/hugin-2018.0.0 b/metadata/md5-cache/media-gfx/hugin-2018.0.0
deleted file mode 100644
index 0149efa41d7d..000000000000
--- a/metadata/md5-cache/media-gfx/hugin-2018.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=GUI for the creation & processing of panoramic images
-EAPI=6
-HOMEPAGE=http://hugin.sf.net
-IUSE=debug lapack python sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW 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
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
-RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/hugin/hugin-2018.0.0.tar.bz2
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6e10e29380ed8a440ac768e7e1ca6734
diff --git a/metadata/md5-cache/media-gfx/hugin-2019.0.0 b/metadata/md5-cache/media-gfx/hugin-2019.0.0
index 2d6f131756e1..033b39cfd094 100644
--- a/metadata/md5-cache/media-gfx/hugin-2019.0.0
+++ b/metadata/md5-cache/media-gfx/hugin-2019.0.0
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GUI for the creation & processing of panoramic images
 EAPI=6
 HOMEPAGE=http://hugin.sf.net
@@ -10,5 +10,5 @@ RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=med
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2019.0.0.tar.bz2
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=326e60a8600e66aff2cc984535e6eb68
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=33778395e9c4fe51857ffa7797fee84b
diff --git a/metadata/md5-cache/media-gfx/hugin-9999 b/metadata/md5-cache/media-gfx/hugin-9999
index d74aeea27440..99bcc36fec83 100644
--- a/metadata/md5-cache/media-gfx/hugin-9999
+++ b/metadata/md5-cache/media-gfx/hugin-9999
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-vcs/mercurial sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-vcs/mercurial sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GUI for the creation & processing of panoramic images
 EAPI=6
 HOMEPAGE=http://hugin.sf.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
 RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=92a414f5acec499110d94b5d2a956f75
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=90e4b87d587e22cf6da400e1b435efeb
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.42 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.42
deleted file mode 100644
index cc9d59ce641c..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.42
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.10.42
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-42.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51a4a1a3e2fce5893c80324c63f9bf47
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.45 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.45
deleted file mode 100644
index 9f41758a7a74..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.45
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.10.45
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-45.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5aaef979695a86c97543d756a403e64
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.46 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.46
new file mode 100644
index 000000000000..8834435b56ef
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.46
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv )
+SLOT=0/6.9.10.46
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-46.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=51a4a1a3e2fce5893c80324c63f9bf47
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.42 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.42
deleted file mode 100644
index 14f593bb5f5f..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.42
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-SLOT=0/7.0.8.42
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-42.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4c6fa48b18fc88f0226aa066c02ae78b
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.45 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.45
deleted file mode 100644
index 7a721b790575..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.45
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-SLOT=0/7.0.8.45
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-45.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b0b4caa091b933ba34a42cb66e213d1
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.46 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.46
new file mode 100644
index 000000000000..8afc6ad8981b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.46
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+SLOT=0/7.0.8.46
+SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-46.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4c6fa48b18fc88f0226aa066c02ae78b
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.4 b/metadata/md5-cache/media-gfx/inkscape-0.92.4
index 9a4fa217a09b..176475e9f4f8 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.4
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.4
@@ -4,7 +4,7 @@ DESCRIPTION=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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/poppler-0.26.0:=[cairo] >=dev-cpp/glibmm-2.54.1 >=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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) 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? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) 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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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.4.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=54abb3bed1f751929dfe762708c5116a
+_md5_=591af11f288ab24fd7c7d36160a8de80
diff --git a/metadata/md5-cache/media-gfx/jpeginfo-1.6.1 b/metadata/md5-cache/media-gfx/jpeginfo-1.6.1
deleted file mode 100644
index 694f64038b22..000000000000
--- a/metadata/md5-cache/media-gfx/jpeginfo-1.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/jpeg
-DESCRIPTION=Prints information and tests integrity of JPEG/JFIF files
-EAPI=4
-HOMEPAGE=https://www.kokkonen.net/tjko/projects.html
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=virtual/jpeg
-SLOT=0
-SRC_URI=https://www.kokkonen.net/tjko/src/jpeginfo-1.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=99e34f38ea8df1d4d037e297eadba0f1
diff --git a/metadata/md5-cache/media-gfx/krita-4.2.0 b/metadata/md5-cache/media-gfx/krita-4.2.0
new file mode 100644
index 000000000000..c3806f60175f
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-4.2.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.57.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kguiaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/boost:= dev-libs/quazip dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sip[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 dev-util/desktop-file-utils
+DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics/krita/ https://krita.org/
+IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=kde-frameworks/karchive-5.57.0:5 >=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kguiaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/boost:= dev-libs/quazip dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sip[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/krita/4.2.0/krita-4.2.0.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=69877f533a6d225a99648c4327457ce4
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.12.3 b/metadata/md5-cache/media-gfx/libimagequant-2.12.3
new file mode 100644
index 000000000000..460a963820ce
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/libimagequant-2.12.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install pretend
+DESCRIPTION=Palette quantization library that powers pngquant and other PNG optimizers
+EAPI=7
+HOMEPAGE=https://pngquant.org/lib/
+IUSE=cpu_flags_x86_sse2 debug openmp static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+SLOT=0/0
+SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.12.3.tar.gz -> libimagequant-2.12.3.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=459033c6001fc5aa7820fcb93eefed32
diff --git a/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1 b/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1
index a9c6806d465a..8e00d349c279 100644
--- a/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1
+++ b/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtn
 DESCRIPTION=LXImage Image Viewer - GPicView replacement
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libexif >=x11-libs/libfm-qt-0.12.0:= x11-libs/libX11 x11-libs/libXfixes !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lximage-qt/0.14.1/lximage-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a260bd3b12421c1ce45b65a59f35edf9
+_md5_=a3b9f32a36992a84de402d733843e870
diff --git a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2 b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2
index d21155c13750..84c325f716ff 100644
--- a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2
+++ b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Libs for the efficient manipulation of volumetric data
 EAPI=6
 HOMEPAGE=https://www.openvdb.org
 IUSE=+abi3-compat doc python test 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
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-libs/boost-1.62:=[python?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/dreamworksanimation/openvdb/archive/v4.0.2.tar.gz -> openvdb-4.0.2.tar.gz https://dev.gentoo.org/~dracwyrm/patches/openvdb-4.0.2-patchset-02.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=769079543812fabe083925e54f15a908
+_md5_=c043c8ae7dcff5eecae031ddd7748522
diff --git a/metadata/md5-cache/media-gfx/pngquant-2.12.3 b/metadata/md5-cache/media-gfx/pngquant-2.12.3
new file mode 100644
index 000000000000..5caf2293f5cb
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pngquant-2.12.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libpng:0= media-gfx/libimagequant:= sys-libs/zlib:= lcms? ( media-libs/lcms:2 ) virtual/pkgconfig
+DESCRIPTION=command-line utility and library for lossy compression of PNG images
+EAPI=7
+HOMEPAGE=https://pngquant.org/
+IUSE=debug lcms openmp cpu_flags_x86_sse2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 HPND rwpng
+RDEPEND=media-libs/libpng:0= media-gfx/libimagequant:= sys-libs/zlib:= lcms? ( media-libs/lcms:2 )
+SLOT=0
+SRC_URI=https://pngquant.org/pngquant-2.12.3-src.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=6c67ada1f921cd1af2a99b22ef201e8d
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.8.3 b/metadata/md5-cache/media-gfx/ristretto-0.8.3
deleted file mode 100644
index a3e1e3fbf332..000000000000
--- a/metadata/md5-cache/media-gfx/ristretto-0.8.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2.24:2 media-libs/libexif:0= x11-libs/cairo:0 >=x11-libs/gtk+-2.20:2 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0= dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=A fast and lightweight picture viewer for Xfce
-EAPI=6
-HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.24:2 media-libs/libexif:0= x11-libs/cairo:0 >=x11-libs/gtk+-2.20:2 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.8/ristretto-0.8.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4828bddab0447a9a512617bb39413bac
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r1 b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r1
deleted file mode 100644
index db0246ea1e97..000000000000
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers ) >=sys-devel/gettext-0.18.1 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Scanner Access Now Easy - Backends
-EAPI=6
-HOMEPAGE=http://www.sane-project.org/
-IUSE=gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr -sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 -sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek -sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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
-LICENSE=GPL-2 public-domain
-RDEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-114
-REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads )
-SLOT=0
-SRC_URI=https://alioth.debian.org/frs/download.php/file/4224/sane-backends-1.0.27.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2ebdaf551d8cb66e15bd7edfe33f2324
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3 b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3
index 0d4ac67c6642..97c5ff1d2413 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers ) >=sys-devel/gettext-0.18.1 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp:0= ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers ) >=sys-devel/gettext-0.18.1 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Scanner Access Now Easy - Backends
 EAPI=7
 HOMEPAGE=http://www.sane-project.org/
 IUSE=gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr -sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 -sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek -sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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
 LICENSE=GPL-2 public-domain
-RDEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp:0= ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads )
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/4224/sane-backends-1.0.27.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=ab7b9b6243354866a5eea1a003fffdd8
+_md5_=6c71eb2b214090765e87be2fbbaeb2c8
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.30.2 b/metadata/md5-cache/media-gfx/shotwell-0.30.2
index a39ad53634fa..3547f1887818 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.30.2
+++ b/metadata/md5-cache/media-gfx/shotwell-0.30.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.4:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=virtual/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= ) media-plugins/gst-plugins-gdkpixbuf:1.0 media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.30/shotwell-0.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=8c7b17f1a201d8e138077c23ed64cc81
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.30.2 b/metadata/md5-cache/media-gfx/simple-scan-3.30.2
index 68081fa1b50e..3403724733aa 100644
--- a/metadata/md5-cache/media-gfx/simple-scan-3.30.2
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.30.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22:3 >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://gnome/sources/simple-scan/3.30/simple-scan-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=7c215fd34f53f3d2e21d8c8f637de896
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.32.2 b/metadata/md5-cache/media-gfx/simple-scan-3.32.2
index 2980271f6327..274002ac1160 100644
--- a/metadata/md5-cache/media-gfx/simple-scan-3.32.2
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.32.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22:3 >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://gnome/sources/simple-scan/3.32/simple-scan-3.32.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=0561c5d3c7a4e6c624802b5028edc181
diff --git a/metadata/md5-cache/media-gfx/sxiv-24 b/metadata/md5-cache/media-gfx/sxiv-24
index 4c6e9c148fb4..2ad50dea093e 100644
--- a/metadata/md5-cache/media-gfx/sxiv-24
+++ b/metadata/md5-cache/media-gfx/sxiv-24
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://github.com/muennich/sxiv/archive/v24.tar.gz -> sxiv-24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=51e948687e383489b0fae72266e63e4f
diff --git a/metadata/md5-cache/media-gfx/sxiv-25 b/metadata/md5-cache/media-gfx/sxiv-25
index b63f71865f0b..678eceb11422 100644
--- a/metadata/md5-cache/media-gfx/sxiv-25
+++ b/metadata/md5-cache/media-gfx/sxiv-25
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://github.com/muennich/sxiv/archive/v25.tar.gz -> sxiv-25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=4433a3cddad781f193c834ba90847242
diff --git a/metadata/md5-cache/media-gfx/sxiv-9999 b/metadata/md5-cache/media-gfx/sxiv-9999
index 57263ced4289..df4c858f0999 100644
--- a/metadata/md5-cache/media-gfx/sxiv-9999
+++ b/metadata/md5-cache/media-gfx/sxiv-9999
@@ -7,5 +7,5 @@ IUSE=exif gif +jpeg +png savedconfig
 LICENSE=GPL-2
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=39496ff445e9ab9a9acc5a8980575246
diff --git a/metadata/md5-cache/media-gfx/viewnior-1.7-r1 b/metadata/md5-cache/media-gfx/viewnior-1.7-r1
index 0deb155438c8..9e3ff2d2638f 100644
--- a/metadata/md5-cache/media-gfx/viewnior-1.7-r1
+++ b/metadata/md5-cache/media-gfx/viewnior-1.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 media-gfx/exiv2:0= x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/hellosiyan/Viewnior/archive/viewnior-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=7fd71627be676aae390b619212da59cb
diff --git a/metadata/md5-cache/media-gfx/xpaint-2.9.10.2 b/metadata/md5-cache/media-gfx/xpaint-2.9.10.2
deleted file mode 100644
index b00505ea9578..000000000000
--- a/metadata/md5-cache/media-gfx/xpaint-2.9.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 ) sys-devel/flex sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Image editor with tiff, jpeg and png support
-EAPI=5
-HOMEPAGE=http://sf-xpaint.sourceforge.net/
-IUSE=jpeg2k pgf tiff
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 )
-SLOT=0
-SRC_URI=mirror://sourceforge/sf-xpaint/xpaint-2.9.10.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd66fc48686992d811c5e55196586ddc
diff --git a/metadata/md5-cache/media-gfx/xpaint-2.9.10.2-r1 b/metadata/md5-cache/media-gfx/xpaint-2.9.10.2-r1
new file mode 100644
index 000000000000..169d385b2591
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/xpaint-2.9.10.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 ) sys-devel/flex sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Image editor with tiff, jpeg and png support
+EAPI=5
+HOMEPAGE=http://sf-xpaint.sourceforge.net/
+IUSE=jpeg2k pgf tiff
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/sf-xpaint/xpaint-2.9.10.2.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6499d0a96f9395dddb336b8bde3aaa38
diff --git a/metadata/md5-cache/media-gfx/xpaint-2.9.10.3 b/metadata/md5-cache/media-gfx/xpaint-2.9.10.3
deleted file mode 100644
index fce0d192372f..000000000000
--- a/metadata/md5-cache/media-gfx/xpaint-2.9.10.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg:62 jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 ) sys-devel/flex sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Image editor with tiff, jpeg and png support
-EAPI=5
-HOMEPAGE=http://sf-xpaint.sourceforge.net/
-IUSE=jpeg2k pgf tiff
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg:62 jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 )
-SLOT=0
-SRC_URI=mirror://sourceforge/sf-xpaint/xpaint-2.9.10.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ffb1a3ee73a072108e97b9c00cd414f
diff --git a/metadata/md5-cache/media-gfx/xpaint-2.9.10.3-r1 b/metadata/md5-cache/media-gfx/xpaint-2.9.10.3-r1
new file mode 100644
index 000000000000..272eee99eb7d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/xpaint-2.9.10.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 ) sys-devel/flex sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Image editor with tiff, jpeg and png support
+EAPI=5
+HOMEPAGE=http://sf-xpaint.sourceforge.net/
+IUSE=jpeg2k pgf tiff
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/sf-xpaint/xpaint-2.9.10.3.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c2d085a918d0d79e43f0a77a605cb1f7
diff --git a/metadata/md5-cache/media-libs/Field3D-1.7.2 b/metadata/md5-cache/media-libs/Field3D-1.7.2
index 97c30347466c..8bf2516c7186 100644
--- a/metadata/md5-cache/media-libs/Field3D-1.7.2
+++ b/metadata/md5-cache/media-libs/Field3D-1.7.2
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.62:= >=media-libs/ilmbase-2.2.0:= sci-libs/hdf5:= virtual/mpi virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-libs/boost-1.62:= >=media-libs/ilmbase-2.2.0:= sci-libs/hdf5:= mpi? ( virtual/mpi )
 DESCRIPTION=A library for storing voxel data
-EAPI=6
+EAPI=7
 HOMEPAGE=http://opensource.imageworks.com/?p=field3d
+IUSE=mpi
 KEYWORDS=amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.62:= >=media-libs/ilmbase-2.2.0:= sci-libs/hdf5:= virtual/mpi
+RDEPEND=>=dev-libs/boost-1.62:= >=media-libs/ilmbase-2.2.0:= sci-libs/hdf5:= mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://github.com/imageworks/Field3D/archive/v1.7.2.tar.gz -> Field3D-1.7.2.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c0a6716ef339f4177d2b00c9f8798036
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=ce1512907851e4670af3927107549ba5
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 1816a7eb2e2f..50e359bfe689 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/a52dec-0.7.4-r7 b/metadata/md5-cache/media-libs/a52dec-0.7.4-r7
index bb5ccc136078..c859808588d7 100644
--- a/metadata/md5-cache/media-libs/a52dec-0.7.4-r7
+++ b/metadata/md5-cache/media-libs/a52dec-0.7.4-r7
@@ -4,10 +4,10 @@ DESCRIPTION=library for decoding ATSC A/52 streams used in DVD
 EAPI=5
 HOMEPAGE=http://liba52.sourceforge.net/
 IUSE=djbfft oss static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+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-2
 RDEPEND=djbfft? ( >=sci-libs/djbfft-0.76-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b8341052d7d1545e785e06ebac191e2
+_md5_=fc608d958cc79ccd1fcb6a223557cc77
diff --git a/metadata/md5-cache/media-libs/allegro-5.2.5.0 b/metadata/md5-cache/media-libs/allegro-5.2.5.0
new file mode 100644
index 000000000000..1a0f1f338d41
--- /dev/null
+++ b/metadata/md5-cache/media-libs/allegro-5.2.5.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dumb? ( >=media-libs/dumb-0.9.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flac? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) physfs? ( >=dev-games/physfs-2.0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.5.18:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x11-base/xorg-proto
+DESCRIPTION=Cross-platform library aimed at video game and multimedia programming
+EAPI=7
+HOMEPAGE=https://liballeg.org/
+IUSE=alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD ZLIB
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dumb? ( >=media-libs/dumb-0.9.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flac? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) physfs? ( >=dev-games/physfs-2.0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.5.18:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=X? ( opengl ) xinerama? ( X ) || ( alsa openal oss pulseaudio )
+SLOT=5
+SRC_URI=https://github.com/liballeg/allegro5/releases/download/5.2.5.0/allegro-5.2.5.0.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f75a0f41aadbdcc013e89e50eb39a6ff
diff --git a/metadata/md5-cache/media-libs/aribb24-1.0.3 b/metadata/md5-cache/media-libs/aribb24-1.0.3
index a9f238422e4f..f3808657d040 100644
--- a/metadata/md5-cache/media-libs/aribb24-1.0.3
+++ b/metadata/md5-cache/media-libs/aribb24-1.0.3
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng:0= virtual/pkgconfig >=app-portage/elt-patches-20170815
 DESCRIPTION=Library for decoding ARIB STD-B24 subtitles
 EAPI=6
 HOMEPAGE=https://github.com/nkoriyama/aribb24
-KEYWORDS=amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=media-libs/libpng:0=
 SLOT=0
 SRC_URI=https://github.com/nkoriyama/aribb24/archive/v1.0.3.tar.gz -> aribb24-1.0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ff6c5ece9c22bf52fa7d83fb97833bde
+_md5_=726682cd09ee8875d000e798d71a5b45
diff --git a/metadata/md5-cache/media-libs/assimp-4.0.1 b/metadata/md5-cache/media-libs/assimp-4.0.1
index 068bf8cf611a..157804e3c998 100644
--- a/metadata/md5-cache/media-libs/assimp-4.0.1
+++ b/metadata/md5-cache/media-libs/assimp-4.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Importer library to import assets from 3D files
 EAPI=6
 HOMEPAGE=https://github.com/assimp/assimp
 IUSE=samples static test tools
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 ) tools? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/devil virtual/opengl )
 SLOT=0
 SRC_URI=https://github.com/assimp/assimp/archive/v4.0.1.tar.gz -> assimp-4.0.1.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e97c07667f87fc8ab4930daa62290752
+_md5_=26a8402e503ea0326a41b757d3e1faee
diff --git a/metadata/md5-cache/media-libs/babl-0.1.18 b/metadata/md5-cache/media-libs/babl-0.1.18
deleted file mode 100644
index 7dc57400201c..000000000000
--- a/metadata/md5-cache/media-libs/babl-0.1.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/libtool-2.2 virtual/pkgconfig
-DESCRIPTION=A dynamic, any to any, pixel format conversion library
-EAPI=5
-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 ~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.18.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d9070f8e03f4d1e54ea6c0e981a99cf4
diff --git a/metadata/md5-cache/media-libs/babl-0.1.56 b/metadata/md5-cache/media-libs/babl-0.1.56
deleted file mode 100644
index 46cb61d017ec..000000000000
--- a/metadata/md5-cache/media-libs/babl-0.1.56
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/libtool-2.2 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-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_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-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.56.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=49f17663c24dbcdb3b099ce380e87076
diff --git a/metadata/md5-cache/media-libs/babl-0.1.58 b/metadata/md5-cache/media-libs/babl-0.1.58
deleted file mode 100644
index f9f91c81119a..000000000000
--- a/metadata/md5-cache/media-libs/babl-0.1.58
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/libtool-2.2 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-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_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-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.58.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=cc010902f73652707c2af731edc8dfcf
diff --git a/metadata/md5-cache/media-libs/babl-0.1.60 b/metadata/md5-cache/media-libs/babl-0.1.60
deleted file mode 100644
index c10f97d5519f..000000000000
--- a/metadata/md5-cache/media-libs/babl-0.1.60
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/libtool-2.2 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-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_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-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.60.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=cc010902f73652707c2af731edc8dfcf
diff --git a/metadata/md5-cache/media-libs/babl-0.1.64 b/metadata/md5-cache/media-libs/babl-0.1.64
new file mode 100644
index 000000000000..51c3f829c180
--- /dev/null
+++ b/metadata/md5-cache/media-libs/babl-0.1.64
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-devel/libtool-2.2 virtual/pkgconfig
+DESCRIPTION=A dynamic, any to any, pixel format conversion library
+EAPI=7
+HOMEPAGE=http://www.gegl.org/babl/
+IUSE=altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-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.64.tar.bz2
+_md5_=22233cbea1bd256f4f1c7176d22c381a
diff --git a/metadata/md5-cache/media-libs/bio2jack-0.9-r2 b/metadata/md5-cache/media-libs/bio2jack-0.9-r2
index b9b15df182da..f5b3e1f95a18 100644
--- a/metadata/md5-cache/media-libs/bio2jack-0.9-r2
+++ b/metadata/md5-cache/media-libs/bio2jack-0.9-r2
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsamplerate virtual/jack virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libsamplerate virtual/jack
 DESCRIPTION=A library for porting blocked I/O OSS/ALSA audio applications to JACK
-EAPI=6
+EAPI=7
 HOMEPAGE=http://bio2jack.sourceforge.net/
 IUSE=static-libs
 KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
@@ -10,4 +11,4 @@ RDEPEND=media-libs/libsamplerate virtual/jack
 SLOT=0
 SRC_URI=mirror://sourceforge/bio2jack/bio2jack-0.9.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=74784198a7f99433d50a797346c9ff14
+_md5_=3c9c14f18bb94f68e8e0b8e6f1121cec
diff --git a/metadata/md5-cache/media-libs/codec2-0.7 b/metadata/md5-cache/media-libs/codec2-0.7
deleted file mode 100644
index f86920417661..000000000000
--- a/metadata/md5-cache/media-libs/codec2-0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Low bit rate speech codec
-EAPI=6
-HOMEPAGE=https://freedv.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~hppa ~ia64 ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://freedv.com/wp-content/uploads/sites/8/2017/10/codec2-0.7.tar.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=519debfd4719859f8873333e9940efc4
diff --git a/metadata/md5-cache/media-libs/codec2-0.8.1 b/metadata/md5-cache/media-libs/codec2-0.8.1
index 3a6248f274ca..ef8615a2d15d 100644
--- a/metadata/md5-cache/media-libs/codec2-0.8.1
+++ b/metadata/md5-cache/media-libs/codec2-0.8.1
@@ -1,12 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Low bit rate speech codec
-EAPI=6
+EAPI=7
 HOMEPAGE=https://freedv.org/
 IUSE=examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://hobbes1069.fedorapeople.org/freetel/codec2/codec2-0.8.1.tar.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b4323e267e124e7874d36e0ba2f5ba94
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f152dfc0fcdf37c37c0d40e6c04b05d1
diff --git a/metadata/md5-cache/media-libs/dav1d-0.1.0 b/metadata/md5-cache/media-libs/dav1d-0.1.0
index 344582e12a6b..fc640c4bf116 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.1.0
+++ b/metadata/md5-cache/media-libs/dav1d-0.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.1.0/dav1d-0.1.0.tar.bz2
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=be50ab2fa8f179b65cc6aac422331fe6
diff --git a/metadata/md5-cache/media-libs/dav1d-0.2.0-r1 b/metadata/md5-cache/media-libs/dav1d-0.2.0-r1
index 1e4aad0814ca..3c6aebbeb173 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.2.0-r1
+++ b/metadata/md5-cache/media-libs/dav1d-0.2.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0/1
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.2.0/dav1d-0.2.0.tar.bz2
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=d3bacc684ff4c5e6c296881efa1ecded
diff --git a/metadata/md5-cache/media-libs/dav1d-0.2.1 b/metadata/md5-cache/media-libs/dav1d-0.2.1
index 2d70c9cd5631..800fc5a5a4fc 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.2.1
+++ b/metadata/md5-cache/media-libs/dav1d-0.2.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0/1
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.2.1/dav1d-0.2.1.tar.bz2
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=d3bacc684ff4c5e6c296881efa1ecded
diff --git a/metadata/md5-cache/media-libs/dav1d-0.3.0 b/metadata/md5-cache/media-libs/dav1d-0.3.0
index c7ea142baf5a..e1583087efea 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.3.0
+++ b/metadata/md5-cache/media-libs/dav1d-0.3.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD-2
 SLOT=0/1
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.3.0/dav1d-0.3.0.tar.bz2
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=1822f363bca6b5f7321e1e74742e1c30
diff --git a/metadata/md5-cache/media-libs/dav1d-0.3.1 b/metadata/md5-cache/media-libs/dav1d-0.3.1
index 6d390831ec22..764b63430c71 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.3.1
+++ b/metadata/md5-cache/media-libs/dav1d-0.3.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=BSD-2
 SLOT=0/1
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.3.1/dav1d-0.3.1.tar.bz2
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=3d078fb34dc013d47f22d4bd2d126227
diff --git a/metadata/md5-cache/media-libs/dav1d-9999 b/metadata/md5-cache/media-libs/dav1d-9999
index 60850c538971..679e7794894d 100644
--- a/metadata/md5-cache/media-libs/dav1d-9999
+++ b/metadata/md5-cache/media-libs/dav1d-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://code.videolan.org/videolan/dav1d
 IUSE=+8bit +10bit +asm abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 LICENSE=BSD-2
 SLOT=0/1
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=32d049d70dc96bb6877f6f6c6eedf4e0
diff --git a/metadata/md5-cache/media-libs/devil-1.7.8-r2 b/metadata/md5-cache/media-libs/devil-1.7.8-r2
index c13fae4d9165..b197bb2d0d58 100644
--- a/metadata/md5-cache/media-libs/devil-1.7.8-r2
+++ b/metadata/md5-cache/media-libs/devil-1.7.8-r2
@@ -4,10 +4,10 @@ DESCRIPTION=DevIL image library
 EAPI=6
 HOMEPAGE=http://openil.sourceforge.net/
 IUSE=allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl static-libs tiff X xpm
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib:= ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr:= ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=mirror://sourceforge/openil/DevIL-1.7.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=8dfbe728f66c6f15540aed49011fc615
+_md5_=e0a6024d5455570b677e900ddbc0fee1
diff --git a/metadata/md5-cache/media-libs/exempi-2.4.5-r1 b/metadata/md5-cache/media-libs/exempi-2.4.5-r1
index 65e11ea1c730..9d3af0e33dc6 100644
--- a/metadata/md5-cache/media-libs/exempi-2.4.5-r1
+++ b/metadata/md5-cache/media-libs/exempi-2.4.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Port of the Adobe XMP SDK to work on UNIX
 EAPI=7
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
 IUSE=examples static-libs test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
 SLOT=2/3
 SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.4.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=b517ec4cdcf2522f3acbdb8c0a4e8ce3
+_md5_=d29f9ec03e0faa46e979d005a9471dbb
diff --git a/metadata/md5-cache/media-libs/faad2-2.8.8 b/metadata/md5-cache/media-libs/faad2-2.8.8
index 33f335a81a5d..03646db405b7 100644
--- a/metadata/md5-cache/media-libs/faad2-2.8.8
+++ b/metadata/md5-cache/media-libs/faad2-2.8.8
@@ -4,9 +4,9 @@ DESCRIPTION=AAC audio decoding library
 EAPI=7
 HOMEPAGE=https://www.audiocoding.com/faad2.html
 IUSE=digitalradio static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+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-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/faac/faad2-2.8.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=5d751da219b6c125dea5e6309fba3df2
+_md5_=cd510961b39b54686540ef44768fdefc
diff --git a/metadata/md5-cache/media-libs/gavl-1.2.0 b/metadata/md5-cache/media-libs/gavl-1.2.0
deleted file mode 100644
index 6cd744e1cf8f..000000000000
--- a/metadata/md5-cache/media-libs/gavl-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=library for handling uncompressed audio and video data
-EAPI=4
-HOMEPAGE=http://gmerlin.sourceforge.net
-IUSE=doc
-KEYWORDS=amd64 hppa ppc ~ppc64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/gmerlin/gavl-1.2.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=08f817a40f2dd10a02c474e7809e9b83
diff --git a/metadata/md5-cache/media-libs/gavl-1.4.0 b/metadata/md5-cache/media-libs/gavl-1.4.0
deleted file mode 100644
index dfb6010e31d7..000000000000
--- a/metadata/md5-cache/media-libs/gavl-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=library for handling uncompressed audio and video data
-EAPI=5
-HOMEPAGE=http://gmerlin.sourceforge.net
-IUSE=doc static-libs
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/gmerlin/gavl-1.4.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1688063fb2d677e670fd7c45c219807
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r6 b/metadata/md5-cache/media-libs/gegl-0.2.0-r6
index 7c8c2394cd27..9f2e7503b515 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r6
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r6
@@ -4,10 +4,10 @@ DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack
-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
+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=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-4:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
 SRC_URI=https://download.gimp.org/pub/gegl/0.2/gegl-0.2.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=33fb707ebb16f381cfbf84287e245201
+_md5_=0e9bddf33b734a2d5ca0e305938070da
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1 b/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
index c37231c46022..f1511fab8e9b 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
@@ -5,11 +5,11 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 IUSE=gtk-doc +introspection python static-libs test +vala python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/glib-2.38.0:2 >=media-gfx/exiv2-0.21:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) test? ( python introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.10.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d15df72fe2b3a7163f6d75c71f53f3c1
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=921dcd84c8a07486d326f19905d3d0fe
diff --git a/metadata/md5-cache/media-libs/gexiv2-9999 b/metadata/md5-cache/media-libs/gexiv2-9999
index fa18f7e10cac..84e8928cce86 100644
--- a/metadata/md5-cache/media-libs/gexiv2-9999
+++ b/metadata/md5-cache/media-libs/gexiv2-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/glib-2.38.0:2 >=media-gfx/exiv2-0.21:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) test? ( python introspection ) vala? ( introspection )
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=df779508284d5434863192a890a19953
diff --git a/metadata/md5-cache/media-libs/graphene-1.8.2 b/metadata/md5-cache/media-libs/graphene-1.8.2
index fedf6306cd1a..968c2ef2623d 100644
--- a/metadata/md5-cache/media-libs/graphene-1.8.2
+++ b/metadata/md5-cache/media-libs/graphene-1.8.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/ebassi/graphene/releases/download/1.8.2/graphene-1.8.2.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=569e30c947eef2dd60c2c2b77887322b
diff --git a/metadata/md5-cache/media-libs/graphene-1.8.6 b/metadata/md5-cache/media-libs/graphene-1.8.6
index c8b80015d061..45c5351d35ba 100644
--- a/metadata/md5-cache/media-libs/graphene-1.8.6
+++ b/metadata/md5-cache/media-libs/graphene-1.8.6
@@ -5,10 +5,10 @@ DESCRIPTION=A thin layer of types for graphic libraries
 EAPI=7
 HOMEPAGE=https://ebassi.github.io/graphene/
 IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/ebassi/graphene/releases/download/1.8.6/graphene-1.8.6.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5d980cac4ba984fd0c78f5acaf563be8
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=754eac8ee1a7299a7e44ce0da256267d
diff --git a/metadata/md5-cache/media-libs/grilo-0.3.7 b/metadata/md5-cache/media-libs/grilo-0.3.7
index ae7c1d2ff9e5..2f4ee2ef0620 100644
--- a/metadata/md5-cache/media-libs/grilo-0.3.7
+++ b/metadata/md5-cache/media-libs/grilo-0.3.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.3/0
 SRC_URI=mirror://gnome/sources/grilo/0.3/grilo-0.3.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=8428f0fce695366535f743c6ef6de30f
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3
index e5732da1e1f5..0a59554712c7 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=234f4e66df7741292e3afe10aba4aacc
+_md5_=feabf11f35daa356ef798a2bdca39ef6
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.5.0 b/metadata/md5-cache/media-libs/harfbuzz-2.5.0
new file mode 100644
index 000000000000..fdff9ac25be9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=An OpenType text shaping engine
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.5.0.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=2d3c7f76fdea49b91f320255be81c5ee
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.5.1 b/metadata/md5-cache/media-libs/harfbuzz-2.5.1
new file mode 100644
index 000000000000..62cd8256e8a4
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.5.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=An OpenType text shaping engine
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.5.1.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=2d3c7f76fdea49b91f320255be81c5ee
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index 8b57418fef01..7e7711ea2456 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -10,4 +10,4 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=edeeffd6a7b7bbef3445c46a9ca25f7c
+_md5_=2d3c7f76fdea49b91f320255be81c5ee
diff --git a/metadata/md5-cache/media-libs/libao-1.2.2 b/metadata/md5-cache/media-libs/libao-1.2.2
index ee2c352b2a6a..23b79ef29b60 100644
--- a/metadata/md5-cache/media-libs/libao-1.2.2
+++ b/metadata/md5-cache/media-libs/libao-1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=The Audio Output library
 EAPI=6
 HOMEPAGE=https://www.xiph.org/ao/
 IUSE=alsa nas mmap pulseaudio static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/xiph/libao/archive/1.2.2.tar.gz -> libao-1.2.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=2152919c2eb7d7469294057519823802
+_md5_=d79e604673fbbbb823850e63df5e6377
diff --git a/metadata/md5-cache/media-libs/libaom-1.0.0-r1 b/metadata/md5-cache/media-libs/libaom-1.0.0-r1
index e480639b71c2..06796a20ec36 100644
--- a/metadata/md5-cache/media-libs/libaom-1.0.0-r1
+++ b/metadata/md5-cache/media-libs/libaom-1.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Alliance for Open Media AV1 Codec SDK
 EAPI=6
 HOMEPAGE=https://aomedia.org
 IUSE=doc examples cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD-2
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/0
 SRC_URI=mirror://gentoo/libaom-1.0.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=38bf430fefe98fef918939a677d513c5
+_md5_=c95fcb8f2ef5e410189d16e80e793731
diff --git a/metadata/md5-cache/media-libs/libaom-1.0.0-r2 b/metadata/md5-cache/media-libs/libaom-1.0.0-r2
new file mode 100644
index 000000000000..3a2f458fe789
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libaom-1.0.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) amd64-fbsd? ( dev-lang/yasm ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Alliance for Open Media AV1 Codec SDK
+EAPI=6
+HOMEPAGE=https://aomedia.org
+IUSE=doc examples cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+SLOT=0/0
+SRC_URI=mirror://gentoo/libaom-1.0.0.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=feaeabb7cbb6aa8b42b30f001dcddea1
diff --git a/metadata/md5-cache/media-libs/libcanberra-0.30-r5 b/metadata/md5-cache/media-libs/libcanberra-0.30-r5
index f1843823f4c8..c2ea197a0bd1 100644
--- a/metadata/md5-cache/media-libs/libcanberra-0.30-r5
+++ b/metadata/md5-cache/media-libs/libcanberra-0.30-r5
@@ -4,11 +4,11 @@ DESCRIPTION=Portable sound event library
 EAPI=5
 HOMEPAGE=http://git.0pointer.net/libcanberra.git/
 IUSE=alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.20.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tdb? ( sys-libs/tdb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnome? ( gnome-base/dconf gnome-base/gsettings-desktop-schemas ) sound? ( x11-themes/sound-theme-freedesktop )
 REQUIRED_USE=udev? ( alsa )
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78baa745aaa73c1d059ca85d1b621df5
+_md5_=c18f55a4cd420c29bfdfd7acd65afb12
diff --git a/metadata/md5-cache/media-libs/libchamplain-0.12.19-r1 b/metadata/md5-cache/media-libs/libchamplain-0.12.19-r1
index 6ee1982a70a3..0e098df90176 100644
--- a/metadata/md5-cache/media-libs/libchamplain-0.12.19-r1
+++ b/metadata/md5-cache/media-libs/libchamplain-0.12.19-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.0:3 >=media-libs/clutter-1.24:1
 REQUIRED_USE=vala? ( introspection ) gtk-doc? ( gtk )
 SLOT=0.12
 SRC_URI=mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.19.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b3f610eae878d3a91337051bfe2d731f
diff --git a/metadata/md5-cache/media-libs/libcue-1.4.0 b/metadata/md5-cache/media-libs/libcue-1.4.0
index a62c5f46a635..7e7256048d6f 100644
--- a/metadata/md5-cache/media-libs/libcue-1.4.0
+++ b/metadata/md5-cache/media-libs/libcue-1.4.0
@@ -4,8 +4,8 @@ DESCRIPTION=CUE Sheet Parser Library
 EAPI=4
 HOMEPAGE=http://libcue.sourceforge.net
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libcue/libcue-1.4.0.tar.bz2
-_md5_=dc9bd455d3483cb591439e07eb1f76f5
+_md5_=7134435a4ffeb79d4a77239e03020d89
diff --git a/metadata/md5-cache/media-libs/libdc1394-2.2.5-r1 b/metadata/md5-cache/media-libs/libdc1394-2.2.5-r1
index d6480374ea5e..6a27972c3db6 100644
--- a/metadata/md5-cache/media-libs/libdc1394-2.2.5-r1
+++ b/metadata/md5-cache/media-libs/libdc1394-2.2.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library to interface with IEEE 1394 cameras following the IIDC speci
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/libdc1394/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=2
 SRC_URI=mirror://sourceforge/libdc1394/libdc1394-2.2.5.tar.gz https://dev.gentoo.org/~ssuominen/sdl.m4-20140620.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=1d227573a2a5c6fc24afb509bf609902
+_md5_=f3224e77ab015ed5765b91902dc7da4b
diff --git a/metadata/md5-cache/media-libs/libdca-0.0.5-r3 b/metadata/md5-cache/media-libs/libdca-0.0.5-r3
index 7e45dc74c965..acd0c5a2a9a1 100644
--- a/metadata/md5-cache/media-libs/libdca-0.0.5-r3
+++ b/metadata/md5-cache/media-libs/libdca-0.0.5-r3
@@ -4,10 +4,10 @@ DESCRIPTION=library for decoding DTS Coherent Acoustics streams used in DVD
 EAPI=5
 HOMEPAGE=https://www.videolan.org/developers/libdca.html
 IUSE=debug oss static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+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-2
 RDEPEND=!media-libs/libdts
 SLOT=0
 SRC_URI=https://www.videolan.org/pub/videolan/libdca/0.0.5/libdca-0.0.5.tar.bz2 mirror://gentoo/libdca-0.0.5-constant.patch.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=412a8d7cdce8ba6fbc3b5f71a95502d1
+_md5_=4b5c3cb009f442deb8d194f2a4916287
diff --git a/metadata/md5-cache/media-libs/libdmtx-0.7.4 b/metadata/md5-cache/media-libs/libdmtx-0.7.4
index 64ada2ca1953..2ce12b7b1022 100644
--- a/metadata/md5-cache/media-libs/libdmtx-0.7.4
+++ b/metadata/md5-cache/media-libs/libdmtx-0.7.4
@@ -3,8 +3,8 @@ DESCRIPTION=Barcode data matrix reading and writing library
 EAPI=6
 HOMEPAGE=http://libdmtx.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/libdmtx-0.7.4.tar.gz
-_md5_=ce79362f795c34570e5e536b7d656565
+_md5_=b5bb983fa7e16bc7fee0effc46fd07ef
diff --git a/metadata/md5-cache/media-libs/libdvbpsi-1.3.2 b/metadata/md5-cache/media-libs/libdvbpsi-1.3.2
index aa773ec0194c..fa709afa243a 100644
--- a/metadata/md5-cache/media-libs/libdvbpsi-1.3.2
+++ b/metadata/md5-cache/media-libs/libdvbpsi-1.3.2
@@ -4,8 +4,8 @@ DESCRIPTION=library for MPEG TS/DVB PSI tables decoding and generation
 EAPI=6
 HOMEPAGE=https://www.videolan.org/libdvbpsi
 IUSE=doc static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0/10
 SRC_URI=https://download.videolan.org/pub/libdvbpsi/1.3.2/libdvbpsi-1.3.2.tar.bz2
-_md5_=b9505e6807c1a5e303e93e5f39ec22a9
+_md5_=be0a5f21c6270f08bd7fb1880dc736b8
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.3 b/metadata/md5-cache/media-libs/libepoxy-1.5.3
index 14db4033b365..4b6e0fcafabf 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.3
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.3.tar.gz -> libepoxy-1.5.3.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=0d079f2a7f839f8865732248fdc4b9ce
diff --git a/metadata/md5-cache/media-libs/libepoxy-9999 b/metadata/md5-cache/media-libs/libepoxy-9999
index bbec3cf9bbc2..853dee31e956 100644
--- a/metadata/md5-cache/media-libs/libepoxy-9999
+++ b/metadata/md5-cache/media-libs/libepoxy-9999
@@ -7,5 +7,5 @@ IUSE=test +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mip
 LICENSE=MIT
 RDEPEND=media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=bda7e28838a6c80ef3c8b416deb5931a
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.21-r3 b/metadata/md5-cache/media-libs/libexif-0.6.21-r3
index 221f2dee1c54..3a9755ca7ae9 100644
--- a/metadata/md5-cache/media-libs/libexif-0.6.21-r3
+++ b/metadata/md5-cache/media-libs/libexif-0.6.21-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Library for parsing, editing, and saving EXIF data
 EAPI=7
 HOMEPAGE=https://libexif.github.io/
 IUSE=doc nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=LGPL-2.1
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/libexif/libexif-0.6.21.tar.bz2
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ed4e9de1c65913f205020dc6af7e9830
+_md5_=5a5c131acd95c0a7c8ae568ed040a222
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.22 b/metadata/md5-cache/media-libs/libgphoto2-2.5.22
index afeb00867df6..dabd05b7dda3 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.22
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.22
@@ -4,10 +4,10 @@ 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-201
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.22.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f1bac83ee47bd1789f53a95d9aae1d86
+_md5_=e6ad98970066c5a3b9602c8b15d83dab
diff --git a/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1 b/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
index 7b5b34d3fbc9..986f3d5e9a20 100644
--- a/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
+++ b/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=library for manipulating the International Press Telecommunications
 EAPI=5
 HOMEPAGE=http://libiptcdata.sourceforge.net
 IUSE=doc examples nls python python_targets_python2_7
-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? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libiptcdata/libiptcdata-1.0.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eea8198ef4075551586c1ad0bd864cdb
+_md5_=8e019846942212ddcf75acefac413452
diff --git a/metadata/md5-cache/media-libs/libkate-0.4.1-r3 b/metadata/md5-cache/media-libs/libkate-0.4.1-r3
index bd5c1543b2d4..09481ec58570 100644
--- a/metadata/md5-cache/media-libs/libkate-0.4.1-r3
+++ b/metadata/md5-cache/media-libs/libkate-0.4.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Codec for karaoke and text encapsulation for Ogg
 EAPI=6
 HOMEPAGE=https://code.google.com/p/libkate/
 IUSE=debug doc wxwidgets abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=media-libs/libogg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wxwidgets? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/liboggz )
 REQUIRED_USE=wxwidgets? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://libkate.googlecode.com/files/libkate-0.4.1.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c7485da0e4b35db159f583c01746a8d6
+_md5_=e198d3b65e67dd607afa47d0e8c0e96d
diff --git a/metadata/md5-cache/media-libs/libmad-0.15.1b-r9 b/metadata/md5-cache/media-libs/libmad-0.15.1b-r9
index cd877d0542ed..ed882e35c69f 100644
--- a/metadata/md5-cache/media-libs/libmad-0.15.1b-r9
+++ b/metadata/md5-cache/media-libs/libmad-0.15.1b-r9
@@ -4,9 +4,9 @@ DESCRIPTION="M"peg "A"udio "D"ecoder library
 EAPI=7
 HOMEPAGE=http://mad.sourceforge.net
 IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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 ~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 ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mad/libmad-0.15.1b.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0efde5fb07cd164b6f1eee0db417784c
+_md5_=2d7ab478e0cd583c93dd497b48fb474e
diff --git a/metadata/md5-cache/media-libs/libmatroska-1.4.9 b/metadata/md5-cache/media-libs/libmatroska-1.4.9
index b404e1df6c64..b3b0ab97da3e 100644
--- a/metadata/md5-cache/media-libs/libmatroska-1.4.9
+++ b/metadata/md5-cache/media-libs/libmatroska-1.4.9
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libebml-1.3.6:= sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Extensible multimedia container format based on EBML
 EAPI=6
 HOMEPAGE=https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libebml-1.3.6:=
 SLOT=0/6
 SRC_URI=https://dl.matroska.org/downloads/libmatroska/libmatroska-1.4.9.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c845374cd1aa2261e407a48e10af05c7
+_md5_=f70fe8df98c47f8de351786269530b2e
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.10 b/metadata/md5-cache/media-libs/libmikmod-3.3.10
deleted file mode 100644
index 1bb70bbd14f6..000000000000
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2 sys-apps/texinfo oss? ( virtual/os-headers )
-DESCRIPTION=A library to play a wide range of module formats
-EAPI=6
-HOMEPAGE=http://mikmod.sourceforge.net/
-IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2+ LGPL-2.1
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2
-REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3f6fdc777fc013831e7b8ddd2cefa68
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.11 b/metadata/md5-cache/media-libs/libmikmod-3.3.11
deleted file mode 100644
index f42217f1d1cf..000000000000
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2 sys-apps/texinfo oss? ( virtual/os-headers )
-DESCRIPTION=A library to play a wide range of module formats
-EAPI=6
-HOMEPAGE=http://mikmod.sourceforge.net/
-IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2+ LGPL-2.1
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2
-REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=87e93a5495d4d386858bf32e8f6b7cf1
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.11.1 b/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
index 96bf7656b571..a9b4a1055248 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=A library to play a wide range of module formats
 EAPI=6
 HOMEPAGE=http://mikmod.sourceforge.net/
 IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2+ LGPL-2.1
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2
 REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.11.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e4c1c4254a284dac8fb30d091ff3395
+_md5_=05f8572c8a73cc867b12f6f87031af46
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.8 b/metadata/md5-cache/media-libs/libmikmod-3.3.8
deleted file mode 100644
index 2acfca4498a7..000000000000
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2 sys-apps/texinfo oss? ( virtual/os-headers )
-DESCRIPTION=A library to play a wide range of module formats
-EAPI=5
-HOMEPAGE=http://mikmod.sourceforge.net/
-IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2+ LGPL-2.1
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2
-REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b022af0883ee5533d5193de2fa698aa9
diff --git a/metadata/md5-cache/media-libs/libmng-2.0.3 b/metadata/md5-cache/media-libs/libmng-2.0.3
index 9569210b158f..c60bfb993c40 100644
--- a/metadata/md5-cache/media-libs/libmng-2.0.3
+++ b/metadata/md5-cache/media-libs/libmng-2.0.3
@@ -5,10 +5,10 @@ DESCRIPTION=Multiple Image Networkgraphics lib (animated png's)
 EAPI=7
 HOMEPAGE=https://www.libmng.com/
 IUSE=lcms static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=libmng
 RDEPEND=>=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lcms? ( >=media-libs/lcms-2.5:2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/libmng/libmng-2.0.3.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=34e4754f3f4ee9bee27dcbe1494e3b12
+_md5_=40260c3f7bd9accb840764261d9e2f9c
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.16 b/metadata/md5-cache/media-libs/libmpdclient-2.16
index 351829381704..1511428ba01d 100644
--- a/metadata/md5-cache/media-libs/libmpdclient-2.16
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.16
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ppc ppc64 ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.16.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=4f7d9cece8c24369332c429aacfa6b88
diff --git a/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r2 b/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r2
index c5170cd6aeb6..9e18662bea5b 100644
--- a/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r2
+++ b/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=library for decoding mpeg-2 and mpeg-1 video
 EAPI=5
 HOMEPAGE=http://libmpeg2.sourceforge.net/
 IUSE=sdl static-libs X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-solaris
 LICENSE=GPL-2
 RDEPEND=sdl? ( media-libs/libsdl ) X? ( x11-libs/libXv x11-libs/libICE x11-libs/libSM x11-libs/libXt )
 SLOT=0
 SRC_URI=http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26a66f6e2a74ea795537d2775f3b8faa
+_md5_=b5e0efb63f214dffac4e639ef3d8efe8
diff --git a/metadata/md5-cache/media-libs/liboggz-1.1.1 b/metadata/md5-cache/media-libs/liboggz-1.1.1
index 2223ed605640..5683777e657b 100644
--- a/metadata/md5-cache/media-libs/liboggz-1.1.1
+++ b/metadata/md5-cache/media-libs/liboggz-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Oggz provides a simple programming interface for reading and writing
 EAPI=6
 HOMEPAGE=https://www.xiph.org/oggz/
 IUSE=doc static-libs test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.2.0
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/liboggz/liboggz-1.1.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c38d3a9b202e4a555f8b9c71b8a3eabd
+_md5_=1ede0f9536dca6184948b8d276574398
diff --git a/metadata/md5-cache/media-libs/libplacebo-1.18.0 b/metadata/md5-cache/media-libs/libplacebo-1.18.0
index d323d770010e..6fd99dad1417 100644
--- a/metadata/md5-cache/media-libs/libplacebo-1.18.0
+++ b/metadata/md5-cache/media-libs/libplacebo-1.18.0
@@ -11,5 +11,5 @@ RDEPEND=glslang? ( <dev-util/glslang-7.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=vulkan? ( || ( glslang shaderc ) )
 SLOT=0
 SRC_URI=https://code.videolan.org/videolan/libplacebo/-/archive/v1.18.0/libplacebo-v1.18.0.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=f18e54982b19937ab6695a86f8cd0a75
diff --git a/metadata/md5-cache/media-libs/libplacebo-1.7.0 b/metadata/md5-cache/media-libs/libplacebo-1.7.0
index c9b0053d3f2b..f5cfc8983b16 100644
--- a/metadata/md5-cache/media-libs/libplacebo-1.7.0
+++ b/metadata/md5-cache/media-libs/libplacebo-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=glslang? ( <dev-util/glslang-7.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=vulkan? ( || ( glslang shaderc ) )
 SLOT=0
 SRC_URI=https://code.videolan.org/videolan/libplacebo/-/archive/v1.7.0/libplacebo-v1.7.0.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2e8487d2f96930f94ce9093f8f31c637
diff --git a/metadata/md5-cache/media-libs/libplacebo-9999 b/metadata/md5-cache/media-libs/libplacebo-9999
index d5ed4c5c657d..397b354ad9ff 100644
--- a/metadata/md5-cache/media-libs/libplacebo-9999
+++ b/metadata/md5-cache/media-libs/libplacebo-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=glslang? ( <dev-util/glslang-7.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) shaderc? ( >=media-libs/shaderc-2017.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=vulkan? ( || ( glslang shaderc ) )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=f18e54982b19937ab6695a86f8cd0a75
diff --git a/metadata/md5-cache/media-libs/libpostproc-10.20140517-r1 b/metadata/md5-cache/media-libs/libpostproc-10.20140517-r1
index 56b83ed6b666..9d63d33da636 100644
--- a/metadata/md5-cache/media-libs/libpostproc-10.20140517-r1
+++ b/metadata/md5-cache/media-libs/libpostproc-10.20140517-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Video post processing library
 EAPI=5
 HOMEPAGE=https://github.com/lu-zero/postproc
 IUSE=pic static-libs cpu_flags_x86_3dnow altivec cpu_flags_x86_mmx cpu_flags_x86_mmxext abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-video/libav-0.8.2-r2:0= !media-video/ffmpeg:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~lu_zero/distfiles/libpostproc-10.20140517.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b037c48c94edfcd88d3a17a9a973a2c
+_md5_=0a27f6dbd6b87601d99a7da75361c147
diff --git a/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2 b/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
index 792560c5db56..19e3a46c9025 100644
--- a/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
+++ b/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A graphical music visualization plugin similar to milkdrop
 EAPI=6
 HOMEPAGE=http://projectm.sourceforge.net
 IUSE=debug openmp video_cards_nvidia
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=media-fonts/dejavu >=media-libs/ftgl-2.1.3_rc5 media-libs/freetype:2 media-libs/mesa media-libs/glew:= sys-libs/zlib video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-complete-2.1.0-Source.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=90ce83f92c25158bc2e1d21b3b54f59c
+_md5_=3df09878e6bb2fcd6903704bf5cda807
diff --git a/metadata/md5-cache/media-libs/libshout-2.4.1-r2 b/metadata/md5-cache/media-libs/libshout-2.4.1-r2
index 37b26193084e..33230178f6fa 100644
--- a/metadata/md5-cache/media-libs/libshout-2.4.1-r2
+++ b/metadata/md5-cache/media-libs/libshout-2.4.1-r2
@@ -5,10 +5,10 @@ DESCRIPTION=library for connecting and sending data to icecast servers
 EAPI=7
 HOMEPAGE=http://www.icecast.org/
 IUSE=libressl speex static-libs theora abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/libshout/libshout-2.4.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=d096b3b7dbfa70243b5f703b731b884c
+_md5_=5346570e36671196f3d915d2c208c62f
diff --git a/metadata/md5-cache/media-libs/libtiger-0.3.4-r1 b/metadata/md5-cache/media-libs/libtiger-0.3.4-r1
index da78624bd891..d9efcdec2cf1 100644
--- a/metadata/md5-cache/media-libs/libtiger-0.3.4-r1
+++ b/metadata/md5-cache/media-libs/libtiger-0.3.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A rendering library for Kate streams using Pango and Cairo
 EAPI=6
 HOMEPAGE=https://code.google.com/p/libtiger/
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libkate-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://libtiger.googlecode.com/files/libtiger-0.3.4.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=683de6e16e210aebe979001b36082513
+_md5_=9b07b275ea7931818987ac5de9f234e4
diff --git a/metadata/md5-cache/media-libs/libuvc-0.0.6 b/metadata/md5-cache/media-libs/libuvc-0.0.6
deleted file mode 100644
index 498e66e66589..000000000000
--- a/metadata/md5-cache/media-libs/libuvc-0.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/jpeg:62 virtual/libusb:1 virtual/udev sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A cross-platform library for USB video devices, built atop libusb
-EAPI=6
-HOMEPAGE=https://int80k.com/libuvc/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=virtual/jpeg:62 virtual/libusb:1 virtual/udev
-SLOT=0
-SRC_URI=https://github.com/ktossell/libuvc/archive/v0.0.6.tar.gz -> libuvc-0.0.6.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3543d53a26076a8c287d93e9053bd070
diff --git a/metadata/md5-cache/media-libs/libuvc-0.0.6-r1 b/metadata/md5-cache/media-libs/libuvc-0.0.6-r1
new file mode 100644
index 000000000000..f18a0cff2ee6
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libuvc-0.0.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/jpeg:0 virtual/libusb:1 virtual/udev sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A cross-platform library for USB video devices, built atop libusb
+EAPI=6
+HOMEPAGE=https://int80k.com/libuvc/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=virtual/jpeg:0 virtual/libusb:1 virtual/udev
+SLOT=0
+SRC_URI=https://github.com/ktossell/libuvc/archive/v0.0.6.tar.gz -> libuvc-0.0.6.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6da2ea0e8d32b26cfb3d573807e79e0b
diff --git a/metadata/md5-cache/media-libs/libvpx-1.5.0 b/metadata/md5-cache/media-libs/libvpx-1.5.0
index e2c49201340b..2795c8970b36 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.5.0
+++ b/metadata/md5-cache/media-libs/libvpx-1.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=WebM VP8 Codec SDK
 EAPI=5
 HOMEPAGE=https://www.webmproject.org
 IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 static-libs svc test +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/3
 SRC_URI=https://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.5.0.tar.bz2 test? ( mirror://gentoo/libvpx-testdata-1.5.0.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f07a9e34421f147ea10a0e8b069e65ef
+_md5_=916644fe71b3b1d9e459938f041cf8a5
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.2-r2 b/metadata/md5-cache/media-libs/lilv-0.24.2-r2
index a55221550e7e..023eef5d3555 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.2-r2
+++ b/metadata/md5-cache/media-libs/lilv-0.24.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for app
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/lilv/
 IUSE=doc +dyn-manifest static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~hppa ~ia64 ~ppc x86
+KEYWORDS=amd64 arm64 ~hppa ~ia64 ~ppc x86
 LICENSE=ISC
 RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.2.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=31b335d3391e0d28e72925c4ce9f06fe
+_md5_=9965a13bec5af5f7167439bc55228109
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.4 b/metadata/md5-cache/media-libs/lilv-0.24.4
deleted file mode 100644
index 38ac7bcbef4c..000000000000
--- a/metadata/md5-cache/media-libs/lilv-0.24.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for applications
-EAPI=6
-HOMEPAGE=http://drobilla.net/software/lilv/
-IUSE=doc +dyn-manifest static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=ISC
-RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=http://download.drobilla.net/lilv-0.24.4.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=2e8147d40db9457266312451ef3379ff
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.4-r1 b/metadata/md5-cache/media-libs/lilv-0.24.4-r1
new file mode 100644
index 000000000000..2d86817ca7a5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lilv-0.24.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile >=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for applications
+EAPI=6
+HOMEPAGE=http://drobilla.net/software/lilv/
+IUSE=doc +dyn-manifest static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile >=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=http://download.drobilla.net/lilv-0.24.4.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=c9aebb3495461199d1b47d7ef6c2882f
diff --git a/metadata/md5-cache/media-libs/lv2-1.14.0-r1 b/metadata/md5-cache/media-libs/lv2-1.14.0-r1
index b5d6394ad9bd..d686befc23c2 100644
--- a/metadata/md5-cache/media-libs/lv2-1.14.0-r1
+++ b/metadata/md5-cache/media-libs/lv2-1.14.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple but extensible successor of LADSPA
 EAPI=6
 HOMEPAGE=http://lv2plug.in/
 IUSE=doc plugins 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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/rdflib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] !<media-libs/slv2-0.4.2 !media-libs/lv2core !media-libs/lv2-ui
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://lv2plug.in/spec/lv2-1.14.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=939cb18f3b91cfb845c7ec4bc01fa6a2
+_md5_=b77130a1a2d5d8daf748df85b629c77e
diff --git a/metadata/md5-cache/media-libs/mesa-18.3.6 b/metadata/md5-cache/media-libs/mesa-18.3.6
index e9b5d4ebfce1..99fdb603c15b 100644
--- a/metadata/md5-cache/media-libs/mesa-18.3.6
+++ b/metadata/md5-cache/media-libs/mesa-18.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_rad
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.3.6.tar.xz
-_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=e4cb548f1da86a69e8ac87ef6667683e
diff --git a/metadata/md5-cache/media-libs/mesa-19.0.2 b/metadata/md5-cache/media-libs/mesa-19.0.2
index 16dd81b1d367..07bd20f29b9c 100644
--- a/metadata/md5-cache/media-libs/mesa-19.0.2
+++ b/metadata/md5-cache/media-libs/mesa-19.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_rad
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.0.2.tar.xz
-_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=40f2a6479675e8c4419f618e49912281
diff --git a/metadata/md5-cache/media-libs/mesa-19.0.3 b/metadata/md5-cache/media-libs/mesa-19.0.3
index fc09a19808b8..2e48f78b6c4b 100644
--- a/metadata/md5-cache/media-libs/mesa-19.0.3
+++ b/metadata/md5-cache/media-libs/mesa-19.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_rad
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.0.3.tar.xz
-_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=40f2a6479675e8c4419f618e49912281
diff --git a/metadata/md5-cache/media-libs/mesa-19.0.4 b/metadata/md5-cache/media-libs/mesa-19.0.4
index 9fecf41463d9..e151f7278742 100644
--- a/metadata/md5-cache/media-libs/mesa-19.0.4
+++ b/metadata/md5-cache/media-libs/mesa-19.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_rad
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.0.4.tar.xz
-_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=40f2a6479675e8c4419f618e49912281
diff --git a/metadata/md5-cache/media-libs/mesa-19.0.5 b/metadata/md5-cache/media-libs/mesa-19.0.5
new file mode 100644
index 000000000000..f6d70987b9d9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.0.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=6
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan wayland xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.0.5.tar.xz
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=40f2a6479675e8c4419f618e49912281
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.0_rc1 b/metadata/md5-cache/media-libs/mesa-19.1.0_rc1
index 8df3ffd62b60..23d1ae544702 100644
--- a/metadata/md5-cache/media-libs/mesa-19.1.0_rc1
+++ b/metadata/md5-cache/media-libs/mesa-19.1.0_rc1
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r60
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.0-rc1.tar.xz
-_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=e6ca532e932b6a32c575f6c0b02d0371
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.0_rc2 b/metadata/md5-cache/media-libs/mesa-19.1.0_rc2
index 80015597a6e1..1bdd8330c10d 100644
--- a/metadata/md5-cache/media-libs/mesa-19.1.0_rc2
+++ b/metadata/md5-cache/media-libs/mesa-19.1.0_rc2
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r60
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.0-rc2.tar.xz
-_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=e6ca532e932b6a32c575f6c0b02d0371
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.0_rc3 b/metadata/md5-cache/media-libs/mesa-19.1.0_rc3
new file mode 100644
index 000000000000..4fffc0d32a40
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.1.0_rc3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=6
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.0-rc3.tar.xz
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e6ca532e932b6a32c575f6c0b02d0371
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.0_rc4 b/metadata/md5-cache/media-libs/mesa-19.1.0_rc4
new file mode 100644
index 000000000000..f5a862979058
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.1.0_rc4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=6
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.0-rc4.tar.xz
+_eclasses_=llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e6ca532e932b6a32c575f6c0b02d0371
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 20f784dd2f28..225ed9f97510 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -9,5 +9,5 @@ RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi
 REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=e6ca532e932b6a32c575f6c0b02d0371
diff --git a/metadata/md5-cache/media-libs/openimageio-1.8.17 b/metadata/md5-cache/media-libs/openimageio-1.8.17
index 2b1b3a3d877f..b9334e97323e 100644
--- a/metadata/md5-cache/media-libs/openimageio-1.8.17
+++ b/metadata/md5-cache/media-libs/openimageio-1.8.17
@@ -5,7 +5,7 @@ DESCRIPTION=A library for reading and writing images
 EAPI=7
 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_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~ppc64 ~x86
+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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,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_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.8.17.tar.gz -> openimageio-1.8.17.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6202099d72e85c7982e309536736ad0e
+_md5_=891c1c1ef72f70a5ac1d40112e30e352
diff --git a/metadata/md5-cache/media-libs/opensubdiv-3.3.3 b/metadata/md5-cache/media-libs/opensubdiv-3.3.3
index d441ec0c31dd..e0bc981c915a 100644
--- a/metadata/md5-cache/media-libs/opensubdiv-3.3.3
+++ b/metadata/md5-cache/media-libs/opensubdiv-3.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=An Open-Source subdivision surface library
 EAPI=6
 HOMEPAGE=http://graphics.pixar.com/opensubdiv/
 IUSE=cuda doc opencl openmp ptex tbb
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=ZLIB
 RDEPEND=media-libs/glew:= media-libs/glfw:= cuda? ( dev-util/nvidia-cuda-toolkit:* ) opencl? ( virtual/opencl ) ptex? ( media-libs/ptex )
 SLOT=0
 SRC_URI=https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_3_3.tar.gz -> opensubdiv-3.3.3.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e138a6bcfcf049bced70ce921ac0c6e7
+_md5_=44fb7d4bbe7f0fa8610a7bbfea6c71b6
diff --git a/metadata/md5-cache/media-libs/opus-1.3.1-r1 b/metadata/md5-cache/media-libs/opus-1.3.1-r1
new file mode 100644
index 000000000000..371d844ad71f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opus-1.3.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=doc? ( app-doc/doxygen media-gfx/graphviz )
+DESCRIPTION=Open codec for interactive speech and music transmission over the Internet
+EAPI=7
+HOMEPAGE=https://opus-codec.org/
+IUSE=custom-modes doc static-libs cpu_flags_x86_sse cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=516f9fe6ec7a29df10841521baf328e3
diff --git a/metadata/md5-cache/media-libs/opusfile-0.11 b/metadata/md5-cache/media-libs/opusfile-0.11
index c33dd938cde8..915a45bc2927 100644
--- a/metadata/md5-cache/media-libs/opusfile-0.11
+++ b/metadata/md5-cache/media-libs/opusfile-0.11
@@ -4,10 +4,10 @@ DESCRIPTION=A high-level decoding and seeking API for .opus files
 EAPI=7
 HOMEPAGE=https://www.opus-codec.org/
 IUSE=doc fixed-point +float +http libressl static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=media-libs/libogg media-libs/opus http? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 REQUIRED_USE=^^ ( fixed-point float )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/opus/opusfile-0.11.tar.gz
-_md5_=79d05b72424c7a9b63e9ab85746fc2da
+_md5_=0ee7a911a4239494d1a7ef6d3ea1942a
diff --git a/metadata/md5-cache/media-libs/phonon-4.10.2 b/metadata/md5-cache/media-libs/phonon-4.10.2
index 36226f7e99ed..8a9f3c0754e5 100644
--- a/metadata/md5-cache/media-libs/phonon-4.10.2
+++ b/metadata/md5-cache/media-libs/phonon-4.10.2
@@ -5,11 +5,11 @@ DESCRIPTION=KDE multimedia API
 EAPI=7
 HOMEPAGE=https://phonon.kde.org/
 IUSE=debug designer gstreamer pulseaudio +vlc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 PDEPEND=gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] ) vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
 RDEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/4.10.2/phonon-4.10.2.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f65f8e89e78766d21e6afb88f090e08f
+_md5_=d76a12ef49dc964e0b89f86ce4a90b70
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r3 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r3
index f45320140f56..a03d57a43965 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r3
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Phonon GStreamer backend
 EAPI=7
 HOMEPAGE=https://phonon.kde.org/
 IUSE=alsa debug +network
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/phonon-4.10.0 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.9.0/phonon-backend-gstreamer-4.9.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=61b62f5b0b67611ac0cce31d0fc4ce83
+_md5_=9d6af396784b8299bcad12d9b029c854
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.10.2 b/metadata/md5-cache/media-libs/phonon-vlc-0.10.2
index 3a206354ecff..698afae71102 100644
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.10.2
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.10.2
@@ -5,10 +5,10 @@ DESCRIPTION=Phonon VLC backend
 EAPI=7
 HOMEPAGE=https://phonon.kde.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.0 media-video/vlc:=[dbus,ogg,vorbis]
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.10.2/phonon-backend-vlc-0.10.2.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b6713cde357319503d9b37be2b57c280
+_md5_=e3a11b761026f185a0c5e045c239134e
diff --git a/metadata/md5-cache/media-libs/ptex-2.1.28 b/metadata/md5-cache/media-libs/ptex-2.1.28
deleted file mode 100644
index cd2b734e041d..000000000000
--- a/metadata/md5-cache/media-libs/ptex-2.1.28
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib app-doc/doxygen sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Per-Face Texture Mapping for Production Rendering
-EAPI=6
-HOMEPAGE=http://ptex.us/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/wdas/ptex/archive/v2.1.28.tar.gz -> ptex-2.1.28.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=61b90d914173cbaea333a1ae2792598b
diff --git a/metadata/md5-cache/media-libs/ptex-2.3.0 b/metadata/md5-cache/media-libs/ptex-2.3.0
index 66f7a7c8d24f..45ecf917694b 100644
--- a/metadata/md5-cache/media-libs/ptex-2.3.0
+++ b/metadata/md5-cache/media-libs/ptex-2.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Per-Face Texture Mapping for Production Rendering
 EAPI=6
 HOMEPAGE=http://ptex.us/
 IUSE=static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wdas/ptex/archive/v2.3.0.tar.gz -> ptex-2.3.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3862e969b9732b6edbc3849796d6827d
+_md5_=4d2e99b998c90cd6d564da855a76495a
diff --git a/metadata/md5-cache/media-libs/ptex-2.3.2 b/metadata/md5-cache/media-libs/ptex-2.3.2
new file mode 100644
index 000000000000..fc8b83ea3de1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ptex-2.3.2
@@ -0,0 +1,15 @@
+BDEPEND=app-doc/doxygen dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib
+DESCRIPTION=Per-Face Texture Mapping for Production Rendering
+EAPI=7
+HOMEPAGE=http://ptex.us/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/zlib
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/wdas/ptex/archive/v2.3.2.tar.gz -> ptex-2.3.2.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=e0242848450a9ee2d7cd3c2e3d72ceae
diff --git a/metadata/md5-cache/media-libs/pyliblo-0.10.0 b/metadata/md5-cache/media-libs/pyliblo-0.10.0
deleted file mode 100644
index 312e74e29ad2..000000000000
--- a/metadata/md5-cache/media-libs/pyliblo-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/liblo-0.27 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(-)] dev-python/cython[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 Python wrapper for the liblo OSC library
-EAPI=6
-HOMEPAGE=http://das.nasophon.de/pyliblo
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=media-libs/liblo-0.27 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(-)] 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 ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://das.nasophon.de/download/pyliblo-0.10.0.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=de6d21f02d8bf60c2c0b099e654f43f8
diff --git a/metadata/md5-cache/media-libs/pyliblo-0.10.0-r1 b/metadata/md5-cache/media-libs/pyliblo-0.10.0-r1
new file mode 100644
index 000000000000..506bde7fc967
--- /dev/null
+++ b/metadata/md5-cache/media-libs/pyliblo-0.10.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/liblo-0.27 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(-)] dev-python/cython[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 Python wrapper for the liblo OSC library
+EAPI=7
+HOMEPAGE=http://das.nasophon.de/pyliblo
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=media-libs/liblo-0.27 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(-)] 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 ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://das.nasophon.de/download/pyliblo-0.10.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ca711b49359dc3ae3b5e0dcd662cf596
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.15-r2 b/metadata/md5-cache/media-libs/raptor-2.0.15-r2
index d9e79be0a273..d231d9ce13ee 100644
--- a/metadata/md5-cache/media-libs/raptor-2.0.15-r2
+++ b/metadata/md5-cache/media-libs/raptor-2.0.15-r2
@@ -5,10 +5,10 @@ DESCRIPTION=The RDF Parser Toolkit
 EAPI=7
 HOMEPAGE=http://librdf.org/raptor/
 IUSE=+curl debug json static-libs unicode
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 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
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 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=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt curl? ( net-misc/curl ) json? ( dev-libs/yajl ) unicode? ( dev-libs/icu:= ) !media-libs/raptor:0
 SLOT=2
 SRC_URI=http://download.librdf.org/source/raptor2-2.0.15.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=b02ad3fe0c4df2080dd480d54f0393b2
+_md5_=b672f8d3a90a57aac59f898d065a1057
diff --git a/metadata/md5-cache/media-libs/sdl-image-1.2.12-r2 b/metadata/md5-cache/media-libs/sdl-image-1.2.12-r2
index 0ddb4271e777..73cc3adf4a91 100644
--- a/metadata/md5-cache/media-libs/sdl-image-1.2.12-r2
+++ b/metadata/md5-cache/media-libs/sdl-image-1.2.12-r2
@@ -4,10 +4,10 @@ DESCRIPTION=image file loading library
 EAPI=5
 HOMEPAGE=http://www.libsdl.org/projects/SDL_image/
 IUSE=gif jpeg png static-libs tiff webp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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 ~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=ZLIB
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=06d63e2c41c17671d54702acd7dea988
+_md5_=dc9b78e15f4adb98e3e48d7deeba3c48
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.0-r1 b/metadata/md5-cache/media-libs/sratom-0.6.0-r1
index 7c7ab67385e6..bf3a90a3ced7 100644
--- a/metadata/md5-cache/media-libs/sratom-0.6.0-r1
+++ b/metadata/md5-cache/media-libs/sratom-0.6.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for serialising LV2 atoms to/from RDF, particularly the Turt
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/sratom/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=>=media-libs/lv2-1.14.0-r1 >=dev-libs/serd-0.28.0-r1 >=dev-libs/sord-0.16.0-r1
 SLOT=0
 SRC_URI=http://download.drobilla.net/sratom-0.6.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=27992b065ba3e7dab28b6196f0e4160b
+_md5_=f6b73a34b67c506765fc261fe036c067
diff --git a/metadata/md5-cache/media-libs/t1lib-5.1.2-r2 b/metadata/md5-cache/media-libs/t1lib-5.1.2-r2
index 9604173da36d..b5181f4c0cf9 100644
--- a/metadata/md5-cache/media-libs/t1lib-5.1.2-r2
+++ b/metadata/md5-cache/media-libs/t1lib-5.1.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A Type 1 Font Rasterizer Library for UNIX/X11
 EAPI=6
 HOMEPAGE=ftp://metalab.unc.edu/pub/Linux/libs/graphics/
 IUSE=X doc static-libs
-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 ~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 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2 GPL-2
 RDEPEND=X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXt )
 SLOT=5
 SRC_URI=ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbf36a37bf03890e51f45ee8f03bfc36
+_md5_=c88ad5683083cdadca3b686fdf330653
diff --git a/metadata/md5-cache/media-libs/volpack-1.0_p7 b/metadata/md5-cache/media-libs/volpack-1.0_p7
deleted file mode 100644
index 6dd96d78d324..000000000000
--- a/metadata/md5-cache/media-libs/volpack-1.0_p7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=sys-devel/m4
-DESCRIPTION=Volume rendering library
-EAPI=4
-HOMEPAGE=http://amide.sourceforge.net/packages.html
-IUSE=doc examples static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/amide/volpack-1.0c7.tgz
-_md5_=7883f54bc1bacdb1c69066cf3758728f
diff --git a/metadata/md5-cache/media-libs/zimg-2.7.5 b/metadata/md5-cache/media-libs/zimg-2.7.5
index 5ef2d6ed777e..ffb897f871d1 100644
--- a/metadata/md5-cache/media-libs/zimg-2.7.5
+++ b/metadata/md5-cache/media-libs/zimg-2.7.5
@@ -1,12 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Scaling, colorspace conversion, and dithering library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/sekrit-twc/zimg
 IUSE=static-libs cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://github.com/sekrit-twc/zimg/archive/release-2.7.5.tar.gz -> zimg-2.7.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=33a2e874fc44d4b6b20081c0c5323ecf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=4fa6cb64d62fb0fddf982d6183a4c11a
diff --git a/metadata/md5-cache/media-libs/zimg-2.8 b/metadata/md5-cache/media-libs/zimg-2.8
new file mode 100644
index 000000000000..82ac92a223ee
--- /dev/null
+++ b/metadata/md5-cache/media-libs/zimg-2.8
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Scaling, colorspace conversion, and dithering library
+EAPI=7
+HOMEPAGE=https://github.com/sekrit-twc/zimg
+IUSE=static-libs cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=WTFPL-2
+SLOT=0
+SRC_URI=https://github.com/sekrit-twc/zimg/archive/release-2.8.tar.gz -> zimg-2.8.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=b4c1139c34732d93eb6a62b349f78ea9
diff --git a/metadata/md5-cache/media-libs/zimg-9999 b/metadata/md5-cache/media-libs/zimg-9999
index 78ce6ecd1627..4019ffb52b84 100644
--- a/metadata/md5-cache/media-libs/zimg-9999
+++ b/metadata/md5-cache/media-libs/zimg-9999
@@ -1,10 +1,10 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Scaling, colorspace conversion, and dithering library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/sekrit-twc/zimg
 IUSE=static-libs cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 LICENSE=WTFPL-2
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ecf982f1590acd2b71a1938d1f3a8fe
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=b4c1139c34732d93eb6a62b349f78ea9
diff --git a/metadata/md5-cache/media-libs/zita-convolver-3.1.0 b/metadata/md5-cache/media-libs/zita-convolver-3.1.0
index 039e70dccfe8..a044616fbda7 100644
--- a/metadata/md5-cache/media-libs/zita-convolver-3.1.0
+++ b/metadata/md5-cache/media-libs/zita-convolver-3.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=C++ library implementing a real-time convolution matrix
 EAPI=5
 HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html
 IUSE=cpu_flags_x86_sse
-KEYWORDS=amd64
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-convolver-3.1.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c848ac3090299e8f1fe700b95a918ee4
+_md5_=cf7e31039fa028b8a49ebd88892250fc
diff --git a/metadata/md5-cache/media-libs/zvbi-0.2.35-r1 b/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
index a5468ce2691f..7342078c08e3 100644
--- a/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
+++ b/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
@@ -4,10 +4,10 @@ DESCRIPTION=VBI Decoding Library for Zapping
 EAPI=5
 HOMEPAGE=http://zapping.sourceforge.net
 IUSE=doc dvb nls static-libs v4l X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=media-libs/libpng-1.5.18:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/zapping/zvbi-0.2.35.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=130579cdad57d4cd04d37fa97f87aa56
+_md5_=924294ebb38e1e93483853959c287e21
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 83f951c57eac..0109d3465976 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/grilo-plugins-0.3.8 b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.8
index 579482a75b56..0f95add62c1e 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.8
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.3.6:0.3=[network,playlist] freebox? ( net-dns/avahi ) >=dev-libs/gom-0.3.2-r1 chromaprint? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-chromaprint:1.0 ) dev-libs/json-glib daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) media-libs/libmediaart:2.0 net-libs/libsoup:2.4 dev-libs/libxml2:2 flickr? ( net-libs/liboauth ) dev-db/sqlite:3 >=dev-libs/totem-pl-parser-3.4.1 tracker? ( >=app-misc/tracker-0.10.5:= ) upnp-av? ( net-libs/dleyna-connector-dbus net-misc/dleyna-server ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 ) thetvdb? ( app-arch/libarchive ) youtube? ( >=dev-libs/libgdata-0.9.1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
 SLOT=0.3
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.3/grilo-plugins-0.3.8.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b76070bb781e9cd6440b57ad03012fbf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3
index 55ac1328d1d0..d1a09c7398b1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=ATSC A/52 audio decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=74ecde41447af20dfa92c6777326893f
+_md5_=43bd824ddfbf5a61b51cb39c3865c4b5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3
index 818bdb1cc32a..d76bc88cb4a7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=ASS/SSA rendering with effects support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0e4efb6abd098abe8bd834bb3a12a43a
+_md5_=5fcba8772dfff2874c81496959ad3b73
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.4
index 68b873726f8b..448ebd2a518b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b2584f7fcd9b8d6313abddabf9ae7008
+_md5_=d9cfa6143b22497e7bbd54e7816c9136
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.4
index 68fe014bcc9c..78880db20f68 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=FLAC encoder/decoder/tagger plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=37e4c4ae286763bd4b20951b61dbdf66
+_md5_=8431ad3fd78973d936647894b9c476af
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.4
index 604c4389451b..51594b0ce74f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c56cd77b507fa8b14dc55ff9d9a93391
+_md5_=b36cc2a7c75dcb70084825c89c724381
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.3_p20190329 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.3_p20190329
index c50ba0f9363f..fd5cb0be328c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.3_p20190329
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.3_p20190329
@@ -4,11 +4,11 @@ DESCRIPTION=FFmpeg based gstreamer plugin
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html
 IUSE=libav +orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libav? ( >=media-video/ffmpeg-4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libav? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gst-libav-1.14.4-ffmpeg4-patchset.tar.xz libav? ( https://ffmpeg.org/releases/ffmpeg-4.1.3.tar.bz2 )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=15da9c24472a58cce55c581de27182bb
+_md5_=fb8d17b3321265dbd70367affe664725
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.15-r100 b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.15-r100
index e5d56a0fa98a..aeaad422ff12 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.15-r100
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.15-r100
@@ -4,10 +4,10 @@ DESCRIPTION=GStreamer plugin for ICE (RFC 5245) support
 EAPI=6
 HOMEPAGE=https://nice.freedesktop.org/wiki/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( MPL-1.1 LGPL-2.1 )
 RDEPEND=~net-libs/libnice-0.1.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1.0
 SRC_URI=https://nice.freedesktop.org/releases/libnice-0.1.15.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bbe767a6a1ef83c82d897e499719b286
+_md5_=77a1e51222659017a3478166a0c8f0d8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.14.3
index f44a361f36f8..9f0fd80cb374 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.14.3
@@ -3,10 +3,10 @@ DESCRIPTION=Meta ebuild to pull in gst plugins for apps
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=metapackage
 RDEPEND=>=media-libs/gstreamer-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.3:1.0[alsa?,ogg?,theora?,vorbis?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-cdio-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-a52dec-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-dvdread-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-resindvd-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.14.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-mpg123-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-plugins/gst-plugins-vaapi-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bc83d5165d3379ed7636d674784a19cb
+_md5_=c12faa21f2e8c0e52668e8a1689c92f7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3
index fda0241e0b2a..962a59262c66 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=MOD audio decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm64 ~hppa ~mips ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4bc5b14c376a089727a2d45b147ba468
+_md5_=a5ec7d87ce98f008de7d70816314a7cf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3
index 49df801ce3cf..7d3efe4421aa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG2 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f005ed1e695d9f76e8af6eccc13259c4
+_md5_=ec96cf34bb0bae61ada646ab2e727850
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.4
index 8ff22bc728d3..df84a1d887db 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2e03669de89f60f0e93b99a01f5db753
+_md5_=bfa4a8ed09968ce748012bedd6111719
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.4
index 9ea7967ff37b..690f972d4582 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=OSS (Open Sound System) support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8e213c2c58542fb7eb27195fe9364cb7
+_md5_=71d93906d2b9eb689aec524e41042994
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.4
index b20251fdd6b3..1794069b65be 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=PulseAudio sound server plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=99c87859b435b02ecb33bd396d09c2bc
+_md5_=2c0a849d6a67d84ea5d2e68171856c4b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.4
index e45fd2f16075..fded2dce7b3e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client source/sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cd57f872527dd49881c81f00c3abc20a
+_md5_=2186b416e95075cce11c01723794c661
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3
index a8f2e4121eef..8f8eb28e45ae 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=SRTP encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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
 RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6c0b85e556a984f5e6eb899ba7bba4ca
+_md5_=0dc8b3d760db36ad37239ee7cf343f84
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.4
index ada4751ff5b3..438dd9cc82a5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( >=virtual/libgudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d8be14b9be6017ac0169419263ed7c82
+_md5_=f7916eac8cbf7ba6c29ca0a53e15e4e3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.3
index 21b96bd642b8..784bc38d5f88 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware accelerated video decoding through VA-API plugin for GStrea
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi
 IUSE=+drm +egl gles2 +opengl wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] drm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.14.3:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/gst-plugins-base-1.14.3:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=|| ( drm gles2 opengl wayland X ) gles2? ( egl ) opengl? ( || ( egl X ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.14.3.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0be1b62aac92fa565d936b0a867d8915
+_md5_=0a1346559e4ad27dbd6a95813f910bb8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3
index c2ac2b0c6c02..dd5932f74e8d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=H.264 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=06c47f7033cc851eef2ac6ab743c257d
+_md5_=cf268661d9684b06255b90849032bb56
diff --git a/metadata/md5-cache/media-plugins/hexter-1.0.3 b/metadata/md5-cache/media-plugins/hexter-1.0.3
deleted file mode 100644
index 9fe22799cc03..000000000000
--- a/metadata/md5-cache/media-plugins/hexter-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/readline:0 sys-libs/ncurses ) media-libs/ladspa-sdk virtual/pkgconfig
-DESCRIPTION=Yamaha DX7 modeling DSSI plugin
-EAPI=5
-HOMEPAGE=http://dssi.sourceforge.net/hexter.html
-IUSE=gtk2 readline
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/readline:0 sys-libs/ncurses )
-SLOT=0
-SRC_URI=mirror://sourceforge/dssi/hexter-1.0.3.tar.bz2
-_md5_=2d95540021e772a7015f535562e26300
diff --git a/metadata/md5-cache/media-plugins/hexter-1.1.0 b/metadata/md5-cache/media-plugins/hexter-1.1.0
new file mode 100644
index 000000000000..b6590a25ca83
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/hexter-1.1.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) media-libs/ladspa-sdk
+DESCRIPTION=Yamaha DX7 modeling DSSI plugin
+EAPI=7
+HOMEPAGE=http://smbolton.com/hexter.html
+IUSE=gtk2 readline
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= )
+SLOT=0
+SRC_URI=https://github.com/smbolton/hexter/releases/download/version_1.1.0/hexter-1.1.0.tar.bz2
+_md5_=6de339b3735d477e1e15cfb1ff16672f
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.19 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.19
new file mode 100644
index 000000000000..89b40d2a558e
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.19
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's Adaptive inputstream addon
+EAPI=6
+HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
+SLOT=0
+SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.3.19-Leia.tar.gz -> kodi-inputstream-adaptive-2.3.19.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=72beaf5dd0682be6f391ecb9fb0bcbdd
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
index 6ace9909df66..ce02f3259a85 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2*
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=757805dbfadc8c5ed87e656f3c4cd9c1
+_md5_=a8703849f9bc64241b9cf120b0d89094
diff --git a/metadata/md5-cache/media-plugins/live-2017.10.28 b/metadata/md5-cache/media-plugins/live-2017.10.28
index 7413f197d3ff..9aff810eb5a2 100644
--- a/metadata/md5-cache/media-plugins/live-2017.10.28
+++ b/metadata/md5-cache/media-plugins/live-2017.10.28
@@ -3,9 +3,9 @@ DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
 EAPI=5
 HOMEPAGE=http://www.live555.com/
 IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 SLOT=0/7
 SRC_URI=http://www.live555.com/liveMedia/public/live.2017.10.28.tar.gz mirror://gentoo/live.2017.10.28.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9ac58f805cbacd65c4036d96ef0c9a1f
+_md5_=86c03e7a58289883c973957e30e1ba6c
diff --git a/metadata/md5-cache/media-plugins/mda-lv2-1.2.2 b/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
index d0be13913910..0c7985c35226 100644
--- a/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
+++ b/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
@@ -3,10 +3,10 @@ DEPEND=media-libs/lv2 || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[t
 DESCRIPTION=LV2 port of the MDA plugins by Paul Kellett
 EAPI=4
 HOMEPAGE=http://drobilla.net/software/mda-lv2/
-KEYWORDS=amd64
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=media-libs/lv2
 SLOT=0
 SRC_URI=http://download.drobilla.net/mda-lv2-1.2.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=17bf7c9c9fb6a7557ef2e0ee415ee8c5
+_md5_=fb33ecf6dd57c2d270626ef3fb377a9d
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.3.0 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.3.0
index 544cb126688f..7469c9518c45 100644
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.3.0
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.3.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/libsamplerate >=media-libs/taglib-1.10 =media-sound/qmmp-1.3*
 DESCRIPTION=A set of extra plugins for Qmmp
 EAPI=7
 HOMEPAGE=http://qmmp.ylsoftware.com/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate >=media-libs/taglib-1.10 =media-sound/qmmp-1.3* dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.3.0.tar.bz2
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=271b6f8c9ea2f1097bc8c7ac16036564
+_md5_=a061748c6175b87dda05d1434c51cf5a
diff --git a/metadata/md5-cache/media-radio/KochMorse-0.99.6-r1 b/metadata/md5-cache/media-radio/KochMorse-0.99.6-r1
deleted file mode 100644
index a0132f80acbe..000000000000
--- a/metadata/md5-cache/media-radio/KochMorse-0.99.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/pyalsaaudio[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Morse-tutor for Linux using the Koch-method
-EAPI=5
-HOMEPAGE=https://KochMorse.googlecode.com/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pyalsaaudio[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://KochMorse.googlecode.com/files/KochMorse-0.99.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a1b8db91117ffe5954d1252e9af5d829
diff --git a/metadata/md5-cache/media-radio/KochMorse-3.4.0-r1 b/metadata/md5-cache/media-radio/KochMorse-3.4.0-r1
index 660c71697c2e..3a470bcb92ff 100644
--- a/metadata/md5-cache/media-radio/KochMorse-3.4.0-r1
+++ b/metadata/md5-cache/media-radio/KochMorse-3.4.0-r1
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5
 DESCRIPTION=Morse-code tutor using the Koch method
 EAPI=7
 HOMEPAGE=https://github.com/hmatuschek/kochmorse
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/hmatuschek/kochmorse/archive/v3.4.0.tar.gz -> KochMorse-3.4.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=72f4b47c4624c60dac472347983ea548
+_md5_=e41d9f62dfe23c3959e46b59f97b02f7
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 3e8f9e3f8019..2ee0d8dccc5c 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/xastir-2.1.0 b/metadata/md5-cache/media-radio/xastir-2.1.0
index 9996398f3ffe..bbeedf712be4 100644
--- a/metadata/md5-cache/media-radio/xastir-2.1.0
+++ b/metadata/md5-cache/media-radio/xastir-2.1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff:= media-libs/tiff:0 ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=X Amateur Station Tracking and Information Reporting
 EAPI=6
 HOMEPAGE=http://xastir.org/
 IUSE=festival gdal geotiff +graphicsmagick
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival )
+RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff:= media-libs/tiff:0 ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival )
 SLOT=0
 SRC_URI=https://github.com/Xastir/Xastir/archive/Release-2.1.0.tar.gz -> xastir-2.1.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b7ba2d003f3696ad9898474ec972e6df
+_md5_=1e728d3a580796f0384e1f355e11d0e4
diff --git a/metadata/md5-cache/media-radio/xastir-2.1.2 b/metadata/md5-cache/media-radio/xastir-2.1.2
new file mode 100644
index 000000000000..a79b36c227bb
--- /dev/null
+++ b/metadata/md5-cache/media-radio/xastir-2.1.2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff:= media-libs/tiff:0 ) festival? ( app-accessibility/festival )
+DESCRIPTION=X Amateur Station Tracking and Information Reporting
+EAPI=7
+HOMEPAGE=http://xastir.org/
+IUSE=festival geotiff +graphicsmagick
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff:= media-libs/tiff:0 ) festival? ( app-accessibility/festival )
+SLOT=0
+SRC_URI=https://github.com/Xastir/Xastir/archive/Release-2.1.2.tar.gz -> xastir-2.1.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=7303a092d1dcc4d0120e73bb34457f64
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 90e710adf5c3..1aaff077d158 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/audicle-1.0.0.7-r1 b/metadata/md5-cache/media-sound/audicle-1.0.0.7-r1
deleted file mode 100644
index e6c4d2508009..000000000000
--- a/metadata/md5-cache/media-sound/audicle-1.0.0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile media-libs/freeglut virtual/opengl virtual/glu x11-libs/gtk+:2 truetype? ( media-libs/ftgl media-fonts/corefonts ) app-eselect/eselect-audicle sys-devel/bison sys-devel/flex virtual/pkgconfig
-DESCRIPTION=A Context-sensitive, On-the-fly Audio Programming Environ/mentality
-EAPI=5
-HOMEPAGE=http://audicle.cs.princeton.edu/
-IUSE=+alsa jack oss truetype
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile media-libs/freeglut virtual/opengl virtual/glu x11-libs/gtk+:2 truetype? ( media-libs/ftgl media-fonts/corefonts ) app-eselect/eselect-audicle
-REQUIRED_USE=|| ( alsa jack oss )
-SLOT=0
-SRC_URI=http://audicle.cs.princeton.edu/release/files/audicle-1.0.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45c7f0fac5b8132e1a1b1688a7c7b3c2
diff --git a/metadata/md5-cache/media-sound/audicle-1.0.0.7-r2 b/metadata/md5-cache/media-sound/audicle-1.0.0.7-r2
new file mode 100644
index 000000000000..25bf3f148500
--- /dev/null
+++ b/metadata/md5-cache/media-sound/audicle-1.0.0.7-r2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=app-eselect/eselect-audicle media-libs/freeglut media-libs/libsndfile virtual/opengl virtual/glu x11-libs/gtk+:2 alsa? ( >=media-libs/alsa-lib-0.9 ) jack? ( virtual/jack ) truetype? ( media-fonts/corefonts media-libs/ftgl )
+DESCRIPTION=A Context-sensitive, On-the-fly Audio Programming Environ/mentality
+EAPI=7
+HOMEPAGE=http://audicle.cs.princeton.edu/
+IUSE=+alsa jack oss truetype
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+REQUIRED_USE=|| ( alsa jack oss )
+SLOT=0
+SRC_URI=http://audicle.cs.princeton.edu/release/files/audicle-1.0.0.7.tgz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=cfba311df0a0a4fb0ae18e1ada221827
diff --git a/metadata/md5-cache/media-sound/beets-1.4.8 b/metadata/md5-cache/media-sound/beets-1.4.8
deleted file mode 100644
index ec96ef9b27e8..000000000000
--- a/metadata/md5-cache/media-sound/beets-1.4.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A media library management system for obsessive-compulsive music geeks
-EAPI=6
-HOMEPAGE=http://beets.io/ https://pypi.org/project/beets/
-IUSE=badfiles chromaprint doc discogs ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/jellyfish[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/munkres[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-musicbrainz-ngs-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-oauthlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9[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/unidecode[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(-)] >=media-libs/mutagen-1.33[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] badfiles? ( media-libs/flac media-sound/mp3val ) chromaprint? ( dev-python/pyacoustid[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(-)] media-libs/chromaprint[tools] ) discogs? ( dev-python/discogs-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(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ffmpeg? ( media-video/ffmpeg:0[encode] ) icu? ( dev-db/sqlite[icu] ) lastfm? ( dev-python/pylast[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(-)] ) mpd? ( dev-python/bluelet[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-mpd[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(-)] gstreamer? ( media-plugins/gst-plugins-meta:1.0 ) ) replaygain? ( gstreamer? ( dev-python/pygobject:3[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(-)] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0[ffmpeg] ) !gstreamer? ( media-sound/mp3gain ) ) thumbnail? ( dev-python/pyxdg[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-pathlib[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/pillow[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(-)] media-gfx/imagemagick ) ) webserver? ( dev-python/flask[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/flask-cors[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[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/b/beets/beets-1.4.8.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b060192705b6e5c9aec139d0f4ceb82b
diff --git a/metadata/md5-cache/media-sound/beets-1.4.8-r1 b/metadata/md5-cache/media-sound/beets-1.4.8-r1
new file mode 100644
index 000000000000..6e130ad51ba9
--- /dev/null
+++ b/metadata/md5-cache/media-sound/beets-1.4.8-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Media library management system for obsessive-compulsive music geeks
+EAPI=6
+HOMEPAGE=http://beets.io/ https://pypi.org/project/beets/
+IUSE=badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/jellyfish-0.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/munkres[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-musicbrainz-ngs-0.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-oauthlib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unidecode[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/mutagen-1.33[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] badfiles? ( media-libs/flac media-sound/mp3val ) chromaprint? ( dev-python/pyacoustid[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/chromaprint[tools] ) discogs? ( dev-python/discogs-client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ffmpeg? ( media-video/ffmpeg:0[encode] ) icu? ( dev-db/sqlite[icu] ) lastfm? ( dev-python/pylast[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mpd? ( dev-python/bluelet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-mpd[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] gstreamer? ( media-plugins/gst-plugins-meta:1.0 ) ) replaygain? ( gstreamer? ( dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0[ffmpeg] ) !gstreamer? ( media-sound/mp3gain ) ) thumbnail? ( dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-pathlib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/imagemagick ) ) webserver? ( dev-python/flask[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask-cors[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[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=mirror://pypi/b/beets/beets-1.4.8.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=5bdb56fed2eacc030de91a2a6e20ca55
diff --git a/metadata/md5-cache/media-sound/bitmeter-1.2-r1 b/metadata/md5-cache/media-sound/bitmeter-1.2-r1
deleted file mode 100644
index c0522b270c8a..000000000000
--- a/metadata/md5-cache/media-sound/bitmeter-1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 media-sound/jack-audio-connection-kit virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Diagnosis tool for JACK audio software
-EAPI=6
-HOMEPAGE=http://devel.tlrmx.org/audio/
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-sound/jack-audio-connection-kit
-SLOT=0
-SRC_URI=http://devel.tlrmx.org/audio/source/bitmeter-1.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=8052abf04d5b8d58becdb1a5a5ff8bb5
diff --git a/metadata/md5-cache/media-sound/bitmeter-1.2-r2 b/metadata/md5-cache/media-sound/bitmeter-1.2-r2
new file mode 100644
index 000000000000..5cbe4c87c377
--- /dev/null
+++ b/metadata/md5-cache/media-sound/bitmeter-1.2-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=virtual/jack x11-libs/gtk+:2
+DESCRIPTION=Diagnosis tool for JACK audio software
+EAPI=7
+HOMEPAGE=https://devel.tlrmx.org/audio/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jack x11-libs/gtk+:2
+SLOT=0
+SRC_URI=https://devel.tlrmx.org/audio/source/bitmeter-1.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8c747f868f845fc225742433dd119a27
diff --git a/metadata/md5-cache/media-sound/bristol-0.60.11-r1 b/metadata/md5-cache/media-sound/bristol-0.60.11-r1
index 5dcd31c67ee4..cf6cfbbdbca7 100644
--- a/metadata/md5-cache/media-sound/bristol-0.60.11-r1
+++ b/metadata/md5-cache/media-sound/bristol-0.60.11-r1
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 x11-libs/libX11 alsa? ( >=media-libs/alsa-lib-1.0.0 )
+DEPEND=virtual/jack x11-libs/libX11 alsa? ( >=media-libs/alsa-lib-1.0.0 ) x11-base/xorg-proto
 DESCRIPTION=Synthesizer keyboard emulation package: Moog, Hammond and others
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/bristol
 IUSE=alsa oss static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 x11-libs/libX11 alsa? ( >=media-libs/alsa-lib-1.0.0 )
+RDEPEND=virtual/jack x11-libs/libX11 alsa? ( >=media-libs/alsa-lib-1.0.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/bristol/bristol-0.60.11.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=521180e07d929f6c43036dd88592b726
+_md5_=6ddd5df0dcd12b98f1f9906a6799a7a3
diff --git a/metadata/md5-cache/media-sound/brutefir-1.0k-r2 b/metadata/md5-cache/media-sound/brutefir-1.0k-r2
index bb606ef6a50e..94bca1482729 100644
--- a/metadata/md5-cache/media-sound/brutefir-1.0k-r2
+++ b/metadata/md5-cache/media-sound/brutefir-1.0k-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst
-DEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit sci-libs/fftw:3.0
+DEPEND=media-libs/alsa-lib sci-libs/fftw:3.0 virtual/jack
 DESCRIPTION=Software convolution engine for applying long FIR filters
 EAPI=7
 HOMEPAGE=https://www.ludd.ltu.se/~torger/brutefir.html
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit sci-libs/fftw:3.0
+RDEPEND=media-libs/alsa-lib sci-libs/fftw:3.0 virtual/jack
 SLOT=0
 SRC_URI=https://www.ludd.ltu.se/~torger/files/brutefir-1.0k.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=63b3fd6a33b3fc5510a65244d531adbe
+_md5_=cb315dfc2f5d847afe092c90b3cae245
diff --git a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6 b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6
index e5fbac2d6c62..6f1e29399227 100644
--- a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6
+++ b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6
@@ -4,10 +4,10 @@ DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=5
 HOMEPAGE=https://www.xiph.org/paranoia
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz https://dev.gentoo.org/~ssuominen/cdparanoia-III-10.2-patches-2.tbz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1b33f6c00881fbd9b596ac1ab5afb634
+_md5_=e791c7ded69f92de7328f8d1f7bc7d84
diff --git a/metadata/md5-cache/media-sound/clementine-1.3.1_p20190127 b/metadata/md5-cache/media-sound/clementine-1.3.1_p20190127
index ae344a3e13cb..f753ce6a66ba 100644
--- a/metadata/md5-cache/media-sound/clementine-1.3.1_p20190127
+++ b/metadata/md5-cache/media-sound/clementine-1.3.1_p20190127
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-cpp/gtest-1.8.0 dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:=[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
 EAPI=7
 HOMEPAGE=https://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote test
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:=[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/clementine-player/Clementine/archive/610566d25271c67d1625fd62041f6a27435b0a9d.tar.gz -> clementine-1.3.1_p20190127.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e4866202f048bf81362476c03d8dd2a6
+_md5_=9ae8b3602bc53447a9295ad676df32ff
diff --git a/metadata/md5-cache/media-sound/clementine-9999 b/metadata/md5-cache/media-sound/clementine-9999
index 29f0a163e937..d533b448caf1 100644
--- a/metadata/md5-cache/media-sound/clementine-9999
+++ b/metadata/md5-cache/media-sound/clementine-9999
@@ -1,13 +1,13 @@
 BDEPEND=>=dev-cpp/gtest-1.8.0 dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
 EAPI=7
 HOMEPAGE=https://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote test
 LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5da72161f89afc84b738faa2c94122e6
+_md5_=5190ca65a4c6766c4f177fb4132ab798
diff --git a/metadata/md5-cache/media-sound/erec-2.2.0.1 b/metadata/md5-cache/media-sound/erec-2.2.0.1
index eae8c6f6050c..139c2f06c6ed 100644
--- a/metadata/md5-cache/media-sound/erec-2.2.0.1
+++ b/metadata/md5-cache/media-sound/erec-2.2.0.1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install unpack
 DEPEND=sys-apps/sed
-DESCRIPTION=A shared audio recording server
+DESCRIPTION=Shared audio recording server
 EAPI=0
-HOMEPAGE=http://bisqwit.iki.fi/source/erec.html
+HOMEPAGE=https://bisqwit.iki.fi/source/erec.html
 KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 SLOT=0
-SRC_URI=http://bisqwit.iki.fi/src/arch/erec-2.2.0.1.tar.bz2
+SRC_URI=https://bisqwit.iki.fi/src/arch/erec-2.2.0.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f8c362f85115ccae3b925e7a2e2299a3
+_md5_=acfa5cf712b88c3adb4f2fe62f20c566
diff --git a/metadata/md5-cache/media-sound/erec-2.2.0.1-r1 b/metadata/md5-cache/media-sound/erec-2.2.0.1-r1
new file mode 100644
index 000000000000..79ba263e7b7d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/erec-2.2.0.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Shared audio recording server
+EAPI=7
+HOMEPAGE=https://bisqwit.iki.fi/source/erec.html
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://bisqwit.iki.fi/src/arch/erec-2.2.0.1.tar.bz2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c6bab70746195c8e669d8ca017abea95
diff --git a/metadata/md5-cache/media-sound/fmit-1.0.15-r1 b/metadata/md5-cache/media-sound/fmit-1.0.15-r1
deleted file mode 100644
index db4ea00f24fc..000000000000
--- a/metadata/md5-cache/media-sound/fmit-1.0.15-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=sci-libs/fftw-3.3.4:3.0= dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( media-libs/portaudio ) dev-qt/linguist-tools:5
-DESCRIPTION=Free Music Instrument Tuner
-EAPI=6
-HOMEPAGE=https://gillesdegottex.github.io/fmit
-IUSE=alsa jack oss portaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1
-RDEPEND=>=sci-libs/fftw-3.3.4:3.0= dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( media-libs/portaudio )
-SLOT=0
-SRC_URI=https://github.com/gillesdegottex/fmit/archive/v1.0.15.tar.gz -> fmit-1.0.15.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=afdbe864c6aa81e9055dfc4e5c01ac0b
diff --git a/metadata/md5-cache/media-sound/fmit-1.0.15-r2 b/metadata/md5-cache/media-sound/fmit-1.0.15-r2
new file mode 100644
index 000000000000..b0e4e8cf18ca
--- /dev/null
+++ b/metadata/md5-cache/media-sound/fmit-1.0.15-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/fftw-3.3.4:3.0= virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) portaudio? ( media-libs/portaudio ) dev-qt/linguist-tools:5
+DESCRIPTION=Free Music Instrument Tuner
+EAPI=7
+HOMEPAGE=https://gillesdegottex.github.io/fmit
+IUSE=alsa jack oss portaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/fftw-3.3.4:3.0= virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) portaudio? ( media-libs/portaudio )
+SLOT=0
+SRC_URI=https://github.com/gillesdegottex/fmit/archive/v1.0.15.tar.gz -> fmit-1.0.15.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=197f4d606245eb403474ecca455227d7
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.30.2 b/metadata/md5-cache/media-sound/gnome-music-3.30.2
index 009a147e2189..837d2a54d375 100644
--- a/metadata/md5-cache/media-sound/gnome-music-3.30.2
+++ b/metadata/md5-cache/media-sound/gnome-music-3.30.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/3.30/gnome-music-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=e470dfdd3c478c2c20120e88b18f3779
diff --git a/metadata/md5-cache/media-sound/gtklick-0.6.4 b/metadata/md5-cache/media-sound/gtklick-0.6.4
deleted file mode 100644
index 19ac6160a4c7..000000000000
--- a/metadata/md5-cache/media-sound/gtklick-0.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/pyliblo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-sound/klick[osc] python_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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A simple metronome with an easy-to-use GTK interface
-EAPI=6
-HOMEPAGE=http://das.nasophon.de/gtklick/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/pyliblo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-sound/klick[osc] python_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(-)] python_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 ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://das.nasophon.de/download/gtklick-0.6.4.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=577f773d8e69c1a19a2278cdc55b5772
diff --git a/metadata/md5-cache/media-sound/gtklick-0.6.4-r1 b/metadata/md5-cache/media-sound/gtklick-0.6.4-r1
new file mode 100644
index 000000000000..72c91370abc2
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gtklick-0.6.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/pyliblo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-sound/klick[osc] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A simple metronome with an easy-to-use GTK interface
+EAPI=7
+HOMEPAGE=http://das.nasophon.de/gtklick/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/pyliblo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-sound/klick[osc] python_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(-)] python_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 ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://das.nasophon.de/download/gtklick-0.6.4.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=377d1b75657f03395ef7f16dfdaabb9e
diff --git a/metadata/md5-cache/media-sound/id3tool-1.2a b/metadata/md5-cache/media-sound/id3tool-1.2a
index 6a60281390ef..7edaebd403b8 100644
--- a/metadata/md5-cache/media-sound/id3tool-1.2a
+++ b/metadata/md5-cache/media-sound/id3tool-1.2a
@@ -1,9 +1,9 @@
-DEFINED_PHASES=install
-DESCRIPTION=A command line utility for easy manipulation of the ID3 tags present in MPEG Layer 3 audio files
-EAPI=0
+DEFINED_PHASES=-
+DESCRIPTION=Tool for easy manipulation of the ID3 tags present in MP3 audio files
+EAPI=7
 HOMEPAGE=http://nekohako.xware.cx/id3tool
-KEYWORDS=~arm amd64 ~ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://nekohako.xware.cx/id3tool/id3tool-1.2a.tar.gz
-_md5_=2c1b3729cc627670b4d029e3af02bf01
+_md5_=03960a07cbfb3225886b7b3270d343f3
diff --git a/metadata/md5-cache/media-sound/klick-0.12.2-r1 b/metadata/md5-cache/media-sound/klick-0.12.2-r1
deleted file mode 100644
index 6ea226019af5..000000000000
--- a/metadata/md5-cache/media-sound/klick-0.12.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=dev-libs/boost media-libs/libsamplerate media-libs/libsndfile virtual/jack osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) virtual/pkgconfig dev-util/scons[python_targets_python2_7]
-DESCRIPTION=An advanced command-line based metronome for JACK
-EAPI=6
-HOMEPAGE=http://das.nasophon.de/klick
-IUSE=debug osc rubberband
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost media-libs/libsamplerate media-libs/libsndfile virtual/jack osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband )
-SLOT=0
-SRC_URI=http://das.nasophon.de/download/klick-0.12.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=995d6cc169176b5147dff1efe78f4298
diff --git a/metadata/md5-cache/media-sound/klick-0.12.2-r2 b/metadata/md5-cache/media-sound/klick-0.12.2-r2
new file mode 100644
index 000000000000..a44c1fa4647c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/klick-0.12.2-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-util/scons[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DEFINED_PHASES=compile configure install setup
+DEPEND=media-libs/libsamplerate media-libs/libsndfile virtual/jack osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) dev-libs/boost
+DESCRIPTION=An advanced command-line based metronome for JACK
+EAPI=7
+HOMEPAGE=http://das.nasophon.de/klick
+IUSE=debug osc rubberband
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsamplerate media-libs/libsndfile virtual/jack osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband )
+SLOT=0
+SRC_URI=http://das.nasophon.de/download/klick-0.12.2.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=63b2b970ce4305eec50a600bd9d5748b
diff --git a/metadata/md5-cache/media-sound/linuxsampler-2.1.0 b/metadata/md5-cache/media-sound/linuxsampler-2.1.0
index c499412df187..154466e14432 100644
--- a/metadata/md5-cache/media-sound/linuxsampler-2.1.0
+++ b/metadata/md5-cache/media-sound/linuxsampler-2.1.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( alsa jack )
 SLOT=0
 SRC_URI=https://download.linuxsampler.org/packages/linuxsampler-2.1.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=071e40d511bfdc9eda884d857b055fec
+_md5_=271278843a355e6bdf250db32589534c
diff --git a/metadata/md5-cache/media-sound/lollypop-1.0.11 b/metadata/md5-cache/media-sound/lollypop-1.0.11
new file mode 100644
index 000000000000..8355e483484b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lollypop-1.0.11
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3 dev-python/pkgconfig[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/desktop-file-utils dev-util/itstool dev-util/intltool >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3
+DESCRIPTION=Modern music player for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Lollypop
+IUSE=python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3 app-crypt/libsecret[introspection] dev-libs/totem-pl-parser dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/dbus-python dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pylast-1.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/gst-plugins-base:1.0[introspection]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.gnome.org/World/lollypop/uploads/7127b40865afb12d6a07435c4396f34a/lollypop-1.0.11.tar.xz
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=ac3f351de148061ba7b9d151a3fc8c47
diff --git a/metadata/md5-cache/media-sound/lollypop-1.0.7 b/metadata/md5-cache/media-sound/lollypop-1.0.7
index afbbb5e3bade..a48f0b3b557f 100644
--- a/metadata/md5-cache/media-sound/lollypop-1.0.7
+++ b/metadata/md5-cache/media-sound/lollypop-1.0.7
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/pyt
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/lollypop/uploads/04b4d9bdafd176f98dbd233c564bafb8/lollypop-1.0.7.tar.xz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=7f19789b8a1134b438c0edb3542453e9
diff --git a/metadata/md5-cache/media-sound/meterbridge-0.9.3 b/metadata/md5-cache/media-sound/meterbridge-0.9.3
index 27d033af4099..21d7eff75fec 100644
--- a/metadata/md5-cache/media-sound/meterbridge-0.9.3
+++ b/metadata/md5-cache/media-sound/meterbridge-0.9.3
@@ -1,12 +1,13 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-sound/jack-audio-connection-kit >=media-libs/libsdl-1.2 >=media-libs/sdl-image-1.2.10[png] virtual/opengl virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-image-1.2.10[png] virtual/jack virtual/opengl
 DESCRIPTION=Software meterbridge for the UNIX based JACK audio system
-EAPI=6
+EAPI=7
 HOMEPAGE=http://plugin.org.uk/meterbridge/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=media-sound/jack-audio-connection-kit >=media-libs/libsdl-1.2 >=media-libs/sdl-image-1.2.10[png] virtual/opengl
+RDEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-image-1.2.10[png] virtual/jack virtual/opengl
 SLOT=0
 SRC_URI=http://plugin.org.uk/meterbridge/meterbridge-0.9.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ffc3651351ecfe01047f843654fdeb1
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e343ff76c13ac4dd643f07a395b5e223
diff --git a/metadata/md5-cache/media-sound/mp3asm-0.1.3-r2 b/metadata/md5-cache/media-sound/mp3asm-0.1.3-r2
index 6c8d64d3bc9f..63d1fb3282c1 100644
--- a/metadata/md5-cache/media-sound/mp3asm-0.1.3-r2
+++ b/metadata/md5-cache/media-sound/mp3asm-0.1.3-r2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=A command line tool to clean and edit mp3 files
-EAPI=0
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/mp3asm/
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3asm/mp3asm-0.1.3-1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d6443618a24527a9a148aba5591a1a17
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=a7415759172177802559b515b5685466
diff --git a/metadata/md5-cache/media-sound/mpc-0.30 b/metadata/md5-cache/media-sound/mpc-0.30
index 47eb0144ee75..4a0513af2d18 100644
--- a/metadata/md5-cache/media-sound/mpc-0.30
+++ b/metadata/md5-cache/media-sound/mpc-0.30
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmpdclient iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpc/0/mpc-0.30.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=e91607817a225d8406b6a65d5ac1ffee
diff --git a/metadata/md5-cache/media-sound/mpc-0.31-r1 b/metadata/md5-cache/media-sound/mpc-0.31-r1
index 67c7b6a2720f..6081805d8214 100644
--- a/metadata/md5-cache/media-sound/mpc-0.31-r1
+++ b/metadata/md5-cache/media-sound/mpc-0.31-r1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libmpdclient
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpc/0/mpc-0.31.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=d43d26b05aff4987673042fb19a848f5
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.4-r1 b/metadata/md5-cache/media-sound/mpd-0.21.4-r1
index b2ea9fe9065c..6cb36b858ce1 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.4-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.21.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.4.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=c58ad5d8532aba157038d50a2fb52a84
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.5 b/metadata/md5-cache/media-sound/mpd-0.21.5
index b8113496a0ea..241d4f6e75ff 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.5
+++ b/metadata/md5-cache/media-sound/mpd-0.21.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.5.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=1b916ae67077231340a9d896517065b1
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.6 b/metadata/md5-cache/media-sound/mpd-0.21.6
index 386c63b6aa84..62925bf7ca5e 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.6
+++ b/metadata/md5-cache/media-sound/mpd-0.21.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.6.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=1b916ae67077231340a9d896517065b1
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.7 b/metadata/md5-cache/media-sound/mpd-0.21.7
index 3acc4a03ba8f..332b32a399f2 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.7
+++ b/metadata/md5-cache/media-sound/mpd-0.21.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.7.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=05a6aeb83486a590d834d8bb3d6d0a25
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.8 b/metadata/md5-cache/media-sound/mpd-0.21.8
index d7c1a6de1075..9fb834239a05 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.8
+++ b/metadata/md5-cache/media-sound/mpd-0.21.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.8.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=05a6aeb83486a590d834d8bb3d6d0a25
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.9 b/metadata/md5-cache/media-sound/mpd-0.21.9
new file mode 100644
index 000000000000..1f9c88da5bb9
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpd-0.21.9
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.49.2 virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=adplug? ( media-libs/adplug:= ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= ) >=dev-libs/boost-1.58:= test? ( dev-cpp/gtest )
+DESCRIPTION=The Music Player Daemon (mpd)
+EAPI=7
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
+IUSE=adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
+LICENSE=GPL-2
+RDEPEND=adplug? ( media-libs/adplug:= ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.9.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=05a6aeb83486a590d834d8bb3d6d0a25
diff --git a/metadata/md5-cache/media-sound/mpg123-1.25.10-r1 b/metadata/md5-cache/media-sound/mpg123-1.25.10-r1
index 4d0369bc28bb..cdc758fa4e08 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.25.10-r1
+++ b/metadata/md5-cache/media-sound/mpg123-1.25.10-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=6
 HOMEPAGE=https://www.mpg123.org/
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=https://www.mpg123.org/download/mpg123-1.25.10.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c363d75dd40422496e48c31447aecef
+_md5_=42cb720d572db22f4bb5da7e496c35ee
diff --git a/metadata/md5-cache/media-sound/mplay-0.80 b/metadata/md5-cache/media-sound/mplay-0.80
index d4df8bd017e7..a2d38c40e1fb 100644
--- a/metadata/md5-cache/media-sound/mplay-0.80
+++ b/metadata/md5-cache/media-sound/mplay-0.80
@@ -1,10 +1,10 @@
-DEFINED_PHASES=install postinst unpack
+DEFINED_PHASES=install postinst prepare
 DESCRIPTION=A Curses front-end for mplayer
-EAPI=0
+EAPI=7
 HOMEPAGE=http://mplay.sourceforge.net
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=dev-perl/MP3-Info-1.11 dev-perl/Audio-Mixer dev-perl/Ogg-Vorbis-Header-PurePerl >=virtual/perl-Time-HiRes-1.56 >=dev-perl/TermReadKey-2.21 dev-perl/Video-Info media-video/mplayer
 SLOT=0
 SRC_URI=mirror://sourceforge/mplay/mplay-0.80.tar.gz
-_md5_=38f0cd32c76b5672ab77dbde1e4d58af
+_md5_=373557bf9df8bbbe7066f493a27be172
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.33-r1 b/metadata/md5-cache/media-sound/ncmpc-0.33-r1
index c873d51e6660..a352c2beea53 100644
--- a/metadata/md5-cache/media-sound/ncmpc-0.33-r1
+++ b/metadata/md5-cache/media-sound/ncmpc-0.33-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/ncmpc/0/ncmpc-0.33.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=b9d97c0ce4a8e3115bfc8306dd97fcea
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.34 b/metadata/md5-cache/media-sound/ncmpc-0.34
index 55f17626f66f..72ac081df727 100644
--- a/metadata/md5-cache/media-sound/ncmpc-0.34
+++ b/metadata/md5-cache/media-sound/ncmpc-0.34
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/ncmpc/0/ncmpc-0.34.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=e880a3fe5ef53338b1c885303a3e1a3c
diff --git a/metadata/md5-cache/media-sound/paprefs-1.1 b/metadata/md5-cache/media-sound/paprefs-1.1
index a1b545c791cf..cb2a0bea5273 100644
--- a/metadata/md5-cache/media-sound/paprefs-1.1
+++ b/metadata/md5-cache/media-sound/paprefs-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-cpp/atkmm dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=dev-libs/libsigc++-2.2:2 >=media-sound/pulseaudio-12.0-r1[glib] x11-libs/gtk+:3 || ( x11-themes/tango-icon-theme x11-themes/adwaita-icon-theme )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/paprefs/paprefs-1.1.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f1a575d8f9d15bb2b1173392a5cb9609
diff --git a/metadata/md5-cache/media-sound/pavucontrol-qt-0.14.1 b/metadata/md5-cache/media-sound/pavucontrol-qt-0.14.1
index 07aeb61dbe86..a3d6d5a26ff0 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-qt-0.14.1
+++ b/metadata/md5-cache/media-sound/pavucontrol-qt-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 media-
 DESCRIPTION=A Pulseaudio mixer in Qt (port of pavucontrol)
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 media-sound/pulseaudio[glib] !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/pavucontrol-qt/0.14.1/pavucontrol-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=825b6ac06b440384dbcb9e50f74645af
+_md5_=a9ae94836a7b5d3b3be8ea569a4b99f2
diff --git a/metadata/md5-cache/media-sound/playerctl-0.6.1 b/metadata/md5-cache/media-sound/playerctl-0.6.1
index 7394a7680956..01a64dc006f0 100644
--- a/metadata/md5-cache/media-sound/playerctl-0.6.1
+++ b/metadata/md5-cache/media-sound/playerctl-0.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/acrisci/playerctl/archive/v0.6.1.tar.gz -> playerctl-0.6.1.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f195fc290d0ab1a66f5c8f29d37f1f82
diff --git a/metadata/md5-cache/media-sound/playerctl-2.0.1 b/metadata/md5-cache/media-sound/playerctl-2.0.1
index 37d56cdd5b7b..4a4df5368b8e 100644
--- a/metadata/md5-cache/media-sound/playerctl-2.0.1
+++ b/metadata/md5-cache/media-sound/playerctl-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/acrisci/playerctl/archive/v2.0.1.tar.gz -> playerctl-2.0.1.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b26bc5cb5235a9faa1bd31a6bf0d627c
diff --git a/metadata/md5-cache/media-sound/playerctl-2.0.2 b/metadata/md5-cache/media-sound/playerctl-2.0.2
index 1430b2128da1..6ad911f491a5 100644
--- a/metadata/md5-cache/media-sound/playerctl-2.0.2
+++ b/metadata/md5-cache/media-sound/playerctl-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/acrisci/playerctl/archive/v2.0.2.tar.gz -> playerctl-2.0.2.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5daf113fc93117fd8e99a2868bb42d5e
diff --git a/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1 b/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1
index 7a7767350a70..0a69773bb164 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1
+++ b/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3.18:3[introspection] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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[introspection] >=media-plugins/gst-plugins-bs2b-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 dev-libs/appstream-glib sys-devel/gettext media-sound/pulseaudio[equalizer]
 SLOT=0
 SRC_URI=https://github.com/wwmm/pulseeffects/archive/v3.2.3.tar.gz -> pulseeffects-3.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b3ae0c5f56b52551a8cb54dfd600c7e3
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.4.7 b/metadata/md5-cache/media-sound/pulseeffects-4.4.7
deleted file mode 100644
index 89113bde2c96..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-4.4.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-libs/libsamplerate media-sound/pulseaudio sys-apps/dbus virtual/pkgconfig dev-libs/appstream-glib sys-devel/gettext dev-util/itstool >=dev-util/meson-0.48.2 >=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=bs2b calf mda-lv2 rubberband
-KEYWORDS=amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-libs/libsamplerate media-sound/pulseaudio sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.4.7.tar.gz -> pulseeffects-4.4.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2e2edf5feede564a8ce81c7986d83258
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.5.9 b/metadata/md5-cache/media-sound/pulseeffects-4.5.9
index 6ba1957d2ace..c4ca1d81e0cc 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.5.9
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.5.9
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
 SLOT=0
 SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.5.9.tar.gz -> pulseeffects-4.5.9.tar.gz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=65e4a82fc11a449c40fc4b97ed719def
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.6.0 b/metadata/md5-cache/media-sound/pulseeffects-4.6.0
deleted file mode 100644
index 9f2594853c37..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-4.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=7
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=bs2b calf mda-lv2 rubberband
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.6.0.tar.gz -> pulseeffects-4.6.0.tar.gz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1bf66938253abb1c08383ebcdd809057
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.6.1 b/metadata/md5-cache/media-sound/pulseeffects-4.6.1
new file mode 100644
index 000000000000..b9437920d5a1
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.6.1
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
+DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
+EAPI=7
+HOMEPAGE=https://github.com/wwmm/pulseeffects
+IUSE=bs2b calf mda-lv2 rubberband
+KEYWORDS=amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
+SLOT=0
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.6.1.tar.gz -> pulseeffects-4.6.1.tar.gz
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=65e4a82fc11a449c40fc4b97ed719def
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.6.3 b/metadata/md5-cache/media-sound/pulseeffects-4.6.3
new file mode 100644
index 000000000000..9894ec6a3741
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.6.3
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
+DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
+EAPI=7
+HOMEPAGE=https://github.com/wwmm/pulseeffects
+IUSE=bs2b calf mda-lv2 rubberband
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
+SLOT=0
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.6.3.tar.gz -> pulseeffects-4.6.3.tar.gz
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=466ada9a2b0baaf4da549c95146663f5
diff --git a/metadata/md5-cache/media-sound/pulseeffects-9999 b/metadata/md5-cache/media-sound/pulseeffects-9999
index 784ee71b8841..5ebdb7240f08 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-9999
+++ b/metadata/md5-cache/media-sound/pulseeffects-9999
@@ -1,12 +1,12 @@
 BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 media-libs/lsp-plugins[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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
+DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
 DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
 EAPI=7
 HOMEPAGE=https://github.com/wwmm/pulseeffects
 IUSE=bs2b calf mda-lv2 rubberband
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 media-libs/lsp-plugins[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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
+RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[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 bs2b? ( >=media-plugins/gst-plugins-bs2b-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 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1d701894576bba6d0c83209093932b2d
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=466ada9a2b0baaf4da549c95146663f5
diff --git a/metadata/md5-cache/media-sound/qmmp-1.3.2 b/metadata/md5-cache/media-sound/qmmp-1.3.2
index a4d99a07d2b7..a848479716c4 100644
--- a/metadata/md5-cache/media-sound/qmmp-1.3.2
+++ b/metadata/md5-cache/media-sound/qmmp-1.3.2
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
 EAPI=7
 HOMEPAGE=http://qmmp.ylsoftware.com
 IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( || ( media-libs/libmad media-sound/mpg123 ) ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
 REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.3.2.tar.bz2 mirror://sourceforge/qmmp-dev/files/qmmp-1.3.2.tar.bz2
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=01c24ad1aad4b3b0c5bf2aeaf7d5e1bd
+_md5_=fb1b2e001c9cd7a1e001bbae0a8bcf8e
diff --git a/metadata/md5-cache/media-sound/qsynth-0.5.6 b/metadata/md5-cache/media-sound/qsynth-0.5.6
new file mode 100644
index 000000000000..a5ccf1a26ed1
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qsynth-0.5.6
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=configure install
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+DESCRIPTION=A Qt application to control FluidSynth
+EAPI=7
+HOMEPAGE=http://qsynth.sourceforge.net/
+IUSE=+alsa debug jack pulseaudio
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+REQUIRED_USE=|| ( alsa jack pulseaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/qsynth/qsynth-0.5.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=a77c3a6cb2932d3e95a4f880aadc0eb0
diff --git a/metadata/md5-cache/media-sound/rip-1.07 b/metadata/md5-cache/media-sound/rip-1.07
index 78acd35210c6..7be1a9ec0ebc 100644
--- a/metadata/md5-cache/media-sound/rip-1.07
+++ b/metadata/md5-cache/media-sound/rip-1.07
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install
+DEFINED_PHASES=install
 DESCRIPTION=A command-line based audio CD ripper and mp3 encoder
-EAPI=0
+EAPI=7
 HOMEPAGE=http://rip.sourceforge.net
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=media-sound/cdparanoia virtual/eject dev-lang/perl >=dev-perl/CDDB_get-2.10 >=dev-perl/MP3-Info-0.91 || ( media-sound/vorbis-tools media-sound/lame media-libs/flac media-sound/bladeenc )
 SLOT=0
 SRC_URI=http://rip.sourceforge.net/download/rip-1.07.tar.gz
-_md5_=ba56af2092ddd12117481a8414c5cb9c
+_md5_=35b81b3da410381d99dc7538a480c56b
diff --git a/metadata/md5-cache/media-sound/sox-14.4.2-r1 b/metadata/md5-cache/media-sound/sox-14.4.2-r1
index 007d357006b0..73f1afb14287 100644
--- a/metadata/md5-cache/media-sound/sox-14.4.2-r1
+++ b/metadata/md5-cache/media-sound/sox-14.4.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The swiss army knife of sound processing programs
 EAPI=6
 HOMEPAGE=http://sox.sourceforge.net
 IUSE=alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libltdl:0= >=media-sound/gsm-1.0.12-r1 alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ao? ( media-libs/libao ) encode? ( >=media-sound/lame-3.98.4 ) flac? ( >=media-libs/flac-1.1.3 ) id3tag? ( media-libs/libid3tag ) ladspa? ( media-libs/ladspa-sdk ) mad? ( media-libs/libmad ) ogg? ( media-libs/libogg media-libs/libvorbis ) opus? ( media-libs/opus media-libs/opusfile ) png? ( media-libs/libpng:0= sys-libs/zlib ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.11 ) twolame? ( media-sound/twolame ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=mirror://sourceforge/sox/sox-14.4.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=fee6ae06b36e1dd59f939e325478ec13
+_md5_=46953b79acb523d7ec82f9b829f260e7
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-3.2.3 b/metadata/md5-cache/media-sound/teamspeak-client-3.2.3
deleted file mode 100644
index 7e02e14c7c69..000000000000
--- a/metadata/md5-cache/media-sound/teamspeak-client-3.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DESCRIPTION=A client software for quality voice communication via the internet
-EAPI=7
-HOMEPAGE=https://www.teamspeak.com/
-IUSE=alsa pulseaudio
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=teamspeak3
-RDEPEND=app-arch/snappy:0/1 <dev-libs/openssl-1.1:0 dev-libs/quazip dev-qt/qtcore:5 dev-qt/qtgui:5[accessibility,dbus,xcb] dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[geolocation,widgets] dev-qt/qtwidgets:5 net-libs/libsrtp:0 sys-libs/libcxx[libcxxabi] sys-libs/zlib:0/1 virtual/udev alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
-REQUIRED_USE=|| ( alsa pulseaudio )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.2.3/TeamSpeak3-Client-linux_amd64-3.2.3.run ) x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.2.3/TeamSpeak3-Client-linux_x86-3.2.3.run )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=dadf37cc33d9d330a7d2f27404b6668f
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-3.2.3-r1 b/metadata/md5-cache/media-sound/teamspeak-client-3.2.3-r1
deleted file mode 100644
index e2766cf5cd06..000000000000
--- a/metadata/md5-cache/media-sound/teamspeak-client-3.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DESCRIPTION=A client software for quality voice communication via the internet
-EAPI=7
-HOMEPAGE=https://www.teamspeak.com/
-IUSE=alsa pulseaudio
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=teamspeak3
-RDEPEND=app-arch/snappy:0/1 =dev-libs/openssl-1.0*:* dev-libs/quazip <dev-qt/qtcore-5.12.0:5 <dev-qt/qtgui-5.12.0:5[accessibility,dbus,xcb] <dev-qt/qtnetwork-5.12.0:5 <dev-qt/qtsql-5.12.0:5[sqlite] <dev-qt/qtsvg-5.12.0:5 <dev-qt/qtwebchannel-5.12.0:5 <dev-qt/qtwebengine-5.12.0:5[geolocation,widgets] <dev-qt/qtwidgets-5.12.0:5 net-libs/libsrtp:0 sys-libs/libcxx[libcxxabi] sys-libs/zlib:0/1 virtual/udev alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
-REQUIRED_USE=|| ( alsa pulseaudio )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.2.3/TeamSpeak3-Client-linux_amd64-3.2.3.run ) x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.2.3/TeamSpeak3-Client-linux_x86-3.2.3.run )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9b913ed432b84142e816928598571931
diff --git a/metadata/md5-cache/media-sound/vb2rip-1.4 b/metadata/md5-cache/media-sound/vb2rip-1.4
index 8bfb71d0e66e..8a566b3abb59 100644
--- a/metadata/md5-cache/media-sound/vb2rip-1.4
+++ b/metadata/md5-cache/media-sound/vb2rip-1.4
@@ -1,12 +1,11 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=configure install
 DESCRIPTION=Konami VB2 sound format ripping utility
-EAPI=0
+EAPI=7
 HOMEPAGE=http://www.neillcorlett.com/vb2rip
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=app-arch/unzip
 SLOT=0
 SRC_URI=http://www.neillcorlett.com/vb2rip/vb2rip14.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=67ee8b593bba9bcfebc75d0e1858c954
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=498ebbe170b52d2327fc47c1a108af61
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index ab8608a1d836..9d86c3c1122c 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.2_pre20140701-r2 b/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r2
index a7e32da64762..be00f6fdb06c 100644
--- a/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r2
+++ b/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Movie creator from photos and video clips
 EAPI=6
 HOMEPAGE=https://ffdiaporama.tuxfamily.org
 IUSE=libav openclipart texturemate
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 texturemate? ( CC-BY-3.0 )
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= libav? ( >=media-video/libav-11:0=[encode] ) !libav? ( >=media-video/ffmpeg-3:0=[encode] ) openclipart? ( media-gfx/openclipart[svg,-gzip] )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/ffdiaporama/Packages/Devel/ffdiaporama_bin_2.2.devel.2014.0701.tar.gz https://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 https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-4.0.patch texturemate? ( https://download.tuxfamily.org/ffdiaporama/Packages/Stable/ffdiaporama_texturemate_1.0.2014.0125.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=72a8533947c26371401cd566bccdd80c
+_md5_=f659eec9e02d3b82f1d3efbfcb9ea6be
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.1.3 b/metadata/md5-cache/media-video/ffmpeg-4.1.3
index 33a5085082ba..cd78eeea3fdb 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.1.3
+++ b/metadata/md5-cache/media-video/ffmpeg-4.1.3
@@ -4,7 +4,7 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=6
 HOMEPAGE=https://ffmpeg.org/
 IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass lv2 truetype rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~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 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -12,4 +12,4 @@ RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.1.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a17db8a35b9172a52842b5eea0bd426
+_md5_=06754ab12695fad4c1ef8884900a33bd
diff --git a/metadata/md5-cache/media-video/gnome-mpv-0.14 b/metadata/md5-cache/media-video/gnome-mpv-0.14
index 018a007bed0f..3627fe24d5bd 100644
--- a/metadata/md5-cache/media-video/gnome-mpv-0.14
+++ b/metadata/md5-cache/media-video/gnome-mpv-0.14
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44 >=x11-libs/gtk+-3.20:3 >=media-video/mpv-0.27[libmpv] media-libs/libepoxy
 SLOT=0
 SRC_URI=https://github.com/gnome-mpv/gnome-mpv/releases/download/v0.14/gnome-mpv-0.14.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=fec7625ab79c92edbfac7175e5c28f2b
diff --git a/metadata/md5-cache/media-video/gnome-mpv-0.15 b/metadata/md5-cache/media-video/gnome-mpv-0.15
index b8c02a648459..cc5bde2020ef 100644
--- a/metadata/md5-cache/media-video/gnome-mpv-0.15
+++ b/metadata/md5-cache/media-video/gnome-mpv-0.15
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/glib-2.44 >=x11-libs/gtk+-3.20:3 >=media-video/mpv-0.27[libmp
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gnome-mpv/gnome-mpv/releases/download/v0.15/gnome-mpv-0.15.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=043a6db07f1143a75cc05cb0ea0bea31
diff --git a/metadata/md5-cache/media-video/gnome-mpv-0.16 b/metadata/md5-cache/media-video/gnome-mpv-0.16
index c7ca0d8e0881..d41d87cc8a22 100644
--- a/metadata/md5-cache/media-video/gnome-mpv-0.16
+++ b/metadata/md5-cache/media-video/gnome-mpv-0.16
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44 >=x11-libs/gtk+-3.22.23:3 >=media-video/mpv-0.27[libmpv] media-libs/libepoxy
 SLOT=0
 SRC_URI=https://github.com/gnome-mpv/gnome-mpv/releases/download/v0.16/gnome-mpv-0.16.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5c293f0c68862543713ae4e2980251e3
diff --git a/metadata/md5-cache/media-video/motion-4.1.1-r1 b/metadata/md5-cache/media-video/motion-4.1.1-r1
index 4dc5bcb05b10..f243692b2743 100644
--- a/metadata/md5-cache/media-video/motion-4.1.1-r1
+++ b/metadata/md5-cache/media-video/motion-4.1.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A software motion detector
 EAPI=6
 HOMEPAGE=https://motion-project.github.io
 IUSE=ffmpeg libav mmal mysql postgres sqlite v4l webp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:= ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= )
 SLOT=0
 SRC_URI=https://github.com/Motion-Project/motion/archive/release-4.1.1.tar.gz -> motion-release-4.1.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=50c8a5ad64912655fb8bdc9de70e4394
+_md5_=528837eb1be0cd1d570147f09be03693
diff --git a/metadata/md5-cache/media-video/parole-1.0.1 b/metadata/md5-cache/media-video/parole-1.0.1
deleted file mode 100644
index 19a3c9f741b8..000000000000
--- a/metadata/md5-cache/media-video/parole-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=A simple Xfce4 media player using GStreamer
-EAPI=6
-HOMEPAGE=https://docs.xfce.org/apps/parole/start
-IUSE=libnotify taglib
-KEYWORDS=amd64 ~mips x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) media-plugins/gst-plugins-meta:1.0
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/parole/1.0/parole-1.0.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4fe96dccfee59b143b11d6522e8a1f7c
diff --git a/metadata/md5-cache/media-video/pitivi-0.98.1 b/metadata/md5-cache/media-video/pitivi-0.98.1
index 176ce68f1282..00b90e4b2efe 100644
--- a/metadata/md5-cache/media-video/pitivi-0.98.1
+++ b/metadata/md5-cache/media-video/pitivi-0.98.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_s
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.98/pitivi-0.98.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=5fe04727329933ed1711e48328224e5f
diff --git a/metadata/md5-cache/media-video/pitivi-0.999 b/metadata/md5-cache/media-video/pitivi-0.999
index 1f7beba926c2..7472f713d0a4 100644
--- a/metadata/md5-cache/media-video/pitivi-0.999
+++ b/metadata/md5-cache/media-video/pitivi-0.999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_s
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.999/pitivi-0.999.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=4dfbe65bf044cf63ac2f910f31dc6189
diff --git a/metadata/md5-cache/media-video/smplayer-18.10.0 b/metadata/md5-cache/media-video/smplayer-18.10.0
deleted file mode 100644
index 967780610077..000000000000
--- a/metadata/md5-cache/media-video/smplayer-18.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
-EAPI=6
-HOMEPAGE=https://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.10.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f700cad18bd2e27a2e182e4d0043fcfb
diff --git a/metadata/md5-cache/media-video/smplayer-19.1.0 b/metadata/md5-cache/media-video/smplayer-19.1.0
deleted file mode 100644
index 2d85c7b05457..000000000000
--- a/metadata/md5-cache/media-video/smplayer-19.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
-EAPI=6
-HOMEPAGE=https://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-19.1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f700cad18bd2e27a2e182e4d0043fcfb
diff --git a/metadata/md5-cache/media-video/smplayer-19.5.0 b/metadata/md5-cache/media-video/smplayer-19.5.0
new file mode 100644
index 000000000000..8d28d32cf7f4
--- /dev/null
+++ b/metadata/md5-cache/media-video/smplayer-19.5.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=compile configure install postinst postrm preinst 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-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
+EAPI=7
+HOMEPAGE=https://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/mpv[libass,X] media-video/mplayer[bidi?,libass,png,X] )
+SLOT=0
+SRC_URI=mirror://sourceforge/smplayer/smplayer-19.5.0.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=33c61b67f88756ae8f969d724247242b
diff --git a/metadata/md5-cache/media-video/totem-3.30.0 b/metadata/md5-cache/media-video/totem-3.30.0
index 83f1bd96f8be..14870eb05334 100644
--- a/metadata/md5-cache/media-video/totem-3.30.0
+++ b/metadata/md5-cache/media-video/totem-3.30.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.19.4:3[X,introspection?] >=me
 REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.30/totem-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=87bb2020cf0ea2d7d6b75f2eb2c997a4
diff --git a/metadata/md5-cache/media-video/unifi-video-3.10.4 b/metadata/md5-cache/media-video/unifi-video-3.10.4
new file mode 100644
index 000000000000..9ec0c184830a
--- /dev/null
+++ b/metadata/md5-cache/media-video/unifi-video-3.10.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup unpack
+DEPEND=virtual/pkgconfig
+DESCRIPTION=UniFi Video Server
+EAPI=6
+HOMEPAGE=https://www.ubnt.com/download/unifi-video/
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-db/mongodb dev-java/commons-daemon sys-apps/lsb-release sys-libs/libcap virtual/jre:1.8
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.ubnt.com/firmwares/ufv/v3.10.4/unifi-video.Ubuntu16.04_amd64.v3.10.4.deb
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=79e34ecacbf1db40e3e1d7fdd40082df
diff --git a/metadata/md5-cache/media-video/vlc-3.0.6-r1 b/metadata/md5-cache/media-video/vlc-3.0.6-r1
index a6384c4ba04b..8852cc0a74bc 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.6-r1
+++ b/metadata/md5-cache/media-video/vlc-3.0.6-r1
@@ -1,15 +1,15 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20160712:0= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20160712:0= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 -sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20160712:0= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20160712:0= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 SLOT=0/5-9
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.6/vlc-3.0.6.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=107ad06bb145590e920ccd1df41f195f
+_md5_=7af18be0214c8d45658129e828ed9e6f
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index de95096cb7ed..f38398802432 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -1,13 +1,13 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare test unpack
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse test
+IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse test
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 SLOT=0/5-9
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=bfc981284ca19c951dd396ebf096553d
+_md5_=5f787d2bebdb63f3e66cd2e81625a3c1
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 44891c28a3a8..38ef334ca5ad 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,13 +1,13 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare test unpack
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse test
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 SLOT=0/12-9
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=267ad1da930e5df0a1ecd39e0f139bcb
+_md5_=95294d295f93333a29391e6f8261b0bf
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 81327fd2b0d6..fa04605adff6 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/cacti-spine-1.1.38-r1 b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.38-r1
deleted file mode 100644
index a856bfb9e2a5..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.38-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/openssl:* net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
-EAPI=6
-HOMEPAGE=https://cacti.net/spine_info.php
-KEYWORDS=alpha amd64 hppa ~ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/openssl:* net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
-SLOT=0
-SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.1.38.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bdb1a8b718515c4e031b8753467e3288
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.38-r2 b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.38-r2
new file mode 100644
index 000000000000..a851d997f04b
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.38-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/openssl:0= net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
+EAPI=6
+HOMEPAGE=https://cacti.net/spine_info.php
+KEYWORDS=alpha amd64 hppa ~ppc ~ppc64 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/openssl:0= net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
+SLOT=0
+SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.1.38.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=cdbc51799dcab06012728cdf33303654
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.2 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.2
deleted file mode 100644
index f57c2f503cd2..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/openssl:* net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man
-DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
-EAPI=7
-HOMEPAGE=https://cacti.net/spine_info.php
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/openssl:* net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
-SLOT=0
-SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f666e7687199c3b705f63a530775b170
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.2-r1 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.2-r1
new file mode 100644
index 000000000000..95dc2e279c6a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.2-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/openssl:0= net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man
+DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
+EAPI=7
+HOMEPAGE=https://cacti.net/spine_info.php
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/openssl:0= net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
+SLOT=0
+SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=f04c170d0f4bb8a91c017b187f12240a
diff --git a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1 b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
index 32bbe898a8d4..427d4d14312a 100644
--- a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
+++ b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst prepare
 DEPEND=net-libs/libpcap gtk? ( x11-libs/gtk+:2 virtual/jpeg:0 media-libs/giflib:= media-libs/libpng:= ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DESCRIPTION=A program which listens to network traffic and picks out images from TCP streams it observes
+DESCRIPTION=Listen to network traffic and pick out images from TCP streams observed
 EAPI=5
 HOMEPAGE=http://www.ex-parrot.com/~chris/driftnet/
 IUSE=gtk mp3 suid +filecaps
-KEYWORDS=amd64 ppc -sparc x86
+KEYWORDS=amd64 ~arm64 ppc -sparc x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap gtk? ( x11-libs/gtk+:2 virtual/jpeg:0 media-libs/giflib:= media-libs/libpng:= ) mp3? ( media-sound/mpg123 )
 SLOT=0
 SRC_URI=mirror://github/rbu/driftnet/driftnet-0.1.6_p20090401.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=505e027fe97690df7f57beec9055788c
+_md5_=675e04658105fda7688ec93f67320601
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.10.5 b/metadata/md5-cache/net-analyzer/icinga2-2.10.5
new file mode 100644
index 000000000000..3866d9ced33a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.10.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl sys-devel/bison >=sys-devel/flex-2.5.35 apache2? ( =www-servers/apache-2* ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=Distributed, general purpose, network monitoring engine
+EAPI=6
+HOMEPAGE=http://icinga.org/icinga2
+IUSE=classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax apache2
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
+SLOT=0
+SRC_URI=https://github.com/Icinga/icinga2/archive/v2.10.5.tar.gz -> icinga2-2.10.5.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=97b9c06f048a51833d36f9e743faee9d
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1
index f686d9a4171d..d81ee6a59af8 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=6
 HOMEPAGE=http://www.net-snmp.org/
 IUSE=X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
-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=HPND BSD GPL-2
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
 REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/35
 SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.8/net-snmp-5.8.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=019e2e0012920a4fa92d56c4b3ec128b
+_md5_=52007eb612104323ffdb7f8f178ce59f
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.15.0 b/metadata/md5-cache/net-analyzer/netdata-1.15.0
new file mode 100644
index 000000000000..c4951b459a13
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netdata-1.15.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-analyzer/tcpdump net-analyzer/traceroute net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] mysql? ( || ( dev-python/mysqlclient[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mysql-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) tor? ( net-libs/stem[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DESCRIPTION=Linux real time system monitoring, done right!
+EAPI=7
+HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
+IUSE=caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen +filecaps kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ MIT BSD
+RDEPEND=app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-analyzer/tcpdump net-analyzer/traceroute net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] mysql? ( || ( dev-python/mysqlclient[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mysql-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) tor? ( net-libs/stem[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+REQUIRED_USE=mysql? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) tor? ( python )
+SLOT=0
+SRC_URI=https://github.com/netdata/netdata/archive/v1.15.0.tar.gz -> netdata-1.15.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=de86236a3fa6c3ab78b5c591e614fc1e
diff --git a/metadata/md5-cache/net-analyzer/netselect-0.4 b/metadata/md5-cache/net-analyzer/netselect-0.4
index 4d50f948fc6b..254df677e652 100644
--- a/metadata/md5-cache/net-analyzer/netselect-0.4
+++ b/metadata/md5-cache/net-analyzer/netselect-0.4
@@ -3,9 +3,9 @@ DESCRIPTION=Ultrafast implementation of ping
 EAPI=6
 HOMEPAGE=http://apenwarr.ca/netselect/
 IUSE=ipv6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jer/netselect-0.4-ipv6.patch.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b683a72cd2358611d69818b0b472acfb
+_md5_=dcb76cb8949d8dbdcb0da8d2603992a6
diff --git a/metadata/md5-cache/net-analyzer/nmap-9999 b/metadata/md5-cache/net-analyzer/nmap-9999
index 22fa91445cdc..1587ab0ae547 100644
--- a/metadata/md5-cache/net-analyzer/nmap-9999
+++ b/metadata/md5-cache/net-analyzer/nmap-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) ndiff? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) ndiff? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) nls? ( sys-devel/gettext )
 DESCRIPTION=A utility for network discovery and security auditing
-EAPI=6
+EAPI=7
 HOMEPAGE=https://nmap.org/
 IUSE=ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua zenmap python_targets_python2_7
 LICENSE=GPL-2
@@ -9,5 +10,5 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li
 REQUIRED_USE=system-lua? ( nse ) ndiff? ( python_targets_python2_7 ) zenmap? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/nmap-logo-64.png
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b01b3e03a94768ad27936cbe154aaa0
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=c2608ac9f07b0e902effd05b2d98afc0
diff --git a/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0-r1 b/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0-r1
index 399b003abdb2..7e4cc8382937 100644
--- a/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0-r1
+++ b/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Open Source Host-based Intrusion Detection System
 EAPI=7
 HOMEPAGE=https://www.ossec.net/
 IUSE=agent hybrid local mysql postgres server sqlite
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:= )
 REQUIRED_USE=^^ ( agent hybrid local server ) ?? ( mysql postgres )
 SLOT=0
 SRC_URI=https://github.com/ossec/ossec-hids/archive/3.2.0.tar.gz -> ossec-hids-3.2.0.tar.gz
 _eclasses_=user	8bd74731cafdcdad8f7a63637302e073
-_md5_=09c88da2a49680be66585bcbe3c96102
+_md5_=e7139498b4902f3d8f4e8e0ae33d51f8
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.7 b/metadata/md5-cache/net-analyzer/pypacker-4.7
new file mode 100644
index 000000000000..c693758b5539
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/pypacker-4.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Fast and simple packet creation and parsing library for Python
+EAPI=6
+HOMEPAGE=https://gitlab.com/mike01/pypacker
+IUSE=examples python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://gitlab.com/mike01/pypacker/-/archive/v4.7/pypacker-v4.7.tar.gz -> pypacker-4.7.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=08940be134871098455d6ad77cf295b4
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.1 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.1
index c5c7bd472053..66d5e7e3d707 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2128152ee63ba4d2172f4e6f04f4a83d
+_md5_=105ee33d885988c336bc3874f0c18525
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
new file mode 100644
index 000000000000..765d04b6f390
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A system to store and display time-series data
+EAPI=6
+HOMEPAGE=https://oss.oetiker.ch/rrdtool/
+IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.2 )
+RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0/8.0.0
+SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=238504d983faad2bdc3d00b7218b75ec
diff --git a/metadata/md5-cache/net-analyzer/scanlogd-2.2.7 b/metadata/md5-cache/net-analyzer/scanlogd-2.2.7
index c6f51d2bda3a..8fa83f65e534 100644
--- a/metadata/md5-cache/net-analyzer/scanlogd-2.2.7
+++ b/metadata/md5-cache/net-analyzer/scanlogd-2.2.7
@@ -10,5 +10,5 @@ RDEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap )
 REQUIRED_USE=?? ( nids pcap )
 SLOT=0
 SRC_URI=http://www.openwall.com/scanlogd/scanlogd-2.2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ab082d1aada0bf4a19f8131612862c31
diff --git a/metadata/md5-cache/net-analyzer/sngrep-1.4.6 b/metadata/md5-cache/net-analyzer/sngrep-1.4.6
deleted file mode 100644
index c03f888b9c8c..000000000000
--- a/metadata/md5-cache/net-analyzer/sngrep-1.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=net-libs/libpcap sys-libs/ncurses:*[unicode?] openssl? ( dev-libs/openssl:* ) gnutls? ( net-libs/gnutls ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Ncurses SIP Messages flow viewer
-EAPI=6
-HOMEPAGE=https://github.com/irontec/sngrep
-IUSE=eep gnutls ipv6 openssl pcre unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-libs/libpcap sys-libs/ncurses:*[unicode?] openssl? ( dev-libs/openssl:* ) gnutls? ( net-libs/gnutls )
-REQUIRED_USE=gnutls? ( !openssl )
-SLOT=0
-SRC_URI=https://github.com/irontec/sngrep/releases/download/v1.4.6/sngrep-1.4.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=65d0895a8677b713d936e6a803aaf2a1
diff --git a/metadata/md5-cache/net-analyzer/sngrep-1.4.6-r1 b/metadata/md5-cache/net-analyzer/sngrep-1.4.6-r1
new file mode 100644
index 000000000000..9f3ab4bc194d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sngrep-1.4.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=net-libs/libpcap sys-libs/ncurses:0=[unicode?] openssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Ncurses SIP Messages flow viewer
+EAPI=6
+HOMEPAGE=https://github.com/irontec/sngrep
+IUSE=eep gnutls ipv6 openssl pcre unicode
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-libs/libpcap sys-libs/ncurses:0=[unicode?] openssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls )
+REQUIRED_USE=gnutls? ( !openssl )
+SLOT=0
+SRC_URI=https://github.com/irontec/sngrep/releases/download/v1.4.6/sngrep-1.4.6.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c4f28670e716a52f015eabe348ee4ae5
diff --git a/metadata/md5-cache/net-analyzer/thc-ipv6-3.2 b/metadata/md5-cache/net-analyzer/thc-ipv6-3.2
deleted file mode 100644
index 0a2076dadd6a..000000000000
--- a/metadata/md5-cache/net-analyzer/thc-ipv6-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:* )
-DESCRIPTION=complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6
-EAPI=6
-HOMEPAGE=https://www.thc.org/thc-ipv6/
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3 openssl
-RDEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:* )
-SLOT=0
-SRC_URI=https://github.com/vanhauser-thc/thc-ipv6/archive/3.2.tar.gz -> thc-ipv6-3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0383f8fa0af411431b7f6dbbdd676a7c
diff --git a/metadata/md5-cache/net-analyzer/thc-ipv6-3.2-r1 b/metadata/md5-cache/net-analyzer/thc-ipv6-3.2-r1
new file mode 100644
index 000000000000..61b9dd70ed7f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/thc-ipv6-3.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6
+EAPI=6
+HOMEPAGE=https://www.thc.org/thc-ipv6/
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3 openssl
+RDEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=https://github.com/vanhauser-thc/thc-ipv6/archive/3.2.tar.gz -> thc-ipv6-3.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a6123965b26d9070dd21f46949264e71
diff --git a/metadata/md5-cache/net-analyzer/thc-ipv6-9999 b/metadata/md5-cache/net-analyzer/thc-ipv6-9999
index 4845e023f093..be0cc66e3e35 100644
--- a/metadata/md5-cache/net-analyzer/thc-ipv6-9999
+++ b/metadata/md5-cache/net-analyzer/thc-ipv6-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:* ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:0= ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6
 EAPI=6
 HOMEPAGE=https://www.thc.org/thc-ipv6/
 IUSE=ssl
 LICENSE=AGPL-3 openssl
-RDEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:* )
+RDEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:0= )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0383f8fa0af411431b7f6dbbdd676a7c
+_md5_=a6123965b26d9070dd21f46949264e71
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.0.0-r1 b/metadata/md5-cache/net-analyzer/wireshark-3.0.0-r1
deleted file mode 100644
index ff3d6f7c6af9..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<perl-core/Pod-Simple-3.170 !<virtual/perl-Pod-Simple-3.170 dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/make >=dev-util/cmake-3.9.6 filecaps? ( sys-libs/libcap )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=6
-HOMEPAGE=https://www.wireshark.org/
-IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark +udpdump zlib +filecaps python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0/3.0.0
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.0.0.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1198fa59c933ccab7b7d834bc7274324
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.0.2 b/metadata/md5-cache/net-analyzer/wireshark-3.0.2
new file mode 100644
index 000000000000..717729aa2c85
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<perl-core/Pod-Simple-3.170 !<virtual/perl-Pod-Simple-3.170 dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/make >=dev-util/cmake-3.9.6 filecaps? ( sys-libs/libcap )
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=6
+HOMEPAGE=https://www.wireshark.org/
+IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark +udpdump zlib +filecaps python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0/3.0.2
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.0.2.tar.xz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=71d79f8653b259c6a73428035e9c37e8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.19 b/metadata/md5-cache/net-analyzer/zabbix-3.0.19
deleted file mode 100644
index 6dd3803008e1..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.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 ) 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=https://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=https://prdownloads.sourceforge.net/zabbix/zabbix-3.0.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=f28af2e5f7118902ec993e88c63c78f8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.20 b/metadata/md5-cache/net-analyzer/zabbix-3.0.20
deleted file mode 100644
index a48d18c6bcc2..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.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 ) 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=https://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=https://prdownloads.sourceforge.net/zabbix/zabbix-3.0.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=f28af2e5f7118902ec993e88c63c78f8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.21 b/metadata/md5-cache/net-analyzer/zabbix-3.0.21
deleted file mode 100644
index 4da5753b17c6..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.21
+++ /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=https://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=https://prdownloads.sourceforge.net/zabbix/zabbix-3.0.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=f28af2e5f7118902ec993e88c63c78f8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.22 b/metadata/md5-cache/net-analyzer/zabbix-3.0.22
deleted file mode 100644
index a3a743cd7177..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.22
+++ /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=https://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=https://prdownloads.sourceforge.net/zabbix/zabbix-3.0.22.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=dcbe574e092a74d99b0d6a54fa0c5857
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.10 b/metadata/md5-cache/net-analyzer/zabbix-3.4.10
deleted file mode 100644
index ad9f8611d21d..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.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=https://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=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9acf0f7d74ccdec6e0f5d90dcf49c142
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.11 b/metadata/md5-cache/net-analyzer/zabbix-3.4.11
deleted file mode 100644
index 13ca247e992f..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.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=https://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=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9acf0f7d74ccdec6e0f5d90dcf49c142
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.12 b/metadata/md5-cache/net-analyzer/zabbix-3.4.12
deleted file mode 100644
index e039b879ff31..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.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=https://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=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9acf0f7d74ccdec6e0f5d90dcf49c142
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.13 b/metadata/md5-cache/net-analyzer/zabbix-3.4.13
deleted file mode 100644
index 01dda4397aa1..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.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=https://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=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9acf0f7d74ccdec6e0f5d90dcf49c142
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.14 b/metadata/md5-cache/net-analyzer/zabbix-3.4.14
deleted file mode 100644
index 653c8a9d91da..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.14
+++ /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=https://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=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=a6732ca4a7e3096b55dc6a361ee97ff8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.3 b/metadata/md5-cache/net-analyzer/zabbix-4.0.3
deleted file mode 100644
index 267f870f9534..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.3
+++ /dev/null
@@ -1,13 +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-8.1:* ) 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 ) server? ( sys-libs/zlib ) proxy? ( sys-libs/zlib ) 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-8.1:*[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=https://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
-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-8.1:* ) 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 ) server? ( sys-libs/zlib ) proxy? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libpcre dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.4.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=https://prdownloads.sourceforge.net/zabbix/zabbix-4.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=ff2265bc5081b4e82698ae37a64dc4d0
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.4 b/metadata/md5-cache/net-analyzer/zabbix-4.0.4
deleted file mode 100644
index d65de7029482..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.4
+++ /dev/null
@@ -1,13 +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-8.1:* ) 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 ) server? ( sys-libs/zlib ) proxy? ( sys-libs/zlib ) 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-8.1:*[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=https://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
-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-8.1:* ) 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 ) server? ( sys-libs/zlib ) proxy? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libpcre dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.4.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=https://prdownloads.sourceforge.net/zabbix/zabbix-4.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=26e7fd8a55ebe8c7b1e32c65e203f275
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.5 b/metadata/md5-cache/net-analyzer/zabbix-4.0.5
deleted file mode 100644
index a1de940bec97..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.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-8.1:* ) 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 ) server? ( sys-libs/zlib ) proxy? ( sys-libs/zlib ) 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-8.1:*[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=https://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-8.1:* ) 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 ) server? ( sys-libs/zlib ) proxy? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libpcre dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.4.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=https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/4.0.5/zabbix-4.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=a0e895f29751fb3d65437259cc7c758e
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.7 b/metadata/md5-cache/net-analyzer/zabbix-4.0.7
new file mode 100644
index 000000000000..48ea7bdf3f28
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.7
@@ -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-8.1:* ) 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 ) server? ( sys-libs/zlib ) proxy? ( sys-libs/zlib ) 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-8.1:*[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=https://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-8.1:* ) 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 ) server? ( sys-libs/zlib ) proxy? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libpcre dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.4.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=https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/4.0.7/zabbix-4.0.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=a0e895f29751fb3d65437259cc7c758e
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index ab6b1d9710f2..a9aa8e350971 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/ppp-2.4.7-r7 b/metadata/md5-cache/net-dialup/ppp-2.4.7-r7
index 55860e969010..da6fd38a3b99 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.7-r7
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.7-r7
@@ -4,11 +4,11 @@ DESCRIPTION=Point-to-Point Protocol (PPP)
 EAPI=6
 HOMEPAGE=https://ppp.samba.org/
 IUSE=activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius kernel_linux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~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 ) !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-7.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=585ef2e34c771bb9722077816343490d
+_md5_=a73193f098d82517fab26a505b6112c0
diff --git a/metadata/md5-cache/net-dialup/ppp-scripts-0 b/metadata/md5-cache/net-dialup/ppp-scripts-0
index 4dbaa98fc258..be9789740925 100644
--- a/metadata/md5-cache/net-dialup/ppp-scripts-0
+++ b/metadata/md5-cache/net-dialup/ppp-scripts-0
@@ -3,9 +3,9 @@ DEPEND=!<net-dialup/ppp-2.4.7-r1
 DESCRIPTION=Common set of scripts for various PPP implementations
 EAPI=5
 HOMEPAGE=https://gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=!<net-dialup/ppp-2.4.7-r1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/ppp-scripts-0.tar.xz
-_md5_=f160977cc6e0ab769e4b36f7124812e4
+_md5_=ff1d1bee0b639781a26f9c8abb5bf8e0
diff --git a/metadata/md5-cache/net-dialup/pptpclient-1.10.0 b/metadata/md5-cache/net-dialup/pptpclient-1.10.0
index 250bff3cea9b..f0419debe94b 100644
--- a/metadata/md5-cache/net-dialup/pptpclient-1.10.0
+++ b/metadata/md5-cache/net-dialup/pptpclient-1.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=Linux client for PPTP
 EAPI=7
 HOMEPAGE=http://pptpclient.sourceforge.net/
 IUSE=tk
-KEYWORDS=alpha amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=alpha amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=net-dialup/ppp dev-lang/perl tk? ( dev-perl/Tk ) sys-apps/iproute2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pptpclient/pptp-1.10.0.tar.gz https://dev.gentoo.org/~pinkbyte/distfiles/pptpclient/pptp-command-20130515.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=704d43b31da76cbfd23a3c67990cf825
+_md5_=5d389a852a5051bb6785ebdbefad83af
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.10 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.10
index cf902a26a24d..b74867e3b00f 100644
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.10
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.3.10
@@ -4,10 +4,10 @@ DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
 EAPI=6
 HOMEPAGE=http://www.xelerance.com/services/software/xl2tpd/
 IUSE=dnsretry
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~mips ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap >sys-kernel/linux-headers-2.6 net-dialup/ppp
 SLOT=0
 SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.10.tar.gz -> xl2tpd-1.3.10.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=81781f806566dd0170d638dbf2b46388
+_md5_=a274efd4660fd1b177ca50bd1ee3ab66
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 8a0f956b605a..a85e6f987a22 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-tools-9.12.3_p4 b/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
index 9866c28b937b..a4581430576d 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
+++ b/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
@@ -5,7 +5,7 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=7
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libedit libidn2 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
+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:0= ) ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl ) idn? ( !libidn2 ) libidn2? ( !idn )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.12.3-P4/?version=tar-gz -> bind-9.12.3_p4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=6b17014fc28049f822ed1a3367f510ed
+_md5_=552f8292e3d2ba8c10c65c7db33d7385
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.80 b/metadata/md5-cache/net-dns/dnsmasq-2.80
index 4270fe8f9a31..69c92cb25e48 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.80
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.80
@@ -5,11 +5,11 @@ DESCRIPTION=Small forwarding DNS server
 EAPI=7
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
 IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile 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 ~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:0= ) libidn2? ( >=net-dns/libidn2-2.0:= ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack:= ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( >=dev-libs/nettle-3.4:=[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.80.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=4e4733b990aa15d57235ef57a25c3a68
+_md5_=a6db44ab317de0c0245a8aa77ea27aff
diff --git a/metadata/md5-cache/net-dns/ldns-utils-1.7.0-r1 b/metadata/md5-cache/net-dns/ldns-utils-1.7.0-r1
index e183e829decc..5ad67cbb6997 100644
--- a/metadata/md5-cache/net-dns/ldns-utils-1.7.0-r1
+++ b/metadata/md5-cache/net-dns/ldns-utils-1.7.0-r1
@@ -4,10 +4,10 @@ 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
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=net-libs/ldns-1.7.0[dane?,ecdsa?,gost?] examples? ( net-libs/libpcap )
 REQUIRED_USE=ecdsa? ( ssl ) dane? ( ssl ) gost? ( ssl )
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz
-_md5_=5a97c5b2e35bf8aba842c1f210c2ce3f
+_md5_=d92fc867327b37b682b7457278d9c274
diff --git a/metadata/md5-cache/net-dns/libidn2-2.2.0 b/metadata/md5-cache/net-dns/libidn2-2.2.0
new file mode 100644
index 000000000000..d387ebff5a0f
--- /dev/null
+++ b/metadata/md5-cache/net-dns/libidn2-2.2.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl sys-apps/help2man
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-3+
+RDEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/2
+SRC_URI=mirror://gnu/libidn/libidn2-2.2.0.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=767a6097b672bd36f4f37dbf676f0b75
diff --git a/metadata/md5-cache/net-dns/openresolv-3.9.0 b/metadata/md5-cache/net-dns/openresolv-3.9.0
index bb260ef3ebd9..e9c985b1f9bb 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=7
 HOMEPAGE=https://roy.marples.name/projects/openresolv
 IUSE=selinux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=selinux? ( sec-policy/selinux-resolvconf )
 SLOT=0
 SRC_URI=https://roy.marples.name/downloads/openresolv/openresolv-3.9.0.tar.xz
-_md5_=bbb19cf4550e548e54b7d22f329c35bd
+_md5_=ea10bb6dac58f92f921d77e28accae14
diff --git a/metadata/md5-cache/net-dns/pdns-4.1.8 b/metadata/md5-cache/net-dns/pdns-4.1.8
index 1e31a09bdf35..49e2458d7a18 100644
--- a/metadata/md5-cache/net-dns/pdns-4.1.8
+++ b/metadata/md5-cache/net-dns/pdns-4.1.8
@@ -5,11 +5,11 @@ DESCRIPTION=The PowerDNS Daemon
 EAPI=7
 HOMEPAGE=https://www.powerdns.com/
 IUSE=botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
 REQUIRED_USE=mydns? ( mysql )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.1.8.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=1f11419a66304cef9152d46615931739
+_md5_=1121cc524750160123c58d476b899358
diff --git a/metadata/md5-cache/net-dns/pdns-4.2.0_rc1 b/metadata/md5-cache/net-dns/pdns-4.2.0_rc1
new file mode 100644
index 000000000000..629bb553468d
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-4.2.0_rc1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst preinst
+DEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
+DESCRIPTION=The PowerDNS Daemon
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test
+LICENSE=GPL-2
+RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
+REQUIRED_USE=mydns? ( mysql )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-4.2.0-rc1.tar.bz2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=17be432e357e9b3f7601663e7b72817c
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.1.12 b/metadata/md5-cache/net-dns/pdns-recursor-4.1.12
index aca8a02a17d7..e4737388e536 100644
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.1.12
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.1.12
@@ -5,10 +5,10 @@ DESCRIPTION=The PowerDNS Recursor
 EAPI=7
 HOMEPAGE=https://www.powerdns.com/
 IUSE=libressl luajit protobuf snmp sodium systemd
-KEYWORDS=~amd64 ~arm ~x86
+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.12.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=06f4ce7baae68ab88ff3ab4826bcfc34
+_md5_=0adfeba4e2f243a2197d55b482d6856e
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.1.13 b/metadata/md5-cache/net-dns/pdns-recursor-4.1.13
new file mode 100644
index 000000000000..2fa6552fa661
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.1.13
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:=
+DESCRIPTION=The PowerDNS Recursor
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=debug 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.13.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=3af74e7afaf5d025a265fe990e382357
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.2.0_rc1 b/metadata/md5-cache/net-dns/pdns-recursor-4.2.0_rc1
new file mode 100644
index 000000000000..2807e4902653
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.2.0_rc1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:=
+DESCRIPTION=The PowerDNS Recursor
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=debug libressl luajit protobuf snmp sodium systemd
+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.2.0-rc1.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9f41b21d84a95873e19c5653475c8fab
diff --git a/metadata/md5-cache/net-dns/unbound-1.9.1 b/metadata/md5-cache/net-dns/unbound-1.9.1
index 98199cf3e73f..15adf95dd493 100644
--- a/metadata/md5-cache/net-dns/unbound-1.9.1
+++ b/metadata/md5-cache/net-dns/unbound-1.9.1
@@ -5,11 +5,11 @@ DESCRIPTION=A validating, recursive and caching DNS resolver
 EAPI=7
 HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
 IUSE=debug dnscrypt dnstap +ecdsa ecs gost libressl python redis 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.9.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=e70d40c9d92b27d16de45ae41852be80
+_md5_=caa523c4ce04b3de62008dd16993ccd1
diff --git a/metadata/md5-cache/net-dns/unbound-1.9.1-r1 b/metadata/md5-cache/net-dns/unbound-1.9.1-r1
new file mode 100644
index 000000000000..f8853c2380a3
--- /dev/null
+++ b/metadata/md5-cache/net-dns/unbound-1.9.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) redis? ( dev-libs/hiredis:= ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd )
+DESCRIPTION=A validating, recursive and caching DNS resolver
+EAPI=7
+HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
+IUSE=debug dnscrypt dnstap +ecdsa ecs gost libressl python redis 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0/8
+SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.9.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=d355b12926cb10276156179fc0e8bc0d
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 563925fafd06..f3886f0c4494 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/firewalld-0.6.3 b/metadata/md5-cache/net-firewall/firewalld-0.6.3
index 7c9e9d6dc572..bb85b7ef793a 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.6.3
+++ b/metadata/md5-cache/net-firewall/firewalld-0.6.3
@@ -4,7 +4,7 @@ DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
 EAPI=6
 HOMEPAGE=http://www.firewalld.org/
 IUSE=gui kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 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 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] !!net-firewall/gshield dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-firewall/ebtables net-firewall/iptables[ipv6] net-firewall/ipset net-firewall/nftables || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.6.3.tar.gz -> firewalld-0.6.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6d7049e9b9215b0ec1d9c78274bc847e
+_md5_=ada1634c4a1cd3f43f79b1e94f5e4f44
diff --git a/metadata/md5-cache/net-firewall/ipset-6.38 b/metadata/md5-cache/net-firewall/ipset-6.38
new file mode 100644
index 000000000000..e3b65c41a4c1
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/ipset-6.38
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst setup
+DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=IPset tool for iptables, successor to ippool
+EAPI=6
+HOMEPAGE=http://ipset.netfilter.org/
+IUSE=kernel_linux kernel_linux kernel_linux modules
+KEYWORDS=~amd64 ~arm ~arm64 ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=http://ipset.netfilter.org/ipset-6.38.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c60170342850a0675aaec0c8c191c2bd
diff --git a/metadata/md5-cache/net-firewall/ipset-7.0 b/metadata/md5-cache/net-firewall/ipset-7.0
new file mode 100644
index 000000000000..338930ae85c2
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/ipset-7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst setup
+DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=IPset tool for iptables, successor to ippool
+EAPI=6
+HOMEPAGE=http://ipset.netfilter.org/
+IUSE=kernel_linux kernel_linux kernel_linux modules
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=http://ipset.netfilter.org/ipset-7.0.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=02bba8c55e38a1151004291d538c6342
diff --git a/metadata/md5-cache/net-firewall/ipset-7.1 b/metadata/md5-cache/net-firewall/ipset-7.1
new file mode 100644
index 000000000000..d82fb4277d24
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/ipset-7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst setup
+DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=IPset tool for iptables, successor to ippool
+EAPI=6
+HOMEPAGE=http://ipset.netfilter.org/
+IUSE=kernel_linux kernel_linux kernel_linux modules
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=http://ipset.netfilter.org/ipset-7.1.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=02bba8c55e38a1151004291d538c6342
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.21-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
deleted file mode 100644
index b6e3015e4ddd..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnfnetlink ) virtual/os-headers virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=5
-HOMEPAGE=https://www.netfilter.org/projects/iptables/
-IUSE=conntrack ipv6 netlink static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.4.21.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b59c757bac39156d5b499499782db387
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.21-r5 b/metadata/md5-cache/net-firewall/iptables-1.4.21-r5
deleted file mode 100644
index d337e06b52cd..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.21-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnfnetlink ) pcap? ( net-libs/libpcap ) virtual/os-headers virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=5
-HOMEPAGE=https://www.netfilter.org/projects/iptables/
-IUSE=conntrack ipv6 netlink pcap static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnfnetlink ) pcap? ( net-libs/libpcap )
-SLOT=0/10
-SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.4.21.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a4d4b35d251af0c821c55270c9e01c6d
diff --git a/metadata/md5-cache/net-firewall/iptables-1.8.1-r1 b/metadata/md5-cache/net-firewall/iptables-1.8.1-r1
deleted file mode 100644
index 507c915e3f73..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.8.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.1.1:0= ) pcap? ( net-libs/libpcap ) virtual/os-headers >=sys-kernel/linux-headers-4.4:0 virtual/pkgconfig nftables? ( sys-devel/flex virtual/yacc ) virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=6
-HOMEPAGE=https://www.netfilter.org/projects/iptables/
-IUSE=conntrack ipv6 netlink nftables pcap static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.1.1:0= ) pcap? ( net-libs/libpcap ) nftables? ( net-misc/ethertypes )
-SLOT=0/12
-SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.8.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c4b9d77c8a9fdcab52a055ef1c9b08a
diff --git a/metadata/md5-cache/net-firewall/iptables-1.8.2 b/metadata/md5-cache/net-firewall/iptables-1.8.2
deleted file mode 100644
index 78b9f0a8977f..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.1.1:0= ) pcap? ( net-libs/libpcap ) virtual/os-headers >=sys-kernel/linux-headers-4.4:0 virtual/pkgconfig nftables? ( sys-devel/flex virtual/yacc ) virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=6
-HOMEPAGE=https://www.netfilter.org/projects/iptables/
-IUSE=conntrack ipv6 netlink nftables pcap static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.1.1:0= ) pcap? ( net-libs/libpcap ) nftables? ( net-misc/ethertypes )
-SLOT=0/12
-SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.8.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bfd95cf5aa1e9ce97a3861cd0771b2de
diff --git a/metadata/md5-cache/net-firewall/iptables-1.8.3 b/metadata/md5-cache/net-firewall/iptables-1.8.3
new file mode 100644
index 000000000000..c266053d6afc
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/iptables-1.8.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig nftables? ( sys-devel/flex virtual/yacc ) virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare
+DEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.1.3:0= ) pcap? ( net-libs/libpcap ) virtual/os-headers >=sys-kernel/linux-headers-4.4:0
+DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
+EAPI=7
+HOMEPAGE=https://www.netfilter.org/projects/iptables/
+IUSE=conntrack ipv6 netlink nftables pcap static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.1.3:0= ) pcap? ( net-libs/libpcap ) nftables? ( net-misc/ethertypes )
+SLOT=0/12
+SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.8.3.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9d08f6ce3cfc52815348585cfbab7b49
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.0-r4 b/metadata/md5-cache/net-firewall/nftables-0.9.0-r4
index afa094c13e75..c630bd62b721 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.9.0-r4
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.0-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
 EAPI=6
 HOMEPAGE=https://netfilter.org/projects/nftables/
 IUSE=debug doc +gmp json +modern_kernel +readline kernel_linux
-KEYWORDS=~amd64 ~arm ~ia64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.1:0=
 SLOT=0
 SRC_URI=https://git.netfilter.org/nftables/snapshot/v0.9.0.tar.gz -> nftables-0.9.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ac3ec643a13e08ed8abb06bcdad8370f
+_md5_=790435165b25c0386bb08de655147349
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index f6537362257d..ca2c590c28a5 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.10.4 b/metadata/md5-cache/net-fs/samba-4.10.4
new file mode 100644
index 000000000000..b3ec101f9445
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.10.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.4[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !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 ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.4[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !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 ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls json winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.10.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=113b267d12d0e248dbcc349f9d2eba74
diff --git a/metadata/md5-cache/net-fs/samba-4.8.12 b/metadata/md5-cache/net-fs/samba-4.8.12
new file mode 100644
index 000000000000..e6605516ac5d
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.8.12
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.8[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam profiling-data 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.8[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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 winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.8.12.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=053d5ceed20c13c07258494e83eb82d0
diff --git a/metadata/md5-cache/net-fs/samba-4.9.8 b/metadata/md5-cache/net-fs/samba-4.9.8
new file mode 100644
index 000000000000..9b0e68b2fbc5
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.9.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !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 ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !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 ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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 json winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.9.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=86272cbf0ce15d9f5d03ecbfe158dca3
diff --git a/metadata/md5-cache/net-fs/sshfs-3.5.0 b/metadata/md5-cache/net-fs/sshfs-3.5.0
index 1edd90e95df5..a5ff827736ec 100644
--- a/metadata/md5-cache/net-fs/sshfs-3.5.0
+++ b/metadata/md5-cache/net-fs/sshfs-3.5.0
@@ -9,5 +9,5 @@ RDEPEND=>=sys-fs/fuse-3.1.0:3 >=dev-libs/glib-2.4.2 >=net-misc/openssh-4.4
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/sshfs/releases/download/sshfs-3.5.0/sshfs-3.5.0.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=e1e096a83e591231a35315627f298c71
diff --git a/metadata/md5-cache/net-fs/sshfs-3.5.1 b/metadata/md5-cache/net-fs/sshfs-3.5.1
index 20e5c6129614..c5c668cb6266 100644
--- a/metadata/md5-cache/net-fs/sshfs-3.5.1
+++ b/metadata/md5-cache/net-fs/sshfs-3.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/fuse-3.1.0:3 >=dev-libs/glib-2.4.2 >=net-misc/openssh-4.4
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/sshfs/releases/download/sshfs-3.5.1/sshfs-3.5.1.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=fc874d4870fa2f30106accedce20cadd
diff --git a/metadata/md5-cache/net-fs/sshfs-3.5.2 b/metadata/md5-cache/net-fs/sshfs-3.5.2
index dd32a6cfcd2d..523b272d3fd9 100644
--- a/metadata/md5-cache/net-fs/sshfs-3.5.2
+++ b/metadata/md5-cache/net-fs/sshfs-3.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/fuse-3.1.0:3 >=dev-libs/glib-2.4.2 >=net-misc/openssh-4.4
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/sshfs/releases/download/sshfs-3.5.2/sshfs-3.5.2.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=920358e13abd6e01349406c460aafefb
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index c25ab7f876e0..beb486f2cd7f 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/proftpd-1.3.6-r3 b/metadata/md5-cache/net-ftp/proftpd-1.3.6-r3
index efed19a7ffa9..85220cd31e6d 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.6-r3
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.6-r3
@@ -4,12 +4,12 @@ DESCRIPTION=An advanced and very configurable FTP server
 EAPI=6
 HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ http://www.thrallingpenguin.com/resources/mod_clamav.htm http://gssmod.sourceforge.net/
 IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique_id vroot xinetd
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pam? ( virtual/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
-REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls )
+REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-0.11rc.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.6.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=9275f1eaf3bb54b87c901ff5c46f0953
+_md5_=3a8d915e3cd11f4d1cd7bf948c7bd26a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 84ca23ae12a3..440901b92bae 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/gajim-1.1.3 b/metadata/md5-cache/net-im/gajim-1.1.3
new file mode 100644
index 000000000000..cd4951ce7e7e
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.1.3
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/gobject-introspection[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=7
+HOMEPAGE=https://www.gajim.org/
+IUSE=+crypt geolocation jingle networkmanager remote rst +spell upnp +webp python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.22:3[introspection] dev-python/idna[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/precis-i18n[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycurl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pyopenssl-0.14[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-nbxmpp-0.6.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/secretstorage-3.1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/cssutils-1.0.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] crypt? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-gnupg-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.gajim.org/downloads/1.1/gajim-1.1.3.tar.bz2
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=7813ccecaee41b9fe25d9ed2508a626e
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.6.3 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.6.3
index c50ff14b2dcb..0f7d0bb33c10 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-1.6.3
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-1.6.3
@@ -4,9 +4,9 @@ DESCRIPTION=Official desktop client for Telegram (binary package)
 EAPI=6
 HOMEPAGE=https://desktop.telegram.org
 KEYWORDS=-* ~amd64 ~x86
-LICENSE=telegram
+LICENSE=GPL-3-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb] >=media-libs/fontconfig-2.13
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.6.3.tar.gz -> tdesktop-1.6.3.tar.gz amd64? ( https://github.com/telegramdesktop/tdesktop/releases/download/v1.6.3/tsetup.1.6.3.tar.xz ) x86? ( https://github.com/telegramdesktop/tdesktop/releases/download/v1.6.3/tsetup32.1.6.3.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2aee57b7424a544d12f21c54261736aa
+_md5_=28f0d61cf23c32d15620e1400d9d4a9f
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.6.7 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.6.7
index d771c7f617aa..14bf48380558 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-1.6.7
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-1.6.7
@@ -4,9 +4,9 @@ DESCRIPTION=Official desktop client for Telegram (binary package)
 EAPI=7
 HOMEPAGE=https://desktop.telegram.org
 KEYWORDS=-* ~amd64 ~x86
-LICENSE=telegram
+LICENSE=GPL-3-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb] >=media-libs/fontconfig-2.13
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.6.7.tar.gz -> tdesktop-1.6.7.tar.gz amd64? ( https://github.com/telegramdesktop/tdesktop/releases/download/v1.6.7/tsetup.1.6.7.tar.xz ) x86? ( https://github.com/telegramdesktop/tdesktop/releases/download/v1.6.7/tsetup32.1.6.7.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8c2dd4457c42e2698d54193ac9934b15
+_md5_=1d99ada2ad74261427f1076a5067ad35
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.7.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.7.0
index 6eb306498bb0..9d5f6494c1c9 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-1.7.0
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-1.7.0
@@ -4,9 +4,9 @@ DESCRIPTION=Official desktop client for Telegram (binary package)
 EAPI=7
 HOMEPAGE=https://desktop.telegram.org
 KEYWORDS=-* ~amd64 ~x86
-LICENSE=telegram
+LICENSE=GPL-3-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.7.0.tar.gz -> tdesktop-1.7.0.tar.gz amd64? ( https://github.com/telegramdesktop/tdesktop/releases/download/v1.7.0/tsetup.1.7.0.tar.xz ) x86? ( https://github.com/telegramdesktop/tdesktop/releases/download/v1.7.0/tsetup32.1.7.0.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9372dfca6ef05508f6752b2409d9c7b4
+_md5_=916894d60f324c1e1af91db775841a3d
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 5ac1ee2b4794..2c691b137fad 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/hexchat-2.14.1 b/metadata/md5-cache/net-irc/hexchat-2.14.1
index b33dcbd86931..89965e5a9a4f 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.1
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5d0ffa18c613770224e0eb94959b8046
diff --git a/metadata/md5-cache/net-irc/hexchat-2.14.2 b/metadata/md5-cache/net-irc/hexchat-2.14.2
index 182292d16875..6f6e0c5626dd 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.2
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=03a275dd174678f7a097e45df114fa02
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index 00ec08034cb4..a5483f7cd04a 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2 plugin-fishlim? ( MIT )
 RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c9a656b6e9581a727c5a727a7b377909
diff --git a/metadata/md5-cache/net-irc/inspircd-3.1.0 b/metadata/md5-cache/net-irc/inspircd-3.1.0
new file mode 100644
index 000000000000..21dfad48cfe2
--- /dev/null
+++ b/metadata/md5-cache/net-irc/inspircd-3.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-lang/perl gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls:= ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) re2? ( dev-libs/re2:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( dev-libs/openssl:= ) tre? ( dev-libs/tre )
+DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
+EAPI=7
+HOMEPAGE=https://inspircd.github.com/
+IUSE=debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls:= ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) re2? ( dev-libs/re2:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( dev-libs/openssl:= ) tre? ( dev-libs/tre )
+SLOT=0
+SRC_URI=https://github.com/inspircd/inspircd/archive/v3.1.0.tar.gz -> inspircd-3.1.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=ea31b08fcff83055d1acbd5e7ab18f0e
diff --git a/metadata/md5-cache/net-irc/irssi-1.2.0-r2 b/metadata/md5-cache/net-irc/irssi-1.2.0-r2
index b6cf9ac7eebf..487b451737fa 100644
--- a/metadata/md5-cache/net-irc/irssi-1.2.0-r2
+++ b/metadata/md5-cache/net-irc/irssi-1.2.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 !net-irc/irssi-otr ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig
+DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig
 DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=6
 HOMEPAGE=https://irssi.org/
 IUSE=otr +perl selinux socks5 +proxy libressl
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 !net-irc/irssi-otr ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
+RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/irssi/irssi/releases/download/1.2.0/irssi-1.2.0.tar.xz
 _eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e1f84b32a6fda73fb7a9c5e538966e4c
+_md5_=4b30a72b5385aa3fa1d4c4cda11db24b
diff --git a/metadata/md5-cache/net-irc/irssi-9999 b/metadata/md5-cache/net-irc/irssi-9999
index f2330ef36edc..4afc40d9ee62 100644
--- a/metadata/md5-cache/net-irc/irssi-9999
+++ b/metadata/md5-cache/net-irc/irssi-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 !net-irc/irssi-otr ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig dev-lang/perl || ( www-client/lynx www-client/elinks ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig dev-lang/perl || ( www-client/lynx www-client/elinks ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=6
 HOMEPAGE=https://irssi.org/
 IUSE=otr +perl selinux socks5 +proxy libressl
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 !net-irc/irssi-otr ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
+RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=49d96ec98216f5e9a3612b901d232daf
+_md5_=87eca37519a094c930c2ded5f256b786
diff --git a/metadata/md5-cache/net-irc/polari-3.30.2 b/metadata/md5-cache/net-irc/polari-3.30.2
index 03634f9dc652..262654e280f4 100644
--- a/metadata/md5-cache/net-irc/polari-3.30.2
+++ b/metadata/md5-cache/net-irc/polari-3.30.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.53.90 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] >=net-irc/telepathy-idle-0.2
 SLOT=0
 SRC_URI=mirror://gnome/sources/polari/3.30/polari-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c79c882615ac825b624dc0c3cf9ba1d4
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 3eab5a213b4c..ba66122dceeb 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/axtls-1.5.3 b/metadata/md5-cache/net-libs/axtls-1.5.3
index d433faa6fee9..96cc813bfaa4 100644
--- a/metadata/md5-cache/net-libs/axtls-1.5.3
+++ b/metadata/md5-cache/net-libs/axtls-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/axtls/axTLS-1.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cb3c474f26ad7e645244717dd8ece381
diff --git a/metadata/md5-cache/net-libs/axtls-2.1.3 b/metadata/md5-cache/net-libs/axtls-2.1.3
index 75e2cb7edf29..59eea231eaae 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.3
+++ b/metadata/md5-cache/net-libs/axtls-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0/1
 SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.3.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=fa0b0ca2e2e8c9b2d74ad2e4041d7b00
diff --git a/metadata/md5-cache/net-libs/axtls-2.1.4 b/metadata/md5-cache/net-libs/axtls-2.1.4
index 32598be90293..453b01bec60e 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.4
+++ b/metadata/md5-cache/net-libs/axtls-2.1.4
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0/1
 SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.4.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=723391bf0cc7a34961cebeea0dea9817
diff --git a/metadata/md5-cache/net-libs/axtls-2.1.5 b/metadata/md5-cache/net-libs/axtls-2.1.5
index 3a696c3889df..c05506acdfea 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.5
+++ b/metadata/md5-cache/net-libs/axtls-2.1.5
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0/1
 SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.5.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=d35b0bfe74f99d3341345383c1e99f3a
diff --git a/metadata/md5-cache/net-libs/c-client-2007f-r6 b/metadata/md5-cache/net-libs/c-client-2007f-r6
index 5f3fdd7fd591..d32f6439ccc2 100644
--- a/metadata/md5-cache/net-libs/c-client-2007f-r6
+++ b/metadata/md5-cache/net-libs/c-client-2007f-r6
@@ -4,10 +4,10 @@ DESCRIPTION=UW IMAP c-client library
 EAPI=6
 HOMEPAGE=http://www.washington.edu/imap/
 IUSE=doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa
-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=Apache-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !net-mail/uw-imap kerberos? ( app-crypt/mit-krb5 )
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z chappa? ( mirror://gentoo/c-client-2007f-chappa-115-all.patch.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=349cd355fbc173f25e3d5ded896ba2e7
+_md5_=2265d9dbcf0b1d2bc784793f97a08767
diff --git a/metadata/md5-cache/net-libs/farstream-0.2.8-r2 b/metadata/md5-cache/net-libs/farstream-0.2.8-r2
index 8a3c716c6774..f7cb6f864d6a 100644
--- a/metadata/md5-cache/net-libs/farstream-0.2.8-r2
+++ b/metadata/md5-cache/net-libs/farstream-0.2.8-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Audio/video conferencing framework specifically designed for instant
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/Farstream
 IUSE=+introspection test upnp
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=dev-libs/glib-2.32:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11:= ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-good-1.4:1.0 media-plugins/gst-plugins-srtp:1.0 media-plugins/gst-plugins-libnice:1.0
 RESTRICT=test
 SLOT=0.2/5
 SRC_URI=https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7ac4a045cb61aef7c8d59665c1c6555c
+_md5_=69f62c27142f8427b13ef1b56bb3d019
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.58.0 b/metadata/md5-cache/net-libs/glib-networking-2.58.0
index cee0ece3c4b0..2a30365b983f 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.58.0
+++ b/metadata/md5-cache/net-libs/glib-networking-2.58.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.55.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.58/glib-networking-2.58.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=e91256402e4cc134d960b3f33c9876a8
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.30.2 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.30.2
index 5d687a7e1099..2f7dd0814547 100644
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.30.2
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.30.2
@@ -4,7 +4,7 @@ DESCRIPTION=GNOME framework for accessing online accounts
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineAccounts
 IUSE=debug gnome +introspection kerberos +vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2+
 PDEPEND=gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )
 RDEPEND=>=dev-libs/glib-2.52:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 >=net-libs/webkit-gtk-2.12.0:4 >=x11-libs/gtk+-3.19.12:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) kerberos? ( app-crypt/gcr:0=[gtk] app-crypt/mit-krb5 )
@@ -12,4 +12,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.30/gnome-online-accounts-3.30.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5aa261d83957ec6366b13376b77fd9f7
+_md5_=e33abfcd23567ba7a5158b4f37846d5e
diff --git a/metadata/md5-cache/net-libs/grpc-1.16.1 b/metadata/md5-cache/net-libs/grpc-1.16.1
index 50a4e88ae385..27332033e9d3 100644
--- a/metadata/md5-cache/net-libs/grpc-1.16.1
+++ b/metadata/md5-cache/net-libs/grpc-1.16.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= dev-util/google-perftools net-dns/c-ares:= sys-libs/zlib:= systemtap? ( dev-util/systemtap ) virtual/pkgconfig
+DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap ) virtual/pkgconfig
 DESCRIPTION=Modern open source high performance RPC framework
 EAPI=7
 HOMEPAGE=https://www.grpc.io
-IUSE=examples doc systemtap static-libs
+IUSE=examples doc perftools systemtap static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= dev-util/google-perftools net-dns/c-ares:= sys-libs/zlib:= systemtap? ( dev-util/systemtap )
+RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
 SLOT=0
 SRC_URI=https://github.com/grpc/grpc/archive/v1.16.1.tar.gz -> grpc-1.16.1.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e21620852d1ad20a814a6234f4bacb3a
+_md5_=eca83ee765d9544bc55030dc87f8e8a5
diff --git a/metadata/md5-cache/net-libs/grpc-1.17.1 b/metadata/md5-cache/net-libs/grpc-1.17.1
index 21be9b024e22..f7e127a2a593 100644
--- a/metadata/md5-cache/net-libs/grpc-1.17.1
+++ b/metadata/md5-cache/net-libs/grpc-1.17.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= dev-util/google-perftools net-dns/c-ares:= sys-libs/zlib:= systemtap? ( dev-util/systemtap ) virtual/pkgconfig
+DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap ) virtual/pkgconfig
 DESCRIPTION=Modern open source high performance RPC framework
 EAPI=7
 HOMEPAGE=https://www.grpc.io
-IUSE=examples doc systemtap static-libs
+IUSE=examples doc perftools systemtap static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= dev-util/google-perftools net-dns/c-ares:= sys-libs/zlib:= systemtap? ( dev-util/systemtap )
+RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/grpc/grpc/archive/v1.17.1.tar.gz -> grpc-1.17.1.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=3d01cb4b16d3dce96e02f1e705d4eaf7
+_md5_=3062f3ef2b8c05e255a5101d6eba9191
diff --git a/metadata/md5-cache/net-libs/grpc-1.18.0 b/metadata/md5-cache/net-libs/grpc-1.18.0
index 17fce2743067..907ac5127000 100644
--- a/metadata/md5-cache/net-libs/grpc-1.18.0
+++ b/metadata/md5-cache/net-libs/grpc-1.18.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= dev-util/google-perftools net-dns/c-ares:= sys-libs/zlib:= systemtap? ( dev-util/systemtap ) virtual/pkgconfig
+DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap ) virtual/pkgconfig
 DESCRIPTION=Modern open source high performance RPC framework
 EAPI=7
 HOMEPAGE=https://www.grpc.io
-IUSE=examples doc systemtap static-libs
+IUSE=examples doc perftools systemtap static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= dev-util/google-perftools net-dns/c-ares:= sys-libs/zlib:= systemtap? ( dev-util/systemtap )
+RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/grpc/grpc/archive/v1.18.0.tar.gz -> grpc-1.18.0.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=3d01cb4b16d3dce96e02f1e705d4eaf7
+_md5_=3062f3ef2b8c05e255a5101d6eba9191
diff --git a/metadata/md5-cache/net-libs/grpc-1.19.0 b/metadata/md5-cache/net-libs/grpc-1.19.0
index dc3ff692a05a..502433527000 100644
--- a/metadata/md5-cache/net-libs/grpc-1.19.0
+++ b/metadata/md5-cache/net-libs/grpc-1.19.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= dev-util/google-perftools net-dns/c-ares:= sys-libs/zlib:= systemtap? ( dev-util/systemtap ) virtual/pkgconfig
+DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap ) virtual/pkgconfig
 DESCRIPTION=Modern open source high performance RPC framework
 EAPI=7
 HOMEPAGE=https://www.grpc.io
-IUSE=examples doc systemtap static-libs
+IUSE=examples doc perftools systemtap static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= dev-util/google-perftools net-dns/c-ares:= sys-libs/zlib:= systemtap? ( dev-util/systemtap )
+RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/grpc/grpc/archive/v1.19.0.tar.gz -> grpc-1.19.0.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bf5dcd3e346cd09e0ef77752182816f7
+_md5_=514507767ad677e05a7fa28070577db0
diff --git a/metadata/md5-cache/net-libs/grpc-1.20.1 b/metadata/md5-cache/net-libs/grpc-1.20.1
deleted file mode 100644
index 31d606053156..000000000000
--- a/metadata/md5-cache/net-libs/grpc-1.20.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= dev-util/google-perftools >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= systemtap? ( dev-util/systemtap ) virtual/pkgconfig
-DESCRIPTION=Modern open source high performance RPC framework
-EAPI=7
-HOMEPAGE=https://www.grpc.io
-IUSE=examples doc systemtap static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= dev-util/google-perftools >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= systemtap? ( dev-util/systemtap )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/grpc/grpc/archive/v1.20.1.tar.gz -> grpc-1.20.1.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bda218c37b39a14fdfb81964743776da
diff --git a/metadata/md5-cache/net-libs/grpc-1.20.1-r1 b/metadata/md5-cache/net-libs/grpc-1.20.1-r1
new file mode 100644
index 000000000000..e41bd8ad7de9
--- /dev/null
+++ b/metadata/md5-cache/net-libs/grpc-1.20.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.7.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap ) virtual/pkgconfig
+DESCRIPTION=Modern open source high performance RPC framework
+EAPI=7
+HOMEPAGE=https://www.grpc.io
+IUSE=examples doc perftools systemtap static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.7.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/grpc/grpc/archive/v1.20.1.tar.gz -> grpc-1.20.1.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ab2258c1176ec79a2ab2f008a6125470
diff --git a/metadata/md5-cache/net-libs/grpc-1.21.1-r1 b/metadata/md5-cache/net-libs/grpc-1.21.1-r1
new file mode 100644
index 000000000000..d4c953b16406
--- /dev/null
+++ b/metadata/md5-cache/net-libs/grpc-1.21.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.7.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
+DESCRIPTION=Modern open source high performance RPC framework
+EAPI=7
+HOMEPAGE=https://www.grpc.io
+IUSE=examples doc perftools systemtap static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.7.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/grpc/grpc/archive/v1.21.1.tar.gz -> grpc-1.21.1.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=28ab7d08c5f1185675e6eabd2ea2e66a
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.82 b/metadata/md5-cache/net-libs/gsoap-2.8.82
deleted file mode 100644
index 3873f1baa42e..000000000000
--- a/metadata/md5-cache/net-libs/gsoap-2.8.82
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-arch/unzip sys-devel/flex sys-devel/bison
-DESCRIPTION=A cross-platform open source C and C++ SDK for SOAP/XML Web services
-EAPI=7
-HOMEPAGE=http://gsoap2.sourceforge.net
-IUSE=doc debug examples ipv6 libressl gnutls +ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 gSOAP
-RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.82.zip
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=77abe83dd717d9d21a181bf20db624f0
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.84 b/metadata/md5-cache/net-libs/gsoap-2.8.84
new file mode 100644
index 000000000000..89f233738eaf
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.84
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-arch/unzip sys-devel/flex sys-devel/bison
+DESCRIPTION=A cross-platform open source C and C++ SDK for SOAP/XML Web services
+EAPI=7
+HOMEPAGE=http://gsoap2.sourceforge.net
+IUSE=doc debug examples ipv6 libressl gnutls +ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 gSOAP
+RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.84.zip
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=77abe83dd717d9d21a181bf20db624f0
diff --git a/metadata/md5-cache/net-libs/http-parser-2.8.1 b/metadata/md5-cache/net-libs/http-parser-2.8.1
index fdbb7765e0d0..0d9890f8b625 100644
--- a/metadata/md5-cache/net-libs/http-parser-2.8.1
+++ b/metadata/md5-cache/net-libs/http-parser-2.8.1
@@ -3,9 +3,9 @@ DESCRIPTION=HTTP request/response parser for C
 EAPI=6
 HOMEPAGE=https://github.com/nodejs/http-parser
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
 SLOT=0/2.8.0
 SRC_URI=https://github.com/nodejs/http-parser/archive/v2.8.1.tar.gz -> http-parser-2.8.1.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=5dbb5a007929843433d494a3d5de6ad0
+_md5_=49df45f37799a2037e7983abdbcb9346
diff --git a/metadata/md5-cache/net-libs/libad9361-iio-0.1-r2 b/metadata/md5-cache/net-libs/libad9361-iio-0.1-r2
index 38b4d0b4a8b9..cd2774deb0a2 100644
--- a/metadata/md5-cache/net-libs/libad9361-iio-0.1-r2
+++ b/metadata/md5-cache/net-libs/libad9361-iio-0.1-r2
@@ -1,12 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/libiio:= sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=net-libs/libiio:=
 DESCRIPTION=IIO AD9361 library for filter design and handling, multi-chip sync, etc.
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/analogdevicesinc/libad9361-iio
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=net-libs/libiio:=
 SLOT=0/0.1
 SRC_URI=https://github.com/analogdevicesinc/libad9361-iio/archive/v0.1.tar.gz -> libad9361-iio-0.1.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a9ee53f3efecb8c4e8598bae4fc6281b
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=d2669566bd6c3fe3f60e2eae2b284ed2
diff --git a/metadata/md5-cache/net-libs/libad9361-iio-9999 b/metadata/md5-cache/net-libs/libad9361-iio-9999
index 074f5c2b62c9..25583947946e 100644
--- a/metadata/md5-cache/net-libs/libad9361-iio-9999
+++ b/metadata/md5-cache/net-libs/libad9361-iio-9999
@@ -1,10 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/libiio:= sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=net-libs/libiio:=
 DESCRIPTION=IIO AD9361 library for filter design and handling, multi-chip sync, etc.
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/analogdevicesinc/libad9361-iio
 LICENSE=LGPL-2.1
 RDEPEND=net-libs/libiio:=
 SLOT=0/9999
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a9ee53f3efecb8c4e8598bae4fc6281b
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f435d1520388fc25a0d5b0a7e13efcbf
diff --git a/metadata/md5-cache/net-libs/libgrss-0.7.0 b/metadata/md5-cache/net-libs/libgrss-0.7.0
index 54f00c9a94a6..7d1c6148a251 100644
--- a/metadata/md5-cache/net-libs/libgrss-0.7.0
+++ b/metadata/md5-cache/net-libs/libgrss-0.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=LibGRSS is a library for easy management of RSS/Atom/Pie feeds
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgrss
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.42.1:2 >=dev-libs/libxml2-2.9.2:2 >=net-libs/libsoup-2.48:2.4 introspection? ( >=dev-libs/gobject-introspection-1.42 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgrss/0.7/libgrss-0.7.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2abed46792fb947c1700b2d79cc8ada0
+_md5_=291ce7247041df48c28faeb8ea8719ff
diff --git a/metadata/md5-cache/net-libs/libmicrodns-0.0.9 b/metadata/md5-cache/net-libs/libmicrodns-0.0.9
index c27cf90b006a..7dbb47fd1f52 100644
--- a/metadata/md5-cache/net-libs/libmicrodns-0.0.9
+++ b/metadata/md5-cache/net-libs/libmicrodns-0.0.9
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Minimal mDNS resolver (and announcer) library
 EAPI=6
 HOMEPAGE=https://videolabs.io
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/videolabs/libmicrodns/archive/0.0.9.tar.gz -> libmicrodns-0.0.9.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=069e005d9dba7cf8536a602570e8ceeb
+_md5_=9286fbe5350dd2705cb63728d317dc88
diff --git a/metadata/md5-cache/net-libs/libndp-1.7 b/metadata/md5-cache/net-libs/libndp-1.7
index 161e2db817e6..54b82648611b 100644
--- a/metadata/md5-cache/net-libs/libndp-1.7
+++ b/metadata/md5-cache/net-libs/libndp-1.7
@@ -4,9 +4,9 @@ DESCRIPTION=Library for Neighbor Discovery Protocol
 EAPI=6
 HOMEPAGE=http://libndp.org
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=LGPL-2.1+
 SLOT=0
 SRC_URI=http://libndp.org/files/libndp-1.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f277fe10d09fc4468ed055819c8b4da8
+_md5_=b8baedf50bbcd4cdc5675330d53d0895
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.0 b/metadata/md5-cache/net-libs/libnftnl-1.1.0
deleted file mode 100644
index fa94e7bb1ec0..000000000000
--- a/metadata/md5-cache/net-libs/libnftnl-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=virtual/pkgconfig >=net-libs/libmnl-1.0.0 json? ( >=dev-libs/jansson-2.3 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem
-EAPI=6
-HOMEPAGE=https://netfilter.org/projects/nftables/
-IUSE=examples json static-libs test threads kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libmnl-1.0.0 json? ( >=dev-libs/jansson-2.3 )
-REQUIRED_USE=test? ( json )
-SLOT=0/7
-SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=8574608d6106419c10fff90e8e07531c
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.1 b/metadata/md5-cache/net-libs/libnftnl-1.1.1
deleted file mode 100644
index 3df7a6eee16e..000000000000
--- a/metadata/md5-cache/net-libs/libnftnl-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=virtual/pkgconfig >=net-libs/libmnl-1.0.3 json? ( >=dev-libs/jansson-2.3 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem
-EAPI=6
-HOMEPAGE=https://netfilter.org/projects/nftables/
-IUSE=examples json static-libs test threads kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libmnl-1.0.3 json? ( >=dev-libs/jansson-2.3 )
-REQUIRED_USE=test? ( json )
-SLOT=0/7
-SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=190736e8db2c747ed5d9d37e89b52f38
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.3 b/metadata/md5-cache/net-libs/libnftnl-1.1.3
new file mode 100644
index 000000000000..3dfcdfdf1799
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install setup
+DEPEND=>=net-libs/libmnl-1.0.3
+DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=examples static-libs test kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.3
+SLOT=0/11
+SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.3.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e87b5cfac6ec14a971ac8e14c84242b1
diff --git a/metadata/md5-cache/net-libs/libnice-0.1.15 b/metadata/md5-cache/net-libs/libnice-0.1.15
index 65443312e188..5301079f369c 100644
--- a/metadata/md5-cache/net-libs/libnice-0.1.15
+++ b/metadata/md5-cache/net-libs/libnice-0.1.15
@@ -4,10 +4,10 @@ DESCRIPTION=An implementation of the Interactice Connectivity Establishment stan
 EAPI=6
 HOMEPAGE=https://nice.freedesktop.org/wiki/
 IUSE=+gnutls +introspection libressl +upnp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( MPL-1.1 LGPL-2.1 )
 RDEPEND=>=dev-libs/glib-2.48:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) gnutls? ( >=net-libs/gnutls-2.12.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) upnp? ( >=net-libs/gupnp-igd-0.2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://nice.freedesktop.org/releases/libnice-0.1.15.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a48d608fb7d90a332005b90ce05f1e34
+_md5_=8b0497b1814989b78e23f5bce1f822ef
diff --git a/metadata/md5-cache/net-libs/liboauth-1.0.3-r1 b/metadata/md5-cache/net-libs/liboauth-1.0.3-r1
index eacf7a55a3be..75f1f6512b12 100644
--- a/metadata/md5-cache/net-libs/liboauth-1.0.3-r1
+++ b/metadata/md5-cache/net-libs/liboauth-1.0.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=C library implementing the OAuth secure authentication protocol
 EAPI=7
 HOMEPAGE=http://liboauth.sourceforge.net/
 IUSE=bindist curl doc libressl +nss
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=|| ( GPL-2 MIT )
 RDEPEND=curl? ( net-misc/curl ) nss? ( dev-libs/nss curl? ( || ( net-misc/curl[ssl,curl_ssl_nss] net-misc/curl[-ssl] ) ) ) !nss? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) curl? ( || ( net-misc/curl[ssl,curl_ssl_openssl] net-misc/curl[-ssl] ) ) )
 REQUIRED_USE=bindist? ( nss )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/liboauth/liboauth-1.0.3.tar.gz
-_md5_=8f178785035a2f222862df2d02402af0
+_md5_=5e0692fa1aa06a773e3aa47e4cf627a4
diff --git a/metadata/md5-cache/net-libs/libpsl-0.21.0 b/metadata/md5-cache/net-libs/libpsl-0.21.0
index f2bef750a733..d63df5f0d377 100644
--- a/metadata/md5-cache/net-libs/libpsl-0.21.0
+++ b/metadata/md5-cache/net-libs/libpsl-0.21.0
@@ -5,10 +5,10 @@ DESCRIPTION=C library for the Public Suffix List
 EAPI=7
 HOMEPAGE=https://github.com/rockdaboot/libpsl
 IUSE=icu +idn +man abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=icu? ( !idn? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) idn? ( dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/libidn2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/rockdaboot/libpsl/releases/download/libpsl-0.21.0/libpsl-0.21.0.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=eac7973ba30d9b4ef4f6505d667d17bb
+_md5_=831f67c5c04a099f717a208d6c358c83
diff --git a/metadata/md5-cache/net-libs/libsoup-2.64.2 b/metadata/md5-cache/net-libs/libsoup-2.64.2
index 5ca8bba8edc4..b99e0fbd639a 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.64.2
+++ b/metadata/md5-cache/net-libs/libsoup-2.64.2
@@ -4,11 +4,11 @@ DESCRIPTION=An HTTP library implementation in C
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libsoup
 IUSE=debug gssapi +introspection samba ssl test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libpsl-0.20.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) samba? ( net-fs/samba )
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.64/libsoup-2.64.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=dea5ff5bc3450deaa5159c8f2d08624c
+_md5_=a968d15c550bcee24226d803f05b30f3
diff --git a/metadata/md5-cache/net-libs/libsrtp-2.2.0 b/metadata/md5-cache/net-libs/libsrtp-2.2.0
index 475e7b485e2a..61420362433f 100644
--- a/metadata/md5-cache/net-libs/libsrtp-2.2.0
+++ b/metadata/md5-cache/net-libs/libsrtp-2.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Open-source implementation of the Secure Real-time Transport Protoco
 EAPI=6
 HOMEPAGE=https://github.com/cisco/libsrtp
 IUSE=aesicm console debug doc libressl openssl static-libs syslog test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=openssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=2/1
 SRC_URI=https://github.com/cisco/libsrtp/archive/v2.2.0.tar.gz -> libsrtp-2.2.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=2b05041cbd461de75c8eb9df83a1a2d7
+_md5_=181120d2d3e1f154e1af4a9e317bdbab
diff --git a/metadata/md5-cache/net-libs/libssh2-1.8.2 b/metadata/md5-cache/net-libs/libssh2-1.8.2
index 47f864c6d74e..261e1e93da4b 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.8.2
+++ b/metadata/md5-cache/net-libs/libssh2-1.8.2
@@ -4,7 +4,7 @@ DESCRIPTION=Library implementing the SSH2 protocol
 EAPI=6
 HOMEPAGE=https://www.libssh2.org
 IUSE=gcrypt libressl mbedtls zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=gcrypt? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( !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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.libssh2.org/download/libssh2-1.8.2.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7573eb298e785095acfd5b8b3af1806f
+_md5_=7d28ea22fd17cf60947dd3b67ce77f42
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.12 b/metadata/md5-cache/net-libs/libvncserver-0.9.12
index 550b55422096..ee1ce357fc80 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.12
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.12
@@ -5,11 +5,11 @@ DESCRIPTION=library for creating vnc servers
 EAPI=7
 HOMEPAGE=https://libvnc.github.io/
 IUSE=+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl sdl ssl static-libs systemd test +threads +zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=gcrypt? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( >=dev-libs/libressl-2.7.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( dev-libs/lzo ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2 ) systemd? ( sys-apps/systemd:= ) zlib? ( >=sys-libs/zlib-1.2.8-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=!gnutls? ( ssl? ( threads ) ) png? ( zlib )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.12.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4f0b8a7c4f9b895f22a1c04adcdcb9da
+_md5_=59a055e4413e988cd6a140b802cd2662
diff --git a/metadata/md5-cache/net-libs/liquid-dsp-1.3.0 b/metadata/md5-cache/net-libs/liquid-dsp-1.3.0
index 334a5b2a9761..d0944ed2b3fd 100644
--- a/metadata/md5-cache/net-libs/liquid-dsp-1.3.0
+++ b/metadata/md5-cache/net-libs/liquid-dsp-1.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare
 DEPEND=sci-libs/fftw:3.0= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=digital signal processing library for software-defined radios
 EAPI=6
-HOMEPAGE=http://liquidsdr.org
+HOMEPAGE=https://liquidsdr.org
 IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=https://github.com/jgaeddert/liquid-dsp/archive/v1.3.0.tar.gz -> liquid-dsp-1.3.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=7027887beb7fd77f9a4f684b1e05944e
+_md5_=f649827b11aec65c17cf77334fa60ca4
diff --git a/metadata/md5-cache/net-libs/liquid-dsp-1.3.1 b/metadata/md5-cache/net-libs/liquid-dsp-1.3.1
index 36d563d6a15e..38277bce33b4 100644
--- a/metadata/md5-cache/net-libs/liquid-dsp-1.3.1
+++ b/metadata/md5-cache/net-libs/liquid-dsp-1.3.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare
 DEPEND=sci-libs/fftw:3.0= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=digital signal processing library for software-defined radios
 EAPI=6
-HOMEPAGE=http://liquidsdr.org
+HOMEPAGE=https://liquidsdr.org
 IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=https://github.com/jgaeddert/liquid-dsp/archive/v1.3.1.tar.gz -> liquid-dsp-1.3.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=036fdb2fb0ad75f42ba57ba31398284b
+_md5_=04d97d8b5963f190fdb6f4a11b5d46dc
diff --git a/metadata/md5-cache/net-libs/liquid-dsp-9999 b/metadata/md5-cache/net-libs/liquid-dsp-9999
index 74a58482637e..da1d8a00649a 100644
--- a/metadata/md5-cache/net-libs/liquid-dsp-9999
+++ b/metadata/md5-cache/net-libs/liquid-dsp-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare unpack
 DEPEND=sci-libs/fftw:3.0= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=digital signal processing library for software-defined radios
 EAPI=6
-HOMEPAGE=http://liquidsdr.org
+HOMEPAGE=https://liquidsdr.org
 IUSE=static-libs
 LICENSE=MIT
 RDEPEND=sci-libs/fftw:3.0=
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=036fdb2fb0ad75f42ba57ba31398284b
+_md5_=04d97d8b5963f190fdb6f4a11b5d46dc
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.1.20190408 b/metadata/md5-cache/net-libs/miniupnpc-2.1.20190408
index f47d20e063be..c81e29aa1d9c 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.1.20190408
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.1.20190408
@@ -4,9 +4,9 @@ DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=6
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=ipv6 kernel_linux static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190408.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=92c950cb7b9e83bfad13a97f19fcf411
+_md5_=5051432579dcfaad27cb12cba1c69d9a
diff --git a/metadata/md5-cache/net-libs/nodejs-10.16.0 b/metadata/md5-cache/net-libs/nodejs-10.16.0
new file mode 100644
index 000000000000..d23b4fbc0135
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-10.16.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.34.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=6
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.34.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v10.16.0/node-v10.16.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7575bbd90b4ea33ea80fdb4afb5988a1
diff --git a/metadata/md5-cache/net-libs/nodejs-12.1.0 b/metadata/md5-cache/net-libs/nodejs-12.1.0
deleted file mode 100644
index 51e6c20ec1f7..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-12.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v12.1.0/node-v12.1.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=defd041abf29c9ea11851d53703af2b1
diff --git a/metadata/md5-cache/net-libs/nodejs-12.2.0 b/metadata/md5-cache/net-libs/nodejs-12.2.0
deleted file mode 100644
index e491bd2fa3a0..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-12.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v12.2.0/node-v12.2.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=defd041abf29c9ea11851d53703af2b1
diff --git a/metadata/md5-cache/net-libs/nodejs-12.3.0 b/metadata/md5-cache/net-libs/nodejs-12.3.0
new file mode 100644
index 000000000000..437fdd3dd363
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-12.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v12.3.0/node-v12.3.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=defd041abf29c9ea11851d53703af2b1
diff --git a/metadata/md5-cache/net-libs/nodejs-12.3.1 b/metadata/md5-cache/net-libs/nodejs-12.3.1
new file mode 100644
index 000000000000..d4cda54aa40e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-12.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.29.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/libuv-1.29.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v12.3.1/node-v12.3.1.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=79dd6a77958e02ee69cf15df0f04b9aa
diff --git a/metadata/md5-cache/net-libs/nodejs-6.17.0 b/metadata/md5-cache/net-libs/nodejs-6.17.0
deleted file mode 100644
index 984a76992f36..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-6.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.9.0:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.9.0:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v6.17.0/node-v6.17.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7cbb1108977f7da4a0a8bcd2bd265427
diff --git a/metadata/md5-cache/net-libs/nodejs-8.15.1 b/metadata/md5-cache/net-libs/nodejs-8.15.1
deleted file mode 100644
index 3470c25d1d4e..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-8.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.10.1 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.33.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.10.1 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.33.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v8.15.1/node-v8.15.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c56aec677b2827bd2a2d66c196cc462
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index 74b3730d4557..29b40475a162 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -1,13 +1,13 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DEPEND=>=dev-libs/libuv-1.29.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+RDEPEND=>=dev-libs/libuv-1.29.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=1844bb35e3a7004ad6914a7c2640db58
+_md5_=e0b63462be0068a0d9b8030530326b04
diff --git a/metadata/md5-cache/net-libs/rest-0.8.1 b/metadata/md5-cache/net-libs/rest-0.8.1
index 0e2f06395273..6bd7037ac62d 100644
--- a/metadata/md5-cache/net-libs/rest-0.8.1
+++ b/metadata/md5-cache/net-libs/rest-0.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=Helper library for RESTful services
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Librest
 IUSE=+introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86
+KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libsoup:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0.7
 SRC_URI=mirror://gnome/sources/rest/0.8/rest-0.8.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5b95edc5aea9160b2b1d79d0555147be
+_md5_=3aaa25006effe3c5062a28cfbba7b147
diff --git a/metadata/md5-cache/net-libs/srt-1.3.2 b/metadata/md5-cache/net-libs/srt-1.3.2
index 81e84a7cbf19..c77de41c2638 100644
--- a/metadata/md5-cache/net-libs/srt-1.3.2
+++ b/metadata/md5-cache/net-libs/srt-1.3.2
@@ -5,10 +5,10 @@ DESCRIPTION=Open-source implementation of the Secure Real-time Transport Protoco
 EAPI=7
 HOMEPAGE=https://github.com/Haivision/srt
 IUSE=gnutls libressl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=gnutls? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=https://github.com/Haivision/srt/archive/v1.3.2.tar.gz -> srt-1.3.2.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1764ce6405744dbe8c243ea02716c562
+_md5_=288416d77c239d973677acab836b6ebb
diff --git a/metadata/md5-cache/net-libs/tox-0.2.9-r1 b/metadata/md5-cache/net-libs/tox-0.2.9-r1
new file mode 100644
index 000000000000..27a1f3ce82a0
--- /dev/null
+++ b/metadata/md5-cache/net-libs/tox-0.2.9-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Encrypted P2P, messaging, and audio/video calling platform
+EAPI=7
+HOMEPAGE=https://tox.chat
+IUSE=+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+RDEPEND=av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig ) >=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+REQUIRED_USE=?? ( log-debug log-error log-info log-trace log-warn ) daemon? ( dht-node )
+SLOT=0/0.2
+SRC_URI=https://github.com/TokTok/c-toxcore/archive/v0.2.9.tar.gz -> c-toxcore-0.2.9.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6ab98f38e0848b73c5346d0025c6fb42
diff --git a/metadata/md5-cache/net-libs/uhttpmock-0.5.1 b/metadata/md5-cache/net-libs/uhttpmock-0.5.1
index 7e2f27011580..e923f53b4b3c 100644
--- a/metadata/md5-cache/net-libs/uhttpmock-0.5.1
+++ b/metadata/md5-cache/net-libs/uhttpmock-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP web service mocking library
 EAPI=5
 HOMEPAGE=https://gitlab.com/uhttpmock/uhttpmock
 IUSE=+introspection vala debug
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36.0:2 >=net-libs/libsoup-2.37.91:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-0.5.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=79273a9ec55ca727af4bbbdb5e5a2a47
+_md5_=769dc0d2c03274a1a939a8b14ea52da1
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index f3eb0cebfe6d..4163edbb75df 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/bincimap-1.2.13 b/metadata/md5-cache/net-mail/bincimap-1.2.13
deleted file mode 100644
index 47ed13032ba8..000000000000
--- a/metadata/md5-cache/net-mail/bincimap-1.2.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config install postinst unpack
-DEPEND=ssl? ( dev-libs/openssl )
-DESCRIPTION=IMAP server for Maildir
-EAPI=0
-HOMEPAGE=http://freshmeat.net/projects/bincimap/
-IUSE=ssl
-KEYWORDS=amd64 ~hppa ~ppc x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl ) virtual/daemontools sys-apps/ucspi-tcp net-mail/checkpassword !mail-mta/courier !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
-SLOT=0
-SRC_URI=http://www.bincimap.org/dl/tarballs/1.2/bincimap-1.2.13final.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6bcb0432f118bee4b54cf96bcba05567
diff --git a/metadata/md5-cache/net-mail/bincimap-1.2.13-r1 b/metadata/md5-cache/net-mail/bincimap-1.2.13-r1
deleted file mode 100644
index 01362ddc159a..000000000000
--- a/metadata/md5-cache/net-mail/bincimap-1.2.13-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=IMAP server for Maildir
-EAPI=5
-HOMEPAGE=http://freshmeat.net/projects/bincimap/
-IUSE=libressl ssl
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/daemontools sys-apps/ucspi-tcp net-mail/checkpassword !mail-mta/courier !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
-SLOT=0
-SRC_URI=http://www.bincimap.org/dl/tarballs/1.2/bincimap-1.2.13final.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=476e461c168c6bbb2f4813fc40c38428
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10
new file mode 100644
index 000000000000..7d724e9a7336
--- /dev/null
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10
@@ -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:= sys-libs/e2fsprogs-libs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical ) 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? ( dev-db/mysql-connector-c:0= ) 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-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
+DESCRIPTION=The Cyrus IMAP Server
+EAPI=6
+HOMEPAGE=https://www.cyrusimap.org/
+IUSE=afs backup calalarm caps clamav http 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:= sys-libs/e2fsprogs-libs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical ) 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? ( dev-db/mysql-connector-c:0= ) 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 !app-arch/dump
+REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite ) sphinx? ( mysql )
+SLOT=0
+SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.10/cyrus-imapd-3.0.10.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0dfd6d015f5ccb015b387c20651fea07
diff --git a/metadata/md5-cache/net-mail/gnubiff-2.2.15-r3 b/metadata/md5-cache/net-mail/gnubiff-2.2.15-r3
index 1467269ff974..51a9f4f155f8 100644
--- a/metadata/md5-cache/net-mail/gnubiff-2.2.15-r3
+++ b/metadata/md5-cache/net-mail/gnubiff-2.2.15-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:0= ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A mail notification program
 EAPI=5
 HOMEPAGE=http://gnubiff.sourceforge.net/
 IUSE=debug fam nls password
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf
+RDEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:0= ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf
 SLOT=0
 SRC_URI=mirror://sourceforge/gnubiff/gnubiff-2.2.15.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=532282ac205f7c6738056e4a2c28b334
+_md5_=5930c80d156c0906a4798719bfe34e37
diff --git a/metadata/md5-cache/net-mail/gnubiff-2.2.17-r1 b/metadata/md5-cache/net-mail/gnubiff-2.2.17-r1
deleted file mode 100644
index 143e749bf48e..000000000000
--- a/metadata/md5-cache/net-mail/gnubiff-2.2.17-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:* ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A mail notification program
-EAPI=6
-HOMEPAGE=http://gnubiff.sourceforge.net/
-IUSE=debug fam nls password
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:* ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf
-SLOT=0
-SRC_URI=mirror://sourceforge/gnubiff/gnubiff-2.2.17.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=02b7041ccd942db602c51335e683fe22
diff --git a/metadata/md5-cache/net-mail/gnubiff-2.2.17-r2 b/metadata/md5-cache/net-mail/gnubiff-2.2.17-r2
new file mode 100644
index 000000000000..6f0cf1f49aae
--- /dev/null
+++ b/metadata/md5-cache/net-mail/gnubiff-2.2.17-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:0= ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A mail notification program
+EAPI=6
+HOMEPAGE=http://gnubiff.sourceforge.net/
+IUSE=debug fam nls password
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:0= ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf
+SLOT=0
+SRC_URI=mirror://sourceforge/gnubiff/gnubiff-2.2.17.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ef50615c906cd6ae00bfeb90e7bf0a1d
diff --git a/metadata/md5-cache/net-mail/isync-1.3.0 b/metadata/md5-cache/net-mail/isync-1.3.0
deleted file mode 100644
index da18dbe07951..000000000000
--- a/metadata/md5-cache/net-mail/isync-1.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=sys-libs/db-4.2:* zlib? ( sys-libs/zlib ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:* ) libressl? ( dev-libs/libressl ) )
-DESCRIPTION=MailDir mailbox synchronizer
-EAPI=6
-HOMEPAGE=http://isync.sourceforge.net/
-IUSE=compat sasl libressl ssl zlib
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/db-4.2:* zlib? ( sys-libs/zlib ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:* ) libressl? ( dev-libs/libressl ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/isync/isync/1.3.0/isync-1.3.0.tar.gz
-_md5_=6825f734b35e00f527df2ba8ac442b3f
diff --git a/metadata/md5-cache/net-mail/isync-1.3.0-r1 b/metadata/md5-cache/net-mail/isync-1.3.0-r1
new file mode 100644
index 000000000000..52213774a364
--- /dev/null
+++ b/metadata/md5-cache/net-mail/isync-1.3.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=sys-libs/db-4.2:* zlib? ( sys-libs/zlib ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= ) )
+DESCRIPTION=MailDir mailbox synchronizer
+EAPI=6
+HOMEPAGE=http://isync.sourceforge.net/
+IUSE=compat sasl libressl ssl zlib
+KEYWORDS=amd64 ~arm ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/db-4.2:* zlib? ( sys-libs/zlib ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/isync/isync/1.3.0/isync-1.3.0.tar.gz
+_md5_=178dc2fb0f594c73b31831399aa0c72a
diff --git a/metadata/md5-cache/net-mail/qmail-autoresponder-2.0 b/metadata/md5-cache/net-mail/qmail-autoresponder-2.0
new file mode 100644
index 000000000000..35dee57e7225
--- /dev/null
+++ b/metadata/md5-cache/net-mail/qmail-autoresponder-2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-libs/bglibs-2.04 mysql? ( dev-db/mysql-connector-c:0= )
+DESCRIPTION=Rate-limited autoresponder for qmail
+EAPI=7
+HOMEPAGE=https://untroubled.org/qmail-autoresponder/
+IUSE=mysql
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/bglibs-2.04 mysql? ( dev-db/mysql-connector-c:0= ) virtual/qmail mysql? ( virtual/mysql )
+SLOT=0
+SRC_URI=https://untroubled.org/qmail-autoresponder/archive/qmail-autoresponder-2.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=33713a493dbee2f7c859366867b6623f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index aa11dc9ee2e6..35a10b786a7d 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/anydesk-5.0.0 b/metadata/md5-cache/net-misc/anydesk-5.0.0
new file mode 100644
index 000000000000..d79a8082c3d8
--- /dev/null
+++ b/metadata/md5-cache/net-misc/anydesk-5.0.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Feature rich multi-platform remote desktop application
+EAPI=7
+HOMEPAGE=https://anydesk.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=AnyDesk-TOS BSD BSD-2 openssl ZLIB
+RDEPEND=dev-libs/atk dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/glu media-libs/mesa sys-auth/polkit x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/gtkglext x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-libs/pangox-compat
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://download.anydesk.com/linux/anydesk-5.0.0-amd64.tar.gz ) x86? ( https://download.anydesk.com/linux/anydesk-5.0.0-i686.tar.gz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=4d10de76912c35e6d9a81f0d19758270
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.2 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.2
index b6b56887a14f..9eab872e25cd 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.2
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-3.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:* sys-libs/zlib systemd? ( sys-apps/systemd ) dev-util/cmake >sys-devel/gcc-4.8 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-util/cmake >sys-devel/gcc-4.8 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
 EAPI=6
 HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
 IUSE=doc fuse systemd tcpd
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-4 ZLIB public-domain
-RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:* sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
+RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.2.orig.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d614e004bb8935f3a3976a808b030fcc
+_md5_=b5ae7900a61587264e3a755096eef333
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.2_p2-r2 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.2_p2-r2
new file mode 100644
index 000000000000..91114548d462
--- /dev/null
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-3.2_p2-r2
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-util/cmake >sys-devel/gcc-4.8 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
+EAPI=7
+HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
+IUSE=doc fuse systemd tcpd
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-4 ZLIB public-domain
+RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.2.orig.tar.xz mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.2-2.debian.tar.xz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=93e8a275330ea01c391c4da48751a3a4
diff --git a/metadata/md5-cache/net-misc/bird-1.6.6 b/metadata/md5-cache/net-misc/bird-1.6.6
new file mode 100644
index 000000000000..37414010b4b3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-1.6.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
+DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6
+EAPI=7
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug ipv6
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.6.6.tar.gz
+_md5_=4de1b9d27473facbb571d63786c76fac
diff --git a/metadata/md5-cache/net-misc/bird-2.0.4 b/metadata/md5-cache/net-misc/bird-2.0.4
new file mode 100644
index 000000000000..0741d3fe55d6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-2.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
+DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6
+EAPI=7
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://bird.network.cz/pub/bird/bird-2.0.4.tar.gz
+_md5_=5862e2608d0f1332a999130395ac8aa0
diff --git a/metadata/md5-cache/net-misc/casync-2_p20190407 b/metadata/md5-cache/net-misc/casync-2_p20190407
index c3ecadd65b4c..6153a08f5131 100644
--- a/metadata/md5-cache/net-misc/casync-2_p20190407
+++ b/metadata/md5-cache/net-misc/casync-2_p20190407
@@ -11,5 +11,5 @@ RDEPEND=app-arch/xz-utils:= app-arch/zstd:= dev-libs/openssl:0= net-misc/curl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/casync/archive/6d185a540c54195a919d4b44f9bf28c341da3bf1.tar.gz -> casync-2_p20190407.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=f0217de4b47ff5e1cab86b8fc04352ab
diff --git a/metadata/md5-cache/net-misc/connman-1.37 b/metadata/md5-cache/net-misc/connman-1.37
index 60cc2774347b..cf2bc9025788 100644
--- a/metadata/md5-cache/net-misc/connman-1.37
+++ b/metadata/md5-cache/net-misc/connman-1.37
@@ -4,11 +4,11 @@ DESCRIPTION=Provides a daemon for managing internet connections
 EAPI=6
 HOMEPAGE=https://01.org/connman
 IUSE=bluetooth debug doc examples +ethernet iptables iwd l2tp nftables ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= iptables? ( >=net-firewall/iptables-1.4.8 ) bluetooth? ( net-wireless/bluez ) iwd? ( net-wireless/iwd ) l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= >=net-libs/libmnl-1.0.0:0= ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls ) virtual/tmpfiles
 REQUIRED_USE=|| ( iptables nftables )
 SLOT=0
 SRC_URI=mirror://kernel/linux/network/connman/connman-1.37.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=8fa42b1a10ce97a5e92dbc1279ec818e
+_md5_=04ca273c506e67e0a5f9255f4f374b7a
diff --git a/metadata/md5-cache/net-misc/crossbar-18.3.1 b/metadata/md5-cache/net-misc/crossbar-18.3.1
index c60dfcd62287..92fcd9c74f71 100644
--- a/metadata/md5-cache/net-misc/crossbar-18.3.1
+++ b/metadata/md5-cache/net-misc/crossbar-18.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Crossbar.io - The Unified Application Router for the twisted framewo
 EAPI=6
 HOMEPAGE=https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=AGPL-3
 RDEPEND=>=dev-python/attrs-17.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/autobahn-18.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bitstring-3.1.5[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/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-6.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/hyper-h2-3.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/idna-2.5[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/incremental-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/jinja-2.9.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lmdb-0.92[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/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netaddr-0.7.19[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/priority-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-5.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.2.3[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/pyasn1-modules-0.0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.3[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/py-ubjson-0.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12[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/sdnotify-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-17.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setproctitle-1.1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-36.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/shutilwhich-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/treq-17.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/watchdog-0.8.3[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/zope-interface-4.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txtorcon-0.19.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/crossbar/crossbar-18.3.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3f7e5c09ac55bd51394a2cfa0b13bfa0
+_md5_=0658beed8a7a7da97f5626e0e149067e
diff --git a/metadata/md5-cache/net-misc/curl-7.65.0 b/metadata/md5-cache/net-misc/curl-7.65.0
new file mode 100644
index 000000000000..fc4489f5b3b4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.65.0
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl )
+DESCRIPTION=A Client that groks URLs
+EAPI=7
+HOMEPAGE=https://curl.haxx.se/
+IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~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=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( 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.65.0.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8645d5bfd69c2dc263b3dfa498052f6f
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.1.1-r2 b/metadata/md5-cache/net-misc/dhcpcd-7.1.1-r2
deleted file mode 100644
index 2f29f703c3ee..000000000000
--- a/metadata/md5-cache/net-misc/dhcpcd-7.1.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
-DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
-EAPI=6
-HOMEPAGE=https://roy.marples.name/projects/dhcpcd
-IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=udev? ( virtual/udev )
-SLOT=0
-SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-7.1.1.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=3bf2e8dc98b1e0f95b6f74b1615800c7
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.1.1-r3 b/metadata/md5-cache/net-misc/dhcpcd-7.1.1-r3
index 4580bd2529ce..77354c74f1dc 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.1.1-r3
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.1.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
 HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-7.1.1.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=641731c4a8234716037a18b642f28b10
+_md5_=580703b4bb42daa61c42c120970e29eb
diff --git a/metadata/md5-cache/net-misc/dropbear-2017.75 b/metadata/md5-cache/net-misc/dropbear-2017.75
index 60a3f8f469b1..6191829ba769 100644
--- a/metadata/md5-cache/net-misc/dropbear-2017.75
+++ b/metadata/md5-cache/net-misc/dropbear-2017.75
@@ -10,5 +10,5 @@ RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/
 REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2017.75.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2017.75.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0e8fa0eddda7b10ae75c8a1742e038bb
diff --git a/metadata/md5-cache/net-misc/dropbear-2018.76 b/metadata/md5-cache/net-misc/dropbear-2018.76
index 82e77df9d4b9..188c6a2bcf17 100644
--- a/metadata/md5-cache/net-misc/dropbear-2018.76
+++ b/metadata/md5-cache/net-misc/dropbear-2018.76
@@ -10,5 +10,5 @@ RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/
 REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2018.76.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2018.76.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=66063e79eee02498bb5589030aa38bcc
diff --git a/metadata/md5-cache/net-misc/electrum-3.2.3 b/metadata/md5-cache/net-misc/electrum-3.2.3
deleted file mode 100644
index cb3aa3f87095..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=User friendly Bitcoin client
-EAPI=6
-HOMEPAGE=https://electrum.org/
-IUSE=audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync revealer trustedcoin_com vkb l10n_ar l10n_be l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonrpclib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pbkdf2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PySocks[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/qrcode[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tlslite[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-dnspython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=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=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.2.3/Electrum-3.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6ab35c9ebac15708c04f36311a108bbb
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.3 b/metadata/md5-cache/net-misc/electrum-3.3.3
deleted file mode 100644
index 491348318897..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=User friendly Bitcoin client
-EAPI=6
-HOMEPAGE=https://electrum.org/
-IUSE=audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb l10n_ar l10n_be l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/aiohttp-socks[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/aiorpcX[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jsonrpclib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PySocks[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/qrcode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/tlslite[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-dnspython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.3.3/Electrum-3.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e520d98d5bd7e11e3c00d4581be1416c
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.6 b/metadata/md5-cache/net-misc/electrum-3.3.6
new file mode 100644
index 000000000000..08a472116135
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-3.3.6
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DESCRIPTION=User friendly Bitcoin client
+EAPI=7
+HOMEPAGE=https://electrum.org/
+IUSE=audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb l10n_ar l10n_be l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/aiohttp-socks[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/aiorpcX[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jsonrpclib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PySocks[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/qrcode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/tlslite[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-dnspython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://download.electrum.org/3.3.6/Electrum-3.3.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=5e8a2c6c8707256d07162059e9010f11
diff --git a/metadata/md5-cache/net-misc/eventd-0.24.1 b/metadata/md5-cache/net-misc/eventd-0.24.1
index c2a34a685786..690631c4e874 100644
--- a/metadata/md5-cache/net-misc/eventd-0.24.1
+++ b/metadata/md5-cache/net-misc/eventd-0.24.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2 sys-apps/util-linux x11-libs/libxkbcommon introsp
 REQUIRED_USE=X? ( notification ) fbcon? ( notification ) notification? ( || ( X fbcon ) ) test? ( websocket )
 SLOT=0
 SRC_URI=https://www.eventd.org/download/eventd/eventd-0.24.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b946fd17b816ec589e689459f74e4acb
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4
index 7cab71ec1401..12a85b9588d5 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4
@@ -4,10 +4,10 @@ DESCRIPTION=Free implementation of the Remote Desktop Protocol
 EAPI=6
 HOMEPAGE=http://www.freerdp.com/
 IUSE=alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
-KEYWORDS=alpha amd64 arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.0.0-rc4.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a33c1e60286d875b133e1abdd20be392
+_md5_=ca13ff3527a5009ec5419510d3ce96bc
diff --git a/metadata/md5-cache/net-misc/iputils-20190515 b/metadata/md5-cache/net-misc/iputils-20190515
index fffea7b0bce1..bec2fc2a2002 100644
--- a/metadata/md5-cache/net-misc/iputils-20190515
+++ b/metadata/md5-cache/net-misc/iputils-20190515
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+ rdisc
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( nettle? ( dev-libs/nettle ) !nettle? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) ) ) ) nls? ( sys-devel/gettext ) )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/s20190515.tar.gz -> iputils-20190515.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20190515.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6713545ade68e4db3f30f29715838c51
diff --git a/metadata/md5-cache/net-misc/iputils-99999999 b/metadata/md5-cache/net-misc/iputils-99999999
index c2a7952e1c3b..8638e620a6e7 100644
--- a/metadata/md5-cache/net-misc/iputils-99999999
+++ b/metadata/md5-cache/net-misc/iputils-99999999
@@ -7,5 +7,5 @@ IUSE=+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc
 LICENSE=BSD GPL-2+ rdisc
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( nettle? ( dev-libs/nettle ) !nettle? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) ) ) ) nls? ( sys-devel/gettext ) )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09a33b87e8e3ebd72924f9e85628cdfe
diff --git a/metadata/md5-cache/net-misc/ipv6calc-0.97.4 b/metadata/md5-cache/net-misc/ipv6calc-0.97.4
deleted file mode 100644
index d0ed0f937c9b..000000000000
--- a/metadata/md5-cache/net-misc/ipv6calc-0.97.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/openssl:= geoip? ( >=dev-libs/geoip-1.4.7 ) test? ( dev-perl/Digest-SHA1 )
-DESCRIPTION=IPv6 address calculator
-EAPI=5
-HOMEPAGE=http://www.deepspace6.net/projects/ipv6calc.html
-IUSE=geoip test
-KEYWORDS=~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:= geoip? ( >=dev-libs/geoip-1.4.7 )
-SLOT=0
-SRC_URI=ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ipv6calc-0.97.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aeb54a5a088ae9b8165997355402e64e
diff --git a/metadata/md5-cache/net-misc/ipv6calc-0.99.2 b/metadata/md5-cache/net-misc/ipv6calc-0.99.2
deleted file mode 100644
index 48f79b0aaf4f..000000000000
--- a/metadata/md5-cache/net-misc/ipv6calc-0.99.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 ) test? ( dev-perl/Digest-SHA1 )
-DESCRIPTION=IPv6 address calculator
-EAPI=6
-HOMEPAGE=http://www.deepspace6.net/projects/ipv6calc.html
-IUSE=geoip libressl test
-KEYWORDS=~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 )
-SLOT=0
-SRC_URI=ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ipv6calc-0.99.2.tar.gz
-_md5_=3e15daf45eaec3edb3388bff0948a5cb
diff --git a/metadata/md5-cache/net-misc/ipv6calc-1.1.0 b/metadata/md5-cache/net-misc/ipv6calc-1.1.0
deleted file mode 100644
index ff7274242a02..000000000000
--- a/metadata/md5-cache/net-misc/ipv6calc-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 ) test? ( dev-perl/Digest-SHA1 )
-DESCRIPTION=IPv6 address calculator
-EAPI=6
-HOMEPAGE=http://www.deepspace6.net/projects/ipv6calc.html
-IUSE=geoip libressl test
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 )
-SLOT=0
-SRC_URI=ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ipv6calc-1.1.0.tar.gz
-_md5_=0a41fffdaf707948465a4750e24f71c4
diff --git a/metadata/md5-cache/net-misc/ipv6calc-2.0.0 b/metadata/md5-cache/net-misc/ipv6calc-2.0.0
deleted file mode 100644
index 9eddd235179a..000000000000
--- a/metadata/md5-cache/net-misc/ipv6calc-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 ) test? ( dev-perl/Digest-SHA1 )
-DESCRIPTION=IPv6 address calculator
-EAPI=7
-HOMEPAGE=http://www.deepspace6.net/projects/ipv6calc.html
-IUSE=geoip libressl test
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 )
-SLOT=0
-SRC_URI=ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ipv6calc-2.0.0.tar.gz
-_md5_=8f68da11fdc2c0b6414fbd325f8424b2
diff --git a/metadata/md5-cache/net-misc/ipv6calc-2.1.0 b/metadata/md5-cache/net-misc/ipv6calc-2.1.0
index 64af005d756d..e9de41ecdcee 100644
--- a/metadata/md5-cache/net-misc/ipv6calc-2.1.0
+++ b/metadata/md5-cache/net-misc/ipv6calc-2.1.0
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 )
 SLOT=0
 SRC_URI=https://github.com/pbiering/ipv6calc/archive/2.1.0.tar.gz -> ipv6calc-2.1.0.tar.gz
-_md5_=0f34bdc5aad7e45d266431a8c15f31cc
+_md5_=61547f8e04afacc8e6aae34e2596ae90
diff --git a/metadata/md5-cache/net-misc/istioctl-1.1.7 b/metadata/md5-cache/net-misc/istioctl-1.1.7
new file mode 100644
index 000000000000..57b50d91f6b0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/istioctl-1.1.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.10
+DESCRIPTION=Istio configuration command line utility
+EAPI=6
+HOMEPAGE=https://github.com/istio/istio
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/istio/istio/archive/1.1.7.tar.gz -> istioctl-1.1.7.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=43bd33f86cb18a3d394f50ac495d1fe5
diff --git a/metadata/md5-cache/net-misc/kafka-bin-0.10.2.1-r2 b/metadata/md5-cache/net-misc/kafka-bin-0.10.2.1-r2
deleted file mode 100644
index 1050d8aeac00..000000000000
--- a/metadata/md5-cache/net-misc/kafka-bin-0.10.2.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=virtual/jre:1.8
-DESCRIPTION=A high-throughput distributed messaging system
-EAPI=5
-HOMEPAGE=http://kafka.apache.org/
-IUSE=internal-zookeeper
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=virtual/jre:1.8
-RESTRICT=mirror
-SLOT=0
-SRC_URI=mirror://apache/kafka/0.10.2.1/kafka_2.12-0.10.2.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45cdfb11f0ada80396d57f7800f0684e
diff --git a/metadata/md5-cache/net-misc/kafka-bin-0.11.0.2-r1 b/metadata/md5-cache/net-misc/kafka-bin-0.11.0.2-r1
deleted file mode 100644
index ed047c13a5cd..000000000000
--- a/metadata/md5-cache/net-misc/kafka-bin-0.11.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=virtual/jre:1.8
-DESCRIPTION=A high-throughput distributed messaging system
-EAPI=5
-HOMEPAGE=http://kafka.apache.org/
-IUSE=internal-zookeeper
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=virtual/jre:1.8
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/kafka/0.11.0.2/kafka_2.12-0.11.0.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c47493550753809c181cdc0d58bd6afa
diff --git a/metadata/md5-cache/net-misc/kafka-bin-1.0.1 b/metadata/md5-cache/net-misc/kafka-bin-1.0.1
deleted file mode 100644
index 6ce7321f9839..000000000000
--- a/metadata/md5-cache/net-misc/kafka-bin-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=virtual/jre:1.8
-DESCRIPTION=A high-throughput distributed messaging system
-EAPI=5
-HOMEPAGE=http://kafka.apache.org/
-IUSE=internal-zookeeper
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=virtual/jre:1.8
-RESTRICT=mirror
-SLOT=0
-SRC_URI=mirror://apache/kafka/1.0.1/kafka_2.12-1.0.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45cdfb11f0ada80396d57f7800f0684e
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.2.0 b/metadata/md5-cache/net-misc/kafka-bin-2.2.0
new file mode 100644
index 000000000000..03ae91d157cb
--- /dev/null
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=virtual/jre:1.8
+DESCRIPTION=A high-throughput distributed messaging system
+EAPI=6
+HOMEPAGE=http://kafka.apache.org/
+IUSE=internal-zookeeper
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=virtual/jre:1.8
+RESTRICT=mirror
+SLOT=0
+SRC_URI=mirror://apache/kafka/2.2.0/kafka_2.12-2.2.0.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=99ede0339b6a3cd0befc8ea54b042ee8
diff --git a/metadata/md5-cache/net-misc/libteam-1.22 b/metadata/md5-cache/net-misc/libteam-1.22
index e006b56ab764..acebd01d9e0a 100644
--- a/metadata/md5-cache/net-misc/libteam-1.22
+++ b/metadata/md5-cache/net-misc/libteam-1.22
@@ -4,10 +4,10 @@ DESCRIPTION=Library and tools set for controlling team network device
 EAPI=5
 HOMEPAGE=http://libteam.org
 IUSE=dbus debug examples static-libs +syslog zmq kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=http://libteam.org/files/libteam-1.22.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=617b7d9bfbb8b6aaeb6efd11526e032a
+_md5_=e38d33b1e93f14a2fa2a14b4ae5c8db6
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
index ff7d5d15accc..7e5400928624 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for Linux Kernel Stream Control Transmission Protocol implemen
 EAPI=5
 HOMEPAGE=http://lksctp.sourceforge.net/
 IUSE=kernel_linux static-libs kernel_linux
-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+ LGPL-2.1 )
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.17.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a79a8c07e80582f618375cabee911a99
+_md5_=4d3404bf4fb9b0ac0bdb6c2af1a59202
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
index 91620fb304ea..16107fd81dd8 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for Linux Kernel Stream Control Transmission Protocol implemen
 EAPI=6
 HOMEPAGE=http://lksctp.sourceforge.net/
 IUSE=kernel_linux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc ~x86
 LICENSE=|| ( GPL-2+ LGPL-2.1 )
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=https://github.com/sctp/lksctp-tools/archive/v1.0.18.tar.gz -> lksctp-tools-1.0.18.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a2f38bcbd8e9886a3b073e480e07120
+_md5_=264f243769f83f8e61f372a24a4c212b
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.14 b/metadata/md5-cache/net-misc/memcached-1.5.14
index a03f159d5630..1957151fb7ff 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.14
+++ b/metadata/md5-cache/net-misc/memcached-1.5.14
@@ -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 ~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.14.tar.gz https://www.memcached.org/files/old/memcached-1.5.14.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3946533486cdbde8ab71b42a756a0b52
+_md5_=9925d3a26087a390f3c93c94851262bd
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.16 b/metadata/md5-cache/net-misc/memcached-1.5.16
new file mode 100644
index 000000000000..bba1d9e2bdca
--- /dev/null
+++ b/metadata/md5-cache/net-misc/memcached-1.5.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=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 ~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.16.tar.gz https://www.memcached.org/files/old/memcached-1.5.16.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f42ee145d1136616a54b6d94c7a39bfc
diff --git a/metadata/md5-cache/net-misc/mico-2.3.13-r11 b/metadata/md5-cache/net-misc/mico-2.3.13-r11
deleted file mode 100644
index 8e36605f1778..000000000000
--- a/metadata/md5-cache/net-misc/mico-2.3.13-r11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:* ) tcl? ( dev-lang/tcl:0 ) X? ( x11-libs/libXt ) >=sys-devel/flex-2.5.2 >=sys-devel/bison-1.22 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A freely available and fully compliant implementation of the CORBA standard
-EAPI=6
-HOMEPAGE=http://www.mico.org/
-IUSE=gtk postgres ssl tcl threads X
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt
-LICENSE=GPL-2 LGPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:* ) tcl? ( dev-lang/tcl:0 ) X? ( x11-libs/libXt )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.mico.org/mico-2.3.13.tar.gz https://dev.gentoo.org/~haubi/distfiles/mico-2.3.13-gentoo-patches-20170529.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc991abcd22f5b58d90f583f3f222406
diff --git a/metadata/md5-cache/net-misc/mico-2.3.13-r12 b/metadata/md5-cache/net-misc/mico-2.3.13-r12
new file mode 100644
index 000000000000..b68e402af453
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mico-2.3.13-r12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0 ) X? ( x11-libs/libXt ) >=sys-devel/flex-2.5.2 >=sys-devel/bison-1.22 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A freely available and fully compliant implementation of the CORBA standard
+EAPI=6
+HOMEPAGE=http://www.mico.org/
+IUSE=gtk postgres ssl tcl threads X
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt
+LICENSE=GPL-2 LGPL-2
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0 ) X? ( x11-libs/libXt )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.mico.org/mico-2.3.13.tar.gz https://dev.gentoo.org/~haubi/distfiles/mico-2.3.13-gentoo-patches-20170529.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=13a6f7f3ef68dc7afd0d33b97f0b73cf
diff --git a/metadata/md5-cache/net-misc/mico-9999 b/metadata/md5-cache/net-misc/mico-9999
index 413bca17857f..d6a41a64b287 100644
--- a/metadata/md5-cache/net-misc/mico-9999
+++ b/metadata/md5-cache/net-misc/mico-9999
@@ -1,13 +1,14 @@
+BDEPEND=>=sys-devel/flex-2.5.2 >=sys-devel/bison-1.22 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:* ) tcl? ( dev-lang/tcl:0 ) X? ( x11-libs/libXt ) >=sys-devel/flex-2.5.2 >=sys-devel/bison-1.22 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/darcs net-misc/rsync
+DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0 ) X? ( x11-libs/libXt ) dev-vcs/darcs net-misc/rsync
 DESCRIPTION=A freely available and fully compliant implementation of the CORBA standard
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.mico.org/
 IUSE=gtk postgres ssl tcl threads X
 LICENSE=GPL-2 LGPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:* ) tcl? ( dev-lang/tcl:0 ) X? ( x11-libs/libXt )
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0 ) X? ( x11-libs/libXt )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~haubi/distfiles/mico-9999-gentoo-patches-20170529.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	darcs	87c29dece3467022cfeee8654d38b9f4	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e86150652e325c198e499d5640188113
+SRC_URI=https://github.com/haubi/mico/compare/gentoo.patch -> mico-9999-gentoo.patch
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	darcs	87c29dece3467022cfeee8654d38b9f4	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=be26029b64c7132534b49191e5104991
diff --git a/metadata/md5-cache/net-misc/mindterm-3.4 b/metadata/md5-cache/net-misc/mindterm-3.4
index 456c50886179..297f423a773d 100644
--- a/metadata/md5-cache/net-misc/mindterm-3.4
+++ b/metadata/md5-cache/net-misc/mindterm-3.4
@@ -7,8 +7,8 @@ IUSE=elibc_FreeBSD doc test examples elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=mindterm
 RDEPEND=>=virtual/jre-1.4 dev-java/jzlib:0 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
+RESTRICT=test mirror bindist
 SLOT=0
 SRC_URI=http://www.appgate.com/downloads/MindTerm-3.4/mindterm_3.4-src.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=17a6aec7852bda327368937b64281c82
+_md5_=64f7b6e08db762324272aefdf7565f83
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190408 b/metadata/md5-cache/net-misc/miniupnpd-2.1.20190408
deleted file mode 100644
index bbdfda6fe36d..000000000000
--- a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190408
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= sys-apps/lsb-release
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 pcp-peer portinuse strict
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0=
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.1.20190408.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=4e4c4b5fc43de15ed2240c8af922dd16
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190116 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190116
index 5b2129a89fcb..b3ac97ac655c 100644
--- a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190116
+++ b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190116
@@ -4,9 +4,9 @@ DESCRIPTION=Database of mobile broadband service providers
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=CC-PD
 SLOT=0
 SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20190116/mobile-broadband-provider-info-20190116.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6e9e51de64d8ca2f901ef62e0cd2ed0c
+_md5_=02301b0de113988ca0b7d527f940ca43
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.16.0 b/metadata/md5-cache/net-misc/networkmanager-1.16.0
index 683aa18167f7..2ee25a4e756e 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.16.0
+++ b/metadata/md5-cache/net-misc/networkmanager-1.16.0
@@ -4,11 +4,11 @@ DESCRIPTION=A set of co-operative tools that make networking simple and straight
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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-2+
 RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
 REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.16/NetworkManager-1.16.0.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c27afb1ee12c0d18bd1f540975e23ae7
+_md5_=fe99b13347c293135eba9bb5cd3c2564
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.0.0-r6 b/metadata/md5-cache/net-misc/ntpsec-1.0.0-r6
deleted file mode 100644
index 146ed315a362..000000000000
--- a/metadata/md5-cache/net-misc/ntpsec-1.0.0-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[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(-)] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) app-text/asciidoc app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
-DESCRIPTION=The NTP reference implementation, refactored
-EAPI=6
-HOMEPAGE=https://www.ntpsec.org/
-IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[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(-)] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=be40006cc85bb120a7d5801c530e55ef
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.1 b/metadata/md5-cache/net-misc/ntpsec-1.1.1
deleted file mode 100644
index 38a11c7b777f..000000000000
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[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(-)] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) app-text/asciidoc app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
-DESCRIPTION=The NTP reference implementation, refactored
-EAPI=6
-HOMEPAGE=https://www.ntpsec.org/
-IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[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(-)] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) nist? ( rclock_local )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=12c3ea2aecec77960925c4324228f9fa
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.2 b/metadata/md5-cache/net-misc/ntpsec-1.1.2
deleted file mode 100644
index c64c5db558aa..000000000000
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[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(-)] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) app-text/asciidoc app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
-DESCRIPTION=The NTP reference implementation, refactored
-EAPI=6
-HOMEPAGE=https://www.ntpsec.org/
-IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[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(-)] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) nist? ( rclock_local )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=12c3ea2aecec77960925c4324228f9fa
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.3 b/metadata/md5-cache/net-misc/ntpsec-1.1.3
new file mode 100644
index 000000000000..338698b6c9e4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[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(-)] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) app-text/asciidoc app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
+DESCRIPTION=The NTP reference implementation, refactored
+EAPI=6
+HOMEPAGE=https://www.ntpsec.org/
+IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~arm ~arm64 ~x86
+LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[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(-)] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) nist? ( rclock_local )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=74202ece624b9ba25aed9c1b3d56236e
diff --git a/metadata/md5-cache/net-misc/ntpsec-9999 b/metadata/md5-cache/net-misc/ntpsec-9999
index 0d527d8ed8f9..6192856771f6 100644
--- a/metadata/md5-cache/net-misc/ntpsec-9999
+++ b/metadata/md5-cache/net-misc/ntpsec-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) nist? ( rclock_local )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=12c3ea2aecec77960925c4324228f9fa
+_md5_=bbdcc3c3d85c0ce58c899ba7be668457
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.10.2 b/metadata/md5-cache/net-misc/openvswitch-2.10.2
new file mode 100644
index 000000000000..9019ebeef2d6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openvswitch-2.10.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
+DEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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/ovs-2.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( dev-python/twisted[conch,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/twisted-web[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/zope-interface[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(-)] debug? ( dev-lang/perl ) sys-apps/util-linux[caps] virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
+DESCRIPTION=Production quality, multilayer virtual switch
+EAPI=6
+HOMEPAGE=https://www.openvswitch.org
+IUSE=debug modules monitor +ssl kernel_linux kernel_linux kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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(-)] ~dev-python/ovs-2.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( dev-python/twisted[conch,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/twisted-web[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/zope-interface[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(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.10.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=64fdfee53d0d50b6e8bffc97382cb2ca
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.11.1 b/metadata/md5-cache/net-misc/openvswitch-2.11.1
new file mode 100644
index 000000000000..b9a196258ae0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openvswitch-2.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
+DEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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/ovs-2.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( dev-python/twisted[conch,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/twisted-web[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/zope-interface[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(-)] debug? ( dev-lang/perl ) sys-apps/util-linux[caps] virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
+DESCRIPTION=Production quality, multilayer virtual switch
+EAPI=6
+HOMEPAGE=https://www.openvswitch.org
+IUSE=debug modules monitor +ssl kernel_linux kernel_linux kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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(-)] ~dev-python/ovs-2.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( dev-python/twisted[conch,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/twisted-web[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/zope-interface[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(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.11.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=521b9653e981a5141e992b0bd1668a4e
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.5-r1 b/metadata/md5-cache/net-misc/rdesktop-1.8.5-r1
deleted file mode 100644
index cd0bb042ebed..000000000000
--- a/metadata/md5-cache/net-misc/rdesktop-1.8.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( virtual/krb5 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr ) x11-libs/libXt
-DESCRIPTION=A Remote Desktop Protocol Client
-EAPI=7
-HOMEPAGE=http://www.rdesktop.org/
-IUSE=alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( virtual/krb5 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr )
-SLOT=0
-SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.8.5/rdesktop-1.8.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=18d177f78c875a5b9dd1730a6051a5d3
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.6 b/metadata/md5-cache/net-misc/rdesktop-1.8.6
new file mode 100644
index 000000000000..c03dd76680f0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( virtual/krb5 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr ) x11-libs/libXt
+DESCRIPTION=A Remote Desktop Protocol Client
+EAPI=7
+HOMEPAGE=http://www.rdesktop.org/
+IUSE=alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( virtual/krb5 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr )
+SLOT=0
+SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.8.6/rdesktop-1.8.6.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=b16fa3e2a8f56a1efd20a8b8e64a873d
diff --git a/metadata/md5-cache/net-misc/sslh-1.19c b/metadata/md5-cache/net-misc/sslh-1.19c
deleted file mode 100644
index 4b084d8d199f..000000000000
--- a/metadata/md5-cache/net-misc/sslh-1.19c
+++ /dev/null
@@ -1,14 +0,0 @@
-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=https://www.rutschle.net/tech/sslh/README.html
-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=https://www.rutschle.net/tech/sslh/sslh-v1.19c.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1dea987da0c0ef3e1bf5efe2e847efeb
diff --git a/metadata/md5-cache/net-misc/stunnel-5.54 b/metadata/md5-cache/net-misc/stunnel-5.54
new file mode 100644
index 000000000000..5c30b425bc32
--- /dev/null
+++ b/metadata/md5-cache/net-misc/stunnel-5.54
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
+DESCRIPTION=TLS/SSL - Port Wrapper
+EAPI=6
+HOMEPAGE=http://www.stunnel.org/index.html
+IUSE=ipv6 libressl selinux stunnel3 tcpd ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) tcpd? ( sys-apps/tcp-wrappers ) stunnel3? ( dev-lang/perl ) selinux? ( sec-policy/selinux-stunnel )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.54.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.54.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.54.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.54.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.54.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.54.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.54.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=6c58af20e7330250f86d95a9025e87ee
diff --git a/metadata/md5-cache/net-misc/usbip-3.19 b/metadata/md5-cache/net-misc/usbip-3.19
index 560ae2799871..a2576c6fa73c 100644
--- a/metadata/md5-cache/net-misc/usbip-3.19
+++ b/metadata/md5-cache/net-misc/usbip-3.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1c0228d0f6967e05391c7e94259241fb
diff --git a/metadata/md5-cache/net-misc/usbip-4.13 b/metadata/md5-cache/net-misc/usbip-4.13
index 465e2caa404f..a83091e2faa6 100644
--- a/metadata/md5-cache/net-misc/usbip-4.13
+++ b/metadata/md5-cache/net-misc/usbip-4.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dee5fc21d6bb4ea70efe7d68b4009a5f
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.05.11 b/metadata/md5-cache/net-misc/youtube-dl-2019.05.11
deleted file mode 100644
index f3954b768155..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2019.05.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://rg3.github.com/youtube-dl/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2019.05.11/youtube-dl-2019.05.11.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a81df1ee5db1fc10a9efc7acef5a07da
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.05.20 b/metadata/md5-cache/net-misc/youtube-dl-2019.05.20
index 4bca6faf0287..93cb291b9d5c 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2019.05.20
+++ b/metadata/md5-cache/net-misc/youtube-dl-2019.05.20
@@ -5,7 +5,7 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=7
 HOMEPAGE=https://rg3.github.com/youtube-dl/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2019.05.20/youtube-dl-2019.05.20.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=1d089d955908ec8310c856eb6337ba4a
+_md5_=a81df1ee5db1fc10a9efc7acef5a07da
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 05adb000f1c6..c12d18491926 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/gssproxy-0.8.2 b/metadata/md5-cache/net-nds/gssproxy-0.8.2
index cc9540c87405..e027b3c6a6bb 100644
--- a/metadata/md5-cache/net-nds/gssproxy-0.8.2
+++ b/metadata/md5-cache/net-nds/gssproxy-0.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=daemon to proxy GSSAPI context establishment and channel handling
 EAPI=6
 HOMEPAGE=https://pagure.io/gssproxy
 IUSE=debug selinux systemd hardened
-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=BSD-1
 RDEPEND=>=dev-libs/libverto-0.2.2 >=dev-libs/ding-libs-0.6.1 virtual/krb5 selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-gssproxy )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://releases.pagure.org/gssproxy/gssproxy-0.8.2.tar.gz
-_md5_=561a45f4515a4894ee43a2c0323aa684
+_md5_=c777b0937b3f1fa3180d2c806e69bea9
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index bec1a5a96de1..61b458d98450 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-2.3.7 b/metadata/md5-cache/net-nntp/sabnzbd-2.3.7
deleted file mode 100644
index 3a33a3f0636c..000000000000
--- a/metadata/md5-cache/net-nntp/sabnzbd-2.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
-DESCRIPTION=Binary newsgrabber with web-interface
-EAPI=6
-HOMEPAGE=https://sabnzbd.org/
-IUSE=+7za +rar unzip python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-arch/par2cmdline-0.4 >=dev-python/cheetah-2.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cryptography[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/gntp[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pythonutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/sabyenc-3.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-misc/wget 7za? ( app-arch/p7zip ) rar? ( || ( app-arch/unrar app-arch/rar ) ) unzip? ( >=app-arch/unzip-5.5.2 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/2.3.7/SABnzbd-2.3.7-src.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1ac119833da74edf106ce5a39377c722
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-2.3.9 b/metadata/md5-cache/net-nntp/sabnzbd-2.3.9
new file mode 100644
index 000000000000..b958384b2977
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/sabnzbd-2.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
+DESCRIPTION=Binary newsgrabber with web-interface
+EAPI=6
+HOMEPAGE=https://sabnzbd.org/
+IUSE=+7za +rar unzip python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-arch/par2cmdline-0.4 >=dev-python/cheetah-2.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cryptography[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/gntp[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pythonutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/sabyenc-3.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-misc/wget 7za? ( app-arch/p7zip ) rar? ( || ( app-arch/unrar app-arch/rar ) ) unzip? ( >=app-arch/unzip-5.5.2 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/2.3.9/SABnzbd-2.3.9-src.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=31a3d6c9b17372cf44eaac4453d90d4b
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index f49cf8660099..e9116f20fbd3 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/airdcpp-webclient-2.5.0 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.5.0
deleted file mode 100644
index 60d43d8ba36f..000000000000
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/pkgconfig || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy3-5:0 >=virtual/pypy-5:0 ) app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist] net-libs/miniupnpc:= sys-libs/zlib:= virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Cross-platform Direct Connect client
-EAPI=6
-HOMEPAGE=https://airdcpp-web.github.io/
-IUSE=nat-pmp +tbb +webui
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-PDEPEND=webui? ( www-apps/airdcpp-webui )
-RDEPEND=app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist] net-libs/miniupnpc:= sys-libs/zlib:= virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
-SLOT=0
-SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.5.0.tar.gz -> airdcpp-webclient-2.5.0.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b757aec589d81a4ad56fd1faa3a116a8
diff --git a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.5.1 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.5.1
deleted file mode 100644
index 79138eb66166..000000000000
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/pkgconfig || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy3-5:0 >=virtual/pypy-5:0 ) app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist] net-libs/miniupnpc:= sys-libs/zlib:= virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
-DESCRIPTION=Cross-platform Direct Connect client
-EAPI=7
-HOMEPAGE=https://airdcpp-web.github.io/
-IUSE=nat-pmp +tbb +webui
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-PDEPEND=webui? ( www-apps/airdcpp-webui )
-RDEPEND=app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist] net-libs/miniupnpc:= sys-libs/zlib:= virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
-SLOT=0
-SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.5.1.tar.gz -> airdcpp-webclient-2.5.1.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=679b0c9b8c4c62d11f4ee18f1d66d624
diff --git a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.1 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.1
new file mode 100644
index 000000000000..88cc1393337c
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=virtual/pkgconfig || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy3-5:0 >=virtual/pypy-5:0 ) app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist] net-libs/miniupnpc:= sys-libs/zlib:= virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
+DESCRIPTION=Cross-platform Direct Connect client
+EAPI=7
+HOMEPAGE=https://airdcpp-web.github.io/
+IUSE=nat-pmp +tbb +webui
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+PDEPEND=webui? ( www-apps/airdcpp-webui )
+RDEPEND=app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist] net-libs/miniupnpc:= sys-libs/zlib:= virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
+SLOT=0
+SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.6.1.tar.gz -> airdcpp-webclient-2.6.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=679b0c9b8c4c62d11f4ee18f1d66d624
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0.1
new file mode 100644
index 000000000000..ce60b94f9e29
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=7
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl libressl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.0.1.tar.gz -> cpuminer-opt-3.9.0.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1
new file mode 100644
index 000000000000..148238a3058c
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=7
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl libressl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.1.tar.gz -> cpuminer-opt-3.9.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1.1
new file mode 100644
index 000000000000..88baf97f2f54
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=7
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl libressl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.1.1.tar.gz -> cpuminer-opt-3.9.1.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.1.0-r1 b/metadata/md5-cache/net-p2p/syncthing-1.1.0-r1
new file mode 100644
index 000000000000..55cc22bc1ae5
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/syncthing-1.1.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 >=dev-lang/go-1.10 virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup test unpack
+DESCRIPTION=Open Source Continuous File Synchronization
+EAPI=7
+HOMEPAGE=https://syncthing.net
+IUSE=selinux tools
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MPL-2.0
+RDEPEND=selinux? ( sec-policy/selinux-syncthing )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/syncthing/syncthing/archive/v1.1.0.tar.gz -> syncthing-1.1.0.tar.gz https://github.com/AudriusButkevicius/go-nat-pmp/archive/452c97607362b2ab5a7839b8d1704f0396b640ca.tar.gz -> github.com-AudriusButkevicius-go-nat-pmp-452c97607362b2ab5a7839b8d1704f0396b640ca.tar.gz https://github.com/AudriusButkevicius/recli/archive/v0.0.5.tar.gz -> github.com-AudriusButkevicius-recli-v0.0.5.tar.gz https://github.com/bkaradzic/go-lz4/archive/7224d8d8f27ef618c0a95f1ae69dbb0488abc33a.tar.gz -> github.com-bkaradzic-go-lz4-7224d8d8f27ef618c0a95f1ae69dbb0488abc33a.tar.gz https://github.com/calmh/du/archive/v1.0.1.tar.gz -> github.com-calmh-du-v1.0.1.tar.gz https://github.com/calmh/xdr/archive/v1.1.0.tar.gz -> github.com-calmh-xdr-v1.1.0.tar.gz https://github.com/chmduquesne/rollinghash/archive/a60f8e7142b536ea61bb5d84014171189eeaaa81.tar.gz -> github.com-chmduquesne-rollinghash-a60f8e7142b536ea61bb5d84014171189eeaaa81.tar.gz https://github.com/d4l3k/messagediff/archive/v1.2.1.tar.gz -> github.com-d4l3k-messagediff-v1.2.1.tar.gz https://github.com/davecgh/go-spew/archive/v1.1.1.tar.gz -> github.com-davecgh-go-spew-v1.1.1.tar.gz https://github.com/flynn-archive/go-shlex/archive/3f9db97f856818214da2e1057f8ad84803971cff.tar.gz -> github.com-flynn-archive-go-shlex-3f9db97f856818214da2e1057f8ad84803971cff.tar.gz https://github.com/gobwas/glob/archive/51eb1ee00b6d931c66d229ceeb7c31b985563420.tar.gz -> github.com-gobwas-glob-51eb1ee00b6d931c66d229ceeb7c31b985563420.tar.gz https://github.com/gogo/protobuf/archive/v1.2.0.tar.gz -> github.com-gogo-protobuf-v1.2.0.tar.gz https://github.com/golang/groupcache/archive/84a468cf14b4376def5d68c722b139b881c450a4.tar.gz -> github.com-golang-groupcache-84a468cf14b4376def5d68c722b139b881c450a4.tar.gz https://github.com/golang/snappy/archive/553a641470496b2327abcac10b36396bd98e45c9.tar.gz -> github.com-golang-snappy-553a641470496b2327abcac10b36396bd98e45c9.tar.gz https://github.com/jackpal/gateway/archive/5795ac81146e01d3fab7bcf21c043c3d6a32b006.tar.gz -> github.com-jackpal-gateway-5795ac81146e01d3fab7bcf21c043c3d6a32b006.tar.gz https://github.com/kballard/go-shellquote/archive/cd60e84ee657ff3dc51de0b4f55dd299a3e136f2.tar.gz -> github.com-kballard-go-shellquote-cd60e84ee657ff3dc51de0b4f55dd299a3e136f2.tar.gz https://github.com/kr/pretty/archive/v0.1.0.tar.gz -> github.com-kr-pretty-v0.1.0.tar.gz https://github.com/lib/pq/archive/v1.0.0.tar.gz -> github.com-lib-pq-v1.0.0.tar.gz https://github.com/mattn/go-isatty/archive/v0.0.4.tar.gz -> github.com-mattn-go-isatty-v0.0.4.tar.gz https://github.com/minio/sha256-simd/archive/cc1980cb03383b1d46f518232672584432d7532d.tar.gz -> github.com-minio-sha256-simd-cc1980cb03383b1d46f518232672584432d7532d.tar.gz https://github.com/onsi/ginkgo/archive/6c46eb8334b30dc55b42f1a1c725d5ce97375390.tar.gz -> github.com-onsi-ginkgo-6c46eb8334b30dc55b42f1a1c725d5ce97375390.tar.gz https://github.com/onsi/gomega/archive/ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64.tar.gz -> github.com-onsi-gomega-ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64.tar.gz https://github.com/oschwald/geoip2-golang/archive/v1.1.0.tar.gz -> github.com-oschwald-geoip2-golang-v1.1.0.tar.gz https://github.com/oschwald/maxminddb-golang/archive/26fe5ace1c706491c2936119e1dc69c1a9c04d7f.tar.gz -> github.com-oschwald-maxminddb-golang-26fe5ace1c706491c2936119e1dc69c1a9c04d7f.tar.gz https://github.com/petermattis/goid/archive/3db12ebb2a599ba4a96bea1c17b61c2f78a40e02.tar.gz -> github.com-petermattis-goid-3db12ebb2a599ba4a96bea1c17b61c2f78a40e02.tar.gz https://github.com/pkg/errors/archive/v0.8.1.tar.gz -> github.com-pkg-errors-v0.8.1.tar.gz https://github.com/pmezard/go-difflib/archive/v1.0.0.tar.gz -> github.com-pmezard-go-difflib-v1.0.0.tar.gz https://github.com/prometheus/client_golang/archive/v0.9.2.tar.gz -> github.com-prometheus-client_golang-v0.9.2.tar.gz https://github.com/rcrowley/go-metrics/archive/e181e095bae94582363434144c61a9653aff6e50.tar.gz -> github.com-rcrowley-go-metrics-e181e095bae94582363434144c61a9653aff6e50.tar.gz https://github.com/sasha-s/go-deadlock/archive/v0.2.0.tar.gz -> github.com-sasha-s-go-deadlock-v0.2.0.tar.gz https://github.com/stretchr/testify/archive/v1.2.2.tar.gz -> github.com-stretchr-testify-v1.2.2.tar.gz https://github.com/syncthing/notify/archive/4e389ea6c0d84e6195eb585ffaf62c8c143306ae.tar.gz -> github.com-syncthing-notify-4e389ea6c0d84e6195eb585ffaf62c8c143306ae.tar.gz https://github.com/syndtr/goleveldb/archive/34011bf325bce385408353a30b101fe5e923eb6e.tar.gz -> github.com-syndtr-goleveldb-34011bf325bce385408353a30b101fe5e923eb6e.tar.gz https://github.com/thejerf/suture/archive/v3.0.2.tar.gz -> github.com-thejerf-suture-v3.0.2.tar.gz https://github.com/urfave/cli/archive/v1.20.0.tar.gz -> github.com-urfave-cli-v1.20.0.tar.gz https://github.com/vitrun/qart/archive/bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz -> github.com-vitrun-qart-bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz https://github.com/golang/crypto/archive/0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8.tar.gz -> github.com-golang-crypto-0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8.tar.gz https://github.com/golang/net/archive/351d144fa1fc0bd934e2408202be0c29f25e35a0.tar.gz -> github.com-golang-net-351d144fa1fc0bd934e2408202be0c29f25e35a0.tar.gz https://github.com/golang/sys/archive/4d1cda033e0619309c606fc686de3adcf599539e.tar.gz -> github.com-golang-sys-4d1cda033e0619309c606fc686de3adcf599539e.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/golang/time/archive/6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz -> github.com-golang-time-6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/v1.2.tar.gz -> github.com-go-asn1-ber-asn1-ber-v1.2.tar.gz https://github.com/go-check/check/archive/788fd78401277ebd861206a03c884797c6ec5541.tar.gz -> github.com-go-check-check-788fd78401277ebd861206a03c884797c6ec5541.tar.gz https://github.com/go-ldap/ldap/archive/v2.5.1.tar.gz -> github.com-go-ldap-ldap-v2.5.1.tar.gz https://github.com/go-yaml/yaml/archive/v2.0.0.tar.gz -> github.com-go-yaml-yaml-v2.0.0.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/golang/protobuf/archive/v1.2.0.tar.gz -> github.com-golang-protobuf-v1.2.0.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/v1.0.1.tar.gz -> github.com-matttproud-golang_protobuf_extensions-v1.0.1.tar.gz https://github.com/prometheus/client_model/archive/5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz -> github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz https://github.com/prometheus/common/archive/v0.1.0.tar.gz -> github.com-prometheus-common-v0.1.0.tar.gz https://github.com/prometheus/procfs/archive/1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz -> github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=a3473eee4ec9a356376430f962dcf363
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.1.3 b/metadata/md5-cache/net-p2p/syncthing-1.1.3
new file mode 100644
index 000000000000..9fe8d1624666
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/syncthing-1.1.3
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 >=dev-lang/go-1.10 virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup test unpack
+DESCRIPTION=Open Source Continuous File Synchronization
+EAPI=7
+HOMEPAGE=https://syncthing.net
+IUSE=selinux tools
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MPL-2.0
+RDEPEND=selinux? ( sec-policy/selinux-syncthing )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/syncthing/syncthing/archive/v1.1.3.tar.gz -> syncthing-1.1.3.tar.gz https://github.com/AudriusButkevicius/go-nat-pmp/archive/452c97607362b2ab5a7839b8d1704f0396b640ca.tar.gz -> github.com-AudriusButkevicius-go-nat-pmp-452c97607362b2ab5a7839b8d1704f0396b640ca.tar.gz https://github.com/AudriusButkevicius/recli/archive/v0.0.5.tar.gz -> github.com-AudriusButkevicius-recli-v0.0.5.tar.gz https://github.com/bkaradzic/go-lz4/archive/7224d8d8f27ef618c0a95f1ae69dbb0488abc33a.tar.gz -> github.com-bkaradzic-go-lz4-7224d8d8f27ef618c0a95f1ae69dbb0488abc33a.tar.gz https://github.com/calmh/du/archive/v1.0.1.tar.gz -> github.com-calmh-du-v1.0.1.tar.gz https://github.com/calmh/xdr/archive/v1.1.0.tar.gz -> github.com-calmh-xdr-v1.1.0.tar.gz https://github.com/chmduquesne/rollinghash/archive/a60f8e7142b536ea61bb5d84014171189eeaaa81.tar.gz -> github.com-chmduquesne-rollinghash-a60f8e7142b536ea61bb5d84014171189eeaaa81.tar.gz https://github.com/d4l3k/messagediff/archive/v1.2.1.tar.gz -> github.com-d4l3k-messagediff-v1.2.1.tar.gz https://github.com/davecgh/go-spew/archive/v1.1.1.tar.gz -> github.com-davecgh-go-spew-v1.1.1.tar.gz https://github.com/flynn-archive/go-shlex/archive/3f9db97f856818214da2e1057f8ad84803971cff.tar.gz -> github.com-flynn-archive-go-shlex-3f9db97f856818214da2e1057f8ad84803971cff.tar.gz https://github.com/gobwas/glob/archive/51eb1ee00b6d931c66d229ceeb7c31b985563420.tar.gz -> github.com-gobwas-glob-51eb1ee00b6d931c66d229ceeb7c31b985563420.tar.gz https://github.com/gogo/protobuf/archive/v1.2.0.tar.gz -> github.com-gogo-protobuf-v1.2.0.tar.gz https://github.com/golang/groupcache/archive/84a468cf14b4376def5d68c722b139b881c450a4.tar.gz -> github.com-golang-groupcache-84a468cf14b4376def5d68c722b139b881c450a4.tar.gz https://github.com/golang/snappy/archive/553a641470496b2327abcac10b36396bd98e45c9.tar.gz -> github.com-golang-snappy-553a641470496b2327abcac10b36396bd98e45c9.tar.gz https://github.com/jackpal/gateway/archive/5795ac81146e01d3fab7bcf21c043c3d6a32b006.tar.gz -> github.com-jackpal-gateway-5795ac81146e01d3fab7bcf21c043c3d6a32b006.tar.gz https://github.com/kballard/go-shellquote/archive/cd60e84ee657ff3dc51de0b4f55dd299a3e136f2.tar.gz -> github.com-kballard-go-shellquote-cd60e84ee657ff3dc51de0b4f55dd299a3e136f2.tar.gz https://github.com/kr/pretty/archive/v0.1.0.tar.gz -> github.com-kr-pretty-v0.1.0.tar.gz https://github.com/lib/pq/archive/v1.0.0.tar.gz -> github.com-lib-pq-v1.0.0.tar.gz https://github.com/mattn/go-isatty/archive/v0.0.4.tar.gz -> github.com-mattn-go-isatty-v0.0.4.tar.gz https://github.com/minio/sha256-simd/archive/cc1980cb03383b1d46f518232672584432d7532d.tar.gz -> github.com-minio-sha256-simd-cc1980cb03383b1d46f518232672584432d7532d.tar.gz https://github.com/onsi/ginkgo/archive/6c46eb8334b30dc55b42f1a1c725d5ce97375390.tar.gz -> github.com-onsi-ginkgo-6c46eb8334b30dc55b42f1a1c725d5ce97375390.tar.gz https://github.com/onsi/gomega/archive/ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64.tar.gz -> github.com-onsi-gomega-ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64.tar.gz https://github.com/oschwald/geoip2-golang/archive/v1.1.0.tar.gz -> github.com-oschwald-geoip2-golang-v1.1.0.tar.gz https://github.com/oschwald/maxminddb-golang/archive/26fe5ace1c706491c2936119e1dc69c1a9c04d7f.tar.gz -> github.com-oschwald-maxminddb-golang-26fe5ace1c706491c2936119e1dc69c1a9c04d7f.tar.gz https://github.com/petermattis/goid/archive/3db12ebb2a599ba4a96bea1c17b61c2f78a40e02.tar.gz -> github.com-petermattis-goid-3db12ebb2a599ba4a96bea1c17b61c2f78a40e02.tar.gz https://github.com/pkg/errors/archive/v0.8.1.tar.gz -> github.com-pkg-errors-v0.8.1.tar.gz https://github.com/pmezard/go-difflib/archive/v1.0.0.tar.gz -> github.com-pmezard-go-difflib-v1.0.0.tar.gz https://github.com/prometheus/client_golang/archive/v0.9.2.tar.gz -> github.com-prometheus-client_golang-v0.9.2.tar.gz https://github.com/rcrowley/go-metrics/archive/e181e095bae94582363434144c61a9653aff6e50.tar.gz -> github.com-rcrowley-go-metrics-e181e095bae94582363434144c61a9653aff6e50.tar.gz https://github.com/sasha-s/go-deadlock/archive/v0.2.0.tar.gz -> github.com-sasha-s-go-deadlock-v0.2.0.tar.gz https://github.com/stretchr/testify/archive/v1.2.2.tar.gz -> github.com-stretchr-testify-v1.2.2.tar.gz https://github.com/syncthing/notify/archive/4e389ea6c0d84e6195eb585ffaf62c8c143306ae.tar.gz -> github.com-syncthing-notify-4e389ea6c0d84e6195eb585ffaf62c8c143306ae.tar.gz https://github.com/syndtr/goleveldb/archive/34011bf325bce385408353a30b101fe5e923eb6e.tar.gz -> github.com-syndtr-goleveldb-34011bf325bce385408353a30b101fe5e923eb6e.tar.gz https://github.com/thejerf/suture/archive/v3.0.2.tar.gz -> github.com-thejerf-suture-v3.0.2.tar.gz https://github.com/urfave/cli/archive/v1.20.0.tar.gz -> github.com-urfave-cli-v1.20.0.tar.gz https://github.com/vitrun/qart/archive/bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz -> github.com-vitrun-qart-bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz https://github.com/golang/crypto/archive/0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8.tar.gz -> github.com-golang-crypto-0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8.tar.gz https://github.com/golang/net/archive/351d144fa1fc0bd934e2408202be0c29f25e35a0.tar.gz -> github.com-golang-net-351d144fa1fc0bd934e2408202be0c29f25e35a0.tar.gz https://github.com/golang/sys/archive/4d1cda033e0619309c606fc686de3adcf599539e.tar.gz -> github.com-golang-sys-4d1cda033e0619309c606fc686de3adcf599539e.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/golang/time/archive/6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz -> github.com-golang-time-6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/v1.2.tar.gz -> github.com-go-asn1-ber-asn1-ber-v1.2.tar.gz https://github.com/go-check/check/archive/788fd78401277ebd861206a03c884797c6ec5541.tar.gz -> github.com-go-check-check-788fd78401277ebd861206a03c884797c6ec5541.tar.gz https://github.com/go-ldap/ldap/archive/v2.5.1.tar.gz -> github.com-go-ldap-ldap-v2.5.1.tar.gz https://github.com/go-yaml/yaml/archive/v2.0.0.tar.gz -> github.com-go-yaml-yaml-v2.0.0.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/golang/protobuf/archive/v1.2.0.tar.gz -> github.com-golang-protobuf-v1.2.0.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/v1.0.1.tar.gz -> github.com-matttproud-golang_protobuf_extensions-v1.0.1.tar.gz https://github.com/prometheus/client_model/archive/5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz -> github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz https://github.com/prometheus/common/archive/v0.1.0.tar.gz -> github.com-prometheus-common-v0.1.0.tar.gz https://github.com/prometheus/procfs/archive/1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz -> github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=a3473eee4ec9a356376430f962dcf363
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 349096a1ccf6..c9ad3b8d7725 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/cndrvcups-lb-3.60-r2 b/metadata/md5-cache/net-print/cndrvcups-lb-3.60-r2
index 9c884c4d12c2..709c79f9423e 100644
--- a/metadata/md5-cache/net-print/cndrvcups-lb-3.60-r2
+++ b/metadata/md5-cache/net-print/cndrvcups-lb-3.60-r2
@@ -5,8 +5,8 @@ EAPI=7
 HOMEPAGE=https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx
 KEYWORDS=-* amd64 x86
 LICENSE=Canon-UFR-II
-RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=gnome-base/libglade-2.4:2.0 >=net-print/cups-1.1.17 ~net-print/cndrvcups-common-lb-3.60 >=x11-libs/gtk+-2.4:2 virtual/jpeg:62[abi_x86_32(-)]
+RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=gnome-base/libglade-2.4:2.0 >=net-print/cups-1.1.17 ~net-print/cndrvcups-common-lb-3.60 >=x11-libs/gtk+-2.4:2
 SLOT=0
 SRC_URI=http://gdlp01.c-wss.com/gds/0/0100009240/02/linux-UFRII-drv-v360-uken.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=7b58d81561ccfa9a666eec555ef06c4d
+_md5_=0cd211793ed2822c5361a0f197cb5652
diff --git a/metadata/md5-cache/net-print/hplip-3.19.5 b/metadata/md5-cache/net-print/hplip-3.19.5
new file mode 100644
index 000000000000..8eae6a114c34
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.19.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) )
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=7
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
+IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux 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
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( dev-python/pygobject:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python3_5? ( dev-python/pygobject:3[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) fax? ( dev-python/reportlab[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) kernel_linux? ( virtual/udev ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] libnotify? ( dev-python/notify2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pillow-3.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) policykit? ( sys-auth/polkit )
+REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/hplip/hplip-3.19.5.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=d1207302c04131f3809e028bcd2a406a
diff --git a/metadata/md5-cache/net-proxy/3proxy-0.8.12 b/metadata/md5-cache/net-proxy/3proxy-0.8.12
new file mode 100644
index 000000000000..3c67c101473c
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/3proxy-0.8.12
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A really tiny cross-platform proxy servers set
+EAPI=7
+HOMEPAGE=https://www.3proxy.ru/
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/z3APA3A/3proxy/archive/0.8.12.tar.gz -> 3proxy-0.8.12.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=0750cb5432bfd090662e961660566d35
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 226b0c03f41f..7dc62b748f29 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/trojan-1.12.2 b/metadata/md5-cache/net-proxy/trojan-1.12.2
new file mode 100644
index 000000000000..3b88e62db2a5
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/trojan-1.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.66.0:= >=dev-libs/openssl-1.0.2:= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) )
+DESCRIPTION=An unidentifiable mechanism that helps you bypass GFW
+EAPI=7
+HOMEPAGE=https://github.com/trojan-gfw/trojan
+IUSE=mysql test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/boost-1.66.0:= >=dev-libs/openssl-1.0.2:= mysql? ( dev-db/mysql-connector-c:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/trojan-gfw/trojan/archive/v1.12.2.tar.gz -> trojan-1.12.2.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=d2ae65c40dfe0f68c7148aa37458f870
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index b10d5e660450..84185206d6bf 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/libreswan-3.28 b/metadata/md5-cache/net-vpn/libreswan-3.28
new file mode 100644
index 000000000000..6c5e76f73280
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-3.28
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=7
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-3.28.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=4b5bd1eaaa9ab813f40354996c37bf4f
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.4-r1 b/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.4-r1
index 332745c60f89..33fc895f3408 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.4-r1
+++ b/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager OpenConnect plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-vpn/openconnect-3.02:= gtk? ( >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openconnect/1.2/NetworkManager-openconnect-1.2.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9d34a00149b5e6933998f8ad6c05fc09
+_md5_=0eb8db15e13e2424fb4448ddcddfcdb4
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.08-r1 b/metadata/md5-cache/net-vpn/openconnect-7.08-r1
index 3f735295052e..4609c4369538 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.08-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-7.08-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
 EAPI=6
 HOMEPAGE=http://www.infradead.org/openconnect.html
 IUSE=doc +gnutls gssapi java libproxy libressl lz4 nls smartcard static-libs stoken elibc_FreeBSD java kernel_linux
-KEYWORDS=amd64 arm ~arm64 ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.08.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20180227.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b3f63b4206ec69d1fb9e4d3a90564fd7
+_md5_=7d8199fe9c6ac8e47d5aa7097f4f0ede
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.7.1 b/metadata/md5-cache/net-vpn/openfortivpn-1.7.1
deleted file mode 100644
index 75589ab7032a..000000000000
--- a/metadata/md5-cache/net-vpn/openfortivpn-1.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare setup
-DEPEND=net-dialup/ppp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=A Fortinet compatible VPN client
-EAPI=7
-HOMEPAGE=https://github.com/adrienverge/openfortivpn
-IUSE=libressl kernel_linux
-KEYWORDS=amd64
-LICENSE=GPL-3-with-openssl-exception openssl
-RDEPEND=net-dialup/ppp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.7.1.tar.gz -> openfortivpn-1.7.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=498f6e19d6fb443dc4dd45297d3dcdbc
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.6 b/metadata/md5-cache/net-vpn/openvpn-2.4.6
index eb9fec5235f2..2290fa25c819 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.6
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=Robust and highly flexible tunneling application compatible with man
 EAPI=6
 HOMEPAGE=https://openvpn.net/
 IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl static systemd test userland_BSD kernel_linux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-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:0= ) libressl? ( dev-libs/libressl:0= ) ) 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 ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=https://swupdate.openvpn.net/community/releases/openvpn-2.4.6.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.6/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4fda94ec47e1ee25126229e4c2da94a0
+_md5_=8ac4471830e1a17ae5e4ebaab3ecee25
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.5.8 b/metadata/md5-cache/net-vpn/tor-0.3.5.8
deleted file mode 100644
index 6422f4635dcc..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.3.5.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install setup
-DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) !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 )
-DESCRIPTION=Anonymizing overlay network for TCP
-EAPI=7
-HOMEPAGE=http://www.torproject.org/
-IUSE=caps libressl lzma scrypt seccomp selinux systemd tor-hardening test 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 caps? ( sys-libs/libcap ) !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.5.8.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.5.8.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=e86afbaaf85e8cf876d19f9eeca638aa
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.0.5 b/metadata/md5-cache/net-vpn/tor-0.4.0.5
index 3a3864e1495c..077f865b253d 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.0.5
+++ b/metadata/md5-cache/net-vpn/tor-0.4.0.5
@@ -5,10 +5,10 @@ DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=7
 HOMEPAGE=http://www.torproject.org/
 IUSE=caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
+KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !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.4.0.5.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.0.5.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=0a9c88b2d28266ec876de36b3afc637a
+_md5_=e40e3e98630ce1f2446d64e933ed87b9
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.1.1_alpha b/metadata/md5-cache/net-vpn/tor-0.4.1.1_alpha
new file mode 100644
index 000000000000..17250eb7a50b
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.4.1.1_alpha
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install setup
+DEPEND=dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !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 )
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=7
+HOMEPAGE=http://www.torproject.org/
+IUSE=caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !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.4.1.1-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.1.1-alpha.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=0a9c88b2d28266ec876de36b3afc637a
diff --git a/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550 b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550
index 58f9ab02a6f2..6af74fa1ae59 100644
--- a/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550
+++ b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550
@@ -4,11 +4,11 @@ DESCRIPTION=Free client for Cisco VPN routing software
 EAPI=5
 HOMEPAGE=https://www.unix-ag.uni-kl.de/~massar/vpnc/
 IUSE=resolvconf +gnutls selinux kernel_linux
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
 LICENSE=GPL-2 BSD
 RDEPEND=dev-lang/perl dev-libs/libgcrypt:0= >=sys-apps/iproute2-2.6.19.20061214[-minimal] gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) resolvconf? ( virtual/resolvconf ) selinux? ( sec-policy/selinux-vpn )
 RESTRICT=!gnutls? ( bindist )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/vpnc-0.5.3_p550.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b7e76af9d685d2257cea9c646885e325
+_md5_=957c3c08672f69779ba1f85d3b3c9763
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20190406 b/metadata/md5-cache/net-vpn/wireguard-0.0.20190406
deleted file mode 100644
index 5f0c50801ac4..000000000000
--- a/metadata/md5-cache/net-vpn/wireguard-0.0.20190406
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) ) module? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
-EAPI=6
-HOMEPAGE=https://www.wireguard.com/
-IUSE=debug +module +tools module-src kernel_linux kernel_linux module
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20190406.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c45b8dbcaadaacf722ad1ffc3d6e5ce
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20190601 b/metadata/md5-cache/net-vpn/wireguard-0.0.20190601
new file mode 100644
index 000000000000..621014aca3d6
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20190601
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) ) module? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
+EAPI=6
+HOMEPAGE=https://www.wireguard.com/
+IUSE=debug +module +tools module-src kernel_linux kernel_linux module
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20190601.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9c45b8dbcaadaacf722ad1ffc3d6e5ce
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 54c18ae34ae8..be3fb8790c72 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/aircrack-ng-1.5.2 b/metadata/md5-cache/net-wireless/aircrack-ng-1.5.2
index 1a98201ff1cc..f1db61e39744 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.5.2
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.5.2
@@ -5,7 +5,7 @@ DESCRIPTION=WLAN tools for breaking 802.11 WEP/WPA keys
 EAPI=7
 HOMEPAGE=http://www.aircrack-ng.org
 IUSE=+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental python_targets_python2_7
-KEYWORDS=amd64 arm ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 PDEPEND=kernel_linux? ( net-wireless/iw net-wireless/wireless-tools sys-apps/ethtool sys-apps/usbutils sys-apps/pciutils ) sys-apps/hwids airdrop-ng? ( net-wireless/lorcon[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 RDEPEND=net-libs/libpcap sys-apps/hwloc:0= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) netlink? ( dev-libs/libnl:3 ) pcre? ( dev-libs/libpcre ) airdrop-ng? ( python_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(-)] ) airgraph-ng? ( python_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(-)] ) experimental? ( sys-libs/zlib ) sqlite? ( >=dev-db/sqlite-3.4 )
@@ -13,4 +13,4 @@ REQUIRED_USE=airdrop-ng? ( || ( python_targets_python2_7 ) ) airgraph-ng? ( || (
 SLOT=0
 SRC_URI=https://download.aircrack-ng.org/aircrack-ng-1.5.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f9d279a354a9d42c12fb43f9e46b66db
+_md5_=c8642e7312b8f5d206623ca530a72c41
diff --git a/metadata/md5-cache/net-wireless/blueman-2.1_alpha3 b/metadata/md5-cache/net-wireless/blueman-2.1_alpha3
deleted file mode 100644
index dc0dc6cc00cb..000000000000
--- a/metadata/md5-cache/net-wireless/blueman-2.1_alpha3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare pretend setup
-DEPEND=dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-wireless/bluez-5:= python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
-EAPI=6
-HOMEPAGE=https://github.com/blueman-project/blueman
-IUSE=appindicator network nls policykit pulseaudio kernel_linux python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-wireless/bluez-5:= python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/dbus-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio[bluetooth] ) !net-wireless/gnome-bluetooth
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.1.alpha3/blueman-2.1.alpha3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=453ffdbe7945380d99e68b4bb2308230
diff --git a/metadata/md5-cache/net-wireless/blueman-2.1_alpha3-r1 b/metadata/md5-cache/net-wireless/blueman-2.1_alpha3-r1
deleted file mode 100644
index ce9787b54956..000000000000
--- a/metadata/md5-cache/net-wireless/blueman-2.1_alpha3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm prepare pretend setup
-DEPEND=dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-wireless/bluez-5:= python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
-EAPI=7
-HOMEPAGE=https://github.com/blueman-project/blueman
-IUSE=appindicator network nls policykit pulseaudio kernel_linux python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-wireless/bluez-5:= python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/dbus-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio[bluetooth] ) !net-wireless/gnome-bluetooth
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.1.alpha3/blueman-2.1.alpha3.tar.xz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7d8e25704f8ed7f05b40acf497f5c3e1
diff --git a/metadata/md5-cache/net-wireless/crda-3.18-r3 b/metadata/md5-cache/net-wireless/crda-3.18-r3
index 462459723a33..4cd37db07632 100644
--- a/metadata/md5-cache/net-wireless/crda-3.18-r3
+++ b/metadata/md5-cache/net-wireless/crda-3.18-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Central Regulatory Domain Agent for wireless networks
 EAPI=6
 HOMEPAGE=https://wireless.wiki.kernel.org/en/developers/regulatory/crda
 IUSE=gcrypt libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86
 LICENSE=ISC
 RDEPEND=!gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gcrypt? ( dev-libs/libgcrypt:0= ) dev-libs/libnl:3 net-wireless/wireless-regdb
 SLOT=0
 SRC_URI=http://linuxwireless.org/download/crda/crda-3.18.tar.xz mirror://kernel/software/network/crda/crda-3.18.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=3765235859adb6bf14ab735c5da9248b
+_md5_=f12c212a1704465a971a3955c7fc58af
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2 b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
index 165e16f07d99..3a9bf2d08030 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=x11-libs/gtk+-3.12:3[introspection?] media-libs/libcanberra[gtk3] >=x11-libs/libnotify-0.7.0 virtual/libudev >=dev-libs/glib-2.38:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) virtual/udev >=net-wireless/bluez-5
 SLOT=2/13
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/3.28/gnome-bluetooth-3.28.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ea45935ab904363905f3bb4d9d10b2a1
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5 b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5
index c590d0e81c50..17a2ca846a63 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=6
 HOMEPAGE=https://www.gnuradio.org/
 IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt5? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/3.7.13.5
 SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.7.13.5/gnuradio-3.7.13.5.tar.xz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-1-qt5.tar.xz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-codec2.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=de541e6a4e10c246a599a99f09f20a83
+_md5_=0e4c7a45b5dd151e09bc6bb029d65c64
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.7-r2 b/metadata/md5-cache/net-wireless/hostapd-2.7-r2
index 93aa38fa73f4..c625cfad4bf9 100644
--- a/metadata/md5-cache/net-wireless/hostapd-2.7-r2
+++ b/metadata/md5-cache/net-wireless/hostapd-2.7-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.7-r2_extras.tar.xz https://w1.fi/releases/hostapd-2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f7f31864263894e24249d86b50f17c8e
diff --git a/metadata/md5-cache/net-wireless/hostapd-9999 b/metadata/md5-cache/net-wireless/hostapd-9999
index 870f68d881fe..cbf694b11198 100644
--- a/metadata/md5-cache/net-wireless/hostapd-9999
+++ b/metadata/md5-cache/net-wireless/hostapd-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.7-r2_extras.tar.xz
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=6461787f7b11efd0b6f3c6b7d92c3fb2
diff --git a/metadata/md5-cache/net-wireless/iwd-0.17 b/metadata/md5-cache/net-wireless/iwd-0.17
index 8cebf62a379c..617112b9b1f4 100644
--- a/metadata/md5-cache/net-wireless/iwd-0.17
+++ b/metadata/md5-cache/net-wireless/iwd-0.17
@@ -4,10 +4,10 @@ DESCRIPTION=Wireless daemon for linux
 EAPI=6
 HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
 IUSE=+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-0.17.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dad8b640aa52fa729d1748a53545a1b4
+_md5_=5437c58c57f9e1ec446cdb2b08b883cc
diff --git a/metadata/md5-cache/net-wireless/iwd-0.18 b/metadata/md5-cache/net-wireless/iwd-0.18
index 0d21f886f44a..a1837f29914a 100644
--- a/metadata/md5-cache/net-wireless/iwd-0.18
+++ b/metadata/md5-cache/net-wireless/iwd-0.18
@@ -4,10 +4,10 @@ DESCRIPTION=Wireless daemon for linux
 EAPI=6
 HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
 IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/ell-0.20 net-wireless/wireless-regdb sys-apps/dbus client? ( sys-libs/readline:0= ) crda? ( net-wireless/crda )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-0.18.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=99f841285df18d776fcf33d6fadbfab6
+_md5_=a5ee1f1c1c586f7a2ad73af9a893a374
diff --git a/metadata/md5-cache/net-wireless/kismet-2019.04.1_p20190416-r1 b/metadata/md5-cache/net-wireless/kismet-2019.04.1_p20190416-r1
deleted file mode 100644
index f41cd577120a..000000000000
--- a/metadata/md5-cache/net-wireless/kismet-2019.04.1_p20190416-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=IEEE 802.11 wireless LAN sniffer
-EAPI=6
-HOMEPAGE=https://www.kismetwireless.net
-IUSE=lm_sensors mousejack networkmanager +pcre selinux +suid python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) selinux? ( sec-policy/selinux-kismet )
-SLOT=0/2019.04.1_p20190416
-SRC_URI=https://github.com/kismetwireless/kismet/archive/6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a.tar.gz -> kismet-2019.04.1_p20190416.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c83f5d657baa0b9afd60d2dfd83eca5
diff --git a/metadata/md5-cache/net-wireless/kismet-2019.05.1 b/metadata/md5-cache/net-wireless/kismet-2019.05.1
new file mode 100644
index 000000000000..9f62209bb55b
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/kismet-2019.05.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install preinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=IEEE 802.11 wireless LAN sniffer
+EAPI=6
+HOMEPAGE=https://www.kismetwireless.net
+IUSE=lm_sensors mousejack networkmanager +pcre selinux +suid python_targets_python2_7
+KEYWORDS=amd64 arm ~arm64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) selinux? ( sec-policy/selinux-kismet )
+SLOT=0/2019.05.1
+SRC_URI=https://www.kismetwireless.net/code/kismet-2019-05-R1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9a2bb2e3a92cd2ad6c5f06b836d29680
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index aafe2d1449f0..51de8497d8ad 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 RESTRICT=strip
 SLOT=0/9999
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f406f0b429d0aa7761e8d065af758327
+_md5_=beebf07a9cf2f1df0c39065c12814f2e
diff --git a/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02 b/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
new file mode 100644
index 000000000000..f4e194b39142
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/requests !<net-wireless/kismet-2019.05.1
+DESCRIPTION=Kismet REST Python API
+EAPI=7
+HOMEPAGE=https://kismetwireless.net/docs/devel/webui_rest/endpoints/
+IUSE=python_targets_python2_7 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/requests !<net-wireless/kismet-2019.05.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/kismetwireless/python-kismet-rest/archive/2019.05.02.tar.gz -> kismet-rest-2019.05.02.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=eb1b64177d43deb6ddec75ed6456ac50
diff --git a/metadata/md5-cache/net-wireless/kismet-rest-9999 b/metadata/md5-cache/net-wireless/kismet-rest-9999
index 67ef8111d14d..7af20a984e0a 100644
--- a/metadata/md5-cache/net-wireless/kismet-rest-9999
+++ b/metadata/md5-cache/net-wireless/kismet-rest-9999
@@ -10,4 +10,4 @@ RDEPEND=dev-python/requests !<net-wireless/kismet-2019.05.1 python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c1ed6ff3b387d8031f2378a4f77205d3
+_md5_=eb1b64177d43deb6ddec75ed6456ac50
diff --git a/metadata/md5-cache/net-wireless/kismetdb-2019.03.01 b/metadata/md5-cache/net-wireless/kismetdb-2019.03.01
deleted file mode 100644
index d066a8a2ff42..000000000000
--- a/metadata/md5-cache/net-wireless/kismetdb-2019.03.01
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Kismetdb database log helper library
-EAPI=7
-HOMEPAGE=https://kismetwireless.net/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/kismetwireless/python-kismet-db/archive/2019.03.01.tar.gz -> kismetdb-2019.03.01.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=513debc9228f6a5b083417bcb87d36cb
diff --git a/metadata/md5-cache/net-wireless/kismetdb-2019.05.05 b/metadata/md5-cache/net-wireless/kismetdb-2019.05.05
new file mode 100644
index 000000000000..8b95b0728b96
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/kismetdb-2019.05.05
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Kismetdb database log helper library
+EAPI=7
+HOMEPAGE=https://kismetwireless.net/
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/kismetwireless/python-kismet-db/archive/2019.05.05.tar.gz -> kismetdb-2019.05.05.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=513debc9228f6a5b083417bcb87d36cb
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4 b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
index 79f1bf440b41..4f3e6d22b4f9 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
@@ -3,10 +3,10 @@ DEPEND=virtual/libusb:1 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver
 EAPI=6
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/rtl-sdr-0.5.4.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4d17ce99bde512a60b3f235d4b87cda7
+_md5_=1dfdc4010f6838d449308d69cc02513e
diff --git a/metadata/md5-cache/net-wireless/unifi-5.10.24 b/metadata/md5-cache/net-wireless/unifi-5.10.24
new file mode 100644
index 000000000000..3e3b3b252537
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.10.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/5.10
+SRC_URI=https://dl.ubnt.com/unifi/5.10.24-fc15f0fdf1/UniFi.unix.zip -> unifi-5.10.24.zip
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=5e190f370a45d8895631b793f7b1ad5a
diff --git a/metadata/md5-cache/net-wireless/unifi-5.11.26 b/metadata/md5-cache/net-wireless/unifi-5.11.26
new file mode 100644
index 000000000000..8e7e303add2a
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.11.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/5.11
+SRC_URI=https://dl.ubnt.com/unifi/5.11.26-1ecdee774d/UniFi.unix.zip -> unifi-5.11.26.zip
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=ef9dc01c6acc29078e3a2a5e5ad92a35
diff --git a/metadata/md5-cache/net-wireless/wepattack-0.1.3-r4 b/metadata/md5-cache/net-wireless/wepattack-0.1.3-r4
deleted file mode 100644
index 2c1be7161181..000000000000
--- a/metadata/md5-cache/net-wireless/wepattack-0.1.3-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/openssl:* net-libs/libpcap sys-libs/zlib
-DESCRIPTION=WLAN tool for breaking 802.11 WEP keys
-EAPI=5
-HOMEPAGE=http://wepattack.sourceforge.net/
-IUSE=john
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:* net-libs/libpcap sys-libs/zlib john? ( || ( app-crypt/johntheripper app-crypt/johntheripper-jumbo ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/wepattack/WepAttack-0.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b0708294cb70d0e61b9512b2dd0aedc
diff --git a/metadata/md5-cache/net-wireless/wepattack-0.1.3-r5 b/metadata/md5-cache/net-wireless/wepattack-0.1.3-r5
new file mode 100644
index 000000000000..7b4d72a93140
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/wepattack-0.1.3-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/openssl:0= net-libs/libpcap sys-libs/zlib
+DESCRIPTION=WLAN tool for breaking 802.11 WEP keys
+EAPI=5
+HOMEPAGE=http://wepattack.sourceforge.net/
+IUSE=john
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:0= net-libs/libpcap sys-libs/zlib john? ( || ( app-crypt/johntheripper app-crypt/johntheripper-jumbo ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/wepattack/WepAttack-0.1.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=70626a65a31124a1707e842b353dc48c
diff --git a/metadata/md5-cache/net-wireless/wireless-regdb-20190301 b/metadata/md5-cache/net-wireless/wireless-regdb-20190301
index e401c1fa180c..1a60ea6d3731 100644
--- a/metadata/md5-cache/net-wireless/wireless-regdb-20190301
+++ b/metadata/md5-cache/net-wireless/wireless-regdb-20190301
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Binary regulatory database for CRDA
 EAPI=6
 HOMEPAGE=https://wireless.kernel.org/en/developers/Regulatory
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2019.03.01.tar.xz
-_md5_=e324df738dbd6bbf63c38eb8f744c5aa
+_md5_=bc2a760b4cccfd8963b5f8fe8ebfe779
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r10 b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r10
index b4f668258477..485f5541438c 100644
--- a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r10
+++ b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r10
@@ -4,11 +4,11 @@ DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers
 EAPI=6
 HOMEPAGE=https://w1.fi/wpa_supplicant/
 IUSE=ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=|| ( GPL-2 BSD )
 RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/crda eap-sim? ( sys-apps/pcsc-lite ) ) !kernel_linux? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) ssl? ( gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) ) !ssl? ( dev-libs/libtommath ) selinux? ( sec-policy/selinux-networkmanager )
 REQUIRED_USE=smartcard? ( ssl )
 SLOT=0
 SRC_URI=https://w1.fi/releases/wpa_supplicant-2.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0853352755bcb6ba33f31338784c252c
+_md5_=399987c1930aa74af3f21ad9dddf3721
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index 1f14195aee9d..90cb3bc355b7 100644
--- a/metadata/md5-cache/ros-meta/Manifest.gz
+++ b/metadata/md5-cache/ros-meta/Manifest.gz
diff --git a/metadata/md5-cache/ros-meta/imu_tools-1.2.1 b/metadata/md5-cache/ros-meta/imu_tools-1.2.1
new file mode 100644
index 000000000000..b01ed1af1c3c
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/imu_tools-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Various tools for IMU devices
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/imu_tools https://github.com/ccny-ros-pkg/imu_tools
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.1.tar.gz -> imu_tools-1.2.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=94d6984f790a2cbb8182cb5cfef3fbca
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.4 b/metadata/md5-cache/ros-meta/pr2_common-1.12.4
new file mode 100644
index 000000000000..8b016c0e345e
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=d5aa85a1f3cf3ad5681a4caa7c28cb2f
diff --git a/metadata/md5-cache/ros-meta/ros_tutorials-0.9.1 b/metadata/md5-cache/ros-meta/ros_tutorials-0.9.1
new file mode 100644
index 000000000000..3df47a926a18
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-0.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Demonstrates various features of ROS, as well as support packages which help demonstrate them
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/ros_tutorials https://github.com/ros/ros_tutorials
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_tutorials/archive/0.9.1.tar.gz -> ros_tutorials-0.9.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=b8469511a197b1ac9b71dfd370bca0b3
diff --git a/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.1 b/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.1
new file mode 100644
index 000000000000..d652207627cf
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=JSON API to ROS functionality for non-ROS programs
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosbridge_suite https://github.com/RobotWebTools/rosbridge_suite
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_server python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.1.tar.gz -> rosbridge_suite-0.11.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=096ba16cbb2764b2818242adf8de6778
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 170e0752b43f..2555b2a6ea0b 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.2.2 b/metadata/md5-cache/sci-astronomy/kstars-3.2.2
index 949b0481ee37..855664008139 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-3.2.2
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.2.2
@@ -5,11 +5,11 @@ DESCRIPTION=Desktop Planetarium
 EAPI=7
 HOMEPAGE=https://kde.org/applications/education/kstars https://edu.kde.org/kstars/
 IUSE=fits indi +password raw wcs debug +handbook python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/knotifyconfig-5.57.0:5 >=kde-frameworks/kplotting-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=dev-qt/qtdatavis3d-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebsockets-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.7.5 ) password? ( dev-libs/qtkeychain:= ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 REQUIRED_USE=indi? ( fits ) python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-3.2.2.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f13832b74fc5bb32b99e87e394c588fe
+_md5_=765fdc0821733d76a35e19594eff648b
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.2.3 b/metadata/md5-cache/sci-astronomy/kstars-3.2.3
new file mode 100644
index 000000000000..a4b6c1ea65d5
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.2.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.57.0:5 handbook? ( >=kde-frameworks/kdoctools-5.57.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/knotifyconfig-5.57.0:5 >=kde-frameworks/kplotting-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=dev-qt/qtdatavis3d-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebsockets-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.7.5 ) password? ( dev-libs/qtkeychain:= ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) >=dev-qt/qtconcurrent-5.11.1:5 dev-cpp/eigen:3 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils
+DESCRIPTION=Desktop Planetarium
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/kstars https://edu.kde.org/kstars/
+IUSE=fits indi +password raw wcs debug +handbook python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kauth-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/knotifyconfig-5.57.0:5 >=kde-frameworks/kplotting-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=dev-qt/qtdatavis3d-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebsockets-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.7.5 ) password? ( dev-libs/qtkeychain:= ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=indi? ( fits ) python_targets_python2_7
+SLOT=5
+SRC_URI=mirror://kde/stable/kstars/kstars-3.2.3.tar.xz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f13832b74fc5bb32b99e87e394c588fe
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 2e737b843902..cc6780defc66 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/datamash-1.3 b/metadata/md5-cache/sci-calculators/datamash-1.3
deleted file mode 100644
index c478f7dc7ab5..000000000000
--- a/metadata/md5-cache/sci-calculators/datamash-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=nls? ( sys-devel/gettext ) openssl? ( dev-libs/openssl ) nls? ( virtual/libintl )
-DESCRIPTION=command-line program for basic numeric, textual and statistical operations
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/datamash/
-IUSE=nls openssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/datamash/datamash-1.3.tar.gz
-_md5_=0fbef9c60b82e4b0726d9c0a89bdaacc
diff --git a/metadata/md5-cache/sci-calculators/units-2.17 b/metadata/md5-cache/sci-calculators/units-2.17
deleted file mode 100644
index ec49ea5a3e5a..000000000000
--- a/metadata/md5-cache/sci-calculators/units-2.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=sys-libs/readline:= units_cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
-DESCRIPTION=Unit conversion program
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/units/units.html
-IUSE=+units_cur python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=FDL-1.3 GPL-3
-RDEPEND=sys-libs/readline:= units_cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
-REQUIRED_USE=units_cur? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://gnu/units/units-2.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a1828b9d430c645f1d9fdb97ce46741
diff --git a/metadata/md5-cache/sci-calculators/units-2.19 b/metadata/md5-cache/sci-calculators/units-2.19
new file mode 100644
index 000000000000..75e306df4fab
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/units-2.19
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=sys-libs/readline:= units_cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+DESCRIPTION=Unit conversion program
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/units/units.html
+IUSE=+units_cur 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
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=FDL-1.3 GPL-3
+RDEPEND=sys-libs/readline:= units_cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+REQUIRED_USE=units_cur? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://gnu/units/units-2.19.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=6742d3034accb6f22447cf70a4e9871b
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index a8fcbf910015..37909b60d844 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r2 b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r2
deleted file mode 100644
index 6ca24365ac27..000000000000
--- a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
-DESCRIPTION=Publication-quality molecular visualization package
-EAPI=4
-HOMEPAGE=http://hugin.ethz.ch/wuthrich/software/molmol/index.html
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=molmol
-RDEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
-SLOT=0
-SRC_URI=ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-src.tar.gz ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-doc.tar.gz https://dev.gentoo.org/~soap/distfiles/molmol-patches.tbz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=007255bc505f4ae5d941307460933c18
diff --git a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r3 b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r3
deleted file mode 100644
index 3ada9e6d7518..000000000000
--- a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
-DESCRIPTION=Publication-quality molecular visualization package
-EAPI=4
-HOMEPAGE=http://hugin.ethz.ch/wuthrich/software/molmol/index.html
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=molmol
-RDEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
-SLOT=0
-SRC_URI=ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-src.tar.gz ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-doc.tar.gz https://dev.gentoo.org/~soap/distfiles/molmol-patches.tbz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf2abde9e74d84d5da6dab168433a2b2
diff --git a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r4 b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r4
deleted file mode 100644
index 6b2f288816f7..000000000000
--- a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
-DESCRIPTION=Publication-quality molecular visualization package
-EAPI=5
-HOMEPAGE=http://hugin.ethz.ch/wuthrich/software/molmol/index.html
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=molmol
-RDEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
-SLOT=0
-SRC_URI=ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-src.tar.gz ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-doc.tar.gz https://dev.gentoo.org/~soap/distfiles/molmol-patches.tbz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=28891117f2e6aa6f5074fd8b65a412ad
diff --git a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5 b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
index ccea0e6407e3..44b590988746 100644
--- a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
+++ b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
+DEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
 DESCRIPTION=Publication-quality molecular visualization package
-EAPI=5
-HOMEPAGE=http://hugin.ethz.ch/wuthrich/software/molmol/index.html
+EAPI=7
+HOMEPAGE=http://www.csb.yale.edu/userguides/graphics/molmol/molmol_descrip.html http://pjf.net/science/molmol.html
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=molmol
-RDEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
+RDEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
 SLOT=0
-SRC_URI=ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-src.tar.gz ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-doc.tar.gz https://dev.gentoo.org/~soap/distfiles/molmol-patches.tbz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d2f45c4b11493aeaec02179cc4e52089
+SRC_URI=ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-src.tar.gz ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-doc.tar.gz https://dev.gentoo.org/~soap/distfiles/molmol-patches.tbz2 https://dev.gentoo.org/~pacho/molmol/molmol.png
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e101128789ba89046e5c2169caeab55e
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.2.0 b/metadata/md5-cache/sci-chemistry/pymol-2.2.0
deleted file mode 100644
index 8fa592d9cc0e..000000000000
--- a/metadata/md5-cache/sci-chemistry/pymol-2.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/msgpack[cxx] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freeglut media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !sci-chemistry/pymol-apbs-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] web? ( !dev-python/webpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=A Python-extensible molecular graphics system
-EAPI=7
-HOMEPAGE=http://www.pymol.org/
-IUSE=web python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=PSF-2.2
-RDEPEND=dev-libs/msgpack[cxx] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freeglut media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !sci-chemistry/pymol-apbs-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] web? ( !dev-python/webpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.2.0.tar.gz -> pymol-2.2.0.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fb66d14d7bb494cd0d5c290659de9584
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.3.0 b/metadata/md5-cache/sci-chemistry/pymol-2.3.0
deleted file mode 100644
index a54fcb8f3364..000000000000
--- a/metadata/md5-cache/sci-chemistry/pymol-2.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freeglut media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !sci-chemistry/pymol-apbs-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] web? ( !dev-python/webpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=A Python-extensible molecular graphics system
-EAPI=7
-HOMEPAGE=http://www.pymol.org/
-IUSE=web python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=PSF-2.2
-RDEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freeglut media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !sci-chemistry/pymol-apbs-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] web? ( !dev-python/webpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.3.0.tar.gz -> pymol-2.3.0.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2def6e4886eebcf0550fc7e1e17312ea
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r1 b/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r1
new file mode 100644
index 000000000000..d35a31d1c936
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_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(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !sci-chemistry/pymol-apbs-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] web? ( !dev-python/webpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=A Python-extensible molecular graphics system
+EAPI=7
+HOMEPAGE=http://www.pymol.org/
+IUSE=web python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=PSF-2.2
+RDEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !sci-chemistry/pymol-apbs-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] web? ( !dev-python/webpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.3.0.tar.gz -> pymol-2.3.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=e958527800b69f73c4c61ae5e2ee9621
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r1 b/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r1
new file mode 100644
index 000000000000..5d3d805f839f
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-lang/swig
+DEFINED_PHASES=compile configure install nofetch prepare setup
+DEPEND=>=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama )
+DESCRIPTION=Visual Molecular Dynamics
+EAPI=7
+HOMEPAGE=http://www.ks.uiuc.edu/Research/vmd/
+IUSE=cuda gromacs msms povray sqlite tachyon xinerama python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=vmd
+RDEPEND=>=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) sci-biology/stride sci-chemistry/surf x11-terms/xterm msms? ( sci-chemistry/msms-bin ) povray? ( media-gfx/povray )
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=fetch
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.3-gentoo-patches.tar.xz vmd-1.9.3.src.tar
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=31b621c2df338245164f87c909dae1df
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 0e0c69aaf6a2..097e059948cb 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.1 b/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.1
index 61a31c383676..1a47bfa586d1 100644
--- a/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.1
+++ b/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.99.2[introspection?] >=net
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/geocode-glib/3.26/geocode-glib-3.26.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ebaaaddde8132b20eac790970b420c4f
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3 b/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3
index d7beaf08c361..e7af1fd97db9 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/gjs-1.50.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10 >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/3.30/gnome-maps-3.30.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=cfc26f3890aefa0ce923dad72bffc575
diff --git a/metadata/md5-cache/sci-geosciences/laszip-2.2.0 b/metadata/md5-cache/sci-geosciences/laszip-2.2.0
index ee443f65584a..547f3b162bce 100644
--- a/metadata/md5-cache/sci-geosciences/laszip-2.2.0
+++ b/metadata/md5-cache/sci-geosciences/laszip-2.2.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library for free and lossless compression of the LAS LiDAR format
 EAPI=5
-HOMEPAGE=http://www.laszip.org/
+HOMEPAGE=https://laszip.org/
 KEYWORDS=amd64 ~ia64 ppc ppc64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/LASzip/LASzip/releases/download/v2.2.0/laszip-src-2.2.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8eb70120dfab06c87245a07de9a35a7
+_md5_=f2c667647b604c5c32961f8537cfcc21
diff --git a/metadata/md5-cache/sci-geosciences/laszip-3.4.1 b/metadata/md5-cache/sci-geosciences/laszip-3.4.1
new file mode 100644
index 000000000000..191a68733943
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/laszip-3.4.1
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for free and lossless compression of the LAS LiDAR format
+EAPI=7
+HOMEPAGE=https://laszip.org/
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=https://github.com/LASzip/LASzip/releases/download/3.4.1/laszip-src-3.4.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=41937df8e3c659926f89eee746672779
diff --git a/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r1 b/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r1
deleted file mode 100644
index 8593e47ccea8..000000000000
--- a/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= sci-geosciences/laszip sci-libs/libgeotiff gdal? ( sci-libs/gdal ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C/C++ library for manipulating the LAS LiDAR format common in GIS
-EAPI=6
-HOMEPAGE=https://github.com/libLAS/libLAS/
-IUSE=gdal
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= sci-geosciences/laszip sci-libs/libgeotiff gdal? ( sci-libs/gdal )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/libLAS/libLAS/archive/1.8.1.tar.gz -> liblas-1.8.1.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4c4864dc865a79b09f578dd36983e7ab
diff --git a/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r2 b/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r2
new file mode 100644
index 000000000000..6944ef411893
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= sci-geosciences/laszip sci-libs/libgeotiff:= gdal? ( sci-libs/gdal:= )
+DESCRIPTION=C/C++ library for manipulating the LAS LiDAR format common in GIS
+EAPI=7
+HOMEPAGE=https://github.com/libLAS/libLAS/
+IUSE=gdal
+KEYWORDS=amd64 ~ia64 ppc ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= sci-geosciences/laszip sci-libs/libgeotiff:= gdal? ( sci-libs/gdal:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/libLAS/libLAS/archive/1.8.1.tar.gz -> liblas-1.8.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=21da78a898a2f2a59cb3c78f9f104b5e
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.0.7 b/metadata/md5-cache/sci-geosciences/mapserver-7.0.7
new file mode 100644
index 000000000000..9255afd0182a
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/mapserver-7.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
+DEPEND=dev-libs/expat >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg:= virtual/libiconv x11-libs/agg apache? ( dev-libs/fcgi app-admin/webapp-config ) bidi? ( dev-libs/fribidi media-libs/harfbuzz ) cairo? ( x11-libs/cairo ) gdal? ( sci-libs/gdal:=[oracle?] ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) oracle? ( dev-db/oracle-instantclient:= ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff:= sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) perl? ( >=dev-lang/swig-2.0 ) python? ( >=dev-lang/swig-2.0 ) apache? ( =www-servers/apache-2* ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
+DESCRIPTION=Development environment for building spatially enabled webapps
+EAPI=6
+HOMEPAGE=https://mapserver.org/
+IUSE=apache bidi cairo gdal geos mysql opengl oracle perl php postgis proj python threads tiff xml xslt apache python_targets_python2_7 php_targets_php5-6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/expat >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg:= virtual/libiconv x11-libs/agg apache? ( dev-libs/fcgi app-admin/webapp-config ) bidi? ( dev-libs/fribidi media-libs/harfbuzz ) cairo? ( x11-libs/cairo ) gdal? ( sci-libs/gdal:=[oracle?] ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) oracle? ( dev-db/oracle-instantclient:= ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff:= sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) apache? ( =www-servers/apache-2* ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:= php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
+REQUIRED_USE=php? ( php_targets_php5-6 ) xslt? ( xml ) || ( python_targets_python2_7 ) php? ( || ( php_targets_php5-6 ) )
+SLOT=0
+SRC_URI=https://download.osgeo.org/mapserver/mapserver-7.0.7.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=17e4c37bf9a13f9db56c63e39174baa0
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.2.2 b/metadata/md5-cache/sci-geosciences/mapserver-7.2.2
new file mode 100644
index 000000000000..e3c2196ad493
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/mapserver-7.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
+DEPEND=dev-libs/expat >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg:= virtual/libiconv x11-libs/agg apache? ( dev-libs/fcgi app-admin/webapp-config ) bidi? ( dev-libs/fribidi media-libs/harfbuzz ) cairo? ( x11-libs/cairo ) gdal? ( sci-libs/gdal:=[oracle?] dev-libs/protobuf-c ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) oracle? ( dev-db/oracle-instantclient:= ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff:= sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) perl? ( >=dev-lang/swig-2.0 ) python? ( >=dev-lang/swig-2.0 ) apache? ( =www-servers/apache-2* ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
+DESCRIPTION=Development environment for building spatially enabled webapps
+EAPI=6
+HOMEPAGE=https://mapserver.org/
+IUSE=apache bidi cairo +gdal geos mysql opengl oracle perl php postgis +proj python threads tiff xml xslt apache python_targets_python2_7 php_targets_php5-6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/expat >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg:= virtual/libiconv x11-libs/agg apache? ( dev-libs/fcgi app-admin/webapp-config ) bidi? ( dev-libs/fribidi media-libs/harfbuzz ) cairo? ( x11-libs/cairo ) gdal? ( sci-libs/gdal:=[oracle?] dev-libs/protobuf-c ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) oracle? ( dev-db/oracle-instantclient:= ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff:= sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) apache? ( =www-servers/apache-2* ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:= php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
+REQUIRED_USE=php? ( php_targets_php5-6 ) xslt? ( xml ) || ( python_targets_python2_7 ) php? ( || ( php_targets_php5-6 ) )
+SLOT=0
+SRC_URI=https://download.osgeo.org/mapserver/mapserver-7.2.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=a709d16433b908733f774f53dc374440
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 452e401b270b..6c78ef785afc 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/camd-2.3.1 b/metadata/md5-cache/sci-libs/camd-2.3.1
index dc05db1695d6..2953f5254cd9 100644
--- a/metadata/md5-cache/sci-libs/camd-2.3.1
+++ b/metadata/md5-cache/sci-libs/camd-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/camd/
 IUSE=doc static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/camd-2.3.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d82734eb603431fe55246d96d773cf28
+_md5_=4f963e7cd877c327880fc34653ad99d0
diff --git a/metadata/md5-cache/sci-libs/ccolamd-2.8.0 b/metadata/md5-cache/sci-libs/ccolamd-2.8.0
index 41988214b47c..760d048b95f7 100644
--- a/metadata/md5-cache/sci-libs/ccolamd-2.8.0
+++ b/metadata/md5-cache/sci-libs/ccolamd-2.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Constrained Column approximate minimum degree ordering algorithm
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/ccolamd/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/ccolamd-2.8.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6bf6a488a65bfcfc907d6e807a8df5a
+_md5_=1f4fb5aa01d7d8a123c0a46462a08448
diff --git a/metadata/md5-cache/sci-libs/cln-1.3.3 b/metadata/md5-cache/sci-libs/cln-1.3.3
index 5b5841becd03..3e909365bc2b 100644
--- a/metadata/md5-cache/sci-libs/cln-1.3.3
+++ b/metadata/md5-cache/sci-libs/cln-1.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=Class library (C++) for numbers
 EAPI=5
 HOMEPAGE=https://www.ginac.de/CLN/
 IUSE=doc examples static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=
 SLOT=1
 SRC_URI=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.3.3.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e05ddfff66c9a4fdb65e08b6c2032e5b
+_md5_=dfabe48e503c1cbb04d612a425520b8b
diff --git a/metadata/md5-cache/sci-libs/djbfft-0.76-r2 b/metadata/md5-cache/sci-libs/djbfft-0.76-r2
index 3d2a63ea59fe..5314b8c0441f 100644
--- a/metadata/md5-cache/sci-libs/djbfft-0.76-r2
+++ b/metadata/md5-cache/sci-libs/djbfft-0.76-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Extremely fast library for floating-point convolution
 EAPI=5
 HOMEPAGE=http://cr.yp.to/djbfft.html
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://cr.yp.to/djbfft/djbfft-0.76.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a14188997ad1678c38f74acab4b7bcbb
+_md5_=ee5c25dba46a65a11615a8b7d94abb52
diff --git a/metadata/md5-cache/sci-libs/gdal-2.4.0 b/metadata/md5-cache/sci-libs/gdal-2.4.0
index 99e97f8b97f4..bc0eebc41f42 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.4.0
+++ b/metadata/md5-cache/sci-libs/gdal-2.4.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup test
 DEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib:=[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.7:* ) perl? ( dev-lang/swig:0 ) python? ( dev-lang/swig:0 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
 EAPI=6
-HOMEPAGE=https://www.gdal.org/
+HOMEPAGE=https://gdal.org/
 IUSE=armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 elibc_FreeBSD java
 KEYWORDS=amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD Info-ZIP MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python2_7 python_target
 SLOT=0/2.3
 SRC_URI=https://download.osgeo.org/gdal/2.4.0/gdal-2.4.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ed46327c86cf1e70a55997a2e1c292c6
+_md5_=c1b4d2e5169b174c1de3f647b9f7cbd4
diff --git a/metadata/md5-cache/sci-libs/gdal-2.4.1 b/metadata/md5-cache/sci-libs/gdal-2.4.1
index 8ff2fd768004..e8ad02689719 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.4.1
+++ b/metadata/md5-cache/sci-libs/gdal-2.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib:=[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.7:* ) perl? ( dev-lang/swig:0 ) python? ( dev-lang/swig:0 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= media-libs/tiff:0= sci-libs/libgeotiff:= sys-libs/zlib:=[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.7:* ) perl? ( dev-lang/swig:0 ) python? ( dev-lang/swig:0 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
 EAPI=6
-HOMEPAGE=https://www.gdal.org/
+HOMEPAGE=https://gdal.org/
 IUSE=armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 elibc_FreeBSD java
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD Info-ZIP MIT
-RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib:=[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.7:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= media-libs/tiff:0= sci-libs/libgeotiff:= sys-libs/zlib:=[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.7:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) spatialite? ( sqlite )
 SLOT=0/2.3
 SRC_URI=https://download.osgeo.org/gdal/2.4.1/gdal-2.4.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=bc8f5fd223e58bb6e685949c7b8c7c9a
+_md5_=6cd3a7f78d1d16fc79be0003b50a917a
diff --git a/metadata/md5-cache/sci-libs/gsl-2.5 b/metadata/md5-cache/sci-libs/gsl-2.5
index da0b78abcc6d..f1ab5e0069f4 100644
--- a/metadata/md5-cache/sci-libs/gsl-2.5
+++ b/metadata/md5-cache/sci-libs/gsl-2.5
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU Scientific Library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gsl/
 IUSE=cblas-external +deprecated static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas:= )
 SLOT=0/23
 SRC_URI=mirror://gnu/gsl/gsl-2.5.tar.gz https://dev.gentoo.org/~mgorny/dist/gsl-2.3-cblas.patch.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e1c51044ffc5e1ec0346af4cd26d2253
+_md5_=03d1ab91f904ddcb481656d5aeff34a8
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.10.5 b/metadata/md5-cache/sci-libs/hdf5-1.10.5
index a043db0e58d3..ba9500691336 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5
@@ -5,11 +5,11 @@ DESCRIPTION=General purpose library and file format for storing scientific data
 EAPI=7
 HOMEPAGE=http://www.hdfgroup.org/HDF5/
 IUSE=cxx debug examples fortran +hl mpi static-libs szip threads zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl )
 SLOT=0/1.10.5
 SRC_URI=http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=629d656f343add5f9c157b07de0efc42
+_md5_=54d570de9ddfa54e559a9d8569df0680
diff --git a/metadata/md5-cache/sci-libs/libcerf-1.5 b/metadata/md5-cache/sci-libs/libcerf-1.5
index 94695f794d70..da56aad323be 100644
--- a/metadata/md5-cache/sci-libs/libcerf-1.5
+++ b/metadata/md5-cache/sci-libs/libcerf-1.5
@@ -3,8 +3,8 @@ DESCRIPTION=Efficient and accurate implementation of complex error functions
 EAPI=6
 HOMEPAGE=http://apps.jcns.fz-juelich.de/doku/sc/libcerf
 IUSE=doc static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.5.tgz
-_md5_=887cfa427edb87f4818ab2598f785ee6
+_md5_=c2b247f36daa243a55698da074f72f24
diff --git a/metadata/md5-cache/sci-libs/libgeotiff-1.5.1 b/metadata/md5-cache/sci-libs/libgeotiff-1.5.1
deleted file mode 100644
index 3f8ab0ac69d5..000000000000
--- a/metadata/md5-cache/sci-libs/libgeotiff-1.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/jpeg:= >=media-libs/tiff-3.9.1:0 sci-libs/proj sys-libs/zlib doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library for reading TIFF files with embedded tags for geographic information
-EAPI=6
-HOMEPAGE=http://geotiff.osgeo.org/
-IUSE=debug doc static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=virtual/jpeg:= >=media-libs/tiff-3.9.1:0 sci-libs/proj sys-libs/zlib
-SLOT=0
-SRC_URI=http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.5.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=5e634000b083de1fd3d0b15c2f92ea74
diff --git a/metadata/md5-cache/sci-libs/libgeotiff-1.5.1-r1 b/metadata/md5-cache/sci-libs/libgeotiff-1.5.1-r1
new file mode 100644
index 000000000000..fd19eb83cb89
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libgeotiff-1.5.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=media-libs/tiff-3.9.1:0 >=sci-libs/proj-6.0.0 sys-libs/zlib virtual/jpeg:=
+DESCRIPTION=Library for reading TIFF files with embedded tags for geographic information
+EAPI=7
+HOMEPAGE=https://trac.osgeo.org/geotiff/ https://github.com/OSGeo/libgeotiff
+IUSE=debug doc static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=>=media-libs/tiff-3.9.1:0 >=sci-libs/proj-6.0.0 sys-libs/zlib virtual/jpeg:=
+SLOT=0/5
+SRC_URI=https://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.5.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ad69cd5188728d65c903640b9803bbf7
diff --git a/metadata/md5-cache/sci-libs/libqalculate-0.9.9 b/metadata/md5-cache/sci-libs/libqalculate-0.9.9
index 0348c19f36c1..5163693fff32 100644
--- a/metadata/md5-cache/sci-libs/libqalculate-0.9.9
+++ b/metadata/md5-cache/sci-libs/libqalculate-0.9.9
@@ -4,9 +4,9 @@ DESCRIPTION=A modern multi-purpose calculator library
 EAPI=6
 HOMEPAGE=https://qalculate.github.io/
 IUSE=gnuplot readline static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 >=sci-libs/cln-1.2 sys-libs/zlib readline? ( sys-libs/readline:0= ) net-misc/wget gnuplot? ( >=sci-visualization/gnuplot-3.7 )
 SLOT=0/6
 SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v0.9.9/libqalculate-0.9.9.tar.gz
-_md5_=55d91a6d8bfadab246d1c8ba4e158f15
+_md5_=b64c3790ebb00c8eaea9038e6f234167
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.2.0 b/metadata/md5-cache/sci-libs/linux-gpib-4.2.0
index c24c15c865db..66e6c68f009f 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.2.0
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Driver library for GPIB (IEEE 488.2) hardware
 EAPI=6
 HOMEPAGE=https://linux-gpib.sourceforge.io/
 IUSE=pcmcia static guile perl php python tcl doc firmware python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) firmware? ( sys-apps/fxload ) ~sci-libs/linux-gpib-modules-4.2.0
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.2.0.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	f2e3420aed32cf1abe33b4129b842636	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=b2a65a7001203be571f77a88b7e44701
+_md5_=750b00841fc6af5d2fa826754106864c
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.2.0_rc1 b/metadata/md5-cache/sci-libs/linux-gpib-4.2.0_rc1
deleted file mode 100644
index 41c14ad0d071..000000000000
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.2.0_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) firmware? ( sys-apps/fxload ) virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) perl? ( virtual/perl-ExtUtils-MakeMaker ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Driver library for GPIB (IEEE 488.2) hardware
-EAPI=6
-HOMEPAGE=https://linux-gpib.sourceforge.io/
-IUSE=pcmcia static guile perl php python tcl doc firmware python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) firmware? ( sys-apps/fxload ) ~sci-libs/linux-gpib-modules-4.2.0_rc1
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-user-4.2.0_rc1.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	f2e3420aed32cf1abe33b4129b842636	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=31dbf6484115fb4f037d2a3bff49d358
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.2.0 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.2.0
index 57a1fd037c0a..097e5b89a347 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.2.0
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Kernel modules for GPIB (IEEE 488.2) hardware
 EAPI=6
 HOMEPAGE=https://linux-gpib.sourceforge.io/
 IUSE=isa pcmcia debug kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=!<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.2.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae901622b921c655cccea14c43909671
+_md5_=38836d2bc4f27fd650addb81d8155293
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.2.0_rc1 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.2.0_rc1
deleted file mode 100644
index d21416868526..000000000000
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.2.0_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Kernel modules for GPIB (IEEE 488.2) hardware
-EAPI=6
-HOMEPAGE=https://linux-gpib.sourceforge.io/
-IUSE=isa pcmcia debug kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=!<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-kernel-4.2.0_rc1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a37aab2fb7d690eb2b65566ecb741b6
diff --git a/metadata/md5-cache/sci-libs/metis-4.0.3 b/metadata/md5-cache/sci-libs/metis-4.0.3
index a119e7df5894..c0e4223d916d 100644
--- a/metadata/md5-cache/sci-libs/metis-4.0.3
+++ b/metadata/md5-cache/sci-libs/metis-4.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=A package for unstructured serial graph partitioning
 EAPI=5
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/metis/
 IUSE=doc static-libs
-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=free-noncomm
 RDEPEND=!sci-libs/parmetis virtual/fortran
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD/metis-4.0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec6019b4a749d8155bd20ef403bc6ddd
+_md5_=c5262613ff40296c4ff879eeab2e688a
diff --git a/metadata/md5-cache/sci-libs/parmetis-4.0.3 b/metadata/md5-cache/sci-libs/parmetis-4.0.3
index 577043bfbc48..574be92c5fb7 100644
--- a/metadata/md5-cache/sci-libs/parmetis-4.0.3
+++ b/metadata/md5-cache/sci-libs/parmetis-4.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Parallel (MPI) unstructured graph partitioning library
 EAPI=6
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/parmetis/
 IUSE=doc double-precision examples int64 mpi openmp pcre static-libs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=free-noncomm
 RDEPEND=mpi? ( virtual/mpi ) !<sci-libs/metis-5
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz doc? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz ) examples? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz )
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=97f22a3cb0e4e48480533541e343df61
+_md5_=32a3d7595a80f340309e0caed1474524
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index a6f1db4be105..97798d3d2d27 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/arb-2.16.0 b/metadata/md5-cache/sci-mathematics/arb-2.16.0
new file mode 100644
index 000000000000..afedce99e6af
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/arb-2.16.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=sci-mathematics/flint-2.5.0:=
+DESCRIPTION=C library for arbitrary-precision interval arithmetic
+EAPI=6
+HOMEPAGE=http://fredrikj.net/arb/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=sci-mathematics/flint-2.5.0:=
+SLOT=0/2
+SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.16.0.tar.gz -> arb-2.16.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=aefc447a06cac04a7b685b50dc01a326
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.43.0 b/metadata/md5-cache/sci-mathematics/maxima-5.43.0
new file mode 100644
index 000000000000..91150e26b34f
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) ) test? ( sci-visualization/gnuplot ) sys-apps/texinfo >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free computer algebra environment based on Macsyma
+EAPI=6
+HOMEPAGE=http://maxima.sourceforge.net/
+IUSE=emacs tk nls unicode X test sbcl cmucl gcl ecls clozurecl clisp l10n_de l10n_es l10n_pt l10n_pt-BR
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2 GPL-2+
+RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/maxima/maxima-5.43.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=5f69e12877814da5998f81b804dcc8ac
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-19.05.7 b/metadata/md5-cache/sci-mathematics/wxmaxima-19.05.7
new file mode 100644
index 000000000000..5155bf8837ab
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-19.05.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
+EAPI=6
+HOMEPAGE=http://wxmaxima-developers.github.io/wxmaxima/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0 media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
+SLOT=0
+SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-19.05.7.tar.gz -> wxmaxima-19.05.7.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=73632ad3779a6cf520b20e1e25e991b8
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.5 b/metadata/md5-cache/sci-mathematics/z3-4.8.5
new file mode 100644
index 000000000000..50005331fad3
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gmp? ( dev-libs/gmp:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.8 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An efficient theorem prover
+EAPI=6
+HOMEPAGE=https://github.com/Z3Prover/z3/
+IUSE=doc examples gmp isabelle java openmp python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+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 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gmp? ( dev-libs/gmp:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0/4.8
+SRC_URI=https://github.com/Z3Prover/z3/archive/Z3-4.8.5.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=ce3a2ce931ec9a1935234563ca41fcf1
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 4c8b07906810..97215e7435d8 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/espresso-4.0.0-r1 b/metadata/md5-cache/sci-physics/espresso-4.0.0-r1
index a27517c702b2..59cb4c0c8d54 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.0.0-r1
+++ b/metadata/md5-cache/sci-physics/espresso-4.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/releases/download/4.0.0/espresso-4.0.0.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=248407bfa0df02980968c1f6ef1f391f
diff --git a/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228 b/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
index 4308423ab241..a173d706e52c 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
+++ b/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/archive/8a021f5e8b1d508f356f4419d360bd9dfb7fec2c.tar.gz -> espresso-4.0_pre20170228.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=91ffc280a6406b45d3b1ad560d39ed19
diff --git a/metadata/md5-cache/sci-physics/espresso-9999 b/metadata/md5-cache/sci-physics/espresso-9999
index 289ab2d9eb44..6f08fc5f448b 100644
--- a/metadata/md5-cache/sci-physics/espresso-9999
+++ b/metadata/md5-cache/sci-physics/espresso-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 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 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/cython-0.26.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) dev-libs/boost:=[mpi] hdf5? ( sci-libs/hdf5:=[mpi] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=495d7404af5a83cfb61f5b16b09e759e
diff --git a/metadata/md5-cache/sci-physics/root-6.16.00 b/metadata/md5-cache/sci-physics/root-6.16.00
index 75b02ad10e60..b2f063905a6c 100644
--- a/metadata/md5-cache/sci-physics/root-6.16.00
+++ b/metadata/md5-cache/sci-physics/root-6.16.00
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/l
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 SLOT=6.16/00
 SRC_URI=https://root.cern/download/root_v6.16.00.source.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	fortran-2	f75a2d9321053acf424991e805f32ede	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	fortran-2	f75a2d9321053acf424991e805f32ede	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ffc2ac0dcd7f2bb6d8a8996654286fc7
diff --git a/metadata/md5-cache/sci-physics/root-6.16.00-r1 b/metadata/md5-cache/sci-physics/root-6.16.00-r1
index 853d1aabbee0..ef68c1b043b9 100644
--- a/metadata/md5-cache/sci-physics/root-6.16.00-r1
+++ b/metadata/md5-cache/sci-physics/root-6.16.00-r1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/l
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 SLOT=6.16/00
 SRC_URI=https://root.cern/download/root_v6.16.00.source.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	fortran-2	f75a2d9321053acf424991e805f32ede	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	fortran-2	f75a2d9321053acf424991e805f32ede	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=37a51e5127dad1ce4af2aee2c61114c2
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index e8daf8dff3fb..da5058ffaa1c 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) xinetd? ( sys-apps/xinetd ) fortran? ( virtual/fortran )
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 SLOT=0
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	fortran-2	f75a2d9321053acf424991e805f32ede	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	fortran-2	f75a2d9321053acf424991e805f32ede	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=8a4d5ab3b771f05d9462a5b565fc3ad8
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index d9408c5120b8..a72bf3bd7152 100644
--- a/metadata/md5-cache/sec-policy/Manifest.gz
+++ b/metadata/md5-cache/sec-policy/Manifest.gz
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r1
deleted file mode 100644
index eed677f65fff..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=6b5a699a1048ac9decc7b92c0a74076f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r2
deleted file mode 100644
index 53f5bf4ef4ec..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=6b5a699a1048ac9decc7b92c0a74076f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r3
deleted file mode 100644
index 3ccf88a0166f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c85192d9deae2521b9203a9302b31509
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180701-r1
deleted file mode 100644
index 9339b4ff2aba..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180701-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
-_eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=6b5a699a1048ac9decc7b92c0a74076f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180701-r2 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180701-r2
deleted file mode 100644
index 1984f6fefb69..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180701-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r2
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r2.tar.bz2
-_eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=6ccdb2e80876b703aeebcad602a43bfd
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20190201-r1 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20190201-r1
deleted file mode 100644
index 69f751447ed2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20190201-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190201-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190201-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190201/refpolicy-2.20190201.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2
-_eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=2f1c1d3625b93a246038dba4600815bb
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-9999 b/metadata/md5-cache/sec-policy/selinux-perdition-9999
deleted file mode 100644
index 3f577844f597..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c85192d9deae2521b9203a9302b31509
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 805278bc557c..11e6ce931364 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/accountsservice-0.6.50-r1 b/metadata/md5-cache/sys-apps/accountsservice-0.6.50-r1
index 15d6cdd29979..bffb100fccec 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.50-r1
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.50-r1
@@ -4,11 +4,11 @@ DESCRIPTION=D-Bus interfaces for querying and manipulating user account informat
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/AccountsService/
 IUSE=doc consolekit elogind +introspection selinux systemd
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44:2 sys-auth/polkit consolekit? ( sys-auth/consolekit ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) selinux? ( sec-policy/selinux-accountsd )
 REQUIRED_USE=^^ ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-0.6.50.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=384d7d9b2525d4eccd392ce80e293d91
+_md5_=176503e48b826a2c15f5f7a72ba2f965
diff --git a/metadata/md5-cache/sys-apps/baobab-3.30.0 b/metadata/md5-cache/sys-apps/baobab-3.30.0
index 58630650f84a..cb93989b120b 100644
--- a/metadata/md5-cache/sys-apps/baobab-3.30.0
+++ b/metadata/md5-cache/sys-apps/baobab-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/baobab/3.30/baobab-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=395ee48ef035da8c35fd3394d9e6aa83
diff --git a/metadata/md5-cache/sys-apps/bolt-0.4 b/metadata/md5-cache/sys-apps/bolt-0.4
index 117ef1879a39..5ed46a071f04 100644
--- a/metadata/md5-cache/sys-apps/bolt-0.4
+++ b/metadata/md5-cache/sys-apps/bolt-0.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.50.0:2 virtual/libudev virtual/udev sys-apps/systemd:0= sys-auth/polkit[introspection] doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.4/bolt-0.4.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=27179b4d43c3e52603a9696e219da330
diff --git a/metadata/md5-cache/sys-apps/bolt-0.5 b/metadata/md5-cache/sys-apps/bolt-0.5
index f37a7d1e86b4..cbb132812b07 100644
--- a/metadata/md5-cache/sys-apps/bolt-0.5
+++ b/metadata/md5-cache/sys-apps/bolt-0.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.50.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd:0= ) doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.5/bolt-0.5.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=1a19386bcb6dd8bb973ad162dc4df517
diff --git a/metadata/md5-cache/sys-apps/bolt-0.7 b/metadata/md5-cache/sys-apps/bolt-0.7
index 653b12a199fe..66e455444e0b 100644
--- a/metadata/md5-cache/sys-apps/bolt-0.7
+++ b/metadata/md5-cache/sys-apps/bolt-0.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.50.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd:0= ) doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.7/bolt-0.7.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=8d87fc7d20dc743649d3eabff05764b6
diff --git a/metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1 b/metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1
index c584f625da1d..0ed1b9a35c49 100644
--- a/metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Unprivileged sandboxing tool, namespaces-powered chroot-like solutio
 EAPI=7
 HOMEPAGE=https://github.com/projectatomic/bubblewrap
 IUSE=selinux +suid kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectatomic/bubblewrap/releases/download/v0.3.1/bubblewrap-0.3.1.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=2c769bb6f1da9901e28eda055ff79b05
+_md5_=30d170a6b1af7890b8975ef7e86df19e
diff --git a/metadata/md5-cache/sys-apps/busybox-1.29.0 b/metadata/md5-cache/sys-apps/busybox-1.29.0
index f96fd66ba717..8f63f305ede6 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.29.0
+++ b/metadata/md5-cache/sys-apps/busybox-1.29.0
@@ -11,5 +11,5 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.29.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f787e45efc4b8a7c7fc8e201e4eb105a
diff --git a/metadata/md5-cache/sys-apps/busybox-1.29.3 b/metadata/md5-cache/sys-apps/busybox-1.29.3
index 1e44b76ba85d..c50bd5bc4338 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.29.3
+++ b/metadata/md5-cache/sys-apps/busybox-1.29.3
@@ -11,5 +11,5 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.29.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cbe22c693cb932b2363a942ab926ce8d
diff --git a/metadata/md5-cache/sys-apps/busybox-1.30.1 b/metadata/md5-cache/sys-apps/busybox-1.30.1
index 41b3e2b8dcd3..c02af0ee8885 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.30.1
+++ b/metadata/md5-cache/sys-apps/busybox-1.30.1
@@ -11,5 +11,5 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.30.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df140ba8cc4987e66c4c9071066be11c
diff --git a/metadata/md5-cache/sys-apps/busybox-9999 b/metadata/md5-cache/sys-apps/busybox-9999
index fe3ee5a33f75..9a7dcac76dfa 100644
--- a/metadata/md5-cache/sys-apps/busybox-9999
+++ b/metadata/md5-cache/sys-apps/busybox-9999
@@ -9,5 +9,5 @@ RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) mdev
 REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df140ba8cc4987e66c4c9071066be11c
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-18 b/metadata/md5-cache/sys-apps/dbus-broker-18
index a61170873d29..1b301e344bab 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-18
+++ b/metadata/md5-cache/sys-apps/dbus-broker-18
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) launcher? ( >=dev-libs/expat-2.2 >=sys-apps/systemd-230:0= ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=https://github.com/bus1/dbus-broker/archive/v18/dbus-broker-18.tar.gz https://github.com/c-util/c-dvar/archive/9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46/c-dvar-9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46.tar.gz https://github.com/c-util/c-ini/archive/979a18fdd59f05f927d6cdf624d8ded6f81c6776/c-ini-979a18fdd59f05f927d6cdf624d8ded6f81c6776.tar.gz https://github.com/c-util/c-list/archive/dda36d30c7d655b4d61358519168fa7ce0e9dae9/c-list-dda36d30c7d655b4d61358519168fa7ce0e9dae9.tar.gz https://github.com/c-util/c-rbtree/archive/bf627e0c32241915108f66ad9738444e4d045b45/c-rbtree-bf627e0c32241915108f66ad9738444e4d045b45.tar.gz https://github.com/c-util/c-shquote/archive/b7e325c7ff098787f2937dd91597677374f038b6/c-shquote-b7e325c7ff098787f2937dd91597677374f038b6.tar.gz https://github.com/c-util/c-sundry/archive/50c8ccf01b39b3f11e59c69d1cafea5bef5a9769/c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz https://github.com/c-util/c-utf8/archive/b245df543717ee19ad398f8139447e3807c11c96/c-utf8-b245df543717ee19ad398f8139447e3807c11c96.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=a5982ecca69c64feb2006ea1aadbf690
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-9999 b/metadata/md5-cache/sys-apps/dbus-broker-9999
index 57d31ecb9aa9..b3ed5cb724f4 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-9999
+++ b/metadata/md5-cache/sys-apps/dbus-broker-9999
@@ -8,5 +8,5 @@ IUSE=audit doc +launcher selinux
 LICENSE=Apache-2.0
 RDEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) launcher? ( >=dev-libs/expat-2.2 >=sys-apps/systemd-230:0= ) selinux? ( sys-libs/libselinux )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=a5982ecca69c64feb2006ea1aadbf690
diff --git a/metadata/md5-cache/sys-apps/dtc-1.5.0 b/metadata/md5-cache/sys-apps/dtc-1.5.0
index 8b80df4a3506..8db9f1289bcf 100644
--- a/metadata/md5-cache/sys-apps/dtc-1.5.0
+++ b/metadata/md5-cache/sys-apps/dtc-1.5.0
@@ -4,9 +4,9 @@ DESCRIPTION=Open Firmware device tree compiler
 EAPI=6
 HOMEPAGE=https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://kernel/software/utils/dtc/dtc-1.5.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b5004b9e13aeebd921fc9674e740fbf8
+_md5_=aa8d28588914fe827ba3e1c08a5fc2b7
diff --git a/metadata/md5-cache/sys-apps/elfix-0.9.5 b/metadata/md5-cache/sys-apps/elfix-0.9.5
index 034daeeec09c..51698547c619 100644
--- a/metadata/md5-cache/sys-apps/elfix-0.9.5
+++ b/metadata/md5-cache/sys-apps/elfix-0.9.5
@@ -4,11 +4,11 @@ DESCRIPTION=A suite of tools to work with ELF objects on Hardened Gentoo
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml https://dev.gentoo.org/~blueness/elfix/
 IUSE=+ptpax +xtpax
-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=GPL-3
 RDEPEND=~dev-python/pypax-0.9.5[ptpax=,xtpax=] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr )
 REQUIRED_USE=|| ( ptpax xtpax )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/elfix/elfix-0.9.5.tar.gz
-_md5_=6e0c00d417a26d268528afc0d318d330
+_md5_=6c877caa717a10c707a2f005457ec725
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.8 b/metadata/md5-cache/sys-apps/fwupd-1.2.8
index 076c578396dc..41d85ae9f695 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.2.8
+++ b/metadata/md5-cache/sys-apps/fwupd-1.2.8
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ^^ ( consolekit elogind systemd ) dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.8.tar.gz -> fwupd-1.2.8.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c7ce4c7b489e72a9c2e659e23a12d245
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.9 b/metadata/md5-cache/sys-apps/fwupd-1.2.9
index ad7d11947230..f73531f5e7d1 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.2.9
+++ b/metadata/md5-cache/sys-apps/fwupd-1.2.9
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ^^ ( consolekit elogind systemd ) dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.9.tar.gz -> fwupd-1.2.9.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ff71571aeb0905482a46ce6794ca8053
diff --git a/metadata/md5-cache/sys-apps/gawk-4.2.1-r1 b/metadata/md5-cache/sys-apps/gawk-4.2.1-r1
index 511a1321cb72..78d67bab9cce 100644
--- a/metadata/md5-cache/sys-apps/gawk-4.2.1-r1
+++ b/metadata/md5-cache/sys-apps/gawk-4.2.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GNU awk pattern-matching language
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
 IUSE=forced-sandbox mpfr nls readline
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.2.1.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=3d3c494bdd00e28940bcb017cde27aad
+_md5_=a022f86eb689ad6c9b7f160ac56eec62
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.30.2-r1 b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.30.2-r1
index 84261701976c..895ebf8f1a87 100644
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.30.2-r1
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.30.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.31:2 >=sys-fs/udisks-2.7.6:2 >=x11-libs/gtk+-3.16.0:3
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-disk-utility/3.30/gnome-disk-utility-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=14e7a6e63835fe472efa947024151b9b
diff --git a/metadata/md5-cache/sys-apps/ipmitool-1.8.18-r1 b/metadata/md5-cache/sys-apps/ipmitool-1.8.18-r1
index 7a791e620c4d..9398dd2a50dc 100644
--- a/metadata/md5-cache/sys-apps/ipmitool-1.8.18-r1
+++ b/metadata/md5-cache/sys-apps/ipmitool-1.8.18-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Utility for controlling IPMI enabled devices.
 EAPI=6
 HOMEPAGE=http://ipmitool.sf.net/
 IUSE=libressl openipmi static
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=amd64 hppa ~ia64 ppc x86
 LICENSE=BSD
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/readline:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/ipmitool/ipmitool-1.8.18.tar.gz http://http.debian.net/debian/pool/main/i/ipmitool/ipmitool_1.8.18-1.debian.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d482232e9c459b92877f985b16039fac
+_md5_=f7f16a83bd76a3a40a6aafd85a19b4d7
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.6.0 b/metadata/md5-cache/sys-apps/irqbalance-1.6.0
new file mode 100644
index 000000000000..a60316d028a8
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.6.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:0=[unicode] )
+DESCRIPTION=Distribute hardware interrupts across processors on a multiprocessor system
+EAPI=7
+HOMEPAGE=https://github.com/Irqbalance/irqbalance
+IUSE=caps +numa selinux tui kernel_linux
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:0=[unicode] ) selinux? ( sec-policy/selinux-irqbalance )
+SLOT=0
+SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.6.0.tar.gz -> irqbalance-1.6.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ab400ceaaa44a62090aed0e51159a03d
diff --git a/metadata/md5-cache/sys-apps/lsd-0.15.1 b/metadata/md5-cache/sys-apps/lsd-0.15.1
new file mode 100644
index 000000000000..37f641090881
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/lsd-0.15.1
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.31.0 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=A modern ls with a lot of pretty colors and awesome icons
+EAPI=7
+HOMEPAGE=https://github.com/Peltoche/lsd
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/Peltoche/lsd/archive/0.15.1.tar.gz -> lsd-0.15.1.tar.gz https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.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/libc/0.2.55/download -> libc-0.2.55.crate https://crates.io/api/v1/crates/lscolors/0.5.0/download -> lscolors-0.5.0.crate https://crates.io/api/v1/crates/lsd/0.15.1/download -> lsd-0.15.1.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.43/download -> redox_syscall-0.1.43.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/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.8/download -> terminal_size-0.1.8.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/wild/2.0.1/download -> wild-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.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/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=40abd323cccdd116204426016ba1fc73
diff --git a/metadata/md5-cache/sys-apps/openrc-0.40.2 b/metadata/md5-cache/sys-apps/openrc-0.40.2
deleted file mode 100644
index 5d6f71257523..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.40.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
-DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
-EAPI=6
-HOMEPAGE=https://github.com/openrc/openrc/
-IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
-SLOT=0
-SRC_URI=https://github.com/openrc/openrc/archive/0.40.2.tar.gz -> openrc-0.40.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7083179fbf29ad7ae78185131f620146
diff --git a/metadata/md5-cache/sys-apps/openrc-0.40.3 b/metadata/md5-cache/sys-apps/openrc-0.40.3
deleted file mode 100644
index a57c0bb1651e..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.40.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
-DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
-EAPI=6
-HOMEPAGE=https://github.com/openrc/openrc/
-IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
-SLOT=0
-SRC_URI=https://github.com/openrc/openrc/archive/0.40.3.tar.gz -> openrc-0.40.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b459f555c5e861b97fcb8f873d7c6a24
diff --git a/metadata/md5-cache/sys-apps/openrc-0.41 b/metadata/md5-cache/sys-apps/openrc-0.41
deleted file mode 100644
index e15b1c751477..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.41
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
-DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
-EAPI=6
-HOMEPAGE=https://github.com/openrc/openrc/
-IUSE=audit bash 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 ~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 bash? ( app-shells/bash ) !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 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
-SLOT=0
-SRC_URI=https://github.com/openrc/openrc/archive/0.41.tar.gz -> openrc-0.41.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ba08bebf42a3c3c46946db0f12094238
diff --git a/metadata/md5-cache/sys-apps/openrc-0.41.1 b/metadata/md5-cache/sys-apps/openrc-0.41.1
deleted file mode 100644
index 435506584279..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.41.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
-DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
-EAPI=6
-HOMEPAGE=https://github.com/openrc/openrc/
-IUSE=audit bash 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 ~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 bash? ( app-shells/bash ) !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 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
-SLOT=0
-SRC_URI=https://github.com/openrc/openrc/archive/0.41.1.tar.gz -> openrc-0.41.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ba08bebf42a3c3c46946db0f12094238
diff --git a/metadata/md5-cache/sys-apps/openrc-0.41.2 b/metadata/md5-cache/sys-apps/openrc-0.41.2
index aba7f43b460f..6da671ced238 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.41.2
+++ b/metadata/md5-cache/sys-apps/openrc-0.41.2
@@ -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 bash 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 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~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 bash? ( app-shells/bash ) !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 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.41.2.tar.gz -> openrc-0.41.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db03e49df86ef5bfedaf12f1b3ec1e2c
+_md5_=c97a6f38d1d2db0f7451f1d8048b69d1
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20190218 b/metadata/md5-cache/sys-apps/osinfo-db-20190218
index 10d0ce6a6286..c47b0bb2f837 100644
--- a/metadata/md5-cache/sys-apps/osinfo-db-20190218
+++ b/metadata/md5-cache/sys-apps/osinfo-db-20190218
@@ -3,8 +3,8 @@ DEPEND=sys-apps/osinfo-db-tools
 DESCRIPTION=osinfo database files
 EAPI=6
 HOMEPAGE=https://libosinfo.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20190218.tar.xz
-_md5_=0e7d3dea6daf66491fb23197cdda6ff3
+_md5_=f4a3aaadcd2b9575c10d4137118d4be9
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.3.0 b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.3.0
index 1dfc0c37849e..a475088891e2 100644
--- a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.3.0
+++ b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.3.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6.0 >=app-arch/libarchive-3.0
 DESCRIPTION=Tools for managing the osinfo database
 EAPI=6
 HOMEPAGE=https://libosinfo.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6.0 >=app-arch/libarchive-3.0.0:= dev-libs/json-glib !<sys-libs/libosinfo-1.0.0
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-tools-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9fa504adc2f46cfd10ba0296d32aa54b
+_md5_=6f6374f2f35d506e54897d4b5cf338b4
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24
index 08a9bda7c241..fb2a7bdfb94a 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24
@@ -5,11 +5,11 @@ DESCRIPTION=PC/SC Architecture smartcard middleware library
 EAPI=7
 HOMEPAGE=https://pcsclite.apdu.fr/
 IUSE=python libusb policykit selinux systemd +udev 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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD ISC MIT GPL-3+ GPL-2
 RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) !<app-crypt/ccid-1.4.1-r1 !<sys-apps/baselayout-2 !<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-pcscd )
 REQUIRED_USE=^^ ( udev libusb ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-1.8.24.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=627c2d2bce32fcdbc5a7cbf7aac3252e
+_md5_=66ac5da61f512589280a5e18305e6a00
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.62 b/metadata/md5-cache/sys-apps/portage-2.3.62
deleted file mode 100644
index b54617a9ea67..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.3.62
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_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_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_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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 !<app-portage/repoman-2.3.10 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_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.3.62.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.62.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a2ca588037142a7d78e8acbd962f4d17
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.62-r1 b/metadata/md5-cache/sys-apps/portage-2.3.62-r1
deleted file mode 100644
index 337894c7b1a9..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.3.62-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_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_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_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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 !<app-portage/repoman-2.3.10 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_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.3.62.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.62.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fc15fe7edeff9a926a93b5812253cf23
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.62-r2 b/metadata/md5-cache/sys-apps/portage-2.3.62-r2
index c673f6fac722..c07654c18cf1 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.62-r2
+++ b/metadata/md5-cache/sys-apps/portage-2.3.62-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.62.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.62.tar.bz2 https://github.com/gentoo/portage/commit/fbebef9677d63db70f1c68b197e58b041ec6ac61.patch -> repoman-bug-685482-fbebef9677d6.patch
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8185dc2c78284efc55891cb2d04e6908
+_md5_=1a53c531d6ed1f9a7fea9e0ff46b6cac
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.66 b/metadata/md5-cache/sys-apps/portage-2.3.66
deleted file mode 100644
index 2a570d847fc6..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.3.66
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_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_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_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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 !<app-portage/repoman-2.3.10 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_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.3.66.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.66.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4aa5dfd8e3bbbe9854d23ed7a05b3d38
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.66-r1 b/metadata/md5-cache/sys-apps/portage-2.3.66-r1
index 9dad59919f2f..ab1005c6545a 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.66-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.66-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_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_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_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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 !<app-portage/repoman-2.3.10 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_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.66.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.66.tar.bz2 https://github.com/gentoo/portage/commit/fbebef9677d63db70f1c68b197e58b041ec6ac61.patch -> repoman-bug-685482-fbebef9677d6.patch
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=354066baf6bb757615865b08dcd1f47e
+_md5_=81c7869af5459795df6a8c1434b07dc5
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.67 b/metadata/md5-cache/sys-apps/portage-2.3.67
new file mode 100644
index 000000000000..7d34a8d39b2c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.67
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_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_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_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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 !<app-portage/repoman-2.3.10 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_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.67.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.67.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=d3ade50a33407eaedac8e73914eca07f
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 8dfeb8173d31..68894e3f5af9 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -9,5 +9,5 @@ PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-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_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_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_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5440d20f37bb6e0ec376e7160f2f8972
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=dbad5284447f4e365f0681ec95168164
diff --git a/metadata/md5-cache/sys-apps/systemd-239-r4 b/metadata/md5-cache/sys-apps/systemd-239-r4
index 4b5e29d39a3b..fb66697c5292 100644
--- a/metadata/md5-cache/sys-apps/systemd-239-r4
+++ b/metadata/md5-cache/sys-apps/systemd-239-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v239/systemd-239.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-239-patches-2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bec47170db49ca1c79a5652489335615
diff --git a/metadata/md5-cache/sys-apps/systemd-241-r1 b/metadata/md5-cache/sys-apps/systemd-241-r1
index b2c0dad8372c..576d6376450c 100644
--- a/metadata/md5-cache/sys-apps/systemd-241-r1
+++ b/metadata/md5-cache/sys-apps/systemd-241-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v241/systemd-241.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=61856da45b0064a809508eb7a41438b8
diff --git a/metadata/md5-cache/sys-apps/systemd-242-r1 b/metadata/md5-cache/sys-apps/systemd-242-r1
index eed4acebe48d..083d4663ea4d 100644
--- a/metadata/md5-cache/sys-apps/systemd-242-r1
+++ b/metadata/md5-cache/sys-apps/systemd-242-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v242/systemd-242.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=8a5ed3d41069fa2333a1f5925dd78da3
diff --git a/metadata/md5-cache/sys-apps/systemd-242-r2 b/metadata/md5-cache/sys-apps/systemd-242-r2
new file mode 100644
index 000000000000..7adbebac8f09
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-242-r2
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi gnutls http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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= ) dns-over-tls? ( gnutls? ( >=net-libs/gnutls-3.5.3:0= ) !gnutls? ( >=dev-libs/openssl-1.1.0: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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= gnutls? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v242/systemd-242.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=9a0d2c378da1692a95e453884f8e0457
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 7154c9c31dab..09f2b24b972f 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=be1450b68615c6911cfc7c91ccdfa681
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.95_beta b/metadata/md5-cache/sys-apps/sysvinit-2.95_beta
new file mode 100644
index 000000000000..906ba9fa6a28
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.95_beta
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
+DESCRIPTION=/sbin/init - parent of all processes
+EAPI=7
+HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
+IUSE=selinux ibm static kernel_FreeBSD
+LICENSE=GPL-2
+RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown ) !<sys-apps/openrc-0.13
+SLOT=0
+SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.95-beta.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=738d79702114d42ddb04bb94e3a74bfc
diff --git a/metadata/md5-cache/sys-apps/toybox-0.7.5 b/metadata/md5-cache/sys-apps/toybox-0.7.5
index 42695cf8194a..59ff779210e5 100644
--- a/metadata/md5-cache/sys-apps/toybox-0.7.5
+++ b/metadata/md5-cache/sys-apps/toybox-0.7.5
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://landley.net/code/toybox/downloads/toybox-0.7.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=088c2251b3cb91ba4d8d02981b96a68d
diff --git a/metadata/md5-cache/sys-apps/toybox-0.7.6 b/metadata/md5-cache/sys-apps/toybox-0.7.6
index 9b92e60fc908..ee7f581007c1 100644
--- a/metadata/md5-cache/sys-apps/toybox-0.7.6
+++ b/metadata/md5-cache/sys-apps/toybox-0.7.6
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://landley.net/code/toybox/downloads/toybox-0.7.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=924bb7e00e97df13d4c06289b86e86a5
diff --git a/metadata/md5-cache/sys-apps/toybox-0.7.7 b/metadata/md5-cache/sys-apps/toybox-0.7.7
index 2cf0d293bec8..8b78d6854c9d 100644
--- a/metadata/md5-cache/sys-apps/toybox-0.7.7
+++ b/metadata/md5-cache/sys-apps/toybox-0.7.7
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://landley.net/code/toybox/downloads/toybox-0.7.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=924bb7e00e97df13d4c06289b86e86a5
diff --git a/metadata/md5-cache/sys-apps/toybox-0.7.8 b/metadata/md5-cache/sys-apps/toybox-0.7.8
index d6331c67a299..df143caeb8e0 100644
--- a/metadata/md5-cache/sys-apps/toybox-0.7.8
+++ b/metadata/md5-cache/sys-apps/toybox-0.7.8
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://landley.net/code/toybox/downloads/toybox-0.7.8.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=089118673a4361a3ecdebe31d9a4d5f4
diff --git a/metadata/md5-cache/sys-apps/toybox-0.8.0 b/metadata/md5-cache/sys-apps/toybox-0.8.0
index 1a0406f6e245..bac0b1514032 100644
--- a/metadata/md5-cache/sys-apps/toybox-0.8.0
+++ b/metadata/md5-cache/sys-apps/toybox-0.8.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://landley.net/code/toybox/downloads/toybox-0.8.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=696bed9e1a3769c315a079f6776edbeb
diff --git a/metadata/md5-cache/sys-apps/toybox-0.8.1 b/metadata/md5-cache/sys-apps/toybox-0.8.1
new file mode 100644
index 000000000000..31a487b48611
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/toybox-0.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Common linux commands in a multicall binary
+EAPI=7
+HOMEPAGE=https://landley.net/code/toybox/
+IUSE=savedconfig
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://landley.net/code/toybox/downloads/toybox-0.8.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=696bed9e1a3769c315a079f6776edbeb
diff --git a/metadata/md5-cache/sys-apps/toybox-9999 b/metadata/md5-cache/sys-apps/toybox-9999
index 8c0dac78a198..63540df855ca 100644
--- a/metadata/md5-cache/sys-apps/toybox-9999
+++ b/metadata/md5-cache/sys-apps/toybox-9999
@@ -7,5 +7,5 @@ IUSE=savedconfig
 LICENSE=BSD-2
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=089118673a4361a3ecdebe31d9a4d5f4
diff --git a/metadata/md5-cache/sys-apps/ucspi-proxy-1.1 b/metadata/md5-cache/sys-apps/ucspi-proxy-1.1
new file mode 100644
index 000000000000..480ff5e6ecba
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ucspi-proxy-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=dev-libs/bglibs-2.04
+DESCRIPTION=Proxy program for two connections set up by a UCSPI server and a UCSPI client
+EAPI=7
+HOMEPAGE=https://untroubled.org/ucspi-proxy/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/bglibs-2.04
+SLOT=0
+SRC_URI=https://untroubled.org/ucspi-proxy/archive/ucspi-proxy-1.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=f3913293233c45ae6cc94fc39d9af731
diff --git a/metadata/md5-cache/sys-apps/ucspi-unix-1.0 b/metadata/md5-cache/sys-apps/ucspi-unix-1.0
new file mode 100644
index 000000000000..56fcd26fc599
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ucspi-unix-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/bglibs-2.04
+DESCRIPTION=A UCSPI implementation for Unix domain sockets
+EAPI=7
+HOMEPAGE=https://untroubled.org/ucspi-unix/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=!net-analyzer/mk-livestatus
+SLOT=0
+SRC_URI=https://untroubled.org/ucspi-unix/archive/ucspi-unix-1.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1a8a7cf5ac257498f2916ed502aa1f7c
diff --git a/metadata/md5-cache/sys-apps/usbutils-010-r1 b/metadata/md5-cache/sys-apps/usbutils-010-r1
index 57cd48efa610..e0b5fa85494f 100644
--- a/metadata/md5-cache/sys-apps/usbutils-010-r1
+++ b/metadata/md5-cache/sys-apps/usbutils-010-r1
@@ -4,11 +4,11 @@ DESCRIPTION=USB enumeration utilities
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/usb/usbutils/ https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/
 IUSE=python python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=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
 RDEPEND=virtual/libusb:1= virtual/libudev:= sys-apps/hwids python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/usb/usbutils/usbutils-010.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f33bcec975cdf2f7475310ccfe8587b4
+_md5_=773a86c656bb81bc2c6ba2edd1207a42
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.34_rc1 b/metadata/md5-cache/sys-apps/util-linux-2.34_rc1
deleted file mode 100644
index 34c460736584..000000000000
--- a/metadata/md5-cache/sys-apps/util-linux-2.34_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DESCRIPTION=Various useful Linux utilities
-EAPI=6
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
-IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34-rc1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3fffb84f393700b93a6723487999fca1
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.34_rc2 b/metadata/md5-cache/sys-apps/util-linux-2.34_rc2
new file mode 100644
index 000000000000..336ab03ee8a5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.34_rc2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/os-headers caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= )
+DESCRIPTION=Various useful Linux utilities
+EAPI=7
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
+IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=virtual/os-headers caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34-rc2.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e26b415334fd3012c9d58485266f70df
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.2.0 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.2.0
index 9ec72f01e4f0..96ded4a8c04d 100644
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.2.0
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Desktop integration portal
 EAPI=7
 HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal
 IUSE=doc
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2[dbus] sys-fs/fuse:0
 SLOT=0
 SRC_URI=https://github.com/flatpak/xdg-desktop-portal/releases/download/1.2.0/xdg-desktop-portal-1.2.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=be1256a60a57168c07b4f5999f8209d6
+_md5_=74dc974137b8af4e4ade2fae2209bef4
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 6903f363e154..ace523a39fa9 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/authenticator-0.2.1 b/metadata/md5-cache/sys-auth/authenticator-0.2.1
index 4608eb3687dd..ea2fad7d8400 100644
--- a/metadata/md5-cache/sys-auth/authenticator-0.2.1
+++ b/metadata/md5-cache/sys-auth/authenticator-0.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/gnome-screenshot x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/bilelmoussaoui/Authenticator/archive/0.2.1.tar.gz -> authenticator-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=209a4fb04fa4b50744352a84e1129074
diff --git a/metadata/md5-cache/sys-auth/authenticator-0.2.4 b/metadata/md5-cache/sys-auth/authenticator-0.2.4
index 970e54a289cf..29f10dad790e 100644
--- a/metadata/md5-cache/sys-auth/authenticator-0.2.4
+++ b/metadata/md5-cache/sys-auth/authenticator-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/Authenticator/-/archive/0.2.4/Authenticator-0.2.4.tar.gz -> authenticator-0.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=6ceaed4599b83bf081666d5636268912
diff --git a/metadata/md5-cache/sys-auth/authenticator-9999 b/metadata/md5-cache/sys-auth/authenticator-9999
index 32a31839fd65..41217545786d 100644
--- a/metadata/md5-cache/sys-auth/authenticator-9999
+++ b/metadata/md5-cache/sys-auth/authenticator-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/python-gnupg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/gd x11-libs/gtk+:3
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=d1f21f1eec6bfe2eab288c2549bf340e
diff --git a/metadata/md5-cache/sys-auth/elogind-239.4 b/metadata/md5-cache/sys-auth/elogind-239.4
index 036bfa4864fb..bd65f1236ed7 100644
--- a/metadata/md5-cache/sys-auth/elogind-239.4
+++ b/metadata/md5-cache/sys-auth/elogind-239.4
@@ -10,5 +10,5 @@ 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/v239.4.tar.gz -> elogind-239.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=21077f7d37ed67aa8f28f578fb513808
diff --git a/metadata/md5-cache/sys-auth/elogind-241.3 b/metadata/md5-cache/sys-auth/elogind-241.3
index 6b08f39bcebe..fce7ece5de6f 100644
--- a/metadata/md5-cache/sys-auth/elogind-241.3
+++ b/metadata/md5-cache/sys-auth/elogind-241.3
@@ -11,5 +11,5 @@ 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/v241.3.tar.gz -> elogind-241.3.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=1cf80c211edc502253c52aa086d20e7b
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2 b/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2
deleted file mode 100644
index ecfa62e6cdc3..000000000000
--- a/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=virtual/libusb:1 dev-libs/glib:2 dev-libs/nss x11-libs/pixman virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=library to add support for consumer fingerprint readers
-EAPI=6
-HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/
-IUSE=debug static-libs vanilla
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/libusb:1 dev-libs/glib:2 dev-libs/nss x11-libs/pixman
-SLOT=0
-SRC_URI=https://cgit.freedesktop.org/libfprint/libfprint/snapshot/V_0_6_0.tar.bz2 -> libfprint-0.6.0.tar.bz2 https://dev.gentoo.org/~xmw/libfprint-0.6.0_vfs0050.patch.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=499bdd8559ec32dfc0e4458ef0b47be9
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.99.0 b/metadata/md5-cache/sys-auth/libfprint-0.99.0
index 9546eec261bb..9aa710fba1f4 100644
--- a/metadata/md5-cache/sys-auth/libfprint-0.99.0
+++ b/metadata/md5-cache/sys-auth/libfprint-0.99.0
@@ -5,10 +5,10 @@ DESCRIPTION=library to add support for consumer fingerprint readers
 EAPI=7
 HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv
 SLOT=0
 SRC_URI=https://github.com/freedesktop/libfprint/archive/V_0_99_0.tar.gz -> libfprint-0.99.0.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=c20143da022411b194ed80bde14567db
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=c7e242bf826226500772bb9526d9e030
diff --git a/metadata/md5-cache/sys-auth/pam_ssh-2.3 b/metadata/md5-cache/sys-auth/pam_ssh-2.3
index c55173743ae2..041aa27d3168 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh-2.3
+++ b/metadata/md5-cache/sys-auth/pam_ssh-2.3
@@ -3,10 +3,10 @@ DEPEND=virtual/pam dev-libs/openssl:0=
 DESCRIPTION=Uses ssh-agent to provide single sign-on
 EAPI=7
 HOMEPAGE=http://pam-ssh.sourceforge.net/
-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=BSD-2 BSD ISC
 RDEPEND=virtual/pam dev-libs/openssl:0= net-misc/openssh
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-ssh/pam_ssh-2.3.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=97d7babba34494e06790478c6e3fef19
+_md5_=33c37b569432761da786cbe219bb7096
diff --git a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.10.2 b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.10.2
deleted file mode 100644
index f79eb5afda2b..000000000000
--- a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/pam dev-libs/openssl dev-lang/perl
-DESCRIPTION=Simple module to authenticate users against their ssh-agent keys
-EAPI=5
-HOMEPAGE=http://pamsshagentauth.sourceforge.net
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=virtual/pam dev-libs/openssl virtual/ssh
-SLOT=0
-SRC_URI=mirror://sourceforge/pamsshagentauth/pam_ssh_agent_auth/v0.10.2/pam_ssh_agent_auth-0.10.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=21a43ee421a0ee604578a6b4839fd960
diff --git a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.2 b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.2
deleted file mode 100644
index 6bfec6dee418..000000000000
--- a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=virtual/pam dev-libs/openssl dev-lang/perl
-DESCRIPTION=Simple module to authenticate users against their ssh-agent keys
-EAPI=4
-HOMEPAGE=http://pamsshagentauth.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/pam dev-libs/openssl virtual/ssh
-SLOT=0
-SRC_URI=mirror://sourceforge/pamsshagentauth/pam_ssh_agent_auth/v0.9.2/pam_ssh_agent_auth-0.9.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2a6e317a0458a4027c80e60812409084
diff --git a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.3 b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.3
deleted file mode 100644
index d9ad48cae8a0..000000000000
--- a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=virtual/pam dev-libs/openssl dev-lang/perl
-DESCRIPTION=Simple module to authenticate users against their ssh-agent keys
-EAPI=4
-HOMEPAGE=http://pamsshagentauth.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/pam dev-libs/openssl virtual/ssh
-SLOT=0
-SRC_URI=mirror://sourceforge/pamsshagentauth/pam_ssh_agent_auth/v0.9.3/pam_ssh_agent_auth-0.9.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a4e7e51deef79311f937e5d53af8ddd
diff --git a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.4 b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.4
deleted file mode 100644
index d170fc6bfd51..000000000000
--- a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=virtual/pam dev-libs/openssl dev-lang/perl
-DESCRIPTION=Simple module to authenticate users against their ssh-agent keys
-EAPI=5
-HOMEPAGE=http://pamsshagentauth.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/pam dev-libs/openssl virtual/ssh
-SLOT=0
-SRC_URI=mirror://sourceforge/pamsshagentauth/pam_ssh_agent_auth/v0.9.4/pam_ssh_agent_auth-0.9.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ad7a2cca389945dc96fdc5f854f2ff8
diff --git a/metadata/md5-cache/sys-auth/polkit-qt-0.112.0_p20160416-r2 b/metadata/md5-cache/sys-auth/polkit-qt-0.112.0_p20160416-r2
index 8dc233cbb7e6..598224a732a5 100644
--- a/metadata/md5-cache/sys-auth/polkit-qt-0.112.0_p20160416-r2
+++ b/metadata/md5-cache/sys-auth/polkit-qt-0.112.0_p20160416-r2
@@ -4,10 +4,10 @@ DESCRIPTION=PolicyKit Qt API wrapper library
 EAPI=6
 HOMEPAGE=https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/polkit-qt-1-0.112.0_p20160416.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b4cba363f9486766998685f6a2761e95
+_md5_=bef0be39433a4bd33c4de400ed628c76
diff --git a/metadata/md5-cache/sys-auth/sssd-2.1.0 b/metadata/md5-cache/sys-auth/sssd-2.1.0
index 26868b1a36bc..91a8c127ddce 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.1.0
+++ b/metadata/md5-cache/sys-auth/sssd-2.1.0
@@ -1,14 +1,14 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 )
+DEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2[winbind] ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 )
 DESCRIPTION=System Security Services Daemon provides access to identity and authentication
 EAPI=7
 HOMEPAGE=https://pagure.io/SSSD/sssd
 IUSE=acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2 ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+RDEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2[winbind] ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.1.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=d9173365f18cf2da88ee4f456f1f4050
+_md5_=4e9138942b85a8dd3dda25b0b9f1de9f
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 6e70ed0165b6..da7eba5a496b 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/open-iscsi-2.0.877 b/metadata/md5-cache/sys-block/open-iscsi-2.0.877
new file mode 100644
index 000000000000..a3ad3473b227
--- /dev/null
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.877
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-fabric/ofed ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) systemd? ( sys-apps/systemd )
+DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
+EAPI=7
+HOMEPAGE=http://www.open-iscsi.com/
+IUSE=debug infiniband libressl +tcp rdma systemd kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-fabric/ofed ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) systemd? ( sys-apps/systemd ) sys-fs/lsscsi sys-apps/util-linux
+REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
+SLOT=0/0.2
+SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.877.tar.gz -> open-iscsi-2.0.877.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=60a0bdddf4ccca3c956e9516355216b9
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.77 b/metadata/md5-cache/sys-block/tgt-1.0.77
index 2ddbc0972aee..ea51be24afd1 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.77
+++ b/metadata/md5-cache/sys-block/tgt-1.0.77
@@ -4,10 +4,10 @@ DESCRIPTION=Linux SCSI target framework (tgt)
 EAPI=7
 HOMEPAGE=http://stgt.sourceforge.net
 IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
 SLOT=0
 SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.77 -> tgt-1.0.77.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=5748b4c367b4270f32877832cc8ae8ff
+_md5_=678737bacf87fa7ae27f8763e50b9c45
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.78 b/metadata/md5-cache/sys-block/tgt-1.0.78
new file mode 100644
index 000000000000..d79b9bb47189
--- /dev/null
+++ b/metadata/md5-cache/sys-block/tgt-1.0.78
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets
+DESCRIPTION=Linux SCSI target framework (tgt)
+EAPI=7
+HOMEPAGE=http://stgt.sourceforge.net
+IUSE=fcoe fcp ibmvio infiniband rbd
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
+SLOT=0
+SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.78 -> tgt-1.0.78.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=5748b4c367b4270f32877832cc8ae8ff
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.0 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.0
deleted file mode 100644
index f015f9de65f8..000000000000
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!static? ( dev-libs/expat dev-libs/libaio ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba ) dev-libs/boost >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A suite of tools for thin provisioning on Linux
-EAPI=6
-HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
-IUSE=static test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
-SLOT=0
-SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.0.tar.gz -> thin-provisioning-tools-0.8.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f01d419f6278277e24fde9f0a30f663
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.2 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.2
new file mode 100644
index 000000000000..d915ec149734
--- /dev/null
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!static? ( dev-libs/expat dev-libs/libaio ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba ) dev-libs/boost
+DESCRIPTION=A suite of tools for thin provisioning on Linux
+EAPI=7
+HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
+IUSE=static test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
+SLOT=0
+SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.2.tar.gz -> thin-provisioning-tools-0.8.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9380353ba2ce43f9af9eeb3fc0e322a6
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-9999 b/metadata/md5-cache/sys-block/thin-provisioning-tools-9999
index d1bf71e558c9..43bf08fbd770 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-9999
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-9999
@@ -1,11 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!static? ( dev-libs/expat dev-libs/libaio ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba ) dev-libs/boost >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=!static? ( dev-libs/expat dev-libs/libaio ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba ) dev-libs/boost
 DESCRIPTION=A suite of tools for thin provisioning on Linux
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
 IUSE=static test
 LICENSE=GPL-3
 RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f01d419f6278277e24fde9f0a30f663
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9380353ba2ce43f9af9eeb3fc0e322a6
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 583f9c8eb7ac..515e49906741 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/palo-9999 b/metadata/md5-cache/sys-boot/palo-9999
index 71f73abf2f94..b1fc96c05526 100644
--- a/metadata/md5-cache/sys-boot/palo-9999
+++ b/metadata/md5-cache/sys-boot/palo-9999
@@ -1,9 +1,9 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=PALO : PArisc Linux Loader
-EAPI=6
+EAPI=7
 HOMEPAGE=http://parisc-linux.org/ https://parisc.wiki.kernel.org/
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d515f3fccb629dcc3a3f253fc1452a97
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=309de331fd32ac153caf74aaabf1a651
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.9.4-r1 b/metadata/md5-cache/sys-boot/plymouth-0.9.4-r1
index 4c2a578b14cb..ed79edd2cd70 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.9.4-r1
+++ b/metadata/md5-cache/sys-boot/plymouth-0.9.4-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Graphical boot animation (splash) and logger
 EAPI=7
 HOMEPAGE=https://cgit.freedesktop.org/plymouth/
 IUSE=debug gdm +gtk +libkms +pango +split-usr static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) virtual/udev !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.4.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=13a49bb9cac58199471f2ff8b0f37cb8
+_md5_=b7c4ef75995d57d2cdf97f313e750623
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-239 b/metadata/md5-cache/sys-boot/systemd-boot-239
index 4fbd55776adc..d7f6d5a8cd83 100644
--- a/metadata/md5-cache/sys-boot/systemd-boot-239
+++ b/metadata/md5-cache/sys-boot/systemd-boot-239
@@ -9,5 +9,5 @@ RDEPEND=>=sys-apps/util-linux-2.30 !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v239.tar.gz -> systemd-239.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=770dab890f037338d2cde997098bdbb2
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-241 b/metadata/md5-cache/sys-boot/systemd-boot-241
index bce189bf070c..1c723d2f9dbb 100644
--- a/metadata/md5-cache/sys-boot/systemd-boot-241
+++ b/metadata/md5-cache/sys-boot/systemd-boot-241
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/util-linux-2.30 !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v241.tar.gz -> systemd-241.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=c1602b73b69d38609d98b5e34fb8dad3
diff --git a/metadata/md5-cache/sys-boot/yaboot-1.3.17-r3 b/metadata/md5-cache/sys-boot/yaboot-1.3.17-r3
index 5bda0b6f01c3..ded4b9dc2e6c 100644
--- a/metadata/md5-cache/sys-boot/yaboot-1.3.17-r3
+++ b/metadata/md5-cache/sys-boot/yaboot-1.3.17-r3
@@ -10,4 +10,4 @@ RDEPEND=!sys-boot/yaboot-static !ibm? ( sys-fs/hfsutils sys-fs/hfsplusutils sys-
 SLOT=0
 SRC_URI=http://yaboot.ozlabs.org/releases/yaboot-1.3.17.tar.gz mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.13.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=2c5b41359333ec7af69c019e35cc983c
+_md5_=1992b246cdd7358d0527c0a951cddeb0
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 5d8f6268b8e2..66310c8053b6 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/galera-26.4.2 b/metadata/md5-cache/sys-cluster/galera-26.4.2
new file mode 100644
index 000000000000..b9dd91f29d6b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.2
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-util/scons[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
+DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
+EAPI=7
+HOMEPAGE=http://galeracluster.com
+IUSE=cpu_flags_x86_sse4_2 garbd test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 BSD
+RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
+SLOT=0
+SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.5/galera-26.4.2/src/galera-26.4.2.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=e23cd5d217a915a72b949e3f918dbc90
diff --git a/metadata/md5-cache/sys-cluster/ganglia-web-3.7.3 b/metadata/md5-cache/sys-cluster/ganglia-web-3.7.3
deleted file mode 100644
index 12d86788c9c1..000000000000
--- a/metadata/md5-cache/sys-cluster/ganglia-web-3.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=net-misc/rsync >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web frontend for sys-cluster/ganglia
-EAPI=6
-HOMEPAGE=http://ganglia.sourceforge.net
-IUSE=vhosts vhosts
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=net-misc/rsync >=app-admin/webapp-config-1.50.15 >=sys-cluster/ganglia-3.3.7[-minimal] dev-lang/php[gd,xml,ctype] virtual/httpd-php media-fonts/dejavu >=app-admin/webapp-config-1.50.15
-SLOT=0
-SRC_URI=https://github.com/ganglia/ganglia-web/archive/3.7.3.tar.gz -> ganglia-web-3.7.3.tar.gz
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=0fa614d07585d48c7ae927e332fa88ae
diff --git a/metadata/md5-cache/sys-cluster/ganglia-web-3.7.3-r1 b/metadata/md5-cache/sys-cluster/ganglia-web-3.7.3-r1
new file mode 100644
index 000000000000..1e9129eb7e84
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ganglia-web-3.7.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=net-misc/rsync >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web frontend for sys-cluster/ganglia
+EAPI=6
+HOMEPAGE=http://ganglia.sourceforge.net
+IUSE=vhosts vhosts
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=net-misc/rsync >=app-admin/webapp-config-1.50.15 >=sys-cluster/ganglia-3.3.7[-minimal] dev-lang/php:*[ctype,gd,json,xml] virtual/httpd-php media-fonts/dejavu >=app-admin/webapp-config-1.50.15
+SLOT=0
+SRC_URI=https://github.com/ganglia/ganglia-web/archive/3.7.3.tar.gz -> ganglia-web-3.7.3.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=ede46f6098f1cd2ff2e16258a6a507bf
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.2 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.2
new file mode 100644
index 000000000000..09128ae119ad
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+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.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.2 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.2
new file mode 100644
index 000000000000..815baded44a5
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+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.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.14.2 b/metadata/md5-cache/sys-cluster/kube-proxy-1.14.2
new file mode 100644
index 000000000000..f4bdb8509ef9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.14.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Proxy service
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=55aeb7a564b39695fc0cd5bf65ed9902
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.2 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.2
new file mode 100644
index 000000000000..6d9ceadbffad
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Scheduler
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.14.2 b/metadata/md5-cache/sys-cluster/kubeadm-1.14.2
new file mode 100644
index 000000000000..53298d7439f8
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.14.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=fcb6587694b5f25ab39d19a03f0ab955
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.14.2 b/metadata/md5-cache/sys-cluster/kubectl-1.14.2
new file mode 100644
index 000000000000..f35c4528e844
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.14.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
+DESCRIPTION=CLI to 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.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1967dc9a3a57363631512f7d5e70d87f
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.14.2 b/metadata/md5-cache/sys-cluster/kubelet-1.14.2
new file mode 100644
index 000000000000..bf64c240dd4b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.14.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=a53524dc91a7f2e22d63c86e967cd156
diff --git a/metadata/md5-cache/sys-cluster/moosefs-1.6.26-r1 b/metadata/md5-cache/sys-cluster/moosefs-1.6.26-r1
deleted file mode 100644
index 7fb32bb6ac19..000000000000
--- a/metadata/md5-cache/sys-cluster/moosefs-1.6.26-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] fuse? ( >=sys-fs/fuse-2.6 )
-DESCRIPTION=A filesystem for highly reliable petabyte storage
-EAPI=5
-HOMEPAGE=http://www.moosefs.org/
-IUSE=cgi +fuse static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] fuse? ( >=sys-fs/fuse-2.6 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://pro.hit.gemius.pl/hitredir/id=p4CVHPOzkVa0JJIK.m0Ee6dyHZEgoQb1KaiPmVK29EX.M7/url=moosefs.org/tl_files/mfscode/mfs-1.6.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ac0d5a6e1eb8813c8ea4a46efcc6d5c9
diff --git a/metadata/md5-cache/sys-cluster/moosefs-1.6.27 b/metadata/md5-cache/sys-cluster/moosefs-1.6.27
deleted file mode 100644
index 3c807fa1c113..000000000000
--- a/metadata/md5-cache/sys-cluster/moosefs-1.6.27
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] fuse? ( >=sys-fs/fuse-2.6 )
-DESCRIPTION=A filesystem for highly reliable petabyte storage
-EAPI=5
-HOMEPAGE=http://www.moosefs.org/
-IUSE=cgi +fuse static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] fuse? ( >=sys-fs/fuse-2.6 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://pro.hit.gemius.pl/hitredir/id=.WCbG2t.7Ln5k1s3Q9xPg8cPfX.wVMc5kyXfrKcJTDH.c7/url=moosefs.org/tl_files/mfscode/mfs-1.6.27-1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cab0c666f4716a926a8cae21eb2c574b
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 1f08060e8aba..981427b6abe6 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/binutils-2.31.1-r6 b/metadata/md5-cache/sys-devel/binutils-2.31.1-r6
index 4b2491ba9e6b..594c331f8fa2 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.31.1-r6
+++ b/metadata/md5-cache/sys-devel/binutils-2.31.1-r6
@@ -4,11 +4,11 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=+cxx default-gold doc +gold multitarget +nls +plugins static-libs test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=cxx? ( gold plugins ) default-gold? ( gold )
 SLOT=2.31
 SRC_URI=mirror://gnu/binutils/binutils-2.31.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.31.1-patches-7.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a0ab2bfe1fc22789383612a1c87207d8
+_md5_=54095ccdfd3321042b3b03fe033a473e
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
index 52b4e42d7f6a..882efd7aeb61 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm:* sys-libs/libcxx
 SLOT=8
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-274.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-895.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-421.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6cd18e7df6ab5e2b3dbde2d2bde4e8bb
diff --git a/metadata/md5-cache/sys-devel/bison-3.3.1 b/metadata/md5-cache/sys-devel/bison-3.3.1
deleted file mode 100644
index 3c7a2cd230f3..000000000000
--- a/metadata/md5-cache/sys-devel/bison-3.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-devel/m4-1.4.16 sys-devel/flex examples? ( dev-lang/perl ) nls? ( sys-devel/gettext ) test? ( dev-lang/perl )
-DESCRIPTION=A general-purpose (yacc-compatible) parser generator
-EAPI=6
-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 ~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/m4-1.4.16
-SLOT=0
-SRC_URI=mirror://gnu/bison/bison-3.3.1.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.3-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.3-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=70a5c49d407474a7642c150210d7bd92
diff --git a/metadata/md5-cache/sys-devel/bison-3.4.1 b/metadata/md5-cache/sys-devel/bison-3.4.1
new file mode 100644
index 000000000000..f35c3930b7b3
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/bison-3.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=sys-devel/m4-1.4.16 sys-devel/flex examples? ( dev-lang/perl ) nls? ( sys-devel/gettext ) test? ( dev-lang/perl )
+DESCRIPTION=A general-purpose (yacc-compatible) parser generator
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/bison/
+IUSE=examples nls static test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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/m4-1.4.16
+SLOT=0
+SRC_URI=mirror://gnu/bison/bison-3.4.1.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.4.1-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.4.1-patches-01.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1fa293efcf36960640675fab1456b331
diff --git a/metadata/md5-cache/sys-devel/byfl-1.6 b/metadata/md5-cache/sys-devel/byfl-1.6
index b6b884718a42..281f6534211f 100644
--- a/metadata/md5-cache/sys-devel/byfl-1.6
+++ b/metadata/md5-cache/sys-devel/byfl-1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=sys-devel/clang-5.0.1:5 >=sys-devel/llvm-5.0.1:5 sys-devel/binutils:* dev-lang/perl:= dev-perl/Switch hdf5? ( sci-libs/hdf5[cxx] ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://github.com/lanl/Byfl/releases/download/v1.6-llvm-5.0.1/byfl-1.6-llvm-5.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3a67e8c9a5df06380ef5d262cb1f31fb
diff --git a/metadata/md5-cache/sys-devel/byfl-1.6-r1 b/metadata/md5-cache/sys-devel/byfl-1.6-r1
index afcea837d3d6..bc798fd3ffcd 100644
--- a/metadata/md5-cache/sys-devel/byfl-1.6-r1
+++ b/metadata/md5-cache/sys-devel/byfl-1.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=sys-devel/clang-6.0.0:6 >=sys-devel/llvm-6.0.0:6 sys-devel/binutils:* dev-lang/perl:= dev-perl/Switch hdf5? ( sci-libs/hdf5[cxx] ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://github.com/lanl/Byfl/releases/download/v1.6-llvm-6.0.0/byfl-1.6-llvm-6.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b0d5248bb9d58f9ceb26fb5fc5cb2a14
diff --git a/metadata/md5-cache/sys-devel/byfl-9999 b/metadata/md5-cache/sys-devel/byfl-9999
index 9695e148836b..c83d8838b2ac 100644
--- a/metadata/md5-cache/sys-devel/byfl-9999
+++ b/metadata/md5-cache/sys-devel/byfl-9999
@@ -7,5 +7,5 @@ IUSE=hdf5 static-libs sqlite
 LICENSE=BSD
 RDEPEND=>=sys-devel/clang-6.0.0:6 >=sys-devel/llvm-6.0.0:6 sys-devel/binutils:* dev-lang/perl:= dev-perl/Switch hdf5? ( sci-libs/hdf5[cxx] ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3a67e8c9a5df06380ef5d262cb1f31fb
diff --git a/metadata/md5-cache/sys-devel/clang-4.0.1 b/metadata/md5-cache/sys-devel/clang-4.0.1
deleted file mode 100644
index cdb90b2fab73..000000000000
--- a/metadata/md5-cache/sys-devel/clang-4.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-4.0.1:4=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=C language family frontend for LLVM
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml elibc_musl kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=UoI-NCSA
-PDEPEND=~sys-devel/clang-runtime-4.0.1 default-compiler-rt? ( =sys-libs/compiler-rt-4.0.1* ) default-libcxx? ( >=sys-libs/libcxx-4.0.1 )
-RDEPEND=~sys-devel/llvm-4.0.1:4=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
-REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-SLOT=4
-SRC_URI=https://releases.llvm.org/4.0.1/cfe-4.0.1.src.tar.xz https://releases.llvm.org/4.0.1/clang-tools-extra-4.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-4.0.1.tar.bz2 ) test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7849f02330391c293f9519350f361b34
diff --git a/metadata/md5-cache/sys-devel/clang-5.0.2 b/metadata/md5-cache/sys-devel/clang-5.0.2
index 3e79a2bbaa73..cdb2c316fd10 100644
--- a/metadata/md5-cache/sys-devel/clang-5.0.2
+++ b/metadata/md5-cache/sys-devel/clang-5.0.2
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-5.0.2:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGP
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=5
 SRC_URI=https://releases.llvm.org/5.0.2/cfe-5.0.2.src.tar.xz https://releases.llvm.org/5.0.2/clang-tools-extra-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.2-manpages.tar.bz2 )
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=97429121ebd5bee5a8e099a18dbdd8ea
diff --git a/metadata/md5-cache/sys-devel/clang-6.0.1 b/metadata/md5-cache/sys-devel/clang-6.0.1
index 328b43a1350f..93d493d40e25 100644
--- a/metadata/md5-cache/sys-devel/clang-6.0.1
+++ b/metadata/md5-cache/sys-devel/clang-6.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD
 RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=https://releases.llvm.org/6.0.1/cfe-6.0.1.src.tar.xz https://releases.llvm.org/6.0.1/clang-tools-extra-6.0.1.src.tar.xz test? ( https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.1-manpages.tar.bz2 )
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=fe97579c0af36a5c884a87cec6146c61
diff --git a/metadata/md5-cache/sys-devel/clang-7.1.0 b/metadata/md5-cache/sys-devel/clang-7.1.0
index 9a70b909c850..68b30471c43c 100644
--- a/metadata/md5-cache/sys-devel/clang-7.1.0
+++ b/metadata/md5-cache/sys-devel/clang-7.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD
 RESTRICT=!test? ( test )
 SLOT=7/7.1
 SRC_URI=https://releases.llvm.org/7.1.0/cfe-7.1.0.src.tar.xz https://releases.llvm.org/7.1.0/clang-tools-extra-7.1.0.src.tar.xz test? ( https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-7.1.0-manpages.tar.bz2 )
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=e5c13097184c42954c4e708fc0eae5af
diff --git a/metadata/md5-cache/sys-devel/clang-8.0.0 b/metadata/md5-cache/sys-devel/clang-8.0.0
index d3ff5fc62e77..1554e7a0b6c6 100644
--- a/metadata/md5-cache/sys-devel/clang-8.0.0
+++ b/metadata/md5-cache/sys-devel/clang-8.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://releases.llvm.org/8.0.0/cfe-8.0.0.src.tar.xz https://releases.llvm.org/8.0.0/clang-tools-extra-8.0.0.src.tar.xz test? ( https://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-8.0.0-manpages.tar.bz2 )
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=6272c0f73fe9e18419859fc2ef6b12bb
diff --git a/metadata/md5-cache/sys-devel/clang-8.0.9999 b/metadata/md5-cache/sys-devel/clang-8.0.9999
index d5a86109474f..720db4578ce9 100644
--- a/metadata/md5-cache/sys-devel/clang-8.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-8.0.9999
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-8.0.9999:8=[debug=,llvm_targets_AArch64?,llvm_targets_AM
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore )
 RESTRICT=!test? ( test )
 SLOT=8
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=cc908ccecb07bcfe90b022ea8f0561fc
diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999
index 882a132e6138..1098384b7152 100644
--- a/metadata/md5-cache/sys-devel/clang-9999
+++ b/metadata/md5-cache/sys-devel/clang-9999
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-9999:9=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV )
 RESTRICT=!test? ( test )
 SLOT=9
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=759b63937b533450b48ccb31c5246a69
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-4.0.1 b/metadata/md5-cache/sys-devel/clang-runtime-4.0.1
deleted file mode 100644
index ca0609a9fc49..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-4.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=6
-HOMEPAGE=https://clang.llvm.org/
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-4.0.1:4.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-4.0.1:4.0.1 ) ) libcxx? ( >=sys-libs/libcxx-4.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-4.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=4.0.1
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=500760567965cd129d7435a07bc6fd8b
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-4.0.1-r1 b/metadata/md5-cache/sys-devel/clang-runtime-4.0.1-r1
deleted file mode 100644
index d12dfa86df65..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-4.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=6
-HOMEPAGE=https://clang.llvm.org/
-IUSE=+compiler-rt crt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-4.0.1:4.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-4.0.1:4.0.1 ) ) crt? ( || ( sys-libs/netbsd-csu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-freebsd/freebsd-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) libcxx? ( >=sys-libs/libcxx-4.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-4.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=4.0.1
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=aaeebe87a86422b1cb175d22a2532d55
diff --git a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r4 b/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r4
deleted file mode 100644
index 8c14d411f2ff..000000000000
--- a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm 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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Distribute compilation of C code across several machines on a network
-EAPI=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 ~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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) !net-misc/pump >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://distcc.googlecode.com/files/distcc-3.2rc1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b6457474ae39e36a32d96724ec1e786
diff --git a/metadata/md5-cache/sys-devel/distcc-3.3.2-r5 b/metadata/md5-cache/sys-devel/distcc-3.3.2-r5
index b3cb4e1d31e3..aab608eb62dd 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.3.2-r5
+++ b/metadata/md5-cache/sys-devel/distcc-3.3.2-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Distribute compilation of C code across several machines on a networ
 EAPI=6
 HOMEPAGE=http://distcc.org/
 IUSE=gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) !net-misc/pump dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/distcc/distcc/releases/download/v3.3.2/distcc-3.3.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e9f44438a7f04859095df287143cf844
+_md5_=dec88ac95bdc92a88824a6f47778b076
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
index 8dfa78f76ff7..0e1a8839b8c1 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl
 RESTRICT=strip
 SLOT=3.3.6
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-1.9.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=63f1d1e629319cdadc549e36aa390c53
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r2
index 404b28f9c44c..aec2fbde3c08 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl
 RESTRICT=strip
 SLOT=3.3.6
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-1.10.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7d83ec21f455a6c839d1125993fb2859
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r3 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r3
new file mode 100644
index 000000000000..0ffe1abf1e74
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 ) >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig ) >=media-libs/libart_lgpl-2.1 )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=5
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran boundschecking doc hardened multilib objc awt gcj pgo
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
+PDEPEND=>=sys-devel/gcc-config-1.7
+RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
+RESTRICT=strip
+SLOT=3.3.6
+SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-1.11.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5c1561a4b79055276abdf35669a4bd71
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
index 2e144dc0dec5..9e83d30d4266 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d7dec1766720fc67e21b08bfe6022486
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r3 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r3
new file mode 100644
index 000000000000..e831cf2f51a5
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=sys-devel/binutils-2.14.90.0.8-r1 amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 ) >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=5
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran boundschecking d doc hardened multilib objc awt gcj pgo
+KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~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
+RESTRICT=strip
+SLOT=3.4.6
+SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-1.9.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e5fbefd12263f450441111ea1bee9deb
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4 b/metadata/md5-cache/sys-devel/gcc-4.0.4
index dfd18daceac2..d5486780dcc4 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.0.4
 SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3dd4f8122c4cea5a0e80d9e034d8c6f3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.0.4-r1
index 9ce3966eec92..c5410aa90431 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.0.4
 SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-patches-1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c3eea34eaf5e97666b075f7f5d4fa9d
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.0.4-r2
new file mode 100644
index 000000000000..3f010eda3f75
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=sys-devel/binutils-2.15.94 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= ) >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=5
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap
+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= )
+RESTRICT=strip
+SLOT=4.0.4
+SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-patches-1.5.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1bbc42906ab3aa336b87c98b81b2f622
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index 2e565bc7f841..3473d0fe28f4 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=624ba5f357ebde380fd7dcfcfda8449c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2-r1 b/metadata/md5-cache/sys-devel/gcc-4.1.2-r1
index d1ef3c2c43bc..ac5d319c3395 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 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.7.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.7.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.7.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.7.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.7.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.7.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.7.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=916671e5541ab030f004ac8320f8feec
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2-r2 b/metadata/md5-cache/sys-devel/gcc-4.1.2-r2
new file mode 100644
index 000000000000..c9f1d3ae20d0
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= ) >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=5
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran d doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++
+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= )
+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.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.8.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b5c86282ca4bd992897e77a91edb424d
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 5b056364428a..732947f58c3e 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=40eb7f3a89055031f38431809365bc09
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r2
index 57867582d59a..24031dc7b35c 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 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.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=86a9a0b781cbe40672292b40b1c41c6b
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r3 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r3
new file mode 100644
index 000000000000..938ea58e1108
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= ) >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =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 +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp
+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= )
+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.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.6.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f4a302b614d5f1af5799ca8f24708cd3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
index b4391d70fa41..fd2ef612a364 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.6
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=96b4ef1a01a77ed5ac862323a395109e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r2 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r2
index 8ed7a60aaacb..25a6743bfa49 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.6
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=386a5d97f32f4ca3744145d168f82ac4
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r3 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r3
new file mode 100644
index 000000000000..6c8cf2159344
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =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 +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+KEYWORDS=~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0=
+RESTRICT=strip
+SLOT=4.3.6
+SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-1.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=aa0f2e8255b5f001fbcee4662193ecb0
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7 b/metadata/md5-cache/sys-devel/gcc-4.4.7
index 01ab59576db3..1b2413c9deee 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dceb9c7c83221cc16d1e96976accad5e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7-r1 b/metadata/md5-cache/sys-devel/gcc-4.4.7-r1
index 6849f169256c..68bda2aeef19 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-1.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=07148fad278909746fa9e841f07b4813
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7-r2 b/metadata/md5-cache/sys-devel/gcc-4.4.7-r2
new file mode 100644
index 000000000000..7e6f204e20d6
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =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 +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0=
+RESTRICT=strip
+SLOT=4.4.7
+SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-1.5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=df55d2bdcf1e25d2cc1d9355da13b9e1
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4 b/metadata/md5-cache/sys-devel/gcc-4.5.4
index f887c65321b0..a361c63d6010 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=571cff20a06f6ff7c1aca3aaa417c068
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.5.4-r1
index b05302f12be3..a41856f84d1f 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fc88e173b7ff0d25a0df59528acdda2e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.5.4-r2
new file mode 100644
index 000000000000..5093d93b77f8
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 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= >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =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 +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+RESTRICT=strip
+SLOT=4.5.4
+SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=769b7ef7bd7f15680f46348b3ce98b80
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4 b/metadata/md5-cache/sys-devel/gcc-4.6.4
index a3f48179206b..05d0c0c969e9 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b8362c82ddcd2644cca03e1d286bbaa
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.6.4-r1
index a3e6e5712f6e..bf01cb3b22bc 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c622dd97985404d9ac2f950f95b6b286
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.6.4-r2
new file mode 100644
index 000000000000..001aba7d091e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.18 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 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= >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =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 +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+RESTRICT=strip
+SLOT=4.6.4
+SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=933cb429614a5207e83597549d87c7e4
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
index db35924dabdf..2237e8a5e479 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7c4348c5456f94428a7c422251a1f18
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.7.4-r2
index 82642c356424..c3c9c7accf21 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e6cc3051e8e55fad7a8c580b5272b9cb
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4-r3 b/metadata/md5-cache/sys-devel/gcc-4.7.4-r3
new file mode 100644
index 000000000000..e8703c862b8d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.18 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 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= >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =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 +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point go
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+RESTRICT=strip
+SLOT=4.7.4
+SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.6.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2212b967cdf0ce79e3a78c70636783fb
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5-r1 b/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
index dca1ddd51969..2aba1a0b0e4d 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5208fe90a7af46207bca10b23ea935ac
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5-r2 b/metadata/md5-cache/sys-devel/gcc-4.8.5-r2
index 4f358f1313d1..22ce6b579d8c 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.5-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=07f4bc471b219b224108863bbdc6bf1a
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5-r3 b/metadata/md5-cache/sys-devel/gcc-4.8.5-r3
new file mode 100644
index 000000000000..0b218d672df0
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/cloog-0.18.0:0= >=dev-libs/isl-0.11.1:0= ) >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =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 +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point go graphite +sanitize
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/cloog-0.18.0:0= >=dev-libs/isl-0.11.1:0= )
+RESTRICT=strip
+SLOT=4.8.5
+SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=864c70b56d2c0dd6f54f82d9a5308558
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4 b/metadata/md5-cache/sys-devel/gcc-4.9.4
index 4c0b95d214a6..cc60af48fcc5 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c051e9cf5eb44aa3fdb596e4e1c7c83
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
new file mode 100644
index 000000000000..6e08dc5c24c9
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/cloog-0.18.0:0= >=dev-libs/isl-0.11.1:0= ) >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =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 +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/cloog-0.18.0:0= >=dev-libs/isl-0.11.1:0= )
+RESTRICT=strip
+SLOT=4.9.4
+SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bc9ac4fa5bc7919e21e32d9a4e0b59c1
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
index 7e9789b4b409..d265bcf05835 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.9.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eaa0d13b0e1d57db19fc7011c9befd7b
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r6 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r6
index 69e4451f885b..7b309c584e15 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r6
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r6
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.11.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b18328c29f63fa1914f57adb1a570d2
diff --git a/metadata/md5-cache/sys-devel/gcc-5.5.0 b/metadata/md5-cache/sys-devel/gcc-5.5.0
index aced202bea07..9660b82cf278 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-5.5.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.5.0
 SRC_URI=mirror://gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz mirror://gentoo/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c725c4af43e3c3b4ebc995d53ba094b7
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
index f55bbcd66d0a..57e6652d258c 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8c07f4b3f1057325c5297a300d7a3e3
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r5 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r5
index 94cce33289b8..4549791db264 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r5
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.8.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eab704a174f4f72ee52c10d51288a78f
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0 b/metadata/md5-cache/sys-devel/gcc-6.5.0
index eeaa02e8f2cc..7ca38b501127 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.5.0
 SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=091626a6a80477b48f66be7ecc52ca2f
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
new file mode 100644
index 000000000000..9fba201cdda2
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
@@ -0,0 +1,15 @@
+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-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) >=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-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =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 +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=strip
+SLOT=6.5.0
+SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fd8abb938a8bf0cfd3bfa80923684c3b
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
index 81e3c3aadf8a..74aa58ff31e1 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8a97475e8d048e3adf03495a5d3719d1
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r6 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r6
index 22706d201a90..8ebc9f68dc2f 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r6
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r6
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09e59f6d7fc4cb431ef19b926a610d1f
diff --git a/metadata/md5-cache/sys-devel/gcc-7.4.0 b/metadata/md5-cache/sys-devel/gcc-7.4.0
index b240ec909e29..f8d01e2089c8 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-7.4.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.4.0
 SRC_URI=mirror://gnu/gcc/gcc-7.4.0/gcc-7.4.0.tar.xz mirror://gentoo/gcc-7.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.4.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f3c49e42136a40e7a8ed4c575d7e881b
diff --git a/metadata/md5-cache/sys-devel/gcc-7.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-7.4.0-r1
index b84ea210adc8..d236316851fe 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-7.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.4.0
 SRC_URI=mirror://gnu/gcc/gcc-7.4.0/gcc-7.4.0.tar.xz mirror://gentoo/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.4.0-patches-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f82587a71bfd62de6c781a42ebd45304
diff --git a/metadata/md5-cache/sys-devel/gcc-7.4.0-r2 b/metadata/md5-cache/sys-devel/gcc-7.4.0-r2
new file mode 100644
index 000000000000..a5384ace6cc3
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-7.4.0-r2
@@ -0,0 +1,15 @@
+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-20170815 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:0= ) >=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 )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=5
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
+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:0= )
+RESTRICT=strip
+SLOT=7.4.0
+SRC_URI=mirror://gnu/gcc/gcc-7.4.0/gcc-7.4.0.tar.xz mirror://gentoo/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.4.0-patches-1.3.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=50151b6ee0a38b94d7d5e2dfab2aee82
diff --git a/metadata/md5-cache/sys-devel/gcc-8.2.0-r5 b/metadata/md5-cache/sys-devel/gcc-8.2.0-r5
index 1d2f3a7a8a1c..6fae7e3818bb 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.2.0-r5
+++ b/metadata/md5-cache/sys-devel/gcc-8.2.0-r5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.2.0-patches-1.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c1c1937e58c871d2b137b5598896d6f5
diff --git a/metadata/md5-cache/sys-devel/gcc-8.2.0-r6 b/metadata/md5-cache/sys-devel/gcc-8.2.0-r6
index 5a48cd12f0ba..618112f9f231 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.2.0-r6
+++ b/metadata/md5-cache/sys-devel/gcc-8.2.0-r6
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.2.0-patches-1.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8662040db10cce70d663f811a4177f2c
diff --git a/metadata/md5-cache/sys-devel/gcc-8.3.0 b/metadata/md5-cache/sys-devel/gcc-8.3.0
index b0e52dd0f350..a7d742879592 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-8.3.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b33fa6966647c15c744a2cdbf29b0c2b
diff --git a/metadata/md5-cache/sys-devel/gcc-8.3.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
index ce680d602dc5..17d50cabaa25 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
@@ -4,12 +4,12 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=6
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4be07f1715a786c6bd4d92d69e2fa2bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=72aa6ccf76511aa2475c9e73218a9195
diff --git a/metadata/md5-cache/sys-devel/gcc-9.1.0 b/metadata/md5-cache/sys-devel/gcc-9.1.0
index 36e5bf441ccf..32b047a000e7 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.1.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.1.0
@@ -4,12 +4,12 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=6
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit +pie +ssp +pch systemtap d lto
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=strip
 SLOT=9.1.0
 SRC_URI=mirror://gnu/gcc/gcc-9.1.0/gcc-9.1.0.tar.xz mirror://gentoo/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.1.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5479589cbda7c2b6fa53681bbfefc56c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8e5625d994498b125cfa030274fcdc96
diff --git a/metadata/md5-cache/sys-devel/gcc-9.1.0-r1 b/metadata/md5-cache/sys-devel/gcc-9.1.0-r1
new file mode 100644
index 000000000000..1e4d6236c435
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-9.1.0-r1
@@ -0,0 +1,15 @@
+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-20170815 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:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) systemtap? ( dev-util/systemtap )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=6
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit +pie +ssp +pch systemtap d lto
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=strip
+SLOT=9.1.0
+SRC_URI=mirror://gnu/gcc/gcc-9.1.0/gcc-9.1.0.tar.xz mirror://gentoo/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.1.0-patches-1.1.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=906b707fbad1cd1f08179a66bb2f1a30
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index 9c5ebc94b5e6..6e727ff657bf 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9d045438c8d24fad84c5133405ed383f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index c38b640ace91..1953cac895f5 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4287b0b7f9ce8b6865f6948812501cc8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.2.4 b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
index ba3f4dc49ea9..54beb367f6ac 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b6f206f7701d664aa14a87c3585f0ddd
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.5 b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
index ed0e6a05733c..a975738bb8fc 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.5
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.5-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ec6572a5964dbd4fb0e9b408ab1a4906
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.5 b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
index be7631619c9f..a1329ffb74c8 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.5-patches-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=885ff8764444180b5b9468b039d1d6c7
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.6 b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
index 05588d6caef5..cb7f63ab6357 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.6-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7c248eb43f85d6e92aa0d3da6bb4643e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.3 b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
index f00ebdd63f24..4b1e5c12466e 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5.3
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.3-patches-1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bc38515ddf23da9bea281583fd294e01
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.4 b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
index e652f55898f0..09245cb97cf2 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=66fb8a6b7789b020c7ec831ff6734136
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.4 b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
index 308711e4632b..51516623bb10 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72222fd69b078160875299e54f945848
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.3 b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
index a652118137cf..a20ded2d951b 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7.3
 SRC_URI=mirror://gnu/gcc/gcc-4.7.3/gcc-4.7.3.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5f7f7adb1120b7069c7bff6460186eb
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.4 b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
index 88b72bb99661..482d61b631bf 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f12ff1dddfea91247a92f36600960ad6
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.3 b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
index cff8263b3a13..3a203b58dd85 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.8.3
 SRC_URI=mirror://gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2 mirror://gentoo/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.3-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8471dd65776a9de1df31e6ac5983dbd4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.5 b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
index 52a30456cf19..dad167011fa5 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5be437344c8ffaae90c70c4fdd9ddc60
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.4 b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
index c751bfc755ed..ec5c2fc00c66 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-5.4.0 b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
index 950af7876e83..bd528a18c4c0 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-5.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.3.0 b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
index 67f3d7603ceb..35080620e990 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dd30e381df3740b88e76ffa3e5a8933e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.4.0 b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
index 227ec040bc5f..338a2ae765d0 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.2.0 b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
index 051f1d747549..8b5fc88b5cbd 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=7.2.0
 SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.1.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cebaf5a44a3f27a06d34b25f117ec3f4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.3.0 b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
index 5bd9c1d1c8fc..603b3394c2e1 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7c76e15073553d95a38e1d2cec3e32c4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.2.0 b/metadata/md5-cache/sys-devel/kgcc64-8.2.0
index 3c12d019abc6..65f674e51ca3 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.1.0-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7692942c28ca16a1a019705350e29088
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.3.0 b/metadata/md5-cache/sys-devel/kgcc64-8.3.0
index 82e0cc4305a0..5f74166d63bd 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a28bcbc31daad05b16e2f245e041ffc2	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c6fdbf38da4f1451acc991115e7f8182	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0f704b4b8a76dd9b87f6d0c865e8880
diff --git a/metadata/md5-cache/sys-devel/lld-6.0.1 b/metadata/md5-cache/sys-devel/lld-6.0.1
index 92d8a0bf058b..7afa3d4235c2 100644
--- a/metadata/md5-cache/sys-devel/lld-6.0.1
+++ b/metadata/md5-cache/sys-devel/lld-6.0.1
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-6.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.1/lld-6.0.1.src.tar.xz test? ( https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz )
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=8e1ed99544d146be7788ebbc98c51805
diff --git a/metadata/md5-cache/sys-devel/lld-7.1.0 b/metadata/md5-cache/sys-devel/lld-7.1.0
index 9da6f3d8d305..3fac82079c6d 100644
--- a/metadata/md5-cache/sys-devel/lld-7.1.0
+++ b/metadata/md5-cache/sys-devel/lld-7.1.0
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-7.1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.1.0/lld-7.1.0.src.tar.xz test? ( https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz )
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=98b59565a5460316304e1238f8f8ea2a
diff --git a/metadata/md5-cache/sys-devel/lld-8.0.0 b/metadata/md5-cache/sys-devel/lld-8.0.0
index c0ce85bbff84..1b01bbe5c6a5 100644
--- a/metadata/md5-cache/sys-devel/lld-8.0.0
+++ b/metadata/md5-cache/sys-devel/lld-8.0.0
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-8.0.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/8.0.0/lld-8.0.0.src.tar.xz test? ( https://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz )
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=98c71e4b83a9090d9217bad44b08c15e
diff --git a/metadata/md5-cache/sys-devel/lld-8.0.9999 b/metadata/md5-cache/sys-devel/lld-8.0.9999
index 5a180108efca..31d12bbd5991 100644
--- a/metadata/md5-cache/sys-devel/lld-8.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-8.0.9999
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-8.0.9999
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b69885e1f3b82482750b9861074a2dd3
diff --git a/metadata/md5-cache/sys-devel/lld-9999 b/metadata/md5-cache/sys-devel/lld-9999
index a80228408487..67f6908ae295 100644
--- a/metadata/md5-cache/sys-devel/lld-9999
+++ b/metadata/md5-cache/sys-devel/lld-9999
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-9999
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=7703ffa6dd783b18dda65ae4aeaa5924
diff --git a/metadata/md5-cache/sys-devel/llvm-4.0.1-r1 b/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
deleted file mode 100644
index 2f82b8883dd3..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/zlib:0= gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-4.0.1.9999 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=Low Level Virtual Machine
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=debug doc gold libedit +libffi ncurses test elibc_musl kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
-PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-4 )
-RDEPEND=sys-libs/zlib:0= gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-SLOT=4
-SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-4.0.1.tar.bz2 )
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=38786e317ca0688c1c7c0de92307368c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-4.0.1 b/metadata/md5-cache/sys-devel/llvm-common-4.0.1
deleted file mode 100644
index ac0cbed7c1f4..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-4.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=6
-HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz
-_md5_=1b9b341e557f76bbd8fb39b7d9808352
diff --git a/metadata/md5-cache/sys-devel/llvmgold-4 b/metadata/md5-cache/sys-devel/llvmgold-4
deleted file mode 100644
index efe2d45e8c20..000000000000
--- a/metadata/md5-cache/sys-devel/llvmgold-4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=LLVMgold plugin symlink for autoloading
-EAPI=6
-HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=public-domain
-RDEPEND=sys-devel/llvm:4[gold] !sys-devel/llvm:0
-SLOT=0
-_md5_=237b22eecbf8fd833fa1f12eff890c04
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index e2281fc553a2..2b5bb0b0c7a6 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/firmware-imx-5.4 b/metadata/md5-cache/sys-firmware/firmware-imx-5.4
index b19520f85aa8..ed7531302d90 100644
--- a/metadata/md5-cache/sys-firmware/firmware-imx-5.4
+++ b/metadata/md5-cache/sys-firmware/firmware-imx-5.4
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install prepare unpack
 DESCRIPTION=NXP i.MX firmware
 EAPI=6
-HOMEPAGE=http://www.timesys.com/
+HOMEPAGE=https://www.timesys.com/
 KEYWORDS=~arm
 LICENSE=LA_OPT_BASE_LICENSE
 SLOT=0
 SRC_URI=http://repository.timesys.com/buildsources/f/firmware-imx/firmware-imx-5.4/firmware-imx-5.4.bin
-_md5_=26616ded8cfda282eb1a3cb2b8065d76
+_md5_=ea78b808a46fb1c966f75649ecb76e9a
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20180807a_p20190512 b/metadata/md5-cache/sys-firmware/intel-microcode-20180807a_p20190512
deleted file mode 100644
index a35e806b1d2c..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20180807a_p20190512
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DEPEND=sys-apps/iucode_tool
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=6
-HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=28087
-IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks bindist mirror strip
-SLOT=0
-SRC_URI=https://downloadmirror.intel.com/28087/eng/microcode-20180807a.tgz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20190512.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=af9726424630101ef63e08cacc598713
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20190514_p20190512 b/metadata/md5-cache/sys-firmware/intel-microcode-20190514_p20190512
deleted file mode 100644
index 30e8611e42e1..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20190514_p20190512
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DEPEND=sys-apps/iucode_tool
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=6
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks bindist mirror strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20190514.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20190512.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c0177ee4ed4324001311edc0f8cd7300
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20190514_p20190525 b/metadata/md5-cache/sys-firmware/intel-microcode-20190514_p20190525
new file mode 100644
index 000000000000..b9a5c79c55b3
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20190514_p20190525
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
+DEPEND=sys-apps/iucode_tool
+DESCRIPTION=Intel IA32/IA64 microcode update data
+EAPI=6
+HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
+IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=intel-ucode
+RDEPEND=hostonly? ( sys-apps/iucode_tool )
+REQUIRED_USE=|| ( initramfs split-ucode )
+RESTRICT=binchecks bindist mirror strip
+SLOT=0
+SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20190514.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20190525.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c0177ee4ed4324001311edc0f8cd7300
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130925 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130925
index 91e84a4d6222..5941f0af1001 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130925
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20130925
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://git.ipxe.org/ipxe.git/snapshot/cba22d36b77da53890bd65fdadd0e63925687af0.tar.bz2 -> ipxe-1.0.0_p20130925-cba22d3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=61f16e8018169fcda5612e2428dddf6a
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620
index 700b7b086b53..341880757230 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620
@@ -8,5 +8,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://git.ipxe.org/ipxe.git/snapshot/694c18addc0dfdf51369f6d598dd0c8ca4bf2861.tar.bz2 -> ipxe-1.0.0_p20160620-694c18a.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f062dc79cce1e58b040b98498992f45f
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
index 914a138c197e..ed9cbfccde18 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/546dd51de8459d4d09958891f426fa2c73ff090d.tar.bz2 -> ipxe-1.0.0_p20180211-546dd51.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20180211-546dd51-bin.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c83860e1337dc159ca5df79d3bc78fc2
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 2fa66ac923ec..38a26e16dd6f 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/aufs-util-4.14_p20180709 b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20180709
index 1298afaa7815..21494aea164c 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-4.14_p20180709
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20180709
@@ -10,4 +10,4 @@ RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.14_p20180709.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=7d767f3238f572e0207eb750d72bce59
+_md5_=708b65e98b79dcc71519c47eb51cecd5
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.1-r1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.1-r1
index b5dbc7aa75c7..5121ddf88829 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.1-r1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.1-r1
@@ -1,10 +1,10 @@
-BDEPEND=>=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto
+BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
 HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert python reiserfs static static-libs +zstd python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+convert doc python reiserfs static static-libs +zstd python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) zstd? ( app-arch/zstd:0= )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.1.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=fd96b5be996580aa5a70368d72d26af6
+_md5_=a0815aab962222e642aa45e93f7c7f44
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index 8c574612ca8f..d69bd4354032 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -1,14 +1,14 @@
-BDEPEND=>=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup unpack
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) ) sys-devel/gnuconfig
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
 HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert python reiserfs static static-libs +zstd python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+convert doc python reiserfs static static-libs +zstd python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) zstd? ( app-arch/zstd:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 RESTRICT=test
 SLOT=0/0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=7c717c74533e0f8902c19e2d8cda78c8
+_md5_=da2dc41db1bdaa4d44405c7e57da950e
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.9.9 b/metadata/md5-cache/sys-fs/cryfs-0.9.9
index f09d09f1001b..d2b94e7cbcea 100644
--- a/metadata/md5-cache/sys-fs/cryfs-0.9.9
+++ b/metadata/md5-cache/sys-fs/cryfs-0.9.9
@@ -4,10 +4,10 @@ DESCRIPTION=Encrypted FUSE filesystem that conceals metadata
 EAPI=6
 HOMEPAGE=https://www.cryfs.org/
 IUSE=custom-optimization libressl test update-check
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-3 BSD-2 MIT
 RDEPEND=>=dev-libs/boost-1.56:= >=dev-libs/crypto++-5.6.3:= net-misc/curl:= >=sys-fs/fuse-2.8.6:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 SLOT=0
 SRC_URI=https://github.com/cryfs/cryfs/releases/download/0.9.9/cryfs-0.9.9.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=21007626a8e0b683683244a311df3e67
+_md5_=925e711a1bd4e8609aed786081cf22fb
diff --git a/metadata/md5-cache/sys-fs/dmg2img-1.6.7-r1 b/metadata/md5-cache/sys-fs/dmg2img-1.6.7-r1
index 19c4bc1cce27..a1b6b217a545 100644
--- a/metadata/md5-cache/sys-fs/dmg2img-1.6.7-r1
+++ b/metadata/md5-cache/sys-fs/dmg2img-1.6.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Converts Apple DMG files to standard HFS+ images
 EAPI=6
 HOMEPAGE=http://vu1tur.eu.org/tools
 IUSE=libressl
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=http://vu1tur.eu.org/tools/dmg2img-1.6.7.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=8bd9a216c558bc4187323cb7b829f11c
+_md5_=82061e9c14531e55cab8150814c20e64
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.0-r1 b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.0-r1
deleted file mode 100644
index 145dfe295c18..000000000000
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=~sys-libs/e2fsprogs-libs-1.45.0 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
-EAPI=6
-HOMEPAGE=http://e2fsprogs.sourceforge.net/
-IUSE=fuse nls static-libs elibc_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
-LICENSE=GPL-2 BSD
-RDEPEND=~sys-libs/e2fsprogs-libs-1.45.0 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.45.0.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.0/e2fsprogs-1.45.0.tar.xz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=097e909bbaaeb4b9287fcd8c3211f8cb
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.2 b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.2
new file mode 100644
index 000000000000..2323b83a640b
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.2
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=~sys-libs/e2fsprogs-libs-1.45.2 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
+DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
+EAPI=7
+HOMEPAGE=http://e2fsprogs.sourceforge.net/
+IUSE=cron fuse nls static-libs elibc_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
+LICENSE=GPL-2 BSD
+RDEPEND=~sys-libs/e2fsprogs-libs-1.45.2 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.45.2.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.2/e2fsprogs-1.45.2.tar.xz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=1d7db9d8060b2c1d1455e4764c9990db
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.9 b/metadata/md5-cache/sys-fs/fuse-2.9.9
index 652857bc6f94..486693b672e0 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.9
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.9
@@ -12,4 +12,4 @@ RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=7a3461276dab9805d007385d020c691b
+_md5_=031a9d26a5ba1fd3019d70565d9728d3
diff --git a/metadata/md5-cache/sys-fs/fuse-3.4.1 b/metadata/md5-cache/sys-fs/fuse-3.4.1
index 0712c5505f9c..d2687018d031 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.4.1
+++ b/metadata/md5-cache/sys-fs/fuse-3.4.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.4.1/fuse-3.4.1.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=fdd9320ab095b3a4d619d36fe43dd984
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=c66966e7a7b2edb7d46ce8b0fbe9e4a8
diff --git a/metadata/md5-cache/sys-fs/fuse-3.4.2 b/metadata/md5-cache/sys-fs/fuse-3.4.2
index 11b23fcb3ef5..7abb124a099a 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.4.2
+++ b/metadata/md5-cache/sys-fs/fuse-3.4.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.4.2/fuse-3.4.2.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=9ad314df185a1754600d37b59ffd096a
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=e53eb853f382f4e4e941bc79488ce797
diff --git a/metadata/md5-cache/sys-fs/fuse-3.5.0 b/metadata/md5-cache/sys-fs/fuse-3.5.0
index 0210f80e95f0..3a2f14da516e 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.5.0
+++ b/metadata/md5-cache/sys-fs/fuse-3.5.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.5.0/fuse-3.5.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=9ad314df185a1754600d37b59ffd096a
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=e53eb853f382f4e4e941bc79488ce797
diff --git a/metadata/md5-cache/sys-fs/fuse-common-3.2.6 b/metadata/md5-cache/sys-fs/fuse-common-3.2.6
index c8fa6a8b1ddf..f7a1358db532 100644
--- a/metadata/md5-cache/sys-fs/fuse-common-3.2.6
+++ b/metadata/md5-cache/sys-fs/fuse-common-3.2.6
@@ -9,5 +9,5 @@ RDEPEND=!<sys-fs/fuse-2.9.7-r1:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.6/fuse-3.2.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ebd559c3cc72f46e699cf47a1dfeb0aa
diff --git a/metadata/md5-cache/sys-fs/udev-236-r1 b/metadata/md5-cache/sys-fs/udev-236-r1
index 1fc136e32505..e5ef7de193c6 100644
--- a/metadata/md5-cache/sys-fs/udev-236-r1
+++ b/metadata/md5-cache/sys-fs/udev-236-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6eea47095a9ad21cbe4bb47772b56341
diff --git a/metadata/md5-cache/sys-fs/udev-238 b/metadata/md5-cache/sys-fs/udev-238
index f0cc793f4a37..493e7365f5b3 100644
--- a/metadata/md5-cache/sys-fs/udev-238
+++ b/metadata/md5-cache/sys-fs/udev-238
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v238.tar.gz -> systemd-238.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=201c5d4a368afcb2f2077f0e27f64436
diff --git a/metadata/md5-cache/sys-fs/udev-239 b/metadata/md5-cache/sys-fs/udev-239
index cfe36b58e60a..d98194e3df29 100644
--- a/metadata/md5-cache/sys-fs/udev-239
+++ b/metadata/md5-cache/sys-fs/udev-239
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v239.tar.gz -> systemd-239.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=39c678835d41c8dc36f9d5284cc73f01
diff --git a/metadata/md5-cache/sys-fs/udev-240-r2 b/metadata/md5-cache/sys-fs/udev-240-r2
index 37908ab75ec0..a00273b88a5b 100644
--- a/metadata/md5-cache/sys-fs/udev-240-r2
+++ b/metadata/md5-cache/sys-fs/udev-240-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v240.tar.gz -> systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=e5731b746f2a3b1b47cddbcecb7bd3f2
diff --git a/metadata/md5-cache/sys-fs/udev-240-r3 b/metadata/md5-cache/sys-fs/udev-240-r3
index ca06f316ad4e..f8ddcadcbac3 100644
--- a/metadata/md5-cache/sys-fs/udev-240-r3
+++ b/metadata/md5-cache/sys-fs/udev-240-r3
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v240.tar.gz -> systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=2f52045509fd6779fe7919e381c091d0
diff --git a/metadata/md5-cache/sys-fs/udev-241 b/metadata/md5-cache/sys-fs/udev-241
index 5d48866ab846..586a4b2501c7 100644
--- a/metadata/md5-cache/sys-fs/udev-241
+++ b/metadata/md5-cache/sys-fs/udev-241
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v241/systemd-241.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=410f6d5a3c70bf164b4853a929029a2c
diff --git a/metadata/md5-cache/sys-fs/udev-241_rc1 b/metadata/md5-cache/sys-fs/udev-241_rc1
index b994f9e39d07..bba7a5fe2186 100644
--- a/metadata/md5-cache/sys-fs/udev-241_rc1
+++ b/metadata/md5-cache/sys-fs/udev-241_rc1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v241-rc1/systemd-241-rc1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=169b46a589ce099f9feb900c2f711dab
diff --git a/metadata/md5-cache/sys-fs/udev-241_rc2 b/metadata/md5-cache/sys-fs/udev-241_rc2
index cda9dae80ce1..51ee62b96b93 100644
--- a/metadata/md5-cache/sys-fs/udev-241_rc2
+++ b/metadata/md5-cache/sys-fs/udev-241_rc2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v241-rc2/systemd-241-rc2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=169b46a589ce099f9feb900c2f711dab
diff --git a/metadata/md5-cache/sys-fs/udev-242 b/metadata/md5-cache/sys-fs/udev-242
index c6ee08f9fa19..e591f53bed40 100644
--- a/metadata/md5-cache/sys-fs/udev-242
+++ b/metadata/md5-cache/sys-fs/udev-242
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v242/systemd-242.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=410f6d5a3c70bf164b4853a929029a2c
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 9a31fca1ec4e..7bf422fe7a58 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -9,5 +9,5 @@ PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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 !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=169b46a589ce099f9feb900c2f711dab
diff --git a/metadata/md5-cache/sys-fs/udisks-2.8.1 b/metadata/md5-cache/sys-fs/udisks-2.8.1
index 70375296b681..b7d04bfc9801 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.8.1
+++ b/metadata/md5-cache/sys-fs/udisks-2.8.1
@@ -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 debug elogind +introspection lvm nls selinux systemd vdo kernel_linux
-KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.19[cryptsetup,lvm?,vdo?] >=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.30 >=sys-block/parted-3 virtual/eject selinux? ( sec-policy/selinux-devicekit )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.8.1/udisks-2.8.1.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fe581a444d10f756de57439609954d0e
+_md5_=bd5144c5422501f9932bb49504e7b645
diff --git a/metadata/md5-cache/sys-fs/vhba-20190410 b/metadata/md5-cache/sys-fs/vhba-20190410
index 565b6c1945fb..f3db7094eeb0 100644
--- a/metadata/md5-cache/sys-fs/vhba-20190410
+++ b/metadata/md5-cache/sys-fs/vhba-20190410
@@ -4,10 +4,10 @@ DESCRIPTION=Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
 EAPI=6
 HOMEPAGE=http://cdemu.org
 IUSE=kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/vhba-module-20190410.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8eeca5b3cb58cf73cc80720fd3be2412
+_md5_=93aac8f26e1c7274a466d5dc438dffa3
diff --git a/metadata/md5-cache/sys-fs/xwmfs-0.82-r1 b/metadata/md5-cache/sys-fs/xwmfs-0.82-r1
deleted file mode 100644
index b83b41aa61c4..000000000000
--- a/metadata/md5-cache/sys-fs/xwmfs-0.82-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=test
-DEPEND=sys-fs/fuse:0= >=x11-libs/libX11-1.6.5
-DESCRIPTION=FUSE-based X11 Window-Manager file system
-EAPI=7
-HOMEPAGE=https://github.com/gerstner-hub/xwmfs
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/fuse:0= >=x11-libs/libX11-1.6.5
-SLOT=0
-SRC_URI=https://github.com/gerstner-hub/xwmfs/releases/download/v0.82/xwmfs-0.82-dist.tar.gz -> xwmfs-0.82.tar.gz
-_md5_=861bdb2503f453bd7989f27da27b99c4
diff --git a/metadata/md5-cache/sys-fs/xwmfs-0.83 b/metadata/md5-cache/sys-fs/xwmfs-0.83
new file mode 100644
index 000000000000..d0f8637789fd
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/xwmfs-0.83
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=test
+DEPEND=sys-fs/fuse:0= >=x11-libs/libX11-1.6.5
+DESCRIPTION=FUSE-based X11 Window-Manager file system
+EAPI=7
+HOMEPAGE=https://github.com/gerstner-hub/xwmfs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/fuse:0= >=x11-libs/libX11-1.6.5
+SLOT=0
+SRC_URI=https://github.com/gerstner-hub/xwmfs/releases/download/v0.83/xwmfs-0.83-dist.tar.gz -> xwmfs-0.83.tar.gz
+_md5_=5a1472622d5b818ffa223e0282f0909a
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.0 b/metadata/md5-cache/sys-fs/zfs-0.8.0
new file mode 100644
index 000000000000..0ae00a49de21
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-0.8.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk python? ( virtual/python-cffi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=7
+HOMEPAGE=https://zfsonlinux.org/
+IUSE=custom-cflags debug kernel-builtin python +rootfs test-suite static-libs kernel_linux kernel_linux kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=BSD-2 CDDL MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk python? ( virtual/python-cffi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !=sys-apps/grep-2.13* !kernel-builtin? ( ~sys-fs/zfs-kmod-0.8.0 ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0/zfs-0.8.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=48e3912cbf82971eeef964bfbe2969b0
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.0_rc5-r1 b/metadata/md5-cache/sys-fs/zfs-0.8.0_rc5-r1
deleted file mode 100644
index 5928dc523fe3..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-0.8.0_rc5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk python? ( virtual/python-cffi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://zfsonlinux.org/
-IUSE=custom-cflags debug kernel-builtin python +rootfs test-suite static-libs kernel_linux kernel_linux kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk python? ( virtual/python-cffi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !=sys-apps/grep-2.13* !kernel-builtin? ( ~sys-fs/zfs-kmod-0.8.0_rc5 ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0-rc5/zfs-0.8.0-rc5.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=f9283d8b63c0b516284d59cbd3df4b98
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 9b3210c9cb73..237874b4b150 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=90c0a73ee1b46cd07f6b24cc68498ba5
+_md5_=48e3912cbf82971eeef964bfbe2969b0
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.0-r1 b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.0-r1
new file mode 100644
index 000000000000..ab0728da250f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/awk
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
+EAPI=7
+HOMEPAGE=https://zfsonlinux.org/
+IUSE=custom-cflags debug +rootfs kernel_linux kernel_linux kernel_linux
+KEYWORDS=~amd64
+LICENSE=CDDL debug? ( GPL-2+ )
+RDEPEND=!sys-fs/zfs-fuse !sys-kernel/spl kernel_linux? ( virtual/modutils )
+RESTRICT=debug? ( strip ) test
+SLOT=0
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0/zfs-0.8.0.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=0ad87c0646f619bc49c44edbbddf5a47
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.0_rc5 b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.0_rc5
deleted file mode 100644
index 1ff0727fedfc..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.0_rc5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/awk
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
-EAPI=7
-HOMEPAGE=https://zfsonlinux.org/
-IUSE=custom-cflags debug +rootfs kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64
-LICENSE=CDDL debug? ( GPL-2+ )
-RDEPEND=!sys-fs/zfs-fuse !sys-kernel/spl kernel_linux? ( virtual/modutils )
-RESTRICT=debug? ( strip ) test
-SLOT=0
-SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0-rc5/zfs-0.8.0-rc5.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=d271fde8ee817f6ff8dae0ad35dfee1b
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index e3398b57b4d2..f7872aa24212 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.83 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.83
index 4b19ced7e469..8456fb2971c5 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.83
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.83
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.83
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-90.base.tar.xz mirror://gentoo/genpatches-4.14-90.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-90.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9c44718e75455213267059abf144146b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.92 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.92
index f426351d059e..050e4e8bfafb 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.92
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.92
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.92
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-99.base.tar.xz mirror://gentoo/genpatches-4.14-99.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-99.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bc504fc61f7531bb4a3932b463af8429
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.93 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.93
index b0c51bf02a03..447572b7b60c 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.93
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.93
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.93
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-100.base.tar.xz mirror://gentoo/genpatches-4.14-100.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-100.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fb075f2b1f4fd5cbcf84ac7413d8931a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.95 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.95
index 9009c2bf974c..8e0d65692639 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.95
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.95
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.95
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-102.base.tar.xz mirror://gentoo/genpatches-4.14-102.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-102.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b32f449db7281ec535d066cedd66aa5
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.96 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.96
index 2575036f844c..3f2691a31d0a 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.96
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.96
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.96
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-103.base.tar.xz mirror://gentoo/genpatches-4.14-103.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-103.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ac349ef3b914acc939863d811ca78c54
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.97 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.97
index d0b582fdbf9c..756e5f90d06c 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.97
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.97
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.97
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-104.base.tar.xz mirror://gentoo/genpatches-4.14-104.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-104.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aee645fe0382c2fbb0e3c929640e4a9a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.14 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.14
index e389a94cad6f..dc0d984e79c5 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.14
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.14
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.14
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-15.base.tar.xz mirror://gentoo/genpatches-4.19-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-15.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a125f736494b2837fdf3667604d50c3
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.15 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.15
index 966168f8b0b1..fc9529e9660b 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.15
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.15
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.15
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-16.base.tar.xz mirror://gentoo/genpatches-4.19-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-16.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0d15dffdbfb0b54c854eef29cf48c93b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.16 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.16
index 2729631a53bb..b413a566ab57 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.16
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.16
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.16
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-17.base.tar.xz mirror://gentoo/genpatches-4.19-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-17.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c88252036226be70a64de35e70e25a35
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.17 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.17
index 0df5cb23af50..71eb838e8a60 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.17
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.17
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.17
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-18.base.tar.xz mirror://gentoo/genpatches-4.19-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-18.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ce243ca692cfbab8ffe4cdf3fe5fb835
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.18 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.18
index 9ecae2595557..8741612a1ea9 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.18
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.18
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.18
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-19.base.tar.xz mirror://gentoo/genpatches-4.19-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-19.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0ceeaa430f5bc5bf8947e21bb3b7e9a7
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.19 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.19
index 68503a6513d4..d5a64883f685 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.19
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.19
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.19
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-20.base.tar.xz mirror://gentoo/genpatches-4.19-20.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-20.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c55486899eb7b0d11c360fe1ae561fe
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.0 b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.0
index 6b7b291f8ebe..dded172ff851 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.0
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.0
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.20.0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.20_p20190204.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.20-1.base.tar.xz mirror://gentoo/genpatches-4.20-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.20-1.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68cc1bcd54278fe278e738010469f930
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.1
index 0abb128bb8b6..d06babd088bc 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.20.1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.20_p20190204.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.20-2.base.tar.xz mirror://gentoo/genpatches-4.20-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.20-2.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d2d1385962fb7e13b439b65da0ec543
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.2 b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.2
index 1f77a9f2b051..5cf0edbf269b 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.2
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.20.2
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.20_p20190204.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.20-3.base.tar.xz mirror://gentoo/genpatches-4.20-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.20-3.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d3ee9d46612e571b53a7316a0cc462de
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.3 b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.3
index cff3c2f95d83..9f291f954082 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.3
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.3
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.20.3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.20_p20190204.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.20-4.base.tar.xz mirror://gentoo/genpatches-4.20-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.20-4.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ae34853c0f8a008b75ee94193b0cde21
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.4 b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.4
index cb9a4169cdc4..8dc93ad92877 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.4
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.20.4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.20_p20190204.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.20-5.base.tar.xz mirror://gentoo/genpatches-4.20-5.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.20-5.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e91c1a6592375cb2d5b241fbb6533b16
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.5 b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.5
index 223917c31cef..50096992d2e8 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.5
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.20.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.20_p20190204.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.20-6.base.tar.xz mirror://gentoo/genpatches-4.20-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.20-6.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a3fd9783397400fbcf29ff250517dbd1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.6 b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.6
index befda7ef4602..43399bc0e52a 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.6
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.6
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.20.6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.20_p20190204.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.20-7.base.tar.xz mirror://gentoo/genpatches-4.20-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.20-7.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2769071b39e95e114aa717ad5475fc29
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.7 b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.7
index 0cb94ed17117..531d5cef8c8d 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.20.7
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.20.7
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.20.7
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.20_p20190204.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.20-8.base.tar.xz mirror://gentoo/genpatches-4.20-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.20-8.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f58fe3b6f432b679dd69e8c7791dbf92
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.63 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.63
index e9b50ad41759..0842e12c0d1b 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.63
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.63
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.63
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-69.base.tar.xz mirror://gentoo/genpatches-4.14-69.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-69.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=88edc7fd66a293652319552872e228e2
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.66 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.66
index 22fa9b03bb13..9f4a1880eb4a 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.66
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.66
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.66
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-72.base.tar.xz mirror://gentoo/genpatches-4.14-72.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-72.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=5f8b5ea95724c5da6f209548a3032509
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.67 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.67
index b8f135995d81..c1f6da3fdafd 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.67
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.67
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.67
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-73.base.tar.xz mirror://gentoo/genpatches-4.14-73.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-73.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=09a69adeca57626f23d18a45250b26ff
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.69 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.69
index a13529f06d2d..da3eaeae3bb8 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.69
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.69
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.69
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-75.base.tar.xz mirror://gentoo/genpatches-4.14-75.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-75.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=fd0db79c5a74eefa245caa7dca40fd91
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.71 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.71
index efc8e24e5b76..12f143cfd919 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.71
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.71
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.71
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-77.base.tar.xz mirror://gentoo/genpatches-4.14-77.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-77.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=98b37cc3952e24ff0f765f22fd9aec46
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.73 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.73
index 3167f4e42fd5..b0641101d45d 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.73
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.73
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.73
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-79.base.tar.xz mirror://gentoo/genpatches-4.14-79.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-79.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=085ff130ba0a97322b5fa5a7fc9b9eb0
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.75 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.75
index 502fe06da034..649ee69da080 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.75
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.75
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.75
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-81.base.tar.xz mirror://gentoo/genpatches-4.14-81.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-81.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=4aaa7d1e5433c87fe7c8ed0e23972e4b
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.78 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.78
index 3dc10590866d..3dc6b2295b7b 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.78
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.78
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.78
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-85.base.tar.xz mirror://gentoo/genpatches-4.14-85.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-85.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=ffd76a558c1c04b1c5cf6fa596d6aa78
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.81 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.81
index 580347fc4c65..70d178ea4038 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.81
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.81
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.81
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-88.base.tar.xz mirror://gentoo/genpatches-4.14-88.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-88.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=47b079e6b9fe245a4e85be39702611d0
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.11 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.11
index b98110bf2833..c3d96d6631ec 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.11
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.11
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.11
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-14.base.tar.xz mirror://gentoo/genpatches-4.18-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-14.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=19e59bbb661dacc6a839e7100cafa92d
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.13 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.13
index ee79a8d288f8..3c1c03093d88 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.13
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.13
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.13
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-16.base.tar.xz mirror://gentoo/genpatches-4.18-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-16.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=946e2d0c28bb9b6e5c26aec001a7ceb8
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.16 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.16
index b0bcbb961469..384fd716ed3f 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.16
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.16
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.16
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-19.base.tar.xz mirror://gentoo/genpatches-4.18-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-19.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=bded78c0fb5630e7d20dc7533170065f
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.19 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.19
index cd37ebddc0d3..cc8472c65b6e 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.19
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.19
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.19
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-23.base.tar.xz mirror://gentoo/genpatches-4.18-23.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-23.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=31300c723d63a5310f338eb721d0df44
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.5 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.5
index 4801a89fc124..6a6d4a33438e 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.5
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-8.base.tar.xz mirror://gentoo/genpatches-4.18-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-8.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=1146cc2d704051fb09b40413daff2a63
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.7 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.7
index 2478b88ace4e..aa58154ce7b0 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.7
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.7
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-10.base.tar.xz mirror://gentoo/genpatches-4.18-10.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-10.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=be230d062a9a2177e56b84e7a1c1a671
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.9 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.9
index 9e7c0cad2f0b..d0be980d052e 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.9
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-12.base.tar.xz mirror://gentoo/genpatches-4.18-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-12.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2b8df6b48346ec27fb6a94c256d9e8e0
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.19.2 b/metadata/md5-cache/sys-kernel/ck-sources-4.19.2
index aff170436e4a..0b08c872c188 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.19.2
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.19.2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.2
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) mirror://gentoo/genpatches-4.19-3.base.tar.xz mirror://gentoo/genpatches-4.19-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-3.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.19/0001-MultiQueue-Skiplist-Scheduler-version-v0.180.patch -> ck-sources-4.19-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=acab435a08ab2ff759f832856c5cf3e7
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.120 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.120
index f4b8964770be..fed18119b678 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.120
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.120
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.120
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-124.base.tar.xz mirror://gentoo/genpatches-4.9-124.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-124.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=720f70fbaa2e445dc077c743e7668847
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.123 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.123
index 98fa0559b69c..d39d2dc802f9 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.123
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.123
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.123
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-127.base.tar.xz mirror://gentoo/genpatches-4.9-127.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-127.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=d964548267e4142a87f1551f3ae679f8
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.124 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.124
index 08eeef4770bb..a04a3b4a175f 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.124
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.124
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.124
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-128.base.tar.xz mirror://gentoo/genpatches-4.9-128.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-128.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=583c54a6edf2d8f84940f24e0c899152
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.126 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.126
index 9eff3594dffb..fea04b77a327 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.126
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.126
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.126
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-130.base.tar.xz mirror://gentoo/genpatches-4.9-130.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-130.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=98e0ce1fb63f410cfdd5a2051c8fbe0c
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.128 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.128
index 242c6f50a3ce..ceb84fb1c277 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.128
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.128
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.128
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-132.base.tar.xz mirror://gentoo/genpatches-4.9-132.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-132.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=f8e1950cc82180923344b353d4b9cb26
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.130 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.130
index 4b12533aef73..fc573c908442 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.130
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.130
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.130
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-134.base.tar.xz mirror://gentoo/genpatches-4.9-134.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-134.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=035fedf0fc1d114fd67ed46b5de4aec7
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.132 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.132
index 8bc31c2c15c5..9f5b19cd4b01 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.132
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.132
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.132
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-136.base.tar.xz mirror://gentoo/genpatches-4.9-136.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-136.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2f84d80ba564e8662c27588801389ecc
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.135 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.135
index 71d534533cef..4f353523bc88 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.135
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.135
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.135
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-139.base.tar.xz mirror://gentoo/genpatches-4.9-139.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-139.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=7f6ce089d60648491b0a20622553331a
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.137 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.137
index 8b5c6c1c888a..f548542556ad 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.137
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.137
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.137
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-141.base.tar.xz mirror://gentoo/genpatches-4.9-141.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-141.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=6b89323e1bf9e099b76084dbd34af781
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.105-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.105-r1
index c61a92eeb2f8..4e16468f0bd2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.105-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.105-r1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.105-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-112.base.tar.xz mirror://gentoo/genpatches-4.14-112.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-112.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=985d47342799045123572d679148a0e2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.114 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.114
index 88ad0f1c4784..18db329505d9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.114
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.114
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.114
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-122.base.tar.xz mirror://gentoo/genpatches-4.14-122.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-122.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=1a42f10287660bb327ddf7cbd897f513
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.120 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.120
index 23ff39c72c1c..1daca564ef85 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.120
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.120
@@ -4,11 +4,11 @@ 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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.14.120
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-128.base.tar.xz mirror://gentoo/genpatches-4.14-128.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-128.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=10f137ee95a4c88ba498fc633e6b4ef5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=d8f48ed1f9e97d1536c31ebb9fd6853d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.121 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.121
new file mode 100644
index 000000000000..ec12bad51eed
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.121
@@ -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
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.121
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-129.base.tar.xz mirror://gentoo/genpatches-4.14-129.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-129.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=5fa25d4cea0675a874d4af679676122a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.122 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.122
new file mode 100644
index 000000000000..0759070c2413
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.122
@@ -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
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.122
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-130.base.tar.xz mirror://gentoo/genpatches-4.14-130.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-130.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=7ce7d80416cec3b8273b32f8e984c7e5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.123 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.123
new file mode 100644
index 000000000000..198760147628
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.123
@@ -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
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.123
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-131.base.tar.xz mirror://gentoo/genpatches-4.14-131.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-131.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=7029a596199f3886f8b297dbbecbf576
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.27-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.27-r1
index fb3142848bd4..7b39a2fa5874 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.27-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.27-r1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.27-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-28.base.tar.xz mirror://gentoo/genpatches-4.19-28.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-28.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=3744cbe383e7f99bfbb7a06129539c73
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.37 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.37
index ec709a6166b7..7d53b1bbcc9c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.37
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.37
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.37
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-38.base.tar.xz mirror://gentoo/genpatches-4.19-38.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-38.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=17f620d3fac7516c967943ddea090157
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.44 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.44
index 7387c886fc25..50862d551631 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.44
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.44
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.19.44
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-45.base.tar.xz mirror://gentoo/genpatches-4.19-45.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-45.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bc84eb57d9299369433f502016140e46
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=cf22b55313d9b9a00a01b78f223dd4e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.45 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.45
new file mode 100644
index 000000000000..2ea5902da387
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.45
@@ -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.19 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
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.45
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-46.base.tar.xz mirror://gentoo/genpatches-4.19-46.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-46.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=6187a4d8f89634aa9b9a17c97c57c35b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.46 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.46
new file mode 100644
index 000000000000..c1c4c5ab5c20
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.46
@@ -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.19 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
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.46
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-47.base.tar.xz mirror://gentoo/genpatches-4.19-47.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-47.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=58ece64c6d3c492c9cdb0d8d295d9eb5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.47 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.47
new file mode 100644
index 000000000000..7ebfa7ce909e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.47
@@ -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.19 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
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.47
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-48.base.tar.xz mirror://gentoo/genpatches-4.19-48.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-48.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9f7e372b6524bfc7de9bf8016960ac7e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.176 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.176
index 8065128f671f..3079f8438e64 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.176
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.176
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.176
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-177.base.tar.xz mirror://gentoo/genpatches-4.4-177.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-177.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=8f56a92ad1973d022bedbcf22d7a4254
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.177 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.177
index 630a3a4ce6f5..0e953b0c7eb3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.177
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.177
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.177
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-178.base.tar.xz mirror://gentoo/genpatches-4.4-178.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-178.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=6347980dfab7d523d8fb7abb0c0499ec
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.178 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.178
index 892906921d2b..f3adc1667239 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.178
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.178
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.178
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-179.base.tar.xz mirror://gentoo/genpatches-4.4-179.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-179.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=dc28baa3c4dc79fb2b3a0719401ff8bf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.179 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.179
index 34142dfab23b..01b078b563fd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.179
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.179
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.179
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-180.base.tar.xz mirror://gentoo/genpatches-4.4-180.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-180.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=50f06df7ad4bec5ecdf5e44613e83b67
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.180 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.180
index 03a62472e929..dfac53299215 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.180
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.180
@@ -4,11 +4,11 @@ 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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.4.180
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-181.base.tar.xz mirror://gentoo/genpatches-4.4-181.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-181.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ab3c35d3e6eaac2fbd498fc896a61bf9
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ff869d4dd858a8b4894821589b6854a1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.162-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.162-r1
index f24b5f833a49..3d9925b6638c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.162-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.162-r1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.162-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-165.base.tar.xz mirror://gentoo/genpatches-4.9-165.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-165.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=6d8106d8e3cc9c3084170f383f149b38
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.171 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.171
index 28125e09425a..2a85662c8325 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.171
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.171
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.171
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-175.base.tar.xz mirror://gentoo/genpatches-4.9-175.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-175.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=55ca8ff64882df966dd55951c94e86c3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.177 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.177
index fb6772b0083d..8696652ab4f0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.177
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.177
@@ -4,11 +4,11 @@ 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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.9.177
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-182.base.tar.xz mirror://gentoo/genpatches-4.9-182.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-182.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f4099259be2900c0f4526faf1e1259f5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=247b56eb8a42c763f3306eddeecc7397
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.178 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.178
new file mode 100644
index 000000000000..a22f2ed9d386
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.178
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.178
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-183.base.tar.xz mirror://gentoo/genpatches-4.9-183.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-183.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c69b4ea268f9390623af5df5b6b28c5b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.179 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.179
new file mode 100644
index 000000000000..414e99983b9c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.179
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.179
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-184.base.tar.xz mirror://gentoo/genpatches-4.9-184.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-184.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8264283c489d054e076954d4b0f45d81
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.180 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.180
new file mode 100644
index 000000000000..4ce859e6b7b5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.180
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.180
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-185.base.tar.xz mirror://gentoo/genpatches-4.9-185.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-185.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=59a6545fc9b86057d3ee41bd2faa4014
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.17 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.17
index ab3e86eeead1..1d6b383f5e1e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.17
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.17
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.0.17
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz mirror://gentoo/genpatches-5.0-18.base.tar.xz mirror://gentoo/genpatches-5.0-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.0-18.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=c9c065d75394000074068bf776075a33
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.18 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.18
new file mode 100644
index 000000000000..90ef6ba59719
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.18
@@ -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 5.0 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
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.0.18
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz mirror://gentoo/genpatches-5.0-19.base.tar.xz mirror://gentoo/genpatches-5.0-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.0-19.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=5637d03b85f8ecd7a586223116f774e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.19 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.19
new file mode 100644
index 000000000000..03ec578a95c5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.19
@@ -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 5.0 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
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.0.19
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz mirror://gentoo/genpatches-5.0-20.base.tar.xz mirror://gentoo/genpatches-5.0-20.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.0-20.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=a7decb05e9f5f079b58f75de14897957
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.20 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.20
new file mode 100644
index 000000000000..ad32c126f9ad
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.20
@@ -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 5.0 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
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.0.20
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz mirror://gentoo/genpatches-5.0-21.base.tar.xz mirror://gentoo/genpatches-5.0-21.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.0-21.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=eeb7aae9fb7a72ce38c441159a3f3d14
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.3 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.3
deleted file mode 100644
index 4cc0e1530c3a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.3
+++ /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 including the Gentoo patchset for the 5.1 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
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=5.1.3
-SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz mirror://gentoo/genpatches-5.1-4.base.tar.xz mirror://gentoo/genpatches-5.1-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-4.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a3ee279fec232af8b61c6643ae0df398
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.5
new file mode 100644
index 000000000000..677dd83ac6d8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.5
@@ -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 5.1 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
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.1.5
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz mirror://gentoo/genpatches-5.1-6.base.tar.xz mirror://gentoo/genpatches-5.1-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-6.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ffe00c75b7caf47ec211adce6bcedde1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.6
new file mode 100644
index 000000000000..bc60b44130f5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.6
@@ -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 5.1 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
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.1.6
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz mirror://gentoo/genpatches-5.1-7.base.tar.xz mirror://gentoo/genpatches-5.1-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-7.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=601ff7c23e8ffe7fd235dcf65a56cb59
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc1 b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc1
index ddc34314c923..e71fb7cd518e 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1_rc1
 SRC_URI=https://git.kernel.org/torvalds/p/v5.1-rc1/v5.0 -> patch-5.1-rc1.patch mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=afd1b2d9e41f87ff994172d5bf4031c6
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc2 b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc2
index f2d3f1f508be..571848874926 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc2
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1_rc2
 SRC_URI=https://git.kernel.org/torvalds/p/v5.1-rc2/v5.0 -> patch-5.1-rc2.patch mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=afd1b2d9e41f87ff994172d5bf4031c6
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc3 b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc3
index 612f29a7d0b9..c2b2ad68065d 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc3
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1_rc3
 SRC_URI=https://git.kernel.org/torvalds/p/v5.1-rc3/v5.0 -> patch-5.1-rc3.patch mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=afd1b2d9e41f87ff994172d5bf4031c6
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc4 b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc4
index f3a0adcb363b..558693665239 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc4
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1_rc4
 SRC_URI=https://git.kernel.org/torvalds/p/v5.1-rc4/v5.0 -> patch-5.1-rc4.patch mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=afd1b2d9e41f87ff994172d5bf4031c6
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc5 b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc5
index 8bcc9fb1df11..42ace9cffd94 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc5
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1_rc5
 SRC_URI=https://git.kernel.org/torvalds/p/v5.1-rc5/v5.0 -> patch-5.1-rc5.patch mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=afd1b2d9e41f87ff994172d5bf4031c6
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc6 b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc6
index bea64204f181..96306ffa8af8 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc6
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1_rc6
 SRC_URI=https://git.kernel.org/torvalds/p/v5.1-rc6/v5.0 -> patch-5.1-rc6.patch mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=afd1b2d9e41f87ff994172d5bf4031c6
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc7 b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc7
index 16655d09d83d..b8567aa53787 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.1_rc7
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.1_rc7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1_rc7
 SRC_URI=https://git.kernel.org/torvalds/p/v5.1-rc7/v5.0 -> patch-5.1-rc7.patch mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=afd1b2d9e41f87ff994172d5bf4031c6
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.2_rc1 b/metadata/md5-cache/sys-kernel/git-sources-5.2_rc1
index 4ea15c00da06..9f32350fc249 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.2_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.2_rc1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2_rc1
 SRC_URI=https://git.kernel.org/torvalds/p/v5.2-rc1/v5.1 -> patch-5.2-rc1.patch mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=ed311ce15c47753c82bc545119125e99
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.2_rc2 b/metadata/md5-cache/sys-kernel/git-sources-5.2_rc2
new file mode 100644
index 000000000000..40fd92201225
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.2_rc2
@@ -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=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2_rc2
+SRC_URI=https://git.kernel.org/torvalds/p/v5.2-rc2/v5.1 -> patch-5.2-rc2.patch mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ed311ce15c47753c82bc545119125e99
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.4.0-r1 b/metadata/md5-cache/sys-kernel/kpatch-0.4.0-r1
deleted file mode 100644
index b0c8fb771abe..000000000000
--- a/metadata/md5-cache/sys-kernel/kpatch-0.4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare pretend setup
-DEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils dev-libs/elfutils sys-devel/bison kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Dynamic kernel patching for Linux
-EAPI=6
-HOMEPAGE=https://github.com/dynup/kpatch
-IUSE=examples +modules test kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://github.com/dynup/kpatch/archive/v0.4.0.tar.gz -> kpatch-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=180426fef024eccfe2b62c851cc35a80
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.6.0 b/metadata/md5-cache/sys-kernel/kpatch-0.6.0
deleted file mode 100644
index de388a4282e6..000000000000
--- a/metadata/md5-cache/sys-kernel/kpatch-0.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare pretend setup
-DEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils dev-libs/elfutils sys-devel/bison kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Dynamic kernel patching for Linux
-EAPI=6
-HOMEPAGE=https://github.com/dynup/kpatch
-IUSE=examples +modules test kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://github.com/dynup/kpatch/archive/v0.6.0.tar.gz -> kpatch-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b37b9232ba8ed070be0669e863d12d7
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.6.2 b/metadata/md5-cache/sys-kernel/kpatch-0.6.2
deleted file mode 100644
index 453d9b887499..000000000000
--- a/metadata/md5-cache/sys-kernel/kpatch-0.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare pretend setup
-DEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils dev-libs/elfutils sys-devel/bison kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Dynamic kernel patching for Linux
-EAPI=6
-HOMEPAGE=https://github.com/dynup/kpatch
-IUSE=examples +modules test kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://github.com/dynup/kpatch/archive/v0.6.2.tar.gz -> kpatch-0.6.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b37b9232ba8ed070be0669e863d12d7
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.6.3 b/metadata/md5-cache/sys-kernel/kpatch-0.6.3
new file mode 100644
index 000000000000..f0e465e22312
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils dev-libs/elfutils sys-devel/bison test? ( dev-util/shellcheck-bin ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Dynamic kernel patching for Linux
+EAPI=7
+HOMEPAGE=https://github.com/dynup/kpatch
+IUSE=+kpatch-build +kpatch kmod doc contrib test kernel_linux kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://github.com/dynup/kpatch/archive/v0.6.3.tar.gz -> kpatch-0.6.3.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=a53b66a6c4e36e00a9d46cc9270c576b
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20190502 b/metadata/md5-cache/sys-kernel/linux-firmware-20190502
index 98bb868373f8..598cf153d2ba 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20190502
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20190502
@@ -9,5 +9,5 @@ RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firm
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-92e17d0dd2437140fab044ae62baf69b35d7d1fa.tar.gz -> linux-firmware-20190502.tar.gz
-_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
+_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69
 _md5_=8001b8aa4a0ad9ccb0d1d44a2c44acc6
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20190514 b/metadata/md5-cache/sys-kernel/linux-firmware-20190514
index 0eae0325b877..ab8f40a684a1 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20190514
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20190514
@@ -9,5 +9,5 @@ RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_card
 RESTRICT=binchecks strip unknown-license? ( bindist )
 SLOT=0
 SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-711d3297bac870af42088a467459a0634c1970ca.tar.gz -> linux-firmware-20190514.tar.gz
-_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
+_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69
 _md5_=5131a6d367f08b68b463f1416ad327e9
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-99999999 b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
index ff1a52159143..8ea748032f8e 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux
 RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !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 ) unknown-license? ( !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] ) )
 RESTRICT=binchecks strip unknown-license? ( bindist )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69
 _md5_=fecd48d659f88bc1bc0d82f0657376ea
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.18 b/metadata/md5-cache/sys-kernel/linux-headers-3.18
index ac4e82c23664..82abf1b88729 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.18
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.18.tar.xz mirror://gentoo/gentoo-headers-3.18-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dc4fe9f110af888e0a652eaacbbc3b5a
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.13 b/metadata/md5-cache/sys-kernel/linux-headers-4.13
index fc98253a8459..9c73a5661326 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.13
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.13
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.13.tar.xz mirror://gentoo/gentoo-headers-4.13-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6fcc2aeab73ce8ed16b1946f9eb72404
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
index 44f7173e3974..01c595fe34f4 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=59fb671273c1ce0bc3ee90ad15ab0500
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
index ec5600bc8909..7b710db3adb1 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.15.tar.xz mirror://gentoo/gentoo-headers-4.15-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=adc2b7d2293553db25f14ccab47337d5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.16 b/metadata/md5-cache/sys-kernel/linux-headers-4.16
index 5a93e89aa727..dd1d7bb53f2d 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.16
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.16
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.16.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=87ceb46f30cc43df3f28e5eb921ede8b
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2 b/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
index b014d6b73cda..30c218f596b2 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.16-r1.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16-r1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=a2ceb924cb18f4bc540454a280b945e5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.17 b/metadata/md5-cache/sys-kernel/linux-headers-4.17
index 83030ec8de87..12fe2299677c 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.17
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.17
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.17.tar.xz mirror://gentoo/gentoo-headers-4.17-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=627cba397fdb644b9a3af8595fb67798
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.18 b/metadata/md5-cache/sys-kernel/linux-headers-4.18
index 2808065988af..790451dc713b 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.18.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.18.tar.xz mirror://gentoo/gentoo-headers-4.18-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.18-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9cafe7b53b9f289d20c7de25ddaff5f8
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.19 b/metadata/md5-cache/sys-kernel/linux-headers-4.19
index 9d821eb81aa4..bb09df80a0b7 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.19
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.19.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.19.tar.xz mirror://gentoo/gentoo-headers-4.19-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.19-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9cafe7b53b9f289d20c7de25ddaff5f8
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.20 b/metadata/md5-cache/sys-kernel/linux-headers-4.20
index 87a9e67f0441..9791b505eb36 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.20
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.20
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.20.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.20.tar.xz mirror://gentoo/gentoo-headers-4.20-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.20-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9cafe7b53b9f289d20c7de25ddaff5f8
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.4 b/metadata/md5-cache/sys-kernel/linux-headers-4.4
index db12d5a638f0..837d3d61c34e 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.4
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.4.tar.xz mirror://gentoo/gentoo-headers-4.4-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68b3561369522606c23d143a796dd256
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.9 b/metadata/md5-cache/sys-kernel/linux-headers-4.9
index f635635b6620..127ecba32262 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.9
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.9.tar.xz mirror://gentoo/gentoo-headers-4.9-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0e197473a1afd16ea06c6afffb688a17
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.0 b/metadata/md5-cache/sys-kernel/linux-headers-5.0
index fdcb29a75662..75e33f7d7c30 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.0
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-5.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-5.0.tar.xz mirror://gentoo/gentoo-headers-5.0-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.0-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9cafe7b53b9f289d20c7de25ddaff5f8
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.0-r1 b/metadata/md5-cache/sys-kernel/linux-headers-5.0-r1
index 1d74924881e7..4c6b8aebd572 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.0-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-5.0-bug-679630.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-5.0-bug-679630.tar.xz mirror://gentoo/gentoo-headers-5.0-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.0-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9cf7388630d554f237cdaf07bb84f92b
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.88 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.88
index bfa4e6cbf7f9..bdd32899bc05 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.88
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.88
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.88
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.88.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/mipsgit-4.14.0-20180128.diff.xz mirror://gentoo/mips-sources-4.14.0-patches-v1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=32d27058ee81b41580e70337b53da0ce
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.17.19 b/metadata/md5-cache/sys-kernel/mips-sources-4.17.19
index b82231abe5ce..e9857e8b5b9a 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.17.19
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.17.19
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.17.19
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.19.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/mipsgit-4.17.0-20180705.diff.xz mirror://gentoo/mips-sources-4.17.0-patches-v1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=21a2581acc260da5444d50d70d20288c
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20 b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
index e65853f21641..b46cbbbf3b77 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.20
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.20.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz mirror://gentoo/mipsgit-4.18.0-20181112.diff.xz mirror://gentoo/mips-sources-4.18.0-patches-v2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0aa621ac7763cb319a46536dfe80bda
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.4.167 b/metadata/md5-cache/sys-kernel/mips-sources-4.4.167
index ddfeb0e0ebd5..1cdef546361e 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.4.167
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.4.167
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.167
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.167.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/mipsgit-4.4.0-20160123.diff.xz mirror://gentoo/mips-sources-4.4.0-patches-v2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f9f868564d228c89bf01883098b39d27
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.9.145 b/metadata/md5-cache/sys-kernel/mips-sources-4.9.145
index c4c4d13d35cb..bf78012bfa0f 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.9.145
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.9.145
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.145
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.145.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/mipsgit-4.9.0-20161216.diff.xz mirror://gentoo/mips-sources-4.9.0-patches-v1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=86e9a9b67bcf2833987367769d669aa6
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3 b/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3
index 77ec1bb360ef..b5dd5baa52c3 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.10_p3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.10.tar.xz https://pf.natalenko.name/sources/4.10/patch-4.10-pf3.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3 b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3
index 6272c041bb5d..cd57d6a818b9 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.11_p3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz https://pf.natalenko.name/sources/4.11/patch-4.11-pf3.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4 b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4
index 3c461519da99..15d0866a69d2 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.11_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz https://pf.natalenko.name/sources/4.11/patch-4.11-pf4.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4 b/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4
index c7a26dbc76b0..777c3f4237ac 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.13_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://pf.natalenko.name/sources/4.13/patch-4.13-pf4.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8 b/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8
index d616ed44c373..af7c055beb18 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4_p8
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://pf.natalenko.name/sources/4.4/patch-4.4-pf8.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3d02954c3ede09216e82bc9de9f914bf
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4 b/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4
index 45a23825d0be..823a23f47394 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.5_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.5.tar.xz https://pf.natalenko.name/sources/4.5/patch-4.5-pf4.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3d02954c3ede09216e82bc9de9f914bf
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8 b/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8
index 71ed6ce38172..0f0ecf410344 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.8_p8
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://pf.natalenko.name/sources/4.8/patch-4.8-pf8.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3d02954c3ede09216e82bc9de9f914bf
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999
index 00c1cc5ed49b..68d47ebb7420 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.10.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999
index bd46fb7c504a..251cd116378f 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.11.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999
index 5e2fca2896c1..f11f4fcc6925 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.12.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999
index cc236258f3c6..083897c8008e 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.13.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
index 73fd7cd8cf8c..107be19180f4 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.14.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
index cbb8fb594dc8..65b66b900dcd 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.19.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2da249c494dca0e19c87641ef4855aa5
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
index 22fd85633f7e..79830d9583c0 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.4.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999
index fb7e6cb4449f..768e0843d73b 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.9.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107
index 117d1478e3e3..e91065d6cf46 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=3.18.123_p107
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.123.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-3.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.123-rt107.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.123-rt107.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108
index b3adee321629..129741072311 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=3.18.125_p108
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.125.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-3.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.125-rt108.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.125-rt108.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110
index 13e6fb1c0e7f..6f3c8ee4c4e5 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=3.18.129_p110
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.129.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-3.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.129-rt110.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.129-rt110.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=7dd4abac9eef41dfb3911ad066604b3d
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
index e3f43a42b46e..7f5980ac0d07 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.71_p44
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.71.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://kernel/linux/kernel/projects/rt/4.14/patch-4.14.71-rt44.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.71-rt44.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47
index f688ff3e1c55..d0e795376e87 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.78_p47
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.78.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://kernel/linux/kernel/projects/rt/4.14/patch-4.14.78-rt47.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.78-rt47.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.87_p49 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.87_p49
index a14d33de52ae..cff878985911 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.87_p49
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.87_p49
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.87_p49
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.87.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://kernel/linux/kernel/projects/rt/4.14/patch-4.14.87-rt49.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.87-rt49.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=d932aac0bada87f774a7d095025eb628
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12 b/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
index 7f891bb9e2d7..760c3c00c60e 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.16.18_p12
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.18.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-4.16 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-check -> deblob-check-4.16 ) mirror://kernel/linux/kernel/projects/rt/4.16/patch-4.16.18-rt12.patch.xz mirror://kernel/linux/kernel/projects/rt/4.16/older/patch-4.16.18-rt12.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9 b/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9
index 74f69ee9af8e..2f46c2e84ac5 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.16_p9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.16.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://kernel/linux/kernel/projects/rt/4.18/patch-4.18.16-rt9.patch.xz mirror://kernel/linux/kernel/projects/rt/4.18/older/patch-4.18.16-rt9.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.10_p8 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.10_p8
index 2b945e158f7a..0c80927781dc 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.10_p8
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.10_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.10_p8
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.10.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) mirror://kernel/linux/kernel/projects/rt/4.19/patch-4.19.10-rt8.patch.xz mirror://kernel/linux/kernel/projects/rt/4.19/older/patch-4.19.10-rt8.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=d932aac0bada87f774a7d095025eb628
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4
index bc81256b0035..36d9d2b0e6e9 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.5_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) mirror://kernel/linux/kernel/projects/rt/4.19/patch-4.19.5-rt4.patch.xz mirror://kernel/linux/kernel/projects/rt/4.19/older/patch-4.19.5-rt4.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175
index 847c8411ac8b..1b139aa54329 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.162_p175
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.162.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) mirror://kernel/linux/kernel/projects/rt/4.4/patch-4.4.162-rt175.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.162-rt175.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176
index d9bf6d490033..0e7fb72e77f7 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.164_p176
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.164.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) mirror://kernel/linux/kernel/projects/rt/4.4/patch-4.4.164-rt176.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.164-rt176.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
index bde0c204093a..403668852f12 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.115_p93
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.115.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://kernel/linux/kernel/projects/rt/4.9/patch-4.9.115-rt93.patch.xz mirror://kernel/linux/kernel/projects/rt/4.9/older/patch-4.9.115-rt93.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.146_p125 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.146_p125
index 11d3d751ddea..a3d4dc425b81 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.146_p125
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.146_p125
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.146_p125
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.146.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://kernel/linux/kernel/projects/rt/4.9/patch-4.9.146-rt125.patch.xz mirror://kernel/linux/kernel/projects/rt/4.9/older/patch-4.9.146-rt125.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=7dd4abac9eef41dfb3911ad066604b3d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.67 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.67
deleted file mode 100644
index 8dc182b767ac..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.67
+++ /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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=3.16.67
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.67.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.68 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.68
new file mode 100644
index 000000000000..59e67ebf2245
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.68
@@ -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=6
+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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=3.16.68
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.68.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.120 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.120
deleted file mode 100644
index e61a68669d4e..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.120
+++ /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=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.120
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.120.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.123 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.123
new file mode 100644
index 000000000000..c8c21d306a8d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.123
@@ -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=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.123
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.123.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.44 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.44
deleted file mode 100644
index 3d5a0aa357eb..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.44
+++ /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=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.44
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.44.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.47 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.47
new file mode 100644
index 000000000000..0f2cd66081b3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.47
@@ -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=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.47
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.47.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.180 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.180
index 67997709068b..228161f2bbf7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.180
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.180
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.180
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.180.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.177 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.177
deleted file mode 100644
index e2692a43750a..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.177
+++ /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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.177
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.177.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.180 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.180
new file mode 100644
index 000000000000..c41058bd5657
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.180
@@ -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=6
+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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.180
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.180.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.0.17 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.0.17
deleted file mode 100644
index adbb312cd938..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.0.17
+++ /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=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=5.0.17
-SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.0.17.xz mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.0.20 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.0.20
new file mode 100644
index 000000000000..2b19afdec825
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.0.20
@@ -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=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.0.20
+SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.0.20.xz mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.3 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.3
deleted file mode 100644
index 467bbed29e18..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.3
+++ /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=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=5.1.3
-SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.1.3.xz mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.6
new file mode 100644
index 000000000000..6e4286b84ea5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.6
@@ -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=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.1.6
+SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.1.6.xz mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26 b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
index 111cc5270b78..d3ac619229ac 100644
--- a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
+++ b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=2.6.16.26
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.16.26.xz mirror://kernel/linux/kernel/v2.6/linux-2.6.16.tar.xz mirror://sourceforge/xbox-linux/linux-2.6.16-xbox.patch.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fa63226fe1bc8f52b3b2b1fa23047775
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999 b/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999
index e2a92f415111..0a4986cfb29f 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.14.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=322112777abd81f4f8a030331bb728e1
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999 b/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999
index 071731dd5f18..7e2425ccf5ce 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.15.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=322112777abd81f4f8a030331bb728e1
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999 b/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999
index f1e71efc8302..f289a285fbc9 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.16.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=322112777abd81f4f8a030331bb728e1
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 0735ed3208fa..8ef347d452f0 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.31.1-r6 b/metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r6
index 93600afb26c5..3087ba219946 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r6
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r6
@@ -4,10 +4,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5 nls? ( !<sys-devel/gdb-7.10-r1[nls] )
 SLOT=0/2.31.1-r1
 SRC_URI=mirror://gnu/binutils/binutils-2.31.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.31.1-patches-7.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=278387d51a75c2abab0f73dcb82f3dce
+_md5_=9abcb5b2334862c530150ebb1db21db9
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-4.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-4.0.1
deleted file mode 100644
index b8863c3cb9f1..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-4.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( =sys-devel/clang-4.0.1*:4 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=+clang test
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=|| ( UoI-NCSA MIT )
-RDEPEND=!=sys-libs/compiler-rt-4.0.1*:0
-SLOT=4.0.1
-SRC_URI=https://releases.llvm.org/4.0.1/compiler-rt-4.0.1.src.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c2d1e47e6067d424fd0bfb719aea4f49
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-5.0.2 b/metadata/md5-cache/sys-libs/compiler-rt-5.0.2
index b2e82d3e5fd3..f4289b1f1dc0 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-5.0.2
+++ b/metadata/md5-cache/sys-libs/compiler-rt-5.0.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( UoI-NCSA MIT )
 SLOT=5.0.2
 SRC_URI=https://releases.llvm.org/5.0.2/compiler-rt-5.0.2.src.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=cf306ab79e82e1e310441e78889afacf
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-6.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-6.0.1
index b035149d68a7..9599962712f2 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-6.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-6.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=6.0.1
 SRC_URI=https://releases.llvm.org/6.0.1/compiler-rt-6.0.1.src.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=8905da13653837ff391b280337b22cc5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-7.1.0 b/metadata/md5-cache/sys-libs/compiler-rt-7.1.0
index 37a47add544e..95726478460d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-7.1.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-7.1.0
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=7.1.0
 SRC_URI=https://releases.llvm.org/7.1.0/compiler-rt-7.1.0.src.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=d616d6a42c35282eb33cd44e6702807e
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-8.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-8.0.0
index d470c5a8a14d..1d2a84059ee9 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-8.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-8.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=8.0.0
 SRC_URI=https://releases.llvm.org/8.0.0/compiler-rt-8.0.0.src.tar.xz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=d8e04dfe33caede7ed28aee03315a4da
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-8.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-8.0.9999
index bdf84d876563..a7dd4889dd8f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-8.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-8.0.9999
@@ -7,5 +7,5 @@ IUSE=+clang test
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=8.0.1
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=bad27f0dc45f84bdc6359ddb6bd933f4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-9999 b/metadata/md5-cache/sys-libs/compiler-rt-9999
index 14f6696406b4..de272ab5a3aa 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-9999
@@ -7,5 +7,5 @@ IUSE=+clang test
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=9.0.0
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=d406b5417cc0c247b2dcf9879a7209e0
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
deleted file mode 100644
index 238ae9b6cf0f..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( !<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-4.0.1[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-4.0.1*:4 sys-libs/compiler-rt:4.0.1 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=+clang test
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=|| ( UoI-NCSA MIT )
-RDEPEND=!=sys-libs/compiler-rt-sanitizers-4.0.1*:0
-SLOT=4.0.1
-SRC_URI=https://releases.llvm.org/4.0.1/compiler-rt-4.0.1.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/compiler-rt-sanitizers-4.0.1-patchset.tar.xz test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=53999af877f5e4f162ee3dbab23fffb3
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
index 78df6d50d390..b07e4a775257 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( UoI-NCSA MIT )
 SLOT=5.0.2
 SRC_URI=https://releases.llvm.org/5.0.2/compiler-rt-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=1b3a665ffe7cf8222f54030be24485c2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1
index a026e113f02c..533c4d723c7f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1
@@ -10,5 +10,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=6.0.1
 SRC_URI=https://releases.llvm.org/6.0.1/compiler-rt-6.0.1.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/compiler-rt-sanitizers-6.0.1-patchset.tar.xz test? ( https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=da785b8b6d5ae664155ff7743c365243
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.1.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.1.0
index 01ba5bf80417..88752b7696a8 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.1.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.1.0
@@ -10,5 +10,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=7.1.0
 SRC_URI=https://releases.llvm.org/7.1.0/compiler-rt-7.1.0.src.tar.xz test? ( https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=fb1b36bf06b28717a806a16610b165f2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.0
index 50a6365e2f75..251adf87900b 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.0
@@ -10,5 +10,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=8.0.0
 SRC_URI=https://releases.llvm.org/8.0.0/compiler-rt-8.0.0.src.tar.xz test? ( https://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f20a11e7801133c551961dfb694e176a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.9999
index 97ad64e44bd4..50150366e4a6 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.9999
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=8.0.1
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ef1eaea29a8c6b6174f86509b29474ad
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
index 80f6f04e5d50..ffd4048f9260 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=9.0.0
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5614e3f64389e8f94465911331061e03
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.0 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.0
deleted file mode 100644
index 93d65124c4cf..000000000000
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig
-DESCRIPTION=e2fsprogs libraries (common error and subsystem)
-EAPI=6
-HOMEPAGE=http://e2fsprogs.sourceforge.net/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
-SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.45.0.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.0/e2fsprogs-1.45.0.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=aac63ca3dea71f9ba9fa0bb1b768d5be
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.2 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.2
new file mode 100644
index 000000000000..997439902836
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=e2fsprogs libraries (common error and subsystem)
+EAPI=7
+HOMEPAGE=http://e2fsprogs.sourceforge.net/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
+SLOT=0
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.45.2.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.2/e2fsprogs-1.45.2.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=a5888584c6c6fb66c4174dc91b9afc0b
diff --git a/metadata/md5-cache/sys-libs/glibc-2.29-r2 b/metadata/md5-cache/sys-libs/glibc-2.29-r2
index 966411068bc3..d6d12b23ba5b 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.29-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.29-r2
@@ -4,7 +4,7 @@ DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
 IUSE=audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.29.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.29-patches-3.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e196df69605787b752cfb1b11ecdcf3d
+_md5_=53bb80e7c5374541ffd8c990781bd8f4
diff --git a/metadata/md5-cache/sys-libs/lib-compat-1.5 b/metadata/md5-cache/sys-libs/lib-compat-1.5
index 0725381bc840..17cdd4e69ad0 100644
--- a/metadata/md5-cache/sys-libs/lib-compat-1.5
+++ b/metadata/md5-cache/sys-libs/lib-compat-1.5
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Compatibility C++ library for very old programs
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* ~amd64 ~x86 ~x86-linux
 LICENSE=libstdc++
 SLOT=0
 SRC_URI=mirror://gentoo/lib-compat-1.5.tar.bz2
-_md5_=a3e13a17a6162346b3f4537b1018ac3d
+_md5_=2227140a2a741bdb0a170c72bbe2ff2d
diff --git a/metadata/md5-cache/sys-libs/libcxx-6.0.1 b/metadata/md5-cache/sys-libs/libcxx-6.0.1
index 6b804c371eaf..f9e41b2d166f 100644
--- a/metadata/md5-cache/sys-libs/libcxx-6.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.1/libcxx-6.0.1.src.tar.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=03aea2816645180d10cada90e02069a7
diff --git a/metadata/md5-cache/sys-libs/libcxx-7.1.0 b/metadata/md5-cache/sys-libs/libcxx-7.1.0
index 59fb576aa7f8..284cc46f4f68 100644
--- a/metadata/md5-cache/sys-libs/libcxx-7.1.0
+++ b/metadata/md5-cache/sys-libs/libcxx-7.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.1.0/libcxx-7.1.0.src.tar.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=7e5dff02098a38a70e183f4edd4dc5f4
diff --git a/metadata/md5-cache/sys-libs/libcxx-8.0.0 b/metadata/md5-cache/sys-libs/libcxx-8.0.0
index ed7ff19befde..fde3b2dfc300 100644
--- a/metadata/md5-cache/sys-libs/libcxx-8.0.0
+++ b/metadata/md5-cache/sys-libs/libcxx-8.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/8.0.0/libcxx-8.0.0.src.tar.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c7cfc573235251114974275b98770fe5
diff --git a/metadata/md5-cache/sys-libs/libcxx-8.0.9999 b/metadata/md5-cache/sys-libs/libcxx-8.0.9999
index e1c63ce24ff4..f3f9c2b049a8 100644
--- a/metadata/md5-cache/sys-libs/libcxx-8.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-8.0.9999
@@ -9,5 +9,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-8.0.9999[libunwind=,static-libs?,abi_x8
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=37c0ab1db8bf2bb0fe43c2773da70aa0
diff --git a/metadata/md5-cache/sys-libs/libcxx-9999 b/metadata/md5-cache/sys-libs/libcxx-9999
index c91d93f63f8c..7c9169ebd199 100644
--- a/metadata/md5-cache/sys-libs/libcxx-9999
+++ b/metadata/md5-cache/sys-libs/libcxx-9999
@@ -9,5 +9,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-9999[libunwind=,static-libs?,abi_x86_32
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=dfab7db40f4a6a738bf95e5c6b07e7dd
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-6.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-6.0.1
index 96736b3c85af..959e91d065dd 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-6.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-6.0.1
@@ -10,5 +10,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.1/libcxxabi-6.0.1.src.tar.xz https://releases.llvm.org/6.0.1/libcxx-6.0.1.src.tar.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=29bf3f305c4a0906a8d613fb777b02d8
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-7.1.0 b/metadata/md5-cache/sys-libs/libcxxabi-7.1.0
index a4166925fed7..5338401feff6 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-7.1.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-7.1.0
@@ -10,5 +10,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.1.0/libcxxabi-7.1.0.src.tar.xz https://releases.llvm.org/7.1.0/libcxx-7.1.0.src.tar.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f8e46fef118e543c286d8117cfd004f8
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-8.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-8.0.0
index c9bf107e8b0a..669c4be9cb32 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-8.0.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-8.0.0
@@ -10,5 +10,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/8.0.0/libcxxabi-8.0.0.src.tar.xz https://releases.llvm.org/8.0.0/libcxx-8.0.0.src.tar.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=a7a2618d46523f970b46d23f1e7ee7ba
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-8.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-8.0.9999
index b832e281fa8a..d665f51d1023 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-8.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-8.0.9999
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b887bfbaa7e227b912803772cc9e411e
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-9999 b/metadata/md5-cache/sys-libs/libcxxabi-9999
index 68d69b6a947e..af8e18ebbc18 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=9d0562d98bd13cfc1f59c8e0aedda839
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20170515 b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20170515
deleted file mode 100644
index 94d8764ff284..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20170515
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/llvm-libunwind[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-arch/xz-utils
-DESCRIPTION=C++ Runtime from PathScale, FreeBSD and NetBSD
-EAPI=5
-HOMEPAGE=https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265
-IUSE=+libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/llvm-libunwind[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-SLOT=0
-SRC_URI=mirror://gentoo/libcxxrt-0.0_p20170515.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db10a962f7f1d4c5f0fcb270c7980c51
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.3.0 b/metadata/md5-cache/sys-libs/libosinfo-1.3.0
index dff256cfa068..c576aa21ca2a 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.3.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=GObject library for managing information about real and virtual OSes
 EAPI=6
 HOMEPAGE=https://libosinfo.org/
 IUSE=+introspection +vala test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0:2 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0.0 sys-apps/hwids[pci,usb] sys-apps/osinfo-db-tools sys-apps/osinfo-db introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=678e434820ce1b5f51e1f2f65e08e346
+_md5_=769384496a265ce806896c462994c23c
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.1
index bdd346b8ac83..e5b653df4975 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.1
@@ -10,5 +10,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.1/libunwind-6.0.1.src.tar.xz test? ( https://releases.llvm.org/6.0.1/libcxx-6.0.1.src.tar.xz https://releases.llvm.org/6.0.1/libcxxabi-6.0.1.src.tar.xz )
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f644085900997b2bbc0fed9ec1b103cc
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-7.1.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-7.1.0
index 8cbf3ec0f420..402bc2aa31a3 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-7.1.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-7.1.0
@@ -10,5 +10,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.1.0/libunwind-7.1.0.src.tar.xz test? ( https://releases.llvm.org/7.1.0/libcxx-7.1.0.src.tar.xz https://releases.llvm.org/7.1.0/libcxxabi-7.1.0.src.tar.xz )
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=d7740c60c4061d3976bb78ae74dad2ee
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.0
index 0a225c76f6e3..676522feeab8 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.0
@@ -10,5 +10,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/8.0.0/libunwind-8.0.0.src.tar.xz test? ( https://releases.llvm.org/8.0.0/libcxx-8.0.0.src.tar.xz https://releases.llvm.org/8.0.0/libcxxabi-8.0.0.src.tar.xz )
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f5810b8438619c664af70c2b0a2473c1
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.9999
index 6369a9fd4d8d..50b622c1cfb4 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.9999
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=cbfb6d58f0a47ca3d719e6e422eaa852
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-9999
index edc5375278db..50aea57a1748 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b9868051abc1205c2d65290dce86b699
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.1_p20181020 b/metadata/md5-cache/sys-libs/ncurses-6.1_p20181020
new file mode 100644
index 000000000000..25f9666e9e3a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ncurses-6.1_p20181020
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=console display library
+EAPI=7
+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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=sys-libs/ncurses-5.9-r4:5 !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1
+SLOT=0/6
+SRC_URI=mirror://gnu/ncurses/ncurses-6.1.tar.gz ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20181020-patch.sh.bz2 https://invisible-mirror.net/archives/ncurses/6.1/ncurses-6.1-20181020-patch.sh.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=593c3ef7c0a225842f54a4eb32de00ad
diff --git a/metadata/md5-cache/sys-libs/ntdb-1.0-r1 b/metadata/md5-cache/sys-libs/ntdb-1.0-r1
deleted file mode 100644
index ffc25956bf90..000000000000
--- a/metadata/md5-cache/sys-libs/ntdb-1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!<net-fs/samba-4.1.7 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xml-dtd:4.2
-DESCRIPTION=A not-so trivial keyword/data database system
-EAPI=5
-HOMEPAGE=https://tdb.samba.org/
-IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.samba.org/ftp/tdb/ntdb-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=0891c9964a12e2e319862d3621484724
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1 b/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
index cbc7cc32df74..f58708d17dcc 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Library interface to IPMI
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
 IUSE=crypt snmp perl python static-libs tcl python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=amd64 hppa ~ia64 ppc x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.27.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=496d869f0c4363be8d21b5c81a7e6c5a
+_md5_=2d540fe6212f2fb18bd30fd35e1ed985
diff --git a/metadata/md5-cache/sys-libs/tapi-2.0.0 b/metadata/md5-cache/sys-libs/tapi-2.0.0
index 6a6e0a6be1d4..072f34b3de20 100644
--- a/metadata/md5-cache/sys-libs/tapi-2.0.0
+++ b/metadata/md5-cache/sys-libs/tapi-2.0.0
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=sys-devel/llvm:= sys-devel/clang:=
 SLOT=0
 SRC_URI=https://opensource.apple.com/tarballs/clang/clang-800.0.42.1.tar.gz http://releases.llvm.org/5.0.1/llvm-5.0.1.src.tar.xz http://releases.llvm.org/5.0.1/cfe-5.0.1.src.tar.xz https://github.com/ributzka/tapi/archive/b9205695b4edee91000383695be8de5ba8e0db41.tar.gz -> tapi-2.0.0.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f1f27861b46952b82f7a4a1bba60cd8a
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.26 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.26
index fb8339dbe099..e514b3c2ff32 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.26
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.26
@@ -9,5 +9,5 @@ RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.26/uClibc-ng-1.0.26.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b53926e41c5aac2fb241119310620421
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
index 9cfabc5f80fb..ae3e436e4f00 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
@@ -9,5 +9,5 @@ RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.30/uClibc-ng-1.0.30.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=def56d58537f9e5834d073f4cfbe91ab
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31
index 0fd9d2b1d759..182970449608 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31
@@ -9,5 +9,5 @@ RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.31/uClibc-ng-1.0.31.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ea1be4db924289d542801bd010177298
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-9999 b/metadata/md5-cache/sys-libs/uclibc-ng-9999
index 057a16f7789c..0650c3822583 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-9999
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip test
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=97f73bb736099267381e3b954c2cbbc7
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 4fe9a19dccdf..100358933fd2 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/intel-undervolt-1.6 b/metadata/md5-cache/sys-power/intel-undervolt-1.6
new file mode 100644
index 000000000000..b02dc011ab66
--- /dev/null
+++ b/metadata/md5-cache/sys-power/intel-undervolt-1.6
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup
+DESCRIPTION=Intel CPU undervolting and throttling configuration tool
+EAPI=7
+HOMEPAGE=https://github.com/kitsunyan/intel-undervolt
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/kitsunyan/intel-undervolt/archive/1.6.tar.gz -> intel-undervolt-1.6.tar.gz
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=08572b5d12128398ec16e82fdf82fd3f
diff --git a/metadata/md5-cache/sys-power/intel-undervolt-9999 b/metadata/md5-cache/sys-power/intel-undervolt-9999
new file mode 100644
index 000000000000..115e36b275cb
--- /dev/null
+++ b/metadata/md5-cache/sys-power/intel-undervolt-9999
@@ -0,0 +1,10 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install prepare setup unpack
+DESCRIPTION=Intel CPU undervolting and throttling configuration tool
+EAPI=7
+HOMEPAGE=https://github.com/kitsunyan/intel-undervolt
+IUSE=kernel_linux
+LICENSE=GPL-3
+SLOT=0
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=08572b5d12128398ec16e82fdf82fd3f
diff --git a/metadata/md5-cache/sys-power/upower-0.99.9-r1 b/metadata/md5-cache/sys-power/upower-0.99.9-r1
index 1d4e077718d0..4f797e87d4b1 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.9-r1
+++ b/metadata/md5-cache/sys-power/upower-0.99.9-r1
@@ -5,10 +5,10 @@ DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history an
 EAPI=7
 HOMEPAGE=https://upower.freedesktop.org/
 IUSE=doc +introspection ios kernel_FreeBSD kernel_linux selinux
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( virtual/libusb:1 virtual/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) selinux? ( sec-policy/selinux-devicekit )
 SLOT=0/3
 SRC_URI=https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/upower-0.99.9.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1c366c7694f5f7058b0dcb67eb20388a
+_md5_=b1f7acb472cd3a8ce15b0c80b81a00c1
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 04acd5ec541b..dbb45641aa56 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/cronie-1.5.4 b/metadata/md5-cache/sys-process/cronie-1.5.4
index ca59171da3a6..71bfe1bb54cf 100644
--- a/metadata/md5-cache/sys-process/cronie-1.5.4
+++ b/metadata/md5-cache/sys-process/cronie-1.5.4
@@ -5,10 +5,10 @@ DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cr
 EAPI=7
 HOMEPAGE=https://github.com/cronie-crond/cronie
 IUSE=+anacron +inotify pam selinux
-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=ISC BSD BSD-2 GPL-2
 RDEPEND=pam? ( virtual/pam ) anacron? ( !sys-process/anacron elibc_musl? ( sys-libs/obstack-standalone ) ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.5.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cron	5ba8300c950866f90ad70a7b2bfddac2	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=0a044ff1203db7a930c7e5934568c766
+_md5_=72b7a666484281b570db7f71083a64c3
diff --git a/metadata/md5-cache/sys-process/nmon-16f b/metadata/md5-cache/sys-process/nmon-16f
deleted file mode 100644
index 444b44056e16..000000000000
--- a/metadata/md5-cache/sys-process/nmon-16f
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=Nigel's performance MONitor for CPU, memory, network, disks, etc...
-EAPI=6
-HOMEPAGE=http://nmon.sourceforge.net/
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/nmon/lmon16f.c
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13e2dfd083affe2d0626f709a869db59
diff --git a/metadata/md5-cache/sys-process/nmon-16g b/metadata/md5-cache/sys-process/nmon-16g
index eaaddfd398e8..7d7600043129 100644
--- a/metadata/md5-cache/sys-process/nmon-16g
+++ b/metadata/md5-cache/sys-process/nmon-16g
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=Nigel's performance MONitor for CPU, memory, network, disks, etc...
 EAPI=6
 HOMEPAGE=http://nmon.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/nmon/lmon16g.c
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2c117bddc5000ba0f25ea1edfbb46b13
+_md5_=5cb2dd4ff96fce8e8e3f0b1fcd9399f6
diff --git a/metadata/md5-cache/sys-process/nmon-16j b/metadata/md5-cache/sys-process/nmon-16j
new file mode 100644
index 000000000000..c99cf0e5fca4
--- /dev/null
+++ b/metadata/md5-cache/sys-process/nmon-16j
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install unpack
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Nigel's performance MONitor for CPU, memory, network, disks, etc...
+EAPI=7
+HOMEPAGE=http://nmon.sourceforge.net/
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/nmon/lmon16j.c
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8672e1243dc0ee7c7881827743c9d446
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 7212bee1dbe3..5f7548d36cd8 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/cargo-1.35.0 b/metadata/md5-cache/virtual/cargo-1.35.0
new file mode 100644
index 000000000000..26c2981983de
--- /dev/null
+++ b/metadata/md5-cache/virtual/cargo-1.35.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Package manager for Rust
+EAPI=7
+KEYWORDS=~amd64 arm64 ~ppc64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.35.0* =dev-lang/rust-bin-1.35.0* )
+SLOT=0
+_md5_=787f40869b7cdf543ef36b2db5ed1db6
diff --git a/metadata/md5-cache/virtual/eject-0-r1 b/metadata/md5-cache/virtual/eject-0-r1
index d6420ed21df1..2d459652e405 100644
--- a/metadata/md5-cache/virtual/eject-0-r1
+++ b/metadata/md5-cache/virtual/eject-0-r1
@@ -1,7 +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
+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
+_md5_=60274252004a6bbe67c0a5c9264d6532
diff --git a/metadata/md5-cache/virtual/ffmpeg-9-r2 b/metadata/md5-cache/virtual/ffmpeg-9-r2
index 04f26f5a065c..ed1b7cb63c2f 100644
--- a/metadata/md5-cache/virtual/ffmpeg-9-r2
+++ b/metadata/md5-cache/virtual/ffmpeg-9-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual package for FFmpeg executable implementation
 EAPI=5
 IUSE=X +encode gsm jpeg2k libav mp3 opus sdl speex theora threads truetype vaapi vdpau x264
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 RDEPEND=libav? ( >=media-video/libav-9.12[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] ) !libav? ( >=media-video/ffmpeg-1.2.6-r1:0[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
 SLOT=0
-_md5_=bb3efeead72d1c678144a6d833556ff5
+_md5_=f862721d8796a76d2a4821635d237786
diff --git a/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r3 b/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r3
index 86317c0f9d16..1704261a54eb 100644
--- a/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r3
+++ b/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=A virtual to choose between different icon themes
 EAPI=6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 RDEPEND=|| ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme lxde-base/lxde-icon-theme x11-themes/tango-icon-theme kde-frameworks/oxygen-icons x11-themes/mate-icon-theme x11-themes/elementary-xfce-icon-theme )
 SLOT=0
-_md5_=1ba01147d5adb37cbefaee165b0d51ce
+_md5_=f4713c5711df6be16e4a92107c1e1ea5
diff --git a/metadata/md5-cache/virtual/imap-c-client-2 b/metadata/md5-cache/virtual/imap-c-client-2
index 9b8b24fa16ac..856fc99f82e7 100644
--- a/metadata/md5-cache/virtual/imap-c-client-2
+++ b/metadata/md5-cache/virtual/imap-c-client-2
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for IMAP c-client
 EAPI=6
 IUSE=kerberos ssl
-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
 RDEPEND=|| ( net-libs/c-client[kerberos=,ssl=] net-mail/uw-imap[kerberos=,ssl=] )
 SLOT=0
-_md5_=980d83fea8fa1082977e129cf7f76d5a
+_md5_=2be219a7b26a2e0425d0b2e9dabe9679
diff --git a/metadata/md5-cache/virtual/jpeg-62 b/metadata/md5-cache/virtual/jpeg-62
deleted file mode 100644
index bb2047df9114..000000000000
--- a/metadata/md5-cache/virtual/jpeg-62
+++ /dev/null
@@ -1,9 +0,0 @@
-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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=62
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e8ad19c4dd4bd6a0d61e43f315d38f9
diff --git a/metadata/md5-cache/virtual/jpeg-compat-62 b/metadata/md5-cache/virtual/jpeg-compat-62
new file mode 100644
index 000000000000..725feaa49986
--- /dev/null
+++ b/metadata/md5-cache/virtual/jpeg-compat-62
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual for the libjpeg.so.62 ABI for binary-only programs
+EAPI=7
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=62
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=0e9c647c0a55f32c686a41ba42745d52
diff --git a/metadata/md5-cache/virtual/logger-0-r1 b/metadata/md5-cache/virtual/logger-0-r1
index 06213dba4d63..be193a903aca 100644
--- a/metadata/md5-cache/virtual/logger-0-r1
+++ b/metadata/md5-cache/virtual/logger-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for system loggers
 EAPI=6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( app-admin/metalog app-admin/rsyslog app-admin/socklog app-admin/sysklogd app-admin/syslog-ng sys-freebsd/freebsd-usbin sys-apps/busybox[syslog] >=sys-apps/systemd-38 )
 SLOT=0
-_md5_=1542f566ebe8e84407d0fa6e2136f404
+_md5_=9f2d9e077662cf3c0b87dd2ebf29052f
diff --git a/metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0-r1 b/metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0-r1
index ff2f99d7d42c..e06e46e4e398 100644
--- a/metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0-r1
+++ b/metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Archive-Tar
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Archive-Tar-2.300.0 ) dev-lang/perl:= !<perl-core/Archive-Tar-2.300.0 !>perl-core/Archive-Tar-2.300.0-r999
 SLOT=0
-_md5_=cd946f5ebd077c0a9e1f5ee8653b105d
+_md5_=a447d414b0028afaa1b72047b5a7c86b
diff --git a/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r1 b/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r1
index a78f0e48ada4..b910b5d054d2 100644
--- a/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r1
+++ b/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Attribute-Handlers
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Attribute-Handlers-1.10.0 ) dev-lang/perl:= !<perl-core/Attribute-Handlers-1.10.0 !>perl-core/Attribute-Handlers-1.10.0-r999
 SLOT=0
-_md5_=f2e69e69046e414beadb678064450ab4
+_md5_=988fe2800d6c2d0eb83ac80facd7a93c
diff --git a/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0-r7 b/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0-r7
index 90bf6aaa197f..7634073c8550 100644
--- a/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0-r7
+++ b/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0-r7
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for AutoLoader
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/AutoLoader-5.740.0 ) dev-lang/perl:= !<perl-core/AutoLoader-5.740.0 !>perl-core/AutoLoader-5.740.0-r999
 SLOT=0
-_md5_=a79a458841faee49f60f49d924c318db
+_md5_=d7c50190138f794e89821ee8bcc68be4
diff --git a/metadata/md5-cache/virtual/perl-B-Debug-1.260.0 b/metadata/md5-cache/virtual/perl-B-Debug-1.260.0
index 9cef9048942e..63ca57ed3377 100644
--- a/metadata/md5-cache/virtual/perl-B-Debug-1.260.0
+++ b/metadata/md5-cache/virtual/perl-B-Debug-1.260.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for B-Debug
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/B-Debug-1.260.0 ) dev-lang/perl:= !<perl-core/B-Debug-1.260.0 !>perl-core/B-Debug-1.260.0-r999
 SLOT=0
-_md5_=8fe46df71baeb3746f4c12b4071011d2
+_md5_=11f0d5ad8a9538a46c953c1155982388
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.200.0 b/metadata/md5-cache/virtual/perl-CPAN-2.200.0
index 76a05b205cb0..acc8e5ace6d5 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-2.200.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-2.200.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/CPAN-2.200.0 ) dev-lang/perl:= !<perl-core/CPAN-2.200.0 !>perl-core/CPAN-2.200.0-r999
 SLOT=0
-_md5_=13b817bef0fc03104e989828ac5b26bc
+_md5_=d64bfe53f8f60d076ef94ddb348d0723
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r4 b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r4
index ef4a2252dc5a..58acd1cb94cc 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r4
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-Requirements
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/CPAN-Meta-Requirements-2.140.0 ) dev-lang/perl:= !<perl-core/CPAN-Meta-Requirements-2.140.0 !>perl-core/CPAN-Meta-Requirements-2.140.0-r999
 SLOT=0
-_md5_=2ff1d799736940f2779b53a09812216f
+_md5_=d7c50190138f794e89821ee8bcc68be4
diff --git a/metadata/md5-cache/virtual/perl-Carp-1.500.0-r1 b/metadata/md5-cache/virtual/perl-Carp-1.500.0-r1
index 72a7edce03c6..d702555c87b4 100644
--- a/metadata/md5-cache/virtual/perl-Carp-1.500.0-r1
+++ b/metadata/md5-cache/virtual/perl-Carp-1.500.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Carp
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Carp-1.500.0 ) dev-lang/perl:= !<perl-core/Carp-1.500.0 !>perl-core/Carp-1.500.0-r999
 SLOT=0
-_md5_=7217adbcbbf9c27701358934e6aa5b4d
+_md5_=6078d1568643bdfe0711735d007a4097
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.76.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.76.0
index 9d5e48a8a5b2..ae4b35403698 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.76.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.76.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Zlib
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Compress-Raw-Zlib-2.76.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.76.0 !>perl-core/Compress-Raw-Zlib-2.76.0-r999
 SLOT=0
-_md5_=6a69dd25566537be57dc5434308b717b
+_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.84.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.84.0
index c55d058b6f28..ab4b95df0977 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.84.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.84.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Zlib
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Compress-Raw-Zlib-2.84.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.84.0 !>perl-core/Compress-Raw-Zlib-2.84.0-r999
 SLOT=0
-_md5_=8089a521a38ee5a03221d9101562998d
+_md5_=e6368db9933a3afd48792775091fb549
diff --git a/metadata/md5-cache/virtual/perl-Data-Dumper-2.170.0 b/metadata/md5-cache/virtual/perl-Data-Dumper-2.170.0
index d42a8af492b4..f57c970a71e0 100644
--- a/metadata/md5-cache/virtual/perl-Data-Dumper-2.170.0
+++ b/metadata/md5-cache/virtual/perl-Data-Dumper-2.170.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Data-Dumper
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Data-Dumper-2.170.0 ) dev-lang/perl:= !<perl-core/Data-Dumper-2.170.0 !>perl-core/Data-Dumper-2.170.0-r999
 SLOT=0
-_md5_=6a69dd25566537be57dc5434308b717b
+_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.400.0 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.400.0
index 462006acc782..d6fd493b84d5 100644
--- a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.400.0
+++ b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.400.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Devel-PPPort
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Devel-PPPort-3.400.0 ) dev-lang/perl:= !<perl-core/Devel-PPPort-3.400.0 !>perl-core/Devel-PPPort-3.400.0-r999
 SLOT=0
-_md5_=e5c5679a7624916095f2d9e4a04bbcc1
+_md5_=15f1cda532f436c8e56034cb1c009d51
diff --git a/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r8 b/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r8
index d767989ff30f..562f54f9596d 100644
--- a/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r8
+++ b/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r8
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/Digest-1.170.100_rc ) dev-lang/perl:= !<perl-core/Digest-1.170.100_rc !>perl-core/Digest-1.170.100_rc-r999
 SLOT=0
-_md5_=c2fa20e5f67f70a62a6e78e52881c4aa
+_md5_=4924a6e686c6185f1908751caed043fe
diff --git a/metadata/md5-cache/virtual/perl-Digest-SHA-6.10.0 b/metadata/md5-cache/virtual/perl-Digest-SHA-6.10.0
index 25337de182db..faf35d98159b 100644
--- a/metadata/md5-cache/virtual/perl-Digest-SHA-6.10.0
+++ b/metadata/md5-cache/virtual/perl-Digest-SHA-6.10.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest-SHA
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Digest-SHA-6.10.0 ) dev-lang/perl:= !<perl-core/Digest-SHA-6.10.0 !>perl-core/Digest-SHA-6.10.0-r999
 SLOT=0
-_md5_=6a69dd25566537be57dc5434308b717b
+_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
diff --git a/metadata/md5-cache/virtual/perl-Dumpvalue-1.180.0-r4 b/metadata/md5-cache/virtual/perl-Dumpvalue-1.180.0-r4
index 38534b695eef..071f4546a145 100644
--- a/metadata/md5-cache/virtual/perl-Dumpvalue-1.180.0-r4
+++ b/metadata/md5-cache/virtual/perl-Dumpvalue-1.180.0-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Dumpvalue
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/Dumpvalue-1.180.0 ) dev-lang/perl:= !<perl-core/Dumpvalue-1.180.0 !>perl-core/Dumpvalue-1.180.0-r999
 SLOT=0
-_md5_=aa98d1ab34687f26c3beb4fcb9bee18b
+_md5_=58fdd32c1364c445f8a186566d0dc165
diff --git a/metadata/md5-cache/virtual/perl-Encode-2.970.0 b/metadata/md5-cache/virtual/perl-Encode-2.970.0
index f1775f0841a4..4d83b187a669 100644
--- a/metadata/md5-cache/virtual/perl-Encode-2.970.0
+++ b/metadata/md5-cache/virtual/perl-Encode-2.970.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Encode
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Encode-2.970.0 ) dev-lang/perl:= !<perl-core/Encode-2.970.0 !>perl-core/Encode-2.970.0-r999
 SLOT=0
-_md5_=6a69dd25566537be57dc5434308b717b
+_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
diff --git a/metadata/md5-cache/virtual/perl-Exporter-5.730.0-r1 b/metadata/md5-cache/virtual/perl-Exporter-5.730.0-r1
index bb865c9b5666..ea1f5b25ecae 100644
--- a/metadata/md5-cache/virtual/perl-Exporter-5.730.0-r1
+++ b/metadata/md5-cache/virtual/perl-Exporter-5.730.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Exporter
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Exporter-5.730.0 ) dev-lang/perl:= !<perl-core/Exporter-5.730.0 !>perl-core/Exporter-5.730.0-r999
 SLOT=0
-_md5_=7217adbcbbf9c27701358934e6aa5b4d
+_md5_=6078d1568643bdfe0711735d007a4097
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.230 b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.230
index 9a9945df4ea5..d4901d087845 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.230
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.230
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-CBuilder
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/ExtUtils-CBuilder-0.280.230 ) dev-lang/perl:= !<perl-core/ExtUtils-CBuilder-0.280.230 !>perl-core/ExtUtils-CBuilder-0.280.230-r999
 SLOT=0
-_md5_=6a69dd25566537be57dc5434308b717b
+_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r1
index 761b9fdf0d91..2637bae55b1c 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r1
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Constant
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/ExtUtils-Constant-0.250.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Constant-0.250.0 !>perl-core/ExtUtils-Constant-0.250.0-r999
 SLOT=0
-_md5_=318a7718f7fb9b1e24b4e16ba3108701
+_md5_=7e40136750761b6f6a2c304ac7acf30a
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r1
index a6b45c3efe00..35c4173f9d79 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r1
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Install
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/ExtUtils-Install-2.140.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Install-2.140.0 !>perl-core/ExtUtils-Install-2.140.0-r999
 SLOT=0
-_md5_=0704054782fa28b148c3df69cb5e1a3a
+_md5_=1e4bbae7e0fc59e26a632a671be158c9
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r1
index 6483dba8964e..43d6904d4c09 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r1
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-MakeMaker
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/ExtUtils-MakeMaker-7.340.0 ) dev-lang/perl:= !<perl-core/ExtUtils-MakeMaker-7.340.0 !>perl-core/ExtUtils-MakeMaker-7.340.0-r999
 SLOT=0
-_md5_=7217adbcbbf9c27701358934e6aa5b4d
+_md5_=6078d1568643bdfe0711735d007a4097
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.390.0 b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.390.0
index bf52bdd34344..c7eb876ffff2 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.390.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.390.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-ParseXS
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/ExtUtils-ParseXS-3.390.0 ) dev-lang/perl:= !<perl-core/ExtUtils-ParseXS-3.390.0 !>perl-core/ExtUtils-ParseXS-3.390.0-r999
 SLOT=0
-_md5_=6a69dd25566537be57dc5434308b717b
+_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.150.0 b/metadata/md5-cache/virtual/perl-File-Path-2.150.0
index 7466387ab061..ea100ddb4f75 100644
--- a/metadata/md5-cache/virtual/perl-File-Path-2.150.0
+++ b/metadata/md5-cache/virtual/perl-File-Path-2.150.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Path
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/File-Path-2.150.0 ) dev-lang/perl:= !<perl-core/File-Path-2.150.0 !>perl-core/File-Path-2.150.0-r999
 SLOT=0
-_md5_=8fe46df71baeb3746f4c12b4071011d2
+_md5_=11f0d5ad8a9538a46c953c1155982388
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.740.0 b/metadata/md5-cache/virtual/perl-File-Spec-3.740.0
index 6ab413e52163..929771c20db2 100644
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.740.0
+++ b/metadata/md5-cache/virtual/perl-File-Spec-3.740.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Spec
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/File-Spec-3.740.0 ) dev-lang/perl:= !<perl-core/File-Spec-3.740.0 !>perl-core/File-Spec-3.740.0-r999
 SLOT=0
-_md5_=6a69dd25566537be57dc5434308b717b
+_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
diff --git a/metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r1 b/metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r1
index 61e03221327a..e12f070749eb 100644
--- a/metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r1
+++ b/metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for perl-core/Filter-Simple
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Filter-Simple-0.950.0 ) dev-lang/perl:= !<perl-core/Filter-Simple-0.950.0 !>perl-core/Filter-Simple-0.950.0-r999
 SLOT=0
-_md5_=e274acd94a23cf5234d000d9653d24c9
+_md5_=f2a2846b093db93578dd6190c97c7d58
diff --git a/metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r1 b/metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r1
index e7682a712d73..21fdf807ae18 100644
--- a/metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r1
+++ b/metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Getopt-Long
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Getopt-Long-2.500.0 ) dev-lang/perl:= !<perl-core/Getopt-Long-2.500.0 !>perl-core/Getopt-Long-2.500.0-r999
 SLOT=0
-_md5_=7217adbcbbf9c27701358934e6aa5b4d
+_md5_=6078d1568643bdfe0711735d007a4097
diff --git a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.430.0-r1 b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.430.0-r1
index e6b142e07fbd..14292bf253ec 100644
--- a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.430.0-r1
+++ b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.430.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for I18N-LangTags
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/I18N-LangTags-0.430.0 ) dev-lang/perl:= !<perl-core/I18N-LangTags-0.430.0 !>perl-core/I18N-LangTags-0.430.0-r999
 SLOT=0
-_md5_=7dd31b36998a91fc716d6f63484191a4
+_md5_=dc0cbee4326d9dfe4188d7c9284a7081
diff --git a/metadata/md5-cache/virtual/perl-IO-1.390.0 b/metadata/md5-cache/virtual/perl-IO-1.390.0
index 40b093ed2257..3f20246152fb 100644
--- a/metadata/md5-cache/virtual/perl-IO-1.390.0
+++ b/metadata/md5-cache/virtual/perl-IO-1.390.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/IO-1.390.0 ) dev-lang/perl:= !<perl-core/IO-1.390.0 !>perl-core/IO-1.390.0-r999
 SLOT=0
-_md5_=6a69dd25566537be57dc5434308b717b
+_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
diff --git a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.390.0-r1 b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.390.0-r1
index 36b2c3fdbf00..23bcf82beab7 100644
--- a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.390.0-r1
+++ b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.390.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Socket-IP
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/IO-Socket-IP-0.390.0 ) dev-lang/perl:= !<perl-core/IO-Socket-IP-0.390.0 !>perl-core/IO-Socket-IP-0.390.0-r999
 SLOT=0
-_md5_=7217adbcbbf9c27701358934e6aa5b4d
+_md5_=6078d1568643bdfe0711735d007a4097
diff --git a/metadata/md5-cache/virtual/perl-IPC-Cmd-1.0.0 b/metadata/md5-cache/virtual/perl-IPC-Cmd-1.0.0
index 2e8d8d637499..a544e5b4f2d3 100644
--- a/metadata/md5-cache/virtual/perl-IPC-Cmd-1.0.0
+++ b/metadata/md5-cache/virtual/perl-IPC-Cmd-1.0.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IPC-Cmd
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/IPC-Cmd-1.0.0 ) dev-lang/perl:= !<perl-core/IPC-Cmd-1.0.0 !>perl-core/IPC-Cmd-1.0.0-r999
 SLOT=0
-_md5_=8fe46df71baeb3746f4c12b4071011d2
+_md5_=11f0d5ad8a9538a46c953c1155982388
diff --git a/metadata/md5-cache/virtual/perl-JSON-PP-2.970.10 b/metadata/md5-cache/virtual/perl-JSON-PP-2.970.10
index 6b11df01259b..5837aacd30c7 100644
--- a/metadata/md5-cache/virtual/perl-JSON-PP-2.970.10
+++ b/metadata/md5-cache/virtual/perl-JSON-PP-2.970.10
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for JSON-PP
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/JSON-PP-2.970.10 ) dev-lang/perl:= !<perl-core/JSON-PP-2.970.10 !>perl-core/JSON-PP-2.970.10-r999
 SLOT=0
-_md5_=6a69dd25566537be57dc5434308b717b
+_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
diff --git a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0-r1 b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0-r1
index 1f77aa0beb10..271c4bb77ebf 100644
--- a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0-r1
+++ b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Locale-Maketext
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Locale-Maketext-1.290.0 ) dev-lang/perl:= !<perl-core/Locale-Maketext-1.290.0 !>perl-core/Locale-Maketext-1.290.0-r999
 SLOT=0
-_md5_=3799570310ded9045e84e0553edb3594
+_md5_=85180b9faa4eaf6347c3230bbb92ee73
diff --git a/metadata/md5-cache/virtual/perl-Locale-Maketext-Simple-0.210.100_rc-r8 b/metadata/md5-cache/virtual/perl-Locale-Maketext-Simple-0.210.100_rc-r8
index e703203cd721..81a42d845685 100644
--- a/metadata/md5-cache/virtual/perl-Locale-Maketext-Simple-0.210.100_rc-r8
+++ b/metadata/md5-cache/virtual/perl-Locale-Maketext-Simple-0.210.100_rc-r8
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Locale-Maketext-Simple
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/Locale-Maketext-Simple-0.210.100_rc ) dev-lang/perl:= !<perl-core/Locale-Maketext-Simple-0.210.100_rc !>perl-core/Locale-Maketext-Simple-0.210.100_rc-r999
 SLOT=0
-_md5_=6dd27ef9315d345f4cdd24679522c843
+_md5_=4924a6e686c6185f1908751caed043fe
diff --git a/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.811 b/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.811
index 95e0b134daa6..22b636be06c9 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.811
+++ b/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.811
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigInt
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Math-BigInt-1.999.811 ) dev-lang/perl:= !<perl-core/Math-BigInt-1.999.811 !>perl-core/Math-BigInt-1.999.811-r999
 SLOT=0
-_md5_=4ab000927268fb968f40797fc5a334d0
+_md5_=15f1cda532f436c8e56034cb1c009d51
diff --git a/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.600 b/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.600
index e8f851e3d05d..45d5feae70e6 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.600
+++ b/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.600
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigInt-FastCalc
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Math-BigInt-FastCalc-0.500.600 ) dev-lang/perl:= !<perl-core/Math-BigInt-FastCalc-0.500.600 !>perl-core/Math-BigInt-FastCalc-0.500.600-r999
 SLOT=0
-_md5_=4ab000927268fb968f40797fc5a334d0
+_md5_=15f1cda532f436c8e56034cb1c009d51
diff --git a/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.300 b/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.300
index e701be9673ad..3037976f5252 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.300
+++ b/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.300
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigRat
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Math-BigRat-0.261.300 ) dev-lang/perl:= !<perl-core/Math-BigRat-0.261.300 !>perl-core/Math-BigRat-0.261.300-r999
 SLOT=0
-_md5_=4ab000927268fb968f40797fc5a334d0
+_md5_=15f1cda532f436c8e56034cb1c009d51
diff --git a/metadata/md5-cache/virtual/perl-Memoize-1.30.100_rc-r8 b/metadata/md5-cache/virtual/perl-Memoize-1.30.100_rc-r8
index d4392ba6e94d..64ef6893e8d0 100644
--- a/metadata/md5-cache/virtual/perl-Memoize-1.30.100_rc-r8
+++ b/metadata/md5-cache/virtual/perl-Memoize-1.30.100_rc-r8
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Memoize
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/Memoize-1.30.100_rc ) dev-lang/perl:= !<perl-core/Memoize-1.30.100_rc !>perl-core/Memoize-1.30.100_rc-r999
 SLOT=0
-_md5_=6dd27ef9315d345f4cdd24679522c843
+_md5_=4924a6e686c6185f1908751caed043fe
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.904.190 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.904.190
index 0901ce4c7b9a..a620373effc9 100644
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.904.190
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.904.190
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-CoreList
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28.2* ~perl-core/Module-CoreList-5.201.904.190 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.201.904.190 !>perl-core/Module-CoreList-5.201.904.190-r999
 SLOT=0
-_md5_=7260a1cda1375469a6aa2ff42049df0f
+_md5_=dd53f6eebb3869efd38d391fdc51f9d3
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.200 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.200
deleted file mode 100644
index 80f69ed0f87c..000000000000
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.200
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Module-CoreList
-EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30.0* ~perl-core/Module-CoreList-5.201.905.200 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.201.905.200 !>perl-core/Module-CoreList-5.201.905.200-r999
-SLOT=0
-_md5_=df9f8dc8b915d37958d833ea4d0911e8
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.220 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.220
new file mode 100644
index 000000000000..20735a39b7de
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.220
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Module-CoreList
+EAPI=6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=|| ( =dev-lang/perl-5.30.0* ~perl-core/Module-CoreList-5.201.905.220 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.201.905.220 !>perl-core/Module-CoreList-5.201.905.220-r999
+SLOT=0
+_md5_=df9f8dc8b915d37958d833ea4d0911e8
diff --git a/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r11 b/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r11
index 6469ce9bd3f5..cea0faba3333 100644
--- a/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r11
+++ b/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r11
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-Loaded
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/Module-Loaded-0.80.0 ) dev-lang/perl:= !<perl-core/Module-Loaded-0.80.0 !>perl-core/Module-Loaded-0.80.0-r999
 SLOT=0
-_md5_=3d7e4600c4afe36aad877cfed7ab87d6
+_md5_=e27f12c45d4ec60451961b878d84520a
diff --git a/metadata/md5-cache/virtual/perl-Net-Ping-2.620.0 b/metadata/md5-cache/virtual/perl-Net-Ping-2.620.0
index 34d62bd37243..913a0ffa740f 100644
--- a/metadata/md5-cache/virtual/perl-Net-Ping-2.620.0
+++ b/metadata/md5-cache/virtual/perl-Net-Ping-2.620.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Net-Ping
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Net-Ping-2.620.0 ) dev-lang/perl:= !<perl-core/Net-Ping-2.620.0 !>perl-core/Net-Ping-2.620.0-r999
 SLOT=0
-_md5_=68641c0abd7204a629440f2d5a9a37de
+_md5_=3228b4c0db74321d57e47c0913d06bad
diff --git a/metadata/md5-cache/virtual/perl-Pod-Escapes-1.70.0-r5 b/metadata/md5-cache/virtual/perl-Pod-Escapes-1.70.0-r5
index f110eb9b01dc..b8ba6f94d87d 100644
--- a/metadata/md5-cache/virtual/perl-Pod-Escapes-1.70.0-r5
+++ b/metadata/md5-cache/virtual/perl-Pod-Escapes-1.70.0-r5
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Pod-Escapes
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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 ~x86-macos ~sparc-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/Pod-Escapes-1.70.0 ) dev-lang/perl:= !<perl-core/Pod-Escapes-1.70.0 !>perl-core/Pod-Escapes-1.70.0-r999
 SLOT=0
-_md5_=add016a0d1a6aa910f46664e660fc64b
+_md5_=6f310a5e8cd413cfd74af35c283ed63e
diff --git a/metadata/md5-cache/virtual/perl-Pod-Parser-1.630.0-r5 b/metadata/md5-cache/virtual/perl-Pod-Parser-1.630.0-r5
index 28678d80f818..e65a18ac1ea5 100644
--- a/metadata/md5-cache/virtual/perl-Pod-Parser-1.630.0-r5
+++ b/metadata/md5-cache/virtual/perl-Pod-Parser-1.630.0-r5
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Pod-Parser
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/Pod-Parser-1.630.0 ) dev-lang/perl:= !<perl-core/Pod-Parser-1.630.0 !>perl-core/Pod-Parser-1.630.0-r999
 SLOT=0
-_md5_=2ff1d799736940f2779b53a09812216f
+_md5_=d7c50190138f794e89821ee8bcc68be4
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.500.0-r1 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.500.0-r1
index 599e505cf145..95881b7ef7ec 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.500.0-r1
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.500.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Scalar-List-Utils-1.500.0 ) dev-lang/perl:= !<perl-core/Scalar-List-Utils-1.500.0 !>perl-core/Scalar-List-Utils-1.500.0-r999
 SLOT=0
-_md5_=2099e802facb6a0fe0c78eea09d67e65
+_md5_=c12169e0beb14cbf05c3cb7077f55fdf
diff --git a/metadata/md5-cache/virtual/perl-Socket-2.27.0-r1 b/metadata/md5-cache/virtual/perl-Socket-2.27.0-r1
index d11936012b40..541ced3a6b62 100644
--- a/metadata/md5-cache/virtual/perl-Socket-2.27.0-r1
+++ b/metadata/md5-cache/virtual/perl-Socket-2.27.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Socket
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Socket-2.27.0 ) dev-lang/perl:= !<perl-core/Socket-2.27.0 !>perl-core/Socket-2.27.0-r999
 SLOT=0
-_md5_=7217adbcbbf9c27701358934e6aa5b4d
+_md5_=6078d1568643bdfe0711735d007a4097
diff --git a/metadata/md5-cache/virtual/perl-Storable-3.80.100_rc b/metadata/md5-cache/virtual/perl-Storable-3.80.100_rc
index 91d51a3e0be0..326a9dca5c53 100644
--- a/metadata/md5-cache/virtual/perl-Storable-3.80.100_rc
+++ b/metadata/md5-cache/virtual/perl-Storable-3.80.100_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Storable
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28.2* ~perl-core/Storable-3.80.100_rc ) dev-lang/perl:= !<perl-core/Storable-3.80.100_rc !>perl-core/Storable-3.80.100_rc-r999
 SLOT=0
-_md5_=2e50444f31bcf42750f1a4d2b4e5d8e0
+_md5_=a95d3f2d9afdf485a330f0e614f8f9fc
diff --git a/metadata/md5-cache/virtual/perl-Test-1.310.0-r1 b/metadata/md5-cache/virtual/perl-Test-1.310.0-r1
index 8c00608092cc..0aec3f89fb6f 100644
--- a/metadata/md5-cache/virtual/perl-Test-1.310.0-r1
+++ b/metadata/md5-cache/virtual/perl-Test-1.310.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Test-1.310.0 ) dev-lang/perl:= !<perl-core/Test-1.310.0 !>perl-core/Test-1.310.0-r999
 SLOT=0
-_md5_=7217adbcbbf9c27701358934e6aa5b4d
+_md5_=6078d1568643bdfe0711735d007a4097
diff --git a/metadata/md5-cache/virtual/perl-Test-Harness-3.420.0-r1 b/metadata/md5-cache/virtual/perl-Test-Harness-3.420.0-r1
index e0fb226508a8..04ed75b2a875 100644
--- a/metadata/md5-cache/virtual/perl-Test-Harness-3.420.0-r1
+++ b/metadata/md5-cache/virtual/perl-Test-Harness-3.420.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Harness
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Test-Harness-3.420.0 ) dev-lang/perl:= !<perl-core/Test-Harness-3.420.0 !>perl-core/Test-Harness-3.420.0-r999
 SLOT=0
-_md5_=7217adbcbbf9c27701358934e6aa5b4d
+_md5_=6078d1568643bdfe0711735d007a4097
diff --git a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.133 b/metadata/md5-cache/virtual/perl-Test-Simple-1.302.133
index 768cc2762836..183d8d5183b3 100644
--- a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.133
+++ b/metadata/md5-cache/virtual/perl-Test-Simple-1.302.133
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Simple
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Test-Simple-1.302.133 ) dev-lang/perl:= !<dev-perl/Test-Tester-0.114.0 !<dev-perl/Test-use-ok-0.160.0
 SLOT=0
-_md5_=b877fc19bcf6f9ddd925191f414f56a6
+_md5_=ab9df65542a8de1f60a2c087a05e5c9c
diff --git a/metadata/md5-cache/virtual/perl-Text-Balanced-2.30.0-r5 b/metadata/md5-cache/virtual/perl-Text-Balanced-2.30.0-r5
index 7ffc989ed7d8..2507afc6e23d 100644
--- a/metadata/md5-cache/virtual/perl-Text-Balanced-2.30.0-r5
+++ b/metadata/md5-cache/virtual/perl-Text-Balanced-2.30.0-r5
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Text-Balanced
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/Text-Balanced-2.30.0 ) dev-lang/perl:= !<perl-core/Text-Balanced-2.30.0 !>perl-core/Text-Balanced-2.30.0-r999
 SLOT=0
-_md5_=2ff1d799736940f2779b53a09812216f
+_md5_=d7c50190138f794e89821ee8bcc68be4
diff --git a/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r10 b/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r10
index c54dc1b8a3da..b3633760d308 100644
--- a/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r10
+++ b/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r10
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Tie-RefHash
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-cygwin ~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 ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/Tie-RefHash-1.390.0 ) dev-lang/perl:= !<perl-core/Tie-RefHash-1.390.0 !>perl-core/Tie-RefHash-1.390.0-r999
 SLOT=0
-_md5_=b0638ccd8691d47ae810c6a4f7b1b80b
+_md5_=f4351d7ee41f96f62d31fb5a0934bc2e
diff --git a/metadata/md5-cache/virtual/perl-Time-HiRes-1.975.900 b/metadata/md5-cache/virtual/perl-Time-HiRes-1.975.900
index 22084805c5eb..004254272f2f 100644
--- a/metadata/md5-cache/virtual/perl-Time-HiRes-1.975.900
+++ b/metadata/md5-cache/virtual/perl-Time-HiRes-1.975.900
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-HiRes
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Time-HiRes-1.975.900 ) dev-lang/perl:= !<perl-core/Time-HiRes-1.975.900 !>perl-core/Time-HiRes-1.975.900-r999
 SLOT=0
-_md5_=8fe46df71baeb3746f4c12b4071011d2
+_md5_=11f0d5ad8a9538a46c953c1155982388
diff --git a/metadata/md5-cache/virtual/perl-Time-Piece-1.320.400 b/metadata/md5-cache/virtual/perl-Time-Piece-1.320.400
index c9c687b80bcb..8e4722b6aa43 100644
--- a/metadata/md5-cache/virtual/perl-Time-Piece-1.320.400
+++ b/metadata/md5-cache/virtual/perl-Time-Piece-1.320.400
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-Piece
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Time-Piece-1.320.400 ) dev-lang/perl:= !<perl-core/Time-Piece-1.320.400 !>perl-core/Time-Piece-1.320.400-r999
 SLOT=0
-_md5_=52710004c5da1610c9a47cf29e74dc74
+_md5_=724f30df8c998f37ad843db45dc60c10
diff --git a/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0 b/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0
index 45161324fead..0eb25f7f296a 100644
--- a/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0
+++ b/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Unicode-Collate
 EAPI=6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Unicode-Collate-1.250.0 ) dev-lang/perl:= !<perl-core/Unicode-Collate-1.250.0 !>perl-core/Unicode-Collate-1.250.0-r999
 SLOT=0
-_md5_=53665131aaf726d32f100eb2b152cb83
+_md5_=11f0d5ad8a9538a46c953c1155982388
diff --git a/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.260.0-r1 b/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.260.0-r1
index 6b55b22f410e..291139e111ca 100644
--- a/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.260.0-r1
+++ b/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.260.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Unicode-Normalize
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Unicode-Normalize-1.260.0 ) dev-lang/perl:= !<perl-core/Unicode-Normalize-1.260.0 !>perl-core/Unicode-Normalize-1.260.0-r999
 SLOT=0
-_md5_=d9b4fa3f6cbb00a9c9c5f342dcca7280
+_md5_=885326f434da866b05d921b60dd134a2
diff --git a/metadata/md5-cache/virtual/perl-XSLoader-0.300.0-r1 b/metadata/md5-cache/virtual/perl-XSLoader-0.300.0-r1
index 88e4d15d3bff..a3861bf23751 100644
--- a/metadata/md5-cache/virtual/perl-XSLoader-0.300.0-r1
+++ b/metadata/md5-cache/virtual/perl-XSLoader-0.300.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for XSLoader
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/XSLoader-0.300.0 ) dev-lang/perl:= !<perl-core/XSLoader-0.300.0 !>perl-core/XSLoader-0.300.0-r999
 SLOT=0
-_md5_=7217adbcbbf9c27701358934e6aa5b4d
+_md5_=6078d1568643bdfe0711735d007a4097
diff --git a/metadata/md5-cache/virtual/perl-autodie-2.290.0-r4 b/metadata/md5-cache/virtual/perl-autodie-2.290.0-r4
index b42c867386ab..7fa3932f73f6 100644
--- a/metadata/md5-cache/virtual/perl-autodie-2.290.0-r4
+++ b/metadata/md5-cache/virtual/perl-autodie-2.290.0-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for autodie
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/autodie-2.290.0 ) dev-lang/perl:= !<perl-core/autodie-2.290.0 !>perl-core/autodie-2.290.0-r999
 SLOT=0
-_md5_=a79a458841faee49f60f49d924c318db
+_md5_=d7c50190138f794e89821ee8bcc68be4
diff --git a/metadata/md5-cache/virtual/perl-bignum-0.490.0 b/metadata/md5-cache/virtual/perl-bignum-0.490.0
index 16c08e9c207a..c9d8e5c6a5b2 100644
--- a/metadata/md5-cache/virtual/perl-bignum-0.490.0
+++ b/metadata/md5-cache/virtual/perl-bignum-0.490.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for bignum
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/bignum-0.490.0 ) dev-lang/perl:= !<perl-core/bignum-0.490.0 !>perl-core/bignum-0.490.0-r999
 SLOT=0
-_md5_=4ab000927268fb968f40797fc5a334d0
+_md5_=15f1cda532f436c8e56034cb1c009d51
diff --git a/metadata/md5-cache/virtual/perl-if-0.60.800-r1 b/metadata/md5-cache/virtual/perl-if-0.60.800-r1
index 7533446504c0..df9d17525a6b 100644
--- a/metadata/md5-cache/virtual/perl-if-0.60.800-r1
+++ b/metadata/md5-cache/virtual/perl-if-0.60.800-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for if
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/if-0.60.800 ) dev-lang/perl:= !<perl-core/if-0.60.800 !>perl-core/if-0.60.800-r999
 SLOT=0
-_md5_=7217adbcbbf9c27701358934e6aa5b4d
+_md5_=6078d1568643bdfe0711735d007a4097
diff --git a/metadata/md5-cache/virtual/perl-libnet-3.110.0-r1 b/metadata/md5-cache/virtual/perl-libnet-3.110.0-r1
index 5353b86a3bc0..d5912b2b95e9 100644
--- a/metadata/md5-cache/virtual/perl-libnet-3.110.0-r1
+++ b/metadata/md5-cache/virtual/perl-libnet-3.110.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for libnet
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/libnet-3.110.0 ) dev-lang/perl:= !<perl-core/libnet-3.110.0 !>perl-core/libnet-3.110.0-r999
 SLOT=0
-_md5_=7217adbcbbf9c27701358934e6aa5b4d
+_md5_=6078d1568643bdfe0711735d007a4097
diff --git a/metadata/md5-cache/virtual/perl-podlators-4.100.0 b/metadata/md5-cache/virtual/perl-podlators-4.100.0
index adf53768b243..f421dcbd0feb 100644
--- a/metadata/md5-cache/virtual/perl-podlators-4.100.0
+++ b/metadata/md5-cache/virtual/perl-podlators-4.100.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for podlators
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/podlators-4.100.0 ) dev-lang/perl:= !<perl-core/podlators-4.100.0 !>perl-core/podlators-4.100.0-r999
 SLOT=0
-_md5_=6a69dd25566537be57dc5434308b717b
+_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
diff --git a/metadata/md5-cache/virtual/perl-threads-2.220.0-r1 b/metadata/md5-cache/virtual/perl-threads-2.220.0-r1
index 7688e0c3a6d3..64d892ef4576 100644
--- a/metadata/md5-cache/virtual/perl-threads-2.220.0-r1
+++ b/metadata/md5-cache/virtual/perl-threads-2.220.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.30*[ithreads] =dev-lang/perl-5.28*[ithreads] ~perl-core/threads-2.220.0 ) dev-lang/perl:= !<perl-core/threads-2.220.0 !>perl-core/threads-2.220.0-r999
 SLOT=0
-_md5_=f35644c0e3d6c253bfdf9ca0a46352cb
+_md5_=2be82c404132f96f836bb043d3d8c8f0
diff --git a/metadata/md5-cache/virtual/perl-threads-shared-1.580.0 b/metadata/md5-cache/virtual/perl-threads-shared-1.580.0
index 79dd6a51ac3c..82e1d44a02f3 100644
--- a/metadata/md5-cache/virtual/perl-threads-shared-1.580.0
+++ b/metadata/md5-cache/virtual/perl-threads-shared-1.580.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads-shared
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/threads-shared-1.580.0 ) dev-lang/perl:= !<perl-core/threads-shared-1.580.0 !>perl-core/threads-shared-1.580.0-r999
 SLOT=0
-_md5_=9d085690709fdb1a5986ed37fe9a0ac1
+_md5_=cc1be37975af04220bd335f42dff9971
diff --git a/metadata/md5-cache/virtual/perl-version-0.992.300 b/metadata/md5-cache/virtual/perl-version-0.992.300
index 5bdc3bbab823..f80aff4601d3 100644
--- a/metadata/md5-cache/virtual/perl-version-0.992.300
+++ b/metadata/md5-cache/virtual/perl-version-0.992.300
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for version
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/version-0.992.300 ) dev-lang/perl:= !<perl-core/version-0.992.300 !>perl-core/version-0.992.300-r999
 SLOT=0
-_md5_=6a69dd25566537be57dc5434308b717b
+_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
diff --git a/metadata/md5-cache/virtual/pypy-6.0.0 b/metadata/md5-cache/virtual/pypy-6.0.0
deleted file mode 100644
index 95091214c0df..000000000000
--- a/metadata/md5-cache/virtual/pypy-6.0.0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for PyPy Python implementation
-EAPI=6
-IUSE=bzip2 gdbm ncurses sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( >=dev-python/pypy-6.0.0:0/41[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?] >=dev-python/pypy-bin-6.0.0:0/41[gdbm(-)?,sqlite?,tk?] )
-SLOT=0/41
-_md5_=0baa069f973a54fd934c0d6c28ce3cb9
diff --git a/metadata/md5-cache/virtual/pypy-7.0.0 b/metadata/md5-cache/virtual/pypy-7.0.0
deleted file mode 100644
index d6b67cd1b101..000000000000
--- a/metadata/md5-cache/virtual/pypy-7.0.0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for PyPy Python implementation
-EAPI=7
-IUSE=bzip2 gdbm ncurses sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( >=dev-python/pypy-7.0.0:0/41-py27[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?] >=dev-python/pypy-bin-7.0.0:0/41-py27[gdbm(-)?,sqlite?,tk?] )
-SLOT=0/41-py27
-_md5_=613281424cc967e843f41f85fa47ecdd
diff --git a/metadata/md5-cache/virtual/pypy-7.1.0 b/metadata/md5-cache/virtual/pypy-7.1.0
deleted file mode 100644
index a6bfc97f365f..000000000000
--- a/metadata/md5-cache/virtual/pypy-7.1.0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for PyPy Python implementation
-EAPI=7
-IUSE=bzip2 gdbm ncurses sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( >=dev-python/pypy-7.1.0:0/41-py27[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?] >=dev-python/pypy-bin-7.1.0:0/41-py27[gdbm(-)?,sqlite?,tk?] )
-SLOT=0/41-py27
-_md5_=613281424cc967e843f41f85fa47ecdd
diff --git a/metadata/md5-cache/virtual/pypy3-6.0.0 b/metadata/md5-cache/virtual/pypy3-6.0.0
deleted file mode 100644
index f750ec31ff65..000000000000
--- a/metadata/md5-cache/virtual/pypy3-6.0.0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for PyPy3 Python implementation
-EAPI=6
-IUSE=bzip2 gdbm ncurses sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( >=dev-python/pypy3-6.0.0:0/60[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?] >=dev-python/pypy3-bin-6.0.0:0/60[gdbm(-)?,sqlite?,tk?] )
-SLOT=0/60
-_md5_=98ebfe538a16178f7e8d1ad3e2e8f46a
diff --git a/metadata/md5-cache/virtual/pypy3-7.0.0 b/metadata/md5-cache/virtual/pypy3-7.0.0
deleted file mode 100644
index f3834a83a9f6..000000000000
--- a/metadata/md5-cache/virtual/pypy3-7.0.0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for PyPy3 Python implementation
-EAPI=7
-IUSE=bzip2 gdbm ncurses sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( >=dev-python/pypy3-7.0.0:0/71[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?] >=dev-python/pypy3-bin-7.0.0:0/71[gdbm(-)?,sqlite?,tk?] )
-SLOT=0/71
-_md5_=5f9ba7afd18fc89913a94092b555ad6f
diff --git a/metadata/md5-cache/virtual/pypy3-7.1.0 b/metadata/md5-cache/virtual/pypy3-7.1.0
deleted file mode 100644
index 33fb3dfe43bd..000000000000
--- a/metadata/md5-cache/virtual/pypy3-7.1.0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for PyPy3 Python implementation
-EAPI=7
-IUSE=bzip2 gdbm ncurses sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( >=dev-python/pypy3-7.1.0:0/71-py36[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?] >=dev-python/pypy3-bin-7.1.0:0/71-py36[gdbm(-)?,sqlite?,tk?] )
-SLOT=0/71-py36
-_md5_=1ab7cc70bd0a9e1da689d025b6b75be9
diff --git a/metadata/md5-cache/virtual/python-funcsigs-2 b/metadata/md5-cache/virtual/python-funcsigs-2
deleted file mode 100644
index b32cd1218ab4..000000000000
--- a/metadata/md5-cache/virtual/python-funcsigs-2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A Virtual for Python function signatures from PEP362 (py3.6 variant)
-EAPI=6
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/funcsigs-1[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_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_pypy3? ( >=dev-python/funcsigs-1[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_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-python/funcsigs-1[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_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( >=dev-python/funcsigs-1[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_python3_5(-)?,-python_single_target_python3_5(-)] )
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=02ce9dc9321e1068385adf17a86fd0e3
diff --git a/metadata/md5-cache/virtual/python-funcsigs-2-r1 b/metadata/md5-cache/virtual/python-funcsigs-2-r1
new file mode 100644
index 000000000000..fc2566678214
--- /dev/null
+++ b/metadata/md5-cache/virtual/python-funcsigs-2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=A Virtual for Python function signatures from PEP362 (py3.6 variant)
+EAPI=6
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/funcsigs-1[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-python/funcsigs-1[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( >=dev-python/funcsigs-1[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] )
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=137cbedeb1fbbf421238668215b09ffa
diff --git a/metadata/md5-cache/virtual/resolvconf-1 b/metadata/md5-cache/virtual/resolvconf-1
index f68accf82b11..6e27f26aec40 100644
--- a/metadata/md5-cache/virtual/resolvconf-1
+++ b/metadata/md5-cache/virtual/resolvconf-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to select between different resolvconf providers
 EAPI=7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 RDEPEND=|| ( net-dns/openresolv >=sys-apps/systemd-239-r1[resolvconf] )
 SLOT=0
-_md5_=75e1cb945f984f18913bb709b115868b
+_md5_=00db8e4b3fdd9840d5926c32ffd342b0
diff --git a/metadata/md5-cache/virtual/rust-1.35.0 b/metadata/md5-cache/virtual/rust-1.35.0
new file mode 100644
index 000000000000..dadb292293be
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.35.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=7
+KEYWORDS=~amd64 arm64 ~ppc64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.35.0* =dev-lang/rust-bin-1.35.0* )
+SLOT=0
+_md5_=2eaba788565eb6959beaa5d76b99d4ea
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 492f0c95276f..356984c12d9f 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.15.0 b/metadata/md5-cache/www-apache/mod_h2-1.15.0
new file mode 100644
index 000000000000..0e66b21abc44
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-1.15.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4* >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=HTTP/2 module for Apache
+EAPI=6
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/releases/download/v1.15.0/mod_http2-1.15.0.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e7c83c81726c8543ff5006cc73350d01
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.15.1 b/metadata/md5-cache/www-apache/mod_h2-1.15.1
new file mode 100644
index 000000000000..21444d7ec7c6
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-1.15.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4* >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=HTTP/2 module for Apache
+EAPI=6
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/releases/download/v1.15.1/mod_http2-1.15.1.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e7c83c81726c8543ff5006cc73350d01
diff --git a/metadata/md5-cache/www-apache/mod_macro-1.2.1 b/metadata/md5-cache/www-apache/mod_macro-1.2.1
index a30ca7850292..593f46a9676e 100644
--- a/metadata/md5-cache/www-apache/mod_macro-1.2.1
+++ b/metadata/md5-cache/www-apache/mod_macro-1.2.1
@@ -3,10 +3,10 @@ DEPEND=sys-devel/libtool =www-servers/apache-2.4*
 DESCRIPTION=An Apache2 module providing macros for the Apache config file
 EAPI=0
 HOMEPAGE=http://www.coelho.net/mod_macro/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND==www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://people.apache.org/~fabien/mod_macro/mod_macro-1.2.1.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=7c5248e2baccc4e382148cb35574a298
+_md5_=926e1691c3dd9e9efc0d26550dfb3868
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 46df0f043363..758c11348e20 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/airdcpp-webui-2.5.1 b/metadata/md5-cache/www-apps/airdcpp-webui-2.5.1
deleted file mode 100644
index fd3b92ade4af..000000000000
--- a/metadata/md5-cache/www-apps/airdcpp-webui-2.5.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Web interface for airdcpp-webclient
-EAPI=7
-HOMEPAGE=https://airdcpp-web.github.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND==net-p2p/airdcpp-webclient-2.5*
-SLOT=0
-SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.5.1.tgz
-_md5_=975619bdf7f1e70a45e6ba405bfb2673
diff --git a/metadata/md5-cache/www-apps/airdcpp-webui-2.5.2 b/metadata/md5-cache/www-apps/airdcpp-webui-2.5.2
deleted file mode 100644
index 285b9fc0b4ff..000000000000
--- a/metadata/md5-cache/www-apps/airdcpp-webui-2.5.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Web interface for airdcpp-webclient
-EAPI=7
-HOMEPAGE=https://airdcpp-web.github.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND==net-p2p/airdcpp-webclient-2.5*
-SLOT=0
-SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.5.2.tgz
-_md5_=fd200bd5eba867ffc7b6272eeb7487e0
diff --git a/metadata/md5-cache/www-apps/airdcpp-webui-2.6.1 b/metadata/md5-cache/www-apps/airdcpp-webui-2.6.1
new file mode 100644
index 000000000000..b0777656f82f
--- /dev/null
+++ b/metadata/md5-cache/www-apps/airdcpp-webui-2.6.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Web interface for airdcpp-webclient
+EAPI=7
+HOMEPAGE=https://airdcpp-web.github.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND==net-p2p/airdcpp-webclient-2.6*
+SLOT=0
+SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.6.1.tgz
+_md5_=fd200bd5eba867ffc7b6272eeb7487e0
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.2.0 b/metadata/md5-cache/www-apps/grafana-bin-6.2.0
new file mode 100644
index 000000000000..29ded7d9a342
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-6.2.0
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=7
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=media-libs/fontconfig
+SLOT=0
+SRC_URI=https://dl.grafana.com/oss/release/grafana-6.2.0.linux-amd64.tar.gz -> grafana-bin-6.2.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=d98abd8ebb335f7ba998d427ecdbf763
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.2.1 b/metadata/md5-cache/www-apps/grafana-bin-6.2.1
new file mode 100644
index 000000000000..ab0636329fc6
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-6.2.1
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=7
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=media-libs/fontconfig
+SLOT=0
+SRC_URI=https://dl.grafana.com/oss/release/grafana-6.2.1.linux-amd64.tar.gz -> grafana-bin-6.2.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.6.1 b/metadata/md5-cache/www-apps/icingaweb2-2.6.1
deleted file mode 100644
index 23bc676e3f22..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[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] dev-lang/php:7.2[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] dev-lang/php:7.2[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] dev-lang/php:7.2[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.6.1 -> icingaweb2-2.6.1.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0742affc516593620b1a89d43b5a7333
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.6.2-r1 b/metadata/md5-cache/www-apps/icingaweb2-2.6.2-r1
deleted file mode 100644
index 628d19780c37..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.6.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 ) 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] dev-lang/php:7.2[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 fpm 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 ) 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] dev-lang/php:7.2[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.6.2 -> icingaweb2-2.6.2.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5a92db9a6e5d1d80abb01b94f26fa99
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.6.3 b/metadata/md5-cache/www-apps/icingaweb2-2.6.3
index a3c4c70d2ea4..1285572fe4fb 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.6.3
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=6
 HOMEPAGE=http://www.icinga.org/
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) 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.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.6.3 -> icingaweb2-2.6.3.tar.gz
 _eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8281571b0cc310e442a29b8687bdd9a
+_md5_=ed83b39862cfcf3eddf8b8bbae09a189
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20190228 b/metadata/md5-cache/www-apps/ikiwiki-3.20190228
index ea097066d089..1a24759b9ad6 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20190228
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20190228
@@ -4,10 +4,10 @@ DESCRIPTION=A wiki compiler
 EAPI=5
 HOMEPAGE=http://ikiwiki.info/
 IUSE=extras minimal test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Scrubber dev-perl/HTML-Template dev-perl/URI dev-perl/Text-Markdown dev-perl/TimeDate dev-perl/YAML-LibYAML !minimal? ( dev-perl/CGI >=dev-perl/CGI-FormBuilder-3.0202 >=dev-perl/CGI-Session-4.14 dev-perl/Mail-Sendmail dev-perl/Term-ReadLine-Gnu dev-perl/XML-Simple media-gfx/imagemagick[perl] extras? ( dev-python/docutils dev-perl/Digest-SHA1 dev-perl/File-MimeInfo dev-perl/RPC-XML dev-perl/XML-Feed dev-perl/LWPx-ParanoidAgent dev-perl/Net-OpenID-Consumer ) ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20190228.orig.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ef7015d48e934cf96e30e8862a0c7f2b
+_md5_=0c97cee775a8f192dd2a23092c6d6e63
diff --git a/metadata/md5-cache/www-apps/klaus-1.2.2 b/metadata/md5-cache/www-apps/klaus-1.2.2
deleted file mode 100644
index e09e89577a00..000000000000
--- a/metadata/md5-cache/www-apps/klaus-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A simple, easy-to-set-up Git web viewer
-EAPI=6
-HOMEPAGE=https://github.com/jonashaag/klaus/
-IUSE=ctags python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[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/pygments[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/dulwich-0.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httpauth[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/humanize[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(-)] ctags? ( dev-python/python-ctags[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/klaus/klaus-1.2.2.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a97876284290088e9428e78d005eb587
diff --git a/metadata/md5-cache/www-apps/klaus-1.4.0 b/metadata/md5-cache/www-apps/klaus-1.4.0
new file mode 100644
index 000000000000..200fb002fead
--- /dev/null
+++ b/metadata/md5-cache/www-apps/klaus-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A simple, easy-to-set-up Git web viewer
+EAPI=7
+HOMEPAGE=https://github.com/jonashaag/klaus/
+IUSE=ctags python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-python/dulwich-0.19.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httpauth[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/humanize[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ctags? ( dev-python/python-ctags[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/k/klaus/klaus-1.4.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e815d0405092bcdeb9dac44f1910bcba
diff --git a/metadata/md5-cache/www-apps/moodle-3.7 b/metadata/md5-cache/www-apps/moodle-3.7
new file mode 100644
index 000000000000..6b8c155ab9ba
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=6
+HOMEPAGE=https://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-7.1[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysqli mssql postgres )
+SLOT=3.7
+SRC_URI=https://download.moodle.org/stable37/moodle-3.7.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=3cf47f19d7af4f7d21fe0c009658a1db
diff --git a/metadata/md5-cache/www-apps/owncloud-10.0.9 b/metadata/md5-cache/www-apps/owncloud-10.0.9
deleted file mode 100644
index c608cefc1526..000000000000
--- a/metadata/md5-cache/www-apps/owncloud-10.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based storage application where all your data is under your own control
-EAPI=6
-HOMEPAGE=https://owncloud.org
-IUSE=+curl mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip] virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=10.0.9
-SRC_URI=https://download.owncloud.org/community/owncloud-10.0.9.tar.bz2 -> owncloud-10.0.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=7098b04cbe49057cfc7e8aaafa5e740f
diff --git a/metadata/md5-cache/www-apps/owncloud-10.1.0 b/metadata/md5-cache/www-apps/owncloud-10.1.0
deleted file mode 100644
index 8f5c440c6fd4..000000000000
--- a/metadata/md5-cache/www-apps/owncloud-10.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based storage application where all your data is under your own control
-EAPI=6
-HOMEPAGE=https://owncloud.org
-IUSE=+curl mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip] virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=10.1.0
-SRC_URI=https://download.owncloud.org/community/owncloud-10.1.0.tar.bz2 -> owncloud-10.1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=7098b04cbe49057cfc7e8aaafa5e740f
diff --git a/metadata/md5-cache/www-apps/owncloud-10.2.0 b/metadata/md5-cache/www-apps/owncloud-10.2.0
new file mode 100644
index 000000000000..582e4c56297f
--- /dev/null
+++ b/metadata/md5-cache/www-apps/owncloud-10.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web-based storage application where all your data is under your own control
+EAPI=6
+HOMEPAGE=https://owncloud.org
+IUSE=+curl mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip] virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=10.2.0
+SRC_URI=https://download.owncloud.org/community/owncloud-10.2.0.tar.bz2 -> owncloud-10.2.0.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=7098b04cbe49057cfc7e8aaafa5e740f
diff --git a/metadata/md5-cache/www-apps/tt-rss-20190523 b/metadata/md5-cache/www-apps/tt-rss-20190523
new file mode 100644
index 000000000000..8936729a2c79
--- /dev/null
+++ b/metadata/md5-cache/www-apps/tt-rss-20190523
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prerm setup
+DEPEND=!vhosts? ( daemon? ( acl? ( sys-apps/acl ) ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX
+EAPI=7
+HOMEPAGE=https://tt-rss.org/
+IUSE=+acl daemon +mysqli postgres vhosts
+KEYWORDS=~amd64 ~arm ~mips ~x86
+LICENSE=GPL-3
+RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] ) !daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysqli postgres )
+SLOT=20190523
+SRC_URI=https://git.tt-rss.org/git/tt-rss/archive/4a2836ea90c4c471029d189a8c9fe5ec10a9521b.tar.gz -> tt-rss-20190523.tar.gz
+_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe	user	8bd74731cafdcdad8f7a63637302e073	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=4889666c45d4d5f540407bca1302e41f
diff --git a/metadata/md5-cache/www-apps/tt-rss-99999999 b/metadata/md5-cache/www-apps/tt-rss-99999999
index e81e5261d52a..d7a2dd366b4e 100644
--- a/metadata/md5-cache/www-apps/tt-rss-99999999
+++ b/metadata/md5-cache/www-apps/tt-rss-99999999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prerm setup unpack
-DEPEND=!vhosts? ( daemon? ( acl? ( sys-apps/acl ) ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-vcs/git-1.8.2.1[curl] >=app-admin/webapp-config-1.50.15
+DEPEND=!vhosts? ( daemon? ( acl? ( sys-apps/acl ) ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
 DESCRIPTION=Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX
-EAPI=6
+EAPI=7
 HOMEPAGE=https://tt-rss.org/
 IUSE=+acl daemon +mysqli postgres vhosts
 LICENSE=GPL-3
-RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,pcntl,pdo] ) !daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,pdo] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
+RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] ) !daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysqli postgres )
 SLOT=99999999
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	prefix	e51c7882b7b721e54e684f7eb143cbfe	user	8bd74731cafdcdad8f7a63637302e073	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=f0a1328243b13bf334e7b2522698296c
+_md5_=15732b2927bbee0903215752c2191054
diff --git a/metadata/md5-cache/www-apps/wordpress-5.2.1 b/metadata/md5-cache/www-apps/wordpress-5.2.1
new file mode 100644
index 000000000000..db1fe24546b4
--- /dev/null
+++ b/metadata/md5-cache/www-apps/wordpress-5.2.1
@@ -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=Wordpress PHP and MySQL based content management system (CMS)
+EAPI=7
+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=5.2.1
+SRC_URI=https://wordpress.org/wordpress-5.2.1.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=3205300a583e6bd403d2dbc7505a2a0a
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 5f17c5500164..97633ec107a8 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-73.0.3683.75 b/metadata/md5-cache/www-client/chromium-73.0.3683.75
index 0c9c81217e31..ae59a38e8de9 100644
--- a/metadata/md5-cache/www-client/chromium-73.0.3683.75
+++ b/metadata/md5-cache/www-client/chromium-73.0.3683.75
@@ -1,4 +1,4 @@
-BDEPEND=>=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
+BDEPEND=>=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl <dev-util/gn-0.1583 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
 DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.2.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
 DESCRIPTION=Open-source version of Google Chrome web browser
@@ -13,4 +13,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-73.0.3683.75.tar.xz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=46f9f02fa739ecda495cfd05d9e18619
+_md5_=96409cfd603df793ae2fc90abe4bf10f
diff --git a/metadata/md5-cache/www-client/chromium-73.0.3683.86 b/metadata/md5-cache/www-client/chromium-73.0.3683.86
index b0e949d729c5..588f50f5e6c3 100644
--- a/metadata/md5-cache/www-client/chromium-73.0.3683.86
+++ b/metadata/md5-cache/www-client/chromium-73.0.3683.86
@@ -1,4 +1,4 @@
-BDEPEND=>=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
+BDEPEND=>=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl <dev-util/gn-0.1583 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
 DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.2.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
 DESCRIPTION=Open-source version of Google Chrome web browser
@@ -13,4 +13,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-73.0.3683.86.tar.xz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5c2ae87f6dbe35695cf24af4a0fb2450
+_md5_=b55197776563439b6d1cff875fdce506
diff --git a/metadata/md5-cache/www-client/chromium-74.0.3729.169 b/metadata/md5-cache/www-client/chromium-74.0.3729.169
new file mode 100644
index 000000000000..0b70feff75a5
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-74.0.3729.169
@@ -0,0 +1,16 @@
+BDEPEND=>=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl <dev-util/gn-0.1583 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.2.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=http://chromium.org/
+IUSE=+closure-compile component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.2.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+REQUIRED_USE=component-build? ( !suid )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-74.0.3729.169.tar.xz https://dev.gentoo.org/~floppym/dist/chromium-74-e1b1f3a.patch https://dev.gentoo.org/~floppym/dist/chromium-74-2f28731.patch
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=bc7322dc389ae28adeb14ab3c4e56298
diff --git a/metadata/md5-cache/www-client/epiphany-3.30.4 b/metadata/md5-cache/www-client/epiphany-3.30.4
index 1a6b88738bf3..6b17814d4c3e 100644
--- a/metadata/md5-cache/www-client/epiphany-3.30.4
+++ b/metadata/md5-cache/www-client/epiphany-3.30.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.21.92:4= >=x11-libs/cairo-1.2 >=dev-libs/libdazzle-3.28.0 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.30/epiphany-3.30.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ce337df5af40b6dc08dabe5a9367f92b
diff --git a/metadata/md5-cache/www-client/firefox-60.7.0 b/metadata/md5-cache/www-client/firefox-60.7.0
index f57618d3d9c8..8243f0337865 100644
--- a/metadata/md5-cache/www-client/firefox-60.7.0
+++ b/metadata/md5-cache/www-client/firefox-60.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=Firefox Web Browser
 EAPI=6
 HOMEPAGE=https://www.mozilla.com/firefox
 IUSE=bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test custom-cflags custom-optimization clang dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.7.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.7.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.7.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.7.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.7.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.7.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.7.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.7.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.7.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.7.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.7.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.7.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.7.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cak.xpi -> firefox-60.7.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.7.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.7.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.7.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.7.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/dsb.xpi -> firefox-60.7.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.7.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.7.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.7.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.7.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.7.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.7.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.7.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.7.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.7.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.7.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.7.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ff.xpi -> firefox-60.7.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.7.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.7.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.7.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.7.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.7.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.7.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gn.xpi -> firefox-60.7.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.7.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.7.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.7.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.7.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.7.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.7.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.7.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.7.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.7.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.7.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.7.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ka.xpi -> firefox-60.7.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kab.xpi -> firefox-60.7.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.7.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.7.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.7.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.7.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lij.xpi -> firefox-60.7.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.7.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.7.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.7.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.7.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.7.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.7.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.7.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.7.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.7.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.7.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.7.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.7.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.7.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.7.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.7.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.7.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.7.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.7.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.7.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.7.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.7.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.7.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.7.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.7.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.7.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.7.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.7.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.7.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.7.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.7.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.7.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.7.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.7.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.7.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.7.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.7.0esr/source/firefox-60.7.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	de4a7cb850530155c3333776cdbe9308	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a815bcc6b203497dd519fcca1ed419b0
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	50181e8c428d5e8bd3a2883c4a0bbb67	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=1b4a61856bd980956c2cee0255c54900
diff --git a/metadata/md5-cache/www-client/firefox-66.0.5 b/metadata/md5-cache/www-client/firefox-66.0.5
index dd02e7564467..e232d0f8689e 100644
--- a/metadata/md5-cache/www-client/firefox-66.0.5
+++ b/metadata/md5-cache/www-client/firefox-66.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ach.xpi -> firefox-66.0.5-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/af.xpi -> firefox-66.0.5-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/an.xpi -> firefox-66.0.5-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ar.xpi -> firefox-66.0.5-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/as.xpi -> firefox-66.0.5-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ast.xpi -> firefox-66.0.5-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/az.xpi -> firefox-66.0.5-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/bg.xpi -> firefox-66.0.5-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/bn-BD.xpi -> firefox-66.0.5-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/bn-IN.xpi -> firefox-66.0.5-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/br.xpi -> firefox-66.0.5-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/bs.xpi -> firefox-66.0.5-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ca.xpi -> firefox-66.0.5-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/cak.xpi -> firefox-66.0.5-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/cs.xpi -> firefox-66.0.5-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/cy.xpi -> firefox-66.0.5-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/da.xpi -> firefox-66.0.5-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/de.xpi -> firefox-66.0.5-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/dsb.xpi -> firefox-66.0.5-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/el.xpi -> firefox-66.0.5-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/en-GB.xpi -> firefox-66.0.5-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/en-ZA.xpi -> firefox-66.0.5-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/eo.xpi -> firefox-66.0.5-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/es-AR.xpi -> firefox-66.0.5-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/es-CL.xpi -> firefox-66.0.5-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/es-ES.xpi -> firefox-66.0.5-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/es-MX.xpi -> firefox-66.0.5-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/et.xpi -> firefox-66.0.5-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/eu.xpi -> firefox-66.0.5-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/fa.xpi -> firefox-66.0.5-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ff.xpi -> firefox-66.0.5-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/fi.xpi -> firefox-66.0.5-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/fr.xpi -> firefox-66.0.5-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/fy-NL.xpi -> firefox-66.0.5-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ga-IE.xpi -> firefox-66.0.5-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/gd.xpi -> firefox-66.0.5-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/gl.xpi -> firefox-66.0.5-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/gn.xpi -> firefox-66.0.5-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/gu-IN.xpi -> firefox-66.0.5-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/he.xpi -> firefox-66.0.5-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/hi-IN.xpi -> firefox-66.0.5-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/hr.xpi -> firefox-66.0.5-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/hsb.xpi -> firefox-66.0.5-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/hu.xpi -> firefox-66.0.5-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/hy-AM.xpi -> firefox-66.0.5-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/id.xpi -> firefox-66.0.5-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/is.xpi -> firefox-66.0.5-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/it.xpi -> firefox-66.0.5-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ja.xpi -> firefox-66.0.5-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ka.xpi -> firefox-66.0.5-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/kab.xpi -> firefox-66.0.5-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/kk.xpi -> firefox-66.0.5-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/km.xpi -> firefox-66.0.5-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/kn.xpi -> firefox-66.0.5-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ko.xpi -> firefox-66.0.5-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/lij.xpi -> firefox-66.0.5-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/lt.xpi -> firefox-66.0.5-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/lv.xpi -> firefox-66.0.5-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/mai.xpi -> firefox-66.0.5-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/mk.xpi -> firefox-66.0.5-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ml.xpi -> firefox-66.0.5-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/mr.xpi -> firefox-66.0.5-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ms.xpi -> firefox-66.0.5-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/nb-NO.xpi -> firefox-66.0.5-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/nl.xpi -> firefox-66.0.5-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/nn-NO.xpi -> firefox-66.0.5-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/or.xpi -> firefox-66.0.5-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/pa-IN.xpi -> firefox-66.0.5-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/pl.xpi -> firefox-66.0.5-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/pt-BR.xpi -> firefox-66.0.5-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/pt-PT.xpi -> firefox-66.0.5-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/rm.xpi -> firefox-66.0.5-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ro.xpi -> firefox-66.0.5-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ru.xpi -> firefox-66.0.5-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/si.xpi -> firefox-66.0.5-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/sk.xpi -> firefox-66.0.5-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/sl.xpi -> firefox-66.0.5-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/son.xpi -> firefox-66.0.5-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/sq.xpi -> firefox-66.0.5-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/sr.xpi -> firefox-66.0.5-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/sv-SE.xpi -> firefox-66.0.5-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/ta.xpi -> firefox-66.0.5-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/te.xpi -> firefox-66.0.5-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/th.xpi -> firefox-66.0.5-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/tr.xpi -> firefox-66.0.5-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/uk.xpi -> firefox-66.0.5-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/uz.xpi -> firefox-66.0.5-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/vi.xpi -> firefox-66.0.5-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/xh.xpi -> firefox-66.0.5-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/zh-CN.xpi -> firefox-66.0.5-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xpi/zh-TW.xpi -> firefox-66.0.5-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/66.0.5/source/firefox-66.0.5.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-66.0-patches-09.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-66.0-patches-09.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-66.0-patches-09.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-66.0-patches-09.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	de4a7cb850530155c3333776cdbe9308	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	50181e8c428d5e8bd3a2883c4a0bbb67	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=db894ce093cecbab4270e9b6a4ea611d
diff --git a/metadata/md5-cache/www-client/firefox-67.0 b/metadata/md5-cache/www-client/firefox-67.0
index c6b6d3f9e569..f5829ea3c7ec 100644
--- a/metadata/md5-cache/www-client/firefox-67.0
+++ b/metadata/md5-cache/www-client/firefox-67.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.43 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3=[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.2.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.26:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.6.8 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.31.0 >=virtual/rust-1.31.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( dev-lang/nasm ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/nss-3.43 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3=[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.2.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.27.2:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.8.2 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.31.0 >=virtual/rust-1.31.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( dev-lang/nasm ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Firefox Web Browser
 EAPI=6
 HOMEPAGE=https://www.mozilla.com/firefox
 IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.43 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3=[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.2.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.26:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RDEPEND=>=dev-libs/nss-3.43 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3=[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.2.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.27.2:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ach.xpi -> firefox-67.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/af.xpi -> firefox-67.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/an.xpi -> firefox-67.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ar.xpi -> firefox-67.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/as.xpi -> firefox-67.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ast.xpi -> firefox-67.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/az.xpi -> firefox-67.0-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/bg.xpi -> firefox-67.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/bn-BD.xpi -> firefox-67.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/bn-IN.xpi -> firefox-67.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/br.xpi -> firefox-67.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/bs.xpi -> firefox-67.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ca.xpi -> firefox-67.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/cak.xpi -> firefox-67.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/cs.xpi -> firefox-67.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/cy.xpi -> firefox-67.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/da.xpi -> firefox-67.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/de.xpi -> firefox-67.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/dsb.xpi -> firefox-67.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/el.xpi -> firefox-67.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/en-GB.xpi -> firefox-67.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/en-ZA.xpi -> firefox-67.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/eo.xpi -> firefox-67.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/es-AR.xpi -> firefox-67.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/es-CL.xpi -> firefox-67.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/es-ES.xpi -> firefox-67.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/es-MX.xpi -> firefox-67.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/et.xpi -> firefox-67.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/eu.xpi -> firefox-67.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/fa.xpi -> firefox-67.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ff.xpi -> firefox-67.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/fi.xpi -> firefox-67.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/fr.xpi -> firefox-67.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/fy-NL.xpi -> firefox-67.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ga-IE.xpi -> firefox-67.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/gd.xpi -> firefox-67.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/gl.xpi -> firefox-67.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/gn.xpi -> firefox-67.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/gu-IN.xpi -> firefox-67.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/he.xpi -> firefox-67.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/hi-IN.xpi -> firefox-67.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/hr.xpi -> firefox-67.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/hsb.xpi -> firefox-67.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/hu.xpi -> firefox-67.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/hy-AM.xpi -> firefox-67.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/id.xpi -> firefox-67.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/is.xpi -> firefox-67.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/it.xpi -> firefox-67.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ja.xpi -> firefox-67.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ka.xpi -> firefox-67.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/kab.xpi -> firefox-67.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/kk.xpi -> firefox-67.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/km.xpi -> firefox-67.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/kn.xpi -> firefox-67.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ko.xpi -> firefox-67.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/lij.xpi -> firefox-67.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/lt.xpi -> firefox-67.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/lv.xpi -> firefox-67.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/mai.xpi -> firefox-67.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/mk.xpi -> firefox-67.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ml.xpi -> firefox-67.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/mr.xpi -> firefox-67.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ms.xpi -> firefox-67.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/nb-NO.xpi -> firefox-67.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/nl.xpi -> firefox-67.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/nn-NO.xpi -> firefox-67.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/or.xpi -> firefox-67.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/pa-IN.xpi -> firefox-67.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/pl.xpi -> firefox-67.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/pt-BR.xpi -> firefox-67.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/pt-PT.xpi -> firefox-67.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/rm.xpi -> firefox-67.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ro.xpi -> firefox-67.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ru.xpi -> firefox-67.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/si.xpi -> firefox-67.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/sk.xpi -> firefox-67.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/sl.xpi -> firefox-67.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/son.xpi -> firefox-67.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/sq.xpi -> firefox-67.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/sr.xpi -> firefox-67.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/sv-SE.xpi -> firefox-67.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ta.xpi -> firefox-67.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/te.xpi -> firefox-67.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/th.xpi -> firefox-67.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/tr.xpi -> firefox-67.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/uk.xpi -> firefox-67.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/uz.xpi -> firefox-67.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/vi.xpi -> firefox-67.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/xh.xpi -> firefox-67.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/zh-CN.xpi -> firefox-67.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/zh-TW.xpi -> firefox-67.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/67.0/source/firefox-67.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-67.0-patches-05.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-67.0-patches-05.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-67.0-patches-05.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-67.0-patches-05.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	de4a7cb850530155c3333776cdbe9308	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=aefb015bb9c7170232030dd486f7d5e9
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	50181e8c428d5e8bd3a2883c4a0bbb67	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=5ea42ee4e75a83066a75d3affc0c2d00
diff --git a/metadata/md5-cache/www-client/google-chrome-74.0.3729.131 b/metadata/md5-cache/www-client/google-chrome-74.0.3729.131
deleted file mode 100644
index b69b3e488810..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-74.0.3729.131
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=kernel_linux +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[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_74.0.3729.131-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=24aea97a13fcd656053761abb7c9cc6c
diff --git a/metadata/md5-cache/www-client/google-chrome-74.0.3729.169 b/metadata/md5-cache/www-client/google-chrome-74.0.3729.169
new file mode 100644
index 000000000000..353d370e150a
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-74.0.3729.169
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=kernel_linux +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[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_74.0.3729.169-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=24aea97a13fcd656053761abb7c9cc6c
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-75.0.3770.27 b/metadata/md5-cache/www-client/google-chrome-beta-75.0.3770.27
deleted file mode 100644
index 4bedbbc984ae..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-75.0.3770.27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=kernel_linux +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[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_75.0.3770.27-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=24aea97a13fcd656053761abb7c9cc6c
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-75.0.3770.66 b/metadata/md5-cache/www-client/google-chrome-beta-75.0.3770.66
new file mode 100644
index 000000000000..c847ae6e9be1
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-75.0.3770.66
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=kernel_linux +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[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_75.0.3770.66-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=24aea97a13fcd656053761abb7c9cc6c
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-76.0.3783.0 b/metadata/md5-cache/www-client/google-chrome-unstable-76.0.3783.0
deleted file mode 100644
index 340241a9095c..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-76.0.3783.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=kernel_linux +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[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_76.0.3783.0-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-76.0.3806.1 b/metadata/md5-cache/www-client/google-chrome-unstable-76.0.3806.1
new file mode 100644
index 000000000000..8b051aff4f61
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-76.0.3806.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=kernel_linux +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[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_76.0.3806.1-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/luakit-2017.08.10 b/metadata/md5-cache/www-client/luakit-2017.08.10
index 3825fa1e06cd..59d34d8bb59c 100644
--- a/metadata/md5-cache/www-client/luakit-2017.08.10
+++ b/metadata/md5-cache/www-client/luakit-2017.08.10
@@ -10,4 +10,4 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-lua/luafilesystem[luajit=] net-libs/
 SLOT=0
 SRC_URI=https://github.com/luakit/luakit/archive/2017.08.10.tar.gz -> luakit-2017.08.10.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=d712a54b4b42e97cdbfe22ddcc84e383
+_md5_=c2db8186f7a32b2799a8d2caf4b2a178
diff --git a/metadata/md5-cache/www-client/luakit-9999 b/metadata/md5-cache/www-client/luakit-9999
index b8877370b323..9606dce1f961 100644
--- a/metadata/md5-cache/www-client/luakit-9999
+++ b/metadata/md5-cache/www-client/luakit-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-lua/luafilesystem[luajit=] net-libs/webkit-gtk:4= x11-libs/gtk+:3 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=3bcaac50611704ba73969482b3407568
+_md5_=af3e7ccbb1534cf14758429bbe415c76
diff --git a/metadata/md5-cache/www-client/opera-60.0.3255.109 b/metadata/md5-cache/www-client/opera-60.0.3255.109
new file mode 100644
index 000000000000..7ce1926fd09c
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-60.0.3255.109
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +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+: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=https://download1.operacdn.com/pub/opera/desktop/60.0.3255.109/linux/opera-stable_60.0.3255.109_amd64.deb https://download2.operacdn.com/pub/opera/desktop/60.0.3255.109/linux/opera-stable_60.0.3255.109_amd64.deb https://download3.operacdn.com/pub/opera/desktop/60.0.3255.109/linux/opera-stable_60.0.3255.109_amd64.deb https://download4.operacdn.com/pub/opera/desktop/60.0.3255.109/linux/opera-stable_60.0.3255.109_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=da3889161f4011bdda5da1700c2e7970
diff --git a/metadata/md5-cache/www-client/opera-beta-60.0.3255.103 b/metadata/md5-cache/www-client/opera-beta-60.0.3255.103
new file mode 100644
index 000000000000..9d68f5f7c978
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-60.0.3255.103
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +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? ( https://download1.operacdn.com/pub/opera-beta/60.0.3255.103/linux/opera-beta_60.0.3255.103_amd64.deb https://download2.operacdn.com/pub/opera-beta/60.0.3255.103/linux/opera-beta_60.0.3255.103_amd64.deb https://download3.operacdn.com/pub/opera-beta/60.0.3255.103/linux/opera-beta_60.0.3255.103_amd64.deb https://download4.operacdn.com/pub/opera-beta/60.0.3255.103/linux/opera-beta_60.0.3255.103_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=47af986f1f644ed51df72f6081777ae9
diff --git a/metadata/md5-cache/www-client/opera-beta-60.0.3255.60 b/metadata/md5-cache/www-client/opera-beta-60.0.3255.60
deleted file mode 100644
index 638cc80ab60d..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-60.0.3255.60
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +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? ( https://download1.operacdn.com/pub/opera-beta/60.0.3255.60/linux/opera-beta_60.0.3255.60_amd64.deb https://download2.operacdn.com/pub/opera-beta/60.0.3255.60/linux/opera-beta_60.0.3255.60_amd64.deb https://download3.operacdn.com/pub/opera-beta/60.0.3255.60/linux/opera-beta_60.0.3255.60_amd64.deb https://download4.operacdn.com/pub/opera-beta/60.0.3255.60/linux/opera-beta_60.0.3255.60_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=47af986f1f644ed51df72f6081777ae9
diff --git a/metadata/md5-cache/www-client/opera-developer-62.0.3319.0 b/metadata/md5-cache/www-client/opera-developer-62.0.3319.0
deleted file mode 100644
index 382611e9d7cd..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-62.0.3319.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +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? ( https://download1.operacdn.com/pub/opera-developer/62.0.3319.0/linux/opera-developer_62.0.3319.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/62.0.3319.0/linux/opera-developer_62.0.3319.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/62.0.3319.0/linux/opera-developer_62.0.3319.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/62.0.3319.0/linux/opera-developer_62.0.3319.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=15a3756fba642990d5e49f40be495e5e
diff --git a/metadata/md5-cache/www-client/opera-developer-62.0.3331.2 b/metadata/md5-cache/www-client/opera-developer-62.0.3331.2
new file mode 100644
index 000000000000..b11830a1d7bd
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-62.0.3331.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +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? ( https://download1.operacdn.com/pub/opera-developer/62.0.3331.2/linux/opera-developer_62.0.3331.2_amd64.deb https://download2.operacdn.com/pub/opera-developer/62.0.3331.2/linux/opera-developer_62.0.3331.2_amd64.deb https://download3.operacdn.com/pub/opera-developer/62.0.3331.2/linux/opera-developer_62.0.3331.2_amd64.deb https://download4.operacdn.com/pub/opera-developer/62.0.3331.2/linux/opera-developer_62.0.3331.2_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=15a3756fba642990d5e49f40be495e5e
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.6.0 b/metadata/md5-cache/www-client/qutebrowser-1.6.0
deleted file mode 100644
index 3920dc3ecf99..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm 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(-)]
-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=scripts 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,multimedia,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(-),libyaml] 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.6.0/qutebrowser-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=71d2551785c4d009331ce1593c51ddf1
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.6.2 b/metadata/md5-cache/www-client/qutebrowser-1.6.2
new file mode 100644
index 000000000000..8fd422e66c95
--- /dev/null
+++ b/metadata/md5-cache/www-client/qutebrowser-1.6.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm 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(-)]
+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=scripts 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.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) <dev-python/PyQt5-5.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,multimedia,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(-),libyaml] 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.6.2/qutebrowser-1.6.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=5af1ab6b3044b34eb7ed209a8632f900
diff --git a/metadata/md5-cache/www-client/surf-2.0 b/metadata/md5-cache/www-client/surf-2.0
index 1c187d1333b6..74ea94d199cf 100644
--- a/metadata/md5-cache/www-client/surf-2.0
+++ b/metadata/md5-cache/www-client/surf-2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!sci-chemistry/surf dev-libs/glib:2 net-libs/libsoup net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !savedconfig? ( net-misc/curl x11-apps/xprop x11-misc/dmenu x11-terms/st )
 SLOT=0
 SRC_URI=https://dl.suckless.org/surf/surf-2.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=20fb9ca4632475f3926fa2178bbfcb8c
diff --git a/metadata/md5-cache/www-client/surf-9999 b/metadata/md5-cache/www-client/surf-9999
index b1488bdcfcd9..904bf62a9959 100644
--- a/metadata/md5-cache/www-client/surf-9999
+++ b/metadata/md5-cache/www-client/surf-9999
@@ -8,5 +8,5 @@ IUSE=savedconfig
 LICENSE=MIT
 RDEPEND=!sci-chemistry/surf app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !savedconfig? ( >=x11-misc/dmenu-4.7 net-misc/curl x11-apps/xprop x11-terms/st )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=8fbd29b5948200b85afc3c1d2991a069
diff --git a/metadata/md5-cache/www-client/vivaldi-2.5.1525.41_p1 b/metadata/md5-cache/www-client/vivaldi-2.5.1525.41_p1
deleted file mode 100644
index 5d9121a8cd4c..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-2.5.1525.41_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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+: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/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.41-1_amd64.deb -> vivaldi-2.5.1525.41_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.41-1_armhf.deb -> vivaldi-2.5.1525.41_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.41-1_i386.deb -> vivaldi-2.5.1525.41_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c71bed7d90a1783a268c7e21ac0c7fba
diff --git a/metadata/md5-cache/www-client/vivaldi-2.5.1525.46_p1 b/metadata/md5-cache/www-client/vivaldi-2.5.1525.46_p1
new file mode 100644
index 000000000000..d6af8c434bf8
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-2.5.1525.46_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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+: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/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.46-1_amd64.deb -> vivaldi-2.5.1525.46_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.46-1_armhf.deb -> vivaldi-2.5.1525.46_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.46-1_i386.deb -> vivaldi-2.5.1525.46_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6ad3d712e255fffc3879cdf00b491412
diff --git a/metadata/md5-cache/www-client/vivaldi-2.5.1525.48_p1 b/metadata/md5-cache/www-client/vivaldi-2.5.1525.48_p1
new file mode 100644
index 000000000000..0e3bac15073f
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-2.5.1525.48_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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+: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/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.48-1_amd64.deb -> vivaldi-2.5.1525.48_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.48-1_armhf.deb -> vivaldi-2.5.1525.48_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.48-1_i386.deb -> vivaldi-2.5.1525.48_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=c71bed7d90a1783a268c7e21ac0c7fba
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.5.1525.37_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.5.1525.37_p1
deleted file mode 100644
index abd22c7a0e23..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.5.1525.37_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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+: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/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.5.1525.37-1_amd64.deb -> vivaldi-snapshot-2.5.1525.37_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.5.1525.37-1_arm64.deb -> vivaldi-snapshot-2.5.1525.37_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.5.1525.37-1_armhf.deb -> vivaldi-snapshot-2.5.1525.37_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.5.1525.37-1_i386.deb -> vivaldi-snapshot-2.5.1525.37_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1856797049b32786690846250bd98f44
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.6.1554.13_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.6.1554.13_p1
new file mode 100644
index 000000000000..18a1c260be3a
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.6.1554.13_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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+: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/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.6.1554.13-1_amd64.deb -> vivaldi-snapshot-2.6.1554.13_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.6.1554.13-1_arm64.deb -> vivaldi-snapshot-2.6.1554.13_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.6.1554.13-1_armhf.deb -> vivaldi-snapshot-2.6.1554.13_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.6.1554.13-1_i386.deb -> vivaldi-snapshot-2.6.1554.13_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=1856797049b32786690846250bd98f44
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.6.1560.4_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.6.1560.4_p1
new file mode 100644
index 000000000000..2ccbeb17792a
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.6.1560.4_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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+: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/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.6.1560.4-1_amd64.deb -> vivaldi-snapshot-2.6.1560.4_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.6.1560.4-1_arm64.deb -> vivaldi-snapshot-2.6.1560.4_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.6.1560.4-1_armhf.deb -> vivaldi-snapshot-2.6.1560.4_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.6.1560.4-1_i386.deb -> vivaldi-snapshot-2.6.1560.4_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=1856797049b32786690846250bd98f44
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 229d193faa85..b937c6cc634e 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.131 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.131
deleted file mode 100644
index 05dfec33079e..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.131
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_74.0.3729.131-1_amd64.deb
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=d42a365cfcb1cb0bb53fcf1c1818eeb6
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.169 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.169
new file mode 100644
index 000000000000..9f1e33fc517f
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.169
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=stable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_74.0.3729.169-1_amd64.deb
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d42a365cfcb1cb0bb53fcf1c1818eeb6
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3770.27_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3770.27_beta
deleted file mode 100644
index e2b9e81be4dc..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3770.27_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_75.0.3770.27-1_amd64.deb
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3770.66_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3770.66_beta
new file mode 100644
index 000000000000..c571d5ab7c1a
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3770.66_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=beta
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_75.0.3770.66-1_amd64.deb
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3783.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3783.0_alpha
deleted file mode 100644
index c34cfa22c340..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3783.0_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
-RESTRICT=bindist mirror strip
-SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_76.0.3783.0-1_amd64.deb
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3806.1_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3806.1_alpha
new file mode 100644
index 000000000000..313bbf243742
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3806.1_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
+RESTRICT=bindist mirror strip
+SLOT=unstable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_76.0.3806.1-1_amd64.deb
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/lightspark-0.8.1 b/metadata/md5-cache/www-plugins/lightspark-0.8.1
index 7755479f88a8..49daa378e7da 100644
--- a/metadata/md5-cache/www-plugins/lightspark-0.8.1
+++ b/metadata/md5-cache/www-plugins/lightspark-0.8.1
@@ -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/llvm-7:= sys-libs/zlib:0= x11-libs/cairo:0= x11-libs/libX11:0= x11-libs/pango:0= virtual/jpeg:0= curl? ( net-misc/curl:0= ) ffmpeg? ( libav? ( <media-video/libav-13_pre: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/0.8.1.tar.gz -> lightspark-0.8.1.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	83a68dab6355a0f96b37fe96bc4f317c	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=07df61a61fbc06cbad2dc31e7c7dae0b
diff --git a/metadata/md5-cache/www-plugins/passff-1.6.3 b/metadata/md5-cache/www-plugins/passff-1.6.3
deleted file mode 100644
index 92ac0b81c35c..000000000000
--- a/metadata/md5-cache/www-plugins/passff-1.6.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=zx2c4 pass manager extension for Firefox
-EAPI=7
-HOMEPAGE=https://github.com/passff/passff
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=www-plugins/passff-host[firefox]
-SLOT=0
-SRC_URI=https://addons.mozilla.org/firefox/downloads/file/1681210/passff-1.6.3-fx.xpi
-_md5_=5f6d0c5c3e2ba6f1a99b1bcf03baea2b
diff --git a/metadata/md5-cache/www-plugins/passff-1.8 b/metadata/md5-cache/www-plugins/passff-1.8
new file mode 100644
index 000000000000..108656d49072
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/passff-1.8
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=zx2c4 pass manager extension for Firefox
+EAPI=7
+HOMEPAGE=https://github.com/passff/passff
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=www-plugins/passff-host[firefox]
+SLOT=0
+SRC_URI=https://addons.mozilla.org/firefox/downloads/file/2983533/passff-1.8-fx.xpi
+_md5_=9b2381c0b7f590611908ad77e5d5b594
diff --git a/metadata/md5-cache/www-plugins/passff-host-1.1.0 b/metadata/md5-cache/www-plugins/passff-host-1.1.0
deleted file mode 100644
index 7828af052cdd..000000000000
--- a/metadata/md5-cache/www-plugins/passff-host-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup unpack
-DESCRIPTION=Host app for the PassFF WebExtension
-EAPI=7
-HOMEPAGE=https://github.com/passff/passff-host
-IUSE=chrome chromium firefox vivaldi python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-REQUIRED_USE=|| ( chrome chromium firefox vivaldi )
-SLOT=0
-SRC_URI=https://github.com/passff/passff-host/releases/download/1.1.0/passff.py -> passff-host-1.1.0.py https://github.com/passff/passff-host/releases/download/1.1.0/passff.json -> passff-host-1.1.0.json
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e76fbe6c07d5cd555f6432a39ee12f2f
diff --git a/metadata/md5-cache/www-plugins/passff-host-1.2.0 b/metadata/md5-cache/www-plugins/passff-host-1.2.0
new file mode 100644
index 000000000000..f0ea7fc87992
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/passff-host-1.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup unpack
+DESCRIPTION=Host app for the PassFF WebExtension
+EAPI=7
+HOMEPAGE=https://github.com/passff/passff-host
+IUSE=chrome chromium firefox vivaldi python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+REQUIRED_USE=|| ( chrome chromium firefox vivaldi )
+SLOT=0
+SRC_URI=https://github.com/passff/passff-host/releases/download/1.2.0/passff.py -> passff-host-1.2.0.py https://github.com/passff/passff-host/releases/download/1.2.0/passff.json -> passff-host-1.2.0.json
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=850041b7c93f5fe08fff03dd205f60fa
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 19bd4fe2c005..a38a6bdd9a57 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/adsf-1.4.2 b/metadata/md5-cache/www-servers/adsf-1.4.2
new file mode 100644
index 000000000000..3d6ad4b5c712
--- /dev/null
+++ b/metadata/md5-cache/www-servers/adsf-1.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rack-test[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rack-test[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rack-test[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A Dead Simple Fileserver is a static file server that can launch in a directory
+EAPI=6
+HOMEPAGE=https://github.com/ddfreyne/adsf/
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/ddfreyne/adsf/archive/1.4.2.tar.gz -> adsf-1.4.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=c67d50d61d48be5bdbcf0cb68b09493f
diff --git a/metadata/md5-cache/www-servers/apache-2.4.39 b/metadata/md5-cache/www-servers/apache-2.4.39
index dcfe6f731720..bd5d3564e5e9 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.39
+++ b/metadata/md5-cache/www-servers/apache-2.4.39
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=+suexec-caps suexec-syslog ssl debug doc gdbm 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_md 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_http2 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-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-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.39
 RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.39.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.39-20190402.tar.bz2
 _eclasses_=apache-2	20ad1434bfafa6a0c06f7898cf4059ef	autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77e306ed0e0d13b8f8bf1e02b6502514
+_md5_=1677a9e54cab16486f247541cd0e87d0
diff --git a/metadata/md5-cache/www-servers/nginx-1.14.2-r4 b/metadata/md5-cache/www-servers/nginx-1.14.2-r4
deleted file mode 100644
index dc7e667fb96d..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.14.2-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=6
-HOMEPAGE=https://nginx.org
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( luajit nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nginx.org/download/nginx-1.14.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.2.8.tar.gz -> njs-0.2.8.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.14.tar.gz -> ngx_http_lua-0.10.14.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.2.8.tar.gz -> njs-0.2.8.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bd43bfa14acab6666c57b1feb094a990
diff --git a/metadata/md5-cache/www-servers/nginx-1.15.12-r1 b/metadata/md5-cache/www-servers/nginx-1.15.12-r1
deleted file mode 100644
index 9d79c3d16a65..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.15.12-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=6
-HOMEPAGE=https://nginx.org
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( luajit nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.15.12.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.3.1.tar.gz -> njs-0.3.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.14.tar.gz -> ngx_http_lua-0.10.14.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.1.tar.gz -> njs-0.3.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=311b79e8e4cb91c44fe2787ceaf1a2ed
diff --git a/metadata/md5-cache/www-servers/nginx-1.16.0 b/metadata/md5-cache/www-servers/nginx-1.16.0
deleted file mode 100644
index fb73771d67a1..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=6
-HOMEPAGE=https://nginx.org
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( luajit nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nginx.org/download/nginx-1.16.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.3.1.tar.gz -> njs-0.3.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.14.tar.gz -> ngx_http_lua-0.10.14.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.1.tar.gz -> njs-0.3.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=77081d6718148c123c91552195d23974
diff --git a/metadata/md5-cache/www-servers/nginx-1.16.0-r1 b/metadata/md5-cache/www-servers/nginx-1.16.0-r1
new file mode 100644
index 000000000000..2463f1a37e50
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-1.16.0-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DESCRIPTION=Robust, small and high performance http and reverse proxy server
+EAPI=6
+HOMEPAGE=https://nginx.org
+IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
+PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
+RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
+REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( luajit nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nginx.org/download/nginx-1.16.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.3.2.tar.gz -> njs-0.3.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.2.tar.gz -> njs-0.3.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=2c3aad0fc13c16b3121f1cb3efa245e6
diff --git a/metadata/md5-cache/www-servers/nginx-1.17.0 b/metadata/md5-cache/www-servers/nginx-1.17.0
new file mode 100644
index 000000000000..1b69979e99d6
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-1.17.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DESCRIPTION=Robust, small and high performance http and reverse proxy server
+EAPI=6
+HOMEPAGE=https://nginx.org
+IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
+PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
+RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
+REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( luajit nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RESTRICT=test
+SLOT=mainline
+SRC_URI=https://nginx.org/download/nginx-1.17.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.3.2.tar.gz -> njs-0.3.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.2.tar.gz -> njs-0.3.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f17cad01330f3136080da388e9fc9a82
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.8.0 b/metadata/md5-cache/www-servers/nginx-unit-1.8.0
index cd4a4a1e95cd..1c41dfa34416 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.8.0
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=A dynamic web and application server
 EAPI=7
 HOMEPAGE=https://unit.nginx.org
 IUSE=perl python ruby php5-6 php7-1 php7-2 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ruby? ( dev-lang/ruby:= )
 REQUIRED_USE=|| ( perl python ruby php5-6 php7-1 php7-2 ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.8.0.tar.gz -> nginx-unit-1.8.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=88387aa572753ff3bea4e414d6ad0f67
+_md5_=036eec4c4caedb4b1aeda52d5e75565a
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index cd6c5386aedb..4a8ecb10d7af 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23
index 20e1f56c4939..d1c49a98f9da 100644
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23
+++ b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23
@@ -11,5 +11,5 @@ REQUIRED_USE=chamelium? ( glib gsl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.23.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=ab09217547e8e8145bcdd03fa0409efd
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23-r1 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23-r1
index cfe4346c206d..5f221466a80e 100644
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23-r1
+++ b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) ove
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.23.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=3b1235dfd020b74f4a2deabfe9376b9f
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-9999 b/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
index 7ff76aa5bb6f..f9ecc5a5b2b4 100644
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
+++ b/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/libunwind:= s
 REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=b2d88188e5e7546231131bf92ed8a697
diff --git a/metadata/md5-cache/x11-apps/luit-20190106 b/metadata/md5-cache/x11-apps/luit-20190106
new file mode 100644
index 000000000000..53c878e4a19c
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/luit-20190106
@@ -0,0 +1,12 @@
+BDEPEND=sys-apps/groff
+DEFINED_PHASES=configure
+DEPEND=sys-libs/zlib virtual/libiconv
+DESCRIPTION=Locale and ISO 2022 support for Unicode terminals
+EAPI=7
+HOMEPAGE=https://invisible-island.net/luit/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=sys-libs/zlib virtual/libiconv
+SLOT=0
+SRC_URI=https://invisible-mirror.net/archives/luit/luit-20190106.tgz
+_md5_=fcc9a733afe5d91b92d0f925b25533d2
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.1 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.1
index 6e195d4b8ed7..6f3691434d3e 100644
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.3.1
+++ b/metadata/md5-cache/x11-apps/setxkbmap-1.3.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libxkbfile x11-libs/libX11 >=app-portage/elt-patches-20170815 !<
 DESCRIPTION=Controls the keyboard layout of a running X server
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/setxkbmap
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-misc/xkeyboard-config
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/setxkbmap-1.3.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	26270add721dc113c15b0251a4ee2afb
-_md5_=340d79caf1c0ef83d4d0f538abbd4fe0
+_md5_=534d0f09ad865a882dd8e3ee6820198c
diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.2 b/metadata/md5-cache/x11-apps/xsetroot-1.1.2
index 370eebb555a1..07b66de263fa 100644
--- a/metadata/md5-cache/x11-apps/xsetroot-1.1.2
+++ b/metadata/md5-cache/x11-apps/xsetroot-1.1.2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor >=a
 DESCRIPTION=X.Org xsetroot application
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xsetroot
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xsetroot-1.1.2.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	26270add721dc113c15b0251a4ee2afb
-_md5_=662f3d24b5563acd0e171aa92f7bac83
+_md5_=465265a882ff559998f643be33392c49
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 242dd2ca51ec..f88f5aed8127 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2018.4 b/metadata/md5-cache/x11-base/xorg-proto-2018.4
index e463af81b6bb..d7c6e8b1dec0 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-2018.4
+++ b/metadata/md5-cache/x11-base/xorg-proto-2018.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2018.4.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=90914eddd00400f379834227a7588e76
diff --git a/metadata/md5-cache/x11-base/xorg-proto-9999 b/metadata/md5-cache/x11-base/xorg-proto-9999
index d4cdb3829525..ab1569012020 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-9999
+++ b/metadata/md5-cache/x11-base/xorg-proto-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://gitlab.freedesktop.org/xorg/proto/xorgproto
 LICENSE=MIT
 RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=35097949985431857d38d98413b5d8fc
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.5 b/metadata/md5-cache/x11-base/xorg-server-1.20.5
new file mode 100644
index 000000000000..62dce56f8f69
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.5
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-18[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18 ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) sys-devel/flex >=x11-base/xorg-proto-2018.3 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 )
+DESCRIPTION=X.Org X servers
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
+IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity static-libs doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
+RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-18[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18 ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
+REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !glamor !wayland ) xephyr? ( kdrive )
+SLOT=0/1.20.5
+SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.5.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xorg-3	440d0cf8784e228b51e2a85ff560aeb2
+_md5_=319b9a8a08253a20c1721c9aa03ae6c1
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index b14c197f0150..347396f1d1a5 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-input-synaptics-1.9.1 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
index 8969ef93ce09..f9bca68c8fe9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=Driver for Synaptics touchpads
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics
 IUSE=kernel_linux kernel_linux
-KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	26270add721dc113c15b0251a4ee2afb
-_md5_=858ceea6b234f6a58b2bfc61b383d295
+_md5_=23c2dbbc5fc4968e36b6222624289996
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 1627822968b4..a5a129b70ec5 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/gdk-pixbuf-2.38.1 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.38.1
index f888f6248f91..05e539400095 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.38.1
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.38.1
@@ -4,10 +4,10 @@ DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
 IUSE=X gtk-doc +introspection jpeg jpeg2k tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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+
 RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.38/gdk-pixbuf-2.38.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e5d6a6d34c7517cfbf7e9f3d9cfeb4f6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=7899f8abd07b7b0ddeb681e82ddd52b1
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.8 b/metadata/md5-cache/x11-libs/gtk+-3.24.8
index cb5a5cb8dd26..b8126d9a68bc 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.8
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.8
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.53.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.4[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.41.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-0.9:= x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.12 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.8.tar.xz https://dev.gentoo.org/~leio/distfiles/gtk+-3.24.8-patchset.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5f3154f9a8aa90b3a19a85452ffc1d55
+_md5_=51ba782b0eec957135cff057643b7ccc
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.24.10 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.10
index bd1bed099911..08f59d7c5a2b 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-3.24.10
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.24.10
@@ -4,11 +4,11 @@ DESCRIPTION=A text widget implementing syntax highlighting and other features
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
 IUSE=glade +introspection +vala test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=3.0/3
 SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.10.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5c0f36fef88eb29df1d9ac1a3e31e89d
+_md5_=52d19114b611a7d909ba24c68feb9179
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.24.11 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.11
index c178e2e4bfbb..1cc56438980e 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-3.24.11
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.24.11
@@ -4,11 +4,11 @@ DESCRIPTION=A text widget implementing syntax highlighting and other features
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
 IUSE=glade +introspection +vala test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=3.0/3
 SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.11.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b2f4949f2460c3635c69c8af9e809b11
+_md5_=659249a3d4fb3b66e5356cf338781fc1
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.96 b/metadata/md5-cache/x11-libs/libdrm-2.4.96
index 88badc5a11d3..189d51027a4d 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.96
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.96
@@ -10,5 +10,5 @@ RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.96.tar.bz2
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=38490efc3aa2690b87650275f59f7364
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.97 b/metadata/md5-cache/x11-libs/libdrm-2.4.97
index 74baa459b792..15a8788da718 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.97
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.97
@@ -10,5 +10,5 @@ RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.97.tar.bz2
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=38490efc3aa2690b87650275f59f7364
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.98 b/metadata/md5-cache/x11-libs/libdrm-2.4.98
index 5f13da60cca8..0528d69ae146 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.98
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.98
@@ -10,5 +10,5 @@ RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.98.tar.bz2
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=12ec96f87e119112efeaa59c0a1083ae
diff --git a/metadata/md5-cache/x11-libs/libdrm-9999 b/metadata/md5-cache/x11-libs/libdrm-9999
index ee647be0a754..65ed1e00c093 100644
--- a/metadata/md5-cache/x11-libs/libdrm-9999
+++ b/metadata/md5-cache/x11-libs/libdrm-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=12ec96f87e119112efeaa59c0a1083ae
diff --git a/metadata/md5-cache/x11-libs/libfm-1.3.1 b/metadata/md5-cache/x11-libs/libfm-1.3.1
index 19559ba9be42..2613f1e5e824 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.3.1
+++ b/metadata/md5-cache/x11-libs/libfm-1.3.1
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= ~x11-libs/libfm-extra-1.3.1 udisks? ( dev-libs/dbus-glib ) vala? ( || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext
+DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= ~x11-libs/libfm-extra-1.3.1 udisks? ( dev-libs/dbus-glib ) vala? ( || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext dev-util/glib-utils
 DESCRIPTION=A library for file management
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/PCManFM
@@ -12,4 +12,4 @@ REQUIRED_USE=udisks? ( automount ) doc? ( gtk )
 SLOT=0/5.2.1
 SRC_URI=https://github.com/lxde/libfm/archive/1.3.1.tar.gz -> libfm-1.3.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=15b65636dcdcd5732af3a52ab0837384
+_md5_=127d0d88ca9d6bdfe6b32756d7c4e773
diff --git a/metadata/md5-cache/x11-libs/libfm-9999 b/metadata/md5-cache/x11-libs/libfm-9999
index 6371d8279d99..29d3d85f9114 100644
--- a/metadata/md5-cache/x11-libs/libfm-9999
+++ b/metadata/md5-cache/x11-libs/libfm-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= x11-libs/libfm-extra vala? ( || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= x11-libs/libfm-extra vala? ( || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext dev-util/glib-utils >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=https://wiki.lxde.org/en/PCManFM
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-
 REQUIRED_USE=udisks? ( automount ) doc? ( gtk )
 SLOT=0/4.4.0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e23efee0b0aca41dd9165117f23f11e4
+_md5_=f605ee7fb403532b0bc5ef2545219006
diff --git a/metadata/md5-cache/x11-libs/libfm-extra-1.2.5 b/metadata/md5-cache/x11-libs/libfm-extra-1.2.5
index 0b727cb58cb6..535aa4f2084f 100644
--- a/metadata/md5-cache/x11-libs/libfm-extra-1.2.5
+++ b/metadata/md5-cache/x11-libs/libfm-extra-1.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !!<=x11-libs/libfm-1.2.3 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/glib-2.18:2 app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext dev-util/gtk-doc-am !!<=x11-libs/libfm-1.2.3 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2.18:2
 SLOT=0/4.5.0
 SRC_URI=https://github.com/lxde/libfm/archive/1.2.5.tar.gz -> libfm-1.2.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2adabbe44cd350d5ad80f001381fb6f6
+_md5_=2698472491c7d53c16efb86d80398da2
diff --git a/metadata/md5-cache/x11-libs/libfm-extra-1.3.1 b/metadata/md5-cache/x11-libs/libfm-extra-1.3.1
index 2ef068a7e24b..f82809e4d2e6 100644
--- a/metadata/md5-cache/x11-libs/libfm-extra-1.3.1
+++ b/metadata/md5-cache/x11-libs/libfm-extra-1.3.1
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !!<=x11-libs/libfm-1.2.3
+DEPEND=>=dev-libs/glib-2.18:2 app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext dev-util/gtk-doc-am !!<=x11-libs/libfm-1.2.3
 DESCRIPTION=A library for file management
 EAPI=7
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.18:2
 SLOT=0/5.2.1
 SRC_URI=https://github.com/lxde/libfm/archive/1.3.1.tar.gz -> libfm-1.3.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=052f1c258d5b808e587376ecb85b7ec7
+_md5_=dd2e9f76f6f7930b0fca875d2cfc1158
diff --git a/metadata/md5-cache/x11-libs/libfm-qt-0.14.1-r1 b/metadata/md5-cache/x11-libs/libfm-qt-0.14.1-r1
index f63c9266d9f5..81ea37d6c9fb 100644
--- a/metadata/md5-cache/x11-libs/libfm-qt-0.14.1-r1
+++ b/metadata/md5-cache/x11-libs/libfm-qt-0.14.1-r1
@@ -4,10 +4,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=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ 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-1.1.0 media-libs/libexif:= x11-libs/libxcb:= !lxqt-base/lxqt-l10n
 SLOT=0/5
 SRC_URI=https://downloads.lxqt.org/downloads/libfm-qt/0.14.1/libfm-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fce7ae3b35b3ac60baedf7e581649eeb
+_md5_=4f0b6c339cb785ab742ebbb3fd0c2269
diff --git a/metadata/md5-cache/x11-libs/libfm-qt-0.14.1-r2 b/metadata/md5-cache/x11-libs/libfm-qt-0.14.1-r2
new file mode 100644
index 000000000000..2fe2fbd792d3
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libfm-qt-0.14.1-r2
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.6.0 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-1.1.0 media-libs/libexif:= x11-libs/libxcb:=
+DESCRIPTION=Qt port of libfm, a library providing components to build desktop file managers
+EAPI=7
+HOMEPAGE=https://lxqt.org/
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ 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-1.1.0 media-libs/libexif:= x11-libs/libxcb:= !lxqt-base/lxqt-l10n
+SLOT=0/5
+SRC_URI=https://downloads.lxqt.org/downloads/libfm-qt/0.14.1/libfm-qt-0.14.1.tar.xz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=841086d4de799ca36f5712b3a0737d6c
diff --git a/metadata/md5-cache/x11-libs/libnotify-0.7.8 b/metadata/md5-cache/x11-libs/libnotify-0.7.8
index 66aaed0868dc..d301d5d940f1 100644
--- a/metadata/md5-cache/x11-libs/libnotify-0.7.8
+++ b/metadata/md5-cache/x11-libs/libnotify-0.7.8
@@ -11,5 +11,5 @@ PDEPEND=virtual/notification-daemon
 RDEPEND=app-eselect/eselect-notify-send >=dev-libs/glib-2.26:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libnotify/0.7/libnotify-0.7.8.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=575a7d356b91228b6a29d251f740c18e
diff --git a/metadata/md5-cache/x11-libs/libvdpau-99999 b/metadata/md5-cache/x11-libs/libvdpau-99999
index 3845bf91181a..f3f73e5b628b 100644
--- a/metadata/md5-cache/x11-libs/libvdpau-99999
+++ b/metadata/md5-cache/x11-libs/libvdpau-99999
@@ -8,5 +8,5 @@ IUSE=doc dri test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 ab
 LICENSE=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=f99be5d2bac6c4b2502d956cc29568e6
diff --git a/metadata/md5-cache/x11-libs/libxklavier-5.4 b/metadata/md5-cache/x11-libs/libxklavier-5.4
index a4352315d73a..148db6278bc8 100644
--- a/metadata/md5-cache/x11-libs/libxklavier-5.4
+++ b/metadata/md5-cache/x11-libs/libxklavier-5.4
@@ -4,11 +4,11 @@ DESCRIPTION=A library for the X Keyboard Extension (high-level API)
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/LibXklavier
 IUSE=+introspection vala
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.16:2= dev-libs/libxml2:2= x11-apps/xkbcomp x11-libs/libX11:= >=x11-libs/libXi-1.1.3:= x11-libs/libxkbfile:= >=x11-misc/xkeyboard-config-2.4.1-r3 introspection? ( >=dev-libs/gobject-introspection-1.30:= ) vala? ( || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/16
 SRC_URI=https://people.freedesktop.org/~svu/libxklavier-5.4.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b058962c2b8df945f1f32bb5fa44ebf6
+_md5_=c64a95276ef2f0797f746d0aa17d272e
diff --git a/metadata/md5-cache/x11-libs/pango-1.42.4-r1 b/metadata/md5-cache/x11-libs/pango-1.42.4-r1
index 97e0678fe281..6c435b0ad4ec 100644
--- a/metadata/md5-cache/x11-libs/pango-1.42.4-r1
+++ b/metadata/md5-cache/x11-libs/pango-1.42.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=6
 HOMEPAGE=https://www.pango.org/
 IUSE=X +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.12.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.42/pango-1.42.4.tar.xz https://dev.gentoo.org/~leio/distfiles/pango-1.42.4-patchset.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b2378d89767b330e3fa572981af3d40c
+_md5_=e13a34e1646f9ea89300f6fa8170f845
diff --git a/metadata/md5-cache/x11-libs/pixman-0.38.4 b/metadata/md5-cache/x11-libs/pixman-0.38.4
index b34447013f4a..7920eae20964 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.38.4
+++ b/metadata/md5-cache/x11-libs/pixman-0.38.4
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.38.4.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=1cc589beefddff3beb44c5173fe586bd
diff --git a/metadata/md5-cache/x11-libs/pixman-9999 b/metadata/md5-cache/x11-libs/pixman-9999
index 3876e249a283..3c378cce6b30 100644
--- a/metadata/md5-cache/x11-libs/pixman-9999
+++ b/metadata/md5-cache/x11-libs/pixman-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
 IUSE=altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 LICENSE=MIT
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	340492f765f55914375a07f726621c52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=963ca06e61980baea98c75520f1a247e
diff --git a/metadata/md5-cache/x11-libs/startup-notification-0.12-r1 b/metadata/md5-cache/x11-libs/startup-notification-0.12-r1
index 2222639c7b18..f2a8eb8c58f3 100644
--- a/metadata/md5-cache/x11-libs/startup-notification-0.12-r1
+++ b/metadata/md5-cache/x11-libs/startup-notification-0.12-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Application startup notification and feedback library
 EAPI=5
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/startup-notification
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2 MIT
 RDEPEND=>=x11-libs/libX11-1.4.3 >x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.8
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	26270add721dc113c15b0251a4ee2afb
-_md5_=bd6ba3cb0a6e20a7f9da7acf731306f5
+_md5_=122e47c078466e858e4500c5bcdc919c
diff --git a/metadata/md5-cache/x11-libs/vte-0.54.4 b/metadata/md5-cache/x11-libs/vte-0.54.4
index b2ab00a181fa..96602c53bd32 100644
--- a/metadata/md5-cache/x11-libs/vte-0.54.4
+++ b/metadata/md5-cache/x11-libs/vte-0.54.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing a virtual terminal emulator widget
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
 IUSE=+crypt debug glade +introspection vala vanilla
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/libpcre2-10.21 >=x11-libs/gtk+-3.16:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= sys-libs/zlib crypt? ( >=net-libs/gnutls-3.2.7:0= ) glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !x11-libs/vte:2.90[glade]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.91
 SRC_URI=mirror://gnome/sources/vte/0.54/vte-0.54.4.tar.xz !vanilla? ( https://dev.gentoo.org/~leio/distfiles/vte-0.54.1-command-notify.patch.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=db2d8afee77369bc208ea878a01462d9
+_md5_=830639e135f3dc8d9036b242c49a7db9
diff --git a/metadata/md5-cache/x11-libs/xapps-1.4.2 b/metadata/md5-cache/x11-libs/xapps-1.4.2
index 00c84456a9e0..541585ef9137 100644
--- a/metadata/md5-cache/x11-libs/xapps-1.4.2
+++ b/metadata/md5-cache/x11-libs/xapps-1.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.37.3:2 dev-libs/gobject-introspection:0= gnome-base/libgnomekbd gnome-base/gnome-common x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] x11-libs/libxkbfile
 SLOT=0
 SRC_URI=https://github.com/linuxmint/xapps/archive/1.4.2.tar.gz -> xapps-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=fcba9aadd142d9f005b9d35d7e3d8098
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 4d9423510f6f..ba48a9c4860d 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/dmenu-4.8 b/metadata/md5-cache/x11-misc/dmenu-4.8
index 5ae10825be6e..88b743d3369d 100644
--- a/metadata/md5-cache/x11-misc/dmenu-4.8
+++ b/metadata/md5-cache/x11-misc/dmenu-4.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/dmenu-4.8.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=396a83229f18c1ac3a8f257917ef0956
diff --git a/metadata/md5-cache/x11-misc/dmenu-4.9 b/metadata/md5-cache/x11-misc/dmenu-4.9
index afa3581897fb..1159c212ede7 100644
--- a/metadata/md5-cache/x11-misc/dmenu-4.9
+++ b/metadata/md5-cache/x11-misc/dmenu-4.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/dmenu-4.9.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=84ed98f32b234fb373fa3d80ced8ceac
diff --git a/metadata/md5-cache/x11-misc/dmenu-9999 b/metadata/md5-cache/x11-misc/dmenu-9999
index 85e9175a0a1f..4ce87a444a78 100644
--- a/metadata/md5-cache/x11-misc/dmenu-9999
+++ b/metadata/md5-cache/x11-misc/dmenu-9999
@@ -8,5 +8,5 @@ IUSE=xinerama savedconfig
 LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9c5557ffcf16a25621a21e93cfe63ffd
diff --git a/metadata/md5-cache/x11-misc/grsync-1.2.6 b/metadata/md5-cache/x11-misc/grsync-1.2.6
index 56cff752c33a..c507249aeb08 100644
--- a/metadata/md5-cache/x11-misc/grsync-1.2.6
+++ b/metadata/md5-cache/x11-misc/grsync-1.2.6
@@ -3,9 +3,9 @@ DEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync virtual/pkgconfig dev-util/intltool
 DESCRIPTION=A gtk frontend to rsync
 EAPI=6
 HOMEPAGE=http://www.opbyte.it/grsync/
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync
 SLOT=0
 SRC_URI=http://www.opbyte.it/release/grsync-1.2.6.tar.gz
-_md5_=0d84382d25c4e79d8cd571d65f4f9f99
+_md5_=bd22d749b44586b80ccfb0823859b1e6
diff --git a/metadata/md5-cache/x11-misc/gxmessage-3.4.3 b/metadata/md5-cache/x11-misc/gxmessage-3.4.3
index f454acd4b061..0f62937d99fa 100644
--- a/metadata/md5-cache/x11-misc/gxmessage-3.4.3
+++ b/metadata/md5-cache/x11-misc/gxmessage-3.4.3
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango virtual/pkgconfig >=dev-ut
 DESCRIPTION=A GTK+ based xmessage clone
 EAPI=5
 HOMEPAGE=https://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
-KEYWORDS=amd64 ~ppc sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc sparc x86 ~x86-fbsd
 LICENSE=GPL-3 public-domain
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://gnu/gxmessage/gxmessage-3.4.3.tar.gz http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-3.4.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=81184814921f3dfd354ad00b4cf27352
+_md5_=83e45d2e2e06ccbdf25c0c1bcf2b70be
diff --git a/metadata/md5-cache/x11-misc/light-locker-1.9.0-r1 b/metadata/md5-cache/x11-misc/light-locker-1.9.0-r1
new file mode 100644
index 000000000000..e5cc39831575
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/light-locker-1.9.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/XML-Parser dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=dev-libs/dbus-glib dev-libs/glib sys-apps/dbus x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango x11-libs/libXxf86vm dpms? ( x11-libs/libXext ) elogind? ( sys-auth/elogind ) screensaver? ( x11-libs/libXScrnSaver ) systemd? ( sys-apps/systemd ) upower? ( sys-power/upower )
+DESCRIPTION=A simple locker using lightdm
+EAPI=7
+HOMEPAGE=https://github.com/the-cavalry/light-locker
+IUSE=+dpms elogind +screensaver systemd +upower
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=dev-libs/dbus-glib dev-libs/glib sys-apps/dbus x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango x11-libs/libXxf86vm dpms? ( x11-libs/libXext ) elogind? ( sys-auth/elogind ) screensaver? ( x11-libs/libXScrnSaver ) systemd? ( sys-apps/systemd ) upower? ( sys-power/upower ) x11-misc/lightdm
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=https://github.com/the-cavalry/light-locker/archive/v1.9.0.tar.gz -> light-locker-1.9.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=b1e439aa5d120a2910e0802efac92514
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1 b/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
index 960f14e0e09a..dba1d4a54d49 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A lightweight display manager
 EAPI=6
 HOMEPAGE=https://github.com/CanonicalLtd/lightdm
 IUSE=audit +gnome +gtk +introspection qt5 vala
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-3 LGPL-3
 PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
 RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) >=sys-auth/pambase-20101024-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.26.0/lightdm-1.26.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1eb86bfede42220a8c15dac701217338
+_md5_=88f98a58cbe87da7ed3ea9d085b9e507
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.5-r1 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.5-r1
index 9ba64e3be91d..ce1d0d07a720 100644
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.5-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=LightDM GTK+ Greeter
 EAPI=6
 HOMEPAGE=https://launchpad.net/lightdm-gtk-greeter
 IUSE=ayatana branding
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
+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.5/+download/lightdm-gtk-greeter-2.0.5.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=24c9ca996d1e54d5f8108034e8bca12c
+_md5_=6fe7b0d976d4f39c62646f3a5e9af890
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.1.5 b/metadata/md5-cache/x11-misc/menulibre-2.1.5
deleted file mode 100644
index ff306f425288..000000000000
--- a/metadata/md5-cache/x11-misc/menulibre-2.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/python-distutils-extra[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[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Advanced freedesktop.org compliant menu editor
-EAPI=5
-HOMEPAGE=https://bluesabre.org/projects/menulibre/
-IUSE=python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] gnome-base/gnome-menus[introspection] x11-libs/gdk-pixbuf[X,introspection] x11-libs/gtk+:3[X,introspection] x11-libs/gtksourceview:3.0[introspection] x11-themes/hicolor-icon-theme python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://launchpad.net/menulibre/2.1/2.1.5/+download/menulibre-2.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8b086f933cd2f9a441ecdafc555decc5
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.2.1 b/metadata/md5-cache/x11-misc/menulibre-2.2.1
new file mode 100644
index 000000000000..5994b68141ac
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/menulibre-2.2.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/python-distutils-extra[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Advanced freedesktop.org compliant menu editor
+EAPI=7
+HOMEPAGE=https://bluesabre.org/projects/menulibre/
+IUSE=python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] gnome-base/gnome-menus[introspection] x11-libs/gdk-pixbuf[X,introspection] x11-libs/gtk+:3[X,introspection] x11-libs/gtksourceview:3.0[introspection] x11-themes/hicolor-icon-theme python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://launchpad.net/menulibre/2.2/2.2.1/+download/menulibre-2.2.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=ec349c47a40ed7eff207568d3905d847
diff --git a/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1 b/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
index 6072e8f1a1e2..baf02d48159e 100644
--- a/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
+++ b/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/notify-osd/precise/0.9.34/+download/notify-osd-0.9.34.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b17ef88a244b891828e15874f1569c92
diff --git a/metadata/md5-cache/x11-misc/obconf-qt-0.14.1 b/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
index e84f2de8d79f..eec14ae78579 100644
--- a/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
+++ b/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/
 DESCRIPTION=Openbox window manager configuration tool
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/sed x11-wm/openbox:3 x11-libs/libX11 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/obconf-qt/0.14.1/obconf-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d1e97d45bdd122597c5da19ad1c66ce7
+_md5_=9c6400bbeb820eff731ee2419fd06385
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1
index 5ff1848a8126..b6ceb1cb2f74 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtw
 DESCRIPTION=Fast lightweight tabbed filemanager (Qt port)
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.14* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/pcmanfm-qt/0.14.1/pcmanfm-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=da2cae7a019c5e4d6b7a7923107162c9
+_md5_=766633cb00c8e503a384526284b5a646
diff --git a/metadata/md5-cache/x11-misc/peksystray-0.2.1 b/metadata/md5-cache/x11-misc/peksystray-0.2.1
deleted file mode 100644
index 2b446537078d..000000000000
--- a/metadata/md5-cache/x11-misc/peksystray-0.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-libs/libXt
-DESCRIPTION=A system tray dockapp for window managers supporting docking
-EAPI=0
-HOMEPAGE=http://freshmeat.net/projects/peksystray
-KEYWORDS=alpha ~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXt
-SLOT=0
-SRC_URI=mirror://sourceforge/peksystray/peksystray-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2f2044c69275defae98c836fbc17200f
diff --git a/metadata/md5-cache/x11-misc/polybar-3.3.1 b/metadata/md5-cache/x11-misc/polybar-3.3.1
new file mode 100644
index 000000000000..81a1c2ab5ed9
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/polybar-3.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A fast and easy-to-use tool for creating status bars
+EAPI=6
+HOMEPAGE=https://github.com/jaagr/polybar
+IUSE=alsa curl i3wm ipc mpd network pulseaudio python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/jaagr/polybar/archive/3.3.1.tar.gz -> polybar-3.3.1.tar.gz https://github.com/jaagr/xpp/archive/1.4.0.tar.gz -> xpp-1.4.0.tar.gz https://github.com/jaagr/i3ipcpp/archive/v0.7.1.tar.gz -> i3ipcpp-0.7.1.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=eb748d931be579bb62d35b0c1d7ec980
diff --git a/metadata/md5-cache/x11-misc/polybar-9999 b/metadata/md5-cache/x11-misc/polybar-9999
index a81a1d566460..59201a4f7f1e 100644
--- a/metadata/md5-cache/x11-misc/polybar-9999
+++ b/metadata/md5-cache/x11-misc/polybar-9999
@@ -1,12 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install 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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
 DESCRIPTION=A fast and easy-to-use tool for creating status bars
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/jaagr/polybar
 IUSE=alsa curl i3wm ipc mpd network pulseaudio python_targets_python2_7
 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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=adad0588acbb4e303a996af2530921f1
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=3b9af475c4329c209242154ac75a1000
diff --git a/metadata/md5-cache/x11-misc/qps-1.10.20 b/metadata/md5-cache/x11-misc/qps-1.10.20
index 67d00d0304b8..a4300900ef01 100644
--- a/metadata/md5-cache/x11-misc/qps-1.10.20
+++ b/metadata/md5-cache/x11-misc/qps-1.10.20
@@ -5,10 +5,10 @@ DESCRIPTION=Visual process manager - Qt version of ps/top
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2.1+ QPL-1.0
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/qps/1.10.20/qps-1.10.20.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cc60b4e979ce2b1ad29eba633d54779f
+_md5_=f1cc84df98458234d9e21329a048bf8b
diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.0 b/metadata/md5-cache/x11-misc/sddm-0.18.0
index b5d369e2ee18..1575a2fb7d6f 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.18.0
+++ b/metadata/md5-cache/x11-misc/sddm-0.18.0
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Desktop Display Manager
 EAPI=6
 HOMEPAGE=https://github.com/sddm/sddm
 IUSE=consolekit elogind +pam systemd test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
 RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.0/sddm-0.18.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f528b68f3637e8dbeff7dc27c01221d2
+_md5_=a6275e3d3e47672646b991036fbcef17
diff --git a/metadata/md5-cache/x11-misc/sent-0.2 b/metadata/md5-cache/x11-misc/sent-0.2
index e3c4098274db..9a1ed25abdc4 100644
--- a/metadata/md5-cache/x11-misc/sent-0.2
+++ b/metadata/md5-cache/x11-misc/sent-0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/fontconfig media-libs/libpng:* x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/sent-0.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=7309a56300cbda9baa93abf6ec210159
diff --git a/metadata/md5-cache/x11-misc/sent-1-r1 b/metadata/md5-cache/x11-misc/sent-1-r1
index 0c5085a70637..187797f7b06d 100644
--- a/metadata/md5-cache/x11-misc/sent-1-r1
+++ b/metadata/md5-cache/x11-misc/sent-1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft !savedconfig? ( media-gfx/farbfeld )
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/sent-1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=b37b7e4fcd292576275c19f35744a6af
diff --git a/metadata/md5-cache/x11-misc/sent-9999 b/metadata/md5-cache/x11-misc/sent-9999
index 8b743ab830be..09d9c47e765c 100644
--- a/metadata/md5-cache/x11-misc/sent-9999
+++ b/metadata/md5-cache/x11-misc/sent-9999
@@ -7,5 +7,5 @@ IUSE=savedconfig
 LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft !savedconfig? ( media-gfx/farbfeld )
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=69300e5c195803672b33a3ccfe11e371
diff --git a/metadata/md5-cache/x11-misc/slock-1.4 b/metadata/md5-cache/x11-misc/slock-1.4
index 3df290c2b1ca..ebd51d1f80b6 100644
--- a/metadata/md5-cache/x11-misc/slock-1.4
+++ b/metadata/md5-cache/x11-misc/slock-1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/slock-1.4.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=3ea5dbf0746e2505d191b9b5eb1f17d1
diff --git a/metadata/md5-cache/x11-misc/tabbed-0.6 b/metadata/md5-cache/x11-misc/tabbed-0.6
index 6d4657667a2f..6f864118b4ab 100644
--- a/metadata/md5-cache/x11-misc/tabbed-0.6
+++ b/metadata/md5-cache/x11-misc/tabbed-0.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/tabbed-0.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=7d3f30c38d8ffaa21efd66e58ebc5912
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.14_p20161013 b/metadata/md5-cache/x11-misc/x11vnc-0.9.14_p20161013
deleted file mode 100644
index 267642541e53..000000000000
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.14_p20161013
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=net-libs/libvncserver-0.9.8[ssl?] x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xinerama? ( x11-libs/libXinerama ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A VNC server for real X displays
-EAPI=6
-HOMEPAGE=https://libvnc.github.io/
-IUSE=crypt fbcon libressl ssl xinerama zeroconf
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libvncserver-0.9.8[ssl?] x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xinerama? ( x11-libs/libXinerama ) zeroconf? ( >=net-dns/avahi-0.6.4 )
-SLOT=0
-SRC_URI=https://github.com/LibVNC/x11vnc/archive/e191071c1f375d04ba8f955ea0a30292a485999e.tar.gz -> x11vnc-0.9.14_p20161013.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=765f139eaec8709149767c72b8a9efb8
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16
deleted file mode 100644
index 5e854ca26721..000000000000
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=net-libs/libvncserver-0.9.8[ssl?] x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xinerama? ( x11-libs/libXinerama ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A VNC server for real X displays
-EAPI=6
-HOMEPAGE=https://libvnc.github.io/
-IUSE=crypt fbcon libressl ssl xinerama zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libvncserver-0.9.8[ssl?] x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xinerama? ( x11-libs/libXinerama ) zeroconf? ( >=net-dns/avahi-0.6.4 )
-SLOT=0
-SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=0eecb024807ebf6da42524e2b5303c3d
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r1 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r1
deleted file mode 100644
index f34b9ac84651..000000000000
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=net-libs/libvncserver-0.9.8[ssl?] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A VNC server for real X displays
-EAPI=6
-HOMEPAGE=https://libvnc.github.io/
-IUSE=crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-lang/tk:0
-SLOT=0
-SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=d4c2efa80c06eec90fdf78465214d2ac
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r2 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r2
new file mode 100644
index 000000000000..8874c3187531
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=net-libs/libvncserver-0.9.8[ssl] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt
+DESCRIPTION=VNC server for real X displays
+EAPI=7
+HOMEPAGE=https://libvnc.github.io/
+IUSE=crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libvncserver-0.9.8[ssl] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) dev-lang/tk:0
+SLOT=0
+SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=27a2d7551d2b77d6caba4787eb616bc8
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r3 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r3
new file mode 100644
index 000000000000..31299f166cc7
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt
+DESCRIPTION=VNC server for real X displays
+EAPI=7
+HOMEPAGE=https://libvnc.github.io/
+IUSE=crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) dev-lang/tk:0
+SLOT=0
+SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=fd4fc0c75adc58844c51f2feb20097fb
diff --git a/metadata/md5-cache/x11-misc/xowl-9999 b/metadata/md5-cache/x11-misc/xowl-9999
index c8ddac7268d3..01857b649e85 100644
--- a/metadata/md5-cache/x11-misc/xowl-9999
+++ b/metadata/md5-cache/x11-misc/xowl-9999
@@ -7,5 +7,5 @@ IUSE=savedconfig
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e33b819d9971dfb751faaccd64dde89e
diff --git a/metadata/md5-cache/x11-misc/zim-0.71.1 b/metadata/md5-cache/x11-misc/zim-0.71.1
new file mode 100644
index 000000000000..9d6e3d9d536e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.71.1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils
+DESCRIPTION=A desktop wiki
+EAPI=7
+HOMEPAGE=http://zim-wiki.org/ https://github.com/zim-desktop-wiki/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.71.1.tar.gz -> zim-0.71.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=821b07bc12a7a909b75d72e9cee6c9ce
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index c6640526e851..c8710000c3bc 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0 b/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
index b0248f317421..33be93dff6a1 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
+++ b/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
@@ -5,6 +5,6 @@ HOMEPAGE=http://gkrellm.srcbox.net/
 IUSE=wifi
 KEYWORDS=~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=!<app-admin/gkrellm-2 >=x11-plugins/gkrellaclock-0.3.2 x11-plugins/gkrellflynn >=x11-plugins/gkrellkam-2.0.0 >=x11-plugins/gkrellm-leds-0.8.0 >=x11-plugins/gkrellm-volume-2.1.4 >=x11-plugins/gkrellmlaunch-0.5 >=x11-plugins/gkrellmoon-0.6 wifi? ( >=x11-plugins/gkrellmwireless-2.0.2 ) >=x11-plugins/gkrellshoot-0.4.1 >=x11-plugins/gkrellstock-0.5 >=x11-plugins/gkrellsun-0.12.2 x11-plugins/gkrelltop >=x11-plugins/gkrellweather-2.0.6 x11-plugins/gkrellm-countdown x11-plugins/gkrellm-trayicons
+RDEPEND=!<app-admin/gkrellm-2 >=x11-plugins/gkrellaclock-0.3.2 >=x11-plugins/gkrellkam-2.0.0 >=x11-plugins/gkrellm-leds-0.8.0 >=x11-plugins/gkrellm-volume-2.1.4 >=x11-plugins/gkrellmlaunch-0.5 >=x11-plugins/gkrellmoon-0.6 wifi? ( >=x11-plugins/gkrellmwireless-2.0.2 ) >=x11-plugins/gkrellshoot-0.4.1 >=x11-plugins/gkrellstock-0.5 >=x11-plugins/gkrellsun-0.12.2 x11-plugins/gkrelltop >=x11-plugins/gkrellweather-2.0.6 x11-plugins/gkrellm-countdown x11-plugins/gkrellm-trayicons
 SLOT=0
-_md5_=9df60983e54ef61c2a5d3ffb0c71b351
+_md5_=19a4127881d6c569b49cd7f1e238717d
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 906a3ca15ed6..f8059203867b 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/st-0.8.1 b/metadata/md5-cache/x11-terms/st-0.8.1
index 2b75ac8a3439..449011a8060a 100644
--- a/metadata/md5-cache/x11-terms/st-0.8.1
+++ b/metadata/md5-cache/x11-terms/st-0.8.1
@@ -9,5 +9,5 @@ LICENSE=MIT-with-advertising
 RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://dl.suckless.org/st/st-0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df73909573cc703a59f99abc44b5dadf
diff --git a/metadata/md5-cache/x11-terms/st-0.8.2 b/metadata/md5-cache/x11-terms/st-0.8.2
index 3a4b83295c08..ff967fa314d0 100644
--- a/metadata/md5-cache/x11-terms/st-0.8.2
+++ b/metadata/md5-cache/x11-terms/st-0.8.2
@@ -9,5 +9,5 @@ LICENSE=MIT-with-advertising
 RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://dl.suckless.org/st/st-0.8.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=d6b610fcb7597b43f8045eba12acfbb4
diff --git a/metadata/md5-cache/x11-terms/st-9999 b/metadata/md5-cache/x11-terms/st-9999
index 0f8b49852b39..23e3d73174e7 100644
--- a/metadata/md5-cache/x11-terms/st-9999
+++ b/metadata/md5-cache/x11-terms/st-9999
@@ -8,5 +8,5 @@ IUSE=savedconfig savedconfig
 LICENSE=MIT-with-advertising
 RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=d23864ea1166311df653225ae4ecc590
diff --git a/metadata/md5-cache/x11-terms/terminology-1.3.2-r1 b/metadata/md5-cache/x11-terms/terminology-1.3.2-r1
deleted file mode 100644
index f6140b45b6aa..000000000000
--- a/metadata/md5-cache/x11-terms/terminology-1.3.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install test
-DEPEND=|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
-DESCRIPTION=Feature rich terminal emulator using the Enlightenment Foundation Libraries
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org/about-terminology
-IUSE=nls
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
-SLOT=0
-SRC_URI=https://fau.re/terminology/terminology-1.3.2.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=17fbd9048e732bd76463f7d77caee3fa
diff --git a/metadata/md5-cache/x11-terms/terminology-1.4.0 b/metadata/md5-cache/x11-terms/terminology-1.4.0
index e77b55d09713..86c285308a21 100644
--- a/metadata/md5-cache/x11-terms/terminology-1.4.0
+++ b/metadata/md5-cache/x11-terms/terminology-1.4.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.4.0.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=df3ae60b2c5aec9245cd9cceec26f762
diff --git a/metadata/md5-cache/x11-terms/terminology-1.4.1 b/metadata/md5-cache/x11-terms/terminology-1.4.1
new file mode 100644
index 000000000000..5e47bbeaa7a0
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/terminology-1.4.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
+DESCRIPTION=Feature rich terminal emulator using the Enlightenment Foundation Libraries
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org/about-terminology
+IUSE=extras nls
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.4.1.tar.xz
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=dca7a25b48feb4168e8bd96df8b3c6e4
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 73cdd3452daa..789a5e6b51e5 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.30.1 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.30.1
index 59d001a423c2..499e91e8a31c 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.30.1
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.30.1
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME default icon theme
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 IUSE=branding
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !<x11-themes/gnome-themes-standard-3.14
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.30/adwaita-icon-theme-3.30.1.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8d756ebb5924c444a5b2b6049584e1a5
+_md5_=4325e54fb6939f2ef848fe50c04862d8
diff --git a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.30.0 b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.30.0
index 2587dff398a4..20777088fe30 100644
--- a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.30.0
+++ b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.30.0
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0
 RDEPEND=!<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-backgrounds/3.30/gnome-backgrounds-3.30.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bd5525844f3b4d2506e40cc34d7180fa
diff --git a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.28 b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.28
index ef2c69080414..9b5b1bde248d 100644
--- a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.28
+++ b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.28
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=app-portag
 DESCRIPTION=Standard Themes for GNOME Applications
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-themes-extra
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=gnome-base/gsettings-desktop-schemas-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-themes-extra/3.28/gnome-themes-extra-3.28.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=82d0cf23aec07a9609faa09f0a282656
+_md5_=b0b911a7368ee02784e2e457bda2372e
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28 b/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
index fe5877be0d52..637f6bf107cd 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
+++ b/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
@@ -4,10 +4,10 @@ DESCRIPTION=Adwaita GTK+2 theme engine
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-themes-extra/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=x11-libs/gtk+-2.24.15:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<x11-themes/gnome-themes-standard-3.20.2-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-themes-extra/3.28/gnome-themes-extra-3.28.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1c72929125a3703a9d1d2970f59a85be
+_md5_=b33ca04b7a213ca33a237f06b903eb3c
diff --git a/metadata/md5-cache/x11-themes/lxqt-themes-0.14.0 b/metadata/md5-cache/x11-themes/lxqt-themes-0.14.0
index f0e8f370ae42..5923bf05dc4b 100644
--- a/metadata/md5-cache/x11-themes/lxqt-themes-0.14.0
+++ b/metadata/md5-cache/x11-themes/lxqt-themes-0.14.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Themes, graphics and icons for LXQt
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-themes/0.14.0/lxqt-themes-0.14.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=199d8f54617fefb080c55d7f45bdef99
+_md5_=99e2acd4da41fefda4e57befe992c1c3
diff --git a/metadata/md5-cache/x11-themes/sound-theme-freedesktop-0.8 b/metadata/md5-cache/x11-themes/sound-theme-freedesktop-0.8
index 22a173547a7f..c82fa58e1b77 100644
--- a/metadata/md5-cache/x11-themes/sound-theme-freedesktop-0.8
+++ b/metadata/md5-cache/x11-themes/sound-theme-freedesktop-0.8
@@ -3,8 +3,8 @@ DEPEND=sys-devel/gettext dev-libs/glib:2 >=dev-util/intltool-0.40
 DESCRIPTION=Default freedesktop.org sound theme following the XDG theming specification
 EAPI=5
 HOMEPAGE=https://www.freedesktop.org/wiki/Specifications/sound-theme-spec
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2 LGPL-2 CC-BY-3.0 CC-BY-SA-2.0
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2
-_md5_=26757e5fe018b368a494068983f5b54f
+_md5_=84d5f796de14c1247261fa9b65c95cf4
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 59d9d833011f..1738f8e8bd7c 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/awesome-4.2-r2 b/metadata/md5-cache/x11-wm/awesome-4.2-r2
index 0a0634f3058d..80fb9d01432f 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.2-r2
+++ b/metadata/md5-cache/x11-wm/awesome-4.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=6
 HOMEPAGE=https://awesomewm.org/
 IUSE=dbus doc elibc_FreeBSD gnome luajit test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1:0 luajit? ( dev-lang/luajit:2 ) dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6[xkb] >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.2.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c306c1ae90857628f2e6cacd2126181c
+_md5_=44a00451f6d3dfce6f26631c4dd47863
diff --git a/metadata/md5-cache/x11-wm/dwm-6.1-r1 b/metadata/md5-cache/x11-wm/dwm-6.1-r1
index 6266bed9a742..a61a47057fdd 100644
--- a/metadata/md5-cache/x11-wm/dwm-6.1-r1
+++ b/metadata/md5-cache/x11-wm/dwm-6.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://dl.suckless.org/dwm/dwm-6.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=4ac08797df38690951653dbe1f7753c9
diff --git a/metadata/md5-cache/x11-wm/dwm-6.2 b/metadata/md5-cache/x11-wm/dwm-6.2
index d314e59e475e..2a78a3ece8a0 100644
--- a/metadata/md5-cache/x11-wm/dwm-6.2
+++ b/metadata/md5-cache/x11-wm/dwm-6.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://dl.suckless.org/dwm/dwm-6.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=3a8c6f64adf804f32d3e54b1bf1f60d2
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.22.3 b/metadata/md5-cache/x11-wm/enlightenment-0.22.3
deleted file mode 100644
index c127780ebd90..000000000000
--- a/metadata/md5-cache/x11-wm/enlightenment-0.22.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) connman? ( net-misc/connman ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( =dev-libs/efl-1.20*[drm,wayland] >=dev-libs/wayland-1.12.0 x11-libs/libxkbcommon x11-libs/pixman ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Enlightenment window manager
-EAPI=6
-HOMEPAGE=https://www.enlightenment.org/
-IUSE=acpi connman doc nls pam systemd udisks wayland +enlightenment_modules_conf-applications +enlightenment_modules_conf-bindings +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers +enlightenment_modules_appmenu +enlightenment_modules_backlight +enlightenment_modules_battery +enlightenment_modules_bluez4 +enlightenment_modules_clock +enlightenment_modules_conf +enlightenment_modules_cpufreq +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_geolocation +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_lokker +enlightenment_modules_luncher +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_music-control +enlightenment_modules_notification +enlightenment_modules_packagekit +enlightenment_modules_pager +enlightenment_modules_pager-plain +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_sysinfo +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_teamwork +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_time +enlightenment_modules_vkbd +enlightenment_modules_winlist +enlightenment_modules_wireless +enlightenment_modules_wizard +enlightenment_modules_wl-buffer +enlightenment_modules_wl-desktop-shell +enlightenment_modules_wl-drm +enlightenment_modules_wl-text-input +enlightenment_modules_wl-weekeyboard +enlightenment_modules_wl-wl +enlightenment_modules_wl-x11 +enlightenment_modules_xkbswitch +enlightenment_modules_xwayland
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
-LICENSE=BSD-2
-RDEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) connman? ( net-misc/connman ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( =dev-libs/efl-1.20*[drm,wayland] >=dev-libs/wayland-1.12.0 x11-libs/libxkbcommon x11-libs/pixman )
-SLOT=0.17/0.22.3
-SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.3.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f114fc0774af642ba38e08d61a7bfe13
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.22.4 b/metadata/md5-cache/x11-wm/enlightenment-0.22.4
index af2fb792b6e1..0a11ed87a880 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.22.4
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.22.4
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) packagekit? ( app-admin/packagekit-base ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( >=dev-libs/efl-1.21.0[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman )
 SLOT=0.17/0.22.4
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.4.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=a82e4c0dc25f7ce38aaa97b58e96b7af
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.22.4-r1 b/metadata/md5-cache/x11-wm/enlightenment-0.22.4-r1
index 31bba0c2ba7e..97881a30c486 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.22.4-r1
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.22.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libx
 REQUIRED_USE=xwayland? ( wayland )
 SLOT=0.17/0.22.4
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.4.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=415ab718bfaa806fbe1655681fbc329b
diff --git a/metadata/md5-cache/x11-wm/muffin-3.6.0 b/metadata/md5-cache/x11-wm/muffin-3.6.0
index 56a8be179ff4..2caa3f0dbc90 100644
--- a/metadata/md5-cache/x11-wm/muffin-3.6.0
+++ b/metadata/md5-cache/x11-wm/muffin-3.6.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/clutter-1.14.3:1.0=[X,introspection?] >=media-libs/cogl-1.13.3:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) >=app-text/gnome-doc-utils-0.8 sys-devel/gettext dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+introspection test xinerama
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
@@ -10,4 +10,4 @@ RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-li
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/3.6.0.tar.gz -> muffin-3.6.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8131dfeddfc933c64ea6b9f329809e88
+_md5_=6c49fcc9fb4a6f6ce3ea7419f0c3e1ee
diff --git a/metadata/md5-cache/x11-wm/muffin-3.8.2 b/metadata/md5-cache/x11-wm/muffin-3.8.2
index 11c8f1f04438..29488fbe5a63 100644
--- a/metadata/md5-cache/x11-wm/muffin-3.8.2
+++ b/metadata/md5-cache/x11-wm/muffin-3.8.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/clutter-1.14.3:1.0=[X,introspection?] >=media-libs/cogl-1.13.3:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) >=app-text/gnome-doc-utils-0.8 sys-devel/gettext dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+introspection test xinerama
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -10,4 +10,4 @@ RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-li
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/3.8.2.tar.gz -> muffin-3.8.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=70c7a6ba5bdedbe4c980785d362260ff
+_md5_=4fa854d16fb80735cc0b8eb2ea1ebb3d
diff --git a/metadata/md5-cache/x11-wm/muffin-4.0.3 b/metadata/md5-cache/x11-wm/muffin-4.0.3
index 6bde313b7ea7..808879bcd6ab 100644
--- a/metadata/md5-cache/x11-wm/muffin-4.0.3
+++ b/metadata/md5-cache/x11-wm/muffin-4.0.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) >=app-text/gnome-doc-utils-0.8 sys-devel/gettext dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
 EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
 IUSE=+introspection test xinerama
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/4.0.3.tar.gz -> muffin-4.0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=93ae9b05c0d3e0613fe04542db9e8705
+_md5_=dda5be0cd814ffc3faa94b45c2440fa7
diff --git a/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r3 b/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r3
index de0751474aed..493c79d3a823 100644
--- a/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r3
+++ b/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 >=x11-misc/dmenu-4.4 apis? ( x11-misc/xbindkeys )
 SLOT=0
 SRC_URI=mirror://gentoo/musca-0.9.24_p20100226.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5bdaa951f11cbe184ac1d1b6ea84c44c
diff --git a/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4 b/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
index 39103dc4948b..d408e5e862e1 100644
--- a/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
+++ b/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=x11-libs/libX11 sys-apps/sed
+DEPEND=x11-libs/libX11
 DESCRIPTION=A simple dynamic window manager, with features nicked from ratpoison and dwm
-EAPI=5
+EAPI=7
 HOMEPAGE=https://launchpad.net/musca
 IUSE=apis xlisten savedconfig
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 >=x11-misc/dmenu-4.4 apis? ( x11-misc/xbindkeys )
 SLOT=0
 SRC_URI=mirror://gentoo/musca-0.9.24_p20100226.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10439033b3b067c08beb0a54be8a1d9e
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=2e7aa830468a87a657396982480c2313
diff --git a/metadata/md5-cache/x11-wm/xoat-9999 b/metadata/md5-cache/x11-wm/xoat-9999
index 44ce34807205..f993062b1d7a 100644
--- a/metadata/md5-cache/x11-wm/xoat-9999
+++ b/metadata/md5-cache/x11-wm/xoat-9999
@@ -7,5 +7,5 @@ IUSE=savedconfig
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama !savedconfig? ( x11-misc/dmenu )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3812ff9dbe63484d556efcad4cc9a69	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8632450db2f848a9a50548cbc421ad52
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 1a09b1e1e2dc..1c07e5ac83a9 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/exo-0.12.4 b/metadata/md5-cache/xfce-base/exo-0.12.4
index 54279b5af6a2..f4311ca99134 100644
--- a/metadata/md5-cache/xfce-base/exo-0.12.4
+++ b/metadata/md5-cache/xfce-base/exo-0.12.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.42:= dev-perl/URI >=x11-libs/gtk+-2
 DESCRIPTION=Extensions, widgets and framework library with session support for Xfce
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.42:= dev-perl/URI >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.22:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/exo/0.12/exo-0.12.4.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=88c56743a02cd0a29f076c16800f68b1
+_md5_=7ebacdeb09b50d62662d0e69cd41fb0d
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4 b/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4
index d1f183dadf41..d0e38301d996 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4
@@ -4,11 +4,11 @@ DESCRIPTION=Unified widget and session management libs for Xfce
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=debug glade introspection startup-notification vala
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) vala? ( || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) !xfce-base/xfce-utils
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.13/libxfce4ui-4.13.4.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=59a93c6ce864e86edb75bbfddb0af3d6
+_md5_=cf844bdea02b2ac7bb6ace4d8241b089
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.13.2 b/metadata/md5-cache/xfce-base/libxfce4util-4.13.2
index 815b1c1120f3..9f77f717e56b 100644
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.13.2
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.13.2
@@ -4,11 +4,11 @@ DESCRIPTION=A basic utility library for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://git.xfce.org/xfce/libxfce4util/
 IUSE=introspection vala
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.30:= introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/7
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.13/libxfce4util-4.13.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a8a72ebd5deb01bfeafe7090b6d3cd5
+_md5_=b4d5c480de94ea6e8d011fdfcd8ba15b
diff --git a/metadata/md5-cache/xfce-base/thunar-1.8.4 b/metadata/md5-cache/xfce-base/thunar-1.8.4
deleted file mode 100644
index 902914984221..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-1.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm test
-DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.12:= >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=File manager for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
-IUSE=exif introspection libnotify pcre test +trash-panel-plugin udisks test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.12:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
-SLOT=0/3
-SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.8/Thunar-1.8.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0eb056cbee0842a011da7becd6f87664
diff --git a/metadata/md5-cache/xfce-base/thunar-1.8.5 b/metadata/md5-cache/xfce-base/thunar-1.8.5
deleted file mode 100644
index 0f3ddce4453c..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-1.8.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.12:= >=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
-DESCRIPTION=File manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
-IUSE=exif introspection libnotify pcre test +trash-panel-plugin udisks
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.12:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
-SLOT=0/3
-SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.8/Thunar-1.8.5.tar.bz2
-_eclasses_=xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=61d1e2ef06f19d86e6f57602f613af43
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.13.2 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.13.2
deleted file mode 100644
index 1c24023b2215..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.13.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/xfconf-4.10:= !xfce-base/xfce-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A tool to find and launch installed applications for the Xfce desktop
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-appfinder/start
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/xfconf-4.10:= !xfce-base/xfce-utils
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-appfinder/4.13/xfce4-appfinder-4.13.2.tar.bz2
-_md5_=26a2443ee7e14428fc1978fa7e73f0fa
diff --git a/metadata/md5-cache/xfce-base/xfce4-meta-4.14_pre1 b/metadata/md5-cache/xfce-base/xfce4-meta-4.14_pre1
new file mode 100644
index 000000000000..3b5b9ceff43a
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-meta-4.14_pre1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=The Xfce Desktop Environment (meta package)
+EAPI=6
+HOMEPAGE=https://www.xfce.org/
+IUSE=minimal +svg
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=metapackage
+RDEPEND=>=x11-themes/gtk-engines-xfce-3:0 x11-themes/hicolor-icon-theme >=xfce-base/exo-0.12.5 >=xfce-base/garcon-0.6.2 >=xfce-base/libxfce4ui-4.13.5 >=xfce-base/libxfce4util-4.13.3 >=xfce-base/thunar-1.8.6 >=xfce-base/xfce4-appfinder-4.13.3 >=xfce-base/xfce4-panel-4.13.5 >=xfce-base/xfce4-session-4.13.2 >=xfce-base/xfce4-settings-4.13.6 >=xfce-base/xfconf-4.13.7 >=xfce-base/xfdesktop-4.13.4 >=xfce-base/xfwm4-4.13.2 >=xfce-extra/thunar-volman-0.9.2 >=xfce-extra/tumbler-0.2.4 !minimal? ( media-fonts/dejavu virtual/freedesktop-icon-theme ) svg? ( gnome-base/librsvg )
+SLOT=0
+_md5_=3c3bad22ef620bd657d62a954e34c6af
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.13.4 b/metadata/md5-cache/xfce-base/xfce4-panel-4.13.4
deleted file mode 100644
index 98cfb0584c82..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.13.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.24:= >=x11-libs/cairo-1:= >=x11-libs/gtk+-2.20:2= >=x11-libs/gtk+-3.22:3=[introspection?] x11-libs/libX11:= x11-libs/libwnck:3= >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= ) dev-lang/perl dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/cairo-1:= >=x11-libs/gtk+-2.20:2= >=x11-libs/gtk+-3.22:3=[introspection?] x11-libs/libX11:= x11-libs/libwnck:3= >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.13/xfce4-panel-4.13.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=89b655f930bbf419ab8f6292c9fa3322
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.13.1 b/metadata/md5-cache/xfce-base/xfce4-session-4.13.1
deleted file mode 100644
index c6117c67511f..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=x11-apps/iceauth >=x11-libs/gtk+-3.20:3= x11-libs/libSM:= x11-libs/libwnck:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)] >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A session manager for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start
-IUSE=elogind nls policykit systemd +xscreensaver
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=x11-apps/iceauth >=x11-libs/gtk+-3.20:3= x11-libs/libSM:= x11-libs/libwnck:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)] >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102:= ) x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.26 >=x11-misc/xlockmore-5.43 x11-misc/slock x11-misc/alock[pam] ) )
-REQUIRED_USE=elogind? ( policykit ) systemd? ( policykit )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.13/xfce4-session-4.13.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=74866df544949d26cd188c9c85f3557c
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.5 b/metadata/md5-cache/xfce-base/xfce4-settings-4.13.5
deleted file mode 100644
index c14e9f1a1daf..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-base/xorg-proto
-DESCRIPTION=Configuration system for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=input_devices_libinput libcanberra libnotify upower +xklavier
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.13/xfce4-settings-4.13.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cde9ffaf4fa38376e4e12316026c9552
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.12.1-r1 b/metadata/md5-cache/xfce-base/xfconf-4.12.1-r1
index 004a1d4fe90c..79d5d5c8fcef 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.12.1-r1
+++ b/metadata/md5-cache/xfce-base/xfconf-4.12.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A configuration management system for Xfce
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=debug perl test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.30 >=xfce-base/libxfce4util-4.10 perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.12/xfconf-4.12.1.tar.bz2
 _eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=48096ef5a07590e500f4315ff8393c03
+_md5_=46f1529ca89c0b6c0770d1ca62ff8f04
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.13.5 b/metadata/md5-cache/xfce-base/xfconf-4.13.5
deleted file mode 100644
index 3a10b3da6c85..000000000000
--- a/metadata/md5-cache/xfce-base/xfconf-4.13.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.30:= >=xfce-base/libxfce4util-4.10:= perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl ) !<xfce-base/xfce4-panel-4.13.1 !<xfce-base/xfce4-settings-4.13.1 dev-util/gdbus-codegen dev-util/glib-utils dev-util/intltool virtual/pkgconfig sys-devel/gettext perl? ( dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A configuration management system for Xfce
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=debug perl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.30:= >=xfce-base/libxfce4util-4.10:= perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl ) !<xfce-base/xfce4-panel-4.13.1 !<xfce-base/xfce4-settings-4.13.1
-SLOT=0/3
-SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.13/xfconf-4.13.5.tar.bz2
-_eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c9dcabb684a85505f67f74530773ec11
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.13.6 b/metadata/md5-cache/xfce-base/xfconf-4.13.6
deleted file mode 100644
index 88b12e1d1f87..000000000000
--- a/metadata/md5-cache/xfce-base/xfconf-4.13.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.30:= >=xfce-base/libxfce4util-4.10:= perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl ) !<xfce-base/xfce4-panel-4.13.1 !<xfce-base/xfce4-settings-4.13.1 dev-util/gdbus-codegen dev-util/glib-utils dev-util/intltool virtual/pkgconfig sys-devel/gettext perl? ( dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A configuration management system for Xfce
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=debug perl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.30:= >=xfce-base/libxfce4util-4.10:= perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl ) !<xfce-base/xfce4-panel-4.13.1 !<xfce-base/xfce4-settings-4.13.1
-SLOT=0/3
-SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.13/xfconf-4.13.6.tar.bz2
-_eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3ee6636cf8f7263914b2a394de2c2e8b
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.13.3 b/metadata/md5-cache/xfce-base/xfdesktop-4.13.3
deleted file mode 100644
index 19f2a0682019..000000000000
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=x11-libs/cairo-1.12:= >=dev-libs/glib-2.42:= >=x11-libs/gtk+-3.22:3= >=x11-libs/libwnck-3.14:3= x11-libs/libX11:= >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= >=xfce-base/thunar-1.7:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Desktop manager for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=debug libnotify +thunar
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/cairo-1.12:= >=dev-libs/glib-2.42:= >=x11-libs/gtk+-3.22:3= >=x11-libs/libwnck-3.14:3= x11-libs/libX11:= >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= >=xfce-base/thunar-1.7:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.13/xfdesktop-4.13.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9446ccfee66b14d0010a6298315cc533
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r2 b/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r2
deleted file mode 100644
index 2f4dcd48946d..000000000000
--- a/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig
-DESCRIPTION=Window manager for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-4.13.1.tar.bz2 https://dev.gentoo.org/~mgorny/dist/xfwm4-4.13.1-patchset.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=55fa855ac427e857f42ad0bbd6926b75
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 1f3bd2ffc4ec..51939119cbdc 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/thunar-volman-0.9.1 b/metadata/md5-cache/xfce-extra/thunar-volman-0.9.1
deleted file mode 100644
index a5937deb71b6..000000000000
--- a/metadata/md5-cache/xfce-extra/thunar-volman-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.30:= virtual/libgudev:= >=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:= libnotify? ( >=x11-libs/libnotify-0.7:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Daemon that enforces volume-related policies
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-volman
-IUSE=libnotify
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.30:= virtual/libgudev:= >=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:= libnotify? ( >=x11-libs/libnotify-0.7:= ) virtual/udev >=xfce-base/thunar-1.6[udisks]
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/thunar-volman/0.9/thunar-volman-0.9.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=95143ca836ca70d513428845688bbedc
diff --git a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0 b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0
index 225ccc1d1256..025e13e071cb 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection] || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-util/intltool >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection] || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) sys-devel/gettext >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DESCRIPTION=Simple ALSA volume control for xfce4-panel
 EAPI=6
 HOMEPAGE=https://github.com/equeim/xfce4-alsa-plugin
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection]
 SLOT=0
 SRC_URI=https://github.com/equeim/xfce4-alsa-plugin/archive/0.2.0.tar.gz -> xfce4-alsa-plugin-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14bc21d1245883cb521c58d95666435a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7b2d59237f509ea4ead8fb3be91bdae1
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.90 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.90
new file mode 100644
index 000000000000..2334dde1e165
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.90
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.12:= dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=A system load plug-in for the Xfce panel
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD-2 GPL-2+
+RDEPEND=>=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.12:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-1.0.90.tar.bz2
+_eclasses_=xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=b9439ba647b5f5ad3e21fc033c0109aa
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.3 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.3
deleted file mode 100644
index 05b36434cdff..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= dev-util/glib-utils dev-util/intltool virtual/pkgconfig
-DESCRIPTION=Xfce4 screenshooter application and panel plugin
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-screenshooter
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=44932dddf6673d177c57666d2a0bf661
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.5 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.5
index 5507d6477a96..a96ce8de56c7 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.5
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.
 DESCRIPTION=Xfce4 screenshooter application and panel plugin
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-screenshooter
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.5.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2a37be3c2960a6c51e204d0cb4166ea2
+_md5_=870b5e7962052510ae83b49fda016316
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5
deleted file mode 100644
index ae04484f6823..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=postinst postrm prepare setup
-DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/intltool dev-util/xfce4-dev-tools media-gfx/imagemagick[png] sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Xfce plugin puts the maximized window title and windows buttons on the panel
-EAPI=7
-HOMEPAGE=https://github.com/cedl38/xfce4-windowck-plugin
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
-SLOT=0
-SRC_URI=https://github.com/cedl38/xfce4-windowck-plugin/archive/v0.4.5.tar.gz -> xfce4-windowck-plugin-0.4.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=994df61ad2ab1008c2ae064fd43de287
diff --git a/metadata/news/2007-05-04-paludis-0_24/2007-05-04-paludis-0_24.en.txt b/metadata/news/2007-05-04-paludis-0_24/2007-05-04-paludis-0_24.en.txt
deleted file mode 100644
index d66e7741600e..000000000000
--- a/metadata/news/2007-05-04-paludis-0_24/2007-05-04-paludis-0_24.en.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Title: Changes for Paludis 0.24
-Author: Piotr Jaroszyński <peper@gentoo.org>
-Content-Type: text/plain
-Posted: 2007-05-04
-Revision: 2
-News-Item-Format: 1.0
-Display-If-Installed: <sys-apps/paludis-0.30
-
-As of Paludis 0.24, the use of '*' to match all packages in the Paludis
-configuration files 'use.conf', 'keywords.conf' and 'licenses.conf' is
-deprecated in favour of '*/*'. You should update your configuration
-files after upgrading.
diff --git a/metadata/news/2009-01-04-sparc-multilib/2009-01-04-sparc-multilib.en.txt b/metadata/news/2009-01-04-sparc-multilib/2009-01-04-sparc-multilib.en.txt
deleted file mode 100644
index f3e9bf3ace6a..000000000000
--- a/metadata/news/2009-01-04-sparc-multilib/2009-01-04-sparc-multilib.en.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Title: Migrating to the new sparc multilib profile
-Author: Friedrich Oslage <bluebird@gentoo.org>
-Content-Type: text/plain
-Posted: 2009-01-04
-Revision: 2
-News-Item-Format: 1.0
-Display-If-Profile: default/linux/sparc/experimental/multilib
-Display-If-Profile: default/linux/sparc/experimental/multilib/desktop
-Display-If-Profile: default/linux/sparc/experimental/multilib/developer
-Display-If-Profile: default/linux/sparc/experimental/multilib/server
-
-When migrating to the new sparc multilib profile please keep in mind that it is
-still in an experimental state. Also note that you need to follow the migration
-guide [0], otherwise important packages such as gcc or glibc will fail to
-compile and most other packages will be installed incorrectly.
-
-[0] http://sparc.gentoo.org/multilib.xml
diff --git a/metadata/news/2009-04-06-x_server-1_5/2009-04-06-x_server-1_5.en.txt b/metadata/news/2009-04-06-x_server-1_5/2009-04-06-x_server-1_5.en.txt
deleted file mode 100644
index c92df9859ab1..000000000000
--- a/metadata/news/2009-04-06-x_server-1_5/2009-04-06-x_server-1_5.en.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Title: Migration to X.org Server 1.5
-Author: Remi Cardona <remi@gentoo.org>
-Author: Christian Faulhammer <fauli@gentoo.org>
-Content-Type: text/plain
-Posted: 2009-04-06
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <x11-base/xorg-server-1.5
-
-A lot of changes regarding device recognition and use by the X server
-have been introduced in the 1.5 update.  As that version is going
-stable on all architectures, users should read the upgrade guide [0]
-before actually updating the package.
-
-[0] http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-1.5-upgrade-guide.xml
diff --git a/metadata/news/2009-07-12-xorg-74-alpha/2009-07-12-xorg-74-alpha.en.txt b/metadata/news/2009-07-12-xorg-74-alpha/2009-07-12-xorg-74-alpha.en.txt
deleted file mode 100644
index a275ec14d719..000000000000
--- a/metadata/news/2009-07-12-xorg-74-alpha/2009-07-12-xorg-74-alpha.en.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Title: xorg-x11-7.4 and xorg-server-1.5 kernel support
-Author: Tobias Klausmann <klausman@gentoo.org>
-Content-Type: text/plain
-Posted: 2009-07-12
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: x11-base/xorg-server
-Display-If-Profile: default-linux/alpha
-Display-If-Profile: default/linux/alpha
-
-Recent versions of xorg's X11 require kernel support to access PCI and AGP
-graphic cards. This support has only recently been added to the Linux kernel
-(sys-kernel/vanilla-sources-2.6.30 and sys-kernel/gentoo-sources-2.6.29-r5).
-Thus, you will need to run a recent enough kernel to use recent versions of X11
-on an alpha. If you only start programs on your alpha, but the display is on
-another machine, no upgrade is necessary.
-
-Furthermore, not all graphics card drivers have been updated to work with the
-newer X server API. One example is the glint driver used for Permedia cards. The
-upstream developers have been informed about this, but no fixes are available
-yet, please see https://bugs.freedesktop.org/show_bug.cgi?id=21546
-
-For a general guide to upgrading to Xorg 1.5, see the Gentoo upgrade guide:
-http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-1.5-upgrade-guide.xml
diff --git a/metadata/news/2009-10-02-xorg-server-1-6-libxcb-1_4/2009-10-02-xorg-server-1-6-libxcb-1_4.en.txt b/metadata/news/2009-10-02-xorg-server-1-6-libxcb-1_4/2009-10-02-xorg-server-1-6-libxcb-1_4.en.txt
deleted file mode 100644
index 886f7f902eed..000000000000
--- a/metadata/news/2009-10-02-xorg-server-1-6-libxcb-1_4/2009-10-02-xorg-server-1-6-libxcb-1_4.en.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Title: Migration to X.org Server 1.6 and libxcb 1.4
-Author: Remi Cardona <remi@gentoo.org>
-Content-Type: text/plain
-Posted: 2009-10-02
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <x11-base/xorg-server-1.6
-Display-If-Installed: <x11-libs/libxcb-1.4
-
-We're pleased to announce the stabilization of xorg-server-1.6. Users
-are strongly encouraged to read the following two guides before
-upgrading:
-
-http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-1.6-upgrade-guide.xml
-http://www.gentoo.org/proj/en/desktop/x/x11/libxcb-1.4-upgrade-guide.xml 
diff --git a/metadata/news/2009-10-08-gnome-226/2009-10-08-gnome-226.en.txt b/metadata/news/2009-10-08-gnome-226/2009-10-08-gnome-226.en.txt
deleted file mode 100644
index 065e675c5d7b..000000000000
--- a/metadata/news/2009-10-08-gnome-226/2009-10-08-gnome-226.en.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Title: Upgrade to GNOME 2.26
-Author: Mart Raudsepp <leio@gentoo.org>
-Content-Type: text/plain
-Posted: 2009-10-08
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <gnome-base/gnome-2.26.0
-Display-If-Installed: <gnome-base/gnome-light-2.26.0
-Display-If-Installed: <gnome-base/gnome-session-2.26.2
-Display-If-Installed: <gnome-base/gnome-menus-2.26.2
-
-We are pleased to announce the stabilization of GNOME-2.26. Users are
-strongly encouraged to read the GNOME 2.26 Upgrade Guide, to avoid any
-possible issues relating to the upgrade, such as Applications menu items
-disappearing, or nautilus constantly restarting when it is configured to
-not handle the desktop.
-
-Please read the Gnome 2.26 Upgrade Guide:
-http://gnome.gentoo.org/howtos/gnome-2.26-upgrade.xml
diff --git a/metadata/news/2009-10-22-default-linux/2009-10-22-default-linux.en.txt b/metadata/news/2009-10-22-default-linux/2009-10-22-default-linux.en.txt
deleted file mode 100644
index 88ca0e041566..000000000000
--- a/metadata/news/2009-10-22-default-linux/2009-10-22-default-linux.en.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Title: Using default-linux profile is now obsolete
-Author: Samuli Suominen <ssuominen@gentoo.org>
-Content-Type: text/plain
-Posted: 2009-10-22
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Profile: default-linux/alpha
-Display-If-Profile: default-linux/amd64
-Display-If-Profile: default-linux/arm
-Display-If-Profile: default-linux/ia64
-Display-If-Profile: default-linux/m68k
-Display-If-Profile: default-linux/s390
-Display-If-Profile: default-linux/sh
-Display-If-Profile: default-linux/sparc
-Display-If-Profile: default-linux/x86
-
-The profiles in default-linux/ have been deprecated for six weeks.
-Users using these profiles are expected to migrate to a new profile
-before 2009-12-01, at which point the default-linux/ profiles will be
-removed.  The new profiles contain up to date configurations and were
-adopted because they were easier to maintain.  Users can switch to a
-new profile using eselect:
-
-# eselect profile list
-# eselect profile set <target>
-
-If a machine is not migrated to a new valid profile before the deprecated 
-profiles are removed, emerge will have very limited functionality until 
-the migration is done.
diff --git a/metadata/news/2010-01-31-eselect-opengl/2010-01-31-eselect-opengl.en.txt b/metadata/news/2010-01-31-eselect-opengl/2010-01-31-eselect-opengl.en.txt
deleted file mode 100644
index 469d62a92243..000000000000
--- a/metadata/news/2010-01-31-eselect-opengl/2010-01-31-eselect-opengl.en.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Title: Removal of libGL.la
-Author: Tomáš Chvátal <scarabeus@gentoo.org>
-Content-Type: text/plain
-Posted: 2010-01-31
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <app-admin/eselect-opengl-1.1.1-r2
-
-Eselect-opengl package now strips the libGL.la file. This file was broken and
-thus we proceeded with its removal. It brings slight inconvenience on you fellow
-users. After emerging the new version =app-admin/eselect-opengl-1.1.1-r2 please
-emerge one more package dev-util/lafilefixer and use it for fixing all various
-compilation issues by running as root:
-# lafilefixer --justfixit
-Note that not-running this command will bring you compilation issues so you
-should really pay attention to this message and act upon it.
diff --git a/metadata/news/2010-02-21-mysql-upgrade/2010-02-21-mysql-upgrade.en.txt b/metadata/news/2010-02-21-mysql-upgrade/2010-02-21-mysql-upgrade.en.txt
deleted file mode 100644
index 493bab44e468..000000000000
--- a/metadata/news/2010-02-21-mysql-upgrade/2010-02-21-mysql-upgrade.en.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Title: MySQL 5.1 unmasking and upgrade procedures
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Content-Type: text/plain
-Posted: 2010-02-21
-Revision: 5
-News-Item-Format: 1.0
-Display-If-Installed: <dev-db/mysql-5.1
-
-The 5.1 series of MySQL is going to be unmasked at the same time as the release
-of this news item. When upgrading from an older major version (including 5.0),
-you will be required to rebuild everything linked to the libmysqlclient.so.15
-and libmysqlclient_r.so.15.
-
-You can do this by installing app-portage/gentoolkit and running:
-# revdep-rebuild --library libmysqlclient.so.15
-# revdep-rebuild --library libmysqlclient_r.so.15
-
-If you use the Portage 2.2 series, you may also use:
-# emerge @preserved-rebuild
-
-The official upgrade documentation is available here:
-http://dev.mysql.com/doc/refman/5.1/en/upgrading.html
-
-Note that existing databases may need converting as well, again including those
-upgrading from 5.0 to 5.1. Details are in the update documentation.
diff --git a/metadata/news/2010-02-28-layman-storage-path-change/2010-02-28-layman-storage-path-change.en.txt b/metadata/news/2010-02-28-layman-storage-path-change/2010-02-28-layman-storage-path-change.en.txt
deleted file mode 100644
index 5726373ce128..000000000000
--- a/metadata/news/2010-02-28-layman-storage-path-change/2010-02-28-layman-storage-path-change.en.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Title: Layman storage path changed from version 1.3.0 on
-Author: Sebastian Pipping <sping@gentoo.org>
-Content-Type: text/plain
-Posted: 2010-02-28
-Revision: 2
-News-Item-Format: 1.0
-Display-If-Installed: <app-portage/layman-1.3
-
-Layman has been using /usr/local/portage/layman to store
-overlay checkouts from version 1.2.3 on.  As that path
-was violating the concept of keeping portage away from
-/usr/local the default of this storage location moves to
-
-  /var/lib/layman
-
-from version 1.3.0 on.  If you have never touched the file
-/etc/layman/layman.cfg manually before, you may be tempted to let
-tools like etc-update or dispatch-conf blindly accept this new version
-of layman.cfg.
-
-As that would hide all your currently installed overlays from layman
-it's probably not what you want.  Your options are:
-
- A) Moving
-   1. Move your current content to /var/lib/layman.
-   2. Update PORTDIR_OVERLAY in /var/lib/layman/make.conf accordingly.
-   3. Make /etc/make.conf source /var/lib/layman/make.conf.
-   4. Set option "storage" in /etc/layman/layman.cfg
-      to "/var/lib/layman".
-
- B) A symlink
-   Put a symlink to your current storage location at /var/lib/layman
-   before upgrading layman.
-
- C) Configuration
-   Reject the path change for layman.cfg when running tools like
-   etc-update or dispatch-conf.  Be aware with this way you'll have
-   to do it for each layman update again.
-
-PS: This news item is a reaction to users having run into this problem
-(see bug #306233).  Thanks to Volker Hemmann for reporting.
diff --git a/metadata/news/2010-03-01-mythtv-upgrade/2010-03-01-mythtv-upgrade.en.txt b/metadata/news/2010-03-01-mythtv-upgrade/2010-03-01-mythtv-upgrade.en.txt
deleted file mode 100644
index 71bf12826ec5..000000000000
--- a/metadata/news/2010-03-01-mythtv-upgrade/2010-03-01-mythtv-upgrade.en.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Title: MythTV 0.22 Upgrade Database Corruption
-Author: Richard Freeman <rich0@gentoo.org>
-Content-Type: text/plain
-Posted: 2010-03-01
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <media-tv/mythtv-0.22
-
-Due to an incompatibility between MythTV 0.21 and the default Gentoo
-MySQL configuration, it is likely that long-time MythTV users will
-have databases with a mixture of locale encodings.  If you upgrade to
-0.22 without following these directions carefully, you could end up
-with a database that contains errors that are extremely difficult to
-fix.
-
-Note that not all mythtv users need to modify their databases, and
-this should only be performed at the time of the upgrade.  The guide
-below contains instructions that can be used to determine if this
-problem pertains to you.
-
-Please see the MythTV Upgrade Guide for instructions:
-
-   http://wiki.mythtv.org/wiki/Fixing_Corrupt_Database_Encoding
-
-Be sure to save a database backup using mysqldump before upgrading.  
-Also, be sure to upgrade any other clients/backends you are using to
-0.22 at the same time.  The upgrade instructions need to be followed 
-once per database - individual client/backend upgrades do not require 
-these steps.
-
-If you do run into problems with your upgrade, there is a forum thread
-where you may be able to find help:
-
-   http://forums.gentoo.org/viewtopic-t-816566-highlight-.html
-
diff --git a/metadata/news/2010-03-23-new-subprofiles/2010-03-23-new-subprofiles.en.txt b/metadata/news/2010-03-23-new-subprofiles/2010-03-23-new-subprofiles.en.txt
deleted file mode 100644
index 550c33d0c9a7..000000000000
--- a/metadata/news/2010-03-23-new-subprofiles/2010-03-23-new-subprofiles.en.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Title: New desktop subprofiles for GNOME and KDE
-Author: Theo Chatzimichos <tampakrap@gentoo.org>
-Content-Type: text/plain
-Posted: 2010-03-23
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Profile: default/linux/alpha/10.0/desktop
-Display-If-Profile: default/linux/amd64/10.0/desktop
-Display-If-Profile: default/linux/arm/10.0/desktop
-Display-If-Profile: default/linux/hppa/10.0/desktop
-Display-If-Profile: default/linux/ia64/10.0/desktop
-Display-If-Profile: default/linux/m68k/10.0/desktop
-Display-If-Profile: default/linux/powerpc/ppc32/10.0/desktop
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/32bit-userland/desktop
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/64bit-userland/desktop
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/desktop
-Display-If-Profile: default/linux/sh/10.0/desktop
-Display-If-Profile: default/linux/sparc/10.0/desktop
-Display-If-Profile: default/linux/sparc/experimental/multilib/desktop
-Display-If-Profile: default/linux/x86/10.0/desktop
-
-There are two new subprofiles under desktop, one for GNOME and one for
-KDE. Users that have only one of those two DEs may choose the according
-subprofile. Users of other DEs or WMs may stick to the desktop profile.
-
-Attention: KDE or GNOME specific USE flags have been stripped from the
-desktop profile. More specifically:
-GNOME subprofile contains: USE="eds evo gnome gstreamer"
-KDE subprofile contains: USE="kde"
-
-(I'll commit the change on Friday, 26 Mar 2010)
diff --git a/metadata/news/2010-03-25-python-3_1/2010-03-25-python-3_1.en.txt b/metadata/news/2010-03-25-python-3_1/2010-03-25-python-3_1.en.txt
deleted file mode 100644
index 13533ecaf8bc..000000000000
--- a/metadata/news/2010-03-25-python-3_1/2010-03-25-python-3_1.en.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Title: Python 3.1
-Author: Arfrever Frehtes Taifersar Arahesis <Arfrever@gentoo.org>
-Content-Type: text/plain
-Posted: 2010-03-25
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: =dev-lang/python-3.1*
-
-Python 3 is a new major version of Python and is intentionally incompatible
-with Python 2. Many external modules have not been ported yet to Python 3,
-so Python 2 still needs to be installed. You can benefit from having Python 3
-installed without setting Python 3.1 as main active version of Python.
-Currently you should not set Python 3.1 as main active version of Python.
-When setting it becomes recommended, a separate news item will be created
-to notify users.
-
-Although Python 3.1 should not be set as main active version of Python,
-you should run python-updater after installation of Python 3.1. By default,
-modules that support both Python 2 and Python 3 are installed for both
-the active version of Python 2 and the active version of Python 3 when both
-Python 2 and Python 3 are installed.
-
-It is recommended to use a UTF-8 locale to avoid potential problems. Especially
-C and POSIX locales are discouraged. If locale has not been explicitly set,
-then POSIX locale is used, so you should ensure that locale has been set.
-Problems occurring only with non-UTF-8 locales should be reported directly
-to upstream developers of given packages.
-See http://www.gentoo.org/doc/en/utf-8.xml for more information about UTF-8.
diff --git a/metadata/news/2010-05-02-gnome-228/2010-05-02-gnome-228.en.txt b/metadata/news/2010-05-02-gnome-228/2010-05-02-gnome-228.en.txt
deleted file mode 100644
index 177e160a1d86..000000000000
--- a/metadata/news/2010-05-02-gnome-228/2010-05-02-gnome-228.en.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Title: Upgrade to GNOME 2.28
-Author: Pacho Ramos <pacho@gentoo.org>
-Content-Type: text/plain
-Posted: 2010-04-23
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <gnome-base/gnome-2.28.2
-Display-If-Installed: <gnome-base/gnome-light-2.28.1
-Display-If-Installed: <gnome-base/gnome-session-2.28.0
-Display-If-Installed: <gnome-base/gnome-menus-2.28.0.1
-
-We are pleased to announce the stabilization of GNOME-2.28. Users are
-strongly encouraged to read the GNOME 2.28 Upgrade Guide, to avoid any
-possible issues relating to the upgrade, such as Applications menu items
-disappearing, missing icons, or mouse interaction problems.
-
-Please read the Gnome 2.28 Upgrade Guide:
-http://gnome.gentoo.org/howtos/gnome-2.28-upgrade.xml
diff --git a/metadata/news/2010-10-22-perl-5_12-upgrade-procedure/2010-10-22-perl-5_12-upgrade-procedure.en.txt b/metadata/news/2010-10-22-perl-5_12-upgrade-procedure/2010-10-22-perl-5_12-upgrade-procedure.en.txt
deleted file mode 100644
index 0be2ab381542..000000000000
--- a/metadata/news/2010-10-22-perl-5_12-upgrade-procedure/2010-10-22-perl-5_12-upgrade-procedure.en.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Title: Perl 5.12 upgrade procedure
-Author: perl-team <perl@gentoo.org>
-Author: Torsten Veller <tove@gentoo.org>
-Content-Type: text/plain
-Posted: 2010-10-22
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <dev-lang/perl-5.12
-
-==> Run `perl-cleaner --all` after upgrading to a new Perl version! <==
-
-"Perl 5.12 is not binary compatible with prior releases of Perl. If
-you have built extensions (i.e. modules that include C code) using an
-earlier version of Perl, you will need to rebuild and reinstall those
-extensions." [1]
-
-In fact, in Gentoo you currently have to rebuild all Perl modules and
-all binaries linking libperl to get into a consistent state again.
-
-perl-cleaner generates a list of broken packages and passes it to your
-package manager to reinstall them. After reinstalling the packages,
-perl-cleaner outputs a list of files the script could not deal with
-(like modules installed not via the package manager).
-
-See `man perl-cleaner` for its options.
-
-[1] http://search.cpan.org/dist/perl-5.12.2/INSTALL#Changes_and_Incompatibilities
diff --git a/metadata/news/2010-10-27-hardened-gcc4-info/2010-10-27-hardened-gcc4-info.en.txt b/metadata/news/2010-10-27-hardened-gcc4-info/2010-10-27-hardened-gcc4-info.en.txt
deleted file mode 100644
index 6ca95223dbec..000000000000
--- a/metadata/news/2010-10-27-hardened-gcc4-info/2010-10-27-hardened-gcc4-info.en.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Title: Info about GCC on Hardened profiles
-Author: Magnus Granberg <zorry@gentoo.org>
-Content-Type: text/plain
-Posted: 2010-10-27
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <sys-devel/gcc-4.4
-Display-If-Profile: hardened/linux
-
-GCC 4.4.4-r2 is now stable in the hardened profiles (on x86 and
-amd64 as of 2010-10-24, other architectures will follow later).
-Starting from this version, SSP support is enabled by default for the
-architectures it is supported on (namely x86, amd64, ppc, ppc64 and
-arm). Previously, GCC 4.3.4 had SSP support but it was not enabled
-by default.
-
-Older GCC versions in the hardened profiles, such as the
-GCC 3.x series will be obsoleted, problems arising on those versions,
-but not applying to GCC 4.4.4-r2 will not be fixed, so please update
-to the new version.
diff --git a/metadata/news/2010-11-13-hardened-profiles/2010-11-13-hardened-profiles.en.txt b/metadata/news/2010-11-13-hardened-profiles/2010-11-13-hardened-profiles.en.txt
deleted file mode 100644
index 98c7378eabc1..000000000000
--- a/metadata/news/2010-11-13-hardened-profiles/2010-11-13-hardened-profiles.en.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Title: Restructuring of Hardened profiles
-Author: Anthony G. Basile <blueness@gentoo.org>
-Author: Hardened Team <hardened@gentoo.org>
-Content-Type: text/plain
-Posted: 2010-11-13
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Profile: hardened/linux/ia64/10.0
-Display-If-Profile: hardened/linux/ia64/10.0/server
-Display-If-Profile: hardened/linux/ia64/10.0/desktop
-Display-If-Profile: hardened/linux/ia64/10.0/developer
-Display-If-Profile: hardened/linux/x86/10.0
-Display-If-Profile: hardened/linux/x86/10.0/server
-Display-If-Profile: hardened/linux/x86/10.0/no-nptl
-Display-If-Profile: hardened/linux/x86/10.0/desktop
-Display-If-Profile: hardened/linux/x86/10.0/developer
-Display-If-Profile: hardened/linux/amd64/10.0
-Display-If-Profile: hardened/linux/amd64/10.0/server
-Display-If-Profile: hardened/linux/amd64/10.0/desktop
-Display-If-Profile: hardened/linux/amd64/10.0/no-multilib
-Display-If-Profile: hardened/linux/amd64/10.0/developer
-Display-If-Profile: hardened/linux/powerpc/ppc32/10.0
-Display-If-Profile: hardened/linux/powerpc/ppc32/10.0/server
-Display-If-Profile: hardened/linux/powerpc/ppc32/10.0/desktop
-Display-If-Profile: hardened/linux/powerpc/ppc32/10.0/developer
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0/server
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0/desktop
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0/32bit-userland
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0/32bit-userland/server
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0/64bit-userland
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0/64bit-userland/server
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0/64bit-userland/desktop
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer
-Display-If-Profile: hardened/linux/powerpc/ppc64/10.0/developer
-
-During the next few weeks, all hardened profiles will be restructured to
-remove the version number "/10.0".  For example, if your current profile
-is "hardened/linux/amd64/10.0/no-multilib" your new profile will be
-"hardened/linux/amd64/no-multilib".
-
-We will change the profiles one arch at a time, starting with ia64, and
-proceeding in order with ppc, ppc64, x86 and amd64.  Once your arch has
-been  updated, you will receive a warning when running emerge that your
-profile has been deprecated.  When you do, use "eselect profile list" to
-get a list of the new profiles.  Then, use "eselect profile set <num>"
-to switch to your new profile with corresponding number <num>.
-
-Progress with the restructuring will be tracked in bug #344861.
diff --git a/metadata/news/2011-02-13-libgphoto2-2_4_10/2011-02-13-libgphoto2-2_4_10.en.txt b/metadata/news/2011-02-13-libgphoto2-2_4_10/2011-02-13-libgphoto2-2_4_10.en.txt
deleted file mode 100644
index d599f3a43bb4..000000000000
--- a/metadata/news/2011-02-13-libgphoto2-2_4_10/2011-02-13-libgphoto2-2_4_10.en.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Title: Change on CAMERAS in libgphoto2-2.4.10
-Author: Pacho Ramos <pacho@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-02-13
-Revision: 2
-News-Item-Format: 1.0
-Display-If-Installed: <media-libs/libgphoto2-2.4.10
-
-In order to not violate package manager handling, selective cameras 
-build logic has been modified in libgphoto2-2.4.10 to build 'ptp2' by 
-default, nothing if CAMERAS variable is set to an empty value and only 
-the ones specified otherwise.
-
-See http://bugs.gentoo.org/346491 for reference.
diff --git a/metadata/news/2011-02-14-gnome-232/2011-02-14-gnome-232.en.txt b/metadata/news/2011-02-14-gnome-232/2011-02-14-gnome-232.en.txt
deleted file mode 100644
index 47c121664892..000000000000
--- a/metadata/news/2011-02-14-gnome-232/2011-02-14-gnome-232.en.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Title: Upgrade to GNOME 2.32
-Author: Pacho Ramos <pacho@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-02-14
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <gnome-base/gnome-2.32.1
-Display-If-Installed: <gnome-base/gnome-light-2.32.1
-Display-If-Installed: <gnome-base/gnome-session-2.32.1
-
-We are pleased to announce the stabilization of GNOME-2.32. Users are
-strongly encouraged to read the GNOME 2.32 Upgrade Guide, to avoid any
-possible issues relating to the upgrade, such as gnome-panel hanging 
-issues, evolution migration problems and others.
-
-Please read the Gnome 2.32 Upgrade Guide:
-http://gnome.gentoo.org/howtos/gnome-2.32-upgrade.xml
diff --git a/metadata/news/2011-02-19-ia64-java-removal/2011-02-19-ia64-java-removal.en.txt b/metadata/news/2011-02-19-ia64-java-removal/2011-02-19-ia64-java-removal.en.txt
deleted file mode 100644
index eb4577850dfb..000000000000
--- a/metadata/news/2011-02-19-ia64-java-removal/2011-02-19-ia64-java-removal.en.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Title: Pending Removal of Java support on IA64
-Author: Petteri Räty <betelgeuse@gentoo.org>
-Author: IA64 Arch Team <ia64@gentoo.org>
-Author: Vlastimil Babka <caster@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-02-19
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Keyword: ia64
-Display-If-Installed: dev-java/java-config
-
-Since the IA64 arch team does not have the resources to maintain Java support,
-we have agreed that ia64 keywords will be dropped from Java packages, and the 
-java USE flag masked on IA64, unless more manpower becomes available.
-If you are willing to help with the maintenance, please contact ia64@gentoo.org.
-If there is not enough interest, Java support will be removed during the second
-half of March 2011.
-
-The removal is tracked in bug #345433.
diff --git a/metadata/news/2011-04-26-gnustep-new-layout/2011-04-26-gnustep-new-layout.en.txt b/metadata/news/2011-04-26-gnustep-new-layout/2011-04-26-gnustep-new-layout.en.txt
deleted file mode 100644
index ca24ef63993b..000000000000
--- a/metadata/news/2011-04-26-gnustep-new-layout/2011-04-26-gnustep-new-layout.en.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Title: GNUstep packages new layout
-Author: Bernard Cafarelli <voyageur@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-04-26
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <gnustep-base/gnustep-make-2.6.0
-
-Traditionally, GNUstep used its own filesystem layout, installing
-everything under /usr/GNUstep. Starting with gnustep-make-2.6.0, the
-default filesystem layout has changed and is now the 'fhs' layout,
-installing files in standard Unix directories.
-
-Following upstream's change, GNUstep packages in Gentoo will now
-also use the new default layout. Your system will switch to it
-after updating gnustep-base/gnustep-make to >=2.6.0.
-
-This change means that you have to re-emerge all installed packages
-depending on GNUstep to move them to the new layout. You can use
-gnustep-base/gnustep-updater for this step
diff --git a/metadata/news/2011-04-27-glib-228/2011-04-27-glib-228.en.txt b/metadata/news/2011-04-27-glib-228/2011-04-27-glib-228.en.txt
deleted file mode 100644
index 823413d35d39..000000000000
--- a/metadata/news/2011-04-27-glib-228/2011-04-27-glib-228.en.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Title: Upgrade to GLIB 2.28
-Author: The Gentoo Freedesktop Maintainers <freedesktop-bugs@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-04-27
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <dev-libs/glib-2.28
-
-The method for setting default applications for specific URI types
-(https://, mailto://, etc.) changed in dev-libs/glib-2.28 and newer.
-If you previously set them in GConf using the Configuration Editor,
-they will now be ignored.
-
-If you use GNOME, you must upgrade gnome-session and
-gnome-control-center and set your default browser/mail-client again.
-
-If you don't use GNOME, you should ensure that the file
-~/.local/share/applications/mimeapps.list has the following content:
-
-[Added Associations]
-x-scheme-handler/http=$browser_name.desktop;
-x-scheme-handler/https=$browser_name.desktop;
-x-scheme-handler/mailto=$mailclient_name.desktop;
-
-Replace $browser_name.desktop and $mailclient_name.desktop with the
-appropriate file from /usr/share/applications that can handle
-http/https/mailto URIs.
-
-The system-wide version of the file is often at
-/usr/share/applications/defaults.list instead.
-
-Please make sure that your browsers and mail clients have been upgraded
-to the latest stable versions before doing all this.
-
-More information about using defaults.list and mimeapps.list is at:
-
-http://www.freedesktop.org/wiki/Specifications/mime-actions-spec
diff --git a/metadata/news/2011-05-01-baselayout-update/2011-05-01-baselayout-update.en.txt b/metadata/news/2011-05-01-baselayout-update/2011-05-01-baselayout-update.en.txt
deleted file mode 100644
index d4b768950ac9..000000000000
--- a/metadata/news/2011-05-01-baselayout-update/2011-05-01-baselayout-update.en.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Title: Baselayout update
-Author: Christian Faulhammer <fauli@gentoo.org>
-Author: William Hubbs <williamh@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-05-01
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <sys-apps/baselayout-2
-
-The baselayout package provides files which all systems must have in
-order to function properly. You are currently using version 1.x, which
-has several issues. The most significant of these is that the included
-init scripts are written entirely in bash, which makes them slow and
-not very flexible.
-
-On 2011/05/08, you will see an update for sys-apps/baselayout to
-2.x and a new package, sys-apps/openrc. It is recommended that you
-perform this update as soon as possible.
-
-Please note, after these packages are emerged, it is
-__Absolutely_Critical__ that you immediately update your configuration
-files with dispatch-conf, etc-update or a similar tool then follow the
-steps in the migration guide located at the following URL.
-http://www.gentoo.org/doc/en/openrc-migration.xml
-
-FAILURE TO FOLLOW ALL OF THESE STEPS WILL RESULT IN AN UNBOOTABLE
-SYSTEM! IF THIS SHOULD HAPPEN, YOU WILL NEED TO BOOT FROM A LIVE CD OR
-DVD, MOUNT YOUR ROOT FILE SYSTEM, CHROOT INTO THAT ENVIRONMENT AND
-FOLLOW THE ABOVE STEPS!
diff --git a/metadata/news/2011-08-28-mesa-r600g/2011-08-28-mesa-r600g.en.txt b/metadata/news/2011-08-28-mesa-r600g/2011-08-28-mesa-r600g.en.txt
deleted file mode 100644
index 110f330080e5..000000000000
--- a/metadata/news/2011-08-28-mesa-r600g/2011-08-28-mesa-r600g.en.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Title: Mesa r600 driver now defaults to gallium
-Author: Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-08-28
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <media-libs/mesa-7.12
-
-This news item is relevant to you only if you have a Radeon graphics
-chipset and use the free/open source driver.
-
-The r600 driver that provides 3D acceleration for Radeon HD 2400 and
-later cards comes in the "classic" and "gallium" variants. The gallium
-driver is based on the new Gallium3D infrastructure and was chosen as
-the default driver for media-libs/mesa-7.11.
-
-Existing users will not be switched automatically. To switch to the
-r600 gallium driver, use the following command:
-
-    eselect mesa set r600 gallium
-
-Gallium3D requires kernel modesetting (KMS). If your system is not yet
-configured for KMS, consult the X Server Configuration HOWTO for
-instructions prior to switching:
-
-    http://www.gentoo.org/doc/en/xorg-config.xml
diff --git a/metadata/news/2011-10-15-libpng15/2011-10-15-libpng15.en.txt b/metadata/news/2011-10-15-libpng15/2011-10-15-libpng15.en.txt
deleted file mode 100644
index d5c3f272e19b..000000000000
--- a/metadata/news/2011-10-15-libpng15/2011-10-15-libpng15.en.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Title: Upgrade to libpng15
-Author: Samuli Suominen <ssuominen@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-10-15
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <media-libs/libpng-1.5
-
-After upgrading from libpng14 to libpng15 it's important that you rebuild
-cairo and gdk-pixbuf as soon as possible if they are installed.
-
-Then you can proceed with rebuilding the rest of the software against the new
-library:
-
-# revdep-rebuild --library libpng14.so.14 -- --keep-going
-
-Note: It might be necessary to run the previous command more than once.
-
-If you find packages not building with the message "ld: cannot find -lpng14",
-they are likely caused by broken libtool archives (.la) in your system.
-
-You can identify those files with following one-liner:
-
-# find /usr/ -name '*.la' -exec grep png14 {} +
-
-Once you have identified the broken files, you can either delete them,
-edit them in place and replace png14 with png15, or re-emerge the packages
-they belong to.
-
-More information and help is available at the following forum post:
-
-http://forums.gentoo.org/viewtopic-t-894950.html
diff --git a/metadata/news/2011-11-27-gnome3-unmask/2011-11-27-gnome3-unmask.en.txt b/metadata/news/2011-11-27-gnome3-unmask/2011-11-27-gnome3-unmask.en.txt
deleted file mode 100644
index 7077a667a3e6..000000000000
--- a/metadata/news/2011-11-27-gnome3-unmask/2011-11-27-gnome3-unmask.en.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Title: Unmasking of and Upgrade to GNOME 3.2
-Author: Nirbheek Chauhan <nirbheek@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-11-26
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <gnome-base/gnome-session-3.2
-
-We are pleased to announce the addition to tree and unmasking of GNOME-3.2.
-Users are strongly encouraged to read the GNOME 3.2 Guide. GNOME 3 has
-a massively changed interface and requires working 3D drivers for use, however
-there is a fallback mode which is very similar to GNOME 2 and does not require
-3D acceleration.
-
-Please read the Gnome 3.2 Guide:
-http://gnome.gentoo.org/howtos/gnome-3.2-upgrade.xml
diff --git a/metadata/news/2011-12-06-kde473-kdepim/2011-12-06-kde473-kdepim.en.txt b/metadata/news/2011-12-06-kde473-kdepim/2011-12-06-kde473-kdepim.en.txt
deleted file mode 100644
index 2565795e9d51..000000000000
--- a/metadata/news/2011-12-06-kde473-kdepim/2011-12-06-kde473-kdepim.en.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Title: Stabilization of KDE 4.7.3 including KDEPIM
-Author: Andreas K. Huettel <dilfridge@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-12-06
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <kde-base/libkdepim-4.5
-Display-If-Installed: <kde-base/blogilo-4.5
-Display-If-Installed: <kde-base/kabcclient-4.5
-Display-If-Installed: <kde-base/kdepim-strigi-analyzer-4.5
-Display-If-Installed: <kde-base/konsolekalendar-4.5
-Display-If-Installed: <kde-base/libkleo-4.5
-Display-If-Installed: <kde-base/libkpgp-4.5
-
-We are pleased to announce the upcoming stabilization of KDE 4.7.3. 
-In general the upgrade of KDE from 4.6.5 to 4.7.3 should be unproblematic.
-However, if you are using the KDEPIM application suite (i.e., akregator,
-blogilo, kmail, knode, kontact, korganizer, and others) where the stable
-version so far was 4.4.11.1, please be aware of the following:
-
-The stable upgrade from KDEPIM 4.4.11.1 to KDEPIM 4.7.3 is a MAJOR upgrade 
-with potential for major breakage. Therefore we will *try* to keep 
-and support the old, so-far stable KDEPIM 4.4.11.1 as long as possible. 
-If you *dont* want to upgrade your KDEPIM yet but keep the old version, 
-please download the following file and add it into your 
-/etc/portage/package.mask:
-http://www.gentoo.org/proj/en/desktop/kde/kdepim-4.7-mask.txt
-If you decide to upgrade, please have a look at the upgrade guide first:
-http://wiki.gentoo.org/wiki/KDEPIM-4.7_upgrade
diff --git a/metadata/news/2011-12-30-bacula-updates/2011-12-30-bacula-updates.en.txt b/metadata/news/2011-12-30-bacula-updates/2011-12-30-bacula-updates.en.txt
deleted file mode 100644
index 269dfa981db1..000000000000
--- a/metadata/news/2011-12-30-bacula-updates/2011-12-30-bacula-updates.en.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Title: Bacula-5.2.3 Upgrade
-Author: Thomas Beierlein <tomjbe@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-12-30
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <app-backup/bacula-5.2.0
-
-The 5.2.x release series of Bacula uses a new database catalog format.
-If you're upgrading from a 3.x.x or 5.0.x release, you must upgrade your
-bacula catalog database.
-
-Please read the manual chapter for how to upgrade your database (see
-http://www.bacula.org/5.2.x-manuals/en/main/main/Installing_Bacula.html).
-You can find database upgrade scripts in /usr/libexec/bacula/(updatedb/).
-
-It is strongly recommended that you save a copy of your existing database
-before upgrading. For details how to do it please look into your database
-documentation.
-
-The simplest way to upgrade the database:
-
-1. Stop Bacula from running (at least the director and storage daemons).
-2. Save a copy of your existing database.
-3. Emerge the new version of Bacula.
-4. Run the appropriate upgrade script from /usr/libexec/bacula/updatedb/. 
-5. Start the new Bacula.
diff --git a/metadata/news/2012-02-14-baselayout-1-deprecation/2012-02-14-baselayout-1-deprecation.en.txt b/metadata/news/2012-02-14-baselayout-1-deprecation/2012-02-14-baselayout-1-deprecation.en.txt
deleted file mode 100644
index d5f671c0c73a..000000000000
--- a/metadata/news/2012-02-14-baselayout-1-deprecation/2012-02-14-baselayout-1-deprecation.en.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Title: baselayout-1.x deprecation
-Author: William Hubbs <williamh@gentoo.org>
-Content-Type: text/plain
-Posted: 2012-02-14
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <sys-apps/baselayout-2
-
-On 28 Jun 2011, baselayout-2.x and OpenRC were first marked stable on
-all supported architectures in Gentoo Linux.
-
-This was the point at which we stopped working on issues in baselayout-1
-and began encouraging users to upgrade to baselayout-2 and OpenRC.
-
-Although we are not supporting baselayout-1, we are supporting migration
-from baselayout-1 to OpenRC and baselayout-2.
-
-According to Gentoo policy, the support for migration from baselayout-1
-to baselayout-2 ends one year after baselayout-2 and OpenRC became
-stable. That date will be 28 Jun 2012.
-
-This news item is to inform you that you must migrate your system
-to baselayout-2 and OpenRC before 28 Jun 2012. Starting on this date, we
-will no longer support this migration, and you may need to re-install
-any systems which are still running baselayout-1.
-
-For questions about how to migrate your system, see the OpenRC migration
-guide [1].
-
-[1] http://www.gentoo.org/doc/en/openrc-migration.xml
diff --git a/metadata/news/2012-04-24-libjpeg-turbo-by-default/2012-04-24-libjpeg-turbo-by-default.en.txt b/metadata/news/2012-04-24-libjpeg-turbo-by-default/2012-04-24-libjpeg-turbo-by-default.en.txt
deleted file mode 100644
index 512b32f2109d..000000000000
--- a/metadata/news/2012-04-24-libjpeg-turbo-by-default/2012-04-24-libjpeg-turbo-by-default.en.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Title: The default JPEG implementation
-Author: Samuli Suominen <ssuominen@gentoo.org>
-Content-Type: text/plain
-Posted: 2012-04-24
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: =media-libs/jpeg-8*
-
-libjpeg-turbo is a derivative of libjpeg that uses MMX, SSE, SSE2,
-and NEON SIMD instructions to accelerate baseline JPEG
-compression/decompression by about 2-4x on amd64, arm and x86
-platforms. It is based on libjpeg/SIMD but has numerous enhancements.
-
-All users are recommended to migrate:
-
-# emerge --deselect media-libs/jpeg
-# emerge --oneshot media-libs/libjpeg-turbo
-
-media-libs/jpeg:0 will be left in tree as a fallback implementation.
diff --git a/metadata/news/2012-07-23-upgrading-postfix/2012-07-23-upgrading-postfix.en.txt b/metadata/news/2012-07-23-upgrading-postfix/2012-07-23-upgrading-postfix.en.txt
deleted file mode 100644
index f9cb0e4aff8f..000000000000
--- a/metadata/news/2012-07-23-upgrading-postfix/2012-07-23-upgrading-postfix.en.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: Upgrading to postfix-2.9
-Author: Eray Aslan <eras@gentoo.org>
-Content-Type: text/plain
-Posted: 2012-07-23
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <mail-mta/postfix-2.9
-
-Daemons for >=mail-mta/postfix-2.9 are installed under
-/usr/libexec/postfix.  Please do not forget to adjust your main.cf by
-running etc-update/dispatch-conf or similar and accepting the new
-daemon_directory setting.  Otherwise, postfix will not be able to find
-the binaries it is looking for.
diff --git a/metadata/news/2013-02-10-new-13-profiles-server/2013-02-10-new-13-profiles-server.en.txt b/metadata/news/2013-02-10-new-13-profiles-server/2013-02-10-new-13-profiles-server.en.txt
deleted file mode 100644
index 999f73c96324..000000000000
--- a/metadata/news/2013-02-10-new-13-profiles-server/2013-02-10-new-13-profiles-server.en.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Title: New 13.0 profiles and deprecation of 10.0 profiles
-Author: Andreas K. Huettel <dilfridge@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-02-10
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Profile: default/linux/alpha/10.0/server
-Display-If-Profile: default/linux/amd64/10.0/server
-Display-If-Profile: default/linux/arm/10.0/server
-Display-If-Profile: default/linux/arm/10.0/armv4/server
-Display-If-Profile: default/linux/arm/10.0/armv4t/server
-Display-If-Profile: default/linux/arm/10.0/armv5te/server
-Display-If-Profile: default/linux/arm/10.0/armv6j/server
-Display-If-Profile: default/linux/arm/10.0/armv7a/server
-Display-If-Profile: default/linux/hppa/10.0/server
-Display-If-Profile: default/linux/ia64/10.0/server
-Display-If-Profile: default/linux/m68k/10.0/server
-Display-If-Profile: default/linux/powerpc/ppc32/10.0/server
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/32bit-userland/server
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/64bit-userland/server
-Display-If-Profile: default/linux/s390/10.0/server
-Display-If-Profile: default/linux/s390/10.0/server/s390x
-Display-If-Profile: default/linux/sh/10.0/server
-Display-If-Profile: default/linux/sparc/10.0/server
-Display-If-Profile: default/linux/x86/10.0/server
-
-We have generated a new set of profiles for Gentoo installation. These are now
-called 13.0 instead of 10.0. Everyone should upgrade as soon as possible (but
-please make sure sys-apps/portage is updated to current stable *before* you
-switch profile).
-This brings (nearly) no user-visible changes. Some new files have been added
-to the profile directories that make it possible for the developers to do more
-fine-grained use flag masking (see PMS-5 for the details), and this formally
-requires a new profile tree with EAPI=5.
-In the course of this change, the "server" profiles will be removed; they do
-not exist in the 13.0 tree anymore. You should migrate to the corresponding
-parent profile. This may change the default value of some use-flags. The
-specific setting in "server" was 
-  USE="-perl -python snmp truetype xml"
-You may want to check the setting of these flags after switching profile, but
-otherwise nothing changes.
diff --git a/metadata/news/2013-02-10-new-13-profiles/2013-02-10-new-13-profiles.en.txt b/metadata/news/2013-02-10-new-13-profiles/2013-02-10-new-13-profiles.en.txt
deleted file mode 100644
index 63aca0c017dd..000000000000
--- a/metadata/news/2013-02-10-new-13-profiles/2013-02-10-new-13-profiles.en.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-Title: New 13.0 profiles and deprecation of 10.0 profiles
-Author: Andreas K. Huettel <dilfridge@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-02-10
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Profile: default/linux/alpha/10.0
-Display-If-Profile: default/linux/alpha/10.0/desktop
-Display-If-Profile: default/linux/alpha/10.0/desktop/gnome
-Display-If-Profile: default/linux/alpha/10.0/desktop/kde
-Display-If-Profile: default/linux/alpha/10.0/developer
-Display-If-Profile: default/linux/amd64/10.0
-Display-If-Profile: default/linux/amd64/10.0/selinux
-Display-If-Profile: default/linux/amd64/10.0/desktop
-Display-If-Profile: default/linux/amd64/10.0/desktop/gnome
-Display-If-Profile: default/linux/amd64/10.0/desktop/kde
-Display-If-Profile: default/linux/amd64/10.0/developer
-Display-If-Profile: default/linux/amd64/10.0/no-multilib
-Display-If-Profile: default/linux/amd64/10.0/x32
-Display-If-Profile: default/linux/arm/10.0
-Display-If-Profile: default/linux/arm/10.0/desktop
-Display-If-Profile: default/linux/arm/10.0/desktop/gnome
-Display-If-Profile: default/linux/arm/10.0/desktop/kde
-Display-If-Profile: default/linux/arm/10.0/developer
-Display-If-Profile: default/linux/arm/10.0/armv4
-Display-If-Profile: default/linux/arm/10.0/armv4/desktop
-Display-If-Profile: default/linux/arm/10.0/armv4/desktop/gnome
-Display-If-Profile: default/linux/arm/10.0/armv4/desktop/kde
-Display-If-Profile: default/linux/arm/10.0/armv4/developer
-Display-If-Profile: default/linux/arm/10.0/armv4t
-Display-If-Profile: default/linux/arm/10.0/armv4t/desktop
-Display-If-Profile: default/linux/arm/10.0/armv4t/desktop/gnome
-Display-If-Profile: default/linux/arm/10.0/armv4t/desktop/kde
-Display-If-Profile: default/linux/arm/10.0/armv4t/developer
-Display-If-Profile: default/linux/arm/10.0/armv5te
-Display-If-Profile: default/linux/arm/10.0/armv5te/desktop
-Display-If-Profile: default/linux/arm/10.0/armv5te/desktop/gnome
-Display-If-Profile: default/linux/arm/10.0/armv5te/desktop/kde
-Display-If-Profile: default/linux/arm/10.0/armv5te/developer
-Display-If-Profile: default/linux/arm/10.0/armv6j
-Display-If-Profile: default/linux/arm/10.0/armv6j/desktop
-Display-If-Profile: default/linux/arm/10.0/armv6j/desktop/gnome
-Display-If-Profile: default/linux/arm/10.0/armv6j/desktop/kde
-Display-If-Profile: default/linux/arm/10.0/armv6j/developer
-Display-If-Profile: default/linux/arm/10.0/armv7a
-Display-If-Profile: default/linux/arm/10.0/armv7a/desktop
-Display-If-Profile: default/linux/arm/10.0/armv7a/desktop/gnome
-Display-If-Profile: default/linux/arm/10.0/armv7a/desktop/kde
-Display-If-Profile: default/linux/arm/10.0/armv7a/developer
-Display-If-Profile: default/linux/hppa/10.0
-Display-If-Profile: default/linux/hppa/10.0/desktop
-Display-If-Profile: default/linux/hppa/10.0/developer
-Display-If-Profile: default/linux/ia64/10.0
-Display-If-Profile: default/linux/ia64/10.0/desktop
-Display-If-Profile: default/linux/ia64/10.0/desktop/gnome
-Display-If-Profile: default/linux/ia64/10.0/desktop/kde
-Display-If-Profile: default/linux/ia64/10.0/developer
-Display-If-Profile: default/linux/m68k/10.0
-Display-If-Profile: default/linux/m68k/10.0/desktop
-Display-If-Profile: default/linux/m68k/10.0/desktop/gnome
-Display-If-Profile: default/linux/m68k/10.0/desktop/kde
-Display-If-Profile: default/linux/m68k/10.0/developer
-Display-If-Profile: default/linux/mips/10.0
-Display-If-Profile: default/linux/mips/10.0/n32
-Display-If-Profile: default/linux/mips/10.0/n64
-Display-If-Profile: default/linux/mips/10.0/multilib
-Display-If-Profile: default/linux/mips/10.0/multilib/n32
-Display-If-Profile: default/linux/mips/10.0/multilib/n64
-Display-If-Profile: default/linux/mips/10.0/mipsel
-Display-If-Profile: default/linux/mips/10.0/mipsel/n32
-Display-If-Profile: default/linux/mips/10.0/mipsel/n64
-Display-If-Profile: default/linux/mips/10.0/mipsel/multilib
-Display-If-Profile: default/linux/mips/10.0/mipsel/multilib/n32
-Display-If-Profile: default/linux/mips/10.0/mipsel/multilib/n64
-Display-If-Profile: default/linux/powerpc/ppc32/10.0
-Display-If-Profile: default/linux/powerpc/ppc32/10.0/desktop
-Display-If-Profile: default/linux/powerpc/ppc32/10.0/desktop/gnome
-Display-If-Profile: default/linux/powerpc/ppc32/10.0/desktop/kde
-Display-If-Profile: default/linux/powerpc/ppc32/10.0/developer
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/32bit-userland
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/32bit-userland/desktop
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/gnome
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/kde
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/32bit-userland/developer
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/64bit-userland
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/64bit-userland/desktop
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/gnome
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/kde
-Display-If-Profile: default/linux/powerpc/ppc64/10.0/64bit-userland/developer
-Display-If-Profile: default/linux/s390/10.0
-Display-If-Profile: default/linux/s390/10.0/s390x
-Display-If-Profile: default/linux/sh/10.0
-Display-If-Profile: default/linux/sh/10.0/desktop
-Display-If-Profile: default/linux/sh/10.0/desktop/gnome
-Display-If-Profile: default/linux/sh/10.0/desktop/kde
-Display-If-Profile: default/linux/sh/10.0/developer
-Display-If-Profile: default/linux/sparc/10.0
-Display-If-Profile: default/linux/sparc/10.0/desktop
-Display-If-Profile: default/linux/sparc/10.0/desktop/gnome
-Display-If-Profile: default/linux/sparc/10.0/desktop/kde
-Display-If-Profile: default/linux/sparc/10.0/developer
-Display-If-Profile: default/linux/x86/10.0
-Display-If-Profile: default/linux/x86/10.0/selinux
-Display-If-Profile: default/linux/x86/10.0/desktop
-Display-If-Profile: default/linux/x86/10.0/desktop/gnome
-Display-If-Profile: default/linux/x86/10.0/desktop/kde
-Display-If-Profile: default/linux/x86/10.0/developer
-
-We have generated a new set of profiles for Gentoo installation. These are now 
-called 13.0 instead of 10.0. Everyone should upgrade as soon as possible (but 
-please make sure sys-apps/portage is updated to current stable *before* you
-switch profile).
-This brings (nearly) no user-visible changes. Some new files have been added
-to the profile directories that make it possible for the developers to do more 
-fine-grained use flag masking (see PMS-5 for the details), and this formally 
-requires a new profile tree with EAPI=5.
diff --git a/metadata/news/2013-03-29-udev-upgrade/2013-03-29-udev-upgrade.en.txt b/metadata/news/2013-03-29-udev-upgrade/2013-03-29-udev-upgrade.en.txt
deleted file mode 100644
index 2816d067437f..000000000000
--- a/metadata/news/2013-03-29-udev-upgrade/2013-03-29-udev-upgrade.en.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-Title: Upgrading udev to version >=200
-Author: Samuli Suominen <ssuominen@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-03-29
-Revision: 2
-News-Item-Format: 1.0
-Display-If-Installed: <sys-fs/udev-201
-
-This replaces the earlier news item about the udev 197 upgrade and
-describes the predictable network interface names in more detail.
-
-If you skip anything in this news item, your system will not be
-bootable, or your networking will be down, or both.
-
-Pay attention also to every message printed by emerge of sys-fs/udev
-and sys-fs/udev-init-scripts as this news item may not be complete.
-
-1. udev-postmount init script:
-
-Remove the udev-postmount init script from your runlevels.
-
-2. devtmpfs support:
-
-You need at least version 2.6.32 of the kernel for devtmpfs
-functionality. Once you have this, make sure CONFIG_DEVTMPFS=y is set
-in the kernel configuration. See the gentoo udev guide for the option in
-make menuconfig [1].
-
-If you have a line for /dev in /etc/fstab, make sure it is configured
-for file system type devtmpfs (not tmpfs or any other type). Also, you
-can remove this line if you prefer, since devtmpfs is mounted
-automatically.
-
-3. Old interface naming rules:
-
-If the system still has old network interface renaming rules in
-/etc/udev/rules.d, like 70-persistent-net.rules, those will need
-to be either modified or removed.
-
-If you choose to modify them, you must use free namespace (like net*
-or internet*) instead of kernel namespace (like eth* or wlan*)
-because in-place renaming has been deprecated, see small
-documentation of it if you like[2].
-
-The file 70-persistent-net.rules, like the 70-persistent-cd.rules
-should be removed, so if you modify, rename the file also to something
-else like 70-my-network.rules to silence the deprecation warning coming
-from the end of the sys-fs/udev emerge.
-
-This is the old format with reserved namespace:
-
-SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="xx:xx:xx:xx:xx:xx", NAME="eth0"
-SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="yy:yy:yy:yy:yy:yy", NAME="eth1"
-
-This is the new format with free namespace:
-
-SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="xx:xx:xx:xx:xx:xx", NAME="net0"
-SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="yy:yy:yy:yy:yy:yy", NAME="net1"
-
-4. predictable network interface names:
-
-If /etc/udev/rules.d/80-net-name-slot.rules is an empty file or a
-symlink to /dev/null, the new names will be disabled and the kernel will
-do all the interface naming, and the resulting names may vary by kernel
-configuration, hardware configuration and kernel version.
-
-Also, the forementioned old 70-persistent-net.rules might interfere with
-the new predictable interface names.
-
-You can get attributes of your network interfaces using a command like
-the following (replace eth0 with the name of the appropriate interface):
-
-# udevadm test-builtin net_id /sys/class/net/eth0 2> /dev/null
-
-You can copy /lib/udev/rules.d/80-net-name-slot.rules to
-/etc/udev/rules.d and specify the attributes and in which order
-they will be used for naming. See upstream wiki[3] for detailed list
-of options.
-
-You can prepare the system for the new names before booting for example
-by renaming /etc/init.d/net.* symlinks, editing /etc/conf.d/net, etc.
-
-The feature can also be completely disabled using net.ifnames=0 on the
-kernel command line.
-
-If you only have one interface card, you don't necessarily have much
-use for this feature as the name almost always stays at eth0, you can
-easily disable it using forementioned methods.
-
-This feature can also replace the functionality of sys-apps/biosdevname,
-but you can still keep using it if you want.
-
-In a normal new installation there are no files in /etc/udev/rules.d
-and if you haven't edited any files you have in there, you should most
-likely backup and delete them all if they don't belong to any packages.
-
-The official wiki has a dedicated page for udev upgrade notes[4].
-
-[1] http://www.gentoo.org/doc/en/udev-guide.xml
-[2] http://www.kernel.org/doc/htmldocs/device-drivers/API-device-rename.html
-[3] http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames
-[4] http://wiki.gentoo.org/wiki/Udev/upgrade
diff --git a/metadata/news/2013-04-10-baselayout-1-deprecation-final-warning/2013-04-10-baselayout-1-deprecation-final-warning.en.txt b/metadata/news/2013-04-10-baselayout-1-deprecation-final-warning/2013-04-10-baselayout-1-deprecation-final-warning.en.txt
deleted file mode 100644
index 331d36f5d55b..000000000000
--- a/metadata/news/2013-04-10-baselayout-1-deprecation-final-warning/2013-04-10-baselayout-1-deprecation-final-warning.en.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Title: baselayout-1.x deprecation final warning
-Author: William Hubbs <williamh@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-04-10
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <sys-apps/baselayout-2
-
-WARNING! THIS NEWS ITEM REQUIRES IMMEDIATE ATTENTION!
-
-On 28 Jun 2011, baselayout-2.x and OpenRC were first marked stable on
-all supported architectures in Gentoo Linux.
-
-Although we no longer support baselayout-1.x, we have continued support
-for migration from baselayout-1.x to baselayout-2.x and OpenRC.
-
-According to Gentoo policy, the support for migration was slated to end
-on 28 Jun 2012, a year after OpenRC was first marked stable.
-
-This is your final warning. openrc-0.11.8 will be the final release of
-OpenRC to support migration from baselayout-1.x.
-
-If you do not upgrade your system to baselayout-2.x and openrc-0.11.8
-before openrc-0.11.8 leaves the tree, you will have to perform the
-migration manually when you upgrade or you will be left with an
-unbootable system. Manual migration is not officially supported, and
-could include fixing things with a live cd or re-installing your system.
-
-For questions about how to migrate your system, see the OpenRC migration
-guide [1].
-
-[1] http://www.gentoo.org/doc/en/openrc-migration.xml
diff --git a/metadata/news/2013-06-01-mysql-pbxt-dropped/2013-06-01-mysql-pbxt-dropped.en.txt b/metadata/news/2013-06-01-mysql-pbxt-dropped/2013-06-01-mysql-pbxt-dropped.en.txt
deleted file mode 100644
index 1f7293adc47d..000000000000
--- a/metadata/news/2013-06-01-mysql-pbxt-dropped/2013-06-01-mysql-pbxt-dropped.en.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Title: PBXT now unsupported in MySQL/MariaDB
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-06-01
-Revision: 4
-News-Item-Format: 1.0
-Display-If-Installed: dev-db/mysql
-Display-If-Installed: dev-db/mysql-cluster
-Display-If-Installed: dev-db/mariadb
-Display-If-Installed: dev-db/mariadb-galera
-Display-If-Installed: dev-db/percona-server
-Display-If-Installed: dev-db/google-mysql
-
-The PBXT/PrimeBase engine is unsupported upstream in MySQL & MariaDB for some
-time now [1]. It is no longer built in the upstream MariaDB 5.5 binaries[2][3]
-and if it is enabled in a source build, it fails many tests [4].
-
-In light of this, the MySQL team has decided to mask it in
-profiles/base/package.use.mask for all relevant packages.
->=dev-db/mysql-5.5 pbxt
->=dev-db/mariadb-5.5 pbxt
->=dev-db/mysql-cluster-5.5 pbxt # overlay
->=dev-db/mariadb-galera-5.5 pbxt # overlay
->=dev-db/percona-server-5.5 pbxt # overlay
->=dev-db/google-mysql-5.5 pbxt # overlay
-
-All users who have data stored in PBXT-backed tables MUST convert the tables
-to another format BEFORE upgrading to MySQL/MariaDB 5.5, as the tables will
-become inaccessible otherwise.
-
-We will continue to allow it to be built in the 5.0/5.1 series, to make the
-above data migration easy, but we strongly encourage all users to move their
-data out of the PBXT engine.
-
-If you need to check for PBXT tables easily, look in your MySQL/MariaDB
-datadir for any files with a .xt extension.
-
-1. https://lists.launchpad.net/pbxt-discuss/msg00134.html
-2. http://www.bytebot.net/blog/archives/2012/05/25/mariadb-5-5-has-deprecated-pbxt
-3. https://kb.askmonty.org/en/about-pbxt/
-4. https://bugs.gentoo.org/show_bug.cgi?id=471616#c1
diff --git a/metadata/news/2013-06-30-cups16/2013-06-30-cups16.en.txt b/metadata/news/2013-06-30-cups16/2013-06-30-cups16.en.txt
deleted file mode 100644
index ba72857d5ab7..000000000000
--- a/metadata/news/2013-06-30-cups16/2013-06-30-cups16.en.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Title: Printer browsing in net-print/cups-1.6
-Author: Andreas K. Huettel <dilfridge@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-06-30
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <=net-print/cups-1.6.2-r5
-
-net-print/cups-1.6 no longer supports automatic remote printers or
-implicit classes via the CUPS, LDAP, or SLP protocols, i.e. "network
-browsing".
-
-The browsing functionality can be restored by running cups-browsed
-from net-print/cups-filters as a separate daemon (just add its init
-script to your default runlevel). By default cups-browsed uses the
-net-print/cups-1.5 browse protocol, but it can also utilize zeroconf
-(if the zeroconf use flag is set). See /etc/cups/cups-browsed.conf
-for configuration.
-
-Of course, directly specifying the location of your printers in
-the cups interface works as well.
diff --git a/metadata/news/2013-08-07-vanilla-sources-stablization-policy/2013-08-07-vanilla-sources-stablization-policy.en.txt b/metadata/news/2013-08-07-vanilla-sources-stablization-policy/2013-08-07-vanilla-sources-stablization-policy.en.txt
deleted file mode 100644
index 75158ec826a0..000000000000
--- a/metadata/news/2013-08-07-vanilla-sources-stablization-policy/2013-08-07-vanilla-sources-stablization-policy.en.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Title: vanilla-sources stabilization policy
-Author: Mike Pagano <mpagano@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-08-07
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: sys-kernel/vanilla-sources
-
-The Gentoo Kernel Team will no longer be providing stable
-vanilla-sources kernels. All currently stabilized vanilla-sources
-versions will be dropped to ~arch. The Arch teams, via normal requests
-of the Kernel Team, will continue to stabilize gentoo-sources kernels
-upon request. This decision is based on the facts that upstream is now
-releasing approximately 1-2 vanilla-sources kernels a week. Arch teams,
-understandably, are unable to keep up with this rate of release.  As
-most vanilla releases contain security fixes, the user who only runs
-stable vanilla-sources will consistently be behind and potentially at
-risk.  For the latest "upstream kernel unpatched by Gentoo", we
-recommend users add 'sys-kernel/vanilla-sources' to their
-package.accept_keywords file. gentoo-sources will continue to be a
-tested and supported version for Gentoo users.
-
-
-Note: This news item only applies to gentoo-sources and vanilla-sources.
-Other kernels currently maintained in portage have their own policies
-and procedures in place today.
diff --git a/metadata/news/2013-09-22-minor-arches-1/2013-09-22-minor-arches-1.en.txt b/metadata/news/2013-09-22-minor-arches-1/2013-09-22-minor-arches-1.en.txt
deleted file mode 100644
index c6fc3ac58bff..000000000000
--- a/metadata/news/2013-09-22-minor-arches-1/2013-09-22-minor-arches-1.en.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Title: m68k, s390, sh are dropping stable keywords                                                                                                                                     
-Author: Andreas K. Huettel <dilfridge@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-09-22
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Keyword: m68k
-Display-If-Keyword: s390
-Display-If-Keyword: sh
-
-Following discussion [1] and a vote by the Gentoo Council [2,3], 
-m68k, s390, and sh will drop all stable keywords and become 
-unstable/testing only arches. The main reason for this is that 
-these arch teams visibly lack manpower, resulting in undesirable
-delays.
-
-In a week, the ACCEPT_KEYWORDS variable in the respective profiles
-will be switched to automatically include ~arch packages. Systems
-running stable before will update to current unstable/testing then.
-Afterwards m68k, s390, and sh keywords on all ebuilds will be
-changed to ~m68k, ~s390, and ~sh.
-
-No steps are required from users, however you should be aware
-of the upcoming changes.
-
-[1] http://thread.gmane.org/gmane.linux.gentoo.project/2975/focus=2984
-[2] http://www.gentoo.org/proj/en/council/meeting-logs/20130917.txt
-[3] http://www.gentoo.org/proj/en/council/meeting-logs/20130917-summary.txt
diff --git a/metadata/news/2013-09-27-initramfs-required/2013-09-27-initramfs-required.en.txt b/metadata/news/2013-09-27-initramfs-required/2013-09-27-initramfs-required.en.txt
deleted file mode 100644
index 4f382a70ed8f..000000000000
--- a/metadata/news/2013-09-27-initramfs-required/2013-09-27-initramfs-required.en.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Title: Separate /usr on Linux requires initramfs
-Author: William Hubbs <williamh@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-09-27
-Revision: 1
-News-Item-Format: 1.0
-
-Linux systems which have / and /usr on separate file systems but do not
-use an initramfs will not be supported starting on 01-Nov-2013.
-
-If you have / and /usr on separate file systems and you are not
-currently using an initramfs, you must set one up before this date.
-Otherwise, at some point on or after this date, upgrading packages
-will make your system unbootable.
-
-For more information on setting up an initramfs, see this URL:
-
-https://wiki.gentoo.org/wiki/Initramfs/HOWTO
-
-Due to many upstream changes, properly supporting Linux systems that
-have /usr missing at boot time has become increasingly difficult.
-Despite all our efforts, it already breaks in some exotic
-configurations, and this trend is likely to grow worse.
-
-For more information on the upstream changes and why using an initramfs
-is the cleanest route forward, see the following URLs:
-
-http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken
-https://blog.flameeyes.eu/2013/01/the-boot-process
diff --git a/metadata/news/2013-10-14-grub2-migration/2013-10-14-grub2-migration.en.txt b/metadata/news/2013-10-14-grub2-migration/2013-10-14-grub2-migration.en.txt
deleted file mode 100644
index d9323463a13c..000000000000
--- a/metadata/news/2013-10-14-grub2-migration/2013-10-14-grub2-migration.en.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Title: GRUB2 migration
-Author: Mike Gilbert <floppym@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-10-14
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <sys-boot/grub-1
-
-A newer version of GRUB (sys-boot/grub) is now stable. There are now
-two available slots:
-
-sys-boot/grub:0 - Known as "GRUB Legacy"
-sys-boot/grub:2 - Known as "GRUB2"
-
-GRUB2 uses a different configuration format, and requires a manual
-migration before your system will actually use it. A guide [1] is
-available on the gentoo.org website, and the Gentoo wiki [2][3] has
-additional information.
-
-If you would prefer not to migrate at this time, you do not need to
-take any action: GRUB Legacy will remain functional in /boot. To
-prevent any associated files (documentation) from being removed, add
-sys-boot/grub:0 to your world file. For example:
-
-emerge --noreplace sys-boot/grub:0
-
-References:
-
-[1] http://www.gentoo.org/doc/en/grub2-migration.xml
-[2] https://wiki.gentoo.org/wiki/GRUB2_Quick_Start
-[3] https://wiki.gentoo.org/wiki/GRUB2
diff --git a/metadata/news/2013-10-24-minor-arches-2/2013-10-24-minor-arches-2.en.txt b/metadata/news/2013-10-24-minor-arches-2/2013-10-24-minor-arches-2.en.txt
deleted file mode 100644
index 4f2e0a72cfbe..000000000000
--- a/metadata/news/2013-10-24-minor-arches-2/2013-10-24-minor-arches-2.en.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Title: alpha, ia64: maintainers may remove stable versions
-Author: Andreas K. Huettel <dilfridge@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-10-24
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Keyword: alpha
-Display-If-Keyword: ia64
-
-Following discussion [1] and a vote by the Gentoo Council [2,3], 
-on alpha and ia64 package maintainers are allowed to remove
-the last stable version of a package under certain circumstances
-(basically when it is outdated and the stablerequest for a newer
-version on alpha or ia64 has been pending for a while; for the 
-details, see [2,3]).
-
-You should be aware that this may occasionally cause broken
-dependencies and/or require keywording of packages for stable 
-users. Then again, things may work out fine just as well.
-
-[1] http://thread.gmane.org/gmane.linux.gentoo.project/2975/focus=2984
-[2] http://www.gentoo.org/proj/en/council/meeting-logs/20130917.txt
-[3] http://www.gentoo.org/proj/en/council/meeting-logs/20130917-summary.txt
diff --git a/metadata/news/2013-11-07-python-exec-package-move/2013-11-07-python-exec-package-move.en.txt b/metadata/news/2013-11-07-python-exec-package-move/2013-11-07-python-exec-package-move.en.txt
deleted file mode 100644
index 3e5536f71458..000000000000
--- a/metadata/news/2013-11-07-python-exec-package-move/2013-11-07-python-exec-package-move.en.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Title: python-exec package move
-Author: Michał Górny <mgorny@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-11-07
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: dev-python/python-exec
-
-Due to the recent issues which caused dev-python/python-exec:0 to be
-removed prematurely [1], we had to perform an urgent package move.
-Since we could not use the automatic updates support in portage, users
-will notice two python-exec packages and possibly blockers.
-
-Currently, dev-lang/python-exec is the real package that contains
-python-exec and that will be used in the future. dev-python/python-exec
-is a virtual package that is kept for compatibility with dependencies
-in already-installed packages.
-
-In the most favorable scenario, the package will be upgraded correctly
-on your next world update if you use the '--deep' (-D) and '--update'
-(-u) options. If you don't want to perform a complete world update
-or if it fails for you, you may as well manually upgrade
-dev-python/python-exec:
-
-  emerge -1 dev-python/python-exec
-
-This will cause portage to update both python-exec packages and resolve
-the blockers properly.
-
-Please note that if you have applied any kind of package-specific
-modifications to dev-python/python-exec (such as applying keywords
-through 'package.accept_keywords'), you will need to copy them to
-dev-lang/python-exec as well.
-
-If you have applied keywords to dev-python/python-exec in order
-to unmask Python 3.3 on a stable system, please consider removing
-the keywords and reading our wiki page that explains how to properly
-unmask USE flags [2].
-
-We apologize for all the inconveniences. If you have any more issues
-with python-exec, please do not hesitate to contact as at #gentoo-python
-IRC channel (@freenode) or the gentoo-python@lists.gentoo.org mailing
-list.
-
-[1]:https://bugs.gentoo.org/show_bug.cgi?id=489440
-[2]:https://wiki.gentoo.org/wiki/Unmasking_non-stable_Python_implementations
diff --git a/metadata/news/2013-11-23-gnome-38/2013-11-23-gnome-38.en.txt b/metadata/news/2013-11-23-gnome-38/2013-11-23-gnome-38.en.txt
deleted file mode 100644
index 11773fcc1931..000000000000
--- a/metadata/news/2013-11-23-gnome-38/2013-11-23-gnome-38.en.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Title: Upgrade to GNOME 3.8
-Author: Pacho Ramos <pacho@gentoo.org>
-Content-Type: text/plain
-Posted: 2013-11-23
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <gnome-base/gnome-3.8
-Display-If-Installed: <gnome-base/gnome-light-3.8
-Display-If-Installed: <gnome-base/gnome-session-3.8
-Display-If-Installed: <gnome-base/gdm-3.8
-
-We are pleased to announce the stabilization of GNOME 3.8. Users are
-strongly encouraged to read the GNOME 3.8 Upgrade Guide to avoid any
-possible issues relating to the upgrade. The guide will also show you
-how to migrate to systemd as it is the only supported setup now,
-suggesting you how to avoid blockers and problems trying to let you
-have a smoother update.
-
-Additionally, it will inform you about important changes regarding
-configuration and troubleshooting.
-
-Please read the Gnome 3.8 Upgrade Guide:
-http://wiki.gentoo.org/wiki/GNOME/3.8-upgrade-guide
diff --git a/metadata/news/2019-05-19-accept_license/2019-05-19-accept_license.en.txt b/metadata/news/2019-05-19-accept_license/2019-05-19-accept_license.en.txt
deleted file mode 100644
index 6b434e5d4a2d..000000000000
--- a/metadata/news/2019-05-19-accept_license/2019-05-19-accept_license.en.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Title: Change of ACCEPT_LICENSE default
-Author: Ulrich Müller <ulm@gentoo.org>
-Posted: 2019-05-19
-Revision: 1
-News-Item-Format: 2.0
-
-The default set of accepted licenses has been changed [1,2] to:
-
-   ACCEPT_LICENSE="-* @FREE"
-
-This means that by default only free software and documentation
-will be installable. The "FREE" license group is defined in the
-profiles/license_groups file in the Gentoo repository. It contains
-licenses that are explicitly approved by the Free Software Foundation,
-the Open Source Initiative, or that follow the Free Software
-Definition.
-
-The system wide default for the accepted licenses is controlled by
-the ACCEPT_LICENSE variable in /etc/portage/make.conf, or it can be
-specified on a per-package basis in /etc/portage/package.license.
-
-For example, to allow the app-arch/unrar and sys-kernel/linux-firmware
-packages to be installed, the following lines would have to be added
-to /etc/portage/package.license:
-
-   app-arch/unrar unRAR
-   sys-kernel/linux-firmware @BINARY-REDISTRIBUTABLE
-
-If you want to revert to the previous default, add the following line
-to /etc/portage/make.conf:
-
-   ACCEPT_LICENSE="* -@EULA"
-
-This will permit all licenses, except End User License Agreements that
-require reading and signing an acceptance agreement. Note that this
-will also accept non-free software and documentation.
-
-See GLEP 23 [3] as well as the make.conf(5) and portage(5) man pages
-for the detailed syntax of the ACCEPT_LICENSE variable. Further
-information about licenses can be found in the Gentoo Handbook [4]
-and on the license groups wiki page [5].
-
-[1] https://projects.gentoo.org/council/meeting-logs/20190210-summary.txt
-[2] https://bugs.gentoo.org/676248
-[3] https://www.gentoo.org/glep/glep-0023.html
-[4] https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage#Licenses
-[5] https://wiki.gentoo.org/wiki/License_groups
diff --git a/metadata/news/2019-05-23-accept_license/2019-05-23-accept_license.en.txt b/metadata/news/2019-05-23-accept_license/2019-05-23-accept_license.en.txt
new file mode 100644
index 000000000000..e42c120b672b
--- /dev/null
+++ b/metadata/news/2019-05-23-accept_license/2019-05-23-accept_license.en.txt
@@ -0,0 +1,53 @@
+Title: Change of ACCEPT_LICENSE default
+Author: Ulrich Müller <ulm@gentoo.org>
+Author: Thomas Deutschmann <whissi@gentoo.org>
+Posted: 2019-05-23
+Revision: 2
+News-Item-Format: 2.0
+
+The default set of accepted licenses has been changed [1,2] to:
+
+   ACCEPT_LICENSE="-* @FREE"
+
+This means that by default only free software and documentation
+will be installable. The "FREE" license group is defined in the
+profiles/license_groups file in the Gentoo repository. It contains
+licenses that are explicitly approved by the Free Software Foundation,
+the Open Source Initiative, or that follow the Free Software
+Definition.
+
+The system wide default for the accepted licenses is controlled by
+the ACCEPT_LICENSE variable in /etc/portage/make.conf, or it can be
+specified on a per-package basis in /etc/portage/package.license.
+
+For example, to allow the app-arch/unrar and sys-kernel/linux-firmware
+packages to be installed, the following lines would have to be added
+to /etc/portage/package.license:
+
+   app-arch/unrar unRAR
+   sys-kernel/linux-firmware @BINARY-REDISTRIBUTABLE
+
+A migration tool app-portage/elicense is available. It scans installed
+packages for licenses that are no longer accepted, and generates a list
+in the same format as the package.license file. See elicense's README
+for further details.
+
+If you want to revert to the previous default, add the following line
+to /etc/portage/make.conf:
+
+   ACCEPT_LICENSE="* -@EULA"
+
+This will permit all licenses, except End User License Agreements that
+require reading and signing an acceptance agreement. Note that this
+will also accept non-free software and documentation.
+
+See GLEP 23 [3] as well as the make.conf(5) and portage(5) man pages
+for the detailed syntax of the ACCEPT_LICENSE variable. Further
+information about licenses can be found in the Gentoo Handbook [4]
+and on the license groups wiki page [5].
+
+[1] https://projects.gentoo.org/council/meeting-logs/20190210-summary.txt
+[2] https://bugs.gentoo.org/676248
+[3] https://www.gentoo.org/glep/glep-0023.html
+[4] https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage#Licenses
+[5] https://wiki.gentoo.org/wiki/License_groups
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e3aa5e10e315..96421a36b5b8 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 20500 BLAKE2B 1bbb199e798c742bd4adac3a4e2af58e717776dddb709cb92d7b907a7fdd7f22cc1caafa915b8a77300ec44654e68ab2962e4d5f694ffd46c49d6508a7eb3e10 SHA512 0723dec26c86832d17ab17115bd6935f62000d8095182770bc3b8f8351768a185646a76f8687b2cfeefdde537308039fe68aea408feb8ff2c2b19640afd04f98
-TIMESTAMP 2019-05-21T08:08:52Z
+MANIFEST Manifest.files.gz 12603 BLAKE2B a79d75e4f4662a5da90ee4742ec303db4c73f3bb97f6217d05e943f5776a211906d5999decd77485dc272c9920e24e7cbf107d907c8e34585539a285d149db6d SHA512 bfd34ad827e1416c9556f6e5a654d6eafab7e565285294931a98718aeb0bdcc2506ab7792bb5fda3a428b3e6707642cf97a453216e768a31f3b6a3ae0d51d34c
+TIMESTAMP 2019-06-02T20:08:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlzjshRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlz0LNpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCm1Q//fiLQAI/4ornmEHV/cx1N83DY1FN8ngZ0jDYdms0ZZnP2+2Zxf3CmHCfH
-Te57Vdmifb597n0ea33WfwpTVf1n7QbOzQaOWXXK6fFHu1HZYWCshdhyOfHoUkno
-dKD7IYwD+RDmKH2nuPkeeWTFTbNFnDPGdCwbPqstB12FlaWPpSO5SDFRU/dbtxeG
-1Zo8rhy5kAmVuGhduPSVt0AhEg9SRlf0b/j9bQswzHSHzuQAf6PG+FTVXj7kXJul
-8TEEou1Y4rFclGK/QD/q2LIV7LiSA2x++1T/+sZOkSGb85x0iyQlPtF2kUKopujI
-+MbwgEe8T6vf+78/tI9bNJkc2gHVkrvVRkRWLxvCp5gBDalnhU5EGuxd4XbdmXpr
-x0iz5SyaFV2Uui/iPAcYYh1QAKcbQHTV/FcbMS1qtyEFUDsYxUrAQAtEXQoZhHOH
-v4tzP1+lG2zHUry6HmP5O0Y9BzeJ4IZ4JwXR+UZR4ExLxIpzo0xBFVIanApEQ58z
-M6wTpMzqOk/5tIkdsJxqoY4pPX+062XwDKIVWPVZrz28odvEP5ZfvNdW/xINDLOw
-Bx6wyaOaCL9O2nAnOm9ROWLFkrYSeTfOUFuQZMWK/0XO0YYSOoS8O4/uNRItk1Zb
-7OybmdKWLcmM0FFIIn5G88yGp+nGoaC6fLyArAucxoXQu0vkmC0=
-=ZNau
+klCqgQ//daf1/7kAzySmJEKcUZG4cbKRDQEVQqlPdvrgmH0Oyxaf98JbhXCW1u46
+002/55qMGC3eCIUdrxB/t7KRPKzVX1IFY80XAtAoC6uZCYaLPoAEXZP+5OasRcSw
+XXuZXVfUPTQAd62aiyfkFU69vutnD+Iqs+hGhr9wdYLzLeagmAFUTu8WU1fXtr1Z
+rYtUa/U584KGoTNlya8fUQdKLW59ma/HpJUvQ/YuXcBasTo3ZlxHkPcE1ltm+qXu
+NHl1VN1t6ULQwrz638WZe7I1qRfylX3N/3xwBQKxH6rO4d3LXCF1/J1ogwt0azld
+Fo4iJFcCutW3VNnnBUr+O5A1FtPuqdJh3iDZiAfaMOe5SEpG93puxmGHtZfrzuaf
+i0IoX64QdqZUt6EKDPB4vNpOdcdlL1TnxXPVSl4y0CYztb5roR/xziMLuosJX8X/
+zoO35UTU74DkV9xKNDYvtExCHJYqvYkz4EKc32Q49sj2aNQkLBcQHQV+LM7iZEoc
+zE/zIniUmFNYheh2gwYYEbL/LPBIwTDMElPrUFrQqOkj2wHHciuKZEvTKQ87/blQ
+YRZOV8TD8VH47U4tdnRzt7UF1SXj2AvfXFrKrstvK+23L7yudiirxsr24YPKGx86
+u/Z0hvvBermZ1lqTPFdkCpcaghasJfxgY/FOAfqdBtd0QkQnuuc=
+=mOQj
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 8bb2d7c8da0e..8670e60f29fe 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 b33917145f9a..a5240019f154 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 21 May 2019 08:08:49 +0000
+Sun, 02 Jun 2019 20:08:54 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index c772d20cf8d8..327cd79b4562 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-03952ef48a413419283960b8f3b887afc8d13fbf 1558291752 2019-05-19T18:49:12+00:00
+8c82e8e72bf9157172b8a153ac8927c9f06500fd 1559295613 2019-05-31T09:40:13+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index c5e7a9fc4d27..21423999d54c 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -1964,6 +1964,11 @@
       <role>Member</role>
     </member>
     <member>
+      <email>k_f@gentoo.org</email>
+      <name>Kristian Fiskerstrand</name>
+      <role>Member</role>
+    </member>
+    <member>
       <email>robbat2@gentoo.org</email>
       <name>Robin Johnson</name>
       <role>Member</role>
@@ -3016,7 +3021,7 @@
   </project>
   <project>
     <email>riscv@gentoo.org</email>
-    <name>RISC-V project</name>
+    <name>Gentoo Linux RISC-V development</name>
     <url>https://wiki.gentoo.org/wiki/Project:RISC-V</url>
     <description>RISC-V architecture support project</description>
     <member>
diff --git a/metadata/timestamp b/metadata/timestamp
index 62e79fead878..271b3740695c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue May 21 08:08:48 UTC 2019
+Sun Jun  2 20:08:54 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 377f3728fd65..8be0015d3f33 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 21 May 2019 08:15:01 +0000
+Sun, 02 Jun 2019 20:15:02 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e8e97e05de33..47a32b16c15c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-bfb7db429f932a872235dbf952ba0f805bec11ac 1558424816 2019-05-21T07:46:56+00:00
+98a6807d2b7584ad5f97e38c2dc19f8551e7e8ff 1559503964 2019-06-02T19:32:44+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d9fc733764f2..255b82d525e5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1558425901 Tue 21 May 2019 08:05:01 AM UTC
+1559505901 Sun 02 Jun 2019 08:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b91e261ffb3c..a5240019f154 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 21 May 2019 08:08:48 +0000
+Sun, 02 Jun 2019 20:08:54 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c203042796ca..74aabe6378ca 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 5e2fbe577435..8d597361a63a 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -2,6 +2,6 @@ AUX cacti-spine-0.8.8d-ping.patch 235 BLAKE2B ab0390faaa8cd7b473ae2341a0f80d4eb8
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
 DIST cacti-spine-1.1.38.tar.gz 805437 BLAKE2B 32d934f54e00d83e9807dd194a7cacf8d5526c8e5b84c44ffad201c07edcb117f862266843552299fe04cc780575b9b2dc7129a106a20bd709cb82844ade7812 SHA512 5409a690e89fcc74e1e87e34e1918cab27d1243825955eb8256a92f8e9658f312345c66b338a4a07a0e38c94e3275131cb4e58fb70e7b59837c0e6c47746e45e
 DIST cacti-spine-1.2.2.tar.gz 2310298 BLAKE2B 782fb21fda6acf06434c6e996863a235670970b19e5218624723df4736c388c2d9f00c1e3cc623dad7973bcbbe7ae5d4bbe89e366c1f47ce83eac9b416f88cb4 SHA512 ef2f839f7b247439a8576d49e311546cfd2346eea06cfb26b7a05d4757ae28334e6ed6ea00396027dc6c0c6e107121ed38f356ba62d8202003553fea3b5d139e
-EBUILD cacti-spine-1.1.38-r1.ebuild 864 BLAKE2B 3d2094cf54d8be7337b301afca195ed8419044c3a9869ff14304d51a545c30029b399bcc778c13f47a46c80829da120a794f366a7abcf751ab9ad9de4b2a981f SHA512 7eb9fb67a1b19564f91b3accac26f6af2c03d46915f51193f7b607439fc24cefb59e541005533d0b474d5492e1a80ae189ddaded2f7a991fba315885883b6ec0
-EBUILD cacti-spine-1.2.2.ebuild 886 BLAKE2B 4e06560bbf32a742232c640e5bb1f991d476ff74c6018781bf050f1fa41fe3170af62886c7fe21306121c2e178786a1a84517523fd0f726c512648bdd3e988f0 SHA512 73035c0963afe0539ad72ca7777d149d30185788752b6d204a3ad3330f8006624ac24a2276b41d010324ee71e298088680a813fc7be70db7913b34459a3032d4
+EBUILD cacti-spine-1.1.38-r2.ebuild 865 BLAKE2B d3ee48575e06d3936d7b05417549a6bbd0655f8b04f8e62b44f220615020016e373c9854b7b830efeda4fea76b0a133574a9e97f150ae6c62e029be6ec812147 SHA512 93a55f613d7f0be9301ab7d36e4bcbd9f518aa514bb43a70eec540848274b98574af5c8fb26ba8b21849c9c698005a7b7e404dfd29b2b04378308ca87cdda740
+EBUILD cacti-spine-1.2.2-r1.ebuild 887 BLAKE2B d8680ed1e6ae3b749b5bcb3d0a37f7d52aed0bfdcb31072f38d604b6800317bfdb1f0da7758f9265b27f8c5b4a456ce97bc434cb7a0833a73a02988025bee152 SHA512 1c6116e9609629559fe8a8462f4449b8535ad44bd2e8d7212f119c179d7e21a2befd378bcaa5e0ee60e344b24acb31501ea41f984fdd92f9ce905f3978d8d335
 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.38-r1.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.38-r1.ebuild
deleted file mode 100644
index ad41da8c9153..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.38-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86"
-
-CDEPEND="
-	dev-libs/openssl:*
-	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
-	dosbin spine
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-	dodoc ChangeLog
-}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.38-r2.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.38-r2.ebuild
new file mode 100644
index 000000000000..23a8cb6b9a4a
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.38-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86"
+
+CDEPEND="
+	dev-libs/openssl:0=
+	net-analyzer/net-snmp:=
+	dev-db/mysql-connector-c:0=
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog
+}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.2-r1.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..9a49a5087926
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	dev-libs/openssl:0=
+	net-analyzer/net-snmp:=
+	dev-db/mysql-connector-c:0=
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+
+	doman spine.1
+	dodoc CHANGELOG
+}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.2.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.2.ebuild
deleted file mode 100644
index 877f39bf52c9..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
-	dev-libs/openssl:*
-	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
-	dosbin spine
-
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-
-	doman spine.1
-	dodoc CHANGELOG
-}
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index 82863e45ade9..51c195bbd098 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1,5 +1,5 @@
 AUX driftnet-0.1.6-giflib-5.patch 1060 BLAKE2B 6bd972e9c7e66eda935058daf75b5667f93f1a808499023e70087d7dd3a904762cd7139f23338321a0f7292974cd8dd206a97b33e665944fd32c9b14aae3908a SHA512 80dc8c0696f022e9034b01e48017f884f57e0044388cdc4d08c87fbd33bfdc7d3cad0bee332a3b7486cb06b9127469a0c6f088cde6e484d7873f3f59cfb5e97c
 DIST driftnet-0.1.6_p20090401.tar.gz 43683 BLAKE2B a3f5c57c5f57247feca37815b84630422f9fdb9ec978791eadaaf0f0b51d1f744674931ea9bb1b9291fc9e556ec9758ff44210a442d219ceeabf71e0ea3a193f SHA512 93b2f7b644603bf2fea09163c3c8cc6eed7ed61f3ad7f6770a754e1a31afde5a75e27464c399261bfdafbe37729f201e6bbcb06bb6c59bf52ac0ede4393a15fa
-EBUILD driftnet-0.1.6_p20090401-r1.ebuild 1822 BLAKE2B d0547bbcf040168f15d5d98e685ea85a2bd9da97c6eb9cb256175c9761f91b43cb6f444dca0e6b5360b6178fbb4e25944cc664d5266434a6f9d9abacac65e497 SHA512 51d05ea045ef4456792fc9785d2c6272f66bc1fd00523a9a857d3bd43f02ff94543f73062cb0f19aa7b849c5ab19abc50deefd601bc200e3fea40bcba99be3d0
+EBUILD driftnet-0.1.6_p20090401-r1.ebuild 1805 BLAKE2B 593f873c48afaa1183f25db36012404c908744a99d2832379a3880341e75da343c6263fdc65f672fab3a238864cec03e7667cc16c5ca77f8966b2f7557eac1ea SHA512 4995dca989537685663aa11ad223bab4c95ea7bbf0aed521f33dca756ba4bcf5e7b774eb289bdbbce2385139f8ccb12f462dd79bb55770343cd2f2e7ef23776f
 EBUILD driftnet-0.1.6_p20090401.ebuild 1495 BLAKE2B 2a979ecb8eba81dae2a8e1fb734c932084c8082f2132c4288a0f512e379d1786a60b145822f9b721f69f6717b09ad6a48553ba4d3ee0990f83a47811be9fc5c0 SHA512 a5d5b9fe7749b2f98182290866a4c7c7de981547ea93f2d93fc3ece2f9b50233aa4290cf1263be85180f4247b1d010d43217d74f236cbd4b29f84fafaddf1736
 MISC metadata.xml 404 BLAKE2B 73ebba8b40a398423b445b4f9a50546ee3752024c06606df966c1e0534dbed717cd5a8158c18bdc440790d186b9d8e70afa0456aacc18b545609d18cb214093f SHA512 e83bea4ca337cbe95398c6310932535246a00ceedf696574624408a5f783c9f5cc3c519216cc16bc9dd44ad2b4b62050707621814a9b2a26a23c6c0272bcfdfc
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
index 8479e85a6794..45f81624b3e1 100644
--- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
+++ b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils fcaps flag-o-matic toolchain-funcs
 
-DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes"
+DESCRIPTION="Listen to network traffic and pick out images from TCP streams observed"
 HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
 SRC_URI="mirror://github/rbu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc -sparc x86"
+KEYWORDS="amd64 ~arm64 ppc -sparc x86"
 SLOT="0"
 IUSE="gtk mp3 suid"
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 380b8959703b..25ba6bc03077 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,8 +1,10 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.10.4.tar.gz 5129248 BLAKE2B 420330cfdbecce98e9b825527c38d4606c0f3e3a74c6798b7012dae2c4ebc583317e60a91c7966d68de17359b6af676f5accd71d0fece505a17a3ca92f00e05e SHA512 7277dd315541341ee68f2e83035210c233d6556d36c26d3211b85e2d43759627c73e881edac8e5e1d266c6b1eef19c5e1eeb8e5a77a237e688039ba88a58438c
+DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a SHA512 c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 EBUILD icinga2-2.10.4.ebuild 4737 BLAKE2B 82b6eff71862480ff9017a301a45d807e2ff8c23eaafd2ee5e7df29e75f90e7f33507bce3ee3d14b6c0deeece33a7b531f023e8429dd55779578c3ce82b99a44 SHA512 b10ae453454d9747f3368c39be3c380bd1409f48298d32d7380b68bfc8fffdbf48afe1271ba8c30766c23b64335f46fa3fddcd313598e94856acc3dad4f696bf
+EBUILD icinga2-2.10.5.ebuild 4739 BLAKE2B 98edc856ce987b5e3b6ce3b7c13626392f1cd8c30f445aee583d20b35b07c86425eb12020461266f04ce009840f94c4636716c8ceb57ca7dac70ceae0c0cccfc SHA512 36f667896c130b61d2f76f29ec014207b60fc3dc9743a6723e51983e89be3bb4727d0243b516dd695b3f88265365ff2205e852546889911da2e530bef7cf7b93
 EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
 EBUILD icinga2-9999.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06
 MISC metadata.xml 894 BLAKE2B 45c6d004ea4200544a543c452df876bd89ce3f2143ce5879c671cfc79c31878abb7ce127a350e3149214c3b5b69f5f8a1b75a4c59ac10d7016b4f5023b276646 SHA512 e370c17e46b447f97281616efab16e591b8c6ecfb85896259c2f7cb5ed61a474ccebceaefe5df5eb6885902f518990963324d13b942b3167d73de093499568dd
diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
new file mode 100644
index 000000000000..8a9695a5e27b
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; then
+	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+	EGIT_BRANCH="master"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.58-r1
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DUSE_SYSTEMD=$(usex systemd ON OFF)
+		-DLOGROTATE_HAS_SU=ON
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use mariadb ; then  # same as mysql
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index c4616dd503fa..fce27f3a6023 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -18,6 +18,6 @@ DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d69
 EBUILD net-snmp-5.7.3-r5.ebuild 5123 BLAKE2B 4b131228917ab3884ca81e2777e1de6f8a73fa8b5ca5bfb15aa3224e00a6f7aa0d750ff18339c5abfcb26c01c592c7f182a47bca26728e0e620971c846bb4838 SHA512 a0aa82e9b35f0e2e8f33fe4abe55b706ddb7e6918da85916189e54c1a7273f121a42d802ff0a13ab53e4ed382b398f0fc6834cf9686aedabf850a7fb55230c9a
 EBUILD net-snmp-5.7.3-r6.ebuild 5156 BLAKE2B 29fbde65309d3169b9b9ce45aef271d70d583b859e27362c5c4c5185da1922abf5075f577b046c5e46042f2f1d335633cd81a56dd7e0fa99487f74797f91eb55 SHA512 e80156676b3b4841c24c6aa20af042ef6ea7c21fbf0ea08bb37af95ae4966a0a80f2bcede1e0231fa8065a21b4d97b12ce1828b012a8d887fe808898523405fa
 EBUILD net-snmp-5.7.3_p3-r1.ebuild 5235 BLAKE2B 20975c562ad43c1a20d4116aa2d422285adbad4df23f7f975357668fbbed6951705fffcec1008498374c42f14ecc6dc96e471970fba95cc592b862019bf23c18 SHA512 c058c0f7351da016936c454830887510a204bc9ae7d798f81323a4a4228fa51ad52551a68e95125c88ed2f511b3d0ee6860cd09bce70ae9d8719ad9673e3f9cd
-EBUILD net-snmp-5.8-r1.ebuild 5235 BLAKE2B af78ea274ffa1eac9ff2394624735f81c023ab97d081754259f3a5c5eeed286e0c9875bffeb10f3c0df71a453137257afea1be58098f75301fb38ef74d1b7e70 SHA512 1f25d2140ccebc49f5ca166ce23ba62d6f633a47b2ac0ab01da63685f41256554413234ca05edd80f72fb80b85f5a1559488a4ad835ff3e94a28919153c4b118
+EBUILD net-snmp-5.8-r1.ebuild 5231 BLAKE2B 5c2dca8613b661e3802d193a5308db29205cd0c0b5e3ff6bac1eb6972c1e8c2eddf2ffd630304b9e5c37e58f0fdce5370c0c79fd646420bfacd9e8a659831db1 SHA512 854b355ceac06756f2e7155a3a304d42a99aff4301afe48daa4cd2a705b5c4382a3625e25c6ec0f60652dfd57d7a9bed887c7d18358a510095ddaef937d8c202
 EBUILD net-snmp-99999999.ebuild 5190 BLAKE2B 49c9bf18d335cdeace6e94a6046c74a3241ec66100d625e6ef5967e86cfed06417d44bfb80940e49d67cf67fd021962bba5eb4c8be007390dc40c3fccf625e73 SHA512 c771920f9db1560b23f43fb3689af3b36deb691d94912d324f09f513a744eafbdfe2f24ce09c4bf33b8d5cb6b330853835a5297e27003ece8b3c32dd4d023e98
 MISC metadata.xml 1142 BLAKE2B d026289018d327a888079b9c3cb7cf65dff58dd87735f7317d15d78698fe307d4dad2dfed10adab428eee0eb3abf357c82554b0861029a70fb60b82537601d84 SHA512 76efbc8444b344164960e671df273afaadbb4b64e73b136f559d4f039ee4b145f8ae989d271a8cc025edc917e4213828e0c77f6e5b0258b4c0eb9653c98c58c0
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
index b550562148c8..bc22e458d86b 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.}
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0/35"
-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="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
 
 COMMON_DEPEND="
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 3aeaeaf5dce8..e72990d41344 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,7 +1,9 @@
 DIST netdata-1.13.0.tar.gz 3095581 BLAKE2B 0149600d308717ce8bdab2af6b4b0403a762fff15c62cf61a94141c0a73f8867cde265a2065e6f1e42cee7291375a7c33a3eff804017d40146d5ecba6f5414a8 SHA512 dddd0005b746429255601e284f498072560bb62c4875a17a731d8e47c3c168c4934476f46eefc7b0deafb54490fcbb6e5ea97aac51a0461f7a63f34d3770c250
 DIST netdata-1.14.0.tar.gz 3116199 BLAKE2B 366fdd7fc94799f170a2957e26fadfacd0cc71ae22f1ac2390633fc2e9d48b2f725ec1f87cc21096d2ed8a948e1dfcfc5d9e90540ad3ef93fd918569a387a64f SHA512 7e4d9eb171eadd0d2b553a6ac7345a7f1ec368f22fa0d1d67b6430e2b388be5d06a1464b539b9b44c07a5440dab58ece5605c44b279889d9e4bf696102b01b25
+DIST netdata-1.15.0.tar.gz 3175237 BLAKE2B 75f4c6f0dba53e6ff01fb98767e266ede8a8b8b965c484a03d5f72a55b39d55b150ada7784a971897a365ff9ebeb9bb66cadc72d4ce33dbc1465a758321d4104 SHA512 34b783d3b550c8ac5dc22e08f30fe87de65a5cd97008e271d9328d09b59620a6807ca3daa81a2e49d7ddf1c015f868b21f4118700b2630dcb78c4f9feda3fe4d
 EBUILD netdata-1.13.0.ebuild 2633 BLAKE2B 917373166cefb26f30a9f62fedec407be3e7332774b419cb36db4a8ec6978d774f527a21d8b09e9bc4ed920144d7dc0378c9ecd30eaf51e855c6557b4e950556 SHA512 b964e4a3949b0ccf268cc8caa6ede03a45c3fbf5ec9b2d98e2c8ca9efec2643d8bbcf4233a087ac259c9a62c19f54ecaa15183a51fae0642c93c80d27c95cda8
 EBUILD netdata-1.14.0-r1.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
 EBUILD netdata-1.14.0.ebuild 2623 BLAKE2B 8552936e3884d9b62a6b2ee94ce4d14fb80feff59412e35b5f6174f5de2abc0506fc22311386b3337c3ee250fe0952acda36ae1524e924bf39673aa5f74a7eac SHA512 82d51a4bcd131b4dca9090ec6c6b344e37efabb5521f06315324bc006fdf5cd9930f4b68c4aa4a90f1ca7a1135803872726521f3d4ac21504a60047f8abaab96
+EBUILD netdata-1.15.0.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
 EBUILD netdata-9999.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
 MISC metadata.xml 921 BLAKE2B d0dfbd5bc5d49552053b908e2fc43357821b0bc63cc2a80a067bb699b937405e7e83ee9e2204de47676891d588cf259d4349e7c7104570671d9be114e78f1175 SHA512 7b1d4da58e73201c0e402ee5d5acd4edb0fd72a8cef212539c9bb020cb68cf101d5afda37538e0c4945947f2cdcaf60b6600634468c4a2de9b163cb45307ab1e
diff --git a/net-analyzer/netdata/netdata-1.15.0.ebuild b/net-analyzer/netdata/netdata-1.15.0.ebuild
new file mode 100644
index 000000000000..54d150969d3c
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.15.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable cups plugin-cups) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index c2eaae2a668f..ea05adf8d38d 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -7,5 +7,5 @@ DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
 EBUILD netselect-0.3-r3.ebuild 976 BLAKE2B 53e56c268d75225b7566279f7fe604a6fd915d40e31160947c8a2ed10e47c06ec815e27371357a8b2641fdd488b1f3f998a68afc3f32fe3fc17e13df3d7cf5c1 SHA512 c3a42dec4c8830765d1b5122465708c9c8f47d67c80a57a69ce91741f7c135de52963ac9ef2ed0a5306a32b9ba7f86e7383ed7faf5d3227434fcdf1c24ecfaef
 EBUILD netselect-0.3-r4.ebuild 994 BLAKE2B af8c22627e8ab2e495a2d4653543c69bd30d7a406551a07d87570782dd00d98e7d386eeb4de2e0dd16a0f6e41754aa0f903e78da93f19f16f23cf4f1bfe862d7 SHA512 af56e7e5c74d79f4079d2721021f9c9b00183db5e92eec44e722a47c98701250910afc7057d7fae1a7d5bccd39104620625a46dd02ef8948caf734b80abbae6f
-EBUILD netselect-0.4.ebuild 961 BLAKE2B 678ae00d6478a6c02f1f4f36082718c3ec3c8cb3877f9c2548f0f8251870a9dc75b2ceaa21bfeeeec59e8ffa7393ef0bece73f92a5a734601ccab504639743f2 SHA512 83be0dd6c8d54bdba3ab8c7a8a78b573447685154e348fdb0436c4a085751ce14ef1d05765e36f8366e4e30f46d004f0043477a85f3cc41b7ccd3f4b81b2df07
+EBUILD netselect-0.4.ebuild 953 BLAKE2B 581705441ffe91cea7ed001efad069a7291ebd17e535bad6fa1c52f8237e382bffd4b96682a753750002396207d8b9da293e19b36c884c759e28524750ac5df3 SHA512 64b108cf8ca0a403be80371be2871a0e7ed54cee5f9118020acde594f18c5606e05251e952f8d71e0915d9f8e5160ae46a09e051e4e509d8a27059fc7d6c3216
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netselect/netselect-0.4.ebuild b/net-analyzer/netselect/netselect-0.4.ebuild
index a6d716516f07..911f1daa4446 100644
--- a/net-analyzer/netselect/netselect-0.4.ebuild
+++ b/net-analyzer/netselect/netselect-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~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 ~x86-macos"
 IUSE="ipv6"
 
 PATCHES=(
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index d4e7dff9f8e8..be8a77093645 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -11,5 +11,5 @@ AUX nmap-7.70-time.patch 586 BLAKE2B 5354fffebb073c2e96ec744ac746b140ef1b528539f
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
 EBUILD nmap-7.70.ebuild 4549 BLAKE2B 7923242126a368798da7c84e2f60fe719a27e452e0c067b15c704e70f6919fd62623cf4bfae1afd93714b0bf399b1c5dbfa6ee42fb8d94ca6b925febd853268b SHA512 33308a5492a447d3aa059a0f69cd339e20131f901b3fe19a668929a4a5840a5303361bf23002a32a67ed7699f70e82e19f430b89f5302776358b204286ba3519
-EBUILD nmap-9999.ebuild 4349 BLAKE2B 6b3b1ea837ac1e72e610aab1c22f83611a12793b05aec5ed6ce8d7558588ab39f4441be74f5498b2f45d177e5a8a3f7033d95ee1767a983ddf3a62b8c1113712 SHA512 1f7fcfd904567fb7d3ce1b75a3b871d7baa1b76c3b546b29953111468b51e433782825031a89fe1bdb0fce00b9beb1d7cde0ef307a678ac546325bb33ed147f9
+EBUILD nmap-9999.ebuild 4320 BLAKE2B 1700d6cd07baa6dc94163cafee22768a945aa72d9e843797ffa3d2bfece588d883e2b3413ea3eaab8aa77b3266afbf0afccfdd65a71d11d0649fd2e2926946fd SHA512 25c03e8fbbcd28e6440589c0c762f1c82cfac13ad7825949bff44ce2ce88f7188644b026561078238a1ad2ea3eea242df95ccbd300c65100784a6ac8b4636b84
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index c282246d4512..6b625c9459bf 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,xml"
-inherit autotools flag-o-matic git-r3 python-single-r1 toolchain-funcs user
+inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs user
 
 MY_P=${P/_beta/BETA}
 
@@ -65,7 +65,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.70-time.patch
 )
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-analyzer/ossec-hids/Manifest b/net-analyzer/ossec-hids/Manifest
index 4b5c72ef9fac..ee3c9ec820a6 100644
--- a/net-analyzer/ossec-hids/Manifest
+++ b/net-analyzer/ossec-hids/Manifest
@@ -3,6 +3,6 @@ AUX makefile.patch 933 BLAKE2B 29e0d41592983d060c5faeaf1a5719c6c6b41469e1de6f63d
 DIST ossec-hids-3.1.0.tar.gz 1886469 BLAKE2B c175c8659a8b5d0d269a5cb6bf142276f29e6f676afc6029accf854d68299d71147ba65a667601e77c6db8ca49a29afa49534e5683369f420f6389059ae61fc3 SHA512 fe55f82ac354d9fcd767d8379a492279644308788535780bb029d46688c93f259771686462570137555b40082c6756daad44bbdd1ddc953ed0bb22b65c6cb566
 DIST ossec-hids-3.2.0.tar.gz 1896977 BLAKE2B d77cff3a3a72287ad2235f346c7d07cfdad83872d956f57877ed44ad21bb717e4b4ddcfd0e8b2ce45cb90160bb63a28a7d06bc6225b53cc5ed42f7a97c5a1765 SHA512 40b25b97c43a66b8a145914ab0badd9d4f7de7d2168aa7a49abdf778c620a4b533ce3de0883d26c4c39816cf78674a053788a57c5f9c38fbea7cd8b13a35d18f
 EBUILD ossec-hids-3.1.0.ebuild 1565 BLAKE2B a87f9f384fd9164a1aac6c1febbafccc8018d10a75508c9acd4fb97d5da6dbe1d1c7dc364c1e38017ca64f5a758764cbb3f628ac52dc1d71496dbf6f7d70e3bf SHA512 797ee671d1f16d8d0144f069a55223d8a030477cb8137c9549ae5cf20d1831fd6c47bcb7ee0bb3134430cbcaa1cc6e97be5a3f96a29a8fd7b7168bd9f705d043
-EBUILD ossec-hids-3.2.0-r1.ebuild 1591 BLAKE2B 96f58a00121e6c9a997032bba5dfcc8a403637ab600f088ca6e9b690002f744ebb9c42d8d88f173951a2d4bb0c05222edfce9b3cbdd7643c1da1165538e4f474 SHA512 39a2a1248e0b643b9f9701debdde41310be0b35c60c01869381d205fb1d90850bc2be9cdd853a973b185defbe009303dc49c86066860d2390038dde1b1c7d98c
+EBUILD ossec-hids-3.2.0-r1.ebuild 1590 BLAKE2B 849c6e5e9327cf2babdc642c79517d30bfcc67a69ac1c3fa253d4166eb139df663653687b29ab8dccb1da694d04ef0130d7b278737ab7a414b2a749cbaf5b569 SHA512 ddba4ca1c940717ac291f53114d6aba2338e69dd03ecca1b0d7cdbd249906c9ae7fd1f886f3c5d9d133d86c235fd2a13d858b5d8b8a632e2d4d403ba725aeda0
 EBUILD ossec-hids-3.2.0.ebuild 1530 BLAKE2B fbb10305328d1666b2718485c3c4afc7ac7f08402cd07b265debc891212b2ffa152c8a0c22d46221ee81229f5fd289306c26fcab32f82c4203910bfe81dc2ce4 SHA512 1e0b2fe87c451ade9d83466f9bcef7e476ff5e39441fa17e5665006b01f7d07cb1d564ef09a2af6d60c867ddc32d524eaa0004125527b6f7eafaa07ec3db359a
 MISC metadata.xml 1184 BLAKE2B 491f885913c264b0bd1eb3bea5131e64afd36f8a07a8964a07a987dc67a5537a2a6fd1a8018b339e487218649833eab4a05199fe5d2b7aa79483ec3494a44bb7 SHA512 e786d57b92a5563eb9d3e4ca60c7f45cf1adf59e9409001f032dac07621cfcfedeaed4fc0d438d0b8c2f3146074d9e75874ebeb31616e158692ae2447fd3c767
diff --git a/net-analyzer/ossec-hids/ossec-hids-3.2.0-r1.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.2.0-r1.ebuild
index 31980c7fe55f..61c466015956 100644
--- a/net-analyzer/ossec-hids/ossec-hids-3.2.0-r1.ebuild
+++ b/net-analyzer/ossec-hids/ossec-hids-3.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ossec/ossec-hids/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="agent hybrid local mysql postgres server sqlite"
 REQUIRED_USE="^^ ( agent hybrid local server )
 	?? ( mysql postgres )"
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index e273b28e200a..2a0ac0af8fd6 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -1,5 +1,7 @@
 DIST pypacker-2.9.tar.gz 276080 BLAKE2B 3bab4b4c7879fea10accbd3fb2bcb4a8e27096a29240f6b8e4e06c3486ee0cb2b8fa1e83674dee759fafc85c2e182cb75e836c00dfe28c83c0bb2cecaed758cd SHA512 b7ca61948a55a37661fa402ebc5a9c2be456e8df14d1ee091a50ccd1362c7a7fa9224e1ae2b8ee8057f302ee9e0c61c06d07b627dde92947f8d22158ef3623b8
 DIST pypacker-4.6.tar.gz 592362 BLAKE2B 41fc63f1fc40ab1cfc007db9dfc6d18cedb51cc8525dc2b467bc03babe03c49f9f0771b8146aacf80f74c511619da85e1f7d56667bcda350710e4c0bafb89351 SHA512 c55205b35f653903149517aad0e2d055745edd6c1a28b1b49aeaa435ca327693b20ed6f851011fa80df1fcc5281ac8b92fbffa3b1381cb3d4507ef7d45d49545
+DIST pypacker-4.7.tar.gz 595975 BLAKE2B 95f29bf88347df5c4673a225049337c053cc4833a13767a3fce700a911fb7b744a61ea745f3d3ac4a14cc93288504e190c9cda228000b8a41b924b23805efcf3 SHA512 9c874af28887e942f62a7f540961f7e31af3b35e52f960ec99ed53e6a5ea29d36f20a6dbcf652125ac6b72849502a30e5d11ee1f795c90c7efd5702a0d34b2b3
 EBUILD pypacker-2.9.ebuild 696 BLAKE2B 3ec2822ab28c7ab75e6a2cd049ad397a4ef86c54f60d06f87c8d544e911a0d513651211dc4020f267e864db782188f3c4e31d749e58a1656427ad68b3b1ff67d SHA512 7fc02ab96434a780d5e6f51e8ccd6f5c2fbbe8227e4f41ba93f85f0894d805f028a6cc3e8321a9455079335698f558a796944c6a7be37ceb40413d4b6098350b
 EBUILD pypacker-4.6.ebuild 696 BLAKE2B 849590e13844edc4d6d08d4995e3284f0aa1e7a90ca969802f6525046197984d6e6c5d4a3f07ac4def5be19812395924a68c102d1bbc8a690405af1530b1526e SHA512 7f80a767611317ded7eb0e94f3b62add6432acdac9c95ac92d2bb2155b34ef1f991a094cdc9db731b7eb8a171bc5af6ac2afd27b882579922f17240e082352d4
+EBUILD pypacker-4.7.ebuild 697 BLAKE2B 3e6cb3ecdc10198d651dd726974ce7ac81b45e9b7fa191c02595afe26ac4f271be55468c1b68ba85c5bc35ab4dea468d7518e359fd9a19bdb8f7fa42efc3881f SHA512 f6f896ce34a9b056b2e0c1af1200404b49457c85daeff4df86661674faf667d10c21a52f618409b06be054a7d505dae2c6c26cd4135097099c0c133bf513ddf7
 MISC metadata.xml 471 BLAKE2B 16f24ca5a8c373e40115c441da2b6efabca5ebf7f6cd5d4e55c64320172d92470e34c484c7c9d63dce8f4fcf1aff0a0adc0d0743807cd342756aabfe790b4356 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f
diff --git a/net-analyzer/pypacker/pypacker-4.7.ebuild b/net-analyzer/pypacker/pypacker-4.7.ebuild
new file mode 100644
index 000000000000..eceff640e8e9
--- /dev/null
+++ b/net-analyzer/pypacker/pypacker-4.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Fast and simple packet creation and parsing library for Python"
+HOMEPAGE="https://gitlab.com/mike01/pypacker"
+SRC_URI="${HOMEPAGE}/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( AUTHORS CHANGES HACKING README.md )
+
+python_test() {
+	"${EPYTHON}" tests/test_pypacker.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index aaf1bd899aaa..e358f8b64036 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -12,7 +12,9 @@ AUX rrdtool-1.7.1-rrdcached.socket.patch 733 BLAKE2B a9ca7691e1589061e65ed4acd3d
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
 DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
+DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 EBUILD rrdtool-1.6.0-r1.ebuild 4248 BLAKE2B 2e072f4503032b3f103ffb8ba21e60d9376608e763142b450b66a8dc6418cb130623f8d3eb8eaab68d884c9d80c561d318c9b2bae6fa17f0e9621815bdc710c7 SHA512 7ebb70f03615b612174bc9a66262c5eb2e658b8d7b6ddfce41bcff7e0ed589f31af4fd101dfedbd2b7578bdd88d060adba5f78028894a2d9a428c4b04a040e8e
 EBUILD rrdtool-1.7.0.ebuild 4301 BLAKE2B e5f7164f2dd661e6b56692812a7d09a42f2edf5402d8729e6114ff35ef66c4744e461c699376a10cfeadac2883f2c68a97de712eeb1e2b555732bddaeac2b1dc SHA512 2526dbb47c58bc067dd85f3923be6e22db815a2d6b71322452744eee5f440aace60178e6daddfda04635f2175277f4d28cffa3ab6d63f1660ae7c7b13b199e00
-EBUILD rrdtool-1.7.1.ebuild 4292 BLAKE2B cf7635462e588fedd509fd11fd22477da670b1d5f0e10cf6dad9655eb9e0bd06950d55cbaf0dd3ec65fbc1782e31836ee62ca64203ff8941f5d60ffb8e06054d SHA512 ea773f709ed7cbad26aaf8b163cf89158c27dcb1e83ecb3425fcd750e76c19485bc9cba598aff78e0831f1a77a8894feaa411a90e9ccc09a4dede5bb0b08263b
+EBUILD rrdtool-1.7.1.ebuild 4255 BLAKE2B 03afebd8aec6e29074c4def30106dd9b0c46383d3e1e62ca5c3b71cd938aecc53a9fdb6844ef20168e9e35b4ab17d1f201c20f7fce3a9c2f8080572693f97838 SHA512 92e9bdcbbaaa93b7e8c19caa111a1c7b8657ff03882bfef34165805dbaae8c4cd4753d0793fac1f96c7f0b560c0ba618d26177e6bd82ab2c59f85353815db216
+EBUILD rrdtool-1.7.2.ebuild 4203 BLAKE2B fcb474aef1bb6fe12b7c23515116f7e4cc214fc5ee2801aa1e3165e7d4cf5234fc48d01ca8ff156861f0c442800fbdfe06cb3011715de84ced266408f423ebfd SHA512 ee4702bc851fbdc723e1bcffb0c00c7f79c0337360f7558b07b5075c87729e0f618ecd80aecc077fec00bbf1dbc6f237698cfcebbe1d5779d867b382e98b52df
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
index 456d9c726c42..ea2cc5c49734 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
@@ -103,8 +103,6 @@ src_prepare() {
 			tests/Makefile.am || die
 	fi
 
-	echo ${PV/_rc*/} >> VERSION || die
-
 	export rd_cv_gcc_flag__Werror=no
 
 	eautoreconf
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
new file mode 100644
index 000000000000..e907820c5be6
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DISTUTILS_OPTIONAL=true
+DISTUTILS_SINGLE_IMPL=true
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit autotools perl-module distutils-r1 flag-o-matic multilib
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
+SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/8.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
+		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+		>=x11-libs/pango-1.28
+	)
+	lua? ( dev-lang/lua:*[deprecated] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	rados? ( sys-cluster/ceph )
+	tcl? ( dev-lang/tcl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+	${CDEPEND}
+	sys-apps/groff
+	virtual/pkgconfig
+	virtual/awk
+"
+RDEPEND="
+	${CDEPEND}
+"
+PDEPEND="
+	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
+	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
+	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
+)
+S=${WORKDIR}/${MY_P}
+
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# At the next version bump, please see if you actually still need this
+	# before adding versions
+	if ! [ -f doc/rrdrados.pod ]; then
+		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
+	else
+		die "File already exists: doc/rrdrados.pod. Remove this code!"
+	fi
+
+	# bug 456810
+	# no time to sleep
+	sed -i \
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+		-e 's|^sleep 1$||g' \
+		-e '/^dnl.*png/s|^dnl||g' \
+		configure.ac || die
+
+	# Python bindings are built/installed manually
+	sed -i \
+		-e '/^all-local:/s| @COMP_PYTHON@||' \
+		bindings/Makefile.am || die
+
+	if ! use graph; then
+		sed -i \
+			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
+			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
+			tests/Makefile.am || die
+	fi
+
+	export rd_cv_gcc_flag__Werror=no
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Stub configure.ac
+	local myconf=()
+	if ! use tcpd; then
+		myconf+=( "--disable-libwrap" )
+	fi
+	if ! use dbi; then
+		myconf+=( "--disable-libdbi" )
+	fi
+	if ! use rados; then
+		myconf+=( "--disable-librados" )
+	fi
+
+	econf \
+		$(use_enable graph rrd_graph) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable lua) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable static-libs static) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		--disable-ruby-site-install \
+		--disable-ruby \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils-r1_src_compile
+}
+
+src_test() {
+	export LC_ALL=C
+	default
+}
+
+src_install() {
+	default
+
+	if ! use doc ; then
+		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
+	fi
+
+	if use !rrdcgi ; then
+		# uses rrdcgi, causes invalid shebang error in Prefix, useless
+		# without rrdcgi installed
+		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
+	fi
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+
+	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	keepdir /var/lib/rrdcached/journal/
+	keepdir /var/lib/rrdcached/db/
+
+	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
+}
diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index 4445307b027b..54b859ed3fc2 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,4 +1,4 @@
 AUX sngrep-1.4.5-tinfo.patch 237 BLAKE2B 2ba30ab0828f475e790175d8c3dcd25160ff691194ebb6b8e86380251863b40ef52bd942cdd65c694b84bae8de8d216244f9ab5fa75066e640b8427099a39342 SHA512 7c47e530caa1c44f8452a536925fd1133a1f0aad3822117e5ce2e1b7b03307a90423d70bb031639305b638d4c6732d980f3dbe617adc489fd0c2b438354f5ce6
 DIST sngrep-1.4.6.tar.gz 235721 BLAKE2B e01f2a1d83b9147b99196f7ff2e5562552b16badc2ca634e63b2e2f5955a5d0328c9fcdb841f42a950899511a81fffd8eb64169758dc319875e3052d4359de93 SHA512 25c67e26158b140bded775b217f313ad5a6268684f03d0b9875ddd423d7548b50fa9c358346330d3873984f456aefa9401c2b0fdd136dd95061e34da6530bcc3
-EBUILD sngrep-1.4.6.ebuild 815 BLAKE2B 0bc3571e1c1ea1be12d04c3b5d0dc1959a00a9a0134cf8964d20bb005a32e511925df015537b7e80eceb2bafbb4c8d468365192b92dfa512941421df1ee49427 SHA512 9ddf0718434fdb53dc23cb9cafbd57d8f4875a4111616d7f49f02ad27bdfc5c76fc838061dbc2978d386cd883f270e4f9f248ed35fb9b419ba07f0eddb8e0b8c
+EBUILD sngrep-1.4.6-r1.ebuild 817 BLAKE2B 5508ec30250296fbc378d403f3baecae5394664b8bd8ed1a157de279f7cda50b4a822dcf50968313ae37ba4cd2f2fa1d4b6b3f11be1bd6a9ac2fd31ad031c173 SHA512 bc0845fcfe1a8649d3b66105e00e54b0915069cca3b2c8ed4261f6805b5c91ef56e812c8b033a515600d6ce4c75ee4f6541d127009f001afb3fbd38be27ba50b
 MISC metadata.xml 468 BLAKE2B c4ecbf2a09c6361f3cdd82c6c2280d1885565eb1a834be6093b3acbde6ecad83b49026524c68b067bee7f2764dbf4d3bc73e7e8fc5d13ac499a04001c97b1b30 SHA512 def85ed081107978cef4e8cad0ce80a0717c5c644494ebb907a9a616ad571f13e518019d6d51447f05f1a9545c739dd31874d888cb06ce91ecc224fb2c40e446
diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..6211329ed152
--- /dev/null
+++ b/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Ncurses SIP Messages flow viewer"
+HOMEPAGE="https://github.com/irontec/sngrep"
+SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eep gnutls ipv6 openssl pcre unicode"
+REQUIRED_USE="
+	gnutls? ( !openssl )
+"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:0=[unicode?]
+	openssl? ( dev-libs/openssl:0= )
+	gnutls? ( net-libs/gnutls )
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.5-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable eep) \
+		$(use_enable ipv6) \
+		$(use_enable unicode) \
+		$(use_with gnutls) \
+		$(use_with openssl) \
+		$(use_with pcre)
+}
diff --git a/net-analyzer/sngrep/sngrep-1.4.6.ebuild b/net-analyzer/sngrep/sngrep-1.4.6.ebuild
deleted file mode 100644
index a6ad92921fd6..000000000000
--- a/net-analyzer/sngrep/sngrep-1.4.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Ncurses SIP Messages flow viewer"
-HOMEPAGE="https://github.com/irontec/sngrep"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="eep gnutls ipv6 openssl pcre unicode"
-REQUIRED_USE="
-	gnutls? ( !openssl )
-"
-
-DEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:*[unicode?]
-	openssl? ( dev-libs/openssl:* )
-	gnutls? ( net-libs/gnutls )
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.5-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable eep) \
-		$(use_enable ipv6) \
-		$(use_enable unicode) \
-		$(use_with gnutls) \
-		$(use_with openssl) \
-		$(use_with pcre)
-}
diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest
index 4467b3cf8e94..e8cad99c6425 100644
--- a/net-analyzer/thc-ipv6/Manifest
+++ b/net-analyzer/thc-ipv6/Manifest
@@ -1,5 +1,5 @@
 AUX thc-ipv6-3.2-stdint.patch 208 BLAKE2B 639a1ceec32ab48b886d721b7ea197dd39efe4ab5f62f8f1fffe04e68560336269e9b3b021c90ef635948bfbbbc0c60e0cb2c56e60e7bca3dfdc7c0d823dfdd9 SHA512 635438ba4a64eb63d51130643afd73e87e83313532f351e1f124cd0f34d719a67d77e592595707e65c8fd5b69a00cf04942688668e5a9c921807934ca602fd8e
 DIST thc-ipv6-3.2.tar.gz 1595453 BLAKE2B f1bb1cdc31f4cf4d067b39997ca3cc2d6d8c15e7a8c585c7c494f03e229fccbcd65677e382a65f0e650d79278f5ede89173db1cdf313ade7c48dff1566856afa SHA512 648db4618ebb83572e2e318cdbb284fe96a86adf335f7dd9b26fd010c76d12e9137ed7367207c66c93c1961c868d3917d706db9f597289ac47ea3f9b83c03441
-EBUILD thc-ipv6-3.2.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
-EBUILD thc-ipv6-9999.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
+EBUILD thc-ipv6-3.2-r1.ebuild 1165 BLAKE2B b2571fbf1a6e0fd1da35c328ed4a9c4989bcbe919115733603ee94200c13d357005fb0c48f16db71c4609a8d71a49c4e44cf0c8b41ab12b1f7aea2e58c451c16 SHA512 fe8fe27aec9b335632ca22e498e14c5cfae2f2bb559d04f77ae7af632cae1a3eec7074484d2be5d62bfa943a438a98b2f89a341dd3ca75cf204437d50a0f49e5
+EBUILD thc-ipv6-9999.ebuild 1165 BLAKE2B b2571fbf1a6e0fd1da35c328ed4a9c4989bcbe919115733603ee94200c13d357005fb0c48f16db71c4609a8d71a49c4e44cf0c8b41ab12b1f7aea2e58c451c16 SHA512 fe8fe27aec9b335632ca22e498e14c5cfae2f2bb559d04f77ae7af632cae1a3eec7074484d2be5d62bfa943a438a98b2f89a341dd3ca75cf204437d50a0f49e5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild
new file mode 100644
index 000000000000..71f98da3f733
--- /dev/null
+++ b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git"
+EGIT_BRANCH=master
+
+inherit eutils toolchain-funcs ${SCM}
+
+DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
+HOMEPAGE="https://www.thc.org/thc-ipv6/"
+LICENSE="AGPL-3 openssl"
+SLOT="0"
+IUSE="ssl"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="net-libs/libpcap
+	net-libs/libnetfilter_queue
+	ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" )
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default_src_unpack
+	else
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
+		-i Makefile || die
+	if ! use ssl ; then
+		sed -e '/^HAVE_SSL/s:^:#:' \
+			-i Makefile
+	fi
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
+	dodoc CHANGES HOWTO-INJECT README
+}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.2.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.2.ebuild
deleted file mode 100644
index a0934cf80b9a..000000000000
--- a/net-analyzer/thc-ipv6/thc-ipv6-3.2.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
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git"
-EGIT_BRANCH=master
-
-inherit eutils toolchain-funcs ${SCM}
-
-DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
-HOMEPAGE="https://www.thc.org/thc-ipv6/"
-LICENSE="AGPL-3 openssl"
-SLOT="0"
-IUSE="ssl"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DEPEND="net-libs/libpcap
-	net-libs/libnetfilter_queue
-	ssl? ( dev-libs/openssl:* )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" )
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default_src_unpack
-	else
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
-		-i Makefile || die
-	if ! use ssl ; then
-		sed -e '/^HAVE_SSL/s:^:#:' \
-			-i Makefile
-	fi
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
-	dodoc CHANGES HOWTO-INJECT README
-}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
index a0934cf80b9a..71f98da3f733 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ fi
 
 DEPEND="net-libs/libpcap
 	net-libs/libnetfilter_queue
-	ssl? ( dev-libs/openssl:* )"
+	ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" )
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b535deb18856..de4b26176a7e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -9,10 +9,10 @@ AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f92022
 AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677
-DIST wireshark-3.0.0.tar.xz 30953760 BLAKE2B ee866966000cf902da6f330eb8a4b281d34a3ca88e9d92a7de1069172c8aeb86f9222e1467c5d3722ee055baf88d8ba0eb6fe27084d0b35f9639bdb9741d25e1 SHA512 917708b5edc25609536c7bd7cf4ae32a901fd99118302138dc0bf6f1ad092a8e5069a917cc8cf6cb77190f54e50623a4eba1ee10ffc225ee3051b50cf02a0963
 DIST wireshark-3.0.1.tar.xz 30903792 BLAKE2B 583052691cc20e97511f2407a64fbdffae91c09275429c9c9a60dbafcfc91ce79270f09710e8fba7db053565f1afc9786caf22ef21e700dd0f97c2f38b139e31 SHA512 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d
+DIST wireshark-3.0.2.tar.xz 30910100 BLAKE2B ffc8f1c5fc09a387c10ec2bbd91f80dcee2b368108c2d93b3c891773dd1d69259fff351adf991d37ecc52fcb69f5ae60ab91333b5bf7b7a3390de2eb9d4f6d9a SHA512 0dab01b614534c9ddea517d045598029c15f24ab54d59110e6819d43d2479afe9eebe04554d25f3b0806cf8c78ed241b0fb261c2024234297eeb25d032fbb982
 EBUILD wireshark-2.6.7.ebuild 6510 BLAKE2B de9400f9081e9a225d4c3e43f715db085b2e420fd5fe91badba9a9ddbb4f78d83715f4505203b54fab0f5d3aab6366b35ad09ed91d9cf681e2ab3f744840bbfc SHA512 6d0f9594348164136a731ea99a82b22bfec73f51f477446a58f85da5873c956a2806d310c9aa74bf2a8b124c7a22e405b7b1e555d903f316801dedec19c404f5
-EBUILD wireshark-3.0.0-r1.ebuild 6675 BLAKE2B e00d0e4b1e778db1abe5baefc609c4640b597b6d1f8a8fafe1ab3963d0e7eac32c57a5a6629378d83fa38cf8c4700adf4d70b6289a96b171bce9381cd3581bd3 SHA512 2ce1ba5cb2e1a534e2bedbce3923c614ba03834c1ff20d1e1a73cf2450ee3066277da3a2a20e44344cd706b12c3ec77185dc405bfae186b2e33dff3914daa444
 EBUILD wireshark-3.0.1.ebuild 6645 BLAKE2B 913afdbacafd77f21c802c1ee66ea23ff2314fc67552a9713ce6c34a9cfa89276b26c4032d597d9f50532bc63f159674b0f9244288ce725636f21f179ac2dc01 SHA512 40a68db2216783d04703c51e3467b28820387ba68796f71818244cdc2ed041d3acba4d1d1a5bf20edd930bb8241f2aa71d7fe47d019fa98ca4851a0248f82899
+EBUILD wireshark-3.0.2.ebuild 6649 BLAKE2B cb036c300475a0171736c1266cb94284fe1e5c8ba9c734bf58a42bb70ad6616edba9ccfe33fb523412e6e2fe7840ac42a26dedf6b8c1c1abddeb91496cef2997 SHA512 29e89b6e91ee0e108bf50e3d1dd2591cf167e2e3f6b2998a508354c9e902ef96a81236db76041c628075fe7eaf89ee39374f67ab295adc2af1868c498c5a2267
 EBUILD wireshark-99999999.ebuild 6742 BLAKE2B 1c7c56171e9fa7a768966a6949c00fa8afa7a108c5da6dd912188790541d0a0308618ab9f484e983444b63df3e7960558ad15886277b17fdf053b5640c97e123 SHA512 81ce54ba8d23f0b3f9ab62ab1718bff1bd96981d3349fb779672c3ffb0f155bf2997c62e051e7334188fe12a3b8af4bce1f9f4f5ef1925eeeac7a0970b383043
 MISC metadata.xml 5078 BLAKE2B f6cce66c296cee00dc8409609f502a88ea9acbc76f2bb8ab5bf0ea7468b91899ad301c1f56e32c9244c1acba6b8572e2f0bef0b416a833226d5c91b9f0ae6923 SHA512 1c8b1596001ac29e32fe2252584acbf53495305f5d894927b9e193f224f45c42cd182e96bb32420488e371ef51d4cdb927148de53f2f797ddefcf43a60cfa5bd
diff --git a/net-analyzer/wireshark/wireshark-3.0.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.0.0-r1.ebuild
deleted file mode 100644
index 3ef6f605164f..000000000000
--- a/net-analyzer/wireshark/wireshark-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib python-r1 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
-	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
-	+udpdump zlib
-"
-
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/libgcrypt:0
-	adns? ( >=net-dns/c-ares-1.5 )
-	bcg729? ( media-libs/bcg729 )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	lz4? ( app-arch/lz4 )
-	maxminddb? ( dev-libs/libmaxminddb )
-	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-	!<perl-core/Pod-Simple-3.170
-	!<virtual/perl-Pod-Simple-3.170
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
-	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# 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."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup 'python3*'
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(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 '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_CARES=$(usex adns)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" test-programs
-	emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-	for dir in "${dirs[@]}"
-	do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	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 qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.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
-	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && 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-3.0.2.ebuild b/net-analyzer/wireshark/wireshark-3.0.2.ebuild
new file mode 100644
index 000000000000..d1c7241896e3
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.0.2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit cmake-utils fcaps flag-o-matic ltprune multilib python-r1 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
+	+udpdump zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libgcrypt:0
+	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	netlink? ( dev-libs/libnl:3 )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+	!<perl-core/Pod-Simple-3.170
+	!<virtual/perl-Pod-Simple-3.170
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# 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."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup 'python3*'
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(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 '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test-programs
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	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 qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && 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() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index dcd1767b0b50..9a88f887b3df 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -26,39 +26,17 @@ AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5c
 DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1fd45ecfcf3cc2bdf7e625d54b0fcfa3690ce5d766e987d320d9ccbf7f430957f532c31f180a0a037334d6eb5b51a SHA512 5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd
 DIST zabbix-2.2.21.tar.gz 15489747 BLAKE2B e00fe140977f0ce995497954a15ff647c813c048a706e536a12010a649d3467d6c63343c3c0d11b1900f91f8fcc5bb235f9e4a030362c93ad3c1c31e68699f54 SHA512 29e3cba0663e7160dce5141cc389959571e5e298206baed26209facab206cc4f66611d48d76306a53925a2096db6f0bed1753435ec1be20bd8db53862cb902a4
 DIST zabbix-2.2.23.tar.gz 15504361 BLAKE2B c0eec293a92564607ed56c570aca30385481cf028fdee2bb51fbb29b40d7a1908a6065a6ee21c019ed6fb9eee294bc8fb58414669ae8e16e50f614a0650e2dbd SHA512 178e193f83dbaaa8aa0a0b87dd621acf7aa24e0d84d0010532b419139ed02e3cf892e4e772362bb855efb5966a64b9da8d3512eb91e759835039dc8c3529ea56
-DIST zabbix-3.0.19.tar.gz 15642128 BLAKE2B b9b84f21371db1eb8efdfb547e2b4a9216e9fb3c76fe54420ab1c76bad5cbf4537f6f0aca720748d39fb2ebf0447c3f82bf9e0d276f9fa4c9e91bc70e8b67f22 SHA512 30239db9236f536325f0ad3a8ea08abd8c460caf60dfd80b881cc9532d2f65d6154e8911be89d141539f7eeced359809405cf1b655eafdab1b940c314c8d3132
-DIST zabbix-3.0.20.tar.gz 15653766 BLAKE2B 4c36611e6fa26f9f5a8e3201eea0f08f3c2945542284be0a823751ad39f51deffc450e1994bc685c6179d7e72bd3dd58e0071071cd02446d6d733cddf8d7f916 SHA512 06832600f31f13781b42083a56b8bca18f6a2034b6641b6809e338e374fa08dabbae6c9d54ee711b3dd2ac5017203fea3e0cbf7f70a1a1da60dda43c7e1af00c
-DIST zabbix-3.0.21.tar.gz 15658030 BLAKE2B 8a943f015ba137c7a161439a31d09bf023bd02bf6ad420c8b02f316adedccf3b23df3775ecea7b27c5b4c893e881f2689cab1c28a4e6c1fe5b79ec08d5d86f43 SHA512 bffe02dac6f009ba8929e0d9ba222ae4bb9da05550f9eaff034fe444ee1c866bd231bb8aa814b7dedc01a5338171b40d461567a7bf619bfccfc523362db579a1
-DIST zabbix-3.0.22.tar.gz 15669417 BLAKE2B bef6a757324e68d61df8d892c94853ae7044cd66442cfaf2356e6f855af5d177b583aceaed14c31beb0c82e4134d089bfd7c4847c68e2c739f4e9e09a6cfb278 SHA512 fba82d22560c2aa1025b7d89a6ef50a02bda4c7f2408572f1b9624e8a703a798bf3188f9e8def261e564b8e74e63d4a5973e50f93d49058429d51b9699d110a8
 DIST zabbix-3.0.26.tar.gz 14724426 BLAKE2B d887f0dd77cf051e2b6ae16221c02c20aa3a7b8bee07eaff5a0837eb25962a4d0b42a9adace4d68d5e141fcd89a0896e3e2f64b6af5e28b2e63109a89791ced3 SHA512 de3ebee12a4be3b81d64fd0ce718866d55c9696da97f54c546c882f0e70656066c825c9383caf80fdf5ea6a6ac4801cb8ae88c1a83d9be051935111a72e31917
 DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76 SHA512 a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e
-DIST zabbix-3.4.10.tar.gz 17300622 BLAKE2B 1b4c275d271ae4d4607400cb6e5f955ba624bf19cd116728e7a71a1b4adc0fbbde8cf91e6b0a71c5d48bf5c38b2ebe0db79f00ba3a42cc4213a0e310d56d5e29 SHA512 25e85cbe7a93a088fa0132ed6f3f75ad1aadedb839d745be38e180f0f9b858e32045b9d057b10cab4d3a8aa770b22b631aa0894fe5f1c3ca4ca62a000934bf94
-DIST zabbix-3.4.11.tar.gz 17517171 BLAKE2B 72f7d1cad3e8cb7972cb9c3698d35f70c45de1244c14a87f403a0c2c9b1825d679fa32e54dc4b2aae80a24acb7723ce489e0d409fb027c1afc8bb4eccecf9867 SHA512 1360e1de02fbbda30539e0f1dbe9d4aee57bc693f597db011cdefe7e7c4acaa6e3452813ee29e0e614794336e7fc9210ff3458f3761fcec90db66fb4a2275373
-DIST zabbix-3.4.12.tar.gz 17509251 BLAKE2B 158c7b3061059cc54a5988296404ed6670ca872fa8fa55f8de9708871ee03f163d0365420e23ef5df89a0a85e2f23d607952cf4fc02c974037555534ca164f08 SHA512 6707ff5a15d2c139775b4b5de32ceb4982c90aa4023af310ab9cb849895387984d32f59b7dc9fbaff8f317a630238437e4651ab8272b4535fb5fc3d88750e3ef
-DIST zabbix-3.4.13.tar.gz 17507365 BLAKE2B a5d1fa1a48df2ad66b844c2c85038a088ea5f7e3e67c2c3ab5f5d1ad695b3a31664d317e6a1cbf64d1f6a211304f50e5c38f5d973d4607f2caa202e1184420cf SHA512 4edcf6d9df0f100c639efa6bc18e67ed59819e719a2226593fd81212d4c2e46a19cb50501cca005246b4c01c4082a18e21c9049a99ac9df263180a3c24fa52f0
-DIST zabbix-3.4.14.tar.gz 17476022 BLAKE2B 9fccdf69bb74379fccfe044d68da8ce458e04c4686ae70a2fed5523309196b13fb022daa00d47ae9eb97a0774942efd766858dfe94890e20f38808ef2a3e3d15 SHA512 597ae107c16578ec2b1a364f2b61a7a7423a1cf39d3b04289e2f91dc0f931e796b566cbd451b14e026c35302120b647d6d574952a453189b066fb06081f9bb83
 DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a SHA512 d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f
-DIST zabbix-4.0.3.tar.gz 18019170 BLAKE2B 0b36ece98ec68ce48c7f38c167c81c4622e454f5626396fdea67092506bcea120c8cc8fd408e2dd4671db44a4c5c0760aa5aba78204d4ad7d124f7d3e62faf35 SHA512 ee8feec85a01c7617d3420529afa59550982c3c51173f8de484a8833099d33cccb84fa4e82f7199bc0ed8af687eb206ae50e4853b824bfbe784f67964cc15e37
-DIST zabbix-4.0.4.tar.gz 18045463 BLAKE2B b236bfc4c98aece3efa9af855055fffe8ddb032dc9dbc47564af120914c8cd373a258e1db890fa51581975628bd065fb7c41295d3291460b77575c9d1958cb37 SHA512 cf07c6dc3ea4b3722790d6db9219b81be7cb06cc11925a335b38bc3a7ad3fc395b45f6ba77edaf41eed545796ed2979c7b2f3b11b67fa6f39b76b58320642adb
-DIST zabbix-4.0.5.tar.gz 17098529 BLAKE2B 0148f1087890a5321acf3cd9fdc45ae0f0bc6f8682645799df0e822f4b81e18625d95689b067300c28832c178e3863691dfb3b26ea747db64b0aeeb4e52326c5 SHA512 65794a37b1abd899af2709812a3ce2671e35a6bd9b4751097c6e373736f68ecb3af8c25d6c7f63c2cd8787fe9278e5d70f30d84133bf78d4c742fdf52560957d
 DIST zabbix-4.0.6.tar.gz 17162202 BLAKE2B 8f03830d5493719cbabd770527dfc99e1bd2d80a3eaeb691e07cd7d8bfe587317ee045ed13a297494539d3cc2e3a26bafe29cd6eb6126c7fe74ee5de44e98b39 SHA512 43b7ccadfaebc34098a827ef7e27c2c637d4bb74db4d06cdaee7650171b7b5e14787a473a66b638a252c1342e841b546e089bd762de703e99e0a34b0549393ca
+DIST zabbix-4.0.7.tar.gz 17175571 BLAKE2B 3173881e093c58175e014d55c74d09656dbb6e99321f808a3ce6fe61aef56325aa94c4a3ff0b1edd2872734cc970052c63e5db377f8e8d605bf25f2eb8505802 SHA512 67373383ef961426901d8c27e1e51c902d8580b9af1877d4012c934f0ee52c5cf85e3f81fd16b244cd9c8e869cf13dbdd7597d8e2591356efc61570b354961f8
 EBUILD zabbix-2.2.16.ebuild 9436 BLAKE2B 3d7e32e772074500827d0bd469e280f77a4f7319ada11d1556bfa3148d0a25e6b00b84d604ac0cca436d375cabfe9cb145c5e51902c8293668135396d1dfc160 SHA512 c244b2dcff1fc7a1e7dc82c254eef974a4153f3f4bdf1b202d50e3006de3e0237d4dcc587ee66ffcbc16bb39ee4ad29a4dfe283332a3593aba2585f5c970d563
 EBUILD zabbix-2.2.21.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
 EBUILD zabbix-2.2.23.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
-EBUILD zabbix-3.0.19.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
-EBUILD zabbix-3.0.20.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
-EBUILD zabbix-3.0.21.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
-EBUILD zabbix-3.0.22.ebuild 9275 BLAKE2B 16b444212a63836beacde9b5e20c0e81c00a316d83341e905c68e3ba553b7acaa1da7d5143991211cd2cf9bc1dd4c9b56dc07282d39597f2bb47841fb0397e08 SHA512 1a554929bb14c9c7279646fcc77d7584d731d57e2395641c944cb787bfe7627dffdb32f874d0d86045c9c9620b7f1f881aa5c30f544d2cb7c387356c7deb6ac3
 EBUILD zabbix-3.0.26.ebuild 9275 BLAKE2B 072b2fde37e9b098ab6767249a8967d558bf561f72e11f55497f9db47d0810cdd751bf3a9d36a5135ca94c2a0dfb88ce21caf31a95180e06a6d6acb5d76acdea SHA512 f30893b5c51596ea6db4bdd19e0a647cb03a6e9f527a70579c8378495250cb63bc056e0807c2be9f39dbceb4cb5f228dc51135e3f9e96cf4d4e2c14df1b00374
 EBUILD zabbix-3.2.11.ebuild 9265 BLAKE2B 489884d6ce42e154f3c7c0a9b1f2e0143b9fdd38a1778b13dd8be48d0e4ba1e6645934fcb495dd08a19a22f23201270c2ef79d3d2885316b2eebae142a4bb04a SHA512 f2fd5f8759e9625a798edad0b00868c27f961cb2d3327855cde7e53e46f4950b269bdc95f280d79d89a95291cf92288a6e163fd72562a889f900ddf519a9e44e
-EBUILD zabbix-3.4.10.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
-EBUILD zabbix-3.4.11.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
-EBUILD zabbix-3.4.12.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
-EBUILD zabbix-3.4.13.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
-EBUILD zabbix-3.4.14.ebuild 9253 BLAKE2B f381475686894409266e9c642872a728306a89ea472b337709ca45683be504e9ae2822f9d105c256630113f6c874595d130204ca512b6ecd93126fb4926447ef SHA512 d4929f2687c5c0a58ceb7a8a98fed706a62a5a717ba7892d85058b7e1e827095245b022a523daf0d3f53727f42b4ff83c693c1a2195eb3656d589bede632db4d
 EBUILD zabbix-3.4.15.ebuild 9253 BLAKE2B f381475686894409266e9c642872a728306a89ea472b337709ca45683be504e9ae2822f9d105c256630113f6c874595d130204ca512b6ecd93126fb4926447ef SHA512 d4929f2687c5c0a58ceb7a8a98fed706a62a5a717ba7892d85058b7e1e827095245b022a523daf0d3f53727f42b4ff83c693c1a2195eb3656d589bede632db4d
-EBUILD zabbix-4.0.3.ebuild 9396 BLAKE2B 12297f3d67b753be1e8986439c2e6214076a415a7071b7b94804235b2cb40cf4500db1ebf37d0116368d157f5d20a5b0eb61051368fb2b37971d7e1477e0c1b8 SHA512 e6a8aa0df4d4b5a8feb8b00a74fa54704e115e033ed22c886dd042b775923865193bbd819c9c0aa856cbac274fdc8184e30a21c9636584e3d36777dad3f72b59
-EBUILD zabbix-4.0.4.ebuild 9396 BLAKE2B a3ca03f0aff4ea8d3620fd488520d2d4d1f5943098d8de2eaa92e990504f4aaf84f58af552e53227c666e82b86d965931dec60f840715282c6798453737e6c0e SHA512 42bf1561ef422e5500901fb9a3692e82d519385a7fad625f41ce8811eaae3187e45fd24f32df4b280f4f66c251ac88ff23d80fb649cf33e2412fd7429d5976af
-EBUILD zabbix-4.0.5.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
 EBUILD zabbix-4.0.6.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
+EBUILD zabbix-4.0.7.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-3.0.19.ebuild b/net-analyzer/zabbix/zabbix-3.0.19.ebuild
deleted file mode 100644
index c3575d4f121b..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.19.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# 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="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://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.20.ebuild b/net-analyzer/zabbix/zabbix-3.0.20.ebuild
deleted file mode 100644
index c3575d4f121b..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.20.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# 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="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://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.21.ebuild b/net-analyzer/zabbix/zabbix-3.0.21.ebuild
deleted file mode 100644
index c3575d4f121b..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.21.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# 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="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://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.22.ebuild b/net-analyzer/zabbix/zabbix-3.0.22.ebuild
deleted file mode 100644
index bacf8eaf4260..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.22.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://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.4.10.ebuild b/net-analyzer/zabbix/zabbix-3.4.10.ebuild
deleted file mode 100644
index 94b8bc3cdfff..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.10.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# 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="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://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.11.ebuild b/net-analyzer/zabbix/zabbix-3.4.11.ebuild
deleted file mode 100644
index 94b8bc3cdfff..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.11.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# 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="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://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.12.ebuild b/net-analyzer/zabbix/zabbix-3.4.12.ebuild
deleted file mode 100644
index 94b8bc3cdfff..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.12.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# 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="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://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.13.ebuild b/net-analyzer/zabbix/zabbix-3.4.13.ebuild
deleted file mode 100644
index 94b8bc3cdfff..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.13.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# 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="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://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.14.ebuild b/net-analyzer/zabbix/zabbix-3.4.14.ebuild
deleted file mode 100644
index dd57544e3c45..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.14.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://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-4.0.3.ebuild b/net-analyzer/zabbix/zabbix-4.0.3.ebuild
deleted file mode 100644
index 0ed8678d8d94..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.3.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS=""
-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-8.1:* )
-	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 )
-	server? ( sys-libs/zlib )
-	proxy?  ( sys-libs/zlib )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config
-		dev-libs/libpcre
-		dev-libs/libevent )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.4.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-8.1:*[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() {
-	eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
-	eapply_user
-}
-
-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-4.0.4.ebuild b/net-analyzer/zabbix/zabbix-4.0.4.ebuild
deleted file mode 100644
index 6f3e1a578796..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.4.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS=""
-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-8.1:* )
-	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 )
-	server? ( sys-libs/zlib )
-	proxy?  ( sys-libs/zlib )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config
-		dev-libs/libpcre
-		dev-libs/libevent )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.4.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-8.1:*[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() {
-	eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
-	eapply_user
-}
-
-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-4.0.5.ebuild b/net-analyzer/zabbix/zabbix-4.0.7.ebuild
index cab89e4b3b1e..cab89e4b3b1e 100644
--- a/net-analyzer/zabbix/zabbix-4.0.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.7.ebuild
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index c5b2e2701992..78a8ccae905e 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp-scripts/Manifest b/net-dialup/ppp-scripts/Manifest
index 6a7907c31485..055f57463ada 100644
--- a/net-dialup/ppp-scripts/Manifest
+++ b/net-dialup/ppp-scripts/Manifest
@@ -1,3 +1,3 @@
 DIST ppp-scripts-0.tar.xz 1824 BLAKE2B dc2fe1fa860ec9abe43466a270324f8ac39f08a8ed35f2dbd971a59a2e07a939049624802ae8b8c5a4bf11544c871d27517976f61486c4cdbad75f162a502c59 SHA512 a36e6180b0acc8081b192602a2a5dbe765f1ba26e2cca8dc80d1dbc0e405b86acd6fe0cf655fb520c9f45373528773e64545876fd3370ce3514ffd9858916971
-EBUILD ppp-scripts-0.ebuild 645 BLAKE2B b815ad06ea13d481f4155ec62730861e2eb7287a451222e378b4e9cd39fcfb14c61b2b16fd3a267da2cd2f70f35375e5259ac7f07eafb840cbf4194997225bef SHA512 564f65389b8dd4c80edc8de7f9bb6411abb1063a560f2a8b1289f2b7ac59f73dd3588d1ae6a85b3cac87617b652bc4eef04db1d9ae26822522154627e9aa0544
+EBUILD ppp-scripts-0.ebuild 644 BLAKE2B 44df5ff971dad46fc112b5d5dc6ff9a5bb6f86beb3b24f4d6055c39c54a761e7084cf9d35f5749de6a3cc02bfeab4af0e912b338a46140ccf31cdabb6cebbf1c SHA512 6f44ef40c4687a342e1e8a20f19d3f37bcfdf9f023b2c99d0106f332a51e5f5977f3eff33e2c4fb58e29c65f620f1ff2d9dc528655306309807d5d5b14dfda08
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
index c751fbd13525..99a75a548072 100644
--- a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
+++ b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 
 DEPEND="!<net-dialup/ppp-2.4.7-r1"
 RDEPEND="${DEPEND}"
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 25dfcfa2c8f4..a45ff29cda35 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -3,5 +3,5 @@ AUX modules.ppp 299 BLAKE2B d5c0dcf135dd0a33288f27c95133d4dc980b84dc62bf8eca5b35
 DIST ppp-2.4.7-patches-7.tar.xz 40540 BLAKE2B 353814692aab3012f5d5ccdecc514d69357826ea7abe64a7581c562f333d868f9766f11516721cf0b116b4c1c8b01daee306d98ef7be356af6e8d16e22fc9fac SHA512 9d34c044ded09424a6d80047e88bb21130a9c2414c9ea4f52c7299d9db08b1391543b50cd97c0c8763e6943591fc325d01932b31966a1374dbfe5e977bbf4356
 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-r7.ebuild 7075 BLAKE2B d03ac9782aa5b0ba463e0cc1859d6327c0f59c9b1e6cc50af945bfc1c2883db56fd8064c8609dd0ac4ff1df7a0f34af31596ec77fd5616d4ddac1c76adc58b86 SHA512 0243f0ac5b086980d484eefa77a99575073a7970ac78cf944dd785fe3f47f4cd5061d8cf3edb98de56b67051f88dccba1227422adee3ef888347fed82cfb94c6
+EBUILD ppp-2.4.7-r7.ebuild 7074 BLAKE2B 39abd188047166eca6b2ddf0c3c87ccb98ac84db1d0bc84cf7e3c968023d9476937934f94ff947e212cb2487683a53c6a82659d4343dd69829f7bb31b786fffa SHA512 91c1a2a121b877e2a6f0c9e70a4d5c7dbe743f39b7990e0765030f9e162605fe1a19d1eddf28d12c93b20c267d8587cf1d85c28ba1c2dcf78d5d6a3e0cce414b
 MISC metadata.xml 1470 BLAKE2B 8e70c742a13d352ff2b16946c6d063cda061e4710e340227d907ca599938b0466f86258d67836eeed6ed189e546ec463703dc0b1e44c1c9a9409c0ef1b74b5ed SHA512 2b00f6c0b4f3079eb885327188e12d151ec3d9682df9a71232b331524d9d3430af5fe342ca4198d926c012059786ec6a7e91fffeec899069a990e032b94b94c4
diff --git a/net-dialup/ppp/ppp-2.4.7-r7.ebuild b/net-dialup/ppp/ppp-2.4.7-r7.ebuild
index 8b88365fe123..0139d679188f 100644
--- a/net-dialup/ppp/ppp-2.4.7-r7.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="
diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
index d04b2f591531..71051330c248 100644
--- a/net-dialup/pptpclient/Manifest
+++ b/net-dialup/pptpclient/Manifest
@@ -2,5 +2,5 @@ AUX pptp_fe.pl 8097 BLAKE2B e479f4f13babd5e467be758b88545653fe3200d5bea4ad0cc008
 AUX xpptp_fe.pl 5620 BLAKE2B 682623fe03b8d9e90f4e86837b850dd57a2a1b960e9f0554d65cac4e0e5351718e8f9b4d56ae4c3be81d666a8be1b1cb9bd2ee07d3f48a1fa776665b5e11c62a SHA512 fa6d31c9b9ae319ea3cbbba389664f04c6fff8d2d17a826870ebca236e04df4ca51cb2cd60961a2cd78ee3c99af2738c4bf87edaf49032dd3ec1dbe5d3632833
 DIST pptp-1.10.0.tar.gz 87007 BLAKE2B aeb8bff0025c5144678db2ee79ecd80ec3c7261640ed94596a3599c163763cbf17b50c37591fd8b39d0687db5dff9b4c14d1aa303d95b9fcaf4eb53602cf321b SHA512 d2b925fb9cb5dbc4da576dce0cfae62f466576ae5b5ed7d6edeaec9be16ab6e0d17c307df43ebdc06138f1269ef61ba8910462a4629b6262c452e8287cabe41c
 DIST pptp-command-20130515.bz2 7269 BLAKE2B dda3f517cf747e025dee1967841d40e58461384415161ef01bcc96c6568c5ccfb1af5254f26276164c43c41b668bf2646e5138985531d54f13ab2fedd410fab2 SHA512 3b0ad28c5f7bf4f674ba8742e8a3be50cb62521f767142a1a1e74263707bc860126b7238a4aea307366a71100a193d18f3ec7599f4c0c52cd259f8b1d6b429bf
-EBUILD pptpclient-1.10.0.ebuild 1137 BLAKE2B b7ed439f14fb609ba5f002779e5dd308bb3aaa2c25febc79c65fd056dee6a87ec42c5e15a64fccb6b954ee3d25d3faae2197b09b90fbe137581115b85f9b5b1c SHA512 bbc5ceb25686ae23c5a0e11ec2742dda1a7ce72857edbb8aa0c01e20fee85b8293c0e8e0f3596a370aa75c2a8d394543128fb6ac5fe3b51ff8c39e62f74a22f0
+EBUILD pptpclient-1.10.0.ebuild 1136 BLAKE2B f84d30990317436d80132035cf8ff3c969029e3ff564faa336792257dfb41bce25753598f159c3051afdda9126a38a067ef2834dd333b5db314ecc7c22848f15 SHA512 1b1c5b0668a0148a779675edb77317d4a4e928feb67a6a9b82976527d3b9a0d0fc56af7e94d22ef26271ac5e0cef1a669ccaac64694967755c8d751372cdf8bb
 MISC metadata.xml 378 BLAKE2B 224be6ab2aa2334074dce847a6527f713f1c82f797862e58bb5ed972a4c1f464a53b67a28ea10635fd949a5aa927a9419f85163172f26376001c85e4784cb894 SHA512 7a4b7cfeecee2503bcf7171f7a66edc27962a6f461695dfad358421be6c1bfc794e438d9136448278b11a4fd0761df03132d8ee66b7e43f7b407c0a5bad09ea7
diff --git a/net-dialup/pptpclient/pptpclient-1.10.0.ebuild b/net-dialup/pptpclient/pptpclient-1.10.0.ebuild
index bf607214603e..02d037d298aa 100644
--- a/net-dialup/pptpclient/pptpclient-1.10.0.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm arm64 ppc ppc64 x86"
 IUSE="tk"
 
 DEPEND="net-dialup/ppp
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 8a2a6af33b0a..19531d632bc3 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -6,7 +6,7 @@ DIST xl2tpd-1.3.10.tar.gz 510777 BLAKE2B 15ec09a6186d20facd4eceeca87a33a4676644a
 DIST xl2tpd-1.3.11.tar.gz 510652 BLAKE2B c120ba0a2bb96a87334743319808e4a1dfb1b95140fc37df51c33e176bdefdac547ad27d38731bab9d94a939b9a3ca93404ef17c8076e16567a3ecc5b568fb47 SHA512 9fd478aa6b7e22867aa977aa0c22ba9d856e3b659aa0ffdcdb17aa0d8358cceab37da565eeb799590d65fc2914720715423e006f6bbe7ca742f09d7cced52cb7
 DIST xl2tpd-1.3.12.tar.gz 513173 BLAKE2B a1f2e4d0e1af4402679eeec6589ca17b0422c664d37beae628511f988f6508ca22160d4657f8ff84bc5e5aac4d3e837c501b4d307964530044a792f2ecc599ab SHA512 e18f15ba038cd358fbad9dd7284c5f3c34273d9291bf8c66494c46d78150acfc1666cbf935fb5a66bd1f0220014f0b49fa0f7f55cb42de125e4123112c6eb00b
 DIST xl2tpd-1.3.13.tar.gz 513958 BLAKE2B 66c2bcbb54191445f1a519d507b2ec67b48d9e994db09b8c6fc9980b03bf5aab09a2f6187170f0e8639bd8a323b8417bf6e5d0a80fd9e45f8adc310902b256ae SHA512 02e3502a75f41745c001fe1a34dd9900c3a77eea274e08f9361f7145ac24e9a663975efe85ef6aef7c6da1aa9f3369eeb5542ac26e90b9d59753158a17b69ee4
-EBUILD xl2tpd-1.3.10.ebuild 1425 BLAKE2B bc0818635d0bb8afcdd156627b8aa9d17a4f994218f3b99d79b42145267ce41034000bea0d939ec434a69883b18644109d14d8a269278c9990cf237d063c8459 SHA512 1eefffdad13cbd8c20f44d07795ce5fa91992c4b742a4888aff3c91e1ec4bb5c956da7a064b9d7f741b64a4d50b1faa797f235d9f039dc998c59212d29be15f1
+EBUILD xl2tpd-1.3.10.ebuild 1421 BLAKE2B 7a913a770cc5feed9b201f6bc7d54402fd246fec6c280c5a8a8c64da7aef9fe1cc66b5d2933820c8d57265e1989d5aaeef3f72c73200769918572ff9fe3dff5d SHA512 c2c4bd328767e082aa8e20c9274a3070f5c121bf0723bcb740c04aacc41825f6785f393904e751f1f820a60d3b541518fba30eb63f228b18d7cf4d919be69601
 EBUILD xl2tpd-1.3.11.ebuild 1428 BLAKE2B 58651df441e16d91d8581a802392328a15350101f2d866b2c31205054779648fd1372520200140392e9078b2e32d0b1b2f061d5c71b1046369e772220ed6734f SHA512 9cee0c5c5b4d36ef43f65347ddcf1b8f6dc7d317f1f300fea2b6634f23ae656ba535674ba3b186bb725adf73f64bdf251e53a03b7c02b8235e99d87392fdb8ae
 EBUILD xl2tpd-1.3.12.ebuild 1004 BLAKE2B a796ad76184d12a65580ae78f74d7d9b1441218575e9ba0251f12c3a455d3a08a842788d3ab5a1ea8b3bbd0f31f844ef3d5bd9b1d3caf58752102b5dbfb9dc3d SHA512 f71ebce1cbb0c62164433a1a17685d1c38c5b359b49bec046e10c9fbb9d4eff0b2878f2aae0fa1630b9126ddb7bf5888beb5ddf78bfc764b7116f75743239ea4
 EBUILD xl2tpd-1.3.13.ebuild 1085 BLAKE2B 59ac457947ab22c55f14f184e48aca4bf1b3f6c17dbfb40819b6c36e4bcb3084247297fa0f1b6266f0fcedcf884596b5dc6e28253129477e4508ff472108115e SHA512 3929d200e1d714c50bfa712c68544e46270b5e9485ee531fd9c74d1ec2535fe20112ef2dc8379b0781d3fbf2e0054c0029e36ec69246c6e80515e1f53191bb31
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
index 700d95b0f6b9..dce7282294d9 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ppc64 x86"
 IUSE="dnsretry"
 
 DEPEND="
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index bb7efc477510..7e9c6c110b45 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 1a0fae781063..a1871271f017 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,3 +1,3 @@
 DIST bind-9.12.3_p4.tar.gz 8627833 BLAKE2B f7f8b88d8179f2df92b3105a49f30f7de5ccfe78a4a51f6bfa08e732968bf8e4c35f298c4209d8d05bea4d71b8669fd360d4c17193574eda471ba4d7ad742092 SHA512 42c41f47a0282dc08ee875fe098ce84b26384dba5efbaf99b557d34c4271e0d6aac70126f280a3ee157e8604cce16901c8cd51fab791dec82f4a3d00c054f363
-EBUILD bind-tools-9.12.3_p4.ebuild 3565 BLAKE2B 6705009bb3e2c1c343197efc109db21119064b562f3d7dd7257e5c8ccfd92c23c5773b14cea710f9bae512b7d3d65907742516af58908ff7b9ae4e3c92f305c3 SHA512 3ba3f607ac4f951f3d62af9e1736e033fc2d93c672e95331ca17256d602741a020ba971d271fd7c8aa7c5fdf9386f534b48c9459f921d971db20abec797bb988
+EBUILD bind-tools-9.12.3_p4.ebuild 3564 BLAKE2B 3a6232d97229208746fbb33c2b9c6371a7ce915d495a759bdaed498691d21dd94a39e241ccac308270ace1ad4145c55199b81efd8cb43be91bd6e75d3f1b335c SHA512 7693dc80b416aa7c790f48f8b308a521298ffe9e4486adb78d0cdb0767e17b6d6878d610ff2470eb8562da2429511b42f256dbe823b95190ce65dce42a0a4926
 MISC metadata.xml 640 BLAKE2B e563c600c07069fbcf6b9c6a650c4ea47004973757ee685ef12d88c012d70dc2d50831f238aa0ce557531dc91fe8dbb606e526a3b3a72d56725024d76329bcf7 SHA512 e87aa31e416bf3051f213c22b744262a6f4700254a42ab684da2a99eb2b9efb848ccbd2ec747f7c9f309556e6ba5426edaaf3a877cc620758cbde0b40d8c6b37
diff --git a/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild b/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
index d32063eaa873..29540d5b0f5d 100644
--- a/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 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"
+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 libedit libidn2 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/dnrd/Manifest b/net-dns/dnrd/Manifest
index 02376f82c4e7..bef3ef9c0eb1 100644
--- a/net-dns/dnrd/Manifest
+++ b/net-dns/dnrd/Manifest
@@ -3,4 +3,4 @@ AUX dnrd-2.20.3-docdir.patch 719 BLAKE2B 45cf21aaf65ef35c7de3ffd12398d6962fed28a
 AUX dnrd.conf 250 BLAKE2B a9334bdd7ed06152068e22d72c7fbb5c4de97fa888e0b0cde6a6517c8d29e47e9727c0bfdb732156b77e7f825413d31c808565c5a65103d90828ba04bbc3ee92 SHA512 461bbebba321b5216a15ea9550342ca9f7374af6446c2f515a3f5ce35bf45480c8f684b60ce8c206ec017e7ca060d4588c0d2da026d2e99162f3f9a6e58f03d2
 DIST dnrd-2.20.3.tar.gz 161887 BLAKE2B e04941fe59a8835386d398aa4a76bb0b2562705f98994b1d9d6c57557499de49a084dd2c3bab4c25499c81267fb336bac7a2b27dd8efd77164bf8d5409b2c94c SHA512 a526ec9c2f82ac36fa7beaf864ab39c56e5956530b10115ad2ca2f79ecb820fe865d9da9edd1dea5f4cb97508afbec88f0606b03f87baba25561c097e7c0ea9b
 EBUILD dnrd-2.20.3-r2.ebuild 594 BLAKE2B 066fef67266ca9b4e765a13d42341f8ff74463cb2e17479224c9713407a1619c501ce22b62520cbd0bbfb0249ac623993876d89bfd102df05522fb0d6e1651f8 SHA512 3f9299d991e4e4b9de04fe08e756d54359c5d81910cfe858fc9e2aef120e2b3ca8357a0b442972ce68c333609a0a8e670c2232eac4cfbbf115d903808b37aeef
-MISC metadata.xml 657 BLAKE2B 2a27a4416cbee6eb65e220f99fc847fd2bedca655740ffbaf8fae61eb3986472b69f7ba89eca393049cc57ce94e38ca3b69bc8024f2aa344a50a816d4220f466 SHA512 1b241e4719fde34ca85e146e21906a0b82aaacd5e71cdd215365e32bb005d2166f39f90eab12bdcd574d9387175a5870af6d24a676a108470c30e096ff9f53f8
+MISC metadata.xml 455 BLAKE2B 4f423f5ea5c92a093b5c09d7cf9ce5f4b380ac58911f236ca89655104a24c01c298aa19d389009c5c04532bf3320dea75b155a38237cd41113eef75e41a0b7a6 SHA512 74e9f0700866a28065395947e4b37f2f06d68a1ff2886bb2574cc164d94f2104ca37f4d029f28032164d7f29c7b59d9b228456a0ac55a2382fd37c2affa69723
diff --git a/net-dns/dnrd/metadata.xml b/net-dns/dnrd/metadata.xml
index 349a9bf300f0..584bfbc30142 100644
--- a/net-dns/dnrd/metadata.xml
+++ b/net-dns/dnrd/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>natanael.copa@gmail.com</email>
-		<name>Natanael Copa</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 Domain Name Relay Daemon is a caching, forwarding DNS proxy server. Most useful on vpn or dialup firewalls but it is also a nice DNS cache for minor networks and workstations.
 </longdescription>
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 664e515d7273..c92185005d21 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -6,5 +6,5 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
 DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
 DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
 EBUILD dnsmasq-2.79.ebuild 4594 BLAKE2B 28cf745cd261bf067114adc98733f5e00a2f6a10a906d4eaf2175c0457d538d7d96b91fe87a87320c3df27a5c64234ed7d5bbee993070964fa421b8e5b12693c SHA512 eb8ac4fdf747657983909b22baa2e0af5f2299d2a5ab4d97933b185e528cddbb1d4cc7ca14c2efddcd8c6f4ec9861f3c37d9fc59c96b68f55c45a274acf7eff7
-EBUILD dnsmasq-2.80.ebuild 4743 BLAKE2B bb50234f08188339f68592a7e94acd3232adb130e73f7c50bfddc4d502247657a7a3ca356fe255dccfec1d95844b6085bf224803f501c7f0ee7fc80f93eb87e6 SHA512 8fb983c7cb709385b8e492d95f7101e8cb794c92f624e5a4548f7932f2db16f8fc356b68791c59aa2fe90193c01f618bc4902fe0e973c766b8b86aa4031c1458
+EBUILD dnsmasq-2.80.ebuild 4742 BLAKE2B 4844bb2c2fed9d35ee6358bedf86c9fac3feacedc965628b53687bc22ac672f2a5a7eef90f112a0a1446fb99ce79c7233d2178b5bf7773e8fad23dc2a1557f2b SHA512 a278d6e216bde4d31671481eb7d9ec302789854119229c0852a1204b7b059213ca19ed48b99afe75221e39494c358f537d56a6da1e5275ef563844ff4083e49e
 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.80.ebuild b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
index e1d9a3e3aa28..1e8a6dddf189 100644
--- a/net-dns/dnsmasq/dnsmasq-2.80.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
@@ -12,7 +12,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 ~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 +dumpfile id idn libidn2"
 IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 40abe73464bf..504ad3a77dbf 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,3 +1,3 @@
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
-EBUILD ldns-utils-1.7.0-r1.ebuild 1192 BLAKE2B 6a8d02048c735ca3853cbd5456202e10802652b619e63c31b549b6fc5ec34d7146415ffd3a615620f4b8f9a4df60fd4a5d0e40940af74d7fb93b39a48b955784 SHA512 f9eb08a53bb37e225312ee5f4c13c036f7522a77bdfdc368d8bc99165048ab9ee00dce4d3a4b263b69e2f52d5f88caa6eeb683e348bd3a1d2a2c496d13b8a75a
+EBUILD ldns-utils-1.7.0-r1.ebuild 1196 BLAKE2B 3743024ce280c8a1fd29b37f87333fd87d578cec89498be2b4cd8870f88f57081575c7236c883c95ed908bd5dd7b70ceda7311a6a660f3e2048b05ac1d97e353 SHA512 1305efbed428c05b10ec75e84ddf9dceb6d9087e87e3d1a1ae8b560a98db30b03366c005207135f3506d0fc40892fae4a8046f6b3a78367c490a8cae9940a06d
 MISC metadata.xml 742 BLAKE2B 78bcba18e70bea755bab35347639a1a529961e91b709b789c045db918525939e9fdb4a7adb6dd7801c64bd02090503d5b3edbe444fbf34615ec3ebb5342d2288 SHA512 a0c0fc0a7dd05890fa9b2d6bf99c5b96990d76993d27d18a382ab69e1200aa5f472865c5de928575d773f70ef21314519bc46a1d2a138da34d569bf56a7d8748
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
index 9fe878c5d5bc..9d5a0611c2f2 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="+dane ecdsa examples gost ssl"
 
 REQUIRED_USE="
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 761c9dfdf019..9f4e0d1ad0a2 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,5 +1,7 @@
 DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
+DIST libidn2-2.2.0.tar.gz 2110743 BLAKE2B 08a1f89d4b6edd7da4d91c9d21f9944c1ebb4064cb43147ac23fcd79f0a0bbd94e7d2b9a72382784f4aaca211cf9502a5117dfa63ab5fe72383188eeae6f628b SHA512 ccf56056a378d49a28ff67a2a23cd3d32ce51f86a78f84839b98dad709a1d0d03ac8d7c1496f0e4d3536bca00e3d09d34d76a37317b2ce87e3aa66bdf4e877b8
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
 EBUILD libidn2-2.1.1a-r1.ebuild 1319 BLAKE2B 15d25cfc11f73533d94bdd40c20bb3bcf313c7b79e3a2750b12af32f712b0156469b4a1198ab3f8653246ef19e1ebccb29a3b8f0bbf04d2ed0a4261b3497cb91 SHA512 a5c09aa232d92230a4ed703c8ca022b387fd2c2e9afd287f0bfa69912c97210fc79da5876b520d573dd7983604967e89a62911ebbc82d3462bde4736f0bb2b7d
+EBUILD libidn2-2.2.0.ebuild 1332 BLAKE2B 9ebf852e6f4af2212e70e779990586d1632483b204dd84c34f0773f19fbc76462fe6023fd7799431c2efb1dcb9c8254fdc658af5c8e52aed31faa324cddf883b SHA512 83050754150dfebea699555702da010a58c3e89f7287e9bc22c88f458b7a9d81b81e0db18dd95aff7f4aa84e7f503b5cac4453981fc540fec79e0b53d631b24f
 EBUILD libidn2-99999.ebuild 1416 BLAKE2B ea56153f0eb2ca68fcd2fd170e2cfeedc8399a3bf5ba78d8bc78250ebbd59dd05e4074dee3bb4d3caf67b4c3391de331a495423d0f0cdc16c953fd4fa75ea278 SHA512 66f96b4e87d01dbb779d29ab83cfe6c1e756dcbc5db1555ca9128f0faa7888156c45e71befb2daa45c86aa77afeb9bdd6551b6336b955f57fb4179d1b2c6e512
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/net-dns/libidn2/libidn2-2.2.0.ebuild b/net-dns/libidn2/libidn2-2.2.0.ebuild
new file mode 100644
index 000000000000..17c2e6485f02
--- /dev/null
+++ b/net-dns/libidn2/libidn2-2.2.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
+SRC_URI="
+	mirror://gnu/libidn/${P}.tar.gz
+"
+
+LICENSE="GPL-2+ LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/libunistring[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/help2man
+"
+S=${WORKDIR}/${P/a/}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
+		# reason in the Makefile)
+		sed -i -e '/^TMPDIR = /d' Makefile.in || die
+		export TMPDIR="${T}"
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-doc \
+		--disable-gcc-warnings \
+		--disable-gtk-doc \
+		--disable-silent-rules
+}
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index a116bb15554f..b1b03e6c0464 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,3 +1,3 @@
 DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
-EBUILD openresolv-3.9.0.ebuild 1080 BLAKE2B 0c62aff8e54eb913dd446eb149e4e65c9bda8b15bcccdc990a0698969f40d1ebcfc4c2266542b2f08abea56aa0a4e7bf5f2b1f41bf41b6971c4f12e9bb05e791 SHA512 ace9feadc6d28c8fe083160602b33196afb41e1f37777bb2bcef65060d8005bc1224ad772cf56a05913e2a6f6f158c85485ea91053c0c09f9ea23b87fedaf2c6
+EBUILD openresolv-3.9.0.ebuild 1076 BLAKE2B 8b2a74f45af82e138fe7c32df4db16ac568aca964f8bdbf46b8e76da008df2892fa8bca0aca4eeaf34076860bf989d30e08822fd5c56f73a97f72f8c92ffb80e SHA512 38048c5c4fe0db31a4d88c06c7e1e8f2dd766dafaaa37ef6a2b2e08ab71054d1057d5a0d00e97b76e9fe995178d3e089ed3a0cffe8b7ad8142416daeee88dc7e
 MISC metadata.xml 309 BLAKE2B 8abae227455bf1e75801e0dcf3b4165beedefc1499e12049e9eb6652302925a11b2b50ea09d417ed523e00103c5f2d7c619669d40bf3c98a7393b939bbb8a05c SHA512 311a9444ac8811bf1ea1a8bb06370b81360c6642921b2932095bd191d8784509bfe46189de8f073a34a831eaf1c8114c3b5bfcf67d0fe042ea2ecd8c1fc7cc0a
diff --git a/net-dns/openresolv/openresolv-3.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index 71369c4473ef..2199d8c1229a 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://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 ~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 9f802df171b6..18059e251607 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,6 +1,10 @@
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
 DIST pdns-recursor-4.1.11.tar.bz2 1239986 BLAKE2B 33c9b2a2f811c43b67ad2bddf5a11d5d95cc88679d46ba3513f3eeec97bf7694af493a9fea4f733f003056b5f0fc971112e9062883324102ecca28838e2f3e41 SHA512 6041d31f0a517786f44a7fa22c7bfa94d5d4bdc3a7f349d2b47bc66be87404fe8eaf76f45ca18ef8ab96a45c0271f46fdba93a51fbda2542a3ad96e10f51c1d1
 DIST pdns-recursor-4.1.12.tar.bz2 1245110 BLAKE2B 187fe117ab64f234d144d7e2d91a119afe1d6b0a45079f1f9527724081c64f594c8c5d5b4dbc6e25b4beef1fcdfb3e5caed8e5a434921bf6b66e07617d0fb6f9 SHA512 d228976937ede7e9f6b3375e573f5b436d9df7ae246e411b13acb095a1a58f12173b663acc364ce0fbdcc61b3d5522e101472a88da8f044e44541564f9915d9e
+DIST pdns-recursor-4.1.13.tar.bz2 1246775 BLAKE2B ec664baa9d98dde179f15777fb83817706770a88e08dfb61bf8bc9f1fcbd1e6e6064e44bda90da2d82ef4d15e33e0656cd6624c38b3922b5c662610085319164 SHA512 3b64caf291b80e1b0d024d607fc7e0fe8d51450a687a1090f0d0f7aab1a42a73fb31576a0acfddcee3f9c476f8bb0ac192a937f9c3481bef8031d34866b5f430
+DIST pdns-recursor-4.2.0-rc1.tar.bz2 1312628 BLAKE2B 9ab6462cbfad26bd5590af19ff0527d749e5e48aba21ac52603f0d481415491f584976de6c03fce1d6b6a3180226e343e0ed715678e1e0c523a9f25dc18ac47c SHA512 f524001d6303bb8aa83b90646915d7b5666056a8c177391ddd2fd94b610e9cca94a7f33cc65be39d76e57a0b823c87c5a16147bc7a92438ab0b2b8dc891e401a
 EBUILD pdns-recursor-4.1.11.ebuild 1756 BLAKE2B e2fbacc7c51b9979ec9b1a034cac79d3f0960b70614aacb69362577e047383d03b35e2baefd0e5ceea666baa913e4bf2c068b2ab9d28567f8bd0458b2c63506e SHA512 acd802ca6e50382bbe08992ee77791d08ad9aeae143d889423bfe5cd08818fe83e0ec091ab1e65020883d838779bc344b0969a6f90dbb241fb66666fb0b434d8
-EBUILD pdns-recursor-4.1.12.ebuild 1758 BLAKE2B bbee1332e0392092ccce34b4d75e10988559d5ed91a2aafa27c3408c6beb36468a303178f39b76edc42cb498318a7465578ee3dc3b2eba82f8c5a46e69532f88 SHA512 fb9ca18f4b87b744a5421648ea14039fe6f00a95434d3ab992723d8cd184ff2e04808a0a509d5be6515f32c98609024babd00b3d8a89e4e8319218686e13c064
+EBUILD pdns-recursor-4.1.12.ebuild 1756 BLAKE2B e2fbacc7c51b9979ec9b1a034cac79d3f0960b70614aacb69362577e047383d03b35e2baefd0e5ceea666baa913e4bf2c068b2ab9d28567f8bd0458b2c63506e SHA512 acd802ca6e50382bbe08992ee77791d08ad9aeae143d889423bfe5cd08818fe83e0ec091ab1e65020883d838779bc344b0969a6f90dbb241fb66666fb0b434d8
+EBUILD pdns-recursor-4.1.13.ebuild 1804 BLAKE2B 7cea57f7268aab9d16b526e070f7e8b999788f6d28707376eb4451b86af87b5f57b1ca14758b4e7e9e44833ac8583bd9ae24a7c3d4674ff373f2dbcc4f32cd71 SHA512 96e29573690bd3b44b31e2f80ebfd049f21d57fbc01de38d53e4804608cf3a61d0821a79baa3d3bc2a46f7cb6285641a876a6a331dea074a7163a0d8edac8b0f
+EBUILD pdns-recursor-4.2.0_rc1.ebuild 1788 BLAKE2B 4bd0954bbf949b75e3dd47c338af4b0e4148027b4bd5cf5df8ec5e6a8a387e6024b923ee5ede858eb6f581a38e2965e6e7a06a4a137ee0ae479c4870d684ccc7 SHA512 4ec082568d1265293da90cc24766b702aec0fd4371fa067c91b108ee367d5473c040c3461f01e6ab3d3998939aa82bd13f2b5332f38286a5d24361bea0328680
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild
index c054da53ceed..45a74d2b9434 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="libressl luajit protobuf snmp sodium systemd"
 
 DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.13.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.13.ebuild
new file mode 100644
index 000000000000..8c6bb86d0ac8
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.13.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable sodium libsodium) \
+		$(use_with !luajit lua) \
+		$(use_with luajit luajit) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.2.0_rc1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.2.0_rc1.ebuild
new file mode 100644
index 000000000000..4430ff42e693
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.2.0_rc1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="" # ~amd64 ~arm ~x86
+IUSE="debug libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-lua=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 15678c486073..1ade22e1026a 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -2,6 +2,8 @@ AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf40345342288
 AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02f2ad4324cb7c99a05736bac7cbe80e1b9081832cac95d8c482eb4d1a8c344a6b55da623e3 SHA512 6392f59f82b82621b6cab6823f7761cd875bc6818c48db846df289057c02d8119a1024c5ecdf70a5ca8a55c00a2c3c56240d36b42cc038a25e8616ab9b966dd6
 DIST pdns-4.1.7.tar.bz2 1116191 BLAKE2B 8c214bff6d1af8354dc0b22c2bed233ec92e217fcfda456f69a665eb615500452f2bea7abfbab506f93abc35d0466a26594734a242e5cfef2b62e789252274d1 SHA512 dc9c693ac2eaf11ddce220e7fedc40f6ae3f9d7a55352643b30db2aad0b2d543ad04a14199a06355275aba2d9dd7873087715a16157b0ff2f7335f1a4a4b96a2
 DIST pdns-4.1.8.tar.bz2 1116996 BLAKE2B df32e1e239f65a37570b1f3f6b7fd2384ea9ea4d60ecf6dc520441e7f004c9e17c1cb35358e1cd9b5080c85b6366354ae4b3e5eaeda20af18c6e411bb119bbc1 SHA512 1113745cdaa8fba591c176721893fb478e976861beee0cb6c0240e5afa6b68c9afae286579036b2ed77fffe76ca1e6f103cda915f8b7b875bcdc1253931ad935
+DIST pdns-4.2.0-rc1.tar.bz2 1221177 BLAKE2B fa911805bfe9c04ffe6b508e1deec716e9149a6cfe10b771bb8bb214c4b4db72a9d4990eb21145e13422388c48563e2951c6e7d210a59dc2d3569cac6a3232b8 SHA512 bd769a2e0159b44d5699b0166d20afe49d9c48aa04c170405099a897417a12887a4dfb54bf9c100498be37a519c91e08a96039b23bdbc1cf33499ea63841c1ba
 EBUILD pdns-4.1.7.ebuild 4196 BLAKE2B af3cfdf1057305c0675ea5aa66d6774a1a8625b2b53ed7ff132f916a0502c14662c8c9ae40d161bce8c088df68d7448ca971ba7007ceb9f8eb6c01578086f664 SHA512 99dc3cac1fc167c1b7e546209266717002f723898a74a43d1c566a0daf7f31c432db6ae39ba1e31edfc0ad2b3983c20c42f36d9ae7b3cd857e9500ebcd01bad2
-EBUILD pdns-4.1.8.ebuild 4198 BLAKE2B 6f5a5605abb7b08ccd7b959997db18d7f8adca4d1eefba2cd2dc3bff227eef09a6d345bee089cb7649a0a47e37f597404f9f9c9f3eebf42ea6906eaf93e15739 SHA512 10c501e58ded7213cf21eca41502fe2e9dda82733e54591c28ec97a9b58c6d59e3e402511a074082f9d6c28930239ca8a9fd4a590d0f2d4759c836eea91ca6b0
+EBUILD pdns-4.1.8.ebuild 4196 BLAKE2B af3cfdf1057305c0675ea5aa66d6774a1a8625b2b53ed7ff132f916a0502c14662c8c9ae40d161bce8c088df68d7448ca971ba7007ceb9f8eb6c01578086f664 SHA512 99dc3cac1fc167c1b7e546209266717002f723898a74a43d1c566a0daf7f31c432db6ae39ba1e31edfc0ad2b3983c20c42f36d9ae7b3cd857e9500ebcd01bad2
+EBUILD pdns-4.2.0_rc1.ebuild 4090 BLAKE2B b4310e3cd28309b960f6c9593f17d522a2859b27f86c4b4c469a8120bff116017a4a2b0690ed00f39693e5003a3775fd8fc70c2f89b325e4b206ec49a0ec7998 SHA512 63ce610a1a26b368dd7b625bf8f20313bc2966a45c2d584745304dccb1b11061e138d8bff173076b03d692822cdfe45a117ef03b0e39265a2010701665d767ac
 MISC metadata.xml 1330 BLAKE2B 17be53a41fc13a3739905f8409b49996b1958cfd04baf1d2982c923ee7b39ef5b8be627017a6efb1261f158f45660337eb22157ceaadc7b07ed5b5b3da7c7cdf SHA512 fb13690059baceefc1366423c524427655d54313f5690e12709c9e1dd4b9567d111d7d748c530286dcd24dc78acfa38baac88a5cfc9a2b01996baae6b47f39dc
diff --git a/net-dns/pdns/pdns-4.1.8.ebuild b/net-dns/pdns/pdns-4.1.8.ebuild
index 9c4996e63d3b..ad05ab448209 100644
--- a/net-dns/pdns/pdns-4.1.8.ebuild
+++ b/net-dns/pdns/pdns-4.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # other possible flags:
 # db2: we lack the dep
diff --git a/net-dns/pdns/pdns-4.2.0_rc1.ebuild b/net-dns/pdns/pdns-4.2.0_rc1.ebuild
new file mode 100644
index 000000000000..9bffaee27109
--- /dev/null
+++ b/net-dns/pdns/pdns-4.2.0_rc1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib user
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="" # ~amd64 ~x86
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+
+REQUIRED_USE="mydns? ( mysql )"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:=
+	lua? (
+		!luajit? ( dev-lang/lua:= )
+		luajit? ( dev-lang/luajit:= )
+	)
+	mysql? ( dev-db/mysql-connector-c )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	opendbx? ( dev-db/opendbx )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	protobuf? ( dev-libs/protobuf )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${P/_/-}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use lua && dynmodules+=" lua"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	use opendbx && dynmodules+=" opendbx"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-modules= \
+		--with-dynmodules="${dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		$(use_with lua lua $(usex luajit luajit lua)) \
+		$(use_with protobuf) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	enewgroup pdns
+	enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	if use ldap ; then
+		ewarn "The official LDAP backend module is only compile-tested by upstream."
+		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+	fi
+
+	local old
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 3.2 || continue
+
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
+
+		break
+	done
+}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 2efc18d44e66..7f3d92de5932 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,5 +9,6 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7
 DIST unbound-1.9.0.tar.gz 5662176 BLAKE2B dff42ca4155df1c364bcfeb37c0f9516e7f167cc59bebd1fcf264db6471ad99804323c59e485662e03ab095932f1ca3fe25693a9ba840e9c0ecad69cf31b1a2d SHA512 7dfa8e078507fc24a2d0938eea590389453bacfcac023f1a41af19350ea1f7b87d0c82d7eead121a11068921292a96865e177274ff27ed8b8868445f80f7baf6
 DIST unbound-1.9.1.tar.gz 5665254 BLAKE2B 68a643cd17139b34e3651e0e72053b0faacf83ae975fff97493c78742ffa7f0d3dbc0028e96e581e125a3591467ec78ae245a718424c2fb32ea7db23ae945f44 SHA512 5dfac7ce3892f73109fdfe0f81863643b1f4c10cee2d4e2d1a28132f1b9ea4d4f89242e4e6348fdadf998f1c75d53577cbf4f719e98faa1342fc3c5de2e8903d
 EBUILD unbound-1.9.0.ebuild 5371 BLAKE2B 210ca5db8c4fedf546d8caeffda1cf94f6366e9befe55be6c07ba273209ff2b5388509341c4540ee65aeedb3f543e0caa7fbac880121ba86f1426e856167689c SHA512 2f78e2c29c5ed3998260ae8803c0a5e9216f63c9001be4f62613e88899e130258b7a53e0072a621e2d436b6491ed688006cb2e8ccdf6e6426eec34d87d358648
-EBUILD unbound-1.9.1.ebuild 5376 BLAKE2B aa5a4eb9833094e082f52076a819fb5e05716d37f9423a3addb47bb64f508b6d4dbd2d12ca37ca13c701ea36a8fb4c33df35d30204cb5ceec889e3eac811f2de SHA512 3466847443d8548e4b961ad51e0dc8bc699b8954428715f82cce9069629fb486aef49a168b9922132d912d467bc9a144c36db0cb3116fbd690d3d9d17688ffb6
+EBUILD unbound-1.9.1-r1.ebuild 5406 BLAKE2B 92f267663f8174cf9ed701078773c5e56a2e44456788037ba392df6d4d3aacf7d3fab1447a93271bdf1ededc6bc4e2e010157f782389f48fa3678f2449acedd2 SHA512 761d406627a16bd9ed687c939f57e9b16e42e7aa9de84aa3b03aa11efb4efa9eb9910cbb73ab962dc34184159b46413540d8f6b1071059ac02231eda63190527
+EBUILD unbound-1.9.1.ebuild 5383 BLAKE2B 2e5777319dab657dea41e1eb2e6e325ed8dc0d5d6c9e7711ee4cd11e043bc9582cb58fcffa26d1264759fed85debfa8f23b21dde1a936730e47d7ecf1ea2eb0f SHA512 1cc7d4b7deef9d75412caee7633e487e22fea793454eb87554401bf8b1efdaf24b67c2d6a463232cddb4cf1ecd8ab90f998623df0c99e9c8434245f27b202975
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.9.1-r1.ebuild b/net-dns/unbound/unbound-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..e4d1ceae7af4
--- /dev/null
+++ b/net-dns/unbound/unbound-1.9.1-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis 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[${MULTILIB_USEDEP}] )
+	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} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+	# improve security on existing installs (bug #641042)
+	# as well as new installs where unbound homedir has just been created
+	if [[ -d "${ROOT}/etc/unbound" ]]; then
+		chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# 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 ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(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 \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX%/}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX%/}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX%/}"/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() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.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
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED%/}/etc/unbound/unbound.conf" || \
+		die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	# make var/ writable by unbound
+	if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
+	fi
+
+	einfo ""
+	einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+	einfo "set 'auto-trust-anchor-file: ${EROOT%/}/etc/unbound/var/root-anchors.txt' in ${EROOT%/}/etc/unbound/unbound.conf"
+	einfo "and run"
+	einfo ""
+	einfo "  su -s /bin/sh -c '${EROOT%/}/usr/sbin/unbound-anchor -a ${EROOT%/}/etc/unbound/var/root-anchors.txt' unbound"
+	einfo ""
+	einfo "as root to create it initially before starting unbound for the first time after enabling this."
+	einfo ""
+}
diff --git a/net-dns/unbound/unbound-1.9.1.ebuild b/net-dns/unbound/unbound-1.9.1.ebuild
index 6ae0e2e35b3e..8dde19fcab96 100644
--- a/net-dns/unbound/unbound-1.9.1.ebuild
+++ b/net-dns/unbound/unbound-1.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-dns/validns/Manifest b/net-dns/validns/Manifest
index 6618e6a8ecef..e35fa1c9a3d7 100644
--- a/net-dns/validns/Manifest
+++ b/net-dns/validns/Manifest
@@ -2,4 +2,4 @@ DIST validns-0.7.tar.gz 185377 BLAKE2B 53d1607062e4d6669b82bc5bfa3ff987eafabbb9d
 DIST validns-0.8.tar.gz 190325 BLAKE2B cb1f7200aa9256e24bc9c9d071c4680e22ef436dbe997bc0278331b76131070d3797012d0f40f7bd66f5cfa2c8b8baef80753764caf758351a41c27f8cc59030 SHA512 2443bb8a7373f27d41ab3be1a92b61696d05b74afa42c19db54f6e999e4a634499faa44a5feefd3bc515bc677a8ef0a076092cf13316eff6d1cc504ff9702038
 EBUILD validns-0.7.ebuild 526 BLAKE2B b108891333f275e69e8320e136dbe42cd491f07ebeb842ff2a14b471acb51d18c84d9adf3bb3600372ccc9502d49211e8456b628a6282cb9472e1c95b33c6582 SHA512 301fb91e5dbfb030f3cb16cb5e3a4ee07a8692e600b6a33ea049250ae430c751d50ed1e2945ead284795c4b19091f7de9fa74a7fcd000ddcc917a89e12e4fc6a
 EBUILD validns-0.8.ebuild 526 BLAKE2B b108891333f275e69e8320e136dbe42cd491f07ebeb842ff2a14b471acb51d18c84d9adf3bb3600372ccc9502d49211e8456b628a6282cb9472e1c95b33c6582 SHA512 301fb91e5dbfb030f3cb16cb5e3a4ee07a8692e600b6a33ea049250ae430c751d50ed1e2945ead284795c4b19091f7de9fa74a7fcd000ddcc917a89e12e4fc6a
-MISC metadata.xml 667 BLAKE2B 267d0c89bb03695add59a50dd203f3c40b52e7fd3eb67bfe3edcf2b3fe5f9b959b6b83926aa62948bdbdc57acfee7492e7ce71f2d9ada959dead41dbba4d0053 SHA512 2769398f65753d988431df8d9b19f21cc957a491ea8115b5f19f3591e19cf805fe5257f2b1a51c1ecdb2a70d5deda64480f2b90ff5927bad12e303ee2bdef475
+MISC metadata.xml 471 BLAKE2B bdb426332df401e1df1fc63668c077dfc5b4275ba7e9e1734a9a59e6cbccd433214323fc20a93eb3d570f653087250b85451f1402f1c8724a929ea98d98be6b8 SHA512 26c46b8856c214a71ac566859c44f7ed029d96d9e61f98094d9cce02201c3c4520986bd8aeafec734ecc6c89d95266544f21b0c58677c6411c49ff7e85f73142
diff --git a/net-dns/validns/metadata.xml b/net-dns/validns/metadata.xml
index 87897f6ba70a..9fe242e22541 100644
--- a/net-dns/validns/metadata.xml
+++ b/net-dns/validns/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tom@whyscream.net</email>
-		<name>Tom Hendrikx</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>Validns is a standalone command line RFC 1034/1035 zone file validation tool that, in addition to basic syntactic and semantic zone checks, includes DNSSEC signature verification and NSEC/NSEC3 chain validation, as well a number of optional policy checks on the zone.</longdescription>
 </pkgmetadata>
-
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index b09159328102..42753fc2452b 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index b0af80e95dea..69a9e2ea2f5a 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -4,5 +4,5 @@ AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d
 DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be
 DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
 EBUILD firewalld-0.5.1-r2.ebuild 2839 BLAKE2B 5560e10a2c297e5f0c1f51ee28a2ecbdcfb14b5f38235b19719b1c33bc12f763c7138e50cdf2795157ab09f4e4cad4d49f05e0a6036ae22fb60b74f03b14386d SHA512 2d26fbf9c9d2fb507d8da8c036ddb3ea81a4d95c5dc64fec2baf2bdce76271a69d40fc6ba8979da0e8d17d6f989cc036ce7eb3fbc81630365cbcafdc926e23f9
-EBUILD firewalld-0.6.3.ebuild 2515 BLAKE2B bf52b7588ad655c9631a6d94b75ceab62b68e9a4be2e8f021da1f4f82e7e11069c2a904cadc71d4f98f22fd4d53613edee6a034cdb8a838f4c95b2e18dae8728 SHA512 7f1dc4b255b60fb3464d9e7b373392d8445e6d35271a2437f55cb3a610c5765a7a7d0be204a05c127c40fe77a8ff12c8587860f1a4247c7ccbc3a9eaaa57be04
+EBUILD firewalld-0.6.3.ebuild 2514 BLAKE2B 0a3982fb6a2bdbf30968867247563a2760432aeef24d014d0dcd122876515f5bc9472708eca28ec99a9e3c93b54b6534541c7c4b12e75770902f07ebd37af8f3 SHA512 06827644dad6f6d64b0461d3b53c9550285689e7eb0aac6d2df852fc7fe4e141c3e866c71610f124f97d145b415d77e6caf9a786a9b35eed832172da382a4219
 MISC metadata.xml 365 BLAKE2B f5f2b3b7646cec193cffcef9ca3fe51f4f071a996c20dcd5669f428a6759be96a014f477281d58a127149d82422862178289b362b0f30603a9fbac62c59ff6e2 SHA512 b317c52dc7ab211183555f45d1b84786f9aede73f3b59eee54aa696b4e358e42dd7c30044e89931c2362f3a11c5180f1136f7631bf19c1fe02e29d68bea4c5a6
diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index 54ebdf788baa..6b6f2a4cd0b3 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index d96251dd5ea6..49cb9a739aa4 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -4,8 +4,14 @@ DIST ipset-6.29.tar.bz2 542735 BLAKE2B 2229eb802597b38287f49cc2936a8be1afde2f638
 DIST ipset-6.30.tar.bz2 544054 BLAKE2B eb9a6368436f0c4a813a6733b2122be975c752aee4d8ac9a2e7a02ebd2da372351c318cf1b0c06c1b389c523cd9572dfe1bff813e23a4e924391f9c7a946b75b SHA512 6299a6905fbbcc2dd7c2f07862af184fd3b63b586f7bf3af2de5a0cc692f4ec6ef57db64c3435c1acedd6c293570602dca8cfedcb197a00ec18517ced92dc903
 DIST ipset-6.32.tar.bz2 544635 BLAKE2B 684354b0b24b15a657b21d44fa58b2cf7823f78d78ccd2b3f1c2d50b9e1396db6ed1414edb69102e3f82810d844ccd5eb738d1a968921b76b20e5d15c6ae5fb1 SHA512 7b0f5e7ef1a777ab70872aa52f658ff9516cb5de4c67c56d7f596eb88db03467d39b10ffc098441b4bfa4bb21a15f3c5f7f7f825300ce8efbacd767369ad43c7
 DIST ipset-6.34.tar.bz2 547940 BLAKE2B a42ad1b0af07250ecae645424d6a9564f16a388da452fa22817318947d114ca6e0a7ac175c2d2ec8a8602529bcefd361a206b083c231c33e96a76570b8ae8bcd SHA512 5a8cd743eee5abdbaba452c3b4508e9f0569a5a5ae83c9aeafb3d92c2c17672b489302a4a0953668c8b6d51cf7e510660b03b9dbd4ccb2deddffa41e6e6db33a
+DIST ipset-6.38.tar.bz2 545568 BLAKE2B 14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f SHA512 ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
+DIST ipset-7.0.tar.bz2 552144 BLAKE2B 722559409e0a617bc2e47a05023ff225a6c422d2847534ff8511611cf1e02451f0fde293eac3a1a6e49547b3e6d5f82dc130b08b7e42f8f9fad9d5908e3c29f4 SHA512 4d63351cd7c98a5662963d3301522c18644e14aeebf93ea15fb5f4e600e7ccc2040a0640fb6d776aa90ef296905d75630ec5f06e46f8521275befecf9705e669
+DIST ipset-7.1.tar.bz2 669520 BLAKE2B 0737c4cd780f072dd6fcf67c58ebc8d5afefb33081240c25a972708185771cfad9f746b8ed5135b1e7fca4ce510ed707a7cfd641afc864210184a9998360e699 SHA512 eae9bd83f6675754af8ca443a82e0a1c9d47f60f6bf2a7a405a695223cc17063d5d4eb79428fe21a1f0a867109dfaf8ad8071b45e92191ec108b2cd2382fa854
 EBUILD ipset-6.29.ebuild 2961 BLAKE2B 0dc2faad4795f837c731bfb80a2925c0d7a6e4415130291330a042f0e5d7aa3ccfd0b553bd5ef838405d617d875623202b53b86e5da0d55da3f69dab923ee371 SHA512 c11c5a7b9c56b00d1ae60328d31c6415238b680329d2d1b7be591cd0d6c383029fe07e4305e6bb6e2780205bc4525c2f39bb106a6d3a8c542cf4ea8c00839ccd
 EBUILD ipset-6.30.ebuild 2888 BLAKE2B 05654ce7430037c17fd9ea5fd42804397750a9091bfdea063001001370c6264de3006af3853d60eca5a6ffa90cf509f83c8721d141b4f604cc45c25f29f27d52 SHA512 abd9526b8b6576ed497a8679a903b34fe7330343b91c925bebb2be9a2efaea32472384ed3a6b74cb7b59ddcac5bd865594690597492c78853895f2afc5197efd
 EBUILD ipset-6.32.ebuild 2888 BLAKE2B 05654ce7430037c17fd9ea5fd42804397750a9091bfdea063001001370c6264de3006af3853d60eca5a6ffa90cf509f83c8721d141b4f604cc45c25f29f27d52 SHA512 abd9526b8b6576ed497a8679a903b34fe7330343b91c925bebb2be9a2efaea32472384ed3a6b74cb7b59ddcac5bd865594690597492c78853895f2afc5197efd
 EBUILD ipset-6.34.ebuild 3007 BLAKE2B e39e4e2e8d31d333364ed22ba11db1e8dfac476716ec1631b409ae19d5114f0b16f8d25fc82314e7b4afdf0a2536097f6e0101d6687171157167466e67db3dee SHA512 94827fe7e36189e965ac275c6edf3761bdb8c7d1ac78adf8978e0b6113437bc9670923647e9ac87ac575be8a568f9b0f9c86b5db033e45e30c6fbe525bc7e031
+EBUILD ipset-6.38.ebuild 3003 BLAKE2B 593553f385f9665003be5757e3a684fdaff7de5b0f11b86bd7f5ee4c97555104cea66db7602bb16948f24814be0b42c00f8018cf9b5de3ad8c1cbdacd888b8d5 SHA512 5fb1e8030b8f3a9742824a3a9f06ae5ebc3278bb3c4d512279f3c4f313f938c2aa6f68150348be9e605574160ff1749e8b58279d2ea47b7422f0c194206bb64f
+EBUILD ipset-7.0.ebuild 3004 BLAKE2B a40d7f6bced82e0e5013ac9efc4c97c699e6190897991202b3f836537bbc84213b417a822a73f9ec405dbaed417874b3a4012c3d08c329b6d1b68e44d3b2cdeb SHA512 666ffa27fe1bcc6ddf674e3c72e922b72d4153c47d5d8a1d238f59e495d05111bfb795f32493256950bf3dff4a6856559039f77fc7d9a6fa6054298da7393f26
+EBUILD ipset-7.1.ebuild 3004 BLAKE2B a40d7f6bced82e0e5013ac9efc4c97c699e6190897991202b3f836537bbc84213b417a822a73f9ec405dbaed417874b3a4012c3d08c329b6d1b68e44d3b2cdeb SHA512 666ffa27fe1bcc6ddf674e3c72e922b72d4153c47d5d8a1d238f59e495d05111bfb795f32493256950bf3dff4a6856559039f77fc7d9a6fa6054298da7393f26
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-firewall/ipset/ipset-6.38.ebuild b/net-firewall/ipset/ipset-6.38.ebuild
new file mode 100644
index 000000000000..a2ebc6e6e4f5
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.38.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MODULES_OPTIONAL_USE=modules
+inherit linux-info linux-mod
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="http://ipset.netfilter.org/"
+SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~x86"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+	net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+# configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+BUILD_TARGETS="modules"
+MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
+MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
+for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do
+	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+
+pkg_setup() {
+	get_version
+	CONFIG_CHECK="NETFILTER"
+	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+	# It does still build without NET_NS, but it may be needed in future.
+	#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
+	#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
+	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
+
+	build_modules=0
+	if use modules; then
+		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
+			if linux_chkconfig_present "IP_NF_SET" || \
+				linux_chkconfig_present "IP_SET"; then #274577
+				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
+				eerror "Please either build ipset with modules USE flag disabled"
+				eerror "or rebuild kernel without IP_SET support and make sure"
+				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
+				die "USE=modules and in-kernel ipset support detected."
+			else
+				einfo "Modular kernel detected. Gonna build kernel modules..."
+				build_modules=1
+			fi
+		else
+			eerror "Nonmodular kernel detected, but USE=modules. Either build"
+			eerror "modular kernel (without IP_SET) or disable USE=modules"
+			die "Nonmodular kernel detected, will not build kernel modules"
+		fi
+	fi
+	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
+}
+
+src_configure() {
+	econf \
+		$(use_with modules kmod) \
+		--disable-static \
+		--with-maxsets=${IP_NF_SET_MAX} \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-ksource="${KV_DIR}" \
+		--with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {
+	einfo "Building userspace"
+	emake
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Building kernel modules"
+		set_arch_to_kernel
+		emake modules
+	fi
+}
+
+src_install() {
+	einfo "Installing userspace"
+	default
+	prune_libtool_files
+
+	newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
+	newconfd "${FILESDIR}"/ipset.confd ${PN}
+	keepdir /var/lib/ipset
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Installing kernel modules"
+		linux-mod_src_install
+	fi
+}
diff --git a/net-firewall/ipset/ipset-7.0.ebuild b/net-firewall/ipset/ipset-7.0.ebuild
new file mode 100644
index 000000000000..b6bd9375ea68
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MODULES_OPTIONAL_USE=modules
+inherit linux-info linux-mod
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="http://ipset.netfilter.org/"
+SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+	net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+# configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+BUILD_TARGETS="modules"
+MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
+MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
+for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do
+	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+
+pkg_setup() {
+	get_version
+	CONFIG_CHECK="NETFILTER"
+	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+	# It does still build without NET_NS, but it may be needed in future.
+	#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
+	#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
+	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
+
+	build_modules=0
+	if use modules; then
+		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
+			if linux_chkconfig_present "IP_NF_SET" || \
+				linux_chkconfig_present "IP_SET"; then #274577
+				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
+				eerror "Please either build ipset with modules USE flag disabled"
+				eerror "or rebuild kernel without IP_SET support and make sure"
+				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
+				die "USE=modules and in-kernel ipset support detected."
+			else
+				einfo "Modular kernel detected. Gonna build kernel modules..."
+				build_modules=1
+			fi
+		else
+			eerror "Nonmodular kernel detected, but USE=modules. Either build"
+			eerror "modular kernel (without IP_SET) or disable USE=modules"
+			die "Nonmodular kernel detected, will not build kernel modules"
+		fi
+	fi
+	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
+}
+
+src_configure() {
+	econf \
+		$(use_with modules kmod) \
+		--disable-static \
+		--with-maxsets=${IP_NF_SET_MAX} \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-ksource="${KV_DIR}" \
+		--with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {
+	einfo "Building userspace"
+	emake
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Building kernel modules"
+		set_arch_to_kernel
+		emake modules
+	fi
+}
+
+src_install() {
+	einfo "Installing userspace"
+	default
+	prune_libtool_files
+
+	newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
+	newconfd "${FILESDIR}"/ipset.confd ${PN}
+	keepdir /var/lib/ipset
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Installing kernel modules"
+		linux-mod_src_install
+	fi
+}
diff --git a/net-firewall/ipset/ipset-7.1.ebuild b/net-firewall/ipset/ipset-7.1.ebuild
new file mode 100644
index 000000000000..b6bd9375ea68
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MODULES_OPTIONAL_USE=modules
+inherit linux-info linux-mod
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="http://ipset.netfilter.org/"
+SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+	net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+# configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+BUILD_TARGETS="modules"
+MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
+MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
+for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do
+	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+
+pkg_setup() {
+	get_version
+	CONFIG_CHECK="NETFILTER"
+	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+	# It does still build without NET_NS, but it may be needed in future.
+	#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
+	#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
+	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
+
+	build_modules=0
+	if use modules; then
+		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
+			if linux_chkconfig_present "IP_NF_SET" || \
+				linux_chkconfig_present "IP_SET"; then #274577
+				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
+				eerror "Please either build ipset with modules USE flag disabled"
+				eerror "or rebuild kernel without IP_SET support and make sure"
+				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
+				die "USE=modules and in-kernel ipset support detected."
+			else
+				einfo "Modular kernel detected. Gonna build kernel modules..."
+				build_modules=1
+			fi
+		else
+			eerror "Nonmodular kernel detected, but USE=modules. Either build"
+			eerror "modular kernel (without IP_SET) or disable USE=modules"
+			die "Nonmodular kernel detected, will not build kernel modules"
+		fi
+	fi
+	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
+}
+
+src_configure() {
+	econf \
+		$(use_with modules kmod) \
+		--disable-static \
+		--with-maxsets=${IP_NF_SET_MAX} \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-ksource="${KV_DIR}" \
+		--with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {
+	einfo "Building userspace"
+	emake
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Building kernel modules"
+		set_arch_to_kernel
+		emake modules
+	fi
+}
+
+src_install() {
+	einfo "Installing userspace"
+	default
+	prune_libtool_files
+
+	newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
+	newconfd "${FILESDIR}"/ipset.confd ${PN}
+	keepdir /var/lib/ipset
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Installing kernel modules"
+		linux-mod_src_install
+	fi
+}
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 0e7ef8951d4e..980377077f15 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -2,9 +2,6 @@ AUX ip6tables-1.4.13.confd 690 BLAKE2B 457beb9caaef166b8d98bddfd3e9f2799439bdfef
 AUX ip6tables-r1.confd 899 BLAKE2B d8c72df359a35798d7a92958ba9a620ab580427a06765850928181d7b4cc25455c586daaad88bd20e61a9c9218dbc0895de38b006526bb04f4f2e998d8062fbe SHA512 553ddf83558edaccf891a366175e47aad950853be0de556581cfa08f614afa1f4139c94b8d8d2884ed69018513edeb966331d4d6a615829ada65fac2066840e5
 AUX iptables-1.4.13-r1.init 2766 BLAKE2B 1941ba5383055bfedd57b8eb6a390cab5fc3438bcf9f2b03a31f7a417ac7c2abaa590d23a8ae4500595c9bbb83da852e27d71f672a2758fe0be45691a461105c SHA512 9b74344043f48ce2a4691f09199cfa752bd7ee360d912d412fe1cf51de54821b0d082c9585a11b84020454f9759af78ff097d7dfc8f5148ef9e987e6d990edde
 AUX iptables-1.4.13.confd 687 BLAKE2B 78b2242454b5f3228661f1e41b790aaa458c1225162a222da5a309a15eca56a531c756a5ceb49e506095461998305189efe136fde0bfe5916cc2d00661de1789 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70
-AUX iptables-1.4.21-configure.patch 1066 BLAKE2B 59bf725aeaae131b57e04b556957dd3316f2282ea5a1d9e931f63865dd48484831c9f7674085b7134e2ef4c2dcddbc3b06c8f8e85a45840746a25e386c390f86 SHA512 45445d1460072ed19ba617be983be82094fdd0535a25de4f6159173de4a08be9bee9da13c7aeea419291beb92402ca25efba3a0e269510e221f7eacc8bcd5176
-AUX iptables-1.4.21-static-connlabel-config.patch 2195 BLAKE2B 237c59c2fd3312efa26181f363c2ad4dfe19b0cb494f90048e50ff464ed8abbb8ec46d406df51b9f3ba75f717a045ebb4fa38cc0ca5741f5efbfc3322171e04f SHA512 d838773bf2db9f97548d2f7eaab0ce3205265a7ec8b274df479fcecb474ba09ed061abae50534c0379a1290479c2e94927595eca0f4570b27744ec165348b6b1
-AUX iptables-1.8.1-build_limit_without_libnftnl_fix.patch 1499 BLAKE2B 01b8f257577b37749da8c7449e5a830373fc7556885be0e1fd8233b2105cde52e95e6393eaee3f2c7b0e335286b89d0b7b638a23921998375b333d8ccf8223df SHA512 a900d1544098f58326537684bd5de20df114402abacf1971c625431a0c03e988382a9b9f4860c761923c9bd54600424ae1a3769e16518a6c6e7ba1f61caf5ddd
 AUX iptables-r1.confd 890 BLAKE2B 0aaca870e3c03f19a71cf1b210377dfda320faf118359e298bef419eaf280fd11c9726d200ae89602e863c9b48de0bb51ac05424b50c064afe948a980e300153 SHA512 10002da01ded6be0e9bca6041798ad0859fa2212fde077a048443e4f3012c95d86e4580ae426e87af5891368062af9af6f9fd35ed617d24cdd3c51702b816b13
 AUX iptables-r2.init 4384 BLAKE2B d11be1725e25d234e01af86c82d3745fd630b15b3ae2228845c5555db5c2ffdcd920fd565480f76ab91ef2d5b26f9ae96432efc288a1b9aa2abfb5b9bb01d7bf SHA512 8897ab985424c895e261e0fe521921f0da8e09e38394655b0f91c65c0e8f603731faf70489f7a6610c83d6c2fde75f92f309405d72277643165a847e62238df7
 AUX iptables.init 2787 BLAKE2B 79c17ba2970d63791dd4d137536b3ccf0f9b6a637d0445049a6fac338ca4e2d1fad927038dfa7ad42a1eb321feac1dc834af09ce0baec554fc9767f199e10b6b SHA512 317c71bee98f5b1bbfd17ea961e5e268532c2320fc865b7876f7cc4e02a66b6a012fc336f8880045a83e101f161197c0a1d106220af6240407cebafbf38022db
@@ -14,16 +11,12 @@ AUX systemd/ip6tables.service 133 BLAKE2B 28a81d41464015e0af5621612b0738f22d8afc
 AUX systemd/iptables-restore.service 400 BLAKE2B cd7f700cf717a2efb6504770308f7dcb90a1968f64cca98ea5e7437cf3cf2a2e8f575e3743ac19eec8738c665f4243f537a101c00d5d1cc94648688d4e240a59 SHA512 8c005e321ad041068f243e4baa6588b24b0ffd69991f2129dfab0a34d0ebaf702ff2be8b7328126c84abdc3bbd300e1c387a690c5f6a002b50b2e9148feeb8ef
 AUX systemd/iptables-store.service 240 BLAKE2B 7ddb4425e63cd41f421767fab25a7b055087fddde5927291b3fce6e0e978f0cb3b734bcacf02f78257eec99274056b69058436a847dcb366f5fb70032e410355 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e
 AUX systemd/iptables.service 130 BLAKE2B 1b4881253eae9fd24c831931e5836efc3d3bb6f7ebb1762ca5aabb31813e3298e02d66d557efa73e6f252bf3f67898a2b646c863879dd993a613796b4c057019 SHA512 87114ccc7eb079d1ed43d77be35cf4c91702ca960883a4bbca5dfcf74aa6f086e44f4a4251441ac3a277c93eb10e7482157caf2d62bbf2a7f5327947ede25bef
-DIST iptables-1.4.21.tar.bz2 547439 BLAKE2B e30f25581a118b91781dcc02761d4c8c420fb19876ec9e8ade3aff22b574931065f9a1c1ec31983a444c406dd928c47673d02698553da85c3db4f31484b1597d SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b
 DIST iptables-1.6.1.tar.bz2 620890 BLAKE2B b45ac26e1fb7e8b17a6df0afab3b6c0e2f0a5df9191367548136b3ce9aadc1bcb875b8bc0403e6f12fcf487054e96418f4ef34da827af8989fd4dcf83cd3cd8d SHA512 12280db6e6ef8e68da2537e9da59fc601790fd02b1ba38a37c90dbb56272018329dccb8be995f96ecd5d94fafa6043204f3e8f8ee96531685d9e3c55359d2ee8
 DIST iptables-1.6.2.tar.bz2 639785 BLAKE2B 3d129756fd33c8c73d56d57e3c5595896db86ded14834a45db21b964d82840b62216ce3cea4ae4960e8c5f0671df3cc6bfb222f68d29cf3a8c99e0eee14bf017 SHA512 04f22e969c794246b9aa28055b202638081cfb0bb4a5625c049a30c48ac84cdd41db12a53c5831398cfe47c8f5691aa02b30b0ae3b5afe0f20ec48cf86a799c0
-DIST iptables-1.8.1.tar.bz2 678706 BLAKE2B 671e7329cc07dae0fbc54c1f6061bc148c4823e1f675369ee36a7cd2346cc1a9a516d5aa2e8a3506d5400027c1ba306cbe426940894117710bc61aacd256fccd SHA512 96a896b6dd26c2d0b4e1672d428ea3c3aab0a3c9e56a896af3a2b8428c4212d7378ba555e0be198b0ccb3fd370bca529466ab8b4edc1777eb7deed600d3f0e11
 DIST iptables-1.8.2.tar.bz2 679858 BLAKE2B 2004d85c89ecbc37ef0d571ac8ece680fd2e11a51b074f6387d6e9c4892da524c785d6bf3f30e26af4e7c2cb1f401d51bf8bcb21a91e380e24945374553139cb SHA512 8cf0f515764e1dc6e03284581d682d1949b33e8f25fea29c27ae856f1089fe8ca7b1814524b85f4378fd1fc7c7c7d002f06557b257ae2bbc945f8555bad0dc76
-EBUILD iptables-1.4.21-r1.ebuild 2442 BLAKE2B caa1b23d35ccb9a8e5631f932fe4a6816358782ea620d71ad1d64498df64b18015b3610f48b345a13caafaca51bb504d364ed4167804383c03d70439ca4154c2 SHA512 b0d5b1de2c24dbe4aa3eec29e3adefac12f72529fa850fbe5b956d1835fc5ea25ceed8172d8b5bc2d5c1bff63a609cae04c3da923c783ccdfeed126ef2bde831
-EBUILD iptables-1.4.21-r5.ebuild 2975 BLAKE2B f9fdeaf8c242b1553b59586346e81735dae31100a435a9cf2d0817c69a8fb6a0652b76944f5261eca8b5c5be60f38db50fb22a3940573e493c3326ec068396e0 SHA512 dab27d6601b69dae4c0be6b48f0cbc7daf7b93066ad398d962f81ec625628d6d2ce9e0188810941364e1cbc7d9c6b4511f3ab832ee736d69d8b977f80d52657d
+DIST iptables-1.8.3.tar.bz2 716257 BLAKE2B 58c606a5753ae2cb8ada9039e4653d2abe03c7c9b6aeef1e458baa3e10e818893f35e8f2aed5221e692415115e618aa673c8fcd33d172f85e9d1b609ed79c7b8 SHA512 84b10080646077cbea78b7f3fcc58c6c6e1898213341c69862e1b48179f37a6820c3d84437c896071f966b61aa6d16b132d91948a85fd8c05740f29be3a0986d
 EBUILD iptables-1.6.1-r3.ebuild 3251 BLAKE2B a9c05bf1263b59ef1a1005bc87705ec68d951e4462f9ee1f04a54396cd729cd74c0318837a8199530be4ccb2ee2bcc22dae9012670e6a920bf7bee52c7c56b77 SHA512 464f18812e42886f7eebb636bd56f91c668cb9ce22037fb824ac9ade50813cb105cb08bc82566628d63ba8bc97b5dc64ec3b59efb0451e4bf9856a4e592e1a00
 EBUILD iptables-1.6.2-r2.ebuild 3327 BLAKE2B c4d683d81f4d3be5efb9d043d63b8ee7b20f4b735cce0d7e31c85e159d2693568b83b28fe1e517ba658ee240dfd063b7810590cbf94029975992b0e5aeab479e SHA512 dc12b299d205f5404bd6486b36a933b611d567be45e00f8f02dd010036c701510824184a3d3d0d52798c89e5b57bfbe402e79bbfbeb50e4f0d26de1627b387d3
-EBUILD iptables-1.8.1-r1.ebuild 3543 BLAKE2B 9b18e81d1994868695bc098229f612997cedadf8b2970e84650893f4ed6281216121ea56f982ad7621f5da766850189c5e4011039659bc6fd488cb3e9a2afaf5 SHA512 f4d64da35788ffac7391c9b4a7e111bfff519e5d3757c1050ff74eac9da136c8f7f0a05fd32cba63f8e19b42c6f40299e75a13992c10d965643d280bc8b3ac85
 EBUILD iptables-1.8.2-r2.ebuild 3460 BLAKE2B d60479345dc2a7cf42927e43efd6ae405d04f620d489a0801830882357590f44f06afe4b88bc7ac5a5043eaec68c15b1e9714eb954057c540eaa3b91208ba085 SHA512 1bf426c57327331a5bdb651150571fcd399ce2c92ee405122d34d3bbb247f43d88120a9c9704bb1c674ce4a00749b2e84af91e973f938910ff745b6776750cc5
-EBUILD iptables-1.8.2.ebuild 3468 BLAKE2B 40dd2a8b377d6354604cef6f68f86feb86050f2aa3f3d185cb7019b4ba8aa0ed4c5e198eb3f51590431421fdb715851aff9194c682fd4a11079a75385c525d61 SHA512 13cdd43b8f3c1f9d1a60730275f565bc45499382af4d5a71155e3bccbe5cc750b6b65434c0c642eb3fc40d9cc00f950aaf911f0fd07be3fbfdb773d14d818eda
+EBUILD iptables-1.8.3.ebuild 3478 BLAKE2B 0e4c8c887e582bcedb8ecd199aaf3ec67546e4a244c7f17f6eb3c71f0dcacf5f493453786997f56aaf3fbf8590a3872c577381e2153a17e72f0b7f61ebd4cb1d SHA512 32bcd11eb6df18a4502bcc1d1559307d0c5e3ee5b51d0ef8f6cb455efeda0b083156b6922ba10ae68aaec1fa9d4523c7ea25d2040d48a633b93f43724835a208
 MISC metadata.xml 1465 BLAKE2B c60f98672fb6153499b700a436b26b63c0f271c8f8519a3391e486b761ba673c362a7dc5e23b86e3af887270596a1682ea993e643a08215f670f7e3804f095bd SHA512 26bf7e3008dfd705995b15eccaaaa8c79fd488be191570a874b76571a2f9d4648a7c19eb576399ca7bbe849336d7d193f5b6b58a3ff83f87f3c157c53333e987
diff --git a/net-firewall/iptables/files/iptables-1.4.21-configure.patch b/net-firewall/iptables/files/iptables-1.4.21-configure.patch
deleted file mode 100644
index e827885f1688..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.21-configure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/557586
-
-From b24e59fba39120bfdb9e521bbd0af8f33a60466e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 15 Aug 2015 14:12:39 -0400
-Subject: [PATCH] configure: fix 3rd arg w/AC_ARG_ENABLE
-
-The 3rd arg is used when --{enable,disable}-foo are passed in, not when
-the feature is enabled.  Use the existing $enableval instead.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/configure
-+++ b/configure
-@@ -11898,14 +11898,14 @@ fi
- 
- # Check whether --enable-bpf-compiler was given.
- if test "${enable_bpf_compiler+set}" = set; then :
--  enableval=$enable_bpf_compiler; enable_bpfc="yes"
-+  enableval=$enable_bpf_compiler; enable_bpfc="$enableval"
- else
-   enable_bpfc="no"
- fi
- 
- # Check whether --enable-nfsynproxy was given.
- if test "${enable_nfsynproxy+set}" = set; then :
--  enableval=$enable_nfsynproxy; enable_nfsynproxy="yes"
-+  enableval=$enable_nfsynproxy; enable_nfsynproxy="$enableval"
- else
-   enable_nfsynproxy="no"
- fi
diff --git a/net-firewall/iptables/files/iptables-1.4.21-static-connlabel-config.patch b/net-firewall/iptables/files/iptables-1.4.21-static-connlabel-config.patch
deleted file mode 100644
index a4183d6d4025..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.21-static-connlabel-config.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-https://bugs.gentoo.org/558234
-http://git.netfilter.org/iptables/commit/?id=825fbda5482a7d5ec5a6619c81fe07ff865c7d6e
-
-From 825fbda5482a7d5ec5a6619c81fe07ff865c7d6e Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Fri, 5 Sep 2014 20:45:56 +0200
-Subject: [PATCH] extensions: libxt_connlabel: do not open config file from
- _init hook
-
-else, static builds will print this for every iptables invocation,
-even 'iptables -L'.  Delay open until we need to translate a mapping.
-
-Reported-by: Thomas De Schampheleire <patrickdepinguin@gmail.com>
-Signed-off-by: Florian Westphal <fw@strlen.de>
----
- extensions/libxt_connlabel.c | 27 ++++++++++++++++++++-------
- 1 file changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/extensions/libxt_connlabel.c b/extensions/libxt_connlabel.c
-index c84a167..1f83095 100644
---- a/extensions/libxt_connlabel.c
-+++ b/extensions/libxt_connlabel.c
-@@ -29,11 +29,26 @@ static const struct xt_option_entry connlabel_mt_opts[] = {
- 	XTOPT_TABLEEND,
- };
- 
-+/* cannot do this via _init, else static builds might spew error message
-+ * for every iptables invocation.
-+ */
-+static void connlabel_open(void)
-+{
-+	if (map)
-+		return;
-+
-+	map = nfct_labelmap_new(NULL);
-+	if (!map && errno)
-+		xtables_error(RESOURCE_PROBLEM, "cannot open connlabel.conf: %s\n",
-+			strerror(errno));
-+}
-+
- static void connlabel_mt_parse(struct xt_option_call *cb)
- {
- 	struct xt_connlabel_mtinfo *info = cb->data;
- 	int tmp;
- 
-+	connlabel_open();
- 	xtables_option_parse(cb);
- 
- 	switch (cb->entry->id) {
-@@ -54,7 +69,11 @@ static void connlabel_mt_parse(struct xt_option_call *cb)
- 
- static const char *connlabel_get_name(int b)
- {
--	const char *name = nfct_labelmap_get_name(map, b);
-+	const char *name;
-+
-+	connlabel_open();
-+
-+	name = nfct_labelmap_get_name(map, b);
- 	if (name && strcmp(name, ""))
- 		return name;
- 	return NULL;
-@@ -114,11 +133,5 @@ static struct xtables_match connlabel_mt_reg = {
- 
- void _init(void)
- {
--	map = nfct_labelmap_new(NULL);
--	if (!map) {
--		fprintf(stderr, "cannot open connlabel.conf, not registering '%s' match: %s\n",
--			connlabel_mt_reg.name, strerror(errno));
--		return;
--	}
- 	xtables_register_match(&connlabel_mt_reg);
- }
--- 
-2.4.4
-
diff --git a/net-firewall/iptables/files/iptables-1.8.1-build_limit_without_libnftnl_fix.patch b/net-firewall/iptables/files/iptables-1.8.1-build_limit_without_libnftnl_fix.patch
deleted file mode 100644
index a0fca7efa93a..000000000000
--- a/net-firewall/iptables/files/iptables-1.8.1-build_limit_without_libnftnl_fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b2fc2a368562d55fadad94d995247bb8cd7e68a3 Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Wed, 24 Oct 2018 12:00:11 +0200
-Subject: extensions: limit: unbreak build without libnftnl
-
-Lars Wendler reported 1.8.1 build failure when trying to build without nft backend:
-
-  In file included from ../iptables/nft.h:5, from libxt_limit.c:18: libnftnl/rule.h: No such file or directory
-
-Reported-by: Lars Wendler <polynomial-c@gentoo.org>
-Fixes: 02b80972c43 ("ebtables: Merge libebt_limit.c into libxt_limit.c")
-Signed-off-by: Florian Westphal <fw@strlen.de>
----
- extensions/libxt_limit.c | 1 -
- iptables/nft-bridge.h    | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c
-index c7b66295..1b324657 100644
---- a/extensions/libxt_limit.c
-+++ b/extensions/libxt_limit.c
-@@ -15,7 +15,6 @@
- #include <xtables.h>
- #include <linux/netfilter/x_tables.h>
- #include <linux/netfilter/xt_limit.h>
--#include "iptables/nft.h"
- #include "iptables/nft-bridge.h"
- 
- #define XT_LIMIT_AVG	"3/hour"
-diff --git a/iptables/nft-bridge.h b/iptables/nft-bridge.h
-index 9d49ccbe..de52cd71 100644
---- a/iptables/nft-bridge.h
-+++ b/iptables/nft-bridge.h
-@@ -68,6 +68,7 @@ int ebt_get_mac_and_mask(const char *from, unsigned char *to, unsigned char *mas
- #define EBT_VERDICT_BITS 0x0000000F
- 
- struct nftnl_rule;
-+struct iptables_command_state;
- 
- static const char *ebt_standard_targets[NUM_STANDARD_TARGETS] = {
- 	"ACCEPT",
--- 
-cgit v1.2.1
-
diff --git a/net-firewall/iptables/iptables-1.4.21-r1.ebuild b/net-firewall/iptables/iptables-1.4.21-r1.ebuild
deleted file mode 100644
index 47f4a1757481..000000000000
--- a/net-firewall/iptables/iptables-1.4.21-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib systemd toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://www.netfilter.org/projects/iptables/"
-SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="conntrack ipv6 netlink static-libs"
-
-RDEPEND="
-	conntrack? ( net-libs/libnetfilter_conntrack )
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	# Some libs use $(AR) rather than libtool to build #444282
-	tc-export AR
-
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
-		configure || die
-
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service
-	if use ipv6 ; then
-		systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service
-	fi
-
-	# Move important libs to /lib #332175
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-
-	prune_libtool_files
-}
diff --git a/net-firewall/iptables/iptables-1.4.21-r5.ebuild b/net-firewall/iptables/iptables-1.4.21-r5.ebuild
deleted file mode 100644
index 6dbce98c427d..000000000000
--- a/net-firewall/iptables/iptables-1.4.21-r5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib systemd toolchain-funcs autotools flag-o-matic
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://www.netfilter.org/projects/iptables/"
-SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Subslot tracks libxtables as that's the one other packages generally link
-# against and iptables changes.  Will have to revisit if other sonames change.
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="conntrack ipv6 netlink pcap static-libs"
-
-RDEPEND="
-	conntrack? ( net-libs/libnetfilter_conntrack )
-	netlink? ( net-libs/libnfnetlink )
-	pcap? ( net-libs/libpcap )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	epatch "${FILESDIR}"/${P}-configure.patch #557586
-	epatch "${FILESDIR}"/${P}-static-connlabel-config.patch #558234
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	# Some libs use $(AR) rather than libtool to build #444282
-	tc-export AR
-
-	# Hack around struct mismatches between userland & kernel for some ABIs. #472388
-	use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct
-
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
-		configure || die
-
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable pcap bpf-compiler) \
-		$(use_enable pcap nfsynproxy) \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service
-	if use ipv6 ; then
-		systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service
-	fi
-
-	# Move important libs to /lib #332175
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-
-	prune_libtool_files
-}
diff --git a/net-firewall/iptables/iptables-1.8.1-r1.ebuild b/net-firewall/iptables/iptables-1.8.1-r1.ebuild
deleted file mode 100644
index 0183b70bd77d..000000000000
--- a/net-firewall/iptables/iptables-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit multilib systemd toolchain-funcs autotools flag-o-matic
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://www.netfilter.org/projects/iptables/"
-SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Subslot tracks libxtables as that's the one other packages generally link
-# against and iptables changes.  Will have to revisit if other sonames change.
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="conntrack ipv6 netlink nftables pcap static-libs"
-
-COMMON_DEPEND="
-	conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
-	netlink? ( net-libs/libnfnetlink )
-	nftables? (
-		>=net-libs/libmnl-1.0:0=
-		>=net-libs/libnftnl-1.1.1:0=
-	)
-	pcap? ( net-libs/libpcap )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	>=sys-kernel/linux-headers-4.4:0
-	virtual/pkgconfig
-	nftables? (
-		sys-devel/flex
-		virtual/yacc
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	nftables? ( net-misc/ethertypes )
-"
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-build_limit_without_libnftnl_fix.patch" #669486
-
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Only run autotools if user patched something
-	eapply_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	# Some libs use $(AR) rather than libtool to build #444282
-	tc-export AR
-
-	# Hack around struct mismatches between userland & kernel for some ABIs. #472388
-	use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct
-
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
-		configure || die
-
-	local myeconfargs=(
-		--sbindir="${EPREFIX}/sbin"
-		--libexecdir="${EPREFIX}/$(get_libdir)"
-		--enable-devel
-		--enable-shared
-		$(use_enable nftables)
-		$(use_enable pcap bpf-compiler)
-		$(use_enable pcap nfsynproxy)
-		$(use_enable static-libs static)
-		$(use_enable ipv6)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Deal with parallel build errors.
-	use nftables && emake -C iptables xtables-config-parser.h
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	if use nftables; then
-		# Bug 647458
-		rm "${ED%/}"/etc/ethertypes || die
-
-		# Bug 660886
-		rm "${ED%/}"/sbin/{arptables,ebtables} || die
-
-		# Bug 669894
-		rm "${ED%/}"/sbin/ebtables-{save,restore} || die
-	fi
-
-	systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
-	if use ipv6 ; then
-		systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
-	fi
-
-	# Move important libs to /lib #332175
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-firewall/iptables/iptables-1.8.2.ebuild b/net-firewall/iptables/iptables-1.8.2.ebuild
deleted file mode 100644
index cbf85327a99a..000000000000
--- a/net-firewall/iptables/iptables-1.8.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit multilib systemd toolchain-funcs autotools flag-o-matic
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://www.netfilter.org/projects/iptables/"
-SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Subslot tracks libxtables as that's the one other packages generally link
-# against and iptables changes.  Will have to revisit if other sonames change.
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="conntrack ipv6 netlink nftables pcap static-libs"
-
-COMMON_DEPEND="
-	conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
-	netlink? ( net-libs/libnfnetlink )
-	nftables? (
-		>=net-libs/libmnl-1.0:0=
-		>=net-libs/libnftnl-1.1.1:0=
-	)
-	pcap? ( net-libs/libpcap )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	>=sys-kernel/linux-headers-4.4:0
-	virtual/pkgconfig
-	nftables? (
-		sys-devel/flex
-		virtual/yacc
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	nftables? ( net-misc/ethertypes )
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Only run autotools if user patched something
-	eapply_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	# Some libs use $(AR) rather than libtool to build #444282
-	tc-export AR
-
-	# Hack around struct mismatches between userland & kernel for some ABIs. #472388
-	use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct
-
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
-		configure || die
-
-	local myeconfargs=(
-		--sbindir="${EPREFIX}/sbin"
-		--libexecdir="${EPREFIX}/$(get_libdir)"
-		--enable-devel
-		--enable-shared
-		$(use_enable nftables)
-		$(use_enable pcap bpf-compiler)
-		$(use_enable pcap nfsynproxy)
-		$(use_enable static-libs static)
-		$(use_enable ipv6)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Deal with parallel build errors.
-	use nftables && emake -C iptables xtables-config-parser.h
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	if use nftables; then
-		# Bug 647458
-		rm "${ED%/}"/etc/ethertypes || die
-
-		# Bug 660886
-		rm "${ED%/}"/sbin/{arptables,ebtables} || die
-
-		# Bug 669894
-		rm "${ED%/}"/sbin/ebtables-{save,restore} || die
-	fi
-
-	systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
-	if use ipv6 ; then
-		systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
-	fi
-
-	# Move important libs to /lib #332175
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-firewall/iptables/iptables-1.8.3.ebuild b/net-firewall/iptables/iptables-1.8.3.ebuild
new file mode 100644
index 000000000000..51b1a40e408a
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.8.3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Force users doing their own patches to install their own tools
+AUTOTOOLS_AUTO_DEPEND=no
+
+inherit multilib systemd toolchain-funcs autotools flag-o-matic
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://www.netfilter.org/projects/iptables/"
+SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+# Subslot tracks libxtables as that's the one other packages generally link
+# against and iptables changes.  Will have to revisit if other sonames change.
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="conntrack ipv6 netlink nftables pcap static-libs"
+
+COMMON_DEPEND="
+	conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
+	netlink? ( net-libs/libnfnetlink )
+	nftables? (
+		>=net-libs/libmnl-1.0:0=
+		>=net-libs/libnftnl-1.1.3:0=
+	)
+	pcap? ( net-libs/libpcap )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	>=sys-kernel/linux-headers-4.4:0
+"
+BDEPEND="
+	virtual/pkgconfig
+	nftables? (
+		sys-devel/flex
+		virtual/yacc
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	nftables? ( net-misc/ethertypes )
+"
+
+src_prepare() {
+	# use the saner headers from the kernel
+	rm include/linux/{kernel,types}.h || die
+
+	# Only run autotools if user patched something
+	eapply_user && eautoreconf || elibtoolize
+}
+
+src_configure() {
+	# Some libs use $(AR) rather than libtool to build #444282
+	tc-export AR
+
+	# Hack around struct mismatches between userland & kernel for some ABIs. #472388
+	use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct
+
+	sed -i \
+		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
+		-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
+		configure || die
+
+	local myeconfargs=(
+		--sbindir="${EPREFIX}/sbin"
+		--libexecdir="${EPREFIX}/$(get_libdir)"
+		--enable-devel
+		--enable-shared
+		$(use_enable nftables)
+		$(use_enable pcap bpf-compiler)
+		$(use_enable pcap nfsynproxy)
+		$(use_enable static-libs static)
+		$(use_enable ipv6)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Deal with parallel build errors.
+	use nftables && emake -C iptables xtables-config-parser.h
+	emake V=1
+}
+
+src_install() {
+	default
+	dodoc INCOMPATIBILITIES iptables/iptables.xslt
+
+	# all the iptables binaries are in /sbin, so might as well
+	# put these small files in with them
+	into /
+	dosbin iptables/iptables-apply
+	dosym iptables-apply /sbin/ip6tables-apply
+	doman iptables/iptables-apply.8
+
+	insinto /usr/include
+	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
+	insinto /usr/include/iptables
+	doins include/iptables/internal.h
+
+	keepdir /var/lib/iptables
+	newinitd "${FILESDIR}"/${PN}-r2.init iptables
+	newconfd "${FILESDIR}"/${PN}-r1.confd iptables
+	if use ipv6 ; then
+		keepdir /var/lib/ip6tables
+		dosym iptables /etc/init.d/ip6tables
+		newconfd "${FILESDIR}"/ip6tables-r1.confd ip6tables
+	fi
+
+	if use nftables; then
+		# Bug 647458
+		rm "${ED}"/etc/ethertypes || die
+
+		# Bug 660886
+		rm "${ED}"/sbin/{arptables,ebtables} || die
+
+		# Bug 669894
+		rm "${ED}"/sbin/ebtables-{save,restore} || die
+	fi
+
+	systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
+	if use ipv6 ; then
+		systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
+	fi
+
+	# Move important libs to /lib #332175
+	gen_usr_ldscript -a ip{4,6}tc iptc xtables
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 735435e58e44..3201293f8401 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -12,6 +12,6 @@ EBUILD nftables-0.8-r3.ebuild 1959 BLAKE2B a029fd4444f5aeddedfbdcb3659f879c4a8f6
 EBUILD nftables-0.8.5.ebuild 1937 BLAKE2B b24ea2b8978dc0294c2d27a90aa205916ddeb04c2b66f0adc7e870705a6ffac8ac0e3bf5a95e3c79c27965f780c0ca94ba21bcb5abad49ce49b50ff00c2046fd SHA512 f5f461225c68ed17450380d467f79d87302f0d1c1d69ddb15f90b6a938ea79906e165e6564db8135f07eafc35fb89acfab7659a97d62c7c71ac0376953ff6954
 EBUILD nftables-0.9.0-r1.ebuild 2079 BLAKE2B 303d82b14d13f49c7ed5222d69025eaf0d73e3ec617655b33224b8a1f14e4a16a9d9e71a60270cb3e015bb009efb43ccb419a722a4780cdba50cc2ea341a3eda SHA512 68386a156baa050c83f6233516f8e37f871a2be203d71c751eeefbfbbfe52f114201c2a6eced8bfa194ca8e87c9ad62d6370096c0ceab6e60927cf236c12dfe6
 EBUILD nftables-0.9.0-r3.ebuild 2343 BLAKE2B d726f8bef9ddd5860fff0d91cf29185a32432fc24ad31b173330dd4f881809f66e62e805dcbb9d1e4bbc9f0c3c8185ceadaa4db7882266a1747f9d5f522e1e9e SHA512 953a2e64cf4ddc2591335b245ca8a0b18056cb55c46f7796fd1e4de2f774ab3bb2b3bb6be70b49c7c7d1b4d4780f1e5e3335b84d1d97e9a4a99443aecadc91e1
-EBUILD nftables-0.9.0-r4.ebuild 2494 BLAKE2B 7afd80b8e98ca1c45f3024fad2d0cc05a9f198f10a779e410ce9b7d8a4df7f5b13e67dd3c24a985207ec24bd2aac4e59cc5eb7265f9d29b165a8258aec79e335 SHA512 3a27cb493a3d1e386c845891fdcc66b112e724c08258bfea8d7cd7dd8977704bd08efd6ce504b3132d7421a79117c4fee4864fa547f8f4d968676b664cd754cd
+EBUILD nftables-0.9.0-r4.ebuild 2501 BLAKE2B 3b02b0b809c78afe3d6001c39a1c4a2387185ecbe2ebcce43fea231f9d1ecf73fe8e5cecb4d73b4ed74cebff3fb7f3fad78d5d4f88d5ef139a56f2160f0aa89b SHA512 c3e4a4591bbf7d896fd81e18d621a18bd03eeae24f9e9e2be7d2fb833975e7a2e9568b0d10a8b0216fc20949d361e614a900f77112e2f4b2c0f05fe16a4af23a
 EBUILD nftables-0.9.0.ebuild 1993 BLAKE2B b0e94b4b45f247a02fb77980141647c65a97dd291343decc7baf510421e5e33f8314c25e7cece5ea794a243baa2dae939389e1e876e13105333c4edb68f7ffbe SHA512 5283b79acc5e71f3b6eb197ce21ddd4be71888bf693d62485dc516bdb67ce2808d1ff136173975e7bfaabdb565ca1b400c3aea9e68d83cca9e994e7d03cf8a08
 MISC metadata.xml 701 BLAKE2B 14244e9f37e87bc6e4a9cc917b7f2e55bcb61135af3a9ff258334ef9d40ade40312760f30ddab907d75f4c4492cc8d8d2217d022f5e04672988c25d65ec1d85a SHA512 070e4dcaf6f323f93fac80352d2c2ae1512611ffc3261e7b3c85acee9f490f90e238b39aad2a7d4959c75fe7c96545b8c12318b09d4c56d8116df80364bf09a6
diff --git a/net-firewall/nftables/nftables-0.9.0-r4.ebuild b/net-firewall/nftables/nftables-0.9.0-r4.ebuild
index 6578419d4fef..0529f229347c 100644
--- a/net-firewall/nftables/nftables-0.9.0-r4.ebuild
+++ b/net-firewall/nftables/nftables-0.9.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
 IUSE="debug doc +gmp json +modern_kernel +readline"
 
 RDEPEND=">=net-libs/libmnl-1.0.3:0=
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index b18e914ab2b5..c8b1eb121d2a 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 838f27c298b5..8f958d1c1882 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -17,17 +17,23 @@ AUX smbd_at.service 145 BLAKE2B 729dd189fc69ff33930ec96a68cff42438645ff7f3cf0a88
 AUX talloc-disable-python.patch 1706 BLAKE2B cc447f5077c82d7eb584692121b9b34c03afb5f7dda2b799ea518d08421d31ce54fe2422c5ca7efe74f66011951c97b171a326604bd67446a15ad2849bade919 SHA512 ac0bf82e8ed8b918a5efbdeb0a6cbaaef22bb72231abb09026637d62b8ce35b25212960d26c07abe63661328ab7ea8a82590cd93f04de583e23239211daf6efa
 AUX winbindd.service 240 BLAKE2B f0b96a5a1d93a3c04bb2a2b2b500718b41fc907a3c551827a459c5d8184abc3caed0ac5edcf16032650dc2d58c38b779473c7a619047956f1381415e3de4dd93 SHA512 f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7
 DIST samba-4.10.2.tar.gz 18280710 BLAKE2B f15b117d1159dfa6cd279c5011629d688fcfba94a2ca8184a827d0787a31f76a38f46b355454b916f2e62c0a88109b86664f6bb16fc0e23d0f61d09908e587cd SHA512 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf
+DIST samba-4.10.4.tar.gz 18289224 BLAKE2B e5e416ed9ab51ed8294023619c6a4b8a6d41b0962cab7b9788d8d8b21706bd93a1d6a3833712377839d6112b67ce6fbd0d9be93f64c0bd603800624b130b780a SHA512 10799f866b896903baaea5141af89cf442f3892d9c6f74b7acf217dd95abfe77b09f2bb001273cccf2e433bd2e845fad90651970952b4e18e8cd37bde956cf4e
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
 DIST samba-4.7.12.tar.gz 16923189 BLAKE2B 98ea5e535482a4cdfeb4f9ad70bc8c40bb6d5a8920ce9bc6dda84f20698245c3c5d472a5f79984efc81f9c32d1d1e72b1fcdffb137e3a27634f4c521a1d46a48 SHA512 951dfc0ea7130da9d9aa3069ca276e630d67171a1995dba368459e0cdf00337d0f6271827bffec694371010614a1a7ce2349840ddedd0231315f6a56dce2fcac
+DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64273abc9be0639b011f71072926a0b303cf53e63c4e470aeb168e8ec23003b5f4ed4258aac8d6b3d029f71fba6f SHA512 f29595f6390d01860cb6acd750d2e36b4d207dd1da16465c21c8d6d732ce27bd0582a0f34296081e2659638d839c8b12f28deccc31982afa94650da8bce8df8b
 DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
 DIST samba-4.8.9.tar.gz 17750151 BLAKE2B 09f350be7f262889708c1b8f779c0e003cc292e0de2afb19f35ec12d43c4c5874151e984699218a563a11eb24b13f1af33607d2accfe699fb0b5f6bdb1b9b367 SHA512 733eb769e21fc563d4deef17c54de025d05ceec85f8b16513bbeefdb3cb99c3611027e049014d3c29cb6463ce2660be92c97f8b5f741a6b67424c8f329a88ea4
 DIST samba-4.9.6.tar.gz 18068196 BLAKE2B 03a04abb430abc4b7ba6fc5ade8690c215948d24fe1044d79c2dd1f8242b6708f0618045e37ad73114413dcef70bcf45de15f358a0e012cecfea045b9ab9165c SHA512 462774e60f0165aa445821795c373ab6845ac2790578a68e84c0c82f761ddf29bf5186106a95f394e24b8ef7393d7abe003f95e72f5c5892bbf992f58e350531
+DIST samba-4.9.8.tar.gz 18081493 BLAKE2B 026c166ec10c799be0e7e8790b8285671884ae42435895a3f33219ad4a3dc42bb8681c0b2e683fcf6955cf6d27fe3f150ee589fdfb2570a98863045c927d26da SHA512 80d93f10a415960b758c7fd26c91c27eeb9e8371eb82681aa287e139f9388b6131c9ab5460d39b912a22a79bbad9de210753ba01fd55fad8b2db91190ce3f286
 EBUILD samba-4.10.2.ebuild 9070 BLAKE2B 80a704b0a82cbe4a720cfb8418da6c5b6245f54da0689ff704ec579f38a05894d7a5474977b2802432670a9424c4efa8fff3f234782a551d54b5ac247db8075c SHA512 ea1422a0eb843444d7ab232d85fd1e5be1022aaf2ff785ee67edbe65516acc7d6d40ecff4a767de2f18290c8f91710c90aba19c2a19b91c32c98be61fe57a3a7
+EBUILD samba-4.10.4.ebuild 9115 BLAKE2B d0d8c4b014098218e7dc30b5169c5ee474ceada2e774e78b7e8a3f76d61703553da7c6ab298dadee21db500124858089497711783307f801c1d92443411204b9 SHA512 4c1c41e3e4cefce8721d07f29894dbb64825f1d514fbfd964285a9509986aafc2aa8819bc6db4fda24b864e3412a620323bfbf5d437803f9a907f5f4b400eeca
 EBUILD samba-4.5.16.ebuild 8166 BLAKE2B 2a0d68ff2848c1dee76d8329cab4f5a0b06bcac989b55a97bac1211f194b4c10736d8fd99eb32779c86406c8aa4c45523af34f43f70eebf928e4ceb787d374e3 SHA512 5a3e1645ec3d05ddf26e66f75cc2f43c86baad8b08e40e137919f0b33d68701cef8460fd3da3d080905af538659b834169e66cc946517ed1c9190dc52ac697d3
 EBUILD samba-4.7.12-r1.ebuild 9188 BLAKE2B 458197bbc0248729c819bcd347fd6fe6a31acf4e858d6b7d204c91f528bc029901a7a30004e16146baf789b4aae1a82d2eadae8e257a1a89fe320220bacbe2b5 SHA512 9bbc844a9cd1883eb6097e12482641c83ec140caf1870cca8879b9d3f3392a462fa11084ff285c547725661747432c0c9a327f83d2da1997709eafe5c133dc52
+EBUILD samba-4.8.12.ebuild 8901 BLAKE2B f01720de64da1ed13c6f717891919c2ccfad0221d1e0f6a612e620d7de8bcea57fdec4c10bed8e9842c31a412a1681b2e0376e7ac628646d121584de54220944 SHA512 deed37996e47a8889f783898fd0c99c63feb20a4d6b811384b8a964cbc4363c3e63d8c404de4a3bf9cd310cbdfd0f440434cd86d7c7426cb8a4bc6f5c88ea9fb
 EBUILD samba-4.8.6-r2.ebuild 8469 BLAKE2B 506742391e1260943d41db47153ae4ea37a32b69b7ecf53a93404fefab3255a4409b954630b48402efef07c6edf71a73af8704926c314a29ae681212bb40f693 SHA512 b0039151acbef5e6c80eeccdf9e123c9b9168dfb320977e7a0d743be961c8f6aa84acda5b352be1882995b936105f40d34043e64344026cd5a18cdf5f68ab63a
 EBUILD samba-4.8.6-r3.ebuild 8862 BLAKE2B 23eea9d9f1e1aa4b5812b10a190a6c6d609dc9d7ce48a5052eb0505289aabc7644090e15bc72c7bbc2d79a42707d16fa36c3e41a58cdcec0c292b50d20ec7905 SHA512 d98d4a73c0404912a6946b0b9b793542158d061a72a1979e4e8aa7a8d378c818e29f3049daa07db71f4b3ccd550ce9325b85d5beab3d13204957912ac99cc4e7
 EBUILD samba-4.8.9.ebuild 8857 BLAKE2B 2b1aa17cd241772ca12823d869d16dae818964aef1046d62cca7921769272d101861c415e26d1f4aee7e61b83b73599ba1e9435e4f06e49a0b5dbf61de0c4ddc SHA512 66f517a1541ade2895cee149c943fd2f974d99de547ac203edefcccd2f5ee75c7f7ac8e7fa50d067a858eb65f8b51f3cc2703627c10707312231d43f7d8c79de
 EBUILD samba-4.9.6.ebuild 9016 BLAKE2B 91a3d6efd4dec823cf96b413123b9f78590d7e1e782ce12bb51da99006e9cd5a7392e3789cd7a1d45d109a8a874002219155342e5fe061d036606049d7f2fd79 SHA512 dc697d8348cd9b8bc4c066569ee7600fd795c32fca57613a67c6d20ed2460d337c441dd799cf9f59fc9d95ff3a09ea2ef67d002a9b4901870c89e6af88729018
-MISC metadata.xml 1673 BLAKE2B 56bdd566235a3db45ebcbb546a11c12b035b41f54bd00df2fbb65f47ff29c7a2ab5466cdaff8fef6fd72a7b5fc9af2bac1e4050bfd6db3220c32ac383eeeeb1a SHA512 2436c4c24de5cebee90c6fb49d52dd9228a3f0deced53701d229f1afa3bb7eb29621864678325381dfacd1d221142368b27d4800ebd2412b18595ab106ddff01
+EBUILD samba-4.9.8.ebuild 9060 BLAKE2B 966a27c76b743bf6548e5a8e794344c100dc65031d42aca9351e5d9f56e5fb66fe150b4e22ef5c5701d70dcc845218bebd28e276aece5d8b81b7bb247e45b2dc SHA512 5fb312a2f176e7f4fb928411ff9d212c21aa004837fe5e81aea43cd8d78c5c96c6f81b7dae1763913a82488550d989219aac12b73324925b3f9aaddf7e7258d8
+MISC metadata.xml 1756 BLAKE2B 74fcabbc9a00bd2e2b91d527354edde5e44c36755d81c849c2a81c03590794f1be30a92ad7cade453fdb183754ace37f7ddc2c171eab657689cf34d83e840aed SHA512 65ee3dbcb246c068278ffb6a8eaaa439bea10fa86662504d2aacfb1bcf58a215d915e50c4c6ea6c6e989870f7a9d9974b7a1a33d2a2f0077b9e263a6adf94279
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 97a8476c02ff..fb277df6bb3b 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag>
 		<flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag>
 		<flag name="iprint">Enabling iPrint technology by Novell</flag>
+		<flag name="profiling-data">Enables support for collecting profiling data</flag>
 		<flag name="quota">Enables support for user quotas</flag>
 		<flag name="system-heimdal">Use <pkg>app-crypt/heimdal</pkg> instead of
 			bundled heimdal.</flag>
diff --git a/net-fs/samba/samba-4.10.4.ebuild b/net-fs/samba/samba-4.10.4.ebuild
new file mode 100644
index 000000000000..9abce7be82cd
--- /dev/null
+++ b/net-fs/samba/samba-4.10.4.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
+iprint json ldap pam profiling-data 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}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.39[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? (
+		net-libs/rpcsvc-proto
+		!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 )
+	json? ( dev-libs/jansson )
+	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
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	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.9
+			>=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 json winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( 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.9.2-timespec.patch"
+	"${FILESDIR}/${PN}-4.10.0-disable_gnutls_build_fix.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# 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_with json)
+		$(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 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+	)
+
+	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 {} + || die
+
+	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
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf || die
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+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 "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild
new file mode 100644
index 000000000000..abff5eeec78a
--- /dev/null
+++ b/net-fs/samba/samba-4.8.12.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 pam
+
+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="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://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 profiling-data 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}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.4.0[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.36[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? (
+		net-libs/rpcsvc-proto
+		!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
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	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.9
+			>=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 winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( 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.8.6-no-pydsdb-when-no-addc.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)
+		$(use_with profiling-data)
+	)
+	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
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf || die
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+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 "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.9.8.ebuild b/net-fs/samba/samba-4.9.8.ebuild
new file mode 100644
index 000000000000..b254b52dad44
--- /dev/null
+++ b/net-fs/samba/samba-4.9.8.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 pam
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
+iprint json ldap pam profiling-data 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}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.4.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.37[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? (
+		net-libs/rpcsvc-proto
+		!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 )
+	json? ( dev-libs/jansson )
+	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
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	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.9
+			>=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 json winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( 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.9.2-timespec.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
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# 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_with json json-audit)
+		$(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 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+	)
+	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 {} + || die
+
+	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
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf || die
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+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 "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 2aff933f5f00..b6d49bfabf95 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index d51a61ce4817..d52eac83c6c6 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -20,6 +20,6 @@ DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a5239
 EBUILD proftpd-1.3.5e.ebuild 7264 BLAKE2B 3e5e8dca76b1a6fcd8de4673fcb2af33454bcf2443626bbda699149251232579d24655d6bf89906feddabd502df682a2f01c19e9b0ba8d6e8f428aa3af154d4f SHA512 a0b0204493f6d10741830d9eef7c5b2349a27765ebc7c6ff3b6baa4879549c8c1d68e409b35af72b4271c2c70ef65639db9302f4d93965e4f02df9f0e908d512
 EBUILD proftpd-1.3.6-r1.ebuild 8455 BLAKE2B 3152ba84ad6e73b57413a9ef9bef3f9557a9e63a3be9fdf1838ba65c8ec9be653dcba036af7c199832faa85bb6d4fcf92c48d88adf7e99214f51f51c0416afcd SHA512 6f658928141d2b08ccd93129a96a9c5bafe766a6706e7e47c6ecd2ddf64a3c373930c6db5dd9974bd2f19ea4a194da39ac939d016dab4aae0d9f8cb3a4b6a085
 EBUILD proftpd-1.3.6-r2.ebuild 8533 BLAKE2B febfcd73184829ca04f0e8013ed4ad16ebbc3640a186a1432193bb991cae7f5723bfe1118ea558565ddb25e5c05e1b04d0e69392a912b2b790f6309226643c99 SHA512 ae98a188143fb35a8cfcfd85fccb6d57f28af3a5d4f978c74b08269d1e68d7e4ea738adc0793f7bb04a20791062d9e12e4ddd5db8269e9aa8299663b7eec7a00
-EBUILD proftpd-1.3.6-r3.ebuild 8576 BLAKE2B 46aa0412fd0ccae50c80cf06cf4ecc5e397b194312f5f48e8a320f95bdca0d2d0c23958b07c99073280bf63096508207331e2ac9da8a1068cde6043412a4fcd4 SHA512 62453b086d64bb8d11afafe13f5c9136547b6ab13a1dfc63693d00ce76c4ae93d68fb0cfcb581114c56c3e8c0379d871ce450773a8b41bcd3712b13793d47939
+EBUILD proftpd-1.3.6-r3.ebuild 8627 BLAKE2B 4d486b8a8d72cf34774fe373582de04b95d22be1865080032df14007386e9add7d1ae16ffe012d9650256db52e81472ef2f71cd3093dd8afb56ccf267ab43aa5 SHA512 72fd496f8f3b309a8532b218d2b578261fae2a741ec49302ad70e4d9087b0f130555f5c576f4b702f1c57efd92a379df548eb4232b5d3278b0f657767c41fa90
 EBUILD proftpd-1.3.6.ebuild 8337 BLAKE2B e968ce2c91b562da83a80ddf50a6acebcf16b3d8cbcfbd7dd5d6b3a511de689cd9bf67086844fe5ba502bc491731b5565c792734ebc0cfd57415f53dfeefde81 SHA512 294b99f911ff074c6ba3cb0ce3c58a59aac53255c494bed4dd8f49f450a0eb14b0e7f50cd3521c5ebb79229af35f36a919f9a267aa9b7d4f2ef7e21f3999bf93
 MISC metadata.xml 3028 BLAKE2B c9b780180099942fa3a023629ed5f5faaf9a84eeca9f95cc88665d310c67b7647c7917e5d1a0ab4e1ecfa85b993af260f32f604c30267083364ef6b7683933e5 SHA512 9558151e889dc4a1f90968565247446ad47fda8f3e048d67350ad8580067fd995f8a79cef3673c462f75ebdf6fa830672c3a078d7e26b493dced84bfda8520bf
diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
index da2fff59e8be..c5b9e539a75a 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique_id vroot xinetd"
@@ -34,7 +34,12 @@ IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynm
 REQUIRED_USE="ban? ( ctrls )
 	msg? ( ctrls )
 	sftp? ( ssl )
-	shaper? ( ctrls )"
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
 
 CDEPEND="acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index d9c1c28c9ccc..bcbca0b262dd 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index dfda25b2bb6c..c7b411a5e66e 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,4 +1,6 @@
 DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
+DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
 EBUILD gajim-1.0.3-r1.ebuild 2175 BLAKE2B 8b4edb274123a0d6df82ee6776762e21848c47969c67a2d4b6bf9cbc863b2a479df6511959d932c8ebe25e2fe34d076a6dc5390c0f9ab1e30548552ebd5ed1b7 SHA512 3bb95be0156d410949d6237a5084c0e2b4d9b79a1742df8bf10d9f6b349864df9c2813116999ff688a1dd206df5703d52615d79a3e0350b3eeb7bbb3f6ab087b
 EBUILD gajim-1.0.3.ebuild 2173 BLAKE2B 2040e327866a96f479ea97d79975a7394ed4958505ffe02969f27b8e7a28e8f0a57aa3064b7ec6ae99485f287bc9b76f2956f608a01cbf0d80d4ae96a97d572a SHA512 b413d58eddec79a358b4407d40ae7808730e5f7a8b59c9eabcbad822aec7c8a7c114c966ef8640f3fda3ba16a172d8d48cbbaf7bed7e2015b3b7573dc8ecafba
-MISC metadata.xml 1063 BLAKE2B b36cbe426b80b9412e715fd3c66525ed89411e015d4cb2a68e34515e1f63086f75872fc6009d02e57cd0618c52c0a036a09b2a36567b8c390db254d672f72bd2 SHA512 6a045a2dc6ba1d1bd30139943fea34b88844bf8f8fefb6f2a2d389f28287e47ad349749ff240c3dfae96f542ef037417db5283b5169a715eb0788c567b1afdc1
+EBUILD gajim-1.1.3.ebuild 2217 BLAKE2B cab09e9b550f0b5b39b1b7c39bfc84a013010d1fbb8fc1cd1e1bf4a49438438882b4406d9b27fb7e2f2e104d99f27825da4e7c7b9c7b3d35f5db6fd0280617df SHA512 240ba8a69ab9a0e4ede62d9cab9046a4a8226e1a5971e700e0609537ff20bbfe32f226f5d8ceddbb514b3f6a8f322a7c33196ecc7e58d84916941ce80cd60f6a
+MISC metadata.xml 1061 BLAKE2B d7e37cec9e291addde0d1c18b155afdadee1225270c7f34f8a916f45ad828353f677f87e6de49994ba14af8cc4773689d7f629f991326e94a43ff36fa9c9b981 SHA512 f9eb4f8a033ca5cca7a2de4a43e98346cf446a20a9257ea95b37d9a6be6051224d55b32272167946c2cbef370cd3c1ddc3b27ce6b8794823d1e9ca9b5ebcac44
diff --git a/net-im/gajim/gajim-1.1.3.ebuild b/net-im/gajim/gajim-1.1.3.ebuild
new file mode 100644
index 000000000000..1548f5c281dd
--- /dev/null
+++ b/net-im/gajim/gajim-1.1.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2-utils distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="https://www.gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
+	+webp"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/precis-i18n[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/pygobject[cairo,${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/python-nbxmpp-0.6.9[${PYTHON_USEDEP}]
+	x11-libs/libXScrnSaver
+	app-crypt/libsecret[crypt,introspection]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
+	crypt? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+	geolocation? ( app-misc/geoclue[introspection] )
+	jingle? (
+		net-libs/farstream:0.2[introspection]
+		media-libs/gstreamer:1.0[introspection]
+		media-libs/gst-plugins-base:1.0[introspection]
+		media-libs/gst-plugins-ugly:1.0
+	)
+	networkmanager? ( net-misc/networkmanager[introspection] )
+	remote? (
+		>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+		sys-apps/dbus[X]
+	)
+	rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	spell? (
+		app-text/gspell[introspection]
+		app-text/hunspell
+	)
+	upnp? ( net-libs/gupnp-igd[introspection] )
+	webp? ( dev-python/pillow[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index 67b5f8003508..b7751e37af04 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>aidecoe@gentoo.org</email>
+    <email>hanno@gentoo.org</email>
   </maintainer>
   <longdescription>
     A fully featured and easy to use GTK+ Jabber client written in PyGTK.
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index fad7a4d339da..57c448be28f1 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
 DIST signal-desktop_1.24.1_amd64.deb 89896368 BLAKE2B 2bda1aa749b0f008dc37648a397b501c6980fa8a860bec7249a9742cf8cd69d547259aac96c9cd0bb79372982b9e5e4e03c331cd99175406132f8a73b559e8f3 SHA512 9e8105f42405a980dc1934a5502f81915bebc2ffc9c06777df676fa4384c533d551cbd54923a22208a160d0f22a52ff55044f6a32beb9bf68ef3b1fc16bead6c
 EBUILD signal-desktop-bin-1.24.1.ebuild 1653 BLAKE2B 93394fa752e482fb2860399d3737e819bd3086ac84750c3d2699451d789edbd4d6bdeedfa98e4e9da1df670e4ef20488c13184e67843e8e88bdb591e8e0bd6a6 SHA512 9197e96d699328b966e70d2d5bd4eaf2bd419e55b69e7a4e3ecfa00135bbd9b54e03e0aac8700a1969d6f8bcfd3d4ea860e2ff03f684898a451cd1cae5690cbd
-MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
+MISC metadata.xml 501 BLAKE2B 160ad95d95c3a77268358b27e8ec0050b74fc0fc3f817577f8883b8dcf647c1c8289059bedf2260d6338ba218f48bd116dd75e30b175e7290550d74f09fb32a7 SHA512 cafe6a933400547fa34405893240bd75b22e3f6fef8298d2693ffe073b1540dd1745f5314f35c3f12e72da062b327bbccf5c7bf6f5415a5c75666e90652c56a8
diff --git a/net-im/signal-desktop-bin/metadata.xml b/net-im/signal-desktop-bin/metadata.xml
index 0961ae0091e8..04db50894c6b 100644
--- a/net-im/signal-desktop-bin/metadata.xml
+++ b/net-im/signal-desktop-bin/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>gentoo.bugzilla.2012@r123.de</email>
+		<email>gentoo.2019@r123.de</email>
 		<name>Robert Siebeck</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 9d36cfaff9ea..938647239903 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -8,7 +8,7 @@ DIST tsetup.1.7.0.tar.xz 32941420 BLAKE2B 5de9d4d34c4667dc40f79d7a10f01490647678
 DIST tsetup32.1.6.3.tar.xz 35580176 BLAKE2B 55518aae40367b8af161a4748bfee656f63c099c327853f01dab11dc4dc6f0c34dbb7236ca58b662905f985b82a4191f645757a8a940534b8893b2222914d666 SHA512 68d08a2b5a0ca5f8ceb918ab6261f51f3650df647262268822f9ff662527339a707f40bb724edcf3d1ea61ca254f77f7fdf2f50413559fd4ac4dffb0adcbdf22
 DIST tsetup32.1.6.7.tar.xz 35654388 BLAKE2B 328964b24d6aa883b24a559a5728faa33660a38d3e6d8aa2c035a59ecdf3c006940ddd6ecfe7976a5b6528c1a08eb8448199478c75dd16bd9c324ac826e29637 SHA512 ef149e2e32a61ebb38e10e907550efa014f8121ab1f2713e3d85e27f72e9f895c3c99921f42dbdd906f69508bc25786a06ff7763317a94fca21ec2eafbf240ac
 DIST tsetup32.1.7.0.tar.xz 35534532 BLAKE2B e72445cccc7f49d17638ce65feebfaa73803c6d27804151efc42bb6a1c3610819b05ef5c8e8931ef410c97541912db2eeab8b8c036bc06cd954b28a48ef46593 SHA512 400b7c468748a782758b3b02d12ae5743aee864341b0765745a2e6f604094cd431dd7e17a228259cbe734054d9183efe880af325f88d80f939fa5a62a7845ad6
-EBUILD telegram-desktop-bin-1.6.3.ebuild 1632 BLAKE2B 437433f439fa7032124c15a64094f92081286656429e790d222d29f59a9508dc5ca1d74edebeacc7666bce3cb56038d8f1f53cd307119348175ae0ffe23ba279 SHA512 9ed86eec52ba8f3804102e1806576b718f7b2368be6c99cbcbf361211e228a21741c4b202e9b28795dd2a3c3c046e0d1d30f26315389dd292c4fd1391300376e
-EBUILD telegram-desktop-bin-1.6.7.ebuild 1567 BLAKE2B 11cb0c526d9e80b9b28af214d851ebba2e07ca4ffd8ad097abf48b6d4ce95d3f02ddd252e80c0396df93370bbd05b0600ea9b8950aa606c0d0c484b9aac2e059 SHA512 0d16a8a03bfdb798fc6f4800c2282ac8ca52736975b8e4e1eb1a5ab9b3d596f1b545cf61249efe37f3403f8516325226950b132832c3e85e85f204784f20c1c8
-EBUILD telegram-desktop-bin-1.7.0.ebuild 1567 BLAKE2B 5608f77e075d41329e826c4cf2f509f6d1866fcf7f389575e7c4b58f0ca9442b3c35328c57e651abd0b452d7235ac7545f184c81913fad19cf4e79b768476636 SHA512 9e11a59cd33a4429b4a9ea751560862cf9238471dc0c08fb0da5324293c28a63b06c98ba08d5d1a679e4023871dc718c06af8a4281f6cc298e830c7fa9484e79
+EBUILD telegram-desktop-bin-1.6.3.ebuild 1652 BLAKE2B 2aa98799e662752878a8097a7c213dc21732a1772828c74eee5ef4405e18dd44df0422fe539192eb47b6c6869e64f29183ef5bd08374af61582725690004a7b2 SHA512 d158e44d4d851789de54d8a017e426dd5e34c311381c0b6340a58ae7540d9201d7c00ec11e69fd3aed469a3d3a7ad2d06f3c61c39325f8af4ff5e7a6a50d2715
+EBUILD telegram-desktop-bin-1.6.7.ebuild 1587 BLAKE2B 3d898187c5208415ae2b4849a5bd7fbfc7bc08b7b1edb0b42a94676a0610bc4daec1b782b190797dd1411392b3bec7d715fa300400a8eee8a0a7117fbd8fafed SHA512 fbef862e380193ee3c89d4cdf253bfb1551bf8195a05189001f837d205049337377223560b3f2d1c7cb43f8e8f9ed56e7bcc6dc37ecc43fb6051199d425ab979
+EBUILD telegram-desktop-bin-1.7.0.ebuild 1587 BLAKE2B d108d0d59875c5d87a462c01dcf8c800971a2f4988e9e87e46859ad4905e2b0049e6c0473fb5bc173e5a0b4927b056672e827fc96ca3455b5cb049ebc0970d63 SHA512 e78c76acf267ec6d7d9590c7f3312b06be7a5660be1d7868736132ae3702b87dfbb524bffa14a45498da34f40087b91db15cc065da5d34643dd32a0d1fd86db8
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.6.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.6.3.ebuild
index 10f3a4e22b72..8229c739f38d 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.6.3.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 	x86? ( https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/tsetup32.${PV}.tar.xz )
 "
 
-LICENSE="telegram"
+LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.6.7.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.6.7.ebuild
index fa1922505479..ca20c1c30a0e 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.6.7.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.6.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 	x86? ( https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/tsetup32.${PV}.tar.xz )
 "
 
-LICENSE="telegram"
+LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.7.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.7.0.ebuild
index 5b051b508f5b..55d80d8203c1 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.7.0.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 	x86? ( https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/tsetup32.${PV}.tar.xz )
 "
 
-LICENSE="telegram"
+LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index ebdf13c324fa..f553bdb4dc1b 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 732693cb1e1a..8b21753e0806 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,9 +1,12 @@
 AUX inspircd-2.0.25-fix-path-builds.patch 9669 BLAKE2B 8b6612800028658cf231be62fbdd92638bfbc64fc1e9634bfbbdfe997f2915f583aba8ee41fbf98f44e016b1bdf17936017d5e9217c29aa404576167526f9d1b SHA512 0595199d8c5c44ea3dff19e08d4a1fe9bb5011befbafe7b58fce2cf7678f30cbaa6ceedb408141519f4068c3b96dbc41aecb8112d180ca66e9deff00390935d9
 AUX inspircd-2.0.27-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402
+AUX inspircd-3.1.0-fix-path-builds.patch 12262 BLAKE2B cef2d7bac65cbf90d219852e5692154c659cc3947bc1626ec2b47f34b617c0bb2f3aef451925b2dd59f37da02055049aff250d8cbb60e770ac11fe6ef7ee636c SHA512 7ca1a2a7218797775238bd68d2c1fbcfc1797de4a2b4e9e2e64c7e12c84acc285f9576c056e18989b10279f5314f6f910fde60ae2e11b993f3523c6f328363f5
 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
 DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
 DIST inspircd-2.0.27.tar.gz 735970 BLAKE2B 74a262ddd5f7d2fd61a1a01cddb0d61bf58e9fcdb3a69ebda15d711f3439b7b8e4387ee9ef3b55309e213e1e8bdc2978ca5b319720b0fcf71d9645f13102c2a2 SHA512 56f03c3259fad54365e97fd82f4e309edc60b641ccadd7916d04156fd157858f79930c8b9df99aa98c5505f76ab19e6bcd150ae5ed04d2bddfff572e18226cdd
+DIST inspircd-3.1.0.tar.gz 795435 BLAKE2B 86f4c62b61ea2692be4f0bba21976e738f733187640f7fa43f3e90fb29b5a6e1bd4769fcdb86f1912a43cd856f5d1d28a335c2e6e4c86db6097588247ec6e119 SHA512 77e5602115d612be6bb1dc0123f5fde2e6ff0547376de04cd5c24de9376797654bbd62a01d058b6f27858bd338ae9126cdd0dcd8571ba0c33afc1f3e166e000c
 EBUILD inspircd-2.0.25.ebuild 3376 BLAKE2B 802a96022a2cad65801d6dab88d2069523ce72914b2558718b39dde9891e6e0b78cd432541add655cdf1a01376ec1f8d216640c9480a84deb36b703345377859 SHA512 fd9a2c56b35f6855a68e8d697df1e63100c0abafdcd7a79b4ca53bc0f65a23876870352c3203e09a4a668844fd01735896d93ace6e60bd8a01e5253c5af9f99e
 EBUILD inspircd-2.0.27.ebuild 3168 BLAKE2B 06c0815778898c90477b49aae366e2f250a30a716da12d6d3414fd164107a9deb5b1e580937aee3be226cbf09df14af7bce301a6d09e0e6fc30e3b5963363952 SHA512 ae539416d593d8602a900ea8cfebf450d4c5762163bf9a0ee0556d1ad51d42302e93c5d20788d1285d6a26a714a1f5d413ffd547c7c74f517779e873b9689476
-MISC metadata.xml 1674 BLAKE2B 4d00f675f380e0bd75adca0eabbf455cdb27dab9a5c8cb170abc670909d647cf5dda0a2f3fbfd9b9cad2ce210cad3ea5d2fa07683d236f6f437be6d6d8be7c40 SHA512 ae6a96d1093024c9796788dea7fb23c8d2bb51ddea56eeb041e2443db2730f7f38cdb5fde42911ba75dd0cdfc4eac2c9c424f87660361d65cac6766729a60d98
+EBUILD inspircd-3.1.0.ebuild 3878 BLAKE2B e52ff76092c5b72d1a8338929980b7f11479daac448eada0d758e8237d7fa1e93f03c81282f61017f9a6bd5439f0f65638b63173867fba829fd8c2844c1a2276 SHA512 36021b543acd0cb0d4757483914433e9b5125093dee686c1edf97adb391e0451079966e36e65f357e288fb6b246f937f7da596ddbd454f677a3f63a729943a66
+MISC metadata.xml 1928 BLAKE2B b3c78c7526b07644b61532293634647d5db2c60f3f69e7cae15f4cc7fb7ad12dcbe980467d2c433e509817a8e200d0e674e0a1b12f5cec3ffbf5a80ebe5a2d53 SHA512 8c373da73fdad81bce0533aa767716fe16bbdbe909818f1a022a43b307e6679456150a077a155076d221b48759b00a0f09947d32608876787c306fac88918098
diff --git a/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch
new file mode 100644
index 000000000000..0f4738c70123
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch
@@ -0,0 +1,260 @@
+diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf
+similarity index 100%
+rename from docs/conf/filter.conf.example
+rename to docs/conf/filter.conf
+diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf
+similarity index 100%
+rename from docs/conf/helpop.conf.example
+rename to docs/conf/helpop.conf
+diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
+similarity index 99%
+rename from docs/conf/inspircd.conf.example
+rename to docs/conf/inspircd.conf
+index 9baaa5261..60e277310 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -465,11 +465,11 @@
+ 
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-#<include file="examples/opers.conf.example">
++#<include file="/etc/inspircd/opers.conf">
+ 
+ # This file has all the information about server links and ulined servers.
+ # You *MUST* edit it if you intend to link servers.
+-#<include file="examples/links.conf.example">
++#<include file="/etc/inspircd/links.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -478,7 +478,7 @@
+ #
+ #   motd - displayed on connect and when a user executes /MOTD
+ # Modules can also define their own files
+-<files motd="examples/motd.txt.example">
++<files motd="/etc/inspircd/motd.txt">
+ 
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -514,7 +514,7 @@
+ # the default of 'inspircd.pid' is used.                              #
+ #                                                                     #
+ 
+-#<pid file="/path/to/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -1012,7 +1012,7 @@
+ # provide almost all the features of InspIRCd. :)                     #
+ #                                                                     #
+ # The default does nothing -- we include it for simplicity for you.   #
+-#<include file="examples/modules.conf.example">
++#<include file="/etc/inspircd/modules.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION  #-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -1021,13 +1021,13 @@
+ # exemptions for services pseudoclients:                              #
+ #
+ # Anope users should uncomment this:
+-#<include file="examples/services/anope.conf.example">
++#<include file="/etc/inspircd/aliases/anope.conf">
+ #
+ # Atheme users should uncomment this:
+-#<include file="examples/services/atheme.conf.example">
++#<include file="/etc/inspircd/aliases/atheme.conf">
+ #
+ # Users of other services should uncomment this:
+-#<include file="examples/services/generic.conf.example">
++#<include file="/etc/inspircd/aliases/generic.conf">
+ 
+ #########################################################################
+ #                                                                       #
+diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf
+similarity index 100%
+rename from docs/conf/links.conf.example
+rename to docs/conf/links.conf
+diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf
+similarity index 99%
+rename from docs/conf/modules.conf.example
+rename to docs/conf/modules.conf
+index bb8a74dbc..397b61295 100644
+--- a/docs/conf/modules.conf.example
++++ b/docs/conf/modules.conf
+@@ -832,7 +832,7 @@
+ # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor,    #
+ # censor, filter, flood, nickflood, noctcp, nonick, nonotice,         #
+ # regmoderated, stripcolor, and topiclock.                            #
+-# See <options:exemptchanops> in inspircd.conf.example for a more     #
++# See <options:exemptchanops> in inspircd.conf for a more             #
+ # detailed list of the restriction modes that can be exempted.        #
+ # These are settable using: /MODE #chan +X <restriction>:<status>     #
+ #<module name="exemptchanops">
+@@ -862,7 +862,7 @@
+ # Your choice of regex engine must match on all servers network-wide. #
+ #                                                                     #
+ # To learn more about the configuration of this module, read          #
+-# examples/filter.conf.example, which covers the various types of     #
++# filter.conf, which covers the various types of                      #
+ # filters and shows how to add exemptions.                            #
+ #                                                                     #
+ #-#-#-#-#-#-#-#-#-#-#-  FILTER  CONFIGURATION  -#-#-#-#-#-#-#-#-#-#-#-#
+@@ -871,7 +871,7 @@
+ # specify below the path to the filter.conf file, or define some      #
+ # <keyword> tags.                                                     #
+ #                                                                     #
+-#<include file="examples/filter.conf.example">
++#<include file="/etc/inspircd/filter.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)#
+@@ -961,7 +961,7 @@
+ # If you specify to use the helpop module, then specify below the     #
+ # path to the helpop.conf file.                                       #
+ #                                                                     #
+-#<include file="examples/helpop.conf.example">
++#<include file="/etc/inspircd/helpop.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Hide chans module: Allows users to hide their channels list from non-
+@@ -1533,7 +1533,7 @@
+ # onoper        - If on, the message is sent on /OPER, otherwise it's #
+ #                 only sent when /OPERMOTD is used.                   #
+ #                                                                     #
+-#<opermotd file="examples/opermotd.txt.example" onoper="yes">
++#<opermotd file="/etc/inspircd/opermotd.txt" onoper="yes">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Override module: Adds support for oper override.
+@@ -2106,7 +2106,7 @@
+ # connections in order to oper up. It is highly recommended to load
+ # this module if you use SSL on your network.
+ # For how to use the oper features, please see the first
+-# example <oper> tag in opers.conf.example.
++# example <oper> tag in opers.conf.
+ #
+ #<module name="sslinfo">
+ #
+diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt
+similarity index 97%
+rename from docs/conf/motd.txt.example
+rename to docs/conf/motd.txt
+index c5266f844..34d85d965 100644
+--- a/docs/conf/motd.txt.example
++++ b/docs/conf/motd.txt
+@@ -24,7 +24,7 @@
+                     `-.__  `----"""    __.-'
+                          `--..____..--'
+ 
+-        ---- To change, see motd.txt.example -----
++        ---- To change, see motd.txt         -----
+        /                                          \
+       /   * Web: https://www.inspircd.org          \
+       |   * IRC: irc.inspircd.org #inspircd        |
+diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
+similarity index 97%
+rename from docs/conf/opermotd.txt.example
+rename to docs/conf/opermotd.txt
+index 7e1c82f33..73ad28621 100644
+--- a/docs/conf/opermotd.txt.example
++++ b/docs/conf/opermotd.txt
+@@ -24,7 +24,7 @@
+                     `-.__  `----"""    __.-'
+                          `--..____..--'
+ 
+-        -- To change, see opermotd.txt.example ---
++        -- To change, see opermotd.txt         ---
+        /                                          \
+       /   * Web: https://www.inspircd.org          \
+       |   * IRC: irc.inspircd.org #inspircd        |
+diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf
+similarity index 99%
+rename from docs/conf/opers.conf.example
+rename to docs/conf/opers.conf
+index 7cad2589c..082009da9 100644
+--- a/docs/conf/opers.conf.example
++++ b/docs/conf/opers.conf
+@@ -178,4 +178,4 @@
+ 
+ # Once you have edited this file you can remove this line. This is just to
+ # ensure that you don't hastily include the file without reading it.
+-<die reason="Using opers.conf.example without editing it is a security risk">
++<die reason="Using opers.conf without editing it is a security risk">
+diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt
+similarity index 100%
+rename from docs/conf/quotes.txt.example
+rename to docs/conf/quotes.txt
+diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf
+similarity index 86%
+rename from docs/conf/services/anope.conf.example
+rename to docs/conf/services/anope.conf
+index 5c8f859ff..b1179eb8c 100644
+--- a/docs/conf/services/anope.conf.example
++++ b/docs/conf/services/anope.conf
+@@ -2,7 +2,7 @@
+ # by Anope. See https://www.anope.org for more information on Anope.
+ 
+ # This file inherits from the generic config to avoid repetition.
+-<include file="examples/services/generic.conf.example">
++<include file="examples/services/generic.conf">
+ 
+ # /GLOBAL <message>
+ # Sends a global notice.
+diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf
+similarity index 98%
+rename from docs/conf/services/atheme.conf.example
+rename to docs/conf/services/atheme.conf
+index d509522b8..7605251db 100644
+--- a/docs/conf/services/atheme.conf.example
++++ b/docs/conf/services/atheme.conf
+@@ -3,7 +3,7 @@
+ # information on Atheme.
+ 
+ # This file inherits from the generic config to avoid repetition.
+-<include file="examples/services/generic.conf.example">
++<include file="examples/services/generic.conf">
+ 
+ # Long hand aliases for services pseudoclients.
+ <alias text="ALIS"      replace="SQUERY $requirement :$2-" requires="ALIS"      uline="yes">
+diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf
+similarity index 100%
+rename from docs/conf/services/generic.conf.example
+rename to docs/conf/services/generic.conf
+diff --git a/make/template/main.mk b/make/template/main.mk
+index e39a24f87..e0fcbf4fc 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -207,8 +207,8 @@ install: target
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/services
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
++	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services
++	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(SCRPATH)
+@@ -225,9 +225,9 @@ endif
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
++	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
++	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services
++	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
+ 	@echo ""
+ 	@echo "*************************************"
+@@ -241,7 +241,7 @@ endif
+ 	@echo '  Data:' $(DATPATH)
+ 	@echo 'To start the ircd, run:' $(SCRPATH)/inspircd start
+ 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
+-	@echo 'Examples are available at:' $(CONPATH)/examples/
++	@echo 'Examples are available at:' $(CONPATH)
+ 
+ GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
+ 	./configure --update
diff --git a/net-irc/inspircd/inspircd-3.1.0.ebuild b/net-irc/inspircd/inspircd-3.1.0.ebuild
new file mode 100644
index 000000000000..98fed20a13d3
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.1.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs user
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://inspircd.github.com/"
+SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
+
+RDEPEND="
+	dev-lang/perl
+	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
+	ldap? ( net-nds/openldap )
+	maxminddb? ( dev-libs/libmaxminddb )
+	mbedtls? ( net-libs/mbedtls:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	re2? ( dev-libs/re2:= )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	ssl? ( dev-libs/openssl:= )
+	tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+DOCS=( docs/. )
+PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+
+	# Patch the inspircd launcher with the inspircd user
+	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+}
+
+src_configure() {
+	local extras=""
+
+	use gnutls && extras+="m_ssl_gnutls.cpp,"
+	use ldap && extras+="m_ldap.cpp,"
+	use maxminddb && extras+="m_geo_maxmind.cpp,"
+	use mbedtls && extras+="m_ssl_mbedtls.cpp,"
+	use mysql && extras+="m_mysql.cpp,"
+	use pcre && extras+="m_regex_pcre.cpp,"
+	use postgres && extras+="m_pgsql.cpp,"
+	use re2 && extras+="m_regex_re2.cpp,"
+	use regex-posix && extras+="m_regex_posix.cpp,"
+	use regex-stdlib && extras+="m_regex_stdlib.cpp,"
+	use sqlite && extras+="m_sqlite3.cpp,"
+	use ssl && extras+="m_ssl_openssl.cpp,"
+	use sslrehashsignal && extras+="m_sslrehashsignal.cpp,"
+	use tre && extras+="m_regex_tre.cpp,"
+
+	# The first configuration run enables certain "extra" InspIRCd
+	# modules, the second run generates the actual makefile.
+	if [[ -n "${extras}" ]]; then
+		./configure --disable-interactive --enable-extras=${extras%,}
+	fi
+
+	local myconf=(
+		--disable-interactive
+		--disable-auto-extras
+		--prefix="/usr/$(get_libdir)/${PN}"
+		--config-dir="/etc/${PN}"
+		--data-dir="/var/lib/${PN}/data"
+		--log-dir="/var/log/${PN}"
+		--binary-dir="/usr/bin"
+		--module-dir="/usr/$(get_libdir)/${PN}/modules"
+		--manual-dir="/usr/share/man")
+	CXX="$(tc-getCXX)" ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	# Default is '0750', which causes init errors.
+	fperms 0755 /usr/bin/inspircd{,-genssl}
+	# Default is '0640', causing module load errors.
+	fperms -R 0755 "/usr/lib64/inspircd/modules/."
+
+	insinto "/usr/include/${PN}"
+	doins -r include/.
+
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	keepdir "/var/log/${PN}"
+
+	diropts -o"${PN}" -g"${PN}" -m0700
+	keepdir "/var/lib/${PN}/data"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "You will find example configuration files under "
+		elog "/usr/share/doc/${PN}"
+		elog "Read the ${PN}.conf.example file carefully before "
+		elog "starting the service."
+	fi
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test "${pv}" -lt "2.0.24-r1"; then
+			elog "Starting with 2.0.24-r1 the daemon is no longer started"
+			elog "with the --logfile option and you are thus expected to define"
+			elog "logging in the InspIRCd configuration file if you want it."
+		fi
+		if ver_test "${pv}" -lt "3.0.0"; then
+			elog "Version 3.0 is a major upgrade which contains breaking"
+			elog "changes.  You will need to update your configuration files."
+			elog "See: https://docs.inspircd.org/3/configuration-changes"
+		fi
+	done
+}
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index 5bcadd4c1b6e..55b39da0b0eb 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -12,16 +12,19 @@
 		para ser estable, moderno y ligero.
 	</longdescription>
 	<use>
-		<flag name="geoip">Add geoip support for country and city lookup based on IPs</flag>
 		<flag name="gnutls">Enable TLS support</flag>
-		<flag name="ipv6">Enable support for IP version 6</flag>
 		<flag name="ldap">Enable LDAP support</flag>
+		<flag name="maxminddb">Add support for geolocation using libMaxMindDB</flag>
+		<flag name="mbedtls">Add support for TLS using the mbedTLS library</flag>
 		<flag name="mysql">Enable MySQL database backend</flag>
 		<flag name="pcre">Adds support for Perl Compatible Regular Expressions</flag>
-		<flag name="posix">Adds support for POSIX-compatible functions</flag>
 		<flag name="postgres">Enable PostgreSQL database backend</flag>
+		<flag name="re2">Add support for Google RE2 regular expressions library</flag>
+		<flag name="regex-posix">Adds support for POSIX Regular Expressions</flag>
+		<flag name="regex-stdlib">Add support for C++ stdlib regular expressions</flag>
 		<flag name="sqlite">Enable Sqlite database backend</flag>
 		<flag name="ssl">Enable SSL support</flag>
+		<flag name="sslrehashsignal">Enable rehashing SSL module by SIGUSR1</flag>
 		<flag name="tre">Enable support for TRE, a lightweight, robust, and efficient POSIX compliant regexp matching library</flag>
 	</use>
 	<upstream>
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 736f8df6c722..d3bf8a65d13d 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -2,6 +2,6 @@ AUX libressl.patch 1373 BLAKE2B 8cc6dd14a7f79d95ef037be9267570ca476dd92ca002cdae
 DIST irssi-1.1.2.tar.xz 1084328 BLAKE2B 6f4e49097d97a511d0fd679806bfa3d261c26f9160ed66d34e7d314b3f330accf90c5e019c31dafd5418c25d538fcb44fc35fcdf6210370f640ff95743556a9a SHA512 706f811c810b976888101a29bab6ff6b9aa6116678994b3710d6b266bfbc0ae2be1d4fd889aedfbf0a13a2e3da3f1affcce0018346ecc582865eaccd8cc79f84
 DIST irssi-1.2.0.tar.xz 1138984 BLAKE2B 940b8fb0c6633ea82ccd242241a39b67fa1a356aa58758ca9e0388971ccaabbdfe954140d27abd06d1ca36d0aac14decbb1fd0929d969305abfaa9c9dbeafd24 SHA512 343530ca63355dd6683e84f31602c9162e1e3158e52ce81e37519d1e42abbdcb621fb710fcb605fcafd7e7ea3f2c30ed62607d4ea91d8c8dc29bf893e54aee40
 EBUILD irssi-1.1.2.ebuild 1410 BLAKE2B e4afbeeef63408b98189f96df84a368068e8d1985158629928c0a8d7acd1eb6784b1a66eb34a1313873b529552012a3bb6bdb59af7e091c5e7398ee81370b926 SHA512 8ce49e74840ebdfa69fc56b9ec1d99bbd336990eb94e53a6a91beddafbd26f5c2f0ab519a31590aab1fa1bdf61d91d1c26432957d7883d99805132ade9dd0421
-EBUILD irssi-1.2.0-r2.ebuild 1562 BLAKE2B 117e46598c8bad0b62dd2b87be220217181d035cdc959ba378c7516222e2ba1671755fbb073f3dfc08d3622d0c200d0897e464e4ddbeedf7563e912a20a861d0 SHA512 719dd3f38e52fd2fd0710cefe66e9c162b7a6de2d36ee05d45d055d412919843f7c46de9da2b69df102e73f5e7a67a5b7015a819593306e8fbc1dfe1ea2a04d2
-EBUILD irssi-9999.ebuild 1487 BLAKE2B 3f83206f2b22dc6de4636cd749549383cbf82068e6415564ec5afa1aeb6a4d06e99b8f0f6e2cc7cd8db4d455c37bc89f28e67d9412c7342f79634620074cd118 SHA512 035223cce0c3bd26a1862c4bb88e60e3d7138e84d01bacbc21d621b6d2ccefbbcac6106ba5eef9ca5f40205a2065a8eb1956064c89899dd956ed0b04bed581d3
+EBUILD irssi-1.2.0-r2.ebuild 1561 BLAKE2B 1071df359650b4e3cc737aa83b4ce0eadbb71bee59f8461706e00ae01a79703e1ba46b4f3a5d38fc96db0f173cc818ee443a42d6ddebc70d73b52c4d1fa9a8e5 SHA512 82d93c6d99cc7563a3460e0a739955c89ab5132d704f9734d3d19d4cc300182c27e5838a37e20ebaa86f10d83e0832ad244c0e67fbb937ec9ed0dcaa5363cf08
+EBUILD irssi-9999.ebuild 1486 BLAKE2B 2742c15d0b3f5a2787aeea9db79693e36845957a28b5146e8eb839278681f538d7be2e46d37875e5f230b0edc7fa37a79809f2ba93f6927363398201335c030f SHA512 ba8be2fe7989ed59714cc454b372edf377261cb5b2fcbe6cfaec10f9fef1b1871d238ab3920f05b1c8da93d2f35b7049dbf12418659eedff457e99b225959159
 MISC metadata.xml 700 BLAKE2B 9d12cb98cc2a5204d423141bcb42222cb5aca53888eac4158927a40f2b5b8a28eb0fa4171f1a4467aa795df45673f21dec09ddbf9c22f897c131d137a10a1d98 SHA512 9d510764f9f5dbfaaa2c027ac79ccbcfc92552d48de3bb3491b6e9b1abdb8be7dcd4e59be4fdf82b9ba4c240a8bc63e5f18548b3c3da4e77eff0b87a457db470
diff --git a/net-irc/irssi/irssi-1.2.0-r2.ebuild b/net-irc/irssi/irssi-1.2.0-r2.ebuild
index 3fd4c3836773..83dffcd5041b 100644
--- a/net-irc/irssi/irssi-1.2.0-r2.ebuild
+++ b/net-irc/irssi/irssi-1.2.0-r2.ebuild
@@ -22,11 +22,11 @@ IUSE="otr +perl selinux socks5 +proxy libressl"
 COMMON_DEPEND="
 	sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
+	!net-irc/irssi-otr
 	!libressl? ( dev-libs/openssl:= )
 	libressl? ( >=dev-libs/libressl-2.7.4:= )
 	otr? ( >=dev-libs/libgcrypt-1.2.0:0=
-		>=net-libs/libotr-4.1.0
-		!net-irc/irssi-otr )
+		>=net-libs/libotr-4.1.0 )
 	perl? ( dev-lang/perl:= )
 	socks5? ( >=net-proxy/dante-1.1.18 )"
 
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 73df7ceb2125..e0ecc363aa78 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -18,12 +18,12 @@ IUSE="otr +perl selinux socks5 +proxy libressl"
 
 CDEPEND="sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
+	!net-irc/irssi-otr
 	!libressl? ( dev-libs/openssl:= )
 	libressl? ( dev-libs/libressl:= )
 	otr? (
 		>=dev-libs/libgcrypt-1.2.0:0=
 		>=net-libs/libotr-4.1.0
-		!net-irc/irssi-otr
 	)
 	perl? ( dev-lang/perl:= )
 	socks5? ( >=net-proxy/dante-1.1.18 )"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 00eafa494341..83d337e83ed4 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index cde5d50cdd5c..629de0c5e795 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -5,5 +5,5 @@ AUX c-client-2007f-openssl-1.1.patch 2857 BLAKE2B 748933d521a99409234e62cfee1c98
 AUX c-client-2007f-topal.patch 1078 BLAKE2B 5224ac12119e25c3208865bf1904a21c9d4bd880b685bea1389cc32a30764e8673606085f2d58ec12532618807d61257e02ed2d9b178014c8ba78f9defba1f72 SHA512 f81914d9d0acf92625d2a4956aa82e9639bc36ab12c608dafb8137afe619f6acc5d9647d05a1827bfe27b21c9dd774bd458c8cfa2e5c2e449ed956daed674b00
 DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142a4e0c4dd561d0a387cb72fea16de656a01bc21a0b30600dc121c8af090b76188d0131852ca6f3d40b9bba8745696faed5a79fb8c59 SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
-EBUILD c-client-2007f-r6.ebuild 4607 BLAKE2B f874d65e6517a4a9d780f22da2e7b1a7c5cc342c7de6fb0d2c6802983f4e4fee3da36885a31815bff5b6aa1512d2aa584c2197da49c79adf24f2087536528f6a SHA512 0aad017446a3625dd20292f0b3c7af001e0632672d62b3455ef55587e1c788afeba232cc2f19bcf55c6d449b403f9dbb31598196dfc1b4fd0689175a9dca1b00
+EBUILD c-client-2007f-r6.ebuild 4606 BLAKE2B 6e1f98e0e2cc0baf47216c7bbafa828c64589362820e5678afc5fec347cfa326c38867e369c02f228077a9be521b3733b0fb3729369e621c693e88d2bb11eff2 SHA512 cbf38189f21509d53b078a723c99349e318dc7a371a5509a96abbf3e7235bd9223b2bf65666640a32ee78ec3b82b1575f4f3b9ac3c29f3fe11baf52aa3b7173f
 MISC metadata.xml 480 BLAKE2B 1e688b1b8c76882dfbce8625873104438c89652149a9a14069d8692a469101fb7cf4036151e42f888558d8eb4062817f9481e9552b4882bd285f1c73ed821364 SHA512 b59bb7820763cb1c5dab4b0166fafc424fa76aa24465c44c7314ca8ed0b0f0b4d5066fca335cad963d5c4737be1b1d02ff929f0b2a5c5d234728669ddb5379a9
diff --git a/net-libs/c-client/c-client-2007f-r6.ebuild b/net-libs/c-client/c-client-2007f-r6.ebuild
index b7980c7cbbbe..b46fffc10c62 100644
--- a/net-libs/c-client/c-client-2007f-r6.ebuild
+++ b/net-libs/c-client/c-client-2007f-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa"
 
 RDEPEND="
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 0ff16a382e2a..4086c266cd38 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -3,5 +3,5 @@ DIST farstream-0.1.2.tar.gz 1265972 BLAKE2B 239deea639f3456170aee1633d0ec0856917
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
 EBUILD farstream-0.1.2-r2.ebuild 2374 BLAKE2B c4832a241cce39990bc5a396503cb29090a67799edb33018d2f25a8fee56eb77b9ffa17a04b05ec608dc28cc90382fd7f2620924bd1b506ffd8273f9a5c0bf15 SHA512 1222e9257b9ac280dd94b1e2f75f12369db67ae8efbce4ab6403404b37e60b63de9c06c797eb716ea8150c642cf323153e7ee4a1e246ff51b9a5de69e76ca56c
 EBUILD farstream-0.2.8-r1.ebuild 1823 BLAKE2B ec2e9332008aff2e2b510a473addfc3d424152b25045714544a2b12d6bec84df95e82869a076ca6c0eaa8461ea1f1cf897e814ea817b3e2e74b30371be91e144 SHA512 11cdf3f595e40cd4dd6fd328313e4f8696a82f86083f9944ec60e25e68389aae8e54b7791b83cf7638becf92e1cf00badcbe5d669feb70412ecd1520528ac65f
-EBUILD farstream-0.2.8-r2.ebuild 1865 BLAKE2B 3de27782915da460d70704c2f5c0369578a1e25cbfc5dd45ffc1b4b25219d9d340724a3c9f507a3c1f884576e4c47a7349360708c1f9264002be3fb043b96ebd SHA512 2a0c475abee3d10c3f1beb7b3763003d1990ec8481ec07bbcb46d9765195239c3fdd27715526aa27d7947cee788edbbe3a64abd74f6cb44ef68b0efae70ff735
+EBUILD farstream-0.2.8-r2.ebuild 1864 BLAKE2B 273cc39ecebb0c8c440f5a76663bb23880ecb8f5012a89d48538f6633f9780168c5421b56ff7ff1d18a1372ea4387759df55f06d2313181cc2d34d039a179fcf SHA512 1d3380e2063ce247fab29402b4cda284b18f1662bf74949f2e5ecbcc173a9d5480cf4443511faa91402e10f040dd29485d1504a52a1965712d39e30e99248f05
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index 5fb5b32b80e9..a6d6e87d72d1 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 68807593987f..1d08b1427b06 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-online-accounts-3.30.2.tar.xz 921284 BLAKE2B 9dc503f73ddda64411f73ac865a0355f318ad13789fac0cf7e7a91d16e53b03dee33acca6752060ce54936cfd5050adb8fadfd121158c0496a3f516e35e8fa45 SHA512 3555421adbfec0e7da1c8f3a47415f6c5bc3eaf8b246cf08eb6ee420286a4b40d11bc6e2514bca937b022b95068c9862438fa632d3385503aba2647a4a57976b
-EBUILD gnome-online-accounts-3.30.2.ebuild 2094 BLAKE2B 50ec41090891c626d2fac7a78419522338dada0b0d984a7c47c6526ca9227203d9f13ec3a61845f998539bcdf79db55d4b54c56dd9b31b0e39226b64f989cc10 SHA512 401fb0d2206311d71e965ec30dc23600a13d7525d0f3850b69666ff6698d537523d5e40b88ac37fe90cf9f9de2eacad2f80d8a4b5c94c0165c26826110d26737
+EBUILD gnome-online-accounts-3.30.2.ebuild 2093 BLAKE2B 1238f709ef5744af1025bab7db217bfcacb9e08ea475a54127ad738bfcaea28d188e152e9b73e1819836eccf323b21d4736272d14627945fccbae6cc673cea23 SHA512 14b614b2a71046c3229a19745e492c01b373983eb10098ee24b70e8894fe3d0162fbad2c62046c66cb7b0830d243577536d0d1ea6d431af77f7dcea4c324be0a
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild
index 4e26ca00f0dd..b514430f0387 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 3d8f951e6182..6f829083fd70 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -8,6 +8,7 @@ AUX 0006-grpc-1.12.1-allow-system-openssl.patch 2691 BLAKE2B 078ff854f90f5dea0b5
 AUX 0007-grpc-1.12.1-allow-system-zlib.patch 2069 BLAKE2B 60b70714eca54ba0befffd36409dc4cb3983393f478e54dc1922bf7acbbe8122a2a7b76003842952a9d693a04adf84d1f6b7243a7034d181a0084620fdfec587 SHA512 22c4bcd909ad19989e72f8063b7b44f8f63d58119a19a92661734ba2bf0c4150b2e870fae45c4bf8c6411e1ca32e8bf713536c3f60d98763210231a0ac4fedde
 AUX 0008-grpc-1.12.1-allow-system-cares.patch 2049 BLAKE2B 4f7e352f3efca21cbc918bf0a8510589c1f9a3b0ede344c83223cebfced42a65e5e3f2c5bebd1cf88d96dbc4d7f738f94b4484cfd23d5ebb1ff74a3370584d75 SHA512 3efffca62048d89430720237c8b51e82b2d2f02c067849d3a6506013b9c4fbda92037a70e3ff66e117465653ecb2a1db0d00857b6325c768ee1d2b122a44d26a
 AUX 0009-grpc-1.12.1-gcc8-fixes.patch 2420 BLAKE2B 05a0e92f38e877bfc2160d44aec598a67247dbd064efd03cea660444ecb3afe3095e2b7c1c67b2e83423762ad1580636039e27004fe34c8ff0c3bdc9862a3c54 SHA512 dfdafec8efc8fc0f4bbcdcbb036fb7ee746c917c8dfe18338dbd20be40efe8e1b3fe77c6f66f0b050f6d078aaff81a78477980b63ad81288cae474af8c723420
+AUX 1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493
 AUX grpc-1.14.2-gcc8-fixes.patch 4258 BLAKE2B 211847b5f493076ecdc13eef9567f5f088dfb1f0e1b7c61b69b6daeaeafa638262aea525063ac5a4612e12cb378d1231d30eb1ed86d781b6ee43b20d4fb68353 SHA512 20279e231042fa01ad0dffbfd731e2ea17d9ff4240a21204f672f88a4dca7302f1e8a4f4dbffbb4a5c2d321f47f735ef0411a2e2a44472494b518741a044ac4f
 AUX grpc-1.15.0-fix-cpp-so-version.patch 4772 BLAKE2B 96efd477c385c7a4714025081288576f8ef4fbba691257e3638e85b850c20b1db9a72de6fb9f85a8b6b3f4f990dd4456ada838ce6ccd01d4bb5043071926eec9 SHA512 49c5da5883a6e8aac6d37fb1920b6b8af23ec9f45c1dd9c337e1a9455adb1eded0ed3763003818ab261fd367e38b705af0dd409d01b97060b1e5020228acef2c
 AUX grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch 3039 BLAKE2B 1da27e75874229261115b174b168e0b478add3c844c58e81a84bf74b699447310decda09e0cad89056a3f5d7fcc8d0bb1835889438ee8efab89471c66a77b69a SHA512 a6f59a3b518310c6150439fba5ad058048540f0f84152406f607873248e3e0d95cc0077b634164f4bdf391427c847614dd88e2ddac9feded0aa23044ea58c051
@@ -23,6 +24,7 @@ DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c
 DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B ec2992e3b80ca10f9d0250510930d4f2b5f7a9593a8245927aafe77b29b028e4a4a2f32162af08fd4e2077d48b9e0e32e772901f5f524247f7d6910e74c2a120 SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
 DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f71f131581ddea60ded64b247d69bdc4edcc974cbce7af71e78c4579a7b6ad0c618ac3aeb9b0ff7743b039658f7 SHA512 6a61373e5c407ee147ea755b9992f96801695d0b94e6d34305fc09afe9987ae6d4a70a0757bd903734f549604bda26b41582e6938b1654598429abc4cc3a3b90
 DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
+DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
 EBUILD grpc-1.12.0.ebuild 1533 BLAKE2B 8b5808b767a779c2e9d5baf53ba27e76ea78aa8433acf1b5c3254db134efbf82c0166963e9182111b1bd6dafdab8b7f6c66066e20676bf208aedb4b1286143e1 SHA512 2beaf3a5f7309fb756d3c90fa8444337fcea15ed7cc65adbce7951602a96e9d29d9389b540c5d92e6d4ef209b25b99b76328a52de7aef36b6c543bed10506017
@@ -31,9 +33,10 @@ EBUILD grpc-1.13.0-r1.ebuild 4367 BLAKE2B 60db5fa5681f2574b54b52fd06832f43f9de29
 EBUILD grpc-1.13.1.ebuild 4380 BLAKE2B 6fc9c25ff651bab7903c3550b3c3eaf6c8dab361273d9fe8480abe874b6d46d9315973dafefe054b92bc900f4fc9a6fde783f23277b05b2cbc895995078385aa SHA512 250bd2fe515d305d4c093deca0c22f8e81b63ee2bf3c86dc3b8b83ff1ee65b99856ef1aa035e9ab6a5802ecb86657c61256727c36491a2c5a3c1c446fb354a76
 EBUILD grpc-1.14.2.ebuild 4483 BLAKE2B 74abe8b6c1686a92faa257379fa7085ad13bd6222557a3ac7701503a82f19d82bf87a1dc9a01a2f825d2a87de42e6bf3ec333ea2feb381a373ce7aa904a4d4b5 SHA512 f4353999761d8c438f2a4fc9618aa12e214bd01799722c252d4bfcc4f63bd4f914979dba8f62ffe2ef34277ef6495e363b6a10af6123d6f45ba339a25926fdbb
 EBUILD grpc-1.15.0.ebuild 4478 BLAKE2B b27a529156dca8385d57bdb38076d0292e1409aa2e328a008fa15b2cbae20172e4baeec06fe978d736fc8c29549c8172ccf1d01167ba2f376802e246c8db91b6 SHA512 8eb8cd1e05c7ba06b06879221cf598546143e5c510322cc66abce42d502a214fd81f98c81d2031fda04404d3b4dcacbed32603cdb138fcd3e3b7f1c017b539a2
-EBUILD grpc-1.16.1.ebuild 2337 BLAKE2B ad5315e38f4f176a621de8eb1c792d4f6735d9ff078fb3516e0569e11b83f2e916340905dfd59754c45ceecbca4924464711cf94aa38bdc91ff587fa4c2658c9 SHA512 05e321adbe059e17882d35692760576d745476b872f3fa7859e364d7cb8a88488fa7adcca3183059b552f7fc8aca926d2a64fe1c2f85a285a46fe69e0010a1c9
-EBUILD grpc-1.17.1.ebuild 2361 BLAKE2B e05151676e946f5f4681799144db2610c6dca6c359abfa49bd29a02e059a79cd40e2b17810539c74d9ee26a4333654b1a237f5848b34008a296a28a6def14dd2 SHA512 8cc37a22dd53ee250c6c5f468d799373b8136df4e5e64232ba7337e37202bcd23be6cf51b0133618a3c8699b82c619a52d8ef44427f3a104cc7302ce18467998
-EBUILD grpc-1.18.0.ebuild 2361 BLAKE2B e05151676e946f5f4681799144db2610c6dca6c359abfa49bd29a02e059a79cd40e2b17810539c74d9ee26a4333654b1a237f5848b34008a296a28a6def14dd2 SHA512 8cc37a22dd53ee250c6c5f468d799373b8136df4e5e64232ba7337e37202bcd23be6cf51b0133618a3c8699b82c619a52d8ef44427f3a104cc7302ce18467998
-EBUILD grpc-1.19.0.ebuild 2328 BLAKE2B 24b0230a3ba17bbeff1504a27c1c0c01706cd7cc9c3f0660f411d7b57ba100fbf0c0bad8728c90836b4637abd007c68bce14b4f084df343e5a362754702deb07 SHA512 d638a76e179b729822d77b22f7653b68104c0c7b1a86568b3872675bf8926e6780833b2c2bd46c95208bc76f2fa5f3bfb7caa336b05a8737a4fb7f322c205be9
-EBUILD grpc-1.20.1.ebuild 2337 BLAKE2B 565cbec7ca067173e1296eb962dc6ac740df29ab23023c8340e88f4256c212b963d6bc7c33ad041f4ea1f55253d7e81eba9ae293184b3afbff8e249a9f1c101e SHA512 3199e0710cc18c73938d00a224435b9829c4c54be6a8d5e9303fe4b3245c5590f6dddfbd5abf7deb2dd92f7982ced0a99215acdc2aa10bb145a5b7262f514700
-MISC metadata.xml 646 BLAKE2B cd1e7daa64d2ba30c25d0c84433f946be486507890f9a5da98fa419239fff924228ea7eac15a5bd360e8b75a291718c0e8a991923709f7452ca42982bc92b213 SHA512 a667f40567b9d65371553cdde70a033c81f73f7370f19733e21c885f7c26cf7c144f81a8e1a6af3bda88947ef4c8efcfe7356b8127cf82a5f33fcdbaae2dad95
+EBUILD grpc-1.16.1.ebuild 2420 BLAKE2B ffe4395b757612ff3f7aefd0ec1f88a39fd4b41dba202ac255897847601d3884a1ca8041d973b4cc16bc0e6dcd7f98c98e9c45699d31fa3b31bebbf1d65e4911 SHA512 ee73eb435828c9ec466efb8da1ee3585dd97b8b05df9c55173b192683b7e263d06743446ce1897d71f8905d4dbd280a078ad4acc949d05962af8a53884158ad1
+EBUILD grpc-1.17.1.ebuild 2444 BLAKE2B bdd53da589d3bc782d30084c550f1a862d04e47e78d2b36758f7044a1f6c4e4171457ba75db79b4e2d263e1482889fe2c7fbb251bcf2bca5324d03e4461e2c3c SHA512 6060b94f74e4ca5cdcd4b2a756ec860ca6557b7fdc3e8aa726d29cbd3f4104e4d7b258888d3036b60e19022512843a8f3db8619405344cac4b967996bacf7e57
+EBUILD grpc-1.18.0.ebuild 2444 BLAKE2B bdd53da589d3bc782d30084c550f1a862d04e47e78d2b36758f7044a1f6c4e4171457ba75db79b4e2d263e1482889fe2c7fbb251bcf2bca5324d03e4461e2c3c SHA512 6060b94f74e4ca5cdcd4b2a756ec860ca6557b7fdc3e8aa726d29cbd3f4104e4d7b258888d3036b60e19022512843a8f3db8619405344cac4b967996bacf7e57
+EBUILD grpc-1.19.0.ebuild 2411 BLAKE2B 07dcdddf9de213e4a6304e25baaad18c55d0661bb2e7b280fb8e171b7fafcfa45fb156734ac3303c94c8cb9535bcefa0e67040016b0002adbafb578a905f5660 SHA512 11118c9854af50b3bda038388bf9174066c625a781bc8dc5f22a07f4d604fbc54537fbf65a4cacb8816e65800707f9290251e7421d0d7e783ff4018bd9e9c70d
+EBUILD grpc-1.20.1-r1.ebuild 2428 BLAKE2B 58420dd83cd4561dec2b1f22643c3fc77ce0cca3f6f47f7636029fa6a914df907206437618e44cca09733a5778f2247a8bcb103da66d794f53de7b22ea274cb4 SHA512 ca6357220aabc017a7bd2b0a22f8731c1a85967d7e4cb35e2390f5e9954771be26d254f96da474d213a1e2c3942a1dfe43f12a45cd544df746c2812444bb454d
+EBUILD grpc-1.21.1-r1.ebuild 2510 BLAKE2B 4682ad4a7b103c7a102cd9ad73d85331400b7216c572c8bf121001c5ccd0c32ab2e6c2f7c09e5245eb8c69011e55b3fc59b1d05e908e4a0a17af7b342705d3b1 SHA512 1cb0f897bf2d888e97df9208b9c30b6ceef08b29f08090457e65d903a810ca7ac09431e20835b722d84758bbdcd537437277504e492f05aef6d63fdf75ff3eb7
+MISC metadata.xml 738 BLAKE2B cff2b1998bc69661baad2d711e3f6b333b641c8ce287cafe4db88f8582b4a73082aee86d35bb8ed575941f813451af032d9e9aa4654984f344bc357817cce3b6 SHA512 acc602accf74b98f978a3cab6b46f70c4730718c49a7dd7869687c899b2b0f72eb70dd90f783151ba1bf0f44ed9de028cead4c1ddcc6051509a04d38a50df4fb
diff --git a/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
new file mode 100644
index 000000000000..213a39a38438
--- /dev/null
+++ b/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
@@ -0,0 +1,47 @@
+From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Wed, 22 May 2019 23:04:28 -0700
+Subject: [PATCH] Makefile: fix host ar handling
+
+picked lines from
+https://github.com/grpc/grpc/pull/11476
+---
+ Makefile | 236 ++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 119 insertions(+), 117 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 67495f2..e1c741c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -346,6 +346,7 @@ HOST_CC ?= $(CC)
+ HOST_CXX ?= $(CXX)
+ HOST_LD ?= $(LD)
+ HOST_LDXX ?= $(LDXX)
++HOST_AR ?= $(AR)
+
+ CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
+ CXXFLAGS += -std=c++11
+@@ -483,6 +484,7 @@ HOST_CFLAGS += $(CFLAGS)
+ HOST_CXXFLAGS += $(CXXFLAGS)
+ HOST_LDFLAGS += $(LDFLAGS)
+ HOST_LDLIBS += $(LDLIBS)
++HOST_AROPTS = $(AROPTS)
+
+ # These are automatically computed variables.
+ # There shouldn't be any need to change anything from now on.
+
+@@ -7381,11 +7383,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
+
+ else
+
+-$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
+-	$(E) "[AR]      Creating $@"
++$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
++	$(E) "[HOSTAR]  Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
++	$(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
+ endif
diff --git a/net-libs/grpc/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild
index 07af07cc1f53..f04778edda6d 100644
--- a/net-libs/grpc/grpc-1.16.1.ebuild
+++ b/net-libs/grpc/grpc-1.16.1.ebuild
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples doc systemtap static-libs"
+IUSE="examples doc perftools systemtap static-libs"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
 	dev-libs/protobuf:=
-	dev-util/google-perftools
 	net-dns/c-ares:=
 	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
 	systemtap? ( dev-util/systemtap )
 "
 
@@ -64,7 +64,8 @@ src_compile() {
 		HOST_LD="$(tc-getBUILD_CC)" \
 		HOST_LDXX="$(tc-getBUILD_CXX)" \
 		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)" \
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
 }
 
 src_install() {
diff --git a/net-libs/grpc/grpc-1.17.1.ebuild b/net-libs/grpc/grpc-1.17.1.ebuild
index bbdf4092a7c5..2774a877762b 100644
--- a/net-libs/grpc/grpc-1.17.1.ebuild
+++ b/net-libs/grpc/grpc-1.17.1.ebuild
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples doc systemtap static-libs"
+IUSE="examples doc perftools systemtap static-libs"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
 	dev-libs/protobuf:=
-	dev-util/google-perftools
 	net-dns/c-ares:=
 	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
 	systemtap? ( dev-util/systemtap )
 "
 
@@ -68,7 +68,8 @@ src_compile() {
 		HOST_LD="$(tc-getBUILD_CC)" \
 		HOST_LDXX="$(tc-getBUILD_CXX)" \
 		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)" \
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
 }
 
 src_install() {
diff --git a/net-libs/grpc/grpc-1.18.0.ebuild b/net-libs/grpc/grpc-1.18.0.ebuild
index bbdf4092a7c5..2774a877762b 100644
--- a/net-libs/grpc/grpc-1.18.0.ebuild
+++ b/net-libs/grpc/grpc-1.18.0.ebuild
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples doc systemtap static-libs"
+IUSE="examples doc perftools systemtap static-libs"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
 	dev-libs/protobuf:=
-	dev-util/google-perftools
 	net-dns/c-ares:=
 	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
 	systemtap? ( dev-util/systemtap )
 "
 
@@ -68,7 +68,8 @@ src_compile() {
 		HOST_LD="$(tc-getBUILD_CC)" \
 		HOST_LDXX="$(tc-getBUILD_CXX)" \
 		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)" \
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
 }
 
 src_install() {
diff --git a/net-libs/grpc/grpc-1.19.0.ebuild b/net-libs/grpc/grpc-1.19.0.ebuild
index dbbfa3954380..d944be59c386 100644
--- a/net-libs/grpc/grpc-1.19.0.ebuild
+++ b/net-libs/grpc/grpc-1.19.0.ebuild
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples doc systemtap static-libs"
+IUSE="examples doc perftools systemtap static-libs"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
 	dev-libs/protobuf:=
-	dev-util/google-perftools
 	net-dns/c-ares:=
 	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
 	systemtap? ( dev-util/systemtap )
 "
 
@@ -66,7 +66,8 @@ src_compile() {
 		HOST_LD="$(tc-getBUILD_CC)" \
 		HOST_LDXX="$(tc-getBUILD_CXX)" \
 		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)" \
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
 }
 
 src_install() {
diff --git a/net-libs/grpc/grpc-1.20.1-r1.ebuild b/net-libs/grpc/grpc-1.20.1-r1.ebuild
new file mode 100644
index 000000000000..f34a772f7781
--- /dev/null
+++ b/net-libs/grpc/grpc-1.20.1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc perftools systemtap static-libs"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-3.7.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
+	systemtap? ( dev-util/systemtap )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
+)
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	emake \
+		V=1 \
+		prefix=/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		AR="$(tc-getAR)" \
+		AROPTS="rcs" \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LD="${CC}" \
+		LDXX="${CXX}" \
+		STRIP=/bin/true \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		HOST_CXX="$(tc-getBUILD_CXX)" \
+		HOST_LD="$(tc-getBUILD_CC)" \
+		HOST_LDXX="$(tc-getBUILD_CXX)" \
+		HOST_AR="$(tc-getBUILD_AR)" \
+		HAS_SYSTEMTAP="$(usex systemtap true false)" \
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
+}
+
+src_install() {
+	emake \
+		prefix="${ED}"/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		STRIP=/bin/true \
+		install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}
diff --git a/net-libs/grpc/grpc-1.20.1.ebuild b/net-libs/grpc/grpc-1.20.1.ebuild
deleted file mode 100644
index c17b91e18436..000000000000
--- a/net-libs/grpc/grpc-1.20.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-libs/protobuf:=
-	dev-util/google-perftools
-	>=net-dns/c-ares-1.15.0:=
-	sys-libs/zlib:=
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.21.1-r1.ebuild b/net-libs/grpc/grpc-1.21.1-r1.ebuild
new file mode 100644
index 000000000000..f90bab18e1c5
--- /dev/null
+++ b/net-libs/grpc/grpc-1.21.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc perftools systemtap static-libs"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-3.7.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
+	systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	rm -r third_party/cares || die
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	local myemakeargs=(
+		V=1
+		prefix=/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		AR="$(tc-getAR)"
+		AROPTS="rcs"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LD="${CC}"
+		LDXX="${CXX}"
+		STRIP=/bin/true
+		HOST_AR="$(tc-getBUILD_AR)"
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_CXX="$(tc-getBUILD_CXX)"
+		HOST_LD="$(tc-getBUILD_CC)"
+		HOST_LDXX="$(tc-getBUILD_CXX)"
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		V=1
+		prefix="${ED}"/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		STRIP=/bin/true
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}
diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 5a11d0f4a2d3..3a3bfdc3d72d 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -12,6 +12,7 @@
 		A high performance, open-source universal RPC framework
 	</longdescription>
 	<use>
+		<flag name="perftools">Enable profiling using <pkg>dev-util/google-perftools</pkg></flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 		<flag name="tools">Install gRPC python tools</flag>
 	</use>
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 9f60db809499..a68812f605f6 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -3,9 +3,9 @@ AUX gsoap-2.8.70-parallel.patch 229 BLAKE2B 2fb3b972b8201dae35911065df1b7555cbe6
 AUX gsoap-2.8.70-shared_libs.patch 6177 BLAKE2B d599e56a83a3dec5dc0e6470531081af3a5d5778f3ba7f231e41d4b95a8fbffe2f94ab41b422cff21df3c25dbe5976da4da0626735fe84877407a6f0fa925247 SHA512 46cc3733f1b25c3c5ac81ff340b4254d29bdd8c93f5cc4cb5aad4a997e253aed513eb466070ae1697a308fba5cf2bb22bdda0c04eecd0979debe2b38c68fab83
 AUX gsoap-2.8.70-xlocale_h.patch 660 BLAKE2B afe47e3394b7417defc0cf38a08f1d0c44dbbe445f6042ea361011d97af3b321681912e3cecff574e218804aaf954239ef8eccb6a8dfd2e6d50c14afa4d70e2f SHA512 c86e465752a90519317d61399f09925d5dfaa6ce11651e5013d63ceb49a92aa3728c880d6d57c50e830b1fcabf359cbc18f1b78c0fc2168d98acfb73c89bf57f
 DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
-DIST gsoap_2.8.82.zip 32514214 BLAKE2B 4945fc9e8c6fcbf364235c31aaf5eff5546b4f927a69cc973ba9e855a97ba2e40af2823448c2ea7d371aafea3ea6f6a71cc2d0527049fea53a2d6e1bbeecceec SHA512 daf6a1870fe43beb20d0faf646b171c92629885708baabea5bbce79fa5a8030f014dbe5c0bf4024031df993dd3ed3a90449db813946cfdfa9c12318096b57eec
 DIST gsoap_2.8.83.zip 32703770 BLAKE2B 1750a25bcd38c020c83d644395e9b3ac3e0c1080fb82f26b11ea0d0beea98c7dc8f3f24a77e093c6ac7e3598d416430990105eeb93e565809844825e1e937ec1 SHA512 7f4ae6feea26ec2d0e970e77cf476a0049c2e3fe47feba4e3b3b57239e7ae0016c409a74d3e865e56d2c01a8098be282d74a33c686d177d203cb8c2dff6bc407
+DIST gsoap_2.8.84.zip 32538551 BLAKE2B cab2b75ac931ee6063af47975665f45514cb94f5514fb1f76d17ccb2e71d64d4ebd43543cc004ff7f5c49982975ebaa38e555e3bc45dbc370aae991bc7639273 SHA512 ec050119cd3e480b266cad36823f4862fe0ac21045ce901c3c91a552eae2fbf9e1cd515458835807cce54c04df7835a980a299d37f418190cd57684fd6bdcf79
 EBUILD gsoap-2.8.70.ebuild 1873 BLAKE2B 470be90c7eff0997b921d6ef7814437d9f98e4320c5f11dd4bfe310be23448b1bc4bdf621d47f17c34b19ac29941b080e4b765b63eb0d1e05ff1c788d552147c SHA512 6394da6872a8e2ca0755a35814809f79b669386ee871abb3b42466001ac87cdba366e00d83171cf50f7ae12d196efbd8ee64d424f0940c78734e0afaa2e4de27
-EBUILD gsoap-2.8.82.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
 EBUILD gsoap-2.8.83.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
+EBUILD gsoap-2.8.84.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/gsoap-2.8.82.ebuild b/net-libs/gsoap/gsoap-2.8.84.ebuild
index a36f6c5466c9..a36f6c5466c9 100644
--- a/net-libs/gsoap/gsoap-2.8.82.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.84.ebuild
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index f42ffcf82f2e..ad278c34289b 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -1,7 +1,7 @@
 DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883
 DIST http-parser-2.9.1.tar.gz 51300 BLAKE2B f99c3e6a764ea0870359b43aac7f31691faef9cc6be3fb99426a3c1e3f24ae50689dfd8e46fa52a22d713780476130ee6fae6294b83cc3526bb5131cf16b98f2 SHA512 110a1861666cdd45857c3ab0e9bf8a3eb9d98f86fe001f7c620009e13186377de805d295f7751921cd5c9d4c2781807b3ae00f939af04d7365a3a45aa20b5052
 DIST http-parser-2.9.2.tar.gz 51298 BLAKE2B 5d37ea197acbac468de03081010fb3b755a093085e56c9fa5a3d4dbd70dd2903335a8113ec21664ca54a74aac4cbbb1cc64b861d021df944790453c2de9baaab SHA512 fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023
-EBUILD http-parser-2.8.1.ebuild 1010 BLAKE2B 41fd9e9bc96b39e583f49ec1c01befc7a0b68af0ae21dfff5523c5a8e54bd141fb7b470e47c7ef7c5ab9eda7a19ec64ce290371307c974e753c5477daa70330f SHA512 e1690bdcb1a2b1bc9f1e255e8d494d0e53f46937f89abf24a8106e1194961213f2f2d72370e81be29e3d1a8568df143c9a7fd80967a5d4df3975ba724e89bd56
+EBUILD http-parser-2.8.1.ebuild 1009 BLAKE2B dab1aeac7fc07cabadc19ae29050975d5f7712b260f314e06115f9367287edd0a8b524706a6817ea0a90d2a29fa8bb2d5d132dedf21b1d7476a8635e963346bf SHA512 b764290864401b181216c761847f54903671c19f2ebbe45de9d736e2c8fb02758054364970f9b1f913081004495087049c282130679536b785a877951a036688
 EBUILD http-parser-2.9.1.ebuild 988 BLAKE2B 22e14115cbd3f6bf6ba95751ac1f5bc891823b18b9c19c024458a964f2beade70b5c2a8591461f82de19fc336f604b94f8f1fe819ce8af8454d5f960a1dba624 SHA512 c37817c6f5c2eadfa559616c9c2ff4115ff84cf0bb5fd575c119b57833516885de0cb8d6ed20b522aaccd2ab122e0314231ed0591632ecf1212c3fb52eb8fe4c
 EBUILD http-parser-2.9.2.ebuild 988 BLAKE2B 22e14115cbd3f6bf6ba95751ac1f5bc891823b18b9c19c024458a964f2beade70b5c2a8591461f82de19fc336f604b94f8f1fe819ce8af8454d5f960a1dba624 SHA512 c37817c6f5c2eadfa559616c9c2ff4115ff84cf0bb5fd575c119b57833516885de0cb8d6ed20b522aaccd2ab122e0314231ed0591632ecf1212c3fb52eb8fe4c
 EBUILD http-parser-99999.ebuild 848 BLAKE2B a34ef61acb4072b1b51e13f4381fc6076b8b5e2693a281d1d41a0a15455ec29532aa7c69e474ecaad23b2230ff0d9894d02302e6940148ae19dafc080b508761 SHA512 b74380f265418b2956102b0d56c34ebbe8a439eb81dfd75f91b80eb266094d19940f29af59d50c894f832499af6aca11710ba14631b6111f5a9ea2c4ff4d1735
diff --git a/net-libs/http-parser/http-parser-2.8.1.ebuild b/net-libs/http-parser/http-parser-2.8.1.ebuild
index b1cdb5d9ae19..1d64d816e0bd 100644
--- a/net-libs/http-parser/http-parser-2.8.1.ebuild
+++ b/net-libs/http-parser/http-parser-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0/2.8.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest
index 990704e2a3e4..fcaced03df77 100644
--- a/net-libs/libad9361-iio/Manifest
+++ b/net-libs/libad9361-iio/Manifest
@@ -1,5 +1,5 @@
 AUX 7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch 1209 BLAKE2B 198818f6d54bbd9a987df795f06ec6a9a1fe0776b37fc27ad0aae4a2d31bd0e261af1d266aaf18add8585b8446806ef6d59964d90bfd08b440e49e3f5e8149b4 SHA512 4cf240a0d8cd195614ad188262a1b482c9f57647d72b3daf4a1717a03afb5ac58cd639e77ef6b861deaed81d29e60a599196456f673a7c1eb6fa8b51b2430656
 DIST libad9361-iio-0.1.tar.gz 27495 BLAKE2B d46873d69c494835e028ba1de7d17d48e5ed6bf1a73e96cf958dcfe44142cd39a9df3b00d61d3d3b8934bcb59fff3bd33c82f5c11de65f332185fe0e8c296f54 SHA512 64df3d4ce5e1c10fb44b6e39c11bac119ef77f2cc5b9785023b22670ca4905a1afd13c6923b3056f957789a911a3cae3cb7208770e1a112d849e7e3d2feb2fdc
-EBUILD libad9361-iio-0.1-r2.ebuild 743 BLAKE2B 1bb841da041dccfb400e217e515b5654b73817369ed15899f5fc08b392b291e5a9b56041c3226845bd3f19ef59ac25506ab0b2cc1dcdf1d2b26fdaa2eafbb22b SHA512 c27c986471ae812553253688dd5d06c4ab37ce4e410cc5a438edc4b664c549130cd50e17e91e80c87930af331abbf5cb3ea7cce2af1c05dae358db4d9c9ec71f
-EBUILD libad9361-iio-9999.ebuild 743 BLAKE2B 1bb841da041dccfb400e217e515b5654b73817369ed15899f5fc08b392b291e5a9b56041c3226845bd3f19ef59ac25506ab0b2cc1dcdf1d2b26fdaa2eafbb22b SHA512 c27c986471ae812553253688dd5d06c4ab37ce4e410cc5a438edc4b664c549130cd50e17e91e80c87930af331abbf5cb3ea7cce2af1c05dae358db4d9c9ec71f
+EBUILD libad9361-iio-0.1-r2.ebuild 848 BLAKE2B 08fb6933bf1055201fc031f2dd98060ae902cee7906de4049aff76b3bd4f153c7e354a3da9c0e3d5761b5a5bf2999788e9e726643dd995b5bb4a3d0e44989974 SHA512 51edb845ae8b1be1e38c34a37d32a9a66c55ccb9d5f07c62c4a2bdf539bbf93e8ae409083035b8866992e129375a4b3a4f8bad14af4d0a1701e5aa9e79cb37e6
+EBUILD libad9361-iio-9999.ebuild 779 BLAKE2B 339d7517026f123e4bec0a10ebe983afe3560707e7b8a214b53415643c90bdd75ee708918723808999e9614044f8a3684507ffa4b4d8183d863e258f74842db0 SHA512 83086642822909681b14bac5062d1c4429dbecb9bfe4f989621ca345705f1b47535ebcb8e25734e3801fa48b3ccf20cda7c381369c98210e607e63fac6080d52
 MISC metadata.xml 441 BLAKE2B 56143244ca58d80b2857f231c5313690c35cd686f152dcaaa9d9982f8692895555d19bad1cd222b91154b1a567607b80c9412d6d378a87c8580a80bab8794b7c SHA512 53ed722fc50caaa21746b65f7fd1fbff34a296cac7ecc49ad1a0dde04e17e09385985db1a1cfb2651333733516fb30bc32d9c26351f2df24f06c93d05ff758c5
diff --git a/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild
index 429ddc4b83f0..1688a99ad8b8 100644
--- a/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit cmake-utils
 
 DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
@@ -23,7 +22,8 @@ RDEPEND="net-libs/libiio:="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch"
+	sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" CMakeLists.txt || die
+	eapply "${FILESDIR}/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch"
 	cmake-utils_src_prepare
 	eapply_user
 }
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
index 429ddc4b83f0..bf3f30e1b44a 100644
--- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit cmake-utils
 
 DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
@@ -23,7 +22,7 @@ RDEPEND="net-libs/libiio:="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch"
+	sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" CMakeLists.txt || die
 	cmake-utils_src_prepare
 	eapply_user
 }
diff --git a/net-libs/libgrss/Manifest b/net-libs/libgrss/Manifest
index dc752c884de7..5e31c8c12043 100644
--- a/net-libs/libgrss/Manifest
+++ b/net-libs/libgrss/Manifest
@@ -3,5 +3,5 @@ AUX libgrss-0.5.0-headers.patch 268 BLAKE2B a9873d24aa5c0bdbe004c3d91466127fba21
 DIST libgrss-0.5.0.tar.gz 439634 BLAKE2B 28fcdfc7026b53c83bf8f97194bb70c1d68721bd767a1d527713756eb4360bb1ae81a2512d4284032d590bc5143fe9dedf1251c161bc22f0d4a1320639d05aed SHA512 189c49b7bdf029160e72d3d89c6779e193373e5a3af7f810041bf325d0b5543bb87b414d833a13e028a589b96a4d53bb223e88667d18d2c53f610d6086bb60ea
 DIST libgrss-0.7.0.tar.xz 362360 BLAKE2B d93337ab50edf9b5d0762a624fbf0db29faca556e5d13d51659c6199d9dcbf71bc8334b8a9c6a2830d9496b86d066949fc7b072439b63f3a528ef36b77c61bc0 SHA512 22a4f13ee979932575c6efd25bfd2fb184ea113aa34254d9e4bfb64cfbbd9b277dd235b8c9be037baf8c85bea7ba3bc1478ec3c7a3c87e63aeddb1774959c780
 EBUILD libgrss-0.5.0-r1.ebuild 870 BLAKE2B 445b78c46164d2039e77963b0265c3aa4e3e458d10981b636ad053da843305a450e4581fbbd083ca6e8289ef7daef6124fb9975aa41a174ebf9d8c46de4f64b6 SHA512 2661759badc30857e449aa5f53b167e4ed9a7cb0b9e29c65194d8b09a9c53ff4fd1da7d26c83a42186d3cff9399730c88d6e86ef4c0c692697a06fc2b4060871
-EBUILD libgrss-0.7.0.ebuild 615 BLAKE2B abae8aa77e8150eeb562f4c146de07dd34f48a3b6eb204405b66dc82683034cdbb1038d0885a06fc590a84d13c5e3d553fd4961e50596974ec3024f1bd1faa80 SHA512 d5f4d2cff93db961c456684cd26894a343082be9d1ad4f72d71134718842941890c3ecdeaf0124567fb8aed957aba8ebf054239e5795eb13ce7efdd130cc76a4
+EBUILD libgrss-0.7.0.ebuild 614 BLAKE2B 2ce2eebcca5add5ca5ef08532eedfb9ade808350bf37fb89f224b9899acbc262dc2176935295eefc9d2c17076233e7b250a275f65a27fe35717344817990b7d1 SHA512 b1219d02afd4e18b734225853f910c998b91268e670eafffa90b13c4f913b801b559a146c524967d810faa634609971ae1e1fa6097a088eabab49e0c89e681cb
 MISC metadata.xml 392 BLAKE2B a3683c8e5db0596508877ac63d648bea8ba8bdf1e6fad9bd5eeab6d1003eba5dd9cda58515e80d8f287cb4cd7d056028a4656d2f83660d102c2326c48620ca5c SHA512 ea3b3f271fba72e28c4d0ab6db46c4fe58d5bac4999192a324ecea7f5199b8191cdaaaba89fc437bc24fa146a29a61a17f3df12bbc3d32c69a6aa91a795c05e3
diff --git a/net-libs/libgrss/libgrss-0.7.0.ebuild b/net-libs/libgrss/libgrss-0.7.0.ebuild
index 03098268a1b6..379a157032d7 100644
--- a/net-libs/libgrss/libgrss-0.7.0.ebuild
+++ b/net-libs/libgrss/libgrss-0.7.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgrss"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-libs/libmicrodns/Manifest b/net-libs/libmicrodns/Manifest
index fdb77363c8ad..3da21b7a6dea 100644
--- a/net-libs/libmicrodns/Manifest
+++ b/net-libs/libmicrodns/Manifest
@@ -1,5 +1,5 @@
 AUX libmicrodns-0.0.9-null-addr-fix.patch 945 BLAKE2B 40b777b9d0d1a781d1ee3ff82a2370d0ca414c687d665b0df1aa9750e9bde79c027e661c9ead963edb366858c46f6118139903f77d8d4ef99df99b8c28d28268 SHA512 83ef122e8192f34608965e9d6a479ce73abf98c28028f5749e0c53cc677225fae25f501573b671425754b14fb1b871a29caff6e116ed19700cae464b4b7b4236
 DIST libmicrodns-0.0.9.tar.gz 57333 BLAKE2B a9e1d099d4588863dee3c2735a2e3f9cd46212729c342e06cccad1a8e997e85964e7f917ce97f50c0cccd21c1662ef9baf7392333ea666ff65b0577f57bab692 SHA512 6f7dbf1a324fed847131745498895ab0773dfc3c7bb96a05bf0fd3df0c0ce19d7f607789f7a5350d34e91e7ba323ee57196eb37ce351f83a9faa82c5fc8d89a8
-EBUILD libmicrodns-0.0.9.ebuild 623 BLAKE2B 274fc4ea614171bcb6f61479659f2e7121f00e4ee5f9100c17c5572c7576969edfc8185663e483c9f5c1d13d5f08fd5f5d81ccad130c8ee6587e15970d82560a SHA512 830dada25fbe415d49029fb8f7a8ce5491bdf9aa6e5bcb43ea8ac1ed5b18741284e62c3c182c7e86731114836797c67895689a1537ee73eeffd6ca024b56fca0
+EBUILD libmicrodns-0.0.9.ebuild 622 BLAKE2B 4b006b9b3c74c19701dfbfa4376d28c91c36466c454f29f3eda5c553f49e8b777461c85521ef2286ecfd42d2e92b8727dfd53aed5a75f32b1e1c4ebbe06c2949 SHA512 8ead0148b3436a8cc0876c7e3d4819f96dcce0c37f6c39f6cc08467d21a97064c5eb9492ac6ec5839090258e02a79f6897aca916420a1f323fcfb43988d17643
 EBUILD libmicrodns-9999.ebuild 547 BLAKE2B 9e2f1b42a8bfdf1ff226c6ab31c69d4925b7257d1f8f63f3442b42bb3001acdd3c34d96f6f8078f426db8c7a687842524910efacbc2486f6da28619a847414bf SHA512 fcb52e9ec7308571d795fd4449e4ec05ee4ff46dc6b9a7d3f3c4509d5481c16d1240cce3fbe739cebc2a8f67bad3890dfa4b657047e3bc30f1aab9468fb14c9f
 MISC metadata.xml 430 BLAKE2B 94c8e7b19ca9899428db5b67c33d492423ab83f354e878271bdc6ce9b6602c78892b5069ce38032e837e68285c2979bfb43ea11650d734ae6061089a3f2d1232 SHA512 7ca90565928898c788ac8b87abff3909c5d1c0947c57e4ba30b0929a794ac943c20f2002601d2614dca35c2e3b09432653378bd66eaa6f53881c8cc6f86b892c
diff --git a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
index 2ac4653346f0..63b0829aeeb0 100644
--- a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
+++ b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
 else
 	SRC_URI="https://github.com/videolabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
index 9ca0a6363859..ee7602420bac 100644
--- a/net-libs/libndp/Manifest
+++ b/net-libs/libndp/Manifest
@@ -1,5 +1,5 @@
 DIST libndp-1.6.tar.gz 364406 BLAKE2B 616bad28a38f40b32446431ada1ad786ea09e5fe8e58fe9d4944b2fc36ab7ad44258f9fb7b8cabcea47bfb366de3a4a93ef2bd1d032896f60cc35ac92e9c8438 SHA512 ad2df92c5b908f5c40e6e1920195ef97d560b667f78dd4ba5b5418d2dc294a69357fa704b9137f76a4d1ab473f0ec5f1bc4644f25f6a3f0802b75b961638be22
 DIST libndp-1.7.tar.gz 363502 BLAKE2B f9b4dc455a666fb8d7bbedd49ed2c66764eac0e886943647be906fbd2912379c8b0bcaf64460316417b9d13011c79f5cf6a79d0dae0af991b137cb69940e85c2 SHA512 4aadaf6d7d8b9e57983cba17ce92715cceef6635613c4c5326decb97fb575ce5f5d5586a629645e3605a03e385c6481bfb6c4458216be2bbd36959af62783790
 EBUILD libndp-1.6-r1.ebuild 565 BLAKE2B e6c1dde7773367b73701af74d37c91cf5d1c41ac509cdb06d9649be49f4addf4bd178f92ff21d689028260a917fb54388aba8b235a7b3556894cdf564e64920e SHA512 c4d41e8490f65cb6703a9831c7be6b9e097ceab8373dd3760adc855e967dca6f0523e03864f6c9048197fe458d23e206e25927dbb4080339e8a6d761b498bf7b
-EBUILD libndp-1.7.ebuild 565 BLAKE2B 7307cbcf163f3188bde8ab730e70c239d6511479caa0f6be4f3cd09fac1eef98cdc6e2274bcc2c18ceff0ae0ac68e382fc848017966e91c5a3fe5e947636ed83 SHA512 dc503a94be18ee896bfb1e78b6d830fd629c2fe4f183cfb7149befba0f67f97c47239a88a20bcad69c6c9db22054b5e6dd2ffcaa8f55a78b8439c3e952086197
+EBUILD libndp-1.7.ebuild 563 BLAKE2B 8353396a850ff244de413085b66d09fd80142bfe86fd428bfbd6d424266e46ee79f800a35b75fe573a0aeb21e76582a2b70a0f0c0e391236b425ba625abc5fc3 SHA512 bb1b1f0b08e97cc14d9426658e592994e372a63c90f65cd4337fdcb3d186e0e47380bee5823a8624d1915a460177d9b060f23f5fad006fa25193a11666dee187
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libndp/libndp-1.7.ebuild b/net-libs/libndp/libndp-1.7.ebuild
index 541d0be371c5..7e1914dfad6a 100644
--- a/net-libs/libndp/libndp-1.7.ebuild
+++ b/net-libs/libndp/libndp-1.7.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND=""
 RDEPEND=""
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 1b33cb4841a8..4c2c8b0497d2 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -2,12 +2,11 @@ AUX libnftnl-1.1.1-big-endian-1.patch 2069 BLAKE2B de0c7ac336dc01d25eb8f2a8ff837
 AUX libnftnl-1.1.1-big-endian-2.patch 1383 BLAKE2B cae500d1ebdde1dd1d7dc7b572ab0a5b30f775b1c9b874ec889ef1bccb2981795e69107268b9ab67aad17864d648ce2c63e29ab54596dbf11072631fa868f44c SHA512 9cae1b05c3b3794219609c95ad547a51ec2249b2457531eb6be1450f0c17a5c4a91ce8b2d3694490e986dba1b587b2df8dcf4f014f6704bef7250f8ec2bfac69
 AUX libnftnl-1.1.1-big-endian-3.patch 1179 BLAKE2B 8ca66b878b2ddbe73aa361b3886e033662d585c5a6d35dfd693877b9f706cbfeec689272f8f43ea41bed77a908e69873f946f967d76bdae0fd45be6992f93b64 SHA512 c1249763339cb633ceb556d97c483f437d6fcc095253df076e46ff3c7c613455ea8296abca53656ad7fea14c7903373c115bb7344abb11acc17b67c67db4bf57
 DIST libnftnl-1.0.8.tar.bz2 400496 BLAKE2B d2563f707ceb40b8cd7c4b4fdede64943fabcc8a639eb61c844f7b941786a49b1c029e375977759717e5cb8f8dc2019ddcbf48223347f868713d1a077d51d8a8 SHA512 df9f5967908ce5e6a6a85fe4328bdf6e7501ce6b0e42239b750782aeb76c30b1aae80dd07f73a06fb077d072b1269c4e0c5fd525feed1055400201567d215ef9
-DIST libnftnl-1.1.0.tar.bz2 370642 BLAKE2B 3dbc0116027e863a656c55c0d65449bf3905378e84c907f0d94582c608a793952fbb83f90565304af05978b08675a6edf13ee997fd5ce0d4374a2143746691c1 SHA512 3216afbd62f5dbd78b26c2ab3acb467bca5d6a7f5fd5bb15356b9d80ffca64f9afa1d8f374701e00f1ae9e5ec282fd55c970502121330c1446032e70bb593d23
 DIST libnftnl-1.1.1.tar.bz2 372562 BLAKE2B 9dee45bb485399c4677f636c8aa065a7e4e80102f17beb4aa066278a6ef753e7c1aaf02c6a853edc70f018ebef5e8389a05ca384116ec06761f0a29e278f4e54 SHA512 87f092e2b6576121538c8ac7ce92d8c918723e36dd02e2fcfcb7dcaf2ae705bbcd62c79c9076574ef73f461f7df5d10e72bcaeda29e4a7e60ea1401d998424a6
 DIST libnftnl-1.1.2.tar.bz2 366014 BLAKE2B c9170b9a948b949e443fcbbc0b795095a8e51b0cb77e5ba23853fe8c3005baa476afd5d7fa4d7bfcb733b912f0ecb868d22aa2b4c88dbf68e7b56e1a5b23c1db SHA512 808e0efd2ff32a65cca1e6113cc29aece1335364b94ad87438d19b0887d0bd34de11942fa411e4105ef153f2cce862ded17ebc441c413b839ac506471e530569
+DIST libnftnl-1.1.3.tar.bz2 366521 BLAKE2B 9a46a46b68fd6d3e0ffc3d28713ee9a70017dd4d05763a49a655f172ae77928d9b54554e7609851f3a18e9465c53f53c1828311162013bc067493e4e02ff3fb8 SHA512 3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe
 EBUILD libnftnl-1.0.8-r1.ebuild 1364 BLAKE2B 0c8ed0d675c9bd38094fde0b057b667e40cad6033f70c035c8e11d1e951fe68fac729bcde0a963d16d2acb58ada4343c35185193730a5a0ed4f0ee0045107c8c SHA512 c630c448ee80de01b0e98337314f2ac695c3a653914491db4aeb4ba1d99f9a43d532d9ff19b3ec92b619ab889a97d6788828333d90dd6bf81bbb2f2bf1cc54e7
-EBUILD libnftnl-1.1.0.ebuild 1375 BLAKE2B 8176c16368b5af09f74326a79beecd990be14274cf1e643d4a71d87a260cb5513d828df70ccfb2dad2b936a0e5312be1700a4db0c6132ffdc677c80a1e391717 SHA512 bee525dc84832e27a6b80faeded252d4f5bc373bec65bb160cd1402210b1123e99d7df0e670104bc9e73f7b2e7a80a5cee5770908ca15aad3e026dc273e44549
 EBUILD libnftnl-1.1.1-r1.ebuild 1495 BLAKE2B 75d2b2cdfb8ad9e1c9b994338ef585b90fc8728bb2c5d5c1daa0111f9ccb8ea5ea8eca1d4f976bd111beb4bb5f18799f48fc41701ef56899c770a5658c84b8fe SHA512 521e8da06ad4b1e7af767e9b33985305a260776dcda48692433b491cd2c079492db2ce6d41ecd61dbe29635e572d5bf03d6581beadb42e0044575cf77cbe1ae9
-EBUILD libnftnl-1.1.1.ebuild 1375 BLAKE2B 896998647d4f4b38aaebab192925ebec10d7afceacfee79dfb5250b175142c8f332ee6c20af203a0b72af9becf2676d21d334d42710146e6131ecfa5edd51c65 SHA512 d2a1f4d3b03ce8d8c44048fa049c556acb74cbc8b53a9198ca687277257452cdb9a477b9ba4e952d466a9e72e8239ce5a49815380f36231dbb837346e4636a5e
 EBUILD libnftnl-1.1.2-r1.ebuild 1169 BLAKE2B dee9509f316dd8956703ea1973568c26099449148a6c62ece7ecbab5c5201646f4468b47d669d99168769b0b3039a12485233ce5b6003dd84386cd0217180639 SHA512 7384dbf1bd63c8bc1f94603eb1e1268f1f6682aa79ed2a70679f8038c4a87cb3b5e50f76977842d890761c1695c7c7c6cc4d7b7bc2404ca22c224c822e6d4251
+EBUILD libnftnl-1.1.3.ebuild 1159 BLAKE2B 910e57e90dc99a8545ec9f2d2fd82447503bf191437cca5ebc4eac26875f541bfe5be1c8b538dad70b977c288315f68462a084e3e61470e9ced6fbc2421b66d6 SHA512 037078d24ff856b8e091a0acd38aa1e8d9018862004a22b433ac0f23a2596663c7dce98b9b22beda011d49ba491a2e14facec80fc686f02a8670d538958af1ca
 MISC metadata.xml 317 BLAKE2B ec8bdc87d1d0694e81566b611db8e455e851b86a2403ca8ac0c36f774f23b89fb9ee4e55dbc818efba807aec0487dd1956f2fb17393b327500dbe69118d5030b SHA512 bfdf498de4ccd1d1a4f78c7e94a90b2bf203e16b8ddec5949bb88c953279026f95da956ef94b39140d44bbcd8cb4008f9f4b777fd895576da8414051c4487beb
diff --git a/net-libs/libnftnl/libnftnl-1.1.0.ebuild b/net-libs/libnftnl/libnftnl-1.1.0.ebuild
deleted file mode 100644
index f9ff5b2f238f..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info toolchain-funcs
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/7" # libnftnl.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="examples json static-libs test threads"
-
-RDEPEND=">=net-libs/libmnl-1.0.0
-	json? ( >=dev-libs/jansson-2.3 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-REQUIRED_USE="test? ( json )"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with json json-parsing)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	cd tests || die
-	./test-script.sh || die
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnftnl/libnftnl-1.1.1.ebuild b/net-libs/libnftnl/libnftnl-1.1.1.ebuild
deleted file mode 100644
index 1d63f726eff7..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info toolchain-funcs
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/7" # libnftnl.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="examples json static-libs test threads"
-
-RDEPEND=">=net-libs/libmnl-1.0.3
-	json? ( >=dev-libs/jansson-2.3 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-REQUIRED_USE="test? ( json )"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with json json-parsing)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	cd tests || die
-	./test-script.sh || die
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnftnl/libnftnl-1.1.3.ebuild b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
new file mode 100644
index 000000000000..31dd03c894c7
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info toolchain-funcs
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples static-libs test"
+
+RDEPEND=">=net-libs/libmnl-1.0.3"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index e06515a1514b..6eee9e0d582a 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -3,5 +3,5 @@ AUX libnice-0.1.15-libressl.patch 1961 BLAKE2B 7e06399def0beb5c744d97fc6ed3a73eb
 DIST libnice-0.1.13.tar.gz 912374 BLAKE2B ae8ac3af7b5f355e3c7b961bfa60759ba71c8cc6ddb6cb5faaf1c6fe347785f36340a9f8977a1689595c265349a1b34305f41288cf951fa938b0411cec3acc0d SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 EBUILD libnice-0.1.13.ebuild 1566 BLAKE2B 4b5dcc470188b8fba4435ed7be47dacda438d59821ecc69f5f6875572d91b3bc6a4039febb7d2c241674122b6db0aecd1dfcf2c15a226bb144850d7b403fefb4 SHA512 85220da97849a1202ff57fc6864011bc5d6c7e2ebccdc7ca98a852af08defd5616dd55bea86cd101c60dda24444258d51374124ff2ce52c50f47a6dd7c0b0137
-EBUILD libnice-0.1.15.ebuild 1763 BLAKE2B 0c79f1ee986c7f7e12899d680390ae2865dd924db03b7ee065fc29ef5aefd3f3051e12403de2732f4811c7fd70ef8338254044719b0bf518df137c46f592291a SHA512 d082a3c75ffd23cc20484a7aa047dabc8a54e83d28cb445ac052cfd712142ce2acae1b10fca65d4e3fe078f5362ac636116ebc989fb81bfd9d0b8d3f92f9d6e1
+EBUILD libnice-0.1.15.ebuild 1762 BLAKE2B 06cc0d9202ecd7e9483315b3f53e5edea519a689b65ec9c50fa6d810da643e9bd366a2f51b459076550ab8e6bded23b20b26f31b31a7bbaf0ee926eb0b4dbd52 SHA512 81dbc8c137b7475e208cb22d1e27591061c7ab16e8cdbbb3474544e3c9f8eda2eb4561650adb611efa71066eca9413f13edb288222ddcab1c95dc6917482b99f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
index deb325875153..f01485ba8a09 100644
--- a/net-libs/libnice/libnice-0.1.15.ebuild
+++ b/net-libs/libnice/libnice-0.1.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+gnutls +introspection libressl +upnp"
 
 RDEPEND="
diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest
index 4f8ae03794f8..aa7c0b1e2f19 100644
--- a/net-libs/liboauth/Manifest
+++ b/net-libs/liboauth/Manifest
@@ -2,5 +2,5 @@ AUX liboauth-1.0.1-doxygen-out-of-tree.patch 2231 BLAKE2B 61523955ac500d63879dae
 AUX liboauth-1.0.3-openssl-1.1.patch 4483 BLAKE2B 4d2628448a1341cc41a676d5002c7f0f17af384fafde77687bc83235d90f4b6b853bbc9a4262fd4acaa0b04cb67d586bca308bb9c66fafbe7de1734fb39a4c1b SHA512 90ae75bbaf7296826f813df852263901ad8632579b5e5dd1e8b1edc4719d3f749ffc30e6348ffc2ddd5239de544c934382f52c4d62e90b3e655fd9630b5b4880
 AUX liboauth-1.0.3-openssl-1.1_2.patch 750 BLAKE2B cf07dc1722c41f55e1ea5d241c91bd62d4eb8c862a727cf350ea10ca11a24e195439599bf1e712158d6f0dbd113d5cce62d567b48883f23e505e1df6d077a34f SHA512 778222c9b5ff2a35447cc8c14f7868f011c3a3e938cebdd617471221e07278e82b70bc436dbcf28c4b7a558486465a0e36278d18718f48f57a2bb47e74eba957
 DIST liboauth-1.0.3.tar.gz 504950 BLAKE2B 56cf10574af58995de9bf86bb7f00becb360cc899bf1ddb23804820d63ae2c7af29aa29031f68ce79a6cc441cbce27aebf5f1c9dfa029243d7732592d03620c7 SHA512 5a13818dbb3e0df76f7a3fde451eff4f90c9bebfe2076a294921af0c07c2b0789f717f0f862ac6961562d4227e016dc198ddd7efb9c7ac599c3bfbcdb2ac33fa
-EBUILD liboauth-1.0.3-r1.ebuild 1575 BLAKE2B edac3426f806f029b972ea2538aa14c477e2b4335c2b88e9097aeb0a609bd96f152c28747fe77f019c9219425d89f3ff308f71421a8a1f1cda76228a7b170f36 SHA512 20e771fe25375d747a5670aa644b47395bcf909de6a8301ab0e7ac684f606f81c0ac5fc6c61465892ea178dd9ab41f4c0b2bdca88a37eb1bdb5244bbfc8aa264
+EBUILD liboauth-1.0.3-r1.ebuild 1574 BLAKE2B 2ea82b2ad55d4f4d9c2257732c75dc3d0e54b17ccae1a36bad595ae649df8ef48f0f5b074c4056d2d3824ab7e3a34315c9a333208b3caf8e017b08d58c588c46 SHA512 a09e3fec90db3a57228ed6b80c19a1debc87555242eea72a43cd923b579bf0010e02cf1b09bc84b903b5bec6cb43c27e6e9b8aec4204552256c4303b8f05f29b
 MISC metadata.xml 879 BLAKE2B 499e638089270b30e1fc4a15008592e036c05032719e05ef06cc4c897be1bebe3d4873caacec09f6c54f65240da2582fee0776aa7e0b89508e98c4a3a668f870 SHA512 05625ec768286997f291d95e40e024c692bb8dd3be2d2eea1c3d7c90b452b9a98988a2ca43a5c6134a0e084e0a4ae40af4a00e809092edbcf3a0630781657a07
diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
index fda29af61178..3540e299a28d 100644
--- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 MIT )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="bindist curl doc libressl +nss"
 
 REQUIRED_USE="bindist? ( nss )"
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 9b9f954037b2..0bdbec823a11 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
 EBUILD libpsl-0.20.2.ebuild 1473 BLAKE2B c70153f34bd9da55823c004eb61fd10cd9f91bd04b55ad33d528d37dbd4bf32bbf3eb6b117adfcc1933099ea09a3f6ce1b490342386054662f7a9f97fc125699 SHA512 32ff684e4938c070a09ecf5410b35e50131716b4e694c798c6b7a9e6cbfb86d3145ab9b78ff7c2469bac74e43c579a131d64ae5dee4002723c15d46431af307a
-EBUILD libpsl-0.21.0.ebuild 1476 BLAKE2B ddaaef76af1c382bde3b327d7749bcfd412efd0dff7797c3a28a64e5906ffb73bdf2c91781332e0ffeff916db1891139b56bfa4fae0c68d7df93623becb5a49a SHA512 9ef8ac9dfdab1f1f7d5d7985a26bed09dd73a51b5886cae8fdfb4fe52ed53833ea93f22b6653deadcd2c07dfdd3dfa011012503e03c9bea498e12dde0f91ae61
+EBUILD libpsl-0.21.0.ebuild 1480 BLAKE2B 4357ebf870c6f50321c5d760dcdb869b533e16d66fccfa9993d5b9a325e4cc46cc02109bcc15dc26ca63e17cb364594f8f3183b647bb1a06108f662430e7e83b SHA512 0933b97f2e731db85ee34e2f6a12b48b089e01025138e4862e038062bf35816f4a5c2cbdad570e3147ebb332a10bc129e69eea909f8a8221e9f22c5805cdb29b
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index 80ab1cdb49be..6606dd228d7f 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
 IUSE="icu +idn +man"
 
 RDEPEND="
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 2a740212dc6a..456794e25567 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -4,5 +4,5 @@ DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e
 DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
 EBUILD libsoup-2.58.2.ebuild 3011 BLAKE2B 6bb09cc7a247550ac1ef0fbc82b3a6e2d0fe421174243f12feabb87dda992b305ef0aaec2fdbc99a13eccd1523ed98f46bfe175598907f30d9365034ad6c3fd7 SHA512 98dfcd612e875658b20e590875f0ffc016fed4f4da998d38954a6fbd5f8817c0d95819343d567432b682dadb152299d826f8d65aa36714de091e4aad8c20e8aa
 EBUILD libsoup-2.62.3.ebuild 2922 BLAKE2B 8b7f012a12a0a6d6ec723a5d8fd74ac57bc5c734c2dd4c65fa51ac6db657f4a286a3324509c4490fe97b9e5c8f0834d8116285392bf643349bb398bffb8c406f SHA512 c70d71b679159df7cf00829cd13e68f8723e054ef3bb3ddcd131008ce699317fb5a7e9a0a69cc4381746441555b2f1dd78c78f1528e39cc38315d396054cbcb0
-EBUILD libsoup-2.64.2.ebuild 2812 BLAKE2B 61c3033e057e6e36cb503a266ac3b13128d150ec462515ae518a063a272249815993f29b04b73741284e44320dddbffb28646a54e58a2b1eb1306699701179b7 SHA512 72b40e83847245d124929705eda35733b9bad46ecb9ce112eaf2f4e5d54bfca44d8d30c57bd204508f2579d66db016aa3792f6cdc9ed7fc5c84cdd11d0da144a
+EBUILD libsoup-2.64.2.ebuild 2816 BLAKE2B 1b7e3161d37cdc54d3ab56b3c2e5d7ab28c9513a4b4c50b7b03475f7d9e435ef2eb196dcb17609e401f7818ad5c0c2e1d27224241cde2e9a7ebce1a24a837283 SHA512 e6b0d903dc1c8181c40052b76974681fe21f21c629e22d0fa4500037bd4c17841ebec1bb479caffef8cb7f2528f69765c4c8c35e50b12d7ccd99db6b4c1060be
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.64.2.ebuild b/net-libs/libsoup/libsoup-2.64.2.ebuild
index 45930701efa1..cbd439f73b92 100644
--- a/net-libs/libsoup/libsoup-2.64.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.64.2.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 0964a924bcbc..952065a68486 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -8,5 +8,5 @@ DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f0
 DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
 EBUILD libsrtp-1.6.0-r1.ebuild 2382 BLAKE2B 46357f214e3bb13d64daf41157ab8d560dcc741933175252b97a42d84426497d5c596867c496d5ceef0f1ab36149eac3a9337c0c2e72c96503c696590198ed20 SHA512 eb599d95be055bcae54d06b8110fc6351f1b0048fa5566f87941ad7583c794b5c26db77dde153c0cef9b54d063aad7f2c130a7708b378ef1a45e68cc259f276a
 EBUILD libsrtp-1.6.0.ebuild 2215 BLAKE2B 0c7fc9e569f320487aa26c95c9d5b70335fa770bcc7471a1727e0872f8af655b3af9034831fa5d8800afb0492bf2b6bcc61f1aa9b3b1d6b39f065dee7b2787c0 SHA512 14f95b201db1eba997d54059ac6c54d0af5d5047bab001510bfa1fe6ed7ed3b3b29428a1221fb6c0e44fd0fc96b8a481416a912e4c0c79fab3f6b56afab29712
-EBUILD libsrtp-2.2.0.ebuild 1849 BLAKE2B 8da25f146b54912124fa5f31bc31431098216ba839375823cc5afa093ca1c34e5a6bbd1ba39d9b2fe5db744291cb39e70bccaa0693c5997cbe2eb18522a2c380 SHA512 a42d3e5bca155e7ea0453903c19d0ea38cca52e5d1fcc08bf031527e4500e8fc9a63b884e0d157cdbaf7ae0a4d253d30b788eb86292cead338b6c05ef56d8efd
+EBUILD libsrtp-2.2.0.ebuild 1848 BLAKE2B de13bc96422646659fd82fff3b9de1441743c585a74ea24499009fa20d20b9009bf7183385bec03a3d0c844367eb0526a329b1021d19536eb871ffbdc8f135a9 SHA512 df56545398885f53d6dbfee89a147f92d40cc03b8ca38a1addc58497d3dda5aa0df2c5434962fdd400481567bfb5b7f5e7d0fbf055de17123234fe7e38546e8f
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
index add8e007cda0..241cce30c991 100644
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 061c5c95be2f..20077c4a7d58 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -6,6 +6,6 @@ DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420
 DIST libssh2-1.8.2.tar.gz 859587 BLAKE2B 58e0854e83001c424a767ceb4ddfb535373320d8319aa632244dc14434276db7c8b7a77d4a5f22fe8e397f1050b33516d2fca1162658a9f414166f560bc1f358 SHA512 390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93
 EBUILD libssh2-1.8.0-r1.ebuild 1362 BLAKE2B 0765a2ec7cfb2b0eb5ab4f52054d4cf8abebeda0b47814520ec76a5b3ff4299efa642483bfad8051788a27cc0934bdecf9a91bf6a17b49e81562e2b3a6b246d6 SHA512 61067547b394f9c5959bf7dec2ec2cb0a69629ca5a65f9f5dbc6f71b8664767802af0fe59eae210eefb165378c9f4af58eae0358421ae4f339da3812a80dd579
 EBUILD libssh2-1.8.0-r2.ebuild 1647 BLAKE2B 47a2d718a0a2bf40f31fa3a3251ddf64e44fdb2823b61a3c10b54cf34c41af01adc3831b99f25a8b012cf7ce54a0120d4216dd3c7ec9921b48df15d29d542561 SHA512 43bbf761c4075cbe523b1b5ab247ef7e69c800f529ac41981ff61cf53a0c37b3b2b989cd9a08e7e709b9ddc0cb9d2a86f31e7930b96c95a0e5857aadf2a3eda9
-EBUILD libssh2-1.8.2.ebuild 1640 BLAKE2B a58a0bf9e7129e17a14ecfb17c81449325f2d5cc4b9765ca4ac73a8574f23a56914401fbbff8bc284b5239bb02f97f03bd3745c02f890d2360b92c495b000da9 SHA512 a7e39681d2cb9a006b900b8fc9b91c251be9c03ecbb40ea31a502b46614f75e042c443a8ec94a9371997dc2fc7ecb19219e0af2452c0746a81a7a5fb3f3f32d8
+EBUILD libssh2-1.8.2.ebuild 1639 BLAKE2B b94ac43366db8d2f143b0f58f72902b7b7f2fed8000f4719492902122a75eafd8cff6da2829a502c3b03c6740866aa7b1603d48798ab285840ed93a72e822fed SHA512 4b175bc5e71b6691ec3891f6b50a42410559e11f1fd7b851cb23b212e5ce9f750539fccff2f7deb6ee6e27c1865f03f41d3ba15b89157f1f370b06cf5111572f
 EBUILD libssh2-9999.ebuild 1350 BLAKE2B 4c235624aeef7721a3488a1dac91d406f5f83b8e7b1482bdddf7a71f0d2ad19c0124aa64b00b228d713a5da0c394accc9d3dce19374d588256e2905139176b64 SHA512 e12db58e8a20272414575ab19378dec2ecb2c97aa79d3f8d4397ec9638a2377d9218f21302c2c56af03dbc8620e807189b50442cb8d86b3b50d9c8caf15d717a
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild b/net-libs/libssh2/libssh2-1.8.2.ebuild
index df52717f790d..ac870e1233e2 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 234a0d659966..76d284c09ab8 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -2,5 +2,5 @@ AUX libvncserver-0.9.12-cmake-libdir.patch 669 BLAKE2B 1906637be7180a884aa3daf8e
 DIST LibVNCServer-0.9.11.tar.gz 1413739 BLAKE2B e295d3aef7181cd767676c4e55130fa65ecf8ea92a659b6de82d2cc465f1c9e1a587839942fd89882126dc8ec54f9de20a78e799ea194f9ae227a82ae705721b SHA512 e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb
 DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
 EBUILD libvncserver-0.9.11-r1.ebuild 1921 BLAKE2B e324d043474b5575867592f07106ef8c6054004aed2dd46a1ac433962538b0203da3315a1025490de760960d58102935fd925ef77287af597ac18b363590c5c2 SHA512 33159e0e940be618bc4267e62f34555cc48726fab8db08097568e911f3fa5efdb1391ad0ee054e92db785811368943a601ce6434456177a0258c044431c9eaab
-EBUILD libvncserver-0.9.12.ebuild 2113 BLAKE2B 22f17f33bd0ea7ba84bf1744ae25f3ad15299902311e990db06af343d570dfbce1cb16de0a167311f610ee4e7d4ca781006aa15b2ae182ae0b4d321e1aeff300 SHA512 8d9e6ed8352cddb3146d37525bbd3ee47b335cb6ca28e43005d7dca6a7c3ed8756cae3a2922c10bedfab0de7926e98a04ec78b1d2b60d453101b755001cfe1f8
+EBUILD libvncserver-0.9.12.ebuild 2110 BLAKE2B 970c3a5794a09ed58a814c5455028a38e1ebc022412a86c8198d3a40fcc39ec9d6db5d634af6ceb524dd35f280d216262b3d5dc7e7123637987af13b621d57be SHA512 9bb50f1bbc8565547ece02c7fb2d5e62c967932045d39783e64eae5b221592af88b5c566e368e5e1346b5e7086f20b0b791a35a3e2cef9bb91ccf715c7cd03ad
 MISC metadata.xml 886 BLAKE2B eb2d3707e1c536735a10b97c885e8787d1039449cce85e93e4ad485bcc92ca786a538aa10cce2888657cb2764c5793c6d86516b5dfe16970ce54e23803c569f1 SHA512 40d57c413847589b5e3b4c4edd7743bcc3461624abe129c7cc558178e1af8ee7585c3a1edb776c884a2d8b33b99bf9d67e4e6fa44c774692e66b2bab074fe06e
diff --git a/net-libs/libvncserver/libvncserver-0.9.12.ebuild b/net-libs/libvncserver/libvncserver-0.9.12.ebuild
index 35cdde270759..10cbd56dcaf4 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_PN}-${PV}.tar.gz"
 LICENSE="GPL-2"
 # No sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl sdl ssl static-libs systemd test +threads +zlib"
 REQUIRED_USE="!gnutls? ( ssl? ( threads ) ) png? ( zlib )"
 
diff --git a/net-libs/liquid-dsp/Manifest b/net-libs/liquid-dsp/Manifest
index 3be536170062..44e457bf5c70 100644
--- a/net-libs/liquid-dsp/Manifest
+++ b/net-libs/liquid-dsp/Manifest
@@ -1,6 +1,6 @@
 DIST liquid-dsp-1.3.0.tar.gz 1036160 BLAKE2B fab2cecfdb3e494c5bb25d273be3dbb44904b1c1ef419eb166bdfa33b29a03aa72cb1c1d8b2bbb8ed87a505fa2b68b53cb300f41a51fdb01ac2cb5e309fec5ad SHA512 d69df2c15ea56cd84be9f77383b9914daa52e89e1136aa84fd14dff7690e98c4e29bb5c4e570cac5ef826b884b8fa382e5d806a711d22b6d5c4ddf5b93a0026b
 DIST liquid-dsp-1.3.1.tar.gz 1047182 BLAKE2B e110ac2838209b97420b4884d9df3a3477e548c09f2d3962b025e6e1415ac7077cfb81f16005f90bc01c039514ede9a53e53d969037f7b86c2475e2833f0e32c SHA512 6da76030fc346e3fadfe70e72be14d1f2ff198d3e9bb5ffb5f4d9b89945686d2474d3bb4911a2b923aad22feabebf2744d47afbffabab87737fe46a24af68917
-EBUILD liquid-dsp-1.3.0.ebuild 1045 BLAKE2B b4df00726e055a2b5faaff6a5dfacf078a28b8f5cb141465c9b8858fe0f22c92c60248e28ac8960706703fed19ca855437b7ec7d072a2d89e6da8633bdba8c77 SHA512 949fbf9e3e1e2b7e3f63e6636d41817d0be9942611adc37d02595b4a2cc7df998186fae286f9773f5f193eb6e6c9f1ae6461664d05275c4af3c3289795fb0d2a
-EBUILD liquid-dsp-1.3.1.ebuild 1045 BLAKE2B c56ff5cfc465668a05ffe4f4a2624ce374505e01c798957f935cc1cb433c75bd926f7a41acbe1b261069d312ef990345dadf286e54f5307d3308cff13c7e124b SHA512 4786e55d4e0a11792ae681df6dddbc232d03e20b0c40cf871992936e7316432de56fabf03a3ff9051166591e74edba3330dcf0988022d5484d2fb00aead6a8e3
-EBUILD liquid-dsp-9999.ebuild 1045 BLAKE2B c56ff5cfc465668a05ffe4f4a2624ce374505e01c798957f935cc1cb433c75bd926f7a41acbe1b261069d312ef990345dadf286e54f5307d3308cff13c7e124b SHA512 4786e55d4e0a11792ae681df6dddbc232d03e20b0c40cf871992936e7316432de56fabf03a3ff9051166591e74edba3330dcf0988022d5484d2fb00aead6a8e3
+EBUILD liquid-dsp-1.3.0.ebuild 1043 BLAKE2B 8a59c5048df3ed3a37aa604debfe63902cc18c3bb966655b41797622932784dbab23a029a1e30b73eee83b36848b07fd91f8af451bb9e9a2ac0afa1f27a30fed SHA512 4f4a98753d710a1d831072fcf6d7be4352ba02c4ac573a19043eb9dc3d7ac90db7e51d1ac3ec62fd499e01517a5d4753f4adc4c9ef255970f8852e3abe22e77c
+EBUILD liquid-dsp-1.3.1.ebuild 1043 BLAKE2B ba53260d7f825f0b6e1286e66479143c4d94ed08dd2a39eca335933556a20220c9c74cd3af844af9942d4350a24c40f40b194a3bccf45a0e9ed4554fdfab39ff SHA512 284f56954f6699fc27bc4a136557a65697437ae3316e97f423a598e0d6045d6fde6d3355f07aa9d22e94900296414da8bde07b29d36c82e9d246600b78f9e72e
+EBUILD liquid-dsp-9999.ebuild 1043 BLAKE2B ba53260d7f825f0b6e1286e66479143c4d94ed08dd2a39eca335933556a20220c9c74cd3af844af9942d4350a24c40f40b194a3bccf45a0e9ed4554fdfab39ff SHA512 284f56954f6699fc27bc4a136557a65697437ae3316e97f423a598e0d6045d6fde6d3355f07aa9d22e94900296414da8bde07b29d36c82e9d246600b78f9e72e
 MISC metadata.xml 416 BLAKE2B 6f961dd0d9e7e9ee5b6b65eff224e6a73cb7b4ac13432a239da0e28e76e73b49f428d2203294aba8c9568b2b384222a75aed92f046c537d55af738b76dfe29ad SHA512 7dee49689a60f0b24a9435987f3752f53c36c84187e19850bcbe5e2d14b1fd7bf52c3d8de83f91f3e25b3984bbbde9a08150b24d6b62552602ef145821bc95fe
diff --git a/net-libs/liquid-dsp/liquid-dsp-1.3.0.ebuild b/net-libs/liquid-dsp/liquid-dsp-1.3.0.ebuild
index fcd3127de23e..1e7b8067e41a 100644
--- a/net-libs/liquid-dsp/liquid-dsp-1.3.0.ebuild
+++ b/net-libs/liquid-dsp/liquid-dsp-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools multilib
 
 DESCRIPTION="digital signal processing library for software-defined radios"
-HOMEPAGE="http://liquidsdr.org"
+HOMEPAGE="https://liquidsdr.org"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild b/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
index 968f83948b9b..a22a52f75ad7 100644
--- a/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
+++ b/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools multilib
 
 DESCRIPTION="digital signal processing library for software-defined radios"
-HOMEPAGE="http://liquidsdr.org"
+HOMEPAGE="https://liquidsdr.org"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
index 968f83948b9b..a22a52f75ad7 100644
--- a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
+++ b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools multilib
 
 DESCRIPTION="digital signal processing library for software-defined radios"
-HOMEPAGE="http://liquidsdr.org"
+HOMEPAGE="https://liquidsdr.org"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 2f4f61af45ff..4dc9f0de3adb 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,5 @@
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
 EBUILD miniupnpc-2.1.20190210.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
-EBUILD miniupnpc-2.1.20190408.ebuild 1337 BLAKE2B d5248f0e817c206a781680bf6f5e2842c6e0533b22ae1bab0373946235d18ed7165a37d0ec5084f6c09aada855dd17b50f450eca0f55305e7349c5c6d35779f4 SHA512 eeec145f6ecd01b157c4e0300669937f192c406276bb2fc736fc6d992be3d9b15686c7ed8b9512f288814f3624c27827201ff8b99b9fba13203da74de9136087
+EBUILD miniupnpc-2.1.20190408.ebuild 1336 BLAKE2B ab1cd055a1709100703671ad87114e27c4099979e29b1d549abb9e19b6c13a81a08a973d723e8f10fff17bb01c582919312c2c56b1e69afe4e3c1a9db3875cc9 SHA512 64fc2936a503db04fc8525e653d3f62317d477c6894be1a88b285e1c0ca27f483ee905ce3a40213d2178ef4b0fe462c0920b7d9766844af18e9b8f109aeb52b5
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
index 001384d95bd8..c1f5b1097244 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 0e424360505e..c4933cdb1850 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,29 +3,27 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.15.3.tar.xz 20262632 BLAKE2B d65d4e274fa829be5cda1970b0ebe7081e8476334cb825e5727324c3202bc015f4ba39589608284d0f8c0b722079c06d1587de5299a3c81ccb7b0eacbdaccf84 SHA512 cf741f733af7a7e1fbd37b0f98110078494b4771dbdfccacfda95a5ea4cda6cdcea4f8d31dddcf27477213614e4ab6cf7d1a1f900cb92936333730737ac4f9e8
+DIST node-v10.16.0.tar.xz 21480088 BLAKE2B de91e718893aa0bb87b75225a484281370ca1054fed919d6177911ca8e57228a0925c077a02397efd05594f72438d47b264d6f4b91623173e3a577a58a5d86db SHA512 df197c7b929fe1e0acf0334dbeb45be4c0cfa3266f9ddb513eafffcd6405bc02cba2fcbd34a7a5bef2e45a1d61ef3734ca0afe7295904ed563744fe06751cc62
 DIST node-v11.14.0.tar.xz 22106812 BLAKE2B 3a8dd9feb5916f235bf69d0610e32c1861e64f427b6de5ec27b3634268f273826f271cf5ea821042420d3b3f348124be2ce2fda13d0addea092db1338c9f95f7 SHA512 4e8033ea0f326fe5a8372c81771cd58242881ac7db905f697ce79ef9cb3ba2dfe2b94fb24a36775761c72ac531096c5e18a8574f933d76c1b652b18419b25446
 DIST node-v11.15.0.tar.xz 22115480 BLAKE2B ed1f621e46d24051f8d84255875e7cb2c1bc0f9432a12fcc35dc5e336a71bb3e7f511146d112d1f236f9f978a68987d80331c22699479ce63b7bf30e50643219 SHA512 48270620fab3eef86c21387b316ce9054e2b0aac60a36f7fc08d18ad4a11c8d2082886ca20a455fb4a74a561d7e97c77403227ec9a83a13c47fa230b47a5af2e
-DIST node-v12.1.0.tar.xz 22463256 BLAKE2B ed66ac34acb3e27974f1da192776223104862d00410bc3f77ddafa49fd3e5a1a9921acf472990a8cc953522f2953135ad1af80ac9c83f8d796dce343a086d419 SHA512 bef5b8f85f772fbce474991952cd36cb83f8bfb9cf59d34e0bc4b0b60fb1a5b8547eaaca8c796e865ad6b7e54dc76e0fbb2c0d692ab35c1cb7d3fd4d39add4e5
-DIST node-v12.2.0.tar.xz 22436748 BLAKE2B bb578aad8ad49ee542716086591d896c325083d48b7e69b8b0e9644db2b43546872eaba4b7b6a8b983cb7b21fc948705af88cbf883f275af76bd24918088d584 SHA512 00cda17e5fcce771ea461941d6cdd258545ac295bfbe7543f3153278e73fddbe117dd81c4e22716c147eddaab2577f50abf2a3235b18b4eca60180dee050dd7b
+DIST node-v12.3.0.tar.xz 22448392 BLAKE2B 8c6e40d9bcfee315b6bb5f97846db27ebeae2520fcde5ede942af2f24032101c06653dded9d4fa77992fcdaf5b0f67452e5e3cbb032bd33cde4dc496a652c283 SHA512 4b97524781efb8c284337b36d1b02576aa6703aa37d0775329eff735f38bcb5391364bd420914fa75088b97e72fe087e263a41fb2367fc8e8f7f63ebf4a949e6
+DIST node-v12.3.1.tar.xz 22462972 BLAKE2B f28b5594aca3701735a178873ae426ebde27a6abb5b13115c6ca2a32bb2e2532f60a96722b07737246bdf8a1dce799e86f920a355278ad8619d9931319a6e81a SHA512 40e05550d48b0b8739fcd6ef66a70e53e85106af486c2f99aad58fe10c8f33e5473ab5afb59849960ce828f5c8bb21f26cecbbfb31852a2f2c6aa3916449b44d
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
-DIST node-v6.17.0.tar.xz 15853760 BLAKE2B f1872b2ed43c447beff2b3278e49f9f10bbef58bba2640f6ecd889facfa4c5e5ae142f3b30721faae615df42c0870d7c09147930a259fa81c161b29559e2a340 SHA512 8ae9bfa0336a7d0d9f4a372330de1f877354a3d68bdd6977285787f81999012e42faf4ccef5981fe565ea9e2f18c5490b857bab29359fdf906b5a9fb14628858
 DIST node-v6.17.1.tar.xz 15858444 BLAKE2B ad050f71452f0ddf989e66a4eb02e88e4e5001faa2bcb0eae6b57784da87ba1d8251201e3a3d15245bb4d846f31f39854ddfae47aa1212c0526ec717438ba778 SHA512 6938c4864a96f5698ebc4e9a1228644820789d5402f42348eb1ff9ccd64f31bb91309a1f3301636b1117424c88b0b41b42baae51a1070d5c532604e5d7d7b868
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
-DIST node-v8.15.1.tar.xz 18501532 BLAKE2B e6da98902d665997b2e85472424e00f817353dcfc118b1d309f1305099b145eb0eae33429554ab5d563366182b34b24ac78f8b78794f8d21318ebcd137622131 SHA512 23fb4e2580116a69a58514c2dc1f42098c7d594ea9d0cd6e7090f37e12e1805ca6546df66ee68fcb61b803e287ce34422f55129412f6bdcdaa97f515d9581e19
 DIST node-v8.16.0.tar.xz 18515392 BLAKE2B fc2e53322fbd74cc35c3865d718733ca18d37f82af057650cf119ad64bb81aab1dcf8a09e43437b1f196547c11291f5d7de5f53a959f0b742f8f5b97e4a2d7fc SHA512 42ce0aa6f94b42859c2df43db4e3a2818581ccaf92179a7a5252ec122035c8674dddb8aad3b867d8edfff19053918162ad04e8f2eedc1026b199a12b586ae103
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
 EBUILD nodejs-10.15.3.ebuild 6442 BLAKE2B 8ae691a1aa9e3a2eeec5096c5890fa6ae2d8774769f65c88551f3c09e2bd7fdf9482f0ff169e2df43d29be1d85d4424dad7e840300c8f441028c7fab075cee69 SHA512 7ecdabe04e2eaf93277922e528f777126a90fcd8c96a18d3db7f890f0dd516cc0ec2c60f427f1366aafe42e869a777468bcfe85fea0cc1dc62c252373b7cd594
+EBUILD nodejs-10.16.0.ebuild 6444 BLAKE2B b2b9b7389dc48866543b7bbba9745587e954309160d6158df1339116a67e0cd7a74c0ff4cdbc024d90f4b26f731b3b4ad42c294f792550c110ac32e7df832169 SHA512 ae9b06ec1e04fd41044a8f0dad681df222e7384ca9fd01b461e475d0b60b88b9b9481303a6801c085d1ee31d1a9bede849dd35927fe99b3d96a2aef321e8a997
 EBUILD nodejs-11.14.0.ebuild 6486 BLAKE2B 9098ad26511d8d268fb0e1073f126570374aa3c6b81d0a69944e21da7d2cf6340a9df14eb30296f192dbac31c3c8574128f500055e2370f3ee5f5c3e3e0022c8 SHA512 006b48fce401ec454df6a41fe050a865d5f7372448d778a775ec67c10960341812f39f8411e67f7b6797b0362f23d6fce870cda6ba682a687adf87e3d069723a
 EBUILD nodejs-11.15.0.ebuild 6458 BLAKE2B f5eb4de9847e708dcc43d8917671592459ff9357c7a26128ba9b9ed1e0fbfba19c419a234dda9c7fa528ff75590793cab2ea66abbb6929766289be87272f741d SHA512 9aaa1c5b5cd446f7f11896ab53ddf19c1552d5b635dcb5cc50745e9e3e886d6539becffb9f9568a39bca6930ee32485f82f4e426ef1da3a44ec7ac414ad5f442
-EBUILD nodejs-12.1.0.ebuild 6464 BLAKE2B 60a09e27725d915304e14d1e39341396d7e000ebe9cd7909d8eb1980b624fa892053ef4396b58423280503d23d12b43fe89aac418940e68028f0b7d411efb6a9 SHA512 00f28e753fed742c4757208dd80bb9bc37245f5850c76bce52b5a419182c4a0f9d0c30c51674235b1c501462ccccd07bed22b880825ca6329dc0d881bbfa4bad
-EBUILD nodejs-12.2.0.ebuild 6464 BLAKE2B 60a09e27725d915304e14d1e39341396d7e000ebe9cd7909d8eb1980b624fa892053ef4396b58423280503d23d12b43fe89aac418940e68028f0b7d411efb6a9 SHA512 00f28e753fed742c4757208dd80bb9bc37245f5850c76bce52b5a419182c4a0f9d0c30c51674235b1c501462ccccd07bed22b880825ca6329dc0d881bbfa4bad
+EBUILD nodejs-12.3.0.ebuild 6464 BLAKE2B 60a09e27725d915304e14d1e39341396d7e000ebe9cd7909d8eb1980b624fa892053ef4396b58423280503d23d12b43fe89aac418940e68028f0b7d411efb6a9 SHA512 00f28e753fed742c4757208dd80bb9bc37245f5850c76bce52b5a419182c4a0f9d0c30c51674235b1c501462ccccd07bed22b880825ca6329dc0d881bbfa4bad
+EBUILD nodejs-12.3.1.ebuild 6464 BLAKE2B 5b0b3a2d086f787e38f782ac17f608208bac066a38b293d51fe9f2cd1a93fba2749338600a14037d6c1193b336baa0703b3cc4c38c356084787edcd4ebd6ee7e SHA512 fbde4d8d4017cad90c9bee6b5c3dd92cea4d066b09230e9dba9ac2cd029e4fcf937104e7e624dada880f9a3f1a8042a9e074088412f2d46d2c3d39f1d378597e
 EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e
 EBUILD nodejs-6.14.4.ebuild 6153 BLAKE2B 6b358c6e4361f34761a577c10f0bcdf9273ee75dbbbafb652df8a374db376257c968ba9bc40142920266cf58b857f055ee46f161f31e756ba6f7124414976380 SHA512 0513974058c7c878f1104ab95b14d6788e293e4850b0d2d72979f3a3f9538854564eb6bb55b788f3616a4a0cd18d9f8b20e407c5aa221195a185ffbea5d9ccb7
-EBUILD nodejs-6.17.0.ebuild 6202 BLAKE2B f0bc03d031211502a09878f0177729f00c1625a91ec89b6971cd1329d4f05bee838e04ae066f84bf7555f844fc0fff6d33cf15c80fdb800ee0bfb40a1c1ef79f SHA512 9ec3f757e9bd5dbb375bf03820ea277315f974b76029422d12c9fcef5e86c1b704203a21079384e5375968d1654d325d583cd09e89fa9bf1e8e62fe65c7b770a
 EBUILD nodejs-6.17.1.ebuild 6202 BLAKE2B f0bc03d031211502a09878f0177729f00c1625a91ec89b6971cd1329d4f05bee838e04ae066f84bf7555f844fc0fff6d33cf15c80fdb800ee0bfb40a1c1ef79f SHA512 9ec3f757e9bd5dbb375bf03820ea277315f974b76029422d12c9fcef5e86c1b704203a21079384e5375968d1654d325d583cd09e89fa9bf1e8e62fe65c7b770a
 EBUILD nodejs-8.12.0.ebuild 6362 BLAKE2B d2caec942c787ff4af79633f40d145d459df2e7ff7b15c7807a44086aa93dd3f21f4f0a84879ab61f9792d72c0855c3745400b6d791086184649bc22999e4f05 SHA512 b698140ab323e29eddfa4f3d579618206c4a31023ee25be2aff6ca03f321f4e9d3bde7735ac821093bdef62000e0d458e9fe4ae5cc9883b9bff9eb559135326e
-EBUILD nodejs-8.15.1.ebuild 6464 BLAKE2B 047682cbf31f62246cc571d5385918ca8563f83f11f659382ad660867fc3e8cd95bef0940fbb2b4adbcfa82a7e97fb34ccea4037be3eb8cdb3f07af3c6e8ebf9 SHA512 28aebffa55645c850572f8aac9d7aa0f0c233d0abe5b829f80a971e55a65f3b0621e69b52fe8ab2eb3000fe6b84c603bb7f99a56172bed0d9840830222e521a5
 EBUILD nodejs-8.16.0.ebuild 6464 BLAKE2B 047682cbf31f62246cc571d5385918ca8563f83f11f659382ad660867fc3e8cd95bef0940fbb2b4adbcfa82a7e97fb34ccea4037be3eb8cdb3f07af3c6e8ebf9 SHA512 28aebffa55645c850572f8aac9d7aa0f0c233d0abe5b829f80a971e55a65f3b0621e69b52fe8ab2eb3000fe6b84c603bb7f99a56172bed0d9840830222e521a5
-EBUILD nodejs-99999999.ebuild 6372 BLAKE2B cb6a3ee88e32d46b36b64c33e2fb12de4df0b79f1ac10605c5c6af21ac0ad3f9a9ae35d7ea6441bea221dea0a8ea2c77dd95862c1ef2b7963a76e4a93f4371d5 SHA512 ef1ff098ceb9b826ab8ddeb4afeb90c562dbd43f4c6e22fd1b45489a99ad13aeaf1ad7f175a7b0235fbabfae2006008549aa224c6ae4a2fbbd880a418001bdd2
+EBUILD nodejs-99999999.ebuild 6372 BLAKE2B 7693f820dbbe93314c5b8ce3a346e6dbe2c75f6e4d2aeb63d916629571bb36c18431cfbc4d003f697665138494fd7d5df89518a70419e63bf0154e14617148ec SHA512 1a7a07d20ad6b42ae7f26b935d11731c711628060d71d953dfec1f6b71f227368d5ead3f9ee56d5c13723f154adf89bde64fed6e6c1a62f94a6e574db5ee391a
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/nodejs-10.16.0.ebuild b/net-libs/nodejs/nodejs-10.16.0.ebuild
new file mode 100644
index 000000000000..c55a7a4b9751
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.16.0.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.28.0:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.0:=
+	>=net-libs/nghttp2-1.34.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-12.2.0.ebuild b/net-libs/nodejs/nodejs-12.2.0.ebuild
deleted file mode 100644
index 54f1648d7788..000000000000
--- a/net-libs/nodejs/nodejs-12.2.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.28.0:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.38.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.1.0.ebuild b/net-libs/nodejs/nodejs-12.3.0.ebuild
index 54f1648d7788..54f1648d7788 100644
--- a/net-libs/nodejs/nodejs-12.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.3.0.ebuild
diff --git a/net-libs/nodejs/nodejs-12.3.1.ebuild b/net-libs/nodejs/nodejs-12.3.1.ebuild
new file mode 100644
index 000000000000..1d6bf82084f3
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.3.1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+inherit bash-completion-r1 flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.29.1:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.38.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-6.17.0.ebuild b/net-libs/nodejs/nodejs-6.17.0.ebuild
deleted file mode 100644
index 8db127221fd8..000000000000
--- a/net-libs/nodejs/nodejs-6.17.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.16.1:=
-	>=net-libs/http-parser-2.9.0:=
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-58.2:= )
-	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-)
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i \
-		-e "s|lib/|${LIBDIR}/|g" \
-		-e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \
-		tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myarch=""
-	local myconf=( --shared-libuv --shared-http-parser --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		--without-dtrace \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-8.15.1.ebuild b/net-libs/nodejs/nodejs-8.15.1.ebuild
deleted file mode 100644
index 059aa2d524ea..000000000000
--- a/net-libs/nodejs/nodejs-8.15.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.23.2:=
-	>=net-dns/c-ares-1.10.1
-	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.33.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-60.1:= )
-	ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/nodejs-10.3.0-global-npm-config.patch
-)
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i \
-		-e "s|lib/|${LIBDIR}/|g" \
-		-e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \
-		tools/install.py || die
-
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 3d664da6f54b..7ccae4c7d0cc 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.28.0:=
+	>=dev-libs/libuv-1.29.1:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.38.0
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index 7b5d6fb1eaf2..c5f408be4016 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,3 +1,3 @@
 DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
-EBUILD rest-0.8.1.ebuild 1505 BLAKE2B 3c0d1e6274a5f9f1b783a0c4faf350c28ead3ae7931ec413411c1b23606f0fc87f6489555205a2950565a36e08e987ef38d5a585b8bd8a72b1600444a354d042 SHA512 291c84bb788f69496e05a26effc63753a3bc111ec9eea8fe36ad827745b298c509be186952340abebf85b4e45b3ba34ace4914b8eb45c02f4cb91c9d7a64a2f2
+EBUILD rest-0.8.1.ebuild 1504 BLAKE2B aa6aa1bcf6bf55d3097b7baa5359dfb5b256a2303d2cd7652a711cfe5d5dac0d01bf03639e023ef30e8eef01f942f9e79700a6d61a54b16cded0ea6ea31d9126 SHA512 c09c3703a185d00cce7bab3ddd06519bc90571a2159c172258e59ed574693372e7f04653d811b72f4deb89c108b6c51500fd3b86faf5ceaf721657ed2eee9d96
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild
index 831f75ec61d0..b8d9e4d1f22e 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.8.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
 LICENSE="LGPL-2.1"
 SLOT="0.7"
 IUSE="+introspection test"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
 
 # Coverage testing should not be enabled
 RDEPEND="
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index e1cf2a517af4..48e3fbde8313 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -6,6 +6,6 @@ DIST srt-1.3.1.tar.gz 783953 BLAKE2B 647a67fbc8806f35b6ebc5c24236664262abbccaf41
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
 EBUILD srt-1.2.2.ebuild 1055 BLAKE2B 3548583311b1ea6d21c20ff9752cd29968d8357b99821d56b7f894495efa11eb31e2624f8cc45d6ef50915c188ebf0f9ee7579fe4502c48eb3ab919ffcbe004e SHA512 a85446242b4830255ea70b9b2632dfb404178056b29009e6facffc6ac35dc708c018baf8c48dd9f97d5bed1bf7109fe6df0946173c072264f95635180e395c5f
 EBUILD srt-1.3.1-r1.ebuild 1347 BLAKE2B 99c91c175f9c3102e1b29a6f9802c4a73576c2840c5d815494632a77c2ff9334a17ae2cc4b5709132de4dd52bc7cb0db482fa6f5c6f85dfe532e03cefdeed543 SHA512 76c669ab9a37339d041a28fdd888fbab0ea1e36f4f29705fa262b7d68a4cce1d80b9f3e29289f342b951d20a61f65b0b074a03b42cf1ec62fe54ffc1f2d064b5
-EBUILD srt-1.3.2.ebuild 1216 BLAKE2B 5810178a2bddb2f2073ac57765c433dd26366c79c126b7c821f6a4988a16cd76c15c59ae596e741dc940cb9878968576e45d65c5d46271d40e37acf358299a7a SHA512 9332810835b518e77e614686799316feb7f6632f42a98f7ebd9801c3c9dc946483b54e7cf44cab4729851e5f4fbd165c595478efc2a3c6f65fd5f65f05baa7bd
+EBUILD srt-1.3.2.ebuild 1215 BLAKE2B 8b09f7efeece6a97ec6df638747a7cd869d43eda7563f781672e988244ebe1bc1bd50024a98c8ca260c3f90db99872723f5e1ebfafd42c6745197f39055b105e SHA512 eed390578426f656aca21f4c278d746c9b77bb013e03238fc47bc46249185d7118481102eb7b002e5b9c9d4819557b78068c4725201fee5c7b17ace1b97313aa
 EBUILD srt-9999.ebuild 1314 BLAKE2B 190493cd65e60dfb2131cd64910dde9b4d62b10aca1dba5143dd1a34d5f353c22b89b9cfaaae03a3cf3b8f27ed31304aa10533f9c062d396a57be7943e3bd138 SHA512 4c7857ebec342fab43372b5baf7af31455a6a82addff0b5bdaba4df78f733abbaa75f4da5d263313962db51464ab496aca797d00a500bf1f8b0400c9dea1c596
 MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2.ebuild
index bd420bba4fa9..fd800aad8b5d 100644
--- a/net-libs/srt/srt-1.3.2.ebuild
+++ b/net-libs/srt/srt-1.3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index 66cea0986429..b61afee6018f 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -5,6 +5,7 @@ AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd854364
 DIST c-toxcore-0.2.8.tar.gz 502907 BLAKE2B 0ca2c861b3cd982b471fac5cf8bdacd21c3248118846cc17e51f33ba04cf3da12a64578744e47daa27bb8613762a6f562eb550f0b7af05a66696412f6d0a6360 SHA512 a23a87a74fe97091b00ea76676a22578ed1e2426ac777146bb6efc984f1bfd3fff0d7fb149691155b8e2db56e1e088a1884536e5b717ff5c45a87b437f275735
 DIST c-toxcore-0.2.9.tar.gz 510806 BLAKE2B e67bdb86757d1431cc9d627dbc9afa9f54c3deb7814b38c2126849d10e9225aa58d2b23d175622678be74894ea197d3084719422a605d95eb4c55c4597a79f98 SHA512 917826a906a9ca4f04f34494616b8e36ec9e74c6b0709c50e8fe2dd9da680d170013fef242a3fe1b834e8e54cd2dde6be1c14e5d977f8531436ef34280bc3966
 EBUILD tox-0.2.8.ebuild 2757 BLAKE2B 6b95692af1fb7b3aa1ecba363536769a7466c3b0110bb2ce1b0f885767d6d624b7cda900ac891cbf3dcd9b3552b7a99db1523688ace5641ea5799b08ebfcb1c9 SHA512 8bbc00c73c02246985712429187095765677e08f1161438987fe38a26165c45c5dc1bd71acca27001040f6337ad4a307f350bf8efc6b83e56b02d739ff2168a0
+EBUILD tox-0.2.9-r1.ebuild 3128 BLAKE2B a5a0e3a4ec5171fb513a6567916e84a20ec2400ae4a83e97ada018e048b92e03d1874b5accf278dcecf303eae80a917e0d21514a49c6b262e3662f17f0094a9c SHA512 be7033b60e01d5ff19e9465ad2662822a94b97caecf24bd3babd0aa769eec4c7eff67fb62a11d0887b82b5d84d3ccf8e3e8357ff83005ff79637d2c349cbef27
 EBUILD tox-0.2.9.ebuild 2698 BLAKE2B 6ca306040efe329b02f083a143f45253f08d1e9580b7dcde040b227927a0a03353e31233cd947e52176423ae951eb81b0a0e3f6f0cb11d3fcbd9162db0e65f70 SHA512 d0f6f23e05d9fe3a291f45d01cc294ab6255f5af958ef8e88d50c66b6615a8d9585648c8b312d0d5e341411fede14181b2fb0c4832d6876d5ef71d0ff71d5504
 EBUILD tox-9999.ebuild 1803 BLAKE2B 68f3351d491a75643265226fc47e90d23e44cc66f772fe859cff87fcd6b88ced56ffead16ebef992701d023bcd97edd7be45b4075ec72b5afd37b91488b22d01 SHA512 f5dc655a65c4f5f6566008367208d71e017889136e02ad0f023b5a065e3b719c447c9918a3673ce6e9b4c8b0cffdcf7e81b0ca6f701f97b21f3ac04b340ba083
-MISC metadata.xml 875 BLAKE2B 0768a021d85945b52d6b62b91b7c374ac97824842f807f66e6dafa9a95a2701cad54b4c41cba8d567848dc5815d1b52ebd670d23699feb8dfe434b7ef0a20950 SHA512 d0cb0ec14129a7c6ddfc4743fc8ebd2e3ac21b0f01738a4a7f2f3a59a6e062097b046764fe8f6e868c6bf6a56041b750bf769c4451eb5265825fb918cde611f4
+MISC metadata.xml 935 BLAKE2B 27a67342b8cc389cc89a3640589c158ece6be9b25ff2550f063bdcc4d0ded3e39f50ed6ea261e3fb627434a00a4d1e1454797f61fda050ad6c38cc4aa0453ed4 SHA512 24effa76d3f6b31308cb2c18e3f618d4a3392c88bb63b55df65ce7ac9dcacd5ed269b126ffb1af29e0f83bd631d6cc96e14a0343fde709693ebe9d301de9b279
diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index 4c464531d0ba..9b67a0bb1737 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="av">Adds support for audio and video.</flag>
+		<flag name="dht-node">Enables DHT Bootstrap Node.</flag> 
 		<flag name="no-log">Log level: 0 (no debug info logged)</flag>
 		<flag name="log-error">Log level: 1</flag>
 		<flag name="log-warn">Log level: 2</flag>
diff --git a/net-libs/tox/tox-0.2.9-r1.ebuild b/net-libs/tox/tox-0.2.9-r1.ebuild
new file mode 100644
index 000000000000..96361d5998c8
--- /dev/null
+++ b/net-libs/tox/tox-0.2.9-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils systemd user
+
+MY_P="c-toxcore-${PV}"
+DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
+HOMEPAGE="https://tox.chat"
+SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/0.2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
+
+REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
+		daemon? ( dht-node )"
+
+RDEPEND="
+	av? ( media-libs/libvpx:=
+		media-libs/opus )
+	daemon? ( dev-libs/libconfig )
+	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	#remove faulty tests
+	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
+		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAUTOTEST=$(usex test)
+		-DBOOTSTRAP_DAEMON=$(usex daemon)
+		-DBUILD_MISC_TESTS=$(usex test)
+		-DBUILD_TOXAV=$(usex av)
+		-DDHT_BOOTSTRAP=$(usex dht-node)
+		-DENABLE_SHARED=ON
+		-DENABLE_STATIC=$(usex static-libs)
+		-DMUST_BUILD_TOXAV=$(usex av))
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_AV_TEST=$(usex av)
+			-DTEST_TIMEOUT_SECONDS=120
+			-DUSE_IPV6=$(usex ipv6))
+	else
+		mycmakeargs+=(
+			-DBUILD_AV_TEST=OFF
+			-DUSE_IPV6=OFF)
+	fi
+
+	if use log-trace; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
+	elif use log-debug; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
+	elif use log-info; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
+	elif use log-warn; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
+	elif use log-error; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
+	else
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
+		einfo "Logging disabled"
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/initd tox-dht-daemon
+		newconfd "${FILESDIR}"/confd tox-dht-daemon
+		insinto /etc
+		doins "${FILESDIR}"/tox-bootstrapd.conf
+		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
+	fi
+}
+
+pkg_postinst() {
+	if use dht-node; then
+		ewarn "There is currently an unresolved issue with tox"
+		ewarn "DHT Bootstrap node that causes the program to be"
+		ewarn "built with a null library reference. This"
+		ewarn "causes an infinite loop for certain revdep-rebuild"
+		ewarn "commands. If you aren't running a node, please"
+		ewarn "consider disabling the DHT-node use flag."
+	fi
+	if use daemon; then
+		enewgroup tox
+		enewuser tox -1 -1 -1 tox
+		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
+			ewarn "Backwards compatability with the bootstrap daemon might have been"
+			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
+			ewarn "    ${EROOT}/var/lib/tox-dht-bootstrap/key"
+			ewarn "    ${EROOT}/etc/tox-bootstrapd.conf"
+			ewarn "    ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
+			ewarn "Then just re-emerge net-libs/tox"
+		fi
+	fi
+}
diff --git a/net-libs/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest
index 4e9c0194ca31..75bf554f9c4d 100644
--- a/net-libs/uhttpmock/Manifest
+++ b/net-libs/uhttpmock/Manifest
@@ -1,3 +1,3 @@
 DIST uhttpmock-0.5.1.tar.xz 310976 BLAKE2B a7aa609d853a8593461aaaed0074532bc7df1d43638c720694a558cd4eefac14b140f79025cbf7ca9a93ad41cfecfa7728eb049e52d514edda7267389f4d8097 SHA512 99135c0983be78eaaf962e5b182eaaf921e1d6ed30f98691d8766e9d4a9e07188965ce3f546a13a8c32b148bad305083cc3cfdf48d9a8b91efffaec5a46d8006
-EBUILD uhttpmock-0.5.1.ebuild 915 BLAKE2B ea547b1b8232efb30efcb62876ebc07745664baac3b85bd3b67ea9d71693cca0b44b04dfb5ad3009166a0708c749bf04298bf44d10111307bdccb642d742433c SHA512 0ffed890834eda839fc6bfe38a86e798198661af11505aa14952666b1881db848b9f0a347327befbaceab38562248c649999a16140238b2ab6bd5d0323c1ee67
+EBUILD uhttpmock-0.5.1.ebuild 914 BLAKE2B d2467cd34b994cc47899b1419f1d03fc363df6c0793dc5da9c9b7d86dc7ff41e596618d75d24a72f47c64e4090c614f88b6e50e6e8507c842044701673d04ea0 SHA512 a52c26a5216cda25dd25a8dcb3cb12c691b696f9bea05581a728d1c1c086f7a3a49f9ee975b2aabb0424e442f6536a93339faa166cc3dc43b2b4b7be72c004ed
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
index d53316cc2f2e..d2c4f91cfe88 100644
--- a/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
+++ b/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36.0:2
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 007510f5b50b..688362a1f91e 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/bincimap/Manifest b/net-mail/bincimap/Manifest
deleted file mode 100644
index 64786fd565b1..000000000000
--- a/net-mail/bincimap/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX bincimap-1.2-gcc43.patch 1750 BLAKE2B 2891d0c1bdd93ea5e857c8957240c5ec2695fccdbbea06c1ac9c04c4b5cc6372debefc43c1dd145d840065154ffa908ed1eface6d4bcd99d7eba4b5a0a8fcc13 SHA512 4c97a402394d5f984ad6f7f0fa777d2cca179bc378cc59e3a19823868e2b77edfb1c58371e2d89bcca1c62f6f4aec4b1519aeaaae50011d75da4654d7d8eedb7
-AUX bincimap-1.2.13-gentoo.diff 1438 BLAKE2B e8176ff146f231f91c3e747c5b87b4e16b963892ad8fb2ece81dac00cf8173281621944f232dc71bc6f66f74bf1b87212e613b472b364746a70b28ff7ded0ddd SHA512 559a1c58c81cef131e2dd902927df61a3de16e2a71daaff3102329a51dfa57c2fb9a37eec0720f19bbec5856d4c59ee030ac187df172f6ec957a54d56daaceef
-AUX bincimap-1.2.13-glibc-2.10.patch 469 BLAKE2B 179a077099266ffa4dc071562e2152c5ffb0988d9ffbdd3fc5866c3af53886ca5bd9c50aad54db409b0205473a07d5952c1a76480bc060f32f216f9c8bdfafc1 SHA512 36e8afcfeb40a650e8401a0481478714d65e6fbf63366fea2d2f5aba4633195a808ff1e2d1526c89b88020dab9f8671ec3c46db6d444de80c63f1887924c790a
-DIST bincimap-1.2.13final.tar.bz2 416152 BLAKE2B 7397442baa9c3668c59a17c99b3531fcc920675ff5a73a025be6f5785448874e42ee91ef7e5c1c318ca248db2422f2ff0b3c5494a8e832fe2522808189fd1e65 SHA512 06c0487d214581293b45a2f189979ceecae5e02b74a8d22381e51aef9fb1ad595628d2aa94e7dbdac0ad544747138735aa61b00c50d83090bed4c41e11c3d2dc
-EBUILD bincimap-1.2.13-r1.ebuild 2657 BLAKE2B b81b48b8d32f32e3d3f1775cbba859e1d12b2cc89872d72ff307b62f5ef1486387976c49a861db6fc7d30c8096d79b60d0cd7fa7995c75cc5c9a31f13ea45e23 SHA512 3baaa443d21071c57a57d88f87664b2791ddfcff1646ea531d71813fbf98454dec082a6cafd81a6d7fa1b489ab069878f22d0fdcdfde81ae82e04e1730275a52
-EBUILD bincimap-1.2.13.ebuild 2626 BLAKE2B 5a901000e06ba4457377a21bfd7cc2486c5767a323a3834fee6770663b6d18bc734117d778a05a79dcc4a348f70f524f793db47bdc5ae2530efcc780a851ec32 SHA512 bda7193543d6df8bb0bc3756ead6ed50908dce867fbb6f0f4b800b32ecd4aabedc530d40ec2893dd2705112b2c206515b043891cf6d0c8b4048dbd7e7a781fa2
-MISC metadata.xml 243 BLAKE2B 7b085d7d77a6d5399f878b273b007162200106638f41abd31d8d3ee2c5cb604dc28e86143d1e3bc6554bf9284becfe7e84937892647872113fdc96c3d15f663c SHA512 910e47d4d9c2919f57ee5af7f20859e8d9c3611707f7c33cc342b11c66a725c3e557836bb15d1605f1537129414fb1202f815ff540d793f115d7c17fd5bcc66c
diff --git a/net-mail/bincimap/bincimap-1.2.13-r1.ebuild b/net-mail/bincimap/bincimap-1.2.13-r1.ebuild
deleted file mode 100644
index 4c68d7e65c58..000000000000
--- a/net-mail/bincimap/bincimap-1.2.13-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="IMAP server for Maildir"
-SRC_URI="http://www.bincimap.org/dl/tarballs/1.2/${P}final.tar.bz2"
-HOMEPAGE="http://freshmeat.net/projects/bincimap/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="libressl ssl"
-
-DEPEND="ssl? (
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-)"
-
-RDEPEND="${DEPEND}
-	virtual/daemontools
-	sys-apps/ucspi-tcp
-	net-mail/checkpassword"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
-
-S="${WORKDIR}/${P}final"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	epatch "${FILESDIR}"/${PN}-1.2-gcc43.patch
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-}
-
-src_configure() {
-	econf $(use_enable ssl) --sysconfdir=/etc/bincimap
-}
-
-src_compile() {
-	emake localstatedir=/etc/bincimap
-}
-
-src_install () {
-	emake DESTDIR="${D}" localstatedir=/etc/bincimap prefix=/usr install
-	keepdir /var/log/bincimap || die
-	use ssl && keepdir /var/log/bincimap-ssl || die
-
-	dodoc AUTHORS ChangeLog INSTALL \
-		NEWS README README.SSL TODO
-	dohtml doc/*.{html,css}
-	rm -rf "${D}"/usr/share/doc/"${PN}"
-
-	# backward compatibility
-	dosym /etc/bincimap/service/bincimap /etc/bincimap/service/imap
-	dosym /etc/bincimap/service/bincimaps /etc/bincimap/service/imaps
-}
-
-pkg_postinst() {
-	elog "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
-	elog "and create the following link:"
-	elog "ln -s /etc/bincimap/service/bincimap /service/bincimap"
-	elog
-
-	if use ssl; then
-		elog "If you want to use ssl connections, create the following link:"
-		elog "ln -s /etc/bincimap/service/bincimaps /service/bincimaps"
-		elog
-		elog "And this command will setup bincimap-ssl on your system."
-		elog "emerge --config =${CATEGORY}/${PF}"
-		elog
-	fi
-
-	elog "NOTE: Default Maildir path is '~/.maildir'. If you want to modify it,"
-	elog "edit /etc/bincimap/bincimap.conf"
-	elog
-}
-
-pkg_config() {
-	if use ssl; then
-		local pemfile=/etc/bincimap/bincimap.pem
-		if [ ! -f $pemfile ]; then
-			echo "Creating a self-signed ssl-cert:"
-			/usr/bin/openssl req -new -x509 -nodes -out $pemfile -days 366 -keyout $pemfile
-			chmod 640 $pemfile
-
-			einfo "If You want to have a signed cert, do the following:"
-			einfo "openssl req -new -nodes -out req.pem \\"
-			einfo "-keyout $pemfile"
-			einfo "chmod 640 $pemfile"
-			einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
-			einfo "cat signed_req.pem >> $pemfile"
-		fi
-	fi
-}
diff --git a/net-mail/bincimap/bincimap-1.2.13.ebuild b/net-mail/bincimap/bincimap-1.2.13.ebuild
deleted file mode 100644
index 749fe7f706d5..000000000000
--- a/net-mail/bincimap/bincimap-1.2.13.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="IMAP server for Maildir"
-SRC_URI="http://www.bincimap.org/dl/tarballs/1.2/${P}final.tar.bz2"
-HOMEPAGE="http://freshmeat.net/projects/bincimap/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE="ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	virtual/daemontools
-	sys-apps/ucspi-tcp
-	net-mail/checkpassword"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
-
-S="${WORKDIR}/${P}final"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	epatch "${FILESDIR}"/${PN}-1.2-gcc43.patch
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-}
-
-src_compile() {
-	econf $(use_enable ssl) --sysconfdir=/etc/bincimap || die
-	emake localstatedir=/etc/bincimap || die
-}
-
-src_install () {
-	make DESTDIR="${D}" localstatedir=/etc/bincimap prefix=/usr install || die
-	keepdir /var/log/bincimap || die
-	if use ssl; then
-		keepdir /var/log/bincimap-ssl || die
-	fi
-
-	dodoc AUTHORS ChangeLog INSTALL \
-		NEWS README README.SSL TODO
-	dohtml doc/*.{html,css}
-	rm -rf "${D}"/usr/share/doc/"${PN}"
-
-	# backward compatibility
-	dosym /etc/bincimap/service/bincimap /etc/bincimap/service/imap
-	dosym /etc/bincimap/service/bincimaps /etc/bincimap/service/imaps
-}
-
-pkg_postinst() {
-	elog "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
-	elog "and create the following link:"
-	elog "ln -s /etc/bincimap/service/bincimap /service/bincimap"
-	elog
-
-	if use ssl; then
-		elog "If you want to use ssl connections, create the following link:"
-		elog "ln -s /etc/bincimap/service/bincimaps /service/bincimaps"
-		elog
-		elog "And this command will setup bincimap-ssl on your system."
-		elog "emerge --config =${CATEGORY}/${PF}"
-		elog
-	fi
-
-	elog "NOTE: Default Maildir path is '~/.maildir'. If you want to modify it,"
-	elog "edit /etc/bincimap/bincimap.conf"
-	elog
-}
-
-pkg_config() {
-	if use ssl; then
-		local pemfile=/etc/bincimap/bincimap.pem
-		if [ ! -f $pemfile ]; then
-			echo "Creating a self-signed ssl-cert:"
-			/usr/bin/openssl req -new -x509 -nodes -out $pemfile -days 366 -keyout $pemfile
-			chmod 640 $pemfile
-
-			einfo "If You want to have a signed cert, do the following:"
-			einfo "openssl req -new -nodes -out req.pem \\"
-			einfo "-keyout $pemfile"
-			einfo "chmod 640 $pemfile"
-			einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
-			einfo "cat signed_req.pem >> $pemfile"
-		fi
-	fi
-}
diff --git a/net-mail/bincimap/files/bincimap-1.2-gcc43.patch b/net-mail/bincimap/files/bincimap-1.2-gcc43.patch
deleted file mode 100644
index 76cb3a96d6b5..000000000000
--- a/net-mail/bincimap/files/bincimap-1.2-gcc43.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -NrU5 bincimap-1.2.13final.orig/src/convert.cc bincimap-1.2.13final/src/convert.cc
---- bincimap-1.2.13final.orig/src/convert.cc	2005-01-08 11:20:48.000000000 +0100
-+++ bincimap-1.2.13final/src/convert.cc	2008-05-07 12:32:33.000000000 +0200
-@@ -37,10 +37,12 @@
- 
- #include "convert.h"
- #include "io.h"
- #include <string>
- 
-+#include <cstring>
-+
- using namespace ::std;
- using namespace Binc;
- 
- //------------------------------------------------------------------------
- BincStream::BincStream(void)
-diff -NrU5 bincimap-1.2.13final.orig/src/convert.h bincimap-1.2.13final/src/convert.h
---- bincimap-1.2.13final.orig/src/convert.h	2005-02-08 21:30:22.000000000 +0100
-+++ bincimap-1.2.13final/src/convert.h	2008-05-07 12:32:33.000000000 +0200
-@@ -35,10 +35,11 @@
- #include <config.h>
- #endif
- 
- #ifndef convert_h_included
- #define convert_h_included
-+#include <cstdlib>
- #include <string>
- #include <vector>
- #include <iomanip>
- #include <iostream>
- 
-@@ -46,10 +47,12 @@
- #include <sys/stat.h>
- 
- #include "address.h"
- #include "depot.h"
- 
-+#include <cstring>
-+
- namespace Binc {
- 
-   //----------------------------------------------------------------------
-   inline std::string toString(int i_in)
-   {
-diff -NrU5 bincimap-1.2.13final.orig/src/tools.cc bincimap-1.2.13final/src/tools.cc
---- bincimap-1.2.13final.orig/src/tools.cc	2005-01-08 11:20:48.000000000 +0100
-+++ bincimap-1.2.13final/src/tools.cc	2008-05-07 12:32:33.000000000 +0200
-@@ -33,13 +33,16 @@
-  */
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
- #include <errno.h>
-+#include <cstdlib>
- 
- #include "tools.h"
- 
-+#include <cstring>
-+
- using namespace ::std;
- using namespace Binc;
- 
- //------------------------------------------------------------------------
- Tools::Tools(void)
diff --git a/net-mail/bincimap/files/bincimap-1.2.13-gentoo.diff b/net-mail/bincimap/files/bincimap-1.2.13-gentoo.diff
deleted file mode 100644
index d969622ab85f..000000000000
--- a/net-mail/bincimap/files/bincimap-1.2.13-gentoo.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naru bincimap-1.2.13final.org/conf/bincimap.conf bincimap-1.2.13final/conf/bincimap.conf
---- bincimap-1.2.13final.org/conf/bincimap.conf	2004-04-18 20:23:28.000000000 +0100
-+++ bincimap-1.2.13final/conf/bincimap.conf	2004-04-24 13:53:10.011618795 +0100
-@@ -56,7 +56,7 @@
-     type = "Maildir",                              /* only Maildir
- 						    * support */
- 
--    path = "Maildir",                              /* default path */
-+    path = ".maildir",                              /* default path */
- 
-     auto create inbox = "yes",                     /* create INBOX in
- 						    * given format if
-diff -Naru bincimap-1.2.13final.org/service/log/run-ssl.in bincimap-1.2.13final/service/log/run-ssl.in
---- bincimap-1.2.13final.org/service/log/run-ssl.in	2004-03-02 20:16:02.000000000 +0000
-+++ bincimap-1.2.13final/service/log/run-ssl.in	2004-04-24 13:52:30.562843106 +0100
-@@ -14,5 +14,5 @@
- 
- exec 2>&1
- 
--exec multilog t n5 s1048576 @localstatedir@/log/bincimap-ssl
-+exec multilog t n5 s1048576 /var/log/bincimap-ssl
- 
-diff -Naru bincimap-1.2.13final.org/service/log/run.in bincimap-1.2.13final/service/log/run.in
---- bincimap-1.2.13final.org/service/log/run.in	2004-03-02 20:16:02.000000000 +0000
-+++ bincimap-1.2.13final/service/log/run.in	2004-04-24 13:52:37.988613029 +0100
-@@ -14,5 +14,5 @@
- 
- exec 2>&1
- 
--exec multilog t n5 s1048576 @localstatedir@/log/bincimap
-+exec multilog t n5 s1048576 /var/log/bincimap
- 
diff --git a/net-mail/bincimap/files/bincimap-1.2.13-glibc-2.10.patch b/net-mail/bincimap/files/bincimap-1.2.13-glibc-2.10.patch
deleted file mode 100644
index 063f7a54dc3d..000000000000
--- a/net-mail/bincimap/files/bincimap-1.2.13-glibc-2.10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur bincimap-1.2.13final.orig/src/convert.h bincimap-1.2.13final/src/convert.h
---- bincimap-1.2.13final.orig/src/convert.h	2005-02-08 22:30:22.000000000 +0200
-+++ bincimap-1.2.13final/src/convert.h	2009-08-08 10:38:08.000000000 +0300
-@@ -111,7 +111,7 @@
-       unsigned char c = *i;
-       unsigned char d = *(i + 1);
-       
--      char *t;
-+      const char *t;
-       if ((t = strchr(hexchars, c)) == 0)
- 	return "out of range";
-       n = (t - hexchars) << 4;
diff --git a/net-mail/bincimap/metadata.xml b/net-mail/bincimap/metadata.xml
deleted file mode 100644
index 63f42e644cf1..000000000000
--- a/net-mail/bincimap/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-needed -->
-	<upstream>
-		<remote-id type="freshmeat">bincimap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 1bc438a76ab5..e5649eb78689 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -7,11 +7,13 @@ AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fb
 AUX cyrus.pam-include 109 BLAKE2B f241d45aead08952c5c7cbd6a8a25ca6926ec99703b0e879de2176b1d348efaab0b6547200f10e65a18f1926dcbabe74e5d7eaa9b9a7c7039a35421671b5ada0 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4
 AUX cyrus.rc8 699 BLAKE2B b1a7cca8f7ee5a23870108550c990dad79c76a729c82efc77713939a537141df8b1ace2bfc6f3a384c28e155bece1bec480bbaf90fcd1899af854d441b518eee SHA512 9340877dd83cd4d5770c12a7f107ee697b42736a57cf304695f03f9f673c5c53b4477f20832ee4815515b2e33e8b33335b298cf5dd48015a6a581b8ab4f4f240
 AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb669e46470527b864dd5c960bae38f10fac10ca884291ee05203f4c380db57f750fb49217ca7a96 SHA512 dd19551b6e254c5e132f28748435ee61f2df86d6503643cd4946efcfba998d7bd487818ceaab1ca320289077eddd2531f6b05a493a5b5040ee5121165c3a712f
+DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a SHA512 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
 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
 DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03
 DIST cyrus-imapd-3.0.8.tar.gz 10735462 BLAKE2B 27fdead9a75048c12fe4c0eed1dcda9ce24319c2183851190068fd3ded32c1f6b4d550e726dd4a483bafe298ac0199aa2b1354c6f0c5ac0083d7d1ad0e69457a SHA512 f4aa9877e62479439bee2ca29f452bd7e9daa091c19bf3567aa7f493f5163c98b44086b749c70981402212ff90e19d9125b508cfcc077088f8c705e533812960
 DIST cyrus-imapd-3.0.9.tar.gz 10771916 BLAKE2B cc483246c83ed55fa7d4e85aa8189852f2e6be23aff5bb478c2d2123e3d928cc8248e580c80c1474b2b3eea9aa1c0f8b3336f779e72e690d8d093e70993cd657 SHA512 d1a65e957ad3bbbd70e4c8c699e226c17911c6f5815839694136b967a7067acaf4261c8aaad223ffb1e41d76ef78e9e7279a2805048de9b05939044ce17cb738
+EBUILD cyrus-imapd-3.0.10.ebuild 5894 BLAKE2B d1e0bc7c5daff6e174db81228fa06e57d658092c4844dac857231e2dc803f7cfea389e0d4f33c4536fab3915c124380807b3f9179bb3b78a10b1eef194447528 SHA512 71e13cc4f3d5974e5991fd38353da71eeb13701873fb199d7f9c3af1b468ab9c018f1c85f53104a1166508d2e5a8c1d93af722e13f8d4c90f60a785fd4833e40
 EBUILD cyrus-imapd-3.0.4.ebuild 5895 BLAKE2B b7913c9e8d1997ba5188ae736c53869e2121e7aa5d26f9308b8226f7e6b021d5306ef8e508952bc1334ebdfd93b00404bb0e650408c8527fc5508e330085dbce SHA512 14b4ff0f7834dfdd6ca4da827e5a9afddfcb8db8790136d3ed9e5330c305ae933f4ebfdbd8033ce69440cf9dad5a62c6395030c863e7808d616a3ee5f9384833
 EBUILD cyrus-imapd-3.0.5.ebuild 5943 BLAKE2B 0e6570961c66c54f1150ea3cc6fac6437acb570b66d2895b314574c3e1901db4bc51cbeccdc4ee651d2aeff7fc728e7e519730eff0f5ab3090f9bd68f2d48f54 SHA512 694fcd9df8774acc58661ab01791a8b0200ce8c3deefd1cbfd74a7d872a4c572700ff8f030726d3ea296c6653f3937d502884debf913253510f3f31ca54c7624
 EBUILD cyrus-imapd-3.0.6.ebuild 5945 BLAKE2B 3b3a342bdf6b7805eba36fa7cfdb72f951afbc1c4bb11d0784b0d2b40770c19c7e5171fcf7f1c2012f77be694fbc6bf9fe1199dc58bd2aa7f16234be04d78539 SHA512 6dfca67ca8b64662dfd3a1595ec0513053ed99300f6a22408d80ef3f32818e399515ca5e24dd41c62dd277f3a1c19e3cd3ac2fd06e6c612b28f67cc78fab1300
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10.ebuild
new file mode 100644
index 000000000000..5bf98d12a9bc
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${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 kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sphinx sqlite ssl static-libs tcpd test xapian"
+
+CDEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	dev-libs/icu:=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical )
+	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? ( dev-db/mysql-connector-c:0= )
+	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?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+	sphinx? ( mysql )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	default
+	# 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
+
+	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-com_err \
+		--with-cyrus-user=cyrus \
+		--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 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
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
index 001f8929c55f..02413a883c90 100644
--- a/net-mail/gnubiff/Manifest
+++ b/net-mail/gnubiff/Manifest
@@ -3,6 +3,6 @@ AUX gnubiff-2.2.15-gold.patch 511 BLAKE2B c0ef1cdecfcc91ead4d1adf5e3fdecee1b4d85
 AUX gnubiff-2.2.15-underlink.patch 337 BLAKE2B ea045a75986fd13e63549b7f187315ac7979ddf71b0be7ad4bd6ab3300af7e74fe4f9ccf8be01753180949648c7018b23eb51f9fe67e34725eeed621658a6c44 SHA512 6d03040784eed725848cde01533304e33c8b0045e0488936a9782ec2edcb8492ebd47fb263ff142510e0e96c06e60c3de84bb074171e54ad2860e6b3c1d4eeb4
 DIST gnubiff-2.2.15.tar.gz 851638 BLAKE2B dd6d8527664470497d0f7eccd5f435f06f67935a831ace025152f717986c80bd39d49730f1f92b94ded4da8fd0d6aba30705f81b245c6a51dc8257bfe6c95238 SHA512 592a9934f34cec65869bef6bb7a488fd1a44515d513e47b440a36ef15ff9c44dbedb33c27e375ac6cc9590d9a0f02b315307913059f3d7e44ee64a87d95f52c4
 DIST gnubiff-2.2.17.tar.gz 897817 BLAKE2B 5ee58828211eb7b85ab017129feec48c6d2b2df4de862f7791f15f361bda7919cbdc7aa37403130da044a1f9e2068154ddc5ae8629eb9f4d38956d759477fb80 SHA512 2fe715d584fb057255d4922275de152ff5b1167abcbdd27d33124921a4c659c3db301944a73d58622ecd22f62615d44b5bebb83838bbd53c67a2dd8286592d89
-EBUILD gnubiff-2.2.15-r3.ebuild 1059 BLAKE2B f0b824e9610600bafc9a3a634333d261c7ad080233eac7495804510c23c26daac1433a2efa373e65bd9cd40222050236594e56b7ccfd0a38b9065d724a739ca0 SHA512 d6ab12975a623075abd8ebdd479f0d43d51397166e585abe27f1987816bd48c9659fdb4ecac72e4e3a7eef94b07a8706d1e9631f69339dbe7e184ff9eee7bda0
-EBUILD gnubiff-2.2.17-r1.ebuild 1107 BLAKE2B 5b64af7022e16fa55167f4db3db0f7228157340a5d3eab9315b2f267b04866cc4ea47c991c892214471e4271b96346ea67729a9a6897a44d2530fb911bbf4863 SHA512 96e16c80e19b6c315d14d6b959356b51e30a7e116624074d36b5765b4666415bee238a52f9f3c83df8dd706d38966fba903f689e6b0db695dbeab65d8eb89cb8
+EBUILD gnubiff-2.2.15-r3.ebuild 1059 BLAKE2B ba64181ccd3184c06fbc75ced3bdc61fbaa06bcb2d1c83962460042b2682e4d950a384d0cb899d1d814673a183a95d1bc204f40fd50c9a32c6a5e18affccf451 SHA512 3b376e1bb8f474ee58d2c3e9e5f0fdddd56e9d7053290082839378e981d524f0f907d762788e4b80af71f00bea6309c1bdbe48427284af750134924ee2c86cd4
+EBUILD gnubiff-2.2.17-r2.ebuild 1105 BLAKE2B 37330335b960ea8423efec07780e5d8df3043fdfcec12ff38332203ac84cd604d244de01c666c51b03b50cbd363c20090dd6e49441a64b9f252b19a81af886b9 SHA512 bc3dcf0548693e0eea74fca7f2e47c752e837f22938b2c1a8952bd3a749d0879411d8d344f508598b6c4ab0c2700989d94c9d9c7e28232ef5e6d9ae4a4b8e03a
 MISC metadata.xml 359 BLAKE2B e503972d7cc44508b3f94842c9b57a15f3fdc4df89a2eed1ea968fb6033c96b56b59ec6bf5839fe7cb832a69b565c29f6b47552acb205fb9a030d5531ba22bfa SHA512 c1654b01e77115f9c8d3852da7f5951024d0f121a5b589197af6843e063df27dcec59457aec68babe6a8e14c81a307a78a0e34860799d5bec076e0c6bd0c18a1
diff --git a/net-mail/gnubiff/gnubiff-2.2.15-r3.ebuild b/net-mail/gnubiff/gnubiff-2.2.15-r3.ebuild
index d37d1433a5c2..b22d67e1a6cb 100644
--- a/net-mail/gnubiff/gnubiff-2.2.15-r3.ebuild
+++ b/net-mail/gnubiff/gnubiff-2.2.15-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ RDEPEND="
 	>=x11-libs/gtk+-3:3
 	>=gnome-base/libglade-2.3
 	dev-libs/popt
-	password? ( dev-libs/openssl )
+	password? ( dev-libs/openssl:0= )
 	fam? ( virtual/fam )
 	x11-libs/libX11
 	x11-libs/pango
diff --git a/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild b/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild
deleted file mode 100644
index f2f1da676d1f..000000000000
--- a/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A mail notification program"
-HOMEPAGE="http://gnubiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug fam nls password"
-
-RDEPEND="
-	>=x11-libs/gtk+-3:3
-	>=gnome-base/libglade-2.3
-	dev-libs/popt
-	password? ( dev-libs/openssl:* )
-	fam? ( virtual/fam )
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/gdk-pixbuf
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-2.2.15-fix-nls.patch"
-	eapply -p1 "${FILESDIR}/${PN}-2.2.15-gold.patch"
-	eapply -p0 "${FILESDIR}/${PN}-2.2.15-underlink.patch"
-	eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	# note: --disable-gnome is to avoid deprecated gnome-panel-2.x
-	econf \
-		--disable-gnome \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable fam) \
-		$(use_with password) \
-		$(use_with password password-string ${RANDOM}${RANDOM}${RANDOM}${RANDOM})
-}
diff --git a/net-mail/gnubiff/gnubiff-2.2.17-r2.ebuild b/net-mail/gnubiff/gnubiff-2.2.17-r2.ebuild
new file mode 100644
index 000000000000..2cbcdd2ea191
--- /dev/null
+++ b/net-mail/gnubiff/gnubiff-2.2.17-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A mail notification program"
+HOMEPAGE="http://gnubiff.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug fam nls password"
+
+RDEPEND="
+	>=x11-libs/gtk+-3:3
+	>=gnome-base/libglade-2.3
+	dev-libs/popt
+	password? ( dev-libs/openssl:0= )
+	fam? ( virtual/fam )
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/gdk-pixbuf
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${PN}-2.2.15-fix-nls.patch"
+	eapply -p1 "${FILESDIR}/${PN}-2.2.15-gold.patch"
+	eapply -p0 "${FILESDIR}/${PN}-2.2.15-underlink.patch"
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	# note: --disable-gnome is to avoid deprecated gnome-panel-2.x
+	econf \
+		--disable-gnome \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable fam) \
+		$(use_with password) \
+		$(use_with password password-string ${RANDOM}${RANDOM}${RANDOM}${RANDOM})
+}
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index a9cdaa09d83b..5ecd3804ee31 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,4 +1,4 @@
 DIST isync-1.3.0.tar.gz 309459 BLAKE2B 852b37e1d9d5b0c4fc2f84305e88263adff5448ea355782da17f295a22e3265e68edcc049ce6172155ab0be7518a0431091d45f4e012f49b500fde7c28491ece SHA512 b5186f2afe97cab58ce55d3ec19ae7371676ae614448614a9e3e02d09662c34b74e559f0926661fa0300ab22dab9e2e9089b78ee38b94141ff3f8b4d75578ffa
-EBUILD isync-1.3.0.ebuild 707 BLAKE2B 187a92a7da6c4d8fa8ee0651b36fb209e7c1fa054f82ec6351c5ef16d044583ed6f7af0b31e32efd450e25f678679cc6d7d5a3edc264902f8d0de7a28a65395f SHA512 ae1539349cd2097bc69243900bd6920a72a49557272464eae0507a36c42564f6be240c2692c61396cb70e4b6147b3b182e42a569c8cc30b9a500b60d56db5d81
+EBUILD isync-1.3.0-r1.ebuild 702 BLAKE2B 7e04e4ff0121252958df13a783eee3c0d5593ad3b0682b976ef676ac49575d464757db79a0e8d3865e572a09487218b28d1c234dfab4cf9727e90a2822d4534f SHA512 4de3f8e020c188e1103f9ea20af277ba7dca9c091c2058e1e5e674e07612b9f104fa8a554d8c325285f741f4b1420f27bbc8bd7fc3dbe0156f82329b2bba9300
 EBUILD isync-9999.ebuild 836 BLAKE2B 40b42361c93c1cc350318e81c5cd4d6438f89eb64adf45fe65433c993df045322eef4466249375f583ab6da95e27797e9b2688f2ce1f274a017316dcd60b5425 SHA512 178cacd53cabcdddf89dfdb7ec3a0a84fde49d46c3fe260a43a3dd025771f90cacd9aa284d69e8fa99fb1448055c489c2a2799918e077a7d27fa46939c7eab95
 MISC metadata.xml 363 BLAKE2B 6dec111933ae495659c17c49ecf8020fa2f202c3a2e45178b8ece570ffa8d4a15330c873d32cd2325f9f138528ae8e498b2b9b3e1de063f42a028cb4d302be6e SHA512 04a35386c0d3af6f95c57060fff261063ead761033c0f43f9cfa09afb65f6c708de90813d50a812c5be6c76aa869540757a7aef9296ba831136314f509e29e17
diff --git a/net-mail/isync/isync-1.3.0-r1.ebuild b/net-mail/isync/isync-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..ed92112b1459
--- /dev/null
+++ b/net-mail/isync/isync-1.3.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="MailDir mailbox synchronizer"
+HOMEPAGE="http://isync.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="compat sasl libressl ssl zlib"
+
+DEPEND=">=sys-libs/db-4.2:*
+	zlib? ( sys-libs/zlib )
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_with ssl) \
+		$(use_with sasl) \
+		$(use_with zlib) \
+		$(use_enable compat)
+}
diff --git a/net-mail/isync/isync-1.3.0.ebuild b/net-mail/isync/isync-1.3.0.ebuild
deleted file mode 100644
index bf69e93d446e..000000000000
--- a/net-mail/isync/isync-1.3.0.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
-
-DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="compat sasl libressl ssl zlib"
-
-DEPEND=">=sys-libs/db-4.2:*
-	zlib? ( sys-libs/zlib )
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-	    !libressl? ( >=dev-libs/openssl-0.9.6:* )
-	    libressl? ( dev-libs/libressl )
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_with ssl) \
-		$(use_with sasl) \
-		$(use_with zlib) \
-		$(use_enable compat)
-}
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index 6f51da1d33f5..de8250417597 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,4 +1,6 @@
 AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 BLAKE2B 9f68bfc64c126d1268630b94f309be16dc8cbc157989c5e3d93b721e4d8f809417d516750db555b99f19f25fc604da59c135855d90dd9017ad3cda6df7ba4f07 SHA512 fa1ae38b8c61c1a67c20653b4e19e48946c140496d7380f918818bc18171de36762c70fc664947a22d0fb479f224d16bb2741374e8813ac46768178e3285f7d5
 DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
+DIST qmail-autoresponder-2.0.tar.gz 35463 BLAKE2B 1aa724dd2b0fab0ad62136ea4ef9b65fbb2f3ab567c5dc5676c2be3f52969fa9ebd0b5d0997362a47312efadd97898d56c0721f0f430b51f52cfd6357417fd40 SHA512 d1223b65453cb7c88de5b22a20a961441810e6db1d80ca976599b88cc5771602a678599354b11586e56273c02502b621cfffb610e9ff33632e4a7d7c28766ccb
 EBUILD qmail-autoresponder-0.97-r3.ebuild 1406 BLAKE2B e0bf8ce404b0a5924d258c9d9e5e5ee75e8d73d7676ba6bd4bbd2e2c6c0da1678d1f80579fa626456b4019e813a9e8b8b175349faa90e228bd1258872c10b07f SHA512 54fb56f1b98e4afce05b2959f0ca46634948181977070b7515496e8ceb16c372051041c071cae1d8be3761f22a24384573e694b7bcdc9b43e1905bd9da99bf52
+EBUILD qmail-autoresponder-2.0.ebuild 1018 BLAKE2B 8318b4e6ed59736d28ef5abf37e8f52a1cfe6b236f0f9dfee3ee4535e2dbae2a2e5b8028ff710dcd9325ab8f46b322334f9f6a5bf7165e71bff6b41b14ccb315 SHA512 5318cb60a7f57345dcf16b4ea00bdbea0fca485683c8dc378f9d1eea8847eb68a98ec1b4bcafc3f7fa4a4e059d9d02a452b97a2752fecd45d3fa147d49fe0a4a
 MISC metadata.xml 415 BLAKE2B ce1cf3c127835055f2555ab5488f2fb9bf9858711fb6e5be022ee924c53876f3baa97c9a71c3f5993ca71ffd9a6caa5c0a5a804a0aa326eaf3293363dfc657c4 SHA512 d0735db9241b2f5c46d4a2f8e1e2d0b2afe8baa94ec633e474a83a61f894146e1727799f9e59d6efb986c207c4cb6893a130424497db132b89ea2ea1a2ebfeef
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-2.0.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-2.0.ebuild
new file mode 100644
index 000000000000..623cf77ed841
--- /dev/null
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Rate-limited autoresponder for qmail"
+HOMEPAGE="https://untroubled.org/qmail-autoresponder/"
+SRC_URI="https://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="mysql"
+
+DEPEND=">=dev-libs/bglibs-2.04
+	mysql? ( dev-db/mysql-connector-c:0= )"
+RDEPEND="${DEPEND}
+	virtual/qmail
+	mysql? ( virtual/mysql )"
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
+
+src_compile() {
+	emake qmail-autoresponder
+	if use mysql; then
+		emake qmail-autoresponder-mysql
+	fi
+}
+
+src_install () {
+	dobin qmail-autoresponder
+	doman qmail-autoresponder.1
+	if use mysql; then
+		dobin qmail-autoresponder-mysql
+		doman qmail-autoresponder-mysql.1
+		dodoc schema.mysql
+	fi
+
+	dodoc ANNOUNCEMENT NEWS README TODO ChangeLog procedure.txt
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 211d021c3a7b..d6750277d8b4 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index 7f1192ae9c93..fcca2cbeca8d 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -2,5 +2,8 @@ AUX anydesk-4.0.1.service 276 BLAKE2B 1eb07a90a1e2369c42be849e9885d0696f1b68ff1f
 AUX anydesk.init 291 BLAKE2B 5fa5d60240f3342e53fcf7aa17df6d658a98b6446887f73e04eed490824876cebe9fca7844c4e33737f6b4e01787a2134089de78152503130d4ef4a242bf3f12 SHA512 63e60d0442355f567e24bb6042710e998ac7ed09b4d970cd30bb6910955bc95e7629f63a4988c2b92067cf273aa04893510cc31971def96bf453c92b673254c2
 DIST anydesk-4.0.1-amd64.tar.gz 3663439 BLAKE2B 6d693262569708d0289f9e4b03e15a4d4b8d7eea5253a18c6694d720e916b9d3d2a6894db16e5e6a31ddc39bd87ef4e766244047761440f9245c5f563ccd8dd4 SHA512 df2d4ec945f77954b8548513052af4d4f16c904ba450f4560c9185e94c2d4e57dc5ffb865239d1082803e040a60775b78d9c09015932b0fa6159378475d73f10
 DIST anydesk-4.0.1-i686.tar.gz 3658518 BLAKE2B 39bcad58de9b5ae76da5e96e32a8799343e1b6f7f78b3db3d02e675acae1ebbfa5c2a47a043b9d88810644656bce027bc347a783fcccbf37cdf44f986f1a8548 SHA512 e922e296149811a7ef77ae642c9ba73ca9888be57f13b0616ba5008f6837c86245d4b8b3a4b8ab6739a97fffa9b397b20d572c1fae7d5a5b2d909e8ee07112cc
+DIST anydesk-5.0.0-amd64.tar.gz 4258837 BLAKE2B 1ebb7cb70226873e9a2207823a1d66eb6b2dda9846d2921fc4484638f1bb4b9bf1abe4897af38fe7fb4c1c585187121bcf54bda5bd33a48c052fa5021f5cac07 SHA512 f18a3374dfdc62fecb7d47cdc6d43f7ec71433ed06f4c7165056e9b9526acd624305b0409cf1140f85631f8d7b72cf032ff32298ea24781c8e48e58d7e50abf0
+DIST anydesk-5.0.0-i686.tar.gz 4259050 BLAKE2B 43eb38dda82e6846c3e3c47f28f2556d93a4a420ea82639c7be0fc122a4d1bfdeecc5bbe7088687a54a0cc992307bd0ca4502a9c46539e459cea2d362a962622 SHA512 bfe3b39540aec09432343c554ec761072dc688f271bf164c1b3d6cb54271336b5cf35b51a93902bfad2d92d530c186abe108cc250f2a7f88641c66abd42b3c6a
 EBUILD anydesk-4.0.1-r1.ebuild 2272 BLAKE2B e8d7054d8237607150316ad90e8cf7be776c11770734a0e67ded1f19344fb0bbb82bf2704523a0f3457c319e54ca708c94def234fca4c9e02ad8b02c6513bb82 SHA512 5a7a368670b7d1337ff2246f23d1b26101b9630b9cfd00416d155b6ece5b240355bcf879ccdf535f61c8fb290cb5009b54387d4cfade1ff240f5e60b4a409384
+EBUILD anydesk-5.0.0.ebuild 2253 BLAKE2B 50ce9bfb0f309d63b150e6120aea5a6d12945bac42e26af30de6d21c5154e93b1f1f6e51a7f8e7547a6a813626dfb400b94b02ccd4a65a92267d3dbe4b9eada3 SHA512 f5ee8ee569d69562b90bbca805bb9a3d22b18d4800dc0ba61109329200f2b181b76c794a5582ffe6d4a778500e500b59d2e0961c7bcec689e6ff6fb938678722
 MISC metadata.xml 782 BLAKE2B 4052c9f572568a3ab3a9c4bc1f567439cc7a4438a5f3fc1c4b14b0b7d4582d19d74ef106d5ad845e2f7549b734eeb539a3c79bc287f0359301c02d04083c303f SHA512 4c8eda43942444eeb6df7a19bb27528973a9efa412536b5b297640c77ae94065bd3b46e722289f1762494742d61ac6c9b47c5f967afa1c226a1daef30484fb03
diff --git a/net-misc/anydesk/anydesk-5.0.0.ebuild b/net-misc/anydesk/anydesk-5.0.0.ebuild
new file mode 100644
index 000000000000..d6ab3121665b
--- /dev/null
+++ b/net-misc/anydesk/anydesk-5.0.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop systemd xdg-utils
+
+DESCRIPTION="Feature rich multi-platform remote desktop application"
+HOMEPAGE="https://anydesk.com"
+SRC_URI="amd64? ( https://download.anydesk.com/linux/${P}-amd64.tar.gz )
+	x86? ( https://download.anydesk.com/linux/${P}-i686.tar.gz )"
+
+# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
+LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/glu
+	media-libs/mesa
+	sys-auth/polkit
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+
+	x11-libs/gtkglext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/pango
+	x11-libs/pangox-compat
+"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_install() {
+	local dst="/opt/${PN}"
+
+	dodir ${dst}
+	exeinto ${dst}
+	doexe ${PN}
+
+	dodir /opt/bin
+	dosym ${dst}/${PN} /opt/bin/${PN}
+
+	newinitd "${FILESDIR}"/anydesk.init anydesk
+	systemd_newunit "${FILESDIR}"/anydesk-4.0.1.service anydesk.service
+
+	insinto /usr/share/polkit-1/actions
+	doins polkit-1/com.philandro.anydesk.policy
+
+	insinto /usr/share
+	doins -r icons
+
+	domenu anydesk.desktop
+
+	keepdir /etc/${PN}
+
+	dodoc changelog copyright README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To run AnyDesk as background service use:"
+		elog
+		elog "OpenRC:"
+		elog "# rc-service anydesk start"
+		elog "# rc-update add anydesk default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start anydesk.service"
+		elog "# systemctl enable anydesk.service"
+		elog
+		elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
+		elog "further information about the linux version of AnyDesk."
+		elog
+		elog "AnyDesk might require the following commands/packages"
+		elog "for some functions:"
+		elog "* lsb_release	(sys-apps/lsb-release)"
+		elog "* lsusb		(sys-apps/usbutils)"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 615d0205f6cb..2e7a32c4ce7e 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,8 +1,11 @@
+AUX apt-cacher-ng-3.2-flags.patch 4172 BLAKE2B 9068ada51f5c12a662f521eee7a834c6eb07299a41671a6d8b47474bdbe15f1c25f531a9f2d058af97ee77d6ddb05fdfa64f018f3bb2ceaad51ac6b7a5f66903 SHA512 b57dc514d976b6f808c332c36c5014a407ec1e7184fb8653404dcf745872b03611ccc9f33bc42846429dc389b4b91831f308874deca4682e6dc636ea4c707713
 AUX confd 90 BLAKE2B 5a0ba4fe7d07c4d74559f194cc497b0de5ea86db746fa8425267b9e1fe0d88afc3bae69129a60f4553729d24dfd09f910c037742181915d03f4c18b764f235cd SHA512 14412f717ad334e6ce5cf65b9b0968fc3ab27e93f3d3ce52d39e0b646694e8e7d7905ede25feeabad6ef3301b5644677f30e27b867ff32f665ab6c4e2cd0a662
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
 AUX initd 725 BLAKE2B 3984d5c7f4b34fdb16420d29935edf2a5975e5f7aca2559506ba839d21d781f0a5a5f914bbd35efcc73dfa70d0610ed57b51b3ec9b66de0d77e864c59bf5fa04 SHA512 de8dbff432540d3b725556bb9189e14cf06afc876ec636a9ae2a00ee6158f791a9306c2630cfbf11de80b81ffadb45f39bae235c5d9ee76b5245c0599a387b0a
 AUX initd-r1 906 BLAKE2B 828ac672348454842e3daeb62e39436dce86f3ff9ba2319755f2bc64a20d3dc9e73689c27f79e7f521b6d6553c5d6922eb1b8d72a52a97c7f92b2847b6322b9d SHA512 c4aa04ea30734f00c617684ea014c632bf0d43580ae7b7c6e9ae58e2c947d15177f93e7b92fd9f7b79d1898d0c6a386de1da7fa038dace6381cd72907845e57c
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
+DIST apt-cacher-ng_3.2-2.debian.tar.xz 48740 BLAKE2B ab2f6349aa66f39b778f346827767514761eeb8977d69a55940d7dd4c738b54ba20a9725387f769edf2cce454588746bc10361d4a174ed380a431a6ecf6b096d SHA512 e5299432b91cdf6cb51934fcc440e62d24c1b4849ad3a0c3a5e47a256c874ebb85c7ba56b97da27c2e03e0621b4ae42b69592440d521e718f4f8725a6ff379d4
 DIST apt-cacher-ng_3.2.orig.tar.xz 319036 BLAKE2B 576fc7a409556d34ee702edd57527c9c35eb033d0e8c8ea4f7b8a8a2dae86f75cd1ca3a7fb0e02845e70d6f8715692b638ff9d574ce1664b67fec9247b60fbc0 SHA512 7dfee4a8f38e7c5251c761a5faae063926c5001fe0b97136d938cdbff907e97fb0a20b89dcf685645a518e92be04fe5660d840e738960b4465408f04fe532cae
-EBUILD apt-cacher-ng-3.2.ebuild 2497 BLAKE2B bcf3587c34503a6bad3b32b1a666f2b8d42abd1f5d401dc40c92ae8bb94515b6c2b51aa1f41f2a79ee23919c41ec0a1c18f364188eea4a5376338d20380e2022 SHA512 ec023741c65c638d144b74f12e3340428f70982db16e020bccf2e9d2c1a5edcfc1c94a4e5ac2932fac32dcc019c6964f70902eada986c74390e848ada334540e
+EBUILD apt-cacher-ng-3.2.ebuild 2495 BLAKE2B a70da3cd229c554d91ee3ea67c9feaa2eb7259902203efe366e84a9af12fc17ae0eed4fd09be05e90d6a5252cdf36fe47068821db64e81af0053fdfd767aacc1 SHA512 49c0eb48c086f9631750f3875be888751dbefd7b268538bc3dfa3e61eb6517564202ffd1a71eb95e3a428b1212942716b2cd15f42fa8319b3cee3042e515fcb6
+EBUILD apt-cacher-ng-3.2_p2-r2.ebuild 2715 BLAKE2B cf204efafbd483b174bd2f0627dd81c0d04bf9c232a4c7e694c43e0ad5dca58eb69180bb27e5f80f1981643d0696689c724a8417e56c4a1c7be032ac476760cf SHA512 bc9486e131b1d6fd294d50a62d9e20ac3e25d4fd24de9f28e334f6504140bd0a7217b1af0832ad70df5a08cbadced4229a51a7bb6df7e5a5b861bd6b3f24d98c
 MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild
index fb6f30e111ad..d04cec3cc611 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ IUSE="doc fuse systemd tcpd"
 COMMON_DEPEND="
 	app-arch/bzip2
 	app-arch/xz-utils
-	dev-libs/openssl:*
+	dev-libs/openssl:0=
 	sys-libs/zlib
 	systemd? (
 		sys-apps/systemd
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild
new file mode 100644
index 000000000000..4e825f700ed0
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils toolchain-funcs user
+
+DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
+HOMEPAGE="
+	https://www.unix-ag.uni-kl.de/~bloch/acng/
+	https://packages.qa.debian.org/a/apt-cacher-ng.html
+"
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+SRC_URI="
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	systemd? (
+		sys-apps/systemd
+	)
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	dev-util/cmake
+	>sys-devel/gcc-4.8
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+	fuse? ( sys-fs/fuse )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+PATCHES=(
+	"${WORKDIR}"/debian/patches/debian-changes
+	"${FILESDIR}"/${PN}-3.2-flags.patch
+)
+S=${WORKDIR}/${P/_*}
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	fi
+}
+
+pkg_setup() {
+	# add new user & group for daemon
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_configure(){
+	mycmakeargs=(
+		"-DCMAKE_INSTALL_PREFIX=/usr"
+	)
+	if use fuse; then
+		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
+	else
+		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
+	fi
+	if use tcpd; then
+		mycmakeargs=( "-DHAVE_LIBWRAP=yes" )
+	else
+		mycmakeargs=( "-DHAVE_LIBWRAP=no" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+	dosbin ${PN}
+	if use fuse; then
+		dobin acngfs
+	fi
+	popd
+
+	newinitd "${FILESDIR}"/initd-r1 ${PN}
+	newconfd "${FILESDIR}"/confd ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate ${PN}
+
+	doman doc/man/${PN}*
+	if use fuse; then
+		doman doc/man/acngfs*
+	fi
+
+	# Documentation
+	dodoc doc/README TODO VERSION INSTALL ChangeLog
+	if use doc; then
+		dodoc doc/*.pdf
+
+		docinto html
+		dodoc doc/html/*
+
+		find conf -name '*.gz' -exec gzip -d {} \; || die
+		docinto examples/conf
+		dodoc conf/*
+	fi
+
+	# perl daily cron script
+	dosbin scripts/expire-caller.pl
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/cron.daily ${PN}
+
+	# default configuration
+	insinto /etc/${PN}
+	newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
+	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
+
+	keepdir /var/log/${PN}
+	# Some directories must exists
+	keepdir /var/log/${PN}
+	fowners -R ${PN}:${PN} \
+		/etc/${PN} \
+		/var/log/${PN}
+}
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch
new file mode 100644
index 000000000000..bc78fcaea142
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch
@@ -0,0 +1,97 @@
+- Rip out additional CFLAGS/LDFLAGS
+- Drop osslcompat (bug #686608)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,16 +106,6 @@
+         _append(ACNG_CXXFLAGS -fvisibility-inlines-hidden)
+ endif()
+ 
+-foreach(linkarg -Wl,--as-needed -Wl,-O1 -Wl,--discard-all -Wl,--no-undefined -Wl,--build-id=sha1 -Wl,-fuse-ld=gold -Wl,--threads)
+-	STRING(REGEX REPLACE "=|-|," "" optname "${linkarg}")
+-	set(CMAKE_REQUIRED_FLAGS "${linkarg}")
+-	CHECK_CXX_COMPILER_FLAG("" "LD_${optname}")
+-	if(LD_${optname})
+-          _append(CMAKE_EXE_LINKER_FLAGS ${linkarg})
+-	endif()
+-	set(CMAKE_REQUIRED_FLAGS "")
+-endforeach(linkarg)
+-
+ option(USE_SSL "Use OpenSSL library for TLS and other crypto functionality" on)
+ 
+ IF(CMAKE_SYSTEM MATCHES "Darwin")
+@@ -134,14 +124,6 @@
+ if(CMAKE_BUILD_TYPE MATCHES Debug)
+    set(USE_LTO_DEFAULT off)
+    _append(ACNG_COMPFLAGS -DDEBUG)
+-else()
+-   set(CMAKE_REQUIRED_FLAGS "-Wl,--gc-sections")
+-   CHECK_CXX_COMPILER_FLAG("-Os -fdata-sections -ffunction-sections -Wl,--gc-sections" GC_SECTIONS)
+-   if(GC_SECTIONS)
+-           _append(ACNG_COMPFLAGS -fdata-sections -ffunction-sections)
+-           _append(CMAKE_EXE_LINKER_FLAGS -Wl,--gc-sections)
+-   endif()
+-   set(CMAKE_REQUIRED_FLAGS "")
+ endif()
+ 
+ # XXX: could use the modern macros instead but they were not available in CMake 2.x
+@@ -167,23 +149,6 @@
+    endif()
+ endif()
+ 
+-option(USE_LTO "Enable Link Time Optimization (requires modern compilers)" ${USE_LTO_DEFAULT})
+-
+-if(USE_LTO)
+-        SET(LDFLAGS_BACKUP "${CMAKE_EXE_LINKER_FLAGS}")
+-        SET(CMAKE_REQUIRED_FLAGS "${ACNG_COMPFLAGS} -flto")
+-        _append(CMAKE_EXE_LINKER_FLAGS -flto)
+-        CHECK_CXX_SOURCE_COMPILES("${CXX11_TESTSRC}" HAS_LTO)
+-        if(HAS_LTO)
+-                SET(ACNG_COMPFLAGS ${CMAKE_REQUIRED_FLAGS})
+-        else()
+-                SET(CMAKE_REQUIRED_FLAGS "${ACNG_COMPFLAGS}")
+-                SET(CMAKE_EXE_LINKER_FLAGS "${LDFLAGS_BACKUP}")
+-                message(WARNING "Link Time Optimization support broken, disabling it.")
+-        endif()
+-endif()
+-message("-- LTO use: ${USE_LTO}")
+-
+ FIND_LIBRARY(HAVE_SOCKETLIB socket) # separate socket lib looks like Solaris-like environment
+ if(HAVE_SOCKETLIB)
+    LIST(APPEND BaseNetworkLibs socket nsl)
+@@ -378,7 +343,6 @@
+ 
+ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/include/acsyscap.h.in" "${CMAKE_BINARY_DIR}/acsyscap.h")
+ 
+-add_subdirectory(oldssl-workaround)
+ add_subdirectory(client)
+ add_subdirectory(fs)
+ add_subdirectory(source)
+--- a/fs/CMakeLists.txt
++++ b/fs/CMakeLists.txt
+@@ -20,7 +20,7 @@
+                 list(APPEND fsSRCS ../source/aclogger.cc)
+         endif()
+ 
+-        ADD_EXECUTABLE(acngfs ${fsSRCS} $<TARGET_OBJECTS:osslcompat>)
++        ADD_EXECUTABLE(acngfs ${fsSRCS})
+         SET_TARGET_PROPERTIES(acngfs PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${acngfs_cflags}")
+         INSTALL(TARGETS acngfs DESTINATION ${LIBDIR})
+         if(HAVE_DLOPEN)
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -4,12 +4,12 @@
+ ADD_LIBRARY(acngstuff OBJECT ${SHAREDSRCS})
+ SET_TARGET_PROPERTIES(acngstuff PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}")
+ 
+-ADD_EXECUTABLE(apt-cacher-ng $<TARGET_OBJECTS:acngstuff> ${ACNG_SRCS} apt-cacher.cc $<TARGET_OBJECTS:osslcompat>)
++ADD_EXECUTABLE(apt-cacher-ng $<TARGET_OBJECTS:acngstuff> ${ACNG_SRCS} apt-cacher.cc)
+ TARGET_LINK_LIBRARIES(apt-cacher-ng ${BaseNetworkLibs} ${ServerLibs} ${CompLibs} ${SSL_LIB_LIST} ${LDFLAGS_DAEMON} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNG})
+ SET_TARGET_PROPERTIES(apt-cacher-ng PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}")
+ INSTALL(TARGETS apt-cacher-ng DESTINATION ${SBINDIR})
+ 
+-ADD_EXECUTABLE(acngtool acngtool.cc $<TARGET_OBJECTS:acngstuff> $<TARGET_OBJECTS:osslcompat>)
++ADD_EXECUTABLE(acngtool acngtool.cc $<TARGET_OBJECTS:acngstuff>)
+ SET_TARGET_PROPERTIES(acngtool PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_PTHREAD}")
+ TARGET_LINK_LIBRARIES(acngtool ${BaseNetworkLibs} ${CompLibs} ${SSL_LIB_LIST} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNGTOOL})
+ INSTALL(TARGETS acngtool DESTINATION ${LIBDIR})
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 4213be046cd9..8345942e8657 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,13 +1,18 @@
+AUX initd-bird-2 1169 BLAKE2B 399481b20099d54f4a4f0cbffa2d9d080f090e15fa1bb9e0613469d94a895fcff3708983defe6d9be181f11ad18598e7e36d411cfc8e07b59c78a74890b5c1c3 SHA512 42224f1ac8ac53be1e0f2d30ecba0fa9ac491494bb6b6147940455538623082f4111731463daec15cbc7c10a90c440d36e27eaab1193f9385488ab6683e15f55
 AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b965d9033e6493df67ea268afba8ab95c46208894f330ff3607d90502653072eb73c130d1841cab9e604c2 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879
 AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
 DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
 DIST bird-1.6.4.tar.gz 1018874 BLAKE2B f6ef0b952f6b00008fadcaa1c1a32ac31b42a9804e221edb75073e23ff942276bf1beee6d3f4c9d89f90339e99bb82a5953c17ff6963e5ff60d29a50f45e06d4 SHA512 5034d6bdca40ecddaed57bd4ab6e700828b89221bd3ce6d347aa9caa4dca65880c080ee3f276a8c31adde2de16402c8b7e7fd32dc4463d29d63b3f16b833b2eb
 DIST bird-1.6.5.tar.gz 1114984 BLAKE2B 15b2a432e467a8ce81acc4d3d5cf7dea865cf7d3a8c893ab348916fbf60104a5606a6cbc2fcd647c102f3177f0d04d2f046860da244f26a7357f321285f1e295 SHA512 a86c340f4acd9d90b5babe8f19dbd753b2ad94db2c92181bf969244c1d7b20aa825a0311c13a1e19b019019b91af7827775970fd39e807ab32da690492ce356e
+DIST bird-1.6.6.tar.gz 1029505 BLAKE2B 45cd621175962ea22848948e61aaf8b5c4eebbae5f5703bd71571defb2661d0aee646e93a1b42b8d93e6901d256a6e6d91d9bc4573bc01c31d9b359f5184dc5a SHA512 2419e487af2c8e75f613892ee1b1ada00085945bcafe17de972d3196f50a32321a6d18c9a3b58c0c58a5273f348a6d6de8b861505ad559269510a0ba69041fd9
 DIST bird-2.0.2.tar.gz 1015224 BLAKE2B 3931c0431dc6511596e7214f6e2099548aafa69c951a44cd628443701eac061e8d95c387d74d81ad889988750c5bdb32a69ed77bfe655b161932017f1a1266a1 SHA512 aef96f246484a52269b44963df033ccc584e62d50d1ae31a97a97b9c7375e576d70d00f61a0f6da336e60cefc4c921945df0cc821d5fd1c737b19f508e65d30b
 DIST bird-2.0.3.tar.gz 1141917 BLAKE2B 14b51a4195003ddcf848be45755057ebf835edf54f35208f8d80121c22eeb83c9afa0c0c1ab269c376da59f5d07843054b08e1679db873a0b8121aa611b9202b SHA512 c88d0119dbebf4b2224ff7c6555e1ebf516748611e3544e7cfba47adb60c45a996efed7d2dc2b8fd849f15689e5d3c2624c4019c4a9a5a356d551a35db8fa0e2
+DIST bird-2.0.4.tar.gz 1051911 BLAKE2B 12100685e4aad969dbb51eaa567e1038f50e7c030a25a8697bc35d4f33d0f64f9ccbc045e1210acb78f3d8d4a7cc7ef2be7ae50a36679f2322d292e8e6993ed4 SHA512 65092ca6be115b4d0c31c3c4a79d3ee2e196dc2f85454448eab568cc9cc1fe37b7bdfe1ddb74d4f6f147dc479a8570cf7bf702d762cd69414f976678c14c8e2f
 EBUILD bird-1.6.3-r1.ebuild 1285 BLAKE2B 6d118b27f8bdf9ecf5ea2b5a4302c7c1c1bdb46ae3e266da97eb369532f9d815b718fd9cc211515a37b7027a1cb6f1571258c593641a0299bc7a5a90a3d21da7 SHA512 65dcb46fad1912e8d7f26d9597e7dcdc5f78e10d82fcc3cc4a211c03f2d395614d363b98c00283ca09704e0fe52a245f67e0ec41680eaeacbac931cd52d00bc9
 EBUILD bird-1.6.4.ebuild 1285 BLAKE2B e728912943f43f666b0a96430cb48f9d4028627492ce03c87557af59cc78e5af6ac5f152fe63f7a1ef989b4028ec918fccda2f21b27c57f1e8530c2e3ec3ba56 SHA512 f94a5f28cc72dd35a853c5763fd28842cfd34ab0a8063db01e756e021c80191ac4cc40cc83f5fc980d93a5d00e2b777a9e902052db8fa9c50db5905d4a4bbf0b
 EBUILD bird-1.6.5.ebuild 1282 BLAKE2B 08adb25747149de95a2b3c806db82a199044cfe2eff8887dd1394700ba7c35d25a7ad48eb5d5129220618daddf1dba526948efa56962e970da452c48f7374b9f SHA512 daeb190612f574a628d99e3d2a28187c686c87fbf454aca050719c77624cc2dd04513d084257ab6e3282e7dd5006016fdbc1261e89780b4700fc8c41f8fab07d
+EBUILD bird-1.6.6.ebuild 1268 BLAKE2B 23639d0d57b4927dcdf805a9c8f31a4197649a2168aaeb8966436c176d1eb65d63118ab9871e2566e8427c0204831b1e23fc5a439d2cbadb9b8dfb51359e8008 SHA512 a815cee9c0f749cf0faa8cef0c516b7245bfccf32293d81ab7b23b30c91e9d788511b0c9c57e681dce44c44b8f83f21af2485ef2c22d50daab166b1754f7ff09
 EBUILD bird-2.0.2.ebuild 774 BLAKE2B cdb92e8ef96464851c1b4d37b916ea705fb5b880cb89df18a093c411052e8363f15321da2bc400fd99cb8d33af5f6ab33668939a759e27028bca043961dc46bf SHA512 a14f8b83bf5d68a1c89c1ac8ab64f6f597893ea9ff004c904c7a3d009bb5ba4007a9607a30f987f423cf95aa7b8dda5040b94929d7a8e9f63f14e7775fb3f53e
 EBUILD bird-2.0.3.ebuild 771 BLAKE2B 9adf75165ef2ff7721d62a1ff062338e8119b32bdb8e8390b9e9b294ae2900f58d872252070b0ea1983526db6693e5fd8438cfb086e901fdf6c6a44a26cdb3e3 SHA512 8bd4530fa36b6e9476539bea7e37fa4a16d07aa1e1e60b1c63f757d545174a7bff163860b81f261a1b7f06dccc4f756e96d5fe134aff91f9c7dc3c33619f045a
+EBUILD bird-2.0.4.ebuild 764 BLAKE2B 8478281f359226d4fcd8373829ef27f1c119b8380a90e95c08cfa6cead3adf43ae5e519ad9b80f4c438f95163c8380da02210e5faf0d6fc02809b582690969ad SHA512 575d8d2bca595e5e215c3bc3bdd957827cd8888c885ad7dd489ef823f455a740ef1d6769af8dc435d9f1f6fb074372f1c241360ad4098fdfb4ceccc58211d85c
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.6.6.ebuild b/net-misc/bird/bird-1.6.6.ebuild
new file mode 100644
index 000000000000..db540658a184
--- /dev/null
+++ b/net-misc/bird/bird-1.6.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug ipv6"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_prepare() {
+	eapply_user
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+}
+
+src_configure() {
+	econf \
+		--disable-ipv6 \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+
+	if use ipv6; then
+		cd ipv6
+		econf \
+			--enable-ipv6 \
+			--localstatedir="${EPREFIX}/var" \
+			$(use_enable client) \
+			$(use_enable debug)
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd ipv6
+		emake
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		if use client; then
+			newbin ipv6/birdc birdc6
+		fi
+		newbin ipv6/birdcl birdcl6
+		newsbin ipv6/bird bird6
+		newinitd "${FILESDIR}/initd-${PN}-2" bird6
+	fi
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-${PN}-2" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-2.0.4.ebuild b/net-misc/bird/bird-2.0.4.ebuild
new file mode 100644
index 000000000000..152c1ad23c3c
--- /dev/null
+++ b/net-misc/bird/bird-2.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+}
+
+src_install() {
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-${PN}-2" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/files/initd-bird-2 b/net-misc/bird/files/initd-bird-2
new file mode 100644
index 000000000000..06030d4b3016
--- /dev/null
+++ b/net-misc/bird/files/initd-bird-2
@@ -0,0 +1,51 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Copyright 2019 Alarig Le Lay <alarig@grifon.fr>
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+pidfile="/run/${RC_SVCNAME}.pid"
+command="/usr/sbin/${RC_SVCNAME}"
+retry=15
+
+CONF_FILE="/etc/${RC_SVCNAME}.conf"
+SOCK="/run/${RC_SVCNAME}.ctl"
+
+client_args="-s ${SOCK}"
+command_args="${client_args} -c ${CONF_FILE} -P ${pidfile}"
+client_args="${client_args} -r"
+
+depend() {
+	need net
+	use logger
+}
+
+check_run() {
+	BIRD_CHECK_CONF="birdc ${client_args} configure check \"${CONF_FILE}\""
+	# Check if the bird parser returns what we want
+	# We can’t use $? because it’s always 0 if the sock works
+	STATE=$(${BIRD_CHECK_CONF} | grep 'Configuration OK')
+
+	if [ -n "${STATE}" ]; then
+		return 0
+	else
+		# We remove the first three lines (garbage informations), the
+		# errors begin after that
+		eerror "$(${BIRD_CHECK_CONF} | sed '1,3d')"
+		return 1
+	fi
+}
+
+reload() {
+	check_run || return 1
+	ebegin "Reloading BIRD"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ] ; then
+		check_run || return 1
+	fi
+}
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 455357922349..6dccbd44d114 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -9,5 +9,5 @@ DIST connman-1.37.tar.xz 707752 BLAKE2B ad8993764a444d205b0a8cf1ad38acc249a1a280
 EBUILD connman-1.35-r1.ebuild 2555 BLAKE2B 7369ceafa9bd072bd8020da45453bd07ddacb10606bb3d61ceddfd3367b15bdbf890a00aa579536d548b52fd6c6656d79cdb31d290d2ac6301a6f04ffbd0724d SHA512 640be0029a8c6568a47973743f968cc641a579523f4288cc5ac0347b72721f547f608729c2865b2a31e15394e2c85a18b360936e082ac3f7069296e9977870b8
 EBUILD connman-1.36-r1.ebuild 2587 BLAKE2B ed3365fca807716a3e51e4ec9dc6b24baa144bd9f48d72e5d68b30a512663e9ba0d3497d1f8532a3b3d260d546df37f489b1c7fdb7f1d70931bd3043a9a881ea SHA512 4ba0e07568052cea00aeb6ccb8dbccc4e339712ddbb8c2b22716659298afd09863de1a2b3f1f3325b0ff40e24d8345fe1fc408085874a8ee5897be861df3bfdd
 EBUILD connman-1.36.ebuild 2568 BLAKE2B 902e767beeeb20850f0387485444905ac4b607dbdcca5fe73b4db808df7534829d2a2ccec1636c1ecaf8cbcc0c60bea9dc8b8865d8da13b1d748fd778a62d551 SHA512 f9c93a7263ce7d683dcfb6e1fc2d6798a222159bdcaf432ab75fb37d5c8a37e200ad6ad2ba5efef8438eff2eaa486545d4593817aa9ff3532833c1a15f9acb27
-EBUILD connman-1.37.ebuild 2590 BLAKE2B f3aece41f15003280467b2cb8a9457b88198c30a7454ce521ae4197042ba2975623bf68d3c832b135275b45812777f9771c0ecf9a01fc6ccaf621dce846365b4 SHA512 e7c353ec3c1ba0cef969ca9e0997340d6c8e9ffadcf64c726973c3e449cb0755b6e706c2bee6bc556bf236d3cd722ff7f26facb8d3e831c98d52fe231d71e874
+EBUILD connman-1.37.ebuild 2585 BLAKE2B 2424e663462e696811a50892a495837113fb013f3ae3220763eef2a1794608a3d904f505cb775734eadf69731a965dfe1a0b397162a45e5f306399910e3abd32 SHA512 b946271739eddfa7451d1da1e956a485a9fe201ccd7cc8a90b82751fc0fee9d4ea0285feebd8825a1a3b50780c75533ca53a3e111e9855eeb9f573e95985750d
 MISC metadata.xml 1158 BLAKE2B 57d083417dd0b186b1d45368f1ffab64d6283535ae6f25adfd6cd85d26f535544f0b89d7f731dbb876ba7acd1973abdd26ac7643c050adc9a433d321ffc9fb57 SHA512 2d272d638d9f9f06eb900736815eb0e401520f3ad86082beea541932626c5758e220f692931772ecafffbd60798f0df38e8c9e8a02b58c03743ed984955edb8b
diff --git a/net-misc/connman/connman-1.37.ebuild b/net-misc/connman/connman-1.37.ebuild
index 3114fde34651..fc81c6e57dfa 100644
--- a/net-misc/connman/connman-1.37.ebuild
+++ b/net-misc/connman/connman-1.37.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 
 IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables iwd l2tp nftables"
 IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
diff --git a/net-misc/crossbar/Manifest b/net-misc/crossbar/Manifest
index 8137e7fc3f89..a962a19ca198 100644
--- a/net-misc/crossbar/Manifest
+++ b/net-misc/crossbar/Manifest
@@ -12,5 +12,5 @@ EBUILD crossbar-17.12.1.ebuild 6388 BLAKE2B 77a8608edce04cf5e19be47d91acda53faaa
 EBUILD crossbar-17.6.1_p3-r1.ebuild 6033 BLAKE2B f4ac47903acc228320c224a18c832f9c15c42d5c721ff4da8f8e4c38a3174d6662996c51c4b423f64fd68961a4eda931058ca842982e34b6b4f2b3db73c566da SHA512 cbb1ad06f854d34194aee8f46f313a1d0f976fd6e2540c4749df26f4c81b9178357152c9ceeaf5317f31208e976b8b5e1b01edc7a5ca0af80c8054c85ca1faa6
 EBUILD crossbar-17.8.1.ebuild 6435 BLAKE2B d2e41ff6f90579d152334152cb42cf50e3e48dd9b198642aa0a36f738797edec812f4fe51b311871e207022e4b2897c48bb958483f2d4f17c895468a8e287eef SHA512 b440f74d45b22312f5a97304d40dc4c2d36a534202de19e15a20698f8be5faaea85c31b05309a45116820c9d26f25819135e5613483486ec73567f51e5772364
 EBUILD crossbar-17.9.1.ebuild 6385 BLAKE2B 5e6e26cc376fe091a5ad2fced8cb2ccdcc8ef30a2581816468744325e616ed7c6847bbb905457b9ee811689385a79e2313a68bd11db0a1071b107b318a616339 SHA512 0dcb2623777b352e0f168a0c59fef1b50d441c7fa486ba1bbe81a2152e39e68d5a633b3fdf6948985d95b4579068ef0e062ea99f269ca546312593f622d464ac
-EBUILD crossbar-18.3.1.ebuild 6330 BLAKE2B 12b8cf4e5a507be6573a5a338651da633b470ca3bdf92ee986786fe90513d95c777802a812fc8829664cf0bda9d24a689eb146c9d1228f8b017a45abd952873b SHA512 50bc482f6a22ceb59573233d4d3954f525b6d6387411649a0480bfa2412059d8215d9240c45788a23754401f5c53036fbe70e1caf5bc7c81c054583d3348d98d
+EBUILD crossbar-18.3.1.ebuild 6337 BLAKE2B e1e3cfab199e176033b539881e977cc40c63431b1a83fbf5708876234e3c5b72335cc08231e990f0c1399c57f9ade92546326b1e87659eace7eba0f733682446 SHA512 896b8831d12986807f355e7172738fb0e69c0ddccabd29ebb1c65dc783ce1837006c521537b939500aa22e8ad2b17be32db81cc571bad2631daa8a647fb7d353
 MISC metadata.xml 861 BLAKE2B acef636c9c51de3530425dcf3ab31afe8300c3fcbe1615d374c52610647086324887e2fb97b7a2fc9aeae73c48f5742b67ee9190abab5b01f3f7e762ae286851 SHA512 90ce37e4764583a09f90e99c7010de5c1f2abff6837cef4255eee5d83f7d9de2f641812700fa180cdb0e0511d401cb1e160a721600efabc787fc2a32ac0b83bc
diff --git a/net-misc/crossbar/crossbar-18.3.1.ebuild b/net-misc/crossbar/crossbar-18.3.1.ebuild
index 9fa6267f2b5d..0e5de6b82bcf 100644
--- a/net-misc/crossbar/crossbar-18.3.1.ebuild
+++ b/net-misc/crossbar/crossbar-18.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 
 RDEPEND="
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d5c16ec3a721..5163b2e42090 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,6 +3,8 @@ AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.64.0.tar.bz2 3012077 BLAKE2B 512edeaa7a4ff3a998903771307070b08f1dc53bf45b4f0c98edd78daa309877e1856e1253a3582b3db35d2ae877af5aeedf2fb2741bfd8faed3bc4525880581 SHA512 058da4c63a05f704de475271f37fb99ca90a67a919b168e07958ed45d10cb3d03898ea6e3452ffb1a1f1e5dd5915f08a2993024b12233919f3c46c036b9c07e3
 DIST curl-7.64.1.tar.bz2 3000536 BLAKE2B 787b9f9662dad4e3497357dc3f9cff0fb2c997e2603cf3c621633d9983fd011c346640be5227ddc4b363bdb7e1a64532a44ae9d5ccc27e405275e08f150d63fa SHA512 e04532d68896b79f28aea3b30aec2d5b53076d0d27c8f6404769618300828eed96633e7bd5945125bca76241bb1e169f5002ac9566108bcaddc8c51b513106b6
+DIST curl-7.65.0.tar.xz 2392324 BLAKE2B e5aec8c6cb6f6baabd035ce2ea159dba1541011658892bb883e917541aaffe6ebfb0d2b9f18e2357059a7bc1e3a8db47b2aed7a74597b21c14f0892ad6e9eb68 SHA512 032c065c1d4bd07ba028625f8fab6a09e7cb8505a5f19339b3abdee5a9cda7d091c11f075fe3fc227d082690a66c558c770a4cd9fb17b52acc13794976a770c5
 EBUILD curl-7.64.0.ebuild 6857 BLAKE2B 768a2b4559ba419b7211ae44edb63eca018f2bb98a078c05c9eae2f5be74c76501dbe78eee0372e64bcbb5a462a698959533b57d944cf83d40c8140e59b07b02 SHA512 2aa729057a5fca87b89cc412a157c67a02fefc172b374592ffdf832cc8fe88f9648958abb7534bf57e96fab8f14c5f3034688c242d5c660d8d7841112d727cda
 EBUILD curl-7.64.1.ebuild 6976 BLAKE2B 703d33296158e3e7514588080c11308926d9ae246c416e993a23e623ea6c846e8ad50dff2624e4c9e7d2c228dd165716909c009a5f9a11243589f13d19dfa499 SHA512 5eac3bf04054a2b7bceb22a7840cad1b6c04743bf02d468e5ae9789318f3dd087ae0f8dd3dc6da0ce23c48261cb62d756c1b75cb92cc83f9ea22d21bfb0b4052
+EBUILD curl-7.65.0.ebuild 6978 BLAKE2B e8fe53f65319cebd690aadace6fba8e2baf5b1245f21c63f0b2d9cfa272232587b505d053fdd6bdcd6d2ef33bc8ffd71b201141aeb99c8c87337a182d0696b62 SHA512 8d22f79773511915adfb5da91425dbde36b5766f4dd8749a9a8b0de986e48a753d7818a9e8340ed0b0c8795c09bd3bf0738686cf397ef409811f7f514ef6184a
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.65.0.ebuild b/net-misc/curl/curl-7.65.0.ebuild
new file mode 100644
index 000000000000..7af6f7acd4a8
--- /dev/null
+++ b/net-misc/curl/curl-7.65.0.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~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="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" 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:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		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[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# 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_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/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
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --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_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 \
+		--disable-alt-svc \
+		--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-amissl \
+		--without-cyassl \
+		--without-darwinssl \
+		--without-fish-functions-dir \
+		$(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-schannel \
+		--without-secure-transport \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--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 ssl && 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
+	find "${ED}" -type f -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 9c60c163f2f8..67129621b7ff 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -6,8 +6,7 @@ AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced
 DIST dhcpcd-7.1.1.tar.xz 211788 BLAKE2B 984ec97ffdcb15883f57f9e2a699a7c8f006b2630e7651ab9d55e7a980045f8891f09d9f7be420969203a59671d097a1ed76621fe4a62ff26a5020fc8becfe69 SHA512 8791e718d65ef8ae23a16b98e82824860fa91914e6eb0a42cdbbca28236c1c38005ada44214bde33aac57152fe675debebdb5d141b67dcfc82012996d8337bb4
 DIST dhcpcd-7.2.1.tar.xz 213652 BLAKE2B cae5a68ecf285825e6376c8b5bef5f3aba3bb8a393ba4298d8e990d665dd948369f24f688cdb85006df535b7f9b412c795d8eb7817a92e8d9992bdc7b7757a1e SHA512 11c3ef6d3ee49e147aa44725aa1ac0cddff70a268908439fe91990e135175d063e3d65ab587e1780e4f6f0739cf33873a58ffea0a3130d1bfb5598f9f11ec5a3
 DIST dhcpcd-7.2.2.tar.xz 213600 BLAKE2B ae36cc44d32c034b41f9c970fdb154ef2935b53ae9a81d76dfe8143882170cb8f4ea9c2048ebbfc2d94096061626e93d5890565192115d2953506a7d1e4ee6f2 SHA512 a774c4788efbb9712be04d3f29943b801043f9ec1ea1925282330afa00b9f3db5c29a85969ef004bf85b20045b4cc6ab241ceaae050a18051079d396845845e8
-EBUILD dhcpcd-7.1.1-r2.ebuild 4589 BLAKE2B 7b2a6de223666229f41fe9062a0c5234f0cfb300405cd5fa5d7fe6eb8d788d11edacfc803e42ad27a09fadd8593f59b8ea5ac27cf5e8f6b3f87d243efc08fe8d SHA512 2f761b8d0534c1555cfc716c38117ad1d5d4b871c71a085cd703da3ef3cadad755b07409f69926f08400f60cd008a41668d762c5a550bf31bb27643eb14996de
-EBUILD dhcpcd-7.1.1-r3.ebuild 4644 BLAKE2B f776383d0a000c29c04d77f8b32db59e82137cf55821905e72619cb9979339083c1e165d3b93ba9a3b63ae2ec0c85018c924847f4b3b88291d00ee4a1950430e SHA512 4a333156302dc928083ae142230a9105fbd5ddd16681714f51b8d1cb479aeb864ef00164a2ecff403167ad3e26f288e9e070b4cab2c839a9df9d07ee6240b9f4
+EBUILD dhcpcd-7.1.1-r3.ebuild 4641 BLAKE2B 4bf2bc06ab5ad509960e4730a91ac6cedebb2109ffb285cdc3381e3fcdec239e63d1ec26bb5037fbcb745e7532bfbb57673627a0165d197315da97326e8c63d0 SHA512 06fdb570c0f55e13091f6b12b014304b4e9036fb81194944fe7f53fd4809aa6376fa77e0e6d6cdec77d3649336a18363aa13ba4e921247ce20aa5ac37c688c95
 EBUILD dhcpcd-7.2.1.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5
 EBUILD dhcpcd-7.2.2.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5
 EBUILD dhcpcd-9999.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5
diff --git a/net-misc/dhcpcd/dhcpcd-7.1.1-r2.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r2.ebuild
deleted file mode 100644
index 88f47e8867ba..000000000000
--- a/net-misc/dhcpcd/dhcpcd-7.1.1-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-disable_inet6_fix.patch #677508
-	"${FILESDIR}"/${PN}-7.1.1-overflows.patch
-)
-
-src_configure() {
-	local dev hooks=() rundir
-	use udev || dev="--without-dev --without-udev"
-	hooks=( --with-hook=ntp.conf )
-	use elibc_glibc && hooks+=( --with-hook=yp.conf )
-	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	local myeconfargs=(
-		--prefix="${EPREFIX}"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		${rundir}
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		${dev}
-		CC="$(tc-getCC)"
-		${hooks[@]}
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT%/}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.1.1-r3.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r3.ebuild
index a63e8bda4d53..15d28a114040 100644
--- a/net-misc/dhcpcd/dhcpcd-7.1.1-r3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.1.1-r3.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 6b3f1ad8c92a..c0c05dce6f49 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -4,11 +4,9 @@ AUX 3.1.3-desktop.patch 683 BLAKE2B 15babc615c74152d5005ddc8dc644557fcaf176825fe
 AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
 DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439
-DIST Electrum-3.2.3.tar.gz 8311398 BLAKE2B 389f2ce2982d40f69c1fe3bfcac3ffb70d4fa09265f1a0567ecbdad21b53ebfdd2473e8e56e024add8cd52d24f690467441ffd33509cb0ef20c4f30bfcbba2a7 SHA512 a1620d2a0f28ee8c61e0ddd985f9e2a219f2b9fe0316042fbc88533332fd95709a9f4e60a40494a9cc5c2fad08c6f318f38bcbe91bbb88d20811953d514682f7
-DIST Electrum-3.3.3.tar.gz 9192110 BLAKE2B c4884125f5309c18d324b2bdcc9afee05b3beeb124ca45a0c6f3207b19cf9431f5ed15fbd066c854f8f7bfa89e347df5578eda825ab43e69c502fc7ced00e8ec SHA512 a30287794b87f3e3ad02be4c32281c22dcfec801ff0d4602e6adcb85e532c34e69b60e2aec65f5d6ef8ae68c21b068fff87ca685ef8caca4c785b56cb400e23f
 DIST Electrum-3.3.4.tar.gz 8606286 BLAKE2B a815a577509cc7d31f02347b5ce52d0fe9fd52ddbe4b60200a02423f8e6bf43a6c24d3c1db6ab265a69f6f3891db63886fe6c138d601bc48c0c8fdb66191e941 SHA512 297eb757dccb166d40a652be2c1c058e42f16416b586b69f32223966ff1e92a34e5d01822d71bd063bfa72b7bbbcae4251a63f7373600d0eeb139e923d17a2b3
+DIST Electrum-3.3.6.tar.gz 8789792 BLAKE2B dcac9a317364780a7dc3ae1083e6ba7fd3a4559d0b7f6375197bdf639143ab9da2c5a001605af5a0590fb900de2e98999aea171c6dcec390a47beb610af3b490 SHA512 b25fc67883b7a90bf902f62d07574f283c4c04b3c6dfbb4e890448ddb938d477e036470f82b45e426aa581a1da2425e13e6974a730b18b130fd265b8d01d0d91
 EBUILD electrum-3.1.3.ebuild 4324 BLAKE2B 982bf508f73e8dba14667d04e49c3af84e04c2c84624bfae7698ce265d3b09246db987e1da9e8887266c1d77e0a575104d489de97719ddf71cd3d390f359768a SHA512 8620a4eb41aedc875f3315fad410489b96d9ffbf1477cd91d6ca34385c12719e4fefb56eb9a5d1700d5c99001340a080af96fd3ddfffa3970bd9ff311934c39b
-EBUILD electrum-3.2.3.ebuild 4429 BLAKE2B ce1d204868a4011cc67d16e9626886986562316ccf796217548bcd53f9a567a1cf7ae478918f654c0e08117649feb16e98469a31b4825fe7045605650882bcb1 SHA512 174851b0615a21239e4ffce92003be1a1a36e9cf08809b164ec27ea5cb616c43c7646adfe5b39956c650d064ac9935c10743afa461f85d4e71a515502380e04e
-EBUILD electrum-3.3.3.ebuild 4629 BLAKE2B aeecbe400dc123f9e363a0730beebda4c092f324eb38f9a891101bb548ee0ff904c7e503f6c487695fa72f4264816b1acc64292304110582e49d6300b73c46ab SHA512 f70bb7dbc876302be045bba03dc5d5e77ea17798c2052739bb26736151bbe9f1d17d8d11beaa7e3406d2d897bbe9299e93f7f4e1a76ceb1bd1416f549cda919f
 EBUILD electrum-3.3.4.ebuild 4642 BLAKE2B 02a2f998591557da446f1d9be0db24742764ddb3e22af518460281fde6f6cd8ce1ab0308aaae9f4d6247705e5aa05c21ec7067d7ca8548cf8461da47445b9706 SHA512 770bc4dff7fee5bf2508ab2c58f346f0bdb767fde0d26d8de61ede13b617b96a2d7cf8859925acaf84270dfd00cfe8811adb455519717e35b31f03be4ca48048
+EBUILD electrum-3.3.6.ebuild 4642 BLAKE2B fa910e649d20976822159e5221e29a311545825c3577eea1c5232738031a1229d353c3f584d0441bc2a957ca53dbbb169765e313c5739e4ae77a5b2c8b4acd71 SHA512 02904da5ec4338107061be342fc0675001cb51565f6da639d6669c7fabad399e1260e44085a3072bc34647b3055a768abdee47c648cfbce0311f602239cd9205
 MISC metadata.xml 1464 BLAKE2B 702ecb52f960766ab9cfbf48af6bdec84ffe6374bc0bc7684aefd47aa36b569c2730205bd6bca9ebfbee168abf5478d263be5724e99c896c3a296d85bf3d2075 SHA512 e6142f8a9bb951a6dae009c542597ab47ef2398b8c119824e8e14575f02de2d776b3463035973e2da5f90d896417f00c3fe8533e2894e162e262def472531f02
diff --git a/net-misc/electrum/electrum-3.2.3.ebuild b/net-misc/electrum/electrum-3.2.3.ebuild
deleted file mode 100644
index a107aca5a3f7..000000000000
--- a/net-misc/electrum/electrum-3.2.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync revealer trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.1.3-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "${PN}/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "${PN}/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" ${PN}/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm ${PN}/gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		$(usex revealer        '' revealer             ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r ${PN}/plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-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/net-misc/electrum/electrum-3.3.3.ebuild b/net-misc/electrum/electrum-3.3.3.ebuild
deleted file mode 100644
index f2fa58dda34c..000000000000
--- a/net-misc/electrum/electrum-3.3.3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	dev-python/aiorpcX[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "${PN}/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "${PN}/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" ${PN}/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm ${PN}/gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex coldcard        '' coldcard             ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex safe_t          '' safe_t               ) \
-		$(usex sync            '' labels               ) \
-		$(usex revealer        '' revealer             ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r ${PN}/plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-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/net-misc/electrum/electrum-3.3.6.ebuild b/net-misc/electrum/electrum-3.3.6.ebuild
new file mode 100644
index 000000000000..7aad1b5767fc
--- /dev/null
+++ b/net-misc/electrum/electrum-3.3.6.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 gnome2-utils xdg-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
+
+my_langs_to_l10n() {
+	# Map all except pt_* and zh_* to their generic codes
+	case $1 in
+		pt_*|zh_*) echo ${1/_/-} ;;
+		*) echo ${1%%_*} ;;
+	esac
+}
+
+IUSE="audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb"
+
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
+done
+unset lang
+
+REQUIRED_USE="
+	|| ( cli ncurses qt5 )
+	audio_modem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	greenaddress_it? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	trustedcoin_com? ( qt5 )
+	vkb? ( qt5 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
+	dev-python/aiorpcX[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
+	eapply "${FILESDIR}/3.3.2-desktop.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	# Remove unrequested localization files:
+	local lang
+	for lang in ${MY_LANGS}; do
+		use l10n_$(my_langs_to_l10n ${lang}) && continue
+		rm -r "${PN}/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja    '' japanese) \
+		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
+		$(usex l10n_es    '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
+	; do
+		rm -f "${PN}/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" ${PN}/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt5      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm ${PN}/gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt5      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex coldcard        '' coldcard             ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		$(usex greenaddress_it '' greenaddress_instant ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex safe_t          '' safe_t               ) \
+		$(usex sync            '' labels               ) \
+		$(usex revealer        '' revealer             ) \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin          ) \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r ${PN}/plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 electrum/gui/icons/${PN}.png
+	distutils-r1_src_install
+}
+
+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/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index c623bbe77320..b8ef84f9d748 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -3,6 +3,6 @@ AUX 2.0.0-rc4-libressl.patch 1770 BLAKE2B a0f9c5938ecc9ee6f7ec3d67f0a285285c5dc4
 DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3 SHA512 cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589
 DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20
 EBUILD freerdp-2.0.0_rc2-r1.ebuild 2664 BLAKE2B 8612caa8fd82f99e1e6369ea991dd25270b9d7d104825038d6f0bc11983d43b84ac0ca15b02ad112072ab654b10f68372bd949b171ca0f9282dd0971be6b6389 SHA512 0c17d9a07ef8a13bfa8462eac1b3f19c3741e156e1dfd4e5fad41158cbd65bd18403b55cef9a04d0f3f5fb4c53a75c1f34b3405e86210823916eb2a10d6510be
-EBUILD freerdp-2.0.0_rc4.ebuild 2703 BLAKE2B 687f1401be2c68ebf450dc715d8e329497d5cb1cfff986adb89850663f704b4c08e2cdf0f39366ea57d9df37cd6e5597f74f94560d561759b333bebd31b95478 SHA512 4e46a70cbf3a1f009a10ac1ee93ae5a39ab41e6b83b59e7a97084e619a3859a89bd51ef6fde3a4480c1538eec6e2caaead1e5140ab5c30615cd3161e8b61f249
+EBUILD freerdp-2.0.0_rc4.ebuild 2702 BLAKE2B 2835c11a2dca2c6b28670867343fc387eb10b2c19cc8111574fe2e9c9d2a3adf5d025f95e1672414687973fdbcee0e1ebcef62e5622896248998ae4e0f6d87cd SHA512 fa1c1f485c5fb3368975794e22334f93e921c1000f5bbad0590e7b59d2566163bb626c628af9bc3cc33c3dd347def778bc1aeded490b4df0a89547601ad140a1
 EBUILD freerdp-9999.ebuild 2650 BLAKE2B 9366eac7edf2dc9ab3ce1b7bab9804bca0faf93822e2f4263d94ef49fe23125e0404b940234f8ecbb2b43da9e9e4ba02260cf8aabc826c61c580031db60203f0 SHA512 f462a8d947212addd7e406992f1ee5d09a65ff7cdfb2aa5156012c715149f5a0e7fedbf18da5ab1633ae0794426c081387717357cf4d5c25fabbb895a7fc664b
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
index dcf32d13beb8..772d36f98fa8 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != 9999 ]]; then
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="alpha amd64 arm arm64 ~ppc ~ppc64 x86"
 else
 	inherit git-r3
 	SRC_URI=""
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 83e0120b5d81..4aad00952e5e 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,13 +1,5 @@
-DIST ipv6calc-0.97.4.tar.gz 1037582 BLAKE2B b01929321c94169631c865ddf00067a85d0df8083f2d675b6fea6d4d780400d654cc802a94ff8c723f2e5f4f0d970e82338d5e9fc4bf4c1572b304fa017ec4db SHA512 133f4e281da8eb1ea13b7c37123ae9f1b88e100553de758ceaa6cc63b0306e4711447bc7a4c171508fc5ce1ed447daec9749c5a75e5288deef0efcdc095bfcde
-DIST ipv6calc-0.99.2.tar.gz 1287951 BLAKE2B 14de353f5883e1aa538c9fd1b66dbc9d9b485192a7cd7853f4b8a00a31b1b798cee33edb4263a9c5acd8b6dd42b26cbce35e0f072e7b92a7c40f1222bba27075 SHA512 f757a4a7d69b5dea34051125b96b9f9f36957bfabb1568ddae2aaefe6551aac7b9edb6abfdb3ac90aeaf32e517720157614cb7552b4e9dc18180904674e48f09
 DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
-DIST ipv6calc-1.1.0.tar.gz 1396498 BLAKE2B 67b95057ea75f7c26ab1f9fc8b8e869ef027594e71800c4f8f1c442f34bce31340f1e7160d4f48033b8bc080738051418be48e3913ccd62594256ab64eaef919 SHA512 8fe2a4717f2be4ceae051b635d4329b8c438d9741e9a99a3c12cc1c0d0daef89325cc9beb7ca65da3c671586ce2a596191962118005aeaaf7cfe33a1d4549101
-DIST ipv6calc-2.0.0.tar.gz 1436990 BLAKE2B c445db7583f39b5084adcf756f383d888f1ac75c15702215bbd320c4a54222dfba8ab7b75582d43fb48fa89db1b6e186594f9028d0b30b843e0e7d033baaf6e7 SHA512 6763c27399529b1cc22bdffd84e1fb412d8fe7e20fa7c120fa9a231c0d24e2dde5c285856166ed71e498c93574baaf9d87c4ffb50b2a8511d71b7af4f35c3f25
 DIST ipv6calc-2.1.0.tar.gz 1452903 BLAKE2B 52221e0ff08f6cffbf37900a750359b3e89fc7711ec0fc15b1dd974aa06a4e093ca53fb59e8d75e12824c60079bcefd9df5092365a375825fa9e2e583f0af6dd SHA512 b2ff8557a4af99e1d08b617b2d0a20652d23d80fb532104aefe3708c90fd42ed1309dc9697c7f405715140a2efdb460f4915b797fddf4a7966d165e74224695e
-EBUILD ipv6calc-0.97.4.ebuild 1261 BLAKE2B 685a6981839b68a33c680812c5d4307a5d41ac580db6d08394134b000f9b0045eaadaf85491a6fecd4ee91b5540ab155354d3feeb0bb30271bc1671986fe118a SHA512 d80802c0164be4d04daf115945b0addf1e2821f8c6af49371378f39bc2df09b0431300ca76657b4149fa8865304074e07d63fb3d7e557d2acd3cb38a756b65bb
-EBUILD ipv6calc-0.99.2.ebuild 1509 BLAKE2B 9f5bfc6e3dea8ec9d1659a44b8e646f7fa41278db028d99c3451a201dbbd51d24d27117ecdd1a41cc1d16603a39115db093736cafe399eceef90593ddcb41135 SHA512 b0a1cd648acece998390e55d6ee38659f0352d1f82599e17c2761c9f384079c2eec4e371673f1566cb1d4baf61a97f3b0857f79f0c4ca6980b402c33ebcf0756
 EBUILD ipv6calc-1.0.0.ebuild 1506 BLAKE2B e1c0db4b5904351ba98a0b141dcd906836cce9eac0f81d20ab86bafe52b9101f9cef108dc6fb08b948d940e42001b74533cd2c9e0fbe7ca0c7aa02eac12211fe SHA512 4dd8479d8738b0ba7c0cb31462981715dec73f820c4c6fb2829693359944b32babbba53315d019d37290c7722da1f4b941927c6baefd8bbd927f200d72fea78f
-EBUILD ipv6calc-1.1.0.ebuild 1514 BLAKE2B 1b520e08975817482c85dccf0ba9ff118a2f976dae4c83ee35f155277862969562ca8c880ef4d215ed92c9fc2f304d42d5f68b070f24a585c617c47e742d60d1 SHA512 34ce1a7e1ceecac75e0758078a72a7b9e319b2050eebc0b2f56497436744b1e7e9c74e44b36ec2457ef8658ff20aab560302a7c4037c9bff5d6e263a62209227
-EBUILD ipv6calc-2.0.0.ebuild 1511 BLAKE2B 4ad3e6d1f76eb345a2d61a9bd140980296706177e4d682a03e7c312ea6bbaf2555dc092263311df3f4b68fec3ee0f1d08226776c6b77ec4b7ed3c23b8ce705dc SHA512 4a2861424be22075c9e561a170711bdb7f2addde58b1c51f8dc8b9aaf9aec4e257174b4d4976d78eadc107256b965982cb1835bde3ed33c73194454071dd76b4
-EBUILD ipv6calc-2.1.0.ebuild 1586 BLAKE2B 7fdbd28d864908340aaff783cfa04db513623eb4f2a79909a1d408aeab3af85368604f051cae0fa715f66698546492b3a569d34e0cec5390724c5293f7b1d69d SHA512 ca93fa84ffa87517429b198e2defa105853e31c7e4e5826f2cf01f75cde0cfff1ad59fab09f8212906990252015ac1ccf279fcd7cd3b22243616f22cc7b27593
+EBUILD ipv6calc-2.1.0.ebuild 1559 BLAKE2B 684d3ff677db62f49c19049e8450c791bb45cc3d7630aab914b94194449d4bfc6375d4d6c39aaa337c766fd99252f4fa88e07f043d03738df4a42eb506f22e66 SHA512 82dd0bbe8070ec2bc1070fe6680cd7745af241d7b59f20be4c7731e00eaa97aef852873f3c14e19c4cda7e865b8da04267e1a0ef3a18a2c0cd3f7cfaf9571c69
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild b/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild
deleted file mode 100644
index 0d08524686b5..000000000000
--- a/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="geoip test"
-
-RDEPEND="
-	dev-libs/openssl:=
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-src_configure() {
-	if use geoip; then
-		myconf=$(use_enable geoip)
-		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
-	fi
-	econf \
-		--disable-bundled-getopt \
-		--disable-bundled-md5 \
-		--enable-shared \
-		--enable-dynamic-load \
-		--enable-db-ieee \
-		--enable-db-ipv4 \
-		--enable-db-ipv6 \
-		--disable-ip2location \
-		${myconf}
-}
-
-src_compile() {
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-0.99.2.ebuild b/net-misc/ipv6calc/ipv6calc-0.99.2.ebuild
deleted file mode 100644
index 2070cec352d6..000000000000
--- a/net-misc/ipv6calc/ipv6calc-0.99.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="geoip libressl test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	if use geoip; then
-		myconf=$(use_enable geoip)
-		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
-	fi
-	econf \
-		--disable-bundled-getopt \
-		--disable-bundled-md5 \
-		--enable-shared \
-		--enable-dynamic-load \
-		--enable-db-ieee \
-		--enable-db-ipv4 \
-		--enable-db-ipv6 \
-		--disable-dbip \
-		--disable-external \
-		--disable-ip2location \
-		${myconf}
-}
-
-src_compile() {
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-1.1.0.ebuild b/net-misc/ipv6calc/ipv6calc-1.1.0.ebuild
deleted file mode 100644
index f16ce08a7706..000000000000
--- a/net-misc/ipv6calc/ipv6calc-1.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="geoip libressl test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	if use geoip; then
-		myconf=$(use_enable geoip)
-		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
-	fi
-	econf \
-		--disable-bundled-getopt \
-		--disable-bundled-md5 \
-		--enable-shared \
-		--enable-dynamic-load \
-		--enable-db-ieee \
-		--enable-db-ipv4 \
-		--enable-db-ipv6 \
-		--disable-dbip \
-		--disable-external \
-		--disable-ip2location \
-		${myconf}
-}
-
-src_compile() {
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-2.0.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.0.0.ebuild
deleted file mode 100644
index af1dab4b99bc..000000000000
--- a/net-misc/ipv6calc/ipv6calc-2.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="geoip libressl test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	if use geoip; then
-		myconf=$(use_enable geoip)
-		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
-	fi
-	econf \
-		--disable-bundled-getopt \
-		--disable-bundled-md5 \
-		--enable-shared \
-		--enable-dynamic-load \
-		--enable-db-ieee \
-		--enable-db-ipv4 \
-		--enable-db-ipv6 \
-		--disable-dbip \
-		--disable-external \
-		--disable-ip2location \
-		${myconf}
-}
-
-src_compile() {
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
index 12762462078f..077b47c137f1 100644
--- a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
@@ -44,7 +44,6 @@ src_configure() {
 		--disable-dbip2 \
 		--disable-external \
 		--disable-ip2location \
-		--disable-mod_ipv6calc \
 		${myconf}
 }
 
diff --git a/net-misc/istioctl/Manifest b/net-misc/istioctl/Manifest
index 4644bf41f237..00e02d9a5d45 100644
--- a/net-misc/istioctl/Manifest
+++ b/net-misc/istioctl/Manifest
@@ -1,5 +1,7 @@
 DIST istioctl-1.1.4.tar.gz 20705247 BLAKE2B d3727dafcfa8a630a02040fe452a3a2b6c89d4dc2ede4128b9906adf21d97e68f8b126783d248239416a459357bee72ca0f2af19a6d34039ad59b3ade6f3b6d1 SHA512 e866fcad482ef605e4126fffe421eff7fbc1733e5d949e2ebe846f790d8825bb79d5360fe48d29913f0b015c15bc1aac224ac9f39e4e7d5948f2dcd5042570a8
 DIST istioctl-1.1.6.tar.gz 20707819 BLAKE2B 0ebd34873e6ff1fec2413afed8b4fe80baee8e9bec55bc2fab15b25266b404fb05fce6bfd0e122c5eb3fa661f5633a431aaa3042ad6d12caf2c4feb58bdbaa5e SHA512 62b9b96547af6f8050f934e4d620ab1990afc805c0abbdbc7933220d28676542222b4452f8207dbe5976116bfe8ae557ee7545e1859b0ab22d9c0c2510950fca
+DIST istioctl-1.1.7.tar.gz 20711283 BLAKE2B 5c6d54ab033f0dba19377d0ca1a88a57e319932c91d3c2c1f3ad9fc112f11aec481e4421b958490e5b3c24d3be6ae68dbc7122e17a7463585a052e225f77ae5b SHA512 8a00efd3fea05d3b28225bf6d58d46769aa7576851df849185d62a14ef368980df765d3c5b1d9c59dff7f0034259e62fe57bc119b66cecb220513f7b94500cef
 EBUILD istioctl-1.1.4.ebuild 881 BLAKE2B 2469a8a5e01cfd03c46dd36ccea76f55245d0f5c6f4138dd091344d78e6e6bc3012b1865bc8b3544b50e20d2d90b256ea50e49631d5bccea32feaad198e77673 SHA512 42e2248f54be2b555c8b3fb5b889edbb999979b97b75feb0595c9974345c04fab4475d60fc0f237701af8d4001a6c8099db5a0364c684739c891331528b65c5d
 EBUILD istioctl-1.1.6.ebuild 881 BLAKE2B 3d0da6dcd771988cf424595f1909c2801a792aa84077e0d384e6dcc10b090a5551ee9c564fe4478fee21303c46bf2b3d8a777bb992696e8ed8d3a10a98973e6e SHA512 d526bcc73da7aebf102533e6f87e20b59da33a94efefcb218353085a097b2d61cb2cd77e98b208d7bc7212d2439389834678110b0c1c7599af169f959c5aa72c
+EBUILD istioctl-1.1.7.ebuild 881 BLAKE2B 7f43a2eb6cdb29533b604826aa7051c24fd51690afe8972bee6de9bc9ca8605243fbd740b74e550a12cc54db7b4fdc5c754c8f849cfc0156a141d98ac486ce6e SHA512 9f1cb38ffd5cebca846d843f255a419588544ef7afb99c3d1a67816db69dfdd00a0e9d4e4d5c27f66328f21430ef1bdaf6b0ee3d0ffc23002095365aa3f40e04
 MISC metadata.xml 321 BLAKE2B 46078d652e4352893c239c5e6b7d30a160f48b370f932357a5c2940c67ddae2f6c932ca6dd1b0b784b0e2a03a7649936ebe317dc95da5ad7a9acbd2e497a01d1 SHA512 cb45dda3fe092fbc1d18cdd21f44ad5cd89c51fee4e10aee6140bd66b25e46c9253672b8f36fe0ae6a83ff9a76c9b1bd35de59846abb9054b1f5095e33858d88
diff --git a/net-misc/istioctl/istioctl-1.1.7.ebuild b/net-misc/istioctl/istioctl-1.1.7.ebuild
new file mode 100644
index 000000000000..2d1aca58a468
--- /dev/null
+++ b/net-misc/istioctl/istioctl-1.1.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+GIT_COMMIT="eec7a74473deee98cad0a996f41a32a47dd453c2"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Istio configuration command line utility"
+EGO_PN="istio.io/istio"
+HOMEPAGE="https://github.com/istio/istio"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/istio/istio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	BUILDINFO="istio.io/istio/pkg/version.buildVersion=${PV}
+		istio.io/istio/pkg/version.buildGitRevision=${GIT_COMMIT}
+		istio.io/istio/pkg/version.buildStatus=Clean" \
+	VERBOSE=1 GOPATH="${WORKDIR}/${P}" TAG=${PV} emake istioctl
+	popd || die
+}
+
+src_install() {
+	dobin out/linux_amd64/release/${PN}
+	pushd "src/${EGO_PN}" || die
+	dodoc README.md
+}
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 77f79ccc67c1..693e9584759b 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -1,17 +1,13 @@
 AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238f4f4eff4733432ef48ad0d3352c843290e517a195ca89ee39a8c1793d0fac671689cb51946696b3eb62d90e SHA512 96656e81a296c989fa5dcbab4831b6ca12841ef8e902d32b3100196e0dfc1984ba6d4eb426ade14ef8b4299ea9665753a0af22e8e7f4b7947424d5529d2f7010
 AUX kafka.init.d.4 709 BLAKE2B 3fb3d09fb715b4c01396406574c21a2127cc7c73a92927b9add59123fb5cc2d9f97c2dd2c10c212eb3bb723a05ab7575c2443a71baa6063b85ef21dce9426f75 SHA512 1c96854b6fab044e1b415e6e9f16964d1d06dc4070dabead9a1b391a9ab2a4b64120e175f8199afbc1fd2a4ba7f7d319932e0d2b5fb1ef0e8cfe55c68313d1a3
-DIST kafka_2.12-0.10.2.1.tgz 34046244 BLAKE2B 210ebb9a2994d453e10e7c2f7a789ac33f65adced96032c2cfaff8ec2fceb2c4e4a35d71421a2b9c965c8c6e8b85b6a4e5cabd7cb0b5af0474b5a1c598c3e2f1 SHA512 48884838980ff182fe1bb089b5f8db91aaa190dad9f9cbf24d762ba8afb897546f66d66ce110eef87ad1541e06564e5ea455e4698a23fbd296d971e033953bbc
-DIST kafka_2.12-0.11.0.2.tgz 37282246 BLAKE2B 55485ff6b319b35626e8c93967357eda7099e427b5f1d87ab29bd7c8edd0ded8e271b3973b5d3ee025f09e17d319a0e9f1a9fffcf75c663052ce3b656f2e9b66 SHA512 b1652b53558886a1d407fd82d6ea1c3af5b580752303dcf836c43d76c0fc0773790df4af2d9364f937fac96d197974282e57add488bd592e87cf4c3f52592bb8
-DIST kafka_2.12-1.0.1.tgz 44474706 BLAKE2B 59aaa2bb2f1940b4d581882eaedbba091149cecadca970762b7ba83aff41da165526e5d69a65212de2f25c28ad5c2327befa4d9d01bd04e7fa8b9d882e832dd8 SHA512 935c0df1cf742405c40d9248cfdd1578038b595b59ec5a350543a7fe67b6be26ff6c4426f7c0c072ff4aa006b701502a55fcf7e2ced1fdc64330e3383035078c
 DIST kafka_2.12-1.1.1.tgz 50602117 BLAKE2B acef2456e70278e09fe2a686205829d0c699aab6057ca0ba458bc1ee141e6d9336013e664b02242ad83401f4f71a8ab4b42574ffcaa99b05f55ef68a4b87d72d SHA512 2a1eb9a7c8c8337c424eefed7baae26b3dacba6a4ab8b64d9a7d5c6ee2cdb66cfa76c5b366f23435941569b89bf02482625189016296b2ea2a05fd0f38f6b709
 DIST kafka_2.12-2.0.1.tgz 49446678 BLAKE2B 6d4aa6bd015cb42492364893c3f8ee01b2ce0408097ce5cdf0d3074c1096d30c8eec9926cad6dab31d3b2f26e16ae06173ee25554a8f901632bfde27270a70d3 SHA512 9773a85ef2898b4bae20481df4cfd5488bd195fffd700fcc874a9fa55065f6873f2ee12f46d2f6a6ccb5d5a93ddb7dec19227aef5d39d4f72b545ec63b24bb2f
 DIST kafka_2.12-2.1.0.tgz 55201623 BLAKE2B 3c0b0ce65b65dc005fe4e0e8a3c03d9047e9028fcbcdb840bcddbbabf59d02589057c250073836f779f335523e701f2c4c48d50e3580e5168fb5be1ad730ea83 SHA512 05a07e928c439b1084a6b3f6835f067f9636ac47f9473dcaaf7040d339cbd0a4561b7478531b237aa69e27f50fe3a2e7f4d0f2ba99a6422592a89ecf1187fa25
 DIST kafka_2.12-2.1.1.tgz 55351618 BLAKE2B a102fa24883ab5d3110aec1367e40c0ed0a437ca776e2532dbddb8a79c6288b8334c30b48072da8b58c693fc765106b6dcd03b6baebf66708021305a2dff2acf SHA512 a2e8168e8de6b45e8fca1f2883f0744d3c5a939b70d8a47a5428b72188501d4c2fc11bc35759f2392680d4e8ecf2fa9d0e518e77fd28393afba22194ad018b10
-EBUILD kafka-bin-0.10.2.1-r2.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
-EBUILD kafka-bin-0.11.0.2-r1.ebuild 1466 BLAKE2B 5fc18d046403eeb6c501f70030553b14c5fdc942bd7f504c8cbe40adc9f09a6645e54ca2f1c15ebba261f792db5be8d61b800c756ce3f34a0ac6240e310a6726 SHA512 1ba99aaca03965df8676629e571d61abb2a95aa7bf19ad34f5032d10b947fb5e3bbfbaf8e4cc122809a9c0d0a4b0f8fcddf1611c2ee54a7bec840a5f2fa0647b
-EBUILD kafka-bin-1.0.1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
+DIST kafka_2.12-2.2.0.tgz 57028557 BLAKE2B d71a84a308961fc78ad51c9831ef3a45f95380f143df2c961ea79603ba7c2471d0b0ae15853df86904d90dfc82cd2d2a52c03371391f534a4bf10bcd05d314ba SHA512 63fdcd05b857a096d2e72804253590bd086e4f3046fbfa546f186602e48f54712ed6de2a346a5b05d5335870bf5268fcb2bfd3ef9c4f4bbea379091a79604556
 EBUILD kafka-bin-1.1.1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
 EBUILD kafka-bin-2.0.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
 EBUILD kafka-bin-2.1.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
 EBUILD kafka-bin-2.1.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
+EBUILD kafka-bin-2.2.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
 MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.ebuild
deleted file mode 100644
index e285fe9e87d6..000000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.2-r1.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.2-r1.ebuild
deleted file mode 100644
index e550727584b1..000000000000
--- a/net-misc/kafka-bin/kafka-bin-0.11.0.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="https://archive.apache.org/dist/${MY_PN}/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-1.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-1.0.1.ebuild
deleted file mode 100644
index e285fe9e87d6..000000000000
--- a/net-misc/kafka-bin/kafka-bin-1.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.2.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.2.0.ebuild
new file mode 100644
index 000000000000..0f799f94c22c
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-2.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.12
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="virtual/jre:1.8"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+	eapply_user
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest
index 4267f9187c21..b20a934f2258 100644
--- a/net-misc/libteam/Manifest
+++ b/net-misc/libteam/Manifest
@@ -1,3 +1,3 @@
 DIST libteam-1.22.tar.gz 544302 BLAKE2B 8c20471506546de6f45989513ed22fe79f694febacbf1a0caeda872e6e8b815f9813cff682eb11060c3bb1b2ef12149f34d15c201a6b50fe438bf9776abda987 SHA512 7f54b7e87c1d3a5150e598052126e1c2f5396096450a68a923c9cfb7bcc48b724cddc61f55e34d1b5df103f5473367eb268877100f10c58d53fc3eaf24749d5b
-EBUILD libteam-1.22.ebuild 1284 BLAKE2B af14cad944b70c33a0dafd1a42c2366170e939160fb669b65b81111124ef9a3e6bbf52c922ed000701dd5ce11bb3622fb3f532504a80372e36657be999c35b8c SHA512 04aab77a8d8da1eddd3d25a3683e6b93820aebada9f34d80081e28fb7e3517c6a0adfe58e16584853431a7d55e66e103907638bb0118dba2caa71db48ff8e013
+EBUILD libteam-1.22.ebuild 1280 BLAKE2B dcf5b6dac0742ce5f77534a2f0fc4f135efdc759616491fb82532d00c260f6beeb6476a27e4e15d91e73393b71a800e9f958d76d104494d70dde17d565ba5703 SHA512 5cce151ef7ddcbdc97f85963e633147bfac5cfe1f37cc580fb329a11b5d1179ca76833eadbc29ce9b70ae5b7ac97af0065a0e3e23056b91c90f570e171c9efe6
 MISC metadata.xml 334 BLAKE2B c4d7a143b2617bc5896b42db67b45115231eef0177c1bd6d4878fcce85b1db00085153aff0a51b7e4b877b2bc68aeeb7769f8360042a6e6e21d5c9371bcc2e03 SHA512 0cdfae73365dfd53d676ae7ab8e9a0689f0a117542d5fb99e1c5987ae41388f8f8c54b37829915035f417b7e9ac30b6f2abccf95b8a3202c7a6731530201d2d4
diff --git a/net-misc/libteam/libteam-1.22.ebuild b/net-misc/libteam/libteam-1.22.ebuild
index b6c9a923d13b..4d69259df53a 100644
--- a/net-misc/libteam/libteam-1.22.ebuild
+++ b/net-misc/libteam/libteam-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://libteam.org/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="dbus debug examples static-libs +syslog zmq"
 
 DEPEND=">=dev-libs/jansson-2.4
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index 80a6f4c3eaf0..302cbd6ab66c 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -7,6 +7,6 @@ DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b
 DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055
 EBUILD lksctp-tools-1.0.13.ebuild 1325 BLAKE2B 2abb94d04bc857ce825ac73d11aa3eb0edf212f2665734e154196ffe7a420dbf50aac450de9b50710df6fadcb56e1b59a7f0f0c7e21fd41746e3be892908d35d SHA512 056d22e86c97ebab6a4b782ac069a18df5f3f023188e064ed0c600859dcb4c2a5eda9dd87e1caa0b733da3f40887afd02ab8c3835a745ea03b83567154de5586
 EBUILD lksctp-tools-1.0.16.ebuild 1262 BLAKE2B 5a1d23239b5a9db76cad9c1cb9004d70ac5bf0cdb7c5bfc6f40fae6a369668bda47943020d3412277540d73cc9cabf30eb4cad7eca2908070b05d7ee423a01ff SHA512 895d27b5a9250d835f9327ae66d45c05a0c714dc85c227c767bc255b7139f8beb46469c1201b293b482074722bee68a5f6d71648b9d91f85c1d5da67297edb5f
-EBUILD lksctp-tools-1.0.17.ebuild 1262 BLAKE2B cbe69e6d6aca2e34a238ac076cc9fb81ecd3a41139c4c54c2030272c4341d83419ac4c9bf3e94811af0d4340a4a66d0f095247bedf9bb8df742a81851606d7e1 SHA512 3cc1bd3e23845fa1c5247e4a52e04a331a9ec4dfc70035a4c63ab2e7f7d6f912ef37f7df5881d67f1d51b267195768b59344100b996461616a68ea16f62bb17a
-EBUILD lksctp-tools-1.0.18-r1.ebuild 1401 BLAKE2B 52fbe86bfe10078921532e4ff43ec99ae1745b393b67ef4a762100a390aad4a533760e3923b618e00295cf051cd8b4affa09ce4827617f742370e5ec052ab2b4 SHA512 fc311327f9c0a924de6e3157ff782b50e7ce95f22b25d83172b275f6fb3d9575b51f31eef2be0ef3eb1a301022e69ebc0e32cf1823fe5268b4d3fb38b751eb8a
+EBUILD lksctp-tools-1.0.17.ebuild 1258 BLAKE2B dfa2c9b65e53a0eb8d139778206d33183ecfcb4981f9d06fde840e986457499afecc4c8b4c718725962fd4693f514d2d439dfd92cfae0de4393e0a871ecec762 SHA512 e187fe17a57dc5497ad8d89c78e61bdf30ee037071ac69e215b3b28d705d4b6c6ef6e2bfeb434d1a442224059a0be30326af24b446a52a4cbdc383e9f5929ea4
+EBUILD lksctp-tools-1.0.18-r1.ebuild 1396 BLAKE2B ae0f85a309ffebd703898bba5940d2162fd71beff5d9884326d61690457337aa3cdfef4249c453e93c7c77d18ed3fdd50ab828c91265419b512f00765764e2be SHA512 b51278536bb807ab01c9994377368a6987461f1795ffa9aa5c9262e6909a92594d12be5530a76b9650deb155970b60190a5aaca754e875a8697d9bcb3ae8b113
 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
index c8e7e9d77a6a..ed02957f258f 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lksctp/${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"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86"
 IUSE="kernel_linux static-libs"
 
 # This is only supposed to work with Linux to begin with.
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index 7ab57c6c6dbc..74d6a748084e 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sctp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2+ LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc ~x86"
 IUSE="kernel_linux static-libs"
 
 # This is only supposed to work with Linux to begin with.
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 8af472cb0515..a73fe2f4073e 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -11,12 +11,14 @@ DIST memcached-1.5.11.tar.gz 457692 BLAKE2B 248e1b1e6aa54db06d18086add51964b8fc6
 DIST memcached-1.5.12.tar.gz 457719 BLAKE2B 6ad223cc62b3514f42eb91851cb906aa6c22f1bed65aed8b9bd5f11d8201bd1e946ddf980e26f4a2a8380f1da03ad7a4e9ad68f2c830bbfa948fe117b2689c3c SHA512 95927fcc06e83e46a050dd50c85e50faf41e6d1f6901b757f7a842b7727a596054082a512a3b830729171556e8a995f037d39d991df2198a80a4e61a6efa1fd8
 DIST memcached-1.5.13.tar.gz 483697 BLAKE2B fb4f58cbeb518941a92dc213ce2d30dda501bc84c61ae5fa520c1a3a5cfd58ed92128ea098430d57b2a3db69f0d8e8a77dd38ea7edf4440b3f6c484d3b3fb966 SHA512 77ea80135f572ff49d030ea1da01b31aa6513589e75c370ef306a986a79129358062730dfebe6801487eeb20b1367aed4096514e882ef35425c764434493fa7b
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
+DIST memcached-1.5.16.tar.gz 487868 BLAKE2B b9889866b8adbbbf23785f0da35f6f6b3cd5c842c6167beab3dd5385d6ed53e4607a2ffc18cd815005f2a1d67a3a549c780411b93d34335c541f4999d793b8a0 SHA512 999872c4c68e0210feab76f74c9487fbfb652cf3e6b7fa347f882767aad41ea6d8ba3ee056494409c054d673fc209032d8a890605810b2c6c9048d26d50751a0
 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d
 EBUILD memcached-1.4.39.ebuild 2873 BLAKE2B 1862c2434c8b711d22d97d827a79a484c1e0f682e92f282d61c10d78d6c6bb62af86519a59d3e3f715f9eae6fb8af2ee92b7705f9c987ca01f35f64ec87c08bd SHA512 2980ce757bbeb1cc401cd91473dbb4a76bce44407f0253aba2f05353426e87022cf40fcb2d584eae9d8bbd930f901e65030b86842936cd48b7425ce7163d78d9
 EBUILD memcached-1.5.10.ebuild 2933 BLAKE2B 53ed1e26ad2f3d60088b0f0eb4020d8338fcf27bca4a72224ecf61f3c9b31421ee1d6480f1aba03c7dfe07948fc0b7112f3442655ec27762d4dcc543b7d3c630 SHA512 450b27248f092e78827d95e7fab3276112b2da4b907339519e5afaaf3ce3902f2a5ac082db187d68fbd1c26874450596d5d2b42df4d6e96bcbf442b56e08f0b4
 EBUILD memcached-1.5.11.ebuild 2932 BLAKE2B 694ee35427d6009183f94e438b3ca51d2cb4bfda1c1bc0e93fa7e18b823c9291440698ffa364fe40fea6621248bfe87c6d789cb943dab9ca634550613e26fb4a SHA512 db18f156d71c8d7f31228669109ee1448ac6df8722b9f11ac02dcdcb0c33d4b367d1540c4cc5b3d1f036118c482a6e61a8672b3cde0c27c6f091a94d8a864475
 EBUILD memcached-1.5.12.ebuild 2923 BLAKE2B db692987cbde108325f1a634338339a33cc05994a3dbc9d5ee30a096b5fac6bf91779874257a217b95ae6266a29c6c821798deb20821f42be92b71c6945dfc04 SHA512 f32c20794b3385d881abdcd109c1569d725af77e4d08ce384e1ff10c55ca330f9fb200a5c9a8f1353f36d650633a8e110a1af3ddc54d7c6a446ab181caacef29
 EBUILD memcached-1.5.13.ebuild 2921 BLAKE2B 2b1c3a401a1709575ed32394830c0e8c155962ed8762d5645983437aaf55eb97ecc04c29dc8bb4d85601a019034e7187ad8cfc0ffe50531c9303969e4f103d62 SHA512 d2aa1b965e03d0242265b151dd29c0fd1dab9858c650eace0a1a931a24b6ecb5e5adda22993d738eb8bf06c62a8db3ca6f2e002aa0378f5847ecd4010e756129
-EBUILD memcached-1.5.14.ebuild 2919 BLAKE2B b1b560721a021cb44bf6d5fe0fbe299a2c14c4309b925ba066f76d1c5abcd2e256ff815b285c6f6befc47708b7c6977f747f9ee0e82c21441304f7736be34a56 SHA512 d6d65f3eeaa12b4d336e688f69ebfd3723b995eb85d72092af0100aaf3ad3a7be9b305c33051dd3116056d447b829f0d69be00d7e77f54059c3ee935932646eb
+EBUILD memcached-1.5.14.ebuild 2914 BLAKE2B 340b10974394fb77b2b4c04c0864675374c466ea93b853d4e5f042a0de7759f9d4fb09f2e4a73120716b58e8d7887ba4322cc38d533ae0783e1e486ec1abce29 SHA512 2b63ffb131a7a499610cb4b51f83478284f5c20b468147a3b23158b7380b52f86bdd007269d76e75936aec901652dc206ebab508435e814f2ae32034b61df663
+EBUILD memcached-1.5.16.ebuild 2922 BLAKE2B e2dd55a2876f4ae53465b2df1aedac099e496227b4ae56c00a9c081a8069d2e6ad4d489b8414865a431101db52dd32f50a65e2245122e3a484d3b3afc2800a1d SHA512 45cff587c952d530c1c986789ef6b54f5cd177b238e2941f8ea604412374b9fbdc09b4fb0a676914f6d54edfbde3a463d2fa94a45a70876a20ba89166e4af251
 EBUILD memcached-1.5.2.ebuild 2882 BLAKE2B e92dbd6cde47898797b2225a09a560651dbb3a9fb9cf603d2b5aadecf25472a02ac33771369855deca687e80fd38c53a263f4affeb92ffb60719d5a64f381deb SHA512 187509aef05b0c47ca2f8ef26bcf9ec813d5fd2a859482a2ce95907b1dba05d4c7d0091542c9e85cc4605e679600bfe7a2260cc3a3b150d3a5a608729d75251d
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.14.ebuild b/net-misc/memcached/memcached-1.5.14.ebuild
index 4e9b834c2f91..c1fbb16c9220 100644
--- a/net-misc/memcached/memcached-1.5.14.ebuild
+++ b/net-misc/memcached/memcached-1.5.14.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 ~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.16.ebuild b/net-misc/memcached/memcached-1.5.16.ebuild
new file mode 100644
index 000000000000..8d046a22030e
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.16.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+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"
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 09f53fba7414..97673984bf12 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,6 +1,6 @@
 DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 BLAKE2B a25371cc1b7d0ee912aaa694943e9faa87f9c3df1c85186af1ab0d328bfa3138ce82381e1c91c732ae4b4d9d9b394058a1666af3b8547da675948aa556176a26 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf
 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895
-DIST mico-9999-gentoo-patches-20170529.tar.xz 16716 BLAKE2B 61aac1cc26031ca2c515a325ffc9dd28871e5a2e42e0d1367ccc619f04a6598d32241afc69e1c89f562bdd0e9ed5f0b217c611e3eeb7b0556fe20234bc20e98a SHA512 33361ab7a40fe897a48bf69fb33ffc3afa3da224a1589cfd7c4660deb00dcb9dd76dd2bc84ed968db6dd8a9e22aa493bb4b78713606675b6021f081eb56deb10
-EBUILD mico-2.3.13-r11.ebuild 4198 BLAKE2B f7f0db6a8bd9c0cacbb264cc6b6c2298a879f096df2e61c9e2a32d6e02c2f4e753143d1ddcdede5ca09581ab02b8c693c0aea9f9b611d95dc8167cceed43e55a SHA512 2beafa375e6610bcd29de467df8d260ab6fd3a7e311b6cd5befea2b4ef0b68a544a54b7c3a253ff4cda83c8be65ca4b914cf42fa554a1423bded1e9bae4a6893
-EBUILD mico-9999.ebuild 4049 BLAKE2B 544326abf0641c757406097b748555b1441d565b754174db3626e3701b455b4cbbe9742a6189fd8d44b27bf409878382021f5a352461abb1af3360c534d48f91 SHA512 e3b302f3a44a96075e52ac7dcff3ff9ee2be4aaf44488c38c268f5e9300e6f0c05c287f1dd51d716a3138e0cfbc8cc310866d13dfe5f2ab3248d69611ff47df6
+DIST mico-9999-gentoo.patch 66675 BLAKE2B c403d2e6fe3b3e9a77f7a4d73b6152b73ff3eea76e35e16f705ce8da5935fdc4a0fd4b1136437cac5a0fb0b81f00f0461cba0d45e9cbf0d88f3ffc5faf1e7967 SHA512 2d709b90cc8c8873eca8df94acbb24cf484305dbadc8d913dc58912349677ded633e92faac4944076547cb064329d7a3dfc79a43ce9ff15b238d989f2bdd4a6d
+EBUILD mico-2.3.13-r12.ebuild 4199 BLAKE2B 0baa83f3f5fb24fff5ff7c5778751aad2dedf78a107d06bd93a545823cf72f6f66e73e5eec8100f503550902f3e7e119d0faa1fc0ae1e5ee968c4aa334fd4a80 SHA512 2563faf67faadd1b382b766131ac003b1862d132628ceeab9872abe3f7450569c7a8ef6e0aca73ee961534478f418672da1f7ef61d9e4e24f45355d98b1e9870
+EBUILD mico-9999.ebuild 4131 BLAKE2B f4a40e64ee6499b8d5520f2634f72b00410a33853f93bf003bcb79ec0178bd18148a6c3a66924a7a3b5111d18784d8de5a2bf93729b75001e4b9efceb36a5961 SHA512 05c1e23b787a5c31714fe9bc2ba4a28617c8febf554a5c9bf697de5f3fdda8f277fb2ba178d7cbf223def4e232c9c5d73b6a915cb559e6358588464af9b02906
 MISC metadata.xml 631 BLAKE2B bb0a1ee82b5b74160096ad9652a933f25c51f192ff30b3ae18d477aacff13a1021aa959e238b9103957ddff622b40f4ec8269b35b114d2325e3f75f90891c580 SHA512 111d8d30478b2647475b075f3c16f49b14be2bbde9e55b0b9efde42c0eaa8da128dd6801a914a898a8500d705d034d50ad05f7b41da5ec644f3c1bad12f21840
diff --git a/net-misc/mico/mico-2.3.13-r11.ebuild b/net-misc/mico/mico-2.3.13-r11.ebuild
deleted file mode 100644
index dea317a207b0..000000000000
--- a/net-misc/mico/mico-2.3.13-r11.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs autotools
-
-PATCH_VER=20170529
-
-if [[ ${PV} == 9999 ]]; then
-	EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
-	inherit darcs
-	SRC_URI=
-else
-	SRC_URI="http://www.mico.org/${P}.tar.gz"
-fi
-
-if [[ -n ${PATCH_VER} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
-	PATCHES=${WORKDIR}/patches
-else
-	PATCHES=
-fi
-
-DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
-HOMEPAGE="http://www.mico.org/"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-IUSE="gtk postgres ssl tcl threads X"
-RESTRICT="test" #298101
-
-# doesn't compile:
-#   bluetooth? ( net-wireless/bluez )
-
-RDEPEND="
-	gtk?       ( x11-libs/gtk+:2 )
-	postgres?  ( dev-db/postgresql:* )
-	ssl?       ( dev-libs/openssl:* )
-	tcl?       ( dev-lang/tcl:0 )
-	X?         ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/flex-2.5.2
-	>=sys-devel/bison-1.22
-"
-
-if [[ ${PV} == 9999 ]]; then
-	src_unpack() {
-		darcs_src_unpack
-		default
-	}
-else
-	S=${WORKDIR}/${PN}
-fi
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# cannot use big TOC (AIX only), gdb doesn't like it.
-	# This assumes that the compiler (or -wrapper) uses
-	# gcc flag '-mminimal-toc' for compilation.
-	sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	if use gtk && [[ -n ${PATCH_VER} ]]; then
-		# need gtk-1 wrapper for gtk-2
-		export PATH="${WORKDIR}"/helpers:${PATH}
-	fi
-
-	# Don't know which version of JavaCUP would suffice, but there is no
-	# configure argument to disable checking for JavaCUP.
-	# So we override the configure check to not find 'javac'.
-	export ac_cv_path_JAVAC=no
-
-	# '--without-ssl' just does not add another search path - the only way
-	# to disable openssl utilization seems to override the configure check.
-	use ssl || export ac_cv_lib_ssl_open=no
-
-	local myconf=
-	myconf() {
-		myconf="${myconf} $*"
-	}
-
-	myconf --disable-mini-stl
-	myconf $(use_enable threads)
-
-	# '--without-*' or '--with-*=no' does not disable some features,
-	# the value needs to be empty instead.
-	# This applies to: gtk, pgsql, qt, tcl, bluetooth.
-	myconf --with-gtk=$(  use gtk      && echo "${EPREFIX}"/usr)
-	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
-	myconf --with-tcl=$(  use tcl      && echo "${EPREFIX}"/usr)
-	# bluetooth and wireless both don't compile cleanly
-	myconf --with-bluetooth=''
-	myconf --disable-wireless
-	# But --without-x works.
-	myconf $(use_with X x "${EPREFIX}"/usr)
-
-	# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
-	[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
-
-	if [[ ${CHOST} == *-winnt* ]]; then
-		# disabling static libs, since ar on interix takes nearly
-		# one hour per library, thanks to mico's monster objects.
-		use threads &&
-		ewarn "disabling USE='threads', does not work on ${CHOST}"
-		myconf --disable-threads --disable-static --enable-final
-		append-flags -D__STDC__
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=:
-	if [[ $(get_libdir) != lib ]]; then #500744
-		mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die
-	fi
-
-	# avoid conflict with net-dns/nsd, bug#544488
-	mv "${ED}"usr/bin/{,mico-}nsd || die
-	mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die
-
-	# avoid conflict with net-misc/eventd, bug#632170
-	mv "${ED}"usr/bin/{,mico-}eventd || die
-
-	dodir /usr/share
-	mv "${ED}"usr/man "${ED}"usr/share || die
-	dodir /usr/share/doc/${PF}
-	mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
-
-	dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO
-}
-
-pkg_postinst() {
-	einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'"
-	einfo "due to a name conflict with net-dns/nsd. For details"
-	einfo "please refer to https://bugs.gentoo.org/544488."
-	einfo
-	einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'"
-	einfo "due to a name conflict with net-misc/eventd. For details"
-	einfo "please refer to https://bugs.gentoo.org/632170."
-}
diff --git a/net-misc/mico/mico-2.3.13-r12.ebuild b/net-misc/mico/mico-2.3.13-r12.ebuild
new file mode 100644
index 000000000000..97281d44bfd2
--- /dev/null
+++ b/net-misc/mico/mico-2.3.13-r12.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs autotools
+
+PATCH_VER=20170529
+
+if [[ ${PV} == 9999 ]]; then
+	EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
+	inherit darcs
+	SRC_URI=
+else
+	SRC_URI="http://www.mico.org/${P}.tar.gz"
+fi
+
+if [[ -n ${PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
+	PATCHES=${WORKDIR}/patches
+else
+	PATCHES=
+fi
+
+DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
+HOMEPAGE="http://www.mico.org/"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
+IUSE="gtk postgres ssl tcl threads X"
+RESTRICT="test" #298101
+
+# doesn't compile:
+#   bluetooth? ( net-wireless/bluez )
+
+RDEPEND="
+	gtk?       ( x11-libs/gtk+:2 )
+	postgres?  ( dev-db/postgresql:* )
+	ssl?       ( dev-libs/openssl:0= )
+	tcl?       ( dev-lang/tcl:0 )
+	X?         ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.2
+	>=sys-devel/bison-1.22
+"
+
+if [[ ${PV} == 9999 ]]; then
+	src_unpack() {
+		darcs_src_unpack
+		default
+	}
+else
+	S=${WORKDIR}/${PN}
+fi
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# cannot use big TOC (AIX only), gdb doesn't like it.
+	# This assumes that the compiler (or -wrapper) uses
+	# gcc flag '-mminimal-toc' for compilation.
+	sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	if use gtk && [[ -n ${PATCH_VER} ]]; then
+		# need gtk-1 wrapper for gtk-2
+		export PATH="${WORKDIR}"/helpers:${PATH}
+	fi
+
+	# Don't know which version of JavaCUP would suffice, but there is no
+	# configure argument to disable checking for JavaCUP.
+	# So we override the configure check to not find 'javac'.
+	export ac_cv_path_JAVAC=no
+
+	# '--without-ssl' just does not add another search path - the only way
+	# to disable openssl utilization seems to override the configure check.
+	use ssl || export ac_cv_lib_ssl_open=no
+
+	local myconf=
+	myconf() {
+		myconf="${myconf} $*"
+	}
+
+	myconf --disable-mini-stl
+	myconf $(use_enable threads)
+
+	# '--without-*' or '--with-*=no' does not disable some features,
+	# the value needs to be empty instead.
+	# This applies to: gtk, pgsql, qt, tcl, bluetooth.
+	myconf --with-gtk=$(  use gtk      && echo "${EPREFIX}"/usr)
+	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
+	myconf --with-tcl=$(  use tcl      && echo "${EPREFIX}"/usr)
+	# bluetooth and wireless both don't compile cleanly
+	myconf --with-bluetooth=''
+	myconf --disable-wireless
+	# But --without-x works.
+	myconf $(use_with X x "${EPREFIX}"/usr)
+
+	# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
+	[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
+
+	if [[ ${CHOST} == *-winnt* ]]; then
+		# disabling static libs, since ar on interix takes nearly
+		# one hour per library, thanks to mico's monster objects.
+		use threads &&
+		ewarn "disabling USE='threads', does not work on ${CHOST}"
+		myconf --disable-threads --disable-static --enable-final
+		append-flags -D__STDC__
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=:
+	if [[ $(get_libdir) != lib ]]; then #500744
+		mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die
+	fi
+
+	# avoid conflict with net-dns/nsd, bug#544488
+	mv "${ED}"usr/bin/{,mico-}nsd || die
+	mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die
+
+	# avoid conflict with net-misc/eventd, bug#632170
+	mv "${ED}"usr/bin/{,mico-}eventd || die
+
+	dodir /usr/share
+	mv "${ED}"usr/man "${ED}"usr/share || die
+	dodir /usr/share/doc/${PF}
+	mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
+
+	dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO
+}
+
+pkg_postinst() {
+	einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'"
+	einfo "due to a name conflict with net-dns/nsd. For details"
+	einfo "please refer to https://bugs.gentoo.org/544488."
+	einfo
+	einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'"
+	einfo "due to a name conflict with net-misc/eventd. For details"
+	einfo "please refer to https://bugs.gentoo.org/632170."
+}
diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 596262c42dff..ba56c4b4614b 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -1,25 +1,22 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit flag-o-matic toolchain-funcs autotools
 
-PATCH_VER=20170529
-
 if [[ ${PV} == 9999 ]]; then
 	EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository"
 	inherit darcs
-	SRC_URI=
-else
-	SRC_URI="http://www.mico.org/${P}.tar.gz"
-fi
-
-if [[ -n ${PATCH_VER} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
-	PATCHES=${WORKDIR}/patches
+	SRC_URI="https://github.com/haubi/mico/compare/gentoo.patch -> ${P}-gentoo.patch"
+	PATCHES="${DISTDIR}/${P}-gentoo.patch"
 else
-	PATCHES=
+	PATCH_VER=20170529
+	SRC_URI="
+		http://www.mico.org/${P}.tar.gz
+		https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz
+	"
+	PATCHES="${WORKDIR}/patches"
 fi
 
 DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
@@ -36,11 +33,12 @@ RESTRICT="test" #298101
 RDEPEND="
 	gtk?       ( x11-libs/gtk+:2 )
 	postgres?  ( dev-db/postgresql:* )
-	ssl?       ( dev-libs/openssl:* )
+	ssl?       ( dev-libs/openssl:0= )
 	tcl?       ( dev-lang/tcl:0 )
 	X?         ( x11-libs/libXt )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-devel/flex-2.5.2
 	>=sys-devel/bison-1.22
 "
@@ -115,22 +113,22 @@ src_configure() {
 }
 
 src_install() {
-	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=:
+	emake INSTDIR="${ED}"/usr SHARED_INSTDIR="${ED}"/usr install LDCONFIG=:
 	if [[ $(get_libdir) != lib ]]; then #500744
-		mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die
+		mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
 	fi
 
 	# avoid conflict with net-dns/nsd, bug#544488
-	mv "${ED}"usr/bin/{,mico-}nsd || die
-	mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die
+	mv "${ED}"/usr/bin/{,mico-}nsd || die
+	mv "${ED}"/usr/man/man8/{,mico-}nsd.8 || die
 
 	# avoid conflict with net-misc/eventd, bug#632170
-	mv "${ED}"usr/bin/{,mico-}eventd || die
+	mv "${ED}"/usr/bin/{,mico-}eventd || die
 
 	dodir /usr/share
-	mv "${ED}"usr/man "${ED}"usr/share || die
+	mv "${ED}"/usr/man "${ED}"/usr/share || die
 	dodir /usr/share/doc/${PF}
-	mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
 
 	dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO
 }
diff --git a/net-misc/mindterm/Manifest b/net-misc/mindterm/Manifest
index d7acc7eddae4..cc857ecc3085 100644
--- a/net-misc/mindterm/Manifest
+++ b/net-misc/mindterm/Manifest
@@ -1,3 +1,3 @@
 DIST mindterm_3.4-src.zip 1224973 BLAKE2B fb42de3cf163cff2ee4b4912a519e16eac92f011be25c63186d06ead0b442309eb0b6d59a9806c9c7b0485114aaf02f368ee82acbbdccc17b7749a530d6e24aa SHA512 6c274aea32622517f07010d496f97010a0a7e17fd769a85e928ea0794b20daddb785a5cf4fc954dd2f6e863bc3f90422714392f995d040f4cf3f1230fb14cb07
-EBUILD mindterm-3.4.ebuild 1278 BLAKE2B 20a9f963ded5fb2522f5f20c048cf0f6afa2812abbb81368a2c98a0a8c324f924c87c55df07cf91e5112f7cf643f11d4dcfcdb76ff149cf4555ce8b78c4ad25a SHA512 416d440569afa2ee74f9914924c0788e440ea892c718bde6c6e0262f0656fea31977307ca92ad23c80f452b0f9194140bfc04ab15667835a322cfe0704d21c02
+EBUILD mindterm-3.4.ebuild 1294 BLAKE2B 0afa23092a625a02ff22b68d34870a066c73006d49d7a4c4e8fe914480bdeaced98e719841772f4a239c8b4f21bbe8d3187d21cc707a5571b3716b2b1859cc0e SHA512 2bb7eb5348490ec012e5812216e06948d1176f148ca5f99d7552692731dc740aab6a8d0362a1f2d07e999f6f3d27a1715c219b19ee70614d0654eb72706e4183
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/net-misc/mindterm/mindterm-3.4.ebuild b/net-misc/mindterm/mindterm-3.4.ebuild
index d19408b6b94d..c91cec036d8a 100644
--- a/net-misc/mindterm/mindterm-3.4.ebuild
+++ b/net-misc/mindterm/mindterm-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -15,6 +15,9 @@ LICENSE="mindterm"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
+# Don't even compile
+RESTRICT="test mirror bindist"
+
 COMMON_DEP="dev-java/jzlib:0"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
@@ -36,8 +39,6 @@ src_prepare() {
 	rm -vr com/jcraft || die "Failed to remove bundled jcraft"
 }
 
-# Don't even compile
-RESTRICT="test"
 src_test() {
 	ANT_TASKS="ant-junit" eant test \
 		-Dgentoo.classpath="$(java-pkg_getjars jzlib,junit):mindterm.jar"
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 7a1414d53e91..7f4087d664a8 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,7 +1,5 @@
 AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
-DIST miniupnpd-2.1.20190408.tar.gz 235989 BLAKE2B cdfb4fe23a136d9a3e0cc91c174fc4f0ee0a3e136305a2ea6d21c358287f67d34009b37ba8870bef86e53d056e441b45e19a89939e72485051245b5d40b384ff SHA512 f812660c1f626f1fdbcaabd6636125cc18f1306bb4a3a29dae45c06017c97c681e3e056d602fe5444962ecc1aec4d39d9c203621bb11a3aa1f57cda6dc4f19de
 DIST miniupnpd-2.1.20190502.tar.gz 236052 BLAKE2B 9f2f81769d72fad2191969e0e80b4d2e70619d5674fe6b4ef9f4306e09ac4737577a2146bc04ec9960df092252abe3c9a57e32d5d893a763b85863d1c4892045 SHA512 6423cef89b5af62b6b6a120a3cd13a0e7755d609b33de8f1671f7f9160fb1b5e68b0ebd3f8b7b5758cf05a1c58b416cde253e37bc5ba0bb423c14b5fb44599f1
-EBUILD miniupnpd-2.1.20190408.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
 EBUILD miniupnpd-2.1.20190502.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
 MISC metadata.xml 923 BLAKE2B e7b26fae1c4f3f67ae6a3a7da57607cdca2c2999174c35ddf9db972d4871eacac116a4c0f068e4be467c9670294de7ec797a64b06106a54f986336bb111b0c38 SHA512 8e6c396f3601ccbba09e16cd48b0432616d692700b4b402484d4c592101f71a4434772efe63a4e9a2887d00e39eda9865173d74930aa6f792c61eb24b847af69
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190408.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190408.ebuild
deleted file mode 100644
index 673b340fb090..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190408.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 7b88c45f8c91..f66e594f5ebc 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,5 +1,5 @@
 DIST mobile-broadband-provider-info-20170310.tar.xz 85016 BLAKE2B a43312e1772fc59205be1bbf7d6f80518ff0edf0719d48e60013c3acada4c05a29043567695896641b32c477ddab2ca6da379e1b7a4436d977ccc68f4e247f09 SHA512 24d8d8bb202f0893bea105420d38156ff8de311eac71e969524961e723ed3d1f9994ec98efbace62dc0ac3859c7a4b316a0728038539b82ca5cf8f8c460a6c6e
 DIST mobile-broadband-provider-info-20190116.tar.xz 85904 BLAKE2B e41ca1914c8b9c47f52f5b65cbfef577814269a23c5777fb1caf582cfc1c0c9a5125f51907748de8516b8aa3a8cf3fb044c8521d305161b206cc75f06e791764 SHA512 82cbf2c4523bc941d7cbfb1f552057d8259fcccbf95d02a6d43d315136050928ae5a8cf85f9900196214b803bb087446e28254d148af6b004225518f07aa9d23
 EBUILD mobile-broadband-provider-info-20170310.ebuild 462 BLAKE2B fe682e0d76f4fd4a394388b40036b5a9923d0a4fc664218424f50ea0a619e1464789d1f013a87bc63d97528b9f21e803af771af7217c714e88f5e4c2e142226b SHA512 ecec2bcf1de8a1fe7a1cde63cb3905555c6611ce55ef3a78f4c2d2e62a8761dcd9599cf486567859b2eb3b46fa095597df9d42055361dedd362fce9ac16f1da4
-EBUILD mobile-broadband-provider-info-20190116.ebuild 465 BLAKE2B 51f75f3443ca040d66b25e4fdd7d351579c7b6060209a1b1ec3f792d336eed9f36ba31aadf1a5b517eb55869b48ce0c5a10dbba31065671705ed03ff0c5ca7f5 SHA512 7749fcc87b835c869af21544c88c856a125bf1ca0bb85b4de8d661bb0d2d0080c6e291fdc52622350c3724739e55b2516dab8b633e8651d51def3477c96d606c
+EBUILD mobile-broadband-provider-info-20190116.ebuild 464 BLAKE2B f0024990e4b24b6e3b3c72219e24181c107280c80bf3ba256c936dbec6ccd7a6cc94b4f5190f8c9435a580841a18f58fba6535140546410cc04601bd04aa0c62 SHA512 5019a223f8e15a7293d3409dcd30b9e5640a9bd6f35b3b5b84c4874e0aa21b2f7f00327d5b3f1d0e24980f5f1f09b74b08aa0121f289c0f9a2ec9cfc420a6f5f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild
index 74abce56f964..90317e80ab72 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 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="test"
 
 DEPEND="
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 75892fdc0739..976e5b78a4cc 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,5 +5,5 @@ AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11
 DIST NetworkManager-1.14.6.tar.xz 4426540 BLAKE2B 29709005f4143bb4a9ef2348c2da062ea741111bdd54400f199e057317dff12fe9b0d3ab7795b21e93217076a0b338a18d99c7d2c2514d138aaf5bf41aa71c5a SHA512 e5e11eed6366eb185691102c89732a458f3a01aa979e724f7415d237e0ba1a811ac78bb17d9cf1b11181ec6e3f82cb5f1c86b624d3c2b2c7c1b72549653309c9
 DIST NetworkManager-1.16.0.tar.xz 4793620 BLAKE2B 554559eefbfa489cf01067bd2c32e4b06fed076d38920b41f2d0005873ff913c0af2babcc3d9b463a4b636ca82e5c27ee20ab5768fcfb2c6b79e003d7fdc224d SHA512 e9d8365d8e59e5bc7c0bc13482139fb96b1d87183c8884e71e84eaf05fe121f2bcac519edd916bd242be4e9a9e2d2140a1065f529a9a02bda87b6d2bd4192584
 EBUILD networkmanager-1.14.6.ebuild 10961 BLAKE2B ba38ca50957abd14cb4b965e72a1a249267d5ded23cc7d766f1cc2ff2bda6ff5583fb66124eddbd45c3f62eca650c6094d7a637196b0c4acf392e576445595f0 SHA512 6dbba3c0a1fa478b5f3599b97101eee08c7d347409235ce49b72d6cf857da064ceee394afd8820e59237f788b2442ab4e7f5bb411b659dbdb495fba190e567ef
-EBUILD networkmanager-1.16.0.ebuild 11117 BLAKE2B 384576bd739fd63f9c7ec834d858115b79605049a49dc182d59b155f058c79a50797993fcdf846ab191e3d611cdc2363eee8dc1d5a3208977240b689a89d80be SHA512 f7df02ffea404047363ff706e4b412d3af7851758d870115a8e09c9520677e6453c5d1e10fa120204fd99cd890de23d01797c6804d7096706654db797f053fe7
+EBUILD networkmanager-1.16.0.ebuild 11116 BLAKE2B 6efd07abfefffa1e3ebc8b559ae37b6b422c809677cbdb970ce0a7ee2e4d36f3d0bfb63c6480424e18fd307c51e683932c51f1ef87be44fdcd7e5ca1431bdffe SHA512 289846ad13e61b095781886cedba698261070cd2091ccd0d6fc5b18d640cc49b6c4772adbd88e82b5fab9a35ee4913006f77094e13279e17433f8337ae13ebbd
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.16.0.ebuild b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
index bc78cf88dcb4..651553fe4dbb 100644
--- a/net-misc/networkmanager/networkmanager-1.16.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 852edb32f78c..adc4f5b4aa4c 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -2,12 +2,7 @@ AUX ntp.conf 727 BLAKE2B 1b37cee807c41593ffc44994e390c98406c49154477bc2a603ba403
 AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542
 AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31
 AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b4544f1df565828da2b685ce408061bc03f9a7991fbd61a9b42577c4e6db06bd2a4a012949cafe2dc SHA512 b625e993bbeba5da9c0f14ec8ff9d256575d9590a6c506436e834a9dc17877bfd57920b008bd01409d47de71acfb221a0d92c0203e2aacca33083e196466faf9
-AUX ntpsec-1.0.0-fix-seccomp.patch 587 BLAKE2B c937a12ed548a4d825964c66e37faebb35b3b8ca2bb6dda6a75a84cfcce04777a0e9ff48a6f3bbd82dfc9fd47977aba749dd93200e81280cea5475bc04c933f3 SHA512 12eaa510d6dac6b6e2fe764d6ec8cc8582031be25e5e6785a4813d4c150ecb36574b64f1fa8c2a7d6cf6a49423642fe875774b8d6e894f31f8605e5716313107
-DIST ntpsec-1.0.0.tar.gz 2405862 BLAKE2B b1631491500cafa5d41761fe6cb2db523450ed7801d06678048d6b8878d93dbd1e9d7cb2081a8400421213cf78a6724220236149a7f719896d1e8e48f5337d85 SHA512 9fb06310508b30d2ae2d66212d7d87b00e8eea294cebc27eb70435d764bd639fcec234b66e78deafb700476c88e47afe2d1b463563008c32efbb0644dd611f43
-DIST ntpsec-1.1.1.tar.gz 2451415 BLAKE2B 516c87f0710ecacfde27f801a5fc4a492e7871eb35cc3afb8a107e0c381cd9787a4af2d0b01e2cf5d4f43043afe042321e5bbd2299578723e870b2fa502646d2 SHA512 838ed81c94e14a3d8588670ce63a1c4f6216d2f79be5149ad6a845cec00bdf6d7fe77310ce9c33c4675d3db54e59c3d9d02ae4351913ffbd9a3883716c443f83
-DIST ntpsec-1.1.2.tar.gz 2458805 BLAKE2B e9ab493f60179ce94a5995287423c3a0038298b622b0dcffd5a299261a7b42fc8d0d04256726e049c625c0789882f601615eaa7169047e984a274f62e0cf40d2 SHA512 83d2d3bc59202f1e5f3e76eeb6810e575e24c6f392f20c25732a6881a0a0a9f72453b76b294399351ec4baf88bc64da089dc1340aee38576021659f81bcd0e19
-EBUILD ntpsec-1.0.0-r6.ebuild 3979 BLAKE2B b1333fab50369c29a4912e72148f304a89f35fdbec7d61bcd236fd8ad07d791202f676921876ab4650a0ec63b3bae7042f4963eb22da301b6abf02c392cc6ff2 SHA512 4ee90ef0c4f0111cd05baead4fb79cd461e44e42e6915259ebf9d1d9e1c1fa07f79d47dbe4c9ff4c7042959d1c3ae94b9a7d8751376c162f6cb7791719fe6e7c
-EBUILD ntpsec-1.1.1.ebuild 3938 BLAKE2B 9970361b96e50918581964845df8b504c442cf01fa907692c68915a2d126573df054126987ab3d2690c8c7c7fd4b60579050bdb1f7a803986dbb957dda5cd745 SHA512 18929aa55a1ad09103ad4cffa9f06e60a9ef1ba0542729f9af5c3012a64f02557a3b90494fe39a3a9b6140a225794508f0f1de6f38bab0b9d990791708d69526
-EBUILD ntpsec-1.1.2.ebuild 3938 BLAKE2B 9970361b96e50918581964845df8b504c442cf01fa907692c68915a2d126573df054126987ab3d2690c8c7c7fd4b60579050bdb1f7a803986dbb957dda5cd745 SHA512 18929aa55a1ad09103ad4cffa9f06e60a9ef1ba0542729f9af5c3012a64f02557a3b90494fe39a3a9b6140a225794508f0f1de6f38bab0b9d990791708d69526
-EBUILD ntpsec-9999.ebuild 3938 BLAKE2B 9970361b96e50918581964845df8b504c442cf01fa907692c68915a2d126573df054126987ab3d2690c8c7c7fd4b60579050bdb1f7a803986dbb957dda5cd745 SHA512 18929aa55a1ad09103ad4cffa9f06e60a9ef1ba0542729f9af5c3012a64f02557a3b90494fe39a3a9b6140a225794508f0f1de6f38bab0b9d990791708d69526
+DIST ntpsec-1.1.3.tar.gz 2462330 BLAKE2B 903e569ad72939def9df31d7b51b2623b140754de67362213f39e39ad770d903d70c45a10a18e98ae35927792666ae27de40b41a5c0bfe6fd8cfa6a37102d4e8 SHA512 df60c5fa63d4c94529ba1e8b21c7d6b5d0c9fb810ed7546a621b072725a6ff03edbd2dcbc3baf19ac3b3a9b82d7aff3ddee4ab8c93559b7065ed06a211b538c4
+EBUILD ntpsec-1.1.3.ebuild 4068 BLAKE2B a0dc5a6733d392982c0c6a55760974b3ff22b055a220c0841a5e0aa1d1e01291495c115d8751317eaf83e8aad1556cfb48962dec7b5c19d788aee0dc16de51ca SHA512 fc551143326b61f2039e747ccae7d7d82409768d4a447eb51858207aa6c7f3656121e4d7e89a75b94b4b0e5f04bb20cbf19f67a78ea454d4204bbbe25f962f5a
+EBUILD ntpsec-9999.ebuild 4064 BLAKE2B e85f6d74f70f0302d6d93d2dcd1d5769f743d86c85d880113ad25fd483dbbfac97c408efa012e22bd81c94a3bd0a6dcd92a0910a3f39f4ac5a65212544c2482e SHA512 dcd0195ee1c8585d3c88dcb6ce77fb1301cb59b879a5c77e84732d74bf272f5a2b02a2e0661bfe7393f4914c1bd9c917c58cec63c54caf4098151810cf3c299a
 MISC metadata.xml 2008 BLAKE2B e4f1a7e79fbaf5011ba2b26143c138f39663be73664ec9f1270e9b6cbcb553c245201c9a5bd0771435a24e1f342907861e8a2b6808cc2e3f6d6a7a10ad6ed021 SHA512 5c8fc24233d577ebc254a6d92d93734bfb10ef287217ef61f4f6e8b28f059ee7e92bc5e18326d61a9e80fa7504f79c820d831cdad489321a9f45bae0a4d54a16
diff --git a/net-misc/ntpsec/files/ntpsec-1.0.0-fix-seccomp.patch b/net-misc/ntpsec/files/ntpsec-1.0.0-fix-seccomp.patch
deleted file mode 100644
index b9716569f631..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.0.0-fix-seccomp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a backport of https://gitlab.com/NTPsec/ntpsec/commit/eef92d6217da03ad2ae41e298d110bdb05031381
-
-diff -Naur ntpsec-1.0.0.orig/ntpd/ntp_sandbox.c ntpsec-1.0.0/ntpd/ntp_sandbox.c
---- ntpsec-1.0.0.orig/ntpd/ntp_sandbox.c	2017-10-09 23:54:39.000000000 -0400
-+++ ntpsec-1.0.0/ntpd/ntp_sandbox.c	2018-02-28 07:31:28.381406881 -0500
-@@ -354,6 +354,10 @@
- 	SCMP_SYS(write),
-         SCMP_SYS(unlink),
- 
-+#ifdef ENABLE_EARLY_DROPROOT
-+	SCMP_SYS(getdents),
-+#endif
-+
- #ifdef ENABLE_DNS_LOOKUP
- /* Don't comment out this block for testing.
-  * pthread_create blocks signals so it will crash
diff --git a/net-misc/ntpsec/ntpsec-1.0.0-r6.ebuild b/net-misc/ntpsec/ntpsec-1.0.0-r6.ebuild
deleted file mode 100644
index 8a60622902ea..000000000000
--- a/net-misc/ntpsec/ntpsec-1.0.0-r6.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit flag-o-matic python-r1 waf-utils systemd user
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-	BDEPEND=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
-	RESTRICT="mirror"
-	BDEPEND=""
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# net-misc/pps-tools oncore,pps
-CDEPEND="${PYTHON_DEPS}
-	${BDEPEND}
-	sys-libs/libcap
-	dev-python/psutil[${PYTHON_USEDEP}]
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="${CDEPEND}
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
-	!net-misc/ntp
-	!net-misc/openntpd
-"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
-"
-
-WAF_BINARY="${S}/waf"
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-
-	# See https://gitlab.com/NTPsec/ntpsec/issues/460
-	eapply "${FILESDIR}"/${P}-fix-seccomp.patch
-
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript
-
-	local myconf=(
-		--nopyc
-		--nopyo
-		--refclock="${CLOCKSTRING}"
-		$(use doc	&& echo "--enable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use nist	&& echo "--enable-lockclock")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use tests	&& echo "--alltests")
-		$(use_enable debug debug) )
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install
-	}
-	python_foreach_impl run_in_build_dir python_install
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ntpsec/ntpsec-1.1.1.ebuild b/net-misc/ntpsec/ntpsec-1.1.1.ebuild
deleted file mode 100644
index 446753553564..000000000000
--- a/net-misc/ntpsec/ntpsec-1.1.1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit flag-o-matic python-r1 waf-utils systemd user
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-	BDEPEND=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
-	RESTRICT="mirror"
-	BDEPEND=""
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-CDEPEND="${PYTHON_DEPS}
-	${BDEPEND}
-	sys-libs/libcap
-	dev-python/psutil[${PYTHON_USEDEP}]
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="${CDEPEND}
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
-	!net-misc/ntp
-	!net-misc/openntpd
-"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
-"
-
-WAF_BINARY="${S}/waf"
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	local myconf=(
-		--nopyc
-		--nopyo
-		--refclock="${CLOCKSTRING}"
-		$(use doc	&& echo "--enable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use nist	&& echo "--enable-lockclock")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use tests	&& echo "--alltests")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install
-	}
-	python_foreach_impl run_in_build_dir python_install
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ntpsec/ntpsec-1.1.2.ebuild b/net-misc/ntpsec/ntpsec-1.1.2.ebuild
deleted file mode 100644
index 446753553564..000000000000
--- a/net-misc/ntpsec/ntpsec-1.1.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit flag-o-matic python-r1 waf-utils systemd user
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-	BDEPEND=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
-	RESTRICT="mirror"
-	BDEPEND=""
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-CDEPEND="${PYTHON_DEPS}
-	${BDEPEND}
-	sys-libs/libcap
-	dev-python/psutil[${PYTHON_USEDEP}]
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="${CDEPEND}
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
-	!net-misc/ntp
-	!net-misc/openntpd
-"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
-"
-
-WAF_BINARY="${S}/waf"
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	local myconf=(
-		--nopyc
-		--nopyo
-		--refclock="${CLOCKSTRING}"
-		$(use doc	&& echo "--enable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use nist	&& echo "--enable-lockclock")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use tests	&& echo "--alltests")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install
-	}
-	python_foreach_impl run_in_build_dir python_install
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ntpsec/ntpsec-1.1.3.ebuild b/net-misc/ntpsec/ntpsec-1.1.3.ebuild
new file mode 100644
index 000000000000..320a55e35a49
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.1.3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-r1 waf-utils systemd user
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+	BDEPEND=""
+	KEYWORDS="amd64"
+else
+	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
+	RESTRICT="mirror"
+	BDEPEND=""
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea neoclock modem
+	local)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+CDEPEND="${PYTHON_DEPS}
+	${BDEPEND}
+	sys-libs/libcap
+	dev-python/psutil[${PYTHON_USEDEP}]
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="${CDEPEND}
+	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+	!net-misc/ntp
+	!net-misc/openntpd
+"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )
+"
+
+WAF_BINARY="${S}/waf"
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	default
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript
+	python_copy_sources
+}
+
+src_configure() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	local myconf=(
+		--nopyc
+		--nopyo
+		--refclock="${CLOCKSTRING}"
+		$(use doc	&& echo "--enable-doc")
+		$(use early	&& echo "--enable-early-droproot")
+		$(use gdb	&& echo "--enable-debug-gdb")
+		$(use nist	&& echo "--enable-lockclock")
+		$(use samba	&& echo "--enable-mssntp")
+		$(use seccomp	&& echo "--enable-seccomp")
+		$(use smear	&& echo "--enable-leap-smear")
+		$(use tests	&& echo "--alltests")
+		$(use debug	&& echo "--enable-debug")
+	)
+
+	python_configure() {
+		waf-utils_src_configure "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	unset MAKEOPTS
+	python_compile() {
+		waf-utils_src_compile
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+src_install() {
+	python_install() {
+		waf-utils_src_install
+	}
+	python_foreach_impl run_in_build_dir python_install
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
+	newconfd "${FILESDIR}"/ntpd.confd ntp
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+
+	# Prepare a directory for the ntp.drift file
+	mkdir -pv "${ED}"/var/lib/ntp
+	chown ntp:ntp "${ED}"/var/lib/ntp
+	chmod 770 "${ED}"/var/lib/ntp
+	keepdir /var/lib/ntp
+
+	# Install a log rotate script
+	mkdir -pv "${ED}"/etc/logrotate.d
+	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+	# Install the configuration file and sample configuration
+	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+	# move doc files to /usr/share/doc/"${P}"
+	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+pkg_postinst() {
+	einfo "If you want to serve time on your local network, then"
+	einfo "you should disable all the ref_clocks unless you have"
+	einfo "one and can get stable time from it.  Feel free to try"
+	einfo "it but PPS probably won't work unless you have a UART"
+	einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 446753553564..b227382f452e 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -143,6 +143,9 @@ src_install() {
 	# Install the configuration file and sample configuration
 	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
 	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+	# move doc files to /usr/share/doc/"${P}"
+	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
 }
 
 pkg_postinst() {
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index bab34ef0d8c2..86c3ae735558 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -15,9 +15,13 @@ AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
 DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e2063333a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 SHA512 f118c1c4ab4e126c3343023b03007ca9819c3c5a5ea42eaffaabdc7c50ecddede3e258574dbe0de95ed3be2e3d101612f5bdb423a7adb679987f4e501183a216
 DIST openvswitch-2.10.1.tar.gz 7522058 BLAKE2B 0f4eef6bf376cc23de4061c04787663f31458d98ac9ffb76627d5a7bb9422ee5f1d99e5c6024ad078c1b6128fb1b9ac99ea9e7107803fd2fdf6cb09bff6b0ef3 SHA512 3634bd3e978110cb9e11191a88e4232a7af152a6ddf46e8a32e50e07de866be782b7e753d26b81183ec107816e5af4109badf8f2067a61fd9506ccf81e748e44
+DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d3af79cce53436d75e0c3d8a38ce408a142f99b936a66c8bf0f3b317970ad8c1ef84bacc2e573e9b8c21b70aab1de485 SHA512 fd64ae814d85d3002d655a330268cfd6be79db6f954c132d3bfafc7dac23533918b642d0ed454e760f5820804bdff64f73ee8c36afc25a6810ef4c7aab748ba1
+DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564fdc890035ce3984e1754b9dd916e0b78bea133331b5f4bc3a85d8b8a902ab210703feb0b7cce279803f642f9ee9f87bf SHA512 de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789
 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7
 EBUILD openvswitch-2.10.0-r1.ebuild 4699 BLAKE2B c9de21a5bba881e69a2741419ea0435fe74e8080407bbd31b0dbddc80c406c3329d925f7dfb641896982adcbd6140f32fb097386f46b82e5afc0838ac9b62a59 SHA512 12e6e28f65c7d69acfe7d881c1c1ca38d506e50d28428f15606f776649cc7c2e32dccdceeecd46e13c6af8f85f0797cf929915c4a8c8050e9e59e8def729fe66
 EBUILD openvswitch-2.10.1-r1.ebuild 4461 BLAKE2B 9d229b86adf3261b3761f0c92e3a41839dbaec4fdf6c35939fcb5915b0232c87dd2a25bc78b04b37729a2a9d3adfae7195a6666d5b043d77f418f31af76add62 SHA512 c660b92275b577385952c24f817fdb8dfe110158f49dd2cd62506a8252cc5181f0f43c76236287a7c8f53601e33fe5d3d5eb0e46f95fc0ee7d00f7a92d598a75
 EBUILD openvswitch-2.10.1.ebuild 4263 BLAKE2B a6e844947f481d7beaf79172d90f09f52770514d5e203b10548783efccfcc791465a75a4d4796889f8f0ba53f74a6beb21a9d8478dc7f4ec25f2ec6e8a5ae09d SHA512 3cbc185a839a30d48262552b7d2ab8604353a3c2c12fdf42b3f558c1521d58dadb2e465494a0babd03fe0a7c435215916c30df996842e5ac15e63d0188d50270
+EBUILD openvswitch-2.10.2.ebuild 4461 BLAKE2B ce73d782dcd586facd60189ec0b6c459b96fff110e56dee1f447fb608534d5410bcfae158d8c6d2f87fd7f279e586207ee594763cd462f6902253b61c7759060 SHA512 befd11f9f14266ca500ae649a61357eedbba502dec865102fccfa05be2989675345d0da771024822150d967ba0ff64ef5dd7e4b4017a4c8831b459c680336f39
+EBUILD openvswitch-2.11.1.ebuild 4461 BLAKE2B f4dfa13c33ee0a14d81fb42e7f780d6609a244fc2886b5cf5639f60694d7b96392474d603e546f1681fb04671331006669beb2a292a921cb14e0c86b8c5b4ded SHA512 bae4fec83d12bf3c6d9d04bf9e8ed0e6b06646ba068eb1f7ed6c8fa3cb6d106990de499aeb8790f282f2be775bf1fee6e832be2cea0a0c71dc3892d5b9e0d98b
 EBUILD openvswitch-2.8.1.ebuild 4446 BLAKE2B 68da5d17271fe0c59d7a6820836c56f39a35d7c151a84108f594eaaef3edf7838d80d3dd6c7d521cea09d692cfb89c00ad9eb2d58045167a21b22cacfac54724 SHA512 21edf1a60d31999eff602af6ec6fc8141a55c266d2076f8dc2a4aacb632dad0ea47375834048084642989b02a0f2f1dbce4ab4baef7e4afc37844f88528e1cd9
 MISC metadata.xml 538 BLAKE2B c5bb1d88b9923e4df32eebb70ddbe96fc7ba60ac17e2a84515a69ab9c3f90b73dc429797a23d1a13ebec9ae4def24a04b4cb0e8685159a7ec01fb905c2ab0cca SHA512 79f8fecddfb657298b4c261eb8c6d502cf5e320764acdc92fb97ac6f67379ec10faf553e8a3a0a37d4d650b52c0fa827e485655dbaa126f97d19fbf7b8fbeffd
diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild
new file mode 100644
index 000000000000..9fa8277073f0
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.10.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit autotools eutils linux-info linux-mod python-r1 systemd
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="https://www.openvswitch.org"
+SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	${PYTHON_DEPS}
+	~dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
+	|| (
+		dev-python/twisted[conch,${PYTHON_USEDEP}]
+		dev-python/twisted-web[${PYTHON_USEDEP}]
+	)
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	sys-apps/util-linux[caps]
+	virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		# docs state 4.17.x code states 4.15.x
+		kernel_is le 4 17 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	set_arch_to_kernel
+	# monitor is statically enabled for bug 596206
+	# use monitor || export ovs_cv_python="no"
+	# pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	# flake8 is primarily a style guide tool, running it as part of the tests
+	# in Gentoo does not make much sense, only breaks them: bug 607280
+	export ovs_cv_flake8="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	if use monitor; then
+		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+			python_foreach_impl python_doscript utilities/"${SCRIPT}"
+		done
+		rm -r "${ED%/}"/usr/share/openvswitch/python || die
+	fi
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED%/}"/var/run || die
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
+	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
+	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	# only needed on non-systemd, but helps anyway
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/openvswitch/openvswitch-2.11.1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1.ebuild
new file mode 100644
index 000000000000..a36bb2cdaa1c
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.11.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit autotools eutils linux-info linux-mod python-r1 systemd
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="https://www.openvswitch.org"
+SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	${PYTHON_DEPS}
+	~dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
+	|| (
+		dev-python/twisted[conch,${PYTHON_USEDEP}]
+		dev-python/twisted-web[${PYTHON_USEDEP}]
+	)
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	sys-apps/util-linux[caps]
+	virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		# docs state 4.17.x code states 4.15.x
+		kernel_is le 4 18 999 || die "Linux >= 3.10.0 and <= 4.18 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	set_arch_to_kernel
+	# monitor is statically enabled for bug 596206
+	# use monitor || export ovs_cv_python="no"
+	# pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	# flake8 is primarily a style guide tool, running it as part of the tests
+	# in Gentoo does not make much sense, only breaks them: bug 607280
+	export ovs_cv_flake8="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	if use monitor; then
+		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+			python_foreach_impl python_doscript utilities/"${SCRIPT}"
+		done
+		rm -r "${ED%/}"/usr/share/openvswitch/python || die
+	fi
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED%/}"/var/run || die
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
+	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
+	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	# only needed on non-systemd, but helps anyway
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 032ba578f1d9..7eb7fd1bc701 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -5,8 +5,8 @@ AUX rdesktop-1.8.4-libressl.patch 395 BLAKE2B d7ae01de041bcba333c6c72348c28665a8
 AUX rdesktop-1.8.4-use_standard_gssapi.patch 2696 BLAKE2B 01f5542dc294d51f6d2fccf7141fc02ed199042cc25000bbc90d3387d6cd0b93ebce1a3ebbcaa1a8817bdd660dedd09d115f979fabb561b3ccc9e56e126bbd60 SHA512 ae91f4e0eb1e2c3141aedef660eb89628b334155c8c0559805cc4ac75274fff94101daf665052b27fe5074ce7468ff854fab865e7efd377d08d525319c7aa150
 AUX rdesktop-1.8.5-use_standard_gssapi.patch 1909 BLAKE2B 5e9b2b4b7bde0c38ba3302c780cbaec1a2ecea437fa686ce812c0e898427cac5e742ed69b96df9cbbc38378b99eef00f8326c25ed389461f689aab92f14e2a79 SHA512 1f886a23fd416f421bbab449b72fc889f60908b0408436f4c26229386d3baa48256bb78b4c72575ab9877932c634575345511f8418c20bef3345e231ef5d78ca
 DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
-DIST rdesktop-1.8.5.tar.gz 322452 BLAKE2B 186f4379a61d8e71dec3f3541deefef2c350b968fcb0e882e1d52e74c7fa47e110d5d5bf2968ee4ce2dbfab0e2a564a0e54e2d550f6dcc230fbb70c97dfcf351 SHA512 e905a0805854c16cd305635087e2fe206f4b0aee1825e3b52c6d3fea3b0b0cfc1463b74c7b07a6a2ff961717741a5b85079a5734d86f0ed2dd645ae69e6129a9
+DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
 EBUILD rdesktop-1.8.4-r1.ebuild 1736 BLAKE2B 2683cb189864e5895da4d8252a96e6729bdf6484fab692c5b7922e9cfa4d66bbb2885fbcac7d7863d787d5ddd253faa05124bc712450b7a2d7a7f274242a39ae SHA512 16d5d030d96a6a27ef134e6d5f6b6a94a90034042f2dc02c587788f312403c1aaf9c71f0baf1001910053c703b96e009975d5fdc328a4114c0c511821117570c
 EBUILD rdesktop-1.8.4-r2.ebuild 1783 BLAKE2B 94a097e988cb19622eb8165830136f78f7ef6081914d64660974be4b97b861b4a01cd631a45009910cf27a2498c2e6f74e9be48ba0ccf8d4ea67a84eaba0fd93 SHA512 66a9fdc1e5c46fcf09879f482cb1b918614ed012373b776b05622dbc520d60d626a487422cf7ab0161886355fe17b392a64074da357e67a25c780cf625783679
-EBUILD rdesktop-1.8.5-r1.ebuild 1790 BLAKE2B 97dcb8f4c2c1694b8929a0382fa4c94c53e4b43d1f64c410966a2d13c70a4a7ee9c1c26e21f71b2678b9f14816d01a325871ce679690e0c5740b3c356f9be8d9 SHA512 ca4e07def77481d504c94a53e74fcd8097aefa9b099379e627c8840fc79f5fb6e5b61b5d983f77c19fa8194df3ae23759534fa31b1eb591c1e68076d51024ced
+EBUILD rdesktop-1.8.6.ebuild 1797 BLAKE2B bd91ea20abc67be28637e2d3c85978ce78093616961fe869f354f588ec59a1884a30876e2f9bf658f7d82e38e8184a0a75556765383db8e30894159fdecce056 SHA512 9be7a905e9d00bf2ea20546f7b62d1dfca701ede55bee99a944b573b8584431e3b21701071440ddb63047186e35cb31a10680aa4a06544d1dbf1d273345e2d25
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild
deleted file mode 100644
index 8a54a1e507b3..000000000000
--- a/net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://www.rdesktop.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.6 )
-	kerberos? ( virtual/krb5 )
-	libsamplerate? ( media-libs/libsamplerate )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
-BDEPEND=virtual/pkgconfig
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
-	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
-	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
-	"${FILESDIR}"/${PN}-1.8.4-libressl.patch
-	"${FILESDIR}"/${P}-use_standard_gssapi.patch
-)
-
-DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use ao; then
-		sound_conf=$(use_with ao sound libao)
-	else if use alsa; then
-			sound_conf=$(use_with alsa sound alsa)
-		else
-			sound_conf=$(use_with oss sound oss)
-		fi
-	fi
-
-	econf \
-		--with-openssl="${EPREFIX}"/usr \
-		$(use_with debug) \
-		$(use_with ipv6) \
-		$(use_with libsamplerate) \
-		$(use_with xrandr) \
-		$(use_enable kerberos credssp) \
-		$(use_enable pcsc-lite smartcard) \
-		${sound_conf}
-}
diff --git a/net-misc/rdesktop/rdesktop-1.8.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
new file mode 100644
index 000000000000..b47bffbf7f4e
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://www.rdesktop.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( virtual/krb5 )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+BDEPEND=virtual/pkgconfig
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
+	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
+	"${FILESDIR}"/${PN}-1.8.4-libressl.patch
+	"${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch
+)
+
+DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index b2b583480c9a..648baaabeb8d 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1,8 +1,6 @@
 AUX sslh.conf.d-2 621 BLAKE2B 095522c582be245f1e49018848be738a33eb722cd9be4bd8a0830bbfaa1c2e4018ff480b625349372cc35ec47a1b10069cb5fd6a3c22d7e957e782c888c70b55 SHA512 31d482af0b3626f4b2f669f74a08fa6b6dfc310a40ab332cc3907306bd2fa5321f92e0e76af72c2ea185142f0d485578817e738737917b9c1764079070297e67
 AUX sslh.init.d-3 273 BLAKE2B 01ba7f4347989a6bcf829139ce3a51e7b14265eaae2e32617933c29c5d195a6a3bbe0674a13d52f02e2c418787ed3976987dc79d9c9045b0c7ca6285aa86fb55 SHA512 1508a137c5bc962e1dfa780334c015fb63701867261fc335920fa1847e2ed2093cd02657fc9d2f633382db15bbfd87bfb65f698f5f76aa777aa947ddf39ca10a
-DIST sslh-v1.19c.tar.gz 57418 BLAKE2B 97af9d8f79c54f1ba11476a142c762c69a16b6fdd48ead167c56c217a556183e3fda777f217c09d3bf6a5705d5cf491b68c282b626f70d42512d147d98b6f87c SHA512 14529f1fc1488b10e660fa85f5d8bb642a0e119a15ca44d492793153447c9414ade5a1925fbbedd19c5d26662aa1bafd9743ab5ca11324632269110406fa8ce9
 DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a
-EBUILD sslh-1.19c.ebuild 1931 BLAKE2B 5374fa4e57249b1d5b89b80460e6487f6e5f74bc29d473eaa161c786f467b2cb7474af00fcd28073aa1583a1958966c6ae8b16c9460134f6c22716bae1a039fe SHA512 989d3f47f06fbdae7bf2964dc90e49d2652080bce56a6f2f15ed7bc8e7afc57d109c644655bc71dffe290f1493fe02fa21f2fd48beb44fb41b92cb7fc006a6c5
 EBUILD sslh-1.20.ebuild 1931 BLAKE2B c407cde3ec222bdea752ff518b3ebddfdf86406dc75d5d600f919652c9f1e237d630f1a14fe172468dfbea59e028ef033e1e52fe820720e688ebf6758ed79893 SHA512 f619a6d09f5a9633c97fcebc2c795286ed2ea01cec26a4b8f155fcc390090485ac13322469c93a5bcf22acfe6e5c138b3e3a259e67cc86b38999990f545d8d8f
 EBUILD sslh-9999.ebuild 1936 BLAKE2B 0f91af8934fecdb8da30340aca3d7bb123507e2ddbcd8e345f46a045ad70d71a4d734e62656f8fed6b3d63bcfdc10aec6a82709178422763d3300024bfa46d99 SHA512 5ffb55731ea00f59011dc64597ed970568bdb58ba4ce7de50964d2c44173ec5500df386411bb13dc3593021b74e99c7519a914e899ea7c64b05ddc2818397f90
 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/sslh-1.19c.ebuild b/net-misc/sslh/sslh-1.19c.ebuild
deleted file mode 100644
index c163c7b5f920..000000000000
--- a/net-misc/sslh/sslh-1.19c.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="https://www.rutschle.net/tech/sslh/README.html"
-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="https://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/stunnel/Manifest b/net-misc/stunnel/Manifest
index fbc15bef1512..45da27ff3f11 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -2,13 +2,16 @@ AUX stunnel 1259 BLAKE2B f407bcff9249e57c46f641e8b666c187f3279e14d7d28f356506388
 AUX stunnel-5.43-compat-libressl.patch 5328 BLAKE2B 5a014b47e3a314ab2d016ca31fb98d8a4fd613816c38382ece2a9925be217151130fab7d14666aac2602513c1cb0af04742c6a80eb9b8bf51caa46fdc05ad4b1 SHA512 d45e660fc610636dc93b8f696fc378cda4fcf7989f22aecff6394f84bbddfabb70255ebc4a9291a29806b3631767bb64b826c4a9fb2ecfe0ab7e53aebcdc7eb3
 AUX stunnel-5.50-libressl.patch 8684 BLAKE2B 6c4b01ec93ba8e8d734dc5489b9eddabb3e655a858c709ed75cea7a38b745d3a281d483ea74d47ae98d3371321fbc9d2776cd470e56eaea0ab6851ec3b203f28 SHA512 802c5ae1c729cdeb72f1d4f53d8216243f5e3e801f964b057a53099ebe9cc67b1e8d09d58475130d5239c9cb5fd8a967a10193d1740daed182b7af43122b19d4
 AUX stunnel-5.51-libressl.patch 10288 BLAKE2B f403d620b6b1341d3934e560d8d7e81fb6567c5076c3c46a34ebafe7136d95e2c9bf0f1d56818384040e0dcf5a1a4e1e10afe29db1f32ff2008cef30b83a8da5 SHA512 d8c8562afeaed5a8843e08d50a5097a4e36a10a014ebe281d8ea0bc563ac5b9bfa9d884f8cf6008b58bf679a7e785d86b331cddcb0bd5e49ed664763d9b3e597
+AUX stunnel-5.54-libressl.patch 12341 BLAKE2B a46445e80f54ce9a912fb7b255600f3598513305485004249f11354312db13cbba8b7aa95a4da0d431ee0bef6e5c049afaa2d14b41d3ac4f222f8cc4ebb8e933 SHA512 1d85b587a36e2d78c0b97fa90829156a7123e860d323010287cee43bd36a803e490313e664e72b44ed54ba5e89a0920d8d8608b6ac269663892610c62f4240b0
 AUX stunnel-r1 1437 BLAKE2B 92689cd4ee63920e1064cb96c88795132ee917e7886f9970f125f52d4eabf0fdb2515783c321771ae4e06598dca7e54f9b8131523c14dea7efa2769e0de0ed4b SHA512 6ccb1735770a4662e6fcb02bb7d0329cbed9aec16fc410f9d0f34f1a13dc5c9767eceafa406c55cca23b364c87c033bf5349d267838bbd5c560aaeec17ccd92c
 AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826
 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb
 DIST stunnel-5.43.tar.gz 698715 BLAKE2B 21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e SHA512 3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
 DIST stunnel-5.51.tar.gz 979334 BLAKE2B d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4 SHA512 ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b
+DIST stunnel-5.54.tar.gz 985587 BLAKE2B 3f736301f042387bfb1b892bf33b1baa1b93459db84cab61844bb19a423a4cced65fbc6f5c1bacd0a638596553e5f9a08ea72175c8fc31195e103615ff9fa591 SHA512 3c8f782c48fbe2dc4909e8d4c5db6491cd9c58fe0763107546d8420b8b49a02a4a1258e88282d07b31e784111c7f167d66c7c2af92f347685b393d443a653cd9
 EBUILD stunnel-5.43.ebuild 2908 BLAKE2B a0013d9661c772464743069e4e80ed3713fd8deb39002d1594581601e2f39dbfbe77196c5dcc03f19c66b9d693e5a7a6e4f3ded589976b3b181e9af3471e1951 SHA512 7f1336affe6ff12f4a6eb173a9e0f24a955fcfcfc6ff9650aafe66a4fc0724147473a9ad6056ea4b30489ac795224ee5302c67518c90307e1b69a89dda5bdd96
 EBUILD stunnel-5.50-r1.ebuild 2891 BLAKE2B 0fd609cbe4542c98b2da12e9f5b10a9c7b78b193b64b1bb6b9c949556a5fce5a05719455876932f759abb300e1a0c9a737f5715c856f80504ba82c5dba9a82c2 SHA512 4ab5d9f3986182beb5fe5e1f32a1cf1e164eacecc4295dba1194a24db2dfa58a63af0d547487029b5245885cb9e87a2bbd93bcabde58b49bddc1c12445bfdf22
 EBUILD stunnel-5.51-r1.ebuild 2907 BLAKE2B 2aa8773750af083b3db5e5a232915c73e3985b8a32424ef6a6c0660f51a33b8c1049ef48e272e889e386fcd98c0e8464e22fdfe26309b0df37ffa0912c61557d SHA512 2e45350897ac5423492a0e90a6cdd80125a5aab49d9db9ff29701f63604559846be9b95ee5f58698b7c210758b1f97a9d0991055c2d509497285204e6ca59419
+EBUILD stunnel-5.54.ebuild 2907 BLAKE2B f2f85b3b178486d0c6720cbab05be44feeaaf238e476bc43b216bf181435b3b092ce55b4fa2ef40592f06b8f84c0f7d705335c782df9fbc7dc9c6daf4d328d32 SHA512 ae6df10bc5c499b3a8e4835334358df143fb5da32b8c578ed7dbeace2b8d297e27315b0d1639b4eabdabe91a145c9a11d1b9a0e9ba761abfeeea411e3b045f04
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/files/stunnel-5.54-libressl.patch b/net-misc/stunnel/files/stunnel-5.54-libressl.patch
new file mode 100644
index 000000000000..1965f47bca2d
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.54-libressl.patch
@@ -0,0 +1,313 @@
+diff --git a/src/client.c b/src/client.c
+index 21fa273..e500d62 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -657,7 +657,7 @@ NOEXPORT void print_cipher(CLI *c) { /* print negotiated cipher */
+ NOEXPORT void transfer(CLI *c) {
+     int timeout; /* s_poll_wait timeout in seconds */
+     int pending; /* either processed on unprocessed TLS data */
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     int has_pending=0, prev_has_pending;
+ #endif
+     int watchdog=0; /* a counter to detect an infinite loop */
+@@ -705,7 +705,7 @@ NOEXPORT void transfer(CLI *c) {
+ 
+         /****************************** wait for an event */
+         pending=SSL_pending(c->ssl);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+         /* only attempt to process SSL_has_pending() data once */
+         prev_has_pending=has_pending;
+         has_pending=SSL_has_pending(c->ssl);
+@@ -1109,7 +1109,7 @@ NOEXPORT void transfer(CLI *c) {
+             s_log(LOG_ERR,
+                 "please report the problem to Michal.Trojnara@stunnel.org");
+             stunnel_info(LOG_ERR);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+             s_log(LOG_ERR, "protocol=%s, SSL_pending=%d, SSL_has_pending=%d",
+                 SSL_get_version(c->ssl),
+                 SSL_pending(c->ssl), SSL_has_pending(c->ssl));
+diff --git a/src/ctx.c b/src/ctx.c
+index 01119f3..b73fdcb 100644
+--- a/src/ctx.c
++++ b/src/ctx.c
+@@ -91,7 +91,7 @@ NOEXPORT void set_prompt(const char *);
+ NOEXPORT int ui_retry();
+ 
+ /* session tickets */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int generate_session_ticket_cb(SSL *, void *);
+ NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *,
+     const unsigned char *, size_t, SSL_TICKET_STATUS, void *);
+@@ -130,7 +130,7 @@ NOEXPORT void sslerror_log(unsigned long, const char *, int, char *);
+ 
+ /**************************************** initialize section->ctx */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ typedef long unsigned SSL_OPTIONS_TYPE;
+ #else
+ typedef long SSL_OPTIONS_TYPE;
+@@ -138,7 +138,7 @@ typedef long SSL_OPTIONS_TYPE;
+ 
+ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
+     /* create TLS context */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     if(section->option.client)
+         section->ctx=SSL_CTX_new(TLS_client_method());
+     else /* server mode */
+@@ -234,7 +234,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
+ #endif
+ 
+     /* setup session tickets */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+     SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb,
+         decrypt_session_ticket_cb, NULL);
+ #endif /* OpenSSL 1.1.1 or later */
+@@ -493,7 +493,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+ /**************************************** initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+     SSL_CONF_CTX *cctx;
+     NAME_LIST *curr;
+     char *cmd, *param;
+@@ -979,7 +979,7 @@ NOEXPORT int ui_retry() {
+ 
+ /**************************************** session tickets */
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ typedef struct {
+     void *session_authenticated;
+@@ -1470,7 +1470,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
+ 
+     c=SSL_get_ex_data((SSL *)ssl, index_ssl_cli);
+     if(c) {
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+         OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
+ #else
+         int state=SSL_get_state((SSL *)ssl);
+diff --git a/src/options.c b/src/options.c
+index 670adbe..a10cecd 100644
+--- a/src/options.c
++++ b/src/options.c
+@@ -81,7 +81,7 @@ NOEXPORT char *sni_init(SERVICE_OPTIONS *);
+ NOEXPORT void sni_free(SERVICE_OPTIONS *);
+ #endif /* !defined(OPENSSL_NO_TLSEXT) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int str_to_proto_version(const char *);
+ #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
+ NOEXPORT char *tls_methods_set(SERVICE_OPTIONS *, const char *);
+@@ -96,7 +96,7 @@ NOEXPORT PSK_KEYS *psk_dup(PSK_KEYS *);
+ NOEXPORT void psk_free(PSK_KEYS *);
+ #endif /* !defined(OPENSSL_NO_PSK) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L
++#if OPENSSL_VERSION_NUMBER>=0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT TICKET_KEY *key_read(char *, char *);
+ NOEXPORT TICKET_KEY *key_dup(TICKET_KEY *);
+ NOEXPORT void key_free(TICKET_KEY *);
+@@ -3104,7 +3104,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr,
+         break;
+     }
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+     /* sslVersion */
+     switch(cmd) {
+@@ -3273,7 +3273,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr,
+     }
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L
++#if OPENSSL_VERSION_NUMBER>=0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+     /* ticketKeySecret */
+     switch(cmd) {
+@@ -3755,7 +3755,7 @@ NOEXPORT void sni_free(SERVICE_OPTIONS *section) {
+ 
+ /**************************************** modern TLS version handling */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ NOEXPORT int str_to_proto_version(const char *name) {
+     if(!strcasecmp(name, "all"))
+@@ -4079,7 +4079,7 @@ NOEXPORT void psk_free(PSK_KEYS *head) {
+ 
+ /**************************************** read ticket key */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L
++#if OPENSSL_VERSION_NUMBER>=0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ NOEXPORT TICKET_KEY *key_read(char *arg, char *option) {
+     char *key_str;
+diff --git a/src/prototypes.h b/src/prototypes.h
+index ebd413c..edd4341 100644
+--- a/src/prototypes.h
++++ b/src/prototypes.h
+@@ -244,7 +244,7 @@ typedef struct service_options_struct {
+ #if OPENSSL_VERSION_NUMBER>=0x009080dfL
+     long unsigned ssl_options_clear;
+ #endif /* OpenSSL 0.9.8m or later */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     int min_proto_version, max_proto_version;
+ #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
+     SSL_METHOD *client_method, *server_method;
+@@ -706,7 +706,7 @@ int getnameinfo(const struct sockaddr *, socklen_t,
+ extern CLI *thread_head;
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_OS_THREADS
+ 
+@@ -755,7 +755,7 @@ typedef enum {
+ 
+ extern CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ /* Emulate the OpenSSL 1.1 locking API for older OpenSSL versions */
+ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void);
+ int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *);
+diff --git a/src/ssl.c b/src/ssl.c
+index 60e31c1..10b0658 100644
+--- a/src/ssl.c
++++ b/src/ssl.c
+@@ -39,7 +39,7 @@
+ #include "prototypes.h"
+ 
+     /* global OpenSSL initialization: compression, engine, entropy */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
+     void *from_d, int idx, long argl, void *argp);
+ #else
+@@ -114,7 +114,7 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
+ #endif
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
+         void *from_d, int idx, long argl, void *argp) {
+ #else
+@@ -177,7 +177,7 @@ int ssl_configure(GLOBAL_OPTIONS *global) { /* configure global TLS settings */
+ 
+ #ifndef OPENSSL_NO_COMP
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ NOEXPORT int COMP_get_type(const COMP_METHOD *meth) {
+     return meth->type;
+diff --git a/src/sthreads.c b/src/sthreads.c
+index dc2cd43..7a01f2e 100644
+--- a/src/sthreads.c
++++ b/src/sthreads.c
+@@ -102,14 +102,16 @@ unsigned long stunnel_thread_id(void) {
+ 
+ #endif /* USE_WIN32 */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L
++#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L) || \
++    defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void threadid_func(CRYPTO_THREADID *tid) {
+     CRYPTO_THREADID_set_numeric(tid, stunnel_thread_id());
+ }
+ #endif
+ 
+ void thread_id_init(void) {
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L
++#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L) || \
++    defined(LIBRESSL_VERSION_NUMBER)
+     CRYPTO_THREADID_set_callback(threadid_func);
+ #endif
+ #if OPENSSL_VERSION_NUMBER<0x10000000L || !defined(OPENSSL_NO_DEPRECATED)
+@@ -120,7 +122,7 @@ void thread_id_init(void) {
+ /**************************************** locking */
+ 
+ /* we only need to initialize locking with OpenSSL older than 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_PTHREAD
+ 
+@@ -229,7 +231,7 @@ NOEXPORT int s_atomic_add(int *val, int amount, CRYPTO_RWLOCK *lock) {
+ 
+ CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_OS_THREADS
+ 
+@@ -339,7 +341,8 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) {
+ 
+ void locking_init(void) {
+     size_t i;
+-#if defined(USE_OS_THREADS) && OPENSSL_VERSION_NUMBER<0x10100004L
++#if defined(USE_OS_THREADS) && \
++    (OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER))
+     size_t num;
+ 
+     /* initialize the OpenSSL static locking */
+diff --git a/src/tls.c b/src/tls.c
+index 6c92b96..5e60a95 100644
+--- a/src/tls.c
++++ b/src/tls.c
+@@ -41,7 +41,7 @@
+ volatile int tls_initialized=0;
+ 
+ NOEXPORT void tls_platform_init();
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void free_function(void *);
+ #endif
+ 
+@@ -52,7 +52,7 @@ void tls_init() {
+     tls_platform_init();
+     tls_initialized=1;
+     ui_tls=tls_alloc(NULL, NULL, "ui");
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     CRYPTO_set_mem_functions(str_alloc_detached_debug,
+         str_realloc_detached_debug, str_free_debug);
+ #else
+@@ -184,7 +184,7 @@ TLS_DATA *tls_get() {
+ 
+ /**************************************** OpenSSL allocator hook */
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void free_function(void *ptr) {
+     /* CRYPTO_set_mem_ex_functions() needs a function rather than a macro */
+     /* unfortunately, OpenSSL provides no file:line information here */
+diff --git a/src/verify.c b/src/verify.c
+index 1d1eccb..dfd9bff 100644
+--- a/src/verify.c
++++ b/src/verify.c
+@@ -346,7 +346,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback_ctx) {
+     cert=X509_STORE_CTX_get_current_cert(callback_ctx);
+     subject=X509_get_subject_name(cert);
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100006L
++#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER)
+ #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
+ #endif
+     /* modern API allows retrieving multiple matching certificates */
diff --git a/net-misc/stunnel/stunnel-5.54.ebuild b/net-misc/stunnel/stunnel-5.54.ebuild
new file mode 100644
index 000000000000..a36f2872e781
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.54.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	# bugs 656420, 682894
+	eapply "${FILESDIR}"/${P}-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index b6f1da953479..aebf31ebf105 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2019.05.11.tar.gz 3167002 BLAKE2B aad84dcb9f729bd3c6622978c2f9d2d1d9b20c6a7bc59a9d134cff4a857abcb6e5360f058399f5385a5f088f0a695077786a56b94f68fce4e4518bf090b762a1 SHA512 e47a2163d73554fc125a2ac9c14cb12eadd506f6416fd673d687e9a068ece34e95d7f59483aefaa329da0a8c4b72e6d1debc2a8d3bd6c7ded5fbe543c5d769b9
 DIST youtube-dl-2019.05.20.tar.gz 3167834 BLAKE2B fe5501380b5134665b3c5c31a7b703832d7c7d9675c1e7c20bfa2b4ebc175e37521b423b68d3701a3637e047e3d4f12e54786f7d6f23e896f0a9da93c39be6f5 SHA512 c50661585f987a6c2abc7b9940749a2ba8e9a534d66f0846dddb265be3fe5a58ba8009fbad44c2551c7574b73bc21aa35f7d633729c0090c46e5818199dccb1d
-EBUILD youtube-dl-2019.05.11.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c
-EBUILD youtube-dl-2019.05.20.ebuild 2125 BLAKE2B 50e06196444aee277e8bc2a72c762b76b7de6a9616f3ec6ccd76cfff696c4fcbb6e2c64022fcd5536708441a9009fb06b424fd7cbd86b7a58cee8108f908c6f0 SHA512 ee93e8557d67c11a7ead1bc1f0fefaec1f331aeea30a2fe93efd913d5a866380b62ba8a02d1115fb257d1989818a06eeea4e00d9acc35fe8feee147b8d6ed5b5
+EBUILD youtube-dl-2019.05.20.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c
 EBUILD youtube-dl-99999999.ebuild 2014 BLAKE2B 55abeec62089210469af6edf2cde4f8764eb1a5d20a3cd96985dce8a833023e5dd2e44cc893a7db99d9002fc671601fabd1c26cdbfa0fc0411a9ba11e1715b78 SHA512 bbbfb4e6e8319e383eaf4db4dd4056f34374eb6f1527c6cc1c6ee0d9f61199a913bc99f929bd91ef80aa744ba9a865833395460d8b94125c362c59372f738346
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.05.11.ebuild b/net-misc/youtube-dl/youtube-dl-2019.05.11.ebuild
deleted file mode 100644
index 4d80cb2b49ed..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2019.05.11.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-RESTRICT="test"
-SLOT="0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2019.05.20.ebuild b/net-misc/youtube-dl/youtube-dl-2019.05.20.ebuild
index a8b1afbfc11a..4d80cb2b49ed 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.05.20.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.05.20.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://rg3.github.com/youtube-dl/"
 SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 LICENSE="public-domain"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 RESTRICT="test"
 SLOT="0"
 DEPEND="
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 52c05dac04f3..201364ce727c 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -6,4 +6,4 @@ DIST 389-ds-base-1.3.6.8.tar.bz2 3440164 BLAKE2B 20ff28fc1d59452e48ec6684f844dd2
 EBUILD 389-ds-base-1.3.5.19.ebuild 2957 BLAKE2B d949b7a77c8e037d11d667bc35f290bc855b99724ed9c28bd52e2fd70973eec54c69b722a3fd9f86a91e5f8ec453cb609a503dd92fea74a44903eab1c0e4e68d SHA512 facd2e4180ecd5da4ec7c55d30d44cd3963e3a52de68cea5664d0f6ca7bdf2f7f06cfcaeff6718d0e5d97a935564990eae51c1f245f039fd62426b2de81d9a4d
 EBUILD 389-ds-base-1.3.6.8-r1.ebuild 3034 BLAKE2B 77277e1a31d2e0e718060a4ce007cc601fd48c0f813525c15d6437e1f05821197a6307be8e070af0a69253cd3cabd288ce81d640111a4feb2f708f67a7034ead SHA512 77af6cfe40c112c496c527fe5766430812e2da9d440eef15d155196d5e09b9c69473038e34a736a052e5ba7f3d046d088e8198a47e6991cadc2b7d3a8109a16c
 EBUILD 389-ds-base-9999.ebuild 3083 BLAKE2B 45a20a14951c11131a0ca5fc899e4166eda69611f4f8c7bb9619f9d5d5ad9cd2d846b01c8fc6aba385605e30b455a9344fb9dce27563558141f4bad5f7018dc0 SHA512 a86fa6972731f3e7e3aad42fec4ab14378537e1173f35a18873a38dc78459b2723b7a348333499557fa007677a97c4c2bf748dd3b2fc1bb92131853f5f73102e
-MISC metadata.xml 1203 BLAKE2B fc2dcbe45aa7f00e6fdd493f693ebc9e1889219ee65197bac45deb39e95cedc36332e7559427ab03d8ea2e10eed3a2cf6b33d746696dcddc2cd11b80f1d99734 SHA512 3e21c3f77fb39b3b5d8099fa4994040acc62c89d16b2a74016a8ca4bb9d6436a77f56fc5f01ec595de3801f9467a2157b295e841e3aefc4d4de58896a9f8e07a
+MISC metadata.xml 1019 BLAKE2B 0258798048756a11ef38481a5abbe2c3e80d186bc3d4474771232397e4ec48a270fed6a0867efafb31c4261caf130511083e65f434f03e8486713a710bd2c470 SHA512 d63ffd88de13739f9889f064cdc135ca0f82e0ecde52617e8bbe477049f0e911e3d79514dbef3ff5913b1760889a20035f89118b760ab241fe864b0d07f694a3
diff --git a/net-nds/389-ds-base/metadata.xml b/net-nds/389-ds-base/metadata.xml
index 5f1b11d4bad0..55831e027b4c 100644
--- a/net-nds/389-ds-base/metadata.xml
+++ b/net-nds/389-ds-base/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>wes@sol1.com.au</email>
-		<name>Wes</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>The enterprise-class Open Source LDAP server for Linux
 	</longdescription> 
 <use>
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 953ac11665f3..3135d10a6e61 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/gssproxy/Manifest b/net-nds/gssproxy/Manifest
index 872ff8512ad6..477fb87fc93e 100644
--- a/net-nds/gssproxy/Manifest
+++ b/net-nds/gssproxy/Manifest
@@ -4,5 +4,5 @@ DIST gssproxy-0.8.0.tar.gz 557386 BLAKE2B 14948bbd4c08834375ed00d9f9c6624797eade
 DIST gssproxy-0.8.2.tar.gz 563300 BLAKE2B 104637af6f43d118ef5194ee8bdfd0a8a8155df43691ac80394de0482f718f2672996b698a80d5c4db7bdc1b164be7f8dc6ffd9a5346affd5923b78362f10333 SHA512 68ce39b36ee83d77da19e9a9fb322ba901366999828a2b427bc2275c4187b4d2291de140c202cce02bdf53eb5cf64da2fafa022ea482258c102f28b0af5d7c63
 EBUILD gssproxy-0.7.0-r1.ebuild 2772 BLAKE2B f91994050439b41fe8fd6e31e234f9f5d60c3202ccf59664958b37a199cd3f3d786c2cab3c56003e81a72b25b702353136c88f33ab1c3516d252a018d32cf9c4 SHA512 b9017d2455856a88a93b05cc53b78c8db4b9683ff4158ac7bdf462cf2db384848157d58a35e02ca364dcbac216978fa6cf41646425b8187ae035f737472279f8
 EBUILD gssproxy-0.8.0.ebuild 2777 BLAKE2B ff1edd382a3a7d5e6f8a7dcb5ec414b144fb8f963a98d24bc467e53e22e7757857c9d15d35d91320a6495a8343341ab088cf91fd91b593380f6c1ecf6cbc9857 SHA512 9c013f50d746dda87496ac865c5061d74f9ad9feeb55fb59019348b88b89be70930d0c6fae04dac8b4bf9442b4319986f506d14a0da5dff87b0d4aa459c0bf3a
-EBUILD gssproxy-0.8.2.ebuild 2791 BLAKE2B 5578a838e3935bbb4e64afba0ad99933867721df5c7b7ea358d390d684ed421819345885ce584cb1170c69e6444e43d8b797a4e96f8b2c2c0e68bd8a4923f8f3 SHA512 15dbd9165d7178883a17fcc35a32d53de00e1326236028afc0fac38f9288ba81febf8dc641e02052d720334d8f1f7a6e9fa58b434181ec2fc41954366091a33a
+EBUILD gssproxy-0.8.2.ebuild 2790 BLAKE2B f368c4b79fcbfd259e00166629683bed29911a333c3f922596cefbcc1c18dbdcb90a366e8b741f8e6132ab601e641cde03ad75f795463c5580e3de86448dc5d1 SHA512 170a264a300b840a93b07c37c252b70c66efbce702ebd4d2193395161372cead645414496a1fa651e98b00c7a1471cc0c94e10a112cb300752cc117edbbd7a7b
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/net-nds/gssproxy/gssproxy-0.8.2.ebuild b/net-nds/gssproxy/gssproxy-0.8.2.ebuild
index b8d0c25c7470..b8c8577bc940 100644
--- a/net-nds/gssproxy/gssproxy-0.8.2.ebuild
+++ b/net-nds/gssproxy/gssproxy-0.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://releases.pagure.org/gssproxy/${P}.tar.gz"
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="debug selinux systemd hardened"
 
 COMMON_DEPEND=">=dev-libs/libverto-0.2.2
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index c4f32f0b1ed8..f7d5bb3ebb7d 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 36305df44381..f38069a22366 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -5,6 +5,6 @@ AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b3
 AUX sabnzbd.ini 347 BLAKE2B b3e247bb75d3d3cead9db3bb1f4d7301542619bfadd66619e3c3d0bc815f4841e95dd11b0b14ec6e02d14e4510aed06abd0c9b66e8b0e2a02fde30a6b5678659 SHA512 14df57a0594a671a275e6e5b4f6a704ce2be01507c518f46162d096870da7b04fb636c4e8aedfdb07d3290934941707eda94180e290bdf7eef561b5641497df4
 AUX sabnzbd.initd 1395 BLAKE2B d8663fefa21e3d371c32ecebd1a3958704d39738ce4496c8f977cc411d6c5235aad6c0147f626089a9964c472b15ed4bd2ede0fb35b08260a705190b877ea65a SHA512 0510dc7386ae57493bf614d9b74614f0c2b160981c0f7e5f784a9a336167de7918112ff1a173e3535edd654567ca806b156ee6db819e139dcfea3990bc8252d8
 AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e3a6b53fbb8e0c7df2100ac13ee746e4b6cd45b384acfe6a9478df3a3d1f75bfc70dc41f51ac8f018916 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34
-DIST SABnzbd-2.3.7-src.tar.gz 2740143 BLAKE2B caf165609a2122a19f0f9bb017789a84c5c5d508ca856c983de11f598717043560a0d6b44b44e5aafc3e9e4c50ae47dc78e00a65f253e88ad591dafad607e5a4 SHA512 5a9043abf54dcd4590ebe2bd97ec7ea7112bcf65874018f7962f15de0433805c4b5d4b2fd8b2ff737dac491134f082bd4f75f8c1e0d60d89988f09fef343a113
-EBUILD sabnzbd-2.3.7.ebuild 4182 BLAKE2B 5b23291c37a70486796494cab05dc8fdfe9b747a91e2c3dced08b04af8052c0bdc8673ae57a84423e0b9ba201018b7864fa99561920aca0cf41cdf28f6ac840a SHA512 c9fd52e74ff60a8b9bfc690d4b937ee2875c774ce12c7d375f0224aee72b7fb193934009fa09f91c34a70f74988d2cf9c21e78da6e9f2b9d528a36f200c304d8
+DIST SABnzbd-2.3.9-src.tar.gz 2738773 BLAKE2B fbb765732c0aab6a47a4d4827d21b1b029c6d40c1c6c335692964210dc4c389e94cd1cdca45bfb3fb8c2fa9adc84f33df0fe3d23a0e4f9143a095eec042a5cf0 SHA512 10a39db9ad7f6d441166da97194b7a281aacd1900f7687bca72c6c2b555114bc2bbdaaba51cb9fcec57aa1b782f20609a07528484ad911ffd9f9eabb54a324fa
+EBUILD sabnzbd-2.3.9.ebuild 4170 BLAKE2B 3d0e56d22c41045ea2a1e2c05f4cec3cb680d11f2a988c72222343fb4715a5cc8f984479290feacdc993bed7322aef0cf3aa6fdf0bbc37c5c9cb11f35f18b514 SHA512 5719356e34b7c08bdb6e81ef49481a297bf65630dde38cd080cecf138f52a062fbff5b2acb8578b54c36fa83a27e7062c7c85feb5ff28248f456803f07ed0fb4
 MISC metadata.xml 506 BLAKE2B ae36d43db0df97454127c4e195c5039b745ea2cbc5883bd9747f049ea63340e16090c671bbe7229895630b078a0d025729353dd457b3581f4a72672bf085ee2e SHA512 13c60fc2a77328dd1d8ae3d2036a84b72dc98a88093aad9a326fd904b41c795dcce84aec5dc528bc81daabba0341f10a7dda2d01788f70310bbaf801da831f53
diff --git a/net-nntp/sabnzbd/sabnzbd-2.3.7.ebuild b/net-nntp/sabnzbd/sabnzbd-2.3.7.ebuild
deleted file mode 100644
index f0871da23b49..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-2.3.7.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# Require python-2 with sqlite USE flag
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 user systemd versionator
-
-MY_P="${P/sab/SAB}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${PV}/${MY_P}-src.tar.gz"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+7za +rar unzip"
-
-# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
-# be in python's sitedir.  See:  http://wiki.sabnzbd.org/unix-packaging
-
-# TODO:  still bundled but not in portage:
-# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs
-# pynewsleecher
-#
-# dev-python/rarfile is bundled as of 2.0.1 because sabnzbd is modifying it
-# https://github.com/sabnzbd/sabnzbd/commit/de6d642b0dc6eaed63199a99d9a1a8b2e3d0018b
-#
-# Also note that cherrypy is still bundled.  It's near impossible to find
-# out where the bundled and heavily patched version came from (pulled from
-# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched
-# further.  Upstream is planning on making this easier with 0.8.0.
-# https://github.com/sabnzbd/sabnzbd/issues/47
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/par2cmdline-0.4
-	>=dev-python/cheetah-2.0.1[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/gntp[${PYTHON_USEDEP}]
-	dev-python/pythonutils[${PYTHON_USEDEP}]
-	>=dev-python/sabyenc-3.3.1[${PYTHON_USEDEP}]
-	net-misc/wget
-	7za? ( app-arch/p7zip )
-	rar? ( || ( app-arch/unrar app-arch/rar ) )
-	unzip? ( >=app-arch/unzip-5.5.2 )
-"
-DEPEND="${PYTHON_DEPS}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	HOMEDIR="/var/lib/${PN}"
-	python-single-r1_pkg_setup
-
-	# Create sabnzbd group
-	enewgroup "${PN}"
-	# Create sabnzbd user, put in sabnzbd group
-	enewuser "${PN}" -1 -1 "${HOMEDIR}" "${PN}"
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/patches
-
-	# remove bundled modules
-	rm -r sabnzbd/utils/{feedparser,configobj}.py || die
-	rm -r gntp || die
-	rm licenses/License-{feedparser,configobj,gntp}.txt || die
-
-	eapply_user
-}
-
-src_install() {
-	local d
-
-	for d in cherrypy email icons interfaces locale po sabnzbd tools util; do
-		insinto "/usr/share/${PN}/${d}"
-		doins -r ${d}/*
-	done
-
-	exeinto "/usr/share/${PN}"
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED%/}/usr/share/${PN}"
-	python_optimize "${ED%/}/usr/share/${PN}"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	diropts -o "${PN}" -g "${PN}"
-	dodir "/etc/${PN}"
-	dodir "/var/log/${PN}"
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	doins "${FILESDIR}/${PN}.ini"
-
-	dodoc {ABOUT,ISSUES,README}.txt licenses/*
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	einfo "Default directory: ${HOMEDIR}"
-	einfo
-	einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-	einfo
-	einfo "    gpasswd -a <user> sabnzbd"
-	einfo
-	einfo "By default, SABnzbd+ will listen on TCP port 8080."
-	einfo
-	einfo "As Growl is not the default notification system on Gentoo, we disable it."
-
-	local replacing
-	local major
-	local minor
-	for replacing in ${REPLACING_VERSIONS}; do
-		major=$(get_major_version ${replacing})
-		minor=$(get_version_component_range 2 ${replacing})
-
-		if [ "${major}" == "1" ]; then
-			ewarn
-			ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format"
-			ewarn "that is not compatible with earlier ${PN}-1.x.y releases."
-			ewarn
-			break
-		elif [ "${major}" == "2" ] && [ ${minor} -lt 2 ]; then
-			ewarn
-			ewarn "Due to changes in this release, the queue will be converted when ${PN}"
-			ewarn "is started for the first time. Job order, settings and data will be"
-			ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
-			ewarn "fetching before the upgrade will be lost!"
-			ewarn
-			break
-		fi
-
-	done
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-2.3.9.ebuild b/net-nntp/sabnzbd/sabnzbd-2.3.9.ebuild
new file mode 100644
index 000000000000..3c897b62e6e7
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-2.3.9.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Require python-2 with sqlite USE flag
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 user systemd
+
+MY_P="${P/sab/SAB}"
+
+DESCRIPTION="Binary newsgrabber with web-interface"
+HOMEPAGE="https://sabnzbd.org/"
+SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${PV}/${MY_P}-src.tar.gz"
+
+# Sabnzbd is GPL-2 but bundles software with the following licenses.
+LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+7za +rar unzip"
+
+# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
+# be in python's sitedir.  See:  http://wiki.sabnzbd.org/unix-packaging
+
+# TODO:  still bundled but not in portage:
+# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs
+# pynewsleecher
+#
+# dev-python/rarfile is bundled as of 2.0.1 because sabnzbd is modifying it
+# https://github.com/sabnzbd/sabnzbd/commit/de6d642b0dc6eaed63199a99d9a1a8b2e3d0018b
+#
+# Also note that cherrypy is still bundled.  It's near impossible to find
+# out where the bundled and heavily patched version came from (pulled from
+# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched
+# further.  Upstream is planning on making this easier with 0.8.0.
+# https://github.com/sabnzbd/sabnzbd/issues/47
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/par2cmdline-0.4
+	>=dev-python/cheetah-2.0.1[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/gntp[${PYTHON_USEDEP}]
+	dev-python/pythonutils[${PYTHON_USEDEP}]
+	>=dev-python/sabyenc-3.3.1[${PYTHON_USEDEP}]
+	net-misc/wget
+	7za? ( app-arch/p7zip )
+	rar? ( || ( app-arch/unrar app-arch/rar ) )
+	unzip? ( >=app-arch/unzip-5.5.2 )
+"
+DEPEND="${PYTHON_DEPS}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	HOMEDIR="/var/lib/${PN}"
+	python-single-r1_pkg_setup
+
+	# Create sabnzbd group
+	enewgroup "${PN}"
+	# Create sabnzbd user, put in sabnzbd group
+	enewuser "${PN}" -1 -1 "${HOMEDIR}" "${PN}"
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/patches
+
+	# remove bundled modules
+	rm -r sabnzbd/utils/{feedparser,configobj}.py || die
+	rm -r gntp || die
+	rm licenses/License-{feedparser,configobj,gntp}.txt || die
+
+	eapply_user
+}
+
+src_install() {
+	local d
+
+	for d in cherrypy email icons interfaces locale po sabnzbd tools util; do
+		insinto "/usr/share/${PN}/${d}"
+		doins -r ${d}/*
+	done
+
+	exeinto "/usr/share/${PN}"
+	doexe SABnzbd.py
+
+	python_fix_shebang "${ED%/}/usr/share/${PN}"
+	python_optimize "${ED%/}/usr/share/${PN}"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	diropts -o "${PN}" -g "${PN}"
+	dodir "/etc/${PN}"
+	dodir "/var/log/${PN}"
+
+	insinto "/etc/${PN}"
+	insopts -m 0600 -o "${PN}" -g "${PN}"
+	doins "${FILESDIR}/${PN}.ini"
+
+	dodoc {ABOUT,ISSUES,README}.txt licenses/*
+
+	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
+}
+
+pkg_postinst() {
+	einfo "Default directory: ${HOMEDIR}"
+	einfo
+	einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
+	einfo
+	einfo "    gpasswd -a <user> sabnzbd"
+	einfo
+	einfo "By default, SABnzbd+ will listen on TCP port 8080."
+	einfo
+	einfo "As Growl is not the default notification system on Gentoo, we disable it."
+
+	local replacing
+	local major
+	local minor
+	for replacing in ${REPLACING_VERSIONS}; do
+		major=$(get_major_version ${replacing})
+		minor=$(get_version_component_range 2 ${replacing})
+
+		if [ "${major}" == "1" ]; then
+			ewarn
+			ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format"
+			ewarn "that is not compatible with earlier ${PN}-1.x.y releases."
+			ewarn
+			break
+		elif [ "${major}" == "2" ] && [ ${minor} -lt 2 ]; then
+			ewarn
+			ewarn "Due to changes in this release, the queue will be converted when ${PN}"
+			ewarn "is started for the first time. Job order, settings and data will be"
+			ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
+			ewarn "fetching before the upgrade will be lost!"
+			ewarn
+			break
+		fi
+
+	done
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 9017393d1f77..4fe86f4dd083 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 6b33504743e4..df114bcc5688 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,9 +1,7 @@
 AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef90c28b170b84ecd3a82da77b582b69ef442a9a455752192ba4b6b33aeb9a43587c0209fdf380342 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
-DIST airdcpp-webclient-2.5.0.tar.gz 900078 BLAKE2B 53f5e096a3a6cc7c77c92bef32a7aaf0fb7b5e49740718252c7b4e233b80c52ca27029ba24fef4f1ab9c4c360da182accffb8ba7de27ef9b0b4aaa011005b689 SHA512 cf0220e3f2096304e393a4bd833e81c1427dbd144a56498712c9e18f2ec14f35d9112ad0ff05f54aad5a57126d68fc46c2bf20806dd7464a5bdb301543b08809
-DIST airdcpp-webclient-2.5.1.tar.gz 898980 BLAKE2B a930a13d34068977d0184ea56163cb9ae0f47bd92cfb724145f287742fb034ebc89f0a55fc5b07a8761de0749d3725912d4f4682542ac60c93b003a08ed24c9f SHA512 297aa780ecc35f48000eba1cc3b6f284a64954fbcc257ed58c84f2c88901b1c01c17228883c6569fa1333f0e41067f9fe7623ef24e458844544f6d6cc2b45c4c
 DIST airdcpp-webclient-2.6.0.tar.gz 903873 BLAKE2B 7a82891efef14e8d3c2da9a15165698084daf9c044d420c271dd1401710f030fc3c6fd83d7f58cee746767624b1292e7fcb7a48387e03b0eca2cf779753686d8 SHA512 d6d029638e69d19743d2e49185b08a808d95d725c3f40bd98ab42c384d3eae6d07e4528ac28ac9db50011f8a68592ae60f49cedbbccb45a78e82a5e424bb731c
-EBUILD airdcpp-webclient-2.5.0.ebuild 1437 BLAKE2B e0450bcb8ad7cac245fb7a38f9bf124321b57ed4185558e7b0e1c9232dd5e94d36c6b937be183ddfde043e902f7eb93a107bec65b2833f8cc0b3c29aba3e9542 SHA512 9fba8e23a2266b16f4b88437669b8efce51f741998cdd184ba9ed4d64876ba1f7f0ade9dcc5c5803e2760e4ffea86383891a4a5c43ae4bba9d8b135d7e209c43
-EBUILD airdcpp-webclient-2.5.1.ebuild 1437 BLAKE2B 82d3e693e68b9c85e4b3c7864d3448b19a76f59060934a23c0a0cd99cf2dee2b5242ad3c45e91b016f5fb46d98e708dd0e28b4ff5a8c01acdbc991b99794cca3 SHA512 5bdce912f57bde5f91368102a41d5527369c65ba3a47c953dbe9471998b45036893c1f2ab68435e29d21921f9e4d16e6939b2d578a6643382d6506da528170e7
+DIST airdcpp-webclient-2.6.1.tar.gz 908393 BLAKE2B 8734cdfc1b0e380d231cf6e571d215b7cec196fe012bf842fd2257496f252dd803eee0a308e97033f959652dbd4d21bd2b96559c4a4262a8f7ddd2c491c7d263 SHA512 bad35d09475ef9a95f358bce99d1143586e3eedb58b3c5c74570c707f099ed1b1214714c093f74c6e2bbfa733077dcaf3e590ae3d821330938f9ec32c75a7152
 EBUILD airdcpp-webclient-2.6.0.ebuild 1437 BLAKE2B 82d3e693e68b9c85e4b3c7864d3448b19a76f59060934a23c0a0cd99cf2dee2b5242ad3c45e91b016f5fb46d98e708dd0e28b4ff5a8c01acdbc991b99794cca3 SHA512 5bdce912f57bde5f91368102a41d5527369c65ba3a47c953dbe9471998b45036893c1f2ab68435e29d21921f9e4d16e6939b2d578a6643382d6506da528170e7
+EBUILD airdcpp-webclient-2.6.1.ebuild 1437 BLAKE2B 82d3e693e68b9c85e4b3c7864d3448b19a76f59060934a23c0a0cd99cf2dee2b5242ad3c45e91b016f5fb46d98e708dd0e28b4ff5a8c01acdbc991b99794cca3 SHA512 5bdce912f57bde5f91368102a41d5527369c65ba3a47c953dbe9471998b45036893c1f2ab68435e29d21921f9e4d16e6939b2d578a6643382d6506da528170e7
 MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild
deleted file mode 100644
index 8d45254e2be0..000000000000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils python-any-r1 user
-
-DESCRIPTION="Cross-platform Direct Connect client"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="nat-pmp +tbb +webui"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/websocketpp
-	dev-libs/boost:=
-	dev-libs/leveldb:=
-	dev-libs/libmaxminddb:=
-	dev-libs/openssl:0=[-bindist]
-	net-libs/miniupnpc:=
-	sys-libs/zlib:=
-	virtual/libiconv
-	nat-pmp? ( net-libs/libnatpmp:= )
-	tbb? ( dev-cpp/tbb:= )
-"
-DEPEND="
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-PDEPEND="webui? ( www-apps/airdcpp-webui )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	enewgroup airdcppd
-	enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_WEB_UI=OFF
-		-DENABLE_NATPMP=$(usex nat-pmp)
-		-DENABLE_TBB=$(usex tbb)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newconfd "${FILESDIR}/airdcppd.confd" airdcppd
-	newinitd "${FILESDIR}/airdcppd.initd" airdcppd
-	keepdir /var/lib/airdcppd
-	fowners airdcppd:airdcppd /var/lib/airdcppd
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Run 'airdcppd --configure' to set up ports and authentication"
-	fi
-}
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
index 647a9600c515..647a9600c515 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.1.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index ccbb070db985..442ef15b1621 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,7 +1,13 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
 DIST cpuminer-opt-3.8.8.1.tar.gz 1709515 BLAKE2B cecf9f57093fd89cef459cdc0d591a5de4bb12126a931dd9bfee0fc9b08a7ec4b5bb087ad383f14492b3da3066bac695f0022e1dfc595c7e331c9517b4b44db6 SHA512 5dd254237231abb84312c31be97952d1e1f1cd6c4fa0efc409581afb1a28d9783816b9efdb07501d67b99b831bce0a290e5cc2b3ce6c915a3e76b00edd582560
+DIST cpuminer-opt-3.9.0.1.tar.gz 1744675 BLAKE2B e1dff3bafd1c60bd67dbeca6acad4ee48a00bf0d77512686ac5b2bd9f375eee4a6e9b32c891f195bb98c4a48ac0f52a6da91bc51e28017dd811bf975d8c0550f SHA512 f807f9f7416983363116a07b12a191227907e26a658f6cd00f5556292785c27f6b56df9998a06bc1e44769bd549a5be75acd6986d446dd885b8b49763fde1731
 DIST cpuminer-opt-3.9.0.tar.gz 1744113 BLAKE2B 0fef9ead2218284032d70df4d823f43896a72a06c91612b3a9981a89bb51c890d3fe54707af80d2ebe3ceb513ef98c3e7b036b9ec0a9767ff5b969bed2a26318 SHA512 beb3faf8f2b765f7f995274e247b59590c3cebf2f6d46ce39abac8ecec322cabfc4b2acc087686f9c701c2c32d96b5d1f95d34413ec70c727b58f67054fc2603
+DIST cpuminer-opt-3.9.1.1.tar.gz 1771289 BLAKE2B c3a0cdb6793d1590bca11fac736d2d9e0bc200a391f2f440f7e005e6d61c90c331bc856055a1cf207a5abed934caa421e6d291372e293467ad2738039f491f96 SHA512 fdbbc60f433ae810522ca22b1709ee2052de90631cd68d5581fa2297ad549093bc64b0f4ec6900986ec56e16b84ead111f8d8a796b7e654c675b0585990e266d
+DIST cpuminer-opt-3.9.1.tar.gz 1770345 BLAKE2B c2ef3111f1c1f034d2e4d4148031cf4fa099484e4bc54e8266323bdff26cbd90a390bb4bc0e77b095227bb3c0026a1b6d791bebb5345e74462650fe4be0e688d SHA512 ca83b2b325947591e77b8edd7f920043d3422259e9e60a7549066d1290c60b7b108dd91c4f8731e8ffb3932d2d430a0b0f02e6b384b03a939e32c6dd4329732b
 EBUILD cpuminer-opt-3.8.8.1-r1.ebuild 1029 BLAKE2B 3b78792a9c3e6eeceef1b01e8ffb3541c169c44b9d21c294856a2e9624f6b6106a5f7ba2e9f743f3e3bb97e14986d352fdda69dea944906aa87e4e843a5bf1fd SHA512 2927d9dfd2ea681153c77cb592bba5d447ea8954d9a99a0743cd86bc695349529105ef5f06e0219814bbfead0ede171c4bbb7352edfbfa2bb32d8b144b2e727d
+EBUILD cpuminer-opt-3.9.0.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
 EBUILD cpuminer-opt-3.9.0.ebuild 1029 BLAKE2B 03505cb48293bd884d6ff25944aad5d5aed6d2fe8888d07f16529900d5589f3550ac02f3f2e6e24ec70e65a7059d1f0e05e8377fbaff98385c8d23b2005f5670 SHA512 1ca7351712bb25fa0245e281bf23a18bc7d2b778cd8e16969c25cde8702f65519855b30a7c3d171e0ee7b58dc61b8e4c66d91643d8aaf5c68a6829d209735663
+EBUILD cpuminer-opt-3.9.1.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
+EBUILD cpuminer-opt-3.9.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
 EBUILD cpuminer-opt-9999.ebuild 1029 BLAKE2B 03505cb48293bd884d6ff25944aad5d5aed6d2fe8888d07f16529900d5589f3550ac02f3f2e6e24ec70e65a7059d1f0e05e8377fbaff98385c8d23b2005f5670 SHA512 1ca7351712bb25fa0245e281bf23a18bc7d2b778cd8e16969c25cde8702f65519855b30a7c3d171e0ee7b58dc61b8e4c66d91643d8aaf5c68a6829d209735663
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild
new file mode 100644
index 000000000000..666d27ee1c02
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	>=net-misc/curl-7.15[ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.1.ebuild
new file mode 100644
index 000000000000..666d27ee1c02
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	>=net-misc/curl-7.15[ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.ebuild
new file mode 100644
index 000000000000..666d27ee1c02
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	>=net-misc/curl-7.15[ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 585d5961c494..a5852ef797a7 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,3 +1,7 @@
+AUX stdiscosrv.confd 107 BLAKE2B 8bf3beb78bac5a50cf4b036dcbc9e43106e9a6d52193dab63f80d1c0575f376061b72eb331199c4be14037b572a06aeddcfca6fc9c0e3e13a4ef26ae967b0095 SHA512 1bdbc7a4d86c6286b6859916e13de8fb196874ca5f27829bce586481a9bda535758f627890ab78b0a1e7eebf30ef209b9433a75ea60a4a69c3f18e2afbd0feed
+AUX stdiscosrv.initd 730 BLAKE2B 55d60be02d28b8c995105d0f68ece809b0fc1c5314ed6eb1c3a926f2d2a7a5b3edff7d096fcb6dc3d79224ffa888f0c23834872427c26bb162ce3609037abc5a SHA512 a854aa0655803b7f15571d774514125fe3e97dea8da8d449ac4768edb86a4e57840e2c83bbf4d6fc0c0a9a26b8eeb6dd3e2648dd415e33c3ef1f4f1438e98517
+AUX stdiscosrv.logrotate 102 BLAKE2B c4670214a411fdc0ccfabcc0b1f7692e910cb0b2f465006b61d9f67f3ab1a41bc72fb831d2a261efeedfb585a774c1659bc3c8b2183582ce6a329390a2cc70a0 SHA512 cef815a68906851a594214a9bc8a437591b4928c02fdb2fa982898d51b2cc2cd083f2a6093830a5319f1b4d7ab446f3f31a6831fa1ae946c6bdf149afb1dd539
+AUX stdiscosrv.service 304 BLAKE2B 2caaeb4ca9e3cf2cd202b4d3542d7069697cfa057759ef12e387c08e3e3c72d349dffe52ffe1fa6b369045d829c3688c8f2ecfe866379a49f00bf0391c2f8ff3 SHA512 2d12e4de4675d0ef3bb5f55d5c393b223531bec5d0b4d6f752be3f90b82e93a31db899dea5ee954d727d8a535e46047be6547ae30528052c371993d264c22582
 AUX strelaysrv.confd 107 BLAKE2B d7a8bf341826c8e3f343d8e39a1e527e8284695fb51324546452c2f5ce8d78034d5e7145a28fc08fff9443af37e263b243f2fe4c580b01a979a6409f0c0c93ee SHA512 67ca4b8a1c9197e0d5876073ccc89d34866e493c66f7691716f1f2b81defd74a79e7aeae9ce42d852e9cb32d7f0df4ffb43b53ae61ec1b4944e63cc0b470e9c5
 AUX strelaysrv.initd 729 BLAKE2B 5a9d55a604604ff1d8ade89ece5a1ff29d75f882a431e06f7f926cd457d1e3db0eebd90c336a848d254de9571385d0ba577a97687809b36fdd0ece301e857c26 SHA512 364ff18453da1a3a76a5bec26403728872ea5f8c551762ac7c091293cd76e01bf9e2fa100dcedf12004e84b5a023e556b713b0e9db0f540062cb4a44562b02e0
 AUX strelaysrv.logrotate 102 BLAKE2B 3d19a7dcade5878e7b7f275572ab2d5232ea3d043b720fa17c208dca456c3e82b5d5158df6633c6fd15d16aa0680bb2a642ba0daf440754fab281e94e69f327d SHA512 2f94be8af78b1beb567a7e6b7177aaa6451cd1ae63ef2842369879cc2e8e0cc2c615f68ce26d7031fbb7268788f7c210c03c33de52ff064b48ca42231613be85
@@ -57,7 +61,10 @@ DIST github.com-vitrun-qart-bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz 2397
 DIST syncthing-0.14.52.tar.gz 10583112 BLAKE2B cceaf0aba9dff96df0551d7aab855cb716be3d252fd677b82e20560f0a2e9eabf513ca7c7acdf4f1a3b4d3d8f6409692df7d2e92b86b1be1753bdd8913e06952 SHA512 cff48ea1d1286c8b1fe971b00423ad64ef10c9b0555f0cae6e008efc07a21698d54d402fe1a0ac3161c0b5180e5ca0099a0a302fd7e7c5da0f227bdb7e2853ce
 DIST syncthing-1.0.1.tar.gz 7114455 BLAKE2B 71c80afaab5a546551e8e72e63272ab277df33645d4de19005376de599d8fe0bad9d4a1e7758321d116f8c46cd73067a770f641a0c736ad678a09579716f44a8 SHA512 7f9fd48e00fae2f0913eb9eeddadaad1d5d7559164a24020706e70411f8ec43420192c4c9422699be6faa1641a382d5b8627038ca9a5dad38ee0e189970efbb7
 DIST syncthing-1.1.0.tar.gz 4658059 BLAKE2B 7b145d0299eada05662f500269d15bee078d00a16ea1cd621fcae0179e6ffc0180741867be33b3736392bb850bf82770a245002d735ba518a48574a11c5c2c07 SHA512 9fd3b7b29fc5842ec0764a274d8695772c1dc23d9c971c4741ea4fba93f93afbdc0df6e743345ebe83a26556e2a693b808a409190d6cc6c61d8d6b9850e5e998
+DIST syncthing-1.1.3.tar.gz 4686497 BLAKE2B d80718bc084212657cb7f1c3a4b5c41f22e43ddbba6923d1daf20328789135fcfca8a0f40adaedd68c1a3c29b891eaed39b0fac2099777999a1e2ed3f980c676 SHA512 43dff52336c19a9a8ce39413a9288d0f500d633589e0f3ff3989ad38d9c6fe6af5b01b27b3143e6beb0841e1e6bc6c590f4859530720e2730cdf214130c99a3a
 EBUILD syncthing-0.14.52.ebuild 3519 BLAKE2B 16e32b0870241dda338ae5d189f417794d1c0d631c20e8a5898fafe362020ed0bb478e19eb2c46bdef9cced55da00ad5e272fc316ef775699ec1cf195c8d3e54 SHA512 66218c53a968625f6350de72d225c2a5a1a5b6fe707599c207bda1a05a3d03fd11c901d8c5433da3f59913bbd67d014d3c7277db2f236d54f437a4dbee59fa7c
 EBUILD syncthing-1.0.1.ebuild 2405 BLAKE2B b86f9fd630a2b4c3dbd41cb8176ec040c27e956b46fefdf252f81e69b5f6448136830ccaad91d5a02e3c41c3583d9f2e0e1a6eafb09f2ce6d952f2917476c615 SHA512 58bfa070682a0037376da86054c456657f2ee9c7723a0d6198972516b0c8077a86acbe715c633c52556fe9cfc1bbb0f36b0e016baa113720e090258184f40e96
+EBUILD syncthing-1.1.0-r1.ebuild 5939 BLAKE2B ac39d2404143e578aaea91a0ae24272aca65016b02b92d066cb0a3aebc56e9aba3fcd7929e186ac10b8a94bee338fe41fd84506f74ffa92db10bd52e3b506622 SHA512 a5c8e3a31ffd008c59cea2bc1cf6281abc9474a686c9aad26ce8af469db7dfcbe9912d33db785fcc7fc10fec424c778591952ffe1abdcd3ac51e22e965c02efa
 EBUILD syncthing-1.1.0.ebuild 5518 BLAKE2B f317a927182f47e49263bef2b42dc4ab0241d18f1dab59b5a851a5745c242aee751ae134e85915a18a83febf990513f865e7081f208123f8917a51157b4d2fdb SHA512 22501deac7b557c74e2167d9233e445f19f6c6b40bafdb7f21d679cf6720346b6ba73fcd84d09411af916a849b0d9869c1244f86161bf3448ae1b2810dceeac9
+EBUILD syncthing-1.1.3.ebuild 5939 BLAKE2B ac39d2404143e578aaea91a0ae24272aca65016b02b92d066cb0a3aebc56e9aba3fcd7929e186ac10b8a94bee338fe41fd84506f74ffa92db10bd52e3b506622 SHA512 a5c8e3a31ffd008c59cea2bc1cf6281abc9474a686c9aad26ce8af469db7dfcbe9912d33db785fcc7fc10fec424c778591952ffe1abdcd3ac51e22e965c02efa
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/files/stdiscosrv.confd b/net-p2p/syncthing/files/stdiscosrv.confd
new file mode 100644
index 000000000000..e40a4b931db7
--- /dev/null
+++ b/net-p2p/syncthing/files/stdiscosrv.confd
@@ -0,0 +1,3 @@
+# Options to pass to discosrv
+# see /usr/libexec/syncthing/stdiscosrv --help for more information
+SD_OPTS=
diff --git a/net-p2p/syncthing/files/stdiscosrv.initd b/net-p2p/syncthing/files/stdiscosrv.initd
new file mode 100644
index 000000000000..333b980897b3
--- /dev/null
+++ b/net-p2p/syncthing/files/stdiscosrv.initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+SD_USER=stdiscosrv
+SD_GROUP=stdiscosrv
+SD_HOMEDIR=/var/lib/stdiscosrv
+SD_LOGFILE=/var/log/syncthing/stdiscosrv.log
+
+
+description="Discovery service for syncthing"
+command="/usr/libexec/syncthing/stdiscosrv"
+command_args="${SD_OPTS}"
+pidfile="/run/stdiscosrv.pid"
+start_stop_daemon_args="--background
+  --user ${SD_USER}
+  --group ${SD_GROUP}
+  --chdir \"${SD_HOMEDIR}\"
+  --make-pidfile
+  --stdout \"${SD_LOGFILE}\"
+  --stderr \"${SD_LOGFILE}\"
+  "
+
+depend() {
+  need net
+}
+
+start_pre() {
+  checkpath -q -d -o ${SD_USER}:${SD_GROUP} ${SD_HOMEDIR}
+  checkpath -q -f -o ${SD_USER}:${SD_GROUP} ${SD_LOGFILE}
+}
diff --git a/net-p2p/syncthing/files/stdiscosrv.logrotate b/net-p2p/syncthing/files/stdiscosrv.logrotate
new file mode 100644
index 000000000000..406a1122a240
--- /dev/null
+++ b/net-p2p/syncthing/files/stdiscosrv.logrotate
@@ -0,0 +1,6 @@
+/var/log/syncthing/stdiscosrv.log {
+    missingok
+    notifempty
+    sharedscripts
+    copytruncate
+}
diff --git a/net-p2p/syncthing/files/stdiscosrv.service b/net-p2p/syncthing/files/stdiscosrv.service
new file mode 100644
index 000000000000..4011c7d4c5bd
--- /dev/null
+++ b/net-p2p/syncthing/files/stdiscosrv.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Syncthing discovery server
+After=network.target
+
+[Service]
+User=stdiscosrv
+Group=stdiscosrv
+ExecStart=/usr/libexec/syncthing/stdiscosrv
+WorkingDirectory=/var/lib/stdiscosrv
+
+PrivateTmp=true
+ProtectSystem=full
+ProtectHome=true
+NoNewPrivileges=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/syncthing/syncthing-1.1.0-r1.ebuild b/net-p2p/syncthing/syncthing-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..b03fd9fcd02e
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.1.0-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/${PN}/${PN}"
+
+EGO_VENDOR=(
+	"github.com/AudriusButkevicius/go-nat-pmp 452c97607362b2ab5a7839b8d1704f0396b640ca"
+	"github.com/AudriusButkevicius/recli v0.0.5"
+	"github.com/bkaradzic/go-lz4 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a"
+	"github.com/calmh/du v1.0.1"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/chmduquesne/rollinghash a60f8e7142b536ea61bb5d84014171189eeaaa81"
+	"github.com/d4l3k/messagediff v1.2.1"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff"
+	"github.com/gobwas/glob 51eb1ee00b6d931c66d229ceeb7c31b985563420"
+	"github.com/gogo/protobuf v1.2.0"
+	"github.com/golang/groupcache 84a468cf14b4376def5d68c722b139b881c450a4"
+	"github.com/golang/snappy 553a641470496b2327abcac10b36396bd98e45c9"
+	"github.com/jackpal/gateway 5795ac81146e01d3fab7bcf21c043c3d6a32b006"
+	"github.com/kballard/go-shellquote cd60e84ee657ff3dc51de0b4f55dd299a3e136f2"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/lib/pq v1.0.0"
+	"github.com/mattn/go-isatty v0.0.4"
+	"github.com/minio/sha256-simd cc1980cb03383b1d46f518232672584432d7532d"
+	"github.com/onsi/ginkgo 6c46eb8334b30dc55b42f1a1c725d5ce97375390"
+	"github.com/onsi/gomega ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64"
+	"github.com/oschwald/geoip2-golang v1.1.0"
+	"github.com/oschwald/maxminddb-golang 26fe5ace1c706491c2936119e1dc69c1a9c04d7f"
+	"github.com/petermattis/goid 3db12ebb2a599ba4a96bea1c17b61c2f78a40e02"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/prometheus/client_golang v0.9.2"
+	"github.com/rcrowley/go-metrics e181e095bae94582363434144c61a9653aff6e50"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/syncthing/notify 4e389ea6c0d84e6195eb585ffaf62c8c143306ae"
+	"github.com/syndtr/goleveldb 34011bf325bce385408353a30b101fe5e923eb6e"
+	"github.com/thejerf/suture v3.0.2"
+	"github.com/urfave/cli v1.20.0"
+	"github.com/vitrun/qart bf64b92db6b05651d6c25a3dabf2d543b360c0aa"
+	"golang.org/x/crypto 0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8 github.com/golang/crypto"
+	"golang.org/x/net 351d144fa1fc0bd934e2408202be0c29f25e35a0 github.com/golang/net"
+	"golang.org/x/sys 4d1cda033e0619309c606fc686de3adcf599539e github.com/golang/sys"
+	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
+	"golang.org/x/time 6dc17368e09b0e8634d71cac8168d853e869a0c7 github.com/golang/time"
+	"gopkg.in/asn1-ber.v1 v1.2 github.com/go-asn1-ber/asn1-ber"
+	"gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
+	"gopkg.in/ldap.v2 v2.5.1 github.com/go-ldap/ldap"
+	"gopkg.in/yaml.v2 v2.0.0 github.com/go-yaml/yaml"
+	# These are only used by the test suite but conditional vendoring is messy
+	"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+	"github.com/golang/protobuf v1.2.0"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
+	"github.com/prometheus/common v0.1.0"
+	"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
+)
+
+inherit golang-vcs-snapshot systemd user xdg-utils
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="selinux tools"
+
+BDEPEND=">=dev-lang/go-1.12"
+RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+
+	if use tools ; then
+		# separate user for the discovery server
+		enewgroup stdiscosrv
+		enewuser stdiscosrv -1 -1 /var/lib/stdiscosrv stdiscosrv
+		keepdir /var/lib/stdiscosrv
+		fowners stdiscosrv:stdiscosrv /var/lib/stdiscosrv
+
+		# separate user for the relay server
+		enewgroup strelaysrv
+		enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
+		# and his home folder
+		keepdir /var/lib/strelaysrv
+		fowners strelaysrv:strelaysrv /var/lib/strelaysrv
+	fi
+}
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+}
+
+src_compile() {
+	export GOPATH="${S}:$(get_golibdir_gopath)"
+	cd src/${EGO_PN} || die
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	cd src/${EGO_PN} || die
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	pushd src/${EGO_PN} >& /dev/null || die
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	if use tools ; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+	popd >& /dev/null || die
+
+	# openrc and systemd service files
+	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use tools ; then
+		# openrc and systemd service files
+
+		systemd_dounit "${FILESDIR}/stdiscosrv.service"
+		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
+		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
+
+		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}
diff --git a/net-p2p/syncthing/syncthing-1.1.3.ebuild b/net-p2p/syncthing/syncthing-1.1.3.ebuild
new file mode 100644
index 000000000000..b03fd9fcd02e
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.1.3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/${PN}/${PN}"
+
+EGO_VENDOR=(
+	"github.com/AudriusButkevicius/go-nat-pmp 452c97607362b2ab5a7839b8d1704f0396b640ca"
+	"github.com/AudriusButkevicius/recli v0.0.5"
+	"github.com/bkaradzic/go-lz4 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a"
+	"github.com/calmh/du v1.0.1"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/chmduquesne/rollinghash a60f8e7142b536ea61bb5d84014171189eeaaa81"
+	"github.com/d4l3k/messagediff v1.2.1"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff"
+	"github.com/gobwas/glob 51eb1ee00b6d931c66d229ceeb7c31b985563420"
+	"github.com/gogo/protobuf v1.2.0"
+	"github.com/golang/groupcache 84a468cf14b4376def5d68c722b139b881c450a4"
+	"github.com/golang/snappy 553a641470496b2327abcac10b36396bd98e45c9"
+	"github.com/jackpal/gateway 5795ac81146e01d3fab7bcf21c043c3d6a32b006"
+	"github.com/kballard/go-shellquote cd60e84ee657ff3dc51de0b4f55dd299a3e136f2"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/lib/pq v1.0.0"
+	"github.com/mattn/go-isatty v0.0.4"
+	"github.com/minio/sha256-simd cc1980cb03383b1d46f518232672584432d7532d"
+	"github.com/onsi/ginkgo 6c46eb8334b30dc55b42f1a1c725d5ce97375390"
+	"github.com/onsi/gomega ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64"
+	"github.com/oschwald/geoip2-golang v1.1.0"
+	"github.com/oschwald/maxminddb-golang 26fe5ace1c706491c2936119e1dc69c1a9c04d7f"
+	"github.com/petermattis/goid 3db12ebb2a599ba4a96bea1c17b61c2f78a40e02"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/prometheus/client_golang v0.9.2"
+	"github.com/rcrowley/go-metrics e181e095bae94582363434144c61a9653aff6e50"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/syncthing/notify 4e389ea6c0d84e6195eb585ffaf62c8c143306ae"
+	"github.com/syndtr/goleveldb 34011bf325bce385408353a30b101fe5e923eb6e"
+	"github.com/thejerf/suture v3.0.2"
+	"github.com/urfave/cli v1.20.0"
+	"github.com/vitrun/qart bf64b92db6b05651d6c25a3dabf2d543b360c0aa"
+	"golang.org/x/crypto 0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8 github.com/golang/crypto"
+	"golang.org/x/net 351d144fa1fc0bd934e2408202be0c29f25e35a0 github.com/golang/net"
+	"golang.org/x/sys 4d1cda033e0619309c606fc686de3adcf599539e github.com/golang/sys"
+	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
+	"golang.org/x/time 6dc17368e09b0e8634d71cac8168d853e869a0c7 github.com/golang/time"
+	"gopkg.in/asn1-ber.v1 v1.2 github.com/go-asn1-ber/asn1-ber"
+	"gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
+	"gopkg.in/ldap.v2 v2.5.1 github.com/go-ldap/ldap"
+	"gopkg.in/yaml.v2 v2.0.0 github.com/go-yaml/yaml"
+	# These are only used by the test suite but conditional vendoring is messy
+	"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+	"github.com/golang/protobuf v1.2.0"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
+	"github.com/prometheus/common v0.1.0"
+	"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
+)
+
+inherit golang-vcs-snapshot systemd user xdg-utils
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="selinux tools"
+
+BDEPEND=">=dev-lang/go-1.12"
+RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+
+	if use tools ; then
+		# separate user for the discovery server
+		enewgroup stdiscosrv
+		enewuser stdiscosrv -1 -1 /var/lib/stdiscosrv stdiscosrv
+		keepdir /var/lib/stdiscosrv
+		fowners stdiscosrv:stdiscosrv /var/lib/stdiscosrv
+
+		# separate user for the relay server
+		enewgroup strelaysrv
+		enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
+		# and his home folder
+		keepdir /var/lib/strelaysrv
+		fowners strelaysrv:strelaysrv /var/lib/strelaysrv
+	fi
+}
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+}
+
+src_compile() {
+	export GOPATH="${S}:$(get_golibdir_gopath)"
+	cd src/${EGO_PN} || die
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	cd src/${EGO_PN} || die
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	pushd src/${EGO_PN} >& /dev/null || die
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	if use tools ; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+	popd >& /dev/null || die
+
+	# openrc and systemd service files
+	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use tools ; then
+		# openrc and systemd service files
+
+		systemd_dounit "${FILESDIR}/stdiscosrv.service"
+		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
+		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
+
+		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index ddfbb9bceba3..baef38d0c7b4 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 56ac2c0c4aab..5471b235144c 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,3 +1,3 @@
 DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
-EBUILD cndrvcups-lb-3.60-r2.ebuild 2677 BLAKE2B 4f99a32d087099a6c6e5c0b8ee60fb03553ca8f0e68226d1cb96ac8ae729bb4332a2879c90f5c4ff45bfa49f7f1818d098aed71e295cc416beb7a1c4550b54eb SHA512 10cc5d47d4b090e40dd47e08517896df89010c543d70b110e7f595e95cd0119790af6cab9a864e2c3036ab942540511b7495582b199d83463eb0384bb1cd603c
+EBUILD cndrvcups-lb-3.60-r2.ebuild 2645 BLAKE2B d691db4a3275fde32c17916fa4d7df7c9986d77968c60330a4cba3b0e1b36617665ff22d722c45814ef88db11d67942f1e9797277abceca6b554cba4ae2481a9 SHA512 ff473b4b6f4bd5ad685184ddddd269bf8b2ab5d4071ee064eae50e9c091fa110e324c255b05f44a944a1a96f4b818fa59536d30ca5bab75972aee94b13b1ab3d
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
index b345ec6eeddc..ec74c2e7a0ee 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 	>=net-print/cups-1.1.17
 	~net-print/cndrvcups-common-lb-${PV}
 	>=x11-libs/gtk+-2.4:2
-	virtual/jpeg:62[abi_x86_32(-)]
 "
 DEPEND="${DEPEND}"
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 9211299f037f..ba3797bf123d 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -3,7 +3,9 @@ DIST hplip-3.18.12.tar.gz 24588202 BLAKE2B f2ffa6d0d54e467c03ccf9e74accb62ef6984
 DIST hplip-3.18.3-patches-2.tar.xz 8936 BLAKE2B 58c17f3b6332de1edd88a3b458f1e9f856bc917842f62eee0808469ec14ff5793cd33c7a2ba30593eba624e58c12a6d426fa43a7d375d6ac50b985b895a85b4c SHA512 cbafcd9616f9c86318007b703325d3429ed0698c3fc9d3eddd422e4cd7a16c77320ac168bfa01b5874213e1740cfaae1867d31c3cf96cd57573ad33651a674ed
 DIST hplip-3.18.6.tar.gz 22590564 BLAKE2B edbc80120bb332de9848e528095839b8f3496404ae83482a17bb8bd196c30dd8d3fca4d3dbb60c048bfbeeddd4384b4d7844798dad993eaf52d5418a9391b4ad SHA512 deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f
 DIST hplip-3.19.3.tar.gz 25068895 BLAKE2B 380fc54c814e38a113d8cfb5d4199bad4f53fbf04535a512e37932d34285e221cf013f688eeeba1cb025ea5230b15cddc9ad0bf5f492170c768662057cbe486e SHA512 6191974d6c9a35e58a9b0d2ff1077b3a9479e44ccb76a551f3e29ca56d420bfe0778fa6b7a4e51b18f2e55cae9ad1f5216f716e22b651122ec0fe9e730fcd29a
+DIST hplip-3.19.5.tar.gz 25263343 BLAKE2B 7a7d2afeadd99dcd9a4a251ef6243f5e33d892b9c2a9f801b92f3d443eed0dad9928010164f2d2778f22dfb92643dc79c06ef25eaddfbf56a7c26a9fd68a2313 SHA512 bee7d64cea10020844b08b78a754ab9fa51aa699b365f2ccd98f18a9286a660e3c32ae1b5a173397c75fe2acafe801f3e6d7eabedcd95f2f064b89afe7726494
 EBUILD hplip-3.18.12.ebuild 7741 BLAKE2B 751b37522049c4a2f8f6bec7d7b264fdb823adf3e9db612c3782ad19dcc8a551dc2df7811ab97bc9acbd5995063af9b40aff0c3deac422a9a274be26ecc22932 SHA512 577a06b65a059d039951ed49c4b995d5f1d5f0a61e0fa16f33e34a6b55380676c9defe0dc801419163f7195c655c1d6ea2f1709ebccf17bc5f74c40077a40bcb
 EBUILD hplip-3.18.6.ebuild 7810 BLAKE2B 9e5c8e58b368f45f4bb986f72329d952ebdef1dc899252585a73726c79958e768f271a0d756ffd91839184f3d839ced35bebb080b38014a605f0e7af558f9aa5 SHA512 4db0fbae5a50f352cc4a18ee94eaf97de4e327a375c66057a4a873ed57580f9d38957932aed61827e137cf0de51ffbedad71a03a13504f6f89ea427bada03c25
 EBUILD hplip-3.19.3.ebuild 7743 BLAKE2B afd1f59ad7c15e2801d2cdaaac099061606ca22e1a229c391c46c7ec35220b894512d75e611671f16657db5d8cecf8d8fabb195277cfe898b713d9eaa8c9f904 SHA512 d283fc0e5784e9f9d3e298ab186d97692bf071bc2c12c5bec53ebe0c26094252f036858186e395f0a9e1c346407c53d21c3ca5c49e231884293e1039346ec62f
+EBUILD hplip-3.19.5.ebuild 7743 BLAKE2B afd1f59ad7c15e2801d2cdaaac099061606ca22e1a229c391c46c7ec35220b894512d75e611671f16657db5d8cecf8d8fabb195277cfe898b713d9eaa8c9f904 SHA512 d283fc0e5784e9f9d3e298ab186d97692bf071bc2c12c5bec53ebe0c26094252f036858186e395f0a9e1c346407c53d21c3ca5c49e231884293e1039346ec62f
 MISC metadata.xml 1829 BLAKE2B 614757c5958bb24f223c75a252beb06014bfe7f47cfe58feb88be89918394224b7075e0d444d7bb898f9f478c2ae5cf572df3f905ff110ec1153cf1849cc8e46 SHA512 c6aae86cd5a200b7d42336f0884b87dc0b74d2b2216b8002929a56a53f42ec02447684eb8d0411e30ef707e01d930aac446866796c781f95a3463f84901666f6
diff --git a/net-print/hplip/hplip-3.19.5.ebuild b/net-print/hplip/hplip-3.19.5.ebuild
new file mode 100644
index 000000000000..0c753a8bdef0
--- /dev/null
+++ b/net-print/hplip/hplip-3.19.5.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.12-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+		kernel_linux? ( virtual/udev )
+		qt5? (
+			>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+			libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
+		)
+		scanner? (
+			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+			X? (
+				|| (
+					kde? ( kde-misc/skanlite )
+					media-gfx/xsane
+					media-gfx/sane-frontends
+				)
+			)
+		)
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		--enable-hpps-install \
+		--disable-class-driver \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${ED}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-proxy/3proxy/3proxy-0.8.12.ebuild b/net-proxy/3proxy/3proxy-0.8.12.ebuild
new file mode 100644
index 000000000000..5ebf6061b3da
--- /dev/null
+++ b/net-proxy/3proxy/3proxy-0.8.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A really tiny cross-platform proxy servers set"
+HOMEPAGE="https://www.3proxy.ru/"
+SRC_URI="https://github.com/z3APA3A/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.12-gentoo.patch
+)
+
+DOCS=( README cfg )
+HTML_DOCS=( doc/html/. )
+
+src_prepare() {
+	default
+	cp Makefile.Linux Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LN="$(tc-getCC)"
+}
+
+src_install() {
+	local x
+
+	pushd src >/dev/null || die
+	dobin 3proxy
+	for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts icqpr smtpp; do
+		newbin ${x} ${PN}-${x}
+		[[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8
+	done
+	popd >/dev/null
+
+	doman man/3proxy*.[38]
+
+	einstalldocs
+}
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index bae405396403..0b02cc1dc9b4 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,4 +1,7 @@
+AUX 3proxy-0.8.12-gentoo.patch 1749 BLAKE2B 8ee153ae343989faef6f36dbdc072b933fbee2d2ad129b0e6573dd57e465916d94f0868fcfd03a2099879b3c7bc925ac3be1adb7be52043fbb9996cbc8ff0ed2 SHA512 b8c3a9d5cf1ad20ef517ec6ec5626cf9f6094777c0870e53fd35e32f49a518fecdfa05a5806514957d10943da7bdcaa63e2ad6fce32506d7fd1a467bb7b2e652
 AUX 3proxy-0.8.8-gentoo.patch 1471 BLAKE2B daccc5f278ba4ac59aad24b463557a49e177f0dea679deea0b1282ba31eac21d76ee4587c3a6523da29ea8130ac24c75ee8b0ceecceb1ec57a53cc6028c9bb51 SHA512 9c41df962691f8b2b832495a5e644fcbe58805839b2b40dd65564dc3eb9897de1a744677e2c4a032e39d64b34c4190893049f2ed86be8908f739f720633b2f3a
+DIST 3proxy-0.8.12.tar.gz 528990 BLAKE2B fb338c93e25fe4d03d626118f8c3ef52af7104599e11d535dfa572c4fb47d609da66f199406a3c6bb9739766163bb7b54b529f71d4d6ff637567f2f67d3a9ed1 SHA512 33412e89991055598e06210dbcd7b2f9ee6810753c8f40ada02f222def0a49047a90ff7f2efa6895bc4f8ad99193866c980de2e79464310a77cc8e63c8b9813d
 DIST 3proxy-0.8.9.tar.gz 497006 BLAKE2B c57e98eb586dfacefd530e091fecbee274d8104698ca082b71ea0607294199cb7db63fc32787236b7e797c928a7ba4f7bafa3ef35551bef76aacfbdf1f259fff SHA512 35153882fec7077b05b23f9cea91443126a8a9faf9818915612e0739196a8bd1f00e0bcefb339a86bad10bb0c1b9891bd06847934787f4758ec55e6cc2e9e815
+EBUILD 3proxy-0.8.12.ebuild 923 BLAKE2B 1a29d1e6f61fe79a9db6a1963794fb7276ae4364caa6d4549506ac65b947daf7344512c902e1428f10cf55be5e27d75416927be6f6c41872c423c91997f29426 SHA512 55101f5091f615a6411680b737ea82f275e910d9d9bc93ceacb42ab297cbe4099aa7746cf1578a34bcc1b187e822f9ff118bf80866e75166ad1554bca500c006
 EBUILD 3proxy-0.8.9.ebuild 837 BLAKE2B 7f5666c6d09b04d57be1147421436435f0ce8487ae5957a474cee81064642bde3b4b80b52d9a14c6a9e0c16e61518cf6b1a412dddf354edc2cbec821e2351207 SHA512 ef8abe07dff61866d3b2a887511aaaba995fbdf3173213790f71a42f64d61b2fa224f41cb1f11d9d42ffbca04c579a013f2adc8ce19c06f03b9b5491552009c4
 MISC metadata.xml 1102 BLAKE2B 1c5bfc3ff94b076a5bc8f7c87091b08e9f2fe69a49776687379d1149cfc3cc3f04fff7278858a548746110533b528fa0d83e7af9c384143ddcf6a9d3e796502b SHA512 f9c7b4b3b9f045b76049a75f2e65f70a316a3ad08f44a39d1c7ea23e5b23bc92232eae7487b4bf7534bb2fbd2655a9debf35ac3ba8ee4de6583d49f61bfc6076
diff --git a/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch
new file mode 100644
index 000000000000..33950f45ceeb
--- /dev/null
+++ b/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch
@@ -0,0 +1,49 @@
+diff -uNr a/Makefile.Linux b/Makefile.Linux
+--- a/Makefile.Linux	2018-04-18 22:48:45.000000000 +0300
++++ b/Makefile.Linux	2019-05-26 14:42:38.927811513 +0300
+@@ -8,13 +8,13 @@
+ # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
+ 
+ BUILDDIR =
+-CC = gcc
++CC ?= gcc
+ 
+-CFLAGS = -g -O2 -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
++CFLAGS += -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
+ COUT = -o 
+-LN = gcc
++LN ?= gcc
+ DCFLAGS = -fpic
+-LDFLAGS = -O2 -fno-strict-aliasing -pthread
++LDFLAGS += -fno-strict-aliasing -pthread
+ DLFLAGS = -shared
+ DLSUFFICS = .ld.so
+ # -lpthreads may be reuqired on some platforms instead of -pthreads
+@@ -39,12 +39,12 @@
+ include Makefile.inc
+ 
+ allplugins:
+-	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;	cd ../.. ; done
++	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ;	cd ../.. ; done
+ 
+ DESTDIR		=
+-prefix		= /usr/local
++prefix		=
+ exec_prefix	= $(prefix)
+-man_prefix	= $(prefix)/share
++man_prefix	= $(prefix)/usr/share
+ 
+ INSTALL		= /usr/bin/install
+ INSTALL_BIN	= $(INSTALL) -m 755
+diff -uNr a/src/stringtable.c b/src/stringtable.c
+--- a/src/stringtable.c	2018-04-18 22:48:45.000000000 +0300
++++ b/src/stringtable.c	2019-05-26 14:42:07.437810566 +0300
+@@ -38,7 +38,7 @@
+ /* 24 */	NULL,
+ #ifndef TPROXY_CONF
+ #ifndef _WIN32
+-/* 25 */	(unsigned char *)"/usr/local/etc/3proxy/3proxy.cfg",
++/* 25 */	(unsigned char *)"/etc/3proxy/3proxy.cfg",
+ #else
+ /* 25 */	(unsigned char *)"3proxy.cfg",
+ #endif
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 4c7a3adae643..ecfcf475b1f7 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 85d74032a3ff..7d90d37e1ee2 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,4 +1,6 @@
-AUX trojan.initd 542 BLAKE2B 2e5597381353f1aa8da392027b9a4179da08bb387a776f584bd508f9e7d20747317d78ed7506e97047eb809e0e9726f3f52a9f75a2aacf26d349ec8628b23acb SHA512 1e1f230c96c1d7f8c6f0dc23c40eb8895d004448d802c85d62b34e186bea964753e28e90978075dcbe9fbc2e73074564303f6e28cf12633e424230a2d415910e
+AUX trojan.initd 539 BLAKE2B 1dcca22a0647d109928570ab58780237a67bf5bd5952da6a0e68cc4b8d75348b392ea309beddda64e3f00619f3ce2744a29445794338c406b50b28cd44687fcd SHA512 d032f840d2e3dc0a9f3fe92d40aad3946a9c70217c673ecb89a9da8bf14fa9c4e764431534f63edf70d38fed293903aa8a298af474ddc8343e10d169855d81e6
 DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1 SHA512 9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf
+DIST trojan-1.12.2.tar.gz 41742 BLAKE2B 7090c426c66877ed31a61b8b678d5169094af4687b37622cacac758ce907154f579b5a5455d850ed1ca5fb70e8793a13c3c4aa20015cca70d78d0ce51c747e2c SHA512 1cf0eb7cf740f6212140886e481adb00883f7132ba21d346812a2c23fca35222b93251b3cdaba6b6dad66b15f743d8627a5d42e28f32aaef5cab682ea37b5983
 EBUILD trojan-1.10.0.ebuild 1024 BLAKE2B 37744644fa8f9e38d54cdc08cbaf6174676e7b6fdc8521c62b403048fc827c62eb2fe8b9f611195a55463626d69835641c2245ebabf645dcfea46e185f2de662 SHA512 306cb838df2d05604940c1c519865829e3eb65a78e87df80b248cf93eb8d4628a69f65460cdf5e8537ef9f2622cae960bbfd0b4c82491fe369e477959283a118
+EBUILD trojan-1.12.2.ebuild 1021 BLAKE2B 14122028ed5d2eaed5b8ceeb702119efffb1864a7b09f7db43501ca546c100dad1c666502ca159a371415d912f4352066c6a1a71acc249a2f68520fca63ae6dc SHA512 86108b7321ae1bb4bc5fed94196f463fbbaafa58cea4a4c5003d84aa5947b01d547d266b8e9496326ce3f6eb78f1197ae6329f774f21337723597b55e50721b6
 MISC metadata.xml 1023 BLAKE2B cea392d59eea944198e523e0dfdab0325180568d9f3f39e40fc7c94c43a1c8b9811e787da5174f4f0b85d932778b34dcf4a07afccc4cf02972de57e7a3004ad4 SHA512 b1a1a6bdb8ea7d62bce25a439753c85e5e340be804ac8a71a3fbbd4f671270c174f9db77b72c2d00cdc1ede7cea6f7a86d2401e6cb8c8f9e395573c9216dfa4b
diff --git a/net-proxy/trojan/files/trojan.initd b/net-proxy/trojan/files/trojan.initd
index f525eefe74df..cee794ad4d72 100755..100644
--- a/net-proxy/trojan/files/trojan.initd
+++ b/net-proxy/trojan/files/trojan.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 TJ_CONFIG="/etc/trojan/config.json"
diff --git a/net-proxy/trojan/trojan-1.12.2.ebuild b/net-proxy/trojan/trojan-1.12.2.ebuild
new file mode 100644
index 000000000000..e394deff72a0
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.12.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit cmake-utils python-any-r1 systemd
+
+DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
+HOMEPAGE="https://github.com/trojan-gfw/${PN}"
+SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mysql test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/boost-1.66.0:=
+	>=dev-libs/openssl-1.0.2:=
+	mysql? ( dev-db/mysql-connector-c:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( net-misc/curl ${PYTHON_DEPS} )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_MYSQL=$(usex mysql)
+		-DSYSTEMD_SERVICE=ON
+		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/trojan.initd" trojan
+}
+
+src_test() {
+	cmake-utils_src_test -j1
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 87386785137e..85a36faa9b46 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 80cbe5119dce..5fe6584d420f 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,4 +1,6 @@
 DIST libreswan-3.27.tar.gz 3720103 BLAKE2B 51ee792cd3fb8330a9cfee0b1a27e48c9a8c8fd3346e8c06fe0a911c813c400ef62d68b1d06bb849695aad5f4d5a496dc444b2543aa9ffbc59d373081c0b85e5 SHA512 b92ecfd08b9d19dc801032176eff3dd07f625223d4f0dd07ff10f639644573430a55f7aebfcc8b9d2424e194ca9d06b17ad5a13dad5dc6f659d19bc5d32520f5
+DIST libreswan-3.28.tar.gz 3842828 BLAKE2B 7e78f3c6d1d6a22a64f1316bb63366823ce763a3eb236e2cd64dc7f3fa9a84caff7a31cb65a6583521280e5ee84ac220c1770d230ba0b7098a1582613751c456 SHA512 aeb3ea723f2ca10098f2626172166cddea59b3bc084f0fefc823fd784d8986b12adc5a5b0965f2c7ecdfff5ac8029a922b8357debf79ff43605783d80e144983
 EBUILD libreswan-3.27-r1.ebuild 2939 BLAKE2B bbceef07aaefbf8323a2342bf8479ae47ef9824581095d065a5d61ffc9e3c6434f8217b88221c421f2d1f377cf8f50c3e31661b7627abbc81a51ad7e2fc9a759 SHA512 6de7bbf1962589cfd1b4cdb4d9b3db2fec2d997a5e7c46dbfd35330521a3c42915adf36a6214736da5173f851fd3f659f89d23782a197d72a5d33be29e42b093
 EBUILD libreswan-3.27.ebuild 2811 BLAKE2B 04ac4dc887783fcadd8aaa444ec59c71b9221b4f968d6ab13305866d26f5025208c806307b63874607de8617ad64e69fce54b7a08d3e958b20e5331531048f94 SHA512 e3b7a8b50f17f426cdab73fc237ef555e8d0d89d06546a60d0c38d01001620e9b03ec4e8e933aa587561019057aa71ee80250b8c3ae6aac502a93e5c6a5cd77b
+EBUILD libreswan-3.28.ebuild 3013 BLAKE2B ec5f6ba88f5b46217b3ed5f987b51a83949536581f63e9b89a84bc5d5c9bb6a3c71a7133614b032513283fe0827421d3b62740afa03d782fe44bdac0bf50b1bc SHA512 be0989524389b7d8cd382b2b12d9d18ce62c5558ea8ad162d3e0a1edb78370ce55f13444324c90c254b51e8e9ee8d273f837e32042f97be368ee9723c10c6b78
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.28.ebuild b/net-vpn/libreswan/libreswan-3.28.ebuild
new file mode 100644
index 000000000000..9d4ae2605aac
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-3.28.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-misc/openswan
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export INC_USRLOCAL=/usr
+	export INC_MANDIR=share/man
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INC_RCDIRS=
+	export INC_RCDEFAULT=/etc/init.d
+	export USERCOMPILE=
+	export USERLINK=
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_XAUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	local IPSEC_CONFDIR=${ROOT%/}/etc/ipsec.d
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/networkmanager-openconnect/Manifest b/net-vpn/networkmanager-openconnect/Manifest
index 91aa8e1a98c6..8e14df5008ad 100644
--- a/net-vpn/networkmanager-openconnect/Manifest
+++ b/net-vpn/networkmanager-openconnect/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-openconnect-1.2.4.tar.xz 647944 BLAKE2B a2a096224a42e5ab55743e46d9030eb036cb0d8d43a957c2b7f056f7de8763ec8d2de84701ac59951540aceefd0329614eb50aa5c57600b3e72fbce0118fe431 SHA512 203652a468525c3f6d374ce7fbf2f5b904a13b5e74fb3898dbfeec863c64a60fd9826fc5d9edb52c3e75b9871f49cb78580914e37a3522e4676ca1c29102d0a2
-EBUILD networkmanager-openconnect-1.2.4-r1.ebuild 1121 BLAKE2B a47eb36ad4953016c9e78cea3127a4012a508cd625423d23036c5b5f8888125dddb7126817714a7824bebcfc80d06860f42b51106d83780d7169c66f5f4459c6 SHA512 5ad925a1c60068aade726ad09e98b41c675a07931ce0671b70e6fc0749d59bdc47cb52fbb29b7391beee8a8a93ef70ce36cc463a61a729a7f8e909d2ace583d1
+EBUILD networkmanager-openconnect-1.2.4-r1.ebuild 1120 BLAKE2B 2ff3d693764a66d9e8ae57d110833cefe4691e2d1b0548421162970e41c33abb4f8698aa0d54277d387ad30b82e52b252db0850505cd834bb4eb4089b3999a6e SHA512 22a3de3521ef79f93c518ee4a4c4ac939ef683699db3ee142d255ab3f648f36ece2517534474537d02a54429a8d796ab3034f33c5d0772c5558fa32763659e2d
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
index 22e99755b27e..e69273edff31 100644
--- a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
+++ b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 1362e7f844f4..afba45d3dc2b 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -5,7 +5,7 @@ DIST openconnect-7.08.tar.gz 1686133 BLAKE2B 265c43982b475ef1e49d7bf16e782c82b9a
 DIST openconnect-8.02.tar.gz 1876135 BLAKE2B aef1f17702ddbbd392c3203f4235a6e24ca5ecbfe144652675ac8b98c0cbb85bf8cc5563295150cf385d3c0bc5a9b3ad84228706baa17f56dd62b798cbdd05d1 SHA512 690a51198aeaf4bb1cd0901b0799ac991712a29aa899fe735a7b5201683cd627556eebeefba01d0c752ba44ba0a6c5ee1c3647d692383f3f4b335e79c5337cbc
 DIST vpnc-scripts-20180227.tar.gz 21241 BLAKE2B 2ba4c76121ba9c5d307233d6f8c91db03c8da4882b8f6dfeed335f7fcc30438df8fe0657a1177e7e551566b597e195cf41bb6e27e13b757a0c931e8574de9a5e SHA512 9a508426e9307213078ce57b59d25168647fa5d2e823b1085e93401259b0a52269e948c8292e4055babf3e8b3c087a23475b5caa2a43c11feb2df8b0d8843972
 DIST vpnc-scripts-20190117.tar.gz 21412 BLAKE2B 47adc50fe8940e6f5253321d2ef91abeb03e131dc0c1ba02f33f90c9a1ef75c0e838c0215c7ac419134c620b83a449e225d6ba5d77bb98d8f461406cb39eed9f SHA512 d01bb52532bd96f1bbf9735b8d5530c762c80205e53057f619db6090556887da1c91fe111da9937b452910f493e73dad26fcd20d3bd97248099d90ffa3060cde
-EBUILD openconnect-7.08-r1.ebuild 3721 BLAKE2B 765faa806a725c554faca14efe1317e7facddac5d701d9a3e252bca579f5be311576886d9b91e94fa31b0feec97ff5aee0427458ac66265edb51ce4671dacac6 SHA512 87eebbe79f95c5502b3eb3fcedbe38639fc700c76b3287d352f35e88e8d8a14dd1a992effe85154510bcea2e26895e00e43302709b370ad8ccc5b6343456e559
+EBUILD openconnect-7.08-r1.ebuild 3720 BLAKE2B 8fff58b2aa115deab2eb95cc397ec5cfb97fa196320a48439484ffda5aa63fe5a057f26ed56e4ee27506f446432ed4c8c738e0834f7ac4f77395427e18bc0456 SHA512 0b6c4e0590b5de04fad4be0b08306bca4359812f6521cdbd5ced8c83567591b5ed32761d9d9562c1b784203eda0f323046b79c40f91bbd2adfa835cf4e3ee672
 EBUILD openconnect-8.02.ebuild 3637 BLAKE2B 9ed3a5704bf71fb5267b130b81474cbedecdbbd4f8d581d13e0c34de89669045412b3a902d1c6612af0f2f88b57457453aaa31e252b2e3ff63f4cf4aabe9f503 SHA512 8d6aea2fd2d98bc8c2efdf1ebb3c5762c1b702a9c9c197cc0d9e54788c29e13d7bf5cd684aa7f731b6dc0908544e6c5a3ef9a32981ea4177022feacc20a982df
 EBUILD openconnect-9999.ebuild 3637 BLAKE2B 9ed3a5704bf71fb5267b130b81474cbedecdbbd4f8d581d13e0c34de89669045412b3a902d1c6612af0f2f88b57457453aaa31e252b2e3ff63f4cf4aabe9f503 SHA512 8d6aea2fd2d98bc8c2efdf1ebb3c5762c1b702a9c9c197cc0d9e54788c29e13d7bf5cd684aa7f731b6dc0908544e6c5a3ef9a32981ea4177022feacc20a982df
 MISC metadata.xml 642 BLAKE2B 57e9e1e2bdbbac2deaa1419dd84f793b9e6adfedddb04a57813633d1a552e13d392648782ed642bf6602b1e48b47432aa3bd05588f9e410ed67d775d34adca80 SHA512 3a6b08e9258161af07ff47a0c52fe294185a2dd41bb7786500bfc35d56a1c1e366d013979a3bba6a80d8350e5765cb06876e9f4270c1e504445224a308de185f
diff --git a/net-vpn/openconnect/openconnect-7.08-r1.ebuild b/net-vpn/openconnect/openconnect-7.08-r1.ebuild
index 46f90fa74f44..db3c5070cabc 100644
--- a/net-vpn/openconnect/openconnect-7.08-r1.ebuild
+++ b/net-vpn/openconnect/openconnect-7.08-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 VPNC_VER=20180227
 SRC_URI="${ARCHIVE_URI}
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 3ce78a909c48..3e108c2e169b 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,7 +1,5 @@
-DIST openfortivpn-1.7.1.tar.gz 61236 BLAKE2B b382ceac577e63ebb7a92ee3ca80c45e94f77eb95f8ea75f91a4c2ca2fb006f4d2e5e4c7bdf3974875cfb3611f34ef249218d194d58f66f3b51b30c8b90a3f82 SHA512 9c151ce3f914a7cba13be3e3b98e35d49329ac2c04410b653ce40dfb9fe1912c2e51d0322f9e37d5ed47bb28a46203a19ce87ab2fa670229f2b5ccf5b9bb6fc1
 DIST openfortivpn-1.8.1.tar.gz 70521 BLAKE2B 5451ab9937e0f6ba1c2601f9ad8a44d5b9954b9798f4a4aa81675d561f5aa95890946a5623af9a57db6e20fe074e65b0578655ca538c20751e7e1363df01ab68 SHA512 0c2f26e744c266125bf35a643bc2510d782c9c7b4e3324cef53cc7e9a350df3c968c4d0d34256a64cf6b7d1cad2ffc95019a39586786238481dda20030e524a9
 DIST openfortivpn-1.9.0.tar.gz 71903 BLAKE2B 0f37b782944e96ba043b82bb172cdd90badf501a31f4ef253cdfc2ea59f4d478ccb4de15514df279059ad41ff3d872e2521ebc64af56844e5d3dd719e8965e18 SHA512 bea07d173f84562e37bbd925fc9ca1ffc4b91442792d29dd5f78849a44df7f4f677f306bb9020ca3ebdc4da1d5635bb4e746455c4ccf9ef1598c8100dcb2df7a
-EBUILD openfortivpn-1.7.1.ebuild 766 BLAKE2B 59675dd6afd568ef60fc345e96c401e462063bb570c4e5c094c4a2c5f4061e862e6b185763af143d34a79d817fbe61ff1783180a981611e9405875c19d8bbece SHA512 19abaec0e7981787d4f2995bfe905a0d24643d17cfdb651dec7d2dc4be2c80af6042876ef06d5196c953d3209c90bd8d9bea2650bfab650d2608609d211bd048
 EBUILD openfortivpn-1.8.1.ebuild 763 BLAKE2B 08493890f4639410b0ac11123ba8babeca5e1888586bf4bc84e7fb8e00c3170a8b26a7b342aed2174c2ed65f8cfcbe9be8df7b687d967995b2cdaae437032bb0 SHA512 8d8abd0fa604fcef6d156ac14e085a19f3418e5ea569947e8085017c55b4028c5e2a7437cd7efc05b8b822e3397c2d459835bb6a4aa5ea5873b50ec4fd2a1512
 EBUILD openfortivpn-1.9.0.ebuild 764 BLAKE2B 41d9b1a2d531317f54089e0cab337c50480b0698b55ecc81bf685084ff626bc79532415735d00a431e73c078b70746e14ddeb154fe69a750d7c0169bbb115537 SHA512 9ca560c229901eb4919265cabef86e7dfe106bd4ff7c7b9d4e2cb2fd79ff468d69e66c5c81abb142bc274bdfcbeea0d48b5583268b3395f289680b869df27896
 MISC metadata.xml 334 BLAKE2B f24aad8486bdfc65b3b679b17aee075a53b08cda8e80df8c6119cf224885d6ed25a23b14ca38bda9a1c8a651263d59e42d84719dd27749f25d109e7a6f8a3783 SHA512 383c645edf7e7baa6588a4639ec81290b4260d329f3839e540ecd506d7945a72a35bd039514b377454c0c81f23ecadaa9334c746e96aa91e0408712f112148fd
diff --git a/net-vpn/openfortivpn/openfortivpn-1.7.1.ebuild b/net-vpn/openfortivpn/openfortivpn-1.7.1.ebuild
deleted file mode 100644
index edc56936ac07..000000000000
--- a/net-vpn/openfortivpn/openfortivpn-1.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="A Fortinet compatible VPN client"
-HOMEPAGE="https://github.com/adrienverge/openfortivpn"
-SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception openssl"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="libressl"
-
-DEPEND="
-	net-dialup/ppp
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~PPP ~PPP_ASYNC"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	keepdir /etc/openfortivpn
-}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index a11e701ebacf..c412499dcc52 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -10,7 +10,7 @@ DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2
 DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5bb763df149640978f0bf87450a01e3e40372265440f1aae4e1c58b6d9a1ee1f2aade970d19fd8e8813e0b487a7 SHA512 cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8
 DIST openvpn-2.4.7.tar.gz 998094 BLAKE2B 90f91d74279a547b49704cd14d9ac3dde26c522cd77eb851ea603addb1b220eda9be4de6cf5d74fe7717f34b3ff5fc802ca977a1402c5ed75616139d449fceb0 SHA512 ba9bc08c02fad85ba05c27488b0bfcb3540ba9c625c42334e24cb1d5e253b91c518c02641d755e03b8747ae8c2ebd340c55d51f7aedbbf2550ee4e4b79823c9c
 EBUILD openvpn-2.4.6-r1.ebuild 4570 BLAKE2B 553cf285d9b56c9980288a76086cc4c1e6c2966cd0faa9fef748d8d52ebd9d5cc753744af2b91040c9b13842a143018d982221bc38d0ddffd94670cdc19e19ae SHA512 0dbfab153334ac315aa2de9aee667ed0febcc48a0d5cc432e3ec404dc564fdbb35b52626141132ca12ac6638987e98484693bb5e4181de4627228ec9aaf68ce1
-EBUILD openvpn-2.4.6.ebuild 4562 BLAKE2B e6e9d019a5acb456fc52dff3e811045a846fbe1d26548dd2f9b6c4ef5ace5072d7921f095085f2dbbc5c7f6602f2aa2f18d18e20146b5c0842ce9f18fde95515 SHA512 66a74cdff4521b8e0b63b648cf6931e9e47c0d19aa831d00bacaaf5682598d582aa953cc7b6a7447e93606aa3b0db2ade5f80beee337c15e375f684243088736
+EBUILD openvpn-2.4.6.ebuild 4561 BLAKE2B b1d8c976a760015e0e434ab4688ee7e0a5ef2a1fb94ae5c56f611792100199def8f34ed8d052733a92c76e5729f1faf8e50cd6ae0193d93df5f481e3016d49fd SHA512 c5efb4e0f2d4268727254fe4115bdf8d27d9d6bef820c8a745299d987113e3ee3b04be2324df0458c2fd92b91c66f13daa50297b47920af58d740ea056dd5865
 EBUILD openvpn-2.4.7-r1.ebuild 4615 BLAKE2B 31fe988c02831d6a8bc96e1cec0b7f3046ec7b78d72c8694c1f3f45b34c20d21656646aba643e552dc199d69df288ddd49c5f8f396c969cd421b105da0e8c56d SHA512 e973cc64e828761ea9a5439d39722d2e240118931d029eb868c86bb05ca4679941bff20ba98d3d71bc15c8ffc8148b4af69ffaac55afb084323d208e677410fd
 EBUILD openvpn-9999.ebuild 4303 BLAKE2B 0f3cbf8a1a16b74e86c95ff0b8b2890ff2c3170ba1f5e274e616a5dfd68310abcdb249075c3dd6b1490e6b161ec64e1aed6a1c3b476179bad8868cf1a4c9b727 SHA512 d0ab575c0144753c57c63bdef58b7ba0a8cb8c62c72b762153b607470a73c87388271c9c079010c2dee157c906fe45fe67a911ac0fbe75d90f934bf925906822
 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec
diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index 41badc7b0794..015f8bcb94b6 100644
--- a/net-vpn/openvpn/openvpn-2.4.6.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 7fa31d5b4587..c544304759c4 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -4,8 +4,8 @@ AUX tor-0.3.3.2-alpha-tor.service.in.patch 305 BLAKE2B 6ed92587a7f4ba3e40837e911
 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660
 AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
-DIST tor-0.3.5.8.tar.gz 6994335 BLAKE2B d37006ee48f6ecb9205fe9ad1178f2375aec5a8f8c614a85af398e2114d13e4ef7dcfc501685f2f6d4dbb44cca2ab318be69ac37686a3ef1bb980adcdefcac11 SHA512 47a21cdd6d4563dd9bfb43c26f054f00747d069611dc9b16eb11b9653fab5c0133fb8bd30e162fa27d90d6bc4f88c0e2bf49eb4fe54529017d5eb87c3bb86132
 DIST tor-0.4.0.5.tar.gz 7203877 BLAKE2B e03710038615a5b9baf327933917c369bb3fabd4df6dd9f16053a0b72bcf20219e956e74258d0e39ae297d406035a89fab017d2e28c795f5d713c3933ad7cd29 SHA512 f6bccc52aaa436a501077b0891ecd3a9779f288b3b15fd76fa2c612e60aba04763b5951f55b2357e6271797b2f924bee9a6d2c1ee20419daa02d9d38ec68510b
-EBUILD tor-0.3.5.8.ebuild 2176 BLAKE2B dada372351cc5c34b3929c3a18ee9287728cd3b3c7285366213c056737ed2dfdfdc9887ec9b1cd9c8e352f4d953c927301ab1c2a86a648499ba9932006f7bae8 SHA512 a64cd8723241a6a8af8955b84db614ef6f7b868ee445289cdfc3962ad5daab59925768875cf2a25441455eaee1b3469aabbb9ab5916c5c7b700d867384f7960e
-EBUILD tor-0.4.0.5.ebuild 2237 BLAKE2B c4b181a5383703dd236901b8a7c6f7af27caa9f2e2cc8824bed97e17fa7dde3eed93ef1e341b9d34197040c4d25a6eb6d2d009115f936539da447464747fbc01 SHA512 347aac4e1fdd00208a2949c42804110b0d4c10b499d8d85c5b97cadf54577b966f76bb90d38ab5c732a29ae533024b6207d1508d5ec166f2b1f650d58bde7498
+DIST tor-0.4.1.1-alpha.tar.gz 7350019 BLAKE2B 5e5022f9a150d87955b438e8afeef053bdc4196b87c891016a2ecc43d44b0a2a271ef4088cb16d539d2ccfaedc8e73c7d663e9878cf7a10af0d368c5a4512409 SHA512 d8fc5c124de8127a1b06081fb45e6cb0e1d2b77dc2cc4677370317961869f82282483b717fadd932f1d86ae32291ba51f61421c89005703c9625237cb84d2e8e
+EBUILD tor-0.4.0.5.ebuild 2232 BLAKE2B fed112e92aa7b11f4646ea94db9fea5ef81a80dd57a4b95990d906142991ee8f4b900601a011246ff6e707069c255555195041929c97e753d16a16bc8d820719 SHA512 44a4958239f006307178121e4cb49f79ca2063561dc593af840456895eaa4f7d272592a1a3658645b29fe9e82a71e73a731eccbc7cab0ebbbfe37b41068f1c1b
+EBUILD tor-0.4.1.1_alpha.ebuild 2237 BLAKE2B c4b181a5383703dd236901b8a7c6f7af27caa9f2e2cc8824bed97e17fa7dde3eed93ef1e341b9d34197040c4d25a6eb6d2d009115f936539da447464747fbc01 SHA512 347aac4e1fdd00208a2949c42804110b0d4c10b499d8d85c5b97cadf54577b966f76bb90d38ab5c732a29ae533024b6207d1508d5ec166f2b1f650d58bde7498
 MISC metadata.xml 502 BLAKE2B 62cfa9bebca4f57461228105fc7433ba9d56494197768549f6dc62ec048654918bfc04958c321239b5f223c5d263415b346168ab30c6ea3cc78a5b0bef93f08f SHA512 70b258fd1bab0a13d24e20ccff51ba8b0b1f3a526986a0140c5d2344c781f257ff0f7b60cb6a193b6727faf21d7a4ce96071b9b09373fd9636ed2f01ee1f2000
diff --git a/net-vpn/tor/tor-0.3.5.8.ebuild b/net-vpn/tor/tor-0.3.5.8.ebuild
deleted file mode 100644
index f96f51fd642c..000000000000
--- a/net-vpn/tor/tor-0.3.5.8.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic readme.gentoo-r1 systemd user
-
-MY_PV="$(ver_rs 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"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~ppc-macos"
-IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd"
-
-DEPEND="
-	app-text/asciidoc
-	dev-libs/libevent[ssl]
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	!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
-	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--enable-system-torrc \
-		--enable-asciidoc \
-		--disable-android \
-		--disable-libfuzzer \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-rust \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(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 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-vpn/tor/tor-0.4.0.5.ebuild b/net-vpn/tor/tor-0.4.0.5.ebuild
index 5260bac68c8c..7e37f46a9bab 100644
--- a/net-vpn/tor/tor-0.4.0.5.ebuild
+++ b/net-vpn/tor/tor-0.4.0.5.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~ppc-macos"
 IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
 
 DEPEND="
diff --git a/net-vpn/tor/tor-0.4.1.1_alpha.ebuild b/net-vpn/tor/tor-0.4.1.1_alpha.ebuild
new file mode 100644
index 000000000000..5260bac68c8c
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.1.1_alpha.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic readme.gentoo-r1 systemd user
+
+MY_PV="$(ver_rs 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
+
+DEPEND="
+	dev-libs/libevent[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	man? ( app-text/asciidoc )
+	!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
+	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
+)
+
+DOCS=()
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_configure() {
+	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-system-torrc \
+		--disable-android \
+		--disable-libfuzzer \
+		--disable-module-dirauth \
+		--enable-pic \
+		--disable-rust \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
+		$(use_enable man asciidoc) \
+		$(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 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-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index 90a029738a80..35ae73dbfffd 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -3,5 +3,5 @@ AUX vpnc-tmpfiles.conf 29 BLAKE2B cc5cf7d24be2117a95c339667771121df32d813680a32c
 AUX vpnc.confd 123 BLAKE2B 313d5999586f56b3b88f8473d1f6f07e69994c620ddf3d8cfb9e263fc27c60500a3e6da59f1e905611aec39a62dfcc3c4b746a580a8a106fc6be9384d716955d SHA512 1254f687dcd9822becfcccabbb34d8343d715d70247dbf4b5e018835fff24b33f5272368f77199d697c8d11d913182b1f756d5e08a46b2057849779f09b19633
 AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d69971312c9e062299af8b9f7514875a79a7d4e916efa4b4cf83ab0fb29eedbf52da31af3bc0fff63 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5
 DIST vpnc-0.5.3_p550.tar.xz 101860 BLAKE2B 9800ab0704108cd70450dcfe314eba7c09ca1bb329fa6b9f2946dbb6ee6407e5f6bc3d17d8be782e9103d94a12895777125acdad070f39ea1b96a946ba7d2302 SHA512 95150c743c61a962c36591bb874c77f2c28f341c0a1290dba4e878a460d22d762dd88f7cfc0aa9d17ace71a8b826d9fd13554c23b5123dee6009e9fffcd2de55
-EBUILD vpnc-0.5.3_p550.ebuild 2207 BLAKE2B 44b6d215c5f84b5a8169271947848cc3774667d49db53d3ab0808f22f78445632effdf759fac5ec0e4e0e5135ec906ebc77918149e4f94b0afff5545200416ea SHA512 601b4af1fea80cd07af4f866498ab448976614a59e9706b7341f53f2f6b2c69322637499efe0a60df26b827eaca45ef901fbb42fcff1ae96407b4aa73f8fb102
-MISC metadata.xml 378 BLAKE2B b0a2cd315ee9781e69d78dd75ac6b5ee832f7184be8fd01d93b38a5f0c5c950e06699b9a5dc480cf16ab5a1eb6fc49c9ab04d594c13aae069536d306cd226a6c SHA512 75bf9e1dd168147ebb73034a8bc9f681d72f6ff7c14597f822a237a785deb314a5b0a330861ad751d7837168718204f5e1a14767e12c6ee27f197f2e813e26d2
+EBUILD vpnc-0.5.3_p550.ebuild 2206 BLAKE2B 73d66da98c0e2ed3c756e1409384915a471d817318b3f04765c4e488f2ceb75e92032ef4f4fea85b910d579ce63f818560eb53d716dc291957d690107108162a SHA512 a25a180d9a16507d2c490590f1f6f05dd59abcd2196d9673b0a88c659069c5fc9a2912ea816f6a90d5d20d2300a602df7417427413233be8a12e46cd0b30cadc
+MISC metadata.xml 501 BLAKE2B 31df31e209ccf8c590130748c6b8f800a143b81beba395b0ece4b73eefa5677928ca25dee2f3cba5eed014da2d9fb318b34407ebfd8138f383a035446b3e481d SHA512 68b6553d61bd272eee71187a3d3c547132b694b9258d20887a91b0429a50ea6b35644ec8305fbc67213a22bab10f18b4166dabaf9beef3088182facd461aea39
diff --git a/net-vpn/vpnc/metadata.xml b/net-vpn/vpnc/metadata.xml
index 295fa367b7bf..08b929631454 100644
--- a/net-vpn/vpnc/metadata.xml
+++ b/net-vpn/vpnc/metadata.xml
@@ -5,6 +5,10 @@
     <email>mmokrejs@gmail.com</email>
     <name>Martin Mokrejs</name>
   </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
   </use>
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p550.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p550.ebuild
index 34d8bd70511f..6a33ec812e0f 100644
--- a/net-vpn/vpnc/vpnc-0.5.3_p550.ebuild
+++ b/net-vpn/vpnc/vpnc-0.5.3_p550.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="resolvconf +gnutls selinux"
 
 DEPEND="
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index a62f2b83992c..7d0c390c06cf 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20190406.tar.xz 324112 BLAKE2B 11a67eae986b0adac11dc88c899d68e3c5510bd7fa438bbd378eaa5b3c184b3dd726f625950e6800e0f53662cd1c23d5a78c954edd9a3387f278700bffeab607 SHA512 e3035030299f5a6ae3ac0c2e35dc2d54745cda8f31185b21c6590f1ddcc9c7a83bf7b71cc71f6d48ed6dc8f2b31f3c704f8fa85685d4113f4c560f7eba7b7d5e
-EBUILD wireguard-0.0.20190406.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
+DIST WireGuard-0.0.20190601.tar.xz 327348 BLAKE2B bd7827262f0c056b2deaad9c3ca62b28d26200b32c3b31c6d970c141d58255a8c9dd361603663040118d68defe9d5a130f7dd8a2eb26306f66d5fff84762228f SHA512 d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3
+EBUILD wireguard-0.0.20190601.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
 EBUILD wireguard-9999.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
 MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20190406.ebuild b/net-vpn/wireguard/wireguard-0.0.20190601.ebuild
index e4113ef8fb96..e4113ef8fb96 100644
--- a/net-vpn/wireguard/wireguard-0.0.20190406.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20190601.ebuild
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index c2c5196287d4..9dc0829169d6 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 89645576a63b..f55e8423e960 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,4 +1,4 @@
 DIST aircrack-ng-1.5.2.tar.gz 7138360 BLAKE2B cfc178d76273bb1cf6c34b1656a710d046a094f9c772a562f19ae783c30810cf7b6aa8668566ef6998af79090266771aeea8037b446eb0b9755b602ddcebc0d2 SHA512 72c249782dda3a875fbec98e4fe0e6044a6f123ebd36341a5f42733dfe6c26d96b5c74f67c0547b81c5dd5e2f52a6f475b424885f8e6fa21279ac539228038f5
-EBUILD aircrack-ng-1.5.2.ebuild 2922 BLAKE2B d67c75d895af696e9de68692c74df1d70718a1ffd65d00457a0a5a7636b143f089bd97a4b4af994b2f9a17431a4fec588e81ddcd48f0b2fd7ffa0c7e0a96c33f SHA512 a6eef87d7ffe72d543ceb52d107a872a8bf4ddaf8169c5839698dd25445558701bb4e3b03d206f1a93ff2e07e36085a03691f59f47e41ad7bf6a7340b1e1fe2f
+EBUILD aircrack-ng-1.5.2.ebuild 2929 BLAKE2B e6deaa039cfc88df20a8495413524eff1d0f90a742fd0ae3f21ba3211824bbba21965ba7f4f8e7c2ce87621b576dfa6d754ceaa3edb375a9e0c602167bdb5765 SHA512 1b1bf42f4537fdf5a757acc1a54469917946e238a49982ab364faa220fcc83627e1f5869039c1004f0405f2b8d0efd95a3a669f9ccd6183903c8ab1e50a0a41e
 EBUILD aircrack-ng-9999.ebuild 2912 BLAKE2B 1f63fc126c2e93c75f91f8a4f59274a8ae3379b74f85dea59ad97b8bbd46110d6e4904e71516b4f82a6e4bc948f2963510f03c2e289d96375d1fda6e54e8eb77 SHA512 b143217d62ae40565beb150307657e31e4b1e80f8e250f940f58c138bfbfc26b3acdb46c5743eeb215920710a484bc0abaa2d228f4778d0131093a689a86543f
 MISC metadata.xml 1033 BLAKE2B d1891cb0f4c12730c46b03a0b502b20b898881c1fab3a2260a85bfdd06b1d69ba0d7bac12afbbe37c060d2eefbaa5fc5d3e085efb0a28c65c443228279c9a24a SHA512 f42092ddaeac9aca346120d869382895a679d2a6eed8ad1b80fb91f7fbc7c356feba55629a1470ba18afa632d2bce1c7b9e3f3298d827a169e49c72f95a3892c
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
index 7c3d9a892854..09e5e6b6a669 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index e4c73e4b9555..d2d1ae22e9ab 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,8 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
-DIST blueman-2.1.alpha3.tar.xz 977724 BLAKE2B a1b02956249c65bb9dc870f9585f917b17e99d570c2a3f05f505de9ea4ec004ff9ad5d88e958ec84566fdcf0f3fe6cf1965dcdc050241feedbd08fff98d18b22 SHA512 e2ad9aff87148e522705872829e9c4c78a1bfbe29e102b69b1f1f56348743343cb543eaac4c21e157aa579b76f023ca9164700a4a08848f55f17d025cead23a6
 DIST blueman-2.1.beta1.tar.xz 948440 BLAKE2B da1c6935b47b498d8fa2681c9672381bb6242f8fd752f28d2f2874dd4b602927044db1a291246dfd4c0931d934cc32b2516680cb963fec948fa9452d08d69671 SHA512 c7f04f6d65c9228660efc6e4d2e417eef8dd08f1f703a16270fc883f40be2b7d8f1d7e8728f3a0523b854bfef7fed18b58eb8cdae697d9890a76c220ee2b818b
-EBUILD blueman-2.1_alpha3-r1.ebuild 2777 BLAKE2B 70df84050526f06c2dd073c2b8ba1c78c1697265eb717ef386ce966242f35e960614688230fa95300a647f7d2c442cfb9ec5b606e6423781b48d1dc48a1fcd32 SHA512 3a706364e4fe49c0549ed4bbc1272d9162bc3adbbb229b55bb194e641cac09448ffb0bcec6b3e3033e16dba4fe0bb1919740028baac6a334aa7e25febf3bc988
-EBUILD blueman-2.1_alpha3.ebuild 2781 BLAKE2B 7b420137bcc1fad735b663528becccbb0cdd40002afb42b73b637875a1bb9afc8b5de8809b508202185fa578424f05acbf1ed77c82645a9648f39cd19e3949c2 SHA512 7331ed8531e9e027526ffcb5331a57912faadcaa949be4deda66f9e6647fc8fdee64989df9c9b7496ef2e7f482d7286a4af3945b671362084db95425fdc6ffe6
 EBUILD blueman-2.1_beta1.ebuild 2780 BLAKE2B 7b184eadc3b08275ec5a69be05ffe634a952c4e8734f7eaf8f923d77b397da0c2a4494f0ce692574cc9077310b44b6ab41e004315c7c65bbd3c20614ad276259 SHA512 b8bac18ecab2f956120aab08728bac5ba4568bae21031ba6f7be9fe994a829513625625a875c57db74c9d5a437d4ed39a4a6b2ca9bb8db6ce9e0768ba4120e89
 EBUILD blueman-9999.ebuild 2757 BLAKE2B 30cb997a1c7473786e45728aa447c1c3b3329d8285033b26115bd29342b731201747ce80eb45004df82f5661fdc534c1ecb2ce37363ed5409500ad86bb604ed5 SHA512 02cb66900dddb5a3cecd25c24f20eef45daea1eae5f6fde4b44e17da5e795c530e6ed00c5a89a2ff7620409d152cccb752a6fef05668b8757e404e5ec04469e1
 MISC metadata.xml 688 BLAKE2B 60db2d7f9a0b7a9cb49845de2720dd1ef20fe18b3c85a0b95387aa8b3e801aa9edc2ab0e66b69c2d27ca148d1358ae347ceb81cc5a94def15fe7b7966424f35b SHA512 372797b89a2f56312d68bd0719af15c273fdb15a90172d2752ea22f5404d3e054075fd5d1edb08b280d842dcee6b52e2cdf5b18b296b230b6e4a76d4c6fe0bad
diff --git a/net-wireless/blueman/blueman-2.1_alpha3-r1.ebuild b/net-wireless/blueman/blueman-2.1_alpha3-r1.ebuild
deleted file mode 100644
index 80488b8450b1..000000000000
--- a/net-wireless/blueman/blueman-2.1_alpha3-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit gnome2-utils linux-info python-single-r1 systemd
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio"
-
-DEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=net-wireless/bluez-5:=
-	${PYTHON_DEPS}"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	network? (
-		net-firewall/iptables
-		|| (
-			sys-apps/net-tools
-			sys-apps/iproute2
-		)
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? ( sys-auth/polkit )
-	pulseaudio? ( media-sound/pulseaudio[bluetooth] )
-	!net-wireless/gnome-bluetooth
-"
-
-S=${WORKDIR}/${P/_/.}
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
-			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--docdir=/usr/share/doc/${PF}
-		--disable-runtime-deps-check
-		--disable-static
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(use_enable appindicator)
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	python_fix_shebang "${D}"
-	rm "${D}"/$(python_get_sitedir)/*.la || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/blueman/blueman-2.1_alpha3.ebuild b/net-wireless/blueman/blueman-2.1_alpha3.ebuild
deleted file mode 100644
index faa16e7c5d55..000000000000
--- a/net-wireless/blueman/blueman-2.1_alpha3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-inherit gnome2-utils linux-info python-single-r1 systemd
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio"
-
-COMMON_DEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=net-wireless/bluez-5:=
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	network? (
-		net-firewall/iptables
-		|| (
-			sys-apps/net-tools
-			sys-apps/iproute2
-		)
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? ( sys-auth/polkit )
-	pulseaudio? ( media-sound/pulseaudio[bluetooth] )
-	!net-wireless/gnome-bluetooth
-"
-
-S=${WORKDIR}/${P/_/.}
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
-			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	pkg_pretend
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--docdir=/usr/share/doc/${PF}
-		--disable-runtime-deps-check
-		--disable-static
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		$(use_enable appindicator)
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	python_fix_shebang "${D}"
-	rm "${D}"/$(python_get_sitedir)/*.la || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index e3abea3b3a35..c16ca811670f 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -11,5 +11,5 @@ DIST crda-1.1.3.tar.bz2 38697 BLAKE2B 5ca68362a134e6f5fad1a450edc3cfc083686d4575
 DIST crda-3.18.tar.xz 61516 BLAKE2B 76feac7fcf85b03b39bfe78de444515f54cd513041f81f7588cd7866e5bf072d000ad0c8df181ccacde7fc8125ed04ece00d5d9d3013df759b5f9fd05f8cfd56 SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588
 EBUILD crda-1.1.3-r1.ebuild 1611 BLAKE2B 9e28635e093a1746b5b8d27cab156400f6aa7597054395058c0d91722d358ca581fb871b29d8e1a7bdf992b75903464006b2afa3ed001c75fd31adac9c0ae0e8 SHA512 de63b4c8ffdcb047c6d2dead406734e2cf1a3275918a88d64ff58cc0e27870f9355e3011d690609b92d18db09d788c0f65e673b1508c3f6efba58e8262a66e61
 EBUILD crda-3.18-r1.ebuild 2070 BLAKE2B 50b262cb62ee430d28e11383e53e8840d82f453d0cdaba60a1968f8dada923788f2679c5592ebd9a5b12ae6a3b471c9d7a55a6d61fa538cb17b6769caa6408c4 SHA512 5794efc8708aeeda30e03f17b22c47e03dc9d6a9274f52d18d5de94c4d3582cf427aaba77edee13f4183ec144609072276b11dbdf9433a9ca96028e3c0ec31ec
-EBUILD crda-3.18-r3.ebuild 2167 BLAKE2B ed36ecdfad4400cbc4b01dd45cc75b405023a5f047184fb4a0d9d99361406be0e81d8ffd773510448d973b7859fd6ed96ab51dfaa3b311f8f0fbe86e6e3d6f49 SHA512 78150c5cf8d434b378bd407d2bb29bf0644ddc541c07b7bf22c8f6d94ff1b417c26f3aab855e16cf028552e58b83c4189b4da3e2b6df8a13f0b4bfc9fcdac349
+EBUILD crda-3.18-r3.ebuild 2160 BLAKE2B 2ec9011409bb23ece341fdebac90f07b1489b6b211b4cf1c96dbb6077d9ae5804ad55ac11a8f16465b98515b15a4d0681e7ec1f07094d9d0f63734bc9e4283a3 SHA512 c08a38bbf714889e08f1865517fab94ee679c89117ba929c12f4441a634dd414710e8765ccf424d1718083b41851ad544f095a27cf29ba800178982bebac0ddc
 MISC metadata.xml 341 BLAKE2B 3164318aaf0c333f739b8c863660b2b77844b0aa7cdca818358f566dd6cfbf585e1b6661373e58e6c1116771cb4f23c962e27b24bf325cd415ee23a035d5d8a2 SHA512 ca1f9e4b85c7921ab86bf2b5c6be5c8ad07ec900ec23e0c602cc63e815c4e0036fc3ab03470debf645b4f3d444d986f16f9a120af56193d902150e15156f9d59
diff --git a/net-wireless/crda/crda-3.18-r3.ebuild b/net-wireless/crda/crda-3.18-r3.ebuild
index ed88e2a8e475..5073287cd767 100644
--- a/net-wireless/crda/crda-3.18-r3.ebuild
+++ b/net-wireless/crda/crda-3.18-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.xz
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gcrypt libressl"
 
 RDEPEND="!gcrypt? (
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index eab92ca2705c..cf0b6639d95f 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,11 +1,12 @@
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf156a83f6b463b74398a6bb17f70a0917bdded1e585fe1ead61dd38f5aeb9020fac256a6f5caf9e1f638e214035fb8ec3b8ef7c SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768
+AUX gnuradio-3.7.13.5-boost-1.70-asio.patch 769 BLAKE2B 19a0f56540911443a8b2b8af3f16b3a784ae760ac60a017f5d2d642a6612c4c4f310df5937ba1d815b9cf9ff8e7d5de660876140f6821d2ab59acf94270ccbe6 SHA512 b3270301945489ac6cb301f30c28bea4b9d59ee7cb2a0e5a162e8ff514e0173d849236db8c3e60fa028a9df2304fc22ce73b7eabb525e567867ad72d7cd46dd7
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
 DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
 DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
 EBUILD gnuradio-3.6.5.1-r2.ebuild 5127 BLAKE2B ad5cb9725f4a3adfc90deac129121d3b17d9db03dea210e9d9bc04b5279eec5276cb216110e88cab5b6cfeb12c1d213198dc9d50b032a21bc88b16a9945a52d0 SHA512 b36955101eee2a2e92388980c470941d2c6aeb7eb58f23158b21da16174e49640fd9332e5e05626307fccc1233fc6149a9baf8211ba1866ec2dbedc85c24831b
-EBUILD gnuradio-3.7.13.5.ebuild 7369 BLAKE2B f6ad6ccaa7d38b34ca6805ea799ed1861585037a6457f598510b896f3554b79e364462001436620e642612110a0e0d8148b08db5c185dd17160fadbe4f101290 SHA512 87ec2799db30073c2bd7b30f29a8242a3b06edd4a51657bf41d26cc0e0a7198d94226bd5c43825703654b6e6584eff645aabdcf5689720611be57f564e86ad2f
+EBUILD gnuradio-3.7.13.5.ebuild 7435 BLAKE2B 2aa7f26b80ce2f66a551dbe38b2111003fcd67e1dd901b18a738e30cac939f73fcd40bbff8e83d3eaa767011e04938e3f4b7b7e5af2ba004f15a02c7234cff29 SHA512 817f3a56f07ec8d62b5014c35bb0fa6445257bcd70608ae745f4a9834ff6c678c038f667e72fffcd9dba2d7137a2673b8d3c3f0f11927e9ef6b5b07d23046870
 EBUILD gnuradio-3.7.9999.ebuild 6917 BLAKE2B ad74825e50483a3950aab15788b467e834379e38cd6bab913f67e3a05e9abd4533df01f7878782a06c29be196b7357f52952359b1beeb878f41193f866b2c33c SHA512 1ca495b9bb543bf7879c079e1668155fa805b6fbeef0f6940e9748bb5540453402a770df9c2510cac2b71ad63ff8119234ed54dcb87896d90c819c93d06c83aa
 EBUILD gnuradio-9999.ebuild 6955 BLAKE2B 727f4f890202932f02a1c9136b6fbbbf417380cd9ea477d7485f98411656b25ee798b930caf8f65cd0d8f193b69d54dd0811cedd27247617bc663e75606988fa SHA512 e961f10a77bc407eb6be40424f146852ab7a17ac87ead37a45305bcd6aa66038d74550ea4f25795ebaef800111926f7260e94902fd637876154d7fe8557fa0d6
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
diff --git a/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch b/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch
new file mode 100644
index 000000000000..d4925e674eab
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/683380
+Patch adapted from FreeBSD:
+https://svnweb.freebsd.org/ports/head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc?view=markup&pathrev=499093
+
+--- a/gr-blocks/lib/socket_pdu_impl.cc
++++ b/gr-blocks/lib/socket_pdu_impl.cc
+@@ -165,7 +165,11 @@
+     void
+     socket_pdu_impl::start_tcp_accept()
+     {
++#if (BOOST_VERSION >= 107000)
++      tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay);
++#else
+       tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
++#endif
+ 
+       d_acceptor_tcp->async_accept(new_connection->socket(),
+         boost::bind(&socket_pdu_impl::handle_tcp_accept, this,
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
index 354d6e7b959a..687926509464 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
@@ -49,7 +49,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
 RDEPEND="${PYTHON_DEPS}
 	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
+	dev-libs/boost:0=[python,${PYTHON_USEDEP}]
 	!<=dev-libs/boost-1.52.0-r6:0/1.52
 	dev-python/mako[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
@@ -120,6 +120,7 @@ src_prepare() {
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
 	epatch "${WORKDIR}"/qt5-maint-00*.patch
 	epatch "${WORKDIR}"/codec2-next-00*.patch
+	epatch "${FILESDIR}"/${PN}-3.7.13.5-boost-1.70-asio.patch
 
 	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
 	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index c7e2c4e53185..05c47d501422 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -2,7 +2,7 @@ AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 DIST iwd-0.17.tar.xz 720500 BLAKE2B 8bd931421663b71eb7bbdc4a72e10fe325ede4a3d075a8d477ee80040f23d3a8645f1c8c24f8c5f3e615049273968ea48687bcbc5480d05af3aabf135d0e7118 SHA512 fcec43cb9d470dec783fcafd8485e2e25f7c5ccc4283bc58c299fb816609b4e03ca241f1fe9f73025a08863e89ae8d7b7ceb6ae02524eb681a61079c5a28534a
 DIST iwd-0.18.tar.xz 738168 BLAKE2B b37bde01952542583d82439639c39c06a1a5b6c359bbd092e631be6d25975498eb9bad9f71f3eeaa4b571e9d195e6f1113b17f758f386d49e6ee2d2cf071387f SHA512 0eb5558f7bafe521aaf80f24e5818c1fb0dfa6445c671c4454d3a4f67f97643a1232709b1e9c376cbe09dd7ba521651e1e46328cce0bfe1befe15668d6081cd6
-EBUILD iwd-0.17.ebuild 2854 BLAKE2B 06f93df8287f832865068dceb4fab0663077a9dc70fd638ad8a8d011ff7500bfce80525e0cb50a1c26aff2289aa8db26b9be7aa54cb8e7ba3e91983b3ca689e1 SHA512 867781ef69f9486ed2ab971e38ff5c88de76508a08604977836ec8d81e0a3588749af4cb47219a1332ac294e310e5f2dfd598c40e11c30268f0b59d320496cc1
-EBUILD iwd-0.18.ebuild 3798 BLAKE2B 80da5037232d27a1e8fdb39807eb426eaec3372a0f3d9151c6861bfef8ef959f4555ee522863c626a302447e7fa3ace98ec66d04c96d3451e4ef55e3ba87fb0e SHA512 b77f776a9c079af6e34854d44c687ca97770a91f92805174a2ebf9a4091815f67b85139151c884af5b888f5551e846ee0b5f8d57cc5070e7623151c1307a4b95
+EBUILD iwd-0.17.ebuild 2861 BLAKE2B c5e1d4a9828a20c30d45434d88b72ffce6598a000e005b6273a61d6d7d714667167501030ac67509a58363e4976b7cdcb0cdecde04cf596145ffbba657f1cead SHA512 fb1341de4cf116a5cbbc3f20cd7fa6b83b905564a60b5dd23fefd7b07f2d738c4c1d45a6206a812bbfd1fc9c2d3f3cd6305810ccfc8e27977b06a0a683cd74b2
+EBUILD iwd-0.18.ebuild 3805 BLAKE2B 3c5b74b16d08bfa3cdfd22218e49d0250dfeecf45b22a635cdee871db03c1902410f629df2185ea3360472b0e87cc8a7f7ce828b548001697242ef3d873e3d83 SHA512 d760823d5e7a9f8ff0389eaecc6e3dbe2a660e8d04c7cdf1ddceb560f8e806dae2659040c92474bfed0f0ce1102ab7601a3772255ab4718170bebd74b9471f41
 EBUILD iwd-9999.ebuild 2854 BLAKE2B 06f93df8287f832865068dceb4fab0663077a9dc70fd638ad8a8d011ff7500bfce80525e0cb50a1c26aff2289aa8db26b9be7aa54cb8e7ba3e91983b3ca689e1 SHA512 867781ef69f9486ed2ab971e38ff5c88de76508a08604977836ec8d81e0a3588749af4cb47219a1332ac294e310e5f2dfd598c40e11c30268f0b59d320496cc1
 MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/iwd-0.17.ebuild b/net-wireless/iwd/iwd-0.17.ebuild
index 93969ee59cb0..ea142e8b05d3 100644
--- a/net-wireless/iwd/iwd-0.17.ebuild
+++ b/net-wireless/iwd/iwd-0.17.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/iwd/iwd-0.18.ebuild b/net-wireless/iwd/iwd-0.18.ebuild
index f5b667cf75fc..b1e62ae86e3b 100644
--- a/net-wireless/iwd/iwd-0.18.ebuild
+++ b/net-wireless/iwd/iwd-0.18.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/kismet-rest/Manifest b/net-wireless/kismet-rest/Manifest
index 9a03604c9826..0fa98d09dd4d 100644
--- a/net-wireless/kismet-rest/Manifest
+++ b/net-wireless/kismet-rest/Manifest
@@ -1,2 +1,4 @@
-EBUILD kismet-rest-9999.ebuild 497 BLAKE2B 540f6adc7fe9bf7fe44eb9a7ddb78f425d6fd8fd512968f2b857716e6bc0cf538a19fda114f42bd19e9f543c69be5bf66523b51fc5392540c258ec511d49f7b3 SHA512 7cc67e66060448b0dbc12ae86e06d33c9efe9aadd72b1f5297288d20117126e40358de5c9a9033f7ee3a08b15a7bdb973cb99961169812950060986f2acc81a6
+DIST kismet-rest-2019.05.02.tar.gz 31844 BLAKE2B 66b2540788f892545100ffbac078559027d4671aef012b59d7cbe4da3fe6865d6f46576ea8f99b84b995718fdfe6a82d1d7724fe9a93fcd932dd0bf45893b66d SHA512 6f5daef441bcf36e17c469dc36e6e7b521b08ba3aba2c89c199fa263bc3eb67b3d9217351a72c94df3902e35695874285cf769bb8c54778c657b83e44a18a6c5
+EBUILD kismet-rest-2019.05.02.ebuild 685 BLAKE2B b1dda01d2783beb04f023861f6810391366d78bd2250ae16cff2964ac180f28590dcfebc617c3766829f0208c85f011cfa6b7910a37869704a6b8d861719c799 SHA512 93e2e48957da57ae180647d54aacdabd8852e1a18f8a242959ac17077132d3c70a18517a262d5300fdd6fb0e8dc2d017af51e0fad6d1e4281e55ccef3ffa4da6
+EBUILD kismet-rest-9999.ebuild 685 BLAKE2B b1dda01d2783beb04f023861f6810391366d78bd2250ae16cff2964ac180f28590dcfebc617c3766829f0208c85f011cfa6b7910a37869704a6b8d861719c799 SHA512 93e2e48957da57ae180647d54aacdabd8852e1a18f8a242959ac17077132d3c70a18517a262d5300fdd6fb0e8dc2d017af51e0fad6d1e4281e55ccef3ffa4da6
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild b/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild
new file mode 100644
index 000000000000..c5f6d594eb5e
--- /dev/null
+++ b/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Kismet REST Python API"
+HOMEPAGE="https://kismetwireless.net/docs/devel/webui_rest/endpoints/"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kismetwireless/python-kismet-rest.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kismetwireless/python-kismet-rest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/python-${P}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/requests
+		!<net-wireless/kismet-2019.05.1"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/net-wireless/kismet-rest/kismet-rest-9999.ebuild b/net-wireless/kismet-rest/kismet-rest-9999.ebuild
index a5613e695458..c5f6d594eb5e 100644
--- a/net-wireless/kismet-rest/kismet-rest-9999.ebuild
+++ b/net-wireless/kismet-rest/kismet-rest-9999.ebuild
@@ -3,15 +3,21 @@
 
 EAPI=7
 PYTHON_COMPAT=( python2_7 python3_6 )
-inherit distutils-r1 git-r3
+inherit distutils-r1
 
 DESCRIPTION="Kismet REST Python API"
 HOMEPAGE="https://kismetwireless.net/docs/devel/webui_rest/endpoints/"
-EGIT_REPO_URI="https://github.com/kismetwireless/python-kismet-rest.git"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kismetwireless/python-kismet-rest.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kismetwireless/python-kismet-rest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/python-${P}"
+fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 DEPEND="dev-python/requests
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 4ee4e67bcb3f..67d268228eb8 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -2,8 +2,8 @@ AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27e
 AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
-DIST kismet-2019.04.1_p20190416.tar.gz 4154154 BLAKE2B 86ce5057f62004269ab00a5a1619a1961d79fee506fa67aa065c18c7ce75d8fbe85a64e5b3861754acb802e03a599efb516f947b9e9192030ecbff0d779efb54 SHA512 fded3cf80bdd1eac2b57e8dc37e4995500ea8b1e6b32e665356b6172f2cd1986efd043ada8e04e62393943c815a3197e72408308c7294f6f26aa495ca8d9f9d3
+DIST kismet-2019-05-R1.tar.xz 3025984 BLAKE2B dbb286a2bd53e78be2fd6ecc8d7046b65b88f11c34b82787c9a3a0198549317c254fd32d9097492bef60fb5e074b7d9c964da5993881305e0dd135b15a77f39d SHA512 1be981020aff723b52e887d3db40c7842b6639a83c524fadd468094a1aef7ca80540db1691984958ec9f8a4e31d2486557aeef5bf1769d410416638cb783b7cd
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
-EBUILD kismet-2019.04.1_p20190416-r1.ebuild 3424 BLAKE2B 62da8d152a52d9ff94aab3e23082b23c8b2a2e779e0d9d91f9f8983eed7fd10cef409657d0cb7c7e97560b76ad7029945cc469bdcd5c9e7544847857aca7c4f8 SHA512 d48f5ac94123ef61dba739460dee4e9dba8ce26ba200c881d5daf7f719864a951d6207b8980e7c1ba744269b66e3e50caff45c2d438264741f244e55ca17edeb
-EBUILD kismet-9999.ebuild 3172 BLAKE2B 0e444650ad62775bdd832172fc78786bf4168961d6d20e92ab3da4908e843f0570031ce670755c64dfe928cf0ff0945e5352e1967f7d83286255c8b17ced74b1 SHA512 9c76de5c31e96964f5cc8da9b881015f478996bb92fe34df0d7a08411a281245ef50294eec49a92176dcb88e61590cb9f7ffd4457bff97b7c01066bfced632bd
+EBUILD kismet-2019.05.1.ebuild 3426 BLAKE2B 411ab8cb5c085ea6031df9dd1abeeae2693826a096f914474aa02f3a84a442f180962b09ef933b16b496dcde8a04f8304d4ce8c5a1ab09eeaea151e1328ebf2e SHA512 34a1e6c9d617bf5bcedf2d56f28311ecead912db0d6ace211198a14c7dc79f86ace08973e40b9cf762051ccac4c81f948a1c6352a77855cd4f08ebc9bcc9b00c
+EBUILD kismet-9999.ebuild 3429 BLAKE2B df2b377fbec665bd26deebe0162ca9861e2f228c497bf3da1c3e6b37a74c6da0e0d7776f1fb9ca1d2b072575a89a446a48d1ee0101666117f808fcadd27c07fc SHA512 76bdb921dbb8d8af6c38ac2fa6399ee77d62b52c30afa69f217f09f872292bc24104b1caceb9e19be54220c69d92cc11f1e5f561d1c5113c07542bf2fdf3b72e
 MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/kismet-2019.04.1_p20190416-r1.ebuild b/net-wireless/kismet/kismet-2019.04.1_p20190416-r1.ebuild
deleted file mode 100644
index 6277b7995e0b..000000000000
--- a/net-wireless/kismet/kismet-2019.04.1_p20190416-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib user python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
-	inherit git-r3
-	RESTRICT="strip"
-else
-	MY_P=${P/\./-}
-	MY_P=${MY_P/_beta/-BETA}
-	MY_P=${MY_P/./-R}
-	S=${WORKDIR}/${MY_P/BETA/beta}
-	#normally we want an official release
-	#SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
-	#but sometimes we want a git commit
-	COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
-	SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="https://www.kismetwireless.net"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	networkmanager? ( net-misc/networkmanager:= )
-	dev-libs/glib:=
-	dev-libs/elfutils:=
-	sys-libs/zlib:=
-	dev-db/sqlite:=
-	net-libs/libmicrohttpd
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	mousejack? ( dev-libs/libusb:= )
-	dev-libs/protobuf-c:=
-	dev-libs/protobuf:=
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	sys-libs/ncurses:=
-	lm_sensors? ( sys-apps/lm_sensors )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kismet )
-"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet_logging.conf || die
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	eapply_user
-
-	#just use set to fix setup.py
-	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-
-	if [ "${PV}" = "9999" ]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable pcre) \
-		$(use_enable lm_sensors lmsensors) \
-		$(use_enable mousejack libusb) \
-		$(use_enable networkmanager libnm) \
-		--disable-optimization
-}
-
-src_install() {
-	emake DESTDIR="${D}" commoninstall
-	emake DESTDIR="${D}" forceconfigs
-
-	insinto /usr/share/${PN}
-	doins Makefile.inc
-
-	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
-	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
-		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
-		fowners root:kismet /usr/bin/kismet_cap_pcapfile
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
-		fperms 4550 /usr/bin/kismet_cap_linux_wifi
-		fperms 4550 /usr/bin/kismet_cap_pcapfile
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-	if ! use suid; then
-		ewarn "It is highly discouraged to run a sniffer as root,"
-		ewarn "Please consider enabling the suid use flag and adding"
-		ewarn "your user to the kismet group."
-	fi
-}
diff --git a/net-wireless/kismet/kismet-2019.05.1.ebuild b/net-wireless/kismet/kismet-2019.05.1.ebuild
new file mode 100644
index 000000000000..a4d105b452e9
--- /dev/null
+++ b/net-wireless/kismet/kismet-2019.05.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib user python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
+	inherit git-r3
+	RESTRICT="strip"
+else
+	MY_P=${P/\./-}
+	MY_P=${MY_P/_beta/-BETA}
+	MY_P=${MY_P/./-R}
+	S=${WORKDIR}/${MY_P/BETA/beta}
+
+	#normally we want an official release
+	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+
+	#but sometimes we want a git commit
+	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
+	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
+fi
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="https://www.kismetwireless.net"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
+
+CDEPEND="
+	${PYTHON_DEPS}
+	networkmanager? ( net-misc/networkmanager:= )
+	dev-libs/glib:=
+	dev-libs/elfutils:=
+	sys-libs/zlib:=
+	dev-db/sqlite:=
+	net-libs/libmicrohttpd
+	kernel_linux? ( sys-libs/libcap
+			dev-libs/libnl:3
+			net-libs/libpcap
+			)
+	mousejack? ( dev-libs/libusb:= )
+	dev-libs/protobuf-c:=
+	dev-libs/protobuf:=
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	sys-libs/ncurses:=
+	lm_sensors? ( sys-apps/lm_sensors )
+	pcre? ( dev-libs/libpcre )
+	suid? ( sys-libs/libcap )
+	"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kismet )
+"
+
+src_prepare() {
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		conf/kismet_logging.conf || die
+
+	# Don't strip and set correct mangrp
+	sed -i -e 's| -s||g' \
+		-e 's|@mangrp@|root|g' Makefile.in
+
+	eapply_user
+
+	#just use set to fix setup.py
+	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+
+	if [ "${PV}" = "9999" ]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable pcre) \
+		$(use_enable lm_sensors lmsensors) \
+		$(use_enable mousejack libusb) \
+		$(use_enable networkmanager libnm) \
+		--disable-optimization
+}
+
+src_install() {
+	emake DESTDIR="${D}" commoninstall
+	emake DESTDIR="${D}" forceconfigs
+
+	insinto /usr/share/${PN}
+	doins Makefile.inc
+
+	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
+	dodoc CHANGELOG README*
+	newinitd "${FILESDIR}"/${PN}.initd kismet
+	newconfd "${FILESDIR}"/${PN}.confd kismet
+}
+
+pkg_preinst() {
+	if use suid; then
+		enewgroup kismet
+		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
+		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
+		fowners root:kismet /usr/bin/kismet_cap_pcapfile
+		# Need to set the permissions after chowning.
+		# See chown(2)
+		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
+		fperms 4550 /usr/bin/kismet_cap_linux_wifi
+		fperms 4550 /usr/bin/kismet_cap_pcapfile
+		elog "Kismet has been installed with a setuid-root helper binary"
+		elog "to enable minimal-root operation.  Users need to be part of"
+		elog "the 'kismet' group to perform captures from physical devices."
+	fi
+	if ! use suid; then
+		ewarn "It is highly discouraged to run a sniffer as root,"
+		ewarn "Please consider enabling the suid use flag and adding"
+		ewarn "your user to the kismet group."
+	fi
+}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 863cf42add19..2ddf82ae347d 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -16,7 +16,15 @@ else
 	MY_P=${MY_P/_beta/-BETA}
 	MY_P=${MY_P/./-R}
 	S=${WORKDIR}/${MY_P/BETA/beta}
+
+	#normally we want an official release
 	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+
+	#but sometimes we want a git commit
+	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
+	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-${COMMIT}"
+
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 fi
 
diff --git a/net-wireless/kismetdb/Manifest b/net-wireless/kismetdb/Manifest
index 549a681f95cf..60a6d11e6fc7 100644
--- a/net-wireless/kismetdb/Manifest
+++ b/net-wireless/kismetdb/Manifest
@@ -1,4 +1,4 @@
-DIST kismetdb-2019.03.01.tar.gz 29115 BLAKE2B 2ff59518faa2fa4d689af901ae017b73dbe137f8e6ddf2bc897b297a9c87348110e682d181244506526cabf9febdee7956587f4c2988ec6fc5a80b0224b41239 SHA512 5b886ff5c133aea0c5d53bddaefd201061e6866987338f61623787b79397a396198fa3ba68a08e5728fa571bd2fb250eaf7b5ee785a165f4b1ba818f412d4bb3
-EBUILD kismetdb-2019.03.01.ebuild 710 BLAKE2B 2bc009bb6d5e49cb711c02a14c85b882f3d6b057e58c99c1ee59d2ef5ca2f6402cd19761ec8fde0585f20c206dea8abdc36c9a084183fd23516672441ba026c9 SHA512 32025e8f40220ae66908eddd1bca7389778e969449830b1deb73e04997e7d16b7e800ddf4e945c20cc369c58274d69013fece956e3348f5f0e497fcc9a6c9b95
+DIST kismetdb-2019.05.05.tar.gz 31425 BLAKE2B 4aa4ee6924792376e84fb4a4fb86a425319ea21fc10dc5874df35aa551ce444f62dd381359bad994b89defee3fef8f0bed5e80ffc0d18c025bed28b5cb2efa45 SHA512 0b36c1d4dfb0ffb5749c32884ce1b44c1ece196ebaf07db66157aed2c649c2b4dc650a6553a2e263c4518da2f06f1602754917d5db07f3ab39efb63c38dd8327
+EBUILD kismetdb-2019.05.05.ebuild 710 BLAKE2B 2bc009bb6d5e49cb711c02a14c85b882f3d6b057e58c99c1ee59d2ef5ca2f6402cd19761ec8fde0585f20c206dea8abdc36c9a084183fd23516672441ba026c9 SHA512 32025e8f40220ae66908eddd1bca7389778e969449830b1deb73e04997e7d16b7e800ddf4e945c20cc369c58274d69013fece956e3348f5f0e497fcc9a6c9b95
 EBUILD kismetdb-9999.ebuild 710 BLAKE2B 2bc009bb6d5e49cb711c02a14c85b882f3d6b057e58c99c1ee59d2ef5ca2f6402cd19761ec8fde0585f20c206dea8abdc36c9a084183fd23516672441ba026c9 SHA512 32025e8f40220ae66908eddd1bca7389778e969449830b1deb73e04997e7d16b7e800ddf4e945c20cc369c58274d69013fece956e3348f5f0e497fcc9a6c9b95
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/kismetdb/kismetdb-2019.03.01.ebuild b/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild
index a0a5fee7f90e..a0a5fee7f90e 100644
--- a/net-wireless/kismetdb/kismetdb-2019.03.01.ebuild
+++ b/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index efd9bcf66552..e194340ad1a1 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,6 +1,6 @@
 DIST rtl-sdr-0.5.3_p20170919.tar.xz 98972 BLAKE2B fb7d977bd05a2c717897ba58a2242698d1a90cf38a7a8340d7ec8c3aefeeff49bfe9612285253b27c6726ae584172e0b26c8f535bc4bec704958c1296e232f04 SHA512 b1b97c720882ccbe8be8e30af28b8d52c5a27507861bdb9e964e153cd8ece9de977abd271b68861c163a7cf239044f28c8d17ccda5ff5acf60f17d839d782a82
 DIST rtl-sdr-0.5.4.tar.xz 108708 BLAKE2B 12f5f5a913089ec57327621eddab9b74b07cccceeac9d00ab2cbd413bc29d8444633953319e2887ef5e07a766f38b4ea2f5d3cbf73efd63a1886e30e2bed6968 SHA512 6cf3c62e6a56694f90deed64e2761105fdbeb40de8001a378e687d60cc3718ad64065b5d896b3f4b27ff6a5383173b53df52816e24b31c726485364cfd9c1a43
 EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
-EBUILD rtl-sdr-0.5.4.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
+EBUILD rtl-sdr-0.5.4.ebuild 1162 BLAKE2B f3088c38e3f3307f4c4320a034c5cd573c5578ffc9f83d1994a1773c7c3f91846055201c46ba55926967fc9c2312077020d6e39351c3fda2d89995f4900360af SHA512 68bc4fa2d8fa2bcacded03f85c6d68ebdc4600d4440fc366991940e2e5a54362088b50f7bc58a4b152bb1edb7b3f24f86e3354f0ce9e391486e1cfecee5c75bb
 EBUILD rtl-sdr-9999.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
index cb32ad203bb9..01063ffe168f 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ else
 	#cd rtl-sdr
 	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index e5fb54946596..34fc1986c9c5 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,12 +4,16 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.10.21.zip 91783841 BLAKE2B 92d4c886fe10e65a3517ab8ee21ca999751e8ac35d8d7a9c1355a586f2ac31ccd12b4337673308a620866757fa4e4d34a559ed1ec23f04bfe07eb2a16f1018d3 SHA512 239493242d73347639eb99bcb3d01f852cddebd33efd5687759e6520f6f36e7c152588321d0464f63f3369927e48070d62dcb5cfaee74fb16cbceda8725b0a9a
 DIST unifi-5.10.23.zip 91775246 BLAKE2B 842ffd4c63b19d480fa29330fa66245cbfdd840f719d5c9e1bd59972f7dba6d2a425c22097a3afa01aab719bdad162dced938e1406716a7892a6a30e58797f61 SHA512 be4a4f855b741dcd86f46a082838a770c1b622f8f1e860f1005e8fbf55306a28de98a3ba2a704af21e6badd7d342465520c42e481b2bec50ec4439d8f784edc3
+DIST unifi-5.10.24.zip 91779832 BLAKE2B 2e20b10036d185b2fa282b0bf3f1b7538482a5ed07c334f1d681957abc7e63a6de97709c2c35fb4b1e2186351b3fd47460d6c21be5483301b0ff008ade97bb63 SHA512 db71422339ab93cd285ae62715c4066075d6602f16767e765461e1121d75f44c348f10ddd0033626b35e199df4da7b6e26efe350e8052eab0ee98471939d44b6
 DIST unifi-5.11.18.zip 99865634 BLAKE2B 41403e420441793685cb27347238e5e8243083fef2386401be05705571921d0d0317c2b786080b8b2181dda76324cc0592f03729460c732d5b454d22f6682e49 SHA512 33c332a3719c8500fc918d93a40dddb1465e108b13faa969e311a47ed5781842297700293cefad6a13feb2ae267a11b929c103352e055a78d392c8b8c1bbac16
+DIST unifi-5.11.26.zip 111562451 BLAKE2B f4a7788f8ff14e2eadc0da28fdf11c54ff22ada8bfc7300dc07aa87058d9d207b66d3687625c27920f60b46035756c49b69342740dd28cb51f2ad427f7d7d550 SHA512 3704e1b19b73a3c572a3695b21ecfae5948fed0ebfb305f234865c096688b5a87f4ca9c59ba79d28d1ab8571ecd61c555196a4b2a21e870797fd0bbd71fe4b5d
 DIST unifi-5.6.40.zip 63584069 BLAKE2B 9c241c7ef335b6e4d9ce1d53d8bf6a9b2e6a0c5b91d60f321100e67cc6201f1dc060398dc7af1ee014c47df194f64ddf1eb56a6c7ce53691251b4fd2937c5603 SHA512 d2e154ec6bdf24cfcb0e5154512a91dc0e601a2bfe7fcdda4c22b329b304b50315a42485daee8495a5076136055c2cf59ebe42b083221683168199e437589e9a
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 EBUILD unifi-5.10.21.ebuild 1845 BLAKE2B 2c5b5165cea1d75d627ed6302ff6d008d74cb85f55687ca129b1cf94f4b3150fd07d0ba0b02673b5f96b7cdd1f6ed1a03fcba27614d9994477f5ed2a9bb6f998 SHA512 4868f8b1475143ab02556d2b0e3ab8c5b61e7236d0cc3fb47c9f5e3c7416a01217eb20f6b4aae3eff0a644b9628805f8ce8ed867f5665ca83c308af93db7fe26
 EBUILD unifi-5.10.23.ebuild 1834 BLAKE2B 419a9012af3f4d2911f12e5877e28309c3d1ff9d935f69bff2c4ff0276c46225d1268fb895238df249f9c76bcb70e69743f5fb893e1e6d21e846b2f7254d1911 SHA512 a83f56a8f2efbcc108c2b4b4ccdaffded74d59341167f672a2a70a85b97cf5d529f587ca4ba34a4fe5268e51c84e0edfde2886122c4cc62ef50ad7c973ce8998
+EBUILD unifi-5.10.24.ebuild 1845 BLAKE2B 3431d95023bf22aef529f93f9bcbcec4ef64eb6c6385c0e31d235efbbb50c7a82e68280ee9a4f4c67f432d259a99fa773316c1ea16ed7bb1d2f11598ebc3f43b SHA512 e5821ab30f7f72dd545b8d5a83182a5773e99efa26ea238d6969a4b23442d4f2e1db9b0355d5fee484579793f4caa5f7744da8a4c482373dfdcb6ac659b9a484
 EBUILD unifi-5.11.18.ebuild 1846 BLAKE2B 001f3756c66a102d3df5767a7b226b87af54fedca02caabf35d2ba8551c54cbb6cc5c62a0e740e23938ff8c885fc4555ae923cdb57bee73c0d3704de2e3fd460 SHA512 28779be98780d1280279b171b49cde0cb0d30d04c238f64662f3c3decc8b1464a238e5217bfdb6cffe4d91a665fe1a6bfdedfc8a81f937226f0553de3ba587ac
+EBUILD unifi-5.11.26.ebuild 1835 BLAKE2B 0e5689f5ffeefdb88be719ea6ba00f7dfc7f396000729bc8b928095ee2c99074634b8cae30b279c2615846d09b5321d1571817d9a7c1750f25b20009ce57b0ea SHA512 80195ede8f3062cb0fcb0ff6b5cde659d72f93abbf2f6294a9733eea3854ea2e44844f76f4bd61e5f73139c2300a3c314eff704e4ca9b17a640ff351e100aca3
 EBUILD unifi-5.6.40.ebuild 1721 BLAKE2B 04efda4b528074a4b01f11d9cdb45237d64ec6af9846f8d30e2c5fe1564990467f6e0e6c4fa76e77e06007239f1f338d509f5759ed9baccd93ee8f2f70b39a63 SHA512 6e1b3ae4df8cb47c142ee14e5bb92a3c21dd5a97caeaa665bba0e201a9ffefb913f24420967944c09e3dcf516c667af566ecbd7404a254146fa2022a496f6788
 EBUILD unifi-5.6.42.ebuild 1721 BLAKE2B 04efda4b528074a4b01f11d9cdb45237d64ec6af9846f8d30e2c5fe1564990467f6e0e6c4fa76e77e06007239f1f338d509f5759ed9baccd93ee8f2f70b39a63 SHA512 6e1b3ae4df8cb47c142ee14e5bb92a3c21dd5a97caeaa665bba0e201a9ffefb913f24420967944c09e3dcf516c667af566ecbd7404a254146fa2022a496f6788
 MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/unifi-5.10.24.ebuild b/net-wireless/unifi/unifi-5.10.24.ebuild
new file mode 100644
index 000000000000..f05b3f52c3bc
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.10.24.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Used when it's an unstable, beta or release candidate
+RC_SUFFIX="-fc15f0fdf1"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.10"
+IUSE="systemd"
+
+RDEPEND="dev-db/mongodb
+	virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+	enewgroup unifi
+	enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/unifi/unifi-5.11.26.ebuild b/net-wireless/unifi/unifi-5.11.26.ebuild
new file mode 100644
index 000000000000..e7bf09eafeee
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.11.26.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-1ecdee774d"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.11"
+IUSE="systemd"
+
+RDEPEND="dev-db/mongodb
+	virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+	enewgroup unifi
+	enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/wepattack/Manifest b/net-wireless/wepattack/Manifest
index 521824ed0458..8a4dc870ce00 100644
--- a/net-wireless/wepattack/Manifest
+++ b/net-wireless/wepattack/Manifest
@@ -2,5 +2,5 @@ AUX wepattack-0.1.3-filter-mac-address.patch 6727 BLAKE2B cdd1ff764e3cc409baa80b
 AUX wepattack-0.1.3-missed-string.h-warnings-fix.patch 608 BLAKE2B f0bd227ddc9e778101802cd988451d374bec0e619f06f180d7275e793d0e8815c08e9a2f9e12614a4efeac2b44fc3cd0bd9ae1c59bd4a650702e21ddde335d58 SHA512 30b92627c616a1e2d07300765d6b2e2b1e097e424820c21d98f814ff153ab87375e913deb9f2e60d61ddd64768865d35e3b5d73b2e700caf7fc85a3f484b719b
 AUX wepattack.conf 181 BLAKE2B 62d5a4b333fea32a5c5fe81e71a5b30ed90914361fda8c23dba208e6e4134651f257c337eaa1c8e95c5be5a4323443dad91ea51e1ab47e40064c5231299f8b07 SHA512 51c056be0c8b77e0af5c3ca40ee38244c6d5b7c55be4ac1d6a0e0db721c4be7e1ef235588d27b124a2f281d626fc5904234fb4d2d2e344047582e600ae6037d7
 DIST WepAttack-0.1.3.tar.gz 25063 BLAKE2B 48923fd891a57a61edf5a3c75e84c3194ddad79adf7b588b54f4709cfbbad43537011f5e1a6c303f35cace50835802871113d7815bfcd1b08d167449e5007a0f SHA512 fe8d9843613fc29b7802f699311cb67fe3546a17a279ebc2e150cce155e726270dc937b1c941d9e9287b813febf171fe56053f6b010c4f2021e45e572f91fdf4
-EBUILD wepattack-0.1.3-r4.ebuild 1174 BLAKE2B 07963ddd83b699e0b137aee8dd66daa1253a25c057e16af6ae238712118401f85c0dc5fb642f017ce569b8058af4fad969ade83ab1d940e56cd5bb8753122df2 SHA512 588d8965e2be86abdd9a576d94d8e616fce8be4b3f0edb0e531074d34fb3e38386a6a254d5fd7ddded2e3864a3d97ad6e3de31699240af9a13f48bfd9bf21567
+EBUILD wepattack-0.1.3-r5.ebuild 1175 BLAKE2B e157b56166cccba9a37023a4c1694172b8216f68b50603ddd054bf7da7997952c2e0b28a8e630c4f67f56f2734397b2ef92ee535b42e0844c28deadd8bdb59e5 SHA512 b76540cfd6a3709267d1ba0f74b2db73c39e93f8fd130c493b0bacbfc8bc47cf3f9d826f25e5e111ca1c25cbd1d57ab9f55aba79b43eb5e4d9b5d5529f69506d
 MISC metadata.xml 738 BLAKE2B afff49099c9884048e58980250796970f9222ea864eb9889ace2b5cd26efbc6292e658d252d03cd7f7f93e006e57fa7a7eef6bb3eb1c68fc86c7c77706a1447a SHA512 5b2f7f73769ca63b32574a04ce6031ae4d664d65c23aea972aec5cafcbd8602a4cb3cddab078c75c6645c3bbf12f0b658916295834c7dfcddd9b2fac3c5649f9
diff --git a/net-wireless/wepattack/wepattack-0.1.3-r4.ebuild b/net-wireless/wepattack/wepattack-0.1.3-r4.ebuild
deleted file mode 100644
index cc200b2888b8..000000000000
--- a/net-wireless/wepattack/wepattack-0.1.3-r4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_P="WepAttack-${PV}"
-DESCRIPTION="WLAN tool for breaking 802.11 WEP keys"
-HOMEPAGE="http://wepattack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wepattack/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="john"
-
-DEPEND="
-	dev-libs/openssl:*
-	net-libs/libpcap
-	sys-libs/zlib
-"
-
-RDEPEND="${DEPEND}
-john? ( || ( app-crypt/johntheripper app-crypt/johntheripper-jumbo ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-filter-mac-address.patch
-	epatch "${FILESDIR}"/${P}-missed-string.h-warnings-fix.patch
-	chmod +x src/wlan
-	sed -i \
-		-e "/^CFLAGS=/s:=:=${CFLAGS} :" \
-		-e 's:-fno-for-scope::g' \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "/^LD=/s:gcc:$(tc-getCC):" \
-		-e 's:log.o\\:log.o \\:' \
-		src/Makefile || die
-	sed -i \
-		-e "s/wordfile:/-wordlist=/" \
-		run/wepattack_word || die
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_install() {
-	dobin src/wepattack
-	if use john; then
-		dosbin run/wepattack_{inc,word}
-		insinto /etc
-		doins "${FILESDIR}"/wepattack.conf
-	fi
-	dodoc README
-}
diff --git a/net-wireless/wepattack/wepattack-0.1.3-r5.ebuild b/net-wireless/wepattack/wepattack-0.1.3-r5.ebuild
new file mode 100644
index 000000000000..0d272d9e31de
--- /dev/null
+++ b/net-wireless/wepattack/wepattack-0.1.3-r5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+MY_P="WepAttack-${PV}"
+DESCRIPTION="WLAN tool for breaking 802.11 WEP keys"
+HOMEPAGE="http://wepattack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wepattack/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="john"
+
+DEPEND="
+	dev-libs/openssl:0=
+	net-libs/libpcap
+	sys-libs/zlib
+"
+
+RDEPEND="${DEPEND}
+john? ( || ( app-crypt/johntheripper app-crypt/johntheripper-jumbo ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-filter-mac-address.patch
+	epatch "${FILESDIR}"/${P}-missed-string.h-warnings-fix.patch
+	chmod +x src/wlan
+	sed -i \
+		-e "/^CFLAGS=/s:=:=${CFLAGS} :" \
+		-e 's:-fno-for-scope::g' \
+		-e "/^CC=/s:gcc:$(tc-getCC):" \
+		-e "/^LD=/s:gcc:$(tc-getCC):" \
+		-e 's:log.o\\:log.o \\:' \
+		src/Makefile || die
+	sed -i \
+		-e "s/wordfile:/-wordlist=/" \
+		run/wepattack_word || die
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_install() {
+	dobin src/wepattack
+	if use john; then
+		dosbin run/wepattack_{inc,word}
+		insinto /etc
+		doins "${FILESDIR}"/wepattack.conf
+	fi
+	dodoc README
+}
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index cfd533cfc70b..6ec34f911faf 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,5 +1,5 @@
 DIST wireless-regdb-2018.10.24.tar.xz 23296 BLAKE2B d9fd3da8ff91514e671d14e3caed628f9bc7e338227b5f1164523f4c8125ae9abe2b998d026f8aaa612fda60ea4bdf3817f9808935cda984e137a75fb5b3ddde SHA512 1bf295a759c8807178eea8b421a2276f23eac8fc51742386867e8589e297f78a8466c011995daaa40b288ffb1db875142f124d93ce637a8967e548e9b5ce2174
 DIST wireless-regdb-2019.03.01.tar.xz 23196 BLAKE2B 804ad05a0270df58dd89eb7193f8b568b5534abfc52b35f519e27cfa1f1922db457c77477b3014bd6b48cdd1bbe9e859a6508afa848cf01efbbf6b20d10c4984 SHA512 f0b94e1f661d86f4fcd39384588e10d7353ad085563ddc40a98446b416ce0d7bd0cbe34f1d9620ac45a33f16b7bfe58419da915061942cd5f51d5a3bf9809d72
 EBUILD wireless-regdb-20181024.ebuild 1073 BLAKE2B 493b37398960a9ae1e08f9bbbbd95e20ee5c777f26ff0e1e6baef77a5d130656cfbdfbb0c6fbda79479a7241b3f798f4c81741fd8b940602aeceb725a46b7429 SHA512 4069e29d136f4181ad80623827506bb972c2f5219260530f7f4f0c79991580aa43d0ad7fe0caf3eab7c7a5589ad0b467e90bbeb54902823ccc81252657ca3b0b
-EBUILD wireless-regdb-20190301.ebuild 1073 BLAKE2B c1b32e1ab0188fceda701ec24ec7c981cbeb491293a6953181ec87aed74d1e56b1946c3c48e07d9fd40638c82cf2b221a25de4eda36f081afd9bbc38f4ed56aa SHA512 294caff32a9e7b648585dc802fd1f9367858189ba1a93e4e0cb13b823d627ab831653af6bf7e5fbc900019d6fd56951dee94d1bffe3f849a18efd53dd8f69720
+EBUILD wireless-regdb-20190301.ebuild 1072 BLAKE2B 01bb8430f1e4867ec1b68b11544a0d104ea419e7ad6910d0f17e670635f81b830340f6661b9fda172659273a462f4a18f2196bd7cb1a0725830d60cddc737e79 SHA512 99eb1e6196130b621c83819968c269f36994e0f6c85f8e42a03647af15acd5b8da38a5206f3e88678821981e3fe59da33345120ac5609f09c0c2b49c0cb451af
 MISC metadata.xml 457 BLAKE2B b9df8d376a76636ad2c8b8e78414889163936311a12421871a57d28c83c249da98a275b37a9b4a32ab979b194eb2ca000f34503dfe01a18c7c61e4044478ffd6 SHA512 0ee51061d82f0d81f263b479b1932666109450df0bf8c72faca8881f0417f2940245a0099ddc785526b95dcfffcc255de8a07f27356239781921dec10827c4bd
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
index eda605269c32..d38887cb9ee6 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 9444ff324f16..44a9fe8ac0dc 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -19,7 +19,7 @@ AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535
 DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 99c61326c402f60b384fa6c9a7381e43d4d021d7e44537a6e05552909270f30997da91b690d8a30aa690f0d1ce0aed7798bd8bb8972fcf6830c282ccc91193ac SHA512 46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6
 DIST wpa_supplicant-2.7.tar.gz 3093713 BLAKE2B bbf961b6e13757e9d7bb8b9de1808382a551265cd2d54de14e24bde3567aa5298b48fdcd0df75db79189a051532c54b28eab5519c32fc8fc00459365b57039aa SHA512 8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3
 DIST wpa_supplicant-2.8.tar.gz 3155904 BLAKE2B 260b4830949a3e051ef4f33f279b3b225ab9fd95100e4b270d29af457cf07601421fac636d9f1d8927271d7c76aecb0b7c93ddab35203e31a0fd84c3e327d951 SHA512 b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b
-EBUILD wpa_supplicant-2.6-r10.ebuild 12648 BLAKE2B c67a87d8edae237a17d8799fb79c2aad65da5ba6a8c80d2a8ad925542e8fb0494a5f7732a0b9e4915d64f564507c347559c459e29190e10713474b4d00c27afe SHA512 518d7f5ba4f7cd0587151af95024b8d42d7220677ba2fc73a7b29a7e6a5c47b0947e7c353d74f38fe46f17f5fe91dc6c4bd61688a8a4fe2769e55f7e48131a20
+EBUILD wpa_supplicant-2.6-r10.ebuild 12647 BLAKE2B 1c79f30a1746cb72ca4a8dd1353fc943731ab13633ec963f53f36ddf8c75a64bc738e9be75a059d174e05f85693b251de413f8733d47392de53c8bdbcd8bec75 SHA512 dca78957810df5fd52a1a4bbc7fdb5460dad19b2388124ef90c4616e4684eeac01ea60f0436d9c81ad168ac7acf5f56011270a0972fc42da58d2731539993ba8
 EBUILD wpa_supplicant-2.7-r1.ebuild 11750 BLAKE2B eb1e7a72330890822359cc0d006957cd6e25723bc063ee739148a9923aa5d966287e5f35049190dbf730f116025bfc960545561d869ca8d06ad35a92c88bbd26 SHA512 b9bd97e080835f1aeec619cab60e5bf23382b6a91bead57373edef72064b53945ee4722ec4ebd23ce8d5d95d342a56f72d9c508910176d890e796067802b1746
 EBUILD wpa_supplicant-2.7-r3.ebuild 11552 BLAKE2B 2634e6f8bf06e5a9f65dc52194334bda1b89fafc5db5d5c080840944c58431d8271eac507d3ae33ea9496ca05bffa76d2852231ae39032f697feb297ec895b9b SHA512 83fef1ecea3a7b21a995920018a63b4cd3f3f5019573aaa559faae16bf8550e4fd4f1b26fb96d3f94dead411067f11ffc444a37728883bedb73e493f1a476d69
 EBUILD wpa_supplicant-2.8.ebuild 11488 BLAKE2B 60d9bb625804d9b4fffc57fc5411375779d1eecc66cfb6fa5390b2111753a8caf4d17f13ed0532512f0a8e8fd2972c6bb00b5c56f3c212f7194468b08603f3fd SHA512 be7f3e6427b251d3a95820dc8ad663da424e5f7e72f3cc56eb4c69564be79f13ce56a4f03205fd00da6f9c790884ab3bc8fd43bc395b95174f4c8d20b412947a
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
index aee917dd595b..a51880a17ddc 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 REQUIRED_USE="smartcard? ( ssl )"
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b3b66f812cbb..a8bb9b65cb63 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 3c1fc8c89200..567c53840b2b 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -41,6 +41,7 @@ games-action/brutal-legend
 games-action/cs2d
 games-action/descent3
 games-action/descent3-demo
+games-action/guacamelee
 games-action/heretic2
 games-action/heretic2-demo
 games-action/hotline-miami
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 9a134f645267..8bae7dd1d1cf 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (22 May 2019)
+# Allow python-exec to install all targets
+# Ack by mgorny
+dev-lang/python-exec -python_targets_python3_7
+
+# Andreas Sturmlechner <asturm@gentoo.org> (21 May 2019)
+# dev-db/oracle-instantclient ain't stable
+dev-qt/qtsql oci8
+
 # Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
 # Depends on unstable media-libs/dav1d
 media-video/vlc dav1d
@@ -36,6 +45,8 @@ app-admin/sudo -sssd
 # Mart Raudsepp <leio@gentoo.org> (01 Nov 2018)
 # net-wireless/iwd not stable yet
 net-misc/networkmanager iwd
+# Ben Kohler <bkohler@gentoo.org> (22 May 2019)
+net-misc/connman iwd
 
 # Mikle Kolyada <zlogene@gentoo.org> (15 Sep 2018)
 # the dependency is unstable
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 747e71d461bd..9e4d8a253d08 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -57,7 +57,7 @@ media-sound/mpd fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (29 May 2017)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-13 frei0r
-<=media-video/ffmpeg-3.4.5 frei0r sofalizer
+<=media-video/ffmpeg-4.1.3 frei0r sofalizer
 
 # Alexis Ballier <aballier@gentoo.org> (18 Apr 2017)
 # No gst-plugins-vp8:0.10, gst-plugins-musepack:0.10 stable
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index f5f8a290b1b3..7e89ef2ce62e 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (01 June 2019)
+# not yet keyworded
+dev-java/openjdk javafx
+
+# Aaron Bauman <bman@gentoo.org> (27 May 2019)
+# plasma is not stable yet
+kde-frameworks/purpose kaccounts
+
 # Aaron Bauman <bman@gentoo.org> (20 May 2019)
 # doc USE ultimately pulls in dev-lang/ocaml[ocamlopt]
 media-gfx/enblend doc
@@ -15,11 +23,6 @@ www-servers/uwsgi uwsgi_plugins_rados
 # app-text/dblatex not keyword yet
 net-firewall/nftables doc
 
-# Roy Bamford <neddyseagoon@gentoo.org> (19 Mar 2019)
-# Let kde-apps/akonadi use mysql.
-dev-qt/qtsql -mysql
-kde-apps/akonadi -mysql
-
 # Mart Raudsepp <leio@gentoo.org> (11 Mar 2019)
 # media-libs/bcg729 not keyworded yet
 net-analyzer/wireshark bcg729
@@ -65,11 +68,6 @@ virtual/ffmpeg -sdl
 # It builds OK but is not yet in ::gentoo. bug #678404
 kde-apps/cantor lua
 
-# Davide Pesavento <pesa@gentoo.org> (27 Dec 2018)
-# The corresponding Qt5 modules are not keyworded on arm64, and we don't want to
-# keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 networkauth
-
 # Dirkjan Ochtman <djc@gentoo.org> (29 Sep 2018)
 # Upstream doesn't build docs for tier 2 and lower architectures.
 # Bug #660512.
@@ -88,10 +86,6 @@ sci-electronics/kicad occ oce ngspice
 <app-editors/emacs-25.3-r6:25 imagemagick
 <app-editors/emacs-26.1-r3:26 imagemagick
 
-# Tomáš Mózes <hydrapolic@gmail.com> (10 Aug 2018)
-# Needs dev-libs/libmaxminddb which isn't keyworded
-app-admin/syslog-ng geoip2
-
 # Matthew Thode <prometheanfire@gentoo.org> (18 Jul 2018)
 # dev-python/pandas not keyworded and test uses pandas
 dev-python/networkx pandas test
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index d1a6dc06e536..855f907eaea4 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Aaron Bauman <bman@gentoo.org> (27 May 2019)
+# media-libs/dav1d is not stable
+media-video/vlc dav1d
+
 # Aaron Bauman <bman@gentoo.org> (20 May 2019)
 # deps are not stable yet
 virtual/notification-daemon gnome kde
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index e730f1ed5372..c0acbe59c7ac 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -119,7 +119,6 @@ xemacs
 rpm
 scanner
 zvbi
-mysql
 fluidsynth
 sid
 mms
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 2e1a9ab86a31..ba6ecb3233e2 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -13,10 +13,6 @@ ocamlopt
 consolekit
 
 # Mart Raudsepp <leio@gentoo.org> (07 Feb 2019)
-# app-misc/tracker not stable yet
-tracker
-
-# Mart Raudsepp <leio@gentoo.org> (07 Feb 2019)
 # media-sound/musepack-tools not stable yet
 musepack
 
@@ -24,10 +20,6 @@ musepack
 # media-libs/portaudio not stable yet
 portaudio
 
-# Mart Raudsepp <leio@gentoo.org> (18 Jan 2019)
-# x11-libs/libva not stable yet
-vaapi
-
 # Mart Raudsepp <leio@gentoo.org> (27 Nov 2018)
 # x11-libs/fltk not stable yet
 fltk
@@ -37,14 +29,6 @@ fltk
 python_targets_python3_7
 python_single_target_python3_7
 
-# Michał Górny <mgorny@gentoo.org> (16 Apr 2018)
-# Not stable yet.
-vala
-
-# Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
-# virtual/{jdk,jre} are not stable here.
-java
-
 # Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
 # dev-lang/tk is not stable here.
 tk
@@ -56,7 +40,3 @@ subversion
 # Mart Raudsepp <leio@gentoo.org> (28 Jan 2017)
 # sys-auth/skey not marked stable yet
 skey
-
-# Ben de Groot <yngwin@gentoo.org> (24 Aug 2015)
-# Not yet stable, bug #543326
-qt5
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index e87d47208193..007e8c6841d1 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sergei Trofimovich <slyfox@gentoo.org> (25 May 2019)
+# libgo needs an explicit port to hppa: bug #686624
+sys-devel/gcc go
+
 # Jeroen Roovers (jer@gentoo.org) (22 Mar 2018)
 # HiPE does not work on HPPA
 dev-lang/erlang hipe
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 541a9c44f2ff..90c52e0b84f0 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -2,8 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Sergei Trofimovich <slyfox@gentoo.org> (21 May 2019)
-# No ia64 arch support for jit.
+# No ia64 arch support for jit. Version 17 USE=debug
+# required USE=jit.
 dev-lang/spidermonkey jit
+=dev-lang/spidermonkey-17* debug
 
 # Mart Raudsepp <leio@gentoo.org> (17 Mar 2019)
 # Unkeyworded media-libs/opencv dependency, bug #680656
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index a6add7ff54bd..208d8b8210ba 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (01 June 2019)
+# not yet keyworded
+dev-java/openjdk javafx
+
 # Patrick McLean <chutzpah@gentoo.org> (15 Apr 2019)
 # deps not available on platform
 sys-cluster/ceph babeltrace lttng
diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults b/profiles/arch/riscv/rv64gc/lp64/make.defaults
index 8c6534c6999a..f4b3042683c5 100644
--- a/profiles/arch/riscv/rv64gc/lp64/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults
@@ -3,13 +3,15 @@
 
 # RISC-V rv64gc/lp64 no-multilib profile
 
-CFLAGS="-O2 -pipe -march=rv64gc -mabi=lp64"
+CFLAGS="-O2 -pipe"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
 
 # We have only one ABI
 MULTILIB_ABIS="lp64"
+DEFAULT_ABI="lp64"
+ABI="lp64"
 
 # We hide the useflags for the ABIs
 USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.force b/profiles/arch/riscv/rv64gc/lp64/use.force
new file mode 100644
index 000000000000..d04bb8b3d835
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64/use.force
@@ -0,0 +1,5 @@
+# Un-force the original multilib default-abi flag
+-abi_riscv_lp64d
+
+# Force the abi of this profile here
+abi_riscv_lp64
diff --git a/profiles/arch/sparc/package.mask b/profiles/arch/sparc/package.mask
index 2c683288e66c..19e2f5841dd5 100644
--- a/profiles/arch/sparc/package.mask
+++ b/profiles/arch/sparc/package.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Patrice Clement <monsieurp@gentoo.org> (30 Oct 2015)
-# Requires dependencies that are not stable on sparc yet.
-# See https://qa-reports.gentoo.org/output/gentoo-ci/7182f7a/5.html#l2294
-mail-mta/postfix
-
 # Raúl Porcel <armin76@gentoo.org> (17 Nov 2014)
 # Mask sys-devel/kgcc64 since >=gcc-4.4 can build 64bit kernels
 sys-devel/kgcc64
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index b943c309a4ef..00a1efed92fd 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (22 May 2019)
+# Allow python-exec to install all targets
+# Ack by mgorny
+dev-lang/python-exec -python_targets_python3_7
+
+# Andreas Sturmlechner <asturm@gentoo.org> (21 May 2019)
+# dev-db/oracle-instantclient ain't stable
+dev-qt/qtsql oci8
+
 # Andreas Sturmlechner <asturm@gentoo.org> (06 May 2019)
 # media-libs/dav1d is not yet stable
 media-video/vlc dav1d
@@ -36,6 +45,8 @@ app-admin/sudo -sssd
 # Mart Raudsepp <leio@gentoo.org> (01 Nov 2018)
 # net-wireless/iwd not stable yet
 net-misc/networkmanager iwd
+# Ben Kohler <bkohler@gentoo.org> (22 May 2019)
+net-misc/connman iwd
 
 # Thomas Deutschmann <whissi@gentoo.org> (27 Sep 2018)
 # sys-devel/lld is unstable
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 2ffb8d9669ea..053b0e4ac859 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -52,8 +52,9 @@ KERNEL="linux"
 USERLAND="GNU"
 INPUT_DEVICES="keyboard mouse"
 
-# Accept any license except those in the EULA license group.
-ACCEPT_LICENSE="* -@EULA"
+# Accept only licenses in the FREE license group, i.e., with
+# the freedom to use, share, modify and share modifications
+ACCEPT_LICENSE="-* @FREE"
 
 # Tomáš Chvátal <scarabeus@gentoo.org> (23 Mar 2013)
 # By default enable libreoffice implementation only.
@@ -153,7 +154,7 @@ TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE="1"
 
 # Aaron W. Swenson <titanofold@gentoo.org> (9 Jul 2017)
 # Default target(s) for postgres{,-multi}.eclass
-POSTGRES_TARGETS="postgres9_5 postgres10"
+POSTGRES_TARGETS="postgres10 postgres11"
 
 # Michael Orlitzky <mjo@gentoo.org> (17 Nov 2017)
 #
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 03f8e8c920bd..bd7f8963dc12 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# James Le Cuirot <chewi@gentoo.org> (21 May 2019)
+# Doesn't support ffmpeg-4. Portage takes a long time to report the
+# conflict and the feature is half broken anyway. See
+# https://github.com/visualboyadvance-m/visualboyadvance-m/issues/179.
+games-emulation/vbam ffmpeg
+
 # Ulrich Müller <ulm@gentoo.org> (18 May 2019)
 # Firmware images without a known license. Most likely, upstream
 # redistribution may conflict with the licenses or lack thereof
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 0879dc3bdde3..8bde36761be2 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,12 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Bernd Waibel <waebbl@gmail.com> (22 May 2019)
+# Marked experimental, needs build and runtime testing. Due to non-
+# available licenses for arnold and maya I can not test these addons.
+# Build and functional tests and reports on issues are appreciated!
+media-gfx/alembic arnold maya
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (10 May 2019)
 # needs llvm slots which are not stable #678908
 # also prone to weird compilation failures
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index e6b015af4fc0..10c7b0d0affa 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -19,6 +19,7 @@ games-action/beathazardultra
 games-action/brutal-legend
 games-action/descent3
 games-action/descent3-demo
+games-action/guacamelee
 games-action/heretic2-demo
 games-action/hotline-miami
 games-action/intrusion2
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index 58037537e75d..f8fa6ac1b00e 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -19,6 +19,7 @@ dev-games/gtkradiant
 dev-games/ps2-packer
 games-action/descent3
 games-action/descent3-demo
+games-action/guacamelee
 games-action/shadowgrounds-bin
 games-action/shadowgrounds-survivor-bin
 games-action/trine
diff --git a/profiles/desc/enlightenment_modules.desc b/profiles/desc/enlightenment_modules.desc
deleted file mode 100644
index 9ed9d46414c4..000000000000
--- a/profiles/desc/enlightenment_modules.desc
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of ENLIGHTENMENT_MODULES USE_EXPAND
-# for x11-wm/enlightenment.
-
-appmenu - Gadget that holds the menubar of the foreground application
-backlight - Backlight control slider gadget
-battery - A gadget to visualize your battery status
-bluez4 - Configure Bluetooth devices
-clock - Nice clock gadget to show current time
-cpufreq - Gadget to monitor and change the CPU frequency
-everything - The run command module provides an application launcher dialog
-fileman - Enlightenment's integrated file manager
-fileman-opinfo - Allows EFM to be placen on the desktop or in a shelf
-gadman - Module to manage gadgets on the desktop
-geolocation - Geolocation information
-ibar - Iconic application launcher
-ibox - A home for your iconified applications
-lokker - Screen locker
-luncher - Iconic application launcher
-mixer - A module to provide a mixer for changing volume
-msgbus - DBus Extension
-music-control - Control your music in your shelf
-notification - Notification-daemon alternative
-packagekit - Package manager integration
-pager - Gadget to allow you to visualize your virtual desktops and the windows they contain
-pager-plain - A simpler desktop pager
-quickaccess - Enlightenment Quickaccess Launcher
-shot - Simple screenshot+save/upload module
-start - Enlightenment's 'Start' button equivalent
-syscon - Provides a unified popup dialog for all the system actions in Enlightenment
-sysinfo - A gadget to visualize your system info
-systray - System tray that hold applications icons like Skype, Pidgin, Kopete and others
-tasks - Gadget to allow you to switch tasks
-teamwork - Enable teamwork module
-temperature - Temperature monitor
-time - Time related gadgets
-tiling - Positions/resizes your windows tilingly
-vkbd - Virtual keyboard
-winlist - A module to show the list of client applications presently running
-wizard - First Run Wizard
-wireless - WiFi monitoring
-wl-buffer - Wayland buffer
-wl-desktop-shell - Enlightenment Wayland Desktop Shell
-wl-drm - Wayland DRM (Direct Rendering Manager) compositing module
-wl-text-input - Wayland text input support
-wl-weekeyboard - Wayland virtual keyboard
-wl-wl - Wayland-in-Wayland module
-wl-x11 - Wayland-in-X11 module
-xkbswitch - Keyboard layout configuration and switcher
-xwayland - X/Wayland integration
-conf - Settings Panel
-conf-applications - Allows configuration of Ibar, Restart, and Startup applications
-conf-bindings - Input Control Settings
-conf-dialogs - Configure default dialog properties
-conf-display - Used to configure your screen
-conf-interaction - Configure Mouse and Touch input
-conf-intl - Used to select a default language
-conf-menus - Configures menu behavior
-conf-paths - Specifies the Enlightenment search paths and default directories
-conf-performance - Used to configure certain performance related items as frame rates and cache settings
-conf-randr - Used to configure your screen's resolution
-conf-shelves - Shelf configuration dialog
-conf-theme - Used to configure your theme preferences
-conf-window-manipulation - Configures window raise, resistance, and maximize policies
-conf-window-remembers - Delete existing window remembers
diff --git a/profiles/desc/postgres_targets.desc b/profiles/desc/postgres_targets.desc
index 464cb04702d5..e8fc83457668 100644
--- a/profiles/desc/postgres_targets.desc
+++ b/profiles/desc/postgres_targets.desc
@@ -10,3 +10,4 @@ postgres9_6 - Build against PostgreSQL 9.6
 postgres10 - Build against PostgreSQL 10
 postgres11 - Build against PostgreSQL 11
 postgres12 - Build against PostgreSQL 12
+postgres13 - Build against PostgreSQL 13
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index a00f6334f287..3382ca7db562 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -40,5 +40,6 @@ USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_F
 # and not by user configuration files.
 PROFILE_ONLY_VARIABLES="IUSE_IMPLICIT USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
 
-# Accept any license except those in the EULA license group.
-ACCEPT_LICENSE="* -@EULA"
+# Accept only licenses in the FREE license group, i.e., with
+# the freedom to use, share, modify and share modifications
+ACCEPT_LICENSE="-* @FREE"
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index f6b0c2f82955..82649fc8202e 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -38,6 +38,7 @@ dev-util/biew
 games-action/cs2d
 games-action/descent3
 games-action/descent3-demo
+games-action/guacamelee
 games-action/heretic2
 games-action/heretic2-demo
 games-action/intrusion2
diff --git a/profiles/license_groups b/profiles/license_groups
index 14649929f535..f5f9968c575d 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -10,7 +10,7 @@
 ######################################################################
 
 # GPL compatible licenses approved by the Free Software Foundation
-# http://www.gnu.org/licenses/license-list.html
+# https://www.gnu.org/licenses/license-list.html
 # GPL or LGPL with various exceptions are also included here, because
 # they are more permissive than the licenses they are based on.
 GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2-with-classpath-exception GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-2+-with-openssl-exception GPL-3 GPL-3+ GPL-3+-with-cuda-exception GPL-3+-with-cuda-openssl-exception GPL-3-with-font-exception GPL-3+-with-opencl-exception GPL-3+-with-opencl-openssl-exception GPL-3-with-openssl-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 ZLIB ZPL
@@ -19,18 +19,18 @@ GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0
 FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4 CDDL CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EPL-2.0 EUPL-1.1 gnuplot IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0 Zend-2.0
 
 # Licenses approved by the Open Source Initiative
-# http://www.opensource.org/licenses
+# https://www.opensource.org/licenses
 # Note that the FSF lists these as nonfree: Artistic NOSA Watcom-1.0
 OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL Sleepycat UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL
 
 # Misc licenses that are probably free software, i.e. follow the
-# Free Software Definition at http://www.gnu.org/philosophy/free-sw.html
+# Free Software Definition at https://www.gnu.org/philosophy/free-sw.html
 # but are not approved by either FSF or OSI. Preferably on the long
 # term these should be cleared up and moved to other sets.
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
+MISC-FREE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -42,7 +42,7 @@ FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
 FSF-APPROVED-OTHER Arphic CC-BY-2.0 CC-BY-2.5 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.1 FDL-1.1+ FDL-1.2 FDL-1.2+ FDL-1.3 FDL-1.3+ FreeArt GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ IPAfont OFL OFL-1.1 OPL
 
 # Misc licenses for free documents and other works (including fonts)
-# that follow the definition at http://freedomdefined.org/ but are NOT
+# that follow the definition at https://freedomdefined.org/ but are NOT
 # listed in @FSF-APPROVED-OTHER
 MISC-FREE-DOCS BitstreamVera CC-BY-SA-1.0 CC-PD CC-SA-1.0 LDP-1 LDP-1a man-pages man-pages-posix man-pages-posix-2013 MaxMind2 mplus-fonts myspell-en_CA-KevinAtkinson quake1-textures Texinfo-manual UbuntuFontLicense-1.0 Unicode_Fonts_for_Ancient_Scripts vlgothic wxWinFDL-3
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 11bef7b32355..65855617bd50 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,15 +29,123 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2 Jun 2019)
+# Test version with all new Gentoo defaults. 
+# Fixes bug 676946 bug may break other things.
+# Masked for testing.
+=dev-ruby/rubygems-3.0.3-r1
+
+# Fabian Groffen <grobian@gentoo.org> (30 May 2019)
+# Pre-release for upcoming 0.80
+# You're invited to try this version out (and report bugs), but beware,
+# it is still subject to changes, as well as some applets having changed
+# considerably
+=app-portage/portage-utils-0.80_pre20190530
+
+# Mikle Kolyada <zlogene@gentoo.org> (30 May 2019)
+# Start adding texlive-2019 (still may be terribly broken)
+=app-text/texlive-core-2019
+=dev-libs/ptexenc-1.3.7_p20190410
+=app-text/dvipsk-5.999_p20190410
+=app-text/ttf2pk2-2.0_p20190410
+=app-text/ps2pkm-1.8_p20190410
+=dev-tex/bibtexu-3.71_p20190410
+=dev-libs/kpathsea-6.3.1_p20190410
+=dev-texlive/texlive-basic-2019
+=dev-texlive/texlive-bibtexextra-2019
+=dev-texlive/texlive-context-2019
+=dev-texlive/texlive-fontsextra-2019
+=dev-texlive/texlive-fontsrecommended-2019
+=dev-texlive/texlive-fontutils-2019
+=dev-texlive/texlive-formatsextra-2019
+=dev-texlive/texlive-games-2019
+=dev-texlive/texlive-humanities-2019
+=dev-texlive/texlive-langarabic-2019
+=dev-texlive/texlive-langchinese-2019
+=dev-texlive/texlive-langcjk-2019
+=dev-texlive/texlive-langcyrillic-2019
+=dev-texlive/texlive-langczechslovak-2019
+=dev-texlive/texlive-langenglish-2019
+=dev-texlive/texlive-langeuropean-2019
+=dev-texlive/texlive-langfrench-2019
+=dev-texlive/texlive-langgerman-2019
+=dev-texlive/texlive-langgreek-2019
+=dev-texlive/texlive-langitalian-2019
+=dev-texlive/texlive-langjapanese-2019
+=dev-texlive/texlive-langkorean-2019
+=dev-texlive/texlive-langother-2019
+=dev-texlive/texlive-langpolish-2019
+=dev-texlive/texlive-langportuguese-2019
+=dev-texlive/texlive-langspanish-2019
+=dev-texlive/texlive-latex-2019
+=dev-texlive/texlive-latexextra-2019
+=dev-texlive/texlive-latexrecommended-2019
+=dev-texlive/texlive-luatex-2019
+=dev-texlive/texlive-mathscience-2019
+=dev-texlive/texlive-metapost-2019
+=dev-texlive/texlive-music-2019
+=dev-texlive/texlive-pictures-2019
+=dev-texlive/texlive-plaingeneric-2019
+=dev-texlive/texlive-pstricks-2019
+=dev-texlive/texlive-publishers-2019
+=dev-texlive/texlive-xetex-2019
+=app-text/texlive-2019
+
+# Zac Medico <zmedico@gentoo.org> (31 May 2019)
+# Upstream is dead and there are multiple security vulnerabilities.
+# Removal in 30 days. Bug #687100.
+app-emulation/rkt
+
+# Hanno Boeck <hanno@gentoo.org> (27 May 2019)
+# Obsolete LXDE modules, see #652658, #651964
+lxde-base/lxshortcut
+lxde-base/lxsession-edit
+
+# Virgil Dupras <vdupras@gentoo.org> (24 May 2019)
+# py2 only, dead upstream, removal in 30 days. Bug #686668
+dev-python/drpython
+
+# Aaron Bauman <bman@gentoo.org> (23 May 2019)
+# Upstreami now requires registration to download
+# EAPI2. Removal in 30 days.
+net-misc/mindterm
+
+# Aaron Bauman <bman@gentoo.org> (23 May 2019)
+# Unmaintained, EAPI2, updates available upstream
+# Oh yea, removal in 30 days
+dev-util/pmd
+
+# Patrick Lauer <patrick@gentoo.org> (23 May 2019)
+# PostgreSQL beta and release candidate releases are pre-release testing
+# versions, not meant for production use. They are feature-frozen, and are
+# released to the public for testing before final release
+#
+# NOTE: Successive beta or candidate releases may not be backwards compatible,
+# so it is important that you review the release notes before upgrading.
+#
+# For more information about beta and release candidate versions, see:
+#     https://www.postgresql.org/developer/beta/
+dev-db/postgresql:12
+
+# Jonas Stein <jstein@gentoo.org> (22 May 2019)
+# Masked for removal after 2019-06-23. (bug #686260)
+# Wrong license, ships non-GPL image, maintainer needed.
+x11-plugins/gkrellflynn
+
+# Sebastian Pipping <sping@gentoo.org> (22 May 2019)
+# Masked for removal in 30 days (bug #686562)
+# Unfixed bug, dead upstream, not relevant enough
+sys-fs/pytagsfs
+
+# Lars Wendler <polynomial-c@gentoo.org> (21 May 2019)
+# Masked for testing
+=sys-libs/ncurses-6.1_p20181020
+
 # Stefan Strogin <steils@gentoo.org> (21 May 2019)
 # Unmaintained. Last release in 2005. Does not build with
 # >=dev-libs/bglibs-2.04. Bug #686438.
 net-mail/qmail-qfilter
 
-# Stefan Strogin <steils@gentoo.org> (21 May 2019)
-# Depends on >=dev-libs/bglibs-2.04. Bug #347479.
->=net-mail/mailfront-2.22
-
 # Michał Górny <mgorny@gentoo.org> (19 May 2019)
 # Unmaintained.  The program breaks init.d script (#626580).  Homepage
 # and public sources disappeared.  Last release in 2006.
@@ -68,10 +176,6 @@ dev-ruby/elasticsearch-api:0
 dev-ruby/elasticsearch-transport:0
 dev-ruby/filesize:0.1.1
 
-# Stefan Strogin <steils@gentoo.org> (17 May 2019)
-# Depends on >=dev-libs/bglibs-2.04. Bug #685238.
->=net-libs/cvm-0.97
-
 # Matt Turner <mattst88@gentoo.org> (16 May 2019)
 # Not supported by the Xserver since v1.6.0 (2008)
 # Masked for removal.
@@ -95,53 +199,6 @@ dev-db/mariadb-galera
 dev-python/detox
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
-# Perl 5.30 preparation block. Will be unmasked some time after the
-# actual release of Perl 5.30.0.
-=dev-lang/perl-5.30*
-~virtual/perl-Archive-Tar-2.320.0
-~virtual/perl-CPAN-2.220.0
-~virtual/perl-Compress-Raw-Bzip2-2.84.0
-~virtual/perl-Compress-Raw-Zlib-2.84.0
-~virtual/perl-DB_File-1.843.0
-~virtual/perl-Data-Dumper-2.174.0
-~virtual/perl-Devel-PPPort-3.520.0
-~virtual/perl-Digest-SHA-6.20.0
-~virtual/perl-Encode-3.10.0
-~virtual/perl-ExtUtils-CBuilder-0.280.231
-~virtual/perl-ExtUtils-Manifest-1.720.0
-~virtual/perl-ExtUtils-ParseXS-3.400.0
-~virtual/perl-File-Path-2.160.0
-~virtual/perl-File-Spec-3.780.0
-~perl-core/File-Temp-0.230.900
-~virtual/perl-File-Temp-0.230.900
-~virtual/perl-HTTP-Tiny-0.76.0
-~virtual/perl-IO-1.400.0
-~virtual/perl-IO-Compress-2.84.0
-~virtual/perl-IPC-Cmd-1.20.0
-~virtual/perl-JSON-PP-4.20.0
-~virtual/perl-Math-BigInt-1.999.816
-~virtual/perl-Math-BigInt-FastCalc-0.500.800
-~virtual/perl-Math-BigRat-0.261.400
-~virtual/perl-Module-CoreList-5.201.905.200
-~virtual/perl-Module-Load-0.340.0
-~virtual/perl-Module-Metadata-1.0.36
-~virtual/perl-Net-Ping-2.710.0
-~virtual/perl-Storable-3.150.0
-~virtual/perl-Test-Simple-1.302.162
-~virtual/perl-Thread-Queue-3.130.0
-~virtual/perl-Time-HiRes-1.976.0
-~virtual/perl-Time-Local-1.280.0
-~virtual/perl-Time-Piece-1.330.0
-~virtual/perl-Unicode-Collate-1.270.0
-~virtual/perl-bignum-0.510.0
-~virtual/perl-parent-0.237.0
-~virtual/perl-podlators-4.110.0
-~virtual/perl-threads-shared-1.600.0
-~virtual/perl-version-0.992.400
-~dev-perl/Math-BigInt-GMP-1.600.600
-~dev-perl/Math-BigInt-Lite-0.180.0
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
 # Perl 5.24 will be removed soon. Please upgrade.
 <dev-lang/perl-5.26.2
 =virtual/perl-Archive-Tar-2.40.100_rc-r6
@@ -235,14 +292,6 @@ dev-python/pytest-relaxed
 # it. Removal in 30 days. Bug #581720.
 media-tv/tvbrowser
 
-# Stefan Strogin <stefan.strogin@gmail.com> (05 May 2019)
-# Depends on >=dev-libs/bglibs-2.04. Bug #670694.
->=sys-process/bcron-0.11
-
-# Stefan Strogin <stefan.strogin@gmail.com> (04 May 2019)
-# Masked for testing reverse dependencies. Bug #591300.
->=dev-libs/bglibs-2.04
-
 # Michał Górny <mgorny@gentoo.org> (02 May 2019)
 # Discontinued upstream, and no longer required by any packages
 # in Gentoo.  Removal in 30 days.  Bug #684828.
@@ -331,43 +380,6 @@ dev-python/gst-python:0.10
 media-libs/gnonlin:0.10
 net-libs/farstream:0.1
 
-# Virgil Dupras <vdupras@gentoo.org> (26 Apr 2019)
-# Should have been removed with django-cms a while back but wasn't.
-# Removal in 30 days. Bug #683862
-dev-python/djangocms-attributes-field
-
-# Virgil Dupras <vdupras@gentoo.org> (26 Apr 2019)
-# Unmaintained, no revdeps. Removal in 30 days. Bug #618734
-dev-python/yapps
-
-# Jason Zaman <perfinion@gentoo.org> (25 Apr 2019)
-# net-mail/perdition was last-rited in 2016. The
-# SELinux policy packge is no longer needed.
-# Removal in 30 days.
-sec-policy/selinux-perdition
-
-# Michał Górny <mgorny@gentoo.org> (25 Apr 2019)
-# This programs suffers severe code quality problems and should have
-# never been added to Gentoo.  It looks like a shell script badly
-# converted to a C program with a lot of system() calls with globs,
-# horribly unreadable code and broken memory management including
-# reading past end-of-string (which only recently replaced writing into
-# uninitialized memory).  Auditing the program completely would probably
-# be more costly than rewriting it from scratch.
-# Removal in 30 days.  Bug #684340.
-app-admin/lsat
-
-# Alon Bar-Lev <alonbl@gentoo.org> (24 Apr 2019)
-# Commercial. Upstream does not provide sources any more.
-# Tend to break per kernel upgrades.
-# Removal in 30 days. Bug#684268.
-app-crypt/bestcrypt
-
-# Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
-# Unmainained since 2011.  Ebuild broken since 2016.  Last release
-# in 2005.  Removal in 30 days.  Bug #588032.
-net-mail/bincimap
-
 # Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
 # Unmaintained.  Vulnerable init.d script.  Missing dependencies causing
 # build failures (#514412, #544942).  Insecure format strings (#520574).
@@ -375,68 +387,17 @@ net-mail/bincimap
 # Removal in 30 days.  Bug #629450.
 mail-filter/mimedefang
 
-# Richard Freeman <rich0@gentoo.org> (24 Apr 2019)
-# Masked for removal in 30 days.  Likely does not work
-# and is essentially unmainted.  Please comment in 
-# bug 548926 if you want to give this some care.
-games-rpg/eternal-lands
-games-rpg/eternal-lands-bloodsucker
-games-rpg/eternal-lands-data
-
-# Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
-# Unmaintained.  Vulnerable init.d script.  Missing dependencies causing
-# build failures (#514136).  Last bumped in 2011, pending bump since
-# at least 2014 (#540502).
-# Removal in 30 days.  Bug #630986.
-mail-filter/spamass-milter
-
-# Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
-# Unmaintained.  Does not build with current version of courier
-# (#684254), also had a different build failure in the past (#513976).
-# Last bumped in 2013, pending bump since 2014 (#519452).
-# Removal in 30 days.  Bug #684256.
-mail-filter/zdkimfilter
-
 # Jeroen Roovers <jer@gentoo.org> (24 Apr 2019)
 # Depends on =dev-libs/openssl-1.1.1* due to newly introduced
 # support for EVP_PKEY_ED25519 and EVP_PKEY_ED448 (bug #670574).
+=net-libs/nodejs-10.16.0
 =net-libs/nodejs-11.15.0
 =net-libs/nodejs-12*
 
-# Lars Wendler <polynomial-c@gentoo.org> (21 Apr 2019)
-# Masked for removal (bug #683926)
-sys-libs/ntdb
-
-# Alexys Jacob <ultrabug@gentoo.org> (20 Apr 2019)
-# Unmaintained. Not active any more with latest release Jul 23, 2017.
-# Does not build with recent openssl. Dropping useless python driver as well.
-# Removal in 30 days.  Bug #597340, #674236.
-dev-db/rethinkdb
-dev-python/python-rethinkdb
-
-# Alexys Jacob <ultrabug@gentoo.org> (20 Apr 2019)
-# Unmaintained. Only version in portage has been EOL for a while.
-# No strong user base or herd support. Breaks fuse-3.
-# Removal in 30 days.  Bug #650256, #673672.
-sys-cluster/moosefs
-
-# James Le Cuirot <chewi@gentoo.org> (20 Apr 2019)
-# Ancient and long dead upstream. Use app-emulation/fs-uae
-# instead. Removal in 30 days. Bugs #432092, #602966.
-app-emulation/uae
-app-emulation/e-uae
-
 # Miroslav Å ulc <fordfrog@gentoo.org> (19 Apr 2019)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.19
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (18 Apr 2019)
-# This version is provided for testing of the upcoming 0.8.0 release.
-# It is not recommended for use, it contains known bugs.
-# This version supports TRIM.
-=sys-fs/zfs-kmod-0.8.0_rc*
-=sys-fs/zfs-0.8.0_rc*
-
 # Michał Górny <mgorny@gentoo.org> (18 Apr 2019)
 # All current versions of SystemRescueCD contain vulnerable packages.
 # Bug #683724.
@@ -461,6 +422,9 @@ sys-boot/systemrescuecd-x86-grub
 >=dev-libs/boost-1.70.0
 >=dev-util/boost-build-1.70.0
 >=net-mail/libpst-0.6.66-r2
+>=net-proxy/trojan-1.12.2
+>=dev-python/graph-tool-2.27
+=dev-python/graph-tool-9999
 
 # Robin H. Johnson <robbat2@gentoo.org> (25 Mar 2019)
 # Requires >=dev-lang/lua-5.3 which is masked
@@ -566,11 +530,6 @@ dev-libs/gost-engine
 # Masked for removal on 2018-11-24, bug #669650.
 dev-db/pgadmin3
 
-# Lars Wendler <polynomial-c@gentoo.org> (22 Oct 2018)
-# Breaks dev-libs/gobject-introspection and its consumers
-# See #669278
-=xfce-base/xfconf-4.13.6
-
 # Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
 # EOL and has known vulnerabilities. Please move to
 # Firefox 60 or newer if you can.
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
index a50334dc5a41..ac1d126eb4f5 100644
--- a/profiles/prefix/make.defaults
+++ b/profiles/prefix/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Some USE-flags that only die-hards don't want:
@@ -9,11 +9,11 @@
 USE="readline zlib ncurses ssl"
 
 
-# Python 3.6 is unmasked for us, build stuff by default with latest to
-# avoid unnecessary builds
+# In Prefix, aim for Python 3 only, leaving out 2 to avoid unnecessary
+# builds
 # NOTE: Both are incremental variables: Need to drop obsolete base values.
-PYTHON_TARGETS="python2_7 -python3_5 python3_6"
-PYTHON_SINGLE_TARGET="-python3_5 python3_6"
+PYTHON_TARGETS="-python2_7 python3_6"
+PYTHON_SINGLE_TARGET="python3_6"
 
 # Move away from ruby22 fast forward to ruby24, we don't have ruby23
 RUBY_TARGETS="ruby24"
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index 4ca2d473d009..8d8dd0a834cc 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (30 Apr 2019)
-# Fails to compile, bug #684024
-=dev-lang/perl-5.28.2*
-
 # Fabian Groffen <grobian@gentoo.org> (22 Mar 2019)
 # fails to compile, bug #681316
 =app-crypt/gnupg-2.2.14
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 019ef2e56ef5..1465ef6062f6 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -256,6 +256,7 @@ ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd	exp
 # @MAINTAINER: riscv@gentoo.org
 riscv		default/linux/riscv/17.0/rv64gc			stable
 riscv		default/linux/riscv/17.0/rv64gc/lp64d		dev
+riscv		default/linux/riscv/17.0/rv64gc/lp64		exp
 
 # S390 Profiles
 # @MAINTAINER: s390@gentoo.org
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3d0e9d932b1d..a95902cb7cca 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -501,8 +501,6 @@ app-emulation/docker-credential-helpers:pass - Build pass helper for the pass ut
 app-emulation/docker-runc:ambient - Enable support for ambient capability
 app-emulation/docker-runc:apparmor - Enable AppArmor support
 app-emulation/dosemu:fluidsynth - use media-sound/fluidsynth for MIDI emulation
-app-emulation/e-uae:capslib - Add CAPS library support
-app-emulation/e-uae:sdl-sound - Use media-libs/sdl-sound for audio output
 app-emulation/faudio:ffmpeg - FAudio has optional support for decoding xWMA resources using FFmpeg, requiring: media-video/ffmpeg (note: this feature is not supported by media-video/libav).
 app-emulation/faudio:test - Build and run faudio testsuite.
 app-emulation/faudio:utils - Build all faudio utilities.
@@ -644,7 +642,6 @@ app-emulation/runv:xen - Enable support for the Xen Hypervisor
 app-emulation/spice:lz4 - Enable support for LZ4 compression using app-arch/lz4
 app-emulation/spice:smartcard - Enable smartcard remoting using app-emulation/libcacard
 app-emulation/spice-vdagent:consolekit - Use sys-auth/consolekit to determine the master vdagentd in case of multiple running vdagentds (highly recommended)
-app-emulation/uae:scsi - Enable the uaescsi.device
 app-emulation/vagrant:virtualbox - Use VirtualBox provider.
 app-emulation/vice:ethernet - Enable ethernet emulation
 app-emulation/vice:fullscreen - Enable the ability to run fullscreen
@@ -1213,12 +1210,14 @@ app-portage/layman:squashfs - Support mounting squashfs image overlays locally r
 app-portage/layman:subversion - Support dev-vcs/subversion based overlays
 app-portage/layman:sync-plugin-portage - Install the sys-apps/portage sync module
 app-portage/pfl:network-cron - Adds a cron job which does a weekly submit of the package database
+app-portage/portage-utils:qmanifest - Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing
 app-portage/tatt:templates - Install template scripts to be used with tatt
 app-shells/autojump:ipython - Add support for dev-python/ipython
 app-shells/bash:bashlogger - Log ALL commands typed into bash; should ONLY be used in restricted environments such as honeypots
 app-shells/bash:mem-scramble - Build with custom malloc/free overwriting allocated/freed memory
 app-shells/bash:net - Enable /dev/tcp/host/port redirection
 app-shells/bash:plugins - Add support for loading builtins at runtime via 'enable'
+app-shells/bash-completion:eselect - Support blacklisting of completions via 'eselect bash-completion'. This enables custom Gentoo patching of upstream completion loader.
 app-shells/dash:vanilla - Support echo -n, and enable echo -e all the time (unsupported)
 app-shells/pdsh:rsh - This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.
 app-shells/shish:diet - Use dev-libs/dietlibc
@@ -1389,15 +1388,18 @@ app-xemacs/xemacs-packages-all:mule - Add multi-language support to XEmacs
 dev-ada/asis:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/asis:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/asis:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/asis:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/aunit:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/aunit:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/aunit:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/aws:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/aws:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/aws:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/aws:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gnat_util:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnat_util:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnat_util:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gnat_util:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gnat_util:shared - Build gnat_util shared library
 dev-ada/gnat_util:static-pic - Build gnat_util static library with pic code
 dev-ada/gnatcoll:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
@@ -1409,16 +1411,19 @@ dev-ada/gnatcoll:tools - Build associated tools
 dev-ada/gnatcoll-bindings:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnatcoll-bindings:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnatcoll-bindings:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gnatcoll-bindings:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gnatcoll-bindings:shared - Build shared library
 dev-ada/gnatcoll-bindings:static-pic - Build shared library
 dev-ada/gnatcoll-core:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnatcoll-core:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnatcoll-core:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gnatcoll-core:gnat_2019 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/gnatcoll-core:shared - Build shared library
 dev-ada/gnatcoll-core:static-pic - Build static library with pic code
 dev-ada/gnatcoll-db:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnatcoll-db:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnatcoll-db:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gnatcoll-db:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gnatcoll-db:gnatcoll_db2ada - Build gnatcoll_db2ada
 dev-ada/gnatcoll-db:gnatinspect - Build gnatinspect
 dev-ada/gnatcoll-db:shared - Build shared library
@@ -1431,16 +1436,19 @@ dev-ada/gnatmem:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/gprbuild:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gprbuild:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gprbuild:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gprbuild:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gps:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gps:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gps:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/gtkada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gtkada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gtkada:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gtkada:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gtkada:shared - Build gtkada as shared library
 dev-ada/libadalang:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/libadalang:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/libadalang:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/libadalang:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/libadalang:shared - Build shared library
 dev-ada/libadalang-tools:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/libadalang-tools:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
@@ -1448,11 +1456,13 @@ dev-ada/libadalang-tools:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/libgpr:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/libgpr:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/libgpr:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/libgpr:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/libgpr:shared - Build shared library
 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:gnat_2018 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/xmlada:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/xmlada:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/xmlada:shared - Build shared library
 dev-ada/xmlada:static-pic - Build static library with pic code
 dev-cpp/eigen:c++11 - Build using the C++11 standard
@@ -1589,7 +1599,6 @@ dev-db/postgresql:server - Disable to build and install the clients and librarie
 dev-db/postgresql:uuid - Enable server side UUID generation (via dev-libs/ossp-uuid).
 dev-db/psqlodbc:iodbc - Use dev-db/libiodbc. Disable to use dev-db/unixODBC.
 dev-db/redis:tcmalloc - Use tcmalloc from dev-util/google-perftools for allocations.
-dev-db/rethinkdb:tcmalloc - Use tcmalloc from dev-util/google-perftools for allocations.
 dev-db/soci:boost - Enable boost support
 dev-db/soci:empty - Build the sample backend called Empty
 dev-db/spatialite:geos - Add the sci-libs/geos library for exact topological tests
@@ -1982,6 +1991,7 @@ dev-java/lucene:contrib - Include extra functionality from contrib/
 dev-java/miglayout:swt - Add support for the SWT toolkit.
 dev-java/openjdk:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/openjdk:headless-awt - Don't install the X backend for AWT, needed by some GUIs
+dev-java/openjdk:javafx - Import OpenJFX modules at build time, via dev-java/openjfx
 dev-java/openjdk:jbootstrap - Build OpenJDK twice, the second time using the result of the first
 dev-java/openjdk:source - Install JVM sources
 dev-java/openjdk:systemtap - Enable SystemTAP/DTrace tracing
@@ -1993,6 +2003,8 @@ dev-java/openjdk-bin:webstart - Provide javaws command through symlink to icedte
 dev-java/openjdk-jre-bin:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/openjdk-jre-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
 dev-java/openjdk-jre-bin:webstart - Provide javaws command through symlink to icedtea-web
+dev-java/openjfx:media - Compile media module, based on gstreamer-minimal (does not pull gstreamer)
+dev-java/openjfx:source - Install JavaFX sources
 dev-java/oracle-jdk-bin:commercial - Install features requiring a commercial license for production use
 dev-java/oracle-jdk-bin:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/oracle-jdk-bin:gtk2 - Enable GTK+ 2 support in JavaFX
@@ -2044,6 +2056,7 @@ dev-lang/gnat-gpl:pgo - Build GCC using Profile Guided Optimization (PGO)
 dev-lang/gnat-gpl:regression-test - Run the testsuite and install the results (requires FEATURES=test)
 dev-lang/gnat-gpl:sanitize - Build support for various sanitizer functions (ASAN/TSAN/etc...)
 dev-lang/gnat-gpl:ssp - Build packages with stack smashing protector on by default
+dev-lang/gnat-gpl:systemtap - enable systemtap static probe points
 dev-lang/gnat-gpl:vtv - Build support for virtual table verification (a C++ hardening feature)
 dev-lang/go:gccgo - Bootstrap using sys-devel/gcc[go]
 dev-lang/go:system-bootstrap - Bootstrap using previously installed dev-lang/go
@@ -2354,11 +2367,9 @@ dev-libs/efl:harfbuzz - Enable complex text shaping and layout support
 dev-libs/efl:hyphen - Enable text hyphenation support
 dev-libs/efl:ibus - Enable Intelligent Input Bus
 dev-libs/efl:ico - Enable Ico image loader
-dev-libs/efl:ivi - Enable ivi-shell support
 dev-libs/efl:libuv - Enable dev-libs/libuv support
 dev-libs/efl:luajit - USE dev-lang/luajit instead of dev-lang/lua
 dev-libs/efl:physics - Enable Bullet physics effects and support
-dev-libs/efl:pixman - Enable PixMan for software rendering
 dev-libs/efl:ppm - Enable PMAPS image loader
 dev-libs/efl:psd - Enable PSD image loader
 dev-libs/efl:scim - Enable Smart Common Input Method
@@ -3092,6 +3103,8 @@ dev-util/bustle:threaded - Build with support for multithreaded execution.
 dev-util/catalyst:ccache - Enables ccache support
 dev-util/catalyst:iso - Pulls in the depends for building iso images
 dev-util/catalyst:system-bootloader - Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar
+dev-util/cccc:apidoc - Build software docs with doxygen/graphviz and metrics with cccc
+dev-util/cccc:mfc - Add patch for MFC dialect options
 dev-util/clion:custom-jdk - Install and use IntelliJ's custom JRE.
 dev-util/cmake:server - Enable cmake-server support.
 dev-util/cmake:system-jsoncpp - Use system copy of dev-libs/jsoncpp instead of bundled one.
@@ -3470,6 +3483,8 @@ games-fps/eduke32:tools - Install the support tools for mapster32.
 games-fps/eduke32:voxels - Install the Duke Nukem 3D Voxels Pack.
 games-fps/eduke32:vpx - Enable support for media-libs/libvpx.
 games-fps/eduke32:xmp - Enable support for media-libs/exempi.
+games-fps/gzdoom:fluidsynth - Use media-sound/fluidsynth for MIDI support
+games-fps/gzdoom:gtk2 - Enable support for GTK+2 instead of GTK+3
 games-fps/nexuiz:maps - Install the community map pack
 games-fps/quake2-icculus:demo - Install the demo files (quake2-demodata) and configure for use
 games-fps/quake2-icculus:qmax - Build the pretty version (quake max)
@@ -4043,6 +4058,7 @@ mail-client/thunderbird:system-libevent - Use the system-wide dev-libs/libevent
 mail-client/thunderbird:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled.
 mail-client/thunderbird:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
 mail-client/thunderbird-bin:crashreporter - Enable crash reporter for bugs
+mail-client/trojita:addressbook - Build kde-apps/akonadi addressbook plugin
 mail-client/trojita:password - Store passwords securely via dev-libs/qtkeychain
 mail-filter/MailScanner:exim - Set mail-mta/exim to used MTA
 mail-filter/MailScanner:postfix - Set mail-mta/postfix to used MTA
@@ -4121,8 +4137,6 @@ mail-filter/rspamd:torch - Enable torch support. This is required for the neural
 mail-filter/spamassassin:cron - Install a cron job to update SpamAssassin's rules daily.
 mail-filter/spamassassin:qmail - Build qmail functionality and docs
 mail-filter/spamdyke:ssl - Enables TLS protocol for spamdyke
-mail-filter/zdkimfilter:debug - Log process and signal information. Also leave the child process running for gdb examination.
-mail-filter/zdkimfilter:opendbx - An alternate statistics based storage engine.
 mail-mta/courier:fax - Enables fax support in the courier mail server
 mail-mta/courier:norewrite - Prevents courier mail server from mangling virtual user addresses when sending
 mail-mta/courier:web - Enable the web interface
@@ -4209,6 +4223,7 @@ media-fonts/intlfonts:bdf - Installs BDF fonts in addition to PCF
 media-fonts/liberation-fonts:fontforge - Use media-gfx/fontforge to build fonts from source
 media-fonts/montecarlo:bdf - Install BDF fonts in addition to PCF
 media-fonts/mplus-outline-fonts:ipafont - Generates new fonts merged with media-fonts/ja-ipafonts
+media-fonts/noto:extra - Install full upstream font set
 media-fonts/sil-charis:compact - Use more compactly spaced font
 media-fonts/sil-gentium:compact - Also install more compact version of the font.
 media-fonts/terminus-font:a-like-o - Changes view of letter 'a' - a looks like o (see homepage)
@@ -5936,6 +5951,7 @@ net-fs/samba:dmapi - Enable support for DMAPI. This currently works only in comb
 net-fs/samba:gpg - Use app-crypt/gpgme for AD DC
 net-fs/samba:iprint - Enabling iPrint technology by Novell
 net-fs/samba:json - Enable json audit support through dev-libs/jansson
+net-fs/samba:profiling-data - Enables support for collecting profiling data
 net-fs/samba:quota - Enables support for user quotas
 net-fs/samba:system-heimdal - Use app-crypt/heimdal instead of bundled heimdal.
 net-fs/samba:system-mitkrb5 - Use app-crypt/mit-krb5 instead of app-crypt/heimdal.
@@ -6162,16 +6178,19 @@ net-irc/hexchat:plugin-checksum - Build Checksum plugin (needs plugins)
 net-irc/hexchat:plugin-fishlim - Build FiSHLiM plugin (needs plugins )
 net-irc/hexchat:plugin-sysinfo - Build SysInfo plugin (needs plugins)
 net-irc/hexchat:theme-manager - Build the theme manager (mono)
-net-irc/inspircd:geoip - Add geoip support for country and city lookup based on IPs
 net-irc/inspircd:gnutls - Enable TLS support
-net-irc/inspircd:ipv6 - Enable support for IP version 6
 net-irc/inspircd:ldap - Enable LDAP support
+net-irc/inspircd:maxminddb - Add support for geolocation using libMaxMindDB
+net-irc/inspircd:mbedtls - Add support for TLS using the mbedTLS library
 net-irc/inspircd:mysql - Enable MySQL database backend
 net-irc/inspircd:pcre - Adds support for Perl Compatible Regular Expressions
-net-irc/inspircd:posix - Adds support for POSIX-compatible functions
 net-irc/inspircd:postgres - Enable PostgreSQL database backend
+net-irc/inspircd:re2 - Add support for Google RE2 regular expressions library
+net-irc/inspircd:regex-posix - Adds support for POSIX Regular Expressions
+net-irc/inspircd:regex-stdlib - Add support for C++ stdlib regular expressions
 net-irc/inspircd:sqlite - Enable Sqlite database backend
 net-irc/inspircd:ssl - Enable SSL support
+net-irc/inspircd:sslrehashsignal - Enable rehashing SSL module by SIGUSR1
 net-irc/inspircd:tre - Enable support for TRE, a lightweight, robust, and efficient POSIX compliant regexp matching library
 net-irc/iroffer-dinoex:admin - Compile with HTTP Admin
 net-irc/iroffer-dinoex:blowfish - Compile with blowfish encryption support
@@ -6261,6 +6280,7 @@ net-libs/gnutls:test-full - Enable full test mode
 net-libs/gnutls:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
 net-libs/gnutls:tools - Build extra tools
 net-libs/gnutls:valgrind - Enable usage of dev-util/valgrind in debug
+net-libs/grpc:perftools - Enable profiling using dev-util/google-perftools
 net-libs/grpc:systemtap - Enable SystemTAP/DTrace tracing
 net-libs/grpc:tools - Install gRPC python tools
 net-libs/iax:snomhack - Use slower memset for SNOM phoneem
@@ -6378,6 +6398,7 @@ net-libs/shairplay:tools - Build and install a binary shairplay in /usr/bin
 net-libs/telepathy-qt:farstream - Enable support for audio/video calls via farstream
 net-libs/tox:av - Adds support for audio and video.
 net-libs/tox:daemon - Enable the DHT Bootstrap Daemon.
+net-libs/tox:dht-node - Enables DHT Bootstrap Node.
 net-libs/tox:log-debug - Log level: 4
 net-libs/tox:log-error - Log level: 1
 net-libs/tox:log-info - Log level: 3
@@ -7459,6 +7480,7 @@ sci-geosciences/gshhs:data - Add earth data with sci-geosciences/gshhs-data
 sci-geosciences/liblas:gdal - Add support for the sci-libs/gdal geospatial raster library
 sci-geosciences/mapnik:gdal - Enable sci-libs/gdal library support
 sci-geosciences/mapnik:osmfonts - Enable openstreetmaps font styles
+sci-geosciences/mapserver:apache - Enable mapserver to run under apache
 sci-geosciences/mapserver:gdal - Enable sci-libs/gdal library support
 sci-geosciences/mapserver:geos - Enable sci-libs/geos library support
 sci-geosciences/mapserver:postgis - Enable dev-db/postgis support
@@ -8249,8 +8271,6 @@ sys-cluster/legion:hwloc - Enable HWLoc lib support
 sys-cluster/maui:pbs - Enable pbs integration
 sys-cluster/maui:slurm - Enable slurm integration
 sys-cluster/minikube:libvirt - Build plugin for kvm
-sys-cluster/moosefs:cgi - Install CGI server and scripts.
-sys-cluster/moosefs:fuse - Install the mfsmount utility.
 sys-cluster/mpich:mpi-threads - Enable MPI_THREAD_MULTIPLE
 sys-cluster/mpich:romio - Build the ROMIO MPI-IO component
 sys-cluster/mpich2:mpi-threads - Enable MPI_THREAD_MULTIPLE
@@ -8346,7 +8366,6 @@ sys-devel/clang-runtime:crt - Require a package providing crt*.o files to make i
 sys-devel/clang-runtime:libcxx - Install sys-libs/libcxx for -stdlib=libc++
 sys-devel/clang-runtime:openmp - Install sys-libs/libomp for -fopenmp support
 sys-devel/clang-runtime:sanitize - Enable compiler-rt sanitizer (-fsanitize*) support
-sys-devel/distcc:crossdev - Enable support for sys-devel/crossdev
 sys-devel/distcc:gssapi - Enable support for net-libs/libgssglue
 sys-devel/gcc:awt - Useful only when building GCJ, this enables Abstract Window Toolkit (AWT) peer support on top of GTK+
 sys-devel/gcc:boundschecking - Add the bounds checking patch by Haj Ten Brugge, this will DISABLE the hardened PIE+SSP patches
@@ -8552,6 +8571,10 @@ sys-kernel/genkernel-next:iscsi - Enable support for open-iscsi (include open-is
 sys-kernel/genkernel-next:mdadm - Enable support for mdadm (include mdadm dependency)
 sys-kernel/genkernel-next:plymouth - Enable support for Plymouth (include Plymouth dependency)
 sys-kernel/gentoo-sources:experimental - Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
+sys-kernel/kpatch:contrib - Enable contrib kpatch services files.
+sys-kernel/kpatch:kmod - Enable a kernel module (.ko file) which provides an interface for the patch modules to register new functions for replacement.
+sys-kernel/kpatch:kpatch - Enable a command-line tool which allows a user to manage a collection of patch modules.
+sys-kernel/kpatch:kpatch-build - Enable tools which convert a source diff patch to a patch module.
 sys-kernel/linux-firmware:redistributable - Install also non-free (but redistributable) firmware files
 sys-kernel/linux-firmware:savedconfig - Allows individual selection of firmware files
 sys-kernel/linux-firmware:unknown-license - Install firmware files whose license is unknown
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index becbdff99a08..8aeb5beea72b 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/imu_tools/Manifest b/ros-meta/imu_tools/Manifest
index 291de9e36759..3a69a83f9e4d 100644
--- a/ros-meta/imu_tools/Manifest
+++ b/ros-meta/imu_tools/Manifest
@@ -1,6 +1,8 @@
 DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
 DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
+DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
 EBUILD imu_tools-1.1.5.ebuild 425 BLAKE2B dc5a4b08ea353efed9876c8d0f14d07d43801adb80598d07fc950a6c6d9ba86a0a904d91c42e5e85d4b190b673d5822a5e6b3c7dd00ca9883980d3c25242e8ff SHA512 3c7fde8f62f1b388cd7727498362da37c1cfbde078f3a1a2490427670374eae28b5eeeb34a28599583c12cde1438b21249ce9f8c52606db5f9f0e5622ca73531
 EBUILD imu_tools-1.2.0.ebuild 425 BLAKE2B f8dc933d0eee5bc95e3b9a708e1416b9f473ac53c08708531e28648ab7247d3a003971b25624af6220ca01ac57bef85d7ea1452c872c83b7e870698d8b207f1c SHA512 63e0a7f354cff1fcf03e79fb253c98b9164089976e50e1dc408cc3c8ed4b5bafa9534261afabeba7fcbd80ed7fe0501c569079a0f2793096d9606417fca661ea
+EBUILD imu_tools-1.2.1.ebuild 422 BLAKE2B 9321c474e417e8cc995feec76391267a012e53c37b251c8eb6622619b9a86383e3e77051575dedd144193bbd8d0ce14b991f0ab1b0ebe79db95f3813a169cccb SHA512 8805e26156fef9100655b1d3251535ad697fa8f868e5ee52f58d760182ba8881bbb533efa162da4c9f2ff681c46f2f145f5032514255c9a5f2ae68b6c534af03
 EBUILD imu_tools-9999.ebuild 425 BLAKE2B dc5a4b08ea353efed9876c8d0f14d07d43801adb80598d07fc950a6c6d9ba86a0a904d91c42e5e85d4b190b673d5822a5e6b3c7dd00ca9883980d3c25242e8ff SHA512 3c7fde8f62f1b388cd7727498362da37c1cfbde078f3a1a2490427670374eae28b5eeeb34a28599583c12cde1438b21249ce9f8c52606db5f9f0e5622ca73531
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/ros-meta/imu_tools/imu_tools-1.2.1.ebuild b/ros-meta/imu_tools/imu_tools-1.2.1.ebuild
new file mode 100644
index 000000000000..2355082f2feb
--- /dev/null
+++ b/ros-meta/imu_tools/imu_tools-1.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Various tools for IMU devices"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/imu_complementary_filter
+	dev-ros/imu_filter_madgwick
+	dev-ros/rviz_imu_plugin
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/Manifest b/ros-meta/pr2_common/Manifest
index 9974c4da0000..c50b221d5b4b 100644
--- a/ros-meta/pr2_common/Manifest
+++ b/ros-meta/pr2_common/Manifest
@@ -7,6 +7,7 @@ DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb
 DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
 DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
+DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
 EBUILD pr2_common-1.11.10.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 EBUILD pr2_common-1.11.11.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 EBUILD pr2_common-1.11.13.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
@@ -16,5 +17,6 @@ EBUILD pr2_common-1.12.0.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670
 EBUILD pr2_common-1.12.1.ebuild 464 BLAKE2B 294148d725203f8daa604d596c2daa10f0dad8f11bfc1fa602c45784df7f7d68c2120b8d97a2ee8ba5fb18732815576ab1c8c793fcf683a8e77621538bfef2a4 SHA512 42972118902b27a1f5ebd183cad5721ee2eba6a833cfaae3c919cc892909fb2ef0ebf402f4cdd4d0b4166d73d32458e98570daec31fee9512caa4fa90941e6d4
 EBUILD pr2_common-1.12.2.ebuild 464 BLAKE2B 294148d725203f8daa604d596c2daa10f0dad8f11bfc1fa602c45784df7f7d68c2120b8d97a2ee8ba5fb18732815576ab1c8c793fcf683a8e77621538bfef2a4 SHA512 42972118902b27a1f5ebd183cad5721ee2eba6a833cfaae3c919cc892909fb2ef0ebf402f4cdd4d0b4166d73d32458e98570daec31fee9512caa4fa90941e6d4
 EBUILD pr2_common-1.12.3.ebuild 461 BLAKE2B 23105ca80af40f9f9d3c0f7cd28e1953f9b5a770430d80d8505af20a22d5458186eb8c1cc7d749b2f2adf9036aff37e25cbf50207f6b780858ef6a1fa5aa847d SHA512 a79d5fca98df427fceead6643132e118c75d7d1bc2236d5f08ae387bf34c7e626d49ed3b051ac8004d3a39a820a7b2a8f0cec34898edf26290335e02623b793d
+EBUILD pr2_common-1.12.4.ebuild 461 BLAKE2B 2d7aa7c21e5662c0e75fffd0d7527462702f59838cd5ebe2d7860c6add22add5a09f0dd86a4081bf89b20734ecf88541de0cd88efa1c1f4d6e1594e4784ed9d9 SHA512 48e923779bc59c5cc4e0b151e65976842731281475de448d4eedf2834fa3017f8666fddb74bad063a8d983bede3d2582a111fbb632dab53a8fd04a433f8d6ea3
 EBUILD pr2_common-9999.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/ros-meta/pr2_common/pr2_common-1.12.4.ebuild b/ros-meta/pr2_common/pr2_common-1.12.4.ebuild
new file mode 100644
index 000000000000..3d40e56c016a
--- /dev/null
+++ b/ros-meta/pr2_common/pr2_common-1.12.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/pr2_msgs
+	dev-ros/pr2_dashboard_aggregator
+	dev-ros/pr2_description
+	dev-ros/pr2_machine
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_tutorials/Manifest b/ros-meta/ros_tutorials/Manifest
index 174e02d40917..5513f9095881 100644
--- a/ros-meta/ros_tutorials/Manifest
+++ b/ros-meta/ros_tutorials/Manifest
@@ -4,11 +4,13 @@ DIST ros_tutorials-0.7.1.tar.gz 140483 BLAKE2B 8f2d4aee6494476bf7efb2ea35962ea61
 DIST ros_tutorials-0.8.0.tar.gz 153739 BLAKE2B 0dc7918a2b95a26518d07d753040e381b26c357eb3995a22a429d58c244751d7c58c8736efbab23a6a5ca6903f08e43acf9519f2a534b22fe89ea853b2e3fbff SHA512 269f71ef360f7441e1bfed2c2b3da791ce8018d6ec833a1fb7198d289067359b1e7704e37580c61188cc45034c788f3ca463882f8247a155752ff5c61939d795
 DIST ros_tutorials-0.8.1.tar.gz 153831 BLAKE2B c34aec17ffd247554e37abb252848183392864c801dce7e2cae8c66d9fd30fdb12d50163487eff8615593df1532dece6c86303aab0b91d4075c14a9fba652b5a SHA512 f537312a78c27375791e11820f4d3a70433ce200d724d80bc8b417edd3c6dcbbf72abac0e9a98a199da2e3a8dbdec34e81d9106be4f6a5243a6f84d02d9ca668
 DIST ros_tutorials-0.9.0.tar.gz 154992 BLAKE2B d7a45d0adaa1507ae9494ea9590b9c69d3bbececa01f209a93825432b4b362499cde8c966e6734dbd854478e98970c340403ac56cb99a00b07cf9cff8b28fa36 SHA512 7beba72d3f72943ea5402416dc03809576d47d4e76e81d9ed85eba69c1f9a4e5737a91bdac76747f47e9d6459e5dd8e062cc8ec5f2fb9450cdb013b416534e56
+DIST ros_tutorials-0.9.1.tar.gz 155151 BLAKE2B 7371063ef77981892fee54b6b3d29907421f29deece22c6d53ace576717357a9700a2e14a03bd9f24c2285a16b55f5c9665a0da5081ae1599da8df5ec68ba425 SHA512 62a980e9515515496de39aa360df030f0dd8678bbf132d90386775c34e3b54f33a477aaefb65db803dcd704b8fbc61d445617399ac38cc2fa3f3363a6052682f
 EBUILD ros_tutorials-0.6.1.ebuild 470 BLAKE2B a030a9ce6186bb44ebce15766d3b562b8f7397a44a79691ad3d4a894d8257bf3928ad5cb09eb39bbf37547cb3a36bf5fb39f2f9aaa8dc34faaac74bde743e3b5 SHA512 18f7fb43c8f541fae229607bd3229d5088246ea0bea0849773482051114e2f6cd7df180bf3fd478cb7049e06f7f958eb3c526034e20f633e8d0917d096900702
 EBUILD ros_tutorials-0.7.0.ebuild 470 BLAKE2B a030a9ce6186bb44ebce15766d3b562b8f7397a44a79691ad3d4a894d8257bf3928ad5cb09eb39bbf37547cb3a36bf5fb39f2f9aaa8dc34faaac74bde743e3b5 SHA512 18f7fb43c8f541fae229607bd3229d5088246ea0bea0849773482051114e2f6cd7df180bf3fd478cb7049e06f7f958eb3c526034e20f633e8d0917d096900702
 EBUILD ros_tutorials-0.7.1.ebuild 470 BLAKE2B c3f068236eba12980816923c3620f41d71ab9de3185d20132fc3b03de0f7a7682cf5927f978184c5775d9e23531753444d532b864a3a3be9d90cfd424ee99b95 SHA512 ad39d206ddff67de43f4f71983bff88faea7db81778aebb71c8237a1c2a1df7e1616ab1cd0a6d4a3e299d80d62519a47aefd4b0c976878dfc02df1dea38be9df
 EBUILD ros_tutorials-0.8.0.ebuild 470 BLAKE2B e6f6a76e63f6df1520a394d3ae3e660c3a4e9180ef073dfc2eb6e2d78fcb1cb9ff3a1cc654c12d8f06f1df0fb241f0314b3c6f2438838dddc318b34d269a00d8 SHA512 a1bfb9bc6caeb77608f06561c0db5d25f3342f85dfbc2c068b4bafa3d220a42539d50b97ac77f7ea73724f0c7a7b6a223775cfb1fb3219a180295005f09862ad
 EBUILD ros_tutorials-0.8.1.ebuild 470 BLAKE2B e6f6a76e63f6df1520a394d3ae3e660c3a4e9180ef073dfc2eb6e2d78fcb1cb9ff3a1cc654c12d8f06f1df0fb241f0314b3c6f2438838dddc318b34d269a00d8 SHA512 a1bfb9bc6caeb77608f06561c0db5d25f3342f85dfbc2c068b4bafa3d220a42539d50b97ac77f7ea73724f0c7a7b6a223775cfb1fb3219a180295005f09862ad
 EBUILD ros_tutorials-0.9.0.ebuild 470 BLAKE2B 11402aacf018bd71c0512335736a71a814e3b87daeabccd7cecc6dc4b36cfcd8969a7a76c0ad3df00d2442601dd89d09b0d5ca5128dccd2a6144f5806637701a SHA512 9a4ba3dee1f016dca6ba486ddcbf1464ad740a8619d04898ee9ab23c37223f68a407d9b6491caa9db396985baf409549787a4c20027e2b6a532e11b6b79358e6
+EBUILD ros_tutorials-0.9.1.ebuild 467 BLAKE2B 4df10dcaea392101c4a9af871bda9e9d63a783a3f1d2790d370b59c63d7483e3c207fc1e634e4d5cae4e446264ada79c03ac7dcb1bd319585b9510275d91836b SHA512 2dc47534bfee36df7564b29fc17ad70d18d69573896351c93b7cc6491f86c5ca9be95837464ee44e0506ab7339f3ba8a648bb1a0bbddf7410b60a2854ce6ffd3
 EBUILD ros_tutorials-9999.ebuild 470 BLAKE2B a030a9ce6186bb44ebce15766d3b562b8f7397a44a79691ad3d4a894d8257bf3928ad5cb09eb39bbf37547cb3a36bf5fb39f2f9aaa8dc34faaac74bde743e3b5 SHA512 18f7fb43c8f541fae229607bd3229d5088246ea0bea0849773482051114e2f6cd7df180bf3fd478cb7049e06f7f958eb3c526034e20f633e8d0917d096900702
 MISC metadata.xml 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/ros-meta/ros_tutorials/ros_tutorials-0.9.1.ebuild b/ros-meta/ros_tutorials/ros_tutorials-0.9.1.ebuild
new file mode 100644
index 000000000000..6a12257e66f7
--- /dev/null
+++ b/ros-meta/ros_tutorials/ros_tutorials-0.9.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/ros_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates various features of ROS, as well as support packages which help demonstrate them"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp_tutorials
+	dev-ros/rospy_tutorials
+	dev-ros/turtlesim
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/rosbridge_suite/Manifest b/ros-meta/rosbridge_suite/Manifest
index 6f9dc66fb788..595b4297f385 100644
--- a/ros-meta/rosbridge_suite/Manifest
+++ b/ros-meta/rosbridge_suite/Manifest
@@ -1,6 +1,8 @@
 DIST rosbridge_suite-0.10.1.tar.gz 98010 BLAKE2B d634840a68081e7afaba77cff2b0f435392aa061ef6a4d4e75feccaa26811df92e0cd3c1b83973bd7eab534e66a5d5df880428d82fdd7cf20c7997a3427fdcf5 SHA512 455950eb5aebdccd6f173f2b7d1ea0bdf74421172895ab13e3af698a79e49964cb53354f90c396aad596818ecbb36385a3e1c9c373feb3a15aeff13d9e703443
+DIST rosbridge_suite-0.11.1.tar.gz 100994 BLAKE2B b6b21e1f8444b969d94ae1c86c70f242075c1494359df062179789920b3c03aa6ed44dd273c301098ed43f6084c656018349022158ec4b9b4672f20262952c05 SHA512 dd89d43b20589ac436cba673b3ee4f229eb14d47aabbe8352e04d6a2691b6f9e156315788178fbe345fa489fa84f86c626647b09ff3632562eb023bca688451c
 DIST rosbridge_suite-0.9.0.tar.gz 89409 BLAKE2B e48f36b71d8c5bcbd1ede0a87015b231d45194f3410b4cfcc38d39089477418b1f40afb28d8df7beba2e5e99b4aafde53bbc3f9bf371f0434099d7730c6393ee SHA512 4d7a6c0c33da9bf42ff24a0add81cad5fec707ef7149bf929bd2aac92ea2fe6f42da21bd5349dadee05cacb69d7efdb7adb0c01fc01c8251e0503cb488a73364
 EBUILD rosbridge_suite-0.10.1.ebuild 421 BLAKE2B 5433c4147b6cf60742e89c9ed32e277c1149c034f8af51f7767b6c5fee85daabd1d71fe6da4183f2f5969121cd11cd0917f9bcbcf8a082ad67a98123f7d61846 SHA512 eadf2584378d4a89a84843cb1e36ee434fb1f13e55e38977bdd940cf5e66e803c52d5241bcd30423f3cc465d43c1f42414e81d1079378515947b482ab646aad9
+EBUILD rosbridge_suite-0.11.1.ebuild 421 BLAKE2B bc01e47ef3d780de5fdf9efa0d363d9cacd7f61b29e9fe8f4d6584c1f38f6b64289a516ae43ca934243e231f94ae98614e653a07ae08ecf3990abc025768fcbc SHA512 7b2bc34cf63625ffd2c197fe89c83db2a95d4b3ce91828ad44510d627d82babcc882e0515276668b15b57e348d48dd2b522518d347a3193e450d17f5958c277a
 EBUILD rosbridge_suite-0.9.0.ebuild 424 BLAKE2B 6dfec71f3190926aa2014a6e68321e27707bd45a6200ba508c21e6b6f020b6feb74d4fd050bf35916d577da234a2924f908c7071afab1cf3a6ffd45f8b6060a5 SHA512 1f2b48a1d8dfbb88a88687d69a288b03b848c0f0d2ad472f482d4538eb77b567c474df6f7be3d994787013cdfb5da6c7afcff65746ea7f44bcdfa5d942f3f831
 EBUILD rosbridge_suite-9999.ebuild 424 BLAKE2B 38747dcac5ed55d2cadca9b11e0fc739642545208c501184cf27cec0a52ec81140185b703daf23d1db06caf5d873fa2f9405a8d5fa1eaf46bfc7657bd55b07a2 SHA512 9d80f537d18581dd200477da8fb6f77d077351fbd9f6b98d2de352938e9f44fbb69d74870fbc829c95f5974175240a65ad6a92079bc6e2de33a23aa5f070ab4c
 MISC metadata.xml 343 BLAKE2B 54e565b139250d84a9adfb768099d530c91876a8d20dabdb1c5fdb61c7c4e799b3e4121ad704c09b8019693ccbf15be426100cdc8e9388f8ef68312d4ca75d31 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365
diff --git a/ros-meta/rosbridge_suite/rosbridge_suite-0.11.1.ebuild b/ros-meta/rosbridge_suite/rosbridge_suite-0.11.1.ebuild
new file mode 100644
index 000000000000..ff0329a29539
--- /dev/null
+++ b/ros-meta/rosbridge_suite/rosbridge_suite-0.11.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="JSON API to ROS functionality for non-ROS programs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosapi
+	dev-ros/rosbridge_library
+	dev-ros/rosbridge_server
+	"
+DEPEND=""
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 50e18749f51d..ed399d75de05 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index aba3c58a0d00..940a4a05a05e 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,5 +1,7 @@
 DIST kstars-3.1.1.tar.xz 70308140 BLAKE2B 97c32773bb600b6601f6b0f64cb951d9931760f3f83bd40e99888868a49643c26af666756fde7b8fb59c634cdfdd7391d4ea8674e99acbe0955bc07b194f4285 SHA512 f482a0bf82eda596a6da9ab8641059aaae8c1983b3c28e963b18665aec3d6418472997aa3d94f6cdff496a95f4151f4b5ca2171bed4c9ff3f7f95177a8fd67c0
 DIST kstars-3.2.2.tar.xz 70730772 BLAKE2B f92510e7e1a077d685e67a3e2ddadb1f5ca0c79a4775a07db9d05e25cd871c8faf04d2cf827c60e1c0173ac35b170d3460ec747b5e00b2a1d2cc3a60c6354524 SHA512 05bdb1ce739ae05a0557082fa3ad299a9ea233d747def20a0ec3ded566d66cd9fa15d6d2cc338429c63dfe61385bbfc961ead195208b429a39111ca9ea44a5e1
+DIST kstars-3.2.3.tar.xz 70750660 BLAKE2B ea44b1ab2ba5d34a472b513180c148093defeff9fc2b8fb823621149b836a6fb7d6f53e0e50765de7c423fcdcdfc8fac6ae4feb4c4670d475353e091fa14d20c SHA512 29c534c860cb1ab2c52e497061b16c7870e63253a7184f79ed8565d56abbc2909160d7f8c649764e4eb7462630e30e4428a88753e7987e97e530b174076cbd37
 EBUILD kstars-3.1.1.ebuild 2199 BLAKE2B 6a15c7174ad19e05253c89ad9f7744b80ecbeacd3aa4c5f3f25a938a0b9ab56a3ba7c377b78f60c6650b9c7ae9879d64e1583a97bd6ad77d39a4f398fe837626 SHA512 126b54bb36b0407fe49a0da961e7b93aec43f211d17c1120b27ad3d962392b21ddaa17345b6f357982e8493c3e35877a352d563592fe210556007793cddab926
-EBUILD kstars-3.2.2.ebuild 2197 BLAKE2B 7cb3ea0f13a4141ad3f6ba717bab0d41351c7f621fc694116f743e1b0c76287116c0e814a35c6efd0814da124c0777c5e2af34c7a940d6a4e85e03878c8832a7 SHA512 5b9cc2d2ea9836b23113e3bbf6f2ed5623176a1c4f72bebbf960fa1ad89f30637c46c1922ad8dbaf335d6f1900d29e932b09cb88990ee5eae46c39a0d8254283
+EBUILD kstars-3.2.2.ebuild 2196 BLAKE2B 237f77cbc0eaea95a37e78e63cef9924035585369509a30dc01f127046a2c527a896ed1d317b8d4084c600a119566c944699c6857dc89e426a37c96c53b2f967 SHA512 fe95a5ba0bc95a25c390f8513e248ac47881ed8fdc45436014bf47bef44f9361c21ced4e4dbec3d7e9276cded3dc10a35dc41b7fa1d8447598e142354f7e3eb8
+EBUILD kstars-3.2.3.ebuild 2197 BLAKE2B 7cb3ea0f13a4141ad3f6ba717bab0d41351c7f621fc694116f743e1b0c76287116c0e814a35c6efd0814da124c0777c5e2af34c7a940d6a4e85e03878c8832a7 SHA512 5b9cc2d2ea9836b23113e3bbf6f2ed5623176a1c4f72bebbf960fa1ad89f30637c46c1922ad8dbaf335d6f1900d29e932b09cb88990ee5eae46c39a0d8254283
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/kstars-3.2.2.ebuild b/sci-astronomy/kstars/kstars-3.2.2.ebuild
index dbf91c26649b..609206b52681 100644
--- a/sci-astronomy/kstars/kstars-3.2.2.ebuild
+++ b/sci-astronomy/kstars/kstars-3.2.2.ebuild
@@ -9,7 +9,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Desktop Planetarium"
diff --git a/sci-astronomy/kstars/kstars-3.2.3.ebuild b/sci-astronomy/kstars/kstars-3.2.3.ebuild
new file mode 100644
index 000000000000..dbf91c26649b
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.2.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://kde.org/applications/education/kstars https://edu.kde.org/kstars/"
+IUSE="fits indi +password raw wcs"
+
+REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdatavis3d)
+	$(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 qtwebsockets)
+	$(add_qt_dep qtwidgets)
+	sys-libs/zlib
+	fits? ( sci-libs/cfitsio )
+	indi? ( >=sci-libs/indilib-1.7.5 )
+	password? ( dev-libs/qtkeychain:= )
+	raw? ( media-libs/libraw:= )
+	wcs? ( sci-astronomy/wcslib )
+"
+# TODO: Add back when re-enabled by upstream
+# 	opengl? (
+# 		$(add_qt_dep qtopengl)
+# 		virtual/opengl
+# 	)
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+	dev-cpp/eigen:3
+"
+RDEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFETCH_TRANSLATIONS=OFF
+		$(cmake-utils_use_find_package fits CFitsio)
+		$(cmake-utils_use_find_package indi INDI)
+		$(cmake-utils_use_find_package password Qt5Keychain)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package wcs WCSLIB)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst () {
+	kde5_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "x11-misc/xplanet" ; then
+		elog "${PN} has optional runtime support for x11-misc/xplanet"
+	fi
+	# same for AstrometryNet, which is not packaged.
+}
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index cccaf6f33820..65c488956ba3 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/datamash/Manifest b/sci-calculators/datamash/Manifest
index 4a519346d7c6..e41cf38d335c 100644
--- a/sci-calculators/datamash/Manifest
+++ b/sci-calculators/datamash/Manifest
@@ -1,5 +1,3 @@
-DIST datamash-1.3.tar.gz 1939375 BLAKE2B 4fe08d14ffaca21ce78d5b2781fadc665dfbc87c628338ad63eba09779179e4bfa3f578c1a8018acfbf8b3c7aad0389ee068d1b21718b1f576b6e5e8ed8d03c2 SHA512 3c36dd01035dc114f2fbfcb8746354e496e6c1536f7b5908cf25632d9cbaddfcd06fc26f8883ef845a6ecd85ceb5708bb7edb3d1b1c6efa273ef5ec0b758366a
 DIST datamash-1.4.tar.gz 2013538 BLAKE2B 7be0d146e24c9d5e4e739e4884dda30c52089410b39b77e80e2265f134aaf3fb4db097b2b138497ed117028191a8a1bd0b82d2754f96bb5473d79b7785e1e1af SHA512 1c47d70c9d7fa5ab2fd2a8cb1d40817ca07e8501628997ae370884fd0a4e926c0718f49f54a5f91eb4db847296bc120db3dd19fc12a92bfe8d2e7d6f2ded5aec
-EBUILD datamash-1.3.ebuild 603 BLAKE2B 7b4e0d9652693cf925253d2979a14349f4a1e66dcd1fa9f41158aacc0575c6c42df5a0de3c777a6ee6a5292cecd23b2f32dcbfc7bf8d879322de7d7ade76c098 SHA512 39457e47ab6e119cca3d0ab8cd1db2ba98ec5973ee608adba37d493de65c7090829a12bbd59f9444744e8a699d2c102899752c587a3df6f8c54f7f455c35a3a7
 EBUILD datamash-1.4.ebuild 601 BLAKE2B d02c99ccbaf8b2887d503170eca0dcf21b6b3537ee6085830229f61fbc4c036d62456d8c52e0fdfea85b96126d678d1b36da1cac849265f434563296a21a6e0e SHA512 ed49c45bb61cb4c53407a74a35eb92d261fceb495e3cdaad9df7cb731899a58d91cfdd138df8e8faba7fb1565cc7ed31224c9d89afe3b9d5361b47b0ee7a7158
 MISC metadata.xml 310 BLAKE2B 3cdfd42d49682ab36ccc013dd4818674fe05abe3749ee328d41877a865de82f69ee4f8e8aa1b5e4bca55c50120489e5896ff0e6a8014ad07e51ae9350ab791b8 SHA512 e8cadaf3fa95d5ac28e177ec1b5e71b3e330aef4237250fe2579bac07249252d5e40e9f1b831244f3b408bd0a02d85dd76acb1e0129a62524870e4c3083dcac7
diff --git a/sci-calculators/datamash/datamash-1.3.ebuild b/sci-calculators/datamash/datamash-1.3.ebuild
deleted file mode 100644
index 0a8743d8dd44..000000000000
--- a/sci-calculators/datamash/datamash-1.3.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
-
-DESCRIPTION="command-line program for basic numeric, textual and statistical operations"
-HOMEPAGE="https://www.gnu.org/software/datamash/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls openssl"
-
-CDEPEND="
-	nls? ( sys-devel/gettext )
-	openssl? ( dev-libs/openssl )
-"
-RDEPEND="
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${CDEPEND}
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(usex openssl --with-openssl={yes,no})
-}
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 38d0d6e722c9..4e898bf720b9 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,8 +1,8 @@
 AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457a08ddbe98e85cd3c195c149215de8753aa72fec618ccf4bdf584002c507cc53532ee92af6e8097c7fa2573628de34b17c SHA512 f54fb5d006263f89ff8c376f100066d79883b68a30441e8665ca4d8a6aa061e5c697c715ccb93c67a692145a44a441862039e5249e4795159f1c43a12ffe1c97
 DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
-DIST units-2.17.tar.gz 1185070 BLAKE2B 44db938b214596058cdfaeda7fd8d70161221c196a0971b5a0e03331e30fdeb52db85ab43b721f25efd755f4baee4f92aa6204a85d38703a31ec7cac0cefd689 SHA512 e4114f7dc0e40146f969375511c5d930497cb9502306ef82feac78c8e09a03e84ed0b582ff82e2878beae41702c9612f7a3d28fc6e9ed2cfae708f9feb8b737b
 DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7
+DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8
 EBUILD units-2.16.ebuild 1294 BLAKE2B dc631b71d06b87df88986faa03ee6b0ec48e4c7f07eb874b17ff1a2a53e7a48368d9299d24efd00602c66d23ddb5c35a03037ad3e818ff210c4a1ecbcf2c47e6 SHA512 7f42897d19beb48c360de689484a7483a74a26932d3a8749e53e7b26a99d24b10af9c76ed635f04a0cc5f6aadf27bff43895bfe26d2385c942ad8a7df89ccdc4
-EBUILD units-2.17.ebuild 1401 BLAKE2B 01ab9def5187dc6c9998b73178952dbcb2d3de02fd1984712e95b794a7f1e02a7ede68814eccd6c21b3225adf93f98cf743fd9cadab5d5905c5087ae3f28ee6a SHA512 70f9d4b4335ccc392e3cc843741188df403f61a255e2e67478151899f0fb8ee5c9334e79ca0da59bc80c971eb6fb1bebe53e8f4a891f5008cb053f6c0996ca25
 EBUILD units-2.18.ebuild 1401 BLAKE2B 01ab9def5187dc6c9998b73178952dbcb2d3de02fd1984712e95b794a7f1e02a7ede68814eccd6c21b3225adf93f98cf743fd9cadab5d5905c5087ae3f28ee6a SHA512 70f9d4b4335ccc392e3cc843741188df403f61a255e2e67478151899f0fb8ee5c9334e79ca0da59bc80c971eb6fb1bebe53e8f4a891f5008cb053f6c0996ca25
+EBUILD units-2.19.ebuild 1397 BLAKE2B 88ab2561bb81e8032c815c1191a0ab71eeaef671b9894fbf2ac328712a0b1b7bb80fa64c69f5a397b10c94d80b6fac5b99de1c700ddbc21f8b49f8d61e7bf512 SHA512 2d4c83ee37cec61b3d66f26ae7d0e3086789991ddf18e9087211e9a6a5f66b0284c4ac004877a5c85af095e6c72744bf6f6a16c38c0dadc291d4832ffc89a950
 MISC metadata.xml 341 BLAKE2B 60596aa39a0a3810573ced2896624fe01b49ed1138c942969bcd97884078cf69ace3d6cb4d0121de7d548da422a4b823982dc2771dea21817c207285b402ad2a SHA512 b32fc161804c8cd09f6b67923911ddfbdc9c5ba6e5dc61e951bbbe6fd54dd495209c519ead1dd46cb62cf5fd90978472f0d58ed2b66cc079c3ca91a36d22e822
diff --git a/sci-calculators/units/units-2.17.ebuild b/sci-calculators/units/units-2.17.ebuild
deleted file mode 100644
index 4d61f6f6676c..000000000000
--- a/sci-calculators/units/units-2.17.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit eutils python-single-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+units_cur"
-REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/readline:=
-	units_cur? (
-		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
-)
-
-pkg_setup() {
-	use units_cur && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--sharedstatedir="${EROOT}/var/lib" \
-		ac_cv_path_PYTHON=no
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog NEWS README
-
-	# we're intentionally delaying this since 'make install' would
-	# get confused if we shove 'units_cur' there, and there is no real
-	# need to add more complexity for it
-	if use units_cur; then
-		sed \
-			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
-			-e 's|^#!|&/usr/bin/python|g' \
-			units_cur_inst > units_cur || die
-		python_fix_shebang units_cur
-		python_doscript units_cur
-	fi
-}
diff --git a/sci-calculators/units/units-2.19.ebuild b/sci-calculators/units/units-2.19.ebuild
new file mode 100644
index 000000000000..9e35768509d5
--- /dev/null
+++ b/sci-calculators/units/units-2.19.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit python-single-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+units_cur"
+REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-libs/readline:=
+	units_cur? (
+		${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
+)
+
+pkg_setup() {
+	use units_cur && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--sharedstatedir="${EROOT}/var/lib" \
+		ac_cv_path_PYTHON=no
+}
+
+src_compile() {
+	emake ${PN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ChangeLog NEWS README
+
+	# we're intentionally delaying this since 'make install' would
+	# get confused if we shove 'units_cur' there, and there is no real
+	# need to add more complexity for it
+	if use units_cur; then
+		sed \
+			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
+			-e 's|^#!|&/usr/bin/python|g' \
+			units_cur_inst > units_cur || die
+		python_fix_shebang units_cur
+		python_doscript units_cur
+	fi
+}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 88dc6c45c203..556564f17fc7 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index 3fb7f463629c..d8afb6a89cc3 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -1,8 +1,6 @@
 DIST molmol-2k.2.0-doc.tar.gz 1062297 BLAKE2B 082d4eea5544bab52ffc1ff6364c50304348f76759dd3125cd74d02e629383d4a566f28ac77ab89ecf5e17a82617b8f61525e6f454689840b27899827399d866 SHA512 131f747a5762859398ebe9b676a07df56c82c8864ecc035ec914f1dea74dafcd67f87993421dfe5899c640470c7e1e1ef03ae262b04a9b360ae329eb19a331fe
 DIST molmol-2k.2.0-src.tar.gz 1088805 BLAKE2B cd649604f6ee491d3a4485391ecdaa48dc1bc4bcd82865cd4a01ca460a6653f8cbba636050bfab9027b9b95dbefa28a8deeff7065b9b461f518001242af4a849 SHA512 6ab01a6fd3d19752634a2cf22919a20e43d195768bd4bdacd5f0bbe016c3058c94915bad4c7fa64dcd86576be39cad0ae112cb62f5e69ffb10041518101e7a9b
 DIST molmol-patches.tbz2 17528 BLAKE2B b91270a980f290edc169be00639e86b3272281c9fe237750f5778eab1605ed482c09bdaf90660a5edf74bd04b3e31adc755e77e39aea6c75d88b6db9bf47a6d6 SHA512 bd94baf0a378f40f854f396963edd9b9e4afc5c56462ee6f8b68889290afdb4c5d9b10878aa5619d0a70153453fe6ee8e7540064522c6db0291ae9162bba9287
-EBUILD molmol-2k_p2-r2.ebuild 1786 BLAKE2B eda77c9e82f6b48eb38c5f47dfdd74d5916f376cc2d07fe54542fef4c1c7ecffd90ec3af82f4abd8453b15ea2044f56280dfa14274aa3d8a549136153f43c709 SHA512 cffa98ccf69382a64b4005d8971e6ecd1ed02d4199d8b494819d62439daa74b50244f6cb599c7ea73231d60f2d45d1aa49543121fc07b0e7d2ae30da044b7240
-EBUILD molmol-2k_p2-r3.ebuild 1918 BLAKE2B 134be8d8f1c11b60117c701a9b19c5f857dc554d8cd3221eae63d8f8f2d1e7d6382da8071c1d10f08294823bb1e8acabe7c3018d4817ecc9e62959f1fb204c22 SHA512 a1442eb74cc7aaa49ca81765601d1272138ed2ca3d7cebdadedd3bee4f561abf340bcfeabe4556d893df8d1be7983ac488b8773661ffc74a93a379fd503ebf0d
-EBUILD molmol-2k_p2-r4.ebuild 1935 BLAKE2B f0efe15c919180becacbd408e9974b7699276c31307773865c78ba4a2c2d122dee693af69d3aac14f3f58417410cfc0c0701207870bd474e0cda546dceab24d9 SHA512 3a59f7e5df34e0762289e6156a24bbaa7f1853c54c8db3436beae457f1c4f7e49656234f843d529099d9e2ad79ade7aff6f463f12fd5495c58265f538156c180
-EBUILD molmol-2k_p2-r5.ebuild 1947 BLAKE2B 85d1f2c7dde895f466fa334f5163be3b21eca7cc06cadb1fa15598351ea5f4bc0400680f92ed69e42031e3bfbe6a7ffcb85d9460e55055d3760eed5429360038 SHA512 6c0b9db7453acb3a14d762317548ace5a88143d9d3add2104acab0c7c2a7c6901b2086edf5bd5c48caa5fa1059664cf2c24304a88ba28e26ff77f895c1f03084
+DIST molmol.png 509 BLAKE2B 981217602d128da2eb3765ca07580ed58164a4aa8c2d3e016cd54d9f5133418a7c87bbf0f8a83bcbd5d60ad568bf4938ce680eea315716166592e37f815b5aab SHA512 233d3be0c2e2759a8b064b4cf3708f96817f34eb2a397d5122b26a902864a0f1dca1762f8bcc6981cd030e2644cbedef9eb20c7756016fcf27565e3ed586c271
+EBUILD molmol-2k_p2-r5.ebuild 2222 BLAKE2B 701c748446929618b42916e94b2742969d7b66acb055dab37834463bd5420f22e2d0119440dd58685236054a61745a36d8cd385dfd1593217595a48f9978111b SHA512 49dafa2d8a771ec2f8e3ff76f16790d61de84419037f7132581ef5de3f7c2ba12aedaf2ec778139420996d610788aef4c23ee8ac4339a8fe81cba4d36f99ebf8
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
deleted file mode 100644
index 888c738d4f15..000000000000
--- a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib prefix toolchain-funcs
-
-MY_PV="${PV/_p/.}.0"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Publication-quality molecular visualization package"
-HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
-SRC_URI="
-	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
-	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz
-	https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2"
-
-LICENSE="molmol"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	|| (
-		(	media-libs/mesa
-			x11-libs/libGLw )
-		media-libs/mesa[motif] )
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg
-	x11-libs/libXpm
-	x11-libs/motif:0
-	x11-apps/xdpyinfo"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	MMDIR="/usr/$(get_libdir)/molmol"
-}
-
-src_prepare() {
-	rm -rf tiff*
-	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
-	epatch "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff
-
-	epatch "${WORKDIR}"/patches/prefix.patch
-	eprefixify molmol
-
-	epatch "${WORKDIR}"/patches/ldflags.patch
-
-	ln -s makedef.lnx "${S}"/makedef || die
-
-	sed \
-		-e "s:/bin/ksh:${EPREFIX}/bin/sh:" \
-		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR}:" \
-		-i "${S}"/molmol || die
-	sed \
-		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
-		-e "s:^CC.*:CC = $(tc-getCC):" \
-		-i "${S}"/makedef || die
-
-	epatch "${WORKDIR}"/patches/cast.patch
-	epatch "${WORKDIR}"/patches/libpng15.patch
-}
-
-src_install() {
-	dobin molmol
-
-	exeinto ${MMDIR}
-	newexe src/main/molmol molmol.lnx
-	insinto ${MMDIR}
-	doins -r auxil help macros man setup tips
-
-	dodoc HISTORY README
-}
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r3.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r3.ebuild
deleted file mode 100644
index 22f3e6a03bdf..000000000000
--- a/sci-chemistry/molmol/molmol-2k_p2-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib prefix toolchain-funcs
-
-MY_PV="${PV/_p/.}.0"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Publication-quality molecular visualization package"
-HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
-SRC_URI="
-	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
-	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz
-	https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2"
-
-LICENSE="molmol"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	|| (
-		(	media-libs/mesa
-			x11-libs/libGLw )
-		media-libs/mesa[motif] )
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg
-	x11-libs/libXpm
-	x11-libs/motif:0
-	x11-apps/xdpyinfo"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	MMDIR="/usr/$(get_libdir)/molmol"
-}
-
-src_prepare() {
-	rm -rf tiff*
-	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
-	epatch "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff
-
-	epatch "${WORKDIR}"/patches/prefix.patch
-	eprefixify molmol
-
-	epatch "${WORKDIR}"/patches/ldflags.patch
-
-	ln -s makedef.lnx "${S}"/makedef || die
-
-	sed \
-		-e "s:/bin/ksh:${EPREFIX}/bin/sh:" \
-		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR}:" \
-		-i "${S}"/molmol || die
-	sed \
-		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
-		-e "s:^CC.*:CC = $(tc-getCC):" \
-		-i "${S}"/makedef || die
-
-	epatch "${WORKDIR}"/patches/cast.patch
-	epatch "${WORKDIR}"/patches/libpng15.patch
-
-	# patch from fink
-	# fixes numerous bad bracings and hopefully the OGL bug 429974
-	epatch "${WORKDIR}"/patches/${P}-fink.patch
-}
-
-src_install() {
-	dobin molmol
-
-	exeinto ${MMDIR}
-	newexe src/main/molmol molmol.lnx
-	insinto ${MMDIR}
-	doins -r auxil help macros man setup tips
-
-	dodoc HISTORY README
-}
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild
deleted file mode 100644
index 26a294922182..000000000000
--- a/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib prefix toolchain-funcs
-
-MY_PV="${PV/_p/.}.0"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Publication-quality molecular visualization package"
-HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
-SRC_URI="
-	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
-	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz
-	https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2"
-
-LICENSE="molmol"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	|| (
-		(	media-libs/mesa
-			x11-libs/libGLw )
-		media-libs/mesa[motif] )
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	x11-libs/libXpm
-	x11-libs/motif:0
-	x11-apps/xdpyinfo"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	MMDIR="/usr/$(get_libdir)/molmol"
-}
-
-src_prepare() {
-	rm -rf tiff*
-	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
-	epatch "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff
-
-	epatch "${WORKDIR}"/patches/prefix.patch
-	eprefixify molmol
-
-	epatch "${WORKDIR}"/patches/ldflags.patch
-
-	ln -s makedef.lnx "${S}"/makedef || die
-
-	sed \
-		-e "s:/bin/ksh:${EPREFIX}/bin/sh:" \
-		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR}:" \
-		-i "${S}"/molmol || die
-	sed \
-		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
-		-e "s:^CC.*:CC = $(tc-getCC):" \
-		-i "${S}"/makedef || die
-
-	epatch "${WORKDIR}"/patches/cast.patch
-	epatch "${WORKDIR}"/patches/libpng15.patch
-
-	# patch from fink
-	# fixes numerous bad bracings and hopefully the OGL bug 429974
-	epatch "${WORKDIR}"/patches/${P}-fink.patch
-
-	tc-export AR
-}
-
-src_install() {
-	dobin molmol
-
-	exeinto ${MMDIR}
-	newexe src/main/molmol molmol.lnx
-	insinto ${MMDIR}
-	doins -r auxil help macros man setup tips
-
-	dodoc HISTORY README
-}
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
index 41b041609f2f..a09bfe07847b 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
@@ -1,39 +1,48 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils multilib prefix toolchain-funcs
+EAPI=7
+inherit desktop prefix toolchain-funcs
 
 MY_PV="${PV/_p/.}.0"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Publication-quality molecular visualization package"
-HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
+
+# Original page dead
+#HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
+HOMEPAGE="
+	http://www.csb.yale.edu/userguides/graphics/molmol/molmol_descrip.html
+	http://pjf.net/science/molmol.html
+"
 SRC_URI="
 	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
 	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz
-	https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2"
+	https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2
+	https://dev.gentoo.org/~pacho/${PN}/${PN}.png
+"
 
 LICENSE="molmol"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	|| (
 		(	media-libs/mesa
 			x11-libs/libGLw )
 		media-libs/mesa[motif] )
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	media-libs/tiff:0
 	sys-libs/zlib
 	virtual/glu
 	virtual/jpeg:0
 	x11-libs/libXpm
 	x11-libs/motif:0
-	x11-apps/xdpyinfo"
-RDEPEND="${DEPEND}"
+	x11-apps/xdpyinfo
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
 
 S="${WORKDIR}"
 
@@ -44,12 +53,14 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	rm -rf tiff*
 	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
-	epatch "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff
+	eapply "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff
 
-	epatch "${WORKDIR}"/patches/ldflags.patch
-	epatch "${WORKDIR}"/patches/opengl.patch
+	eapply "${WORKDIR}"/patches/ldflags.patch
+	eapply "${WORKDIR}"/patches/opengl.patch
 
 	ln -s makedef.lnx "${S}"/makedef || die
 
@@ -62,14 +73,14 @@ src_prepare() {
 		-e "s:^CC.*:CC = $(tc-getCC):" \
 		-i "${S}"/makedef || die
 
-	epatch "${WORKDIR}"/patches/cast.patch
-	epatch "${WORKDIR}"/patches/libpng15.patch
+	eapply "${WORKDIR}"/patches/cast.patch
+	eapply -p0 "${WORKDIR}"/patches/libpng15.patch
 
 	# patch from fink
 	# fixes numerous bad bracings and hopefully the OGL bug 429974
-	epatch "${WORKDIR}"/patches/${P}-fink.patch
+	eapply "${WORKDIR}"/patches/${P}-fink.patch
 
-	epatch "${WORKDIR}"/patches/wild.patch
+	eapply "${WORKDIR}"/patches/wild.patch
 	tc-export AR
 }
 
@@ -81,5 +92,9 @@ src_install() {
 	insinto ${MMDIR}
 	doins -r auxil help macros man setup tips
 
-	dodoc HISTORY README
+	make_desktop_entry "${PN}"
+	doicon "${DISTDIR}/${PN}.png"
+
+	einstalldocs
+	dodoc HISTORY
 }
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 1bbeb6cfbd8e..53adcde9c072 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,8 +1,6 @@
 DIST pymol-1.8.4.0.png.xz 19528 BLAKE2B f3d23d4cedca3d8bb96b20646a548da4be570697e3346a11b01c5c3599b536ba4697be08472dfa8a4f6533167defc1a37a1de332931a73857319cb28fd42cd2b SHA512 40bb0d3f226476f6e047b5361956aad955232a97641474765eaa5204f0539aee3810e0266213618a45364f9f31f6eb18380b17e0c79f64065f7b62a9016caa7c
-DIST pymol-2.2.0.tar.gz 10514753 BLAKE2B 54bf7c639ec1af0c318438f6dcbe5878aded5cc360dee3a5f1dee4b6eea588f4242865ae8adf1e044628ad5f71aa8f6d58d0cc71baf7c1f20eed3045ed3a1cb1 SHA512 56776586276208d42cc4bd4c3cb7d6b9a08e7239186b8f398c75cb57f85e05ebf51aaa8cdec5672e56beeda26f1cd9d14c6de7fba1a741f9c8ec22c1292b9c63
 DIST pymol-2.3.0.tar.gz 10448674 BLAKE2B 0d508587d880ce7f2e8a0481bf664e6bfe6eb1d68b0f48b9266cde756824bd8c0144d7243e958bbc5e571d60fca9dafff125d81a8a3d32107e78ad2ff8dffc05 SHA512 e1dcea1c97bcd9045d3543e92902f240e6affbf61a38e8d2a0be04309e3dbabfe1a869847d1423b3151008978d4c305bbf3ce994fc9d453c0063ce020100c133
 DIST pymol-v1.8.4.0.tar.bz2 8717344 BLAKE2B a4cfb95eb40a3cd3da5b8cfd4acac7255997f9a3e49ef7e7e1d4c13f36e4aace462a054c326bbaadbc99f22286be878a6d5c518149760b5c939ce9362d4b8cc3 SHA512 73a810adfc31adaf0f3fa25512084882c87b0782c8af716ac0203a5b5b7f0b9fedfbce3d129bffef7b52044e92b0542e683966b2acf961c4dac17fbba72dd7fe
 EBUILD pymol-1.8.4.0-r1.ebuild 3009 BLAKE2B a076dd994e90f886e65cbb5b3f976e75eacd0a6f153c1b9417c476b53d2169495b08b6d3361ab5fcb55102a2e93a86b7f0ac6d0f25bca947f6b13f52dadde6bd SHA512 c696905b2e28c28249bf458e37dfe05237b307e3af1727fe17ebfd6a818322e6f9dc947d720df7ee29d694fe6501791f3a2f6fdc554a8e7dd43adf9727c8ece8
-EBUILD pymol-2.2.0.ebuild 3123 BLAKE2B d5d39aca27089614f5f095eaef2d89bc783f1b3144a944b5e03fa80c2eb3a15402a6041dbe7e59af8c04e9b5e4668d93073cc6173495079f803537485390830c SHA512 4c6a01df6417ea2e28f1a90a2e690b078b853e7bfc4d42f418a095ae605b7fcd316b57e201e1b0debcd15fb8102f9c6e20e7a0a7067af3e1f4372eef76faa635
-EBUILD pymol-2.3.0.ebuild 3142 BLAKE2B d03631d7794b9557c6dcac84895bb0a10766a97a5b81a93ce2a54f8b6d89c0f27f2249109e51c8a8f315948786ba6f49f716f23810d438c36de9fd1237c11de4 SHA512 c90b2798a36403c316f36a483fbc2887d84e55afea4667704543c388a5803ed678830276c4621b7499fb759ea67a29545c399acdea4d88a1c22feb9b31ca2aeb
+EBUILD pymol-2.3.0-r1.ebuild 3134 BLAKE2B 5dac0f4ca3041d02d27d9484bd3a6fe9ac037ffd367e36308ace5c6e5b3389c42cdcde5939c3a5af03f782ebb2fee994547e3251747e02f1c2df610dda17f9f1 SHA512 2fdffad45d70aa2117f295027701ebb2c6d6b523c939caf2c4d128f40e557d118377a5e93612ce1db247341509740274c8520af9f11d121cf66bb502565229d5
 MISC metadata.xml 439 BLAKE2B 68df7dfc8ca3d4d4b18b419532bade69491f2e9362f10ae2397c804132b7fc9cd08dcf9703c0a89c44588c570e0c0c1bb9bffb7394d51faf1283142dbc5f70b3 SHA512 f5a3eded9b12fa715ba2e6e10b41c75d9bd823ca0dd40acbffc3f5bfc4b36c687f720b1a4e119b4540a31faf849985778cbd72b0b2cd35af8c52ca0f808d71e4
diff --git a/sci-chemistry/pymol/pymol-2.2.0.ebuild b/sci-chemistry/pymol/pymol-2.2.0.ebuild
deleted file mode 100644
index 1e53d9ab3397..000000000000
--- a/sci-chemistry/pymol/pymol-2.2.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 eutils xdg-utils flag-o-matic
-
-DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="http://www.pymol.org/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN}-1.8.4.0.png.xz
-	https://github.com/schrodinger/pymol-open-source/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-# git archive -v --prefix=${P}/ master -o ${P}.tar.xz
-RESTRICT="mirror"
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="web"
-
-DEPEND="
-	dev-libs/msgpack[cxx]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:0=
-	media-libs/glm
-	media-libs/libpng:0=
-	media-video/mpeg-tools
-	sys-libs/zlib
-	virtual/python-pmw[${PYTHON_USEDEP}]
-	!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
-	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}-open-source-${PV}
-
-python_prepare_all() {
-	sed \
-		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
-		-e "/ext_comp_args.*+=/s:\[.*\]$:\[\]:g" \
-		-e "/import/s:argparse:argparseX:g" \
-		-i setup.py || die
-
-	sed \
-		-e "s:/opt/local:${EPREFIX}/usr:g" \
-		-e '/ext_comp_args/s:\[.*\]:[]:g' \
-		-i setup.py || die
-	sed \
-		-e "s:\['msgpackc'\]:\['msgpack'\]:g" \
-		-i setup.py || die
-
-	append-cxxflags -std=c++0x
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--pymol-path="${EPREFIX}/usr/share/pymol"
-
-	sed \
-		-e '1d' \
-		-e "/APBS_BINARY_LOCATION/s:None:\"${EPREFIX}/usr/bin/apbs\":g" \
-		-e "/APBS_PSIZE_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/src/\":g" \
-		-e "/APBS_PDB2PQR_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/\":g" \
-		-i "${D}/$(python_get_sitedir)"/pmg_tk/startup/apbs_tools.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	sed \
-		-e '1i#!/usr/bin/env python' \
-		"${D}/$(python_get_sitedir)"/pymol/__init__.py > "${T}"/${PN} || die
-
-	python_foreach_impl python_doscript "${T}"/${PN}
-
-	# These environment variables should not go in the wrapper script, or else
-	# it will be impossible to use the PyMOL libraries from Python.
-	cat >> "${T}"/20pymol <<- EOF
-		PYMOL_PATH="${EPREFIX}/usr/share/pymol"
-		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
-		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
-	EOF
-
-	doenvd "${T}"/20pymol
-
-	newicon "${WORKDIR}"/${PN}-1.8.4.0.png ${PN}.png
-	make_desktop_entry ${PN} PyMol ${PN} \
-		"Graphics;Education;Science;Chemistry;" \
-		"MimeType=chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"
-
-	if ! use web; then
-		rm -rf "${D}/$(python_get_sitedir)/web" || die
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	optfeature "Electrostatic calculations" sci-chemistry/apbs sci-chemistry/pdb2pqr
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..89aef82c8e96
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 desktop eutils flag-o-matic xdg-utils
+
+DESCRIPTION="A Python-extensible molecular graphics system"
+HOMEPAGE="http://www.pymol.org/"
+SRC_URI="
+	https://dev.gentoo.org/~jlec/distfiles/${PN}-1.8.4.0.png.xz
+	https://github.com/schrodinger/pymol-open-source/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+RESTRICT="mirror"
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="web"
+
+DEPEND="
+	dev-libs/msgpack[cxx]
+	dev-libs/mmtf-cpp
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype:2
+	media-libs/glew:0=
+	media-libs/glm
+	media-libs/libpng:0=
+	media-video/mpeg-tools
+	sys-libs/zlib
+	virtual/python-pmw[${PYTHON_USEDEP}]
+	!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
+	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}-open-source-${PV}
+
+python_prepare_all() {
+	sed \
+		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
+		-e "/ext_comp_args.*+=/s:\[.*\]$:\[\]:g" \
+		-e "/import/s:argparse:argparseX:g" \
+		-i setup.py || die
+
+	sed \
+		-e "s:/opt/local:${EPREFIX}/usr:g" \
+		-e '/ext_comp_args/s:\[.*\]:[]:g' \
+		-i setup.py || die
+	sed \
+		-e "s:\['msgpackc'\]:\['msgpack'\]:g" \
+		-i setup.py || die
+
+	append-cxxflags -std=c++0x
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--pymol-path="${EPREFIX}/usr/share/pymol"
+
+	sed \
+		-e '1d' \
+		-e "/APBS_BINARY_LOCATION/s:None:\"${EPREFIX}/usr/bin/apbs\":g" \
+		-e "/APBS_PSIZE_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/src/\":g" \
+		-e "/APBS_PDB2PQR_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/\":g" \
+		-i "${D}/$(python_get_sitedir)"/pmg_tk/startup/apbs_tools.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	sed \
+		-e '1i#!/usr/bin/env python' \
+		"${D}/$(python_get_sitedir)"/pymol/__init__.py > "${T}"/${PN} || die
+
+	python_foreach_impl python_doscript "${T}"/${PN}
+
+	# These environment variables should not go in the wrapper script, or else
+	# it will be impossible to use the PyMOL libraries from Python.
+	cat >> "${T}"/20pymol <<- EOF
+		PYMOL_PATH="${EPREFIX}/usr/share/pymol"
+		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
+		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
+	EOF
+
+	doenvd "${T}"/20pymol
+
+	newicon "${WORKDIR}"/${PN}-1.8.4.0.png ${PN}.png
+	make_desktop_entry ${PN} PyMol ${PN} \
+		"Graphics;Education;Science;Chemistry;" \
+		"MimeType=chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"
+
+	if ! use web; then
+		rm -rf "${D}/$(python_get_sitedir)/web" || die
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	optfeature "Electrostatic calculations" sci-chemistry/apbs sci-chemistry/pdb2pqr
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/sci-chemistry/pymol/pymol-2.3.0.ebuild b/sci-chemistry/pymol/pymol-2.3.0.ebuild
deleted file mode 100644
index 0f1975780234..000000000000
--- a/sci-chemistry/pymol/pymol-2.3.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 eutils xdg-utils flag-o-matic
-
-DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="http://www.pymol.org/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN}-1.8.4.0.png.xz
-	https://github.com/schrodinger/pymol-open-source/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-# git archive -v --prefix=${P}/ master -o ${P}.tar.xz
-RESTRICT="mirror"
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="web"
-
-DEPEND="
-	dev-libs/msgpack[cxx]
-	dev-libs/mmtf-cpp
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:0=
-	media-libs/glm
-	media-libs/libpng:0=
-	media-video/mpeg-tools
-	sys-libs/zlib
-	virtual/python-pmw[${PYTHON_USEDEP}]
-	!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
-	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}-open-source-${PV}
-
-python_prepare_all() {
-	sed \
-		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
-		-e "/ext_comp_args.*+=/s:\[.*\]$:\[\]:g" \
-		-e "/import/s:argparse:argparseX:g" \
-		-i setup.py || die
-
-	sed \
-		-e "s:/opt/local:${EPREFIX}/usr:g" \
-		-e '/ext_comp_args/s:\[.*\]:[]:g' \
-		-i setup.py || die
-	sed \
-		-e "s:\['msgpackc'\]:\['msgpack'\]:g" \
-		-i setup.py || die
-
-	append-cxxflags -std=c++0x
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--pymol-path="${EPREFIX}/usr/share/pymol"
-
-	sed \
-		-e '1d' \
-		-e "/APBS_BINARY_LOCATION/s:None:\"${EPREFIX}/usr/bin/apbs\":g" \
-		-e "/APBS_PSIZE_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/src/\":g" \
-		-e "/APBS_PDB2PQR_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/\":g" \
-		-i "${D}/$(python_get_sitedir)"/pmg_tk/startup/apbs_tools.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	sed \
-		-e '1i#!/usr/bin/env python' \
-		"${D}/$(python_get_sitedir)"/pymol/__init__.py > "${T}"/${PN} || die
-
-	python_foreach_impl python_doscript "${T}"/${PN}
-
-	# These environment variables should not go in the wrapper script, or else
-	# it will be impossible to use the PyMOL libraries from Python.
-	cat >> "${T}"/20pymol <<- EOF
-		PYMOL_PATH="${EPREFIX}/usr/share/pymol"
-		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
-		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
-	EOF
-
-	doenvd "${T}"/20pymol
-
-	newicon "${WORKDIR}"/${PN}-1.8.4.0.png ${PN}.png
-	make_desktop_entry ${PN} PyMol ${PN} \
-		"Graphics;Education;Science;Chemistry;" \
-		"MimeType=chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"
-
-	if ! use web; then
-		rm -rf "${D}/$(python_get_sitedir)/web" || die
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	optfeature "Electrostatic calculations" sci-chemistry/apbs sci-chemistry/pdb2pqr
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index 72040c83b5ce..e170171ba4f4 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,9 +1,11 @@
-AUX vmd-1.9.1-cuda-device_ptr.patch 934 BLAKE2B c0a6f938df4f9ac8d85bc147d83904deb5c3e93d7912a11a75e31a91029d7319228b0cffc09b9e154957e9d8d148089628de262e8d30d7acab5637951d5d25b0 SHA512 274756fe17fdcc39ce471c3187f3076407d34b64e49b0006ee30525a952277b2b5c713fffa8786162dc542eef2b021f2bf7339736cf9e81b673d5146114829ed
+AUX vmd-1.9.1-cuda-device_ptr.patch 894 BLAKE2B 96aeab7c2b9d29e5cd3558e69d1365d6b7dc2d78284bb1185d63a57300a83a4c7c0b8f1c1718027ff33333d34bba116d6898fbee74ab23dfd1a77c560160d659 SHA512 9a561773562873dad077f0f2903299952cb935c69ae4bd1463a5f79d6f27ae3845ac5a24ee295ff3569d9c65ae00a9fe3974f4ead003109246f97d130c2c48bf
 AUX vmd-1.9.2-format-security.patch 550 BLAKE2B d50d05d8697c345f5888b1344c827be1282c5b2e06cfddac022d562688550a728a91a943f9b31c4247f683dcd062ab8fe8ed360aa97a202f20af0467a3148cd3 SHA512 81a71ee4c4c438d18f3a393ebad5c9a08f1a7bb95fa58b78a8798955a34ae2494f80fa074b973a1b595862080e9103d21e509443742cfe2bc3cf77f10c0e3c9d
+AUX vmd-1.9.3-configure-libtachyon.patch 613 BLAKE2B 5717e941102c4d759d6985087f74724df21312a61313d397da1bbac1969b76590117c70bc3b7fac6c7a84483df433d03613b245a05db8bb10bf7b8807369f415 SHA512 1eafa38022588e9b9bba3a15394a432f66693e64ba62c27e7aebf759d279cb04326f76bcc6545ef34cbcbd7446aead1a05a18072e99aa7df0940f11173ab3c00
 DIST vmd-1.9.2-gentoo-patches.tar.xz 14896 BLAKE2B eb7c7fb982602f37bd8374bf8458a0a2ea2202161248caffd0d4e0f8124d627755304bb778976e1cf5598b6bfbbe5d8c8e6016c9ec562204d6782aaaf179b185 SHA512 0516b9e57b256ce822a64df420ebf3ab7391722757caeaa7e615526242043e9375fee8f4ee86fb4eb8de7a50d5cfc8f8d973ace5fa082e6f9010eb692cd6ee51
 DIST vmd-1.9.2.src.tar.gz 34903084 BLAKE2B f7f7048ef7bb72a8b0dcae955c7f90691085158c38a59229d5b929a4b52d3148bdb2f40084cf8c4544f01cb8bcb57de1d98a90bd17568a07c4ebb8f6985cec9b SHA512 b232b743d4ea97dcf76e3005e1c8716d7138602edc078c4846026ab67759c8559af956182cb1acf3c85890db10b6f658ac9c269d432f2595612cf376d6d505ef
 DIST vmd-1.9.3-gentoo-patches.tar.xz 14804 BLAKE2B 64e5df40ed88c23c924d32636495f0383590f91dbb714e64c73551072bb50d72b4e5f188fb2da58d32e84b4bc96ff0297d7ff1bf02b0481198901c4e12e4ee59 SHA512 5d506d4df5ca4a3edb33d77aeeb440fcb4750a250c77103b99f385f356eb9d71d954173b981d3a50f7a714cfc872587e5040868904e50fa1f6fd69d7e4d9f1b1
 DIST vmd-1.9.3.src.tar 129566720 BLAKE2B 848f3280d51765dcd18722dd233e0cdee3b7c0ac3dd48324260ebe1604ba781ca0a1fe4cae6652501d23d5d41712020e17dbb6bc21a1856eb3289a4aab6b774b SHA512 0502df1e8b60c570ca88b779b4153acfaa599a78df53fa96fca36301bab902864118332b5524ae7d170d3a9e429cf1e13d69e1197268b5e841afc0bb56a737ba
 EBUILD vmd-1.9.2.ebuild 7155 BLAKE2B 734137c1a02d76da109d35faf11f29138a8e48dda6d84b7151f93f2095481127f136a5f8954a80912c85ae7031a01c3374783a042bf5461fd9d1049b577a082b SHA512 3f9fc1f4cc8f6f5031de74a8211db2a9e11d07de110689832d408c343a307ba25efa354f5862d4e6d8d06d3d18b567820401fc9fcdc8818f65a33ea24a3c657b
+EBUILD vmd-1.9.3-r1.ebuild 7512 BLAKE2B cfd3259efcf3457e520f8f9ebf809373a99b6d6d5d3ab36192bf7ddd694835d7dd5c113957591d9041b583e58ac419f6cb8649f24ded0e62c89cabf056d45020 SHA512 cb0fc6cbc37c39351d51a3535569adaa69f4aee81942c0eeb83fbd7f1ca5aa3005bc8c87a74002869cc4fd81fb917601ae1bfd0a3dfd474fcf345f696cfd7d21
 EBUILD vmd-1.9.3.ebuild 7110 BLAKE2B d8ad6f495aaacdc4727e2c0e5d950a9670478aba7b55e62ed7074f06ad26151468f0f55a0786ce9dba80a181e7c36e912eaeaaa9ad7ae660739c65f482337c97 SHA512 c0eba398b6a815a59c9d8708dc796273ad3211ddc8e02aee8333f00f42f095c4d8999aaa246665ceb9282d2053c0631dc3c8ed7b60981d88ff9f8a2badf6b89a
 MISC metadata.xml 778 BLAKE2B 6c4202950f57a4d7a3004e966c761325a0a31ab19fe06a6bd69882bd685e41424953104ff653c03d6cbbcb60bb9aba45fbcec43cd228c4bb57fcb1c63a2bd881 SHA512 b967b71fb9f1b47a9d3b69e6958dfb0314a9f071dade7ed1876e91dfa73188748faf11ef832d240a71745b36a30422bde79de2e9ff8e5ec6b6da4b11b40d19c9
diff --git a/sci-chemistry/vmd/files/vmd-1.9.1-cuda-device_ptr.patch b/sci-chemistry/vmd/files/vmd-1.9.1-cuda-device_ptr.patch
index ce842448decf..67eb11bbd36b 100644
--- a/sci-chemistry/vmd/files/vmd-1.9.1-cuda-device_ptr.patch
+++ b/sci-chemistry/vmd/files/vmd-1.9.1-cuda-device_ptr.patch
@@ -4,8 +4,8 @@
 
 diff --git a/vmd-1.9.1/src/CUDAMarchingCubes.cu b/vmd-1.9.1/src/CUDAMarchingCubes.cu
 index 5bfe7bf..36faaf0 100755
---- a/vmd-1.9.1/src/CUDAMarchingCubes.cu
-+++ b/vmd-1.9.1/src/CUDAMarchingCubes.cu
+--- a/src/CUDAMarchingCubes.cu
++++ b/src/CUDAMarchingCubes.cu
 @@ -45,6 +45,7 @@
  #include "CUDAMarchingCubes.h"
  #include <thrust/scan.h>
@@ -16,8 +16,8 @@ index 5bfe7bf..36faaf0 100755
  // (limited by shared memory size)
 diff --git a/vmd-1.9.1/src/CUDAQuickSurf.cu b/vmd-1.9.1/src/CUDAQuickSurf.cu
 index a21ebde..56a42c8 100755
---- a/vmd-1.9.1/src/CUDAQuickSurf.cu
-+++ b/vmd-1.9.1/src/CUDAQuickSurf.cu
+--- a/src/CUDAQuickSurf.cu
++++ b/src/CUDAQuickSurf.cu
 @@ -22,6 +22,7 @@
  #include <stdlib.h>
  #include <string.h>
diff --git a/sci-chemistry/vmd/files/vmd-1.9.3-configure-libtachyon.patch b/sci-chemistry/vmd/files/vmd-1.9.3-configure-libtachyon.patch
new file mode 100644
index 000000000000..b71cd97210a8
--- /dev/null
+++ b/sci-chemistry/vmd/files/vmd-1.9.3-configure-libtachyon.patch
@@ -0,0 +1,13 @@
+--- a/configure.old	2019-05-16 17:26:05.347560700 +0200
++++ b/configure	2019-05-16 17:30:25.478455770 +0200
+@@ -1105,8 +1105,8 @@
+ # This may be commented out if not required.
+ $libtachyon_defines     = "-DVMDLIBTACHYON";
+ $libtachyon_dir         = "$vmd_library_dir/tachyon";
+-$libtachyon_include     = "-I$libtachyon_dir/include";
+-$libtachyon_library     = "-L$libtachyon_dir/lib_$config_arch";
++$libtachyon_include     = "-Igentoo-libtachyon-include";
++$libtachyon_library     = "-Lgentoo-libtachyon-libs";
+ $libtachyon_libs        = "-ltachyon";
+ @libtachyon_cc          = ();
+ @libtachyon_cu          = ();
diff --git a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild b/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..3f24f85d6273
--- /dev/null
+++ b/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit cuda desktop flag-o-matic prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="Visual Molecular Dynamics"
+HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/"
+SRC_URI="
+	https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz
+	${P}.src.tar
+"
+
+SLOT="0"
+LICENSE="vmd"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda gromacs msms povray sqlite tachyon xinerama"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="fetch"
+
+# currently, tk-8.5* with USE=truetype breaks some
+# tk apps such as Sequence Viewer or Timeline.
+CDEPEND="
+	>=dev-lang/tk-8.6.1:0=
+	dev-lang/perl
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/netcdf:0=
+	virtual/opengl
+	>=x11-libs/fltk-1.1.10-r2:1
+	x11-libs/libXft
+	x11-libs/libXi
+	${PYTHON_DEPS}
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= )
+	gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] )
+	sqlite? ( dev-db/sqlite:3= )
+	tachyon? ( >=media-gfx/tachyon-0.99_beta6 )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-lang/swig
+"
+RDEPEND="${CDEPEND}
+	sci-biology/stride
+	sci-chemistry/surf
+	x11-terms/xterm
+	msms? ( sci-chemistry/msms-bin )
+	povray? ( media-gfx/povray )
+"
+
+VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
+# Binary only plugin!!
+QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
+QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
+QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
+
+pkg_nofetch() {
+	elog "Please download ${P}.src.tar from"
+	elog "${VMD_DOWNLOAD}"
+	elog "after agreeing to the license and get"
+	elog "https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz"
+	elog "Place both into your DISTDIR directory"
+	elog
+	elog "Due to an upstream bug (https://bugs.gentoo.org/640440) sources"
+	elog "file may get downloaded as a compressed tarball or not. In that case"
+	elog "you will need to ensure you uncompress the file and rename it"
+	elog "as ${P}.src.tar"
+}
+
+src_prepare() {
+	default
+
+	use cuda && cuda_sanitize
+
+	eapply "${FILESDIR}"/${PN}-1.9.1-cuda-device_ptr.patch
+
+	cd "${WORKDIR}"/plugins || die
+
+	eapply -p2 "${WORKDIR}"/${P}-gentoo-plugins.patch
+
+	[[ ${SILENT} == yes ]] || sed '/^.SILENT/d' -i $(find -name Makefile)
+
+	sed \
+		-e "s:CC = gcc:CC = $(tc-getCC):" \
+		-e "s:CXX = g++:CXX = $(tc-getCXX):" \
+		-e "s:COPTO =.*\":COPTO = -fPIC -o \":" \
+		-e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o \":" \
+		-e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \
+		-e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \
+		-e "s:SHLD = gcc:SHLD = $(tc-getCC) -shared:" \
+		-e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX) -shared:" \
+		-e "s:-ltcl8.5:-ltcl:" \
+		-i Make-arch || die "Failed to set up plugins Makefile"
+
+	sed \
+		-e '/^AR /s:=:?=:g' \
+		-e '/^RANLIB /s:=:?=:g' \
+		-i ../plugins/*/Makefile || die
+
+	tc-export AR RANLIB
+
+	sed \
+		-e "s:\$(CXXFLAGS)::g" \
+		-i hesstrans/Makefile || die
+
+	# prepare vmd itself
+	cd "${S}" || die
+
+	eapply -p2 "${WORKDIR}"/${P}-gentoo-base.patch
+	eapply "${FILESDIR}"/${P}-configure-libtachyon.patch
+
+	# PREFIX
+	sed \
+		-e "s:/usr/include/:${EPREFIX}/usr/include:g" \
+		-i configure || die
+
+	sed \
+		-e "s:gentoo-bindir:${ED}/usr/bin:g" \
+		-e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \
+		-e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \
+		-e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:gentoo-gcc:$(tc-getCC):g" \
+		-e "s:gentoo-g++:$(tc-getCXX):g" \
+		-e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \
+		-e "s:gentoo-cflags:${CFLAGS}:g" \
+		-e "s:gentoo-cxxflags:${CXXFLAGS}:g" \
+		-e "s:gentoo-nvflags::g" \
+		-e "s:gentoo-ldflags:${LDFLAGS}:g" \
+		-e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \
+		-e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \
+		-e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \
+		-e "s:gentoo-libtachyon-include:${EPREFIX}/usr/include/tachyon:g" \
+		-e "s:gentoo-libtachyon-libs:${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \
+		-e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \
+		-i configure || die
+
+	if use cuda; then
+		sed \
+			-e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \
+			-e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \
+			-i configure src/Makefile || die
+		sed \
+			-e '/compute_/d' \
+			-i configure || die
+		sed \
+			-e 's:-gencode .*code=sm_..::' \
+			-i src/Makefile || die
+	fi
+
+	sed \
+		-e "s:LINUXPPC:LINUX:g" \
+		-e "s:LINUXALPHA:LINUX:g" \
+		-e "s:LINUXAMD64:LINUX:g" \
+		-e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \
+		-e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \
+		-e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \
+		-i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script"
+
+	EMAKEOPTS=(
+		TCLINC="-I${EPREFIX}/usr/include"
+		TCLLIB="-L${EPREFIX}/usr/$(get_libdir)"
+		TCLLDFLAGS="-shared"
+		NETCDFLIB="$($(tc-getPKG_CONFIG) --libs-only-L netcdf)${EPREFIX}/usr/$(get_libdir)/libnetcdf.so"
+		NETCDFINC="$($(tc-getPKG_CONFIG) --cflags-only-I netcdf)${EPREFIX}/usr/include"
+		NETCDFLDFLAGS="$($(tc-getPKG_CONFIG) --libs netcdf)"
+		NETCDFDYNAMIC=1
+		EXPATINC="-I${EPREFIX}/usr/include"
+		EXPATLIB="$($(tc-getPKG_CONFIG) --libs expat)"
+		EXPATLDFLAGS="-shared"
+		EXPATDYNAMIC=1
+	)
+	if use gromacs; then
+		EMAKEOPTS+=(
+			TNGLIB="$($(tc-getPKG_CONFIG) --libs libgromacs)"
+			TNGINC="-I${EPREFIX}/usr/include"
+			TNGLDFLAGS="-shared"
+			TNGDYNAMIC=1
+		)
+	fi
+	if use sqlite; then
+		EMAKEOPTS+=(
+			SQLITELIB="$($(tc-getPKG_CONFIG) --libs sqlite3)"
+			SQLITEINC="-I${EPREFIX}/usr/include"
+			SQLITELDFLAGS="-shared"
+			SQLITEDYNAMIC=1
+		)
+	fi
+}
+
+src_configure() {
+	local myconf="OPENGL OPENGLPBUFFER COLVARS FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT"
+	rm -f configure.options && echo $myconf >> configure.options
+
+	use cuda && myconf+=" CUDA"
+#	use mpi && myconf+=" MPI"
+	use tachyon && myconf+=" LIBTACHYON"
+	use xinerama && myconf+=" XINERAMA"
+
+	export \
+		PYTHON_INCLUDE_DIR="$(python_get_includedir)" \
+		PYTHON_LIBRARY_DIR="$(python_get_library_path)" \
+		PYTHON_LIBRARY="$(python_get_LIBS)" \
+		NUMPY_INCLUDE_DIR="$(python_get_sitedir)/numpy/core/include" \
+		NUMPY_LIBRARY_DIR="$(python_get_sitedir)/numpy/core/include"
+
+	perl ./configure LINUX \
+		${myconf} || die
+}
+
+src_compile() {
+	# build plugins
+	cd "${WORKDIR}"/plugins || die
+
+	emake \
+		${EMAKEOPTS[@]} \
+		LINUX
+
+	# build vmd
+	cd "${S}"/src || die
+	emake
+}
+
+src_install() {
+	# install plugins
+	cd "${WORKDIR}"/plugins || die
+	emake \
+			PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \
+			distrib
+
+	# install vmd
+	cd "${S}"/src || die
+	emake install
+
+	# install docs
+	cd "${S}" || die
+	dodoc Announcement README doc/ig.pdf doc/ug.pdf
+
+	# remove some of the things we don't want and need in
+	# /usr/lib
+	cd "${ED}"/usr/$(get_libdir)/vmd || die
+	rm -fr doc README Announcement LICENSE || \
+		die "failed to clean up /usr/lib/vmd directory"
+
+	# adjust path in vmd wrapper
+	sed \
+		-e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \
+		-e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \
+		|| die "failed to set up vmd wrapper script"
+
+	# install icon and generate desktop entry
+	insinto /usr/share/pixmaps
+	doins "${WORKDIR}"/vmd.png
+	eprefixify "${WORKDIR}"/vmd.desktop
+	sed -i '/^Path/d' "${WORKDIR}"/vmd.desktop || die
+	domenu "${WORKDIR}"/vmd.desktop
+}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 3f2afe9c5b09..85850ba67556 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/laszip/Manifest b/sci-geosciences/laszip/Manifest
index 08d055e21bc9..7be7714e1dea 100644
--- a/sci-geosciences/laszip/Manifest
+++ b/sci-geosciences/laszip/Manifest
@@ -1,4 +1,6 @@
 AUX laszip-2.2.0_fix-build-system.patch 1516 BLAKE2B e79bff26c87b51667394c361379bee1d6f048d928b051dd9c357834b50a9980da8ecd248aa63acb25ca76ae19130d99a7b2db183056869670731b818f56da84a SHA512 3b2a8523491ffeded85e7aad50b1792f1f26354838afb7ab2e36bb29e2178cd1fb75601c238d59eff7779bb87a7fd5d93696a2da01951df188e66833ce6ff301
 DIST laszip-src-2.2.0.tar.gz 407457 BLAKE2B d183ab6acf67708b3fc293ade228f516cc364d4cd494f5758cbba93969605f66e450aaa01a07660fd8976031b7747b40e0400573558d0f14b0e19874bf7d9fe3 SHA512 44dacb0d0ab79ac02c784549f42c4522451646b322835afc78fbf8bb82be40e023d374635c2a18989c73a5553e05b55d7c32f35d510f816704020b0e02365824
-EBUILD laszip-2.2.0.ebuild 624 BLAKE2B da738b4eff2834646ab21e600b5f3d4345e24a1fd5e7d675e63a9f2b026a816e87cd8e354ca7015ec5f39910ca57b9b833bc851b4923c908f1afab8df4bd6469 SHA512 01e366b05687ab5a3b8f7ae28580ba2dc7aa3b7fdf5914b0603dd38e92b56eacc1b98d56f6e240247b4e8a8c64cda74608e66ef34cf49c19732fc98022e8013b
+DIST laszip-src-3.4.1.tar.gz 219421 BLAKE2B b1bb3f66d9209c6a137af84c8d220ee6a50309139721b8e0befb4f56991e8153fc6446666ca5c2cdcb57abf297694f1f679a3961dabdff6450bc6dcc965ef6cd SHA512 001602a602dda1e43a08ee306b9c7c23faaf5777d551c269aac4a21b1c99449d2f12f46a0f95ff237003a0ab691eaca15b43b2f4d354651abc5d54930a39a134
+EBUILD laszip-2.2.0.ebuild 618 BLAKE2B 2f9dc6350f6d45c5939c1ef36819ac26c973b94b1ade0a1cb4bfd1158de1014cf51357a37609f7f1c03b6affe409db2650f439304dfb8415df654068ea2fb1df SHA512 ccc87347bd374b875dc2c242cb25496fa77ee5355f737338ca676b878a55dc0d5bc28c228b103aac1845387b27beb4cb06308f2823a4a7c5b426ae9c8fccb14a
+EBUILD laszip-3.4.1.ebuild 438 BLAKE2B e84b85733b083c3839354f73320f0be0d37f27535bca9c03aadf6a081f97be9a72f20025cc8e398001323ba53c8438a321f07cefc018604b4302290d7a39a62a SHA512 1ef97c2167411a429cae672e57b60c485328494c7bc3986217f7ab5c9086ca8841a28a35d215b59843c51ee6e58ee05569480715c154584e0e1af40c2ae521ca
 MISC metadata.xml 486 BLAKE2B a8de1ac6ab5f2981a1e9c514e233d1b84b48bc953aa6056b47ab0f9b5fa234db0380e35a24fb3d3effeafe8fb63b411aa815a99152789a44a732176c291c2541 SHA512 29ba500c7d71620ad3fe1673395ba4073910ba2c898efabe3d6305cd2085bbd00b1c03e21ddbefa17a505973b6083d0fc3faeedd2b1561486e8fe90647b27039
diff --git a/sci-geosciences/laszip/laszip-2.2.0.ebuild b/sci-geosciences/laszip/laszip-2.2.0.ebuild
index e0397f0829eb..02addaad7d04 100644
--- a/sci-geosciences/laszip/laszip-2.2.0.ebuild
+++ b/sci-geosciences/laszip/laszip-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ AUTOTOOLS_AUTORECONF=1
 inherit autotools-utils flag-o-matic
 
 DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format"
-HOMEPAGE="http://www.laszip.org/"
+HOMEPAGE="https://laszip.org/"
 SRC_URI="https://github.com/LASzip/LASzip/releases/download/v${PV}/${PN}-src-${PV}.tar.gz"
 
 SLOT="0"
diff --git a/sci-geosciences/laszip/laszip-3.4.1.ebuild b/sci-geosciences/laszip/laszip-3.4.1.ebuild
new file mode 100644
index 000000000000..27cff79b9aa1
--- /dev/null
+++ b/sci-geosciences/laszip/laszip-3.4.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format"
+HOMEPAGE="https://laszip.org/"
+SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/${PN}-src-${PV}"
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index f9e4f2155795..b91799176fdf 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -1,7 +1,8 @@
 AUX liblas-1.8.0_remove-std-c++98.patch 1141 BLAKE2B 880a1d478c16e680b45e1a064cef2c50d6c662ef1ca15c6beb6548d9dda056e19d2bc30fa87f067e566abf22d1c1b72496539f073d749878933c00bf7d099d8d SHA512 90defe2149a8cf8766022af6cf1248985c350e56bb9fcae99daf9551acf9272b93ea9b9c25ecef86803e75deb0ab50c2a0f919c35705d54ca38c7cafe5940f03
+AUX liblas-1.8.1-CVE-2018-20540.patch 1628 BLAKE2B c62bf39a1dd73ec8b1d82d9c4ae499f902ce7c34d0dac20ac3fae58983048503fca393dabcae8206a5e3ef17680bfd627d2005928ce161c37073ecf4d90fb47d SHA512 549c4b29620519521bfbf3bbaa8c01c90e7bf7f7aca411822e2a846476e3cde14212049c95f51f1db981c2f4c65fd1ad1e9644691aebb9db2c4142a883a3c316
 AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6
 DIST libLAS-1.8.1.tar.bz2 3920203 BLAKE2B 2ef8e822c5d1c07d929e788c59e6e5b942aba637fb764d37e1505d136c75cd4a28efc4702b022bcfee8063b684956b4466c9ec00e737d7024ca2719d7b11f341 SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf
 DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
-EBUILD liblas-1.8.1-r1.ebuild 1074 BLAKE2B 9d98bcc272519372f35e5cbe1207a2f112a39acf23e6aeb9f89018b34ef8f3a53df8184218a1db6dc4c25452c644c388f0683a023a409308d7b0efbed14cb07c SHA512 59bbe726ee289aef3d13fcda97aa17404071f909bb463d0290e116d7ddb8b215973d5c4e387b8a848e5b0788d82c8b2b1946f58c57d0d3ff98e1adebd29e5818
+EBUILD liblas-1.8.1-r2.ebuild 1124 BLAKE2B 4019f34d95ec9758cd1fc03a50518736c9701cbbfaaf5eaac815b6972a6496cdd380822aabc8cc49b6fe5223034d34f59280c15bf640b3a6a34404bff86b8556 SHA512 91eca43db17d7a8b28e1c036fe6956bf42063836cec160b978fd182e9e4625c705cd3bc9d4b9b4348498acb2776dcaa24077c32228718cebf66498c195f88bd3
 EBUILD liblas-1.8.1.ebuild 986 BLAKE2B c9af42b8c995edc65e44129edb303a61df2a154ece99e1772520a5debd96803e5be5a1d6d72a0297371b6d236910aef3aa3c68f2853ccd5dbad366becfe2d84a SHA512 2f5ccdcc9ad4a14f868f6d3996079fd0030e369e3cfb02fa0bda923cd8122fa78e2c4472ede1c6258955d35cbc7b34092d7ebf66e20f4aadd3249dd9553cfece
 MISC metadata.xml 497 BLAKE2B cdae8ef4bfaffefd73a5751950379c704581e09a9f435fc52bac7520f3632fc37007d21750616a05060e2f9213a8ee05278c565be9b80ee8529ff9e5a6c07b6c SHA512 21d5b18461e131a543ba5a5ac1b2f06652d5d49ebd0e590f0bd0971deb337efeb813698613e4bbf200a934a3afa9b20dbb80d6659778c22c8a97d9471007d3d7
diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch
new file mode 100644
index 000000000000..ab2174f04ff0
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch
@@ -0,0 +1,55 @@
+From 09d45518776489508f34098f1c159f58b856f459 Mon Sep 17 00:00:00 2001
+From: Mateusz Loskot <mateusz@loskot.net>
+Date: Sun, 20 Jan 2019 02:28:29 +0100
+Subject: [PATCH] Ensure stream is deallocated in case of exception (#162)
+
+Fixes #158
+---
+ include/liblas/liblas.hpp | 32 ++++++++++++++++++++++++--------
+ 1 file changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/include/liblas/liblas.hpp b/include/liblas/liblas.hpp
+index f5ad44e1..325de3ff 100644
+--- a/include/liblas/liblas.hpp
++++ b/include/liblas/liblas.hpp
+@@ -119,16 +119,32 @@ inline std::istream* Open(std::string const& filename, std::ios::openmode mode)
+ {
+ #ifdef USE_BOOST_IO
+     namespace io = boost::iostreams;
+-    io::stream<io::file_source>* ifs = new io::stream<io::file_source>();
+-    ifs->open(filename.c_str(), mode);
+-    if (ifs->is_open() == false) return NULL;
+-    return ifs;
++    io::stream<io::file_source>* ifs = NULL;
++    try
++    {
++        ifs = new io::stream<io::file_source>();
++        ifs->open(filename.c_str(), mode);
++        if (ifs->is_open() == false) return NULL;
++        return ifs;
++    }
++    catch (...)
++    {
++        delete ifs;
++    }
+ #else
+-    std::ifstream* ifs = new std::ifstream();
+-    ifs->open(filename.c_str(), mode);
+-    if (ifs->is_open() == false) return NULL;
+-    return ifs;
++    std::ifstream* ifs = NULL;
++    try
++    {
++        ifs = new std::ifstream();
++        ifs->open(filename.c_str(), mode);
++        if (ifs->is_open() == false) return NULL;
++    }
++    catch (...)
++    {
++        delete ifs;
++    }
+ #endif
++    return NULL;
+ }
+ 
+ /// Create file and open to write in binary mode.
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild
deleted file mode 100644
index 8e0dbdea8572..000000000000
--- a/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
-HOMEPAGE="https://github.com/libLAS/libLAS/"
-SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-# tests known to fail due to LD_LIBRARY_PATH issue
-RESTRICT="test"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gdal"
-
-RDEPEND="
-	dev-libs/boost:=
-	sci-geosciences/laszip
-	sci-libs/libgeotiff
-	gdal? ( sci-libs/gdal )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/libLAS-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch
-	"${FILESDIR}"/${P}-fix-overload-call.patch #bug 661654
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# add missing linkage
-	sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \
-		-i "${S}/apps/CMakeLists.txt" || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DWITH_GDAL=$(usex gdal)"
-		-DLIBLAS_LIB_SUBDIR=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
new file mode 100644
index 000000000000..0380dffd2f3a
--- /dev/null
+++ b/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
+HOMEPAGE="https://github.com/libLAS/libLAS/"
+SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~x86"
+IUSE="gdal"
+
+DEPEND="
+	dev-libs/boost:=
+	sci-geosciences/laszip
+	sci-libs/libgeotiff:=
+	gdal? ( sci-libs/gdal:= )
+"
+RDEPEND="${DEPEND}"
+
+# tests known to fail due to LD_LIBRARY_PATH issue
+RESTRICT="test"
+
+S="${WORKDIR}/libLAS-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch
+	"${FILESDIR}"/${P}-fix-overload-call.patch # bug 661654
+	"${FILESDIR}"/${P}-CVE-2018-20540.patch # bug 678482
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# add missing linkage
+	sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \
+		-i "${S}/apps/CMakeLists.txt" || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBLAS_LIB_SUBDIR=$(get_libdir)
+		-DWITH_GDAL=$(usex gdal)
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 7d3278abbe66..3fed11748db4 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,6 +1,12 @@
+AUX mapserver-7.0.0-missing-nzz18.patch 563 BLAKE2B fcfe0f19bca658586dda345a14c3ad6c1ddc8a13abde8c3929d4585003fa4cd12c770d651fb1e1032ef1123f77dec38e4db16bc46fc857db6897fca61cc1dadb SHA512 5122b2bda7052663a01d8bff51582a7c09fe9e69bc9ed3c9d23b2036144f559cc9890d43e96e01c09298fc48fee0570c9c37da6a340262e1a38f4c29f042ef9c
 AUX mapserver-7.0.0-no-applicable-code.patch 812 BLAKE2B b3946628fc518dd37111e6f2293391fb6ddca7ba7ceb019a764c528d3c6e450e3ef5941fa2201995b40efe39e63c78c14a4e321f49f96c811541a99e90e83a71 SHA512 dab7c98095791b369c52d10e6737ac65f60ff7e02b8fcb5bceb2440025fa0552a936a16593aaa66b35434db0659184b667cc54962274510b062690029778a44c
 AUX mapserver-7.0.0-sec-format.patch 470 BLAKE2B 2156f485b0b1917fb6c6f4d34938cb083533b8658c4d29d5299475dfdfc14113ef87ca46a126e94fe69fc89463c493761e0d3cc1f981c154e96dfde1224972eb SHA512 7cddc978bce3691bfa19ea7f7782ce1e0a59c12b2142ebdb2c2dcdcb1076a79992e1a477f7b99e638d457136d167066b867de85b07574c766babd16c1f238a8f
 AUX mapserver-7.0.5-missing-macro.patch 439 BLAKE2B 4ef13371034994ed7a6e61a61463831dfb8a8d7a49812fe85d20cdd548159646d3c518f239d66112bfdfe019d74793a5f3a1ca6133a63adfbac3c8d5047757e7 SHA512 351f19b670b4352934150e8ab49af9bc5c47cad3b9bc5c5a25d92ddef19f66f91ab923590f764f5bb2cc9f12a313ab0f85d6c9eaa1c55f8b630362ce597552a2
+AUX mapserver-7.0.7-missing-macro.patch 353 BLAKE2B 0443e605f7b2f59bfce38a2007044c1db66b8e77d024d14c5b4423e101c98eade36edd2f1aae5f742ee8a5ed27131ce676333e2408ebf3316865c8512861eeaa SHA512 f8b704940c3e8593ba64bf48f1bff26b029fb2cd06bba73ef091062f5168fb132139c51cc304570fcd4ed73a7aea3c80dc0912ceca51f6d767cf91ba3e09029a
 DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753
+DIST mapserver-7.0.7.tar.gz 2634698 BLAKE2B fadde68803d7f74b116aa23c05c25f9c52c67e0a8ea69eace2c865843d7f223c24d8c42cbed54578f2eb631cb58bae3652075872f76e9b88238d76e044d4314b SHA512 94225dbe64edf6623bb5e92649d505809f70f86c24ca06675f6277ac4a161c40c369fd1973db649e6c864fa5e2e4a8a93cbd36d1524297a0e47b96ab59c0941c
+DIST mapserver-7.2.2.tar.gz 2677800 BLAKE2B 3f26517f634098fd7f005aa5a1f71fc8ba9b831b9bd0385a64272db6705ad3bd7563848bea1532c08f28177c51b104b1185fe6aa319de8c4ed95ec649a1bf7f4 SHA512 8c66a52ec04741495e0cf2bf5ec28f8e3cafac9834ab314ef998d6cf8d50b893dcc66a05d4b30f29694c357cd175a1cb28712c94bf15da4c8bcb9bfd98f0d2af
 EBUILD mapserver-7.0.5.ebuild 4509 BLAKE2B a595b08ad87b62ee2239ac4b911a8c762adc22190c9f29679ae37eeff0e0f694943c824ece901c7e46098f32abb7134c4c8083a08da97ff2c3c086005a48eaca SHA512 7b6f3701f6cb18a1423fa73d41b797672c15a81f899897340c26efa91331551d0c5261f517ce67f5813c66c786e75835816eeef8312b7f73197f2956003ac888
-MISC metadata.xml 682 BLAKE2B 28881d5c3c341fc24d970d19e69602942623fe9f180cd3dad30ff37b5c3550c158ec11964a76540bbcdc2e62f8ca1c47be1e58ea8a6cd035ff6d450ce25b77ec SHA512 09ba242fe23bdf10d76b882ac32d9952e88e5bc630eb8569e74cfdacae587ec534e8014d6b015387fa2c63047e130dd1f918340cb382413bcbf14f321a296436
+EBUILD mapserver-7.0.7.ebuild 4946 BLAKE2B 2f3b53e1189ac689f7f8c6d13f82c7476f0291a4506c14ed71f18b6558cc47a884cd35666d0ec48d5f7c7b0e42bfe953a81fde843772933b627205cc3f98a1db SHA512 c352de91cc36f3143636d707a7531d65fcb21a87d561369d0965aee104621c417ad9325f7eefcd0dbd428e9df0ca0618da5e979784893ad5e4e60ef2a88c7ffe
+EBUILD mapserver-7.2.2.ebuild 4937 BLAKE2B 757901fefce7a1d297a18f409b17c3764a959eca9158860c37a9bad9ce37123fb2d243e5118e45199b9fecf1b5ca199638361d9021170915bd90ceff783a7fd2 SHA512 cd299942207e6f2c66af7a2376f140896f801e1b1a23f4c54ce4fe862159dbde814fb36db5514a1da1759be85994788f8baa3e3cb55a9f48dc286c0e5706f932
+MISC metadata.xml 748 BLAKE2B d0cdfaae91bf8b692dd90eb8842c5c5bc78c421e729b713d1091de482e23475aedd1c987de14da5e438228bcbbf15bb488515d7253d635aac6148599fae58c3c SHA512 c0ed4810c5d7eff6fc409ae17f25ece71a89d99ba33fe2c27c04d37859798997a8e29964514fd95d1639688e29044309666e0684befcc598c4ea9ce9c82fd2b6
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
new file mode 100644
index 000000000000..a22fcf4de6aa
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake
+index 18055f7..2568b5e 100644
+--- a/cmake/FindOracle.cmake
++++ b/cmake/FindOracle.cmake
+@@ -37,7 +37,7 @@ if(DEFINED ENV{ORACLE_HOME})
+     ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows
+ 
+   set(ORACLE_OCI_NAMES clntsh libclntsh oci)
+-  set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 ociw32)
++  set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32)
+   set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12)
+ 
+   set(ORACLE_LIB_DIR 
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch b/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch
new file mode 100644
index 000000000000..daf5ab1ebc7c
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch
@@ -0,0 +1,19 @@
+diff --git a/mapserver.h b/mapserver.h
+index df7eeb9..9516a6c 100644
+--- a/mapserver.h
++++ b/mapserver.h
+@@ -55,6 +55,14 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifndef TRUE
++#define TRUE 1
++#endif
++
++#ifndef FALSE
++#define FALSE 0
++#endif
++
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ #  define MS_DLL_EXPORT     __declspec(dllexport)
+ #define USE_MSFREE
diff --git a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
new file mode 100644
index 000000000000..3d9b414957ef
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-${PV/_/-}"
+
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscript"
+PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
+PHP_EXT_SKIP_PHPIZE="no"
+USE_PHP="php5-6"
+
+PYTHON_COMPAT=( python2_7 )
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+inherit cmake-utils depend.apache distutils-r1 eutils flag-o-matic multilib perl-module php-ext-source-r3 webapp # ruby-ng
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="https://mapserver.org/"
+SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="apache bidi cairo gdal geos mysql opengl oracle perl php postgis proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="
+	php? ( php_targets_php5-6 )
+	xslt? ( xml )"
+
+RDEPEND="
+	dev-libs/expat
+	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+	media-libs/giflib
+	net-misc/curl
+	virtual/jpeg:=
+	virtual/libiconv
+	x11-libs/agg
+	apache? (
+		dev-libs/fcgi
+		app-admin/webapp-config
+	)
+	bidi? ( dev-libs/fribidi
+		media-libs/harfbuzz )
+	cairo? ( x11-libs/cairo )
+	gdal? ( sci-libs/gdal:=[oracle?] )
+	geos? ( sci-libs/geos )
+	mysql? ( virtual/mysql )
+	opengl? (
+		media-libs/ftgl
+		media-libs/mesa
+	)
+	oracle? (
+		dev-db/oracle-instantclient:=
+	)
+	perl? ( dev-lang/perl:= )
+	postgis? ( dev-db/postgis )
+	proj? ( sci-libs/proj net-misc/curl )
+	tiff? (
+		media-libs/tiff:=
+		sci-libs/libgeotiff
+	)
+	xml? ( dev-libs/libxml2:2 )
+	xslt? ( dev-libs/libxslt[crypt] )
+"
+DEPEND="${RDEPEND}
+	perl? ( >=dev-lang/swig-2.0 )
+	python? ( >=dev-lang/swig-2.0 )"
+
+want_apache2 apache
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.0.0-sec-format.patch"  # see https://github.com/mapserver/mapserver/pull/5248
+	"${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
+	"${FILESDIR}/${PN}-7.0.0-missing-nzz18.patch"
+	"${FILESDIR}/${P}-missing-macro.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use apache ; then
+		webapp_pkg_setup
+	fi
+	use perl && perl_set_version
+	#use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+	# HACK: Make symlinks for php targets
+	local slot
+	for slot in $(php_get_slots); do
+		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
+	done
+}
+
+src_prepare() {
+	local glibdir="${EPREFIX}/usr/include/glib-2.0"
+	local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+
+	sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
+		-i "${S}/CMakeLists.txt" || die
+	sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
+		-i "${S}/CMakeLists.txt" || die
+
+	# For enable compilation with proj-6
+	if use proj ; then
+		append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DWITH_SDE=OFF"
+		"-DWITH_ICONV=ON"
+		"-DWITH_GD=ON"
+		"-DWITH_GIF=ON"
+		"-DWITH_CURL=ON"
+		"-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
+		"-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
+		"-DWITH_PROJ=$(usex proj ON OFF)"
+		"-DWITH_WMS=$(usex proj ON OFF)"
+		"-DWITH_KML=$(usex xml ON OFF)"
+		"-DWITH_FCGI=$(usex apache ON OFF)"
+		"-DWITH_GEOS=$(usex geos ON OFF)"
+		"-DWITH_GDAL=$(usex gdal ON OFF)"
+		"-DWITH_OGR=$(usex gdal ON OFF)"
+		"-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
+		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
+		"-DWITH_MYSQL=$(usex mysql ON OFF)"
+		"-DWITH_LIBXML2=$(usex xml ON OFF)"
+		"-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
+		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
+		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
+		"-DWITH_CAIRO=$(usex cairo ON OFF)"
+		"-DWITH_PHP=$(usex php ON OFF)"
+		"-DWITH_PYTHON=$(usex python ON OFF)"
+		"-DWITH_PERL=$(usex perl ON OFF)"
+	)
+
+	if use gdal && use proj ; then
+		mycmakeargs+=( "-DWITH_WFS=ON"
+				"-DWITH_WCS=ON"
+				"-DWITH_CLIENT_WMS=ON"
+				"-DWITH_CLIENT_WFS=ON"
+				"-DWITH_SOS=$(usex xml ON OFF)"
+			)
+	else
+		mycmakeargs+=( "-DWITH_WFS=OFF"
+			"-DWITH_WCS=OFF"
+			"-DWITH_CLIENT_WMS=OFF"
+			"-DWITH_CLIENT_WFS=OFF"
+			"-DWITH_SOS=OFF"
+		)
+	fi
+
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config"
+			[[ -x ${php_config} ]] \
+				|| die "php-config '${php_config}' not valid or not executable"
+
+			local php_include_dir=$(${php_config} --include-dir)
+			[[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid"
+
+			mycmakeargs+=(
+				-DPHP5_CONFIG_EXECUTABLE="${php_config}"
+				-DPHP5_INCLUDES="${php_include_dir}"
+			)
+		done
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	if use apache ; then
+		webapp_src_preinst
+	fi
+
+	cmake-utils_src_install
+
+	if use php ; then
+		php-ext-source-r3_createinifiles
+	fi
+
+	if use apache ; then
+		webapp_src_install
+	fi
+}
+
+pkg_postinst() {
+	if use apache ; then
+		webapp_pkg_postinst
+	fi
+}
+
+pkg_prerm() {
+	if use apache ; then
+		webapp_pkg_prerm
+	fi
+}
diff --git a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
new file mode 100644
index 000000000000..643020ee7545
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-${PV/_/-}"
+
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscript"
+PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
+PHP_EXT_SKIP_PHPIZE="no"
+USE_PHP="php5-6"
+
+PYTHON_COMPAT=( python2_7 )
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+inherit cmake-utils depend.apache distutils-r1 eutils flag-o-matic multilib perl-module php-ext-source-r3 webapp # ruby-ng
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="https://mapserver.org/"
+SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+# force default gdal and proj if not cause compilation problem
+IUSE="apache bidi cairo +gdal geos mysql opengl oracle perl php postgis +proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="
+	php? ( php_targets_php5-6 )
+	xslt? ( xml )"
+
+RDEPEND="
+	dev-libs/expat
+	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+	media-libs/giflib
+	net-misc/curl
+	virtual/jpeg:=
+	virtual/libiconv
+	x11-libs/agg
+	apache? (
+		dev-libs/fcgi
+		app-admin/webapp-config
+	)
+	bidi? ( dev-libs/fribidi
+		media-libs/harfbuzz )
+	cairo? ( x11-libs/cairo )
+	gdal? (
+		sci-libs/gdal:=[oracle?]
+		dev-libs/protobuf-c
+	)
+	geos? ( sci-libs/geos )
+	mysql? ( virtual/mysql )
+	opengl? (
+		media-libs/ftgl
+		media-libs/mesa
+	)
+	oracle? (
+		dev-db/oracle-instantclient:=
+	)
+	perl? ( dev-lang/perl:= )
+	postgis? ( dev-db/postgis )
+	proj? ( sci-libs/proj net-misc/curl )
+	tiff? (
+		media-libs/tiff:=
+		sci-libs/libgeotiff
+	)
+	xml? ( dev-libs/libxml2:2 )
+	xslt? ( dev-libs/libxslt[crypt] )
+"
+DEPEND="${RDEPEND}
+	perl? ( >=dev-lang/swig-2.0 )
+	python? ( >=dev-lang/swig-2.0 )"
+
+want_apache2 apache
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
+	"${FILESDIR}/${PN}-7.0.0-missing-nzz18.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use apache ; then
+		webapp_pkg_setup
+	fi
+	use perl && perl_set_version
+	#use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+	# HACK: Make symlinks for php targets
+	local slot
+	for slot in $(php_get_slots); do
+		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
+	done
+}
+
+src_prepare() {
+	local glibdir="${EPREFIX}/usr/include/glib-2.0"
+	local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+
+	sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
+		-i "${S}/CMakeLists.txt" || die
+	sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
+		-i "${S}/CMakeLists.txt" || die
+
+	# For enable compilation with proj-6
+	if use proj ; then
+		append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DWITH_SDE=OFF"
+		"-DWITH_ICONV=ON"
+		"-DWITH_GD=ON"
+		"-DWITH_GIF=ON"
+		"-DWITH_CURL=ON"
+		"-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
+		"-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
+		"-DWITH_PROJ=$(usex proj ON OFF)"
+		"-DWITH_WMS=$(usex proj ON OFF)"
+		"-DWITH_KML=$(usex xml ON OFF)"
+		"-DWITH_FCGI=$(usex apache ON OFF)"
+		"-DWITH_GEOS=$(usex geos ON OFF)"
+		"-DWITH_GDAL=$(usex gdal ON OFF)"
+		"-DWITH_OGR=$(usex gdal ON OFF)"
+		"-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
+		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
+		"-DWITH_MYSQL=$(usex mysql ON OFF)"
+		"-DWITH_LIBXML2=$(usex xml ON OFF)"
+		"-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
+		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
+		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
+		"-DWITH_CAIRO=$(usex cairo ON OFF)"
+		"-DWITH_PHP=$(usex php ON OFF)"
+		"-DWITH_PYTHON=$(usex python ON OFF)"
+		"-DWITH_PERL=$(usex perl ON OFF)"
+		"-DWITH_PROTOBUFC=$(usex gdal ON OFF)"
+	)
+
+	if use gdal && use proj ; then
+		mycmakeargs+=( "-DWITH_WFS=ON"
+				"-DWITH_WCS=ON"
+				"-DWITH_CLIENT_WMS=ON"
+				"-DWITH_CLIENT_WFS=ON"
+				"-DWITH_SOS=$(usex xml ON OFF)"
+			)
+	else
+		mycmakeargs+=( "-DWITH_WFS=OFF"
+			"-DWITH_WCS=OFF"
+			"-DWITH_CLIENT_WMS=OFF"
+			"-DWITH_CLIENT_WFS=OFF"
+			"-DWITH_SOS=OFF"
+		)
+	fi
+
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config"
+			[[ -x ${php_config} ]] \
+				|| die "php-config '${php_config}' not valid or not executable"
+
+			local php_include_dir=$(${php_config} --include-dir)
+			[[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid"
+
+			mycmakeargs+=(
+				-DPHP5_CONFIG_EXECUTABLE="${php_config}"
+				-DPHP5_INCLUDES="${php_include_dir}"
+			)
+		done
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	if use apache ; then
+		webapp_src_preinst
+	fi
+
+	cmake-utils_src_install
+
+	if use php ; then
+		php-ext-source-r3_createinifiles
+	fi
+
+	if use apache ; then
+		webapp_src_install
+	fi
+}
+
+pkg_postinst() {
+	if use apache ; then
+		webapp_pkg_postinst
+	fi
+}
+
+pkg_prerm() {
+	if use apache ; then
+		webapp_pkg_prerm
+	fi
+}
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
index c7d7490388ea..bc9652c1add9 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Geosciences Project</name>
 	</maintainer>
 	<use>
+		<flag name="apache">Enable mapserver to run under apache</flag>
 		<flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
 		<flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
 		<flag name="postgis">Enable <pkg>dev-db/postgis</pkg> support</flag>
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 5ba2f5870436..239b1a8ad8f8 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index e789ee345426..e8b6d71b61e4 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,3 +1,3 @@
 DIST camd-2.3.1.tar.bz2 319766 BLAKE2B f812b457ede3b86fd7fd99f8cc2ea8f19a917c96cf33ca65c6bb2d0f7ebdb37b08af5cd8ad260bf4a636f2d884527c928c026edab23fffacafdd87ef2ce416e8 SHA512 13c5d687b9314f43a6c7237c7541e0c21cc544ffe52f8a984f64c5177a9f1f6b5ab07e9190388587f273424db8e6076ef050f836dbc9f33ca44e94d0034c8070
-EBUILD camd-2.3.1.ebuild 716 BLAKE2B 6f5730504160deea6926733de216fd6b9e9ca01aeb710c610b7d9b1254a17d25a4ca400a5c42befb24ea879a41a4487810882c511af8299645689fa26cb04f8c SHA512 ac6c70deaf50bd24fe2f69a7c37434ec2679aebdcfc9ca5d9a873bf1fb60ddefb5f9a73c47ba8713ec2c4cf2483f031e27aa0dd8d47373a27fda7cb1870ceffb
+EBUILD camd-2.3.1.ebuild 712 BLAKE2B a64228794c038618c83663aeee5acc6ff2439f4eccaea8db27e999563c6c2e52dd00fe6ee6d4f625d86e5691be9c2bb2bd8a54618db81192448738fca10b7e4b SHA512 8721c99ec7e0b0a3d5dbb9f4259c81a5601e1b31257f172b57a8a0ca71bd78652e0a7907dcc3378834100c47d1ffcda3761963e408b6f76c6e8b4b3365d6d9ca
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.3.1.ebuild b/sci-libs/camd/camd-2.3.1.ebuild
index acd75e0feb53..3a895fbdcc07 100644
--- a/sci-libs/camd/camd-2.3.1.ebuild
+++ b/sci-libs/camd/camd-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index e31f1b355689..632773a16ef5 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,3 +1,3 @@
 DIST ccolamd-2.8.0.tar.bz2 309907 BLAKE2B 1229d0802a53613d2a320906889dc5ae928bc0b21003d0340f7c5f153a8a7fab8302981c1c2421f64ca5c9f5a1e9460ad5d136a6c1efbc401666f82d7aab1901 SHA512 6a515a8250ed98d52aa932a6f93170174ff32f76c1ecedcedeb1540a471416d0cd40b5613a839b96fbc79c66b3cb5106c6a340a33fafdd695c83b7d949756e77
-EBUILD ccolamd-2.8.0.ebuild 592 BLAKE2B 401e4d2a5c9e45cf519bff20cad6f5abb52e7872d7393ab455aab826f6a15679a2fca7b1b6a26491d022dcd5ad6599e0d300342f5ee30bbdbc90fa30965f451f SHA512 03774bcd9d15a7bf4238fcbd2a1cceeced9131a53c8ab4a3d45b9929c716361c288675ec7486363ba68876f9cb5c77ffcd02d1af0260415ca7c082358816bfbb
+EBUILD ccolamd-2.8.0.ebuild 588 BLAKE2B 100a2e6c5be887f6d78002942eb040f3e5eb7d91d933f08c7a00d557b76abc881c2c54c6fdea41eccbc8da5c74a60eab2f3dba94173613cfbb89bc5d7d7e06a0 SHA512 c84446be95ec384343c72987b8b6d27df2bc68e60fe6d629de3772ea4070424c6ff2b0ce3e90731a70a9c8276cd5377e251a87995c4b46b4a2e32edd940f5564
 MISC metadata.xml 470 BLAKE2B b20ae7c51907e135898a4ca6eee1454c1760d8f6c061d6d8c9bdf6082773e003326c65ba4489831139bc9af96f2321a09b22fbe106aa87b8f6dbb4781163edb9 SHA512 99c2d290fea618dfd8997209d8e6db971a2ab74d1be5fb270f2177c9843b0f324710491977c7cf2427806295d05e341ece4399afd8a0d43bca8b42b0fdea7beb
diff --git a/sci-libs/ccolamd/ccolamd-2.8.0.ebuild b/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
index a631cbdf4641..936f8d8597f4 100644
--- a/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest
index 391f900a56ee..c1e6d8e43254 100644
--- a/sci-libs/cln/Manifest
+++ b/sci-libs/cln/Manifest
@@ -1,6 +1,6 @@
 AUX cln-1.3.2-arm.patch 340 BLAKE2B e66f245944e4a21f87c64d6c79f8b11fd55d8733fbc3af146a5bf632903a2dac12c1650bb29a04541eab2867b1ede5a73390f5796780d4f55bf6a5bd005c856c SHA512 b16e00091ade3f77f54a88130a5953a8d677cbcc124a89e632266313b42c042cda57da4bececdc4740c1dce366a06593ad5cec21bf047ea43ea4927d2e08e020
 DIST cln-1.3.3.tar.bz2 1300229 BLAKE2B ca7985771d300b2bf0a1e5d6acda90de2596e0a8910c293500c8c218578814a82867ac24b641d3e3a36897a1a0ebf09a136ba6d64c7a1ed61133aa0b89ecacea SHA512 ee829cd03a2d36215a4d4e76cc0aa6c5abe6ff967ed366d752da1dc0c47dbec56e0521e92fb35574c038305fb767991c5c7fd12ad03583080da3f923fbfecdaf
 DIST cln-1.3.4.tar.bz2 1281348 BLAKE2B 7681ae5a421f2992e16b48541b46aceb988d697d95d2457fbe2f8c0f7e8ca95e6fbfb0fc309ea29a4669bc3d4fdf9c670fdf25b202019457ffba392f15bf2fa4 SHA512 2178a64b4388b3018c3847f6fb192ea51eb9c8618302986d7706accef17184e3333ddeca218d726f93f3b985598952ad58d705c9081201985611e383f788a631
-EBUILD cln-1.3.3.ebuild 1321 BLAKE2B 550c29879a19ac33bdfb1c5183e8767b8526f8a80ce572828bd767f6a913c14a46888c5ee56095ad3a7e5670540ef7c634d861db1e38a95d151551cf8e11633d SHA512 439b61f735e29e5fdbe482312d336fe38167f235dc2ab0a3e487420113f04096633ce7d08a2f492261c2043dd26be7743cb3113cc9a07c78c8a2f725001cdcbf
+EBUILD cln-1.3.3.ebuild 1324 BLAKE2B 7c3a94a3ae559a76b3237a34da9e5265d4b457ff5a40b8da878cbd7db3fff8c38dcce0d04dedf5b23ead44366f1a34733297a8e9f29f6356cd031f3573130969 SHA512 a65786e4ca6aa958f29d99c091c0bf2bfe0c079a1de5654f26e5ae627d1a28808a0addf187b6818a9809f025b3aec1d477edcfa29bdc64c26d585c3c6886fb4f
 EBUILD cln-1.3.4.ebuild 1320 BLAKE2B 792896c7d55d7d4346a5c7a59c68c52372ae684ade2366fe1d3b27f4c11b1e350679643acced3303c1769617407d524797db33f9047b5497c7c10f29f90e30dd SHA512 b364c2a759897a5eb0dd40e9d747e5a2cd6a67f20f06d6fd1b7920e4fc02fd60791dff25a3375d9311cc61e6d0244fc811577a2b9def106ffe5a46c328430a57
 MISC metadata.xml 702 BLAKE2B 597b40fd2f7f11ef4e6ec7d0c523d2eeedb9a2cf6d2a663616dc45e891368136b38cb7760c588a7fee0880d6bcab6acace1771ad4d108ea6d52eff0abbb7e08f SHA512 4b6ddc8f558bc777963dcf271584ba59ba3d8cc3c2c95260a5680eab2a436dca894a2318f5bacdd9c9da68e6c22323d4ef2829b9bb1de0db2467f20ac204d95b
diff --git a/sci-libs/cln/cln-1.3.3.ebuild b/sci-libs/cln/cln-1.3.3.ebuild
index 8671b3f70af2..0447a7047798 100644
--- a/sci-libs/cln/cln-1.3.3.ebuild
+++ b/sci-libs/cln/cln-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/djbfft/Manifest b/sci-libs/djbfft/Manifest
index b5a1346db3fa..1b969c624722 100644
--- a/sci-libs/djbfft/Manifest
+++ b/sci-libs/djbfft/Manifest
@@ -2,5 +2,5 @@ AUX djbfft-0.76-gcc3.patch 1176 BLAKE2B a5a3301b5aefad844fc08fb8172b6b9be1f538f3
 AUX djbfft-0.76-headers.patch 995 BLAKE2B 8611ff8c7ca92d82e349476346d05fbe797e28395b01a659a48714febd3895c7301ed78b2b1c0a162b2ef15deec6d70a23581df89a543c32c88e138903ac87a7 SHA512 651ef26ef1ae00a5e10b512cef6cd741e77035dbdc792fdc7d215026ff4c3304ac0f1fd4c0e58debeb1bca2620a1002c67c1115b3590cf8f5b2453eb7a370684
 AUX djbfft-0.76-shared.patch 3722 BLAKE2B 4b0367156c0904dad032ea218679355ab4b2d6fd7bbf2a6a8cb17778e959c40db689e9c7fe36e90d344cf9d49d53d70a7cdb481b5d409ec208d46ede6c51f7e1 SHA512 58bc4d65553a6642a1b9a25a5b57974325f201dcec5758c7bf4c86da6b0a9fa018f1099af98234e7fbcbe29b398ac22d40c25069b9b987b41f547630f2799c1a
 DIST djbfft-0.76.tar.gz 80092 BLAKE2B de87fe1e2b0af64fa631b9b72e418bdd464f30b5680bc903a241d0525a48180f55d1cbc99e54dd81d3133a0f6dbba99cf55771304b4b1b62d8388aa15fa9c7e2 SHA512 f23e5f80d2737476feea4ed65d7d022c4ca74748a2ff7b3b9338fdea4f72b4009d1c5909325382647feab837bec078231eddc3fc3bd0b5ae3346690e5edef530
-EBUILD djbfft-0.76-r2.ebuild 1818 BLAKE2B 7e65d09b8571e65e40400d36da9428ebfa9d498880a3068b07ac815be08896460fb0f8b1a6300685981bf4a89cd06a44fac41aa0563b274076947596162d2857 SHA512 14205a19ad97f089af11e92e7de9b93a35a1be8d31d601d4bafaac61113602a13177bc8a3f2dd0932dcd80e9d6bb4fe93a4bcceecffd6d1de3cf491ef3f0c7df
+EBUILD djbfft-0.76-r2.ebuild 1814 BLAKE2B 70f0b43d54797a03a82eb4b9b091f5c7c99b86f0e114417bf6dc27bbb5beda7329b02aa723f830d5dcd3c500dba20b02476e3c4c2dd0bd657ea0b0183b8a1a92 SHA512 b3cdfce6f7c3abb3bd62921948236d1596eb00675669532b083f150634c8e950d8172eaa5afdafb156ee7b970683278907f6dcf1359f6fa369de18a41d8797c3
 MISC metadata.xml 840 BLAKE2B 134f5c3b883159a7ff105730fff872b30cdc091c29ea434d1f1a672b0e65c3410ac596060bc5e98a5be3d5fd41b753867e3e35e8159315390a38045aa7ee479c SHA512 988a23596f952d9f9b874cfa7582fafda0ab2df81a03498c068665b968cf49d3fa7eb7977a09a5e2410c0432bc0addc2cf3a97f4089a6b43a7a16a67d2552d6a
diff --git a/sci-libs/djbfft/djbfft-0.76-r2.ebuild b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
index f2e4cc74f116..15f5799eaa58 100644
--- a/sci-libs/djbfft/djbfft-0.76-r2.ebuild
+++ b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 DOCS=( CHANGES README TODO VERSION )
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 16fa3310a4ab..1318e8de629a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -7,6 +7,6 @@ AUX gdal-2.4.1-poppler-0.75.patch 5452 BLAKE2B 7cb3b1e84f2f1ff91af49cb4292047f05
 AUX gdal-2.4.1-poppler-0.76.patch 699 BLAKE2B 132ff0a3046734e851d12379d049b2e4fdbefcd4bb6949ddf9fa18b856b1ae20d2a2ec9dbcc0d973097cd2ba5f6e72e852b26a93997ffe4b428fe79d44b5c1cf SHA512 09cdd963dbc5e09d211663f54b1cef72eeeda7484ad10b08862907df60aefc068d840e80d4fd0aa0776a03edca89e8affb8b614c4db02085e854bb4a14342d4f
 DIST gdal-2.4.0.tar.gz 14533664 BLAKE2B ec10a4a9ba438a758131c1b80286b27ee17f1f270e77af61d70ed4149d63b9224c98db9c55156075ebd86b5f0875c626d87df3779f0b981895ff1c00786f908e SHA512 9517b23009621ed2622a460dc813b30de726d293531c6f107fb308a31e45a143e67e71aa3af3d1faed554ad516a35924973d714c63ee41445ac8d3b2da61dd10
 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
-EBUILD gdal-2.4.0.ebuild 8297 BLAKE2B b04defd05cdadb3d7ebc78b5b5389e8cdbbd66287d6e0388476b87d749920152862b65d4ce6cc8f4af2c2711a4e35c68e9a52e3e8791ec081600e540788ea3a3 SHA512 e1832e54c9582bcba56db4f5a95dd400787b9cb7ccb0e607662fda1a3ee73cb9d0d99e6a42e9406f6b52a27d6ba8a472b0a602fbe87009ec85ee250a170a9f56
-EBUILD gdal-2.4.1.ebuild 8114 BLAKE2B b46ff7f7ad7e97114320a30dfdea588deaafdc92a2eb42b4e41a3e47e9e7ab3bac240700f8872df0b75ed2d3959ecb0bf99a77215583d5ffb5eb7197fcd15e1d SHA512 d5b3873326328d4dcbbc31ae059b498091422e1d0841af9e2107fda7297a95394fa64a11b1b288723426255d8bdbad53d8181f36f02bc5d54eafbc4211a47c2e
+EBUILD gdal-2.4.0.ebuild 8293 BLAKE2B d8b7ae89eadf31567ad0a618d6e70bbbf74339513e0b5c4e467bf4e3831581102acc404ee7b9cb34c8b7f3ba6ebd3a66ef5f32482a5960b93d57fb970f2843b9 SHA512 6754e42e7733ed5eafa12e313afad31926837f07d212e9c5119f2668b6a0c05172ef36652f155d685255bccdbd4c6cfbc28da7d36788a95fd67d821ca8aadd26
+EBUILD gdal-2.4.1.ebuild 8110 BLAKE2B 6d6b7f39ad24da917aab354d89a4f6292019e5d5ef788ab286903bd7ff4095bbe66aa965c19f33a913335c679ed0d37bdecea0652d754a145f1d3bf312770579 SHA512 f59fff51426669bac6ca5e2394b7762114f83be5d76807df250dced8355079742ec568f8170b5dfed1c3fd46c01009065faeb9a42e03af72828a5a6b93f585a7
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/gdal-2.4.0.ebuild b/sci-libs/gdal/gdal-2.4.0.ebuild
index 32a0cbe2453b..999f213aac70 100644
--- a/sci-libs/gdal/gdal-2.4.0.ebuild
+++ b/sci-libs/gdal/gdal-2.4.0.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_OPTIONAL=1
 inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
 
 DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://www.gdal.org/"
+HOMEPAGE="https://gdal.org/"
 SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.3"
diff --git a/sci-libs/gdal/gdal-2.4.1.ebuild b/sci-libs/gdal/gdal-2.4.1.ebuild
index 1c59333d4d32..78ac5d85adb7 100644
--- a/sci-libs/gdal/gdal-2.4.1.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1.ebuild
@@ -10,12 +10,12 @@ DISTUTILS_OPTIONAL=1
 inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
 
 DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://www.gdal.org/"
+HOMEPAGE="https://gdal.org/"
 SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 COMMON_DEPEND="
@@ -24,7 +24,7 @@ COMMON_DEPEND="
 	dev-libs/libpcre
 	dev-libs/libxml2:=
 	media-libs/tiff:0=
-	sci-libs/libgeotiff
+	sci-libs/libgeotiff:=
 	sys-libs/zlib:=[minizip(+)]
 	armadillo? ( sci-libs/armadillo:=[lapack] )
 	curl? ( net-misc/curl )
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 5df3c87b477d..3fa5a68c3546 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -7,5 +7,5 @@ DIST gsl-2.4.tar.gz 5916715 BLAKE2B f22c07b2d5759a383e05b8bfdba70071672cc27f12ff
 DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
 EBUILD gsl-1.16.ebuild 3092 BLAKE2B e213441308cddca756b5de778f78f40d73e1b9cf4e951bb1e1bb0efbe3602284adad4a4bee6231cdada74d1a5ae05e9ead4a9634c2b4d35a3dd11cb3ddae7652 SHA512 d5dffee6c9ee7c1c66d9517251e397eb7af212c2a649b48aff22b88a5871276e8076c785242fb49fe25d6e101a53268b7a10438350d0d5ffaba82abae27d6286
 EBUILD gsl-2.4.ebuild 3201 BLAKE2B b3277c57be36d13fd4d84c8821226cb12ade83582570f20f70daa0b7683c17839445cd9a2c0b9c7ddd6361159f7d49809d01fcd5f889d8cb38ebe0d6478b9b7b SHA512 07784db20ac72dd1004f0736facbf196db0c648c0a8dc1574f4c6eef4fb3970508408a39d072cb2c050e2bae8bcc95d928dcec964e08e2d554eee1440a769b5a
-EBUILD gsl-2.5.ebuild 3194 BLAKE2B 823b1a827c2150b9b48750c10830eace9ed615e2d0620054ebee0c5837dd3241941e3a0dd231792e6b72ef7abe5895b806cb3021ccdac52a96bb5ec7d5dbe3f4 SHA512 c52751657d62ae714bb4526e50ad485f78ecf0b7af1169fba7f2940f5821bd9792a51d24a15b3ea5d2d66af79d9dd08256eb5ffeab5c4668c7d2c7407d9a837b
+EBUILD gsl-2.5.ebuild 3190 BLAKE2B 548f0b3c31733526765b58a25e491dfd180c5b0487285c3ccea944bc7bb90751b09d7bb5ff63888962fcd2b8c5210b7724646b2149cd55d59922380854f3fdef SHA512 3646bc37c08a70b652205a6d60b21c287115d6b43e13d76fac0855e70041e77f9de468ac870d11f1c0365339ae0c846ae84c14184fc541c35f0ad2004defffe9
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/gsl-2.5.ebuild b/sci-libs/gsl/gsl-2.5.ebuild
index da1026f07391..c676aa3c518c 100644
--- a/sci-libs/gsl/gsl-2.5.ebuild
+++ b/sci-libs/gsl/gsl-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 4e5f4eb19b27..e263776fa3b7 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -6,6 +6,6 @@ DIST hdf5-1.10.1.tar.bz2 11769617 BLAKE2B 66ad762aed90cea9e58a9735bf0e189d78befc
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
 DIST hdf5-1.8.18.tar.bz2 10081294 BLAKE2B cf0d0c8a41576bcf816460eaabcfab29cfffba240721a64fe584c42fbb322470f29fb93c8513f7bbdedeeb392c2fe64cd3261b47b47de5b01828dae0b1929cd3 SHA512 01f6d14bdd3be2ced9c63cc9e1820cd7ea11db649ff9f3a3055c18c4b0fffe777fd23baad536e3bce31c4d76fe17db64a3972762e1bb4d232927c1ca140e72b2
 EBUILD hdf5-1.10.1.ebuild 2808 BLAKE2B 79eb6b5c889d717f6a8391ce334baa0878971256460be4d6bde00726078f4a944c2e4843867c767fa25cf346cca9f7f2cf58f0c918d17bd4cf050a11ba17c396 SHA512 29b39083a7fc5400490c81a5c6ad9bc76485c5ac67f983a45524010b1d72e99cca6e218b1dd052c000bfd7bd7397ec770e6d62ca0d5e313ac3c3c2253387e758
-EBUILD hdf5-1.10.5.ebuild 2657 BLAKE2B 53d78c9ea1f0421a6e421000989715645e325f7fbe2794a6f8615fad7df2cb680cdd99ef357b00de387777e0ad02c80fd4864a0bad602d2d0991a162c44e7704 SHA512 63495b13b81c7e07c6d564b56ddd252a633263a4d35be0375a6b660fd86f0de87303388211dfca115f71220d9e33c7bfc741f4337f1d8a3bfca3f7d737fd139d
+EBUILD hdf5-1.10.5.ebuild 2656 BLAKE2B 926adc736d75fec7bbf6293e155d128037b3469dba1eb792c35eb1ff6356b3ed4f8568c34cbea3e81df1f54b5a477d556061072736d6e7b3ac0daac1f5809244 SHA512 ebb352d338b95a78d083bfb516c569a964cae951a39403a06a0d2a470201064924889145f77bc75e1ca235df77b467228ace2f9f3855093e5b75ddd451d02f8c
 EBUILD hdf5-1.8.18.ebuild 3366 BLAKE2B 5ea79bd8cfd5664c92de2cfb62c826500b1847290684a9ad3a1bda7ac2aa33d2d428b59ce9f7f1bfb17637472742804ddb98f9018386ebfbdff33c2023d942e4 SHA512 54e66dc074fd9b0fe9ad23f23234fc20e79c6ed9e9759d6964cb8e4d3e79321c08b4539a814f2fae2c935bb9358549115a884b8f55719fb77744fd26ad680867
 MISC metadata.xml 822 BLAKE2B ab9bf739575f9758fa521e9640438b345379373884ffd25a021a15589b7016d519f01d4d4d39dc5c8efbd271fbeb89d584b3d627e2b0d90cecf55d36747447cf SHA512 5e6cb47fcf2e704887a375f527b447075a36a51225cc2bdf10892bff5cce548599dd6f04a36ae2e31f691bd635dd6cc5d1455729e05923a8992d95fb27716164
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index 0060a1d2ac2a..a48ad0321e3e 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi static-libs szip threads zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index a7d3e9ca9d1e..ba5240e7fa56 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -4,5 +4,5 @@ DIST libcerf-1.4.tgz 386065 BLAKE2B dc33523ba37133dd210e9aeb2ebaf75b630032ff7acf
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
 EBUILD libcerf-1.3.ebuild 620 BLAKE2B 261a0d3b341ba163968d3139272c334b3d9014cab43edcb31d19052c6411ee1d1809f238b9449f19adb2d25f081f8f140e68d2f172a68970fe032d05b743b704 SHA512 f2911dde75cc0e1450d3099e50efcd4454056f778f67dbad83bc98c93efbcfeecc4b08003790db7690c56c12d41be3ae89729b0b251e978d1c79422384be3fd7
 EBUILD libcerf-1.4.ebuild 718 BLAKE2B ee5b6ad87be49bcee3ff1a942b19ec6b1ff1bb3b39fa25d0b91ec75d83121bbd28ed62dbbf4fd73c9b7ac4b7c2f3a3b22805f441948fbce1d48ebefe93b67599 SHA512 3b7e679d0538a1a34d147c4b0596e1269271be6d3feaaf5ea95cc240004d5ff529a5a1642e2e7994058a58d9c7d8948697f2df3a51b14d5f9042f8ce044629aa
-EBUILD libcerf-1.5.ebuild 804 BLAKE2B 69c58fedf460c869985bcf4f136244cd7b12146f83a04b0e98096e0f46fb98210f872f9cdd18e206dfb2508927413f35ded82b8bdd1838ff64893f9abc25312d SHA512 21d58649a22a8989bce795494f6f13ea536b3e3241bcbde520db15c0bcfa6a6d0e5682840f54fb3a123e8d98e7aba89eb32ca8c7cc1276b3e7841e3fa701ce7b
+EBUILD libcerf-1.5.ebuild 794 BLAKE2B 53e617983987aa0770b364f7a4f54acdafcbfdcd68a471e4db72284bfe5ba37bcb2bac79605655cd5ce6d11431edead7b192fb662777bc06cd127209d337a6c3 SHA512 df62086b7650b98643614829222f14f53667f9843a078192779a2133b42df27127e5ba396201a30f15aee1cc8489b98f5b9579816403fcd087ec200050dc3a8f
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 7834c232f530..cd4699e33a89 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 
 src_configure() {
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index fe793e440174..e20cba77fa00 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -4,5 +4,5 @@ DIST libgeotiff-1.4.1.tar.gz 1674928 BLAKE2B 6c83ca77728c40995bf262d165c8566573c
 DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
 EBUILD libgeotiff-1.4.0.ebuild 1507 BLAKE2B af67acd8b1095a41d858b412cb9b8056e364056c9a646f160e6b3e2f8eca16b94b3ccbba05cf67ed190d5200683d82635b593bd822c7e07ff91ede7f15fa362b SHA512 1f07cae9b9c412e3efa268f3517ccd6c744551496d2c4bd4235ec03c126515b2b173b767bd12533a4958abf11ab2b9c0e0be2c7b2a6ad345aaa52a109aa88bc0
 EBUILD libgeotiff-1.4.1-r1.ebuild 1288 BLAKE2B 29d7fc36597ec31717fdcfdda203123b972069af3364f3d27f8782563ceb11b76d0a9f29bc0579314077f58397ca4489320736e306ecab64f66462d89fbbeb70 SHA512 e5fc2a4623d9a5f94dda82b0fd4d00e10b86c9f3e27fbebc05b84fb11e4b506b07209de809b1310b3b4e36d80951f47b9a61dc1bbcc6d4a4b1a2bf3605e2fd52
-EBUILD libgeotiff-1.5.1.ebuild 1285 BLAKE2B b252f6e4c70bea3c1e7f6c714acc6bb726990c292713178e896faef9f4741bfe019aa2b4e3b41ba983932e5a9ac11975a5432a0122b54e7d2a3a0a98e2cb7c14 SHA512 8641501ae7be2dc6a1343869fafd7ef6635a90e16502afac311c6b37aeebcc6c9cd4b842d18dfcfa9f79a493c6faaee93aa7d444b89361ce5d61ac6b7441016c
+EBUILD libgeotiff-1.5.1-r1.ebuild 1287 BLAKE2B f25dc592b8ea6f624a35a0a4e269d4b44705aa441d9844ee412c3891784d2f75b714fbb6cfba2235ca2ad7be89e45bcea1173a0ddc9e59750e86f8457b09eb9f SHA512 e0ffc07f1150e0b91443921674ef85533139184f43baa0736b03351acfc20b1b7d66dfc123b4aa3bd788e5f4cae1b142d46d7ac7164d855f1d97d07dfee2ba7b
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..7696605edc46
--- /dev/null
+++ b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
+HOMEPAGE="https://trac.osgeo.org/geotiff/ https://github.com/OSGeo/libgeotiff"
+SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc static-libs"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	>=media-libs/tiff-3.9.1:0
+	>=sci-libs/proj-6.0.0
+	sys-libs/zlib
+	virtual/jpeg:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -e "s:-O3::g" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-debug=$(usex debug) \
+		$(use_enable static-libs static) \
+		--with-jpeg="${EPREFIX}"/usr/ \
+		--with-zip="${EPREFIX}"/usr/
+
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		mkdir -p docs/api || die
+		cp "${FILESDIR}"/Doxyfile Doxyfile || die
+		doxygen -u Doxyfile || die "updating doxygen config failed"
+		doxygen Doxyfile || die "docs generation failed"
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( docs/api/. )
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/libgeotiff/libgeotiff-1.5.1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.5.1.ebuild
deleted file mode 100644
index 54b176ce7533..000000000000
--- a/sci-libs/libgeotiff/libgeotiff-1.5.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
-HOMEPAGE="http://geotiff.osgeo.org/"
-SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc static-libs"
-
-RDEPEND="
-	virtual/jpeg:=
-	>=media-libs/tiff-3.9.1:0
-	sci-libs/proj
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P/RC*/}
-
-DOCS=( README ChangeLog )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:-O3::g" \
-		configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-debug=$(usex debug) \
-		--with-jpeg="${EPREFIX}"/usr/ \
-		--with-zip="${EPREFIX}"/usr/
-
-}
-src_compile() {
-	default
-
-	if use doc; then
-		mkdir -p docs/api || die
-		cp "${FILESDIR}"/Doxyfile Doxyfile || die
-		doxygen -u Doxyfile || die "updating doxygen config failed"
-		doxygen Doxyfile || die "docs generation failed"
-	fi
-}
-
-src_install() {
-	default
-
-	use doc && dohtml docs/api/*
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 6c71d487e39d..b40d9171ca67 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -2,7 +2,7 @@ AUX libqalculate-0.9.9-readline.patch 424 BLAKE2B be67a73b0ee7c01c05911126130545
 DIST libqalculate-0.9.9.tar.gz 1509180 BLAKE2B 3f309add80ddb6b21730eab25d37c2d8fee163a79768a09ec5e7e5d329aa11ed9dafbf77f4ce194a96c2ac6a3b55a9c0d16755d5e106123cc2a5f931f6872d91 SHA512 c7692dcd91e0a7aea8184ca5366a3caf704b6e716c9e8552f4214ce7fc3157cf127daf7a063196383e4d5a99f8703486f2282c7fb01acafee5e1b3d8993de384
 DIST libqalculate-2.2.0.tar.gz 1717207 BLAKE2B 020ca544683ff140ab5f8256a5a955c895a6ea09a581e9e75ab6c0a0657886c352a1ec2d34400057fe80004481d3198998613113ca40fb4feebfca010445dced SHA512 e6f3693e4dba2beffca300b673657b90037a6b7acc5bbd4e659863f4f5aec148d6d385fc3c666b16b2be713d0a8ad1b4d7fda557cef0e2be340ca2435f62aae7
 DIST libqalculate-2.8.1.tar.gz 1961535 BLAKE2B 074d83a44cbc6cb5d8afe5121e4c34cec46f2f6fecf046f6b4e67c6ebc612030ccbd0f42c303cc675267374502ecb3e831c9bbfca0f13d339e31fb8933a99b7a SHA512 a258bf4f67db70263626ac77822afc75fd7a9e5af2feb1930314daff219865b28c43e82fef6ceae4f3f23957447d6eaebdc709e606d28457bca0f47eefb9274a
-EBUILD libqalculate-0.9.9.ebuild 1443 BLAKE2B 2c4927b86f73b51e88b06700cc301b30c158133d49bb9e3ae3bd4722e321b60969827bf82ea37a4cc7477188ced124ec57f6d166a23b8a2ac5615da01f500c56 SHA512 6ab0e02af0b984019143f13ae88c0bfab432227ec7d5c4843b53eefe11a74aab3857191930a3e7534e8dce39e6b78f63af77200b7e6645c4052b429020bdfdd2
+EBUILD libqalculate-0.9.9.ebuild 1439 BLAKE2B 71859454b82d428a42e263bb949bc37334e1f299bc38b4564e8aca4d04775e2b4decaa588054823e7e593fc3f29a6726a00fe4f002915e9acd9a5da0c5104df7 SHA512 2cd59c02a4a5fd199d62037b204c571c093165dbd5be331bcf9050421fc4ec753994cd98cd724c3993d9de84681505d69618a7e342983a86757be0efd3d5a572
 EBUILD libqalculate-2.2.0.ebuild 1349 BLAKE2B ea1df54be1d8970a19f229dcc268627ec760e586c3c9c5e9526c747d15d95b91cf3bb0fb90e56fda9191191a22ebd23728bb8921a6b608eae8fa5e7b149785ee SHA512 739d3946688533002637177352784a9884a08931ed9d70ec3012e76b3bfdb7d7831d54fc401e3e74ff4f73b1a015fc18c8cbbf8ee27913d5149c44094cdc16f8
 EBUILD libqalculate-2.8.1.ebuild 1441 BLAKE2B 0fe455d930d87346657de7f521078dadcb7ce0d53d72a79f78b6ad01760fe808720fe5994b509dc60f367afb688629f498659bbb9676439ffbf807314c366ffb SHA512 8aaa4c7ffeba2908dade8b752e01b8339400c03e648eb573211e30bb2c7714da926d4f33b74d1ff18e2a0170bcd7893540634698ac980030cc28a9d19fdfad66
 MISC metadata.xml 412 BLAKE2B 6cb8a434ec8e0eaa50982720079db60a5a2211c9d67852712351e9d6698edb1d70058f8f093ecf7b93fb7f853b1f1c138bc0871a6751975d35c24c622510dde5 SHA512 b6c55b741bda2a497dae278d47c6931611cbda132e08deb16a9c4efef59c7cb18bc464e7d242380b7afde2af4ab6f8e7f72b7db4ed3fd6b8f4cdc9c0359550ce
diff --git a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild b/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
index c4a7b59e1f45..8cce0110307a 100644
--- a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
+++ b/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gnuplot readline static-libs"
 
 COMMON_DEPEND="
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 53c908179ad2..a43b82b6102b 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,6 +1,4 @@
 AUX linux-gpib-modules-4.2.0_rc1-reallydie.patch 737 BLAKE2B 198c078a168071e04efcfdad11bf93c2682ab2f2160d7f93fc9c49fdcd2cbbe9174be53502fa5a2c0eedf448e0f438130646cfe902673383925156244a80bf5d SHA512 96b7e459da514f4a4f84e746a3121baa0076c479ad435fd182a90714aeec21d32dcdbb6871deacab532c722e89970aa7cbccbcbea494195dfa86c7ebb95142d9
 DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
-DIST linux-gpib-kernel-4.2.0_rc1.tar.gz 332525 BLAKE2B e84f9da9902d139474cf68e49922f7b402c6d11113eab8c009683c1b4304a505eb6aba86a60b019e4d3ad0ef1d003c743f14f60b61b3d7f31e8aeca99a4a16c1 SHA512 8bf1a2b04d6128c513c5d13549fb95e563e719e43ffb3b303fc5aa2376f57a69774c1afdb901281933f6b253068461ce59bd9564146a0c5a6483e1ccc47d259f
-EBUILD linux-gpib-modules-4.2.0.ebuild 1666 BLAKE2B f3f5dedb737605af9b60879ce55ff4945727ffa2d4dc684b60dcb8dde4ce2cb5aa6a7d9a179ebe5469d0a8fa9844142d9eff36afc5405028538f48136d98304f SHA512 7a82cd2f829e162ff34e861cf4505bd996e78a37a7a5c33f969d7d437a67c551af7d725275b8a6d4433d4becd58586fcac2cb104dbfcebdaf757169fc6dff752
-EBUILD linux-gpib-modules-4.2.0_rc1.ebuild 1587 BLAKE2B 8e27c06ac44e9bbecf2925a9f93380fce2afcd110c37640ffb2ac8abf3c1471217ff601a0e0b831efce053de12ea10e03ef59dab561b0c2da56995f6b97d041f SHA512 d8d26687c404bada61b92a4935f3c7e0680488dc0f8cb8e3fdf1e71feebc95ec7279459009bc217080063e163b875d1e1a99570c6a9fd8db8fd2be6aba78eec6
+EBUILD linux-gpib-modules-4.2.0.ebuild 1665 BLAKE2B dfe7cc296cb3d94e0089755398403a8a1ccae0c378243034fa8ee13aa2894fea2e5dfc562e676942f74be018583fcca080aaa7066f44898c673574c326768a81 SHA512 1a4815546d71cc963ea8e1f6ebd0c5ec79e150f84a7f635a9dbd6f6a06dd41e4b19955bb20e47f2309aece7c526557139a6cf46b3f217cdb41e9bd9a318199f2
 MISC metadata.xml 638 BLAKE2B 6367f8fe90e75e2a3593d5d79ae09e6c75fa990ae037b58cba80ecdc4f7023a5b116ee2d6eadcdd6960133cd08a5103ebd1870906e2136af064a048603bb2562 SHA512 0bce2e72363ccdec78efa46158bade5135cae3d2d7b97de6836c4708f5823f2c1539f7441f0382061c4e0c4c7b5b1498bc5a4be6949b7dea015c873381010744
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
index 4ac4407a9a83..884cc3f1c2d5 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="isa pcmcia debug"
 
 COMMONDEPEND=""
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
deleted file mode 100644
index b08d9a3d45a7..000000000000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod autotools toolchain-funcs
-
-MY_PN=${PN/modules/kernel}
-
-DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="isa pcmcia debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
-	!<sci-libs/linux-gpib-4.2.0_rc1
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.0_rc1-reallydie.patch
-)
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-pkg_setup () {
-	linux-mod_pkg_setup
-
-	if kernel_is -lt 2 6 8; then
-		die "Kernel versions older than 2.6.8 are not supported."
-	fi
-
-	# https://sourceforge.net/p/linux-gpib/bugs/43/
-	if use pcmcia && kernel_is -ge 2 6 38; then
-		die "pcmcia support is broken on kernels newer 2.6.38"
-	fi
-}
-
-src_prepare () {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	set_arch_to_kernel
-	econf \
-		$(use_enable isa) \
-		$(use_enable pcmcia) \
-		$(use_enable debug driver-debug) \
-		--with-linux-srcdir=${KV_DIR}
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		DEPMOD="/bin/true" \
-		docdir=/usr/share/doc/${PF}/html install
-
-	dodoc ChangeLog AUTHORS README* NEWS
-}
-
-pkg_preinst () {
-	linux-mod_pkg_preinst
-	enewgroup gpib
-}
-
-pkg_postinst () {
-	linux-mod_pkg_postinst
-}
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index bf044cb5b20c..a8218f1ece38 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -5,8 +5,6 @@ AUX linux-gpib-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd
 DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
 DIST linux-gpib-4.1.0.tar.gz 1529480 BLAKE2B b49df07f15d0f91b9d475052993421979d6776ef15aaa9b7e49632db9018f0cbd9ff38d12e2afa9e8027202e450dfc487ac9e2e6ab719086646d983cc41b3482 SHA512 037ed9e484a83caccb15d2d142eef6f1eec356ae972480ca7a676a318d3e9f844fc1911c1b30869b4bb14ef0b4cd10587a803426df9145966bafe22ca7316bd8
 DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
-DIST linux-gpib-user-4.2.0_rc1.tar.gz 1098181 BLAKE2B 3f35eacfcffe04598322af6faed921b20b49959433b6e3c3a4bb2c0b9e3f71a2c00a13d7dec6b4e0bc415f1f8635945419805d5c9dec4ddcddb18fc7e8c5e7b4 SHA512 69d8b3059eab8d1d09006b4da13dbf3479c9a9d45e464767a13a2b1d6d32705e91e2800ca79015d302ea05e4fcbddb433dd817d208d751b6af8ac3867b7cee78
 EBUILD linux-gpib-4.1.0.ebuild 6110 BLAKE2B 354731c55d29f49b1aaca808c45128f7826b322555d5340fa9fd11481a9ec171bfa8cd365c5329f033e46f49d677c1a2a9f56cb8bc02e911224025de51505563 SHA512 29592c5c05b72e8a4263781636aa9a68b3d4e38743f5c7228a9ed449ab1e877141c5f238789e2942dbaa8c883439086c87321e55a7f8be653b91056b9f677656
-EBUILD linux-gpib-4.2.0.ebuild 4617 BLAKE2B 8f7c2747e256e44a89beba79442ac822021da0c0692fae0fb9fb64110e1e68ddeb900748e8ddf1691c6d0c79e7b79c12edd51d63f0a02d32061707f49224ca23 SHA512 44b084f2058d1cc4577853c20b103c3f69d25a77067e47282602571dbdcac0f95ac99c1f61932283d49aa430076901ef72cf7fa2d1625a3561f74a954990a47d
-EBUILD linux-gpib-4.2.0_rc1.ebuild 4552 BLAKE2B 5093b74f8d80489aa357b994d23bd4dae39fc1f979674db0e6e5bca9a5e40899f066347d244581550153e9189bbca504ae806114014534cefe5c2bb841bad871 SHA512 7a48a2016ebafad6e9d5e45e95673ae536d814348447b0fb691e72bbf117940d388d7f8e5c33d736ee30c0bdea20d9f6dbee22e60ac5819b460a048567ba8e5a
+EBUILD linux-gpib-4.2.0.ebuild 4616 BLAKE2B 5eb80245fe59166876d5fbb1d0b99b8c50f7101d54d203528cbfd5fc2599125ff517de3f09a4a9da122e145a947dd9609ed21d75bacdeb71973a484f47f2fdbb SHA512 6f32cafe55805918f05c3549379258cbdab2053d30edde7c2588bf1ab3a7e0fad2f2c563731f8808629b8d10895ae08404d7dd48c5bb9154ce1e6aa57a78dfe2
 MISC metadata.xml 688 BLAKE2B 405c816eb10feec819da0e5994c2ebe1e73ae4882cecf9f619bf30674b9ff499ae044cca42bad687d97cf3aef2a70eb826d5b07695cbde0c164a00cbac576e0a SHA512 d5af868c802d6c01b8267038cc5bdffc61677403ecb88cdfaf97f31d6b80d1e9318bcd507199d6a850df221cda2baf2869a1de4d732cde75a4aea2ec54f944b8
diff --git a/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild
index 7ac1727146f2..d6c4f27cf8e6 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="pcmcia static guile perl php python tcl doc firmware"
 
 S="${WORKDIR}/${PN}-user-${PV}"
diff --git a/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild b/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild
deleted file mode 100644
index daf645239b60..000000000000
--- a/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
-
-inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev user
-
-DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/${PN}-user-${PV}.tar.gz
-	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="pcmcia static guile perl php python tcl doc firmware"
-
-S="${WORKDIR}/${PN}-user-${PV}"
-
-COMMONDEPEND="
-	sys-libs/readline:=
-	tcl? ( dev-lang/tcl:0= )
-	guile? ( dev-scheme/guile:12 )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:= )
-	python? ( ${PYTHON_DEPS} )
-	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}
-	~sci-libs/linux-gpib-modules-${PV}
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	perl? ( virtual/perl-ExtUtils-MakeMaker )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.16-perl.patch
-)
-
-pkg_setup () {
-	use perl && perl_set_version
-	use python && python_setup
-}
-
-src_prepare () {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static) \
-		$(use_enable guile guile-binding) \
-		$(use_enable perl perl-binding) \
-		$(use_enable php php-binding) \
-		$(use_enable python python-binding) \
-		$(use_enable tcl tcl-binding) \
-		$(use_enable doc documentation)
-}
-
-src_compile() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html install
-
-	if use perl; then
-		einfo "Installing perl module"
-		cd "${S}"/language/perl || die
-		DESTDIR=${D} emake install
-		perl_fix_packlist
-		perl_delete_emptybsdir
-		cd "${S}" || die
-	fi
-
-	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
-	udev_dorules 99-gpib.rules
-
-	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
-
-	insinto /etc
-	newins util/templates/gpib.conf gpib.conf
-	newins util/templates/gpib.conf gpib.conf.example
-
-	if use pcmcia; then
-		dodir /etc/pcmcia
-		insinto /etc/pcmcia
-		doins "${S}"/etc/pcmcia/*
-	fi
-
-	# fix rules files
-	local f
-	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
-		grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
-		sed -i -e "s:${D}:/:g" "${f}"
-	done
-
-	DOC_CONTENTS="
-You need to run the 'gpib_config' utility to setup the driver before
-you can use it. In order to do it automatically you can add to your
-start script something like this (supposing the appropriate driver
-is loaded on the startup):
-\n
-		gpib_config --minor 0
-\n
-To give a user access to the computer's gpib board you will have to add
-them to the group 'gpib' or, you could change the permissions on the device
-files /dev/gpib[0-15] to something you like better, using 'chmod'
-\n
-Edit /etc/gpib.conf to match your interface board, and any devices you wish
-to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
-more information.
-\n
-"
-
-	if use pcmcia; then
-		DOC_CONTENTS+='
-For PCMCIA cards:\n
-All files needed for a PCMCIA board were copied to /etc/pcmcia.
-You may wish to edit the options passed to the gpib_config call in the
-/etc/pcmcia/linux-gpib-pcmcia script.
-You may need to send a SIGHUP signal to the cardmgr daemon to force it
-to reload the files in /etc/pcmcia \(alternatively you could use your
-pcmcia init.d script to restart the cardmgr, or you could just reboot\).
-The driver module will be loaded as needed by the cardmgr.
-
-'
-	fi
-
-	if use firmware; then
-		DOC_CONTENTS+='
-For Agilent \(HP\) 82341C and 82341D cards:
-The firmware for these boards is uploaded by passing the appropriate
-firmware file from /usr/share/linux-gpib/hp_82341 directory to
-gpib_config using the -I or --init-data command line option. Example:\n
-gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
-'
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst () {
-	use perl && perl_set_version
-	enewgroup gpib
-}
-
-pkg_postinst () {
-	readme.gentoo_print_elog
-}
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index 4420e92bd581..32c61235d34e 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -4,7 +4,7 @@ AUX metis-5.1.0-multilib.patch 579 BLAKE2B 3e9edf7809a43026bfc7a320b1ff37f2e00a0
 AUX metis-5.1.0-shared-GKlib.patch 590 BLAKE2B 63a10fd00f21cff949660c598fa4519432559965c72f31c35d2a726dbbdfb9d2591c99e92c9520c2021e8ce0c485aa9834445e9f5dfe388f93106e49eee562af SHA512 3157e364f56661c7bc896016b2cda83658f2b00fe7c936e732e80e366ccf6421a1ab6f95d5a74fdb790f4ec8789d048aab9d68b0ccf1eb03f94621f78adb1a3a
 DIST metis-4.0.3.tar.gz 522624 BLAKE2B a09d15de35deb0a41bc7f54254effc68d977349e015b77c5523ed60343f5b7cc737c79b2f9420c42d7a60819c23322ad34770d1dcb93f0f1dea461bca3e7c831 SHA512 3d1388120c9c94bac6a20e2d38d6022c241bb6094cf71e31decf019d5500d2037716c6d615c5db69b536348a54e43f321c33ecfa25335fa6c84e412be227e332
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
-EBUILD metis-4.0.3.ebuild 835 BLAKE2B 4e516f385c8a9f7ea398fee44fa1e90dc2f6662ba878488019a4a9f7d9b636af32790982c5b11ac298c45e473a2dcb7c34d78ed34dbc83f26caa72e35fab63ab SHA512 06bc7c24aa4fb572acd03e25ae552c4b1ecf48462677d40d3deed3098e52e4d01028a6fd5cef2b50e31cc9e32adda74b5cca69b0169b778c51b8955c4f212ab5
+EBUILD metis-4.0.3.ebuild 831 BLAKE2B 711852ea61ac1b9a5ba55aed20cc1ad9d8d49b39388fbcacff05a0917968673748e500ef4732b28eeb67694277246bd58ea9f103893106445657017018e7b3a5 SHA512 31ebca6e275944c533f3720a40e844964cbf1ef606db51ce462f4602deddee4c23cc97aa76c42e853e17c5045f577e02b9b6a58000df32ce7c794459e2c849a8
 EBUILD metis-5.1.0-r2.ebuild 1927 BLAKE2B b553fb768808d3163576834714e618000b2f960c6503a7f23c04d97073b68fd78a7c9dfc933807bf675c09a25a68865a5faef717e21c55767e008ba63ae3aa63 SHA512 7208c15231112a4e57b29f4d0f3678dde907400632d85ef65992ff4cdd7a6597973fde2191a2f11b275932a3f18427ac15791dbafc7bfb9317c3c36703220489
 EBUILD metis-5.1.0-r3.ebuild 1958 BLAKE2B 7d5d39ecc4d520ad2f1488920b15a6feaadd3e08cd38e5e021d761bc222a1910dcb5bce2107c26c9cf3f9a8f0a24ebd480a82252271bb80b6bf54bc7373494f8 SHA512 3745c698d479f2eb6db0d6f131421a91cf0d4a6020b4a8d0211bccf730e8e01ece6bfd1e70ce9bc0e26aabde3f3f0c06ece2adadc516d6aef21eca1428211776
 MISC metadata.xml 618 BLAKE2B 862f647c5562ab3d781bd3cb6a4ec1470cd45941043bbf1b9d09d41c5ad528546e338663400d322d8b1cb6b57e33910a9520b818a81c376451af0da6c037aa34 SHA512 7f46d28a97805eddd9d547ba66263cd395be46b495f4a9651312cfb421714b614d2c7415142c929c99386d32799fe78ea10110471b702487be4072b981ca17ee
diff --git a/sci-libs/metis/metis-4.0.3.ebuild b/sci-libs/metis/metis-4.0.3.ebuild
index 73b9671feace..444328b56d9e 100644
--- a/sci-libs/metis/metis-4.0.3.ebuild
+++ b/sci-libs/metis/metis-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
 SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/OLD/${P}.tar.gz"
 
 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"
 LICENSE="free-noncomm"
 IUSE="doc static-libs"
 
diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index 82790b283ba6..c1fd4b39faf4 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -1,4 +1,4 @@
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
 DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132
-EBUILD parmetis-4.0.3.ebuild 4081 BLAKE2B 47034c2028fea0e7af01c6ca710994686ea79eb9daa902b9c4fc90bb0f67aef3cb820161e89753073beb53cbaed9f1cadba8813929fac3523d3e0297cb5a9484 SHA512 bcba60dc0a2ad5ab4c537b9072b604258a14ad712f85d81f4fc55631b5162e15c29789b3e15054eb1a87b1d631c945a36e3184dda9016d5abdc8bf84bba85367
+EBUILD parmetis-4.0.3.ebuild 4087 BLAKE2B 57e125520954c312e093056d7aaeb1950af75df76203ca6eee29d0daf4dadabb9c9ffa2780a06547d2145c8db49af1a82b76209b25c2c3f99073d6ce9b60d474 SHA512 2e6a24226ba8e4b6c5b8839175eeb7e18e738497d53c6ad2d8bac9653dae774f2750f4a81e0858cc9fffab6fe6bcd533c83c3233a4e2609ac174a521eb5ddd27
 MISC metadata.xml 851 BLAKE2B 8c8fc30f50378b05ae59ca1f829da71f2a5cf66dfab03f645ceed4379bc8edc176fb9e5d1f1f83bbb695519a9e14bfd7855e040f56070a344791eb70eed12721 SHA512 6309c02babe871cd0bdaf509caab79dd8b81face5f6f5a39a1473284dbae6859223ae4f65d61fcf08370bac29dfd0e174cb722fbeeaeb5c80d53b749c265c73a
diff --git a/sci-libs/parmetis/parmetis-4.0.3.ebuild b/sci-libs/parmetis/parmetis-4.0.3.ebuild
index 5fbc940345ef..0351c921efe4 100644
--- a/sci-libs/parmetis/parmetis-4.0.3.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 	examples? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/${METISP}.tar.gz )"
 
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 LICENSE="free-noncomm"
 IUSE="doc double-precision examples int64 mpi openmp pcre static-libs"
 
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 5ce1dd8311ea..f09e286dbcbd 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index 678fe3f2e342..2061a95c8954 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -1,4 +1,6 @@
 AUX arb-2.11.1-pie-ftbs.patch 585 BLAKE2B cf7fd0230dd00a52452b1ad80f284028eab6c35c8aeb160e3f74b924a7c6e422a0740a3954eb2937b5b13085e47a25abc6c8f9dede88bd5f90cac5570c6b2710 SHA512 f147d61a6c9dfac57ded28a7265db9e6be76ebb8c9c787960d4dafc36ef703cebc42ba4a3ca8ef03ae3b81589d6a6a555a7ff381ddc9fd391466156677e0b4ff
 DIST arb-2.11.1.tar.gz 1248835 BLAKE2B 8ba11f3a92103231c4710c0158ce0811b2a01872e1ec7b7a4a4320d27ab86688aa8733df6dd2464aa55c0a506a8a595e4c370848c78b5c3a650e647f0c6d7411 SHA512 7a014da5208b55f20c7a3cd3eb51070b09ae107b04cbbd6329925780c2ab4d7c38e1fb3619f21456fa806939818370fcae921f59eb013661b6bdd3d0971e3353
+DIST arb-2.16.0.tar.gz 1526059 BLAKE2B 14f4a9b23fa6fc46659b742cc95b4970cee74cf52bda8bc696831b0a5c1f946f41f1c2bba180ad1199c55d741366b3376aeed0efbf6ee087b26f6de788519739 SHA512 171c965aeb03cd2830df8a53990403c6da480a94d44385dadfbb2d02697f7c03e8b9a217094b0ad93f796d889a1564f4b9ae9db35ef9de90f61bb2e3220911be
 EBUILD arb-2.11.1-r1.ebuild 1584 BLAKE2B 51a0f06c3357d1fedd7435d362b4f0cba35b4c479a23af1290989b7bbbec14fb61a6cce90292b793ee3692741cf949c501a89806d6f4f0e2b2d0070b268b152b SHA512 a489c8422518fdcb774e42b77c176301d64fc2c4d76ea8dc5865556ad2a1ce6ec562fed29e7c913c37fc69281d9b2d34fd62d2aaf5936e0fc0a6ed7679df0df8
+EBUILD arb-2.16.0.ebuild 1534 BLAKE2B 757103d7596a6b8e82675a480845dd4ef7b391efdc5b43d04963df4bdbd5c4d92603c7e7f67e06a8bc9455ed7d8ac809bd8082e76bccd80a749c2710a64bd262 SHA512 a544ff3bb4be78fb154e8d5988c8eb591bd96928ec163fae68f070ad9d2e6d67664c2d9d00972e48574bd136a6f1c24e4d95287da329fbf8bf1b842380b080bf
 MISC metadata.xml 756 BLAKE2B da8035991c582b71f7bb25866fd86ad79c40640f5685436935bfd6efb26af9e11a31fb28ea83df5ef7f0951ecb26155021d289e0b9926aba03c8c7d9e417677f SHA512 843e473b1cb261c97f817d2c003f632c973a67ba1d8cfe188a40f41cc89fe6167917e2b669768420a7c7c88b19f5b4b68ba4529ab73e373c6696786ecfad11b6
diff --git a/sci-mathematics/arb/arb-2.16.0.ebuild b/sci-mathematics/arb/arb-2.16.0.ebuild
new file mode 100644
index 000000000000..72f391958855
--- /dev/null
+++ b/sci-mathematics/arb/arb-2.16.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="C library for arbitrary-precision interval arithmetic"
+HOMEPAGE="http://fredrikj.net/arb/"
+SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/2"
+KEYWORDS="~amd64  ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	>=sci-mathematics/flint-2.5.0:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# Not an autoconf configure script.
+	# Note that it appears to have been cloned from the flint configure script
+	# and that not all the options offered are valid.
+	tc-export CC AR CXX
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--with-flint="${EPREFIX}/usr" \
+		--with-gmp="${EPREFIX}/usr" \
+		--with-mpfr="${EPREFIX}/usr" \
+		$(use_enable static-libs static) \
+		CFLAGS="${CPPFLAGS} ${CFLAGS}" || die
+}
+
+src_compile() {
+	emake verbose
+}
+
+src_test() {
+	# Have to set the library path otherwise a previous install of libarb may be loaded.
+	# This is in part a consequence of setting the soname/installnae I think.
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		DYLD_LIBRARY_PATH="${S}" emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
+	else
+		LD_LIBRARY_PATH="${S}" emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
+	use static-libs || prune_libtool_files --all
+	dodoc README.md
+}
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index cf253538032e..75f0cc6cdd62 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,6 +1,7 @@
 AUX 50maxima-gentoo-1.el 538 BLAKE2B 0c0810f90f3a64f5e576b9e3480032ad7aa52ede02b8c045ba43a41407d5ce05ece1186f4e7cb73429e82bb983043a07eb141bd8987c3a49694df9f5ae51f233 SHA512 e1325f0d401b80f302c3e6b5d6c0fe8f58a53336f670f73450ff7876ca1c25b8bacbaff49ce05ec1dec1dda08062986ba4b9988927fce835dfca9f24460a0ddd
 AUX clisp-1.patch 1194 BLAKE2B b64764d80b5908a35081b9bb7114e18de266156cb80bae1c764af8c74594a5238e916ed34c547c3053804d68840f2106278dfc83c61445ee9ab9361539315ddc SHA512 05febcd92f6e9d667a8bc8c5c2bf7f02a1585cf5cff8add669716b6fc014ca603ee5bd72e2824db2b8d20cf3f7c9e5cc981c7bce7091c8f5f7ec002a20de40d3
 AUX clozurecl-2.patch 1505 BLAKE2B c5550f79e67dd007c970759c5e734009d1cb4fa0af728d414ce271175770ed32bd2cf5e58c9738e32afa76b0053b2eee77c886650b0ba99c7e0e3176bc946d69 SHA512 41664b77eae0f2c3cc0e551bd2c26c02769faed339b5725dc790691929094cd5d5008169eba9788515392d9fed00919aaacbb24ee91b76f5d51eb6468335cf9c
+AUX clozurecl-3.patch 1499 BLAKE2B 080d9bdd90ba34f9b63e9a3409da90ec84e4de7f35dd0c1aff3be431a6b11c515e10c310a43f987f933d70923a21a5ee63920f88174eb840e2b653975e6512ef SHA512 c5f31f515e1a13d4e0f251e52d2f96142ff917c03e12c52c3463bc576a1add783d2cd4239f8f321495f0c4de5f93e0d4174a95e3c2bc0d63c88683250ac9cf18
 AUX cmucl-1.patch 1336 BLAKE2B 59767907f9f2734fa43e8d9c0e876cf2bf1f2cb0e360976ddd08b4eda9685cd1b862aa072a2f0202733db5ab91958bf0d6b48af3d20e6748f4de2e6b366f49ed SHA512 3b8c01ecbbcd87101e4e31356293216d9c2a018ddabc076905a8b87eeda27bea6cd36242ab6b9caf7553fb9187544beb620b739211c63e21afa1b2f050ef318e
 AUX ecls-2.patch 1612 BLAKE2B 1f06a895ed09844e8d42f462e4541a49de46762a3e9189073a7624785937da2b5ec0e5c54e230652f80bc47a359793c1ed25209061787c3e2b0da76025bdbc86 SHA512 cd37e62c24f24e49f264d63526615537cb088386cfc48f3eac8fcc746d16f6d79c585dee6f24c664fca355f539728a1a23cc75f3672c240a210a407e87b73141
 AUX ecls-3.patch 2147 BLAKE2B d454b620f01d734d6a774f64dbac67f0996aeacc2a029225cc8a9269211169e7b69237f8b734b92b1f037b5abdcd7ec3ba374924b498fdc63025a1eca5a0d9e6 SHA512 1fcaa4a79d4aaf08dd4162c6d59f8f168909320575a43dcb435cbd758338244ac3b89888501f4cb1fc0f9d8d43b3abe587bc898aacb45c19ba0858f74512366e
@@ -13,7 +14,9 @@ AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64d
 DIST maxima-5.38.1.tar.gz 38641257 BLAKE2B 0244b5dbdd337e64d4f7c3e7f6b946463b0246a9fd0660588798f7891fd1599cf400369fe0d1ce3433d01ce2e4b8bc86ad405d3f8368b429cd028362ec66a1b4 SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9
 DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
 DIST maxima-5.42.2.tar.gz 41840181 BLAKE2B bca8a94366f1fe2f508436fdef8de80107b19c9b267a4b72dc6f56870078d35b3feb7dbdda384589b38c5351d6eeede1b9738a5ec2152063de2afacd1ced48c4 SHA512 5033b02272121f6aacff5ededf90eaad5e644a06d0c62aafd745401c08429da979ecd8274f7aa12596a0e32ddb614659af14e4273f59d372fe1ecbec081e7829
+DIST maxima-5.43.0.tar.gz 34605709 BLAKE2B db9db75b7eff0454d4b9595120d726969b4e8b651f611ac69dcd92c4496bf9530ce76867348fd87a33444eef3abb7d123ef2726a7b96ebde9e43f231b21a2b8c SHA512 6611eda4bf81bc5454bf6dd641c73a470cc07b2f768d9550b3abeb7b68f1b4675fd5eca766c52844438e9247d8035be537c7120c9f49cdaed9f918d49ed16659
 EBUILD maxima-5.38.1.ebuild 4823 BLAKE2B e2f4aa9b01a251b0ff0250df56a9b9cb904ea1d859ff32414fc38f48d9cd772ebe5bab5dbe02fdfe87f6c70c848ad9b2b0b724a8dcbd8aecf459d492cbfa6132 SHA512 88dfd3edcef7450247c1c62b1c9c8759a8816ff6ba6691074088253d5ae3922afa828b21e543978617cc022701a2dfc82e2d2436c21430da1249949393cf6e12
 EBUILD maxima-5.42.1.ebuild 4904 BLAKE2B 9e3ebeec6da72caab22651f9e2421d36b7eed178a3aa86d07e7cdc62cba8af5a762ff6394a002138a83f03e313c3c0c80a9f2bf3343a1cb85b3a2182ffae8332 SHA512 0d6ce53ea40e4d34de1958a9e9739ff95179b424ac816b108c30f711784d5c1aed240a16c1b7c26f16b95a4b468c6113b79e434fc4a823dbf60697eff986f54e
 EBUILD maxima-5.42.2.ebuild 4907 BLAKE2B e01606981d1a4bb47d35ba0eece7ed52397cda03a913c1c9d198346db458fd6906d33cde56ac29881c864ac4c7fc14e93d111544005b1a20bfe0836eb0a5822b SHA512 afdc36255024bb493e1b119cda07cf37a9aa871c6b49af412121e45e12be2e510211ea8ad828dda76686d6cf2df435c8eccca7e264297f0abac8138b72d8a56f
+EBUILD maxima-5.43.0.ebuild 4949 BLAKE2B 01d050edf6f5a4677c9e9919d644de24a2ee073f2f104b126b55d06c46a247150171b160d437b893da1828df12f32665bd2d7bef78f8b565f7ec7e38c304dda6 SHA512 1729fc4fe938e78d0926cf4a0fb2b9dce261ccdc8454557037218dc8f65a850fe95fc9bf6b294348a82a784a50ccd984df5a5fda48f9a27774d1386feb0d501e
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/files/clozurecl-3.patch b/sci-mathematics/maxima/files/clozurecl-3.patch
new file mode 100644
index 000000000000..531c6caca9d1
--- /dev/null
+++ b/sci-mathematics/maxima/files/clozurecl-3.patch
@@ -0,0 +1,27 @@
+diff -r -U1 maxima-5.43.0.orig/configure.ac maxima-5.43.0/configure.ac
+--- maxima-5.43.0.orig/configure.ac	2019-05-31 00:52:28.000000000 +0200
++++ maxima-5.43.0/configure.ac	2019-06-01 12:08:22.549425058 +0200
+@@ -434,3 +434,3 @@
+ dnl n.b. openmcl_default_name is hardcoded in "with" message
+-openmcl_default_name=openmcl
++openmcl_default_name=ccl
+ AC_ARG_ENABLE(openmcl,
+diff -r -U1 maxima-5.43.0.orig/src/Makefile.am maxima-5.43.0/src/Makefile.am
+--- maxima-5.43.0.orig/src/Makefile.am	2019-05-31 00:52:28.000000000 +0200
++++ maxima-5.43.0/src/Makefile.am	2019-06-01 12:06:49.990422763 +0200
+@@ -392,3 +392,3 @@
+ 
+-EXECUTEOPENMCL = $(OPENMCL_NAME)
++EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init
+ BUILT_FILES += $(OPENMCL_MAXIMA)
+diff -r -U1 maxima-5.43.0.orig/src/maxima.in maxima-5.43.0/src/maxima.in
+--- maxima-5.43.0.orig/src/maxima.in	2019-05-31 00:52:28.000000000 +0200
++++ maxima-5.43.0/src/maxima.in	2019-06-01 12:10:12.251427778 +0200
+@@ -221,5 +221,5 @@
+     if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+-      exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
++      exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
+     else
+-      exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
++      exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
+    fi
diff --git a/sci-mathematics/maxima/maxima-5.43.0.ebuild b/sci-mathematics/maxima/maxima-5.43.0.ebuild
new file mode 100644
index 000000000000..c537cea53d2c
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.43.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools elisp-common eutils xdg-utils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=(   .    .     y               .    .         y     )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( .    .     .               ecl  ccl       .     )
+# patch file version; . - no patch
+PATCH_V=(   2    1     .               3    3         1     )
+
+IUSE="emacs tk nls unicode X test ${LISPS[*]}"
+
+# Languages
+LANGS="de es pt pt_BR"
+for lang in ${LANGS}; do
+	IUSE="${IUSE} l10n_${lang/_/-}"
+done
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+RDEPEND="!app-emacs/imaxima
+	X? ( x11-misc/xdg-utils
+		 sci-visualization/gnuplot[gd]
+		 tk? ( dev-lang/tk:0 ) )
+	emacs? ( virtual/emacs
+		virtual/latex-base
+		app-emacs/auctex
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-latexrecommended )"
+
+# generating lisp dependencies
+depends() {
+	local LISP DEP
+	LISP=${LISPS[$1]}
+	DEP="dev-lisp/${LISP}:="
+	if [ "${SUPP_RL[$1]}" = "." ]; then
+		DEP="${DEP} app-misc/rlwrap"
+	fi
+	echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+	LISP=${LISPS[${n}]}
+	RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+	DEF_DEP="${DEF_DEP} !${LISP}? ( "
+done
+
+# default lisp
+DEF_LISP=0 # sbcl
+ARM_LISP=2 # gcl
+DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+	DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+	${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+	test? ( sci-visualization/gnuplot )
+	sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+	local n=${#LISPS[*]}
+
+	for ((n--; n >= 0; n--)); do
+		use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+	done
+
+	if [ -z "${NLISPS}" ]; then
+		use arm && DEF_LISP=${ARM_LISP}
+		ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+		NLISPS=${DEF_LISP}
+	fi
+}
+
+src_prepare() {
+	local n PATCHES v
+	PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
+
+	n=${#PATCHES[*]}
+	for ((n--; n >= 0; n--)); do
+		eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
+	done
+
+	n=${#LISPS[*]}
+	for ((n--; n >= 0; n--)); do
+		v=${PATCH_V[${n}]}
+		if [ "${v}" != "." ]; then
+			eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+		fi
+	done
+
+	eapply_user
+
+	# bug #343331
+	rm share/Makefile.in || die
+	rm src/Makefile.in || die
+	touch src/*.mk
+	touch src/Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	local CONFS CONF n lang
+	for n in ${NLISPS}; do
+		CONF=${CONF_FLAG[${n}]}
+		if [ ${CONF} = . ]; then
+			CONF=${LISPS[${n}]}
+		fi
+		CONFS="${CONFS} --enable-${CONF}"
+	done
+
+	# enable existing translated doc
+	if use nls; then
+		for lang in ${LANGS}; do
+			if use "l10n_${lang/_/-}"; then
+				CONFS="${CONFS} --enable-lang-${lang}"
+				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+			fi
+		done
+	fi
+
+	econf ${CONFS} \
+		$(use_with tk wish) \
+		$(use_enable emacs) \
+		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+}
+
+src_compile() {
+	emake
+	if use emacs; then
+		pushd interfaces/emacs/emaxima > /dev/null
+		elisp-compile *.el
+		popd > /dev/null
+		pushd interfaces/emacs/imaxima > /dev/null
+		BYTECOMPFLAGS="-L . -L ../emaxima"
+		elisp-compile *.el
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	docompress -x /usr/share/info
+	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+	use tk && make_desktop_entry xmaxima xmaxima \
+		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+		"Science;Math;Education"
+
+	# do not use dodoc because interfaces can't read compressed files
+	# read COPYING before attempt to remove it from dodoc
+	insinto /usr/share/${PN}/${PV}/doc
+	doins AUTHORS COPYING README README.lisps
+	dodir /usr/share/doc
+	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+	if use emacs; then
+		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+		rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+		insinto ${TEXMF}/tex/latex/emaxima
+		doins interfaces/emacs/emaxima/emaxima.sty
+
+		insinto /usr/share/${PN}/${PV}/doc/imaxima
+		doins interfaces/emacs/imaxima/README
+		doins -r interfaces/emacs/imaxima/imath-example
+	fi
+
+	# if we use ecls, build an ecls library for maxima
+	if use ecls; then
+		ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+		insinto "${ECLLIB#${EPREFIX}}"
+		doins src/binary-ecl/maxima.fas
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	if use emacs; then
+		elisp-site-regen
+		mktexlsr
+	fi
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	if use emacs; then
+		elisp-site-regen
+		mktexlsr
+	fi
+}
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index d122dbccfedd..db72b9b1e7cd 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,7 +1,9 @@
 DIST wxmaxima-15.08.2.tar.gz 5592673 BLAKE2B cacb508cbcb24e27a43998ba0079b14117980669c25b39b017c0c659ef48d2ad338c6503aea99447a14250ed1a68a3414880828fc8ffdcbd3177b8eb9355a919 SHA512 a537c49477f54df4fd9e4e42a5e0d0d740f1ede817d807a98b7cec877a3ad77b2be0a61ae487a7fa5beb193b112eca163b8873292ecab5acf118d58a91e91af6
 DIST wxmaxima-18.11.4.tar.gz 12156776 BLAKE2B 75be0fb88402af011885616a646f7abcad25516ea9b0b375daf02edac5518b113188290262bc431e8bfb4836fc1f731982a1c41c62871818e4d2cc68c96ccb31 SHA512 964de93edc5c46e98de3de405b1873fa0ed594d54f1ddc030377b023110261cb1e6b0b08dbf210551888bf890e28d16e9b1698768c93dde413d5e1918cbd234e
 DIST wxmaxima-19.03.1.tar.gz 12065575 BLAKE2B a376ac6f8dafd8779b6161695595a3f2fc87e8242086a0f97bfb2823151c198a94c824baa9297dd586271ef121fc9af692b33ac06b2266d58dbbab9212c14d98 SHA512 7aa9e03104d276a1cc753a4edfdc0948822efe3ef93b08090a91efc50efe4ec0d913ff5f87069c1433c18f5b8bf086d025dd6bf7560f3b42a70e883914cc995a
+DIST wxmaxima-19.05.7.tar.gz 13832202 BLAKE2B 6afe37dfcefe3f1711cc1cc89e4c61071dff2d49c60742a6d64ece9fa029823f6e94e20eb69e6d6cd8ccad1f5f656670089d593752f4be4d179222f5f2090d53 SHA512 3a7caee5ab03eefd4d2811345678d7b74081b0a4315dcc7739dbf4d265d274bb47a93ace5980a30185a13f40c1c970a8e4ba444bdd64b8b9ebd3b9a263cc6c06
 EBUILD wxmaxima-15.08.2.ebuild 1653 BLAKE2B 1822797d2cf9afbd98b08d4ad3384c118c592e3bf0a40af159bcf9793ec1f18a9e4019e94a270908942101b90b53564ac7c135b8c8ed65a169f70cdfad29c3af SHA512 2cdc1c72257ffe6cbcb6c833f6c0c91b857e784d8df6abb595cf9f6172abc78dbbb558a8835e8781d0fd493f2b18358c6ee7260200c524796c2b61f607b597ae
 EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
 EBUILD wxmaxima-19.03.1.ebuild 1457 BLAKE2B 9808b0a528d892427606f7a96bb08bbe42c4d1f6c0ff6905554a6302d15905a4c0c7cfe4bf54ad4a982a0fe3973455ad48846a46b59bbc0d23ddebfe23dc9ee5 SHA512 223884373b3919e5c5ee9b6f4a3ab488722db92ca3b964b7b09dcc842bd348a9d218b30f73acedef2492234061bcc2787b6fdb3c8110129e93c454a92aa019d2
+EBUILD wxmaxima-19.05.7.ebuild 1460 BLAKE2B 1137943c8725f8a47b31404ff691f4d865f419b9bdc224a851decc4d76c067c4b7dec561039c6b6efa9c6fc8b2643bb8f57f4c94dec60db954b8a02a3d049f65 SHA512 7437cacffb38ce11970036778acb916aadec00ad84e8d8de0f9627bb935e96caac30ede0f6b08ea72539fb3e93d96879796773741d95402df239536418e6dff4
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.05.7.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.05.7.ebuild
new file mode 100644
index 000000000000..6e3b401b1d7f
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-19.05.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
+inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils
+
+DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
+HOMEPAGE="http://wxmaxima-developers.github.io/wxmaxima/"
+SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+S="${WORKDIR}"/${PN}-Version-${PV}
+
+DEPEND="
+	dev-libs/libxml2:2
+	x11-libs/wxGTK:${WX_GTK_VER}"
+RDEPEND="${DEPEND}
+	media-fonts/jsmath
+	sci-visualization/gnuplot[wxwidgets]
+	sci-mathematics/maxima"
+
+src_prepare() {
+	setup-wxwidgets
+	cmake-utils_src_prepare
+
+	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
+		|| die "sed info/CMakeLists.txt failed"
+
+	# locales
+	rm_po() {
+		rm "${S}"/locales/${1}.po || die "rm ${1}.po failed"
+	}
+	l10n_find_plocales_changes "${S}"/locales '' '.po'
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
+	cmake-utils_src_install
+}
+
+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/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 5eda9041133d..5d3514fe943b 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,8 +1,10 @@
 AUX z3-4.4.1-gcc-6.patch 668 BLAKE2B d6d87a3f8204f04359b2843e6988b9ac2c13df9fae5d15ad0309848d98d2b909599f41fb157cb60efa43ec1179952f157cf78f3d7b1c7b5491b640868af7b212 SHA512 2efd883026643f365141665f257a863c6b22ad30327db82ad03719d33abfd58bc681cf4c9db9145098584817e57e59f7b1fe90a5390e72a49bce66cd23481f7f
+DIST Z3-4.8.5.tar.gz 4177051 BLAKE2B f8c4be9dbab2d5cf6fdb0bd8e9e1648f8ac29bc8ca9241b3ef29699400b383f09601149d50899d6ca828abadacb71161af1524df6d1ed45d7fd95c4a49c0d3df SHA512 ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309
 DIST z3-4.4.1.tar.gz 3347371 BLAKE2B 57f090b891618613c4647a89620d12f2ac05ea110268e63b343594f53fa2cc7aa347781001e2778ea7dc1ce475c964ddeced7a82c304b4be706ad164fd17a285 SHA512 76991a24f47f2b53ceb8d7a9a6be19913c57994ffb6cf6acfe30f61b2e73959cf02a99f656053594fccb5aaf4d1f44b3ae7e51f1c8953b213d738ceeeaea74f8
 DIST z3-4.5.0.tar.gz 3573695 BLAKE2B 285cc4d1f998d61ddb0b854044b7c79c1bb4cccf51bbdcba7c4a45698d74d9591f84d0aa74c5ef7c8aea2c6539ac987f29e326b44037e954108df67644dff594 SHA512 1ebc2c908d90b6b879f1e819c864ff894613276af47a440f27cf94968c195656952434754c3eb20f4bdbdd8497d227d22e1b4821c0d320b11052b5648d9e2dc7
 DIST z3-4.8.4.tar.gz 4117081 BLAKE2B 6912defbae0e5444c451c4d7c6fb5d51167a1ae166257c7bfc53044ce7e9b9c4bd9824986c2ae1e6abfd6fef495234c9bea60078f8db2c1faaae11f34d666831 SHA512 4660ba6ab33a6345b2e8396c332d4afcfc73eda66ceb2595a39f152df4d62a9ea0f349b0f9212389ba84ecba6bdae6ad9b62b376ba44dc4d9c74f80d7a818bf4
 EBUILD z3-4.4.1.ebuild 4306 BLAKE2B 7e81603d96667c8e5748467668615f07a9e2194be963b67ae94eb90b29252d7fb53be373df21efbbea007aa8671609f2199fcb8a5f866b1f284228ad0d6e9d00 SHA512 1a370b019b33e83d5984b6abf321b39ff25f3b633ca60b2c48ddf9e33b30252389b5cb6f2e34e0dc1103730c9e5bf60ac688d67914d9c5dae52cf5fc5354620c
 EBUILD z3-4.5.0.ebuild 4721 BLAKE2B 8d0dab01c8c06bb07462bb51311520bb9f600b64ab43dd1ad5975c39554416d1a019665d30079535f5e20cefa5d65c6e6eb7140fd2ebc90cd2c363e9c732421c SHA512 e52d01917d884d10c24bf081303bdef7b1efa3b042f838ebc7de678a473fdd01d7738a216c9e14c4929b847fe7e5c3abe7a92bdafc827a1c1aa54b86abe46664
 EBUILD z3-4.8.4.ebuild 2641 BLAKE2B b5157bbd4f009b269917a301305f8427186a42613645d1656e4f74aff4a3a31bf11b7a735201d54b7022eba010546deb9f053eeff67026e31eb30d3fa44fd140 SHA512 3252a697f537b1929fc732df488b4d89404c08e49a79c1596258de48d887d2883fe4646fdfeb1049447bf86c4e1e63db7ba590426a242ad3d15439dd9a471b4d
+EBUILD z3-4.8.5.ebuild 2643 BLAKE2B 0016ba725593c1d850833b3aa3339b644d5defa96075b520a452e4fb77780c275db4134f64b1fcebd292e4bd0222556e9eb5e062446d69f1b898a71f9f0005e0 SHA512 24576c9210d1e85840fffb56f5cd6b3b47155b9b667c8d25c827d5698a978b02bee2f5314737a961828059454b8a8dc774f42af297f792df46902eec7f00a9a5
 MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
diff --git a/sci-mathematics/z3/z3-4.8.5.ebuild b/sci-mathematics/z3/z3-4.8.5.ebuild
new file mode 100644
index 000000000000..7b359b0b167f
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.8.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit cmake-multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="An efficient theorem prover"
+HOMEPAGE="https://github.com/Z3Prover/z3/"
+SRC_URI="https://github.com/Z3Prover/z3/archive/${P^}.tar.gz"
+
+SLOT="0/4.8"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc examples gmp isabelle java openmp python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	java? ( >=virtual/jdk-1.8 )"
+
+S=${WORKDIR}/${PN}-${P^}
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	python_setup
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp && ! tc-has-openmp; then
+			ewarn "Please use an openmp compatible compiler"
+			ewarn "like >gcc-4.2 with USE=openmp"
+			die "Openmp support missing in compiler"
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+		-DUSE_LIB_GMP=$(usex gmp)
+		-DUSE_OPENMP=$(usex openmp)
+		-DENABLE_EXAMPLE_TARGETS=OFF
+		-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
+		-DBUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
+		-DBUILD_JAVA_BINDINGS=$(multilib_native_usex java)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	cmake-utils_src_make test-z3
+	set -- "${BUILD_DIR}"/test-z3 /a
+	echo "${@}" >&2
+	"${@}" || die
+}
+
+multilib_src_install_all() {
+	dodoc README.md RELEASE_NOTES
+	use examples && dodoc -r examples
+	use python && python_optimize
+
+	if use isabelle; then
+		insinto /usr/share/Isabelle/contrib/${P}/etc
+		newins - settings <<-EOF
+			Z3_COMPONENT="\$COMPONENT"
+			Z3_HOME="${EPREFIX}/usr/bin"
+			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
+			Z3_REMOTE_SOLVER="z3"
+			Z3_VERSION="${PV}"
+			Z3_INSTALLED="yes"
+			Z3_NON_COMMERCIAL="yes"
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	if use isabelle; then
+		if [[ -f ${ROOT%/}/etc/isabelle/components ]]; then
+			sed -e "/contrib\/${PN}-[0-9.]*/d" \
+				-i "${ROOT%/}/etc/isabelle/components" || die
+			cat <<-EOF >> "${ROOT%/}/etc/isabelle/components" || die
+				contrib/${P}
+			EOF
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use isabelle; then
+		if [[ ! ${REPLACING_VERSIONS} ]]; then
+			if [[ -f "${ROOT%/}/etc/isabelle/components" ]]; then
+				# Note: this sed should only match the version of this ebuild
+				# Which is what we want as we do not want to remove the line
+				# of a new Isabelle component being installed during an upgrade.
+				sed -e "/contrib\/${P}/d" \
+					-i "${ROOT%/}/etc/isabelle/components" || die
+			fi
+		fi
+	fi
+}
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index ac04f22ea90f..c5b5ce4b3c7e 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest
index 517ce8f6c2fe..5eb80da597c1 100644
--- a/sci-misc/mendeleydesktop/Manifest
+++ b/sci-misc/mendeleydesktop/Manifest
@@ -4,4 +4,4 @@ AUX mendeleydesktop-1.17.8-unix-distro-build.patch 599 BLAKE2B 8ae42be0372af430d
 DIST mendeleydesktop-1.19.4-linux-i486.tar.bz2 155476937 BLAKE2B 4f2ae744b46940d55e3d3620d72bd35530f906a117edf89a5e020bd98ae79ac2541ea605855f6fcf79ac9b0ca7340cb298bac65c01c42c4014f994c0da47eec9 SHA512 d70e2e7d29bee69b943f800e971a1e02b3c09c80e25113fc91ed2df158100d77fc46932074bcbd19bd0871676f9e0afa0e0fd20dfa860b3ddce72c89597dbdfd
 DIST mendeleydesktop-1.19.4-linux-x86_64.tar.bz2 159335193 BLAKE2B 583238552309c935ffb36ff2904ae64cf6feae4607b0c1f479fd5744bbdd301181702e51b02220a70cadeaa9f4ae1fc4b63d91b75870fd641cee8b5473becc6f SHA512 b3e6cf2ab2a1584121d57f9400ac363a006828c4077d66781c04ba75af18830ca803074c6517675b8d1f979087b1778ba25435ed549eaa4e38b5684d5ed07f6e
 EBUILD mendeleydesktop-1.19.4.ebuild 2893 BLAKE2B 8e17f7197f809b01d9565a1f989515b8f2a9b8eb5099611fffe8d51255e4c332d615c816e9d72e8ba7d249a3f99dcc7127796241e76fd6dcacc64b93f1c1fc03 SHA512 19e4bf0aae5cfbd3a5074af4800b6980ec8f7489c6de1d0a422ce6f8a3a831ba6822029421ee7dd76112331b927cd13b34c2d5d6ec0781d07836e4acd50d0d1a
-MISC metadata.xml 478 BLAKE2B 97747312f4cb9d9a22d1e69a637659b204575d11f9a8f9f85ca15e1cf9479289b76417303f47c8e5fb21c32bcaea8beb007296986626a16721d1111a94d644c6 SHA512 32b39a17092e0a8eeaaf5c3058e67af52302e3a408d2960bcbe9d32633ec200d6fe341dce2000bb6fadaae354ad2cacd00f9f1561034cbc42479c59e97808567
+MISC metadata.xml 386 BLAKE2B f7b77dcf87b678d7daeb1399a8e3523adbbafcdfa3f775bfa349171b6ac8d4af6dde360a2b6c3281f34a6729d1c146b215c2730f6fb895f60a99b7b75ffddf79 SHA512 34a3638dec2839d2c4fab397b571496793d2a87d8d13229e9b57965dc994ce648cc42a561437e3d0fd09c1c9aa1c9a29987709b3dee3365bec59ae0a435f9463
diff --git a/sci-misc/mendeleydesktop/metadata.xml b/sci-misc/mendeleydesktop/metadata.xml
index c9fe662402eb..df5efbe78c2c 100644
--- a/sci-misc/mendeleydesktop/metadata.xml
+++ b/sci-misc/mendeleydesktop/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>marbre@linux.sungazer.de</email>
-    <name>Marius Brehler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
 Mendeley(TM) is a free reference manager and academic social network that can 
 help you organize your research, collaborate with others online, and discover 
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index b84c0f55ea29..f2c35d4d3700 100644
--- a/sec-policy/Manifest.gz
+++ b/sec-policy/Manifest.gz
diff --git a/sec-policy/selinux-perdition/Manifest b/sec-policy/selinux-perdition/Manifest
deleted file mode 100644
index 2c339f10a0d7..000000000000
--- a/sec-policy/selinux-perdition/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
-DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
-DIST patchbundle-selinux-base-policy-2.20180701-r2.tar.bz2 320881 BLAKE2B 12382c64ff8d2acef97ae50b0285061b7f018df0d94034670696b6f19003ee9c9c4f66c711e744696e47145857fcbd577a7762fa807921b40a5366e473901687 SHA512 29453f9deb90b7f982d5a6a3161d79a8171d58d20c0e0de523347d4f1296ad3d4ed970ada0823692e8def4f21756d727628bd919802ec2b1c39087ce5d0811b0
-DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
-DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
-DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
-EBUILD selinux-perdition-2.20180114-r1.ebuild 288 BLAKE2B d8f1fdf63ea6846f2936bfb2c41a9505e5b4cc226901a36319f49d70b747e04ab738dcbaab53759e5cf49351c87885000bc4f71aeb65d2199818ac096ac91254 SHA512 9df1a7fd1d48f1c56e432e84e14eb3083b781861a81c479ad3ea05d919628939253a69d145d640499fb4cddb8464ba962a6beaacd5e2d8afd4522fc9b88d5fe2
-EBUILD selinux-perdition-2.20180114-r2.ebuild 288 BLAKE2B d8f1fdf63ea6846f2936bfb2c41a9505e5b4cc226901a36319f49d70b747e04ab738dcbaab53759e5cf49351c87885000bc4f71aeb65d2199818ac096ac91254 SHA512 9df1a7fd1d48f1c56e432e84e14eb3083b781861a81c479ad3ea05d919628939253a69d145d640499fb4cddb8464ba962a6beaacd5e2d8afd4522fc9b88d5fe2
-EBUILD selinux-perdition-2.20180114-r3.ebuild 290 BLAKE2B 1f31d50c05513a5287369a2d368f6e6cf80faba8c0799ebcbf3ae71b6c16417d000d02d5a5ea571e6c15cb19ef12eafa37f80da31d153ddae0d1f6e83d9142de SHA512 96e35266d3284893d8d1dac92c71641496ac23114c0fb59f854f515ef39a0f2c8fdf189f440d0e62b5964c249cf82ac63a59e4951833fe0c55c287d733f99b69
-EBUILD selinux-perdition-2.20180701-r1.ebuild 288 BLAKE2B d8f1fdf63ea6846f2936bfb2c41a9505e5b4cc226901a36319f49d70b747e04ab738dcbaab53759e5cf49351c87885000bc4f71aeb65d2199818ac096ac91254 SHA512 9df1a7fd1d48f1c56e432e84e14eb3083b781861a81c479ad3ea05d919628939253a69d145d640499fb4cddb8464ba962a6beaacd5e2d8afd4522fc9b88d5fe2
-EBUILD selinux-perdition-2.20180701-r2.ebuild 287 BLAKE2B 611dfc817b75951927f5b72c8d270a2e6b11a8a6f824276405b91fa77a65a3486f69d9f4eb096dbffed0e3db6a233c541ee33ecaa3db2d78cce92d9a3daf37c2 SHA512 6bda4ffe1550ad65a089eed33ce730c917859c61ac0f98708f0b08bb67492e5e31620de695bf5898edc7d7b56a88134d8ae41fbfb9c4906dc48ee67f4fc0ed0b
-EBUILD selinux-perdition-2.20190201-r1.ebuild 287 BLAKE2B 5ab67fd67131d5d0a69c841952ebcfb69b4354fdc262fdb2a87a322c8cc990dd2ef9a89baf95cb90f3d97bf02f4ca550e92c8011ff94f53eeb0a333f0dfe4fe8 SHA512 8d877bb67def825b1949205848a8fb23feabac891b27d156926a77f7a9c4b9678e5d7a49c1dd6640dde6ec686a0fd8449e0fe3d3a155f78a6cf633a1beb6e6b5
-EBUILD selinux-perdition-9999.ebuild 290 BLAKE2B 1f31d50c05513a5287369a2d368f6e6cf80faba8c0799ebcbf3ae71b6c16417d000d02d5a5ea571e6c15cb19ef12eafa37f80da31d153ddae0d1f6e83d9142de SHA512 96e35266d3284893d8d1dac92c71641496ac23114c0fb59f854f515ef39a0f2c8fdf189f440d0e62b5964c249cf82ac63a59e4951833fe0c55c287d733f99b69
-MISC metadata.xml 319 BLAKE2B 5f81c14cad4ee37a46611e0955e94fdf96b7f908006816cc7c7416aedd4cc9e9ee5b15c7f25a0ed355d5797d57f7a7d50ce9512417c9c5ce9056f81ef77f53b6 SHA512 7857badc182ef47415327b8560a32dcf20284532b2c1123cf4b0ce6d4cc3f2d2dfda7b03f6125694d709160ff4a7e54398c381fb49e2215340e419ee360ae605
diff --git a/sec-policy/selinux-perdition/metadata.xml b/sec-policy/selinux-perdition/metadata.xml
deleted file mode 100644
index 460513c09da2..000000000000
--- a/sec-policy/selinux-perdition/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-	<longdescription>Gentoo SELinux policy for perdition</longdescription>
-</pkgmetadata>
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r1.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r1.ebuild
deleted file mode 100644
index b0c6ca82860a..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r2.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r2.ebuild
deleted file mode 100644
index b0c6ca82860a..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r3.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r3.ebuild
deleted file mode 100644
index d84c6e5b0da8..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r1.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r1.ebuild
deleted file mode 100644
index b0c6ca82860a..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r2.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r2.ebuild
deleted file mode 100644
index a02ddb586555..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20190201-r1.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20190201-r1.ebuild
deleted file mode 100644
index 044e1bfb1033..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20190201-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild b/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild
deleted file mode 100644
index d84c6e5b0da8..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fa71eee80cc0..bd3da4c520ab 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 2000c7105142..946cabf00bd8 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,5 +1,5 @@
 AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 BLAKE2B f6196cc7136581ede5437aad909a5c2baa6cda36a27d7e4ceebd0aee2b40a66ef83324b3dde92a77ca0dfca96a47ac342f4a580f38ad6e3a042384dd9e742282 SHA512 e8ac404aed1da3ab4bb092b476cbb18f2ae7d209bcbe6a30cb9058f50dce0f70d64a3de593108ef5588132389d522d19975384eb1b8414119cb622bc7d738931
 AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740424844d62e0e559ad458651965e3ae00853ab4e226dfb0f035daeada6adaa568ac9d9eee517413770d73501d8d712a9f51385f653c3 SHA512 303c933389be6c19e01e43eb074a5e5f72f80cf3f4ef88d8ba52d07c3b6500b6d81a0a209d4abf15a46c617f57486654a74e9f17ba8b39aa438495ccbfa19186
 DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
-EBUILD accountsservice-0.6.50-r1.ebuild 1615 BLAKE2B 582df7bf9fe7548cbb74a898b838c1f697c9a347e6005718e7fa370cbb3dfd1e745cc1342d5cf6b4d51b37cb977cca46f20650346c7f3aea6914f3a41cb30e62 SHA512 738f992dc912e4aa3a96cfaba8b681eb4efb336d06d3b33d93df321ef4a6832ad35359253014d2de456fd43ed05b5be3eac59f123c005fc572aad583812b6f59
+EBUILD accountsservice-0.6.50-r1.ebuild 1614 BLAKE2B 186817bfa9e51d665a856831cbcb537e3c671eea3f7eaa14d7549696720e6977e5b9ede900ec9656f916ebc809eb226da1e8210c9503b724db30462ca4592711 SHA512 fb1187baf22340be9c98adbfdc143288ef2e1bc4e08dfbc1c368e5718b398d6bd6f9816795760693b078cd3057d79c8ecb70dbb4581484296c761aff84088bcf
 MISC metadata.xml 523 BLAKE2B 6117c5e7b8e0120bbae31e46c4d1e3709111638afa43c18d000c975ea0fded590ecb9404e10eca2542b5262cb122be9e34d140b6b3101ad69321cbc2f73a5890 SHA512 41c7b3374cfc02ddd842f13c25039abf016fdc110716cd9f308c4d9050a793c8506d6459c3604eae946184f3d08b2848d63b1bf65eb845f9a551c27debf1794a
diff --git a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
index cd05be8ca8b9..231fdc7776b3 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 IUSE="doc consolekit elogind +introspection selinux systemd"
 REQUIRED_USE="^^ ( consolekit elogind systemd )"
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index c56bbe4d5596..f4c08cb95f7c 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,3 +1,3 @@
 DIST bubblewrap-0.3.1.tar.xz 209924 BLAKE2B bacc4080106cd9876bf0e1ad866a7397d7d232e61a720b52b5a6b9b0d860e625511ed15ac630aa71003fb9fa145ffa9d08ae2e6ba6d1411fd75e7d9568312717 SHA512 74e36caa56540a956158445f5f38c7ac5f7ff3c733ecaf85893de4607900e1fe4050db86a4435cbe18d722e90c5b39c466c555ea8ea8d4944da6207ef1011d67
-EBUILD bubblewrap-0.3.1-r1.ebuild 1053 BLAKE2B 376a916723828e1258c444ea40268c8116ec47fbb533d46ae22bf681fe84dc3ceb5cb7e1e6062105aeeb9b9afb477fff6612edafadc9532e2c47052923d57c7b SHA512 61c04a3ed60811264c6e09955d6cee7998e54c8035654cc51e83598fa160b1f59eab169723efcc768ad68d64863b16f07f493211cf061b3df41ee5cbb3e899ec
+EBUILD bubblewrap-0.3.1-r1.ebuild 1052 BLAKE2B a1a1c85830ff989d7a8a879244f3bef3baaeffaf4fd8fdb5d1d4f8f35b82e249278278103c373373c00bc8bdd541ff906183d913e825cd6d4a5a61440e17cd91 SHA512 bf27b1bcaab8be6f41362f75e82881389bf414df620a82f3ee157661a925e87292607cd5d5c5ead28db832a0ae1418963054d6c4c66c0858152987e42adb3b6d
 MISC metadata.xml 342 BLAKE2B de8d3ba1c95b39bd6e582b27b186ef0805fd9be1fe6c806fb8bcfa28f7cafb3a2068be0e21baa13ca08895db0d0b666b5c1eab573f38fac251ce9d41c793866e SHA512 25752c1aae465ac49409e35c32863b945c1dc8989ddb4fab2999cf890cf4ec33fc82e9324e3af49c15a8580a566e5f737ec270646b4cc569c3c5dd472eb1b2bb
diff --git a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
index 6b58b7d6d3c7..dbd69baa2f6d 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/projectatomic/${PN}/releases/download/v${PV}/${P}.ta
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index c787ef8cc241..813576cba177 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -15,6 +15,6 @@ EBUILD dtc-1.4.3.ebuild 1123 BLAKE2B 0ce6d8ff290534e99b3236173b704f3cd5a8c3810b3
 EBUILD dtc-1.4.4-r1.ebuild 1181 BLAKE2B 4ea4eb40173c5e481fe2d7e935df40e53cce6b79440bd0a12416e6e775e5d367401bc7e040230f43228d8e06a6c20dead191eb30da98454a751877304c011be7 SHA512 de6b2dbd04270c132fce691dec8a1dd7b25c75717c89075091a85d98c3c15f9b154568f4b7beb0d35cd60bd8e775c45a606c7aaf31570d899d64efc85bdfe83e
 EBUILD dtc-1.4.4.ebuild 1121 BLAKE2B 0e6226dce63ed1b6bc6dd96deb179f8451564f99e6a91aeff689a25623a4085a9ed706a9495f8ee59e9a9e415cb8b8f559d8474ac7670f61deec48e9582424f4 SHA512 bea9060f27a2fbfddecf0d3b58ca26c429166e5efe71678f6f3cdf3a59b71c4e27ce6f9ef84806c6527d8804ee7a0a1ceb323c81e301c5f44f3aafef7aa5721b
 EBUILD dtc-1.4.6.ebuild 1217 BLAKE2B e82baa485e5139389f870dd2ecb83c6883af617585c2aa38bf6f1f26fd62c9f1c3c45888f1d305b53a3ba69a5e6c1511284289132499ea5a7b698286d156bcf2 SHA512 06acd8e5b7e8d26acfcc174d158f19a17fcf7f8fe5e5e597b309064773c9424d4032fdcca78eab02ccb3e8894d489ddd0ec8db88081f3645026b5488e7dc43ba
-EBUILD dtc-1.5.0.ebuild 1236 BLAKE2B 8ba0593e2fff77c60976b3dc47d2650fa5eaf369883051cfdde29d5c25062252f3b4b94120c889aab4ace60d06fba0297d24a98415dba33d11976d46786870f0 SHA512 1571c470a9fca97f75040b9723ce590ebbf76fad93d4484b17a0402139bf3d28216e68cbce43d0f8a83baf8e316fbfdccbbde389447bc2b646235fe838c00fd1
+EBUILD dtc-1.5.0.ebuild 1235 BLAKE2B 3215b7aafb7834810c43bd0b00ab3ea325969bad2ae84a3898a11c7eb5509d8a8410afddc1005b67a705cc04077ba9f322363af89c73b021fd615c140a9b81a1 SHA512 cb46e8b8b461fd32eeec1335188e79958a5e2fd844b1c3163bd51b1f9b932207eeacf805b8edce4b5045488c823d99e9f6aeda635cb5f0fd91644ddfe4ec4a86
 EBUILD dtc-9999.ebuild 1181 BLAKE2B 4ea4eb40173c5e481fe2d7e935df40e53cce6b79440bd0a12416e6e775e5d367401bc7e040230f43228d8e06a6c20dead191eb30da98454a751877304c011be7 SHA512 de6b2dbd04270c132fce691dec8a1dd7b25c75717c89075091a85d98c3c15f9b154568f4b7beb0d35cd60bd8e775c45a606c7aaf31570d899d64efc85bdfe83e
 MISC metadata.xml 335 BLAKE2B 123cf55da545acd9b0b568ca010eba5f7818f43bf020f412a479397f08cfb571f7cd83f4b8c63c97d3ab3216278b62e6eff03a8c349f3b6758b1a41d559787b4 SHA512 757b9539f0dd59ff4c25127df262c6f030c3e4ddf4a4044a77bb7e2ee126001adff606a683b3af24f11d23604919366fa42cb496941ed232a5169ed2eac7c631
diff --git a/sys-apps/dtc/dtc-1.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild
index 4268a6db11c7..e20ccf043e55 100644
--- a/sys-apps/dtc/dtc-1.5.0.ebuild
+++ b/sys-apps/dtc/dtc-1.5.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://kernel/software/utils/${PN}/${P}.tar.xz"
-	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="Open Firmware device tree compiler"
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index d04126c34efc..bb482087d861 100644
--- a/sys-apps/elfix/Manifest
+++ b/sys-apps/elfix/Manifest
@@ -5,6 +5,6 @@ DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf06
 EBUILD elfix-0.9.2.ebuild 1131 BLAKE2B 6b23b4204cee8654d34140967e95d0f6e8d5340ebf12948a168c260fefc0dc8f5f8891564579c52d27b3a7b79cb260ae7bd2f008489e4d83d809874fa49c593b SHA512 0b2eeed50d4478894cf3e3d576fef84d725caca54da95e41e98698c4a1fa226172d9ae8fa2b343f59db2229aa5596a7fdb8266868a63667f548567d262a4d451
 EBUILD elfix-0.9.3.ebuild 1132 BLAKE2B f49fd5cfe798d82dc4f2629ff4b4a89ab009f893aea00f9afedc7b6967ba285108cc39408c9e87a9e3479288cffb0fc07e02fcbf555e5be04b2953531f2a89e7 SHA512 ad0ed8032bf426f47973dfb5e3952645f384b09f1f1cefa496725b80cfdaecd0b6d1c90adbe645580f6464339cd0fe4db314b9318dd8361e63f60b79554a45c0
 EBUILD elfix-0.9.4.ebuild 1127 BLAKE2B 77304b496841a74540cb10daedef9ed538ee2814d0e781dc23962e1c3aca6e556d79aaac59f54b0a91ac22da553c808b7ccf3d4737dcf7e7dd8e0c984a6b0129 SHA512 ae6de33cb4d494b432e7c3ad424f4a3762b68a3c98f94fdd2a512713feaf71855b61fed3b14547c544fccac95c093e03bbe40c1d139d9a34b8c06b5bf4d70ed6
-EBUILD elfix-0.9.5.ebuild 1128 BLAKE2B 493486bf54f10c6fcf0fe2a5bdc028c2683327c07334138df7da93429401e4c1ca4d28927af27c55755dfa2e396701e9a19965bbae4cfa759ecb9d4df7db11cf SHA512 e7a1ace9448bd42ee0ca374826457b5fce8f6a95fa1f412ef7822bd5579e3adfabfccd031f29048cad4a7a7c06164bfea54d6b0f448ae0e8ff5161e5d93db3e0
+EBUILD elfix-0.9.5.ebuild 1127 BLAKE2B 77304b496841a74540cb10daedef9ed538ee2814d0e781dc23962e1c3aca6e556d79aaac59f54b0a91ac22da553c808b7ccf3d4737dcf7e7dd8e0c984a6b0129 SHA512 ae6de33cb4d494b432e7c3ad424f4a3762b68a3c98f94fdd2a512713feaf71855b61fed3b14547c544fccac95c093e03bbe40c1d139d9a34b8c06b5bf4d70ed6
 EBUILD elfix-9999.ebuild 1137 BLAKE2B bdd63adab9dfcbcef879b4eb35b15168533315f85de4098dc4477c6836615261e7c6a508c987a460c16836590ec26212fec6142b6b7f16985408c335314e8847 SHA512 00f937ff54b0e32255a6e59a3979340d70665b818a363d7c953c8b6aa7d79c6d55731ba23ee8b3e0a3ccb2f32f6eee2993df0879c5c51b60bfd77d740b5439f7
 MISC metadata.xml 496 BLAKE2B a26ee20b4388a77bf12e032c2091b534653874b6f0880775298da89286487d07709511d64e52b0240206d661f8874c55d4d87ce3bdc73e60e9a1432a232cf219 SHA512 b934fa247d4d5bb1d188de8bead5980aba83abe50423dd1e56c534b762b535faa242dbab58021e91bea43951542dc4f5885aff3754cc0957f01e86832bdd2c5e
diff --git a/sys-apps/elfix/elfix-0.9.5.ebuild b/sys-apps/elfix/elfix-0.9.5.ebuild
index 4a7d339328a9..c5af80158a39 100644
--- a/sys-apps/elfix/elfix-0.9.5.ebuild
+++ b/sys-apps/elfix/elfix-0.9.5.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${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
 
 DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 301cb250de88..b8f8c5a0d902 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -2,6 +2,6 @@ DIST gawk-4.1.4.tar.xz 2367832 BLAKE2B 67004e2867e4c4f43aac7142a52c83642d8bb3b0a
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
 DIST gawk-5.0.0.tar.xz 3000432 BLAKE2B d7885442c615e2b7986d6cb617db3ac376a5e572ab2aca3c6b2bd0f43feca4374f310bbf2e2a875b617df97cfebf98cb983d169468d51db39058b83eb9771afa SHA512 9eb663bbcad53165b7ddb7d72cfb8377252b68004733a9eb8c191b2ddddaff857e48ba811280311384243eb67574fbe7ac9edf4e507f9a82d67b4b2adff8ef6e
 EBUILD gawk-4.1.4.ebuild 2083 BLAKE2B 8032292269399040c80899263b2c4026ce5ddc8de078f1596d28aab56cb01a8a14b056264b9734d5765eee0a539158d090051219081cd19d2686e7b6f498f7a4 SHA512 e56f386e1a0411eddccc98e6702a2d10ea5ffab6be2f509e078dcffcf14ff20dad11e414235379311e6a74fa90a39b16171f11bd32c79d175f1e8dad6d00a408
-EBUILD gawk-4.2.1-r1.ebuild 2557 BLAKE2B 553ad8befbef028548ed7527a13a10415f4cbc7147fbe9f1ddd47a960350aedc7a08dc08b47973731d1371cdfb65a7c04873faa503b3916a4f2c02daf8920b5c SHA512 b9aaa58fe10e350dcfffd38ae52f9a5d6877c1d20369a2e076b5709f913ffd421411ad2f0cfc83d7cbe36fce0575fedb3aacf29b4c4c7292eb1c9f7587e64e9c
+EBUILD gawk-4.2.1-r1.ebuild 2554 BLAKE2B ab620a7ad4d854f4d54dd3c8eaa17308bcba51f80e161240f04893aab413a4807062b804245cdccf94de2ed042b272787ac91e9da582fb2da21a4038b448e0a4 SHA512 c49146b46688fc7b8b2f46a31b1866d7ca185dee47d468410e71f47ef664b55a82dd2246223cbb915400086c5268976f898414784557fc7cb4361cf7618580c0
 EBUILD gawk-5.0.0.ebuild 2567 BLAKE2B 8fc7398e48c66542cdb31a1b54647536abb256e5646c4c568a7c245a22073e710598a5319eddb8e36e6d1ae63650fec42571b73da18903d11557516774bf09e6 SHA512 92fc9e79ce27424f70091ee52eabd66ee4dc583e6f0fc8800e16a6c04f9318757a5164f5bbd0e37e6c484fb3a1a11c399d2927f4e68caf68744db88756bc6d22
 MISC metadata.xml 465 BLAKE2B 4ae9d07b535014b76695db5d04b7a8b984c045dd78e90c8e7b0b3215a3021e5b190bfd89ca3f0dd5d9d8f1b55340ac57e40e02509e0d65288032458a0a247096 SHA512 517baceec7b9ea9311d1a946df59da35e6a5619344426ecdca6ff56e0da876ae1e6f793417e5d563da0f4528c535026deedf451eb6da8c7140db69709342a3cc
diff --git a/sys-apps/gawk/gawk-4.2.1-r1.ebuild b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
index 49debd231903..b64c6634b595 100644
--- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild
+++ b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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="forced-sandbox mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 16f344d81c9d..6be14c7c0b64 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -6,5 +6,5 @@ DIST ipmitool-1.8.18.tar.gz 995313 BLAKE2B 4aee2b1488a8a97348954dd1555baf3d576d7
 DIST ipmitool_1.8.17-1.debian.tar.xz 18252 BLAKE2B 6219d81b6b54354e8e412850fc1ee673e2dead153076d55c67fad0518e7230642934a52ba0abea29d8b1f47eb7beef10cbe25a7b8a4df158d4b44b1f1e229f4d SHA512 e1133262020e8fabe47e7aa308956078bc9fb3bb7033413230f1cf76aca1d4733bac64e52039365f24fe54a1bf8e271071bdaa1722720fca62f1c9e8888777a8
 DIST ipmitool_1.8.18-1.debian.tar.xz 19140 BLAKE2B 255c4da005946f3b118a127f96fc5daad02a170ea079d7a765a0c7650e1eb7e50ad49b31fca95312b49e5a524e04a8a21215cafb1a8451e5b2af2aaec22cda75 SHA512 8aede337d07987decfd032898f194d32730eced443630ac3956676533d693fb2d17a175ef14218cbcd55da44f6b17714f676a912a1d5124a15a995e01d2828ef
 EBUILD ipmitool-1.8.17-r1.ebuild 2443 BLAKE2B 4204805a6f363de5f658168821d8293b20ec61f68447c31c3448c28701e6246bc0cff63a78acbe655bb0ae529a637dda89b917b2f9a949ed43630f248990c97c SHA512 8824e25c00e9b9406fddec2caa638fabbcc1a1d8207a7784e2b6bf7d8c59bc6a668edeaf199a3a347d4be2e046b4efc5ab5198c242fdf9395ee825d6e2df8f2d
-EBUILD ipmitool-1.8.18-r1.ebuild 2569 BLAKE2B 58352bf57941a9044b897f57802b7e565f284842783d3225a5cce0a4d0a282420cc847a7f1e06e97c73aa426063d106281b8b98cf7e131cce0e920419b8fce56 SHA512 adea900dc23c6fafcfe12b9de5029a4a596a0295291da439cf045a07c421cb98b520616fb87ed0da6641840cc32866acaf900f862f4875a60c46bdca93ac2ef8
+EBUILD ipmitool-1.8.18-r1.ebuild 2562 BLAKE2B f43bd010f7ed3630404d34951729923df9f5c125f4d6b567d061929f15ffeebba9aa8c31ce0933393137f0f588d3d969ba2a0e03594f5e7d7767da134b41ff5b SHA512 fa0e7dd14d49aca336212089ab780ce68bc040e37a156a5aa73e3f37d8e2ba61a0907a6237adfe4f44a33a23595a8d2b6087f31d99ec31a30dd30711292089e3
 MISC metadata.xml 570 BLAKE2B 2211290e4ac3a12d1a05528925d3c69534073c2624023244ed263aa312de28e5cfd76ff284870777508fd6818fcde18f9d740f9499cc5819078aaa84f46fd07a SHA512 16820cee9cff78b0137cbfcd179cdf78a503c583e8ca3e2ebf13094e21419770eb94205371b61c74c2e75f351d95ed74e6eaf060d748554c6602552ffa9151b8
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
index 6c26d8e0980c..925d59f5d912 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 #IUSE="freeipmi openipmi status"
 IUSE="libressl openipmi static"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 hppa ~ia64 ppc x86"
 LICENSE="BSD"
 
 RDEPEND="
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 02ee423a740c..12feb96b40a1 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -3,6 +3,8 @@ AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c6
 AUX irqbalance.init.4 524 BLAKE2B 473ee234adf186f620ec022cf20d61b3aaec368611659ce29be47e1038a0d54e4c353264326353cfbca9e43486e4b9bff17086c8484357512dbd9dc74997ff06 SHA512 3b438b142915139d403f6162271e00807db6f0e9432798b3f2955e798dd58ecb07a6c8920cc85032e65cc5a6d4c16fc65402119d6334920ea6715c4f918f6cbc
 DIST irqbalance-1.4.0.tar.gz 53431 BLAKE2B 35271fab011cb917e5472079025f88df45142b0622d94570f62ef7cce7f2a4e9c9c0b77a79121afa5e7edf4510707c7ace52e894b2af44a5a26b543160f481d0 SHA512 d95909c5e86efa452d0d440df0335b398bd2bf973d6a84e29068534f8c4dc033df90913bf507a6d1b7cdab11b288bafbd2c88b4e476f04e32d5f4c89efe4f7d9
 DIST irqbalance-1.5.0.tar.gz 55150 BLAKE2B b111e9fd4cfec968b261f6ae8a6876d15845849ebf28d7304fd8af3bdeb93b8b9a626888c5728b69925f02a5e472c3512f5862726c6ae9a4d378c46ebcf39069 SHA512 343421fd533d7d161fd05a0edfadaddf1da6ced854a19e9f10ea6c12b97b2ef1629aad855214d9700d31d056bb816bf3ec90cdf7c643a1b6e8af1de5befa64f5
+DIST irqbalance-1.6.0.tar.gz 55310 BLAKE2B 67589a40541e9034a0ac09d60a2293dde7a0cf524620794e25b60b4d78f2c91270252f6cebc2c91c66aed105536a211d51aeb29305fc1235112d96b714dc80bd SHA512 ce89dc41eb3aab5950a56b4b1c817aae5e87eaa84bc69bf88618caf53386513e488bb0b4724a600ae175c96be509367cfc418c7f85531007f80e02f7de549b16
 EBUILD irqbalance-1.4.0-r1.ebuild 1372 BLAKE2B 1e12173e698ea23c7b1a7f76b189d96f9dd5ce8227c6b3a9880602651d84f329d7c8cace2026645e31843b163956880b9fb9058da653341d34b7169ba6536b95 SHA512 336cf37b2def1d788592c40ad1e5aafc124e01a0ecfc5d3ed62bd43e7ff9e1bd1c5dfdacdc65dcca254ec65aaf4db0d5af825796c2a33f19ee56b63e00c69080
 EBUILD irqbalance-1.5.0.ebuild 1323 BLAKE2B 7356a75e040053615424aa6c349c1d545f17cf854adc20cb748bec506530e044f3adb65cc740a6107caea49bce7c903c9551e240062ed83a9ea602d544b3ea48 SHA512 f4471a3b3056a3a3a4e424817024a1db01eb596f4e1d474a52623179e962de5b64ad101d7a0d4fef997e84c1c6b73d32fd1cf0a6c4e80e9c215a2f08845db804
+EBUILD irqbalance-1.6.0.ebuild 1312 BLAKE2B 15b955847573ae02a71f155b51581319f602692f02a5b1a7336635b186f70c4947328e1ef72397fe43c0e4042288f9afdf60c7cfb63d5311978aad55823860fa SHA512 5c318b5baf762149b5084f89eb3c04e2051536fbb2110490e43e6f89015de6444891197f22f9b5be48638053d47d5c1d3af784d78f0cb28551ac38f7c5e2b074
 MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04
diff --git a/sys-apps/irqbalance/irqbalance-1.6.0.ebuild b/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
new file mode 100644
index 000000000000..d2cdd3beca3f
--- /dev/null
+++ b/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd linux-info
+
+DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
+HOMEPAGE="https://github.com/Irqbalance/irqbalance"
+SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="caps +numa selinux tui"
+
+DEPEND="
+	dev-libs/glib:2
+	caps? ( sys-libs/libcap-ng )
+	numa? ( sys-process/numactl )
+	tui? ( sys-libs/ncurses:0=[unicode] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-irqbalance )
+"
+
+pkg_setup() {
+	CONFIG_CHECK="~PCI_MSI"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	# Follow systemd policies
+	# https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
+	sed \
+		-e 's/ $IRQBALANCE_ARGS//' \
+		-e '/EnvironmentFile/d' \
+		-i misc/irqbalance.service || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with caps libcap-ng)
+		$(use_enable numa)
+		$(use_with tui irqbalance-ui)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
+	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
+	systemd_dounit misc/irqbalance.service
+}
diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest
index 9204a316d9d6..79b37b7b67c2 100644
--- a/sys-apps/lsd/Manifest
+++ b/sys-apps/lsd/Manifest
@@ -6,10 +6,14 @@ DIST chrono-humanize-0.0.11.crate 11546 BLAKE2B dc0627852f00daa020f529fc37d5caee
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST libc-0.2.44.crate 347920 BLAKE2B 04fd82a1aab02a25a1201f6c463c0b30547e69dbca161f9b0ad87bfcc5b9b8427267fad3534c0a900c23fdb808b8477e20047dac396c8d000657266753786abf SHA512 fda87b206acb1a65be60784516c7d4f4aacb1ce53063e3c67a6a5335a02b3a7232867d11b0cdc574131d562fd98471df8bd0427cc5790c4add0556b2a090b284
+DIST libc-0.2.55.crate 400416 BLAKE2B 157b4f9d221f562e37ccfdd662a6777c8c6c45d1d2c9f9ff0f9d4d1bdf1aa66dac9f61a220e5be65fd7bc01273335eed86291e158f64da26bd7b398af26663e2 SHA512 649155c45a098dc043a42a0df19a7a43100f104bda1ce1a3bad9e5070b5a9c3a73f67197e286fb508c9257315b2e1d2a6eb4cba35f909ef0a2b1f61e1a29b196
 DIST lscolors-0.5.0.crate 15937 BLAKE2B 27c9d42fbdfa32ce9f01fc627c2a758544dccd72f2b63f232b4984287f61f5f4dc8788a30ad60ae92ddc374b7b993b577bbc0d11a03c61756af81cc672300fc0 SHA512 97d881cf248dee1a744e6016941abb80579518ede0883e419b6c452215ddc0b2a6336c6c6c254e4f463cfa7f3a648ea56fef1df0ff044daba98c2d03e1731013
 DIST lsd-0.14.0.tar.gz 33646 BLAKE2B b0bc5f8c9ef764e8e2c1a17da144e507ff6181bbde88a002950b47fb1678f4f4790e1cdc9e438c59ebf8e84eb7ef4c7a6308a45c21c75d63b56d0b5078bef987 SHA512 f1c17b63769f7c390a36e2ff99caf6d1da326fefc041a992986f756614a70db5aae4c87a0a33e416a6096d8ce65f0c0cbed50d168a8d0ca6dc2e97f0065593a0
+DIST lsd-0.15.1.crate 38136 BLAKE2B 6540beb147161fbce2bc59fd97221b961d87a0fe27f23c7b7e168ee80c219854ab1929f4fc92afa2cf70dc82b8ee2c9f7694e9aa9bac91f3c37ccfb981e8e53d SHA512 ab1ba61901c372a39a7e26eda5b53adceb0b357dec998f880d23a8e97c3addc16bf1d6e21cac262f23bec3d4061b3e9f6734d85d856b8e649e8b33805acf094a
+DIST lsd-0.15.1.tar.gz 40728 BLAKE2B 6e3b6c432f23b476bdf53cc0a6bdb353c9c4151e718cb6b848824c9a128c4e34f4c34ab9ff415bc76124e15addcaa989d629ddde009a4599dab146323a7607e8 SHA512 58a280615e72f9dc685e49532d147c17d94be099f80400add15b983d5945d98004a6a636f7f7a76809376dc07cab25f44d716a4b00456db0201c34f935952ed3
 DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
 DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
@@ -26,12 +30,15 @@ DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c3
 DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST users-0.8.1.crate 18406 BLAKE2B 9e6c36e04a64fc5e1e33a4a5714bd360d10c254cd4140c008e00cbdca7b1699e0f66aaabf8dfb8d9c9142ceed4c39af357d6d754c07fe2aa38364128fd6fbe97 SHA512 04de8d9943d9b929ddf060e08f7a019662a0ce9fb7423a8c09c81d52462bf86988f99c29f51d19ff2c72f53cc9d2179f3a57a68e544611427a1c016cf8a474b0
+DIST users-0.9.1.crate 20456 BLAKE2B 49a2dd188f8d944d361a4e58f3f437718af7510c2b684e22209058e97dfd9d5ecec2c901cbe2cef36ab74d11091b1280de8b94135da523f57b02372ed5571fe0 SHA512 e372f8402d241e924c77a13621053836a1a36a6a6b9b66d5e187a582be0a85638270ea140c048e07f6739ed228711095fc98705303c499f2b542fd548df0819a
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST wild-2.0.1.crate 6946 BLAKE2B 00aef7e2de0ed4c055cfdfcd3b1bd03ff53fac394ab76ab9173ed1e13992673252a35ec03a36ff0ce115d1f17e54a9af829301bb9df24ea2cc7cbd084861ee01 SHA512 001f83176ab74b1ebff70fa63bcb93d66aee8eb7519d917af3ba894a208b2346da38ff278b26b11affde90755530ea707918c9476e3b0c72951d23bcb1677ec9
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD lsd-0.14.0.ebuild 1163 BLAKE2B 175ce505dd0d0dda5c45f9a28438cc9a42aca08ff6456e24353177260e23c2b624a9c37960fd44e24bb2545c44e6575ffbe68b854e2ffc381d5e14b2a3be45aa SHA512 c2017256d9a8f218b828944157420787805787362c74d12953c523d8a51ba4090ff661bbc5c05562c84c4fcca062fd8459260f4ae6f56a023e32641c50442f56
+EBUILD lsd-0.15.1.ebuild 1198 BLAKE2B 20831852880793d640f57e149bf15cbe3249329f28998f5beef8174bb911a03e28a8c091810883e52a822eace54131021d7af6e33b5407930b07aab1abb53e87 SHA512 11b31ade354e54d4676ab386c4f2bf079883ac4d0d1e796f32c7a84a416e1b85e01ba49552593685f102ce108dcd314c647f034c2de31bbbb1cdb6221b5b17d8
 MISC metadata.xml 759 BLAKE2B 46f9729d738136d537cfed0a59cb6be6821b5b59bd4381171fce99943119cc477c54b03f303be47451ba9f8929fe94bb62c32881eb730ec11e306517afca505a SHA512 98a410b73a6a4f51f3e949a6e78087052580ce53e4720528aa9e97d3ddb052b6d6e1055cd2609f07d7a605c499e620843842461d514ddc84644f6cac007be599
diff --git a/sys-apps/lsd/lsd-0.15.1.ebuild b/sys-apps/lsd/lsd-0.15.1.ebuild
new file mode 100644
index 000000000000..25a04b987bfc
--- /dev/null
+++ b/sys-apps/lsd/lsd-0.15.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.11
+bitflags-1.0.4
+chrono-0.4.6
+chrono-humanize-0.0.11
+clap-2.32.0
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.2.11
+kernel32-sys-0.2.2
+libc-0.2.55
+lscolors-0.5.0
+lsd-0.15.1
+num-integer-0.1.39
+num-traits-0.2.6
+rand-0.4.3
+redox_syscall-0.1.43
+redox_termios-0.1.1
+remove_dir_all-0.5.1
+strsim-0.7.0
+tempdir-0.3.7
+term_grid-0.1.7
+term_size-0.3.1
+terminal_size-0.1.8
+termion-1.5.1
+textwrap-0.10.0
+time-0.1.40
+unicode-width-0.1.5
+users-0.9.1
+vec_map-0.8.1
+version_check-0.1.5
+wild-2.0.1
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A modern ls with a lot of pretty colors and awesome icons"
+HOMEPAGE="https://github.com/Peltoche/lsd"
+SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=">=virtual/rust-1.31.0"
+
+QA_FLAGS_IGNORED="/usr/bin/lsd"
+
+src_install() {
+	cargo_src_install --path .
+	einstalldocs
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 85692489ea63..04a877a9bb45 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -2,18 +2,10 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
 DIST openrc-0.38.3.tar.gz 238031 BLAKE2B 87d1546e21d581feda4064cd64bf43f762203becdcc4b002bf868f17403bd42770cb1106a8bc383c8d69e19ad66ad2bedaa7090c95206597e8a9b6e2ba481dcc SHA512 6bb42ccdab5fb24b11f5042bf19850f440d3494b6bd1d7b8db31b592f051fcd26feac1c8d9ef515238c53c6f5bf98a8c367a48471c178ae829e05c56bd24cfde
-DIST openrc-0.40.2.tar.gz 245006 BLAKE2B 9e0aab4d42121296cb9bcc47e9222e0e99df80ab686636a8060c6271d30ff7c0d999f851d0e24dfab9e7a6532b56a6a1974cfa4514e88e6b82ec5fbbc192d76c SHA512 746e238f792113397486b9abb6e41c8179e51fe823c82c8e8942d71329a806b9c398628f835e2626ed0e8735c05b0dcd1b82bf9b5111f420105eeae6b0b0e3f2
-DIST openrc-0.40.3.tar.gz 244510 BLAKE2B ed40506693c642358d46fc5fce9b3fbe6e2b699b3e3ed5bbf47ed349e5f7a5c7c1df07a7621622681af33fd68b197d48bfe4aa32e68a8231380de9a01055ced8 SHA512 65dbc5900a22c37af4aab545c52bb7679b4534755bdff0b0e8cba442a3c5fefa0b987caea74cd572dbb791e060116ecc298fd787b9d7efc8eab009b8b44ca3e4
-DIST openrc-0.41.1.tar.gz 245187 BLAKE2B be20b294e39fc5820a40afe2f3391222d5770f362fd424abe3854974e54d8e84689c3704b5efa48f0fecd7ae9f4282ad734dff9af9ee5f19a30a4239a673fc82 SHA512 b810cd7ae01f7fc49ff0f72e6d0ad1b41b0fc3eb9c15f58001d9aa8e9d7845b272b93d5ac6e175b09ab588b99d87292256486c4129cc208b70249bbbe957485d
 DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
-DIST openrc-0.41.tar.gz 245438 BLAKE2B 30329692dca5165bbdc5ac9207a798e62de8380f6249bf2b7e7703cd897465f1d6e81cbf11f5d1f4d2e0810be99e1b24538a2d304214f5b0827c71c47d99b9d6 SHA512 15d18f0169b56ec7e08e0c36b0be1e4b27e7375ddd9b0f828c895c03d2f5eb818195ae56b10a66c7cfd4c21f8b35c0fc06fcec41fd9ea1be58e2f2ee409fb719
 EBUILD openrc-0.34.11.ebuild 10093 BLAKE2B 4f1e8fd970cc608d56df44eefe714390bf68ed18f499ee305f9e5908703f5b36228932e2b7384301021af330ac2ae5455f5b07cbcd6d5da475c042386b31fd9e SHA512 99ddc25723791ca82cd80c55790da6738b796d9fdd61c804821e3e26e4c8be5d9eeac56a9c689977008ce01f56b49319f0b5f65a5d7a08b318c9f38040553928
 EBUILD openrc-0.38.3-r1.ebuild 9773 BLAKE2B 6b3d3d72351f0eef3d1adaf0aa43460be7f5c3c09a26451bb7c9fb9a42c384de211f91ae36e86335dff4845de3f0da831a00aa7a2fbb69f2a7740a94129ba4cc SHA512 d094cee5ecc89fb13ee4077145d284b05d1ded359a57cdaf2d526b205dbe6aec0da8ebd511f7a013e195740f5ae901a45976ac94a52be29903aea8062ebcf716
 EBUILD openrc-0.38.3.ebuild 9835 BLAKE2B 6af429b27930becc7b9b10f73c1641d4a7c7e305aad5d1c5ddfc3c585ce1ab7792bee80b260d46d550289cf2f4758235ae138d73dbf8310a6f71d31cc5b6ef96 SHA512 b3061e6608834a13c30668ab354e4438eb66cc5679fdd6354b7fb037f1820807112ad3d912656cba7273f14160b595a0feedf15bfb16b63bfb7f742bec38668f
-EBUILD openrc-0.40.2.ebuild 9961 BLAKE2B 8d4939143cd8b69ad26101bf1435e2f9113fead51240357e1a7878c50f7aa671f447b419da416dcad1cd501e7504cdec0e117349ca4f7b46b8a1be400791e8ab SHA512 9d665e6a921d4c899e225419a8dbd36aed4d8cea32bc51d6dbff30eec24677ff441351fc0bb98c47c947b396bcd0eaa245b64b47ce82606070d5a829753a8a68
-EBUILD openrc-0.40.3.ebuild 9835 BLAKE2B ee2c443b679b36e0c84fb093a08312972b06c032388087013321a09666dc4c02626ad69105d752323b03e88814639ea8a5a28081eddc6f1da738c7d0855176f1 SHA512 00029676e14e23895f460fecc01b7582ef22498b1b8ba2c3154146d17ec8478015b4a58889ae6de392c1bd1c96e1eb632526ff97e2ea9ece3d6a7e48d0340136
-EBUILD openrc-0.41.1.ebuild 5798 BLAKE2B 3adf45a24828616eaea50803e8da2037bda1b02db7043a3a0baa3c04e4b1f41fc12416bf4ea7e74e903a9df8585667c8a2f8898040b71516468729cc45aba051 SHA512 cc49d1ecdc6bd7f68e2ad1cd98b187b428e63d708717db5f61eced82b631d4078b3916e7a101d65826c6bcbd0e7b7707e069aeda88550c483d52180b83e54993
-EBUILD openrc-0.41.2.ebuild 5800 BLAKE2B 68ccf838a5a15b85d76f3f4ed8fd4715e85dbb27c26982c819dccc8493b897de7e26f858d21c8cd102bf0ee103a32e4c5016f950eaa90208b5f5b82e43d13ad0 SHA512 ecce7a0db096d4cfaf0a3d1371c6eab9608acff369ff1c08b1ef605044cf4c5819e2c5f59d52459559538cc1792ec424f2b54fdc4e01ab3043a155bac310f5aa
-EBUILD openrc-0.41.ebuild 5798 BLAKE2B 3adf45a24828616eaea50803e8da2037bda1b02db7043a3a0baa3c04e4b1f41fc12416bf4ea7e74e903a9df8585667c8a2f8898040b71516468729cc45aba051 SHA512 cc49d1ecdc6bd7f68e2ad1cd98b187b428e63d708717db5f61eced82b631d4078b3916e7a101d65826c6bcbd0e7b7707e069aeda88550c483d52180b83e54993
+EBUILD openrc-0.41.2.ebuild 5797 BLAKE2B ec825a9faeba05f2d2a7a73acf0d8ae5160b4bcb38ed402372bf617ad67f6f9cfdbea2e46f27df89755290a44eafe956b5e70b0801249cc39c5dff8da8bb5c15 SHA512 b21ccea9086c25a41e8c49454eae7a95ddeb63fea5001c8a9f0380ce1d2f244688c263b7ac0adfef54711928db19f53652e13a688d1d2a34a7e03ed46a06ad02
 EBUILD openrc-9999.ebuild 5798 BLAKE2B 12f880af7b9ec991c0bdd296d3ae71cb5cd2bc11a524c7c863d3fd28ad49a9d72a891f973e7223584967a77e9bf44e6b92b2fbdee6815d5b4161e942aca77143 SHA512 8e543a6c508c403e254406d6001c8e2186362a7301081ca6fea7df93afe6b20168bb79af3504e05cf43ef68c98170b3cb3a552e018e8343cf54b46898a8bf366
 MISC metadata.xml 588 BLAKE2B 84f38215d00d7f25c4eb723712720c6476dc1406508c897fb6b610105e7cb04b48a2e6bf8d134e6b8fc2f5107db2fd66da80f102916be202d5003a897a99cfd0 SHA512 e581f7552ffcf10b05a30586728ca85c4fdaf662eac08796687396cccfe3d515c52a943d6f7d3d72dec58d7d57e16ec43dec2b282dc771b1fbe9c22f7ae69a63
diff --git a/sys-apps/openrc/openrc-0.40.2.ebuild b/sys-apps/openrc/openrc-0.40.2.ebuild
deleted file mode 100644
index 03c55deff415..000000000000
--- a/sys-apps/openrc/openrc-0.40.2.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-	unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-	)
-	audit? ( sys-process/audit )
-	kernel_linux? (
-		sys-process/psmisc
-		!<sys-process/procps-3.3.9-r2
-	)
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	!prefix? (
-		kernel_linux? (
-			>=sys-apps/sysvinit-2.86-r6[selinux?]
-			virtual/tmpfiles
-		)
-		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
-		MKZSHCOMP=yes"
-
-	local brand="Unknown"
-	if use kernel_linux ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-		brand="Linux"
-	elif use kernel_FreeBSD ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-		brand="FreeBSD"
-	fi
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	if ! use kernel_linux; then
-		keepdir /lib/rc/init.d
-	fi
-	keepdir /lib/rc/tmp
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-	rm -rf "${ED}"/etc/runlevels
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-add_boot_init() {
-	local initd=$1
-	local runlevel=${2:-boot}
-	# if the initscript is not going to be installed and is not
-	# currently installed, return
-	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-		|| return
-	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-	# if runlevels dont exist just yet, then create it but still flag
-	# to pkg_postinst that it needs real setup #277323
-	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-		touch "${EROOT}"etc/runlevels/.add_boot_init.created
-	fi
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-	local config=$1 initd=$2
-	if [[ -e ${EROOT}${config} ]] ; then
-		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-			add_boot_init ${initd}
-		fi
-	fi
-}
-
-pkg_preinst() {
-	local f LIBDIR=$(get_libdir)
-
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-	# termencoding was added in 0.2.1 and needed in boot
-	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
-	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-	if ! has_version ">=sys-apps/openrc-0.11"; then
-		add_boot_init sysfs sysinit
-	fi
-
-	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-		migrate_udev_mount_script
-	fi
-
-	# these were added in 0.12.
-	if ! has_version ">=sys-apps/openrc-0.12"; then
-		add_boot_init loopback
-
-		# ensure existing /etc/conf.d/net is not removed
-		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-		# this needs to stay in openrc ebuilds for a long time. :(
-		# Added in 0.12.
-		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-			einfo "Modifying conf.d/net to keep it from being removed"
-			cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-		fi
-	fi
-	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-	if ! has_version ">=sys-apps/openrc-0.18.3"; then
-		add_boot_init mtab
-		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-			ewarn "${EROOT}etc/mtab will be replaced with a"
-			ewarn "symbolic link to /proc/self/mounts on the next"
-			ewarn "reboot."
-			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-			ewarn "if you do not want this to happen."
-		fi
-	fi
-
-	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
-
-	if ! has_version ">=sys-apps/openrc-0.40"; then
-		add_boot_init save-keymaps
-		add_boot_init save-termencoding
-	fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-		add_boot_init udev-mount sysinit
-	fi
-	return 0
-}
-
-pkg_postinst() {
-	local LIBDIR=$(get_libdir)
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-	else
-		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/sysinit
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-				"${EROOT}"etc/runlevels/sysinit
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/shutdown
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-				"${EROOT}"etc/runlevels/shutdown
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-				"${EROOT}"etc/runlevels
-		fi
-	fi
-
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	elif ! use kernel_linux; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	fi
-
-	# update the dependency tree after touching all files #224171
-	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/openrc/openrc-0.40.3.ebuild b/sys-apps/openrc/openrc-0.40.3.ebuild
deleted file mode 100644
index 51661733bc06..000000000000
--- a/sys-apps/openrc/openrc-0.40.3.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-	unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-	)
-	audit? ( sys-process/audit )
-	kernel_linux? (
-		sys-process/psmisc
-		!<sys-process/procps-3.3.9-r2
-	)
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	!prefix? (
-		kernel_linux? (
-			>=sys-apps/sysvinit-2.86-r6[selinux?]
-			virtual/tmpfiles
-		)
-		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
-		MKZSHCOMP=yes"
-
-	local brand="Unknown"
-	if use kernel_linux ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-		brand="Linux"
-	elif use kernel_FreeBSD ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-		brand="FreeBSD"
-	fi
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	if ! use kernel_linux; then
-		keepdir /lib/rc/init.d
-	fi
-	keepdir /lib/rc/tmp
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-	rm -rf "${ED}"/etc/runlevels
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-add_boot_init() {
-	local initd=$1
-	local runlevel=${2:-boot}
-	# if the initscript is not going to be installed and is not
-	# currently installed, return
-	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-		|| return
-	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-	# if runlevels dont exist just yet, then create it but still flag
-	# to pkg_postinst that it needs real setup #277323
-	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-		touch "${EROOT}"etc/runlevels/.add_boot_init.created
-	fi
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-	local config=$1 initd=$2
-	if [[ -e ${EROOT}${config} ]] ; then
-		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-			add_boot_init ${initd}
-		fi
-	fi
-}
-
-pkg_preinst() {
-	local f LIBDIR=$(get_libdir)
-
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-	# termencoding was added in 0.2.1 and needed in boot
-	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
-	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-	if ! has_version ">=sys-apps/openrc-0.11"; then
-		add_boot_init sysfs sysinit
-	fi
-
-	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-		migrate_udev_mount_script
-	fi
-
-	# these were added in 0.12.
-	if ! has_version ">=sys-apps/openrc-0.12"; then
-		add_boot_init loopback
-
-		# ensure existing /etc/conf.d/net is not removed
-		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-		# this needs to stay in openrc ebuilds for a long time. :(
-		# Added in 0.12.
-		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-			einfo "Modifying conf.d/net to keep it from being removed"
-			cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-		fi
-	fi
-	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-	if ! has_version ">=sys-apps/openrc-0.18.3"; then
-		add_boot_init mtab
-		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-			ewarn "${EROOT}etc/mtab will be replaced with a"
-			ewarn "symbolic link to /proc/self/mounts on the next"
-			ewarn "reboot."
-			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-			ewarn "if you do not want this to happen."
-		fi
-	fi
-
-	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
-
-	if ! has_version ">=sys-apps/openrc-0.40"; then
-		add_boot_init save-keymaps
-		add_boot_init save-termencoding
-	fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-		add_boot_init udev-mount sysinit
-	fi
-	return 0
-}
-
-pkg_postinst() {
-	local LIBDIR=$(get_libdir)
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-	else
-		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/sysinit
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-				"${EROOT}"etc/runlevels/sysinit
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/shutdown
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-				"${EROOT}"etc/runlevels/shutdown
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-				"${EROOT}"etc/runlevels
-		fi
-	fi
-
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	elif ! use kernel_linux; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/openrc/openrc-0.41.1.ebuild b/sys-apps/openrc/openrc-0.41.1.ebuild
deleted file mode 100644
index e0ea72a5f608..000000000000
--- a/sys-apps/openrc/openrc-0.41.1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
-	unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-	)
-	audit? ( sys-process/audit )
-	kernel_linux? (
-		sys-process/psmisc
-		!<sys-process/procps-3.3.9-r2
-	)
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	!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
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
-		MKZSHCOMP=yes
-		SH=$(usex bash /bin/bash /bin/sh)"
-
-	local brand="Unknown"
-	if use kernel_linux ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-		brand="Linux"
-	elif use kernel_FreeBSD ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-		brand="FreeBSD"
-	fi
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	if ! use kernel_linux; then
-		keepdir /lib/rc/init.d
-	fi
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	elif ! use kernel_linux; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild
index e29ea2e2e329..f1133a48f97f 100644
--- a/sys-apps/openrc/openrc-0.41.2.ebuild
+++ b/sys-apps/openrc/openrc-0.41.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.41.ebuild b/sys-apps/openrc/openrc-0.41.ebuild
deleted file mode 100644
index e0ea72a5f608..000000000000
--- a/sys-apps/openrc/openrc-0.41.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
-	unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-	)
-	audit? ( sys-process/audit )
-	kernel_linux? (
-		sys-process/psmisc
-		!<sys-process/procps-3.3.9-r2
-	)
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	!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
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
-		MKZSHCOMP=yes
-		SH=$(usex bash /bin/bash /bin/sh)"
-
-	local brand="Unknown"
-	if use kernel_linux ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-		brand="Linux"
-	elif use kernel_FreeBSD ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-		brand="FreeBSD"
-	fi
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	if ! use kernel_linux; then
-		keepdir /lib/rc/init.d
-	fi
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	elif ! use kernel_linux; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index a971c97e7b97..653015d273fa 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -2,6 +2,6 @@ DIST osinfo-db-tools-1.2.0.tar.gz 447185 BLAKE2B c8ac2556d552bbeee0b8e0615ac5cbb
 DIST osinfo-db-tools-1.3.0.tar.gz 456012 BLAKE2B 5c29581f4947caf4ee06f435891cccaeb53b9514cc2bf4ad4bac1e8ee38ebeb61678ee886389f837c9f578f1df93ed94f8492165e1613d1bb60b246ea5c52428 SHA512 e488db70b85ba8d5abadf6c50a772f7cd338405c9465189a70eb0da1b488434cd234118f44933847cd05406f55831d08db767932794798270be5964fa4c3dc1e
 DIST osinfo-db-tools-1.4.0.tar.gz 519089 BLAKE2B 2c2e0cdbcd0a795f8deb09727b8b971748f5d0ecc08449238d3054cbd947a0f6059456d4e9feadded47cd0e0aaa87132f1bec7524a3183115dd459eca989d1b0 SHA512 f4813f948551f630cc9936986abc3ef4455647ec529b353dc4fee71f8071beeebac0a2ee1988cede92ea3635bca9bedd400ac9f275e3f5592ff50236d97cfb91
 EBUILD osinfo-db-tools-1.2.0.ebuild 837 BLAKE2B b6ef18efa3f75872bc3ce03e134b3b2e37cf8192bff0fb2cc8e14bc51033a7917233acfe87c9029dd151ef70b5ffca6501ce703feb369601dfe45d780d8442c0 SHA512 8ed562896a204d14fd3d421ec64ac75ca5617f53b1b35f1e99cd18da86eb232fe108bdfe99d4adac99fcb2b954f8ccce4c2a3a784b71877514bedc42ea1b8fa2
-EBUILD osinfo-db-tools-1.3.0.ebuild 857 BLAKE2B e1b75f5ca6052eb15fbf9fe485db0674587f065f0b525f9638d40ed98ee97dfb3e25566bc1923f0fcc98bd00ffc2ac07fd546962bd098c89f6f60ce3564a6d76 SHA512 136f2c0103b370fac5880ba3b53ba8f5dc6fbf31138eca1a44efb73a28876c2dba6d0e0088b0f07b473f22783a69ce5c3faa3c412492fa4524d34ab9e42b4e42
+EBUILD osinfo-db-tools-1.3.0.ebuild 856 BLAKE2B f88cce749dcb0a174a2ccb44bccf87288c8d1312355cad4cf966fb0222a7a66fa4deea2182a650050a41f30883420ae72f6e36441c5eaff800763dc8e7fa6aa6 SHA512 6564edefd5f04a60a1c2cd4e1684117155c271843bd1c0e002cebe636cf8a004eb9bdc1cb3cc156989dfe482b0d5c1970f3efa807ddc10734c8f2f923b03cd94
 EBUILD osinfo-db-tools-1.4.0.ebuild 859 BLAKE2B f10102e3647b3886a5f38bb0c93e2039f708d362911a1895b6f7053ffb262bf6b19deaac7c8896bc2425b488f758b6e5e67f8a38723307aa244c81ee7b5731ee SHA512 347a9ba28c4749a5e8f2d6038edcd305ae8a5065d9ee5ac0641cc6de0c761aaed60769292be401979f3bbb4f4f8d3a2677238f81e0c701c7d099b2b80996b6e7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
index 9dd1c75e8cb7..0850c1e52e71 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
 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"
 
 # Blocker on old libosinfo as osinfo-db-validate was part of it before
 RDEPEND="
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 3b9ccf4782c1..f143b02e8ae2 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,7 +1,7 @@
 DIST osinfo-db-20190218.tar.xz 82712 BLAKE2B d026b428171127b5048357ae75e2601fc184b9e2e5dd7224a7ba1a439ebf20e567bd910ab4b8a0920d3f8c0e2e8be637086920ab905a8fd8eb98c772a13c234d SHA512 e6b6f0e8b965ecf5a6c38071f3b2d5646123a6d84a5d5ebfb59995f10ae0aa8985bc5caeb1a4de396b92be0466291bc82247f33138f7954c847651eb682fdad3
 DIST osinfo-db-20190304.tar.xz 83024 BLAKE2B a0ad9a24f7dd07dc672b2106bf9f767456bc64f0500cb713257eefaa45f1b1a15b1116f0ac6611966ee6750ff519da8d71c746c930ef5e3c5ca54780d247eed8 SHA512 b8a2911da9d84682423ffaf257ffc9e97bc0abf835d6d5929e7e544167a86ca85b882f549e692c1919a49d79815dc32ae86cee99284c7a1c7b9a55de72368ccd
 DIST osinfo-db-20190319.tar.xz 85668 BLAKE2B 9e1d95379c659dc325a0fa5d7d8e6abc6c486839cbf42d78e0964583f19258f2e6669e685bc09cd13f17ecd04cc3d1cf3188d862d12d2825636a76d9d2999b8f SHA512 fb06adeaf639e71b02bec30dafbc405e903d490cd8038d4fe94de63c4d0bb9f617a469e59d11fd4dfc5c1c0d9a6094b888ce5867634c0cbe501e5195316a8e75
-EBUILD osinfo-db-20190218.ebuild 669 BLAKE2B d29946d42d126410a729e435b3a96ce0f821c1f04aa303cd1c6e084c3c7b01252a5b093f8c31faaa5ead9e7780bfc8f23a2c304350981520c7154ef574fabbe4 SHA512 32a262472b53e1ac376f395dd6bc79a393f3619234385fc1259423a51951fe73a9b851d584321d373cbc422df09adc9e7265976cf907d117db7d97617b390534
+EBUILD osinfo-db-20190218.ebuild 668 BLAKE2B 0e4e429414a0a894b5dacf340fd5ce5be4dd7aa60d86c6c1508f7b60af03535831b9b8c55ff470f8ddaad5526425a5d805cc4fa17db2fd5aa880a73c9809e8c5 SHA512 b2ef8af5554474858ace472c8e7230cac8bf77efc45c6ecae37642eb719e3d5bcaeff6a52580bfd8d840c288e38455242ea8ea756cb6eb7eaf68c6521cd4618f
 EBUILD osinfo-db-20190304.ebuild 671 BLAKE2B a50dd6a39f6f582e400ec534a0d8d28f60d850131dde1787b356059a7a8c95530d70fc77c8336ef6da24c6888ad4054574a2a661bb045f6d8a3936a5fef0a957 SHA512 222ea69587a39969f785e84cb346f6e4db2c73f09867b5d10f0b142997ad1ebdd38e88c3154a06476fbaa758589a720039cc036cd865e1e0abe80db3f6a2f1bc
 EBUILD osinfo-db-20190319.ebuild 671 BLAKE2B a50dd6a39f6f582e400ec534a0d8d28f60d850131dde1787b356059a7a8c95530d70fc77c8336ef6da24c6888ad4054574a2a661bb045f6d8a3936a5fef0a957 SHA512 222ea69587a39969f785e84cb346f6e4db2c73f09867b5d10f0b142997ad1ebdd38e88c3154a06476fbaa758589a720039cc036cd865e1e0abe80db3f6a2f1bc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20190218.ebuild b/sys-apps/osinfo-db/osinfo-db-20190218.ebuild
index 2c81e1a380c7..e74d64604535 100644
--- a/sys-apps/osinfo-db/osinfo-db-20190218.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20190218.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 1714aa906394..de51e2e360fb 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -3,6 +3,6 @@ AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab1
 AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d583988cc87ad20b5c2d20559f3702dc4525dcc46c4afabf817c1e76f4a080ca277f9ab01ebcf67441f SHA512 24fbd0fe2847f6c7bb961e4e0d9fa5197d408971fc33fa7652893ce9dbba958d19b02be7688afd4e9617520f93b6544af74968d6fcc3b31ad73b3ac585e87500
 DIST pcsc-lite-1.8.24.tar.bz2 755670 BLAKE2B 22cc072978e221d455373e1fdeb21ae8f3dacdd188a4e8a69ef44202924e6c17c4282d424c88ac32b04c62af6e67787f2d2ba936bd3e3667452b32c40254de28 SHA512 df2e6a7a8179563a6dbf654ab75cf78a4b297b0562214a081d7d2b5d00fd4adf92fd892bd16aacf9d5e2867f3ad46c88a88e5834e311011f37556dd7e8936a0c
 DIST pcsc-lite-1.8.25.tar.bz2 757099 BLAKE2B c34727833206b4c868e4f0cd6f8bcaf6899695a92488df8e2fc815c00771ea2f248d9d5fa457c02fc437b8350cbfa37390e07f45b90d08630c8afc34b247034a SHA512 0da63cefd70d9524b2afabd62c5f404758c805b84bbe9ef64fb801ef91a8934c38495513022565ea31bd8550b23bc95b9e9b098ddc76930e3d0643c1fbfb5deb
-EBUILD pcsc-lite-1.8.24.ebuild 3144 BLAKE2B 0235204e65ba8bc7539ff5266847603adb349ed82426cbb189db15baa12ef8d7f2066a120107a3e9abe08b5eef2dda841692d6aa3c9572eb7483219058ffb5ac SHA512 9c4cdf1797b7b0438fd07b5f5bbb32f8bfbc6e3ba8c4df6f6e6d0fe5a22a62305e59c19665c936a7a815835ef70d97db5eae38e154a18b299105746c6efc63fe
+EBUILD pcsc-lite-1.8.24.ebuild 3143 BLAKE2B c8ef25ce037c708a6907b6576bd445221acb5649c480627d2b0b0986b3982970a2e6248bcc96895bf68582e41e7a0c4d0b3f39e8872822df9e7439db04de690f SHA512 9acabc5a46749c7e629f50d45acf32d587a6e493af63d9c91231c0588c9d944d9292425d20f6915669f2102d4ef9be277bef33f3ca4ea8bd95290adae78569bd
 EBUILD pcsc-lite-1.8.25.ebuild 3157 BLAKE2B 6acae101029143740b7f89583039e2c9055e297969b654b7085dcc79daa5d9e5a9512b59bdb649f9998782d62b4c8207c0b9561042f38fba675091544e0c7bff SHA512 da22534015b24d6bd9c84e42231648417e18ca43c87ea1e4a60037a214947a3132afaf42714b3af978db9b361bd6835ebaafa1855cc9d25417a8f0055ffa8023
 MISC metadata.xml 1077 BLAKE2B d13414e4b691e3df98ce7fefb9939a2cfd224d7ce76b78a72c0585c22acf18939ccee85a5f19791ccdbb8e31e8ba93cb0c537dc86a8a8820435efbef07c7d941 SHA512 4abc19855a868236dfdcfa6d42fcb901fdf52796e08b589a1413c78b931aee74fd482121ff67da632c2cf2e1ba018ff02f1122f1dac5c2185046f98952efd838
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild
index 39ccd7d8856f..93765f85c0f2 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a10dc622a4c0..ccbb7ceedac8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,11 +2,10 @@ AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a7
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.62.tar.bz2 1021442 BLAKE2B 37d5dab0e678ced78e0ff4dc9907af3d20370a4b0f52cea9118be3d06bb14e24fe6597d86c9bbd9d3ed2fc51f9e031d4e9ba84f354b945f7a399da3cbb95d74a SHA512 d4eca7e70573aae07a0522b4bf361191fded00fa02c5e6d8f70cf72c19c4dcfa9be7169a267afdc58cdd0a8ee333774a7779ac08dee3490aa8e8a1ebd39deb49
 DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6 SHA512 f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
+DIST portage-2.3.67.tar.bz2 1025172 BLAKE2B 4557f11eca511766532214630b948f884149a6cae2e7110813a2a3700be448c057500c1708daeca5419e4bcdfcdf4a26e8002a2437f5c0a7731e20d201124021 SHA512 921b8647bd6cb879320b5ca3edf42cbff1e64bdb13a922a4fc2be6e2868dc94966734c1c2b508c75552b95f7e9b970a2ec8f93d02602ce6c351bd700613392d9
 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
-EBUILD portage-2.3.62-r1.ebuild 8035 BLAKE2B 5dd397f127a026d71cc6f68f0535d985caf5552b0ae177f1d3ef05a732041e7fdcbdb34d65413d39bcc6af3bbdfb8ebf46eed1a69d5e98386287bf2e6ca4ade8 SHA512 cef8a210807a39382724d25b640d8df44cc074e6d162dd1e0993040688f9029401b5d0b1b60468231c189733eefb55adac720498b00c41a6386c9e177ad3bd7c
-EBUILD portage-2.3.62-r2.ebuild 8221 BLAKE2B 8178e8eb1e7bcb547a105ba19c624107889bc54912f5561ac2b1b3fc18f73da2d44a65787ffbeb2c6762c9e5c5a142689d45c410adb63ff151ba68a09e99eb08 SHA512 50bdc431f9834aeaf8e9fbe6ba428695fb7854b79e4eef4fe7287bb29e353f22644b23ddbbddfb5ef627311eac5ed1f12c65f63b72b9e45adcff48e07742d5b1
-EBUILD portage-2.3.62.ebuild 8817 BLAKE2B 9cc32f74a006391e990db7ae908865aad2b2331538c2eecc39f3fcb801fc942185e8bc077fd058577f563cbf1d9571ec8bc437310ef6d1d112f56fb749b9ae5b SHA512 4e59aa06af7150e382e5a7ca11610050887bb5c1e938a0ccc0a86df44a077da353dc73917e28cd8ebe945580cbc0f84d9344f8bdd7cd76ae8715b6236f686db2
-EBUILD portage-2.3.66-r1.ebuild 8227 BLAKE2B e867ae91e17f0abb1ed7442c76d681f3b9b03210c48fae72f8fa1d1575cdd2b40ea9c9c0b33cb2b7d641ebcf51ce8c0af547b1a51d15931e253d655b9753e8f4 SHA512 07196de7bb371fef4b9e99657e48fad612602cd93e0559cdfb3f2e22e17f80625c9a420f16207d24ea6ed6a9c9aed4831d264529632671a6e34e403eab2f1a17
-EBUILD portage-2.3.66.ebuild 8038 BLAKE2B 8abb025b72e0f28153041ea9d26517f97ff40a3afd73472bb924c061ed7a13ac7b4ac1f87f0c1b3b81f901fa8b0fe9cc1d91e7c788787e067e1678362acd574c SHA512 f1fb1c35997f8e5131a5d2b5e3fa761621ac166cc3e38da0e94b6090fa63a36842a46bffcd00c89caa39fac0c48e5b89aa309ef7406b9350c216201f7d662a41
-EBUILD portage-9999.ebuild 8675 BLAKE2B b49a405da2d13baa80938559b5a570f74b67e47fca1bae46e43e5cf7caea7beb8e729b4dae3a1462733cecc1e03d821accf0a3cfb4d41a686ef12ff3586e4574 SHA512 f4664ee367396b7eb2070885e71edeed724604c1a5b004366488741ba7dbe0d40633c07b28d3544c6603bcb6cdd211c2c076902577c6167c1faca495d20c5795
+EBUILD portage-2.3.62-r2.ebuild 8240 BLAKE2B 929e062620f7e1e6f6fbd33940341e81eef5c18b18898cc8d5ecc942b15e97b77833118a63fbc146d486f2d3e4a6a273d1998f145e0603380489d895f7d35470 SHA512 2875ecf940c0b413ab50daefeb04e74a7436a0d519a1746f0fe58c4e69dfcbfc7bb803435cff8418c38491e154a56335bc8833670548c05fc90157518a44df19
+EBUILD portage-2.3.66-r1.ebuild 8237 BLAKE2B dc383ccc99383d6bae6d1f9c6b9df81575818738b147ba322d3164935675d0ee8265d5257e0b4662af6bf1b3c2a6536ad82666f0004a90eca2013c1612160e52 SHA512 bebdc7d49bc5d831799d7741203e22736ce03f613c2e150a3461699ef23f36005e40a30a31fab8b5e04cc40ef3f62f0e5fe6d637a234f06bf3c53103ba002be5
+EBUILD portage-2.3.67.ebuild 8050 BLAKE2B 599ed6a44c6fb522b30a439610bc210df555065d7ba080683bc54ae86662385fb637e20e71d2142d1e45fe48e68216d74afc24da46e77d6ad6e3004636f2e6d8 SHA512 4edabd7c51886fe033a5cda8096c664e9712e624710d72029064223ab228ccb8a4021f52f20f4d436da8702edf5234d40d1d92f04593cb2e2f6f171f1a7541f7
+EBUILD portage-9999.ebuild 7909 BLAKE2B 1116fee5fe17096e2a5b33cce164c6dd8e1f7a8cb04716e0218d001df4a09e957541b8267f0bf92e2b7f80a868aa0aeb081a4f83d8fa9529e619e682b8f4b480 SHA512 8b0b42bf555c092fc43aedc3c38f9eb78f7ea77b315dda867aacaddae4f7eba05434accfad2aa91e4d1a31d9ebeb9453483d3a5d6e5cdb785bb4c30ef6aaaa79
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.62-r1.ebuild b/sys-apps/portage/portage-2.3.62-r1.ebuild
deleted file mode 100644
index 1e9a64d698cb..000000000000
--- a/sys-apps/portage/portage-2.3.62-r1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_5 python3_6 python3_7
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 epatch linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# 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
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! 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 ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.62-r2.ebuild b/sys-apps/portage/portage-2.3.62-r2.ebuild
index 17b1506e277d..6774b1d55632 100644
--- a/sys-apps/portage/portage-2.3.62-r2.ebuild
+++ b/sys-apps/portage/portage-2.3.62-r2.ebuild
@@ -150,7 +150,7 @@ python_prepare_all() {
 				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
 					die "sed failed"
 			fi
-		done < <(find . -type f -print0)
+		done < <(find . -type f ! -name etc-update -print0)
 
 		einfo "Adjusting make.globals, repos.conf and etc-update ..."
 		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
diff --git a/sys-apps/portage/portage-2.3.62.ebuild b/sys-apps/portage/portage-2.3.62.ebuild
deleted file mode 100644
index 822bb125eebb..000000000000
--- a/sys-apps/portage/portage-2.3.62.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_5 python3_6 python3_7
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 epatch linux-info systemd
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# 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
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! 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|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i lib/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.66-r1.ebuild b/sys-apps/portage/portage-2.3.66-r1.ebuild
index 8dcb19f89cf5..1a381bdcdbc7 100644
--- a/sys-apps/portage/portage-2.3.66-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.66-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -150,7 +150,7 @@ python_prepare_all() {
 				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
 					die "sed failed"
 			fi
-		done < <(find . -type f -print0)
+		done < <(find . -type f ! -name etc-update -print0)
 
 		einfo "Adjusting make.globals, repos.conf and etc-update ..."
 		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
diff --git a/sys-apps/portage/portage-2.3.66.ebuild b/sys-apps/portage/portage-2.3.66.ebuild
deleted file mode 100644
index e6f67479a110..000000000000
--- a/sys-apps/portage/portage-2.3.66.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_5 python3_6 python3_7
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 epatch linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# 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
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! 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 ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.67.ebuild b/sys-apps/portage/portage-2.3.67.ebuild
new file mode 100644
index 000000000000..841947dcfff7
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.67.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_5 python3_6 python3_7
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# 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
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! 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 ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	python_export PYTHON_SITEDIR
+	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+}
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index aa44b4b671c1..e7c1e8c638fe 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-r3 linux-info systemd
+inherit distutils-r1 git-r3 linux-info systemd prefix
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -136,14 +136,8 @@ python_prepare_all() {
 
 	if [[ -n ${EPREFIX} ]] ; then
 		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i lib/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
 
 		einfo "Prefixing shebangs ..."
 		while read -r -d $'\0' ; do
@@ -152,17 +146,11 @@ python_prepare_all() {
 				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
 					die "sed failed"
 			fi
-		done < <(find . -type f -print0)
+		done < <(find . -type f ! -name etc-update -print0)
 
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
 
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
 		if prefix-guest ; then
 			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
 				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 74777b29e023..28a1301190d2 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -2,6 +2,7 @@ AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e
 AUX 241-version-dep.patch 5015 BLAKE2B 63a2f591c6199787cabc5af4c0df14c76e8dba189ca2d69cf539b13a0187fb7f29f7d6a2550b7eee046859d99c9b4de4af11573c624787968a8041e210d8bc75 SHA512 22667683fdec5b92d9dd7afe40930d7483f3025b24152a6d0f9497ac81e9e2a75b467d2b02770d2321ea53236444b5d01217b6f97d725913974ebd2522c6ac58
 AUX 242-gcc-9.patch 1676 BLAKE2B ed0151821dd695faaecaf3b7eeb5b6765d335b2e355c835d03c64c93c1920981ffad15b50ad1d2ef356b416173c6a53a0e4adbb6f40bbd6688655e622472358d SHA512 a1502ff4dd6b66952791676781bc8a2d8db4bd41123345e42d1eb2f99cca4f53d70a35e96306df4a8aec2f3b50be177a12bd67c88133373b54e7985121a7a435
 AUX 242-socket-util-flush-accept.patch 2123 BLAKE2B 74bfbe440ae548b96d90b41ac45c440b21a63c61ae75a9d2b725d2bdec74a03aeca7b673a656821eb925e6740d6728a41d0dc30275287a92519b47d9c477c487 SHA512 7dd0daa70de4ee264d0b3dfe6f80b5e0c563e5bb5255ca2a92f26c4a993fca178f275f85c9048305b82b258d41c9bcbb28d74f9e2b6c2a0e77748464890cb907
+AUX 242-wireguard-listenport.patch 1598 BLAKE2B 3266fe600db530ebb5b8eb726822daf14ee87292b035c09a1eb9a46638cc2dc3b8a3f11dd74684a79f3e521d3999b6b8c3a641f8f7475a5d45706567e00d26f6 SHA512 69e047000eb5ed36850bcbc6b8ef37a646b60a642a07a68547624e81aa6e49c77b848745ca4daad883151ddcaee9e7957ea6430f5a0c0c67ffc7887778f536e9
 AUX CVE-2019-6454.patch 6017 BLAKE2B 8feefe11f44e4136c5fcf87160197bfbc0557d5097bc12275411887005bed1fe56a532d114e2e49527a7f35016a6b5fc04cb1086b33445402ace21eb880c02e9 SHA512 ff84ae9a043f17fd78c7fc499fe532c4d3b46dbe34f24c8289c209a026c1eda20de3ba46b67c8a5b14e9889e6362a4fb2097d550e6bcdb5182455fc569e23224
 AUX CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch 1848 BLAKE2B 348c35881ce039f92d8fc8dc8c87af2efa95696afbe79ad8fc4e01129524bdf28b529ab86ec611d08446e589176c0678018d94d8c5fc068c65ab4eb429746cf9 SHA512 693afe328ebc20d34cbf07c632a8da90ee293147e793a599a4d2aac6f757738bfab93048a2f8ed6e68d16f865e9b4112e737c692ad01c7d4946f8c430714161d
 AUX CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch 6660 BLAKE2B 45acb2595245a5cbd10c2a9c7ffa2db0c4bd5b03ef8dc25eb51fc35dd51a49b3acd18bf4cf8db7f639e7a4e61592f3ce0bcb031bf27b0bf3ae6fc96c74445f77 SHA512 7c082ab4effc36543bab08700b84a3ccddfba5d5e87b324d6b935d75f5debb7a5f7be1c2e21208e8d1715f5d40619c8f775629acdde40d3c7b2f406b5c6d9460
@@ -18,5 +19,6 @@ DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730
 EBUILD systemd-239-r4.ebuild 13317 BLAKE2B d62f39c9d3ed7ae40c5d04ab463dc1e14140bf9a7b55292906420c088549ace6e491aa1fc598cc274c4518824e419a3d8067d5ea491a7736fc075393d3f68b88 SHA512 3fefb4eb2a28e511cfaba5f076fbbb63358b9adeaed5dce8afa289da7b8295fe793dd2f32a5dd58b84a4fabecf4a138bda6f7d4ed0719acc47a3bffaff2ad446
 EBUILD systemd-241-r1.ebuild 13807 BLAKE2B bed17c8e35d3936f67fa538a314c716d7fbeb0b3e7057024f5cf5c0080b27f9f8e3739e47b419125e78b2f7f67d555b82e4155e7eecb0bd8b7ada58480f24428 SHA512 6cd80e98c0104cd7807fc0ddbe5e59a7558743cf98caaa40a84786caa5919603e683c3ca11f8ad215e3290ddd4fdc67988ef90fd4b9ff5ec12eb80adbe116729
 EBUILD systemd-242-r1.ebuild 13756 BLAKE2B a8dd25392b38e683e2b46c1b50efc3dfd46235ae4aa64432c891525bd17044645cf6917c73461b9ff534f5f803e9214c47892f0e89ec0e6b08babdbac288ebf5 SHA512 7fe988fb7df8f11a681376894e8d343ceb141f86ec85136388585b5318d1bfa490682eff5e24b64477dd78cbe562c1324875c048e4c946eab151e891bd0dac0b
+EBUILD systemd-242-r2.ebuild 13803 BLAKE2B be33f36f5610fae2f89795647c472ead227f58afee1bb72aea661174d64c3e1141e07e72d5ac544695151f80efec83871cdc7871fed801c613f830c165ca5852 SHA512 2e944d46414ffe887587d3f5087c56b04fdd607cb8c88a5d0e0075d65c0d82298e802e7f43493fd2ca1fe77417d9333a2cd156ab86b66726cb50067ef43991b8
 EBUILD systemd-9999.ebuild 13673 BLAKE2B d23c5d7f2963f102d98d388ba249400f52a96c95bf6d0e7471f4cae627ac5120289d5cb8c06c4d0c21667d513ac86fbaf4e4ec2bb274c37cc564b32afa239af4 SHA512 9ab3f1e0f6a7735a08dea7df7902427b9318b0edb2d4ed2c6717fb08c06bddd6b7ae7365dd2c88cbc8a36e2f93851769302e2deb2b6c6112affb9d4bdd871565
 MISC metadata.xml 2125 BLAKE2B fed24f3b56a79016c4df8554626c7ae67ff50f97adb9af809a726b226c52690642f9df71b22eab320d3964d764dec1439009d8b8bf6979e407a5704e843829d2 SHA512 414d069185451f72eb1e803da7019da8800b08eade46824620632d795007bdec0e9201af93bb895674e3c48907593062610eb2f22f20ac15d099a593b450b8de
diff --git a/sys-apps/systemd/files/242-wireguard-listenport.patch b/sys-apps/systemd/files/242-wireguard-listenport.patch
new file mode 100644
index 000000000000..39b3c7c0a54c
--- /dev/null
+++ b/sys-apps/systemd/files/242-wireguard-listenport.patch
@@ -0,0 +1,49 @@
+From a62b7bb79e9a2aa683624c32cde1c756d8466fb4 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Thu, 25 Apr 2019 00:39:04 +0200
+Subject: [PATCH] network: fix ListenPort= in [WireGuard] section
+
+This fixes a bug introduced by f1368a333e5e08575f0b45dfe41e936b106a8627.
+
+Fixes #12377.
+---
+ src/network/netdev/wireguard.c | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
+index f3084c0773f..5ebc5dfed84 100644
+--- a/src/network/netdev/wireguard.c
++++ b/src/network/netdev/wireguard.c
+@@ -452,22 +452,23 @@ int config_parse_wireguard_listen_port(
+                 void *userdata) {
+ 
+         uint16_t *s = data;
+-        uint16_t port = 0;
+         int r;
+ 
+         assert(rvalue);
+         assert(data);
+ 
+-        if (!streq(rvalue, "auto")) {
+-                r = parse_ip_port(rvalue, s);
+-                if (r < 0) {
+-                        log_syntax(unit, LOG_ERR, filename, line, r,
+-                                   "Invalid port specification, ignoring assignment: %s", rvalue);
+-                        return 0;
+-                }
++        if (isempty(rvalue) || streq(rvalue, "auto")) {
++                *s = 0;
++                return 0;
++        }
++
++        r = parse_ip_port(rvalue, s);
++        if (r < 0) {
++                log_syntax(unit, LOG_ERR, filename, line, r,
++                           "Invalid port specification, ignoring assignment: %s", rvalue);
++                return 0;
+         }
+ 
+-        *s = port;
+         return 0;
+ }
+ 
diff --git a/sys-apps/systemd/systemd-242-r2.ebuild b/sys-apps/systemd/systemd-242-r2.ebuild
new file mode 100644
index 000000000000..c2b6ac9fb905
--- /dev/null
+++ b/sys-apps/systemd/systemd-242-r2.ebuild
@@ -0,0 +1,492 @@
+# Copyright 2011-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi gnutls http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? (
+		gnutls? ( >=net-libs/gnutls-3.5.3:0= )
+		!gnutls? ( >=dev-libs/openssl-1.1.0:0= )
+	)
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		gnutls? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+		"${FILESDIR}"/242-gcc-9.patch
+		"${FILESDIR}"/242-socket-util-flush-accept.patch
+		"${FILESDIR}"/242-wireguard-listenport.patch
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Dgnutls=$(meson_multilib_native_use gnutls)
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-Dkill-path=/bin/kill
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	if multilib_is_native_abi && use idn; then
+		myconf+=(
+			-Dlibidn2=$(usex libidn2 true false)
+			-Dlibidn=$(usex libidn2 false true)
+		)
+	else
+		myconf+=(
+			-Dlibidn2=false
+			-Dlibidn=false
+		)
+	fi
+
+	if multilib_is_native_abi && use dns-over-tls; then
+		myconf+=(
+			-Ddns-over-tls=true
+			-Dopenssl=$(usex !gnutls true false)
+		)
+	else
+		myconf+=( -Ddns-over-tls=false -Dopenssl=false )
+	fi
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	local udevdir=/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
+
+	rm -r "${ED}${udevdir}/hwdb.d" || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 355ee31618a1..61bf5a554a0b 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -4,8 +4,11 @@ AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de63191
 AUX sysvinit-2.86-shutdown-single.patch 1229 BLAKE2B fc95e0a3db23300776bc61890f491449f0b078f3814d73b1fae278a3e28f8b3b567056f71ecfbd917e74aec1594cfdb7b15e6808a09ccda594ec8e1a683d5957 SHA512 b1fa6225cdb0d5ed6d2d3128a9ad29dc76f14845c3fe57aa2edf234af456ae49f700b25ed4170a6337f662be224bd6ddfd424331483b0c482fd33cd045ddc575
 AUX sysvinit-2.92_beta-shutdown-h.patch 2341 BLAKE2B 255f9831d59721fb3f59f6caeb9f6d828b5477d7b80668b279b29d036a292584965191bc204054fa71b1d53b3e9d83475ba8a1c09b92152fd9fcb29c40c0d1c6 SHA512 52d172aab471a0e2e8057292bfc401eade032da8c5058e22f35015e58635b8fe45ee8425c2a6cd7466942acd168f28c53c8c34f3b781a5c8c6c8b5714096439e
 AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0
+AUX sysvinit-2.95_beta-shutdown-h.patch 2752 BLAKE2B a7174eaf34d5f9547d5d79c16bf2d8129e71c9564fc0b60e5adb3f2dda998dbdea7a3ee9fbfd3f7bc29ec977f8d47de4581d77abd6e1cdb6feeab9633946251e SHA512 682e6afd6443ffef2cbac9898eca42546b0614a82b2a0c370015cf5373229c00170a22adabf54d10a0f85da7b19de39334b05ef69874fa4003a9c74b7e416974
 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
 DIST sysvinit-2.94.tar.xz 120900 BLAKE2B e45a95246325e93ef49f11573924216937e238761cb9f5979ae2b272838fb3280b1d12c9553992271f7926dc7c7bc18e352a8019a70f54c592971fe043453804 SHA512 8d3b7b777f7c37cf5eaf73d4cdfad8ac54c6115577052bd7ddf3588da8fb7d16b812ffaade0ce300c2c6b7d2acd6e7778130544befc171eab174ee8766b3ec50
+DIST sysvinit-2.95-beta.tar.xz 121352 BLAKE2B 769768185ae3f374ff7bac4a9178796526db9232ed6c735d6165b3f28b219a9804a6e0ae5f78e8558616aa3ae022f4963b9922e7c71bf4997772b8fb1f9d98d7 SHA512 0d1d7559a05142e2bd209fca83e1396e9d3ed32ebe5d4f5f1356ac51e597c0201648e8a80946089fa91e8620302cd60894b7ff343747cee373c0c4459e6224ed
 EBUILD sysvinit-2.93.ebuild 3575 BLAKE2B f327a05eaa2e82baa05b0473f31591da2e61cff22db7fb1e3f8a6302990cc70df166484dc138bb03f8494a32a21c5af4ee4adeaff9f37e1edfa0db702bcfd57b SHA512 159ca13a88b9868ec717fa8d786322d04cc7f67ea3e3ec32e0369060a295a43a33fe6a19d5f3be1b8d30f8dfb659d596b5c0d01f49fd1fa28cce1a150decb900
 EBUILD sysvinit-2.94.ebuild 3817 BLAKE2B dcf4a1ce3f2eb774783e0d3bab5a189e45f43bafefb05c8f6d60f3f09639c691576447c0b6922c974ed8f0f5ab7ecbacba1b427dcb569470163658c64dadaa06 SHA512 7b60c4537ad8f1d4bd70a3c922a8778501b89343ab103f5413322745077ae8c85c16344773746a8e7ae3ef1d185420c26fd30598e33b5641d57563d32f9c7179
+EBUILD sysvinit-2.95_beta.ebuild 3812 BLAKE2B 945467b8f510628c055cfd83b9c5a36198b1aacdf5f05918a34b0478576c941eba6d690ba4523f10e729b5cdcd696643e01c8ceadf4374d49a371e1c5e090079 SHA512 5d0b8a20b6e2380e841cfa529ba867368db64725f776fafe3d4381ded00f3550906e6baa9a58b3eb065155d20f8c3376ab1ec0bac50f27dadc18b9ff9da71352
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch
new file mode 100644
index 000000000000..f24e1029ca58
--- /dev/null
+++ b/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch
@@ -0,0 +1,87 @@
+other inits have moved to not requiring the -h flag when used with -H/-P.
+modify sysvinit to be the same since it really doesn't matter.
+
+https://bugs.gentoo.org/449354
+
+patch by Doug Goldstein
+
+---
+ man/shutdown.8 |   11 ++++-------
+ src/shutdown.c |   12 ++++--------
+ 2 files changed, 8 insertions(+), 15 deletions(-)
+
+--- sysvinit-2.95/man/shutdown.8
++++ sysvinit-2.95/man/shutdown.8
+@@ -66,22 +66,19 @@
+ .\"}}}
+ .\"{{{  -h
+ .IP \fB\-h\fP
+-Halt or power off after shutdown. Usually used with the -P or -H flags,
+-depending on whether we want to poweroff or simply stop the operating system.
++Equivalent to -P, unless -H is specified.
+ .\"}}}
+ .\"{{{  -P
+ .IP \fB\-P\fP
+-Modifier to the -h flag. Halt action is to turn off the power. 
+-Must be used with the -h flag.
++Halt action is to turn off the power. 
+ .\"}}}
+ .\"{{{  -H
+ .IP \fB\-H\fP
+-Modifier to the -h flag.  Halt action is to halt or drop into boot
+-monitor on systems that support it.  Must be used with the -h flag.
++Action is to halt or drop into boot monitor on systems that support it.
+ Halting is often used to run through the shutdown process and leave
+ output on the screen for debugging purposes. Or when the user wants the OS to
+ stop, but leave the power on. To power off at the end of the shutdown sequence
+-use the -P modifier instead.
++use the -P option instead.
+ .\"}}}
+ .\"{{{  -f
+ .IP \fB\-f\fP
+--- sysvinit-2.95/src/shutdown.c
++++ sysvinit-2.95/src/shutdown.c
+@@ -144,9 +144,7 @@
+ 	"\t\t  -r:      reboot after shutdown.\n"
+ 	"\t\t  -h:      halt after shutdown.\n"
+ 	"\t\t  -P:      halt action is to turn off power.\n"
+-        "\t\t           can only be used along with -h flag.\n"
+ 	"\t\t  -H:      halt action is to just halt.\n"
+-        "\t\t           can only be used along with -h flag.\n"
+ 	"\t\t  -f:      do a 'fast' reboot (skip fsck).\n"
+ 	"\t\t  -F:      Force fsck on reboot.\n"
+ 	"\t\t  -n:      do not go through \"init\" but go down real fast.\n"
+@@ -556,9 +554,11 @@
+   		switch(c) {
+ 			case 'H':
+ 				halttype = "HALT";
++				down_level[0] = '0';
+ 				break;
+ 			case 'P':
+ 				halttype = "POWEROFF";
++				down_level[0] = '0';
+ 				break;
+ 			case 'a': /* Access control. */
+ 				useacl = 1;
+@@ -574,6 +574,8 @@
+   				break;
+   			case 'h': /* Halt after shutdown */
+ 				down_level[0] = '0';
++				if (!halttype)
++					halttype = "POWEROFF";
+   				break;
+   			case 'f': /* Don't perform fsck after next boot */
+   				fastboot = 1;
+@@ -613,12 +615,6 @@
+   		}
+ 	}
+ 
+-	if (NULL != halttype && down_level[0] != '0') {
+-		fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n");
+-		usage();
+-  		exit(1);
+-	}
+-
+ 	/* Do we need to use the shutdown.allow file ? */
+ 	if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) {
+ 
diff --git a/sys-apps/sysvinit/sysvinit-2.95_beta.ebuild b/sys-apps/sysvinit/sysvinit-2.95_beta.ebuild
new file mode 100644
index 000000000000..f02f81e06455
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.95_beta.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
+SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *beta* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="selinux ibm static kernel_FreeBSD"
+
+CDEPEND="
+	selinux? (
+		>=sys-libs/libselinux-1.28
+	)"
+DEPEND="${CDEPEND}
+	virtual/os-headers"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-shutdown )
+	!<sys-apps/openrc-0.13
+"
+
+S="${WORKDIR}/${P/_*}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
+	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615
+	"${FILESDIR}/${PN}-2.95_beta-shutdown-h.patch" #449354
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CPPFLAGS =$/d' \
+		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
+		src/Makefile || die
+
+	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
+		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
+		src/Makefile || die
+
+	# pidof has moved to >=procps-3.3.9
+	sed -i -r \
+		-e '/\/bin\/pidof/d' \
+		-e '/^MAN8/s:\<pidof.8\>::g' \
+		src/Makefile || die
+
+	# logsave is already in e2fsprogs
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
+		-e '/^MAN8/s:\<logsave.8\>::g' \
+		src/Makefile || die
+
+	# Mung inittab for specific architectures
+	cd "${WORKDIR}" || die
+	cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab"
+	local insert=()
+	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
+	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
+	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
+	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
+	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
+	if use ibm ; then
+		insert+=(
+			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
+			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
+		)
+	fi
+	(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
+	if use kernel_FreeBSD ; then
+		sed -i \
+			-e 's/linux/cons25/g' \
+			-e 's/ttyS0/cuaa0/g' \
+			-e 's/ttyS1/cuaa1/g' \
+			inittab #121786
+	fi
+	if use x86 || use amd64 ; then
+		sed -i \
+			-e '/ttyS[01]/s:9600:115200:' \
+			inittab
+	fi
+	if [[ ${#insert[@]} -gt 0 ]] ; then
+		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	append-lfs-flags
+	export DISTRO= #381311
+	export VERSION="${PV}"
+	use static && append-ldflags -static
+	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
+}
+
+src_install() {
+	emake -C src install ROOT="${D}"
+	dodoc README doc/*
+
+	insinto /etc
+	doins "${WORKDIR}"/inittab
+
+	# dead symlink
+	rm "${ED}"/usr/bin/lastb || die
+
+	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+}
+
+pkg_postinst() {
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ ${ROOT} == / ]] ; then
+		if [[ -e /dev/initctl && ! -e /run/initctl ]]; then
+			ln -s /dev/initctl /run/initctl
+		fi
+		# Do not return an error if this fails
+		/sbin/telinit U &>/dev/null
+	fi
+
+	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
+	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
+
+	# Required for new bootlogd service
+	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
+		touch "${EROOT}/var/log/boot"
+	fi
+}
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index 06a09a466fdc..4762c7250698 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -3,10 +3,12 @@ DIST toybox-0.7.6.tar.gz 834351 BLAKE2B 7c6737a8b16f77fd7a5e389be17ef8eb41d28718
 DIST toybox-0.7.7.tar.gz 843039 BLAKE2B fb4ef2ad483acd2b42905e765f7287b41fa8b1822796579c4a57a8ad3f5a3cdb8bbcd0e6790eddc8daf2ec41c50be478c7d19623d1c8db2e7b1d4db8b52fbbc6 SHA512 89369662eaf48bb52909f49932b98395eed6e672f6a37387819a02ba9c33f6b737686782ca3bf0ed0f9b60e1e2fff88ad1ebb678999582986acfec371d100827
 DIST toybox-0.7.8.tar.gz 903344 BLAKE2B e223dabd7b44a050bb884d595235ea469524ffbcf3b29ee8a106354dff3250b5e9c7922cb8b499ff343e170735e29b321b9c00c370c67a1d20c8a5e44ab2bdd2 SHA512 125e4b22deda1e707a62c49b40bf7ac8a36122af27fd70ed45c651a61b5607765cf1c9b3b1c3103c0a5b5f4e7760a50e87ac62bfc89aa870a22ae8ad0aacad65
 DIST toybox-0.8.0.tar.gz 975002 BLAKE2B e137c3616d2affaf8b6f234cab49190b98540fe8f954244172f9ca80c749069f85ff8addd94e1018d3680f1a307df54671ee9b01726c5279f340f8fee3669609 SHA512 aeb15a02782cc0b3b46a892e2d82834e5172a7da04e2498eaefec58221305dd24a86aada5ce05978bd4694895ffeb94ae980fd767f4ee00c499b3dd518fd3e20
+DIST toybox-0.8.1.tar.gz 1015363 BLAKE2B a765a133910b7c8d903a1fa95338b8dee1267c3b7430267d47c4157d966256d16c615500acc38428296b9612649fafdaa111a149df7415ac580c01cfdd361025 SHA512 22f91046c75f986e44927ec89feab6c6afa1f614e5b0eae73e43f6ccd5c4328991ad283858fb1a5cb4d697806f38b8ab81782c160860a2c34ecbef3885636d5e
 EBUILD toybox-0.7.5.ebuild 1153 BLAKE2B 7045659da4001b0791fcaffffcdc2d3d362ffd5ca6b4f7b9faef6c4d7a6afd25a0649953017faa10ce10d5c8724da274518a1fe9e37718bf8f832bae308c6677 SHA512 5e70c6665773d9bbf334ffb8f0d90005e76b3e47c3eb8d1796738a619c5d5743a7eec476e1d4bbbe721b561916b7f15759c3ae2dd3f1e6952b9050b913ebdea5
 EBUILD toybox-0.7.6.ebuild 1153 BLAKE2B 401a475bac0b34e93117ec3b1b4494a95d50c4abf1d6271eda8d26d76b5738351ed9d5f35b10043b095e99418b054c6144ffc66dfdf839a4f6caa713c2bb0dce SHA512 be2886c58e3b75be69096f3858a72df21d1f6ca76ffda7e425242055a67e86d4ac1cab7f0622911e587695e4437a292a3460be7ac66632718d28b8a6f06763f7
 EBUILD toybox-0.7.7.ebuild 1153 BLAKE2B 401a475bac0b34e93117ec3b1b4494a95d50c4abf1d6271eda8d26d76b5738351ed9d5f35b10043b095e99418b054c6144ffc66dfdf839a4f6caa713c2bb0dce SHA512 be2886c58e3b75be69096f3858a72df21d1f6ca76ffda7e425242055a67e86d4ac1cab7f0622911e587695e4437a292a3460be7ac66632718d28b8a6f06763f7
 EBUILD toybox-0.7.8.ebuild 1150 BLAKE2B bedee69c61d30ec29870bd0ea4a081080fe4ccb96c1589f98fd5654bc6cb7d4aa5343b99db40f526dd89fbbdbef5c62a91bb357e01d0d697803c540b136e60fa SHA512 c31b51f1686425310997c1b14f6c78a793c5cd301a4f4e2a681dfb667be05437a99d43a737d4062c9888bf839db06bd32ce13426fa784d83825bbdb989670f95
 EBUILD toybox-0.8.0.ebuild 1150 BLAKE2B 60afaa318851dcdf112b5e46a5963f539e095444f53f4ab9d9645a1ebac53b4cc78ff0eafa54b6dc413590c7e2ea21dbebbb8dd373c4d0d560b60d00e8869075 SHA512 0d0402203c6f292dbc1ea35fbde8a3bb37f3b5ea217c93d33a6865332be020bd4b1dbe376638a2531ef6b1bc65d9c83fcf57a35fb7518242d6b31c8ea82ec9ba
+EBUILD toybox-0.8.1.ebuild 1150 BLAKE2B 60afaa318851dcdf112b5e46a5963f539e095444f53f4ab9d9645a1ebac53b4cc78ff0eafa54b6dc413590c7e2ea21dbebbb8dd373c4d0d560b60d00e8869075 SHA512 0d0402203c6f292dbc1ea35fbde8a3bb37f3b5ea217c93d33a6865332be020bd4b1dbe376638a2531ef6b1bc65d9c83fcf57a35fb7518242d6b31c8ea82ec9ba
 EBUILD toybox-9999.ebuild 1150 BLAKE2B bedee69c61d30ec29870bd0ea4a081080fe4ccb96c1589f98fd5654bc6cb7d4aa5343b99db40f526dd89fbbdbef5c62a91bb357e01d0d697803c540b136e60fa SHA512 c31b51f1686425310997c1b14f6c78a793c5cd301a4f4e2a681dfb667be05437a99d43a737d4062c9888bf839db06bd32ce13426fa784d83825bbdb989670f95
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/sys-apps/toybox/toybox-0.8.1.ebuild b/sys-apps/toybox/toybox-0.8.1.ebuild
new file mode 100644
index 000000000000..564d2c54b23c
--- /dev/null
+++ b/sys-apps/toybox/toybox-0.8.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multiprocessing savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/landley/toybox.git"
+else
+	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# makefile is stupid
+RESTRICT="test"
+
+DESCRIPTION="Common linux commands in a multicall binary"
+HOMEPAGE="https://landley.net/code/toybox/"
+
+# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+src_prepare() {
+	default
+	restore_config .config
+}
+
+src_configure() {
+	if [ -f .config ]; then
+		yes "" | emake -j1 oldconfig > /dev/null
+		return 0
+	else
+		einfo "Could not locate user configfile, so we will save a default one"
+		emake -j1 defconfig > /dev/null
+	fi
+}
+
+src_compile() {
+	tc-export CC STRIP
+	export HOSTCC=$(tc-getBUILD_CC)
+	unset CROSS_COMPILE
+	export CPUS=$(makeopts_jobs)
+	emake V=1
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	save_config .config
+	newbin generated/unstripped/toybox toybox
+}
diff --git a/sys-apps/ucspi-proxy/Manifest b/sys-apps/ucspi-proxy/Manifest
index aec031642a7e..bd9070abedc7 100644
--- a/sys-apps/ucspi-proxy/Manifest
+++ b/sys-apps/ucspi-proxy/Manifest
@@ -1,3 +1,5 @@
 DIST ucspi-proxy-0.99.tar.gz 35537 BLAKE2B 0b3f809b027dae6d83a39aa7b83d0747e2046409b97ba2de678d49a3611ea08f82ea9f30f13a3cd67dbc06de881551d282b14aba67addcf294e64156d2d6d5bc SHA512 5bed82bd0db2501c3de8b38e23a07c39bf9937b9ce95166cf1822a6bd5551aec945dc01d6ba716d7ce35f4aa7f2a126d860d31f7df2d807f1f4eb5e355e93164
+DIST ucspi-proxy-1.1.tar.gz 38351 BLAKE2B 395dc3d154665c8c65c2d35f6e666543f5f919497fed441aca7223dee4983fe165911e8bf1571aa11fa10ba6adb480b4da853773b5a2be556ae59ad6d1708328 SHA512 c9e6f98a73bf6868341b0d5c1653d0b9107aa92c21e8fe96c47a9ca0ae41b247aa10bccd819d84bdcf4e8d5902c1955bfbe9e4e3256d5303578cd3337220139c
 EBUILD ucspi-proxy-0.99.ebuild 795 BLAKE2B 1fe311503f626e092ca81fd2a0d9e76bf460df87181112d3ef5c15804a85627d7ea974bdafa2c487b5611bcbc998fd82bdb456f303876426686bc96b055b2d94 SHA512 390de9c8aa461015cd08f9354aebee5bb7579ed17f33ea5b6b4d35cea4d9fd377c897bd4f0e142542a2047f610144e240a33da3ab05b935634f4d43474522eff
+EBUILD ucspi-proxy-1.1.ebuild 656 BLAKE2B b6cd7cc455d37c2064a1870c116c8ccf12ecd291a052a376d8624550fb8109fa2965ce18d81feb76d98f9a2b8c5a7e878032d3d4480336aad080bec6a18e6533 SHA512 e1d5b236a95c1eb8f3a2f0a3c7a8c253cc18a5031412cc3315b51c1cdc8104d40b70861c2aaeadd5a7685a4eea9a2b4faba4005c389329b2ed2b7d225507df41
 MISC metadata.xml 439 BLAKE2B 0765793e54cdc093b3d94ffb0c3f938bb12d53e99a21f091ad05e1f23ee599c77d0b6af04e1f33a92ea5916131718e97e7ad7a48921e3622682ead4eb35992b7 SHA512 86623b17b403875797df6844dd2fe579cd1eddfd0c859e785a9140ebee91c9e35ad3ee9de001ee5b9887f46d4a08e6bf459fdbe1984c4666993c9c4ccbbb3a40
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
new file mode 100644
index 000000000000..efbc87c02090
--- /dev/null
+++ b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Proxy program for two connections set up by a UCSPI server and a UCSPI client"
+HOMEPAGE="https://untroubled.org/ucspi-proxy/"
+SRC_URI="https://untroubled.org/ucspi-proxy/archive/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/bglibs-2.04"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+	echo "${ED}/usr/bin" > conf-bin || die
+	echo "${ED}/usr/share/man" > conf-man || die
+}
diff --git a/sys-apps/ucspi-unix/Manifest b/sys-apps/ucspi-unix/Manifest
index ad4cff77f49e..6ec7640499cc 100644
--- a/sys-apps/ucspi-unix/Manifest
+++ b/sys-apps/ucspi-unix/Manifest
@@ -2,6 +2,8 @@ AUX ucspi-unix-0.36-fix-parallel-build.patch 507 BLAKE2B 32ee69a9a63efb3b990f4e3
 AUX ucspi-unix-0.36-include-sys_socket.h.patch 339 BLAKE2B d00f18db06e084639a169b487ebe7458127086a31ccae759faf458aea69a6523cc9a6eb69922f161fc861cb3e463b4a73b637011dd8e8e86abd2f9b7080a660f SHA512 a8628e664ec993ab964879ff34b2bea7e70901cbc1f812262057fcea0fe34c64b2b910e4e1c77ba66df84fc8dfed94b69c6dbe7b7da09ddf379764b070a97161
 AUX ucspi-unix-gentoo-head.patch 1097 BLAKE2B 7ec8f2e5dd32224f14f254d55bdabdf70324d9e0b21e31ad525598e125331778434b600ca0b6a275d4758f83611d1abfbce810913d6ad3d7cb4cc1955639b9d6 SHA512 e1d5be425dcdf2bf09031c8a11c384b092a2bda38159db37abff111191dac1aa0b40a401cb068d86f97747dad684a0720f3b5b8f18c2d9caaf64368a71d46c3c
 DIST ucspi-unix-0.36.tar.gz 14175 BLAKE2B 609de0e75825ee458823bd34b41ad1d2072851cd006f6fd603c5082c69b48bc7018242a4b6bf7d2584bf43d79273f223352a3af4868575ee8574c9fc9ba4d819 SHA512 56fc5145315ff43629f455996874d6434ebee16e9fccf78ce3dcdd6312daafc508e2dce0984ca9ea73b9ff0da5d2171fc678c8e200641e1c0be02e7863bc5633
+DIST ucspi-unix-1.0.tar.gz 17391 BLAKE2B 0605c770a5e898ff9fbe9eb1a50fddbe2fcb25b37168f7b6a2fed18a632504d0f80f5f0b39b812de7d4bd6845039e143eab8706429392f7b4178bbbe59713630 SHA512 dc79515908e34cd3bcc8c66f360fe3f4662a5be35c9876b07c609fac0f90e0f498d306d1796ebbade902c7affceece7d18f8acd178a850e42d6d6820d53c1d11
 EBUILD ucspi-unix-0.36-r3.ebuild 974 BLAKE2B 2ae598af6554c6a0345baa60be163adadf12fa63c00cd8f6ff96de9ec6daaaebc7544713cff2cd5f44cb1a18df57dd2814d0747e48b9d0ced90e3ecbd1fa3976 SHA512 798901cc22beb4912e8fa1d779abed5bf9fc5711e43d059019684b88fce3438ebf228bf93ce77172f462aa3bbec784a1f61eac6c3f4af37bc6d5fb147476f9a8
 EBUILD ucspi-unix-0.36-r4.ebuild 1136 BLAKE2B 90bb709947cedc619da1ee9a9cf504ced1267a447610844a874db60b65113e1d76c359c165a1673bc3bb9fa5452bbe257b9ec07a4f975052b0ba1a376e9c4c9f SHA512 4544d8053f3c9a0c98396ae5c49114fb5b580637a3c95f90f494cb477b373e470f30b10b85fa0af9d81e40ba0c6ab9af4768028b093c45ffd5ae2e6ea577fcec
+EBUILD ucspi-unix-1.0.ebuild 796 BLAKE2B cf4b06846ab2b14f96f5877f2a8c3af89777540c7f90fc2551f9d9e05d9058ee52554c525306d3b82e5958bce7b15a60f3263b3c1c304904169755c6f8caae0e SHA512 e0521ecaa9df43ad6be76235a077914b85249345080eb263c1f51fd825807ed815f88d00c0a5699538e2d254ebe06c502aaee089ff757854a061ea129641c8dd
 MISC metadata.xml 433 BLAKE2B 884f889ede3653c18a3e3b4cd133e764ca8a3daa5eee474d698f3878ecca59d176cb5d039cbcc61934e0a84ccc59b9e7766e44551654e6684ee5f2e867cfa7ec SHA512 73fcad2c3cf5f25d07fe4c38376e3375021ddd0e2a2a9e51d05728d86ee2e0b63a28ed5f70d9d31e1643d210852b4b81f0ce605b0d9876dbf131cfd444d6fd6e
diff --git a/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild b/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild
new file mode 100644
index 000000000000..dd48c88398ce
--- /dev/null
+++ b/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A UCSPI implementation for Unix domain sockets"
+HOMEPAGE="https://untroubled.org/ucspi-unix/"
+SRC_URI="https://untroubled.org/ucspi-unix/archive/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+# We statically link bglibs.
+DEPEND=">=dev-libs/bglibs-2.04"
+# Block other unixcat installers. #480546
+RDEPEND="!net-analyzer/mk-livestatus"
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} -D_GNU_SOURCE" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
+
+src_install() {
+	dobin unixserver unixclient unixcat
+	doman unixserver.1 unixclient.1
+	dodoc ANNOUNCEMENT ChangeLog NEWS PROTOCOL README TODO
+}
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 6864d4ee85bf..a88062850d63 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -3,6 +3,6 @@ DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc7786
 DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf80a1e1ae888fa498429a7a9e28eaced49047f8f793bad3c59f3b515557054860286b17d9f89f915d0db5943cc SHA512 8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3
 DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
 EBUILD usbutils-009.ebuild 1129 BLAKE2B 49d6b535c588e1efea718884e8f26cdf5b4ba42a7bb77fadb84da8f977a2128291af381f3150bfb3ac06e58af4378c7c33809cbdd76d739297fce252c560c5d3 SHA512 c19643160eb68654493506d4352a5cfcaf991ce24d89b6423a54d94d92be2d72a563d6cd3c02612860d86aee4b914e5e6f0bb50dd7ce88b6f654a2fa50dea893
-EBUILD usbutils-010-r1.ebuild 1236 BLAKE2B a5f438c82e9f0d2f3436b502e8fdd67170b0296178cbd09b4d9158bdfceb592402ad93f3fadb5e0abb8c6fa771f82218db324a388b2b8175bdcff0e02eb22c21 SHA512 ecacd10460f053acf325d60c1b4837e43780596056e3b40f3cfa61f4ddb8d6e8fe15ef842a2ddd4372513fa67b3eb65ad2981bf767a1f9e822940411e2a62c7a
+EBUILD usbutils-010-r1.ebuild 1231 BLAKE2B f9a2282be8192df57f1edd561c76c1abec8be8e2fc3888af8fb4826ab05c7df731580539910494630482b9ad915873a67913cca8e7272d3504288bf2de839008 SHA512 740f7ca0349c1cda80161998e4ee5d8e4e4212dd04a77c165754e1efb131bcca4a534024fd6f4f3776f70b4291525e71645088bcf0f4c93a50ea98621e4499bd
 EBUILD usbutils-012.ebuild 1200 BLAKE2B c14adbb36035ca97f16c79e74b5a7e3e98b99e1a07a30b52fa1f57a16135b116165adaf297cb309e4789e651cfd76a332329b26de3efe657733fdc39138b09a3 SHA512 3c11239cacb377b2a40c26ce76c770b02373bab06f61f7f0dcc43da41ad48f3d50a92cab5ed209a2405122866c9dac38994cd059fd060df1a669df0838ea64d7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-010-r1.ebuild b/sys-apps/usbutils/usbutils-010-r1.ebuild
index 79304512b31f..63d7a8e50247 100644
--- a/sys-apps/usbutils/usbutils-010-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-010-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 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="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 7b37acee0c51..9cdbc4be8830 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -3,14 +3,13 @@ AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254
 AUX util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch 1546 BLAKE2B 11a714486f7c6e4ca3d38adbf59231378ac94a5cd934816d93e46c73e8a9ff3f23909d88c39381b15d0beb4da8dd5c97af72166eec5822dc6a49b67a60eacf5f SHA512 5dfa5bb88e9e454a99c8ff5e8f76b9323729962aa9eba682a4a6ccfadc3af6068714ea3bf0e19abf5cc402dcafeb92057eaf4d25d5c292937d0cb94bbc8d99c2
 AUX util-linux-2.33-sparc-setarch.patch 2353 BLAKE2B 16f3c627096644da973152db4b29d09f6e76d5576d1e9513ae29ed76e1112d71327ceef31b915e58652f8ead0b506819a2c5a996bda0c3670035f13d1f9595eb SHA512 d9e2bbe4a5c0d41dc199406a27187107121294b9bd13794b7f48b558c2dfe3f16b0dfa11e7ef70b6072fd6464d2220f35a0ab032bf6b99e11740056751ec7aed
 AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
-AUX util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch 971 BLAKE2B f035bbcc83fd342e202ced33d0e50d11d6d89e34f59826ab4a95231afcc0696ab6e34d504eed599681e44d369fdca8578b46875f264a6f3f70f562abe9748226 SHA512 b6d5fdb7cd49df072fb00410d1ead9990c53c5105ce7dd2e48ed3c88e91f45271c0a62a87a5cd9c703d96004cb7a81a48c5fff504269c4c1b8edb2d9a4471eab
 DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
 DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
-DIST util-linux-2.34-rc1.tar.xz 4930092 BLAKE2B 742322c85c2b92ff16cc95e98da40522350d84c9e72b929d763da882f54ff88e4ff38d1622a2642b88fcb124e9221ff32e26403e5d76cc06bcfeb6c92e450d91 SHA512 4f968f04394f6beaafd60a84daf1db808ec486dbfa82d2f58b0678f93adc37477395a1b22c0c2af33f9652c5fa82f8bb3c1ce8b62146c983bce270fe45c1419b
+DIST util-linux-2.34-rc2.tar.xz 4990080 BLAKE2B 63c7bc91d04e8cde2f67e2fad5a6a4b6ffe7b392d284c29b01b5a89eea26b42436656f8c4544555545b3718a739674c795c13a41e3a1e1cb2a98e952d02f9283 SHA512 54ae5ab146a2f8185dd1e46b363d3f83fd6791eb95f83522307ea59dcf23be93a9496fd1ca10bb09788ebd429c62db8fcde8747ed793c7826340289efb4e77d0
 EBUILD util-linux-2.33-r1.ebuild 8369 BLAKE2B c8991a1f9a36cc09ad888b439b1baba241740707112abda423a85fdaf13db09c10be9a29ff2c018166cb14f64f425b6f8ffd6c2680c3fce1e25369f4ee8d3209 SHA512 13e47582fe9ae0bced2ad9c2c47e8d4b062ad4ed1cc65973debb2b6fa54d5aa232936f91fc88b6183cd53c2ec2754f00d7a79e274e7cc41f2dd6a8949004311c
 EBUILD util-linux-2.33.1.ebuild 8638 BLAKE2B 9ed38cd12026e04327b38f33a2c0f5285cbe148f9e604e03fd2ba179cdc10351b12ef3768bd97da7f7ba5e65972c42b04c1cef50a2f7ab6854953a990eba8b10 SHA512 aca35d647f0d3d3e260acc67e95a2e32a6d5b4898c78a187306a9c2d228e4304503eeaaed8fe92a6b2c6f7e0a6110ae087d3f486d37ad1c429d04f30b49b8832
 EBUILD util-linux-2.33.2.ebuild 8646 BLAKE2B 14ff1524097b52badbf1d9387be0227f965726c0de918759bd97af2d60eb1e7f3b8e5c06b04874eeb6031d31b9b5f776b794cc8cca17cfbb296598a985c668e9 SHA512 fe5dc9c0c5e40aafa89ced9058048d2f1df5c17e7eb19cf178c7b416c4f9a72af520f921ea4952ec9f28d24151bc902b89f1d6e83ee6c2edb6c5a84c2edf4645
-EBUILD util-linux-2.34_rc1.ebuild 8319 BLAKE2B 4be344e257e15a2505d06071c912e0555923c13333f147b1388d2107ba6950437fae0e13875d79efa6aa14964890d76a6aba180c0748bd00b5da8b437d35f717 SHA512 ea35a87124c3d9a0fe75ba78e974f8fb38639b350a2031e7c1a04fe8043e49c73d77e40084f8e3aebcedf8e093841fc0bcb549438cf67500b1a507b0e6e07766
+EBUILD util-linux-2.34_rc2.ebuild 8244 BLAKE2B e23a21643c084b26a0c5644eaa7ed6ec8075dc52abe8d9bfde40fa6c69e6dce99e92ee1d0a05e0750b53fa48c123ac143447a96fab1480297017e3edfbf342cc SHA512 0a9cd16c055aa50d936b7f5d45198e74619154537ca8af859e14a343923efcfa70948a1dac423aa72ffeca5891f6af516ee480466296fc55f64f34e7b0fbc960
 EBUILD util-linux-9999.ebuild 8238 BLAKE2B 8fd5c1b2fc9bde4b6e9331da10d8f013d3c29a2f74b69ffb63c8f34ddad81d67f638be661bf258d41c31b973a9b00dd01f06ae6dcf2e0f1e4b259e9c22bf2ea8 SHA512 cc6bf3d785dc23b101ab4f147dea9c0ab258fbebf6c4de44f6e4600c46e986a555f2b54264142d7168bbbbe5ce280fcc995c879dbb3afb8b50940128e89008b4
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch b/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch
deleted file mode 100644
index b1314e0e44c7..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 836455917879333e94d4a535aa22f1235b5d4885 Mon Sep 17 00:00:00 2001
-From: Sami Kerola <kerolasa@iki.fi>
-Date: Sat, 18 May 2019 10:19:35 +0100
-Subject: [PATCH] lscpu: fix floating point exception
-
-FIXME: this commit should include vmware_fpe regression test inclusion.
-
-Caused-by: e5f721132ec8b8c933a396d8dcb3efcb67854f13
-Addresses: https://github.com/karelzak/util-linux/issues/788
-Reported-by: Lars Wendler <polynomial-c@gentoo.org>
-Signed-off-by: Sami Kerola <kerolasa@iki.fi>
----
- sys-utils/lscpu.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
-index ca7f6a037..7f6277f00 100644
---- a/sys-utils/lscpu.c
-+++ b/sys-utils/lscpu.c
-@@ -1925,6 +1925,8 @@ static int get_cache_full_size(struct lscpu_desc *desc,
- 	/* Correction for CPU threads */
- 	if (desc->nthreads > desc->ncores)
- 		nshares /= (desc->nthreads / desc->ncores);
-+	if (nshares < 1)
-+		nshares = 1;
- 
- 	*res = (desc->ncores / nshares) * ca->size;
- 	return 0;
diff --git a/sys-apps/util-linux/util-linux-2.34_rc1.ebuild b/sys-apps/util-linux/util-linux-2.34_rc1.ebuild
deleted file mode 100644
index b222e422b0fa..000000000000
--- a/sys-apps/util-linux/util-linux-2.34_rc1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors and others
-# Copyright 2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-RDEPEND+="
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	!net-wireless/rfkill
-	!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.7-r1"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-lscpu_floating_point_exception_fix.patch
-)
-
-src_prepare() {
-	default
-
-	# Prevent uuidd test failure due to socket path limit. #593304
-	sed -i \
-		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-	if ! use userland_GNU; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-
-	# Undo bad ncurses handling by upstream. #601530
-	sed -i -E \
-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
-		configure || die
-
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-python_configure() {
-	local myeconfargs=(
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-	)
-	if use userland_GNU; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
-	local myeconfargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-nologin
-			--disable-pylibmount
-			--disable-su
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-raw
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_enable kill)
-		)
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-		)
-		if use userland_GNU; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
-	fi
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_configure
-	fi
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use userland_GNU; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if ! use userland_GNU; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED%/}"/usr/share/man/man3/uuid* || die
-	fi
-
-	if use pam; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.34_rc2.ebuild b/sys-apps/util-linux/util-linux-2.34_rc2.ebuild
new file mode 100644
index 000000000000..9aefa2207941
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.34_rc2.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2019 Gentoo Authors and others
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+DEPEND="
+	virtual/os-headers
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+"
+RDEPEND="${DEPEND}
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	!net-wireless/rfkill
+	!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r7
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-2.7-r1"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Prevent uuidd test failure due to socket path limit. #593304
+	sed -i \
+		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+	if ! use userland_GNU; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+
+	# Undo bad ncurses handling by upstream. #601530
+	sed -i -E \
+		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
+		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
+		configure || die
+
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+python_configure() {
+	local myeconfargs=(
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+	)
+	if use userland_GNU; then
+		myeconfargs+=(
+			--enable-libblkid
+			--enable-libmount
+			--enable-pylibmount
+		)
+	fi
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+	local myeconfargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with ncurses tinfo)
+		$(use_with selinux)
+	)
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-nologin
+			--disable-pylibmount
+			--disable-su
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_enable kill)
+		)
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
+	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_configure
+	fi
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	fi
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if ! use userland_GNU; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED}"/usr/share/man/man3/uuid* || die
+	fi
+
+	if use pam; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+}
+
+pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 311b3521670d..27a1b172eeb8 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-desktop-portal-1.2.0.tar.xz 405856 BLAKE2B 8d198c7c18b829f531e34d6526b52776a1acffcb874a2ea93953314710aa18bcb1988ffe190bb7b7f7c0d1c4eb1bc3d39fd2f7da626754730bf64f349ae75d39 SHA512 7c7dff8f1f44b4f564f195a8f9ad2985f6085d16638d18941459cd14d76d8ae7cafaf72f461f2c0c1414a8bace9f3ab4a5416de06edb71df677fd7bdca47f61a
-EBUILD xdg-desktop-portal-1.2.0.ebuild 1046 BLAKE2B 141a5f2221cc18b58f05b9b2db5f034d345add9f87e2d7388214e8e89256b2ae9197ac8cf0cca115567e790ead719523b3958091aececd1cecab37204a6ba8b9 SHA512 fa914e296dc14399be9a1628dec72396ac9cbe8743ccdddc70b876cabcbd8710029e88fce42fe5f2bcc70ae39a1f4951fe016858f1a2ebc6a6090e5e233dc05e
+EBUILD xdg-desktop-portal-1.2.0.ebuild 1045 BLAKE2B 2061bb59d99bb21ed71e5ace6a25f4f5246cb082f4f0d047e30b7ac057848e5e25b4beed6009f56aa60bc4d52b9666826fd791f0716a8777338aaa4c23fce254 SHA512 25119b9438894da1b1bd9500087b6146054eb8d188d3114017bbbaf749d86bb521a9c359980f00007567d8d3a42573f04aa8be5020e046d6bf3435ca1fc615fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.2.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.2.0.ebuild
index a0084ddac13a..65b6451ec6f4 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.2.0.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc" # geolocation
 
 BDEPEND="
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 62c974905ff1..4c9e145674dc 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 41eb450f76cb..1da2575df23f 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,8 +1,4 @@
-AUX libfprint-0.6.0-fix-udev-rules.patch 1436 BLAKE2B 0e1d31c33ba0a1462e4c5482545802a253fad032a2148debe1be9a99452257e15c3a84df7ff74c5834718aeaa404a154a23f0f8cce634bc568a6f60b6327f4b7 SHA512 b3b191814e0decccaa6e6b1edad70db23e756c319e512f0f236a62845de41ba1982b510f3b0edd699202ba8de9f56afa68a9fef000ac88a61c1ae9d8d5d8a55d
 AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
-DIST libfprint-0.6.0.tar.bz2 323590 BLAKE2B 8a592241ded8826337db075dd26960a9712e1a01855c6fd2c461b73ea6e2fac5248bce16165144b48271b368d0b2a82963eab00a64a88c27539e19aee54b9ba4 SHA512 2ab9ceec0c357779c94d3b8e94c11a733825bd735bec0e5c762d215d69bf295da0c5db7fd365e2a7efdcf25747777371f793b5e99d5c98e1bf9dcb1170e10ef9
-DIST libfprint-0.6.0_vfs0050.patch.gz 9944 BLAKE2B b53a74f64c9691cee7c4e7f2f54afcffe2b00b63914900ed107426a9e42721548caa1ec80e1e39251ee6a0daec6ecf7f80d6704d37bc984dd1ac76320d0b4256 SHA512 658f936c462cf50d4325d33da6c8298768dfbe4bf442933fc197c8f4bebd741ef6878bcfe123606790c3ddcc3e217fd5f97b3755d36b181c5837dc28e146d674
 DIST libfprint-0.99.0.tar.gz 473925 BLAKE2B 799e3600393e4b25f7b0685ff0456ca391e5fcaef36e5b4475371cd07c848e40820dbbdc5a241fe11c6ee08b818380967129f85e177b5d8714b9dbc4d7b68ea1 SHA512 eca1d45baa23b7db1fcc5d7a9a396fe504aadc6ec2e68da32b5415fb0fff1227566d579271e0b34895ce7f3baa55314a0ccd20bb8c4adba253063b7b61284748
-EBUILD libfprint-0.6.0-r2.ebuild 1273 BLAKE2B 4e5371e38e79e1dfe0c25e36cfa79d03c2b823c145110fd9c8e13a241534cce708e7a67090bdacd203aab33693c46f494780ec46b6dea6a486b88b4a9a01487b SHA512 4e6d1285e871c53be91dc4ae834cd040dd5932d61c38cccb628c86d8b7cad5652faf498943ab8941041a32b5138a033b934a9d6ebaa5662dbfff285f458ba759
-EBUILD libfprint-0.99.0.ebuild 1063 BLAKE2B 6b1e7e7c2f13da8f62986ebd72b8814d5144d3fd46a756403e53c86a15c1d426c646d13817f078516a2fdab1a3b53651490f6efbffca8784b2b8f773947ef027 SHA512 304974ee1234b1caffdf117f265925381b7b4b59463c25eaeccf573c734e2ed9e49f2f49ee5a49a5716b94fe9aecd2d3fe3133b6f99571b0c2a35154f212a5fd
+EBUILD libfprint-0.99.0.ebuild 1056 BLAKE2B 11cec1b29ed9a675bfaa13c2820101f0d7d6e96bff46a51e27d1f4d71768bc8512a8e3323cb652013d3e078a7a9db7655fa79fd36dba77d97db33a48b451e451 SHA512 9700ca3575ff4ea83d664cdab7d6c3c62c29e649a6ab0f91606b7b3b0e19f1bce75caaa8ae619ed05f15706dc5b63c1440299011505b9be8f19ef6d3226bb442
 MISC metadata.xml 347 BLAKE2B dd0d99ac1a5a8cc925618bc556216a23f14fab90dd2e1d66747e4af3fd64d410812aac366a0e11cc169af7345c8bbf304577da5a1faf75f557bb4ba18033fb0f SHA512 f3303670a2e7d4b30732d335b313edda6c97952f2f6290ff6b1d67a8a237e147ba7c7c4edcb58994679ff9cbf606fb82b79bec1ba840a22b46ee21cfd26aefc9
diff --git a/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch b/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch
deleted file mode 100644
index 128ac8ce311b..000000000000
--- a/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Remove spurious \n to fix udev rule generation
-
-Steven Newbury <steve@snewbury.org.uk>:
-libfprint generates 60-fprint-autosuspend.rules for all supported devices, 
-however there's a spurious \n before the ', MODE="0666"' which results in it 
-appearing on a new line after the match criteria.  At least on current 
-systemd/udev this results in MODE="0666" being applied unconditionally to all 
-device nodes.  This is an extremely serious security problem and effectively 
-gives root access to all users simply by having the ebuild emerged.
-
-https://bugs.gentoo.org/562218
-
---- a/libfprint/fprint-list-udev-rules.c
-+++ b/libfprint/fprint-list-udev-rules.c
-@@ -74,7 +74,7 @@
- 	if (num_printed == 0)
- 	    printf ("# %s\n", driver->full_name);
- 
--	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", TEST==\"power/control\", ATTR{power/control}=\"auto\"\n, MODE=\"0666\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
-+	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", TEST==\"power/control\", ATTR{power/control}=\"auto\", MODE=\"0666\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
- 	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ENV{LIBFPRINT_DRIVER}=\"%s\"\n", driver->id_table[i].vendor, driver->id_table[i].product, driver->full_name);
- 	num_printed++;
-     }
diff --git a/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild b/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild
deleted file mode 100644
index 73bc12900ff3..000000000000
--- a/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils udev vcs-snapshot
-
-MY_PV="V_${PV//./_}"
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/"
-SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://dev.gentoo.org/~xmw/${P}_vfs0050.patch.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs vanilla"
-
-RDEPEND="virtual/libusb:1
-	dev-libs/glib:2
-	dev-libs/nss
-	x11-libs/pixman"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-udev-rules.patch"
-)
-
-src_prepare() {
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/${P}_vfs0050.patch
-	fi
-
-	default
-
-	# upeke2 and fdu2000 were missing from all_drivers.
-	sed -e '/^all_drivers=/s:"$: upeke2 fdu2000":' \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-drivers=all \
-		$(use_enable debug debug-log) \
-		$(use_enable static-libs static) \
-		-enable-udev-rules \
-		--with-udev-rules-dir=$(get_udevdir)/rules.d
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	dodoc AUTHORS HACKING NEWS README THANKS TODO
-}
diff --git a/sys-auth/libfprint/libfprint-0.99.0.ebuild b/sys-auth/libfprint/libfprint-0.99.0.ebuild
index f47dc6065968..f985a5c73d6b 100644
--- a/sys-auth/libfprint/libfprint-0.99.0.ebuild
+++ b/sys-auth/libfprint/libfprint-0.99.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 '_').ta
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sys-auth/pam_ssh/Manifest b/sys-auth/pam_ssh/Manifest
index 22c2d62ed746..1391e1d4aea0 100644
--- a/sys-auth/pam_ssh/Manifest
+++ b/sys-auth/pam_ssh/Manifest
@@ -7,5 +7,5 @@ DIST pam_ssh-2.3.tar.xz 380396 BLAKE2B e228e30c6f353f631c0a1c41e82e31e7a8c573b04
 EBUILD pam_ssh-1.98.ebuild 1149 BLAKE2B 992b24c2e63a6c3ab9e253e6953f1f31c2087299a9befa13532e94ff376c2790ded71e47d35244f7acee63a02761f5a04bb68ded168246daa7d5a68583b9fcdb SHA512 c1836e72948fe0fe59f2657c9d5d7fe6f05021cc25b94ef035fd33d63d3a6bc04e3e21d7738a662eab1b3a3bc0b23e2cef47fbd3c6f675fbf3a5f6db1febae27
 EBUILD pam_ssh-2.1.ebuild 1674 BLAKE2B 4234af139462e91adcc0184e56372afff1098a666f12e03bfdcb83ee9a8caaffac7fe1814c35159f80e2be5f21e6f419386d15b96ed1d62e231589cd75f3f40d SHA512 12508a96cff523b740ee0dc8cded9ddec545124417e65290fabe7644f5cc9b96206804cf7f071b793722f41305ad4e49ba4612a97ebea6ee01036a5f37cbc62e
 EBUILD pam_ssh-2.2.ebuild 1754 BLAKE2B b0175df5997d4caa2a1f9051777e29fc33f37bf7adb7647dce22e3e14867b81529429e07189b1201c8071f8f841e94f276fe62f47f96c15becf0bc61cdebdf33 SHA512 6e569c3708e7976f1a6a30fcd620d9f2a6bad8350a4f58dec9adf4421b8a88e8caf335b95407404dbcb44ddb64bd4e9d1d9cb244002da97e77c7042a7ee53ffc
-EBUILD pam_ssh-2.3.ebuild 1799 BLAKE2B 356e802a997f3e2d89c89a283102ab4b57fb1de4fe78d42e0afbab1c5e00d4f2628ea6d87854166c3773dad580a92489d84e6c43b8f9064353e054d1896f9b54 SHA512 c1353c03ab0abce6c8c6222241165b630c772838e8da46ee7fe4c936a4e951d4e4ef37d3c90f6a391fde7663e0fe6328acb2f41ad3b72e0f30f79c3df20928f3
+EBUILD pam_ssh-2.3.ebuild 1836 BLAKE2B 99b4d910cd96ed4fae7cb8e41c066825cd44bfaa3b43ea9d4d620caa08f286ccf4ab3e88228cec47da1beb3f48f901219d4359576a660791586edfe903eee55a SHA512 21fdc93f7123e35fbeaf09cacdf21dcffd75522633be9266e1d01199553d4607b5c2f29ce4680a8c978caaec11c2dba764e5929d1a68e4c300c7fcfa4d5ab38b
 MISC metadata.xml 324 BLAKE2B 1f4653cabf69551457456f200b45bf0240e920ee15962ebce3d959c8bf12f85c8b2de96f3cfaf3f4a244b062f29b2aab2e24eb9c2bd886c491d4c337dc88f3ce SHA512 f90c92c4bf59d659b312bbd22526a9ef2f347d5481d89c91847996981077d1504a996a2bf0a7382f95f5a10f86e20a2ddbc0a4875e2850f9a777457e2e911d40
diff --git a/sys-auth/pam_ssh/pam_ssh-2.3.ebuild b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
index f8d86c7fd0d7..fe935baf5932 100644
--- a/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
+++ b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.xz"
 
 LICENSE="BSD-2 BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Only supports OpenSSH via `ssh-agent` #282993
@@ -35,6 +35,9 @@ src_configure() {
 	# file system paths and picking up the wrong thing.
 	export ac_cv_openssldir=''
 
+	# not needed now
+	export ac_cv_exeext=no
+
 	# Avoid cross-compiling funkiness and requiring openssh at build time.
 	export PATH_SSH_AGENT="${EPREFIX}/usr/bin/ssh-agent"
 
diff --git a/sys-auth/pam_ssh_agent_auth/Manifest b/sys-auth/pam_ssh_agent_auth/Manifest
index e94477607f1c..6e2ea58fc390 100644
--- a/sys-auth/pam_ssh_agent_auth/Manifest
+++ b/sys-auth/pam_ssh_agent_auth/Manifest
@@ -1,14 +1,5 @@
 AUX pam_ssh_agent_auth-0.10.3-openssl-1.1.1.patch 46417 BLAKE2B bb62c32fc9c1eb5dc0788b9a535fdf6000812c57a6a758e693406a0d01bcf0cc5ec9f7622c4f21cee74895657a5a3ad13255e19d51e20eca8978e63864266629 SHA512 279fad3be9289c1da06d34e08d2b81a8ad863e07c7b0471419c029aa121abe9942ae4cc4259b7f1e2c2dd32368fc07dc1f9432aba860820455e0d9419c9e7f74
-AUX pam_ssh_agent_auth-0.9.2-libs.patch 1314 BLAKE2B fcbb332e2dbfa47d983970e66586d38f403ea2ea50f25f0273a2868560c1f4962db4b1be2ade94b42f3bed23cbf427710ad71400e5181b0b6f5d4c76d24d2f74 SHA512 ea99c2253081543e041ec043b62df9531ea9ffad029f213f17ce9e8b8b6d673cb4e7a794ddfe57fcea995b49c26a5cb775433e3dc413800c45d625c4e3c8808c
-DIST pam_ssh_agent_auth-0.10.2.tar.bz2 246412 BLAKE2B 3adf2bcc76559733f997744c95c660c67010b124db6e811559625a2ad7cbc7339d43d22dd5144135ae36ab90fdeb3c80c887e3157241936ceeb6026c8aa298fe SHA512 b4b9bc4486d873f236f7c54874c996e24f344f889dfda3beadb12b97cbb89078028a103a4a7175cd919fb0a12fd5bcefef50420510ae5eff9252e494e0124b38
 DIST pam_ssh_agent_auth-0.10.3.tar.bz2 1066393 BLAKE2B 07b113d05e09f770d63dbea813ea644199d2b103f9c6d7e5960bfad37cb181ce5a5f111f72e0274c0335e4c217ccd19bd53d61af23f8bc6aff14c1995fc4edc9 SHA512 d75062c4e46b0b011f46aed9704a99049995fea8b5115ff7ee26dad7e93cbcf54a8af7efc6b521109d77dc03c6f5284574d2e1b84c6829cec25610f24fb4bd66
-DIST pam_ssh_agent_auth-0.9.2.tar.bz2 237156 BLAKE2B b9d09920e10b454ea739e44c38daba6a509fbd4a96f01e26a82e0a8c58b696806b1f3ea95d53c10b55ed01e5804dfb687dd4545b87d85fa4f6a474548c3666d5 SHA512 e710a4dff315c8d79c5d5edc4ebe1629a8fc6d09651813fd4792a2021e7c2d5768d6b7e8539801e31b947cc30817f32375d751fc396707fc4f257df4f33cd408
-DIST pam_ssh_agent_auth-0.9.3.tar.bz2 239596 BLAKE2B 7be6af1c78457e082d34f5df406fccf74fbda48d1fe87be0592b927ea296b6db3cf1f9a58bcdd61c50556ffc53c16276dc87e5970d9caa0e51fb520e0473240b SHA512 c2304dcf623858339b5fd77bcf64e9c980a3ee241384b9125d64ba6ab9539a65eacbd3576b31a94bb390e4c089e702f9df2963119250b773bd8be872ae63a050
-DIST pam_ssh_agent_auth-0.9.4.tar.bz2 239250 BLAKE2B fee1e009a5374126db0b0df9f05436521e215933ed2eabdcd1983e6372fc7160c6a6c53d07b9ddc7bdd8b9529a27c7da4ef35aad2c80ea1ef2f895f3fb237135 SHA512 3d469e85bf7c49dcf9345c63678ebe050db4d15447592bc337bfc762f2337f92cebd7e840fc12d7be94acf1aa47b0272efe2c1688888ecd8f9daf63549520792
-EBUILD pam_ssh_agent_auth-0.10.2.ebuild 790 BLAKE2B 2ecff3ae129494ef13289417ed46219e1894506eaf070301089dd61d58362b462f24e3e306118e54650ac5e10a9a52f19cd5d624232977966d2e35709b954ff4 SHA512 49c0e34eae182fccef342a3d4afa3bdcf9932222866478b028b6ce071a2afe14783ba3a6083411b074db4c9795854e22eb3391f103fa6ecac9b3a7c72853066d
 EBUILD pam_ssh_agent_auth-0.10.3.ebuild 990 BLAKE2B 8d67820e853e5631da52f007913ce66fd3e409d24cc493f7cd7cee5e5c72e79afbd3d04e5d7318972150195ae76e3e2312564931aa71729053dea936875d57a7 SHA512 a765b39e419749f5ffeab11665f0dacb2ca4fc811b6cee2b2a1753b8690f600f2e216f830f5568645ff38864bffb20d2677f9eff08f69b51f4961903b078fa4e
-EBUILD pam_ssh_agent_auth-0.9.2.ebuild 853 BLAKE2B 61a7e4feba97b652892c96f5901b60a04f482b806faf84b2e2fa451974545afa4b1bb1e36289f6765e57a0295af040eaa9d36a4ea7f9ef8ae83d14891be74fff SHA512 326af2ffaa4d7f871584e2f0c659e23c6f089f86eade0f85eee50785e1810f2fe394459f9b977f47142ecbb26317572c812a585d0d9bf61be555fd868493e6c4
-EBUILD pam_ssh_agent_auth-0.9.3.ebuild 873 BLAKE2B ede6573827d2c3b58fee9bd7af4aecfe6f81d14e326eef76f7053d936a1c0fa9a869bedc30ccc8d91000f3e739c7ba3bbb3ce49e13ea05b0890d95fcfcfe21dd SHA512 d3aaac053792d87967fb01cc16dec5b3d3efe58fef3a1b0443c87121d01d34305b9d9fbe25dcafa277638e78801d03238d88160796e97601dc4708def758277e
-EBUILD pam_ssh_agent_auth-0.9.4.ebuild 802 BLAKE2B ab45042fc1e54c318a696004576d75c69882eb4a679f3486809efe533ba5ccd4d51a9b5cdaa61bd2866c660982132635f4dd4c3a86d56aca43ba880d6cd793cb SHA512 4a94a25449e2313a8ec657f62a378e6452af8b6a944fa54b31eeecea2753f475d2ded378b59eadf9b2233c39cfaa168f432c7f2bbbd95ee0782b38d0d9c06061
 EBUILD pam_ssh_agent_auth-9999.ebuild 938 BLAKE2B 1bf278f334da97723e7bfaae19ba60371cb7dd04aeb5998db26377f91b41af1ebf4fa402b6706dac2365473d45ee535b7d09deaabb7ca0a09b09bf457cb8fb36 SHA512 cad3c6b589740e3d811b0f9a4d6b00fb1c85beaeff5024173cab02514ed4524daf02616a2c8135202e4fd7200926cf765578701ba2df0ee14d209145cb3c3bb2
 MISC metadata.xml 319 BLAKE2B 20691dc382ee9681b1d2263cdb263eea3425cb4722cb04e014c992c091a793db3295ae9215447ade8e80ff00b26ecf255f59f98ad6f7474b98af3c50be0d4dce SHA512 c8813d731e8314b510c664ea221fe40524fabf52d5bf5785456c64c6797a55d2f71fb02e2d53832f9be7a855655ea6870c20abb06167abefb780f349d3034127
diff --git a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.9.2-libs.patch b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.9.2-libs.patch
deleted file mode 100644
index 3e259761a2e2..000000000000
--- a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.9.2-libs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 3428c51..4b5ea8a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -48,7 +48,7 @@ PAM_MODULES=pam_ssh_agent_auth.so
- 
- SSHOBJS=xmalloc.o atomicio.o authfd.o bufaux.o bufbn.o buffer.o cleanup.o entropy.o fatal.o key.o log.o misc.o secure_filename.o ssh-dss.o ssh-rsa.o uuencode.o compat.o
- 
--PAM_SSH_AGENT_AUTH_OBJS=pam_user_key_allowed2.o iterate_ssh_agent_keys.o userauth_pubkey_from_id.o pam_user_authorized_keys.o
-+PAM_SSH_AGENT_AUTH_OBJS=pam_user_key_allowed2.o iterate_ssh_agent_keys.o userauth_pubkey_from_id.o pam_user_authorized_keys.o pam_ssh_agent_auth.o
- 
- 
- MANPAGES_IN	= pam_ssh_agent_auth.pod
-@@ -72,8 +72,8 @@ $(LIBCOMPAT): always
- 	(cd openbsd-compat && $(MAKE))
- always:
- 
--pam_ssh_agent_auth.so: $(LIBCOMPAT) $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS)  pam_ssh_agent_auth.o
--	$(LD) $(LDFLAGS_SHARED) -o $@ $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS) $(LDFLAGS) -lopenbsd-compat $(LIBS) -lpam pam_ssh_agent_auth.o
-+pam_ssh_agent_auth.so: $(LIBCOMPAT) $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS)
-+	$(LD) $(LDFLAGS_SHARED) -o $@ $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS) $(LDFLAGS) -lopenbsd-compat $(LIBS) -lpam
- 
- $(MANPAGES): $(MANPAGES_IN)
- 	pod2man --section=8 --release=v0.8 --name=pam_ssh_agent_auth --official --center "PAM" pam_ssh_agent_auth.pod > pam_ssh_agent_auth.8
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.2.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.2.ebuild
deleted file mode 100644
index 3faa51dfab8b..000000000000
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.2.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
-
-inherit pam
-
-DESCRIPTION="Simple module to authenticate users against their ssh-agent keys"
-HOMEPAGE="http://pamsshagentauth.sourceforge.net"
-SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="virtual/pam
-	dev-libs/openssl"
-
-RDEPEND="${DEPEND}
-	virtual/ssh"
-
-# needed for pod2man
-DEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_configure() {
-	pammod_hide_symbols
-
-	econf \
-		--libexecdir="$(getpam_mod_dir)"
-}
-
-src_install() {
-	# Don't use emake install as it makes it harder to have proper
-	# install paths.
-	dopammod pam_ssh_agent_auth.so
-	doman pam_ssh_agent_auth.8
-
-	dodoc CONTRIBUTORS
-}
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild
deleted file mode 100644
index 9d12c9d6d898..000000000000
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils pam
-
-DESCRIPTION="Simple module to authenticate users against their ssh-agent keys"
-HOMEPAGE="http://pamsshagentauth.sourceforge.net"
-SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/pam
-	dev-libs/openssl"
-
-RDEPEND="${DEPEND}
-	virtual/ssh"
-
-# needed for pod2man
-DEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libs.patch
-}
-
-src_configure() {
-	pammod_hide_symbols
-
-	econf \
-		--libexecdir=$(getpam_mod_dir)
-}
-
-src_test() { :; }
-
-src_install() {
-	# Don't use emake install as it makes it harder to have proper
-	# install paths.
-	dopammod pam_ssh_agent_auth.so
-
-	doman pam_ssh_agent_auth.8 || die
-}
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.3.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.3.ebuild
deleted file mode 100644
index 2ebe6d4f5743..000000000000
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils pam
-
-DESCRIPTION="Simple module to authenticate users against their ssh-agent keys"
-HOMEPAGE="http://pamsshagentauth.sourceforge.net"
-SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/pam
-	dev-libs/openssl"
-
-RDEPEND="${DEPEND}
-	virtual/ssh"
-
-# needed for pod2man
-DEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.2-libs.patch
-}
-
-src_configure() {
-	pammod_hide_symbols
-
-	econf \
-		--libexecdir=$(getpam_mod_dir)
-}
-
-src_test() { :; }
-
-src_install() {
-	# Don't use emake install as it makes it harder to have proper
-	# install paths.
-	dopammod pam_ssh_agent_auth.so
-	doman pam_ssh_agent_auth.8
-
-	dodoc CONTRIBUTORS
-}
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.4.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.4.ebuild
deleted file mode 100644
index 0bc8de146ed8..000000000000
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit pam
-
-DESCRIPTION="Simple module to authenticate users against their ssh-agent keys"
-HOMEPAGE="http://pamsshagentauth.sourceforge.net"
-SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/pam
-	dev-libs/openssl"
-
-RDEPEND="${DEPEND}
-	virtual/ssh"
-
-# needed for pod2man
-DEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_configure() {
-	pammod_hide_symbols
-
-	econf \
-		--libexecdir=$(getpam_mod_dir)
-}
-
-src_test() { :; }
-
-src_install() {
-	# Don't use emake install as it makes it harder to have proper
-	# install paths.
-	dopammod pam_ssh_agent_auth.so
-	doman pam_ssh_agent_auth.8
-
-	dodoc CONTRIBUTORS
-}
diff --git a/sys-auth/polkit-qt/Manifest b/sys-auth/polkit-qt/Manifest
index c5ff9d2e6606..cae29b1d55a1 100644
--- a/sys-auth/polkit-qt/Manifest
+++ b/sys-auth/polkit-qt/Manifest
@@ -1,3 +1,3 @@
 DIST polkit-qt-1-0.112.0_p20160416.tar.xz 64540 BLAKE2B fbc3631585801f42ff92324576a2bd82d61aa5b24317f95e1182c300073a8e746007fa3409127a50d7d3433c5092f56d72e2e579683d08145067d4424c4dfe7e SHA512 90677af780a2bbcb33b6a54702ba96f965eb8561f2636af7aa0146f9b2450f9e89f67e022ffa99742afe50e3d1f570eabfad686e9e08e629a1e662d9f5abf2ea
-EBUILD polkit-qt-0.112.0_p20160416-r2.ebuild 772 BLAKE2B 7c000cf2cb82eb4ee93af0f8748e08d1a996dda74ea744a323fd99fc86324898f02751bcd5b3e3525fb28cf98db28701ff0d0bb69e725a2f289d61b43d783ac6 SHA512 cbec6528f24aec75cf776e330eccade8dd9a7eaad5e1f3fba2d7366f0c1f338cb3c31ffe8786662d7c5f5d788870a70f8bf8c17eeed29754855756b9e5034b6b
+EBUILD polkit-qt-0.112.0_p20160416-r2.ebuild 771 BLAKE2B 37d1a80ae56b09e70e834b882d28b5a211662657cc666365a0d9a214e4772ecd42a321e9bbe1caaf379c47192f17f646e0c4139dd8a7a56fc9cf34be1b5434f9 SHA512 d9bf61fe356c7923b4f4ad1dd9a400a0ed023f01b90b6358e48b77e4a1ad09efaacce64d776530172a61d969678118383a703cfdc5691a1517e8ffc357f79b0a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r2.ebuild b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r2.ebuild
index bc0b5722ceca..8061a6189ae6 100644
--- a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r2.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 4b8a8ea2b641..3bbe6a7fbd11 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -6,5 +6,5 @@ AUX sssd.service 341 BLAKE2B 0cffcd43786633aa8e5bb42c54741cba676021c5a07554b0849
 DIST sssd-1.16.3.tar.gz 6217114 BLAKE2B eefaf8de466d0d76e9a4b60aefef6eb63c17a55b9a1f2e07e973a61d71cbe5432e92357656a1eb353d45bbc2fa92290cef45898d0b315d4a4c4074652ff25a23 SHA512 6165923f652f624bbe3ddc625ae682c4867eb7a20652d0cf74bbb8dda2307c917d3189ede26fd21a4fb5fd5926149271a65fa09f3affe928029ed99e6422b728
 DIST sssd-2.1.0.tar.gz 6463331 BLAKE2B 9226370dc384c58841d944bdf9b067d953bf138ee7a289f01a4b8bb5d09beee3b9f21609989123d8f4f9fc13237670d61e32dcb194555ddc6785c598ce78d08c SHA512 12a7e5b89d462350af3c43e15b24a437dd985ac4a2e419d5e52cc0d05c6eacb9319d39b23681595ef860120cd1ae6e5fb265054afeddcb05d3d5f5de5d6ffa63
 EBUILD sssd-1.16.3-r2.ebuild 6285 BLAKE2B e44ab49fc7d72b0c2121bc4b5bea2b2413f6a379d1223a9b2f2cea59cb79685e30ae2beb25620e4c3094c5c032bdf29bf1affd5456665d12504ed84adae44528 SHA512 d79062bc3c7d48db6452bd6cdcf681745f4ae7e13f5aacd7bb8f434963df82d66c0293a1848518a6c2df71e7fcc3337e9de58a622859b1772e6c96fa8618cfa6
-EBUILD sssd-2.1.0.ebuild 6196 BLAKE2B a65e7850f8eb6542732586a7a7b49ed3a37d14aa8c605c4443e45424fe5dbb1d75d84f9001294a87b77e7d00d66dc03599e6f9eea46c639bfb43c217add6cd3f SHA512 feddd1b9ee85eb3ffad49dcbb4d88fd8d4ccd2dde7e861154f01881c0a1f864b2f35fe27aa89581a5972daaf651eddebc9a244e6eaf81e3d3953997eafdd3a66
+EBUILD sssd-2.1.0.ebuild 6205 BLAKE2B f78b016540080eec10a44fb162dacc639639db594dd2e763774a1a51917cd5e2410184c7a2c6efb04a1bf876bd2320a977082980a807ac308292080de3fb9a7b SHA512 b36a70fa89df5717a53e03b42541c881e69eb6c27868fa25f2cbc5dbfd64ac21e020ef6c916acd7c0d0fe3967e05629abd4952f29234fb6a7c41b0f911be41b6
 MISC metadata.xml 1090 BLAKE2B 7085d66b3454b3756d7dab49b6d9525c4ba90156d07f2710f4eb3c5bf3bbd9d10412d511dc0fe091ac4c5291f87a258fac6adbe9732d20a96660f4e0a66cf247 SHA512 2cbf20cd206a45bd82b1416926a02de06bf40b1b4168f19202c367cf8e24d764745b8a5116366ee10520cae15800e17b43d3000995419117f02b2d37474f142e
diff --git a/sys-auth/sssd/sssd-2.1.0.ebuild b/sys-auth/sssd/sssd-2.1.0.ebuild
index 9c5159b78ab2..146e47c5995d 100644
--- a/sys-auth/sssd/sssd-2.1.0.ebuild
+++ b/sys-auth/sssd/sssd-2.1.0.ebuild
@@ -50,7 +50,7 @@ COMMON_DEP="
 	nls? ( >=sys-devel/gettext-0.18 )
 	virtual/libintl
 	netlink? ( dev-libs/libnl:3 )
-	samba? ( >=net-fs/samba-4.10.2 )
+	samba? ( >=net-fs/samba-4.10.2[winbind] )
 	"
 
 RDEPEND="${COMMON_DEP}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index ce1eb8a15695..a9d3a25a3016 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 51932a102385..08ab8e2e2c0b 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -13,12 +13,16 @@ AUX open-iscsi-2.0.876-Makefiles.patch 1416 BLAKE2B e953a6b5b802feae3068322782f3
 AUX open-iscsi-2.0.876-musl-fixes.patch 2323 BLAKE2B c69d973bdc48adc1f4f8e5680f8cf108172f708889bb740cd7960f09dd48ee29d6ccdbf6f1ed08579838fc1913cd3c8ee0b9325714e793de5884eb6faea0e161 SHA512 2224465ba4ae0f8eb195a1181304e17285c6501320f1458b6eb9d092a19c08bdedb08e8b88bfc319eb878a18fb1b487842719fa24f69f5885b1ba7845197fe12
 AUX open-iscsi-2.0.876-space_in_node-mode.patch 901 BLAKE2B 440b58f2ba96d99ef0fe132d301ac138b1e5bd903bffc215e498f7124f30f0d395f473124b718cbedf2035fe29993cc5d87ee125e4c3b3794b741ec285e10aa1 SHA512 89718e2d098fe774553fbb86c244f427da7d0ed64818b83d2d0213f1cce5c7bdf0f57f79e1dc1511ab9ff29fee1f11cce1713a004cde989fdccbbf9a728d2eba
 AUX open-iscsi-2.0.876_p20180814-musl-fixes.patch 2057 BLAKE2B 6dea839a582be9e096ec35cd61eaf173300353e71bf2df57ca420c2a7921e91282fbd206815cbdf5baab8ffe499b86412092680bc4b9342fa1796d5a2fc502ed SHA512 10db0c0123342797824ec241d0769b431ce10aaca32d0242ebee98258e6236ee5492afc8b8a20a9842339fbb4a0c7c4c7c158b4d0c6651890d4c1af9e81733bd
+AUX open-iscsi-2.0.877-optional_systemd.patch 2308 BLAKE2B 32ad0dd559cae999e5fa1cd2164a825bc7c17bfea07d8ab3ffc9bd469d14538b4ec469f241daed9dfcc376a11dd29dc15d0e14bc2b3d59667719b13e27571ffb SHA512 ed00b9155f623ccc6f871247f0388d7f453997b8ce5c04aba38eab36d5379c6e94896e3a0d6b16fe9ed52b96694ddb9b5e07b8bb9051940b4f4274a89ffb7c1c
+AUX open-iscsi-2.0.877-pkgconfig.patch 2882 BLAKE2B f763ae55aa0bc9e7d2f525a069bd7b35cc8f71fa51c5251ef1ca917373cf963f3ad26418bd72f68cadaa1678f86c9f246070a4ae03fc21fa49b52428a30b6290 SHA512 0da14100fa93fd256d6f6cbe4126be1f2fb874d3570fcdc09e8cb77052cc98413d8bde2bcaca6b7bc286b2494f8cca7c707813ecd4f290cc63cc8aa2ea8347af
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac SHA512 f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422
 DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc SHA512 d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf
+DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef SHA512 1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6
 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
 EBUILD open-iscsi-2.0.875.ebuild 3713 BLAKE2B b3ec80066fd3c7bf72e56361e59213ba8b8a4d57e777394e5842458620a712c14ad93cc1b69f47f266360570cc6c63be94582ea3f460730ef920320a5635c397 SHA512 8af21fe4129b7af58f2e126bb5c6f8e7f6b764246686dd2a7c80e13ea90f691bcb6722a8a4a6d688d096fa7d414fd52c0a214d7c1212d40495bbbddd241b7132
 EBUILD open-iscsi-2.0.876.ebuild 3620 BLAKE2B 62aa39170d32cea0f523cf148fa3770fc027b4db72d719996c5621062be9e9f593c95bf3b4a108ae62c13a172a84dc96ffa6587e3e3f51f9635af10abb3a0d6a SHA512 1bb4f8e5e98b93a704242a89e40b692f83dac92497fe018fd87fd635d2a289b7597874fdfa02004b3fd01e2809e45ea514c2a9f86d8ee29c12533bb2638785ff
 EBUILD open-iscsi-2.0.876_p20180814-r1.ebuild 3779 BLAKE2B b781e9f244e37563113547b2c8e1a5bffd3f3b6fce0ddbac6853a0bedccbced4dcaa2893bc53d90e43663777b384ec0216f634af2096d042a450f5d3d4e015b2 SHA512 aa0bc1df9b116ad9f233706e741ad56bde58204b01572a520f3af6017567a9929939d47df527b40841d6ba2e01a0a0472621167e31f62e7de377f49cec39d44a
+EBUILD open-iscsi-2.0.877.ebuild 4038 BLAKE2B e9b029d7ce68a087b74dd898fb16131081f9258151b7b066dd56ca7d4be7d44a3f6087e98174b9fb0682a9b9efff1e3d6ecf553c2465f812398b9f61b7e98843 SHA512 75c8dc09217e30f3bc7a2ed99b8102b4244587baee647edc6583bcabce63d4a5a85447fe09e87a215746e66b265ca3c24c589f5ba08b96f786f708b992d2b50a
 MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch
new file mode 100644
index 000000000000..b1f1a8f1d078
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch
@@ -0,0 +1,87 @@
+From f66608aa9ce989c91f744bb2f3f34d2e01aedc87 Mon Sep 17 00:00:00 2001
+From: Lee Duncan <lduncan@suse.com>
+Date: Tue, 14 May 2019 13:11:34 -0700
+Subject: [PATCH] Make iscsid systemd usage optional
+
+You can compile without system now by using something
+like:
+
+	make OPTFLAGS="-DNO_SYSTEMD ..." NO_SYSTEMD=1
+
+This will skip systemd code for iscsid and iscsiuio.
+---
+ Makefile     | 5 +++++
+ usr/Makefile | 2 ++
+ usr/iscsid.c | 6 ++++++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index c941740c..9a337741 100644
+--- a/Makefile
++++ b/Makefile
+@@ -40,6 +40,11 @@ ifneq (,$(CFLAGS))
+ export CFLAGS
+ endif
+ 
++# export systemd disablement if set
++ifneq ($(NO_SYSTEMD),)
++export NO_SYSTEMD
++endif
++
+ # Random comments:
+ # using '$(MAKE)' instead of just 'make' allows make to run in parallel
+ # over multiple makefile.
+diff --git a/usr/Makefile b/usr/Makefile
+index f1c35aa7..0203127c 100644
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -41,7 +41,9 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
+ ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
++ifeq ($(NO_SYSTEMD),)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd)
++endif
+ PROGRAMS = iscsid iscsiadm iscsistart
+ 
+ # libc compat files
+diff --git a/usr/iscsid.c b/usr/iscsid.c
+index 0c984409..37c13b39 100644
+--- a/usr/iscsid.c
++++ b/usr/iscsid.c
+@@ -34,7 +34,9 @@
+ #include <sys/wait.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifndef	NO_SYSTEMD
+ #include <systemd/sd-daemon.h>
++#endif
+ 
+ #include "iscsid.h"
+ #include "mgmt_ipc.h"
+@@ -339,6 +341,7 @@ static void missing_iname_warn(char *initiatorname_file)
+ /* called right before we enter the event loop */
+ static void set_state_to_ready(void)
+ {
++#ifndef	NO_SYSTEMD
+ 	if (sessions_to_recover)
+ 		sd_notify(0, "READY=1\n"
+ 				"RELOADING=1\n"
+@@ -346,14 +349,17 @@ static void set_state_to_ready(void)
+ 	else
+ 		sd_notify(0, "READY=1\n"
+ 				"STATUS=Ready to process requests\n");
++#endif
+ }
+ 
+ /* called when recovery process has been reaped */
+ static void set_state_done_reloading(void)
+ {
++#ifndef	NO_SYSTEMD
+ 	sessions_to_recover = 0;
+ 	sd_notifyf(0, "READY=1\n"
+ 			"STATUS=Ready to process requests\n");
++#endif
+ }
+ 
+ int main(int argc, char *argv[])
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch
new file mode 100644
index 000000000000..1756196e6b33
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch
@@ -0,0 +1,84 @@
+From 623a81123c494f5c69dc6616bd72e838862e2f1f Mon Sep 17 00:00:00 2001
+From: Lee Duncan <lduncan@suse.com>
+Date: Mon, 12 Nov 2018 13:10:04 -0800
+Subject: [PATCH] Use pkg-config in Makefiles for newer libraries.
+
+These two recently-added libraries can be in different
+locations on different distros, so use pkg-config to
+added the appropriate actions in the make files.
+---
+ libopeniscsiusr/Makefile |  8 +++++++-
+ usr/Makefile             | 11 ++++++++---
+ 2 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
+index bf7c96c7..a045a459 100644
+--- a/libopeniscsiusr/Makefile
++++ b/libopeniscsiusr/Makefile
+@@ -23,6 +23,8 @@ endif
+ INCLUDE_DIR ?= $(prefix)/include
+ PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig
+ 
++PKG_CONFIG = /usr/bin/pkg-config
++
+ LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr
+ 
+ LIBISCSI_USR_VERSION_MAJOR=0
+@@ -43,13 +45,17 @@ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o
+ 
+ CFLAGS ?= -O2 -g
+ CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC
++CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
++
++LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
+ 
+ LIBADD =
+ 
+ all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc
+ 
+ $(LIBS): $(OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD)
++	@echo CFLAGS= $(CFLAGS)
++	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS) $(LIBADD)
+ 	ln -sf $@ $(DEVLIB)
+ 
+ $(LIBS_MAJOR): $(LIBS)
+diff --git a/usr/Makefile b/usr/Makefile
+index f9445ada..f1c35aa7 100644
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -32,11 +32,16 @@ IPC_OBJ=ioctl.o
+ endif
+ endif
+ 
++PKG_CONFIG = /usr/bin/pkg-config
++
+ CFLAGS ?= -O2 -g
+ WARNFLAGS ?= -Wall -Wstrict-prototypes
+ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
+ 	  -I$(TOPDIR)/libopeniscsiusr
++CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
+ ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
++LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
++LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd)
+ PROGRAMS = iscsid iscsiadm iscsistart
+ 
+ # libc compat files
+@@ -60,14 +65,14 @@ all: $(PROGRAMS)
+ 
+ iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
+ 	iscsid.o session_mgmt.o discoveryd.o mntcheck.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@  -lisns -lcrypto -lrt -lmount $(ISCSI_LIB)
++	$(CC) $(CFLAGS) $^ -o $@  -lisns -lcrypto -lrt -lmount $(LDFLAGS) $(ISCSI_LIB)
+ 
+ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB)
++	$(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB)
+ 
+ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
+ 		iscsistart.o statics.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB)
++	$(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB)
+ clean:
+ 	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
+ 
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild
new file mode 100644
index 000000000000..3c166cfb0a40
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
+
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband libressl +tcp rdma systemd"
+
+DEPEND="
+	sys-apps/kmod
+	sys-block/open-isns:=
+	sys-kernel/linux-headers
+	infiniband? ( sys-fabric/ofed )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+	sys-fs/lsscsi
+	sys-apps/util-linux"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
+	"${FILESDIR}/${PN}-2.0.877-pkgconfig.patch"
+	"${FILESDIR}/${PN}-2.0.877-optional_systemd.patch"
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is -lt 2 6 16; then
+		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+	fi
+
+	# Needs to be done, as iscsid currently only starts, when having the iSCSI
+	# support loaded as module. Kernel builtin options don't work. See this for
+	# more information:
+	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+	# If there's a new release, check whether this is still valid!
+	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+	RDMA_MODULES="INFINIBAND_ISER"
+	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
+	if linux_config_exists; then
+		if use tcp; then
+			for module in ${TCP_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+		fi
+		if use infiniband; then
+			for module in ${INFINIBAND_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+		fi
+		if use rdma; then
+			for module in ${RDMA_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
+			done
+		fi
+	fi
+}
+
+src_prepare() {
+	sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
+		-i etc/iscsid.conf || die
+	sed -e 's@\(/sbin/\)@/usr\1@' \
+		-i etc/systemd/iscsi* || die
+	default
+
+	pushd iscsiuio >/dev/null || die
+	eautoreconf
+	popd >/dev/null || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+	append-lfs-flags
+}
+
+src_compile() {
+	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
+	# is messed up already here, so it's not making it that much worse.
+	KSRC="${KV_DIR}" CFLAGS="" \
+	emake \
+		OPTFLAGS="${CFLAGS} ${CPPFLAGS} $(usex systemd '' -DNO_SYSTEMD)" \
+		AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		$(usex systemd '' NO_SYSTEMD=1) \
+		user
+}
+
+src_install() {
+	emake DESTDIR="${ED}" sbindir="/usr/sbin" install
+	# Upstream make is not deterministic, per bug #601514
+	rm -f "${ED}"/etc/initiatorname.iscsi
+
+	dodoc README THANKS
+
+	docinto test/
+	dodoc test/*
+
+	insinto /etc/iscsi
+	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+
+	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
+	newinitd "${FILESDIR}"/iscsid-init.d iscsid
+
+	systemd_dounit etc/systemd/iscsi.service
+	systemd_dounit etc/systemd/iscsid.service
+	systemd_dounit etc/systemd/iscsid.socket
+
+	keepdir /var/db/iscsi
+	fperms 700 /var/db/iscsi
+	fperms 600 /etc/iscsi/iscsid.conf
+}
+
+pkg_postinst() {
+	in='/etc/iscsi/initiatorname.iscsi'
+	if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
+		{
+		  cat "${EROOT}${in}.example"
+		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
+		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
+		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
+	fi
+}
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 03db1390f56c..40d6a71d526f 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -4,8 +4,10 @@ DIST tgt-1.0.74.tar.gz 297109 BLAKE2B 8ad439a1df437b87a6bf94a8c0403c4ae26a6b77dd
 DIST tgt-1.0.75.tar.gz 297374 BLAKE2B c3db3701980b78328decd857b3a031f1e735553b33163bc012b55084a0c1ce803e90b93771c6516542168448ab872a641064c90bd01444b49c353c35a37e2985 SHA512 e2da4f49b1b89b67084a535abc1f6c28f289d25a6fce1cd6a9238df64c7a1e29eb11f4d074cd6dfda4cc37524e0f6831fbdee8d32a03d50ff156bc1369de04d8
 DIST tgt-1.0.76.tar.gz 297349 BLAKE2B b5f954b7497fd54d2156bb8ae7c90c2e158e59dd5cd2f8ea25a87403b1d4c491ce07d4968d27f13d5a195a4824554f98a07091f500cb520dffd856454736ceeb SHA512 4c25f8f0553f95d58ed694e44f85bddbacbebe12d531725b7db03de5f6728c85a9b8968a39bea5b2126aecde9dd254855d9d6e8686c310fa53daf976738edfe1
 DIST tgt-1.0.77.tar.gz 297550 BLAKE2B fdf5728b8b2d796a0b7d0845948d51161b1d2fa148c05e0c3940426a524246b3303b2e9aa6e748df54090ea3682a449edcf65c523ebd1e6d43b142e9339a605c SHA512 ad8d5519a6c1a46991d5b8c2f6d2990e2d064b81e82fb4700728153accf6aff05dab79c9d91ee55a9a6c344e7bd7451de4f26840162e08467a81a11d2d841bdd
+DIST tgt-1.0.78.tar.gz 297886 BLAKE2B c9edf8e5d0fe6a9788ff6bea4097f6cc0a8a905ffdc1943dcab538843445ede9142e1684121dad7f80677207607e20695bdad04fef622364c23df7cbeab1339a SHA512 dedafd490b6a042041fb9c8ed751747ec85f3bddab849fee301e0cf43b18aa92f5609657136700b867667fbff9ace62f4733c535cd425d8c71b072a7d7029430
 EBUILD tgt-1.0.74.ebuild 1511 BLAKE2B 4deca6da9f562fe1d25269d7513d6dc66c6f94cd94dbfb71bc38c4e77833eb311d6302fa5f309602f4ac2e7022299cd9d19241105195d4e0c83409577956458a SHA512 2e04cba7dcaaf6c287714e2866803c7f64b8a50b7b513ec5c23a7fd5227d4571e0cb93e941cdef60a8778005d903d5b767640ecfbbc15a4f843da9dfae06f164
 EBUILD tgt-1.0.75.ebuild 1511 BLAKE2B c13d8c0f3d029a51fc0715039e6e4dbbe68e9ccee82ee8e8b65b03ec886613d1e5fafed8d715f72ff69071fdc6edd024c215a994fde51e82122951f27a58fde3 SHA512 24982df2fe02801733108453122096048974534314aef9c034a988ed0d8a1d8c08e1bc98f295773d278e99e07e489bbf1c38f96191089e8eda73f727c7fae39c
 EBUILD tgt-1.0.76.ebuild 1511 BLAKE2B 92111f2f2ba394c243898b48a2e08925323c2b2b4fd8c89cb6bd7f3a0791d3c752bdaeb70c3daa225c3e4684955e8ce77455a52d31368df7a4a3fc17c294e0fd SHA512 0522174785a977933513c6ab71741928806b4b113cfed918fed68051c12ebb458b8cf94361ad356e264e4ec3563f7940e2b78fd7babac76c1d519e55c40d53a0
-EBUILD tgt-1.0.77.ebuild 1513 BLAKE2B 6efe11c81889f519bae8a04a59162c3d0d533dfca11b4cba234ee42c10b0c80a1092da0105c55117779c0ea9f642d3a4e08e9f86968042b60a098b7b9eb37faa SHA512 e720c050f0ad4d3605f04881b37b822053e74bc3d92d75bf119ecb0e70dee64194ce764b00a7184151bd2c46d97a2a7c798f1c6910086974717dbdd94c4b96f0
+EBUILD tgt-1.0.77.ebuild 1511 BLAKE2B 4617ed3355872a200db6b3f0436a383368936f187797de30fb895a01f89a9a3c1fb5efa6848f3d2475760f425e374c1a281cb9943e4fa9dc6fd4576c035dbb9f SHA512 7c45a432e8a250d7ebf20c441e44b662520db2884079c51e4abf88c3b45882a9df0cefb34355e669b317e25f312bff41c220c46c929ea6e91a880c9b564b48de
+EBUILD tgt-1.0.78.ebuild 1513 BLAKE2B 6efe11c81889f519bae8a04a59162c3d0d533dfca11b4cba234ee42c10b0c80a1092da0105c55117779c0ea9f642d3a4e08e9f86968042b60a098b7b9eb37faa SHA512 e720c050f0ad4d3605f04881b37b822053e74bc3d92d75bf119ecb0e70dee64194ce764b00a7184151bd2c46d97a2a7c798f1c6910086974717dbdd94c4b96f0
 MISC metadata.xml 825 BLAKE2B 89a6844eade4098443db47dcd5b3350c1bd6f4c0ffbdb6277df5714fdfd248d056f770f05e1392d64b573a28ca9db140dc7130e0109075c7fd398677ca251af9 SHA512 0c75be2e830ff683c8cae93175504a1e6508131d704c48d31b9fe98baa6b3a1e491661fda6180c0c1e35ef7e9bd57309d05e07b41160a7cc090934913e186f9f
diff --git a/sys-block/tgt/tgt-1.0.77.ebuild b/sys-block/tgt/tgt-1.0.77.ebuild
index 92920604e245..d89c4603556e 100644
--- a/sys-block/tgt/tgt-1.0.77.ebuild
+++ b/sys-block/tgt/tgt-1.0.77.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 CDEPEND="dev-perl/Config-General
diff --git a/sys-block/tgt/tgt-1.0.78.ebuild b/sys-block/tgt/tgt-1.0.78.ebuild
new file mode 100644
index 000000000000..92920604e245
--- /dev/null
+++ b/sys-block/tgt/tgt-1.0.78.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+MY_TREE="355a4fa"
+
+DESCRIPTION="Linux SCSI target framework (tgt)"
+HOMEPAGE="http://stgt.sourceforge.net"
+SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fcoe fcp ibmvio infiniband rbd"
+
+CDEPEND="dev-perl/Config-General
+	dev-libs/libxslt
+	rbd? ( sys-cluster/ceph )
+	infiniband? (
+		sys-fabric/libibverbs:=
+		sys-fabric/librdmacm:=
+	)"
+DEPEND="${CDEPEND}
+	app-text/docbook-xsl-stylesheets"
+RDEPEND="${DEPEND}
+	dev-libs/libaio
+	sys-apps/sg3_utils"
+
+S=${WORKDIR}/fujita-tgt-${MY_TREE}
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
+	# make sure xml docs are generated before trying to install them
+	sed -i -e "s@install: @& all @g" doc/Makefile || die
+	eapply_user
+}
+
+src_compile() {
+	local myconf
+	use ibmvio && myconf="${myconf} IBMVIO=1"
+	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
+	use fcp && myconf="${myconf} FCP=1"
+	use fcoe && myconf="${myconf} FCOE=1"
+	use rbd && myconf="${myconf} CEPH_RBD=1"
+
+	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
+	emake -C doc
+}
+
+src_install() {
+	emake  install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
+	newinitd "${FILESDIR}"/tgtd.initd tgtd
+	newconfd "${FILESDIR}"/tgtd.confd tgtd
+	dodir /etc/tgt
+	keepdir /etc/tgt
+}
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index d4305ab47a83..6ee14444b78a 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -2,12 +2,12 @@ AUX thin-provisioning-tools-0.7.0-build-fixes.patch 1077 BLAKE2B 540efcaff8a0f82
 DIST thin-provisioning-tools-0.4.1.tar.gz 186979 BLAKE2B d7e60b67f716c1398c4fa7230b3e0b57f62aa47cf6253806e4e3b932b0a71a489cf367ec9eb1e0a620dfab5a7ef0f4c2049a8ee5f5da0d94855fc3618dd03feb SHA512 e148296b55f7ff4ab85dc3b4679c7eab0ee8d56e61415397fc2e46f17bcc16a6a582c17343381320f8582bc4f12311af622d43aabe60e7abb25a882446016b7e
 DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
 DIST thin-provisioning-tools-0.7.6.tar.gz 285428 BLAKE2B af74eff6d435f00e347872786fee8627f02844af122a9f1bf9ffd00234ce5275d3a61d9b4204313a19813cadbc0197bbeb9a1bd92d55992c6d9a03a299579e29 SHA512 395035b6f59fafb1c0f3e68750611e04f10223bc8d57b257e25c28c928647d1d2c6e94014b64ed90eeae1151fc7e5d23cf1aa428716e343338cb3c8fe55ed704
-DIST thin-provisioning-tools-0.8.0.tar.gz 305009 BLAKE2B 1002916cd7b455be21091007f68d12455476efc234a3892607152085adab37db03cea9959cf76d6903dad680b209d87ec62745b268daa02ff11667d0e070da8c SHA512 b95f320f8da94b52327d7afece98020de65c7a3eccf9e6d8e8f89600b9f984e3d4ae928b52c04dd973d0d87885354567f6d392e9551e0e7394158406bae79891
 DIST thin-provisioning-tools-0.8.1.tar.gz 305013 BLAKE2B 647942c6b882ea12ff0429157b72c3fa2ef0d20abae003be4823383dff20b18bc7c447805cbea023c33698f3b00aaed0b5560b08844e2d3a35199b78a9acb871 SHA512 8f1edb7e50b897a070c6c04ea9c43725db3d725d6afcb5349bdedba59fce29faa680cd79bb47f255700054ee89e80f7063cde4c8abaa172e560f22459e004ce6
+DIST thin-provisioning-tools-0.8.2.tar.gz 305022 BLAKE2B ad4f7c088d890e111679a8de041ef0e05c30c5f4a46e96f7d0e1ca8034426d047dc9d2bbad624ba5e9371a5ebdd5be55ebc9486ed38c18c6fb764f8339806f3d SHA512 3aeaef4e720a14605181b700200ce6283e0e230034e5e787164a28043ae622f932e4fe8c166bc982e5e2e987cb2530027af08cc84443b2519cfbfc607c2b4681
 EBUILD thin-provisioning-tools-0.4.1.ebuild 1295 BLAKE2B d41882d0b24f3641e6de64f115918ea9d90ba4f1bcdde9d710e12fd2d2352157119e5ac9816386cdfd7816b1b9f1e7a3b1467518b9aa0373ba7541082a035523 SHA512 c4360645c8cdcb3a1d85590630b077aa3ff0c658a4ee3a42c51c7ab807bdb535abc6ea12a4ec7a953cffa75a3a77b50a04fb40142da817543ee00e2a36fd55e9
 EBUILD thin-provisioning-tools-0.7.0.ebuild 1306 BLAKE2B 30c35547bef9b7df248dd86d85d3a39868ae3573c4b6b9f81d5b85dfed98524ff64c17c54727f131eb479c1fcd54ff8bd9029026e799842da9e1cf9c651fe0da SHA512 67f0ee4b13d52bb480733ed5a94e1300918b518687ea511e604cff921712c93da478a305ef9ee3b82972ee085d9d5498b611bc7050b64e43fe11ad8a4f29b5be
 EBUILD thin-provisioning-tools-0.7.6.ebuild 1320 BLAKE2B 9e6308a4d050c42ef84b12d60fb11a0fdd122060127a8e5b44b1e48fa2e75bfd2186bec24fcab46afe104408b76b8655685db4b34850eab748928b27b2edd9e9 SHA512 72e4fb319e715afc5af130fc4d2cfb5d80992bbb9e803b4d8d8a63c46da9df66997f4862ce6d39c7b4895c6a8cec7260e3b4baca09500acf1bb9b2e9cccf91e8
-EBUILD thin-provisioning-tools-0.8.0.ebuild 1494 BLAKE2B bf3e6d902de15d0d15069b16a4f9cda59d67613c9686d07d389d32a7a69772a590ad2fa49977373cc22714d76d2e45af92a143577d89aa1ea85f58525b70ca0c SHA512 dd917a0dddb1846c65a5c7e394c81df1b4ec4e584c3c18aa49633e2084c17c8b0716c23fd54c0e96e9bf9a93ccff63788e258c6f2d54cce159d3191e86f73dab
 EBUILD thin-provisioning-tools-0.8.1.ebuild 1494 BLAKE2B bf3e6d902de15d0d15069b16a4f9cda59d67613c9686d07d389d32a7a69772a590ad2fa49977373cc22714d76d2e45af92a143577d89aa1ea85f58525b70ca0c SHA512 dd917a0dddb1846c65a5c7e394c81df1b4ec4e584c3c18aa49633e2084c17c8b0716c23fd54c0e96e9bf9a93ccff63788e258c6f2d54cce159d3191e86f73dab
-EBUILD thin-provisioning-tools-9999.ebuild 1494 BLAKE2B bf3e6d902de15d0d15069b16a4f9cda59d67613c9686d07d389d32a7a69772a590ad2fa49977373cc22714d76d2e45af92a143577d89aa1ea85f58525b70ca0c SHA512 dd917a0dddb1846c65a5c7e394c81df1b4ec4e584c3c18aa49633e2084c17c8b0716c23fd54c0e96e9bf9a93ccff63788e258c6f2d54cce159d3191e86f73dab
+EBUILD thin-provisioning-tools-0.8.2.ebuild 1492 BLAKE2B df177df671080545e68ef381dea34b0a64a03f3c57ed88c184d1b893dd5a6f0a688b02c171f840bfb166eacb27f905c65f982fa26d56cbba7a7b3685d1081ff4 SHA512 41942199c194f92521cc2476502ac7405dc3c1f23a8f5a232ffb2edaa5a5407a27ad6a690991414b768c5277ead1f148e02236fe9f195c61eaae4b9d84d2bf61
+EBUILD thin-provisioning-tools-9999.ebuild 1492 BLAKE2B df177df671080545e68ef381dea34b0a64a03f3c57ed88c184d1b893dd5a6f0a688b02c171f840bfb166eacb27f905c65f982fa26d56cbba7a7b3685d1081ff4 SHA512 41942199c194f92521cc2476502ac7405dc3c1f23a8f5a232ffb2edaa5a5407a27ad6a690991414b768c5277ead1f148e02236fe9f195c61eaae4b9d84d2bf61
 MISC metadata.xml 531 BLAKE2B 37dbd49f21f2816fec9f5b620dae0e5d95f4233bedfcdcdd54d573899fc3aaf48ff6c82b62ceeb36f400924889ca52f3f826ed62c8333bc2723c40e1fe697117 SHA512 80fde34da9de5b2436c096bc9051ccb55124c330dc82ac538f66a100225623aa7cb0869041179999608cc52613e40ba464b46630cff52423c13d1a374eb98ed0
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.0.ebuild
deleted file mode 100644
index 8b0eb97b2165..000000000000
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A suite of tools for thin provisioning on Linux"
-HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-else
-	inherit git-r3
-	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="static test"
-
-LIB_DEPEND="dev-libs/expat[static-libs(+)]
-	dev-libs/libaio[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? (
-		|| (
-			dev-lang/ruby:2.6
-			dev-lang/ruby:2.5
-			dev-lang/ruby:2.4
-		)
-		>=dev-cpp/gtest-1.8.0
-		dev-util/cucumber
-		dev-util/aruba
-	)
-	dev-libs/boost"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--prefix="${EPREFIX}"/
-		--bindir="${EPREFIX}"/sbin
-		--with-optimisation=''
-		$(use_enable test testing)
-	)
-	STRIP=true econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	MAKEOPTS+=" V="
-	default
-}
-
-src_test() {
-	emake unit-test
-}
-
-src_install() {
-	emake DESTDIR="${D}" DATADIR="${D%/}/usr/share" install
-	dodoc README.md TODO.org
-}
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.2.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.2.ebuild
new file mode 100644
index 000000000000..f230773175a1
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A suite of tools for thin provisioning on Linux"
+HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+else
+	inherit git-r3
+	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="static test"
+
+LIB_DEPEND="dev-libs/expat[static-libs(+)]
+	dev-libs/libaio[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? (
+		|| (
+			dev-lang/ruby:2.6
+			dev-lang/ruby:2.5
+			dev-lang/ruby:2.4
+		)
+		>=dev-cpp/gtest-1.8.0
+		dev-util/cucumber
+		dev-util/aruba
+	)
+	dev-libs/boost"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--prefix="${EPREFIX}"/
+		--bindir="${EPREFIX}"/sbin
+		--with-optimisation=''
+		$(use_enable test testing)
+	)
+	STRIP=true econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	MAKEOPTS+=" V="
+	default
+}
+
+src_test() {
+	emake unit-test
+}
+
+src_install() {
+	emake DESTDIR="${D}" DATADIR="${D}/usr/share" install
+	dodoc README.md TODO.org
+}
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
index 8b0eb97b2165..f230773175a1 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools flag-o-matic
 
@@ -67,6 +67,6 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${D%/}/usr/share" install
+	emake DESTDIR="${D}" DATADIR="${D}/usr/share" install
 	dodoc README.md TODO.org
 }
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index f4613a72274c..50f679ef9db1 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index c04e8321a8ee..8fcb35268437 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -4,5 +4,5 @@ AUX palo-9999-toolchain.patch 397 BLAKE2B 7de7df2ca1d2d76f2c3cf72f78682686b6a9b8
 AUX palo.conf 260 BLAKE2B 1e81466dcecedc4ca1894863491f4c91e88becc9a5c5815e69028eeadc98ca61e99951fb754a8261a6cdb763aaa22201ae77f65fd4de07bbbd3f3c801322e277 SHA512 4147e480362161cd61ad9af8fb7048b87f9126c213661ab26f77ba98fe7f1acd03791b154667137e4a265e3c31e54e703d32daa86ff0805f47bc7c1b8b03cfe6
 DIST palo-2.00.tar.gz 124484 BLAKE2B b46b616acf51534382f6a775b456cdcbd4771d6bc9d7a8339ad788a5c5a4a333e98a6e4815c40a6750408b1e8168a19800da11ddf7125621f77d478a651d9c75 SHA512 b6dab81e6c2641a64a40561a65b5412ee702136ac79dab94619e0094faf011e158c67e681f45d5aa51423f5f162da7c1fd07b391b58e8a2100e1306eb7148056
 EBUILD palo-2.00.ebuild 882 BLAKE2B 1dd41909eccd63f451b5e244d5cb6aef7ea70b51a2a59c70f2fda1e260ce103d43326c551efc703efccebd2fd7507d913ecbed06a18a0924fb4a9db003f7a449 SHA512 d58a792304194d3d8a5ff652292f3a4d990ea058c9f1b9b50063620fe1b686e8abc23a4e30c378f6db87622ed4b31e7c04b21837a562c68d3f832ccd9b7edd93
-EBUILD palo-9999.ebuild 970 BLAKE2B 2076d8952b8fbcabfc039a881f683a7c9a7bed6927439b1ecb5164aaeb591728855b0b1a6adaf433ef85979696b4be6750a380dddbc9c72099ed6b1e7f2ede58 SHA512 9b2a3369952dacdd4a8ee862272df631f991466c40a4f9347b7fb6696c3df9ae955051f05875885d25529bccf826ea991dfe1536be6a10ee28ead4e589807378
+EBUILD palo-9999.ebuild 960 BLAKE2B f532e29106d43de89eada1db3e601b668aca0b74c5ec53a50b5b38bc3f9c76fbef52473f2245da02a3cd13b21ace7f278cba4b4dfd4632996cf27e06ea640b0d SHA512 10a18e601b961741ca4f28c9597b13c825f15375869e85858508c1d213c23908c38670a23d3366144c49719a5b0d7d6a708609a80b9652212d40b9372eccd6bf
 MISC metadata.xml 318 BLAKE2B 0d17e33c45886d0c0e03044b5b2513d44c1bb4a28d758a8575929536e866419328c68971ba3f324a5677ff68bf37b38a22645e4b02810a118b5f18026d0476c4 SHA512 7ff12a5eb42ac39840f8c9eb78b24aeecd9cbfe780d11eccd75fd6f02b11f4abafd514bc32f47f727047b069e446e9252914dcaf5c33d6f1054981a3c175fdef
diff --git a/sys-boot/palo/palo-9999.ebuild b/sys-boot/palo/palo-9999.ebuild
index ff73edaaaccc..7800f7b0c900 100644
--- a/sys-boot/palo/palo-9999.ebuild
+++ b/sys-boot/palo/palo-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic git-r3 toolchain-funcs
+EAPI=7
+inherit flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="PALO : PArisc Linux Loader"
 HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
@@ -32,16 +32,17 @@ src_install() {
 	into /
 	dosbin palo/palo
 
-	doman palo.8
-	dodoc TODO debian/changelog README.html
-
 	insinto /etc
 	doins "${FILESDIR}"/palo.conf
 
-	insinto /usr/share/palo
-	doins iplboot
-
-	insinto /etc/kernel/postinst.d/
+	insinto /etc/kernel/postinst.d
 	insopts -m 0744
 	doins "${FILESDIR}"/99palo
+
+	doman palo.8
+
+	dodoc TODO debian/changelog README.html
+
+	insinto /usr/share/palo
+	doins iplboot
 }
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 0d3a76273eaa..897c3970b07e 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -4,6 +4,6 @@ DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992
 DIST plymouth-0.9.4.tar.xz 1103496 BLAKE2B abad2cefb89e9d17b77113396d7203090544759b3dd7f73f67153d9f126db28e5366d36aa11e2335566bf4046bebd50d8d9dd47c75634446fb3a0314cd458925 SHA512 83eb2de7e6d0980e9f7fa4e0b0f20c46a8238051d84bc38dbbb5dfa438e41c1a39846dcd652374256d9f1fe79967b154a3576cd9c433ef816b6c962be2d31e93
 EBUILD plymouth-0.9.3-r1.ebuild 2585 BLAKE2B d67507b56f0c864ce51d649d3a2a577aeb6b7a7688814045aea01e329cefd1899cc37ba019ee5ebce4db3011855df7146c61767fd37a8e5c2bed661609d55855 SHA512 291db5b95322b27a4798347b6e86c674f87a88380b72052f93c3f1a0fd1f35e3bfacf36fce2d3f67be0d5b8731307e6a387f05275622d26fb4ff4f07ccfa6a7b
 EBUILD plymouth-0.9.3-r2.ebuild 2686 BLAKE2B 4991ce88676c102ff2bd5062a5d59184e9bb53b5db22dda2f22c5138627663a2f1c107af549de7abcc935be0d19e2b15a56234a15315f3deb1464c6a1ecda9f5 SHA512 8232ace285011d537cd876df0cd343deb42ba1924811ad808cdb39b1ef3d5e8caaac70c0b91859d909e3306ab3a5e6296b84b13413028e136c6eea8f13da4608
-EBUILD plymouth-0.9.4-r1.ebuild 2738 BLAKE2B dc7fbf00c0df4fa9a5b40bc69bdb2f991f4392d16a43cc8d8e634e8e5ea282899560b06230c19988fdde3e876c5eec47a8f22fdf0114891e79876be12e7ad2c2 SHA512 c5e6fa6ca2983ff2ee731686bbb6d1074c6ec70402f1f3504f0d7d740b65c1a098cfd05c9b7d3ef9e271a49dea5b2253c7ba0f40f2a3266401f5ee7f9f087f07
+EBUILD plymouth-0.9.4-r1.ebuild 2737 BLAKE2B 4d19500584ce7cf9568829d3e58077632b79e3e3dacc610166626470f563ad5339ae55f83ca22ba01f6b4bc4dfea19a3a27e569648049c07630a9773d7549bf0 SHA512 6503f274400178498858564c20b53e5aafd762774f9c3f9cd96fc89c4b52f58923723aa3de492e2734789145e63cd5bbed2b891d80430bb6f1147e50ab18123b
 EBUILD plymouth-9999.ebuild 2691 BLAKE2B a09eb144e11469b0af81e094dad79fcf2a50522ab26d24286dbf2ee22e70c216b071437304d2eb3dbac8dea72e22621f7adc74769d918410357aa772bf65d32d SHA512 68812de9973b89cdc93ef7015a812c24250dc9a2524d63d043eab121bc86a1d25ee9c404230435508f531d6cdfdfdd19ca46c0dea2872b2306c4b61f3b08a768
 MISC metadata.xml 1247 BLAKE2B 6ebdb42e799d0abe9470a6f7a885d4c01130e4ad2e3498b3a6dc244460639ba15ae398408804ee939d93b0971178478925414dcd145cdde9a763aed2cdde0cb1 SHA512 c51276f71d8d7142fd69426c6622913c8d67dbcbbc3d0eec7fe1f0d6f0b6ac06cc48154c2e6512dff441682fe3df942162d499dae9258c0855d9b7183a54cd6a
diff --git a/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild
index a44e91d017d1..ca1a0bce4cbf 100644
--- a/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth"
 else
 	SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 fi
 
 inherit autotools readme.gentoo-r1 systemd toolchain-funcs
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index c746b80361d8..20c4a13c2b97 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -15,5 +15,5 @@ DIST yaboot-1.3.17.tar.gz 224325 BLAKE2B 41f96266f2342eebbfdc3c0eb64eeaf59e55a31
 EBUILD yaboot-1.3.14-r2.ebuild 1090 BLAKE2B c0cec53d18160ba535a5efc3f55f552e5b5f266794201d961f03bc1eadeb25b4d6f667e13c49b9a1b8973c03dc8381190c2b2966ad542fae761c4bcd2bce654d SHA512 e400c540823a82924328d46385fcc5aac8b72aa29e7a0f85daf8d9ba7a87461300cc95acb9c01547c0209b4274e28447772e84aa94df18d53108da303eb9b4e3
 EBUILD yaboot-1.3.16.ebuild 1258 BLAKE2B 5c89562628f998bbe0bc5f4850ea6d802b3d28d1018af02d96f8b1d1d6a551e0ee2f7dfc68a9236e251715feae6ea557928981a8d97f5c70ee90e06175e01fac SHA512 447724cc4ad94e30c9cfa1520f599edce8363b127d244ac98c9680089af9a598f330fc33f954adafd764527e5b4bbfb85fcdcdf9ae192c941ab2b039d907a770
 EBUILD yaboot-1.3.17-r2.ebuild 1422 BLAKE2B e396ceaff0619050e0d7516a9fedd9071968f8506dcccf17c71e6572c00fc15da4ee9cab223a21c43ec473a056d773f53835b5d43026fffc85293b83ba8009e9 SHA512 06714ef51cb0a8597a8fd548a53c0c50390e9e6b89eec2bcc307cbb3d2fe88c1c6af98e07cee325d6b84e30aa6a53c5fd4c4d9a4588c7ce9814ee018d1c09c58
-EBUILD yaboot-1.3.17-r3.ebuild 2809 BLAKE2B a24ef6f3b369bfb304260255a85176bb1604769556301f8418d74179debe4094a2e04f7ad7b0711c1b61de751e409476f5a8aae29c36de88c0c3951771dc6481 SHA512 b4ceea2ed64c423ab90e149f756ed8b7dbfd6fd84ba10cbbb922f35aa2291e89c70cc990b2f016b9b1fad4caf079b5222367b7c4aae967182988203c5d30242d
+EBUILD yaboot-1.3.17-r3.ebuild 2949 BLAKE2B 4176f85831e53f9b70328a12b671a196f73251f25fedd59b31e402bb6d88544af65d3139039f9cc33faf5b84b35e8f940f7fb0d4fa036dddfee37c4ddff20a93 SHA512 bce038921c863b3df3c74667182c286506eacea2ff83f8a40cce9ca055ba140c40d06af72febd798ed2468ca503465db49e0d17b6f37781c8e39bd165bfd7594
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
index b127a5072d35..832df154e076 100644
--- a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
@@ -66,6 +66,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# ld.gold fails to link yaboot as:
+	#  sorry, I can't find space in second/yaboot.chrp to put the note
+	# bug #678710
+	tc-ld-disable-gold
+
 	pushd "${WORKDIR}/${E2FS_P}" || die
 	econf \
 		--enable-libblkid \
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 1aa8d799cd68..7db5e8d8b0c2 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 3d69ae9aa660..ad2ed195bd59 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -3,7 +3,9 @@ AUX galera-4.1-strip-extra-cflags.patch 2747 BLAKE2B 314e020bdbce2d3080d28c4d5bf
 AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
 AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902
 DIST galera-25.3.26.tar.gz 3386588 BLAKE2B ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4 SHA512 c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
+DIST galera-26.4.2.tar.gz 3499538 BLAKE2B 4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115 SHA512 6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
 EBUILD galera-25.3.25.ebuild 1894 BLAKE2B 966c5c85e5b66b34223acf4e3c1a4451605259c19e0698068cb36ca80beff80d2b47d93bc111adb9061230cb1163b93248e09c72c33265da4ca464c3de814a66 SHA512 de45fd6c64e0329563d4e2e6b8aefda5c81d839359b37366c8f958613d5cb1c2723f8900848a7caa67492832394fb4cbb13c6e512b2ca3435cdee7093f2c826d
 EBUILD galera-25.3.26.ebuild 1913 BLAKE2B 928d84e64eaf0691173b9ebe663c66d2b91635ef818bb12bac0b720393686d0500727226fb99e8e02568feb39ed91964029d278fdcda7389c072194af8eb713c SHA512 c17cac0dd0c4f8c5e7915c20dcc81db99651acb93edf65858947478f3a52f1668ac880180519600a85cc2f296c3e17b92d2f316a2d4ad3283d169bff711037ed
+EBUILD galera-26.4.2.ebuild 1867 BLAKE2B 152c033d2433d8b0d33d30303511b6cff76de88fc3e43a443718be02efec11b3f6d76ae005deffd826e3da15ee2593759bda087d25ce539636d0f8e56f99add7 SHA512 c1671876dd299d5b935cd17ad91af04414bf0cee2a2ecaab0f317c84c617f3e87e27939b21bc7792f10927c325172c4b93eb68beccd3427f5eeacbbe01b1d488
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-26.4.2.ebuild b/sys-cluster/galera/galera-26.4.2.ebuild
new file mode 100644
index 000000000000..1e75a442128e
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="http://galeracluster.com"
+SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.5/${P}/src/${P}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+
+CDEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.41:0=
+	"
+BDEPEND=">=sys-devel/gcc-4.4"
+DEPEND="${BDEPEND}
+	${CDEPEND}
+	dev-libs/check
+	>=dev-cpp/asio-1.10.1[ssl]
+	<dev-cpp/asio-1.12.0
+	"
+#Run time only
+RDEPEND="${CDEPEND}"
+
+# Respect {C,LD}FLAGS.
+PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" )
+
+pkg_preinst() {
+	if use garbd ; then
+		enewgroup garbd
+		enewuser garbd -1 -1 -1 garbd
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove bundled dev-cpp/asio
+	rm -r "${S}/asio" || die
+
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -r "${S}/garb" || die
+	fi
+}
+
+src_configure() {
+	tc-export CC CXX
+	# Uses hardware specific code that seems to depend on SSE4.2
+	if use cpu_flags_x86_sse4_2 ; then
+		append-cflags -msse4.2
+	else
+		append-cflags -DCRC32C_NO_HARDWARE
+	fi
+	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+	# and -Wold-style-cast
+	MYSCONS=(
+		tests=$(usex test 1 0)
+		strict_build_flags=0
+		system_asio=1
+	)
+}
+
+src_compile() {
+	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+	if use garbd ; then
+		dobin garb/garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.sh" garbd
+		doman man/garbd.8
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}
diff --git a/sys-cluster/ganglia-web/Manifest b/sys-cluster/ganglia-web/Manifest
index 332d2b9dfddc..b9a2f21685f9 100644
--- a/sys-cluster/ganglia-web/Manifest
+++ b/sys-cluster/ganglia-web/Manifest
@@ -1,3 +1,3 @@
 DIST ganglia-web-3.7.3.tar.gz 709356 BLAKE2B 8d5ac9eb8bd37ea040b08caa763797929acac3bd520c88af0e8fd3a9cfbc28d2a55e42d772ca1b6d5e87fe7dce6f4a6e7e15b836d06052c7e642885c727070cc SHA512 884b1ba168b8fe01aa865ae77df6995bb5a09a8b2d441189264283fc1c95b8a6fd0800488ad75e9c1cdd3694b9d6c1c33218ddad804ade2d6be948791b797a95
-EBUILD ganglia-web-3.7.3.ebuild 1061 BLAKE2B 66650d1664b79bcb8aeaf3f4062283e66b7b916d98c25b77c24617b204bea5dedeee7e7042e6e6abfd3f44c9e05b18e602ad68b4ad5f605d8a08b482ba025546 SHA512 80c0a5e9b00bc2b4ed6cf477c6735d6b26847b330369c510346b70f3cf5353069a7c3c7837a3370bdbda892c2e3b066664912a6673fb3e6d118025535ace4aa3
+EBUILD ganglia-web-3.7.3-r1.ebuild 1065 BLAKE2B a8087bf40205cd2b9fecbec4e8e97fb2a36ca15248d5d47754cb12ef0527d18b6563b4f0ee6bbfcf95f361644b3e2b1c26ebef8357d38252eb464ef7e4a300a4 SHA512 6ed8d9a4daeaf6cf0e11c9fd3fbb701561fd87a70ddaaa55ebce0d2f15338065971c4ec397e0a2953b59fde42a655dfeaa8fbb52ecbae5c5a072815a6e3fd2bc
 MISC metadata.xml 633 BLAKE2B 29ba6ca6f778c6ce5067e0063afed1eb2c4c918c1627f7e8767750bfad4d6576e710d869912eae816a0db523d110385ae77b1f60205f3968a900b624bcbc604a SHA512 0968fdd09ec185b3a88a6656d816da77c1e08950b3395b3377969da698c4288c2e127fe4a3e97ea20d936d1a6aab280d5b9bf1df52b3da4bcefdc289a05dcd89
diff --git a/sys-cluster/ganglia-web/ganglia-web-3.7.3-r1.ebuild b/sys-cluster/ganglia-web/ganglia-web-3.7.3-r1.ebuild
new file mode 100644
index 000000000000..764723fb60f9
--- /dev/null
+++ b/sys-cluster/ganglia-web/ganglia-web-3.7.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WEBAPP_MANUAL_SLOT="yes"
+inherit webapp
+
+DESCRIPTION="Web frontend for sys-cluster/ganglia"
+HOMEPAGE="http://ganglia.sourceforge.net"
+SRC_URI="https://github.com/ganglia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="vhosts"
+
+DEPEND="net-misc/rsync"
+RDEPEND="
+	${DEPEND}
+	${WEBAPP_DEPEND}
+	>=sys-cluster/ganglia-3.3.7[-minimal]
+	dev-lang/php:*[ctype,gd,json,xml]
+	virtual/httpd-php
+	media-fonts/dejavu"
+
+src_install() {
+	webapp_src_preinst
+	cd "${S}" || die
+	emake \
+		GDESTDIR="${MY_HTDOCSDIR}" \
+		DESTDIR="${D}" \
+		APACHE_USER=nobody \
+		install
+	webapp_configfile "${MY_HTDOCSDIR}"/conf_default.php
+	webapp_src_install
+
+	fowners -R nobody:nobody /var/lib/ganglia-web/dwoo
+	fperms -R 777 /var/lib/ganglia-web/dwoo
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	# upgrade from < 3.5.6
+	if [ -d "${ROOT}"/var/lib/ganglia/dwoo ]; then
+		rm -rf "${ROOT}"/var/lib/ganglia/dwoo || die
+	fi
+}
diff --git a/sys-cluster/ganglia-web/ganglia-web-3.7.3.ebuild b/sys-cluster/ganglia-web/ganglia-web-3.7.3.ebuild
deleted file mode 100644
index 9aeccf7c2fc2..000000000000
--- a/sys-cluster/ganglia-web/ganglia-web-3.7.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WEBAPP_MANUAL_SLOT="yes"
-inherit webapp
-
-DESCRIPTION="Web frontend for sys-cluster/ganglia"
-HOMEPAGE="http://ganglia.sourceforge.net"
-SRC_URI="https://github.com/ganglia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="vhosts"
-
-DEPEND="net-misc/rsync"
-RDEPEND="
-	${DEPEND}
-	${WEBAPP_DEPEND}
-	>=sys-cluster/ganglia-3.3.7[-minimal]
-	dev-lang/php[gd,xml,ctype]
-	virtual/httpd-php
-	media-fonts/dejavu"
-
-src_install() {
-	webapp_src_preinst
-	cd "${S}" || die
-	emake \
-		GDESTDIR="${MY_HTDOCSDIR}" \
-		DESTDIR="${D}" \
-		APACHE_USER=nobody \
-		install
-	webapp_configfile "${MY_HTDOCSDIR}"/conf_default.php
-	webapp_src_install
-
-	fowners -R nobody:nobody /var/lib/ganglia-web/dwoo
-	fperms -R 777 /var/lib/ganglia-web/dwoo
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	# upgrade from < 3.5.6
-	if [ -d "${ROOT}"/var/lib/ganglia/dwoo ]; then
-		rm -rf "${ROOT}"/var/lib/ganglia/dwoo || die
-	fi
-}
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index f312d98af9d9..770e39ef8803 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -8,6 +8,7 @@ DIST kubernetes-1.13.4.tar.gz 28793464 BLAKE2B 0a637bf1003e4fd6ebabe09ebc0f3ca54
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kube-apiserver-1.10.12.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
 EBUILD kube-apiserver-1.11.6.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
@@ -16,5 +17,6 @@ EBUILD kube-apiserver-1.13.4.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529b
 EBUILD kube-apiserver-1.13.5.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.13.6.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.14.0.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.14.2.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.9.11.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.14.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.14.2.ebuild
new file mode 100644
index 000000000000..a1931590ff31
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.14.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+	>=dev-lang/go-1.11"
+
+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" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	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 8be76c23d61a..9ff3e1b93833 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -8,6 +8,7 @@ DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kube-controller-manager-1.10.12.ebuild 1213 BLAKE2B 6b6fa87bd507baac038712357a693ff423e19ba7bfbd15e4ad6a7f9a6fd0205a6ec7f0f62bd67627cf969985aee17cb92df24eff042a3d1158b401a89b262005 SHA512 b36227fed5d1e407ae148bbb14f21acf6226c49dfc381d3258a8be9c70fdda1a213018a436aca89b721cd082f3b500780705d33c701bfe1a33f2dfe67ac1a7d3
 EBUILD kube-controller-manager-1.11.6.ebuild 1213 BLAKE2B 6b6fa87bd507baac038712357a693ff423e19ba7bfbd15e4ad6a7f9a6fd0205a6ec7f0f62bd67627cf969985aee17cb92df24eff042a3d1158b401a89b262005 SHA512 b36227fed5d1e407ae148bbb14f21acf6226c49dfc381d3258a8be9c70fdda1a213018a436aca89b721cd082f3b500780705d33c701bfe1a33f2dfe67ac1a7d3
@@ -16,5 +17,6 @@ EBUILD kube-controller-manager-1.13.3.ebuild 1233 BLAKE2B 64c7d8543d7a77630b5229
 EBUILD kube-controller-manager-1.13.5.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.13.6.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.14.0.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+EBUILD kube-controller-manager-1.14.2.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.9.11.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.2.ebuild
new file mode 100644
index 000000000000..6aa71f51b8b1
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+	>=dev-lang/go-1.11"
+
+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" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	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 20c47e47ff1f..2cead9f72147 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -8,6 +8,7 @@ DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kube-proxy-1.10.12.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
 EBUILD kube-proxy-1.11.6.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
@@ -16,5 +17,6 @@ EBUILD kube-proxy-1.13.3.ebuild 1137 BLAKE2B 52d86c985e37cd01c32721f21b892ed79e0
 EBUILD kube-proxy-1.13.5.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.13.6.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.14.0.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+EBUILD kube-proxy-1.14.2.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.9.11.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.14.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.14.2.ebuild
new file mode 100644
index 000000000000..f519690e8b2f
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.14.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+	>=dev-lang/go-1.11"
+
+RDEPEND="net-firewall/conntrack-tools"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	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 490a8c895d29..7b1f78cb2d6f 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -8,6 +8,7 @@ DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kube-scheduler-1.10.12.ebuild 1204 BLAKE2B 31644b91c9eb0f6e9ca3eae3700092486a8cc760f973e7f2e14be1c48d5bf26ae83a2750fc3ed344419e6c94fb831045d579c9827e874352ca8ecf2d5022a23b SHA512 b948b730fd717ee73a9b8c922b65e8c7d200dbfea29be0420f5f7d15c08416db91708b68057522227ded88b76ba26aeee483cb058dbbc68286a6cbc734d21e2d
 EBUILD kube-scheduler-1.11.6.ebuild 1204 BLAKE2B 31644b91c9eb0f6e9ca3eae3700092486a8cc760f973e7f2e14be1c48d5bf26ae83a2750fc3ed344419e6c94fb831045d579c9827e874352ca8ecf2d5022a23b SHA512 b948b730fd717ee73a9b8c922b65e8c7d200dbfea29be0420f5f7d15c08416db91708b68057522227ded88b76ba26aeee483cb058dbbc68286a6cbc734d21e2d
@@ -16,5 +17,6 @@ EBUILD kube-scheduler-1.13.3.ebuild 1224 BLAKE2B a293e45658d31ce7adce5daa4659212
 EBUILD kube-scheduler-1.13.5.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.13.6.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.14.0.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+EBUILD kube-scheduler-1.14.2.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.9.11.ebuild 1220 BLAKE2B 032c4eb322e2c7f7d9a898472b0b68a5907f963119b53098bed3bb3336af5098546a273c4c4493e20d3881bd94db22f36a8956832241be7845f16c565cdd7d8e SHA512 c1f9ab8c156c9ce96ab8e4fd31b811739d9859f17b502e32922e904805d791b85fb6529b7e305791ce8329b34a189a0c4a941e11961960cf01aa8b6abb4537f7
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.14.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.14.2.ebuild
new file mode 100644
index 000000000000..2830ac40ff36
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.14.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 Scheduler"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+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" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	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/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 8f72193360bc..d61a76b43ddb 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -3,9 +3,11 @@ DIST kubernetes-1.13.4.tar.gz 28793464 BLAKE2B 0a637bf1003e4fd6ebabe09ebc0f3ca54
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.14.1.tar.gz 28008273 BLAKE2B 28ef62504544f33581a64ccf4c54a9b93fff5b92169db869291ac00f199993373cbef51a9d2562d76f12a5f2ee073018113b23fdac5b875ddfb8a01dba7f422d SHA512 c2923b539103f9f5d414972ccddb99856df8161d5e734b30eb1156fd5ed4330fa25fabb2a9afcc21f07fd2e8c66b2b1b769efc38f32b19237e9b7bc3172af180
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 EBUILD kubeadm-1.13.4.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
 EBUILD kubeadm-1.13.5.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
 EBUILD kubeadm-1.14.0-r1.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
 EBUILD kubeadm-1.14.0.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
 EBUILD kubeadm-1.14.1.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
+EBUILD kubeadm-1.14.2.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
 MISC metadata.xml 1128 BLAKE2B b5ad31ef126f2d95646a37c256b82d2ad5e008968f928fb56b05c39514d4a9e0a252ebcefbeac8679f5349acac170886859af44f095aafea97fc8bf00a34bc44 SHA512 b9246624712068cf304fc5329ae851c26d52204b684b5f547892b23e68948b04b4ed4654a49d7bb5fe7eea658b58fbdbbe51a7a9ba1f4a94c5d0499a033b7f5a
diff --git a/sys-cluster/kubeadm/kubeadm-1.14.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.2.ebuild
new file mode 100644
index 000000000000..763c3838067b
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.14.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12
+	dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+	pushd src/${EGO_PN} || die
+	eapply "${FILESDIR}/${PN}-1.14-openrc.patch"
+	popd || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+	pushd src/${EGO_PN} || die
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	popd || die
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index ad689c617a7e..daa2534232b3 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -5,6 +5,7 @@ DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4c
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.14.1.tar.gz 28008273 BLAKE2B 28ef62504544f33581a64ccf4c54a9b93fff5b92169db869291ac00f199993373cbef51a9d2562d76f12a5f2ee073018113b23fdac5b875ddfb8a01dba7f422d SHA512 c2923b539103f9f5d414972ccddb99856df8161d5e734b30eb1156fd5ed4330fa25fabb2a9afcc21f07fd2e8c66b2b1b769efc38f32b19237e9b7bc3172af180
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kubectl-1.10.12.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
 EBUILD kubectl-1.11.6.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
@@ -13,5 +14,6 @@ EBUILD kubectl-1.13.5.ebuild 1255 BLAKE2B 780babfc4390b252a5e0a462c7c7f742db71e8
 EBUILD kubectl-1.13.6.ebuild 1255 BLAKE2B 780babfc4390b252a5e0a462c7c7f742db71e8334dad63d716d673c78084c6059a022400f55694a6dd24460dd0168d5a77a468ec27de67819d4f63247a20f1de SHA512 0b1becd62a82972e38eb1dba03eb2c6ce412a6bff2fa857b01ffe2cbd10f4ac7be01a558befadd2ae57968376482ebfa805102522edb6f1e15b7cf348e936c0b
 EBUILD kubectl-1.14.0.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
 EBUILD kubectl-1.14.1.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
+EBUILD kubectl-1.14.2.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
 EBUILD kubectl-1.9.11.ebuild 1217 BLAKE2B bc8d5c0dea2db716297e051807bce2ab809dcf59d02a145221c502965993873b82d1df96dcdbed218a488b70e3241323e138817e9fcecd4e10f2d549f4c4073c SHA512 65e0bb08dec59b7f8c211766ff5aff25b0bb12819072834e2d86e768ba175b45b125b04dd0a316f47169e1ae2c9199e44d66408efeff067c8c2cbba248bb534b
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.14.2.ebuild b/sys-cluster/kubectl/kubectl-1.14.2.ebuild
new file mode 100644
index 000000000000..7a61b25dce90
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.14.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot 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-lang/go-1.12
+	dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+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 1a72053e6282..a66836b8f6ac 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -12,6 +12,7 @@ DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4c
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.14.1.tar.gz 28008273 BLAKE2B 28ef62504544f33581a64ccf4c54a9b93fff5b92169db869291ac00f199993373cbef51a9d2562d76f12a5f2ee073018113b23fdac5b875ddfb8a01dba7f422d SHA512 c2923b539103f9f5d414972ccddb99856df8161d5e734b30eb1156fd5ed4330fa25fabb2a9afcc21f07fd2e8c66b2b1b769efc38f32b19237e9b7bc3172af180
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kubelet-1.10.12.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
 EBUILD kubelet-1.11.6.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
@@ -22,5 +23,6 @@ EBUILD kubelet-1.13.5.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fd
 EBUILD kubelet-1.13.6.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.14.0.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.14.1.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+EBUILD kubelet-1.14.2.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.9.11.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.14.2.ebuild b/sys-cluster/kubelet/kubelet-1.14.2.ebuild
new file mode 100644
index 000000000000..f38ce59e625d
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.14.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot systemd
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/moosefs/Manifest b/sys-cluster/moosefs/Manifest
deleted file mode 100644
index 2acbb3caf2fb..000000000000
--- a/sys-cluster/moosefs/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX mfs.confd 368 BLAKE2B 278812cfd177669cb857bbd61433a1b8fa36700d87412ea30477f813162714370a8c0a02a1db34800d3a243ad1fca95657797d854e97f9d2afdbbb42c98a3318 SHA512 508b1d99befd1340d3685df3d548399789321edf7f73f11b32baa88291b65dfcba98436b6f85b1975924ae596b962c501391fd783562b12f7cc3862183646e56
-AUX mfs.initd-r1 1526 BLAKE2B b1e120537d62b983a50a07e4a7f321492497b8aff5d5d593aad5eba2e681e210366637c7e7e8f482d5f12d6c11f55fc25300e363cd9d3d266f5af9c62b9d2d46 SHA512 01341b6c67adf7bb2503cbcfd9b039f704763ef5326c132e864ba7265b887a37bb3475b704878c5fb3a238ec46f69498adb5e6840e09ef695716369834131583
-AUX mfscgiserver.confd 180 BLAKE2B b2428d214bed3f1eb2126f71d7815e703a5174b34106b40d33ed64b49a833df4d0a633125d90396afdc7def9d0128c5a1207d714d19519d0c9a66783af2d163b SHA512 d0389a3200f3ccad16578970d7c0e4c649df8d35eb25b586ac23ad828d06ce9280a5b977174e7a1d03d67af28817fc35df5544e0190a159b3e7ad1aebb92cc7c
-AUX mfscgiserver.initd-r1 543 BLAKE2B a22c5d574e23c76ec119643aab0a18dde20171821b95aad7775d78307fbfe1728cd06da9ef44b7a956895107fa21771ffea0839aeafa63a5eeb9d43e97d8bf19 SHA512 48697c15938f4781d0b2240daa3dfa5680af1d78c5dc8dc2f8a3dc7f4410dd9c251cfe0923b371bd1286508e624e52a4c9e466db41d7e8b06220f368cdc63d51
-DIST mfs-1.6.26.tar.gz 754573 BLAKE2B d03b48599baa8aecc13171ba6cb7da99c02e74336ecf6e8d1608e534cf6bf220552bc22549839591e1890190e56f89b53a9afc9369d674c7d8689c9cb8ddeb52 SHA512 42fdf2b43f3d4a81068ecad48da5519adbc9fb753931198f48741e6d7235b80864ee7d8e3c04b5de2e9536be9459b72e3a5b12037adfdb97bf2a7695595e9ec5
-DIST mfs-1.6.27-1.tar.gz 771983 BLAKE2B 688367bd24e8295d9472c2880786146cfca70aaa6f4c9ac5b50befaa0646b90ace2897ef82b6b77be15ef54d3c4c1ae047304c799f2606da290e0b378a991922 SHA512 8e222c0741b09206e7fb6c792d679d2defa4d7f4de4c20551c236453604153fdb6e5ec049c14c675a80afa2d9df283bb4eb2e407f70cd55dbe204c325a473d59
-EBUILD moosefs-1.6.26-r1.ebuild 1533 BLAKE2B 594a0d7fe9a3f0b683b17388bc5d860762fe8c33767ad516199ed76591f643b2e903051cbb97fc180be841b4a3963e720a5313ce7405499ff893e45e9782116b SHA512 04a26d39a9ecaec7639129aabb1f6d0d1fabf70a6d9fd30a7291f8e9756de5e61c115c32498e89aee1e4a302c0f6eea8cac2249480bf5e6548ebf09b47a3a791
-EBUILD moosefs-1.6.27.ebuild 1535 BLAKE2B acd0294f8d3bb0e5aac203c07fc6a414a1a1a44cfda39b6d65b547b2bbade5165d736c354e6b08896436917ae8aa9bd6e655c75887f9286ce5633771514dca72 SHA512 7b3c51b9b649f03f15c0f85b2ecd6f78a384259d967512d3e29e0a1e2ae1ad7adb5abf4142bde1e5c75dbca81b39a68cef0fec2e506eff00cd3699c8acf39085
-MISC metadata.xml 657 BLAKE2B 8650afc1a345278a71eb384dd960f238be88df661ba15190d0e50c4faedd0e42951f4a95972cda3188eb08c4d697291e12267a70b4f07813272698f57953fa52 SHA512 0557bc8c5bd3a63fdd08cd8da09e813cc3dff52b6d51292da5c797324cee2b393c2eae5aaedf5f82b0dafc614376f72be2a7e5ba75836189bb0302ab9924d3a4
diff --git a/sys-cluster/moosefs/files/mfs.confd b/sys-cluster/moosefs/files/mfs.confd
deleted file mode 100644
index 423795e33355..000000000000
--- a/sys-cluster/moosefs/files/mfs.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Which mooseFS roles should we start ?
-#
-# NOTE: The roles are stopped in *reverse* order of the given list
-# so make sure to list mfsmaster *before* the other roles.
-#
-# Possible values: mfsmaster mfsmetalogger mfschunkserver
-#ROLES=""
-
-# If the role mfsmaster fails to start, should we try to run mfsmetarestore -a ?
-# Possible values: 0 (no), 1 (yes)
-AUTORESTORE=0
\ No newline at end of file
diff --git a/sys-cluster/moosefs/files/mfs.initd-r1 b/sys-cluster/moosefs/files/mfs.initd-r1
deleted file mode 100644
index 89715bf310c9..000000000000
--- a/sys-cluster/moosefs/files/mfs.initd-r1
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/sbin/openrc-run
-
-extra_started_commands="reload"
-
-depend() {
-	need net
-}
-
-chkconfig() {
-	[ -z "${ROLES}" ] && { eerror "No role defined !"; return 1;}
-	for ROLE in ${ROLES}; do
-		if [ ! -f /etc/mfs/${ROLE}.cfg ]; then
-			eerror "Missing configuration file for role ${ROLE} !"
-			return 1
-		fi
-	done
-	return 0
-}
-
-autorestore() {
-	einfo "AUTORESTORE set, trying to restore metadata files"
-	mfsmetarestore -a &>/dev/null
-	return $?
-}
-
-start_role() {
-	local ROLE=$1
-	local RETURN=0
-
-	ebegin "${ROLE}"
-	start-stop-daemon -q --start --exec "${ROLE}" -- start >/dev/null
-	RETURN=$?
-	eend ${RETURN}
-
-	return ${RETURN}
-}
-
-start_roles() {
-	local RETURN=0
-
-	eindent
-	for ROLE in ${ROLES}; do
-
-		start_role ${ROLE} || RETURN=$?
-		eend ${RETURN}
-
-		if [ "${RETURN}" != "0" ] && [ "${ROLE}" == "mfsmaster" ] && [ ${AUTORESTORE} -eq 1 ]; then
-			eindent
-			autorestore && start_role ${ROLE}
-			RETURN=$?
-			eoutdent
-		fi
-
-		[ "${RETURN}" != "0" ] && break
-	done
-	eoutdent
-
-	return ${RETURN}
-}
-
-start() {
-	ebegin "Starting mfs node"
-	chkconfig && start_roles
-	eend $?
-}
-
-stop() {
-	local RETURN=0
-
-	ebegin "Stopping mfs node"
-	eindent
-	local REVERSE=$(echo ${ROLES} | tac -s' ')
-	for ROLE in ${REVERSE}; do
-		ebegin "${ROLE}"
-		start-stop-daemon -q --stop -n ${ROLE} || RETURN=$?
-		eend ${RETURN}
-	done
-	eoutdent
-
-	eend ${RETURN}
-}
-
-reload() {
-	local RETURN=0
-
-	ebegin "Reloading mfs node"
-	eindent
-	for ROLE in ${ROLES}; do
-		ebegin "${ROLE}"
-		start-stop-daemon --signal HUP -n ${ROLE}
-		eend ${RETURN}
-	done
-	eoutdent
-
-	eend ${RETURN}
-}
diff --git a/sys-cluster/moosefs/files/mfscgiserver.confd b/sys-cluster/moosefs/files/mfscgiserver.confd
deleted file mode 100644
index ae93c54f4f94..000000000000
--- a/sys-cluster/moosefs/files/mfscgiserver.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# MooseFS HTTP/CGI server configuration.
-
-# BIND_HOST: local address to listen on
-# default: any
-BIND_HOST="0.0.0.0"
-
-# BIND_PORT: port to listen on
-# default: 9425
-BIND_PORT=9425
diff --git a/sys-cluster/moosefs/files/mfscgiserver.initd-r1 b/sys-cluster/moosefs/files/mfscgiserver.initd-r1
deleted file mode 100644
index d60cf8034cd5..000000000000
--- a/sys-cluster/moosefs/files/mfscgiserver.initd-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-
-PIDFILE=/var/run/mfscgiserv.pid
-
-extra_started_commands="reload"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting mfs CGI server"
-	start-stop-daemon --start --quiet --exec /usr/sbin/mfscgiserv \
-	--pidfile "${PIDFILE}" --make-pidfile --background \
-	-- -H ${BIND_HOST} -P ${BIND_PORT} -f
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping mfs CGI server"
-	start-stop-daemon --stop -q --pidfile "${PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading mfs CGI server"
-	start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/sys-cluster/moosefs/metadata.xml b/sys-cluster/moosefs/metadata.xml
deleted file mode 100644
index d42432463d97..000000000000
--- a/sys-cluster/moosefs/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="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<longdescription>MooseFS is a fault tolerant, network distributed file system.
-	It spreads data over several physical servers which are visible to the user as one resource.
-	For standard file operations MooseFS acts as other Unix-alike file systems
-	</longdescription>
-	<use>
-		<flag name="cgi">Install CGI server and scripts.</flag>
-		<flag name="fuse">Install the mfsmount utility.</flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild b/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild
deleted file mode 100644
index cdcf22ba0780..000000000000
--- a/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild
+++ /dev/null
@@ -1,65 +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 python-single-r1 user
-
-MY_P="mfs-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A filesystem for highly reliable petabyte storage"
-HOMEPAGE="http://www.moosefs.org/"
-SRC_URI="http://pro.hit.gemius.pl/hitredir/id=p4CVHPOzkVa0JJIK.m0Ee6dyHZEgoQb1KaiPmVK29EX.M7/url=moosefs.org/tl_files/mfscode/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cgi +fuse static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	fuse? ( >=sys-fs/fuse-2.6 )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup mfs
-	enewuser mfs -1 -1 -1 mfs
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# rename dist config files
-	sed -i 's@\.cfg\.dist@\.cfg@g' mfsdata/Makefile.in || die
-}
-
-src_configure() {
-	local myopts=""
-	use fuse || myopts="--disable-mfsmount"
-	econf \
-		--sysconfdir=/etc/mfs \
-		--with-default-user=mfs \
-		--with-default-group=mfs \
-		$(use_enable cgi mfscgi) \
-		$(use_enable cgi mfscgiserv) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}/mfs.initd-r1" mfs
-	newconfd "${FILESDIR}/mfs.confd" mfs
-	if use cgi; then
-		python_fix_shebang "${D}"/usr/sbin/mfscgiserv
-		newinitd "${FILESDIR}/mfscgiserver.initd-r1" mfscgiserver
-		newconfd "${FILESDIR}/mfscgiserver.confd" mfscgiserver
-	fi
-
-	chown -R mfs:mfs "${D}/var/lib/mfs" || die
-	chmod 750 "${D}/var/lib/mfs" || die
-}
diff --git a/sys-cluster/moosefs/moosefs-1.6.27.ebuild b/sys-cluster/moosefs/moosefs-1.6.27.ebuild
deleted file mode 100644
index 87cbdf9bdb5b..000000000000
--- a/sys-cluster/moosefs/moosefs-1.6.27.ebuild
+++ /dev/null
@@ -1,65 +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 python-single-r1 user
-
-MY_P="mfs-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A filesystem for highly reliable petabyte storage"
-HOMEPAGE="http://www.moosefs.org/"
-SRC_URI="http://pro.hit.gemius.pl/hitredir/id=.WCbG2t.7Ln5k1s3Q9xPg8cPfX.wVMc5kyXfrKcJTDH.c7/url=moosefs.org/tl_files/mfscode/${MY_P}-1.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cgi +fuse static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	fuse? ( >=sys-fs/fuse-2.6 )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup mfs
-	enewuser mfs -1 -1 -1 mfs
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# rename dist config files
-	sed -i 's@\.cfg\.dist@\.cfg@g' mfsdata/Makefile.in || die
-}
-
-src_configure() {
-	local myopts=""
-	use fuse || myopts="--disable-mfsmount"
-	econf \
-		--sysconfdir=/etc/mfs \
-		--with-default-user=mfs \
-		--with-default-group=mfs \
-		$(use_enable cgi mfscgi) \
-		$(use_enable cgi mfscgiserv) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}/mfs.initd-r1" mfs
-	newconfd "${FILESDIR}/mfs.confd" mfs
-	if use cgi; then
-		python_fix_shebang "${D}"/usr/sbin/mfscgiserv
-		newinitd "${FILESDIR}/mfscgiserver.initd-r1" mfscgiserver
-		newconfd "${FILESDIR}/mfscgiserver.confd" mfscgiserver
-	fi
-
-	chown -R mfs:mfs "${D}/var/lib/mfs" || die
-	chmod 750 "${D}/var/lib/mfs" || die
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 0c8fa001ce12..997dabb4fa9f 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 49511a82532a..aa85a9fd1521 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -25,7 +25,7 @@ EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bdd
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
 EBUILD binutils-2.30-r4.ebuild 12023 BLAKE2B a30f16d4bd14247b3528ec6647190e066a01cd1b5b11f8eb14f132b73bb520c38acfbe648d683c64b50feb46dd70f6ca8835ac4405100ceefc918552e80a0239 SHA512 208574e5c850d00402d6630d7ef30b9216fdabec8aa0287f3f379b3c9d4d1315c8b4b0e55016807906c1bb01c3fb6941712606004ad627c78a950b632a45f2ec
 EBUILD binutils-2.31.1-r4.ebuild 12417 BLAKE2B 231dfce3382481c41146d8bdc8ff8324f80d7a777271ffbc64679f7f79a2ef0b9725c5c1b4afe4d38941eb86509de37fefb8f7310fea9cd9fa7c327b8f46becc SHA512 1aed7cde3e567afe660bdacab256cac8271dfa2532c3b67deda9085c5432aa8431ba85a1bdf9befed878fe5852c2b70554bfbcd01b8e3464e255c63cc8d2cb0f
-EBUILD binutils-2.31.1-r6.ebuild 12420 BLAKE2B 6cd61e8713e78b3ec03d845af0654ea852695a85dc8097fcf7d5d47140bcf89da3b5aac465f449ac5082344e7bdb55b38291f4f9fe3a9caa40f8ee3e9649ccab SHA512 0d0893ddb8318404331b77bc2a4780ec8ba3c64d0dedb400098b96ca8dbc62ca1f9eb8eb419145a82b4ac16afae9eab670a7f7f6323cf3bb8781f8c84a062c05
+EBUILD binutils-2.31.1-r6.ebuild 12419 BLAKE2B 29d0b9c330af84e365dc296276cdb88e4998b6851fc5eac0721e71b422adf1d38c0b7dc98f0c7c2ae192e04554238f3fd10f0f79973defd5b41d90392cb40003 SHA512 9501c2cca0fb6f88b148a93468f04881c70862b3d2052c4d2ebc300648bd4ca1a7c4f83fcc2c861fe6b2c164e5875267ae6961971dee146d2332aa741ef257fd
 EBUILD binutils-2.32-r1.ebuild 12531 BLAKE2B 30e863362b5822da021aa0d382ad0f4ad3c3e22e304957faeae7cb51cbe2066bbcd2a9e2e0fb2f24856cbc44db7cbfe4ec5821a23f1e2f69a4b3c33b703022e5 SHA512 fc4487b1b947bf838075015607906e0aa50a44c2a759fe6724044f10492b206954e161f2e15dae07a3dd8b746d3864fb32fd354a9ef473ca1561666f2c4f53bb
 EBUILD binutils-9999.ebuild 12128 BLAKE2B 593fbabb2debe0faedface04a49f94e16c5c8aa4b7276a365bb159f8e2334b525315f91c8123f3b47420acac3efd05188629f98e609e964879ba4d0e91f0e4e5 SHA512 423085df8080716a64589d7bf80582d5bd26a46eaf0e6a8213bc684d5784ebb857cdf894f527a39f5a67b3be45428b8bc54241e8a85225f096ff095e9d7962d4
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.31.1-r6.ebuild b/sys-devel/binutils/binutils-2.31.1-r6.ebuild
index 20031cc0fba2..b8aeb744c27f 100644
--- a/sys-devel/binutils/binutils-2.31.1-r6.ebuild
+++ b/sys-devel/binutils/binutils-2.31.1-r6.ebuild
@@ -45,7 +45,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(get_version_component_range 1-2)
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 		;;
 esac
 
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index a399eca4381b..8d9b0be5e2c1 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -3,10 +3,11 @@ DIST bison-3.1.tar.xz 1990536 BLAKE2B 6223642f2934927ca118410e2655f7c677bb1d3d98
 DIST bison-3.2.3-patches-01.tar.xz 9460 BLAKE2B 3e9f3e636d774d005c861c4f5fe121a862cbfc38f5efd5bb7ac7d2944f71e80eabd6621f3f5507d9f78727f22b574581c9b694457c63b5181a8cc1a0ac69d294 SHA512 6c599583b67f8999c8e2c8492a19ad0b43bbadef1d9c062c752e7c1cc3d178c2106262c70c998a0588bc6255ec27b2623a90267e0858e2d776ac2f4cf6cb688f
 DIST bison-3.2.4.tar.xz 2094568 BLAKE2B 9b7617b25f1b151c3b86a5f57e733543160fb40f992ff968eaadfc91d8f1a67f56d0afeafbed5003ea1a5e0c861b12ef4cc27065d1b6cbc1d0845710164d84e2 SHA512 652b54fdee969bbc17eeb04d05d65f143e8e0e1b46ac2574e3a76687b9bd916c9a0c97658b4f8357958d64e87fe2a6a2a98a6c312970f0e74fb4445962e9daae
 DIST bison-3.3-patches-01.tar.xz 10768 BLAKE2B 6b4df80d0cf6ff3445019bbc66063b794731d2c9869b20b0ace3ed9500e7ea4a30685a4084717871a68838b31392a90d2e1b52ef01eb2f62ea420e513268652c SHA512 32accc5a9e7b18b8dd98c73e5da50018be68effed9b69ed4d30604c7e7ba4495eef54b7882c3fe32bdeffb9278165ac2b5f3164b7c122e2001e4dd60ac2f4d1a
-DIST bison-3.3.1.tar.xz 2106048 BLAKE2B 998ab8cd014e0dde5a9a709ec8505e51ac5a85f3f88eb5c1a8dda7d2f1a8d82fbe6bd75b06b7a8ca3c67072f1ad09997c559a7584c443174165408f6200276ab SHA512 8901a97adda0d6d62c06e85d12645b35fa624c9f05e40250c1bb387d5524ac52c2b7de0402ab970f6ccfaf99c9bb5356873daa20cdd0c37d73b4a6ed7b98c44f
 DIST bison-3.3.2.tar.xz 2108612 BLAKE2B 84cf59c02ff4ba34c052ef2539cde8d5932145ab21b63c879eeb32d183cadba6cb6209278090e38f3f03085e58ad1fff71248e5729513d8dffdcc14e8f924dfc SHA512 63c67291ea1bd00f4412fc589ffb891ede3e2577253016a9a185e00fb2d702371f3862486639a8f52f8a887f340a639575ff3b7ba93c152170cbfd8c9585c1dc
+DIST bison-3.4.1-patches-01.tar.xz 10812 BLAKE2B 81311c4de0e70e5ca5861e36918be138d14b52872634e85f7e80e2290dc925154faac0d97b8a7c5b2e3cab973ab2a82627057fc4a078517e393174e3b2fda4fb SHA512 5a0fe975982a307bbdb4197441bc48231f3621a59cc97a896789b2976f80bc87e906dd71e5c81ffa75da2932e2f80fa52c894dc005007b7b319379a824fffcf9
+DIST bison-3.4.1.tar.xz 2198020 BLAKE2B 03369f92959061fd780fcde38d62e81f433ec7c0e6632ddf27bfb48607fdd510aa8e2e9fefd7e130b84972e168ff0762a7bed4f7a817be36c848ec6562357d2d SHA512 544d66bf11c55a69fad613bea429667c587fb0c3774f6894df81cb3c7931a554f79e6b71d6a6e9109e164e524c632127c967877f71328cd0b69a683d29ed128d
 EBUILD bison-3.1.ebuild 2515 BLAKE2B 9d5a1ae20ed4c001494d1d8a09a492c6cec0b83931903581967cb9d5a61fb736f5ce388ac9027eeec80c186358345864e7a588e78f64ab1b1170213e5db55e07 SHA512 fc236455ffb85e2755a447d44be3ad17e294c0740616b20872811d9467d4bcd12afdfffb03c573ca325270e764e13fe899be8ff6b95e01d4b29b85393a160201
 EBUILD bison-3.2.4.ebuild 2638 BLAKE2B 229847038c88e6c58e30a880710c780bb49b8278a5ebe338f3ed90b1a7093bdaf13a06ce098d73ea97306a312de056e5f089d0a3bf3095702dd545c0833667ed SHA512 f6267cab808bb92158666696c5a682afa2520c13ba605871b65b22d9405e9bb68f95074571d7a8cc83d0ce4f2286c76ef13cbf581023d9934f14cf49ef351c11
-EBUILD bison-3.3.1.ebuild 2634 BLAKE2B 1edf717ae2b143016cb0d9ffeaf054fe1c5f38855d20768b48dae8e584cce98ab6986c35b2d4e4f57c1481b6b168c3cf8c6fc7e88ce7b601764c1961f5ec753f SHA512 6b6d67f903b277d46e7b16b83f1fdda050ba4d628c965013261bfa2059841ca66579ba042fc00f5eef6c98624841750d07b4ec2920a8216fe8eccb3617a796ee
 EBUILD bison-3.3.2.ebuild 2641 BLAKE2B 318bf6463db5481304255b7d6c2e43ce309411844173fac0138b4dd583c9ee51e61f83dd1f53c9e1b783255fde2dc0ebfe7ac61b23be2ac288c66166ce9a88ed SHA512 b934f67129be99d16dd6204c2710abb3cba1230d10edb4717363d3981bc2f9abe9b3300cdd20a4bdf5622a1c2c4a4ecc868bacc13ab956d93a7a74600bfd96b6
+EBUILD bison-3.4.1.ebuild 2484 BLAKE2B 17c1e4ee0e125b13e6cacd084a4b7a2f44634c0a704feeb833009461b4ec39cbbb3d704b13f84084cda62bb6861be7c572b8f8c1ba327b9e8f16e094ddc17462 SHA512 28579037a8c1c03a55ddae11da12483f9d801dba4dfb47ed41ab89160944b3b88c91191a0b6c503014075aa9f8cc8bdc771d4e4013da108adfbfc27aeea884c1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.3.1.ebuild b/sys-devel/bison/bison-3.3.1.ebuild
deleted file mode 100644
index ca879edb2437..000000000000
--- a/sys-devel/bison/bison-3.3.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic
-
-PATCHES="${PN}-3.3-patches-01.tar.xz"
-
-DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
-HOMEPAGE="https://www.gnu.org/software/bison/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	https://dev.gentoo.org/~whissi/dist/bison/${PATCHES}
-	https://dev.gentoo.org/~polynomial-c/dist/bison/${PATCHES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples nls static test"
-
-RDEPEND=">=sys-devel/m4-1.4.16"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	examples? ( dev-lang/perl )
-	nls? ( sys-devel/gettext )
-	test? ( dev-lang/perl )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) # ChangeLog-2012 ChangeLog-1998 PACKAGING README-alpha README-release
-
-PATCHES=(
-	"${WORKDIR}"/patches/${PN}-3.1-optional-perl.patch #538300
-	"${WORKDIR}"/patches/${PN}-3.3-avoid_autoreconf.patch
-)
-
-src_prepare() {
-	# Record date to avoid 'config.status --recheck' & regen of 'tests/package.m4'
-	touch -r configure.ac old.configure.ac || die
-	touch -r configure old.configure || die
-
-	default
-
-	# Restore date after patching
-	touch -r old.configure.ac configure.ac || die
-	touch -r old.configure configure || die
-
-	# The makefiles make the man page depend on the configure script
-	# which we patched above.  Touch it to prevent regeneration.
-	touch doc/bison.1 || die #548778 #538300#9
-
-	# Avoid regenerating the info page when the timezone is diff. #574492
-	sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
-		$(use_enable examples)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# This one is installed by dev-util/yacc
-	mv "${ED%/}"/usr/bin/yacc{,.bison} || die
-	mv "${ED%/}"/usr/share/man/man1/yacc{,.bison}.1 || die
-
-	# We do not need liby.a
-	rm -r "${ED%/}"/usr/lib* || die
-
-	# Move to documentation directory and leave compressing for EAPI>=4
-	mv "${ED%/}"/usr/share/${PN}/README "${ED%/}"/usr/share/doc/${PF}/README.data
-}
-
-pkg_postinst() {
-	local f="${EROOT%/}/usr/bin/yacc"
-	if [[ ! -e ${f} ]] ; then
-		ln -s yacc.bison "${f}"
-	fi
-}
-
-pkg_postrm() {
-	# clean up the dead symlink when we get unmerged #377469
-	local f="${EROOT%/}/usr/bin/yacc"
-	if [[ -L ${f} && ! -e ${f} ]] ; then
-		rm -f "${f}"
-	fi
-}
diff --git a/sys-devel/bison/bison-3.4.1.ebuild b/sys-devel/bison/bison-3.4.1.ebuild
new file mode 100644
index 000000000000..db1dd26f8961
--- /dev/null
+++ b/sys-devel/bison/bison-3.4.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+PATCHES="${PN}-3.4.1-patches-01.tar.xz"
+
+DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
+HOMEPAGE="https://www.gnu.org/software/bison/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	https://dev.gentoo.org/~whissi/dist/bison/${PATCHES}
+	https://dev.gentoo.org/~polynomial-c/dist/bison/${PATCHES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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="examples nls static test"
+
+RDEPEND=">=sys-devel/m4-1.4.16"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	examples? ( dev-lang/perl )
+	nls? ( sys-devel/gettext )
+	test? ( dev-lang/perl )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) # ChangeLog-2012 ChangeLog-1998 PACKAGING README-alpha README-release
+
+PATCHES=(
+	"${WORKDIR}"/patches/${PN}-3.1-optional-perl.patch #538300
+	"${WORKDIR}"/patches/${PN}-3.4.1-avoid_autoreconf.patch
+)
+
+src_prepare() {
+	# Record date to avoid 'config.status --recheck' & regen of 'tests/package.m4'
+	touch -r configure.ac old.configure.ac || die
+	touch -r configure old.configure || die
+
+	default
+
+	# Restore date after patching
+	touch -r old.configure.ac configure.ac || die
+	touch -r old.configure configure || die
+
+	# The makefiles make the man page depend on the configure script
+	# which we patched above.  Touch it to prevent regeneration.
+	touch doc/bison.1 || die #548778 #538300#9
+
+	# Avoid regenerating the info page when the timezone is diff. #574492
+	sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		--docdir='$(datarootdir)'/doc/${PF}
+		$(use_enable examples)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# This one is installed by dev-util/yacc
+	mv "${ED}"/usr/bin/yacc{,.bison} || die
+	mv "${ED}"/usr/share/man/man1/yacc{,.bison}.1 || die
+
+	# We do not need liby.a
+	rm -r "${ED}"/usr/lib* || die
+}
+
+pkg_postinst() {
+	local f="${EROOT}/usr/bin/yacc"
+	if [[ ! -e ${f} ]] ; then
+		ln -s yacc.bison "${f}"
+	fi
+}
+
+pkg_postrm() {
+	# clean up the dead symlink when we get unmerged #377469
+	local f="${EROOT}/usr/bin/yacc"
+	if [[ -L ${f} && ! -e ${f} ]] ; then
+		rm -f "${f}"
+	fi
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 0bd4517d459f..db02fb84173b 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,5 +1,3 @@
-EBUILD clang-runtime-4.0.1-r1.ebuild 757 BLAKE2B 027d495eb3a9203db1ca76f1f6c99d6ab103bbeb76407bf52ed1eb2793988ba037c1ae9985bca3c48360c38ea3a7a2b19826071464a36a86fc110e30aa195cb3 SHA512 62f6fbe3e9f927efee18cd382a088adb0c7281c2af869e595fa3bd48b3bcae907eb1660c39748831c2309fe2aa6f790a3f5030a438477e09ad5b153722b5477a
-EBUILD clang-runtime-4.0.1.ebuild 639 BLAKE2B 62665ccfdb77a3635995b6ec9a59589e3d5e5b39c3940b378acc314fc9fcb4af23f7d44fba89f61eceb4055622b9d7c35ae26724b3cc207c06ac60bd2eda5a75 SHA512 b42d5fbf0082e194f4fc4ddf987a2d1dd0f06fc673b590ec278b45cacb8854c207b26cd159fe4cccdd1a123884037fff7c9e5908d0f329b93ff4ef0238e550da
 EBUILD clang-runtime-5.0.2.ebuild 820 BLAKE2B 52c56a71db4514803c8ecc070e21a479bad960fdaa40e3fbd6de2229f6f71c0f5fbbfc2dfc5fee8bcb8570c5e71c73be921cd3fcaabe442551d10ccf9a4736e7 SHA512 bcde7bededdae2f422da56eb68ed862fcafb618b8ce6cd1932a5472e325f0c0231429c7914806915b2f4b579655d0f46d82e19f5f83420d204f53a81a9596e47
 EBUILD clang-runtime-6.0.1.ebuild 819 BLAKE2B ce5fe6e1f47830366c00f80149adfb9f0ac25742fe57dd1cb1f35c30186a919b89cdb679b342ff1db3ed676bc48c58f28c85b5c74e1adaaab18875293b8be1c1 SHA512 25d88ca2c1d51c0140fbb7572fc45786a61902ff27534ad8e2bd8d12155a69229cadeee3c4827533207a265aa290e829de2141f96bc7d2181c59731ce0fbacfc
 EBUILD clang-runtime-7.1.0.ebuild 821 BLAKE2B 072164459daddb9d7929387acf7c718e7a1f9bb6ebd09f2521903c4a018893d43b7925edf21ca8f7da0300a01771b006de814c62131ad5b52dacf44cbb83c4ce SHA512 5156a526676038effbce1d470c58df549205eeb7daf57562702186e8669d2225c8b47af816949ea2545a884392918c1a8094ce824039c6b27a82dd83ba506e95
diff --git a/sys-devel/clang-runtime/clang-runtime-4.0.1-r1.ebuild b/sys-devel/clang-runtime/clang-runtime-4.0.1-r1.ebuild
deleted file mode 100644
index 34393f3f5c3f..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-4.0.1-r1.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 multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+compiler-rt crt libcxx openmp +sanitize"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	crt? (
-		|| (
-			sys-libs/netbsd-csu[${MULTILIB_USEDEP}]
-			sys-freebsd/freebsd-lib[${MULTILIB_USEDEP}]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
-
-REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang-runtime/clang-runtime-4.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-4.0.1.ebuild
deleted file mode 100644
index dae37fda523a..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-4.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
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="${PV%_*}"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+compiler-rt libcxx openmp +sanitize"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
-
-REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 4ab9c7881caa..ba1daaece28a 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,24 +1,17 @@
-AUX 4.0.1/0001-Frontend-Correct-values-of-ATOMIC_-_LOCK_FREE-to-mat.patch 4083 BLAKE2B aab48f1ed38bc7711363e86f9ff4f768bb4328eaa3e557c753f3b012ae13c08ffffafbb21645eb1d8a2f2d171362b28e2c41790eef8469c40d9be9c408307930 SHA512 2154b896d9a0ea50cec17c778ea62da525fc054fc24b0f59bebbad8c66ab17a0d607d87a3d0faa801770e74b8fc4bf3ede4103b6e344b7cc915d0dab16bbd31f
-AUX 4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch 2214 BLAKE2B 6c1860f2ba0586d8b8b9b3d055f57ccda1037e100789a2a9e5bfb84a2b21e6ec088ef43314790b773c8d56ba5716944a0e7e34f0972992bdf5a3ec9573b77c71 SHA512 211203f373a882672a712b742b1e4562103fda0a0ac86d602576c105a07af335006da325817ec0ee1f21158a67d0246c7c7ea1d6b3d78abae543f8e69814f885
-AUX 4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch 1527 BLAKE2B 12692e8eb21a341ceb206f94e24a2585b7080adc2b7dcd6098f78654010dcebdaaccb180ee63b38ed49d2d3b5da34d3fb8e1147eb3515278c9d50ace4c982f96 SHA512 10e3f8a2b5fb1c16f38347f77bba3b171d9f6044c1f96c73368c9df2448cbad0c4a0147f1e1ec10b127ef5eb5a3187c4b56030ac4444269aad97e5ec3dac5f2b
-AUX 4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch 3411 BLAKE2B a47f686dffa3e710435291670b8be7b99ea89d86092230f9acce328d24efa7ee43a5023b8deb482a497c1b54eec02c89291e4f10ad2c60382cc4ebe7c913981e SHA512 1ebfe7a6d06dd2991923cd1142c5c5b09ba2d06a3c7e0cbcb5b0f1d34aee57bf585941c0dd44ab331e9427828e5c63ea7475d673ccd3ec8617b99c59c56229a0
 AUX 5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch 6888 BLAKE2B e6d9907b05f99fb21008e7533f348348a3fe81249e6bcd0c473b82ba2dbb3651f7c27ba8c84053eb9c5832de1df4de7632971fc48d47aa9fff673f76e5688263 SHA512 6d1f35f39c15b11ce631477eefcca7ade90cb08e5992839273f97c339ef6bf0deecf9625fdacbad6e8cc61e4fd213e0e1c582c407ac051d99545962e310344fe
 AUX 5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch 2846 BLAKE2B a5d3081767621f774b4c873611506a6ab9518acbab48839e142dc920b2059ac32258ffa0d9c04a6d8450d355680e98a62b406ac876785f9241ee4111f472b86d SHA512 c714adfa4bb62f89be07216a0e2601ba9729791228a42020d5069e821c629077df4581f82236c3dfb5dbcfb54ff124e7b4f1241512a03ae8e3f7ac40b27acd7d
 AUX 5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch 1376 BLAKE2B baa36d2b05118859ffc5af12e9b5a8ed0dac3c262736ef2bab5f89049267dca5a94e134b078c06f09cafcc678fb8adefcf84f940806b594777a1f05a1e216a80 SHA512 f4e31053c03429528fc193a4550784b21d60fa0487700c1f416952c5d92b71988ca481b53c00f95f0c8c39f5f30e9ddd5cc6bee5334294fd3e4df24b8a450e69
 AUX 6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch 1256 BLAKE2B e71f32b08defa1ba59b574e9314e272107638676f1b1469a448efced144c680ffde4d76e34fa3fa5786859bf6e04050bd23150d7c0b98f8849f5d9355eacb646 SHA512 260096c1c7e6ba6f35537873cb6ba83f2271cb50446c50f6f1a5c88138c23508df16c99cac8664b5be0d56f2e0fe288f51a27424ff0b56c317d7a7e07562e0fc
 AUX 6.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533
 AUX 7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch 1244 BLAKE2B 0a5f0b4af299ae49b13eac0e6ff06ce84264baf05bc09437b481830d4cfafab68ec2a3adf5814fcd8efbe91770e2dda0ce5fa5e10fcefc10d6fbe2c17ca067b6 SHA512 cec3d531b7d6121f7fc5da731d7d89d03a7d1a38e32abd5d7812790ffa62e6d3b9f18084983702203502905d447ad89bd4e2a7f3ca51ee7d696ebe623b035ac6
-DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.0.src.tar.xz 12868468 BLAKE2B 3cb96c95c4d9713feb7011e4f1ca24be3e7f6c9b458f6cd9e6905f99737312ca44cb701ed5871e47dd583145e5898d53a65c4cda6456af3d4ca31b670ed84409 SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
-DIST clang-tools-extra-4.0.1.src.tar.xz 581788 BLAKE2B 52ca89eda6fe1e0fbbdc46e17f4067f03a9a9440dcdcc98811651087d0c9ab24dfe3eefb0b80a32ec41abe0766cb3e47031de61c4cff02b7d0e08c8fd03e3faa SHA512 ea26d926f428e62e76cf8a073e63ffe05645f6592e05d7717d5c257908870ae9217727d3e1578227b14eda5937085872463f1a8e99970256179c68b8a92e69e0
 DIST clang-tools-extra-5.0.2.src.tar.xz 646272 BLAKE2B 8a15a0c3ed9e8c31706d744017aa8be52616037790075c2314c3a613c9e1aa86b0b980c4e3bd9a775b234440f17436392196b41f1691ab25a33b432a25affb68 SHA512 241d85652e7c3ad5d77754ad9a694bddab3c14098067da4119223007c5a4a765d1cd7e7c7dba91666ccd5506f8703c82c9ee487f28249a00c2c4edbd0d1f2640
 DIST clang-tools-extra-6.0.1.src.tar.xz 757256 BLAKE2B 1d91d7459a34e7251007af91db1803ee6d04f1ef3e0fcf134a7e0d1d3456b094a80339ee60db3f0bdd12961f3a05caee7edfc5c6b9c48d49cd55a5dc3c102c3a SHA512 cf29d117b6dabcb7a8e5f6dab5016ce5a5c8f475679001a43fd5c935f2c368f37cdef50aae2080a1e4524f647f6d83458d4a5dec5b45d03fb374f463caf7c3f5
 DIST clang-tools-extra-7.1.0.src.tar.xz 901328 BLAKE2B 20865cf188cf08e4eae969d1083d9d69f57159c3dceb71e3e00a3f4dd96814b99e25fe633eb46801923d64cc9f884da24a417c21af71f0b3535bda0cce7d73da SHA512 8c22136324808b42601915e8163e06a90db078693f9e12369050bca6bab8cb971efaddcda82c5abf08e67ba7a5be1ac32e1bef0aff29a1b433e80eca8eba3e7b
 DIST clang-tools-extra-8.0.0.src.tar.xz 1996156 BLAKE2B 26c839669ce4cf531a56e8527c9d507ce458861c00aaf563fa5e58cfa2fa3897d820643746802198c8e77c9e46fc8f4b833fc3746b32d8adc0d4a09dbe3ace7c SHA512 434e4cb7b76f89b0a0af25f05f32f2f2e8edb9e9f14547be845df75f5032c1d9dbf475be408bb989c476ec667c10af54a15d40e42559b05e52d24c5fd416b517
-DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.2-manpages.tar.bz2 93977 BLAKE2B 8c5e8899e0df9d6037fb7d5c373de6492ccdc9fd2c26cc7dfbd8fb2b9e68418ca8fdf42cdc303c361e649cc6939bf5229cbad017bdccbd5d791e92752328252f SHA512 568615bce5a75d42e4b6d592557472d366d49a99f8e81be10ae679804f1fe674c7fd0bbdac09af44fc67ee5aa34c4ed2153c2767c536ac8e45dd15c811c92dcb
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df54505d5db2504bc61860a7260343722ec8cdd5e937d0843263a5bf5077b9cf386c337fa127039b996bab10d2ca5c2caeb59 SHA512 c468e97a2d5610aee9e72cb795e4e65375a079d733550f05380230fb44ba0ed67d407ad06e2340b66f13d19c06583b657e8d01fcdca2146ae43964cea309e0b3
@@ -27,8 +20,6 @@ DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0-manpages.tar.bz2 140542 BLAKE2B e6c58865ace0b8848ffe825e931a639daa5b22099317b3263acf8df4b8d5e1e97ed54a85b9241e6874b112c67114bda5617c3014c3bc1430c179bdf389e77269 SHA512 198f5bde8c610aa7953b325fc29c2bebe5c3d81469af6273975ed32cd739a9936813fca7399acc49809c322cf73fbdaa77a834f889bd78fe4672024965ea47fb
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
-DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415
-EBUILD clang-4.0.1.ebuild 9614 BLAKE2B ef0c63cfe38db99be4b9236d04eba4107092869e6c4dcc64e5a4cddf2d7931652607fce6292a8158ea9ff545ffb0296bca3670fd386e132c05239384190bbde9 SHA512 77045fdf3606b88c4f7f3021399c34b61876e80be7fa84ccb3a464e8caa19fcdbc896eb4f2d08d4f9f39dd7bdb03b9557135a710a00b92714ac2b29d6ba8e2d5
 EBUILD clang-5.0.2.ebuild 10452 BLAKE2B 2f0af78f8cdaf88e643bccc474ff186db268307373cfe5130c09c2f07753c5eaa92220ab4f117ae1396ae5ff7cb13fb42765bcc44f7e0aa3decd1c7ce1c93dd2 SHA512 3dc65b62475430748da620f6dcd83943b5de88a28d666b321f107439a8cec88694285c6cf2cd90e0cca78b8f75d3c7af98ca70099500dfd1a59685aadb4fc630
 EBUILD clang-6.0.1.ebuild 10272 BLAKE2B 7f179071a60dad773c4fedd95aae8c7529e84f891f6001808576bf6523baebe92eee713522c03accdcbeff76afc0c0a1329e159eef2cd307a2ff4ba6b598edc1 SHA512 508dc2b7c6758f63e931f83ec851ccf6e07433719e4e8dcb1f366c736bd22cb4fc19723dc2f05f7ff90f1828fc41a71d808d4f7f8332625134294516dc52ce79
 EBUILD clang-7.1.0.ebuild 10355 BLAKE2B 6f698e87585d2ca5ec9f204022f13dbc9a44a91f78ddfb38e7981af84a19d619b9185124d627b6c00951e323393c864c12f32d60b465f635f1e70ec1f36a441f SHA512 e298008b3eaaf5efb51a04a6322adcbb6e7d16d8b4dba7d5c1ccd0e13ac2c9798b362c9be19087aa1b52a8cdb3ff291c91ed88d1cc7e8195312ee6da17d3e304
diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild
deleted file mode 100644
index 469a613db91a..000000000000
--- a/sys-devel/clang/clang-4.0.1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils flag-o-matic llvm multilib-minimal \
-	python-single-r1 toolchain-funcs pax-utils versionator
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/cfe-${PV/_/}.src.tar.xz
-	https://releases.llvm.org/${PV/_//}/clang-tools-extra-${PV/_/}.src.tar.xz
-	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-${PV}.tar.bz2 )
-	test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="UoI-NCSA"
-SLOT="$(get_major_version)"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
-	test xml elibc_musl kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	!<sys-devel/llvm-4.0.0_rc:0
-	!sys-devel/clang:0"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/cfe-${PV/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	# create extra parent dirs for CLANG_RESOURCE_DIR
-	mkdir -p x/y || die
-	cd x/y || die
-
-	default
-
-	mv clang-tools-extra-*.src "${S}"/tools/extra || die
-	if use test; then
-		mv llvm-*.src "${WORKDIR}"/llvm || die
-	fi
-}
-
-src_prepare() {
-	# fix finding compiler-rt libs
-	eapply "${FILESDIR}"/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
-
-	# fix stand-alone doc build
-	eapply "${FILESDIR}"/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch
-
-	# fix value of ATOMIC_*_LOCK_FREE
-	# (backport, temporary reverted upstream because of FreeBSD issues)
-	eapply "${FILESDIR}"/4.0.1/0001-Frontend-Correct-values-of-ATOMIC_-_LOCK_FREE-to-mat.patch
-
-	cd tools/extra || die
-	# fix stand-alone test build for extra tools
-	eapply "${FILESDIR}"/4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch
-	eapply "${FILESDIR}"/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
-	cd - >/dev/null || die
-
-	# User patches
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(get_version_component_range 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		# ensure that the correct llvm-config is used
-		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# override default stdlib and rtlib
-		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-
-			# workaround pthread
-			-DPTHREAD_LIB=-pthread
-		)
-		use doc && mycmakeargs+=(
-			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/clang-tblgen" ]] \
-			|| die "/usr/bin/clang-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-clang
-	# clang-tidy requires [static-analyzer] and tests are not split
-	# correctly, so they are all disabled when static-analyzer is off
-	if multilib_is_native_abi && use static-analyzer; then
-		cmake-utils_src_make check-clang-tools
-	fi
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED%/}"/usr/include/clangrt "${ED%/}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	# note: we use two version components here (vs 3 in runtime path)
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(get_version_component_range 1-2 "${llvm_version}")
-	local clang_full_version=$(get_version_component_range 1-3 "${llvm_version}")
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X.Y
-	# - clang -> clang-X.Y
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X.Y
-	# - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die
-		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
-		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
-			dosym "${abi_chost}-${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
-		done
-	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED%/}"/usr/include || die
-	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
-	mv "${ED%/}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED%/}"/usr/include/clangrt || die
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"usr/lib/llvm/${SLOT}/share/scan-view
-	fi
-
-	# install pre-generated manpages
-	if ! use doc; then
-		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-		doins "${WORKDIR}/x/y/llvm-manpages-${PV}/clang"/*.1
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-}
-
-pkg_postrm() {
-	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/files/4.0.1/0001-Frontend-Correct-values-of-ATOMIC_-_LOCK_FREE-to-mat.patch b/sys-devel/clang/files/4.0.1/0001-Frontend-Correct-values-of-ATOMIC_-_LOCK_FREE-to-mat.patch
deleted file mode 100644
index f52d445eb05b..000000000000
--- a/sys-devel/clang/files/4.0.1/0001-Frontend-Correct-values-of-ATOMIC_-_LOCK_FREE-to-mat.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From f1ea62e93cba334828c427146cc2ca7718a9ffb3 Mon Sep 17 00:00:00 2001
-From: Michal Gorny <mgorny@gentoo.org>
-Date: Mon, 9 Jan 2017 20:54:20 +0000
-Subject: [PATCH] [Frontend] Correct values of ATOMIC_*_LOCK_FREE to match
- builtin
-
-Correct the logic used to set ATOMIC_*_LOCK_FREE preprocessor macros not
-to rely on the ABI alignment of types. Instead, just assume all those
-types are aligned correctly by default since clang uses safe alignment
-for _Atomic types even if the underlying types are aligned to a lower
-boundary by default.
-
-For example, the 'long long' and 'double' types on x86 are aligned to
-32-bit boundary by default. However, '_Atomic long long' and '_Atomic
-double' are aligned to 64-bit boundary, therefore satisfying
-the requirements of lock-free atomic operations.
-
-This fixes PR #19355 by correcting the value of
-__GCC_ATOMIC_LLONG_LOCK_FREE on x86, and therefore also fixing
-the assumption made in libc++ tests. This also fixes PR #30581 by
-applying a consistent logic between the functions used to implement
-both interfaces.
-
-Differential Revision: https://reviews.llvm.org/D28213
-
-git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@291477 91177308-0d34-0410-b5e6-96231b3b80d8
----
- lib/Frontend/InitPreprocessor.cpp | 10 ++++------
- test/Sema/atomic-ops.c            |  4 ----
- 2 files changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp
-index 17603ada11..4502c92499 100644
---- a/lib/Frontend/InitPreprocessor.cpp
-+++ b/lib/Frontend/InitPreprocessor.cpp
-@@ -286,12 +286,12 @@ static void DefineFastIntType(unsigned TypeWidth, bool IsSigned,
- 
- /// Get the value the ATOMIC_*_LOCK_FREE macro should have for a type with
- /// the specified properties.
--static const char *getLockFreeValue(unsigned TypeWidth, unsigned TypeAlign,
--                                    unsigned InlineWidth) {
-+static const char *getLockFreeValue(unsigned TypeWidth, unsigned InlineWidth) {
-   // Fully-aligned, power-of-2 sizes no larger than the inline
-   // width will be inlined as lock-free operations.
--  if (TypeWidth == TypeAlign && (TypeWidth & (TypeWidth - 1)) == 0 &&
--      TypeWidth <= InlineWidth)
-+  // Note: we do not need to check alignment since _Atomic(T) is always
-+  // appropriately-aligned in clang.
-+  if ((TypeWidth & (TypeWidth - 1)) == 0 && TypeWidth <= InlineWidth)
-     return "2"; // "always lock free"
-   // We cannot be certain what operations the lib calls might be
-   // able to implement as lock-free on future processors.
-@@ -881,7 +881,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
- #define DEFINE_LOCK_FREE_MACRO(TYPE, Type) \
-     Builder.defineMacro("__GCC_ATOMIC_" #TYPE "_LOCK_FREE", \
-                         getLockFreeValue(TI.get##Type##Width(), \
--                                         TI.get##Type##Align(), \
-                                          InlineWidthBits));
-     DEFINE_LOCK_FREE_MACRO(BOOL, Bool);
-     DEFINE_LOCK_FREE_MACRO(CHAR, Char);
-@@ -894,7 +893,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
-     DEFINE_LOCK_FREE_MACRO(LLONG, LongLong);
-     Builder.defineMacro("__GCC_ATOMIC_POINTER_LOCK_FREE",
-                         getLockFreeValue(TI.getPointerWidth(0),
--                                         TI.getPointerAlign(0),
-                                          InlineWidthBits));
- #undef DEFINE_LOCK_FREE_MACRO
-   }
-diff --git a/test/Sema/atomic-ops.c b/test/Sema/atomic-ops.c
-index 8ebf3eaed4..d3ebdf67db 100644
---- a/test/Sema/atomic-ops.c
-+++ b/test/Sema/atomic-ops.c
-@@ -14,11 +14,7 @@ _Static_assert(__GCC_ATOMIC_WCHAR_T_LOCK_FREE == 2, "");
- _Static_assert(__GCC_ATOMIC_SHORT_LOCK_FREE == 2, "");
- _Static_assert(__GCC_ATOMIC_INT_LOCK_FREE == 2, "");
- _Static_assert(__GCC_ATOMIC_LONG_LOCK_FREE == 2, "");
--#ifdef __i386__
--_Static_assert(__GCC_ATOMIC_LLONG_LOCK_FREE == 1, "");
--#else
- _Static_assert(__GCC_ATOMIC_LLONG_LOCK_FREE == 2, "");
--#endif
- _Static_assert(__GCC_ATOMIC_POINTER_LOCK_FREE == 2, "");
- 
- _Static_assert(__c11_atomic_is_lock_free(1), "");
--- 
-2.12.0
-
diff --git a/sys-devel/clang/files/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch b/sys-devel/clang/files/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch
deleted file mode 100644
index 0ecd5bc0e8c1..000000000000
--- a/sys-devel/clang/files/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 8dd12df445c9a35f7b1c0202eb7c74b954b0980d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 21 Aug 2016 23:31:55 +0200
-Subject: [PATCH 7/7] cmake: Support stand-alone Sphinx & doxygen doc build
-
-Copy the necessary options and configuration checks from LLVM to clang,
-to support stand-alone documentation builds.
-
-Patch: https://reviews.llvm.org/D23758
----
- CMakeLists.txt | 37 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 37 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ed8c10..3f34d8c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -162,6 +162,43 @@ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
-     endif()
-   endif()
- 
-+  option (LLVM_BUILD_DOCS "Build the llvm documentation." OFF)
-+  option (LLVM_INCLUDE_DOCS "Generate build targets for llvm documentation." ON)
-+  option (LLVM_ENABLE_DOXYGEN "Use doxygen to generate llvm API documentation." OFF)
-+  option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF)
-+
-+  if (LLVM_ENABLE_DOXYGEN)
-+    message(STATUS "Doxygen enabled.")
-+    find_package(Doxygen REQUIRED)
-+
-+    if (DOXYGEN_FOUND)
-+      # If we find doxygen and we want to enable doxygen by default create a
-+      # global aggregate doxygen target for generating llvm and any/all
-+      # subprojects doxygen documentation.
-+      if (LLVM_BUILD_DOCS)
-+        add_custom_target(doxygen ALL)
-+      endif()
-+
-+      option(LLVM_DOXYGEN_EXTERNAL_SEARCH "Enable doxygen external search." OFF)
-+      if (LLVM_DOXYGEN_EXTERNAL_SEARCH)
-+        set(LLVM_DOXYGEN_SEARCHENGINE_URL "" CACHE STRING "URL to use for external search.")
-+        set(LLVM_DOXYGEN_SEARCH_MAPPINGS "" CACHE STRING "Doxygen Search Mappings")
-+      endif()
-+    endif()
-+  else()
-+    message(STATUS "Doxygen disabled.")
-+  endif()
-+
-+  if (LLVM_ENABLE_SPHINX)
-+    message(STATUS "Sphinx enabled.")
-+    find_package(Sphinx REQUIRED)
-+    if (LLVM_BUILD_DOCS)
-+      add_custom_target(sphinx ALL)
-+    endif()
-+  else()
-+    message(STATUS "Sphinx disabled.")
-+  endif()
-+
-   set( CLANG_BUILT_STANDALONE 1 )
-   set(BACKEND_PACKAGE_STRING "LLVM ${LLVM_PACKAGE_VERSION}")
- else()
--- 
-2.9.3
-
diff --git a/sys-devel/clang/files/4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch b/sys-devel/clang/files/4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch
deleted file mode 100644
index 3779bc620314..000000000000
--- a/sys-devel/clang/files/4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1355920fbe819c5b1f5a870fc76cffcdd6328f0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 10 Feb 2017 22:44:53 +0100
-Subject: [PATCH 1/2] [test] Fix test dependencies when using installed tools
-
-Use the LLVM_UTILS_PROVIDED variable to determine whether test tool
-dependencies should be exposed for clang-tools-extra tests. If clang is
-being built stand-alone and LLVM test tools (FileCheck, count and not)
-are installed, the top-level CMakeLists.txt of clang sets this variable
-to indicate that they will not be built as a part of this build,
-and therefore no dependencies should be emitted for them. This fixes
-the dependency errors when building clang stand-alone with tests
-enabled.
----
- test/CMakeLists.txt | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index a852ef60..c26bd5c4 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -31,9 +31,6 @@ if(CLANG_TOOLS_TEST_USE_VG)
- endif()
- 
- set(CLANG_TOOLS_TEST_DEPS
--  # Base line deps.
--  FileCheck count not
--
-   # clang-tidy tests require it.
-   clang-headers
- 
-@@ -58,6 +55,13 @@ set(CLANG_TOOLS_TEST_DEPS
-   ExtraToolsUnitTests
-   )
- 
-+if(NOT LLVM_UTILS_PROVIDED)
-+  list(APPEND CLANG_TOOLS_TEST_DEPS
-+    # Base line deps.
-+    FileCheck count not
-+    )
-+endif()
-+
- add_lit_testsuite(check-clang-tools "Running the Clang extra tools' regression tests"
-   ${CMAKE_CURRENT_BINARY_DIR}
-   DEPENDS ${CLANG_TOOLS_TEST_DEPS}
--- 
-2.12.0
-
diff --git a/sys-devel/clang/files/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch b/sys-devel/clang/files/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
deleted file mode 100644
index 22f6d5685f33..000000000000
--- a/sys-devel/clang/files/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From f3ff810e81c35133f6a7e463d860bcd4ca30be84 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 19 Feb 2017 12:13:04 +0100
-Subject: [PATCH 2/2] [test] Fix clang library dir in LD_LIBRARY_PATH For
- stand-alone build
-
-Prepend the clang library directory (determined using SHLIBDIR, alike
-in clang) to the LD_LIBRARY_PATH to ensure that just-built clang
-libraries will be used instead of a previous installed version.
-
-When a stand-alone build is performed, LLVM_LIBS_DIR contains the path
-to installed LLVM library directory. The same directory frequently
-contains a previously installed version of clang. SHLIBDIR, on the other
-hand, is always the build-tree directory, and therefore contains
-the freshly built clang libraries.
-
-In a non-stand-alone build, both paths will be the same and therefore
-including them both will not cause any issues.
----
- test/Unit/lit.cfg    | 9 ++++++---
- test/lit.cfg         | 5 ++++-
- test/lit.site.cfg.in | 1 +
- 3 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
-index ff70123c..3a1da187 100644
---- a/test/Unit/lit.cfg
-+++ b/test/Unit/lit.cfg
-@@ -41,14 +41,17 @@ elif platform.system() == 'Windows':
-     shlibpath_var = 'PATH'
- 
- # Point the dynamic loader at dynamic libraries in 'lib'.
-+shlibdir = getattr(config, 'shlibdir', None)
-+if not shlibdir:
-+    lit_config.fatal('No shlibdir set!')
- llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
- if not llvm_libs_dir:
-     lit_config.fatal('No LLVM libs dir set!')
--shlibpath = os.path.pathsep.join((llvm_libs_dir,
-+shlibpath = os.path.pathsep.join((shlibdir, llvm_libs_dir,
-                                  config.environment.get(shlibpath_var,'')))
- 
- # Win32 seeks DLLs along %PATH%.
--if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir):
--    shlibpath = os.path.pathsep.join((config.shlibdir, shlibpath))
-+if sys.platform in ['win32', 'cygwin'] and os.path.isdir(shlibdir):
-+    shlibpath = os.path.pathsep.join((shlibdir, shlibpath))
- 
- config.environment[shlibpath_var] = shlibpath
-diff --git a/test/lit.cfg b/test/lit.cfg
-index bb592936..0e7de849 100644
---- a/test/lit.cfg
-+++ b/test/lit.cfg
-@@ -99,10 +99,13 @@ if clang_tools_binary_dir is not None:
-             clang_tools_dir, llvm_tools_dir, config.environment['PATH']))
-     config.environment['PATH'] = path
- 
-+    clang_libs_dir = getattr(config, 'clang_libs_dir', None)
-+    if not clang_libs_dir:
-+        lit_config.fatal('No Clang libs dir set!')
-     llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
-     if not llvm_libs_dir:
-         lit_config.fatal('No LLVM libs dir set!')
--    path = os.path.pathsep.join((llvm_libs_dir,
-+    path = os.path.pathsep.join((clang_libs_dir, llvm_libs_dir,
-                                  config.environment.get('LD_LIBRARY_PATH','')))
-     config.environment['LD_LIBRARY_PATH'] = path
- 
-diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
-index dfd0164c..f310b59a 100644
---- a/test/lit.site.cfg.in
-+++ b/test/lit.site.cfg.in
-@@ -7,6 +7,7 @@ config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
- config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
- config.clang_tools_binary_dir = "@CLANG_TOOLS_BINARY_DIR@"
- config.clang_tools_dir = "@CLANG_TOOLS_DIR@"
-+config.clang_libs_dir = "@SHLIBDIR@"
- config.python_executable = "@PYTHON_EXECUTABLE@"
- config.target_triple = "@TARGET_TRIPLE@"
- 
--- 
-2.12.0
-
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 25e7971f53fa..61ed76ff3058 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,11 +1,4 @@
-AUX 3.2/conf 1287 BLAKE2B 167936b142892a5a9176b080724d734ef568e108c7c017b4b3be8ef927538a62a4755f1c88dc16444c30a833af45b9254bcf0c7bbda9a1e5d3987c195c91b128 SHA512 e3c32d1bf67fa475ce7b8f6f27835ca604eca23bcb338312c3b93d59123c2747a7c45b2ba7fe19a0c3eec9dca409aa036b1c7aa3776d0f163bd06ac7bb6b2e94
-AUX 3.2/distcc-config 5212 BLAKE2B 5be838fec5e9dfa25bd12f1dd535e95078c2fc9a57e7b7615652d276cbf2e6f05df2db455bf7005a3aabe9d71d39b362b07c7b1d0ac3d2474b76575120f4c0a7 SHA512 f465b6c2a203e0b39ccf36af2098ea7b56fedf3679336b0d3ba07716e8e6edaab2b03c78e428eb6fbaab27403e397d0dec880f853eba5cec4471a67bb14a576c
-AUX 3.2/init 671 BLAKE2B 1ccb01319545b0263e15f87ad5543da5b76adfe6453d0b49b640f25b10e6d387a4ad88a5fb9faf6b15b74a73bf424e2175a0d54c5a3bd71e599cbd132afb6817 SHA512 5e1ff2c6c72ec761afac48c17e5c558617b512676a007e076f9ecbdd1f69b95ff626929952b2f5fff9a927f0422bd2fded297ad494d64c1113ea11c55dcbe605
-AUX distcc-3.0-fix-fortify.patch 313 BLAKE2B a8832bdf00ad84332397815755063cfe9f8aa4faeb369a72da5482208cddb3818ce6da60f75d3d9435e05ffe7a9267fce137ece2c96e051ec228d303f40b2008 SHA512 11f125fd12398d7e7cdcbbb2bb57d5d374fc3dda0eb88d22176c1c9948393debaf4aa05975d79e6fa4ca8de69b332cd2a75b301868b473c42511901e38b4c2a1
 AUX distcc-3.0-xinetd.patch 558 BLAKE2B a381f2282c71f0eb28dc218cd57a2a914f02ffedad068c8cb7a510ae0cbf0a200de38e2bb31918ce5e10960359e1452365f36393c804984db1054410156e4b61 SHA512 1c0aa31606e1ce828ad52c9fff672d9e13a00494b8a3441095aca101d76f0f296308e359330a85745e2c60533eb1dcf82cea3feff2d0a3154b204d56735f0d14
-AUX distcc-3.2_rc1-freedesktop.patch 3140 BLAKE2B ff3fe91dc9ad84185246611b7abc4f4a6aee7fcf5dc3365f6bc0f86218cbbc2528bd5f4c53b4063eaf510c973b1df4d40072801c5fe2172a03dbb51ae381628b SHA512 fe953e1884b498da9cbb83ca90af9e49b554ad56fef8a8f55b9e6b46e5904f7376e5e58a9123f4acb474e16577fb6c9371a12eddc29c07c5d488be847f4ed2ef
-AUX distcc-3.2_rc1-gssapi.patch 1638 BLAKE2B dac27f0480d828a04a58cafb63277ffa54de8556bc3ab2673b8900ec4a8c0893674f0a06bfc276cc43fd2b701ffd9329cedffafd1b19efaef22742b78cae1520 SHA512 c804189f87068f82e7cb18de4e8d30cc67db7cc7fbcb13872d44e3f6fb006b3c779adf9c6068ae50831ef649da718ddb33c0efc4354636aacc9a7217b3c9a348
-AUX distcc-3.2_rc1-python.patch 10592 BLAKE2B 561cb33d2699faa069377fb4c43227cc5fd96c6c81176094cc0f7958c547d37076e204277360361e7a13b32b6bc4b91c8c5d266b853af156590b5c1f00846c07 SHA512 513c2fb9aa8f222a0f6062795fac1f855d67467d796b406c6b685e345554ce09a96ab9e594d6a05aad6c5a0f8c7906700529cfb562f2dd7c498d9078219b3d6b
 AUX distcc-3.2_rc1-socks5.patch 5462 BLAKE2B 5c18de909306bf0fa24690fae618c193396f5d27ef77cb9341bda69e3f8319f3b779c760af27cb19e9a6f88a46f02fe888d4bf4fbaef6419beae239964c4ee47 SHA512 707b6ad02bb7ff1507cfbfbb4cee673d5f0dc776006e9b7e801deabccf05c6057b33ea43c6a3ddd1756b8d07ff1d5e3087b635f15285195ba795b8679ebdc860
 AUX distcc-3.3.2-freedesktop.patch 4210 BLAKE2B 7c1500df8cd8568d68c51a3d14eb7240f16adabf9c664b3295171901f4781a9d7b9b9510e577ca0b85abaf21b9783dd9fa98f351089dc98f52f6182bb841c658 SHA512 7454df35d134dff9f5640f7a1a4241b99fe4c6051682af185657837f25cb870c27885ec9be74b5f01075801542decb54daf7db5d80fbdbecf5c8c721a6ee4e7c
 AUX distcc-3.3.2-noexist-crash.patch 732 BLAKE2B 36aa1175d9650ca4f7799e595346dd59d480b8ff478b286fcb93448e7cff1e64b1658869679687ebebdf39dc94fa183b3370fcddfc493ca4f858dd76289b24e0 SHA512 ff8369a7acc09ed366709000ed2fac726cc74d4bce29f9ed5b1dc40e683a250219e552d2caebde7d8a801cc40fb1a97086332a07fd4c295e688ef22f234c0116
@@ -13,11 +6,8 @@ AUX distcc-config 5218 BLAKE2B 41d483481e483217ed6313b4f82ed66c4f006070c269bc5ee
 AUX distcc-hardened.patch 1084 BLAKE2B 4b78fce2ab19b3832006a8b0092d3d38df07ce8225eb367c90256a158a41121e09269cd4bf59a1fc450db58eafe09e757f6e3ca4ae074a4567676701228c8289 SHA512 d1150dc83bf89c332f8c0bd01e15f52f95d71868733bd2e5430a5377f1a4aaa2b5b6e0cd488d33d9b94ce18b0eeeadf4af719db536b001b50e4d482b35c7e057
 AUX distccd.confd 1189 BLAKE2B 62791080d43004faf5fc4fb61e506bf3f0f8c2a677d4c24e7d44af692ca7b825e173624343f7e89ae7bff206fdf9543e0308ea4b2db90326c0de04eaaeb62f0b SHA512 1769bd32b1e03e7f8a8e6dea82c1709754d4d0fb12e59e9bdf885ac98f13e26d6c3fdf6575512a8b65299043beeb4b86f6c0b1c884daaee73a5c77d09e474545
 AUX distccd.initd 341 BLAKE2B 0781b860647e68511d19d592cb65cf4c03ea15a8499783755772f5a448393befc2b450de703168a2b062e9fe0d8690a7ea3cda271a5bad2560099c0b5dc6c12f SHA512 bd5aecda5153589a78cd5ff82c34b10176efbd994ab82caf8f63951c04983f6e65459784c1e7644a323ad1696aa0a62b38e863ee1c42a15241a60b22942f8dce
-AUX distccd.service 244 BLAKE2B db5796f93fe36b2ed09cf84e54bacdb3483917438feb823bdc786983beebac13408bbfc7dd40b6bfd49341b4a2135a21ae49769c14a904ef37eecfa98c03306f SHA512 0626a2da412df4a124ec8f3486b48af92895e97ad626bb848f14e60c9b016de313ca7c17a09565de95fa48233c9f7e37bf79038d1115b339a2033f0eacf0a22f
 AUX distccd.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805c549f9f92fa41a3099ea3f0a422270ca0ffe37d682d435da513552e6b7c33617c767909577cc83f85a SHA512 c2aa1b5e0d34c6b8c20d3fb83b8328e6859cefc9f3f98130701f7448fe896f5c80e29091fc4bbab01d1f600c0258b790571d86e7057dc4cfe799b53aef92a1bc
 AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6
-DIST distcc-3.2rc1.tar.bz2 609904 BLAKE2B e6b928f3b9231524d37bdf86b39cd6a3601b6cdb1e03d913ae562286794240b4dd364d5d01da2176f9bb440809b166b4b877443459751adf8bd3ecf92ceb8476 SHA512 98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee
 DIST distcc-3.3.2.tar.gz 1008938 BLAKE2B e784002dffefd395b068d237a86203563fefc81e17a08c4d2e372eaaf62c5ac799011fc8633c8bfb717f0ebc8c8cb8b999c941e0f5f87c4077d031a9e5c4b138 SHA512 fdf11ed94ba50977b45e302179c5c4ba067cc3db37579cb8ed6d5b9487f8e3c89114f65af69333c38d374cf7634d7aef8d5a2d5c7fd8e9b1f4930c0897d6da10
-EBUILD distcc-3.2_rc1-r4.ebuild 5603 BLAKE2B 92accfb9fbdec29da8376407a7ee9e67f387bbdf1c5f3da22707917c1f600b64613225536064518aeef0c65d82f7a29f1f8b26c7c47b1306aa80c395bbde5313 SHA512 1f2766a19aaf84f4c7d37fca9f85b2badda7fa0fac6e8f7d2c819b303f4edf6b399e89a93abeca868ea28511b2985791ec91c32db89cb05d04b1a2ce984e669b
-EBUILD distcc-3.3.2-r5.ebuild 5699 BLAKE2B a092083fcd8f89cfbf9217909947fb6a622772d538bac4a595d157fc24aadc168837fae3f37041c2e04a575dff0a9220198ce239d29f163f2398fc370ea55611 SHA512 54be7c94089d70eccb276d3de06972b53de02b0ce5d087fec06aed95db96e7e4b8cea367fc2ace9e89531f5846cd89b03cc1eb770fa89bc2acc8db06256e75ca
-MISC metadata.xml 686 BLAKE2B 149386337b838821ca538556fa2548b759ed09a5a99ff2de536390ba0a39f30c72722e88e0e413122df2d893a317a25eed5e43046a0721b960e0c0b5bfbd8c8e SHA512 22eacde5aeb935c963a80bf5d3a39e4db08ad2613232aabba2a109748b29169ffca04cf53f946a6110d3cf66358ec53e4a025cbbe12a84597ea3130475e9343d
+EBUILD distcc-3.3.2-r5.ebuild 5698 BLAKE2B 5b8292c329aae5fd986e9866ce34a5aef87667ebdee12279e3c4382067c9c7d3b0c1b84ceabbf585d9f3f889314c20cd637042f659ad382f56a41f3213711a59 SHA512 37e46b0085ced2f6fcdb80548f176aee90ba80e0c81226f88404c3ab70c15a7e1c3f9d5565d9bf503807baa60f53ad19e316979ad0cab162d5da7fb9e9295ae7
+MISC metadata.xml 606 BLAKE2B e6d738b3d7fed20430d4ae45738c9e4b2447a61a1a57735bf0fa8e1e177e1e0d027a71ebff71de9cbcc5d1d5800a31946002b1e36d73a8c31b2c097360a1dc64 SHA512 e196028491d2e4bcbb7390e220313a1ce4f5a41706a792775d31c66b3caf92bbb23680d26d3f41d285b2ba2f8b4dceb4e09760ac7ed0724eafdbc4b2ca8ecc6f
diff --git a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
deleted file mode 100644
index 0267f059b07f..000000000000
--- a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user
-
-MY_P="${P/_}"
-DESCRIPTION="Distribute compilation of C code across several machines on a network"
-HOMEPAGE="http://distcc.org/"
-SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="crossdev gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
-
-RESTRICT="test"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-libs/popt
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	gssapi? ( net-libs/libgssglue )
-	gtk? ( x11-libs/gtk+:2 )
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!net-misc/pump
-	>=sys-devel/gcc-config-1.4.1
-	selinux? ( sec-policy/selinux-distcc )
-	xinetd? ( sys-apps/xinetd )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-DCCC_PATH="/usr/$(get_libdir)/distcc/bin"
-DISTCC_VERBOSE="0"
-
-pkg_setup() {
-	enewuser distcc 240 -1 -1 daemon
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.0-xinetd.patch"
-	# bug #253786
-	epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch"
-	# bug #255188
-	epatch "${FILESDIR}/${PN}-3.2_rc1-freedesktop.patch"
-	# bug #258364
-	epatch "${FILESDIR}/${PN}-3.2_rc1-python.patch"
-	# for net-libs/libgssglue
-	epatch "${FILESDIR}/${PN}-3.2_rc1-gssapi.patch"
-	# SOCKSv5 support needed for Portage, bug #537616
-	epatch "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
-	epatch_user
-
-	# Bugs #120001, #167844 and probably more. See patch for description.
-	use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
-
-	sed -i \
-		-e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \
-		-e "s:@PYTHON@:${EPYTHON}:" \
-		pump.in || die "sed failed"
-
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
-		-e "s:@libdir@:/usr/$(get_libdir):" \
-		"${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die
-
-	eaclocal -Im4 --output=aclocal.m4
-	eautoconf
-}
-
-src_configure() {
-	local myconf="--disable-Werror --with-docdir=\$(datadir)/doc/${PF}"
-	# More legacy stuff?
-	[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
-
-	# --disable-rfc2553 b0rked, bug #254176
-	use ipv6 && myconf="${myconf} --enable-rfc2553"
-
-	econf \
-		$(use_with gtk) \
-		$(use_with gnome) \
-		$(use_with gssapi auth) \
-		$(use_with zeroconf avahi) \
-		${myconf}
-}
-
-src_install() {
-	default
-	python_optimize
-
-	newinitd "${FILESDIR}/3.2/init" distccd
-	systemd_dounit "${FILESDIR}/distccd.service"
-	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
-
-	cp "${FILESDIR}/3.2/conf" "${T}/distccd" || die
-	if use zeroconf; then
-		cat >> "${T}/distccd" <<-EOF
-
-		# Enable zeroconf support in distccd
-		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
-		EOF
-
-		sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die
-	fi
-	doconfd "${T}/distccd" || die
-
-	cat > "${T}/02distcc" <<-EOF
-	# This file is managed by distcc-config; use it to change these settings.
-	# DISTCC_LOG and DISTCC_DIR should not be set.
-	DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
-	DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
-	DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
-	DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
-	DISTCC_SSH="${DISTCC_SSH}"
-	UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
-	DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
-	DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
-	EOF
-	doenvd "${T}/02distcc" || die
-
-	keepdir "${DCCC_PATH}" || die
-
-	dobin "${T}/distcc-config" || die
-
-	if use gnome || use gtk; then
-		einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
-		einfo "This is to have a little sensability in naming schemes between distccmon programs"
-		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
-		dosym distccmon-gui /usr/bin/distccmon-gnome || die
-	fi
-
-	if use xinetd; then
-		insinto /etc/xinetd.d || die
-		newins "doc/example/xinetd" distcc || die
-	fi
-
-	rm -r "${ED}/etc/default" || die
-	rm "${ED}/etc/distcc/clients.allow" || die
-	rm "${ED}/etc/distcc/commands.allow.sh" || die
-}
-
-pkg_postinst() {
-	if [ -x "${EPREFIX}/usr/bin/distcc-config" ] ; then
-		if use crossdev; then
-			"${EPREFIX}/usr/bin/distcc-config" --update-masquerade-with-crossdev
-		else
-			"${EPREFIX}/usr/bin/distcc-config" --update-masquerade
-		fi
-	fi
-
-	use gnome && fdo-mime_desktop_database_update
-
-	elog
-	elog "Tips on using distcc with Gentoo can be found at"
-	elog "https://wiki.gentoo.org/wiki/Distcc"
-	elog
-	elog "distcc-pump is known to cause breakage with multiple packages."
-	elog "Do NOT enable it globally."
-	elog
-	elog "To use the distccmon programs with Gentoo you should use this command:"
-	elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
-
-	if use gnome || use gtk; then
-		elog "Or:"
-		elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
-	fi
-
-	elog
-	elog "***SECURITY NOTICE***"
-	elog "If you are upgrading distcc please make sure to run etc-update to"
-	elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with"
-	elog "added security precautions (the --listen and --allow directives)"
-	elog
-}
-
-pkg_postrm() {
-	# delete the masquerade directory
-	if [ ! -f "${EPREFIX}/usr/bin/distcc" ] ; then
-		einfo "Remove masquerade symbolic links."
-		rm "${EPREFIX}${DCCC_PATH}/"*{cc,c++,gcc,g++}
-		rmdir "${EPREFIX}${DCCC_PATH}"
-	fi
-
-	use gnome && fdo-mime_desktop_database_update
-}
diff --git a/sys-devel/distcc/distcc-3.3.2-r5.ebuild b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
index ae95ed386c44..ebf2f5ab8472 100644
--- a/sys-devel/distcc/distcc-3.3.2-r5.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"
diff --git a/sys-devel/distcc/files/3.2/conf b/sys-devel/distcc/files/3.2/conf
deleted file mode 100644
index c499271685e9..000000000000
--- a/sys-devel/distcc/files/3.2/conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# /etc/conf.d/distccd: config file for /etc/init.d/distccd
-
-DISTCCD_OPTS=""
-
-# this is the distccd executable 
-DISTCCD_EXEC="/usr/bin/distccd"
-
-# this is where distccd will store its pid file
-DISTCCD_PIDFILE="/var/run/distccd/distccd.pid"
-
-# set this option to run distccd with extra parameters
-# Default port is 3632.  For most people the default is okay.
-DISTCCD_OPTS="${DISTCCD_OPTS} --port 3632"
-
-# Logging
-# You can change some logging options here:
-# --log-file FILE
-# --log-level LEVEL  [critical,error,warning, notice, info, debug]
-#
-# Leaving --log-file blank will log to syslog
-# example: --log-file /dev/null --log-level warning
-# example: --log-level critical
-
-DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical"
-
-# SECURITY NOTICE:
-# It is HIGHLY recommended that you use the --listen option
-# for increased security. You can specify an IP to permit connections 
-# from or a CIDR mask
-# --listen accepts only a single IP
-# --allow is now mandatory as of distcc-2.18.
-# example:  --allow 192.168.0.0/24
-# example:  --allow 192.168.0.5 --allow 192.168.0.150
-# example:  --listen 192.168.0.2
-DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24"
-#DISTCCD_OPTS="${DISTCCD_OPTS} --listen 192.168.0.2"
-
-# set this for niceness
-# Default is 15
-DISTCCD_OPTS="${DISTCCD_OPTS} -N 15"
diff --git a/sys-devel/distcc/files/3.2/distcc-config b/sys-devel/distcc/files/3.2/distcc-config
deleted file mode 100644
index 4902a9a42c5a..000000000000
--- a/sys-devel/distcc/files/3.2/distcc-config
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/usr/bin/env python
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-import os, re, signal, subprocess, sys
-
-options=[
-	'--get-hosts',
-	'--set-hosts',
-	'--get-verbose',
-	'--set-verbose',
-	'--get-log',
-	'--set-log',
-	'--update-masquerade',
-	'--update-masquerade-with-crossdev',
-	'--help',
-	'--get-env',
-	'--set-env'
-]
-
-tmpcmdline=sys.argv[1:]
-cmdline=[]
-
-eprefix = '@EPREFIX@'
-bindir = os.path.join(eprefix, 'usr', 'bin')
-sbindir = os.path.join(eprefix, 'usr', 'sbin')
-libdir = os.path.join(eprefix, '@libdir@')
-sysconfdir = os.path.join(eprefix, 'etc')
-
-gcc_config = os.path.join(bindir, 'gcc-config')
-env_update = os.path.join(sbindir, 'env-update')
-envfile = os.path.join(sysconfdir, 'env.d', '02distcc')
-default_distcc_dir = os.path.join(sysconfdir, 'distcc')
-hostfile = os.path.join(default_distcc_dir, 'hosts')
-distcc_path = os.path.join(bindir, 'distcc')
-dccc_dir = os.path.join(libdir, 'distcc', 'bin')
-
-def exithandler(foo,bar):
-	os.kill(0,signal.SIGKILL)
-	sys.exit(1)
-
-signal.signal(signal.SIGINT,exithandler)
-
-def isroot(ret=0):
-	if os.getuid() != 0:
-		if ret == 0:
-			print('!!! %s %s must be run as root' % (sys.argv[:1][0],tmpcmdline[0]))
-			sys.exit(1)
-		else:
-			retval = 0
-	else:
-		retval = 1
-	return retval
-
-def writeenv(var,value):
-	isroot()
-	distcc_env    = []
-	distcc_env    = open(envfile, 'r').readlines()
-	distcc_env_new = open(envfile, 'w')
-	for i in range(len(distcc_env)):
-		if re.compile(var+'="(.*)"').match(distcc_env[i]):
-			distcc_env[i] = var+'="'+value+'"\n'
-		distcc_env_new.write(distcc_env[i])
-	#print('Set %s to: %s ' % (var,value))
-	subprocess.Popen(env_update, shell=True)
-	print('If you want to use these new settings in an existing shell,')
-	print('you need to "source /etc/profile" to get the changes.')
-
-def readenv(var):
-	distcc_env = open(envfile, 'r').read()
-	match = re.compile(var+'="(.*)"').search(distcc_env)
-	if match:
-		print(var+'='+match.group(1))
-	else:
-		print(var,'not set.')
-
-def installlink(chost='', version=''):
-	for file in ['gcc', 'cc', 'c++', 'g++']:
-		if not chost == '':
-			file = '%s-%s' % (chost,file)
-		if not version == '':
-			file = '%s-%s' % (file,version)
-		path = os.path.join(dccc_dir,file)
-		if os.path.exists(os.path.join(bindir,file)):
-			if not os.path.exists(path):
-				print('Creating %s symlink...' % (path))
-				os.symlink(distcc_path,path)
-			#else:
-			#	print('Already exists. Skipping...')
-
-def installlinks():
-	p = subprocess.Popen([gcc_config+" -C -l"], shell=True, stdout=subprocess.PIPE)
-	lines = p.stdout.read().rstrip().split('\n')
-	for line in lines:
-		columns = line.split()
-		if len(columns) >= 2:
-			matches = re.match("(.*)-(.*)", columns[1])
-			chost = matches.group(1)
-			version = matches.group(2)
-			installlink(chost)
-			installlink(chost, version)
-
-def uninstalllinks():
-	for root, dirs, files in os.walk(dccc_dir):
-		for file in files:
-			os.remove(os.path.join(root, file))
-
-def createdistccdir(dir):
-	if not os.path.exists(dir):
-		os.mkdir(dir)
-		os.chmod(dir, 0o755)
-
-for x in tmpcmdline:
-	if not x:
-		continue
-	if x[0:2]=="--":
-		if not x in options:
-			print("!!! Error: %s is an invalid option." % (x))
-			sys.exit(1)
-	else:
-		cmdline = x
-
-if '--get-hosts' in tmpcmdline:
-	HOSTS_ENV  = os.environ.get('DISTCC_HOSTS')
-	HOSTS_HOME = os.path.join(os.environ.get('HOME'), '.distcc', 'hosts')
-	if HOSTS_ENV:
-		print(HOSTS_ENV)
-	elif os.path.isfile(HOSTS_HOME) and os.path.getsize(HOSTS_HOME) != 0:
-		print(HOSTS_HOME)
-	elif os.path.exists(hostfile):
-		print(open(hostfile, 'r').read().rstrip())
-	else:
-		print('No configuration file found. Setup your hosts with --set-hosts.')
-elif '--set-hosts' in tmpcmdline:
-	if isroot(1):
-		PATH = default_distcc_dir
-	else:
-		PATH = os.path.join(os.environ.get('HOME'), '.distcc')
-	createdistccdir(PATH)
-	open(os.path.join(PATH, 'hosts'), 'w').write(cmdline + '\n')
-elif '--get-verbose' in tmpcmdline:
-	readenv('DISTCC_VERBOSE')
-elif '--set-verbose' in tmpcmdline:
-	writeenv('DISTCC_VERBOSE',tmpcmdline[1])
-elif '--get-log' in tmpcmdline:
-	readenv('DISTCC_LOG')
-elif '--set-log' in tmpcmdline:
-	writeenv('DISTCC_LOG',tmpcmdline[1])
-elif '--update-masquerade' in tmpcmdline:
-	isroot()
-	uninstalllinks()
-	print('Creating symlinks...')
-	installlink()
-	installlinks()
-elif '--update-masquerade-with-crossdev' in tmpcmdline:
-	isroot()
-	uninstalllinks()
-	print('Creating symlinks...')
-	installlinks()
-elif '--get-env' in tmpcmdline:
-	if len(tmpcmdline) == 1:
-		print(open(envfile, 'r').read().rstrip())
-	elif len(tmpcmdline) == 2:
-		readenv(tmpcmdline[1])
-	else:
-		print('!!! Error: Specify only one variable.')
-elif '--set-env' in tmpcmdline:
-	if len(tmpcmdline) > 2 and len(tmpcmdline) <= 3:
-		isroot()
-		writeenv(tmpcmdline[1],tmpcmdline[2])
-	else:
-		print('!!! Error: Awaiting two parameters.')
-else:
-	cmd = sys.argv[:1][0]
-	print('Usage: %s --set-hosts DISTCC_HOSTS | --get-hosts' % (cmd))
-	print('       %s --set-verbose { 0 | 1 }  | --get-verbose' % (cmd))
-	print('       %s --set-log FILE           | --get-log' % (cmd))
-	print('       %s --set-env VARIABLE VALUE | --get-env [VARIABLE]' % (cmd))
-	print('       %s --update-masquerade' % (cmd))
-	print('       %s --update-masquerade-with-crossdev' % (cmd))
diff --git a/sys-devel/distcc/files/3.2/init b/sys-devel/distcc/files/3.2/init
deleted file mode 100644
index e89dcb3702b7..000000000000
--- a/sys-devel/distcc/files/3.2/init
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use avahi-daemon ypbind
-}
-
-start() {
-	ebegin "Starting distccd"
-
-	if [ ! -e /var/run/distccd ] ; then
-		mkdir -p /var/run/distccd
-		chown distcc:daemon /var/run/distccd
-	fi
-
-	# Load PATH and GCC_SPECS from gcc-config, bug #262773
-	eval "$(gcc-config -E)"
-
-	start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" --user distcc -- \
-		--daemon --pid-file "${DISTCCD_PIDFILE}" \
-		${DISTCCD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping distccd"
-	start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
-	eend $?
-}
diff --git a/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch b/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch
deleted file mode 100644
index 8edc330e324b..000000000000
--- a/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru a/src/snprintf.h b/src/snprintf.h
---- a/src/snprintf.h	2008-08-06 15:52:06.000000000 -0500
-+++ b/src/snprintf.h	2009-01-04 15:19:22.000000000 -0600
-@@ -7,6 +7,7 @@
-  */
- 
- #include <stdarg.h>
-+#include "config.h"
- 
- #ifdef __GNUC__
- /** Use gcc attribute to check printf fns.  a1 is the 1-based index of
diff --git a/sys-devel/distcc/files/distcc-3.2_rc1-freedesktop.patch b/sys-devel/distcc/files/distcc-3.2_rc1-freedesktop.patch
deleted file mode 100644
index 8f0d8d77a12b..000000000000
--- a/sys-devel/distcc/files/distcc-3.2_rc1-freedesktop.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Naur distcc-3.2rc1.orig/Makefile.in distcc-3.2rc1/Makefile.in
---- distcc-3.2rc1.orig/Makefile.in	2011-10-26 11:07:15.000000000 +0900
-+++ distcc-3.2rc1/Makefile.in	2011-10-27 16:57:46.815272689 +0900
-@@ -50,13 +50,14 @@
- includedir = @includedir@
- oldincludedir = /usr/include
- docdir = @docdir@
--pkgdatadir = $(datadir)/@PACKAGE_NAME@
-+icondir = $(datadir)/pixmaps
-+desktopdir = $(datadir)/applications
- 
- include_server_builddir = $(builddir)/_include_server
- 
- # These must be done from here, not from autoconf, because they can 
- # contain variable expansions written in Make syntax.  Ew.
--DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\""
-+DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\""
- 
- # arguments to pkgconfig
- GNOME_PACKAGES = @GNOME_PACKAGES@
-@@ -1016,7 +1017,8 @@
- 	@echo "  documents            $(DESTDIR)$(docdir)"
- 	@echo "  programs             $(DESTDIR)$(bindir)"
- 	@echo "  system configuration $(DESTDIR)$(sysconfdir)"
--	@echo "  shared data files    $(DESTDIR)$(pkgdatadir)"
-+	@echo "  icons                $(DESTDIR)$(icondir)"
-+	@echo "  .desktop file        $(DESTDIR)$(desktopdir)"
- 
- 
- # install-sh can't handle multiple arguments, but we don't need any
-@@ -1108,10 +1110,10 @@
- 	done
- 
- install-gnome-data: $(gnome_data)
--	$(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)"
--	for p in $(gnome_data); do \
--	  $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \
--	done
-+	$(mkinstalldirs) "$(DESTDIR)$(icondir)"
-+	$(mkinstalldirs) "$(DESTDIR)$(desktopdir)"
-+	$(INSTALL_DATA) gnome/distccmon-gnome-icon.png "$(DESTDIR)$(icondir)" || exit 1
-+	$(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" || exit 1
- 
- install-conf: $(conf_files) $(default_files)
- 	$(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc"
-diff -Naur distcc-3.2rc1.orig/gnome/distccmon-gnome.desktop distcc-3.2rc1/gnome/distccmon-gnome.desktop
---- distcc-3.2rc1.orig/gnome/distccmon-gnome.desktop	2011-04-06 03:58:58.000000000 +0900
-+++ distcc-3.2rc1/gnome/distccmon-gnome.desktop	2011-10-27 17:01:50.792242592 +0900
-@@ -1,6 +1,4 @@
- [Desktop Entry]
--Version=0.9.4
--Encoding=UTF-8
- Exec=distccmon-gnome
- Name=distcc monitor
- Name[sv]=distcc övervakare
-@@ -8,9 +6,9 @@
- GenericName[sv]=Distribuerad kompilerings-övervakare
- Comment=Graphical view of distributed compile tasks
- Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter
--Icon=distccmon-gnome-icon.png
-+Icon=distccmon-gnome-icon
- TryExec=distccmon-gnome
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Development;
-+Categories=GNOME;Development;
- StartupNotify=true
-diff -Naur distcc-3.2rc1.orig/src/mon-gnome.c distcc-3.2rc1/src/mon-gnome.c
---- distcc-3.2rc1.orig/src/mon-gnome.c	2008-12-03 06:50:25.000000000 +0900
-+++ distcc-3.2rc1/src/mon-gnome.c	2011-10-27 16:54:50.220566026 +0900
-@@ -599,7 +599,7 @@
- 
- #if GTK_CHECK_VERSION(2,2,0)
-   gtk_window_set_icon_from_file (GTK_WINDOW (mainwin),
--                                 PKGDATADIR "/distccmon-gnome-icon.png",
-+                                 ICONDIR "/distccmon-gnome-icon.png",
-                                  NULL);
- #endif
- 
diff --git a/sys-devel/distcc/files/distcc-3.2_rc1-gssapi.patch b/sys-devel/distcc/files/distcc-3.2_rc1-gssapi.patch
deleted file mode 100644
index 73551f8a7b80..000000000000
--- a/sys-devel/distcc/files/distcc-3.2_rc1-gssapi.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur distcc-3.2rc1.orig/configure.ac distcc-3.2rc1/configure.ac
---- distcc-3.2rc1.orig/configure.ac	2011-10-21 13:40:55.000000000 +0900
-+++ distcc-3.2rc1/configure.ac	2011-10-27 18:06:58.938922585 +0900
-@@ -15,6 +15,8 @@
- AC_CONFIG_HEADERS(src/config.h)
- AC_CANONICAL_HOST
- 
-+PKG_PROG_PKG_CONFIG
-+
- # FreeBSD installs its version of libpopt into /usr/local/, but does
- # not put that on the default library and header path.
- # Solaris doesn't even ship libpopt.  We used to add that path if
-@@ -502,16 +504,17 @@
- 	    [provide mutual authentication services via the GSS-API])])
- 
- if test x"$with_auth" = xyes; then
--        AC_SEARCH_LIBS([gss_init_sec_context],
--                        [gssapi gssapi_krb5],
--	                AC_DEFINE(HAVE_GSSAPI, 1, [Define if the GSS_API is available])
-+        PKG_CHECK_MODULES(GSSAPI, libgssglue,
-+	                [AC_DEFINE(HAVE_GSSAPI, 1, [Define if the GSS_API is available])
-+	                CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
-+	                LIBS="$LIBS $GSSAPI_LIBS"
- 	                AUTH_COMMON_OBJS="src/auth_common.o"
- 	                AUTH_DISTCC_OBJS="src/auth_distcc.o"
--	                AUTH_DISTCCD_OBJS="src/auth_distccd.o",
--	                AC_MSG_FAILURE([--with-auth was given but no GSS-API library found])
-+	                AUTH_DISTCCD_OBJS="src/auth_distccd.o"],
-+	                [AC_MSG_FAILURE([--with-auth was given but no GSS-API library found])
- 	                AUTH_COMMON_OBJS=""
-                         AUTH_DISTCC_OBJS=""
--                        AUTH_DISTCCD_OBJS="")
-+                        AUTH_DISTCCD_OBJS=""])
- fi
- 
- AC_SUBST(AUTH_COMMON_OBJS)
diff --git a/sys-devel/distcc/files/distcc-3.2_rc1-python.patch b/sys-devel/distcc/files/distcc-3.2_rc1-python.patch
deleted file mode 100644
index 409b5a19d321..000000000000
--- a/sys-devel/distcc/files/distcc-3.2_rc1-python.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-diff -Naur distcc-3.2rc1.orig/bench/statistics.py distcc-3.2rc1/bench/statistics.py
---- distcc-3.2rc1.orig/bench/statistics.py	2008-12-03 06:50:21.000000000 +0900
-+++ distcc-3.2rc1/bench/statistics.py	2011-10-27 17:05:08.418023081 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python2.2
-+#! /usr/bin/env python
- 
- # benchmark -- automated system for testing distcc correctness
- # and performance on various source trees.
-diff -Naur distcc-3.2rc1.orig/configure.ac distcc-3.2rc1/configure.ac
---- distcc-3.2rc1.orig/configure.ac	2011-10-21 13:40:55.000000000 +0900
-+++ distcc-3.2rc1/configure.ac	2011-10-27 17:05:31.179112690 +0900
-@@ -243,7 +243,7 @@
- #
- # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present
- # in autoconf 2.53.
--AC_PATH_PROGS(PYTHON, [python2.6 python-2.6 python2.5 python-2.5 python2.4 python-2.4 python])
-+AC_PATH_PROGS(PYTHON, [python])
- AC_ARG_VAR(PYTHON, [Python interpreter])
- # Python 1 doesn't even support -V
- if ! "$PYTHON" -V 2>&1 | grep "^Python" >/dev/null; then
-diff -Naur distcc-3.2rc1.orig/include_server/basics.py distcc-3.2rc1/include_server/basics.py
---- distcc-3.2rc1.orig/include_server/basics.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/basics.py	2011-10-27 17:05:08.421023097 +0900
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.4
-+#!/usr/bin/python
- #
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/basics_test.py distcc-3.2rc1/include_server/basics_test.py
---- distcc-3.2rc1.orig/include_server/basics_test.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/basics_test.py	2011-10-27 17:05:08.421023097 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/c_extensions_test.py distcc-3.2rc1/include_server/c_extensions_test.py
---- distcc-3.2rc1.orig/include_server/c_extensions_test.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/c_extensions_test.py	2011-10-27 17:05:08.421023097 +0900
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.4
-+#!/usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/cache_basics.py distcc-3.2rc1/include_server/cache_basics.py
---- distcc-3.2rc1.orig/include_server/cache_basics.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/cache_basics.py	2011-10-27 17:05:08.422023101 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/compiler_defaults.py distcc-3.2rc1/include_server/compiler_defaults.py
---- distcc-3.2rc1.orig/include_server/compiler_defaults.py	2011-04-06 03:58:59.000000000 +0900
-+++ distcc-3.2rc1/include_server/compiler_defaults.py	2011-10-27 17:05:08.422023101 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/compress_files.py distcc-3.2rc1/include_server/compress_files.py
---- distcc-3.2rc1.orig/include_server/compress_files.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/compress_files.py	2011-10-27 17:05:08.422023101 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer.py distcc-3.2rc1/include_server/include_analyzer.py
---- distcc-3.2rc1.orig/include_server/include_analyzer.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/include_analyzer.py	2011-10-27 17:05:08.422023101 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node.py distcc-3.2rc1/include_server/include_analyzer_memoizing_node.py
---- distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/include_analyzer_memoizing_node.py	2011-10-27 17:05:08.422023101 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node_test.py distcc-3.2rc1/include_server/include_analyzer_memoizing_node_test.py
---- distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node_test.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/include_analyzer_memoizing_node_test.py	2011-10-27 17:05:08.423023105 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4 
-+#! /usr/bin/python 
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer_test.py distcc-3.2rc1/include_server/include_analyzer_test.py
---- distcc-3.2rc1.orig/include_server/include_analyzer_test.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/include_analyzer_test.py	2011-10-27 17:05:08.423023105 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/include_server.py distcc-3.2rc1/include_server/include_server.py
---- distcc-3.2rc1.orig/include_server/include_server.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/include_server.py	2011-10-27 17:05:08.423023105 +0900
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.4
-+#!/usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/include_server_test.py distcc-3.2rc1/include_server/include_server_test.py
---- distcc-3.2rc1.orig/include_server/include_server_test.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/include_server_test.py	2011-10-27 17:05:08.423023105 +0900
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.4
-+#!/usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/macro_eval.py distcc-3.2rc1/include_server/macro_eval.py
---- distcc-3.2rc1.orig/include_server/macro_eval.py	2011-04-06 03:58:59.000000000 +0900
-+++ distcc-3.2rc1/include_server/macro_eval.py	2011-10-27 17:05:08.423023105 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/macro_eval_test.py distcc-3.2rc1/include_server/macro_eval_test.py
---- distcc-3.2rc1.orig/include_server/macro_eval_test.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/macro_eval_test.py	2011-10-27 17:05:08.423023105 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/mirror_path.py distcc-3.2rc1/include_server/mirror_path.py
---- distcc-3.2rc1.orig/include_server/mirror_path.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/mirror_path.py	2011-10-27 17:05:08.424023109 +0900
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.4
-+#!/usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/mirror_path_test.py distcc-3.2rc1/include_server/mirror_path_test.py
---- distcc-3.2rc1.orig/include_server/mirror_path_test.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/mirror_path_test.py	2011-10-27 17:05:08.424023109 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/parse_command.py distcc-3.2rc1/include_server/parse_command.py
---- distcc-3.2rc1.orig/include_server/parse_command.py	2011-04-06 03:58:59.000000000 +0900
-+++ distcc-3.2rc1/include_server/parse_command.py	2011-10-27 17:05:08.424023109 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4 
-+#! /usr/bin/python 
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/parse_command_test.py distcc-3.2rc1/include_server/parse_command_test.py
---- distcc-3.2rc1.orig/include_server/parse_command_test.py	2011-04-06 03:58:59.000000000 +0900
-+++ distcc-3.2rc1/include_server/parse_command_test.py	2011-10-27 17:05:08.424023109 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/parse_file.py distcc-3.2rc1/include_server/parse_file.py
---- distcc-3.2rc1.orig/include_server/parse_file.py	2011-04-06 03:58:59.000000000 +0900
-+++ distcc-3.2rc1/include_server/parse_file.py	2011-10-27 17:05:08.424023109 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/parse_file_test.py distcc-3.2rc1/include_server/parse_file_test.py
---- distcc-3.2rc1.orig/include_server/parse_file_test.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/parse_file_test.py	2011-10-27 17:05:08.424023109 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4
-+#! /usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/run.py distcc-3.2rc1/include_server/run.py
---- distcc-3.2rc1.orig/include_server/run.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/run.py	2011-10-27 17:05:08.424023109 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4 
-+#! /usr/bin/python 
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/setup.py distcc-3.2rc1/include_server/setup.py
---- distcc-3.2rc1.orig/include_server/setup.py	2011-04-06 03:58:59.000000000 +0900
-+++ distcc-3.2rc1/include_server/setup.py	2011-10-27 17:05:08.425023113 +0900
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.4
-+#!/usr/bin/python
- 
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/include_server/statistics.py distcc-3.2rc1/include_server/statistics.py
---- distcc-3.2rc1.orig/include_server/statistics.py	2008-12-03 06:50:31.000000000 +0900
-+++ distcc-3.2rc1/include_server/statistics.py	2011-10-27 17:05:08.425023113 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.4 
-+#! /usr/bin/python 
- #
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/test/onetest.py distcc-3.2rc1/test/onetest.py
---- distcc-3.2rc1.orig/test/onetest.py	2008-12-03 06:50:22.000000000 +0900
-+++ distcc-3.2rc1/test/onetest.py	2011-10-27 17:05:08.432023140 +0900
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.4
-+#!/usr/bin/python
- #
- # Copyright 2007 Google Inc.
- #
-diff -Naur distcc-3.2rc1.orig/test/testdistcc.py distcc-3.2rc1/test/testdistcc.py
---- distcc-3.2rc1.orig/test/testdistcc.py	2011-10-21 11:40:49.000000000 +0900
-+++ distcc-3.2rc1/test/testdistcc.py	2011-10-27 17:05:08.432023140 +0900
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python2.2
-+#! /usr/bin/env python
- 
- # Copyright (C) 2002, 2003, 2004 by Martin Pool <mbp@samba.org>
- # Copyright 2007 Google Inc.
diff --git a/sys-devel/distcc/files/distccd.service b/sys-devel/distcc/files/distccd.service
deleted file mode 100644
index 3eb61396b84c..000000000000
--- a/sys-devel/distcc/files/distccd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Distccd: A Distributed Compilation Server
-After=network.target
-
-[Service]
-User=distcc
-ExecStart=/usr/bin/distccd --verbose --no-detach --daemon --port 3632 -N 15 --allow $ALLOWED_SERVERS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml
index 5daba0cb6edd..0b9bbc941d2d 100644
--- a/sys-devel/distcc/metadata.xml
+++ b/sys-devel/distcc/metadata.xml
@@ -14,7 +14,6 @@
 		machines on a network.
 	</longdescription>
 	<use>
-		<flag name="crossdev">Enable support for <pkg>sys-devel/crossdev</pkg></flag>
 		<flag name="gssapi">Enable support for <pkg>net-libs/libgssglue</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 330a992b557e..632018c9e2bf 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -12,6 +12,7 @@ AUX fix_libtool_files.sh 1546 BLAKE2B afef9b4e3add813374d95226ebe1d76986c00c7e81
 AUX gcc-4.9.4-bootstrap.patch 2698 BLAKE2B 2fe9519590f0870aa201d550e027eaec311961c07b62f470d77f1de125fdf81cab6f884f08dfd8b957b7c2880ad04a7400f3fb395f5404d6c467373042e2fb0c SHA512 c712234b87aa66379bc52b43bce31a2dfd8de996030588a26261bb08471cd6e92587bc5aa35bb8f776a5128b1deb524e37aebe1c0b970a98210d653b5094d95b
 AUX gcc-8.3.0-ia64-bootstrap.patch 1327 BLAKE2B b8f2e46eb619830fec5f44350bac7f4e0908bca0460df642269b1404e3a11526142f9e658a0c4598ada21e68353d137e892eb827fcec3a25516775e8d89ecb40 SHA512 8c6802ec130bb618b675f8519729f096933d19ff246d10e231ec9e94ece532a06edff905f5b83023e32416f99c06635714a3dfb767740d3786587536c7bd9554
 AUX gcc-8.3.0-norisc32.patch 1390 BLAKE2B fc9d4b5afb57631957d66086af67de5843c3a3421f855bedce747fe41b78f3423c33c0cbb00ac8f4ed27af0691d1f0a7b8342850826667f25ef8a2d63b4e6944 SHA512 8e32e1fe14bdb1b29a6ae3c64f7bfcb7db41ba3fadaa00a5f2b85e4d63991bbb624ef04789a313c277a016ad055795ddba23c69762c19e3a536d4cb101cca2fa
+AUX gcc-9.1.0-norisc32.patch 2559 BLAKE2B 3fd196fd55ea9aeba406b7dbfa60e4c888e1cce7982f6ca35432161f9d523ec05d676925a33c07b4a140d26f9920677a9f70803c1696d085f61dd58950281876 SHA512 3e9c9b172ef4b228a17b8e914816abc8360de8650625d34956a604ee233a0f4a8d05c10a23ac02b9da82ea34d97b852f164cfb5fa2d69de10a6da4c75255cb2e
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 337 BLAKE2B 6408817927f71c5c55a19510a95e1aaad9b56be216ec1c753920b55a435d70579e27ff5bb8ecbeea1b9ff1c8ae62b940fbf10bf876c3d7ecf6cd662d9b693100 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5
 AUX gcc-spec-env-r1.patch 3148 BLAKE2B 30ceb113a510092a907b445c4b2131f148f7fef54a00a88b5c389bbf93b8b61bc12c86a07df03d57280759e5485ac0cd89ea69826ace01b5720681ca3102640b SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16
@@ -21,52 +22,64 @@ DIST bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 815566 BLAKE2B b202610cbc3e5a902
 DIST ecj-4.3.jar 1377431 BLAKE2B 1d6a8ae1cef0fc4ee325f935873e4a2e560c34cac929bc4190c7dd47e1ca4480ad608f0b7a5d00f2bde30ff2dc78f74ccb0effa48db1df9358a6e35ebce32100 SHA512 c4be72186d81747f1adce5a50de303c24bd6ed9f401bfa8871b1b864fe7591392218b1937b10d0e76014de8e0b6a1d5c4280475976218141cd1878c4a35217ff
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-3.3.6-patches-1.10.tar.bz2 53739 BLAKE2B d22772d30c432669299e3e6df350920408c510a241a20e6795dcc680227342a16c3b6d2e477a17d6c49794005b42972ed30b4efe5b2d69398d283f50efdeb459 SHA512 be6cc8fae217f789982e324e0d3ad12d527e43ca4c168bce613397aaf3d86219b125e7b39c2b236638a68112cfee0e06c1b297fead712d92b3923b7195299d0a
+DIST gcc-3.3.6-patches-1.11.tar.bz2 53924 BLAKE2B 9183d6fcd99c054df0c3bed279b4bc91e8bb68a2be9902a066f87815ee58a83ed2988b5be69af61c1ac4c9059a81b1fa43b8d27f55e46a3f20b7d18abc070895 SHA512 829c282f2e5421e40ac3d86a9536bc06c2ce80765c05a0cce8a012339ce5988024020643422aab758eca4ecf59e829825578e819a7afb3bce3d268b663333eae
 DIST gcc-3.3.6-patches-1.9.tar.bz2 51760 BLAKE2B 68704c1ddb73d2966746dd1a57b9699c3130d9165dd990b0b70f13b0dc4c7c4503afcbb268fd54242e17bdd571d5d0a20c172ee431c3c772e7c3412d3f0ac884 SHA512 306220c537c5cd90af7638431e6547ee9a80199c384629b5fbda06c28b2d6168fcf1dd448c0e178b104f41e03a8ebda4f389489d205b9e66ade6637e4747196c
 DIST gcc-3.3.6-uclibc-patches-1.0.tar.bz2 28882 BLAKE2B e1e1a1e24368d238b999df061e086c1376b095bba703154fd35edd6337b5fbc265722ffa01ae496e55a524d52792d7802867b38cd426c56397056d96e62036c9 SHA512 d060c1552d4f21b8b1cd6a6e56b9af4f62f61ce8ef4362afb1982b2ad9defe6a9648705cf780103d4f2061737553b6737c276d79b803b6b75ae94035bc881f0e
 DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
 DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 BLAKE2B 174eb5e437367a8e64a48f3764b4a3971afc7f5bffac583b7cf4e98a2ea2241ff896751137cc59d45a12b12333319efd52094925ba175073fe70dc143a5ea7fa SHA512 c0534a374e2e0416d0792373f9d11526226f9ce1a98e771469efa68388b709c72672b8db8fe77901144a96a23e4fd9f9a99f1d278f1e8fffda8a6b01e3b770fa
 DIST gcc-3.4.6-patches-1.8.tar.bz2 61940 BLAKE2B 54026fc7f0a17cac4a219c2182865c597a417448310f2b10f948f971f9639eedf958d03474d999675180e8c8a7ef7f7929551c33fead53b909b4888a5483d78c SHA512 14c12628e0ccdc47492890a46d45f9ef1df3970d1103116c3c3be76ecf1b3560088232819891662f44d621877b59ed38dab48053885bd34e6516d7de514f42d6
+DIST gcc-3.4.6-patches-1.9.tar.bz2 62934 BLAKE2B 5eaeae2c2f4ce79e41e8ed86bc695de67d4e36d238bfdb13486d079495d0013e71a133feababd981f5021dbe409eff684f3a35ec465232e86863a5b299e0ee8f SHA512 3d6d4d5354291758ae00b90e81034950551716cbc5a96325b2bf787e9d400123991b728d0586afd8ada0983b0383668e59e51eceae0c96bbe6281a429293acde
 DIST gcc-3.4.6.tar.bz2 28193401 BLAKE2B b3e2d52269e59acbdb04248d8d95bee957da29722f998ef39731b8f4fe9ce29ab6b29020be440d7d5db2b56f93fa77bc7e56f979912d03ebb755a92ab14927c9 SHA512 d235e1223d5faf8f37f2d73db35edeff44c88974b09dfcf325f4b181b16d7124710d93b1b65b60206ce3525f062236ea0f338b3a5341d7ecbe196d8e90c3ff18
 DIST gcc-4.0.4-patches-1.3.tar.bz2 41994 BLAKE2B 2c6c5402256e177d197cf106e57e9d596d7559eb117f3a5e6b23ee524a08c79db76b192ad37240d209778742070a7cab8d1b73b2ae9bb5cd5accd1a760b26b61 SHA512 34999c783b0b2af782ae316c7a874a40a3e98faa8eb48409f951fc167ad4fb56c4fec93dc5cb6831b89f2dd90c80e3c89778fd73b9f176cb4470d8f5d1537b03
 DIST gcc-4.0.4-patches-1.4.tar.bz2 42634 BLAKE2B 321c5dfbd194771ae28078fdde4baf5661f7cbb8127ff0bd7d23b7e1167e978776e0cdc26b2c1c8d7c469f964a223b67833caf78104b893d61ab243181fdf2f8 SHA512 190d86ea9620e24547726e30e36142c369424633060ecca0edd76f132b283068a680b5faa1bc14e6439fe7d8b5de8b6a9ef43438240831c19b99e753299e19d0
+DIST gcc-4.0.4-patches-1.5.tar.bz2 43777 BLAKE2B 9bd12a707b9721336fa2443d73898df4712a8b81ffc5b7e18b611663f642f6e815d6d6c4583791fee87d36e56dccfd5b364119bfa98bd80cb3e35f20f989c80d SHA512 dc9074fa7861c9efd4bb8a4118551377c88e27f2f2e7ea95fc3c75b3992ab55996afd8606570c795e85e73c9d1e2179f261b6c5d470ce778fec8fec3a74905ea
 DIST gcc-4.0.4-uclibc-patches-1.0.tar.bz2 20164 BLAKE2B d2d9626f03bcf0b06f316f22f2d4ea71ba0721d8369ff914bb27e20c4423a2a5b511bb23e74d2efc247ecc9c0554144a7ebd16d8baf432e289226ef610bef978 SHA512 67bdb8be3b7d173795ae3692f8f76fb6c236bfe3054112db30e3f0a56982685fe0b15e2c37f7d9e15e6198e4a41e47e1434a2befeee4e9e460e7bc9e0fa9d235
 DIST gcc-4.0.4.tar.bz2 32642939 BLAKE2B a152e6183bb288e587f1e6ad21401de5ce21f871aa4f82344bf76af4518d3286d281770754fd5744a9c0a86bd656be8bce88aa72380e42c438271e1f471c4d8e SHA512 194c12b5a1bc50c003f6fc849a4c0032388a960fb4b769bdb6e76cf330f04f880a0723661c991ec03742443c21ccba9af8599ae648a0777e0a5875c5fe7f6abd
 DIST gcc-4.1.2-patches-1.6.tar.bz2 54513 BLAKE2B 5f9d6e3332cbfac0ef757dfbd45226414f41c39f8d828325ab0d1ae1a82855cc6cde09308a7e1565cbd9ddcb1b730681bf7ccf69643a29141b3b029e8fb61135 SHA512 0f225b66851c1e70afe19f59c8527631c8b42f0580922d979d2dbf367b4591a59e7047bcb52b36695bf24fcfd71ea814b0001e001fe0e39482dec7327bb74259
 DIST gcc-4.1.2-patches-1.7.tar.bz2 55204 BLAKE2B dad75b6484a76233f17e47ab48749ab01b4fa905d020dde79aa784734ce26d6ef4328019bbc381ebb0c7692777f17b6c857407841baac36b8b5c65b0b0fce761 SHA512 c1e547857d5a78752a04ce95b23fa2fb3cbd78ae4df110cee3344a024622e4f8c58f2752fb57fd2d188a629bff2d1153aec0f415f46382860917e53887a5566d
+DIST gcc-4.1.2-patches-1.8.tar.bz2 56242 BLAKE2B ea0605478b8f957c8aff6f3f98a35cecb707f02957a58e966b93aa2d83f9c5dfecf2211df155cc42db0727cfeccdfc55ef628c819b0d3629eafbc829dd300caa SHA512 bd4d9c99d79538d679400fc5c55edb870e71df0b374f5ec397a09bd5cbe72a8557f7fddbb08ccae905631de47eea3a56a756cb8bfce54d74ab46ffe275707f29
 DIST gcc-4.1.2-uclibc-patches-1.0.tar.bz2 20980 BLAKE2B cfc7dd4c7a0b1ed80c491d4ad56b05b05ff308fdbed2faa1b9f15b10c0f7834ee4ffcb0df1619f959f7a1a5f315305b550665c232404a8a3306e3e615539a0c8 SHA512 57789f4236a3085136afa83be3cef677bd813afd258d67bfdbecd2058f497cd459366d5515044c0208ab753946dc951dac6a3889752ca6dae836d837c22ce33b
 DIST gcc-4.1.2.tar.bz2 39707720 BLAKE2B 966b6a64c118456c7fb66eb2ad0dd84b1d53ad88dcbd146f446ef097a6975f5d6a7f1bcbbc4bfcd4e48b00eeb8054728e412db3d9818cff1f195e37859a4e510 SHA512 b97d3b72a3b0355611d5090b2c715b7a774f0e466a89326a0226c2809d12dfafb2d7c5a7af54bd5e00c135bbb6596f535e1a484740f7f1f691e8a57e6f0425cc
 DIST gcc-4.2.4-patches-1.4.tar.bz2 25768 BLAKE2B 502a83eb320ab4e4e4f210958b839f99e4c524ed49676ba909c297a9e0fc93b91411c8aa123e1180909297de0f42c0c320bbe3cf75319728f4a130bb56907f60 SHA512 dacd9d13f29e1e7baf136dee564fd0d128c20f77a8f7ab745263ad9dea8c694c006b89baf93f9aab7a0f93b48c2a54d80c4196f83f0f27c0fe17f7fba9a4fcfd
 DIST gcc-4.2.4-patches-1.5.tar.bz2 26425 BLAKE2B 74723391829946d2485fefa5b69bdfad2bdc0ed5390abdcbee4a74829d95abc4a89b5c162a96c1dffac26924a872040e81d551f310dd20a0781b053e1421aeda SHA512 bfa62eb30bc5c311fee0d655ec24d1e3bf81312ee3556aa70c2ae71e857211fd55d8a96cf95266d27e40f39ddf2e7d771e49658f6f810a012c1daa180b0197d0
+DIST gcc-4.2.4-patches-1.6.tar.bz2 27554 BLAKE2B 1b6cf76ec6f0cd17d1078f6586124d6da5b3217f30300970bbcedc024d319fb5768b3a24ba6e366fbd9818f5c973916e7eb77858a6fc3609239f509cfab68196 SHA512 f4b1946429216dc381639e36197e6de8993cd19d3dfa47c52c5383980a3d7eee3613e3cf121609e5ed31dfb466fb97978e4c53240c6135d9babc9e2edb8aaff1
 DIST gcc-4.2.4-uclibc-patches-1.0.tar.bz2 19167 BLAKE2B bf2bcc9ece9096cf7fda9999c56073774072fa03e5dbf389a617888b2269bc79a7cfb68a6e26da66dedce9f954a1766ed21bbdd907b747e9fb5ea3a0fbbb6474 SHA512 5545cfe6bfa7ab9a69a474cc051cc8744380077dcc193afefeb455e959e408a5e4dfd1adde5357886c7f598835400273ef80ad5c14976c0552b44f5cd48704ed
 DIST gcc-4.2.4.tar.bz2 44025458 BLAKE2B 1d9645298dbbb1aba7b2957acf5b9839bd702a85120aa82d4cada0e4ea68a1d633422d8fcedc405504768e2f932e4b9d1a70a86da0b8efa5fc923b786ebc259f SHA512 c6e3e4fce1d27d0c56ab24f4809367d9329b620b7c124e88de190f2ea2ae57b5e06d0bda85c5a74237a4f94ddba53dc91faea0611fff7b19ad720edc312cb0d9
 DIST gcc-4.3.6-patches-1.2.tar.bz2 76826 BLAKE2B c37cb013a6928e8494e9de1eab9601ee4575523b4bfa4e7c1f64cebbf64ef57bf877234a1e637515eef80535d2faa4ea67792e9434b44421a430b6fa6ab07921 SHA512 229692a6026ebadc4d87342fd11695338c0fb2a13c43ed6288710fbdca4d7330c74a2c8a46f60637be9c4c38365076f068d35c5a91faa1c69a55e5e7aeac79f8
 DIST gcc-4.3.6-patches-1.3.tar.bz2 77886 BLAKE2B 076183e5dfb9a11d76ec52a8226d0e2f5ceeb34fed49af9e4c8c3a17455d80486214d66d43c812e6f5ac9e8cb34dc628b40ad9678ee30610aba61731150ddcde SHA512 fb7985da07da1cf9f159c31a3b6a037e673eb8441b8903df62831355c5c3510805fd183f0ac7c590c159cf5d97a8f25c407143d02888878266b6f6318169a3ba
+DIST gcc-4.3.6-patches-1.4.tar.bz2 79026 BLAKE2B fd7597483095afa114ab4df18134d3f00882c1476ae30b7aa531dffdca111599e811a451466fa981d0f94eb29a04cd784a36aaab4bd365ad522eac44e5aa5c0c SHA512 4f19a6221c520d62a4ab8731afb76c20d9dcca7b0cf6e52011b30fef013fc21fdf30c619a4bf959a344e9a6849459e9bb25ee204dc1b7d757e87a647ddd1f3c5
 DIST gcc-4.3.6-uclibc-patches-1.0.tar.bz2 3021 BLAKE2B c3b18a85253fc7b63e2f1fa541ce2c9bbe0c664fb5da8d494c89889d19aaebf513c40cabdf3271e3d074aace500bcde4f0ba4478c35ae0ae105b4a31d6e4e917 SHA512 6b85bf4caf5662ae114e472199c2f77d1fef63c485c073643968b6e0575c13bfa4ce9a32191908f34e70d41fd9fb5b9bc2b527542d82dac881a0462bfe89b120
 DIST gcc-4.3.6.tar.bz2 59756702 BLAKE2B 0bca01c8c2e7d8dc2f971c2b2bfb52d61285154c3fd14d6356a1cf083622aadadd9031bf0aead9a285eb1c4200c2d9515773c256acbdc901842aa16e06cc81e7 SHA512 0cb43f523135c6d54b3b5e26de7044fe096c16e7c3af8e400b2b48c5e52b4b5aa56615b1eca5e326b0202cf34870daa6ac44ec9633762acafa4425552b4029ee
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
 DIST gcc-4.4.7-patches-1.3.tar.bz2 25866 BLAKE2B 30c6e50afd9fb3ff159b99a950f07f91ca7684fbcd11339d273695ba7b1cb324b43b23b821923d8f972af6b32e4dd45075b1fbf6740f034b0911831bae494025 SHA512 cb59c8bb72a5414a9930f63e55a175bdc57d51dc518ec7d1245684f4576daa139e10dbe050a75ac960607cb0a5ed52c49ed7139d74398278bb7012ecda7be09d
 DIST gcc-4.4.7-patches-1.4.tar.bz2 26725 BLAKE2B 9d189cbf85621e09f12ca5ee4cf414b9c58d9c4f05cf39d13de358427f7744468a9b1cb75dac7f9b9994b7dd79aaff9f537a38170c2a9baee825223c294901c3 SHA512 b06b4bc966d6e40ab10227983e6a02ff98ae9c9657be6677259cf45a302049aef3103b5b4d391652e8e7faa1313d2a7c91bd34eeae892c8b89ccdff300128b9d
+DIST gcc-4.4.7-patches-1.5.tar.bz2 27790 BLAKE2B 1598fc1eb320db2ddadff01b3bd8110cab2d838dec75ef1bbaa7465bfdbc69ce5c55cda2bce059f115418bd4506187b62e8eb020237710b1f61468892a43627f SHA512 8420aad5def3c58c75ed955b0d198c2b7d4f0ddeabbad0a83269a1d5078b9240d90a7a272cf0f23f1654cf1058a8e0c9cff29b22c74328b20b9a1e5c19f871a7
 DIST gcc-4.4.7-uclibc-patches-1.0.tar.bz2 3016 BLAKE2B cced59dc8f03a2f8bce7f95c5028164b41189b2272ae6a0d525241dd24df827292dda39b1bd9b4d6c0741be0ff0eb4df62d7c6aadf54d54c2bf64f268c68988f SHA512 46a69cb8e2e3b97116d012b95a515953b2629be04228a2ac90fe628705e6bc3bdf05ee22e3ed7d5fd0fe6e60aad8f1f96f36e8dd3b231bdfd048e61c6cc15beb
 DIST gcc-4.4.7.tar.bz2 63179340 BLAKE2B e01c90907228572c3d25bbb776c8232fa3f8e8f4112a27f69be2bad8eec50b68add39839f8d5726f5f82491f50e71fa1b44d98b60a3e0f145848a0e0e8760700 SHA512 5562a7319cfd8cc7c5261de9170f2cda86cbd3a231a444a5ec0ad3d8fd60af6f8bd86af8f201cebb7bddcd083d761834d1cbd652c68af0f5607d22a63439ed0e
 DIST gcc-4.5.4-patches-1.3.tar.bz2 20108 BLAKE2B 2a78a7e0228ae78996e36b14ad2961d4aba2ebecd8714a393608a41cd53efdd83bc31aebd6fd460372458592167b187997819db1a8a5778474098de224c844af SHA512 ba5781da360b5049ba07aa46dd45b8405540dadd717ceb88c07d8803ba91a90b9ee32147932d3dddf1ae1ece148589cc2b0e709a3fbec7fe56266f6e925fa8a5
 DIST gcc-4.5.4-patches-1.4.tar.bz2 21274 BLAKE2B 6c5c42be4c1a0954ca2c5181579e3d5af1e27bc2f91d77eee97c19f07b2fd2527bd4b96006e15aacc0009ad9b33ad5c9792768b84e002bec679c5a76aaaa9335 SHA512 4c8e9ece888eb0f09317886ceaddfc56536a58438c1b2d441831e916aa11d9584aa282de2535652d4f0bae235e7b0db725796ec57fc641f10a7123d7bcb1faad
+DIST gcc-4.5.4-patches-1.5.tar.bz2 22794 BLAKE2B 8a3a774c68ec37191199d4cc65f18bba55cfae8c5e715485a0950ce43ec6c96f705277460cb28ee8a70f73d9f30d9f06bab53d2e22d2b35bad009d785a0520b6 SHA512 d59857083c41456190adb350d563fe4bb649c4c50cc9a841bbf63ec03be53ee3de5ef3e6720206e7e51184d98453f3163cc267ba71e4fc06b22f44323ca87585
 DIST gcc-4.5.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B abf53f85a4af1336437963595b04d2c24284ebf7cc76d845bc3502cf54ef2dcfc21f76fda336f99165cc9939daa8b8c8dc9493c276879670a3cd0ac0efe526da SHA512 b6aa0a7d029a2a00b36fe8906d76b434fcdfc7191cbc8fffbcb8b89a66eba61ba6cd0cfdba94a79929487fbbad2163083b085476498f8be77ad473d078b0095a
 DIST gcc-4.5.4.tar.bz2 66426133 BLAKE2B 8725c7868e1fc9e72a28635f39aa014681aa502db4687e5d2d6ec7cf6d30b04902eca2ebbc1ef2b0e20b89908424d0053f0958e24ded5366fa1c38469913caa2 SHA512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115
 DIST gcc-4.6.4-patches-1.3.tar.bz2 16443 BLAKE2B a6d5cb1b51319e3167f687b7efddffd7dc8772b656fc42bb68687c2acc95095c57edcc6c7677b4b23c3666545a7eab6129c39abd3c7877c50c699be1b9b2ac65 SHA512 ed904bb8438a23a2e1ec3aff28c4451128421426305ff07de50edbad51a066bee9d1a9042a9b26c36dbd57e1eb044a474088945d6d780c6e98d7563947fb9b9a
 DIST gcc-4.6.4-patches-1.4.tar.bz2 17358 BLAKE2B 636ec75b1d3b6feeba5b21fc40faef6f8b23ff4079f80873f4faba4c44ecd9bdeac6b5a25dd6efcd1816ed594ea8d5d64c7bd41b7b7888fb04bf58148ceb50d5 SHA512 404d2ed19dd59b5eeff64ed5302eba48fc7e0613c20e3e40ebfe0a19131571d059d690113c7c5c00e8547615c6d1466beaa1e8ea16407d8208380c02dfb051b8
+DIST gcc-4.6.4-patches-1.5.tar.bz2 19017 BLAKE2B e2e9642ef97b126df48b480b7a84d47597686932cd3447f3b210518d5eddfe4d90521a6249f174e4480315a924c48cf98c2a2bf0e383eeddc6d1d75770f2da2e SHA512 f609e71514db89d51fb5047ca12cd0d1dbe352a0047d7ca744115df3ae7c0c61ba8f72b2642080267a549b1c7fad65f728f49a50d00f6796042dafc655de10ea
 DIST gcc-4.6.4-uclibc-patches-1.0.tar.bz2 3010 BLAKE2B e841db5125638b0ec34323d0500786ab6577042a22af3b423433542164408199ac4ff1036d27999aa01aa96e9e50988df2e86835102142f74c3f8fb33096a47e SHA512 fd289089a30c768b0ec4e3459cf494bc5e9d4ecf87056dc183277c712f7d69ac4cf900950270d8eacfe686b4aa906e1ece87cae52f2cb00642e96c0b95dcf133
 DIST gcc-4.6.4.tar.bz2 72006076 BLAKE2B 321c14c097c18cf60c32d228720980717e25e22e26ce5e75c3a411c423f9657eb896974200664132e2fb10c3010c5136d2da7f3c916fffddf7e4afe4e8bfdc20 SHA512 b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc
 DIST gcc-4.7.4-patches-1.4.tar.bz2 18072 BLAKE2B 6bab25aee9f9ef605ce2942928a9d1aa91371b8fdec00643805e5010a4b0ffb043e0dd1a119d1064f79e499983374ed39e475a9718fce632cad07811363ed56b SHA512 9f5d68ba62aee909023542dcece81e4e448ea750254258107d4f70291d8ae99469c4518e42ffddbe6b622b258f463127be6e6ef7eaaeeeb0f59b3b719f3eadca
 DIST gcc-4.7.4-patches-1.5.tar.bz2 20193 BLAKE2B 56c6258ee7c8c5657161e8eb182364b862d536300dbbb6ed7e781b45456a265debd299dc16496a543a291313af4d2cfd5f17a842abf64ebc3635d6b50458e4ae SHA512 340dea0cb11c676b5936ad1a32317987cd3a9b3271cf99bd50e40be39d5d361a218f4312deb2a6a17c6ae1fc7fd229b718857fde0e303b3537a4b89ba918c8d3
+DIST gcc-4.7.4-patches-1.6.tar.bz2 20746 BLAKE2B 56687d1788b2a6484fd52dbfffef77f19f3182a38d90ccd24f8df6fbe5daeb3b27176cf01de7ce3723e79b427cd3cc77e06e690e13e8271a0a5067c20117c273 SHA512 4ad9a08f1c9b21b3d9f069346ca752bb9772b9826d3cc50abb9a1cc2b916c208d6a715efdfe3602d5a3f08b6c058e5bfb43f87248b7a09d8b0fc39e2403580bc
 DIST gcc-4.7.4-piepatches-v0.5.5.tar.bz2 15358 BLAKE2B e0df0b19829d9f9b1e8719467a6e15336d58ccf50c182c3d14438bc7e8690940535f6391b83f359c4e0bedf16814b7d4e2b0888f4698740be511bf6a574f9556 SHA512 f5e078bf4c17f7b5be102f1e3358d91c72e80363b5e055a92461f78399a1bf27bf6cb690d41900719bb260b6529f5d1aac999e613fda6ac5e4efa27f622510e6
 DIST gcc-4.7.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B b24522bd5516e0f2bb4e8d20437e0a0aed22ea8cae3c78fc600688f71a57bb7fbd3d431737a30e4406a9ff5426ed7d2289b3efac4d5efaa5841f7db290ef023c SHA512 c2e6c96b74365f8233f6106fa03d94075b60f6f77c683aa2e27aceb007da723243f8e3ddea8b178e6a0f7939b8e35615165534dc74e5050f87680ab261a31c52
 DIST gcc-4.7.4.tar.bz2 82935453 BLAKE2B 98cc902dd1506161b96c8eba10e5a5c7fb11d2dfd95ebac15825806fcdb262a1ff962b72275dcfc8453b753164fc234bdd666b207202cfd5a0a2b4cd09b8c741 SHA512 dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189
 DIST gcc-4.8.5-patches-1.3.tar.bz2 26025 BLAKE2B 3744dfcac069b5f8321fc9cfb019d44c848d70d17e5908d3d97f0c314b98a7fd884235fec2b21c93027f6152577439f6d424f96836b113dcd589604af969c756 SHA512 8d190f81ca0d25281250dbf0a670fcf12334b0811a5bf664e6450942a2996d02b979c6e8f8760b287edad06df3d1f8e2fe5cb0c3dcf9677c3420457d841d9506
 DIST gcc-4.8.5-patches-1.4.tar.bz2 28937 BLAKE2B ecc1d6836b2a2f924a6c5bc224804273901bd362436245fa5ac7c4648693c41931ae970ae8ba0b5a5e43cf2f73493bda2b950a96618df2557f88114b6becab39 SHA512 5cffbc0004e010b8f3140dee3a0e1414d9003461330250ca609eaa98f5ef78ea1f55eae8ad2dc17f11370e036c958825c2940962cd22ca661b469b116b8be8c2
+DIST gcc-4.8.5-patches-1.5.tar.bz2 30345 BLAKE2B 1bd2868e675b43c15d4bafe3c18655042ebf2687ca28675d0e94135251375d6912e086f3132620d8a20a2a6d11a6282b2749c7dbd3b8bb1307909d3502610c32 SHA512 238b5a852521feb90f4f1df691eaeb95c7d125d749253fb800208265e10c9a357842206fcd78a4a2d9c6c16362b623ae1c4878f21e3a9010c6dbffafc5a31f66
 DIST gcc-4.8.5-piepatches-v0.6.2.tar.bz2 14265 BLAKE2B b3bb37957ba8ee446967a3a60fee61c26a49f237241bbaf8bb3c3ec63656dd0492f518b129c8ef43cc06091742bc9c0b1042bb612c1110732b1e9608f28753ad SHA512 cd6af4047d4719dae9dbe86ce5342c7d8ddec38aad032486713b08e1b0cb711f5ca017e08d583137d51b8d4ef673366ba310e71bca7b49b82e9314781d6e9d99
 DIST gcc-4.8.5-uclibc-patches-1.0.tar.bz2 2976 BLAKE2B 1a804fd0b2fd5756e824f3eb511cf62d6af0fa8059ebcffadf6deb85e242ec8728b7883f2e054b465b87e4b61b6a2b55061a68eb8329c3a79a659d4c15808d21 SHA512 5469128eab06525915c75241797ad9ec4b63072ebfd5e110319bf810633cf3fbed39bbda4f6a0c74e537b248e7642780ecbe2086ad10be6e66b7dd289fa6534f
 DIST gcc-4.8.5.tar.bz2 86165587 BLAKE2B 760931013f96083078e74b8376eede6c23954e1f41cb44dbbdd8220fdede48807d89b9ca44fc4ae309f7cef441831b533512f1145cd563c5c797e96cf6cf1bfa SHA512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea
 DIST gcc-4.9.4-patches-1.3.tar.bz2 26060 BLAKE2B a61cb29111e8a9e35d810c0c557e901fc0d78e3b62027f5ea622d29becff9492e350c932824b23e5a38604bc3fa6c39fed9db902df4f830a3a362f1a1c2d9f58 SHA512 0214da6712a1b583f028be60e562f742d3d484d930976e2fce7be090113517c0e07faa20f750411b5125902f38a9944fe0c1dc8605d161c5bb11843acdebab75
+DIST gcc-4.9.4-patches-1.4.tar.bz2 27240 BLAKE2B 26b7d08bad4b617ede2564f77ded67cc87ec6b9f6b4d4ff78b5b75c1d5739fc4049480c716075d74c9b8e23a4a3c1889796cacb3456a3982ab04a0781fe3cd04 SHA512 efa60a7f86e684710848182c7d040565c9cec7666e897adc02e5dea9d4c76117deece7b1f7e1f8772cdec9697bb92b762f93408824e47b3f63b4f35029f50a4b
 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
 DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
@@ -84,12 +97,14 @@ DIST gcc-6.4.0-patches-1.8.tar.bz2 16904 BLAKE2B cc5b47919e6586b8860b7ffd62a9025
 DIST gcc-6.4.0-uclibc-patches-1.0.tar.bz2 1586 BLAKE2B 21f97a9e1c349b3d52def092a03e5a90533521da9af586be7ee527594f2d65745491ff8758d88c99a7ac215bde7ebf4e47a0a36cfcd7e66f70e0bebf2dadd922 SHA512 266dbe2bb53d892a24cd752d5c6833ea33f8df8b11b0471700ee53865243cd41f412f9bea8a369b474c9cd1435faff2e03902c7cb5638dd3ddcaa665aa2ec522
 DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
 DIST gcc-6.5.0-patches-1.tar.bz2 9084 BLAKE2B fab5e50d786db1a5b552475d257ce3ace601e6201d51a6bf7ac31e0a5adeffb45a2a59bfbfa3fe2a6372200ee0af434d473de828b60b7668fdda75e0cad7ee71 SHA512 b8896db839ab46023dffa1fe1c6641555482d94a0d6097a0a3b70cc69063711a7d1c4e75cfdfd4db3daaf1c902888a212607ac2c605b17158cd51620c687946d
+DIST gcc-6.5.0-patches-2.tar.bz2 9870 BLAKE2B c6f6b3c04605da77679474d7784d674b4f6df5d39e7c26fb79b513852acc317776cb9d299ed78bec47544e7c5f932ef8d423483bf55fc830f6c244e71a4740ff SHA512 2e6998204e21fd098cb7823ec2dfa6c448ce0e96d2d4f7a18fcb833d7ac70cb97d7ccf5600dd2b695f7488d65bd4a13633ad78542cde72eca29d23323dfa2301
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
 DIST gcc-7.3.0-patches-1.4.tar.bz2 8238 BLAKE2B 72a5dcb046558c8f5c3a75040fe24ce1106c43af7510d6febf667b4377cb9caea5ebe9e1287af90e4ebfffa3f3f22ca85f533acf57c2e2d896f92adc1659b9f5 SHA512 24ed0d82240426efb111bbf48913b96fdc824ae3aa5a653298a726ebe64a40791f484229bbab9cc58f73d658e0b4b83ccd13081cfbea6e1673ef1d076cca3b33
 DIST gcc-7.3.0-patches-1.8.tar.bz2 14435 BLAKE2B 3e5c1abad56ccd6e0aa7739cb7cd651ec07ef9bf25be554343f1fa0444f251de41bde5fe6f8bb9e85e3f7a5cf8b2b83515647d93d62f338fa7843581fcaff2f8 SHA512 4d9d76b3d47f1af4f23cae15278d165b22065a3d1512323d1e31b5e0cb47e4654733dc43fa11906a3bd18e827621c9a5ec62b73563f8e5ead663c29f7d0d7345
 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
 DIST gcc-7.4.0-patches-1.1.tar.bz2 8778 BLAKE2B 52b02b3c619b99912ee254599788abebe3963cf85e49b56166069318e340a8e271d767e82798e6062fc2a042a86a88da66ab95f2d9e42933ff17688d616a903f SHA512 02ec2eb2460e24cf46f7a04ca3b80ca120719389a54a740070e991d9c96b6fd55d1fa04eb4249fd3043edc9c0f6519b5babcce76036cd0146183512aaae2d573
 DIST gcc-7.4.0-patches-1.2.tar.bz2 9380 BLAKE2B a9608c7993b875f1c8d81e2aa15c46e10f91e6f37a723d7c09dd29dff7bb169a58597afc483dd46ffb3ce24944f824d746aa49d1a59924036e04aa855ca875aa SHA512 7959126eee11c10d9c3bbc867f6a74273dbd6e8f2d896d65b3fe1de73f0d8e09fbb62c7ff02ba8d1798206251ad1059c4490cdefa8adff09212eb23403923642
+DIST gcc-7.4.0-patches-1.3.tar.bz2 10437 BLAKE2B a344341e431b3430fdbbde2821920277289d88ea8b70ece8ac4369f430f6e1e2516d6b03a180f397339c2a210e64095785251d3efb40b6e4ba19ad2015e8272d SHA512 955fcb57ea3ef9231a30adfb8f999e406cca23fff0c57a097ac5d15c28d62fe630df9db2af06a0fedb330003d84e36a6856368460a5b747cda47f96ab0ce8d32
 DIST gcc-7.4.0.tar.xz 62601888 BLAKE2B df91ec680d5389736d3a37a2d85cf2e12fbe87b642fdf4b332e67a043e00944aca00243cc6709f86abd92115cb5a78502146636395571d1ea4899531e15d5d0e SHA512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e
 DIST gcc-8.2.0-patches-1.6.tar.bz2 17138 BLAKE2B edbeba9c41972836de072955c0db51406603aaf0dbb5f84ac1c5d8d2d61a8df6d725356655b69e3678950a0dc6dacc1bc2bf56f3620d685fe5c32045b3893f96 SHA512 32e7bddb5ec288def1e5c79d58023d90e29d77e83b70e3f21a22f4da78061cc49184d92c43807bdfd56a5067cbb9a8cfbfcb514016662aa1a24d791c7bd87b6b
 DIST gcc-8.2.0-patches-1.7.tar.bz2 18166 BLAKE2B 2aff918d253d76c9b7d76b2d82e85c42f2ab8717e73831965b3a0fcc92b1ceacd7aa0b433dd0c180ad16906cfe059c020b256d01271ef95a6e56b08d41f4acfe SHA512 5110b610a4c9116ecd91490f66e570c09217c6b4d18bf46af5e1a51ed043df188ce313bdae6ba670b8800842387c98c1b83b7e1e0c396cbce71e6726d81f589c
@@ -98,43 +113,59 @@ DIST gcc-8.3.0-patches-1.0.tar.bz2 12278 BLAKE2B 793465c5de0af850c7f3017b3011e68
 DIST gcc-8.3.0-patches-1.1.tar.bz2 14430 BLAKE2B c702fbdb18c3c952cdb9adead3a193c948d78a4cb4b041beaa51a06b907fd357bb10a2f8d47d55978ebb08590fd7c9a6ec3df8e7a007173e20a55d251d947c72 SHA512 9e2284f597bab6f78ca24ead358b1f50495aefc9e0a416ace24c94723db7b2fb82d48426876138d00c82bcaf9c2f8b4674885988448dcf16dee1b764face9af4
 DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
 DIST gcc-9.1.0-patches-1.0.tar.bz2 12235 BLAKE2B 3f7a11dfaf05f14a1affcc602bcbea685a214025abc24d6c9df9634a1024142529c3d380d9bcbe50e1d1acdc47f095154cd872fc23487538e697a1fd563b5f23 SHA512 c9a1979e994e08f90a6ec44f088c407946c955f786b7b47adcfc3a56fab5fcaf571442ce60f380444092aad9801cd32f8a4d137bb6076f9a5cf9c961902e52fb
+DIST gcc-9.1.0-patches-1.1.tar.bz2 13931 BLAKE2B 55e863514f41f1af11b1f6f618604edf7f173b4c4ef8df1301ccaf4577355ed03a34b04ab50a6cf4e50317b7f047f279e4212215b183d0642f138ee5163f655d SHA512 ab850bd38902c52586fc84dd1b2da31bab857412db08dce96642f17f213c95bae029bb1be5e0ac4bb12e55f863ecfc2ccda67635e8bc7b54383b2813642d991d
 DIST gcc-9.1.0.tar.xz 70546856 BLAKE2B 0f7e5575aebc24113d12a56eb3dbf4bcdba3c656a76513c44dbbcded9ee71629727f24949bf2e1424682a9e5eda7c51eed93317e6f80013f5a837aaf25b82805 SHA512 b6134df027e734cee5395afd739fcfa4ea319a6017d662e54e89df927dea19d3fff7a6e35d676685383034e3db01c9d0b653f63574c274eeb15a2cb0bc7a1f28
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
 EBUILD gcc-3.3.6-r1.ebuild 1249 BLAKE2B 4fd694cda071603038aec136b37d6722b135e7db317c210aa484f68f47eaf0489c126ceb13309f84e7a96e034761835d1ca1f3baf88ba373f391bd44ace2b074 SHA512 a18cabe5c02f3ba85b28292ce6fd0e3973ef15f5ffa847fc67d57ed2d04d96e1a6910f36a9ec08a4833eac3e247df5a7893bfc19ca6354233352d38651809092
 EBUILD gcc-3.3.6-r2.ebuild 1247 BLAKE2B 1c6ab3cf11ab715bf9896a9b731c216ef7a5ffdad2bd4f76325c13a55d1991054b7dcdc5e4449d1654f6ce0046ebe16f920b215f3716e39e46e368d2e35d98a3 SHA512 61a1e5a717c3af4d8846c64d9dc613b6ca0f2bab884c8e2b3776ed826ba01a6f0d63b987475586d0d573aa777b1d5753900506b3811ed085a26685465503b88b
+EBUILD gcc-3.3.6-r3.ebuild 1247 BLAKE2B 992f97d49a929c135ca42281a721d8e8dc79a9ce01a61f7a3c2b6fc343361f02da0224ecf90125b9fa8359b92efa401cabf60480fe3fbd1378b1590b77a5180c SHA512 fe11c6ccb51f32c481b6bdeaa40a9723d290b6ba1a3ad27c9da79ebdb1fea2c4cedd0aa97d989758c4e099556968590f716148c27ae18b0955433d624734c11f
 EBUILD gcc-3.4.6-r2.ebuild 1374 BLAKE2B 7e38335fa6a4dede1b581fb2b42c14ebab65a16c81d10517601a1e8e9f63f42673ed099f483616a0a720ea01b43e97c7a05362665353bffa6bdf8b56409318a6 SHA512 5c31bf85dab53b0670ca7606c29e5fcdc9cdade9596b02320d95e2ab215952de4dc2f4fc4ce17bf4826c26bb76e820135a9317198753cb071b3ff7e39f1069ad
+EBUILD gcc-3.4.6-r3.ebuild 1378 BLAKE2B d11152c0eae119ac4a3e0d4ee6624c73c921a04c3a4461e80bb9a8ae1cf5a5af6d3cedf1c0ed6557dedbd0fe55d4b3fcf3d68ec88e219a058d2ed4a5150d8bd9 SHA512 18a5dba574d47b571c5217922a0b93d13f96e7dd02b29005529031461360d89c9404340d6ac7880e7b42b80d7cb8b52b6a97da0e5394212f939e6fafd564f0eb
 EBUILD gcc-4.0.4-r1.ebuild 244 BLAKE2B bb80196afd1fdc3c0318a79992b44ca6b9a63f702deb3fc16539b7dcd3526f5bf1ec026831362509fa270e6dbb5657984a9fa41b134d74e10d89dc2b3f08d425 SHA512 ceed99a86365766e7b6cf4e6825fe75c9ad0bfeee119cdb2dcb0bbbdc4eac3ba3c50f01e706575162ba93a867af00117f89648cbb85b4f56f972275059379bbf
+EBUILD gcc-4.0.4-r2.ebuild 244 BLAKE2B dfdde3b2f9a0ce404c006be81c660911f6f8bf1ee0705b8675d371905bce310ef712bc898fec7ba02c53a45bbc6868334405a71029104449966ee3cf76e26841 SHA512 b9738da5703eda3e2c2e33bb456549be9ef68e4391cc880b5af8b2f173cdbdad874f609e90fa38547a3ef53657375c0bb8d377bd70bf3edb89a3e30264e7f180
 EBUILD gcc-4.0.4.ebuild 247 BLAKE2B 3fed6acdd82f733a2aea4251d568466e4177b530d1af839366dbdd534490849b0e438cec31c2c972101ed6e56f4826d4f5a6324d143fb2018cffbc5b2b451459 SHA512 6f988f06da4516223bc9862eaf9bd082f26713a8aba4564d809d9daba6ffffd97e623804982062f421e733434b95ef02c76b230e0cc2322eeccaef616b6e98d1
 EBUILD gcc-4.1.2-r1.ebuild 655 BLAKE2B 7c6c3c838aac0d079e58e3f3bfbad62e69040b16dfa55181b4dcc6d592dc82162209d6a2f37c34979f6aad1fe9405d37ec471c76424970618b67136405f31e42 SHA512 bf7e6b4bb74d5db873c232fbbf0688c34492a51bd32d16d4bcf02dbc6e1e203fc487935b36a3ffc77b721354ee6624a4f01d7d7d21a07ecfc82f9391af8294da
+EBUILD gcc-4.1.2-r2.ebuild 655 BLAKE2B 3302cb25ba09947d7ba702446e24d0b62e01fdf7ee77d4adeb693926f9fc2df4804f9f22a113be0916e9943afc2bc92fe7b01d2478e16b627dcfe76d5afcb997 SHA512 b24aa6d3b774f5994bbf7139682a1a14b2056a2c88c4ddf385cd3473e1e6de03631644348b4a279dc02634acc6647f116e3789a26421091cf91a0750a1897252
 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.2.4-r2.ebuild 392 BLAKE2B ce28a025214b34c2858aab1c050a42e8da857db21c3ef106379ca42dd70b3e68d45c8e4a9b4ef8095927fc7580655938a9fd8d1ac2ac663a5a7a95545b542d25 SHA512 18b37455ec565645dce7807f2ae43b6a9455f023da24bf8e67e05d2e6a9ce2b2cd1d1ea2b39fd32400e772ad923b579a0ad2edbb48b9384fb578e054f5793847
+EBUILD gcc-4.2.4-r3.ebuild 392 BLAKE2B 940f8f015f571fa25e00453127054da76c38958eb7c7320e21a15210132ba686c8c67dee45e0601287792cccd486d99c86617b5470bfcea2749744f7ce6ace7b SHA512 99ab8ca59a1746caa722787b12a44b82379d9b0be4a9a546047ed3522f4cd096f60a6c4effda77ca92359dc8501bec65d606e1d46d22e6e811da46c61fc6e036
 EBUILD gcc-4.3.6-r1.ebuild 630 BLAKE2B a0f9f25d48a7b3abe6e377c12ee3ff35c585b6c5619679d465dd67cf7107d8fabef98c40c2f62a3f27029b43095055440bf6340c534906e31403041e334bd2bb SHA512 d381b460bd995fa8e5f8ee7464f04030510f21d569ab539a0bb6afbe2f5f4266af25ea8df052004bfb56155fd3f6cdb82fed7431c36da0f658549a26449d1e55
 EBUILD gcc-4.3.6-r2.ebuild 635 BLAKE2B 428c094446b975b61f957125f009f9b1349e461aff05eea54e94df833fda1c4eceb2dfbfb20dc18d335113c5cab9e376ae3a692382a228b66731600b8aa19878 SHA512 c3d8b64ed176a09207efd588e32eae31eec81c272596dd8100313ce83331920844ff94d5ec5c2ff25dcc3dbe6b664bab2ffbf5a4d775f3e9dc18f3695fef79c3
+EBUILD gcc-4.3.6-r3.ebuild 635 BLAKE2B 82df9ea727d2421742adf043da0819f1e0f6c622ab9758e5aafc3e30d332e49eb34a6f06a815ae49c5d4131ca549da7a4b91abd8f21ae1f2e9d4e577d340fb99 SHA512 c05e9a151b56cb93a3e85f0f05e0900fb5ee3d0f5de54f76f1dbc0aa2f04e55dd145e3363bddad90100b4261bcbb478109beb31301618e02c9c4db7d812f5ee2
 EBUILD gcc-4.4.7-r1.ebuild 680 BLAKE2B e4a86d0ada40aa08d4c5659095c0f566894861da2914fe8abeadbc9991cdbde700aab98d403b38556a9da5e3c1aca49f6b9a1c01c6240cf36116683cbc1d58ee SHA512 42347fa6ed2cbaebc15cf7bf1562c31ba594f589681ff45d461f032015bfa8f44737a766bf33c8626dd2c52319895e9a8c64eda209b55c12677d563191e581da
+EBUILD gcc-4.4.7-r2.ebuild 680 BLAKE2B fb3274a32fb75e2078034ffb605b712933855858c8c43c89ffd6621beabed31dd913ebbf417c58c04f5a7ba22633213fea6dc7c045d6e8ac9b43dcb40c66a2a3 SHA512 fc13dc76ca642580b7ed4aee4b97cb3109b531448265420c845de074d19964b36fc081aff5215d8106d5a56b25d6610eaffe6a3152b73e29b71820490c5c6b1a
 EBUILD gcc-4.4.7.ebuild 674 BLAKE2B 9f2b3b4d27620cdbf5f141f38709cc37f04d3e822f58b02bc3f784e37f1b9bf550a5ec9d80e646a37f2cd17f315b5e51b008257f9e5d81977e8985f88b328667 SHA512 72e2eb8e125e1dd8ff095a989a739978562e77432a949839eb012bf915af4e989c79759230583b80580d25b2659cee937359f05f96cd7dbe5084d4f7bd3f96d5
 EBUILD gcc-4.5.4-r1.ebuild 693 BLAKE2B bdf72b8cc1603d0341120696add2d833b2a6f594780abc64eb955a5f383891ac41173d12970c46d6dc08a3369ec8bdde27d3c5c368467b60a171575e2ff6e745 SHA512 760b2bcd5586f6c6e0e1a53cd73d17ad6ea84fd5958156632f9a02924baf78dd0da6b44e186f21ac6f76b1b6adb23a2949202435a50c43b3e6087dd42f6704d9
+EBUILD gcc-4.5.4-r2.ebuild 693 BLAKE2B f12bdae02e413e68a6d4f48702dfa25d8d4f5922e7964982b0eecf3cd3bda7f555d2f34fe00543a8899cc349ad0f2522bf2c7e00abb3016863c82d44c25ac0ab SHA512 b7a76fcbd4baf563ac20aca35779f88d3905051e96e50d2eaf1a80c68ade7cfaf436c04741afe1ad7aab472fa8a5f21b7bb9733d5136eb7d65503600d81f6abb
 EBUILD gcc-4.5.4.ebuild 687 BLAKE2B 0cb42fa794ab8b1e4dc8075bddc288f888e6f79ee6d93aa8b95faf1b3befb9049397b8e9583b10053a2e7f1fe1af2e81104cb7aa85327da9a72e0cdd7d43b02b SHA512 2f4ac3fdea111450adbbde5b3021b97db273baa1d2ae9188ab95baa772a696843c2685ce51adb8dc408ebf0924670eaf7b17c42bf1f798bb23d3037ff951e456
 EBUILD gcc-4.6.4-r1.ebuild 774 BLAKE2B efef8b537e1d08c97bc7a0063928f41b6af425950190baa46dce24325c0476acaf7327d3d10ea208cfbb92aa6bb4ec10bf591dca504b365f04506fb8afb0bb56 SHA512 edade673609d5db724a4e04d0082263d99a444a0604b7b56b7d8ebc4ccfa6745aac6cb7b37da175a55a6bcdf5f3190ea677ab4e2006b6e5017a2af7ce50ee7e9
+EBUILD gcc-4.6.4-r2.ebuild 774 BLAKE2B 106d2682855e5c6c32163bc29bc462bc782f4e3a5df49417822010d24f03d797a5ae4b5ec6421b9f2b3f5018b86bc91b3d97803ea6d748ca22ce8f356f595f39 SHA512 604b9bb1388e4e0002b985d3d6d15af8502eeb189548c39b70cbe86c5831fe676de4b0e6fae6286f056648b099214f985026b68e9e80534e5cac74022a21eba5
 EBUILD gcc-4.6.4.ebuild 768 BLAKE2B 9f38ecd86d75d9040e3674e4f33cc71e070c43d33a984b24e01e830d642546987dac29213534400f7c70890c86120bb95b353ed34bd79160539cb263fecc13e3 SHA512 a9d6fab6be0914a0ece96f42da9e2c84ef9d64cb480d9374b01ea16679c65129b49e9439a17d2c898d1e1bd33b7c03513df5b7172e91e3e682d6c475e9972fd5
 EBUILD gcc-4.7.4-r1.ebuild 1291 BLAKE2B 960d5072a4d03ee507cc5f7ea57f272165378daba273ec05e625dab2c38b0676f9261e46e6733649a49dc2dc50227449d480c90f8faa7af35a4cda8c2d4d7277 SHA512 44882746c9ee2920073722cf2847e717c412672e89656c6ee84e44903e935d0a84c6e7fdec327fddc8ba95cce1b8690d29847caff220f571e7d81dd556674b25
 EBUILD gcc-4.7.4-r2.ebuild 1300 BLAKE2B 64ec0b6d8825a08c579e57b0d2cea48fbd5078277081524f627b63d85ff9212804cce3008d1c030895083c26b81acc57af7767cbd692d029cff5485e914d2f8f SHA512 6610e94211ec1c63803afe3bfd1d54f6235cd890ddca4ad5b2d2d4c26bcccaf0f5f3640dbc1dc1db05ac7fa8575f214a74a2ffd1d76ca71a5ddbed59ddde11d0
+EBUILD gcc-4.7.4-r3.ebuild 1300 BLAKE2B 68d517adc49deef4e6fe397464117d58f8b3853249e4ad75198a7ef7652b4179b7b990f7132011502408d57a56fbcba260bcc33fbabb70bba87e7f82c38ad200 SHA512 042e52a0d943e36f6f7dd84cdbac6bf3cd7fad0b488f6a80d676719b3372bec2e0c9abdda40e1c05ce7afcece7b24ab2b3ac36ab455b38a03109c870ff851357
 EBUILD gcc-4.8.5-r1.ebuild 1401 BLAKE2B 669ceca836569aa02247049b00d1beb820b12a8fd08bc8da703b650a01629bb6b9b9607d83152889770cc7116a2ce9e058db7d5eee5e91921ae2342a32890c40 SHA512 22f68cc6733b59e3d4f43df088fa0440ebbb40c3cfbb88e538a1ccca849f1111a83c9a2cf0d0733eb16eec956e65c5accaae1c6598a8027a497d20f3293a2934
 EBUILD gcc-4.8.5-r2.ebuild 1411 BLAKE2B 49c49cbb0be5135b73b13f8df58c32825dc93b4ab0aa885ed0ca0a548b2396b90aa3d0ad6dcb68ff78a67de681acf2acfa442199b9ba038b17de75de37d3fba9 SHA512 16539269e387d53d664ac66aca83c65229682e9fe4bc8720ecb0f3554191afc96994c571de9df97384457513807d91d9e8984c0da74a72c4b13ba7956f17331b
+EBUILD gcc-4.8.5-r3.ebuild 1411 BLAKE2B 0e12458346c9ec6bfccf6100187472c1dcd6cf0459d3e426f87ff538a695ac1e078f46ce2197d2834ee4eee7e54c1fdce9dda39676ae9858bf60ce38d7ba0bc2 SHA512 f082c4ed61cc6974f5df3dcb6ace113c41aa81608c1405b62a6dbbbd526eb55ab0c4e020e85d82a33de5078ca506020cf3f3d34a8eb12585b3633b00561c340b
+EBUILD gcc-4.9.4-r1.ebuild 1470 BLAKE2B ada75cf169dbeaa91ef7b6e2350e2ae2e1d48ec0c6295a937114437dd682d48537bfea81b1433e4207d5b14094f002f62b736c73f8ddafff5a90e21f63b1a3e3 SHA512 e551c428f54ae57fbb5b2ae9d17f312b5848161a936524add7523e412287c044493a574029fdf7101ab70b44ba4a9062229dc76d9c4e93595b8d7099ae041e49
 EBUILD gcc-4.9.4.ebuild 1460 BLAKE2B 60ac80417d49608501a2956ad5b62162fc0e5ce089a8786c7482328cdf4b0d7ab8a10045c2479b3ecf602ca934796e9c32459c9b421a3444a3333b79faf3026d SHA512 c0a443c8c0629b12047f1bdad0b62a23a423f2fad4408b765d5093f8cb2a4ab54b6470f6f4e2b2d4f444817a2e71c11568fadc8d11bfdcc068a8fb4b7fd826f3
 EBUILD gcc-5.4.0-r4.ebuild 1275 BLAKE2B f8246e6904d1d39cccacb972a9e62bebd41ac2df8f45be771be421c8a9905a03486500ac57a8b08d090569eb3f17ed3effad54e337048f1c9ce34f655c86005a SHA512 212b36ca6b5a55855ee91a82ba37c8597d34117a581135ea49ad88b9b7495549e0889a0add86f499208ec27eb81ef8ab786d2ca97d565dd60e6eb09f76ebec61
 EBUILD gcc-5.4.0-r6.ebuild 1286 BLAKE2B 176cf1828d2e8f16cdf1157326103becbb0af36db08f2b4702e25d7732f179709335dd0dcde3afcfc141abf016fd51671b111110d3925b81194e866b4c7abd4f SHA512 807577140b06506ee70e75aa3325a1e02a6f7c4a12c0a79f633b3bb04bdda94de0e9da0d615a1df05bd8829c75825ed98d361d4f3e882b5cdb9cfee04ef10e69
 EBUILD gcc-5.5.0.ebuild 1285 BLAKE2B e0a5bcb01c51b656d4e6f11a8b4894de0de79da2aea5d9e17ea6ce619010244e68e2689923f65fb23553d912aa57f6d55d95688b5b22d4f5c4f1fb878aba4c61 SHA512 8ef8082806d79fb0786c65eb691838cd9735811ed54ed75c9ddc62968bbe5253ca7b6c6dd00bae32608ab076c52e5cd54522076745e6e1e24298b755f1ef5d1f
 EBUILD gcc-6.4.0-r1.ebuild 525 BLAKE2B 4ef6e95caec3cd198f9eac05585a691ea6babeca2278e92b6092dc9c19a8708a4abc1ddb7af687f862b8e47cb4ed4380589a76499e45df5cab03d4b6b2620dd3 SHA512 191f06a355369bb2ad9eff92299d9d4c5c78edf7bd11d27d791fd1c8f438829ef3b0ced2478e126c9470ea198f3ccd20d2ca52e216952130788892c280c213e6
 EBUILD gcc-6.4.0-r5.ebuild 532 BLAKE2B fe0a860235c627ca870340098884f2aa14dc891d00dcdbc5afd81ef2db55a9006d63924b00457fe53e89b81abda549a08aa2b05a665ee2c3f256ba4d7af603f0 SHA512 da5b64937c62801ee0358fa2a6cd8e2b18baf2dd914b8fff644f03e1f6a31b2f788ba1a5633301c2500deefa29ba6f7cce6252ef98bceee20262f4c284213ff8
+EBUILD gcc-6.5.0-r1.ebuild 471 BLAKE2B 3494816c2909a3699c48a0d863d8422f3bf1b59726ec3427b82da6d39e86e8e4ed18a9e4d3de375d5d3b76a309ceb2033fb6c5b6d17bcf2beda63859858d6b12 SHA512 105ea7354c918d164f869976ac41f3cf98948531ccbfac8053738aa96bab80c7869a3aa8ae8a882dd374c9c70936d46c75d0f6a1011c85a73d2412d55e741be5
 EBUILD gcc-6.5.0.ebuild 513 BLAKE2B a42e3ef78dde5716bd0be10696c870d207ade9506d14dc9fbcc2a59eecf71c3d6752776274cecbeffd2de8ac2013ffddb05186d3e8ffcc6c21ee9a493b3b3fe3 SHA512 55772ef578222e3eff2e512de7b01643724d80090056de9955f0e2aeae505c4c8d573ce5295d70e236b41217b7e7f3d836fffd246804009b177659dea35edc9f
 EBUILD gcc-7.3.0-r3.ebuild 534 BLAKE2B 6cf318ef9641c52f34955d7937f4e49b81e033f0b40de377b2e3bf5bf2d9c722de9863d446c7553201be3f224be221f428ff1941da37ca1fd0e08d47ea86df23 SHA512 a9bf223ca8ebf6acbd501b34373d6cdb17dace9bab8bb0efee948f75be11bbe67db3f388c64320932e001d18ec701ee88a68ad36c5df1ec29c2434f40f5cd4ad
 EBUILD gcc-7.3.0-r6.ebuild 544 BLAKE2B 9860dcad0dd77fc2e54311497031f8547f2d91dedf97a2f712967b9170f01127903d625bf7085a43ec09aa2f813a917cd4ec9f94122db09fd4c02dd803d9df46 SHA512 7a3ba4a4f4a41480b04c499b86214f390d0df4dfac3e20abaf087e465a631b846fe303ee0db80d000e1f79a16bdf1722ee0e29055b311d8ba8a6c4b17c4fdc02
 EBUILD gcc-7.4.0-r1.ebuild 484 BLAKE2B 3faffdf7e34e7f037dc161b503c0e3a4ed1b4d9f3d66dd7b378192f2b7665f0f9137e2fbbdb850144012d18ae6d3450d78cf360740151fb06b49cd7c70637136 SHA512 4fc2e4c35d72d55b10df0a5cd1fdeee7b1766490a5121ea4ddd7c478fce470df30141dff9e0cc8c2a10260201a1e1b205cd42ebc0f8ea1e512928bbf38d8e32c
+EBUILD gcc-7.4.0-r2.ebuild 484 BLAKE2B 65279057f5d1da1795fb45cea429ff3d0c57c9b439d70ffa670788064dd357cc1afb2c3f432bf14ddaac4771463aec950993101c44482deed617b22ef102bdcb SHA512 6ec070e980d11720284e890d97ff172e57237c606816340f386aef515e616698ff7c49960659aca83e8f48b26fe015bfdfaf57addf9db85a8ed1efd51b9204f8
 EBUILD gcc-7.4.0.ebuild 526 BLAKE2B 77e8278a26c53204e43178fb3f6b7eb58eebe9967dafe593b8c83cc200dfb742cd01ab0e79664c2b50a68dd1ad8a39c773e098cfc08d643d809aa5d4d519c7b0 SHA512 54b3f0635948779bd04e1ec1fbcbf794fc27255cdf77cfbf9876c104af06a5a8a6610f681e0966dcab73f13c107f74550495320b3911cb83c2b8eb13834fecbf
 EBUILD gcc-8.2.0-r5.ebuild 491 BLAKE2B 302b288193a8cf89d93a53e9012e7686111e5195d2015b219adab5b302245d773519ca0c3193235d0b85974e7237b22beba4d43431e46c9b6e554dcadf816198 SHA512 8270e48c6287c4674318ff5aace71bfcf79dd1e96e7be381d6e87f2c97d42440610d9351403fc7ba30733581919cd992a42fba208991970ad1fcec305f7873a3
 EBUILD gcc-8.2.0-r6.ebuild 573 BLAKE2B 812f00996ac141562556ec5f38a90d56fc208ab3a6ae19244dc2df90895fdd91568e261c1803ff9fd9fcba564b23068c41bdd40efa0b14fd7526b077663b3ff6 SHA512 27e4fb20f91ab261560a70190ab0127bb214afc776d9b168cdb32482b6d443afec1a6c479cc40ebdffd7753ba14ff66383cce6307ec0cdbef3ef30c1c7234bc5
-EBUILD gcc-8.3.0-r1.ebuild 617 BLAKE2B 9a7e8067a3b0482ba3c3f414e1d8026508a1962cdaa9b9c68089f21e360ee63194930a271edd28168a6657f33882c8a0d5eeaae506f98052c0f04338e82cac9f SHA512 2953855814d6f971e6c99626ba69f677a5e40f606004516466dcc37b6c87a154d7acb08fc3ab3cf7e5fe57f51d897c3eb1b40ce69b77a5f7d7901bad659181ee
+EBUILD gcc-8.3.0-r1.ebuild 612 BLAKE2B e657d2df46cc226b0dd46745ecf19891206233262dbbd86aef998db45af5231d62263fcc12a296207d87b0ac7b7f4fb6b5772170399c6a9b4f5f7203a3b6a8b6 SHA512 b5eae4d9dbb0b92c3c6eba3835fac932d719b5213dc5005030450d5edf1dc699750edba9f37aeac8a90522421be346937aa67515555943ff355a4d96b321ad5b
 EBUILD gcc-8.3.0.ebuild 473 BLAKE2B 0a75d6ecd08d361384ad5d351efef2f848ee0449826b6bb71405f65254beba62d86c3523ffc9fc7bfab7070781bc0fe106014c6fdc29eb15c7a7f78ac68e233a SHA512 98f7c39cb541ce430859e22298225ef9a2fd221c067ce93b736db56e144e699a3b2e85d99187ef9ffeb5fca9fc1ba33737c875adac2dfd098e20f1577d55ccbe
-EBUILD gcc-9.1.0.ebuild 473 BLAKE2B 6287b963dedc159bcd43075e4c33bd58e2e1f74963d4ca451a479691e48d75ec14ab545cffd941306cae2662469aaa8277a31179eac0c4865d6457904063be44 SHA512 3f853ab2c9e3df5178b8f7d43b9dc0294b73e99660f5e1d50b00dbf3e834e08ca8b34e0030b0f471385012f2c8d2d6c3d034f4126f4868d6d131bc1548c347be
+EBUILD gcc-9.1.0-r1.ebuild 480 BLAKE2B a210acbb56bd1a1bc7edaf3a1b844ce9eba81b19dfb25f737c84bffb7b3f2a4ac018d45eb8add9c6c3e55379d440527d82dbd5fb2928399a9237b9bdf29649ce SHA512 85b82f7e77261559c40550d0fd5353098145e6429654c2e23622bffee0d144c096ff9b8932b224c16f391bbf140990c11e9163b8070b5bb719ab94ed6a5ad2b2
+EBUILD gcc-9.1.0.ebuild 569 BLAKE2B 37c81c52350c6d4ef28242aec8f0d35a71b69fa71cb0971e2ca8f9e6de61f4db2a56298fb26c21e7e3cfd7ab02aa37b05003a18e6f1362596fd7605e4d22dceb SHA512 5b4102d53b6dcf0c526686bc399bd345f6eb465e3bfc5e7e373fe91bc74739d71a71ac564a8077e2b3f266cb43663a5c39135c9b4174706b14be3f05d8ea953f
 MISC metadata.xml 2802 BLAKE2B 3408fc148189c7e7d19f3608acac185a1cb6bbb4132a667d8a6ebadacecf904d575002ec4c2a76bf72b998a908c24cd15c24b10db4232ff33df16336e8c10597 SHA512 219c1ddacf0599bdc5e148ad2f586d182bca46f734c14492551d2fb067ad1fca516552cfa0f2547d297e81c4447e9b0b182a59656e07f66282d6569d2cfc3a77
diff --git a/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch b/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch
new file mode 100644
index 000000000000..ad0128a0a18b
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch
@@ -0,0 +1,53 @@
+Autogenerated patch disabling the 32bit RISCV support
+See https://gcc.gnu.org/PR90419
+
+diff -ruN gcc-9.1.0.orig/gcc/config/riscv/t-linux-multilib gcc-9.1.0/gcc/config/riscv/t-linux-multilib
+--- gcc-9.1.0.orig/gcc/config/riscv/t-linux-multilib	2017-02-06 22:38:37.000000000 +0100
++++ gcc-9.1.0/gcc/config/riscv/t-linux-multilib	2019-05-18 23:04:54.849400774 +0200
+@@ -1,40 +1,18 @@
+ # This file was generated by multilib-generator with the command:
+-#  ./multilib-generator rv32imac-ilp32-rv32ima,rv32imaf,rv32imafd,rv32imafc,rv32imafdc- rv32imafdc-ilp32d-rv32imafd- rv64imac-lp64-rv64ima,rv64imaf,rv64imafd,rv64imafc,rv64imafdc- rv64imafdc-lp64d-rv64imafd-
+-MULTILIB_OPTIONS = march=rv32imac/march=rv32ima/march=rv32imaf/march=rv32imafd/march=rv32imafc/march=rv32imafdc/march=rv32g/march=rv32gc/march=rv64imac/march=rv64ima/march=rv64imaf/march=rv64imafd/march=rv64imafc/march=rv64imafdc/march=rv64g/march=rv64gc mabi=ilp32/mabi=ilp32d/mabi=lp64/mabi=lp64d
+-MULTILIB_DIRNAMES = rv32imac \
+-rv32ima \
+-rv32imaf \
+-rv32imafd \
+-rv32imafc \
+-rv32imafdc \
+-rv32g \
+-rv32gc \
+-rv64imac \
++#  ./multilib-generator rv64imac-lp64-rv64ima,rv64imaf,rv64imafd,rv64imafc,rv64imafdc- rv64imafdc-lp64d-rv64imafd-
++MULTILIB_OPTIONS = march=rv64imac/march=rv64ima/march=rv64imaf/march=rv64imafd/march=rv64imafc/march=rv64imafdc/march=rv64g/march=rv64gc mabi=lp64/mabi=lp64d
++MULTILIB_DIRNAMES = rv64imac \
+ rv64ima \
+ rv64imaf \
+ rv64imafd \
+ rv64imafc \
+ rv64imafdc \
+ rv64g \
+-rv64gc ilp32 \
+-ilp32d \
+-lp64 \
++rv64gc lp64 \
+ lp64d
+-MULTILIB_REQUIRED = march=rv32imac/mabi=ilp32 \
+-march=rv32imafdc/mabi=ilp32d \
+-march=rv64imac/mabi=lp64 \
++MULTILIB_REQUIRED = march=rv64imac/mabi=lp64 \
+ march=rv64imafdc/mabi=lp64d
+-MULTILIB_REUSE = march.rv32imac/mabi.ilp32=march.rv32ima/mabi.ilp32 \
+-march.rv32imac/mabi.ilp32=march.rv32imaf/mabi.ilp32 \
+-march.rv32imac/mabi.ilp32=march.rv32imafd/mabi.ilp32 \
+-march.rv32imac/mabi.ilp32=march.rv32imafc/mabi.ilp32 \
+-march.rv32imac/mabi.ilp32=march.rv32imafdc/mabi.ilp32 \
+-march.rv32imac/mabi.ilp32=march.rv32g/mabi.ilp32 \
+-march.rv32imac/mabi.ilp32=march.rv32gc/mabi.ilp32 \
+-march.rv32imafdc/mabi.ilp32d=march.rv32imafd/mabi.ilp32d \
+-march.rv32imafdc/mabi.ilp32d=march.rv32gc/mabi.ilp32d \
+-march.rv32imafdc/mabi.ilp32d=march.rv32g/mabi.ilp32d \
+-march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \
++MULTILIB_REUSE = march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \
+ march.rv64imac/mabi.lp64=march.rv64imaf/mabi.lp64 \
+ march.rv64imac/mabi.lp64=march.rv64imafd/mabi.lp64 \
+ march.rv64imac/mabi.lp64=march.rv64imafc/mabi.lp64 \
diff --git a/sys-devel/gcc/gcc-3.3.6-r3.ebuild b/sys-devel/gcc/gcc-3.3.6-r3.ebuild
new file mode 100644
index 000000000000..041188adcc4d
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.3.6-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.11"
+UCLIBC_VER="1.0"
+HTB_VER="1.00-r2"
+
+inherit eutils toolchain
+
+# ia64 - broken static handling; USE=static emerge busybox
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
+# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
+# well tested in gentoo on any arch other than amd64!!
+RDEPEND=">=sys-devel/binutils-2.14.90.0.6-r1"
+DEPEND="${RDEPEND}
+	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	if [[ -n ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] ; then
+		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/os/uclibc "${S}"/libstdc++-v3/config/os/ || die
+		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/locale/uclibc "${S}"/libstdc++-v3/config/locale/ || die
+	fi
+
+	# Anything useful and objc will require libffi. Seriously. Lets just force
+	# libffi to install with USE="objc", even though it normally only installs
+	# if you attempt to build gcj.
+	if use objc && ! use gcj ; then
+		epatch "${FILESDIR}"/3.3.4/libffi-without-libgcj.patch
+		#epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
+	fi
+}
diff --git a/sys-devel/gcc/gcc-3.4.6-r3.ebuild b/sys-devel/gcc/gcc-3.4.6-r3.ebuild
new file mode 100644
index 000000000000..abb03a923180
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.4.6-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.9"
+UCLIBC_VER="1.1"
+UCLIBC_GCC_VER="3.4.5"
+HTB_VER="1.00.1"
+HTB_GCC_VER="3.4.4"
+D_VER="0.24"
+
+inherit eutils toolchain
+
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
+# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
+# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
+# well tested in gentoo on any arch other than amd64!!
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/binutils-2.14.90.0.8-r1
+	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	# Anything useful and objc will require libffi. Seriously. Lets just force
+	# libffi to install with USE="objc", even though it normally only installs
+	# if you attempt to build gcj.
+	if use objc && ! use gcj ; then
+		epatch "${FILESDIR}"/3.4.3/libffi-without-libgcj.patch
+		#epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
+	fi
+
+	# Fix cross-compiling
+	epatch "${FILESDIR}"/3.4.4/gcc-3.4.4-cross-compile.patch
+
+	# Arch stuff
+	case $(tc-arch) in
+		amd64)
+			if is_multilib ; then
+				sed -i -e '/GLIBCXX_IS_NATIVE=/s:false:true:' libstdc++-v3/configure || die
+			fi
+			;;
+	esac
+}
diff --git a/sys-devel/gcc/gcc-4.0.4-r2.ebuild b/sys-devel/gcc/gcc-4.0.4-r2.ebuild
new file mode 100644
index 000000000000..e5a34bf356ad
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.0.4-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.5"
+UCLIBC_VER="1.0"
+
+inherit toolchain
+
+KEYWORDS=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=${CATEGORY}/binutils-2.15.94"
diff --git a/sys-devel/gcc/gcc-4.1.2-r2.ebuild b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
new file mode 100644
index 000000000000..d85b6868f570
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.8"
+UCLIBC_VER="1.0"
+D_VER="0.24"
+
+inherit eutils toolchain
+
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	ppc? ( >=${CATEGORY}/binutils-2.17 )
+	ppc64? ( >=${CATEGORY}/binutils-2.17 )
+	>=${CATEGORY}/binutils-2.15.94"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	use vanilla && return 0
+
+	# Fix cross-compiling
+	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
+
+	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch
+}
diff --git a/sys-devel/gcc/gcc-4.2.4-r3.ebuild b/sys-devel/gcc/gcc-4.2.4-r3.ebuild
new file mode 100644
index 000000000000..15529ecc8370
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.2.4-r3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.6"
+UCLIBC_VER="1.0"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	ppc? ( >=${CATEGORY}/binutils-2.17 )
+	ppc64? ( >=${CATEGORY}/binutils-2.17 )
+	>=${CATEGORY}/binutils-2.15.94"
diff --git a/sys-devel/gcc/gcc-4.3.6-r3.ebuild b/sys-devel/gcc/gcc-4.3.6-r3.ebuild
new file mode 100644
index 000000000000..637aa208400d
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.3.6-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.4"
+UCLIBC_VER="1.0"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	ppc? ( >=${CATEGORY}/binutils-2.17 )
+	ppc64? ( >=${CATEGORY}/binutils-2.17 )
+	>=${CATEGORY}/binutils-2.15.94"
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+fi
+
+src_prepare() {
+	toolchain_src_prepare
+
+	use vanilla && return 0
+
+	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
+}
diff --git a/sys-devel/gcc/gcc-4.4.7-r2.ebuild b/sys-devel/gcc/gcc-4.4.7-r2.ebuild
new file mode 100644
index 000000000000..7fde120f47b9
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.4.7-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.5"
+UCLIBC_VER="1.0"
+
+inherit eutils toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
+	ppc? ( >=${CATEGORY}/binutils-2.17 )
+	ppc64? ( >=${CATEGORY}/binutils-2.17 )
+	>=${CATEGORY}/binutils-2.15.94"
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+fi
+
+src_prepare() {
+	toolchain_src_prepare
+	use vanilla && return 0
+
+	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
+}
diff --git a/sys-devel/gcc/gcc-4.5.4-r2.ebuild b/sys-devel/gcc/gcc-4.5.4-r2.ebuild
new file mode 100644
index 000000000000..1102974a8408
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.5.4-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.5"
+UCLIBC_VER="1.0"
+
+inherit eutils toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
+	ppc? ( >=${CATEGORY}/binutils-2.17 )
+	ppc64? ( >=${CATEGORY}/binutils-2.17 )
+	>=${CATEGORY}/binutils-2.15.94"
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+fi
+
+src_prepare() {
+	toolchain_src_prepare
+
+	use vanilla && return 0
+
+	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
+}
diff --git a/sys-devel/gcc/gcc-4.6.4-r2.ebuild b/sys-devel/gcc/gcc-4.6.4-r2.ebuild
new file mode 100644
index 000000000000..99f7924a0ced
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.6.4-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.5"
+UCLIBC_VER="1.0"
+
+inherit eutils toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
+	>=${CATEGORY}/binutils-2.18"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+fi
+
+src_prepare() {
+	if has_version '<sys-libs/glibc-2.12' ; then
+		ewarn "Your host glibc is too old; disabling automatic fortify."
+		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
+		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-4.7.4-r3.ebuild b/sys-devel/gcc/gcc-4.7.4-r3.ebuild
new file mode 100644
index 000000000000..8aad0d383265
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.7.4-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.6"
+UCLIBC_VER="1.0"
+
+# Hardened gcc 4 stuff
+PIE_VER="0.5.5"
+SPECS_VER="0.2.0"
+SPECS_GCC_VER="4.4.3"
+# arch/libc configurations known to be stable with {PIE,SSP}-by-default
+PIE_GLIBC_STABLE="x86 amd64 ppc ppc64 arm ia64"
+PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64"
+SSP_STABLE="amd64 x86 ppc ppc64 arm"
+# uclibc need tls and nptl support for SSP support
+# uclibc need to be >= 0.9.33
+SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
+#end Hardened stuff
+
+inherit eutils toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
+	>=${CATEGORY}/binutils-2.18"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+fi
+
+src_prepare() {
+	if has_version '<sys-libs/glibc-2.12' ; then
+		ewarn "Your host glibc is too old; disabling automatic fortify."
+		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
+		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
+	fi
+
+	toolchain_src_prepare
+
+	use vanilla && return 0
+
+	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
+}
diff --git a/sys-devel/gcc/gcc-4.8.5-r3.ebuild b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
new file mode 100644
index 000000000000..006faad08faf
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.5"
+UCLIBC_VER="1.0"
+
+# Hardened gcc 4 stuff
+PIE_VER="0.6.2"
+SPECS_VER="0.2.0"
+SPECS_GCC_VER="4.4.3"
+# arch/libc configurations known to be stable with {PIE,SSP}-by-default
+PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
+PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
+SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
+# uclibc need tls and nptl support for SSP support
+# uclibc need to be >= 0.9.33
+SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
+#end Hardened stuff
+
+inherit eutils toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+fi
+
+src_prepare() {
+	if has_version '<sys-libs/glibc-2.12' ; then
+		ewarn "Your host glibc is too old; disabling automatic fortify."
+		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
+		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
+	fi
+
+	toolchain_src_prepare
+
+	use vanilla && return 0
+	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
+	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
+}
diff --git a/sys-devel/gcc/gcc-4.9.4-r1.ebuild b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
new file mode 100644
index 000000000000..b935459e81c2
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.4"
+UCLIBC_VER="1.0"
+
+# Hardened gcc 4 stuff
+PIE_VER="0.6.4"
+SPECS_VER="0.2.0"
+SPECS_GCC_VER="4.4.3"
+# arch/libc configurations known to be stable with {PIE,SSP}-by-default
+PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
+PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
+SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
+# uclibc need tls and nptl support for SSP support
+# uclibc need to be >= 0.9.33
+SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
+#end Hardened stuff
+
+inherit eutils toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+fi
+
+src_prepare() {
+	if has_version '<sys-libs/glibc-2.12' ; then
+		ewarn "Your host glibc is too old; disabling automatic fortify."
+		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
+		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
+	fi
+
+	# Bug 638056
+	epatch "${FILESDIR}/${P}-bootstrap.patch"
+
+	toolchain_src_prepare
+
+	use vanilla && return 0
+	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
+	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
+}
diff --git a/sys-devel/gcc/gcc-6.5.0-r1.ebuild b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..6c3f9ee42106
--- /dev/null
+++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="2"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/gcc/gcc-7.4.0-r2.ebuild b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
new file mode 100644
index 000000000000..9f0be86c0d6c
--- /dev/null
+++ b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.3"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+
+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
diff --git a/sys-devel/gcc/gcc-8.3.0-r1.ebuild b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
index 3ebb8e422ae0..6edc590338dd 100644
--- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.1"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.1.0-r1.ebuild b/sys-devel/gcc/gcc-9.1.0-r1.ebuild
new file mode 100644
index 000000000000..73c93d32ff1b
--- /dev/null
+++ b/sys-devel/gcc/gcc-9.1.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PATCH_VER="1.1"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+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
diff --git a/sys-devel/gcc/gcc-9.1.0.ebuild b/sys-devel/gcc/gcc-9.1.0.ebuild
index fd3f2fb8c720..16bdf7beda9d 100644
--- a/sys-devel/gcc/gcc-9.1.0.ebuild
+++ b/sys-devel/gcc/gcc-9.1.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -17,3 +17,8 @@ DEPEND="${RDEPEND}
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 fi
+
+src_prepare() {
+	toolchain_src_prepare
+	eapply "${FILESDIR}"/gcc-9.1.0-norisc32.patch
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 90b3202df468..954ee2b692b9 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,9 +1,7 @@
-DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
-EBUILD llvm-common-4.0.1.ebuild 641 BLAKE2B a8543b8d909c48caecbcc423f15742aa56412971320650a87742cf907b0d0d3d143e7caa54b947b592380b40d340bd1957c8df05053f6cc6f932332ce5e71eb7 SHA512 b497a3c7edd56bb634e307a8ad9acecb6f21f2f262ab5f50ee6c9b2bd4c40f0defd8df61ad6f0b0c74222468388cb18d3634e0a0d1662ed4c74d5c2e3db30188
 EBUILD llvm-common-5.0.2.ebuild 839 BLAKE2B d7e6aaba7df7b7da6da5f7cc9cc165b8921758d8969f498f289c5797facfb383c7299617655d8228641e53d02a782a48b22b9c08ea9c3e8e6bc33a842fa24567 SHA512 6647d800604efe1eae94a55a632075d491c11c128bbb7a0903a6b3a93a49f071d74049b98fc4f765d5c7dae9e52de772f127d158e397e9160ef80b3b7dd09595
 EBUILD llvm-common-6.0.1.ebuild 838 BLAKE2B 7c30c7e7e52916af34728e11cc6e00e6add5363974affd53e7940bcbacfb3b7a73bd17d86b29b10684535ced07c0237909473c4500e2439d5824b4cbcf924d7e SHA512 d642ce674d3a0a742e5afaeb97a5e67e5a616ddd18642777dc640c44fc65c9f5d34c5e1398483c062152e87c9ab076b5518ad3ab5d39df9d1ce1331eb2784464
 EBUILD llvm-common-7.1.0.ebuild 836 BLAKE2B beeaf332c2a944717b2ed4da06ebac13b00be2f0d364e42767353e8ff42dc49d865bcca42e3d8e27cb40f646511a4365a40e48a005ce5a24263bee1fb4c64fa2 SHA512 7244cce9613cd89f2221bfeee1e6abf1256f7f206127b2098ed6a0d3f966d84b4781207f25cf6b1b50a402beeb70010be53b0f9d27c37250997a243a49a8d789
diff --git a/sys-devel/llvm-common/llvm-common-4.0.1.ebuild b/sys-devel/llvm-common/llvm-common-4.0.1.ebuild
deleted file mode 100644
index b21e9ae4c175..000000000000
--- a/sys-devel/llvm-common/llvm-common-4.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-S=${WORKDIR}/llvm-${PV/_/}.src
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/
-	# some users may find it useful
-	newdoc utils/vim/README README.vim
-	dodoc utils/vim/vimrc
-}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 9dc8d29a43d5..3f60c78cce23 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,4 +1,3 @@
-AUX 4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch 2408 BLAKE2B 92f396663629d0f1bc65833d4050f8e28044c25dec961981edac768b374c543d9084eb70ac51435554acfc5430c45035e4acae6e02f453bc679a3458979b53f3 SHA512 0424f35f12054a7e3e20d948c714979cfcf01200e8aac1cfab1b9fdd08718b4f4143a635eca9500e7ac77993ff390358cb630b8d97029cd9ec1e14c9cfaedfd2
 AUX 5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch 1299 BLAKE2B 486ead622d4885f9e218a6fb44496ace574950e9946455050ffdde7bfac56c0893a5dc62fa6ffe6e8e18cdd706073454f8e1f2bc75a8ad98cf5246449ffe4df2 SHA512 3e17e72508242172c59547eaa2a8238bd145cfb888d4323818a943f075645b9bc5a272656e39f37d9f7997a16491b6a3a3b5c51101465369d8570a0d078cd335
 AUX 6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch 1575 BLAKE2B 3a650b244c2b97fa6e76327348a7bb00ace08b18441a59af238ccf0cdea4409e2d0b46c0a381737d7d0879dbc5eb0f71007fee0c9f0f5b92369453223d25397d SHA512 f09bf2b2bbac1f875f32f8761697717fbbfda2939fcccb8b03ecb8e4e65377c875355a3523d54f81c53d11bfaf3557f80000918bea003cfdba0662469283563a
 AUX 6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch 13865 BLAKE2B 03f677e386115c3c7333db39664f75b2b4c22e18c2e487e515dc2a55acaa1bf569d2945ae620420b4b4323fb2e4fb7d3c3313dcc7e648942afa25d055d36efc7 SHA512 2820793ef29f08b55b7d94ef700085dce02c6a029c5877a77c5296e9a05dfc9946d10ee66d2d3d8a150cd511e3346d2acf259b873aeed25c1b0aaefebe95790d
@@ -7,7 +6,6 @@ AUX 7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 2626 B
 AUX 8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch 1452 BLAKE2B d8b9b34b077bf33fd0fc6fb50937f5e9a8b90730fee3b6c08b5e0659fd37092ad073580ded506fbeba4fa3503f0ea6104d7adefa41f7eeef9a17a3189ba1212b SHA512 fa2aa9bde1b153f42037bb864b1a4dce0288f567c6a116a4005e45ca322808041562c2d2cecca5e3d84e44bf73bed600a05dfda85107c164415912ef60141dab
 AUX 9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 1188 BLAKE2B 72311a8da991b9f3b98523baefe6f5b31aa7f9101c388f35484dd5f384a08e838ea42a17447ca17a0dfe6b7d3c20abbdf0e8afee72e8ad5d46ec38b8d55307c8 SHA512 0ada997db2a0eb875105fb212dc3fc3077b9c4f7804d78c33c4b1f512bf1267295f325153ae14c00404c86e576ae1c78a6aeb0a57d1d4525aabd1169c21806ef
 AUX 9999/musl-fixes.patch 1258 BLAKE2B fe275412bc908884239ea71de9a9ddf1d2f64debaa1a9ada18170195a7775c41571600ed3666343bf967aff5f9117900f73155f60de5077bc4584cfc2f782f53 SHA512 314dcbe846a66312c9f1634f4ff3f4670b3db1d3210bb550f1d3877a423333ba042da2e90c8736918a36be4d4faf58dab8d3236d4f26df5af7f7f019b0e0ec8f
-DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.1-patchset.tar.bz2 4204 BLAKE2B e7282e84578631d88549bdf34e5a44e0294e47ef1fee29c0cb954d7afd160d4b6a0f39bb3bd53791ea53503a60eaa0ada0a512a63d696ff096dc6f21f4aecdc7 SHA512 395ea2b13008e222c034e2bdd8c2bb033b9c01e61fb89c840f009f6cddb499b317df8b061d29f40968d8f0df5540a2f4a9de31eef1de886796c8c334f37254eb
 DIST llvm-5.0.2-manpages.tar.bz2 93977 BLAKE2B 8c5e8899e0df9d6037fb7d5c373de6492ccdc9fd2c26cc7dfbd8fb2b9e68418ca8fdf42cdc303c361e649cc6939bf5229cbad017bdccbd5d791e92752328252f SHA512 568615bce5a75d42e4b6d592557472d366d49a99f8e81be10ae679804f1fe674c7fd0bbdac09af44fc67ee5aa34c4ed2153c2767c536ac8e45dd15c811c92dcb
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
@@ -17,8 +15,6 @@ DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0-manpages.tar.bz2 140542 BLAKE2B e6c58865ace0b8848ffe825e931a639daa5b22099317b3263acf8df4b8d5e1e97ed54a85b9241e6874b112c67114bda5617c3014c3bc1430c179bdf389e77269 SHA512 198f5bde8c610aa7953b325fc29c2bebe5c3d81469af6273975ed32cd739a9936813fca7399acc49809c322cf73fbdaa77a834f889bd78fe4672024965ea47fb
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
-DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415
-EBUILD llvm-4.0.1-r1.ebuild 7050 BLAKE2B 8db3abfa3d521334feac49f923820fe9d2c5dd1d7b2d80d0f0b1815773746009b252dc15ebbad93dea4fcae2a405dfd0eb0ecedd913c78974a7a1b4cd1888500 SHA512 1257f7288c541fba786efc613e12c3f26ca05b6cf221e790d9ee5cc13d680aaf85ba39bd423f897558baaae4966a0f43386483358bc602e4cec3957d41925e84
 EBUILD llvm-5.0.2.ebuild 7860 BLAKE2B 1284c462ae0aff0d04246ae0eedcd024e7751a6f9cb2985137da2396d5440aa9540e33df6952b3f8fa650c00beaaa15f0f8fc869ebf81d7f44cd8baf59a0bf71 SHA512 a491a60e20b93e9641c16cfcee885e413a9aa1c5f8e415eed206729be5e216e67671a9a2ab941f7c1bbc04c5b80481e7546765fa010ed10e2f6bead9f04439e7
 EBUILD llvm-6.0.1-r2.ebuild 8229 BLAKE2B aa3e5f6627a62101fe1413440af453fb388abe3fffbcb5586365c373d8ff644b72d952782a0885b9da44cba1d90e2655e464df71ccfb017f2701276e6ea4990a SHA512 479b220c3ff5382e338dc6a587ae095010ca9bc7e6ed4a6706996e93145114c0ad0e51b836c5e4cfbe4bc1b2dc8715a2e4e3b68fdf7d1792f7c36113adaff79d
 EBUILD llvm-6.0.1.ebuild 7885 BLAKE2B 2cf239c7d2d57c770b7c5a5dc410310463a7ec8070c7a64111c2198dad583997c6d00bfd3b839900454c188731dbc256680b42ba5378786768c9f2d25fcc75af SHA512 25951305382f8e3a22f36ace407e4c33607acfc7b34afcee0ba2a1cfcf97171e615fb18702508a4fb2ebbf53b63d5fc1cde72a9b3ee3b77191585e767e67e364
diff --git a/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch b/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
deleted file mode 100644
index b857136498b0..000000000000
--- a/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 937b23b5fffa59deb1dc342cc5602d387d84a762 Mon Sep 17 00:00:00 2001
-From: Michal Gorny <mgorny@gentoo.org>
-Date: Mon, 27 Nov 2017 22:23:09 +0000
-Subject: [PATCH] [cmake] Pass -Wl,-z,nodelete on Linux to prevent unloading
-
-Prevent unloading shared libraries on Linux when dlclose() is called.
-This is necessary since command-line option parsing API relies on
-registering the global option instances in the option parser instance
-which can be loaded in a different shared library.
-
-Given that we can't reliably remove those options when a library is
-unloaded, the parser ends up containing dangling references. Since glibc
-has relatively complex library unloading rules, some of the LLVM
-libraries can be unloaded while others (including the Support library)
-stay loaded causing quite a mayhem. To reliably prevent that, just
-forbid unloading all libraries -- it's a very bad idea anyway.
-
-While the issue arguably happens only with BUILD_SHARED_LIBS, it may
-affect any library reusing llvm::cl interface.
-
-Based on patch provided Ross Hayward on https://bugs.gentoo.org/617154.
-Previously hit by Fedora back in Feb 2016:
-https://lists.freedesktop.org/archives/mesa-dev/2016-February/107242.html
-
-Differential Revision: https://reviews.llvm.org/D40459
-
-git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319105 91177308-0d34-0410-b5e6-96231b3b80d8
----
- cmake/modules/HandleLLVMOptions.cmake           | 8 ++++++++
- unittests/Support/DynamicLibrary/CMakeLists.txt | 7 +++++++
- 2 files changed, 15 insertions(+)
-
- 4.0.1 backport: removed the unittest part
-
-diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
-index c5390371845..b5059a8a60e 100644
---- a/cmake/modules/HandleLLVMOptions.cmake
-+++ b/cmake/modules/HandleLLVMOptions.cmake
-@@ -151,6 +151,14 @@ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR
-   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
- endif()
- 
-+# Pass -Wl,-z,nodelete. This makes sure our shared libraries are not unloaded
-+# by dlclose(). We need that since the CLI API relies on cross-references
-+# between global objects which became horribly broken when one of the libraries
-+# is unloaded.
-+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,nodelete")
-+endif()
-+
- 
- function(append value)
-   foreach(variable ${ARGN})
--- 
-2.15.1
-
diff --git a/sys-devel/llvm/llvm-4.0.1-r1.ebuild b/sys-devel/llvm/llvm-4.0.1-r1.ebuild
deleted file mode 100644
index 83f6f64dba2f..000000000000
--- a/sys-devel/llvm/llvm-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils flag-o-matic multilib-minimal pax-utils \
-	python-any-r1 toolchain-funcs versionator
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
-	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-${PV}.tar.bz2 )"
-
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. ARM backend: LLVM Software Grant by ARM.
-# 3. MD5 code: public-domain.
-# 4. Tests (not installed):
-#  a. gtest: BSD.
-#  b. YAML tests: MIT.
-
-LICENSE="UoI-NCSA rc BSD public-domain
-	llvm_targets_ARM? ( LLVM-Grant )"
-SLOT="$(get_major_version)"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="debug doc gold libedit +libffi ncurses test
-	elibc_musl kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND="
-	sys-libs/zlib:0=
-	gold? (
-		|| (
-			>=sys-devel/binutils-2.31.1-r4:*[plugins]
-			<sys-devel/binutils-2.31.1-r4:*[cxx]
-		)
-	)
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	kernel_Darwin? ( <sys-libs/libcxx-$(get_version_component_range 1-3).9999 )
-	doc? ( dev-python/sphinx )
-	gold? ( sys-libs/binutils-libs )
-	libffi? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${PYTHON_DEPS}"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="${RDEPEND}
-	!sys-devel/llvm:0"
-PDEPEND="sys-devel/llvm-common
-	gold? ( >=sys-devel/llvmgold-${SLOT} )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# Fix llvm-config for shared linking and sane flags
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
-
-	# Backport the fix for dlclose() causing option parser mess
-	# e.g. https://bugs.gentoo.org/617154
-	eapply "${FILESDIR}"/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
-
-	# gcc-8 build failure
-	eapply "${FILESDIR}"/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch
-
-	# Remove failing test (fixed in newer versions)
-	rm test/tools/llvm-symbolizer/print_context.c || die
-
-	# support building llvm against musl-libc
-	use elibc_musl && eapply "${FILESDIR}"/9999/musl-fixes.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# User patches + QA
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DWITH_POLLY=OFF # TODO
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-#	Note: go bindings have no CMake rules at the moment
-#	but let's kill the check in case they are introduced
-#	if ! multilib_is_native_abi || ! use go; then
-		mycmakeargs+=(
-			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-		)
-#	fi
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use doc && mycmakeargs+=(
-			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-		use gold && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
-		[[ -x "${tblgen}" ]] \
-			|| die "${tblgen} not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DLLVM_TABLEGEN="${tblgen}"
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${SLOT}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED%/}"/usr/include || die
-	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${SLOT} ))
-	cat <<-_EOF_ > "${T}/10llvm-${revord}" || die
-		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-_EOF_
-	doenvd "${T}/10llvm-${revord}"
-
-	# install pre-generated manpages
-	if ! use doc; then
-		# (doman does not support custom paths)
-		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-		doins "${WORKDIR}/llvm-manpages-${PV}/llvm"/*.1
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-}
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index 2289e526ddf0..0a0f41232e9c 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -1,4 +1,3 @@
-EBUILD llvmgold-4.ebuild 549 BLAKE2B c2ec39d1e230eca1b2759a70d812a012c67b789718c8688b7f1d02c07d0ec867d51c91614b7a650972bce68bbb189754c494c3ca1efd751f1f97515469da9508 SHA512 93d78c2ee37937d595d3d6c9f3524d5e38a53db61e81d4585addbbe97031c369507a477d73e81eb016728afd8654ab70d53c4bd1b075c1a9440b45249d291d91
 EBUILD llvmgold-5.ebuild 562 BLAKE2B 31652a1e9d08a66e2b9cac7557c3e887da039b2a1c6004f60ca76423a97a779b251ef1d5803d47ec968851bf384271abbdb8700df61e036762c029c86729a090 SHA512 70e23a895088483df9fdeb1edd5ebb81deb2b0c053bbf0b0c8e61c6793c3d98ece2b2eea0f60c8e5d9099aaa0de668a6e34bdda8864260781fe31e0eaff3037b
 EBUILD llvmgold-6.ebuild 561 BLAKE2B 791f54efe7fa1c99d9a14d75a5ef023114b8cbb4183261b0b042e5dd5eb28a14657082fb0ac3faefa0f4b44bfa2a5d885dea11450e313ba156925eb074c33239 SHA512 245def4febc63a8f161aaa00caefaab5d9d82d6857c730024f1e1366e8a3c6d4cb48e5d1c5c648b9e8ad127607b7e009f29a3e39e39c574ea23356ffe93b0f9e
 EBUILD llvmgold-7.ebuild 559 BLAKE2B 6ee4938f4413aa93c59730e687512b315b4e4f13da62e172a88164b7f3188ba6899ce80dd082a0db2dd58b66f82a0e5ffd3bd8c612e81ade2b7d9f2cf4012e7f SHA512 cd7adc3ff4ee3a94c59028eb93d2520764d2e61a605a40b2ebe65b27ce0e5c57550ef1683b3b1b533eb31b9f70379da53aff1e124e4a3ce22d56a64e3f2bfcd9
diff --git a/sys-devel/llvmgold/llvmgold-4.ebuild b/sys-devel/llvmgold/llvmgold-4.ebuild
deleted file mode 100644
index 330cb976429a..000000000000
--- a/sys-devel/llvmgold/llvmgold-4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="LLVMgold plugin symlink for autoloading"
-HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="sys-devel/llvm:${PV}[gold]
-	!sys-devel/llvm:0"
-
-S=${WORKDIR}
-
-src_install() {
-	dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
-	dosym "../../../../lib/llvm/${PV}/$(get_libdir)/LLVMgold.so" \
-		"/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
-}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 93b2fb913b24..9c0fb6871a41 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/firmware-imx/Manifest b/sys-firmware/firmware-imx/Manifest
index e5a64601bcea..afe266012b17 100644
--- a/sys-firmware/firmware-imx/Manifest
+++ b/sys-firmware/firmware-imx/Manifest
@@ -1,3 +1,3 @@
 DIST firmware-imx-5.4.bin 429744 BLAKE2B a573f14d2c7cb35a1129bf5b1ebc31126ebb23b4a5d4ba407ddb432148d34f27e94990ca2b8dbe6083905f3504ca3db19966283b33657e2a2b0b5ed4cd8c0c79 SHA512 0c9d6e80a67d15518212573dbfe8addd6c7c5c8065f077bb58f6904c6d288c718d0b3dc4ed4735941d22bc9116a4986fb268327e2c1adcc6523ff84fa93c6b64
-EBUILD firmware-imx-5.4.ebuild 652 BLAKE2B 040d77b31e984dcdc1761eccd4dacbf70d3c1a558e2b3cb0ef61e27363d4578dc827d7b8528e35fef9c9d6d5861584727cb00b4a7056d6633368ee779de20b3d SHA512 49ca76a3820c53fe967026252970c47aa88bcf55df8b419be236a39aaf3dda94ca790a68251ebc9cfbde4a84730fecf0612e017c95215b2e19913b2e1a382925
+EBUILD firmware-imx-5.4.ebuild 650 BLAKE2B 27a44f6539f6fbc0fce83ed7c4591df1672890ee187558c4c34efa6d9e47acad37675d5592675d6dba3b07b74d05e8c407d7d3bb77f0a3d4ff46c560b9fb800d SHA512 48680e7d94dd4e29f0eed4430d91c770e90c59acd6845ff6862b03bcbbeabaf085f879d0ee88b4f689096453ad0b1e36d6b645aa6d92e2e1bb360441af39e906
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/sys-firmware/firmware-imx/firmware-imx-5.4.ebuild b/sys-firmware/firmware-imx/firmware-imx-5.4.ebuild
index ddd2096e89ce..106878d131a0 100644
--- a/sys-firmware/firmware-imx/firmware-imx-5.4.ebuild
+++ b/sys-firmware/firmware-imx/firmware-imx-5.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="NXP i.MX firmware"
-HOMEPAGE="http://www.timesys.com/"
+HOMEPAGE="https://www.timesys.com/"
 SRC_URI="http://repository.timesys.com/buildsources/${PN:0:1}/${PN}/${P}/${P}.bin"
 LICENSE="LA_OPT_BASE_LICENSE"
 SLOT="0"
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index ec52dbfc0e8d..bedbfe2e16ee 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,6 +1,4 @@
-DIST intel-microcode-collection-20190512.tar.xz 5085812 BLAKE2B 4b873be318ea1c1d5157ccf9646ccdaf34caabfbdda51cae92692acce83eacce713e7989b2c00cce46df16c501f7f9863478106fc9ce8912ccfca8103f85c45d SHA512 d0a0d0d82522d07549343ee9817133cd721f953421b945584434d8ebb10f0bd6acdd2b1df3daf5a925d3e0f9ea695a4ae81935699d8d655f58daf4fff8a4bd20
-DIST microcode-20180807a.tgz 1628061 BLAKE2B a6b5a07596a0b1687efb95c207b2194865b2f975cc0d761a687d5b9d8fea63e777eb73373113f356a18592fd53651cf37d044d4e98cdfe6b306393b54ac06129 SHA512 3cd6794a5ce26e86f7b644e523ba978699316046e593da215b73b17c4b43049ac4a81636e2ce3e727d06c2efbac98657764aa3ff355edb429127585bb49a9b10
+DIST intel-microcode-collection-20190525.tar.xz 5079704 BLAKE2B bc46128693eb9c14e9b4cf994c8affc332b236c222bf57df79e4f8aa4398d125734c1b61d9d0559518941642a5cad1345b5f894c6ed729273c3f8b1a54311113 SHA512 5aeb83bd1aaeb1e870447d18f91aa8f155da29dd89c3cec546a8a741c0c9fd21647cc64083dc5ca482562803a8e89c910ed2e18a6f232f3df64ac360002beaf4
 DIST microcode-20190514.tar.gz 2447290 BLAKE2B c137342d6a4e662f1fe746e69c97f02a49c75645def0a74edde9e99eae29b2cea70206b2666e4f38c8439cc661adcdda6b60a352b11791c5bc9913cb19864a41 SHA512 fd5e82708d4a7f08630a2c51a182814cc4c0fbd88fe473e871b9784c03cb87e804a9ed4c2f3e041696aabfdd60996f2d50a175bea90f1644f6f3205a37215017
-EBUILD intel-microcode-20180807a_p20190512.ebuild 8145 BLAKE2B 523cef269a58707b4df616d6b2b213e921ddc8dcfbc523a18e81bfdd39f259cb602dda39db82555b4f48c9d94a74e07cd402ba3b553420984d3eab11756a83f3 SHA512 6826a94d95ea11d9785ca5171df6dd1f356681b1bd94f64a55b5e766cafe86277349742517a53ff26d189fc45ceaa276d5d7ded5edb34fc1f0c902090ee9b41e
-EBUILD intel-microcode-20190514_p20190512.ebuild 8571 BLAKE2B 47d02586b98c8b78b798b07577e3b2ec609af2cb4e14e3c428acedd4dd673d3a2ccd37a06a2da338c00d2104f7d3f34d60cd3d1d2562d0a36a2a76810309f47f SHA512 933c15406dc5277896ccda6075b0afc02f5a86b70716d7e6ddafd81faeef2daa6970353cafa89a98cd31741fd0dbfefc5c6f388a22d85bd3e82656af8f1561f2
+EBUILD intel-microcode-20190514_p20190525.ebuild 8571 BLAKE2B 47d02586b98c8b78b798b07577e3b2ec609af2cb4e14e3c428acedd4dd673d3a2ccd37a06a2da338c00d2104f7d3f34d60cd3d1d2562d0a36a2a76810309f47f SHA512 933c15406dc5277896ccda6075b0afc02f5a86b70716d7e6ddafd81faeef2daa6970353cafa89a98cd31741fd0dbfefc5c6f388a22d85bd3e82656af8f1561f2
 MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180807a_p20190512.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180807a_p20190512.ebuild
deleted file mode 100644
index 06557d9fb74b..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20180807a_p20190512.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-NUM="28087"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-DEPEND="sys-apps/iucode_tool"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks bindist mirror strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED%/}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED%/}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED%/}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED%/}"/lib/firmware/intel-ucode-temp )
-
-		mv "${ED%/}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED%/}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED%/}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED%/}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT%/}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20190514_p20190512.ebuild b/sys-firmware/intel-microcode/intel-microcode-20190514_p20190525.ebuild
index c38383872511..c38383872511 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20190514_p20190512.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20190514_p20190525.ebuild
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index dfaeed86c823..dffb734116c0 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index d088e32cb4ea..c1cffa05e7f7 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,5 +1,5 @@
 DIST aufs-util-4.14_p20180709.tar.xz 103724 BLAKE2B 50df13812b090e5d8aa9a07009822f9a324091471243a76c9432ea22698a6167273e661f5ebf176fb3cc419fbe560e82ff73d6e3b37ed0a85a01e6315b06c8ac SHA512 f6330dfc0ddc36102473d9931c62a7f9a5549a3ad2b78ababedf68d335ef02b155a90327dd0c7d446182530db755b9ff756533f90c540bf8aacca5eb117555df
 DIST aufs-util-4.1_p20170130.tar.xz 100144 BLAKE2B d3032feeb787e3864247890c2b77468cb39ac1936cebc7e2044a2a58bd84817401b0cf7ab42413ca2c6307430552b49fb642d45e04c42f2729c0a5f1ccfb1589 SHA512 bf47829bdd93472a318e3eb1fd76332a95a42b3ec39b4d3392baac419ca70bd47b7b0c6209592ad70c284ee997a71e3448e79fa0ad6b4a6db16ffa0c47ed11ca
-EBUILD aufs-util-4.14_p20180709.ebuild 1037 BLAKE2B 81e6529bf6bcdaf2a835e3320f0fe9a066eefe27621686029a8554be9f0597b4d2c2d2fd61dfae34bdd5dddc43ed29707f9fe7dda729bebeecb98928a5be0653 SHA512 e4570de61254349baaa8472987e51548e86631a5443e370869061637017292855e2ae56657f2b04f9d672469f8376717b0eabc09300d155df742288eaf6e9473
+EBUILD aufs-util-4.14_p20180709.ebuild 1078 BLAKE2B d1627bfcac4d66856cff0040f6dec53cdf48d3e5ba8ff6b90b5722ed86b349d83f5200927c3e28bee34427e2b09462d7df076d6adbda8a2e947941d321fb6426 SHA512 d3e970e5b98fec4ccb5750614c25a5ccc27696fd00e2167d6ed1871de0c968c97649cc8c0b02597196e60637efd9a083aed30851f29064397b399274bf01ccb8
 EBUILD aufs-util-4.1_p20170130.ebuild 1020 BLAKE2B e111c9619c4045c0c01d594429cbc0ba048607b0ad1724890c0e3576cf51dbf183837e9fe8f80b2e1388353a5a3d3d108e0e43cacddf9be457e7cbf92e9fc34c SHA512 e568606dcd2d50839433cb5acaa1e41be730f7feadec891541fc1ab7b8fd6a1d59a5b00fe6140a2b8d5604a55bdd8054a98de907109ff1f5992e7e785fff6f33
 MISC metadata.xml 297 BLAKE2B a731cab2c80385c087edc64d31769ae6344ee80a5aee2cd5d8693c398da639f6a79cc124b11b79795e096519a70155ad4b2d3af22d92f8fc3b0f7611eb1c763e SHA512 fdf9bf9558a618fd070f65d91b96b9037498503a4df0d06f1b595a9157c34ddaf3c13de9922f32663fb9499394d8c669fe7957dd213ec8e0ed4e66e3638d837f
diff --git a/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild b/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
index d68a80251fa5..98b1a6c96eae 100644
--- a/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
+++ b/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ src_prepare() {
 	sed \
 		-e "/LDFLAGS += -static -s/d" \
 		-e "/CFLAGS/s:-O::g" \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
 		-i Makefile || die
 
 	sed \
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index dc2f8c0c2a0c..8cacbbc9be26 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -25,6 +25,6 @@ EBUILD btrfs-progs-4.20.2.ebuild 2853 BLAKE2B e655b6e505031d6e1e304d5d5bba4f0b19
 EBUILD btrfs-progs-4.20.ebuild 2853 BLAKE2B e655b6e505031d6e1e304d5d5bba4f0b19e425949fd3e37de3ba4d2deeb643869763dae4aad2993f2e2a637e950b78e06cc74e28d902af08327e98d8fe38bf24 SHA512 7420ccecbca2432e06bed191b018a30f14d6c18c710e4ccd1227c9622f5e5dfe9dd84aa7b7479698dc66ed0326615f72049d1fc0639f53574cabe218a575177f
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
-EBUILD btrfs-progs-5.1-r1.ebuild 2917 BLAKE2B 62d9f108de66e823ea9468a15d110b8ffb1513ddaa752165282d4630bbd546429ad98394423f36c7d578e11206c65035e3b8dd3434029397df61303ebe926108 SHA512 268b3a8b48c24401650f60f25e559142d10d8fcc0e820e8f94f42a967f206c670fc0e0df5edae6a11ca1272857f706491cf4cab0712b0993d9a72c5262b811cb
-EBUILD btrfs-progs-9999.ebuild 2865 BLAKE2B 49cef92ae8c8f89507dd8d58675a7e6ce64ffe93191dddc0810900027b9f2ac5bb0d83827e6e97f74938396a7bccd1c0592283bc9bbb4b96a28ea4563a56451f SHA512 3f9a677a5394c8a925822467f8e0e49de1246252f65d3bd5b7c4ac713bbca0124478a81bc153c3861d2599adc93b4965c7a7426e4976ff14e98ed3c1a0d2974d
+EBUILD btrfs-progs-5.1-r1.ebuild 3075 BLAKE2B 565c20a00dff58014d6fc76591dffaeff105dfdfea9a951d8b8340be018068f4dc53ee6311e8d6665356b8f5b3fa802dc268b010823bd9b075dc78791182aaea SHA512 a6c2e8a3578916d7a0f515b192fbe75c6d16f16bc7080321496c78899b7e5013db92455aab79c8f55ceb7d170106ca5ce6e6e02d067148e72b781225ae803724
+EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
index d8977bdf6b94..033e0ad66d1c 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
+IUSE="+convert doc python reiserfs static static-libs +zstd"
 
 RESTRICT=test # tries to mount repared filesystems
 
@@ -63,9 +63,11 @@ DEPEND="${RDEPEND}
 	)
 "
 BDEPEND="
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
+	doc? (
+		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
+		app-text/docbook-xml-dtd:4.5
+		app-text/xmlto
+	)
 "
 
 if [[ ${PV} == 9999 ]]; then
@@ -99,6 +101,7 @@ src_configure() {
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/sbin
 		$(use_enable convert)
+		$(use_enable doc documentation)
 		$(use_enable elibc_glibc backtrace)
 		$(use_enable python)
 		$(use_enable static-libs static)
@@ -120,4 +123,7 @@ src_install() {
 	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
 	newbashcomp btrfs-completion btrfs
 	use python && python_optimize
+
+	# install prebuilt subset of manuals
+	use doc || doman Documentation/*.[58]
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 4076d30d2382..4680b387969c 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
+IUSE="+convert doc python reiserfs static static-libs +zstd"
 
 RESTRICT=test # tries to mount repared filesystems
 
@@ -63,9 +63,11 @@ DEPEND="${RDEPEND}
 	)
 "
 BDEPEND="
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
+	doc? (
+		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
+		app-text/docbook-xml-dtd:4.5
+		app-text/xmlto
+	)
 "
 
 if [[ ${PV} == 9999 ]]; then
@@ -95,6 +97,7 @@ src_configure() {
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/sbin
 		$(use_enable convert)
+		$(use_enable doc documentation)
 		$(use_enable elibc_glibc backtrace)
 		$(use_enable python)
 		$(use_enable static-libs static)
@@ -116,4 +119,7 @@ src_install() {
 	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
 	newbashcomp btrfs-completion btrfs
 	use python && python_optimize
+
+	# install prebuilt subset of manuals
+	use doc || doman Documentation/*.[58]
 }
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 9beb78ea364f..9d8d7d1c870a 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,6 +2,6 @@ DIST cryfs-0.9.7-spdlog.patch.xz 28204 BLAKE2B 0905971713b2d709aa34bfd11333a0aae
 DIST cryfs-0.9.7.tar.xz 970588 BLAKE2B b3d79ed44c2280ef34bafa5613f51918093686da9a4637987745bd9601817033049115754e235b9a9a0f2045401182bc9cb48291173df6571887e9dec3f73636 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b
 DIST cryfs-0.9.9.tar.xz 977928 BLAKE2B 927d5f61be99a6400cfd53de6291e14ae32f446d281485901e758341f138a2efdfb7385b6c205db6f865dc83f6fbd9ede8fd1bb5a7957fb242624d78d2523eaf SHA512 18f0ce954dc9958b52a77aac85d4d30d03409e4f88c27ec3e904a6014f5257e12fe47a4f3bb628f6ebf3b5aa8cb9d3a59e0aee76d83a3f6bdd4ef864b66898aa
 EBUILD cryfs-0.9.7.ebuild 2195 BLAKE2B 59279b53ecd9acd372f6aeed6996ec5d33a20beb5599fbd7119f8f68c5445630e5bd39b5bf736dfb4f69766510897438ebbdf51b64697e26015dffc181f21179 SHA512 27c020e374be8e31072be14de1ce2f27e03466fb46e72e79b621d07ebeff834a729b0d7b1f2d626933ccf42e33dd874902d6b23bd100e5d8ea326429e50ff561
-EBUILD cryfs-0.9.9.ebuild 2418 BLAKE2B fcf9a626b3ece3fe35134677e3801920daf9c3c3a4e2eb2bda4cf1c9ff6be62e90d36d9337634c9ae07afb7f81ab8008b6b60f32a1fb5176e203c73d73aeb612 SHA512 42966adf9eae75f7e64b20bbbe64a5c85dc17a7ce06c29d3d7d2a1599f2f3ef185473822f480b032e752dad9486bfd9b9ea7464293fc89dc043b1975e22500fe
+EBUILD cryfs-0.9.9.ebuild 2417 BLAKE2B 12f97673529667e8896b28f0cb2eb2955566252d1c363dc96a8de5e1a07b99ed79f10f3695fd82afc3894f945397a8fd8c4f8dbd02b5d910987dc6c40e6d309a SHA512 67d73e33975be8d8afe588d9c91da6ac025576c6fb92f08b86b5ae2a55e131c49af6e826de2d453ce77fa6494c232be731cffad2c9050837d04669c62101d41c
 EBUILD cryfs-9999.ebuild 2416 BLAKE2B 0492c25b60c3c563691fcc6085d3c8e82454c366f900c58be6a776bb337c232f145a3a74e28a8db185a06136ed1bba8cbb1ff2e8f9aa0c213d406219622a5c07 SHA512 ca4e83f9adb1377997dca058ef897a8e574a14c877b5744755904b489f9bb767a58a1f6c9c01b5512d22fcd92db5dc18ffdf26228689c78116df49cc1faecc4d
 MISC metadata.xml 605 BLAKE2B cfbabba2fc835d75ab64ff6ea27f87639d27b0d8591d5d318e2c1768f68cb48a50995b7a96b045ba6da3491c4a50219a8a69de6a2efc28325b3bc852b4abf213 SHA512 e7b1aba09cebc2786c664b1f9dbbfeb7baff97536af721953c4eb2dc10d84c97e02277fa5c4532f8bb022a344731d6ea65be81cb3cc88c25d4dea70dcd6ce250
diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild
index 73f1da161ea1..61780cc28cc6 100644
--- a/sys-fs/cryfs/cryfs-0.9.9.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild
@@ -23,7 +23,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-fs/dmg2img/Manifest b/sys-fs/dmg2img/Manifest
index fba67b513357..e10243d3b3d7 100644
--- a/sys-fs/dmg2img/Manifest
+++ b/sys-fs/dmg2img/Manifest
@@ -1,5 +1,5 @@
 AUX dmg2img-1.6.7-openssl11.patch 7080 BLAKE2B 9815c1c0b3c23f2dae7da65e380ee4a2f2c460ddfa1c5e8e153c2b5b1213139d2052957b40f9c15042b750ed2c7318c36acc6de470b9da66a93550eb913964f4 SHA512 1addd0d349ad21c0fae423fe558583d9457aa2bcdf4f8fe16d408e703437faaa5b1324f38dfb66e9f3d811e89181fc0378978ffc852e87675fde0e416fccb136
 DIST dmg2img-1.6.7.tar.gz 23238 BLAKE2B d4dc8da2974bc296e8aba21de816413df797322c6194e4ece3d0900d64fcd33084b29be6172a45bdc3f515c2e10544f107be2c7f0e6b7d247cf5d6bc5ad03e2f SHA512 4c42841c5cdbf868b6038648a6c83e78d4b7f2010f7065d7b3f4c2c04d13af9489716c1dfa867aff5f3c3b3eef96dc3fc0610eff13fec139265f37f468e339e6
-EBUILD dmg2img-1.6.7-r1.ebuild 771 BLAKE2B 66d01106cc1ed84588b87e5b33e44cd8c2a8e6b8e60d5c3af589adbe14ebbd904d5dc2d5179781bcb27d798bda27a593171ad51cbc286ff5eb0762be00e355a3 SHA512 4d482e934e2ae1ae7fdba331bb7e80798eb8f7ce08a01b7830ce73a4c4b0345dbdf8a059f909c949f913baffbf9d16a3315dc78cbde7441cc04c56ba5c48c829
+EBUILD dmg2img-1.6.7-r1.ebuild 778 BLAKE2B 6fb3b1ecfa7ee62561a77587af81390e7559ecb22277f6c81126eebaa7d4599040a8658d5cf08ae3ce2484aa15482f0b6809451e4782ef944e5df7ec5f919ed1 SHA512 917f22b817dfb33419d4144c5b56924fcdfa5d7528d9a6d626f82e84fe5cf644dd233bce235f9286e6f37bc231dadff4f3ff0ed65b8f557d373ea251cd5fd489
 EBUILD dmg2img-1.6.7.ebuild 663 BLAKE2B 27da57b4e2e2c63c00352e665853af8fb8def684229348d9492c8bb32e57b52f14df37983737ff65e0b120061509baba3fe8d5eac6a5042501e77d29cce81c1e SHA512 ed1bff42a9b43b941685e88d03144743a20ce5ef00720eff5d0ee2159185dda5101ef40b1755e8ee9c7bb0c0ab727b00ca14eb95290fc3b5ea25856c97895f8d
 MISC metadata.xml 446 BLAKE2B 3600c0ef451adcf401547ce76a13372182ea3c40c8670ace741f8a342dfc9cc3be3a6910a5e93883e3d77b55709ac996d8a1380724fae8da5f02efbdea637da0 SHA512 412c28e15abe2581fa29247d58b239a140171b018bcdfd5b437cb1991239eff33ce4bee9ecb14dada6bf74105f13ae230dc6dc46e1906952b81cb7491d3e9449
diff --git a/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild b/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild
index 93c306ff1a8e..95ea794b2742 100644
--- a/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild
+++ b/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://vu1tur.eu.org/tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="libressl"
 
 RDEPEND="app-arch/bzip2
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0b63fbb56990..ccadd43aa2e6 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -9,10 +9,10 @@ AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
 DIST e2fsprogs-1.44.6.tar.xz 5378560 BLAKE2B 1430e87fbfc81cf299c3b577c46309e2ca2ff5a8de7121a9aab7a8ea49693fd1053f3f034c4f9105b2cc0c3395b7887d3284493c9105287c4f03deebc237ace5 SHA512 725ff908148b55d9417aa9e01f514feb434c43441f7104c61d200fcdf6b30b528f62475bdffc9e1c49d3d44e1e3f2cc1e9df60025c8e3d113d6edabfccf356bf
-DIST e2fsprogs-1.45.0.tar.xz 5520532 BLAKE2B de7c27b90e68e822a8157e99d103933d98afe094765016a58dbdce4d5bebda86493c94dbf3bd009aa25063edf34a0c8229cbc1045f1041a357448619aee55de8 SHA512 208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014
 DIST e2fsprogs-1.45.1.tar.xz 5507236 BLAKE2B d454f0228df2079edd3b7f8ad406417ee48cacb5b62fc1c869eff21b35dafc9bbc4ffd80e6040629a8da1edac230beb3981bc43eb12b6feecf4225a9b9f335e6 SHA512 2e8974d30e92d7f194ccad7f152b495d2a6e41328b1532351f13af27ceaef5ee01d52963e17801cc7317f7b5208791bd20c9028f15a9859225f0e64d175be779
+DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e
 EBUILD e2fsprogs-1.44.5.ebuild 3915 BLAKE2B 910133a809c3d28f21623a38b1aa4a5ec162298e32360db7cfa8e7a345bb440c0208e47fecc9a57a56eccaf59d2ff0699cf793167cdbb4c59b92acae00199d3f SHA512 bb486fadb929ffe64df5066d3bb5c1a96e604ad17f164ddd06956ca35cfcb2f0283a4e1161ebe4ae5a5aecea5db927a3a48d6215aa24373d91508d05b517f15a
 EBUILD e2fsprogs-1.44.6.ebuild 3863 BLAKE2B 57d1ab60969ce206b11aae22c1c5f214bcdac17a9e741829cc5b3ac105919e68a736f9f2f5263d037965e63a692263b58e5615ce6c14a0c3dd16710d2299bd80 SHA512 ef1981716a3f7495ea68ff8ff2800549f51390eb3f1d9ef037f141fa1e2fbc2bdcc945277456d453dae40e5fea6b092100526cfc8cd750128ebf45920075c149
-EBUILD e2fsprogs-1.45.0-r1.ebuild 4037 BLAKE2B 9003905aa14158acfa765ec97c0865f11248d46c138eda355bde393e1540afad7104dc04d57ea68d70a245bf34a7579871bd204661ef8ef5bbf05ba8f002ae12 SHA512 2d076c6de2451d604629a6bf9b70bb98de5d4ce64116cf2a726f673c0e9c42aa62ea4032c7871caedafc71ae9ebc877826ab7a7d590928aaa90ee81cca25e2dc
 EBUILD e2fsprogs-1.45.1-r1.ebuild 4094 BLAKE2B 1ed574459a9121ee18c9963d9311b320b0e37838167223f94d27b35b6093e4dea10f9fe6c931cbf1628d6908e5d9e9f3146a4e1c341c1cd2982f7c8ed874d92d SHA512 adc9340b6eec174d8a3d481581e1a5db9c051bda3e25c3aef3d0ddbb24da6c76eadbbd5c698bda4bfe613011cd7549457bd1a4435b70018b04f30c4d1c0a0665
+EBUILD e2fsprogs-1.45.2.ebuild 4094 BLAKE2B 1ed574459a9121ee18c9963d9311b320b0e37838167223f94d27b35b6093e4dea10f9fe6c931cbf1628d6908e5d9e9f3146a4e1c341c1cd2982f7c8ed874d92d SHA512 adc9340b6eec174d8a3d481581e1a5db9c051bda3e25c3aef3d0ddbb24da6c76eadbbd5c698bda4bfe613011cd7549457bd1a4435b70018b04f30c4d1c0a0665
 MISC metadata.xml 578 BLAKE2B 08094a62570e432f1ed7370d2eb402523f17e7cea8ca1370302b602de949e812e6d277a280be23d0a0f515b6b39ee18d974b1ef0d008d2267fcc4e7bb41ff3d9 SHA512 094625d323bca75af0884ee4d2c1503437a50aa1a323c52e054b49edf890afc0b20f936b2833c82e944b58615996b76e7fc2a502aa87b3c66a385e7698d2d6cf
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild
deleted file mode 100644
index c87cb951ed5a..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic systemd toolchain-funcs udev
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
-	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="fuse nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	fuse? ( sys-fs/fuse:0 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.44.6-parallel_install.patch
-	"${FILESDIR}"/${PN}-1.40-fbsd.patch
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-	# Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-mint* ]] ; then
-		PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
-	fi
-
-	default
-
-	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
-
-	# Get rid of doc -- we don't use them. This also prevents a sandbox
-	# violation due to mktexfmt invocation
-	rm -r doc || die "Failed to remove doc dir"
-
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
-		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-	ln -s $(which mk_cmds) lib/ss/ || die
-
-	# Avoid rebuild
-	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS="${T}/fonts"
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	local myeconfargs=(
-		--with-root-prefix="${EPREFIX%/}/"
-		--with-crond-dir="${EPREFIX%/}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX%/}$(get_udevdir)/rules.d"
-		--enable-symlink-install
-		--enable-elf-shlibs
-		$(tc-has-tls || echo --disable-tls)
-		--without-included-gettext
-		$(use_enable fuse fuse2fs)
-		$(use_enable nls)
-		--disable-libblkid
-		--disable-libuuid
-		--disable-fsck
-		--disable-uuidd
-	)
-	ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
-
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake V=1 fsck_ext2fs
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX%/}/usr/$(get_libdir)" \
-		DESTDIR="${D%/}" \
-		install install-libs
-
-	einstalldocs
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-
-	# configure doesn't have an option to disable static libs :/
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs
-		doman "${FILESDIR}"/fsck_ext2fs.8
-
-		# filefrag is linux only
-		rm \
-			"${ED%/}"/usr/sbin/filefrag \
-			"${ED%/}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
new file mode 100644
index 000000000000..c0ce32929e1b
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
+	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="cron fuse nls static-libs elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+	>=sys-apps/util-linux-2.16
+	cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+	fuse? ( sys-fs/fuse:0 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+	sys-apps/texinfo
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.44.6-parallel_install.patch
+	"${FILESDIR}"/${PN}-1.40-fbsd.patch
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+	# Upstream patches (can usually removed with next version bump)
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-mint* ]] ; then
+		PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+	fi
+
+	default
+
+	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
+
+	# Get rid of doc -- we don't use them. This also prevents a sandbox
+	# violation due to mktexfmt invocation
+	rm -r doc || die "Failed to remove doc dir"
+
+	# blargh ... trick e2fsprogs into using e2fsprogs-libs
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
+		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
+		MCONFIG.in || die "muck libs" #122368
+	sed -i -r \
+		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
+		Makefile.in || die "remove subdirs"
+	ln -s $(which mk_cmds) lib/ss/ || die
+
+	# Avoid rebuild
+	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
+}
+
+src_configure() {
+	# Keep the package from doing silly things #261411
+	export VARTEXFONTS="${T}/fonts"
+
+	# needs open64() prototypes and friends
+	append-cppflags -D_GNU_SOURCE
+
+	local myeconfargs=(
+		--with-root-prefix="${EPREFIX}"
+		$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
+		--enable-symlink-install
+		--enable-elf-shlibs
+		$(tc-has-tls || echo --disable-tls)
+		--without-included-gettext
+		$(use_enable fuse fuse2fs)
+		$(use_enable nls)
+		--disable-libblkid
+		--disable-libuuid
+		--disable-fsck
+		--disable-uuidd
+	)
+	ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
+
+	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+		eerror "INTL sanity check failed, aborting build."
+		eerror "Please post your ${S}/config.log file as an"
+		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
+		die "Preventing included intl cruft from building"
+	fi
+}
+
+src_compile() {
+	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
+
+	# Build the FreeBSD helper
+	if use elibc_FreeBSD ; then
+		cp "${FILESDIR}"/fsck_ext2fs.c .
+		emake V=1 fsck_ext2fs
+	fi
+}
+
+src_install() {
+	# need to set root_libdir= manually as any --libdir options in the
+	# econf above (i.e. multilib) will screw up the default #276465
+	emake \
+		STRIP=: \
+		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
+		install install-libs
+
+	einstalldocs
+
+	insinto /etc
+	doins "${FILESDIR}"/e2fsck.conf
+
+	# Move shared libraries to /lib/, install static libraries to
+	# /usr/lib/, and install linker scripts to /usr/lib/.
+	gen_usr_ldscript -a e2p ext2fs
+
+	# configure doesn't have an option to disable static libs :/
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	if use elibc_FreeBSD ; then
+		# Install helpers for us
+		into /
+		dosbin "${S}"/fsck_ext2fs
+		doman "${FILESDIR}"/fsck_ext2fs.8
+
+		# filefrag is linux only
+		rm \
+			"${ED}"/usr/sbin/filefrag \
+			"${ED}"/usr/share/man/man8/filefrag.8 || die
+	fi
+}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index cb57d37111ef..0044050200eb 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -9,8 +9,8 @@ DIST fuse-3.4.2.tar.xz 1019864 BLAKE2B babb8454438b5c4a924e83112ee5c319c0fa37c54
 DIST fuse-3.5.0.tar.xz 1021676 BLAKE2B 9e2ec6b5df75c3427ad99ca30f5c88cb1e2291ac05d005280f6a9b121abf978990e7ee84df83b8d866cc996b8fda7e99fdc626d1a24347472aacbfa2531182fe SHA512 953066a25ab2f67fd5a1f15e97f8d739271c42a6260aa29ccc7b9ffddb9c972d2797d93d9ff0d34c6b51a20f3254ef6f748c14f852603280b318b36899867a27
 EBUILD fuse-2.9.7.ebuild 2206 BLAKE2B eb1f3ee67657e03d572bea6895655ab43f39cf41e6eef422baf6643184080a224f72e773afe496784d0e60d12ce63d9e678b3f1c43a867042f93fea2fc350cfa SHA512 5b44ada149cf1cc4028307ee6e11657e7e1de98f9893a5061aada592037ca54b16644354f970d222687b3f07d3673c1352c02e8ddf5fe60d031244a617d13d23
 EBUILD fuse-2.9.8.ebuild 1942 BLAKE2B 160c38daa8321d980347079e0ab8677526c639e0d6f20b8fffaa481b7072146f1aced7f61cfc5ae05b483d7178beed551e6df44d5e319c9274a3c1c5cb530e58 SHA512 35efa56282f0a9a4aca7e284af1da587d6a5545439c50258ecc31c47159fa777c70400f28b4fd9c8392a39d1b43ba8c3c1935e0860d7689dc7ad40f5134e7da8
-EBUILD fuse-2.9.9.ebuild 1883 BLAKE2B 7cbd50df85e6eaea2e89b3e36bf819bba20cc1589dc2607bff8e2fe97155a7f1f6ae34b9589c3965e29dffd311682a259cbbd06bd9cce215121837b2c29022c0 SHA512 876c5d8760383847d59db3ceed3dcb074fe48e87ef4192cbb8bd586eac9e5e2becfd7a0a49a76cb213426e961ac2e353d9421865fb5801507e59a584a89da5e0
-EBUILD fuse-3.4.1.ebuild 1657 BLAKE2B 7b51b31552b827d810c9ebbef25711049de95f9967dbe112ef1dc70aa56617cf7771dd44cd5aad917030288f2e68169d0abfd3e8673a49604d5f19ff590e7c99 SHA512 58c53a644bc8a70cbc4cfe6afd039d8e747f70bd0231274400d7d46d71eba15a07620564ca7094dd94228b9c9c9e01f59c2968e13117ce2227d630fc92680704
-EBUILD fuse-3.4.2.ebuild 1651 BLAKE2B a2f92916463994570422db3ac73c26363ee6551c9385e51f73d666c3a8fa5eaf762cc3bc4f0edcd37f74eebbf8511c2f19f9a1d66738fe9f581cfc5abb5e7f84 SHA512 94415c24288b1c08d44c220f8fd5fdf28631201941ef9c046a5e21784fda025ede2659c33b2846d1537dec1b9d0f389acb9cf1a4fe81af0ed494b5abe15b36ea
-EBUILD fuse-3.5.0.ebuild 1651 BLAKE2B a2f92916463994570422db3ac73c26363ee6551c9385e51f73d666c3a8fa5eaf762cc3bc4f0edcd37f74eebbf8511c2f19f9a1d66738fe9f581cfc5abb5e7f84 SHA512 94415c24288b1c08d44c220f8fd5fdf28631201941ef9c046a5e21784fda025ede2659c33b2846d1537dec1b9d0f389acb9cf1a4fe81af0ed494b5abe15b36ea
+EBUILD fuse-2.9.9.ebuild 1882 BLAKE2B 4f789ad332f80dbd3c012aeb7286e2d0615717f2afc8dd7078c0148f607cdf4fbac5fd1c515d7c49c189f2eb7e1ec9a79a1e2a25b9ded1a4e79e5e705772912e SHA512 834caa3c39f615fa440688c8bad60b725358ba9c3ac88fbabceeaa86f0027b2a6cea3bc563435cd430adda5f16e76efa86fff46b8ecfbe025ebbd33940a098eb
+EBUILD fuse-3.4.1.ebuild 1656 BLAKE2B 6e556878bce6e6851104a52b29ed2f63306daa675af9bf6eab4d27140f0b9f81ac51c8a3ceeeea45d572b98a2354fe8ce3568a0116c52f7e9f8bab3614d0b267 SHA512 6b093f0fba44af3e4dbfaf0d3ca6f9ca106b669706b91c94c563cbe613fe625bed7ae471ac68cfe8742e0d9e64567a7affd7a9762fc6032981011bce7c38754b
+EBUILD fuse-3.4.2.ebuild 1650 BLAKE2B 04d6572ea92e27205a216f2be84af3dfbdff0d05940df5691a2f889617806134f39165ec570c40c9cf8a930bc078aaeec9ee404e8edb27db230a90c247cd1df9 SHA512 b4b19fade4bddfc3a9d4e6c778af0eb7aecc5e928dce7e9f6513b2ed9650691626e81c05ee1f07ef60f16ba27d3035147e0c0c1eda3387118ee03f901d718a26
+EBUILD fuse-3.5.0.ebuild 1650 BLAKE2B 04d6572ea92e27205a216f2be84af3dfbdff0d05940df5691a2f889617806134f39165ec570c40c9cf8a930bc078aaeec9ee404e8edb27db230a90c247cd1df9 SHA512 b4b19fade4bddfc3a9d4e6c778af0eb7aecc5e928dce7e9f6513b2ed9650691626e81c05ee1f07ef60f16ba27d3035147e0c0c1eda3387118ee03f901d718a26
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-2.9.9.ebuild b/sys-fs/fuse/fuse-2.9.9.ebuild
index e36b63cd9381..c2933b58a93e 100644
--- a/sys-fs/fuse/fuse-2.9.9.ebuild
+++ b/sys-fs/fuse/fuse-2.9.9.ebuild
@@ -67,5 +67,5 @@ src_install() {
 	rm -r "${ED}"/{etc,$(get_udevdir)} || die
 
 	# handled by the device manager
-	rm -r "${ED}"/dev || die
+	rm -r "${D}"/dev || die
 }
diff --git a/sys-fs/fuse/fuse-3.4.1.ebuild b/sys-fs/fuse/fuse-3.4.1.ebuild
index dddc7c719957..f4468b461435 100644
--- a/sys-fs/fuse/fuse-3.4.1.ebuild
+++ b/sys-fs/fuse/fuse-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -65,7 +65,7 @@ multilib_src_install_all() {
 	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
 
 	# handled by the device manager
-	rm -r "${ED%/}"/dev || die
+	rm -r "${D%/}"/dev || die
 
 	# manually install man pages to respect compression
 	rm -r "${ED%/}"/usr/share/man || die
diff --git a/sys-fs/fuse/fuse-3.4.2.ebuild b/sys-fs/fuse/fuse-3.4.2.ebuild
index 80ef87425176..36c655c869a1 100644
--- a/sys-fs/fuse/fuse-3.4.2.ebuild
+++ b/sys-fs/fuse/fuse-3.4.2.ebuild
@@ -65,7 +65,7 @@ multilib_src_install_all() {
 	rm -r "${ED}"/{etc,$(get_udevdir)} || die
 
 	# handled by the device manager
-	rm -r "${ED}"/dev || die
+	rm -r "${D}"/dev || die
 
 	# manually install man pages to respect compression
 	rm -r "${ED}"/usr/share/man || die
diff --git a/sys-fs/fuse/fuse-3.5.0.ebuild b/sys-fs/fuse/fuse-3.5.0.ebuild
index 80ef87425176..36c655c869a1 100644
--- a/sys-fs/fuse/fuse-3.5.0.ebuild
+++ b/sys-fs/fuse/fuse-3.5.0.ebuild
@@ -65,7 +65,7 @@ multilib_src_install_all() {
 	rm -r "${ED}"/{etc,$(get_udevdir)} || die
 
 	# handled by the device manager
-	rm -r "${ED}"/dev || die
+	rm -r "${D}"/dev || die
 
 	# manually install man pages to respect compression
 	rm -r "${ED}"/usr/share/man || die
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index f2443afbf57d..7ed5251f824b 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -8,6 +8,6 @@ DIST udisks-2.8.1.tar.bz2 1354879 BLAKE2B c2e5fc11dc29d43c6ff2cfb048c8f5540e72ea
 DIST udisks-2.8.2.tar.bz2 1589149 BLAKE2B eaa9d95e175bbdd4255c627a0dcd93ff6f0a3660134d2117551c2d61298733570409481393ceeafc92ff26b74277b3a754b70d9359ed402c19d73fea2f39ec04 SHA512 dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a
 EBUILD udisks-1.0.5-r3.ebuild 2795 BLAKE2B 45da28dd3571bad3921197cb8aa68487067a58e905a6802581924d54a64bc39b4a203129c2bdb7a69bbfa63da6259ab48aeb21e039799bce547f6c4c58ff31d6 SHA512 d795d5a8c564afccb2f41c1062ad5485074db7daa4416e2c4babd8665633a21038107e8e8c5356c9d49edb7108a7126a905b57420741239de41b9925a320e80d
 EBUILD udisks-2.7.4-r1.ebuild 3328 BLAKE2B f97ca16814ccf01e774c7a44474c95d0876795024578985023031e42ac429377167718f6de01e093dc658db9e3855f6c5801993fb4870c39d7c1e2ea0a6e2897 SHA512 8b319ed1f9e9f76fe93e4a8ae4fdd5aad1610ad22f3fdc6f7d6f5f5c2a77db27ad8aedc18e15f8e8dc6cccb003c5e8221397142d14a75aaa693c2eac4184ebe5
-EBUILD udisks-2.8.1.ebuild 3234 BLAKE2B b0be42f25f2a9c3a5b3305bc9907f2b8fcd81470e25b0910f72f733dad6e6803f528bbfe2c450e97ab257cd42311ede04c5b9d65c37b13068729563c3a649f99 SHA512 cfe0d8c6b1b60f160b2eceac6eec64951a56aadd930cadd0c38a6c6b8a9d5fb9d74a13738a3d40dd1afe71373e8106143586126da9de62d57afe49f0e498cccf
+EBUILD udisks-2.8.1.ebuild 3233 BLAKE2B 2e6032785c926aec9cd36a2e12e7984825a44190b72d0c76edf60abf9903d04f005a94b258eaac299fa310ba7f801de45ca1cd194e5cf194cf7752cfdbd21f02 SHA512 00a2ad198df800bcc4e2faa99d98d80a3cbccd8d9b63071ec07d49dcf0e85d5e5bc14a36de73ac20ff20cddab21c82f38ee4f422f0d0f6e500d6bc51f4e9aee6
 EBUILD udisks-2.8.2.ebuild 3240 BLAKE2B a887061b0302b102597b146f6597b365b4964f372ec829f8178c419a3e3bcb2b3ed00e11157b75ef0ff8766e2d851391a1ae6a76c4d4a5119966ff4b4e441ea5 SHA512 99278667326d8ae9e4e316eae3eca0628b89cb04c8750a6f822b6f9a024c8d26bfb8d2399988e6f8b9ded8aff4691dd382df68a7aa99b423fcba71cefa67d97f
 MISC metadata.xml 868 BLAKE2B 8d4ef3d2fae9d22074a87c65ced87d1e523b8b935084845b4cdd11389648e5071852cde39b18afb34c33dd352f3b1acb6ffbed68a5dc6c999033c5567693967e SHA512 e5b0ccda409fe0b7c7be656f5834399f2819da68ee811e70c2cdf97370b860efa1ca58188543f9cc46f17cfa340c9d31c18b050b6e6f049928afe8d1ad7ffae5
diff --git a/sys-fs/udisks/udisks-2.8.1.ebuild b/sys-fs/udisks/udisks-2.8.1.ebuild
index ad43058e4b97..39172881d7dc 100644
--- a/sys-fs/udisks/udisks-2.8.1.ebuild
+++ b/sys-fs/udisks/udisks-2.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index c445fc464d91..2d703f818c6f 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,5 +1,5 @@
 DIST vhba-module-20190302.tar.bz2 15708 BLAKE2B 4a6f1f22e893597e50e78fa06e1296079b600ad6b2cf7b319267ef44d1ff07795f2aca22541993a7fc57d15550297e71046ce4147226d0731aa2b4d691dd5299 SHA512 6df59112b9b0597ce98de85744acd8158dbc015841740649fa3538fec32f1d7cbf4e489062998cc13dc85a1b3558bcffc2ea65285e17ee5b3f1c0a7d49cd6a38
 DIST vhba-module-20190410.tar.bz2 15741 BLAKE2B 6d513877c771b1c4c5805231cf8bb13333d29dd3c6de7d91879ef1898fdc424df026b0835a772f398dcdc7d8900db462164a40e46c9b66b38ed70f5b5f6a0e7e SHA512 e4b30bea8464d8ac24fd2fddca9d41052af2f5b3dc9e054ead47991bff41366be377600075627c40261722c88c20ed2eaf65fa7afb34690ef09a6f4ea6f9351f
 EBUILD vhba-20190302.ebuild 2146 BLAKE2B 7b02077e20c319d2d9197719c00e115119b3e825c706fbfbc64de6a018b374605a5d06e4ac7d830c365b3ee1cae7299a207a49eb8d55385d775a73a0bc3f8c8f SHA512 ab5fc77641921817989917b9b47e0f4766db4e02238c8826d2eeb90d6a23c7ef7a1fc21d4ed99ddd1ea002f06d4ff7f63c7df660923cd71db5ab34d9a8b0dc5c
-EBUILD vhba-20190410.ebuild 2148 BLAKE2B 8b3d1dd8f8d8e21da1a6d59356b789cc1cc703c6f68ecc6cbdf04890ed3942024753b3e26f6855e757a68a338a2c4c9e7ae9c35125035ea1580ffb99505b9555 SHA512 4a23aa165510d5b3f518bc47e8aea33053a42b14db27d3b3682a726f2ca840f114a34cbdeb34a0c3661d98a4c059cc9a2dcd351d1930d19d4ad8c54d5989a4a7
+EBUILD vhba-20190410.ebuild 2147 BLAKE2B a066190d6867675253e387a2d6d03356f6c601c049b0d8cf797736c208e0302ce2e84bfc71c8cae293cb53eec29107e34fce7ecc942c7d8a680cf794bfcecc2b SHA512 ccf087347d20f672e458b5413c49161f72a43984b1ecaf8d78586a88251f5d59ba385d7af588908bd9db3fcfd9ae3c43939518e314e167df67556f1e45ed8b37
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20190410.ebuild b/sys-fs/vhba/vhba-20190410.ebuild
index 8969ab8b663f..cb0c86737164 100644
--- a/sys-fs/vhba/vhba-20190410.ebuild
+++ b/sys-fs/vhba/vhba-20190410.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="virtual/udev"
diff --git a/sys-fs/xwmfs/Manifest b/sys-fs/xwmfs/Manifest
index 166f2919cacd..caadc5d5dbf6 100644
--- a/sys-fs/xwmfs/Manifest
+++ b/sys-fs/xwmfs/Manifest
@@ -1,3 +1,3 @@
-DIST xwmfs-0.82.tar.gz 193014 BLAKE2B 2e12ceb4fa1340e05342fccd0cb8978caa38525c59d646633aa32965a4d32efb9fecc4ef0ab0ed72ad57eb07ea821048a629943cbc3bde8d46f32ee1357bcdf0 SHA512 bcf0994a9f1c8dd9d22a4d41b074e406c7ded1e8b179155c6cd7272ad9720e3837b6aad1c70fb732848ded6f8c48261f30b6674ee8584fd1cae9325e6c25379d
-EBUILD xwmfs-0.82-r1.ebuild 616 BLAKE2B b8f9c0892fff04af35eee88faa38bef4efd38d0c1f6dad0e4aaa5cbe58a7a31debd2c6bc57a42ec0c06cdab7a97fc967091596c1b6b152b517bf2b8164364eff SHA512 ffd312368d74a46462937d1f75540046bee94d9c19708ebbd46695fdaa1fd86265a57f457b39f9c0b544239fcd7fdc491891e61f5f995b4fa2aeda3f16979e36
+DIST xwmfs-0.83.tar.gz 193702 BLAKE2B 14319cc47b28f8ca7e0d8f18878d30c8c48eac8d1ef2238d82a18c59f6c4d3a4a11dc435627102b4fe1d41cc27201a59c9c9d04a73bede05996f053c5af08d03 SHA512 eeabf41d537cab53a34fe3b685a0d7bda8ff690bddd7d38271df71cb7638b045c8b1156fbb3a19220362590abb7a5808085bec30ce1652c9ba06c9af886cfdcc
+EBUILD xwmfs-0.83.ebuild 616 BLAKE2B 56b90a826fa615d12546db28010490abd1ba9a8cc12bd558f554729b3d1812d818b5024982a82ceea5f5bccadd75d5e1ab03d909e3cb6a7d72f7c4000257a59d SHA512 9b78eb2777f219aebdef3916fd643d17006f5b99fd33260f3b2a19dcc4a43113ff0da23da5995b913ac53e7f9be1bdd0dc88241ff16e0faa007233b1577e1c8b
 MISC metadata.xml 1393 BLAKE2B f9f7389edcc5535cddf0e0c34ebacc0272b57e65c42ad76c2930534913e12d90c3a06dae5dda49fef8e14935b5376576bf1bc2118c528535c289cf436573457c SHA512 143ed4a1f942d55be296a6b909d56d853e7b27a9710f9d4248bd7102a47a49b804f3687abc2d508209889b12cbfcfdd07f8bdba94883858f1605e59964675951
diff --git a/sys-fs/xwmfs/xwmfs-0.82-r1.ebuild b/sys-fs/xwmfs/xwmfs-0.82-r1.ebuild
deleted file mode 100644
index 0a3213274d9f..000000000000
--- a/sys-fs/xwmfs/xwmfs-0.82-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="FUSE-based X11 Window-Manager file system"
-HOMEPAGE="https://github.com/gerstner-hub/xwmfs"
-SRC_URI="https://github.com/gerstner-hub/${PN}/releases/download/v${PV}/${P}-dist.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-
-RDEPEND="
-	sys-fs/fuse:0=
-	>=x11-libs/libX11-1.6.5"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_test() {
-	# unset display to avoid testing errors, tests rely on X11 and a window
-	# manager environment
-	unset DISPLAY
-
-	default
-}
diff --git a/sys-fs/xwmfs/xwmfs-0.83.ebuild b/sys-fs/xwmfs/xwmfs-0.83.ebuild
new file mode 100644
index 000000000000..b64c09fda99b
--- /dev/null
+++ b/sys-fs/xwmfs/xwmfs-0.83.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="FUSE-based X11 Window-Manager file system"
+HOMEPAGE="https://github.com/gerstner-hub/xwmfs"
+SRC_URI="https://github.com/gerstner-hub/${PN}/releases/download/v${PV}/${P}-dist.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+
+RDEPEND="
+	sys-fs/fuse:0=
+	>=x11-libs/libX11-1.6.5"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_test() {
+	# unset display to avoid testing errors, tests rely on X11 and a window
+	# manager environment
+	unset DISPLAY
+
+	default
+}
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 645fb4a3066e..587a484cb1c9 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,11 +1,13 @@
+AUX 0.8.0_Fix_integer_overflow_in_get_next_chunk.patch 1223 BLAKE2B d2286ad668d7ee1a80dfc01972cb33d12a189087100dd8f52814fd31475f40624501d0a4e026c8eb2acffac9ccbbca941c0d2edd7b32138f6c2b5682e5d32074 SHA512 89126799f50da5482b13c0b23bf156f06341970d201e19022fe9b067ab955100b91f2775928349f97a03d6d078b3d2ac1f83cd456e172bee8bd2642e9f74a86b
+AUX 0.8.0_revert_Report_holes.patch 1344 BLAKE2B 1dfab8f711a821932b213060c8f327406901fa86c5fcab3fc75f7f61d753d506fa75f99b62c3284a2baaa6d3a4efe093db19eed94783aed964b08cd4ed1b757d SHA512 d529fbbbae351cf45dce263ae342aaa5a37f3ce742292b387c39dc0ed378c7ab8d1bb1e302f355adae62ea48074f4bcac14071378e1d365fd4141dd51fff3d41
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
 DIST zfs-0.7.12.tar.gz 6565017 BLAKE2B 493df30ecce1f169e02d6c8262ba71cc9e7b01d5b17ce188004f522f0c93943b858434067cba8173ccb3e08cde24a1d3e8a3996b2e852f8bc35251f8c4ab3809 SHA512 278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2
 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
-DIST zfs-0.8.0-rc5.tar.gz 8994022 BLAKE2B f29b9f6d264bbd04553f6855fbdf039808903eb02989e06082d9db8494723e611736db753fa4d27443527fbac189c1ee282ac89fdf799f6182ae428e178d0d10 SHA512 e54a3f9c7947baf619d737a832a545609bc03774a53f9a65147b8c23d9fb5148400a33d99216205a3e45821f8300108882c4eab9995778611775035441428551
+DIST zfs-0.8.0.tar.gz 9084737 BLAKE2B c3095ca07b7c36fa204274be1166fd244894de70b97a11da32606b08e9bb150bc1326ac8424d5c001eb33d2d94e214d3944ddfce885844885c55291a82f11a2f SHA512 ba29f1644ec6807f4cad574e4950e56026316c3d405c9fc40a63ab34c2400d508521b09f656ac97898e5feaca5e0b259d9d4d85f75a4b1782a9db13d3b14cdc6
 EBUILD zfs-kmod-0.6.5.11.ebuild 4086 BLAKE2B 77042a670913df7a0fbb47e594028d56f6733827192b68ae13b0c52598bf728550b59ef0c850d1498e265765552ba3e6f1e4ea6dd8d8608af3fb994de375135b SHA512 efbc887b8f613a94af230916dd0c6ddbf9fcf29a73d4bfeda19680eb514ad12f75cc75d45f8d01fa56cf909e34e518ec5a91bf70310370dd3cc7db7ab7aa72ef
 EBUILD zfs-kmod-0.7.12.ebuild 4072 BLAKE2B bd174bbce39a1634c40ba20c26066e15c660b18382f6c2c7ada46759fa19339e39e2490e209f319cf80041151c074aaeb86c456441fdf814e46a6a3a37c2316f SHA512 1a52bec71a66de3cb79ab32e68b95ae6a0590a8acb715e4a025516840d8a21252e524a25044897661c2977217a6ec7bbc6da1e60846dcf414f97324bbc564ee2
 EBUILD zfs-kmod-0.7.13.ebuild 4119 BLAKE2B f8d921251bc94644a7331762054935518bb9fb68425b404572876466bff118b9ae20cf297f34d9267c933d7ea28840c84fe8e4a867e9a9f191b627f29207798b SHA512 8e4eb43e5b4edd7dcb8b0ecb13a809340ee20247017e7cb141b8489dc4c9988b84b40e866028e8d3b73aea69981a923e4fc4b237389115fb8e72d8b6ed450340
 EBUILD zfs-kmod-0.7.9999.ebuild 4131 BLAKE2B 10f0553102967537d42f5b2da8ede7c8894ca9134a1421efadd1db538b3381d588fe6729dc37c84ab025212ca01a74c2e60768fe8f7808acbd21f0179b2a9abb SHA512 ad59815b9e2ce844e6caa5232d1e4f17c70b930b8295a28e44f37b8293c602fb8b98f939bb1ea22cef68c8e724de6a581b09073d41fd7a14aa181a0cadb6250c
-EBUILD zfs-kmod-0.8.0_rc5.ebuild 4292 BLAKE2B bb740f7b6eda3a3f2c12dbe672436a50b407d5363d6244eb5d0d507ebe7f4f02fab6fe4da0954955572d9afa55b7be39de6b56d225b5a4be35da004e46591503 SHA512 d1cd8ed3be7ff20b25927fc417038deea66ab283ce69c4782d64822787d0a17a57c70cec6f9577387959098f32aa962e2ccd1c9cb3c10ad977adefcb1847ba5e
+EBUILD zfs-kmod-0.8.0-r1.ebuild 4455 BLAKE2B a46c12e4547b5ad0564cd43fd63af6f646ab21f4cb7ec581a09c3c91bef6901321f10b92c4048de072ed6a3bdfcb36827c2189a04e63f86a4e9243adddb457ee SHA512 9ad94fff5362229432c5d817dfea53a9e17311d7caa7e6b6966de906b1020e393d841ffc277ec4a40d7e9b4a961c80bcfd8a5467557a6a5f69db61d9b2952421
 EBUILD zfs-kmod-9999.ebuild 4328 BLAKE2B b7304dd03f2a189b434837b337a8ae7a46b4b3b823880542bd4751496bd2f63e0976652402266552e822b073a8ea262b8bbbf03ef79a15c0b56da8e840aab63e SHA512 30c91bb159521bfa37b7bed7cf4c25c0415b9f302fbf0aaad6494a1039d1928fd6e8c154ab461ffbe911d53b8f2c60da13bbdba8656cae691149a1f84354d56e
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/files/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch b/sys-fs/zfs-kmod/files/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch
new file mode 100644
index 000000000000..0042bfdc99c4
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch
@@ -0,0 +1,32 @@
+From ec4afd27f198d93a7bd32a05cb288708ba754ada Mon Sep 17 00:00:00 2001
+From: madz <olivier.mazouffre@ims-bordeaux.fr>
+Date: Wed, 29 May 2019 19:17:25 +0200
+Subject: [PATCH] Fix integer overflow in get_next_chunk()
+
+dn->dn_datablksz type is uint32_t and need to be casted to uint64_t
+to avoid an overflow when the record size is greater than 4 MiB.
+
+Reviewed-by: Tom Caputi <tcaputi@datto.com>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
+Closes #8778
+Closes #8797
+---
+ module/zfs/dmu.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
+index 1697a632078..a283b062238 100644
+--- a/module/zfs/dmu.c
++++ b/module/zfs/dmu.c
+@@ -719,8 +719,8 @@ get_next_chunk(dnode_t *dn, uint64_t *start, uint64_t minimum, uint64_t *l1blks)
+ 	uint64_t blks;
+ 	uint64_t maxblks = DMU_MAX_ACCESS >> (dn->dn_indblkshift + 1);
+ 	/* bytes of data covered by a level-1 indirect block */
+-	uint64_t iblkrange =
+-	    dn->dn_datablksz * EPB(dn->dn_indblkshift, SPA_BLKPTRSHIFT);
++	uint64_t iblkrange = (uint64_t)dn->dn_datablksz *
++	    EPB(dn->dn_indblkshift, SPA_BLKPTRSHIFT);
+ 
+ 	ASSERT3U(minimum, <=, *start);
+ 
diff --git a/sys-fs/zfs-kmod/files/0.8.0_revert_Report_holes.patch b/sys-fs/zfs-kmod/files/0.8.0_revert_Report_holes.patch
new file mode 100644
index 000000000000..f8d67ccc7cef
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/0.8.0_revert_Report_holes.patch
@@ -0,0 +1,53 @@
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Wed, 29 May 2019 14:38:15 -0700
+Subject: Revert [PATCH] Report holes when there are only metadata changes
+
+This reverts ec4f9b8f30391a3fb46c8d4a31c2dc9250dca1bb
+Issue: https://github.com/zfsonlinux/zfs/issues/8816
+Bug: https://bugs.gentoo.org/635002
+---
+--- b/module/zfs/dmu.c
++++ a/module/zfs/dmu.c
+@@ -2366,39 +2366,14 @@
+ 		return (err);
+ 
+ 	/*
++	 * Check if dnode is dirty
+-	 * Check if there are dirty data blocks or frees which have not been
+-	 * synced.  Dirty spill and bonus blocks which are external to the
+-	 * object can ignored when reporting holes.
+ 	 */
+-	mutex_enter(&dn->dn_mtx);
+ 	for (i = 0; i < TXG_SIZE; i++) {
+ 		if (multilist_link_active(&dn->dn_dirty_link[i])) {
++			clean = B_FALSE;
++			break;
+-
+-			if (dn->dn_free_ranges[i] != NULL) {
+-				clean = B_FALSE;
+-				break;
+-			}
+-
+-			list_t *list = &dn->dn_dirty_records[i];
+-			dbuf_dirty_record_t *dr;
+-
+-			for (dr = list_head(list); dr != NULL;
+-			    dr = list_next(list, dr)) {
+-				dmu_buf_impl_t *db = dr->dr_dbuf;
+-
+-				if (db->db_blkid == DMU_SPILL_BLKID ||
+-				    db->db_blkid == DMU_BONUS_BLKID)
+-					continue;
+-
+-				clean = B_FALSE;
+-				break;
+-			}
+ 		}
+-
+-		if (clean == B_FALSE)
+-			break;
+ 	}
+-	mutex_exit(&dn->dn_mtx);
+ 
+ 	/*
+ 	 * If compatibility option is on, sync any current changes before
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.0-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..0108a7a9b3b7
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.0-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://zfsonlinux.org/"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+else
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/zfs-${PV}"
+	ZFS_KERNEL_COMPAT="5.1"
+fi
+
+LICENSE="CDDL debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	!sys-fs/zfs-fuse
+	!sys-kernel/spl
+"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/awk
+"
+
+RESTRICT="debug? ( strip ) test"
+
+DOCS=( AUTHORS COPYRIGHT META README.md )
+
+PATCHES=( 
+	"${FILESDIR}"/0.8.0_revert_Report_holes.patch
+	"${FILESDIR}"/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		EFI_PARTITION
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!TRIM_UNUSED_KSYMS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
+
+	kernel_is -ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	if [[ ${PV} != "9999" ]]; then
+		local kv_major_max kv_minor_max zcompat
+		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+		kv_major_max="${zcompat%%.*}"
+		zcompat="${zcompat#*.}"
+		kv_minor_max="${zcompat%%.*}"
+		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+	fi
+
+	check_extra_config
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set module revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i module/Makefile.in
+}
+
+src_configure() {
+	set_arch_to_kernel
+
+	use custom-cflags || strip-flags
+
+	filter-ldflags -Wl,*
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	myemakeargs=( V=1 )
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	myemakeargs+=(
+		DEPMOD="/bin/true"
+		DESTDIR="${D}"
+		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
+		ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
+		ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
+	fi
+
+	if use x86 || use arm; then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	ewarn "This version of ZFSOnLinux includes support for new feature flags"
+	ewarn "that are incompatible with previous versions. GRUB2 support for"
+	ewarn "/boot with the new feature flags is not yet available."
+	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+	ewarn "Any new pools will be created with the new feature flags by default"
+	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+	ewarn "create a newpool that is backward compatible wih GRUB2, use "
+	ewarn
+	ewarn "zpool create -d -o feature@async_destroy=enabled "
+	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
+	ewarn "	-o feature@spacemap_histogram=enabled"
+	ewarn "	-o feature@enabled_txg=enabled "
+	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
+	ewarn "	..."
+	ewarn
+	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
+	ewarn "developers do a tag or the Gentoo developers find time to backport"
+	ewarn "support from GRUB2 HEAD."
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.0_rc5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.0_rc5.ebuild
deleted file mode 100644
index 9474ad475580..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.0_rc5.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://zfsonlinux.org/"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-else
-	MY_PV="${PV/_rc/-rc}"
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/zfs-${PV%_rc*}"
-	ZFS_KERNEL_COMPAT="5.1"
-fi
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-	!sys-kernel/spl
-"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/awk
-"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
-	kernel_is -ge 2 6 32 || die "Linux 2.6.32 or newer required"
-
-	if [[ ${PV} != "9999" ]]; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-	fi
-
-	check_extra_config
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set module revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	# Remove GPLv2-licensed ZPIOS unless we are debugging
-	use debug || sed -e 's/^subdir-m += zpios$//' -i module/Makefile.in
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	use custom-cflags || strip-flags
-
-	filter-ldflags -Wl,*
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	default
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	emake \
-		DEPMOD="/bin/true" \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" \
-		install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
-		ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of ZFSOnLinux includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index d4fe46c9abab..c7dbb5e1a0d5 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -5,11 +5,11 @@ AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
 DIST zfs-0.7.12.tar.gz 6565017 BLAKE2B 493df30ecce1f169e02d6c8262ba71cc9e7b01d5b17ce188004f522f0c93943b858434067cba8173ccb3e08cde24a1d3e8a3996b2e852f8bc35251f8c4ab3809 SHA512 278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2
 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
-DIST zfs-0.8.0-rc5.tar.gz 8994022 BLAKE2B f29b9f6d264bbd04553f6855fbdf039808903eb02989e06082d9db8494723e611736db753fa4d27443527fbac189c1ee282ac89fdf799f6182ae428e178d0d10 SHA512 e54a3f9c7947baf619d737a832a545609bc03774a53f9a65147b8c23d9fb5148400a33d99216205a3e45821f8300108882c4eab9995778611775035441428551
+DIST zfs-0.8.0.tar.gz 9084737 BLAKE2B c3095ca07b7c36fa204274be1166fd244894de70b97a11da32606b08e9bb150bc1326ac8424d5c001eb33d2d94e214d3944ddfce885844885c55291a82f11a2f SHA512 ba29f1644ec6807f4cad574e4950e56026316c3d405c9fc40a63ab34c2400d508521b09f656ac97898e5feaca5e0b259d9d4d85f75a4b1782a9db13d3b14cdc6
 EBUILD zfs-0.6.5.11-r2.ebuild 6063 BLAKE2B dfeb1cb507428711a7aabb08a1a25deb4cabde7a66a7c6708634a7a6919b7a8e009d4f33870d1461b76985866547357c5cd2731ebec6bedc3219c4758bac54b0 SHA512 c4506ebd3be9c6e3037dca9d600f9e964c77b0b15fd554f5e7463136a7f98778d04c477a9a6fc1ae6feb2f54bf9c3968c26167bd45a32d1c0f117f8eb53d3e07
 EBUILD zfs-0.7.12.ebuild 6076 BLAKE2B c26271d1252a199e93b20868f962582864d2b50f102efb046fc0c4b3ad26ef5dc552d6b043979eb5c757889e671210bee202fe71453dc2e16dcf00592884fe8d SHA512 2cc0d649737fbed063bb57ac1eaa25669ad7098b477009f8b0b9507ce3c5c9ff1f0c2ded2c5ea348a84e03413c0c2035fd76dbe17f2a0d755876a792d9796f70
 EBUILD zfs-0.7.13.ebuild 6273 BLAKE2B 2bc2247efd975f46320d964c71764a4382255b1acd37d94d1f800f1ae9e7fd06d08fae70b574189136ae373723d505b49ba9ad1ac033aada5ba178bbb1b8d9fc SHA512 bdec6a25dc8d7c9f41ea7c3d505e6e6ba4ead69393826432ff24b898b16d99a0a023469cf932c3c4e86f1641f3192c8110362a7603ec06ec34266c0dc9b19b08
 EBUILD zfs-0.7.9999.ebuild 5973 BLAKE2B 521149bd89635e86c8fc2dd3b3bbc3cc85ec3c79a4ab372910984abd75fbec617080503074da5dff34064807fc9a1cfdfd4946406c4aa6b9e1e6a478db6f6e33 SHA512 90914f61584760f399dcc6eb84995adbb3e31e22dc6a1aa0da2996f854362e8f5d99a73ad1270a6d01fa73e5327c0b04582ec2256ceb623bb62a7d1606de210a
-EBUILD zfs-0.8.0_rc5-r1.ebuild 6459 BLAKE2B 7c0e40742d943d3b858355af9c60e8dd7f9456dc9ab9251e8a9f271d76e14ca9396d16f61f840b8aefca63fd94dd578d8edc4ef2098aaedd7f0d7f2a4c2b2d91 SHA512 1cd06d6d347dc5d3f8f03d296e0567133c122d61c0a70a8efeefd441cd00c2e6c391d68df381f895d3a5da5e809ed18a13757cb6205fbacefddbc1603b8dc64f
-EBUILD zfs-9999.ebuild 6394 BLAKE2B 35227abea28569721684fde714df0317217c2534ff0f9ba8cc84675655714036331da4c57db3ce62ee45f1bcfbf5ef3d5854481ee2a812cb1e9bebf84ab39488 SHA512 1f1078b05602c9a56ea394ca0c211722f0adacfd52f421ebea887176f4e0994480b1d529707da5d4ff241199ce5bb91efcb60154202b8578351f041ab2c6051a
+EBUILD zfs-0.8.0.ebuild 6798 BLAKE2B 378df0e7ea0fbad2ba174d09cdb4fcea31bf2a9e476a0f85bd1d3fbb340f67c42cf8771102aa172cad4c8bc99de88cc4c4a58b3b0c9059b30d3372ac79ea58e7 SHA512 604ebad57f5e8b25c8a513a446a8eb2aaa03197fe40059fddaddb7d0835dff0d32a0e697ee6a88c7fc4734bec2d1b069f46d311be585cabda648caa867e36200
+EBUILD zfs-9999.ebuild 6798 BLAKE2B 378df0e7ea0fbad2ba174d09cdb4fcea31bf2a9e476a0f85bd1d3fbb340f67c42cf8771102aa172cad4c8bc99de88cc4c4a58b3b0c9059b30d3372ac79ea58e7 SHA512 604ebad57f5e8b25c8a513a446a8eb2aaa03197fe40059fddaddb7d0835dff0d32a0e697ee6a88c7fc4734bec2d1b069f46d311be585cabda648caa867e36200
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/zfs-0.8.0.ebuild b/sys-fs/zfs/zfs-0.8.0.ebuild
new file mode 100644
index 000000000000..129f34845447
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.8.0.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://zfsonlinux.org/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+else
+	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags debug kernel-builtin python +rootfs test-suite static-libs"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	net-libs/libtirpc
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!=sys-apps/grep-2.13*
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
+	!sys-fs/zfs-fuse
+	!prefix? ( virtual/udev )
+	sys-fs/udev-init-scripts
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-boot/grub-2.00-r2:2
+		!<sys-kernel/genkernel-3.5.1.1
+		!<sys-kernel/genkernel-next-67
+		!<sys-kernel/bliss-initramfs-7.1.0
+		!<sys-kernel/dracut-044-r1
+	)
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+	)
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	# Update paths
+	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+		-e "s|/sbin/parted|/usr/sbin/parted|" \
+		-i scripts/common.sh.in || die
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-systemd
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		$(use_enable debug)
+		$(use_enable python pyzfs)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+
+	use test-suite || rm -rf "${ED}/usr/share/zfs"
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	python_setup
+	python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	if has_version "<=sys-kernel/genkernel-3.5.3.3"; then
+		einfo "genkernel version 3.5.3.3 and earlier does NOT support"
+		einfo " unlocking pools with native zfs encryption enabled at boot"
+		einfo " use dracut or genkernel-9999 if you requre this functionality"
+	fi
+
+	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if [[ -e "${EROOT}/etc/runlevels/boot/zfs" ]]; then
+		einfo 'The zfs boot script has been split into the zfs-import,'
+		einfo 'zfs-mount and zfs-share scripts.'
+		einfo
+		einfo 'You had the zfs script in your boot runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the three'
+		einfo 'scripts that replace it have been configured to start.'
+		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
+		einfo 'runlevel while the zfs-share script is in the default runlevel.'
+
+		rm "${EROOT}/etc/runlevels/boot/zfs"
+		ln -snf "${EROOT}/etc/init.d/zfs-import" \
+			"${EROOT}/etc/runlevels/boot/zfs-import"
+		ln -snf "${EROOT}/etc/init.d/zfs-mount" \
+			"${EROOT}/etc/runlevels/boot/zfs-mount"
+		ln -snf "${EROOT}/etc/init.d/zfs-share" \
+			"${EROOT}/etc/runlevels/default/zfs-share"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+	fi
+
+	if [[ -e "${EROOT}/etc/runlevels/default/zed" ]]; then
+		einfo 'The downstream OpenRC zed script has replaced by the upstream'
+		einfo 'OpenRC zfs-zed script.'
+		einfo
+		einfo 'You had the zed script in your default runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the zfs-zed'
+		einfo 'script that replaced it has been configured to start.'
+
+		rm "${EROOT}/etc/runlevels/boot/zed"
+		ln -snf "${EROOT}/etc/init.d/zfs-zed" \
+			"${EROOT}/etc/runlevels/default/zfs-zed"
+	else
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+
+	if [[ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]]; then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+	fi
+
+	systemd_reenable zfs-zed.service
+	systemd_reenable zfs-import-cache.service
+	systemd_reenable zfs-import-scan.service
+	systemd_reenable zfs-mount.service
+	systemd_reenable zfs-share.service
+	systemd_reenable zfs-import.target
+	systemd_reenable zfs.target
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		remove_moduledb
+	fi
+}
diff --git a/sys-fs/zfs/zfs-0.8.0_rc5-r1.ebuild b/sys-fs/zfs/zfs-0.8.0_rc5-r1.ebuild
deleted file mode 100644
index 3ed40d3591bf..000000000000
--- a/sys-fs/zfs/zfs-0.8.0_rc5-r1.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://zfsonlinux.org/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-else
-	MY_P="${PN}-${PV/_rc/-rc}"
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/zfs-${PV%_rc*}"
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags debug kernel-builtin python +rootfs test-suite static-libs"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	net-libs/libtirpc
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!=sys-apps/grep-2.13*
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
-	!sys-fs/zfs-fuse
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-boot/grub-2.00-r2:2
-		!<sys-kernel/genkernel-3.5.1.1
-		!<sys-kernel/genkernel-next-67
-		!<sys-kernel/bliss-initramfs-7.1.0
-		!<sys-kernel/dracut-044-r1
-	)
-	test-suite? (
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-		virtual/modutils
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-
-	# Update paths
-	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
-		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
-		-e "s|/sbin/parted|/usr/sbin/parted|" \
-		-i scripts/common.sh.in || die
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		$(use_enable debug)
-		$(use_enable python pyzfs)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-
-	use test-suite || rm -rf "${ED}/usr/share/zfs"
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	python_setup
-	python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if [[ -e "${EROOT}/etc/runlevels/boot/zfs" ]]; then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}/etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}/etc/init.d/zfs-import" \
-			"${EROOT}/etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}/etc/init.d/zfs-mount" \
-			"${EROOT}/etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}/etc/init.d/zfs-share" \
-			"${EROOT}/etc/runlevels/default/zfs-share"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [[ -e "${EROOT}/etc/runlevels/default/zed" ]]; then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}/etc/runlevels/boot/zed"
-		ln -snf "${EROOT}/etc/init.d/zfs-zed" \
-			"${EROOT}/etc/runlevels/default/zfs-zed"
-	else
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	if [[ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]]; then
-		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
-		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
-	fi
-
-	systemd_reenable zfs-zed.service
-	systemd_reenable zfs-import-cache.service
-	systemd_reenable zfs-import-scan.service
-	systemd_reenable zfs-mount.service
-	systemd_reenable zfs-share.service
-	systemd_reenable zfs-import.target
-	systemd_reenable zfs.target
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index e24458b4194f..129f34845447 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -98,7 +98,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	[[ ${PV} == "9999" ]] && eautoreconf
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
 
 	# Update paths
 	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
@@ -170,6 +175,12 @@ src_install() {
 }
 
 pkg_postinst() {
+	if has_version "<=sys-kernel/genkernel-3.5.3.3"; then
+		einfo "genkernel version 3.5.3.3 and earlier does NOT support"
+		einfo " unlocking pools with native zfs encryption enabled at boot"
+		einfo " use dracut or genkernel-9999 if you requre this functionality"
+	fi
+
 	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
 		einfo "Adding ${P} to the module database to ensure that the"
 		einfo "kernel modules and userland utilities stay in sync."
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 24720f478bef..55146606493c 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 8aee479d41c4..b11fa25da28d 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -7,6 +7,15 @@ DIST genpatches-4.14-122.extras.tar.xz 17488 BLAKE2B d04fec3b9eb350599786270edb0
 DIST genpatches-4.14-128.base.tar.xz 2840048 BLAKE2B 965e2b5c469fc30fc9f3542f8465a7b492f0215396dfbda37a35e68a1e6536213cf66f23909adfdc31fac0b53fca7ae1ce65c785a12f512925c3443a73707cc5 SHA512 b7f77407ed6d60cbcf4b60cf7334d0fef348e9dd68f33ae6920fc44ed171135b5df6b1012c1affd3cb570d92503e429f98ac0794cc697d7bc4b293f966f9edbd
 DIST genpatches-4.14-128.experimental.tar.xz 5228 BLAKE2B ba37a6cce365dfb193d3339d759010bec8f18b4ac558b104896b09c329941a09ba82f993103a1d8a18321f8a2495db3bba9639ac6b70d028dea5e32aa30c5443 SHA512 4aff0ff4a96ca1bc347a30a2bbc5232fd3d406931b74f62b8b3e57cddc02dec54d90a5d9de67e5e2c74942b68079952a9732dd2622398f290e4627d93db4510a
 DIST genpatches-4.14-128.extras.tar.xz 17496 BLAKE2B 87ddc81f1510f0a71622bd6867efa6b2cae6c2bd3eb184ea0c08219cc2692160918c1b57e46866d4b1bd70de821d8cd40f59702cc62b87ad1cb59d47654e55c3 SHA512 5610b4c2d3c0de6819dff887dddd7b1375df3ccf1c2c91c3f64565e8ce077e19e8c43288cb01265bddb0b1cd16c833a5795b39e94c3e167d9ad0c94db7270f0f
+DIST genpatches-4.14-129.base.tar.xz 2853096 BLAKE2B 0cf60aa21e39b529c0cba9ac1e387a126b0da1c60c4de834eb1bf39e39aa491ce00ddd244a8ba0f8ef98dbb24171b1b7bbe022f8335722062da23b2a0fe375b1 SHA512 fe549960e6a9595a09d6359ba75a13b0f7e77a08eea92406cfc5ba1a67e3319c69c340f74b448e2491be02f15f2f9843a84ce659a1685777e5ac53d0fd664d7f
+DIST genpatches-4.14-129.experimental.tar.xz 5220 BLAKE2B 22f3c813d5d0f1288166c4e2d8df2cee999b40e9f7ea4ec3287b32d67234ac80b03e6682156091fc1b9f8ea1887da0803ce946d49c44a21f6b3e81e5171fad7e SHA512 7ae95c0060d2a623ca001fdf50fbdb1974df9c721348dd7780bab0e3fb53eb9f7429962ee727e787f05d7fe20149a73806c6c79119f0f9b6d6a7860388402cdd
+DIST genpatches-4.14-129.extras.tar.xz 17488 BLAKE2B c491444d489f1a7e2ff8e012f4aeecd3aab37b6e5046704fb6c4601bc81e02bbe863a5d767086ab364673cde07def9a16dcbe5082bac0e587aa2f794ea627cd4 SHA512 a1bd8faf5fdd11500442e4ad46bde4d549cefd093ef34a3a1b971c9a6270810d1ad899265daf3e94f4b657f8ebcfe13a4aea88ce821cd61ebfa3f54cffad3bc5
+DIST genpatches-4.14-130.base.tar.xz 2868436 BLAKE2B a8d2703ebd071b467c0b9a759aea8ef3d8583be68687fa39feaa1a00e84e491f3b5483b43fd48372a09d0ec08559e55ce25334dab16015e0b0f1b42b529237e1 SHA512 07ee67c87ef731328fd794c98c1d70e2bb06f0f1ffba8a89e4d784e6edc157111e6b1def8e97917f8425fe5499d6829d9a3ce755eb3dc921dd00bf236c5b5d74
+DIST genpatches-4.14-130.experimental.tar.xz 5224 BLAKE2B 1ea0096f71087bb4d2b0fec6beda161e5c05569b0cbd54f7e60b497343b1d92971b1551f15706ea93aec1b995df9e847651ffa9f4832d4ffc5d3bd42db34dad3 SHA512 1947b1ae0b42976ec424b228aae471ce872d882e2e4c16efb0ec3489f40c177cb22f113fd3e707646c3fa9fbe2edb42a014f9160d0fe20ebbc3bf1ca5d5e9592
+DIST genpatches-4.14-130.extras.tar.xz 17492 BLAKE2B 7d272edc35444eb08a1025717cfa7165cd23a7dcf4173f142b42e90da0940793789023fb063e1ed15f133ffc5a3459c7abf5aa86103e3fb6dfb2396ce47cbd53 SHA512 7fc1cfc4976f7d0143e016ed902acde3724cd9769b476a68947f6c375c9a40451ec6e55c0088140af10220b06b3f4b05dcabf4e997d376f7e86e740167c71fa0
+DIST genpatches-4.14-131.base.tar.xz 2906408 BLAKE2B 4055930a9dd4b40b03cf4687367087c45381b1a2078947117d6d413fafd5a993d0d002479d3b0b3fd478d479c2fd7126cb2648a21d281d6f674c9f8a9efbd39f SHA512 9a8ec998bcd65ab7c8400b9ad120dc9dff668ee8da6454b8d4fc46361f3a3a7551b9c1eec622562e3249047378c17713d4d2ebea15234924dbc0019749034c38
+DIST genpatches-4.14-131.experimental.tar.xz 5224 BLAKE2B 4625fba43e9d9cd7661f4b75015def218d5d4e5fe98fc6dd966e9f17afb5ae73618e1cd3320e760eee75626d87fba30303513e61f30f24127ad161517057f70e SHA512 77e3527742c4f43faf31fedf424ab6a7a2e3bd1a11f21b04f227515db380246318f7c0ec3595a0b2105ea833d9eb9c6dbb4c3343fae1b614691ef9ca8843ca08
+DIST genpatches-4.14-131.extras.tar.xz 17492 BLAKE2B e1b9e620fce60222ce75deb3da2556c95ed53fcfd362d8edf51eb8f64c9378afe7ea85809df1556a775213a811d30e6629ce913ca5a0481ffdf7526d842128ea SHA512 a164b0ec2e06766d75bda5bb30ad8fa2e4e2211a0343753df9c0e2647736210174f06d40b604d63a30a53c27126a87688d8d57a758a97afe6546617bc1c43cf5
 DIST genpatches-4.19-28.base.tar.xz 809620 BLAKE2B 2bf07264d3d65e7908b27727bbfb295c53a0cb2c8a9358bb41fa75a04b3094b0a9ca68721a440f6ffcbee3420b5cd31211f5e1673f8fe8043fdb5d913efe312a SHA512 00c9225dd966e02cba66b039e6bead431162d13b64c3a1680fd5c8b2f1f12af86bcb3c0bb553e88bdc12b4675d99be5944f280a5fad7fbf59e8bc6ab6d041ec8
 DIST genpatches-4.19-28.experimental.tar.xz 5804 BLAKE2B 6c4a52ce04f35a0c971ef438f32acec66395b763f725176312d4ea7e7467e9b2bab953afb64df744acc0827bb96cb13f2537427a56cee10dc95227300bfb6b02 SHA512 e04c94dd53325e89f25343999da5b66f4624605d66859884f2768c073b203126f7aad5fb5a1012fc56a4e2906fb2f3a3f8fda48d8e300a1a0bb8dc7c1719fa82
 DIST genpatches-4.19-28.extras.tar.xz 17480 BLAKE2B 599e85a011c87a7a9bcec44579fd4e54ff9ab78a4b8ee727f6b741acea29902c0531988d5abc6ff9512a205601363837639b5ba31190a044009bac13cb44067b SHA512 e201383a2fd00d063bd3d9817fbc40052db19e46db105ddb15dfd1dd90001a11de12495372f2225adcc80b620252ea20d49e73da46b8b3c88e62baa71a71a8c5
@@ -16,6 +25,15 @@ DIST genpatches-4.19-38.extras.tar.xz 17480 BLAKE2B e5a91594af32c1ad12b2c89316e3
 DIST genpatches-4.19-45.base.tar.xz 1284916 BLAKE2B d4bdbd0392400382d6baa9bfef5f71a43737aef688037865373eac04802a380c60265a6deaf3889702b5d023d695e30ec049bff0ddad74543ce8bdde034f29ba SHA512 82e23dbfdda4828d28fdbae5526a07e36a958387115fbb5dc9e6825439eb3fdba8602d490e0460e84cc2b3c8f21be15107a4db2aba73d4245b2a551f2010a470
 DIST genpatches-4.19-45.experimental.tar.xz 5800 BLAKE2B 66685ef52bc6ec8d856e66c2f96c1e2be0e6054c0ab126078e74d0f99fc4fbf6a184eeb50791a4d49d0f2e4c34d569d319a938d6c9bdd932ec549db2b274051f SHA512 89fcfd336aab90d068a02da9fbba85b954f8fb728c5fa9dbe8478300d32780bbb375929b31d18a032f5ec74547b05b40df3ce42c0236e67f9b9fed5e7c1a250e
 DIST genpatches-4.19-45.extras.tar.xz 17480 BLAKE2B f69d00cc9948456df19b0bbcad0f2c1767aa28e985c74fae8f2d702f8bb075b25b0132d42678820946075ef9373b85e17801c97c654157d656f6c9d34750e8c5 SHA512 71f9f57ca59026a01f5f4dcd7ffc7e62960328d4b5fcfc9e561b5d6a1073f90604f510e6656128fa6a2c23bb847b65643094c4b1cb20224a83611778d7aaac31
+DIST genpatches-4.19-46.base.tar.xz 1312108 BLAKE2B 7ed70fd23a1ff7283b48e29de56b177fcf86b2719eb424dd2850fef8110eeb7d9cd7f17a95afd4dcdbf441465d2906745dce1615fdd19b7a7e26205bc75a08ee SHA512 890e39f2241e690f97715d90adfa3176a8fe5742afbb82b11c9f8da7ffc620af2da1f6b850f3954faee6bbaebd10de5d0687516e96574dc630233dc7c01ef451
+DIST genpatches-4.19-46.experimental.tar.xz 5808 BLAKE2B 20d8b6a993c00e6668e90843e36dd8e393ad2fe1e7a4ad724677dd4d69803bc565859f23791063bac064940ca0d3231c7f48b14c1fbbcfa2eee896ad221c87dd SHA512 1a8d93387e8ebed75edd4298c9999a1b9077ba1b85964bfcae4a47cccc9d1aa4f8c2a59f0aadf59082b8ba892c15845e58da5067a4d304ad006bde1e52a5c280
+DIST genpatches-4.19-46.extras.tar.xz 17476 BLAKE2B 15ae4f55beb8763b33404c13072ce8be4f3083aa9c083a18d37c2c11d2d6b004033b9d502239058b3cc3fd5b0535cac17001eb3d74547c068046132839033e42 SHA512 5d0a92336105100697090e4aa8396a7073600011ceae4406c6b0106af6e9ac68130f0899a7e8244ec0a0d8ab729796934809d5874d855a6e4e12c59292a83684
+DIST genpatches-4.19-47.base.tar.xz 1340244 BLAKE2B 172f66112d8f138726a869d02a83852c62f1f2f84f10d2dd3bc42a1973d9a175318437e92895c515e3186ab25521d72ab50832cfe0483f4b1b5e12bd3547bb15 SHA512 9b25ce4c59992f362f2a446c45e40a2590c4d24c6132797b03957d35d560de7642da9b543f4925ee7b6736c64a640a967ba3e96b2ee11548915eb0dccbfd2c68
+DIST genpatches-4.19-47.experimental.tar.xz 5808 BLAKE2B 4bc6ca1a5ca78ff322e6a39694aea90900614015c0be67d862da193eac54d95d791002d87c1a3b67ee8557246212e84117b3a231a26de42ef217893cce0a3c2b SHA512 1ab9385b86d6c2ce4fd24b1881adbc1728c27e19da13e388964c7cd3683e1c4e0e1107ed4c42d05846309899962e1ccffb3779424be26aa18022e316f77a55d3
+DIST genpatches-4.19-47.extras.tar.xz 17484 BLAKE2B 8208f7589e0cd8cdffc0163fac5179578ff178440c253dc87c1567173b429a6456d705b00d3034183bc3e48287bf386f9be8a1b897a4849c1db4f4f1b068e208 SHA512 953e1e48ef9cc6705937f3c2df7b772ce2f6cb863fad96626e24a4c839e730cc3ecf85f36a0eef69349b337c6a6a55e64519a8613c329d11ae1a8e01d257020c
+DIST genpatches-4.19-48.base.tar.xz 1403372 BLAKE2B 9e0b273afd874fc1b6314a2d39665574886001523cd9bb494bc3a5e50325af5196ef385a2f33c3cdcded3baf17b1c0fe60609970f8ef21c53cf484e372294f2a SHA512 0702d9d395531ef78316ba3571b0f0b8c4814eb0a85d508d1166e47c3f2434922516eb9b779999a61e6aa808e6715bba35e5190fdd2b4cea722ed0356f15e4f7
+DIST genpatches-4.19-48.experimental.tar.xz 5804 BLAKE2B 62df9bf87c88ed4f711e95bf73bf437f70a6696ca949abf169b17abd8a13c98e82e3ba6ea575c926eac50e24b11d18647200aee2363f72857811633ebde404b6 SHA512 28fd31a38d99ed96e71da700fea4015984150f4b58f83b85b530e55439c53b5c1464a75f0ad6e46a0180e83e5d0321d9faefae5ccc6b6818a7542cb4214f7234
+DIST genpatches-4.19-48.extras.tar.xz 17484 BLAKE2B ed398921811f890ffa13594c513185339151322fc19d053f3cdb7f0648dd273ec7287279972bbb9c7a504883a0de73d7c614d31ddf80ca5d13fb36fa30303767 SHA512 cf688d79c545956a4dc7530e316304036f519d2e1e0000e9ff3ad9aa05c63b1e9eedeb36c962053f39895c0cfe21ec50cddd828f57b1f90552050cf646f0a33b
 DIST genpatches-4.4-177.base.tar.xz 2683240 BLAKE2B 663016d9fc9bc7be441364e929d0bf6c2e78872c809174ddc08149f04d484a8abaaacb5abb58fb46bfac9704bd480ca446cb6bbfb2a12aab2e43dfc1313b12bc SHA512 1e3371429f322c76c619c89c8d99c15ee9c3413f7fc54e71a021732f6941ee1e385634e45877c834ed3cb3d7a1d1971c5a89de7fce5c456ec14fad0276bf9cb8
 DIST genpatches-4.4-177.experimental.tar.xz 83316 BLAKE2B 2ea31e71b0838d9ff82d195fc8f1412fd2224ed6863ce0bb8b44785f9c66905132a53acb6cf7ac4b612d85239cb719eb6cb790f79064eebf46e2977411219098 SHA512 498d59dafeb326cbf072c3b65ad1d44ad88a576a66d85131d979185787bfbcbf084cf193530f6df6eb0d4ff5b93135ce083c4c66abfee9991dff71ff2522c870
 DIST genpatches-4.4-177.extras.tar.xz 16464 BLAKE2B a46eddeea412631293ee0c3a4a4fa9fcc35967c4fc26986363b74f5182b495fad1cf66f2c4247eac128ba826d1a3bb36862929d1aa63a9a13e64f0700d8fa0f4 SHA512 250a2f2ddb8464fe245a41ace354b04047c9850b4073ce7764a24ebaee52d3dcf726771b222a976a806f08f6aa95e3ce4a226c5c6896484c029d08a9fe600480
@@ -40,12 +58,33 @@ DIST genpatches-4.9-175.extras.tar.xz 17356 BLAKE2B 7a8986357ce676b6b735c4e78506
 DIST genpatches-4.9-182.base.tar.xz 3094892 BLAKE2B 51d65136b98643b668e8a9e1e8f2f7e2db89b7c5ce73db432d2a9def5d46097e32fbfcc67bea94b84d00770cfb30cbea5bedb17f259e3efb87f0fb07312619f6 SHA512 c1a85146e744a13d73d3b600b6d43fe91bcd4e96b004cc2bfe8cb8ff6cdda91e84b054328eaaa70177c2132d013d00d778219947d9801933381562ddec3bf9a6
 DIST genpatches-4.9-182.experimental.tar.xz 106400 BLAKE2B cf46a596cacd79ba0ccea9f16a76354a20dc3d6b09d587fbe826fbd1e62cec4d2c7fdada11a9c6fa656ad2905923f136d0dbd8960af35072f315c3b31cfa8b1a SHA512 6d9a887055c095d58219159d2038a6b5d869c1ede51744e15d7cccfbe3c09d4f8574e9f792b5be6a4c102ced7ae706f3b3323cebaf131b4790ef7276a1a95b56
 DIST genpatches-4.9-182.extras.tar.xz 17360 BLAKE2B 86a04000c8361b00780cdba1fcd62d81501a5840948bc95b9570add0ee1d7b485842672b512ea8e241ea959daf8916e974cf0bb367b3730a7bf1ecad2b559972 SHA512 d6c805944012aadc2dc2528f205a791f8d368bcd8c0234c4d9e2628b999cce7982b36269457e42467c17f59038800ee9128ff0d0659b8f4156e645848df5aa83
+DIST genpatches-4.9-183.base.tar.xz 3104884 BLAKE2B 5adfd5fb68a7e910288a58adc1b8e8c2911d2fa14a3da4a7b0a86c21841ca3064cc71924c5f78c121e897b2cfdef4f64e352b5a7ce3cb66b113d505a58dfd69e SHA512 940fbed47b6b5bc31ec140569da7c09c577bd73b2862996fcdcb3bccbef62af52870b99daf96ac5466847b5f4c2fb41d24c468b2adf4b73297000609bb7f8e46
+DIST genpatches-4.9-183.experimental.tar.xz 106384 BLAKE2B dfa0939f0fce91abafbf869f5cc8f4c42297732e5b7793e5555d5326f1a392e51fe79f6ab6480f7b849bc327cc30f8952b47130eea34cb3b1fa6f0bb3cd2c98f SHA512 561fe1fb7a2158d86e1bacb56ce4f94cb7dea1c4a99bfbe492b0a6e391122162067ce298b79819c07a36eff826b411f9392147626d4b83cf38d2e132be0d84e2
+DIST genpatches-4.9-183.extras.tar.xz 17368 BLAKE2B b96629fef9107202f7d493cd12cbb9a0941a921e902457aac9a1130fc23e368cd84f5191ba021f65e92ccd017cfe70a8ba269b30d5221bf68cdbad1d1d0f88fb SHA512 09b832136b84656998cc2c4e5fc2f6b9a239e88ed4f2ffdce069e182ed525b3a001cd968f4d1825d31a7736357680c05b2a9df06ae4e515a0dd3087dbfd66a64
+DIST genpatches-4.9-184.base.tar.xz 3115012 BLAKE2B 1b7cdc2e06e53426b561a6586435a60cf5a6473c475b98e54088b7c479325a6e89e46b12080ebe164e4de18c6ca7f1c178d03a5b31681afe47f231f2c561f634 SHA512 f4339d585b11c3b7d1e8e9231b8d036b627526dfb4457f53d47129e6f27f3f6c0399de7e97038f5f216619343030418dd71b817527c97051d3579439bbe53584
+DIST genpatches-4.9-184.experimental.tar.xz 106352 BLAKE2B f74f5385b6c9a6487e2214eefccee27a30849543946acbabdbe9a055ea2011d0d01d063a27119cb628e3ba4cc7bbe6d9e2e545a4408244d610e49f570a557e73 SHA512 ef07fba4fa9fb524242ac5a5257dd60ef0397356c6987d6f38a1125ccdb0579c404acf978b7097a3e3a95bc57522a51eba0ee25604f3f9cf77e204dd095296f4
+DIST genpatches-4.9-184.extras.tar.xz 17364 BLAKE2B c428383a38e629a428e939477cd30e2e37e5dc2919c37183f484a24c87b554af33d9dcdeba043a08aac6b76a5c7b20dd920b75f1d29b49a6ceee4f5856c071e2 SHA512 56d77e7efcbe3fb498cbe7ec9e1b76f4a99cfec2627e5632bcd1cf505f790b6998affea3563ad5b0e40649dba313536bf1591d3d0e384b23d48059cad845dfe7
+DIST genpatches-4.9-185.base.tar.xz 3139412 BLAKE2B a46f74ea95300f1af4d5de456251f343fcc62857594e29981d55847efdf1389f35b53e8444d71cdabbd57c226d5c8296d648ac3f1bbd6c14b9af32dd7eda4bba SHA512 03d948bcc34f107acb13e39ea8279d7569e4a33964bb8801319e1c82966345f43218e3211d0f8d9e4673c91961dd015528dbce0d2ae756a730e1899c14135abe
+DIST genpatches-4.9-185.experimental.tar.xz 106356 BLAKE2B c6c51dc6b570b08aa609158313282f3bc3a5662048a386947bf24718fdcddcaea075c9d65f19331be0499d14ef97445fd335e4157a0e336a57ef2b3b638fb877 SHA512 05b35c43ea20459195b7971dbff89a520e2959254f39d2a19ab69243cdcef5456776829c63e347f64ebbb2caf397cd492931afed60e1cc4e5cec27a45e94dffe
+DIST genpatches-4.9-185.extras.tar.xz 17364 BLAKE2B 6431c99d5edf0eee6013473439bc84134f271a356bc6369129946c8c389520891f46b7fc09fc64ac890c5f182f8636e483134bc6e048b9bff81a846cde3c9034 SHA512 7ed245a2596d252437c562cb3dee70f2ade567d411f0815c8699f2e4d2ea667ec1c9f29b694eacb1e74b4571f4d3c7684db3e7959ccb73d02bfebc8f77d04c28
 DIST genpatches-5.0-18.base.tar.xz 529328 BLAKE2B 7180f31d9d286d43de08aec505ea79df741d56c2b08cc441941755d811b6410f7bca279343b2b8cf9389a9865a7575cc502e44f18330d66e4793c9c77cc0005f SHA512 4897fe00787e5136df302bbd4b0abe030199744ca10b2c9a23e229c5c5d54e6d2a5995d8b410bdd3c07f9736f338da480737b4c16de719d3d1d4e87b13484305
 DIST genpatches-5.0-18.experimental.tar.xz 5812 BLAKE2B 3d34ef9c257fc4902ee0a08c920b57b62cba8e9f93fcd48c0331f6d9d67b9cc9b230c10ef62c4a6bd6dd476f95a985307ef962ece782fef3ec564b9e08954913 SHA512 7ce3400126ad97e90fae510dc29bb0e330cedb97ff56696b0df0a77c1f49be7522de0e9e2aac084bde182001bcb74872c0ed6bab1c05d469fe5a0d66defb5958
 DIST genpatches-5.0-18.extras.tar.xz 1724 BLAKE2B 6751d1b8374d3c5781de3d47d6645263c71625ea665343483a79c1b824b3667dcf56923aeeb974d3f0c7cf802e45fb9931a627815e2fe7bc6d5855a3632ba865 SHA512 c63c44eab24600e44ccf96bf8a81eaa77561b61447d30085da0fe1ff8a6adac0ad6acd9a573b407e5abe5777961faa940c2e4e8c06de77afeeb8a8fed69d70a2
-DIST genpatches-5.1-4.base.tar.xz 61560 BLAKE2B 2f11e7ae6eb04bb908921f60f2e053607b705237897dea5a79a2246ce1ed9a40150b0d2c270c1de73679f113865ad1e456b1217b4ca73092fa910616c14a03f9 SHA512 e7a1dcb0b3085c44ad8638220af0cac16cd19c57c524ad62d4284ea0daec81740971717b1a5795203352a2c5b0dcbc51f379ef44963050358930899eed8809a8
-DIST genpatches-5.1-4.experimental.tar.xz 5804 BLAKE2B 535934b0a7d4a681ce8406534352ec2db164c33b7464233e266593e89df3a2b74f0a4bdf0b522bff6e083705a71c3189d5cb1caa639eed8ebb28923bf4985d2a SHA512 2a7873795807657205c29194f9865f539811035626be5cf7e8ee5a7351d0a32d590c813088c9704521e0c57adfce0bf4f160ee4429cf52be457e38af021141bf
-DIST genpatches-5.1-4.extras.tar.xz 1720 BLAKE2B a35ab24710007868bc6dd27507dd1f3388e790d9e7262ab08678f33311c52342812f87ca14b1495078ab44267b3441070a7b2c7831f880438659d71c0b9b5772 SHA512 fd70df8093f7686125948dc901cb7423aad5b82b9db97e95eb54ff4c409fcff785ae56f9639605546523a11b8671e36d40bd7719c3bd246b0c5f5a3d087a2ad2
+DIST genpatches-5.0-19.base.tar.xz 567088 BLAKE2B a3ae20fedf2ed3426f76b614531fc0330a4b7dfa7f571cedbcdce58b6c353224536de48f2eee5ad5123fc8aa2f7922c8e3e4f0ee0ce197865e7b1d7b8bd551af SHA512 646a2b008e4125dab3f4865ec5d62d2f1e5f3d79814632cba2ebcde77b2703f47e0772f95d5f13810912cda3a223cc9bf76794759f3517a776fb17aa098a0c32
+DIST genpatches-5.0-19.experimental.tar.xz 5812 BLAKE2B 3afed008bb5ca28c15cbd5dc82fb3de85ee74010e961a91ccc0256b10b4b3a48a62e00a6f235f48b77ab34d718bb42f7cb2c8e3acd05a4040ddbd72156a295fd SHA512 49f8bb57f9ffe1d15c2efcd1b8da201b3485a1da88bb20eeb094df5f6c95afefaadb6b4ba0a8babd53aee1ba0fbac1f0c1958f16d9f224a7728925730b0e65e7
+DIST genpatches-5.0-19.extras.tar.xz 1724 BLAKE2B 828c1a07c12968740283e1cff5229775cdcd67bbbc9b8f7a8dc91683cdea7f3b1ddb69b6f33dff9241997d7b28b97a4d2297967dd89817db76db76eb60d70c56 SHA512 3e49100d492cda536a271d802948d5d81ce25ae7fcbf716275a6310e2d173f1b751fc5bf40753ef2c9864bb721c65db0fac11c70a9760ab609ade6a02644f9b3
+DIST genpatches-5.0-20.base.tar.xz 605656 BLAKE2B 15a0e736ffcd09d357066bfe3442be7fa378626ef9e975c2f20e686084fb0eae6f557f66bfb23ba8405a7f3f425c4ee14bd9deeb9b33d9d0447a2c45fadee506 SHA512 b6b12090ffd0772cd3584e9761a446e9277c1d7de1f6c56ee2d597a5cf3ca4e4c724c890f178e0d06250c96d1edf7efdca64fde317c60ac8a09b2c639921a194
+DIST genpatches-5.0-20.experimental.tar.xz 5812 BLAKE2B 35660dc79c63562c141a3ea92b64dfe1999f9c37aea6ef8b83cf463b1744a569e3e8a44497f511d4c8bbda17952989a340b680214e7b830a66348f622e1db783 SHA512 ce6a8175c788537ba8a57ee0673e8dc2bd32462b8b58459d67bfb08837aca6bc1c27115bc202a4bb4457f228e76523094b18b986d8d95e799d4c349e15d2a02a
+DIST genpatches-5.0-20.extras.tar.xz 1724 BLAKE2B 2dc16e375c5ff05f7f5ab2fbd7f14a9d284e312d466aed9909190a92f05a35b542ebea540c0d645c2d9dcccdca5fe857d79c36d683d4b44537843dd58d5793b5 SHA512 190c254982fca3b66ebd28f849d9864af01f1acc4e23a42f3fac4e0118748351bb5ac4dc679cb097be00146593eb5a67a589a969f13cde3b923c0d4573acd228
+DIST genpatches-5.0-21.base.tar.xz 686712 BLAKE2B d4429c519533d564f5825d8e95908a954adbe652fbbeab74e2df99d6f3d81852be4c5bddaf67b3ba5a69badcb705847c61695545f26950d60898a71f5715b9c0 SHA512 754f8045d515b1162cb2a5f5333da840a3e9a3a552c8cc39c56d2278c1a86f5382822cc193bec3ccb302f12f8adc9e43ec092d702e74359bac6229e065df6abf
+DIST genpatches-5.0-21.experimental.tar.xz 5808 BLAKE2B 50ae0cc1d111253f1f9e93eefbfb98da98b05648ca0592f55b4b954dd3a636e804bd852284512acba27e3d1408687ff211c4c20c5b026c89df4903d798fbc1dd SHA512 5a105a05fa6d0c01a8a4861a5a9e3f805442d587f2e865c68663ffbd0858e77c437614baabee70133d70871fd9915534d52e678a5c42e96b2d31f42a9c2f12c8
+DIST genpatches-5.0-21.extras.tar.xz 1724 BLAKE2B f5f5de5afec1a8dc09d2552a003abc8283c9e58268bbbab709002c68412b8c93353c608e66ef1a2c985bb523e30f6c2f373d495e622345631760e5960f352f34 SHA512 434506eb2273e0008cafa56d85b2667d769bb424e3eabe803adf2f100933d3a8066f280b66868ad09b5bdffcce0e64421acef3cbfb05943621eb6f7876de1d1f
+DIST genpatches-5.1-6.base.tar.xz 145980 BLAKE2B 880014f19159580c9eceb3dad22b335727bc7e41b55ab20095bd6becf72f29db9ebfd0c9514e5ca722b035191b2ba1fea29a87678b2cb9d86da4bc36c1a46b2d SHA512 b7465cfa9b8bc87e5952782bb60130c75028725c0ed7b8b2884b0ed5557b7cb2a1566c0a7b6d236c7b1cdc980af5d63ca9169db0bd6731526aed42cf7c5aa11f
+DIST genpatches-5.1-6.experimental.tar.xz 5808 BLAKE2B 7b21c9bbb21b21e2a999bd38038cacfd389090845ca2b1771aeca931bc3fda81894f81ae1eb9ff17eb35de215bbf5de23d43647b9d87e651bc0af72d6d8f0dfa SHA512 391a1dca9b01bcd06a9a281fe2a8330128bc89861902341a767d7e0fc354934a2eb0f4c8dab17a51577d58fc1d86e133da7069c8a7f91ca5e40d108d61c10550
+DIST genpatches-5.1-6.extras.tar.xz 1720 BLAKE2B f45fc2bd8264cfd7397eca87e6fe49b92090a68fb7d11eef6f33a0d0cee1f75a5939cd7ee8827d8825625f8ddf422a5aa0159d2c2091b7b835ec33db0c90e3f8 SHA512 7400418017339ba2970bcf48f34d9ad3bb24fe3f9708ae315d72b1f3ca53e93cdcec7a0cc4da990fd678979306322b27ac5f90b13a2814d7413715a1f559bac2
+DIST genpatches-5.1-7.base.tar.xz 253828 BLAKE2B 31654be1cc2d2094502fc1f93785eec1abd25aba2cd4b9d01699fc82f9b1472d4a39af27ae61c4fe5aa1cdf3ca0e8a841fb8cc9c72289eb70d4a88a36aabb4bf SHA512 2277eb624628e428c183cf46855fe120aa8aae9bf1a7dd9402d2bc469a050fbfd36d52ff0e7e0015cbe491656c47bafbd6b63a12cf74c044d17cbed86e76336e
+DIST genpatches-5.1-7.experimental.tar.xz 5808 BLAKE2B 7a5129c2d36e2ba6398171b6b74d6f98e1e5e6408dfbcbf569f11d9c4077fb0283582bcfee41daaa0efbef1ce7f0d6548292be6b4c6f7a325de045d024238d7a SHA512 450b015089f8ccfa89950bd2c5db6a7c180f1644a1a1268b317e2d791f5d0edf3bad982ec9acd5772ab03202af5899c20c13c4dcc2c50ad9aae28da86decf3d1
+DIST genpatches-5.1-7.extras.tar.xz 1724 BLAKE2B 3ca8f3b48aca88056ca5102090fb2da65e8442a2833b888ecbd32f31c7ead183b48fe30257ddfe2dbfc5132da809befc99c00ebc3b6a7085e1adf7d45d52ea83 SHA512 b4c5bb057cad57e4c73868888da6b2bbdff5af0d66cd95941ab8212afb2e9f8c460777c7bfccdc765db973717d1e81950a0e7ed6e82f738c7b4b372e7193dbfe
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
@@ -54,18 +93,31 @@ DIST linux-5.0.tar.xz 105235152 BLAKE2B 59635c87a4123c90ab8598c9ea5167096aa6bc76
 DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 EBUILD gentoo-sources-4.14.105-r1.ebuild 731 BLAKE2B 991154747665f3ccb376b0d6cf1e681c6cd1f3ca50fa7825b45b2b11405e0698ac2af157535ffefcabc732788643a757b7251a2efddbc7b40cb9130a7ae968d0 SHA512 fae572a8378cd7cd3eec60e38620258d741dc1736b43bf61fa37f52247b9cbb245089997d13ed2bb5ee2a6ad0ae847a4d38ddf021aeb0ef2bfd8806ae65a0e5d
 EBUILD gentoo-sources-4.14.114.ebuild 736 BLAKE2B 78bddd8fcc52fdddc741435ddc5508ef1430ad7f40e3db28dab07c399d23c99885478befcfb3983b9bf7153cf842e97995e747588aee0a0949cd43b7752958d5 SHA512 874c595bd7f222148f904c012dfa6439a4670c6f4c73dcad26b11ff8098c2019f9af22af04684df13af6cb54ce1421492dae33da8b760b6c4ca85b78cba2d055
-EBUILD gentoo-sources-4.14.120.ebuild 738 BLAKE2B fedb81d02c6ba91599055c9e7c381cb0000f97d85e62b74ee2cb63e8aede3f4d763517c584e755f52424c424ad1e9691ec262ef2e6689e964f485d9239638d89 SHA512 0d95cda36442a3f482670bfcacd6f3112a18fb5da7f2ad72c4e337ae3742f1b62538463bca2909286b096ba9bf27c06fa309a13d1a606a329188f226dfb8d473
+EBUILD gentoo-sources-4.14.120.ebuild 735 BLAKE2B 9e8d842e41faaa8c4e7a8cad181d88aea599565bb77ffcac46d5dccadec9f440832f941adaa6f4b5c209f9adf25ae15c92694d774baa28ce537572fe862a5213 SHA512 772b71f0053c31b4265ef427708c1301237d4f69735f27d244e234bc35813219926a3a1531fa93b4a2089223a4274e5a35c225bce3104277cd5f437514e2ff8f
+EBUILD gentoo-sources-4.14.121.ebuild 740 BLAKE2B e390193608ef0a3dd1bcc1b002de6d36032e4c8e987b1f4572bdf8dd329c7982339396b9ad5981a8de689cdff1513438901c01219551fec5a5fd836df1a462fc SHA512 47e790efaddd9b3dda6b5a1d18567822503c0e0395457bb071b1efbb1ad1c2e209028fd373f20c31edf8e8fe2428206e81b437cf51170bcac58cbfe0f125d189
+EBUILD gentoo-sources-4.14.122.ebuild 740 BLAKE2B 26bbc053d21342239301637a86761e471504115fad68689ba3956766e4461a0f3e25072b2f87525d71cfda91d8c4d931301bbe92dcd1b7b7b60373a45b3b72f2 SHA512 c8a074f7de1ae1484ad28cc4e60b2ef2c3615559c88e6fcbcc3d04da408cbc875e318fa7b30deb37cec1fface7d1f5cb4e4d0b7d10a6891c1e13df6199f003c0
+EBUILD gentoo-sources-4.14.123.ebuild 740 BLAKE2B ab53ce4413542efbe7aa64abbfb76ef0fe413bc88892eeea4fd480de917ac50259fa4848f5a9272a242835916fddee8f4e5199eb7a51c039521e7ceaa71544c9 SHA512 8ab8f643be5bd6579666ab2bd057ec70e98e85d7ed22c8c5ad6659db714ee541c0e0a495a314efad6ac7d8bdb9890c2283ad876dbdbaa674208628455b5fcd84
 EBUILD gentoo-sources-4.19.27-r1.ebuild 730 BLAKE2B be197f08516cd3d7295f05ef1c5fff3aca0714eefa33ec3b1af3e99015861b92cf900d350a02937f31a0830b0d05f099db8155a69e04d71349190e479f2da279 SHA512 6f69e3768f999410051f6e8b8135fc3b26b6c37ab62fb83958bc669e138124d9f0ffe39a4422c50ca33f9e9c33875b17e336759284e78bd519f560ce50e35d96
 EBUILD gentoo-sources-4.19.37.ebuild 735 BLAKE2B 8ab6d99f0b4ea8098db2949fe39fd700fbb828e8f2e89a0cdcb0604db10cd2d4d354e9e3a96a1d3f520d5ea985be8d3b0e2eeec6445d1aa4c5daa4349a5ab51b SHA512 b8c4cd073ad0b823fc4a5f7ab401f934f381df990dcf59097ddea70e95e4d3411979e030222f0e888d033b6f2e9349b7796c73d1f011008605dc057cf8c9532a
-EBUILD gentoo-sources-4.19.44.ebuild 737 BLAKE2B 752179b4e121be8882d0338581fd54da9a2c2ac368838c9bf8676a1c827ec15061fd94849ca93f56f214c3b1ea30fa269ec09412f3bde89cc46a64aa1f0dc254 SHA512 d07d0b075ea47005e632548c00fedb4c84c6680e161a50172772a336c7d70ce7befa12a0f77067d8d0befa7091dd16e2ba75ffaf0ffaf7c4fafab33513353630
+EBUILD gentoo-sources-4.19.44.ebuild 734 BLAKE2B 994f79e6092e12073a69ef4cfa8138c8e058718c8fbe8926c65479faa432ddd41232d8f717ad4299b38a0b72f8ad7f62fced05234a4720fc989ee76602e2abfb SHA512 23eda446e264b1927f24422f1024d051fe37188961187d336bc4f974616fca22b46e61630a6c80a19e164fe1b49b665953c157b7d06142d40498f1caa53b6897
+EBUILD gentoo-sources-4.19.45.ebuild 739 BLAKE2B 30a89bb2299d26cc9395ae191b545291babee870edd5076bc0b2f24cd06a0a94ad50f3c64df2a5935d8b2e49d6b2550344f9f0d4a534647134b75d40774978cb SHA512 3d6e1594e712bcbe837eaace79d43ef9701158973912530d98e4d21e86821d23621b4a0100886f4501e5ec18b18ac1a90d45e8a0cc4ce8c7f869c680be104f96
+EBUILD gentoo-sources-4.19.46.ebuild 739 BLAKE2B c8e9dd898290d2f0b7145996a5a72d9d088ceaa95ef06947173cff2920ffd67ff99a2eba2c3563d7e4434667c8852450e7f24d3508e251df746353cc616b45d8 SHA512 6d69a548d2fed8d3d72d5240fdb4c0643862a5ac1f1bc242ae303ca58a47da6a16d4acf9c598583cab83a9a633789bf3b1749fa9628d75888d6baff5b524fe5a
+EBUILD gentoo-sources-4.19.47.ebuild 739 BLAKE2B 3db5ccd67d62d4e15aa8d098c2e40925ff4acdf142180735b38bb3a774504f3bfa192c52a86962ed16347bf94441af2f486e2b04f0ec1ff980fc98fb042a45a1 SHA512 9d25b8f6566eb087627a221bed380abbc09576e6fef09a286b4b9c92d814097fddaf7d3791e07b835bb1e6bbb9f566d702c9068238af4eefa11e798a8dbda169
 EBUILD gentoo-sources-4.4.176.ebuild 731 BLAKE2B 58083c4e9e63cbb9b374a9db24fcdb245266135c3ef6e5f81390b5479ac062a7100100edf1347ac2f7e1a1644b8fb91c33816c575af6cd380661fdebbaf88476 SHA512 e39e4b6d4fc71b1bb3f8d39288513cea436ef2da73cd22ffc3cd5716391502947525f1346a54aa00320ab67ca513eb92fea768b5ad67b9677e553f849d40645b
 EBUILD gentoo-sources-4.4.177.ebuild 740 BLAKE2B 9dc20f230afdc96d201b0870f2327fdd56634c1edb15e7b12f3340dcf786dd2d1538afd7722d42706dac6f58fbd02eab227f5f9bde6c4eddd99612798cc3ed8a SHA512 11b33ff1b5d72c60cb84e213ce574e1ecb26f470fcdc7f50350663756b41a52f3f85efd33a1172c6bfc9855060c3f835dfd87b9f18f437df7cd41b5e8d2d1113
 EBUILD gentoo-sources-4.4.178.ebuild 740 BLAKE2B ffd6dff888607050420239d676a59fe001d7d759a9d31cdfefed30d094c60f10316411c957da34ec8659406f351e735b054d716d869aa304a4e154fe48b5b788 SHA512 aafd7cb8eb132e04723fddb2b01f8c529b55f4c1717330b424cafafae54a32106f764cfd2dd3f1029f14f510992ce131a1fffb78dfbd1ca5e0ab22ab96f8b4a5
 EBUILD gentoo-sources-4.4.179.ebuild 736 BLAKE2B 5e3fd6206390cd752ae8c2eafde33bb84c11c2e267ac31684908f6aa0e3ad91d296c06bdf20491d4af6b91817924bea3ddb0893cf2e4b1834519165cf85627aa SHA512 2ddbcaa46f75576b5fe86817c39937fc76369876978db9341be04e93f9527572456a0aa30b3f4915d0c610e42e066a5bb904bcc0dd47f630e9e7bc197a1a6e8f
-EBUILD gentoo-sources-4.4.180.ebuild 738 BLAKE2B 9af690d0ec87834c6bd31efedac8aa788064b4d69171f3cc92f19bd6fbeca6089aed3f24e66ee00b29fb80cb27b0e5a2b3d40df7ff1a8a95f07a419de19c026e SHA512 830d2ad26ae6142ef88b9c8964142102bf78ac0c4b8d26d63ea05ce71ca2db4f139f7d4b112cdb4bf7548cc7260282d7aaff80fd8d8f09f0ce1d8c99f09e6a7c
+EBUILD gentoo-sources-4.4.180.ebuild 735 BLAKE2B 0afd817d05b80149361163084dbe6ed72b62af892bb6d9728da61883a1547bd4c54d0c4f77a99e0f3014334b2baee37aa4fe58b96f78d378fa549ec8d0edbc15 SHA512 fcf04eff3748a02ea8438795da92fbd22726b980a537bbc997d74ff8c2977caa5ad16c29429de62bec2244a90a4dedd987df504cfb570a599bdf9dc5ccbf42fc
 EBUILD gentoo-sources-4.9.162-r1.ebuild 731 BLAKE2B ae5f635e9aa187fa5d61df994e884e4b2a055a2ae9099d871965f5f270d87fcecbe8d139c11690b7ef99b84b900b6ef136f62d25e73558fbb0f0012caf692399 SHA512 db44c0a49bf8a4f40d1ad7bbec31efcdb933af9bb19704aac8af8ec604ff384d25459ee2550cceddf7316a43c9ccabd79515f6f8384220b0aeaeaec595061e24
 EBUILD gentoo-sources-4.9.171.ebuild 736 BLAKE2B f8eaeb5bf35a89daa711435b92f5d47025e9a4ae273098226af77803c96c84c8751fa2c71521fa9e35822e0c7abd3565ffc12f09de73683bd498025db51655bc SHA512 81552879364b5311c2d89b374f01906d6c58ca9c1b3d333fa4f2b15768e6eb3b8727b4aed45b019b64878878f38e21a40f8de36c56bebe5f0d9b491de7e884cb
-EBUILD gentoo-sources-4.9.177.ebuild 738 BLAKE2B 0a7087deedbf9a659cefdfc4facf562fa6841d88876b42bbc9f653555e88e89fd0aa7bddf584576494e3ffdf9af03e7092b8935a49ab86a4d9e8e583f10961c6 SHA512 7ec7b3192e086bac87511c948f93063b5a09275a8ca59a6db4ce28ea77ed5dc88a45ad63faf1de409c64de1f0ef17d4f641bfc26c4eca0f31233c24b559d9c1c
+EBUILD gentoo-sources-4.9.177.ebuild 735 BLAKE2B 26fc02477ecf01db5b1c988dc227c1b874952038ae990a5329ba1c4a0c178cb667ff164ecb33c0df3a1fac76d716caaa4a0d42a9da087bd8a4e21a8ac0fd59f5 SHA512 b811dc438d800d3e3f51b9b38a8b899969612c02700f7d20e2b486ace24854ff873d4e5e7a1ab5ef761b3cf93c4841e1e768cfa69b6e86669459fc416f96c572
+EBUILD gentoo-sources-4.9.178.ebuild 740 BLAKE2B 1a0c881e0c4fde68c0fc9ec76210e49ff0021b309482622acfe0d009791ba18a755625d072a187fcf4fd0fcc407be3addd5172f3a7d1cfb0c47c9ba5be0d55bf SHA512 53f17e2ee46a78d7e6f4ba7fbc57e1182301b282406a593d85190b44ad719d808352a0171e8990d5dbd8f712f5fdc819c5ed6df19d6555d9fcfbd1bc0edaf3bd
+EBUILD gentoo-sources-4.9.179.ebuild 740 BLAKE2B c43da648122d3832185d5f286d74fddc5e02bb97fa9487fd2a6a091862eb6223327a91d2f2f7e1db22f20dc64353413edbf4d0222a1b56973d2d3a3e90bf6608 SHA512 b1ea8ca328086bcb7cbff9853dfe742fa8a51cf359a90a6e1f759cb063a60be9589e7275546ea62e7cd31828e26bfc5642b6fc8f0569e8cb9f35ce066c4ae3b7
+EBUILD gentoo-sources-4.9.180.ebuild 740 BLAKE2B 342378b81339abf431840773271a2baa2585744149c549c38de0621d20d3281bd37945947373650c09d8207f6dcc5eb2f0b61d753d47c0491dbaf030f2d3edaa SHA512 68182c2eca932a2f3f431304e4b301e1d1cc5178b96d61f07b9b8366689a4ee0f76092576254a6fcd4218e19e8d5c74ce2f507fac4726497192f6623fc186ded
 EBUILD gentoo-sources-5.0.17.ebuild 739 BLAKE2B c6f981d1b04b394b580427368128d6691c0e3b106f63266ad5971233cf91f792b3f0cb11fe49a6e90567a174952a8a7f45b7a9d0c8c1982e1addaa6d5954867f SHA512 06f8a799e843065682307624633474353a22853abb5c11d164ab91329f82ce86e11cb9cdc4353f2617769147ed0d1fdf1b3fecbe7967c975c295d02c2bcc1ec1
-EBUILD gentoo-sources-5.1.3.ebuild 738 BLAKE2B f2ec5e913ded9d968b4feefc081b3d68b8d14e38f074f29c18d04ff7c9b78ae1c54de7398c55d21eec949165e12b9cfb4cec553734743836bed523682702b563 SHA512 a0561014f7305dddf1a7468a8a0795f606a9f26603ac0754b824f9f0dae81ed07c20f315093b2f4d2756d3969aae71603cb81ec9104acbe83d3d107db59d64c8
+EBUILD gentoo-sources-5.0.18.ebuild 739 BLAKE2B 504d831ec58922c1fee355282ce2aae175400d956a827749477138477b616678264f5c6fc3500b3a652b79d43d623251e920345df1f495b4459a2db11c56e215 SHA512 0af77b61f2b71ca97f900890da95004f11978da92165441e5ee64fcd7d454554447703dd015eb9fadd4d1cbd94e5d13a08375b324557c792837436ea0d0f6ec8
+EBUILD gentoo-sources-5.0.19.ebuild 739 BLAKE2B d15409a11b89a2a313ce7627691292d7985b558a284f63a780c6aa728f98ad6e9c40c4a89911867a565c24523759d50d63f14913e13370d6711271e1aa1337e7 SHA512 fe7d699f6e2d46696366db24214f9927c14f5b2c4f11b143af7bd8a67fdaf3f58bdd3a6efa723854064877bbd10db25024e4895cd785f7632199764e2b4fabb3
+EBUILD gentoo-sources-5.0.20.ebuild 739 BLAKE2B e64281846ffbae3cd4e1372641015277024e27910a52f3ffec012c5bfdcc01d6ddd2e15bb94643b4f70c540fecd41a48a7a8833ade0a92d2eef3e530617bdaba SHA512 0624d3bbfa6779f941a901a040490372ecfa208d77f6cdd4e7b421449544c24f7f1bcedd02a2729eb56338f1756543a2517831d3bd5ed64a4c09bd1fee83438a
+EBUILD gentoo-sources-5.1.5.ebuild 738 BLAKE2B 3a563b3d46eabac3a4b6fa8cc0cc2e94afef9fa9193a2cf3bc14ae03f12e3ccd36562c73b75248851bdccad2b64ea0e023217b75facb721b0e2b546a1d4f8cc2 SHA512 c6c70da5283e6513f294c99cfa97ae6d69d93596564b82b81ea2bc188030e5c26e729de3b25b7a0cc7e76c7eac69d65a2d6e09f91cf236b1b7e636dd00681655
+EBUILD gentoo-sources-5.1.6.ebuild 738 BLAKE2B c61efe89320428b1f993491fc821976b28930fb076dd20e2959cb26960b43025d5862762c3c9eabbecee8766eeb479a701d962086f5d51c30b03dc40b83a75ea SHA512 de0986e0b957f6ef2f8fe88e784bd05025424b29f696f1916559214599b4d206ded1450278edc97d78bfde09fc500ed599a325f02e20f63d494e3ceb22787d1d
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.120.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.120.ebuild
index c7c00740f2fc..a845383bed64 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.120.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.120.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.121.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.121.ebuild
new file mode 100644
index 000000000000..25f2674e5b2e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.121.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="129"
+
+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.14.122.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.122.ebuild
new file mode 100644
index 000000000000..8d86691a38a6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.122.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="130"
+
+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.14.123.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.123.ebuild
new file mode 100644
index 000000000000..43d9f93e1622
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.123.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="131"
+
+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.19.44.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.44.ebuild
index 214e59ac7654..77a4ca3056b7 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.44.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.44.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.45.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.45.ebuild
new file mode 100644
index 000000000000..3538571c08c6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.45.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="46"
+
+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.19.46.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.46.ebuild
new file mode 100644
index 000000000000..7d922f1ee611
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.46.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="47"
+
+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.19.47.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.47.ebuild
new file mode 100644
index 000000000000..c2a6bd28a541
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.47.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="48"
+
+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.180.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.180.ebuild
index e2602ccb2fda..8ea147e979fc 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.180.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.180.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.177.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.177.ebuild
index 716172c96fe6..8f52c587f628 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.177.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.177.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.178.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.178.ebuild
new file mode 100644
index 000000000000..750f00e67390
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.178.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="183"
+
+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.179.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.179.ebuild
new file mode 100644
index 000000000000..37dde20f9559
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.179.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="184"
+
+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.180.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.180.ebuild
new file mode 100644
index 000000000000..e636477d7578
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.180.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="185"
+
+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-5.0.18.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.0.18.ebuild
new file mode 100644
index 000000000000..cc4746854d59
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.0.18.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="19"
+
+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-5.0.19.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.0.19.ebuild
new file mode 100644
index 000000000000..5dfa7af54f83
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.0.19.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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-5.0.20.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.0.20.ebuild
new file mode 100644
index 000000000000..6f725151b481
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.0.20.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="21"
+
+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-5.1.3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.1.3.ebuild
deleted file mode 100644
index a082660d5248..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="4"
-
-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-5.1.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.1.5.ebuild
new file mode 100644
index 000000000000..0bc85176fa71
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="6"
+
+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-5.1.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.1.6.ebuild
new file mode 100644
index 000000000000..654410d84a7c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.1.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="7"
+
+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 860c666fee98..519be4a40a57 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -8,6 +8,7 @@ DIST patch-5.1-rc5.patch 40391650 BLAKE2B 3f6d76f528e9eed9611315362e1c78821968c2
 DIST patch-5.1-rc6.patch 40668793 BLAKE2B 5228d2bd81642b28247ef39d021c3baee9cb9f396aa09798574fa4d928815016f02578dc886777ae1c69a746032d2a86cc25655ae0a80f2fc0805a2b61454edc SHA512 cb134cef2d9cbad89a30cea29363059c6681a796e66347c350f08f1a2399442700e423b3f693a1cbdf573f147ae8251624b80cbb90cb787c35f8b4b688385eba
 DIST patch-5.1-rc7.patch 40788333 BLAKE2B c77b212fed9949610426839d7d9bdd616457bcba5d37b2df47c1552eb00bcaf97c843464748791f73e8ce7979a4e97382d639f8ca79babf92c20c473c361ec48 SHA512 0e60f9d6097d4404691f23d74a9e519af495da1f9d94d262739f841f3d2bd8f1c68d8c2f113a8622904e65c56ac5d069aa7984315f8790b2118601764600e8ce
 DIST patch-5.2-rc1.patch 46729627 BLAKE2B e6096414073f46d0bd9ec3a8f0f2594344ebea66d0f803902175bf37c82cdc68c32b9c4bb45515be8bbed4ae82fad90319b304cbf849c9ca75f9aa6c390c7d87 SHA512 12cb66e4680b0fc74fb22c9f4a02905b8feae724be7c51dc69725aeb839c817d964537193b5738d85fd4ee4d8544be2864a33814f4b64d1468dc0b17a05a40e9
+DIST patch-5.2-rc2.patch 49912438 BLAKE2B 38140ffd6b0d62b43fc0d657e28a384d2887cc1f961c10d631dc4b2826c8ec82e6db947ff0d0e5f3586e115eb4f976231aa51bc005786f129ce59dd5c053f8be SHA512 4df97c0911b3fc0c186ef81a204c0633660f9484583fbf76e2c15ed3a60bf31c9caf9cda46232034fcae87ad6ab53bedd52f420b4db446c6c888cd63942fd615
 EBUILD git-sources-5.1_rc1.ebuild 1175 BLAKE2B 47425e4cccbe34effd9374a526dc0dec5e103cdb81ac62052dd3c392986e55123744e120d5e7aeddfc338c6f781bfa23d6bcf5adb588eaa928e4b0e548db0f4d SHA512 aa58968bb72dcd608d9d971f2cc7d1b3123b637772413f82e2b941a9fd1537d288d59bbf5cd651873861b0a344591bf71bafba726d27949d795fcf20b24d3cb2
 EBUILD git-sources-5.1_rc2.ebuild 1175 BLAKE2B 47425e4cccbe34effd9374a526dc0dec5e103cdb81ac62052dd3c392986e55123744e120d5e7aeddfc338c6f781bfa23d6bcf5adb588eaa928e4b0e548db0f4d SHA512 aa58968bb72dcd608d9d971f2cc7d1b3123b637772413f82e2b941a9fd1537d288d59bbf5cd651873861b0a344591bf71bafba726d27949d795fcf20b24d3cb2
 EBUILD git-sources-5.1_rc3.ebuild 1175 BLAKE2B 47425e4cccbe34effd9374a526dc0dec5e103cdb81ac62052dd3c392986e55123744e120d5e7aeddfc338c6f781bfa23d6bcf5adb588eaa928e4b0e548db0f4d SHA512 aa58968bb72dcd608d9d971f2cc7d1b3123b637772413f82e2b941a9fd1537d288d59bbf5cd651873861b0a344591bf71bafba726d27949d795fcf20b24d3cb2
@@ -16,4 +17,5 @@ EBUILD git-sources-5.1_rc5.ebuild 1175 BLAKE2B 47425e4cccbe34effd9374a526dc0dec5
 EBUILD git-sources-5.1_rc6.ebuild 1175 BLAKE2B 47425e4cccbe34effd9374a526dc0dec5e103cdb81ac62052dd3c392986e55123744e120d5e7aeddfc338c6f781bfa23d6bcf5adb588eaa928e4b0e548db0f4d SHA512 aa58968bb72dcd608d9d971f2cc7d1b3123b637772413f82e2b941a9fd1537d288d59bbf5cd651873861b0a344591bf71bafba726d27949d795fcf20b24d3cb2
 EBUILD git-sources-5.1_rc7.ebuild 1175 BLAKE2B 47425e4cccbe34effd9374a526dc0dec5e103cdb81ac62052dd3c392986e55123744e120d5e7aeddfc338c6f781bfa23d6bcf5adb588eaa928e4b0e548db0f4d SHA512 aa58968bb72dcd608d9d971f2cc7d1b3123b637772413f82e2b941a9fd1537d288d59bbf5cd651873861b0a344591bf71bafba726d27949d795fcf20b24d3cb2
 EBUILD git-sources-5.2_rc1.ebuild 1175 BLAKE2B 71ab0396027bc75ad0d51c72ead9b3c2443cefae6d931ebe8fbf07f6de81cde8172477f796071798f76148d9185c466e09a3d895388070df75ef5de23851178d SHA512 dbfb583f858b25c19f7d2fe9e4551133e68f8da2de712534f5e2f1cfaba9d1216a84d3f03435b13ae516451ae76382158cd77445ec323bd47707628137bb2680
+EBUILD git-sources-5.2_rc2.ebuild 1175 BLAKE2B 71ab0396027bc75ad0d51c72ead9b3c2443cefae6d931ebe8fbf07f6de81cde8172477f796071798f76148d9185c466e09a3d895388070df75ef5de23851178d SHA512 dbfb583f858b25c19f7d2fe9e4551133e68f8da2de712534f5e2f1cfaba9d1216a84d3f03435b13ae516451ae76382158cd77445ec323bd47707628137bb2680
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-5.2_rc2.ebuild b/sys-kernel/git-sources/git-sources-5.2_rc2.ebuild
new file mode 100644
index 000000000000..8509b233b0a2
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.2_rc2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/kpatch/Manifest b/sys-kernel/kpatch/Manifest
index e0c20cdc3fda..cae833fba9cf 100644
--- a/sys-kernel/kpatch/Manifest
+++ b/sys-kernel/kpatch/Manifest
@@ -1,8 +1,4 @@
-DIST kpatch-0.4.0.tar.gz 124433 BLAKE2B 6ea18c4d590426f9db95e16d555307e264d1b7db362d421f72eaaf897703f7883c44cc49bd98b48d8789453962259d0b0e301aca325c94be6c21061d0621a9cf SHA512 0bbb49a06d02e9eb026be458eb904cf50f50461a67f16835a306bb3a4a57ef88b86ecf6bca6dfc91b921ba87b4c8b9d532e2a77e987e7c71583b8cb53520a1d7
-DIST kpatch-0.6.0.tar.gz 153337 BLAKE2B 5c132b885f9f8bc3c7b514997a0b8b77280d0387431dd3eb73f45da4678b281961a03452b0ec590b37fc9568192135528a9a42bd5005530bd8b9175fe652f7b1 SHA512 7ac27639773a851ad6689743100ff973b4e3a30efc386bdf413c8f6167068d93c2d18820d87e1f1e96405fa3545dcb80a72db0011f07218a692f91f1f3c3655a
-DIST kpatch-0.6.2.tar.gz 148110 BLAKE2B 9903c9423ee6268a0d87c55336e418a964474a3d7f35dd1ad613be7645a932cd09991652cd4a3af0b08a686f39e7c6c7f4b12d80c20c7ecd663aa703821503f8 SHA512 65098195330a2dbea4f8648c87c41f3a7751ffcb83b4e4c5f0a1146f91a8ae8c305d8f111a69304b31f1f12dd26da788af31a5477899bda098b7391cd0a32eca
-EBUILD kpatch-0.4.0-r1.ebuild 1921 BLAKE2B 3b35c292949f73c13efe8b429e96034d9982d923b937962a184dd4d742d31e86a05433db9a4e44aa3ab043aea3e7d2c9b5d619ed53c2833f16640ca6244f163f SHA512 ab0db6ce451aebd04142d1439f8e2e66d36a6e7abd548f3fbada115650d512c62c1a01918d4529ead08b06e66b5ad6521122efe788a35ca09c65ce9b47e94300
-EBUILD kpatch-0.6.0.ebuild 1921 BLAKE2B 9a4ea4154f650aee4364f5e727d60659f5fbf35a6b1a681410a92454854d7f45078f4cc240aa0b60cef079873fa202c719ea3e67c5bf2888a041ca6fcbcbbb6a SHA512 fbda6b2f18f0d3256d6fec90549027417867456b6d86fd6fd3983a2d08752f672bfa5f56d2de316c47ff5ebfe1bf86d985680aa75441d488359c2ac0a64381e0
-EBUILD kpatch-0.6.2.ebuild 1921 BLAKE2B 9a4ea4154f650aee4364f5e727d60659f5fbf35a6b1a681410a92454854d7f45078f4cc240aa0b60cef079873fa202c719ea3e67c5bf2888a041ca6fcbcbbb6a SHA512 fbda6b2f18f0d3256d6fec90549027417867456b6d86fd6fd3983a2d08752f672bfa5f56d2de316c47ff5ebfe1bf86d985680aa75441d488359c2ac0a64381e0
+DIST kpatch-0.6.3.tar.gz 153100 BLAKE2B e95d1880ffc9ff6038bba98902d0f1e97c9f7f8d0f90eedc281c4bf0570217668cf7b701d038d6f06e9885ebdbb4407cc554d5175cf17eb8fd5051381f75deb3 SHA512 0d266dd837ad651d7f46047cf2c8de527d08274a885a154c53354f4b3c5679d91c766d7d42294ffe71cc548e5ee865c7555f24001882b806f2fb48825f9b0c06
+EBUILD kpatch-0.6.3.ebuild 2429 BLAKE2B f5c29e68e94f581ef722fdcca5abb8ffd915eb0d518a6e6633314072ad260d1dc8577706beb54e3166ea6b43ba4981d0ee54e35ad23442e9292d06f24d6136ea SHA512 de23464be4721f19f8be75f58e3203a747c5c2f0193fcfe4c2a56b1a6ac4b8dcba9d7bcad61694313218cd85d574bcc52319cd6f019d6d052527d25dff6a393a
 EBUILD kpatch-9999.ebuild 1952 BLAKE2B 40d2f4405a96d90e1162aa05110ffded881e3a2a75edab8716f877495502dc4fa3945ebbef9f6086b30ff97194eeb99a686dd811d5c5e5a0806c2545edbd7189 SHA512 f60f2e00b2194083b84bb92d31c0b8c48bb108cf5ba1ff0837585f91950c9c9101bcd8bfeab59e31dd63320cd4f37212a9f08fe8c68101a0891f675457f30adc
-MISC metadata.xml 308 BLAKE2B 326cea5516e2914ea6b9077f6aea441891ec7d7bfad7f3d98cab3179aeacb559d2535395f69732b397afa6651938ad186ca6b2b7fb249f1c8c612c4349347201 SHA512 1094168fbbb63ed9328edc7ab2904b648f30f893d3fde7c2de2716a2b4bbcd32a72bc271974e2b006510e8abcebcc6f684670b550ff44e6267954c519eb06469
+MISC metadata.xml 761 BLAKE2B 04355e1d4a8b0cd049c5957290ae001ea5baf2e849da174eadaa6f527c4288e9f33129c633a90e95e549a76b8339a66f9ff3c1f7a6ea35f49e2600a07dffccf1 SHA512 edfc81d5e271bcdd66c4f79f1c50512092e2e0a46d5124b3a6c2ac31071b0f0e2c8e6a97e5935cf5cca7e9f28ffb1dcd4346977a67c9bb15175454fd94f661b8
diff --git a/sys-kernel/kpatch/kpatch-0.4.0-r1.ebuild b/sys-kernel/kpatch/kpatch-0.4.0-r1.ebuild
deleted file mode 100644
index 2dae0d7a5246..000000000000
--- a/sys-kernel/kpatch/kpatch-0.4.0-r1.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 linux-info linux-mod flag-o-matic
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
-else
-	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Dynamic kernel patching for Linux"
-HOMEPAGE="https://github.com/dynup/kpatch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="examples +modules test"
-
-RDEPEND="
-	app-crypt/pesign
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	sys-apps/pciutils
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-libs/elfutils
-	sys-devel/bison
-"
-
-pkg_pretend() {
-	if kernel_is gt 3 9 0; then
-		if ! linux_config_exists; then
-			eerror "Unable to check the currently running kernel for kpatch support"
-			eerror "Please be sure a .config file is available in the kernel src dir"
-			eerror "and ensure the kernel has been built."
-		else
-			# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
-			CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
-			ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
-			ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
-			ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
-			ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
-			ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
-		fi
-	else
-		eerror
-		eerror "kpatch is not available for Linux kernels below 4.0.0"
-		eerror
-		die "Upgrade the kernel sources before installing kpatch."
-	fi
-
-	check_extra_config
-}
-
-src_prepare() {
-	replace-flags '-O?' '-O1'
-	default
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake all
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	einstalldocs
-}
diff --git a/sys-kernel/kpatch/kpatch-0.6.0.ebuild b/sys-kernel/kpatch/kpatch-0.6.0.ebuild
deleted file mode 100644
index e9cdeb7b5ac3..000000000000
--- a/sys-kernel/kpatch/kpatch-0.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info linux-mod flag-o-matic
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
-else
-	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Dynamic kernel patching for Linux"
-HOMEPAGE="https://github.com/dynup/kpatch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="examples +modules test"
-
-RDEPEND="
-	app-crypt/pesign
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	sys-apps/pciutils
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-libs/elfutils
-	sys-devel/bison
-"
-
-pkg_pretend() {
-	if kernel_is gt 3 9 0; then
-		if ! linux_config_exists; then
-			eerror "Unable to check the currently running kernel for kpatch support"
-			eerror "Please be sure a .config file is available in the kernel src dir"
-			eerror "and ensure the kernel has been built."
-		else
-			# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
-			CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
-			ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
-			ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
-			ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
-			ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
-			ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
-		fi
-	else
-		eerror
-		eerror "kpatch is not available for Linux kernels below 4.0.0"
-		eerror
-		die "Upgrade the kernel sources before installing kpatch."
-	fi
-
-	check_extra_config
-}
-
-src_prepare() {
-	replace-flags '-O?' '-O1'
-	default
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake all
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	einstalldocs
-}
diff --git a/sys-kernel/kpatch/kpatch-0.6.2.ebuild b/sys-kernel/kpatch/kpatch-0.6.2.ebuild
deleted file mode 100644
index e9cdeb7b5ac3..000000000000
--- a/sys-kernel/kpatch/kpatch-0.6.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info linux-mod flag-o-matic
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
-else
-	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Dynamic kernel patching for Linux"
-HOMEPAGE="https://github.com/dynup/kpatch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="examples +modules test"
-
-RDEPEND="
-	app-crypt/pesign
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	sys-apps/pciutils
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-libs/elfutils
-	sys-devel/bison
-"
-
-pkg_pretend() {
-	if kernel_is gt 3 9 0; then
-		if ! linux_config_exists; then
-			eerror "Unable to check the currently running kernel for kpatch support"
-			eerror "Please be sure a .config file is available in the kernel src dir"
-			eerror "and ensure the kernel has been built."
-		else
-			# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
-			CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
-			ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
-			ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
-			ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
-			ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
-			ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
-		fi
-	else
-		eerror
-		eerror "kpatch is not available for Linux kernels below 4.0.0"
-		eerror
-		die "Upgrade the kernel sources before installing kpatch."
-	fi
-
-	check_extra_config
-}
-
-src_prepare() {
-	replace-flags '-O?' '-O1'
-	default
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake all
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	einstalldocs
-}
diff --git a/sys-kernel/kpatch/kpatch-0.6.3.ebuild b/sys-kernel/kpatch/kpatch-0.6.3.ebuild
new file mode 100644
index 000000000000..763ccbeac5d3
--- /dev/null
+++ b/sys-kernel/kpatch/kpatch-0.6.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic linux-mod
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
+else
+	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Dynamic kernel patching for Linux"
+HOMEPAGE="https://github.com/dynup/kpatch"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+kpatch-build +kpatch kmod doc contrib test"
+
+RDEPEND="
+	app-crypt/pesign
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	sys-apps/pciutils
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-libs/elfutils
+	sys-devel/bison
+	test? ( dev-util/shellcheck-bin )
+"
+
+pkg_setup() {
+	if use kmod; then
+		if kernel_is gt 3 9 0; then
+			if ! linux_config_exists; then
+				eerror "Unable to check the currently running kernel for kpatch support"
+				eerror "Please be sure a .config file is available in the kernel src dir"
+				eerror "and ensure the kernel has been built."
+			else
+				# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
+				CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
+				ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
+				ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
+				ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
+				ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
+				ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
+			fi
+		else
+			eerror
+			eerror "kpatch is not available for Linux kernels below 4.0.0"
+			eerror
+			die "Upgrade the kernel sources before installing kpatch."
+		fi
+	check_extra_config
+	fi
+
+}
+
+src_prepare() {
+	replace-flags '-O?' '-O1'
+	default
+}
+
+src_compile() {
+	use kpatch-build && emake -C kpatch-build
+	use kpatch && emake -C kpatch
+	use kmod && set_arch_to_kernel && emake -C kmod
+	use doc && emake -C doc
+	use contrib && emake -C contrib
+	use test && emake check
+}
+
+src_install() {
+	use kpatch-build && emake DESTDIR="${D}" PREFIX="/usr" install -C kpatch-build
+	use kpatch && emake DESTDIR="${D}" PREFIX="/usr" install -C kpatch
+	use kmod && set_arch_to_kernel && emake DESTDIR="${D}" PREFIX="/usr" install -C kmod
+	use contrib && emake DESTDIR="${D}" PREFIX="/usr" install -C contrib
+	use doc && einstalldocs
+}
diff --git a/sys-kernel/kpatch/metadata.xml b/sys-kernel/kpatch/metadata.xml
index b393adbecca2..7e000f09b137 100644
--- a/sys-kernel/kpatch/metadata.xml
+++ b/sys-kernel/kpatch/metadata.xml
@@ -5,4 +5,10 @@
 		<email>alicef@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">Dynamic kernel patching for the Linux kernel</longdescription>
+<use>
+		<flag name="kpatch-build">Enable tools which convert a source diff patch to a patch module.</flag>
+		<flag name="kpatch">Enable a command-line tool which allows a user to manage a collection of patch modules.</flag>
+		<flag name="kmod">Enable a kernel module (.ko file) which provides an interface for the patch modules to register new functions for replacement.</flag>
+		<flag name="contrib">Enable contrib kpatch services files.</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index e9c83490f9f9..e919ad14dbde 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,18 +5,18 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.0.tar.xz 105235152 BLAKE2B 59635c87a4123c90ab8598c9ea5167096aa6bc765e9d8456d00f3da7530e89e925b3925c99f1a6c96ac0ded7df3ac7df52c75672f0a66acc40f563200892e064 SHA512 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0
 DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
-DIST patch-3.16.67.xz 2401404 BLAKE2B 7741144b101d8c4d50e6caf002543a76ae83fa6c5d43cbdb0cd6183eddd744fa03a08f77568689d0083968ff3a6cc4da731e894552fb703dc6a52a365e225504 SHA512 defcc7a303434b9cbd374336f9ce4842d41351c305495200b1f3dadf533f328a01179cb4c7e0d2294de10ff0e42bc68555f5abb650211e81574b74953acd5aa1
-DIST patch-4.14.120.xz 2550764 BLAKE2B 2c9c7b76ecf8df717138b8e25216bfff3712af09cf416a78feb306eb8ec58199cbe00ab62f05e2673637fd0b59e8ba179c358047aaf1105fe492e7a009b9754e SHA512 a72e913d35bf2ffb06f27a233f48f9873835297dd3830455183f494e911542f43a4e59ff0bc6ffd8ec0ca6179d9433e795c3c0a8a9b173ec06866a3bc0f882a6
-DIST patch-4.19.44.xz 1216956 BLAKE2B ddd1b02e562971a1ec888dadc7005b66e891714bae8ea8d37b0de4d6391707a3641781fb24abda410fcec2e4548968162d5ff0e77e8979e6503258339da450dd SHA512 1ad33fbb9939c0c537354ab310e0ca5d292cdd58b5126f5a2df661602b5c6ed8aeff001c3e3c6b6e7c45e0e33af1aa803bc1b51b61ec42ab644aad7479f98ad7
+DIST patch-3.16.68.xz 2429924 BLAKE2B 854e6359597b6b22002482606f71784de21fe8e62b1029b9e9c5fb44b2aedefa603f10b1b1630c319293066c5b4a65e92fadcf99117a0958310696fc7fa82a65 SHA512 837b1a12a48e6a79bc5eaca857479f0543cebf7797bd6f1e22a64e6200ed7151c7ca3217d8f5b8384fd1afc32f884b7de8c1df58079e2d7de8f9178b72adaf20
+DIST patch-4.14.123.xz 2604872 BLAKE2B 85fa3ac6a8ec002ad308612cee49cdf9cf06c024482839fa966388b74c5c2e625f8f63b06aedb3773e79f70ca6f0da00422deb3cc1acac40886facdcaeca4dbd SHA512 84d3f6cfeb2194f5efa9cc2dad487e6ef3a9f7b525713368cdd34c3938bfab3b3a26299b06e557a7041dc69e05feec9a026ac9fb2232f82e77435c8f78334c5c
+DIST patch-4.19.47.xz 1324412 BLAKE2B 5294611cf030d8827ea3bab0c1e5a1a31ae2642a96e248f34eec73437944215710afa4642b43fc60faaeb01ca5bea453a1e18fdc56004af6f67a5b4e1529de16 SHA512 e2385a596f243a84abd3f6f474b5beea1a6599b63cf4cf0898f2e90589abbf27d5d906eaabe9d2366d79ed192868a83cbd72866240e1c7b2c74e0dcd255d9157
 DIST patch-4.4.180.xz 2544176 BLAKE2B d79d67e185d232d39b114e63a8c9682ecaa552264a1a2dfb3d325b83c80a0167030fd10c009609e06dfe7edbe1f694fd867c834051c8b5c4f0b63e0a8612935e SHA512 3218f5caa9b305eb6c9268f630a80e9f69f0477c14976c5902d27df570c199a7eda922f80ddae3814736ff16cdf03db4b6bda64119e5b24473ff8f887a907824
-DIST patch-4.9.177.xz 2761088 BLAKE2B 34272297ea007cf29b6a5471488d37ec4ebc964bf05697c348dd0c57a8130d5d2fb83fb1c5c5b2bac5a1492666928152ce2bad8c03e6129415f8d8fabbb4f840 SHA512 6c304fe467d3608508902e9d7dfff8b332e3c3771d668487f3d5ccec753d021ef0750aa09d08c3640965dc1f0a0c6968ca8d26973457eadfe3171d65396f482a
-DIST patch-5.0.17.xz 511416 BLAKE2B a1c3a81e696b246c5baed79cf82a237a080e00c5cf8a1a581ac01f278add2ee963d9eac2e7567b89fb62a35dea742dbc16102c65dc1505f6b52bac23efec1ca8 SHA512 08e294728bb65358d4e2e819a395effdeeec1df1f0d005906deaa48a7b27dc9795e905209394fcf60fed22092ad3db66b45bb327cab823bd6326efcaefddf31e
-DIST patch-5.1.3.xz 57928 BLAKE2B 129acfc548113160ece28398db20fa4f458a2b40557ea382c6a6cce0fa436bfb30e1a39a2e8ef8926d4682e9e8399d2fb5183c604bb3282687a9b9808079909a SHA512 5f7d13a9ded815dac613c133de9272f7ce7e8e4385e29db0f7125750d0e66c84205ac0c1412afd5beaf1b33f59a3f9ec11d41f2d0b4eda898af3c5b6c059c61e
-EBUILD vanilla-sources-3.16.67.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.14.120.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.19.44.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+DIST patch-4.9.180.xz 2797164 BLAKE2B d0dfd4af6c65ee6dcb37bafb6c7ec8e0ae41133831034565c62a2339d3c57c343c2682125b9f0e967a8a644ed30ef4b57fbedebccad6a413294cb3339ba85827 SHA512 cb3e7376e1cf0ca4697c6a8c95af0eea2e8a1f54ae053a31cd0290c3c37b0631756932dc64cb7d8558b35cf66f2c2647d61fc2a772c23f469771caf93691d855
+DIST patch-5.0.20.xz 660580 BLAKE2B ddfb9e3ac35e6a52e0f85cfb69128098cf41a038b59d11cb00e6ea6f5b3685ddfe21ef68d10a37ec16d8e5939a85fd954d7677ace5165903c2b568e21d0761be SHA512 6f1819a21fc24d402c2366204b76c92e260511c4ccbfd0d383b56352faf844c62410bc3a5e04b9c460494b580efdf39d474d698c3d1cd41444b30ff8703e2c01
+DIST patch-5.1.6.xz 246840 BLAKE2B e7fea1fce08a19de3acd95af8d782ff89a4f67cb8b200ffb4c9ed37ca77cfc63d4a089a7491e1c66d91b423e577248c38bd88884ceab8e00c006e1f7a1086662 SHA512 e0535296a5ff5c85154f944a84ee4d4ffe9f8c7acd74ab6ec1db83268d537fbb3605f9ae708cb71ff0945c6eb3caa40c7d85bda2c8f2d3e6dd09bbc98b41b415
+EBUILD vanilla-sources-3.16.68.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.14.123.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.19.47.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
 EBUILD vanilla-sources-4.4.180.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.9.177.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-5.0.17.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-5.1.3.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.9.180.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-5.0.20.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-5.1.6.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.16.67.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.16.68.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.16.67.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.16.68.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.120.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.123.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.120.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.123.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.44.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.47.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.44.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.47.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.177.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.180.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.177.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.180.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.0.17.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.0.20.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.0.17.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.0.20.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.1.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.1.6.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.1.3.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.1.6.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 9993ca553a61..f412c0e87fb3 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/argp-standalone/Manifest b/sys-libs/argp-standalone/Manifest
index 9344e117ef50..99f2bf39b20b 100644
--- a/sys-libs/argp-standalone/Manifest
+++ b/sys-libs/argp-standalone/Manifest
@@ -2,4 +2,4 @@ AUX argp-standalone-1.3-shared.patch 1407 BLAKE2B 6d838b7b65b38562eca560bf094a74
 AUX argp-standalone-1.3-throw-in-funcdef.patch 2500 BLAKE2B 050476f7dec2ff8d79e09f717eada121bc07ef26e0567c2d89ed18d44a4905741494d660ce82df8fb39f19020cf529b513d0e21b651197066d781250a921177e SHA512 5e4cdeeb16e6a4fb46a00ab95f3da9276ee554eec00bb2a05da7467961234ba3f9a630aafa7ceb5feb429a84ece8bf03b869fa996b86468f4716935a914c79a4
 DIST argp-standalone-1.3.tar.gz 130255 BLAKE2B 0848a0e7a98cfa09de52fa152eb9a793a9bf25c1edfc7401851ef134b62c051ad6ef2134d6f528e167046be582be23f311e74614c5511d659060addc14de6b2f SHA512 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
 EBUILD argp-standalone-1.3-r2.ebuild 812 BLAKE2B a7829fbc8a3f0df4419e1f51240972399e546ea0b4d8518c25b82d0c84c2d9ede6e2239890ea8aa0f9ae33c31a8ff3a095fd9574c663fb22d2f087b1f1d7f33b SHA512 3e3fef7bd309dab6edd38711fabbdc3fe93ad1d8c09b8276bbb76137e7e751a9a7347f25286ff7e26ddab034c78a15d57fc681c1ae464889c96e184a8e44def0
-MISC metadata.xml 478 BLAKE2B 2efd4ceb79d98e1f267d1d72c7a21b86894a40fe8f29e0a81e39b063df1a00190cc8e6db442427113917f26b9a85e4f251231015057327aa7a5abcb26174fa1a SHA512 ee39a1ed0a46fcc737755bbe74f7390c9fe1606f8db738d7c9ebc9b99f43e162a7dc35c0c04dacbb967434eab186904cf67bbe773365a0457a7884157f332986
+MISC metadata.xml 253 BLAKE2B 1d5af623950024db87f3016a93014ce876894828c8bac85ae8b157f8e2851ca96384c8e195c9693e09e7a76f4fb7033ee466057b930198a6416135eebbb6a8c1 SHA512 66f53c08df7430d7052861b4c483e36d54db4d937be2fd4e3a6135d36992e041aa88d60205b47c3749b54c36925ca4c45c88fa7b44fee283de48ab8aa75b738b
diff --git a/sys-libs/argp-standalone/metadata.xml b/sys-libs/argp-standalone/metadata.xml
index a816908ca930..9d6d88e4ce15 100644
--- a/sys-libs/argp-standalone/metadata.xml
+++ b/sys-libs/argp-standalone/metadata.xml
@@ -5,12 +5,4 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>gentoo@wildgooses.com</email>
-		<name>Ed Wildgoose</name>
-	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
+	</pkgmetadata>
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index a25c60650f7b..d30b9e0c3342 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -19,6 +19,6 @@ EBUILD binutils-libs-2.28.1.ebuild 2872 BLAKE2B f0ef199dfc0025b06dbdab74f76f0a17
 EBUILD binutils-libs-2.29.1-r1.ebuild 2921 BLAKE2B f38060716462c9c51bc84b98348b82952b6bb47cd33136d7eaaca822ba6e40504fad2b0c778a4a02989ca9e20f812d928d718295376141dd02e519e541a605a3 SHA512 8fc849244e3cdb9b1a35e9bed1f2e57e8bba210e6ab9aa7408904b5a04cc532dfff52a9840e866df5985f6b1d05c96ce7549c7514389a8dae9a4d5d798d48c8e
 EBUILD binutils-libs-2.30-r4.ebuild 3594 BLAKE2B 60b602ed843164cceee4c490fba486e38b4fe8272ec94dafc652aa891a2a148f4e8f69d88c9fb6ca6fa154cd1365bf1473ea73ce2f9bab4d1a36d08259eb7f89 SHA512 fed6718f162b379e381900b1b4c7fcfa3bfe0710f8d489e3ba19ff1d3accb51dfde7d44df5c608d8c9cf6f5d5cc92e7e518b7719ccb832b89d285507507022ee
 EBUILD binutils-libs-2.31.1-r4.ebuild 3572 BLAKE2B 91d896fb938ad11f8599ef5de78b8029c88a40ec8ff680db3f40a9c07bb9574295cc64635a12cf4b256d18c776da6d0fae31ab5e87a7532f3baeb10c0c432b0f SHA512 e32acb140642638d0b1bc9f328946a8ce303be231bbe593052536fc5a838888085b3d293c3643d4a53d4a205fe55738f4b10eeadc6e7fa96a1df33edf116d571
-EBUILD binutils-libs-2.31.1-r6.ebuild 3575 BLAKE2B 8833b927803eb9873141e056988395bedf934356dc8faa739d0bf9c40f6014e1ad683f3ace95f7153b6433f1b8a741db529c2bcf59a494720b336cd39e46aac9 SHA512 5d568ddf9e019da9dd8495b30e47d0b4a3cd5840d3a69c4e72ea27160eaad3c7d119a317349cf2aff36d90b3c5816be02d4164c0271061b445a55ea4829439da
+EBUILD binutils-libs-2.31.1-r6.ebuild 3574 BLAKE2B 2c7fd1d1ef61bbb30ba454c23bd2744471cbfb3d9275f436c8dff81276ba901ff292fe18e7fea97c508e1948d8560b705a3118c70fecf814b58d5fd6c545319c SHA512 2709e9683733a13c9e1166cd7d33f77f08fdcd57e957477ded54743a97a9504e867345a360f68887d23bfdb9a9bd5a73318bd19decdebb1b3a4a69e2c117e5ef
 EBUILD binutils-libs-2.32-r1.ebuild 3594 BLAKE2B 1fef317f4d7b7a60ef394bfc01bb983b0ddb17f4a03c9b0879a01a44afbbe482aebe0fa0ff2c46dbd4831b30cd7fc7c719893313f9ed9c40984dac85a03f95c0 SHA512 e4cf4a7aa5fbd403c61ceca829d78a5a643a8d84503af8e2d8bf24918c9def622ecbe9b6cda99b49cf50310940c8b989dcaa37ebacef13fa36bfe6ee8c241de1
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.31.1-r6.ebuild b/sys-libs/binutils-libs/binutils-libs-2.31.1-r6.ebuild
index b3545ac2de0a..1d7c7ecbc3e9 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.31.1-r6.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.31.1-r6.ebuild
@@ -23,7 +23,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 # -r1 is a one-off subslot bump where SONAME changed for bug #666100
 SLOT="0/${PV}-r1"
 IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 78e1e1e39792..5f4c46bc4566 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,19 +1,15 @@
 AUX 5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch 2336 BLAKE2B 501238f8bb3881b427ff4673933c4544596fcbd3e129876d17b8506498c0513aeec69acd2a38f1d009a7df9f8aecf3e10d88301281722f156a32f76fea131c53 SHA512 7b2b71bb5cb11d6f0d96d0f5f33f2f7da7b4c637e191248c83e27e536d277bb1dee92affa0ca2092c870648525ed7d7b97a29af71aef3631764f724b61118720
 AUX 7.1.0/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch 2583 BLAKE2B be7e9a2cbab8b3bd110346f6c8bda30d104397601950c995b77388fcb91e53ca82f5d3574931c58244403eee698f01209ca9e704fd4c6b9b3ef08e68d41dbea7 SHA512 656a7bbdcf0f678814d0ad0ff56ce43b7fc48c7a549373a4ef77e74490437283c5834e86b1b4e8bcb85578953687d79474ef2bf494c7eed4cf7fa1f17003f385
 AUX 7.1.0/0002-test-Support-using-libtirpc-on-Linux.patch 4161 BLAKE2B 3db2dcebf70ca3e7c399dfb22d8ae50d51863f7a8a15a10b0232f73d4fc2ee0b51ff67e8842b0e4d29dd41e60a326c90670f62a431ca593617f566e03bc7f90a SHA512 2f03f4d0232b600861de0c527d6bef26b0e3273865a7d7344e083a6a7de4033de6d30df3a6b22f4d23be74dfa8864ccaebd42c1f0d4474abc83a66f8997e19fb
-DIST compiler-rt-4.0.1.src.tar.xz 1434100 BLAKE2B ca6bf78fc07f387b7244a52ef648b06a5685effb46a66b241a9ee847ecafb17d02602f49b0dbe473d47202586874a043a6d75141400062f526d2f808da323e1e SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649
 DIST compiler-rt-5.0.2.src.tar.xz 1543256 BLAKE2B 09fa84b8f3e9b8627a14387bc6eaa3d6b4588b9c8f1ac5a0114135fd830e3d45922408b237866789eb81bf38defde1186e0f7430a69f825bee12776b7cd9f74e SHA512 605a6d064877a860d6c9097e0220896dfceafed0a2392ad495c97aa347b97899d89f7e21932e29d3274f396615837414a3e730a915fe4f53eaa858ce3642a666
 DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
 DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
 DIST compiler-rt-8.0.0.src.tar.xz 1903020 BLAKE2B dc42c4772132fee5e225bb94805cd6917214c1d830b8ba4f1c774e6e1726ec7846432d1d6881085676b6d094ec04060ec2a95749eb7d93be79268ee7de1bd828 SHA512 fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913
-DIST compiler-rt-sanitizers-4.0.1-patchset.tar.xz 2384 BLAKE2B 6f9eee711c83570767f0bb634d0f91c18ee7f2af93a478938b8d5b6ce6f2c2fbaadb7bd5c7ee94a14dc1834359a046187db6bc7005b7c2efa539325dc0701ad9 SHA512 72d7357b4c27bbf8fa8b34803ddea905a9f1054e8fc7bf99a4ead9dc00408989ea2709f04be9cf45a27eeb4b9386c89feeb25b53a84f3cac9739196b89813887
 DIST compiler-rt-sanitizers-6.0.1-patchset.tar.xz 8820 BLAKE2B d53ca357e060d058c7f20c51e74684f4c032fdf3ccec4c9f227dc7a5757206f331b9eda25a72c5c66faf4c44b2cc63eb439bd21bdd55d37a93918ab428fd7cd4 SHA512 782a34c56134bd061da30c1f598ddb9e90cb34a4e4ef058fa9634f6da372fd8693ff5e6cf98b59700942273240f83052b89ee2736b22f4e19bc8b519fbec8cad
-DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
-EBUILD compiler-rt-sanitizers-4.0.1.ebuild 4942 BLAKE2B 384312216b7ec2d71928b22abbab61da0b6a09eca9c518b10a7be7416e12f53aa7160381eebb3c9ca070f5e432b10f7e248cd3380bd50a278758803c53c7cbfd SHA512 64142c2645ef2402f74ef4ee30ed5776f4629f1d0daa34683d50e3b45ce815682e00cb705a00014af524a25acd93fb41a7075f2402b3e73880823c258b01bb85
 EBUILD compiler-rt-sanitizers-5.0.2.ebuild 5259 BLAKE2B d9fd342c98e1c7a9d124cd3149a4325625c8ab604cc9d3cbb01513b6ae2add2adbf246c616219f2fc0691d90aa26f5371e7cda8a18aec95243bd1d6ba7b25379 SHA512 8f82649dded359a5c6132b0b9cf211faefb3840850d71f43332cb8f1c250c830848aee7c5e7b1be2278f103420683b4e51bf493c563dead5a27781756a0c8015
 EBUILD compiler-rt-sanitizers-6.0.1.ebuild 5453 BLAKE2B b643f95efc78b4aaa3ab4f05072397003d6e46793a763f91eb79f60c183d89e7265a53f6f96401dc87546bba5b8d21dd38dd0b8bceecdb652702685288465916 SHA512 c9b1dee74f1cbe7d6822589372389c2e3e6f3398211e26d83072dab290541797fa08c52c4c6ac581a59dac52fe5893a27812e5e46e175b9146f2c8348f170458
 EBUILD compiler-rt-sanitizers-7.1.0.ebuild 5401 BLAKE2B 7e4069b74c630e33f5f7045764f8ad5f510fd4c03014e6274d8ba4430406d1e507ce9fc9198c64f923a3df15545f143cdeb696c9b2e74b5250c557d5a8be295b SHA512 1853c25f8b8fcd21f7f37044dfd96d6bed076324d067cbb6d14711e6e65ffe7aa7b76a3b6665acf04051ea688a08eca0bd66da47476c1cc3e969cc6ce346f0f5
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
deleted file mode 100644
index b57164e921d5..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils flag-o-matic llvm python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/compiler-rt-${PV/_/}.src.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="${PV%_*}"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+clang test"
-
-CLANG_SLOT=${SLOT%%.*}
-RDEPEND="!=sys-libs/compiler-rt-sanitizers-${SLOT}*:0"
-# llvm-4 needed for --cmakedir
-DEPEND="
-	>=sys-devel/llvm-4
-	clang? ( sys-devel/clang )
-	test? (
-		!<sys-apps/sandbox-2.13
-		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
-		sys-libs/compiler-rt:${SLOT} )
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/compiler-rt-${PV/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use test; then
-		mv llvm-* llvm || die
-	fi
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/${P}-patchset"
-	cmake-utils_src_prepare
-
-	# sys/ustat.h removed in glibc 2.28
-	# https://bugs.gentoo.org/675654
-	eapply "${FILESDIR}"/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch
-
-	if use test; then
-		# remove tests that are broken by new glibc
-		# (disabled in 6.0.0+, r313069)
-		if use elibc_glibc && has_version '>=sys-libs/glibc-2.24'; then
-			rm test/tsan/Linux/user_malloc.cc || die
-		fi
-		# https://bugs.llvm.org/show_bug.cgi?id=36065
-		if use elibc_glibc && has_version '>=sys-libs/glibc-2.25'; then
-			rm test/lsan/TestCases/use_tls_dynamic.cc || die
-			rm test/msan/dtls_test.c || die
-			rm test/sanitizer_common/TestCases/Posix/sanitizer_set_death_callback_test.cc || die
-		fi
-	fi
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# built-ins installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=ON
-		-DCOMPILER_RT_BUILD_XRAY=ON
-	)
-	if use test; then
-		if has_version '>=sys-devel/llvm-6'; then
-			mycmakeargs+=(
-				-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			)
-		else
-			mycmakeargs+=(
-				-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	cmake-utils_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake-utils_src_make check-all
-}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 6754ffa71805..9fe1b8b3f472 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,9 +1,7 @@
-DIST compiler-rt-4.0.1.src.tar.xz 1434100 BLAKE2B ca6bf78fc07f387b7244a52ef648b06a5685effb46a66b241a9ee847ecafb17d02602f49b0dbe473d47202586874a043a6d75141400062f526d2f808da323e1e SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649
 DIST compiler-rt-5.0.2.src.tar.xz 1543256 BLAKE2B 09fa84b8f3e9b8627a14387bc6eaa3d6b4588b9c8f1ac5a0114135fd830e3d45922408b237866789eb81bf38defde1186e0f7430a69f825bee12776b7cd9f74e SHA512 605a6d064877a860d6c9097e0220896dfceafed0a2392ad495c97aa347b97899d89f7e21932e29d3274f396615837414a3e730a915fe4f53eaa858ce3642a666
 DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
 DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
 DIST compiler-rt-8.0.0.src.tar.xz 1903020 BLAKE2B dc42c4772132fee5e225bb94805cd6917214c1d830b8ba4f1c774e6e1726ec7846432d1d6881085676b6d094ec04060ec2a95749eb7d93be79268ee7de1bd828 SHA512 fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913
-EBUILD compiler-rt-4.0.1.ebuild 4144 BLAKE2B a89fa2681b1254b285aeab803103860efddb6990b33bbe725fe52f7ebba5652f4ba9ecebbced1f63adc84dac4dc7dd26b10a6e7863169bc08f8e95cc2ba868fa SHA512 f14a4a61cc42a37d62e6662aeb95c8d2c3534b0ffbee57cf788ce1df62ab1387af76e90a2d79708c50b8b70d073b00298b0d31c71e8d69e11f2e9204dcbaca4e
 EBUILD compiler-rt-5.0.2.ebuild 2840 BLAKE2B 4c6e6ca121bad66f69f272a1ddc8a5153196c8f2608da08b5326e264842fe60ae8a4cb1aa98e2907b141068e5af997fe81ae13708dfd148f8676bebf18b894d2 SHA512 3fcea6a7045c1dc666ad6cd9c575b1ba931719bf31457f7493bb7b9c7950bca8e1c5eb8ce4342c1098250d0c126e85ba86b56724b17a3f6bb43c2846fb765a1f
 EBUILD compiler-rt-6.0.1.ebuild 2911 BLAKE2B 9ee423b460c62366af5525ab3b32cd2980aff78331a65b5658a50e0f808c9cb694d2e5d85bd753d291e1b5f96ab9e6cbc6a6d9f0cddcd9f7f8521ed5280f8291 SHA512 ecce0303d9db8ec0c74b3d0b248547402c32b7bceef52a5bb999f076c8fa82e209d5d113e6c14a1511e99dbf04bfd4d79077da1c010d9069a1bd284a168b26e0
 EBUILD compiler-rt-7.1.0.ebuild 2913 BLAKE2B 86f05a0f2604f7df55ecec3906f380f6838f9deb66f76f952c9dfb89d8b3738aafd7468c1cfc2c6e19e1301fc4dacdb74a4f8436cdf7daf98bebb82ee1284590 SHA512 ddb15119c6dc09816ecf15ca61c548d786c16c8380284323e27a37229dd81808fae98b2451b5bfe98b2f1ce3b0bb620acf792ba1a66e5aa67acb40a33dd64744
diff --git a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
deleted file mode 100644
index bb00a9d93c61..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-# TODO: fix unnecessary dep on Python upstream
-inherit cmake-utils flag-o-matic llvm python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="${PV%_*}"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+clang test"
-
-CLANG_SLOT=${SLOT%%.*}
-RDEPEND="!=sys-libs/compiler-rt-${SLOT}*:0"
-# llvm-4 needed for --cmakedir
-DEPEND="
-	>=sys-devel/llvm-4
-	clang? ( sys-devel/clang )
-	test? ( =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	local nolib_flags=( -nodefaultlibs -lc )
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		# ensure we can use clang before installing compiler-rt
-		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-		strip-unsupported-flags
-	elif ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
-
-		# currently lit covers only sanitizer tests
-		-DCOMPILER_RT_INCLUDE_TESTS=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# prepare a test compiler
-	# copy clang over since resource_dir is located relatively to binary
-	# therefore, we can put our new libraries in it
-	mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}{/bin,$(get_libdir)},clang/${SLOT}/include} || die
-	cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-		"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
-	cp "${EPREFIX}/usr/lib/clang/${SLOT}/include"/*.h \
-		"${BUILD_DIR}/lib/clang/${SLOT}/include/" || die
-
-	# builtins are not converted to lit yet, so run them manually
-	local tests=() f
-	cd "${S}"/test/builtins/Unit || die
-	while read -r -d '' f; do
-		# ppc subdir is unmaintained and lacks proper guards
-		# (and ppc builtins do not seem to be used anyway)
-		[[ ${f} == ./ppc/* ]] && continue
-		# these are special
-		[[ ${f} == ./cpu_model_test.c ]] && continue
-		[[ ${f} == ./gcc_personality_test.c ]] && continue
-		# unsupported
-		[[ ${f} == ./trampoline_setup_test.c ]] && continue
-		tests+=( "${f%.c}" )
-	done < <(find -name '*.c' -print0)
-
-	{
-		echo "check: ${tests[*]/#/check-}" &&
-		echo ".PHONY: check ${tests[*]/#/check-}" &&
-		for f in "${tests[@]}"; do
-			echo "check-${f}: ${f}" &&
-			echo "	${f}"
-		done
-	} > Makefile || die
-
-	local ABI
-	for ABI in $(get_all_abis); do
-		# not supported at all at the moment
-		[[ ${ABI} == x32 ]] && continue
-
-		rm -f "${tests[@]}" || die
-
-		einfo "Running tests for ABI=${ABI}"
-		# use -k to run all tests even if some fail
-		emake -k \
-			CC="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" \
-			CFLAGS="$(get_abi_CFLAGS)" \
-			CPPFLAGS='-I../../../lib/builtins' \
-			LDFLAGS='-rtlib=compiler-rt' \
-			LDLIBS='-lm'
-	done
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# includes are mistakenly installed for all sanitizers and xray
-	rm -rf "${ED}"usr/lib/clang/*/include || die
-}
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 86f8e1f450fc..6fd189946eb2 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,10 +1,10 @@
 AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b1cf94854dabb4bfefd0d44d7605cbca6353b27730dcc37ed65c1d4b35f2b7e5386a607056f7397afbf4e3dadc57efb0e3172a94287f5b7 SHA512 0c0a39a7cdf1930c2c8da0072f935eb02e15ce7a5202990b4ee5458a4ba7a5c1848a7b759e91e32c76f38ea419059179b04ff94fa336cbf77e4ecde55f9dc1d3
 DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
 DIST e2fsprogs-1.44.6.tar.xz 5378560 BLAKE2B 1430e87fbfc81cf299c3b577c46309e2ca2ff5a8de7121a9aab7a8ea49693fd1053f3f034c4f9105b2cc0c3395b7887d3284493c9105287c4f03deebc237ace5 SHA512 725ff908148b55d9417aa9e01f514feb434c43441f7104c61d200fcdf6b30b528f62475bdffc9e1c49d3d44e1e3f2cc1e9df60025c8e3d113d6edabfccf356bf
-DIST e2fsprogs-1.45.0.tar.xz 5520532 BLAKE2B de7c27b90e68e822a8157e99d103933d98afe094765016a58dbdce4d5bebda86493c94dbf3bd009aa25063edf34a0c8229cbc1045f1041a357448619aee55de8 SHA512 208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014
 DIST e2fsprogs-1.45.1.tar.xz 5507236 BLAKE2B d454f0228df2079edd3b7f8ad406417ee48cacb5b62fc1c869eff21b35dafc9bbc4ffd80e6040629a8da1edac230beb3981bc43eb12b6feecf4225a9b9f335e6 SHA512 2e8974d30e92d7f194ccad7f152b495d2a6e41328b1532351f13af27ceaef5ee01d52963e17801cc7317f7b5208791bd20c9028f15a9859225f0e64d175be779
+DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e
 EBUILD e2fsprogs-libs-1.44.5.ebuild 2407 BLAKE2B df567fb7e16ded48f10d8935c50eff9d373534f11e05a69372a22883508260a2e2e07290492bea45e92fbd8e812a292671edb95dec284c59d52ce3903435fcef SHA512 7605db691d49a09a1c8e4dcde6f2d225d186c4f61f45f51ae0fd4d43cd7c87e185a17ef80a4530f193eebe96948d47eafe83225b0aafe01492fa6b5e8aa1c1fd
 EBUILD e2fsprogs-libs-1.44.6.ebuild 2420 BLAKE2B 430914024959439be78ee6af7b01ac99746b429d008fc7685f7d26dbbadcc5f38635dce816c88cc412f79bcb59d6ec1740c251d6218a0ff3d969b721190a3755 SHA512 55fa21281b36e66c4442be12003ccfafefddffa879caa2ba92c237d8541499feae5aedf0fbcde2a7ed4236adc70c0946d16e3022de99c9da2ec956f7436a6d88
-EBUILD e2fsprogs-libs-1.45.0.ebuild 2427 BLAKE2B 3ca84a4cfe53fdb3545f0b153083f884513023adb49c8dd6ce99f79f777c1d5bdb6ec820b0d9e2cfa270baec141018733b55adbbbb0c59be430cdf005c3af2f7 SHA512 c971d649eaae767938cc7e2888163688b83b291b2005f35a25d68b6827adc5c12abb20384867b697852492564ecce7cf235541dcfda69ddff56e7930633b94d8
 EBUILD e2fsprogs-libs-1.45.1.ebuild 2420 BLAKE2B e6f6bc56eabb36eca2c030fd2237bd7be695206b85ad445ea7b1e0ab047f6469de2c2b0b781a2d481bb12c30a119156210160add9abc68de7df3eec8fc56b3d5 SHA512 8c02c7ff1f7b6148e298ff2c2043eb49027a0d55ced0a9c7bb2be49151b61747da3a9d7bd4ac6ecf469e9f3ebd90077684c57f39fab8e57bbc02ca8d7f92e07c
+EBUILD e2fsprogs-libs-1.45.2.ebuild 2420 BLAKE2B e6f6bc56eabb36eca2c030fd2237bd7be695206b85ad445ea7b1e0ab047f6469de2c2b0b781a2d481bb12c30a119156210160add9abc68de7df3eec8fc56b3d5 SHA512 8c02c7ff1f7b6148e298ff2c2043eb49027a0d55ced0a9c7bb2be49151b61747da3a9d7bd4ac6ecf469e9f3ebd90077684c57f39fab8e57bbc02ca8d7f92e07c
 MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.0.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.0.ebuild
deleted file mode 100644
index a212f2760389..000000000000
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs multilib-minimal
-
-MY_PN=${PN%-libs}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="!sys-libs/com_err
-	!sys-libs/ss
-	!<sys-fs/e2fsprogs-1.41.8"
-DEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-)
-
-src_prepare() {
-	default
-
-	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-elf-shlibs
-		$(tc-has-tls || echo --disable-tls)
-		--disable-e2initrd-helper
-		--disable-fsck
-	)
-
-	# we use blkid/uuid from util-linux now
-	if use kernel_linux ; then
-		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
-		myconf+=( --disable-lib{blkid,uuid} )
-	fi
-
-	ac_cv_path_LDCONFIG=: \
-	ECONF_SOURCE="${S}" \
-	CC="$(tc-getCC)" \
-	BUILD_CC="$(tc-getBUILD_CC)" \
-	BUILD_LD="$(tc-getBUILD_LD)" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake -C lib/et V=1 || die "Failed to build libcom"
-
-	emake -C lib/ss V=1 || die "Failed to build libss"
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check || die "Failed to test libcom"
-
-		emake -C lib/ss V=1 check || die "Failed to test libss"
-	fi
-}
-
-multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D%/}" install || die "Failed to install libcom"
-
-	emake -C lib/ss V=1 DESTDIR="${D%/}" install || die "Failed to install libss"
-
-	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
-	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
-	# links to libcom_err.so).
-	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
-
-	if ! use static-libs ; then
-		find "${ED%/}" -name '*.a' -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	# Package installs same header twice -- use symlink instead
-	dosym et/com_err.h /usr/include/com_err.h
-
-	einstalldocs
-}
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild
new file mode 100644
index 000000000000..79ee32709eb3
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+MY_PN=${PN%-libs}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="!sys-libs/com_err
+	!sys-libs/ss
+	!<sys-fs/e2fsprogs-1.41.8"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+)
+
+src_prepare() {
+	default
+
+	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-elf-shlibs
+		$(tc-has-tls || echo --disable-tls)
+		--disable-e2initrd-helper
+		--disable-fsck
+	)
+
+	# we use blkid/uuid from util-linux now
+	if use kernel_linux ; then
+		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
+		myconf+=( --disable-lib{blkid,uuid} )
+	fi
+
+	ac_cv_path_LDCONFIG=: \
+	ECONF_SOURCE="${S}" \
+	CC="$(tc-getCC)" \
+	BUILD_CC="$(tc-getBUILD_CC)" \
+	BUILD_LD="$(tc-getBUILD_LD)" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake -C lib/et V=1 || die "Failed to build libcom"
+
+	emake -C lib/ss V=1 || die "Failed to build libss"
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		emake -C lib/et V=1 check || die "Failed to test libcom"
+
+		emake -C lib/ss V=1 check || die "Failed to test libss"
+	fi
+}
+
+multilib_src_install() {
+	emake -C lib/et V=1 DESTDIR="${D}" install || die "Failed to install libcom"
+
+	emake -C lib/ss V=1 DESTDIR="${D}" install || die "Failed to install libss"
+
+	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
+	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
+	# links to libcom_err.so).
+	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	# Package installs same header twice -- use symlink instead
+	dosym et/com_err.h /usr/include/com_err.h
+
+	einstalldocs
+}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 89e72d496112..ca7fb62ea1b0 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -29,6 +29,6 @@ EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff
 EBUILD glibc-2.26-r7.ebuild 25496 BLAKE2B 3edbb2f56d81869f86bd357772c27eb9516a1a0fbbda024412c8588df0b7938c77afc46430ea8b01bfe012eb5097f58b989411d4953d09d9202c33eeea562708 SHA512 e28a2cf8f692e6526fcbee2d9317dbb4cb8a4c249e4b60ed5b3522dc8c4627248b4a4bad0c32192adf0f650f3f002b8e25ebc7038fe0daf959f0dcde0bfe1bc4
 EBUILD glibc-2.27-r6.ebuild 41551 BLAKE2B 9b55701da5b61f4b095108f0042181961fc67a9b8a40d7ed70ca5effd8114a9d1769f2e9ed178fcf49069cb63c0ad9bdc53cf6f4526f98c3a7d41609d9e7574c SHA512 1d06a20e0a2dc7deee567a0e2545cea87cfbdf5f0d1037b85e2a6afa829b5106880d3b44f44adb7e790820eaa873aac442208f77f1e5c48411af8c1c94a16ce9
 EBUILD glibc-2.28-r6.ebuild 41321 BLAKE2B 0f722c8cf58997771e4a0d736f2eba188f54c6262e81562e5682665437a220dfe27a28040a988af6af5713b0a3d7b640ee24344b4198f942225baf394993aa9d SHA512 1c572b8d80350d56a4d111094acebe6c81e095100dd0afc068ed847b516cd82b2a771276cbe859a5db0f45dec4e58416d3a62fcf5834695d41c67f481856b2e1
-EBUILD glibc-2.29-r2.ebuild 42184 BLAKE2B 98df6334513d1918034772dd72d3ee6af19397147acc18869780258c6bac443811376fdcf422a4d3b47859979cb49add15d8f2b3712c1cc949e7648c942e4639 SHA512 7bfea928abb2358c744c5e20eb5ae7255903246143f1365c2d842c261af6dbb60700cf58771fd9da59f790c7115d50567fe41fdffbc2807c256a9cbe870705ad
+EBUILD glibc-2.29-r2.ebuild 42180 BLAKE2B 438cf2113059ffaf2125ff0c3b85302a651d16534bf79ab76092f47c80cf3dca1fc617043b8fb727ab35be452e80b9107dacb557c062a54643bd4125ce48d92b SHA512 ea54f6b64f6de645d63430b8ad0abf13e0300d5b474b546d3639d2a9fb944b01d89a79f86aeb25c1b4d24411ab80fb1ab68d7a635d4860069543089552df5803
 EBUILD glibc-9999.ebuild 42584 BLAKE2B c14f4ec7fed2e7fca3379d8af4c1925384cc842dce8e4ec6b544092b2089356e72bd0189ffa7caf68513aad4e319ae0acbee3f4b19aa82b4e75ab38d6643f8b3 SHA512 e70a3a86532cb763c26132193476dab986c01d4026251e9990b148f275c9515af90d18cfce82a689df8e362f2c8c96d54cb0581695cad9bbc8278eb8efab821f
 MISC metadata.xml 1323 BLAKE2B 6a19ccbf9f068c6c3d3b945d3011dce3d7712dd74a2daeaa8244eef73fd86723b275ce018ec5557862278c23883fabfb27e91e0b88ff62c34fffdadd4b024411 SHA512 848adbf531103d69b8b0e7017c25de730daecccae220e337e475ba8dbcaa95c6d5e440330be56367974607050dfa1964026ed90bc699ab5f12fef35c88d67505
diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild
index 5719cbbf6f79..94b3e9b08682 100644
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
diff --git a/sys-libs/lib-compat/Manifest b/sys-libs/lib-compat/Manifest
index 267ed08dc198..54c2d0153481 100644
--- a/sys-libs/lib-compat/Manifest
+++ b/sys-libs/lib-compat/Manifest
@@ -1,3 +1,3 @@
 DIST lib-compat-1.5.tar.bz2 110305 BLAKE2B d103cd4df22d018e03cdd940a74a50ed79a121863dced17b199a0dee4c2fb7a6fd5547d62f70e61cca3933162e2433b1fa2a3edb1cc2991ac0417b509f42419b SHA512 b23b12ab6ecf8c3840ccaebd9c7823651c687fbfaa845b071fa2c2970e616345650f2688cbfca35097686c6b914ab637d166461adb2122f5f7d37c7870a68472
-EBUILD lib-compat-1.5.ebuild 425 BLAKE2B 412ff65ea880c82079cc6050bd3a330e007903a2e19839a5be9b7a012bba3f350a695947c1e636818a8444a163be495a40d79e7eb1233757a791bb9a92cb753a SHA512 8a8fbe8135c82474ee2842de2d4c830b2e2476630000731785740d60c00991b4ae1890bcd310037d93aba30ee1d7ad5e45f8abdfc472ab2503fa1b057c2e4619
+EBUILD lib-compat-1.5.ebuild 433 BLAKE2B aebb24fd19d3f2b64c3bee13c24bff230f924ec1461a70dcea6f81c1657c142724ce9d99e0dcf66091588baf17b1c2b8cca9bbc9b366dbe37ed726f3b5f5c182 SHA512 9df4b34ea2616c1f748198d0e3655fbbd2e0c6433e4836e37e8a3b015b279ef0d7f7380cd7b43961a6f1dc77f4968bbf60fcfa2e44bac0c8173116cac0530143
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/lib-compat/lib-compat-1.5.ebuild b/sys-libs/lib-compat/lib-compat-1.5.ebuild
index 064a9db028cb..93f758188723 100644
--- a/sys-libs/lib-compat/lib-compat-1.5.ebuild
+++ b/sys-libs/lib-compat/lib-compat-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="libstdc++"  # corresponding source code in gcc-2.95.3.tar.bz2
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 ~x86 ~x86-linux"
 
 src_install() {
 	ABI=x86 dolib.so x86/libstdc++-libc6.2-2.so.3
diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index 07cd051ca053..158fa4f6a846 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -1,9 +1,7 @@
 AUX Makefile 513 BLAKE2B 582a1ee9c7cf3f50a3508470e68c987f7566a6b85fd525b9c5649d5c8b6a7463bdd9a11127c1c0d554fe595bfedfb5c260ebfad15bb8619752da7520252afd1c SHA512 acb4b2855ea3912db0d3a26c7f8e7703b865f7e6f17b22a3654d9ac10633fc25fae3ba3995f0f33c106f4eba14ca897e8c6256e339e4d7f1393d8efdee7f4ef4
 AUX Makefile.test 172 BLAKE2B 75bf612ce08664303e4e28d7003e111a28e5ac931940f61768ffe4244e5fd883bc4a8ec5ef3e41537734899353127801004659ab8a6890b0c4fea46b8bba4591 SHA512 fc93c26e4df1c5eca2f99ad3058e2d129fa85a876c9d3d6fcc9e456f397455ebd136b88b3c0ed8d27003dc7a00a985094b6c711fb34316d9fef39e1ab2aadaba
 AUX prepare_snapshot.sh 428 BLAKE2B 5fab8d5ccc8aafbb4c5e9f729dad99b87d45c9973be777d4a77d5fddba280731186ec5075fe79526130ed26396e621e955ee28f1cbc0293b1e19e109b54f363e SHA512 2fc1391df1178a1f6e2e29243731a0630e43718e7e525f95f8dcea3c9909905e86cba1cd9063c396be0a076965b6c3c1cfaac899ba6e30c9cf4f90e237fb5b25
-DIST libcxxrt-0.0_p20170515.tar.xz 60488 BLAKE2B ae605dbd85a619886a3dca4ded06529bf51309d2c12028aaa4d27180efcbb6a6cd40e59fe731511cc920ba1e3c5786a5051a560186923d60c9aa7eae34b1679e SHA512 cf0539ca8f836adadf83195784ad008008faea2b0dd8953191fa1012d542f10f546eb58ecc42fa8e864c1113530a6bceb28a8005aa62276570343a3aaba09266
 DIST libcxxrt-0.0_p20180311.tar.xz 60920 BLAKE2B c75bf5bb88e0f5c448a377a7ae58b33444e644c5e4ce7d6e0f5242c4ee61335be6a8b878bcc06f47bb44f9c48895845b174ca398c95aabb90182ebefd3d31815 SHA512 625aa0fab7d54c584faf4cf1e7f8f694776337fc0c6f441683f035743d00e3d18be3339a8ccfc8b61eb07819e4ccf7b1e5f3e7948fd584eefc5d61b200b32d50
-EBUILD libcxxrt-0.0_p20170515.ebuild 2325 BLAKE2B 59c0d167aca188e5280d8928a142190233f72b3af8a10ee1663f0d8eb96437163ee6fd299cfea65bb6a7311becafd9be8fe6499c606b755467045781378687b1 SHA512 353079acc3e04ca1056f38242814d2858a33b97a297164eaa08ff4c50c3b5e181b96229edb5d2658b2505724382b4f37155a0b49c7ecdf9155d628a077bec54b
 EBUILD libcxxrt-0.0_p20180311.ebuild 2337 BLAKE2B f932dfa42c7111ef4a64a135907b0751770593a715b0cce951b0e3992de218a400e7f5b69cf9321bb03932a5833ebf2c085a6b391570ccf639edf99a7d50b3a2 SHA512 90342be338bae58ff578bd060ea6bd9bb9994998c0fcbb79d71e3c5c384362648b3d5154232c9962f2d602197d63f0b3ad19a9945f60863471565ed54bcc19a6
 EBUILD libcxxrt-9999.ebuild 2318 BLAKE2B fd2c349bf8a84f19a3c76c0523623897797291d85062d2d9a58a9d105c32c65ff9e66a795b657693584256f9f292a4f1fb22c74403870c5fbf54ed0fbcbb5bd5 SHA512 7550563363686af25f2c9c81a795a972fe9b5599e5d2fc7462940b1be463fdddf32faba7e86e8c2d3bd60a6adaf20f400cf5bad3dcf8d814bb2f8feffc9b2c3f
 MISC metadata.xml 772 BLAKE2B 918a0b6a0d5d7c07b86a8157e08d66f1df42d38e74099c3c38a5dcb2757d55637426df7e0b61d893afde5cd15eb9d4ab78920ccde846a781c5e7ee285161f0c1 SHA512 2740f5561f530ec9053c2e3cc1c32af9b11b61d6b9b1e1babc39d135132bd7fbc0670bcdef274408126c9444e93c9e6f964f7c51316cac06b4a64e177263be7a
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20170515.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20170515.ebuild
deleted file mode 100644
index 8492baad661c..000000000000
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20170515.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/pathscale/libcxxrt.git"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
-
-inherit flag-o-matic toolchain-funcs portability ${SCM} multilib-minimal
-
-DESCRIPTION="C++ Runtime from PathScale, FreeBSD and NetBSD"
-HOMEPAGE="https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	DEPEND="app-arch/xz-utils"
-else
-	SRC_URI=""
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
-	KEYWORDS="amd64 x86"
-fi
-IUSE="+libunwind +static-libs test"
-
-RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-		sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )"
-DEPEND="${RDEPEND}
-	${DEPEND}"
-
-DOCS=( AUTHORS COPYRIGHT README )
-
-gcc_check() {
-	if tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]] && use test; then
-		eerror "At least gcc-6 is required to run tests. Please switch to a newer"
-		eerror "compiler before proceeding."
-		die "gcc-6 required for tests"
-	fi
-}
-
-pkg_pretend() {
-	gcc_check
-}
-
-pkg_setup() {
-	gcc_check
-}
-
-src_prepare() {
-	cp "${FILESDIR}/Makefile" src/ || die
-	cp "${FILESDIR}/Makefile.test" test/Makefile || die
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	# Notes: we build -nodefaultlibs to avoid linking to gcc libs.
-	# libcxxrt needs: dladdr (dlopen_lib), libunwind or libgcc_s and the libc.
-	tc-export CC CXX AR
-	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-	cd "${BUILD_DIR}/src"
-	LIBS="$(dlopen_lib) -l$(usex libunwind unwind gcc_s) -lc" emake shared
-	use static-libs && emake static
-}
-
-multilib_src_test() {
-	cd "${BUILD_DIR}/test"
-	LD_LIBRARY_PATH="${BUILD_DIR}/src:${LD_LIBRARY_PATH}" \
-		LIBS="-L${BUILD_DIR}/src -lcxxrt -l$(usex libunwind unwind gcc_s) -lc" \
-		emake check
-}
-
-multilib_src_install() {
-	# TODO: See README. Maybe hide it in a subdir and let only libcxx know about
-	# it. FreeBSD head installs it in /lib
-	dolib.so src/${PN}.so*
-	use static-libs && dolib.a src/${PN}.a
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	insinto /usr/include/libcxxrt/
-	doins src/cxxabi.h src/unwind*.h
-}
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index aeb438e9e08b..952056e24799 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -2,6 +2,6 @@ DIST libosinfo-1.2.0.tar.gz 916787 BLAKE2B 652910ca1e70071d88adb771e458f0c19159a
 DIST libosinfo-1.3.0.tar.gz 977090 BLAKE2B fdfe29dbf01e00608374baf2fb6b5257dff5eb8870375769c572b4dacf2bd7f6e1907083e6c36bfb1a76e9e994bb19b093c6fc63ce8e7170ab8073f6d53c573b SHA512 652f2927e901afe9772d4f28be5bb59802cf149c6c8eea4256a999f5012bfaaac81b51c56a94b32c82ef3462ff1f26baf84bf9329e5b1136e2b49ed4a0658982
 DIST libosinfo-1.4.0.tar.gz 1075852 BLAKE2B 93129a29ea3a1a3aa69fdceabcf6f41393c8e1dd3f92872d97dcc23a3316b0e4d16ede104da9a3ea0c49d352ba88e05ba5a38806c8c039fe92217e4b6e3140ab SHA512 531b7acf811add53252e52917f8b13b409dbe7a4bc5837dcbe34e729b0f294e760d5a57c5c1c56f1f65217b7fc6e285a56a6fa49d36f02cf696b7cc181db1fe5
 EBUILD libosinfo-1.2.0.ebuild 1733 BLAKE2B 6d8f39bfe7139b5a9103922b61768f458a8ac5db914bb4b7cd4a13b897d5fb1b062adfd81a6aca778a97475ec95835a386904f2bf70a413a992bc3fa3f7c5b67 SHA512 331e01a546b7b81c1d88d2bec8984e15747924d40b6caac719680dae5af709d9816c06bc7eea9c19a9202648c3245191b107390a5097af7323e3c3910fb33dd2
-EBUILD libosinfo-1.3.0.ebuild 1863 BLAKE2B 856b4a5d7d71436c05a23c7e40c7330e21f442ab7ddf2ede8374100fe3a57ed28f50dd1f48fb0820ff18798cf9fb910ed7ccfe1534dba437f9ab4ccb426fcce2 SHA512 1dcdeed50ab0fb3316cd712853f916f87df2e65c35db607863d3ea6544a86227061c8a10ab13c2c6c41cbd46dd60d1b142472676278691ddd9701a71583b0975
+EBUILD libosinfo-1.3.0.ebuild 1862 BLAKE2B 9aacc7c5ed0c1318a8749282a123596135d6b0472417cefbca1fc6a0d52dfe89e3f25b1aa50149101fa896dbd6da43a2a091a0a444b77bfa226192b77f339dc1 SHA512 b55b7cb906a4a02e33d650af2493ba0904ef7b43c47f9b62d15830ef00decad706ea1e74c60b6d49ce63968aef1c7c706745bdbae5ac835ac9cd9b2ec6c964dc
 EBUILD libosinfo-1.4.0.ebuild 1865 BLAKE2B 99659c78f76076d2338c619d381d924f9c2a80d2bba736dbc803d0cee94f4a69379e0a6781cc0776a923200827b4ec908c1692f06d254ddb4b7276eb502f27c6 SHA512 b288b846e4348094d53e072fc2c1ff2a4b5c9bd0cb37005a24a31b7c8f1acd8edcb019da1587a861df6581d2a98103efcdc2cb047cdc975191f92483cf2c3457
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-libs/libosinfo/libosinfo-1.3.0.ebuild b/sys-libs/libosinfo/libosinfo-1.3.0.ebuild
index 2e2afe76c62b..064e8e0d469b 100644
--- a/sys-libs/libosinfo/libosinfo-1.3.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-1.3.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="+introspection +vala test"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Unsure about osinfo-db-tools rdep, but at least fedora does it too
 RDEPEND="
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 01c55245f768..d77c030fd645 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -12,8 +12,10 @@ AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb
 AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6
 AUX ncurses-6.1-st07_terminfo_typo.patch 563 BLAKE2B e28c682c752e8e075691045217d14f88e5a1c5805c014e9b6ccc1d19179cc60dd04dea418a6d9d6302140a89c1977e47b6d9385c7192fdac6a26c9d2e2a33f69 SHA512 a81faa2c9450179324ba56c8cbf3bc5104fbfb2bb9108dfcd93a63fb3ce88c25cb5ab130a2e015816a1a2efa42c2fb3fb3b4b381517d45804efad997a36c8508
 DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
+DIST ncurses-6.1-20181020-patch.sh.bz2 361598 BLAKE2B e74f6b4e81c822ae500724ebe707031d3157190e96256656940241e4485fa3d96669e069e764cecc829d9fccccc11caaab8c68ae489b083ade4f286647ac74af SHA512 e54bf83cae5bae3ddb909b9bbe91f549b366a5c60b6274f6b27a3f28b5f9f1afe7263487db842f8cbc22a93e0ef17f0fd518a0585523116e192174f44423ae4a
 DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
 EBUILD ncurses-5.9-r101.ebuild 5283 BLAKE2B 2860fee40555ddc883b4ffffc8ea1055c4c5151b451b8a25226fbed116d37e3862a6c9c885666365882bea428fff71417811b5ba04aa72ae0df6ed6bb3afbeaa SHA512 dce58899c1ca8b1ba1206fcbc015821e5de433b8ca4f750889d9281e35c15e70bd2628f4ef3a9990d7f1c8d6a757368833d9c88587eff6e480465697ac29d6f3
 EBUILD ncurses-6.1-r2.ebuild 8777 BLAKE2B e4cb86ecb57a121cb0af85ba7c736c6d85cc50f81923533b8121328b30a6b133b96fcf64cfef117addade32ab0df4a3309a154e5b5bfb6f9075bfd11a41b54cd SHA512 2845c4ad480898405305a2a83565c6f153c719098eabcb2c8d59b8a190a91b50434d0038c47f80c1815e746714b0fc6accb1a0efbc5e5ddcfac4356a56903686
 EBUILD ncurses-6.1-r3.ebuild 9194 BLAKE2B ac2478fa113132d40ad6bab70dea47e5c2854a71efd512f7c2457affcc9bfab9805494357c4f609946470c9745b407ed1f53ebbabe3ca59edc084649311b1cce SHA512 a2a118d5539240bf3944be85c0f9aeac9421362461fe14b77f3b10d7402717a0573df5b2a11cdbcb2215badb36936da95bd57704e906b1b639553aaebfa9398d
+EBUILD ncurses-6.1_p20181020.ebuild 9289 BLAKE2B 60627748a592fe658e7c0a73f7ded6cda4af8d133cf8d9a276adc087f780323f01f5590e7fbe70bbccc91f1566e1c02c118f34af2fa8f5ca11847e3aa3e8e24e SHA512 1833bb8b4274f44fdcbab152b6505258514c4e8a80b40473b882f292d3f2bc3a4186249f1e02f89e3af206dcbed206d7f1ed2dd0598b523db0f4567951b19c7d
 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
diff --git a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
new file mode 100644
index 000000000000..c96c376e5c8e
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs
+
+MY_PV="${PV:0:3}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
+
+if [[ "${PV}" == *_p* ]] ; then
+	SRC_URI+=" ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2
+		https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2"
+fi
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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}] )"
+#	berkdb? ( sys-libs/db )"
+# Block the older ncurses that installed all files w/SLOT=5. #557472
+RDEPEND="${DEPEND}
+	!<=sys-libs/ncurses-5.9-r4:5
+	!<sys-libs/slang-2.3.2_pre23
+	!<x11-terms/rxvt-unicode-9.06-r3
+	!<x11-terms/st-0.6-r1"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7-nongnu.patch"
+	"${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871
+	"${FILESDIR}/${PN}-6.0-pkg-config.patch"
+	"${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114
+	"${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
+	"${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426
+)
+
+src_prepare() {
+	if [[ "${PV}" == *_p* ]] ; then
+		eapply "${WORKDIR}"/${P/_p/-}-patch.sh
+	fi
+	default
+}
+
+src_configure() {
+	unset TERMINFO #115036
+	tc-export_build_env BUILD_{CC,CPP}
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+	# Order matters here -- we want unicode/thread versions to come last so that the
+	# binaries in /usr/bin support both wide and narrow.
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncurses
+		$(usex unicode 'ncursesw' '')
+		$(usex threads 'ncursest' '')
+		$(use unicode && usex threads 'ncursestw' '')
+	)
+
+	# When installing ncurses, we have to use a compatible version of tic.
+	# This comes up when cross-compiling, doing multilib builds, upgrading,
+	# or installing for the first time.  Build a local copy of tic whenever
+	# the host version isn't available. #249363 #557598
+	if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-aix*)     dbuildflags=     ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_configure "${t}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}" || die
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Disabled until #245417 is sorted out.
+		#$(use_with berkdb hashed-db)
+
+		# Enable installation of .pc files.
+		--enable-pc-files
+		# This path is used to control where the .pc files are installed.
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		--with-cxx-shared
+		$(use_with debug)
+		$(use_with profile)
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+		# Required for building  on mingw-w64, and possibly other windows
+		# platforms, bug #639670
+		$(use_enable kernel_Winnt term-driver)
+		--disable-termcap
+		--enable-symlinks
+		--with-rcs-ids
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-hard-tabs
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_with debug assertions)
+		$(use_enable !debug leaks)
+		$(use_with debug expanded)
+		$(use_with !debug macros)
+		$(multilib_native_with progs)
+		$(use_with test tests)
+		$(use_with trace)
+		$(use_with tinfo termlib)
+		--disable-stripping
+	)
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-widec )
+	else
+		conf+=( --disable-widec )
+	fi
+	if [[ ${target} == ncursest* ]] ; then
+		conf+=( --with-{pthread,reentrant} )
+	else
+		conf+=( --without-{pthread,reentrant} )
+	fi
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
+	fi
+
+	# Force bash until upstream rebuilds the configure script with a newer
+	# version of autotools. #545532
+	CONFIG_SHELL=${EPREFIX}/bin/bash \
+	ECONF_SOURCE="${S}" \
+	econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+		BUILD_DIR="${WORKDIR}" \
+		do_compile cross -C progs tic
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_compile "${t}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files || die
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+	done
+
+	# Move main libraries into /.
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a \
+			"${NCURSES_TARGETS[@]}" \
+			$(use tinfo && usex unicode 'tinfow' '') \
+			$(usev tinfo)
+	fi
+	if ! tc-is-static-only ; then
+		# Provide a link for -lcurses.
+		ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
+	fi
+	# don't delete '*.dll.a', needed for linking #631468
+	if ! use static-libs; then
+		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
+	fi
+
+	# Build fails to create this ...
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
+}
+
+multilib_src_install_all() {
+#	if ! use berkdb ; then
+		# We need the basic terminfo files in /etc for embedded/recovery. #37026
+		einfo "Installing basic terminfo files in /etc..."
+		local terms=(
+			# Dumb/simple values that show up when using the in-kernel VT.
+			ansi console dumb linux
+			vt{52,100,102,200,220}
+			# [u]rxvt users used to be pretty common.  Probably should drop this
+			# since upstream is dead and people are moving away from it.
+			rxvt{,-unicode}{,-256color}
+			# xterm users are common, as is terminals re-using/spoofing it.
+			xterm xterm-{,256}color
+			# screen is common (and reused by tmux).
+			screen{,-256color}
+			screen.xterm-256color
+		)
+		local x
+		for x in "${terms[@]}"; do
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename "$(dirname "${termfile}")")
+
+			if [[ -n ${termfile} ]] ; then
+				dodir "/etc/terminfo/${basedir}"
+				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
+				dosym "../../../../etc/terminfo/${basedir}/${x}" \
+					"/usr/share/terminfo/${basedir}/${x}"
+			fi
+		done
+#	fi
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+
+	use minimal && rm -r "${ED}"/usr/share/terminfo*
+	# Because ncurses5-config --terminfo returns the directory we keep it
+	keepdir /usr/share/terminfo #245374
+
+	cd "${S}" || die
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	if use doc ; then
+		docinto html
+		dodoc -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libncurses.so.5
+	use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+	use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}
diff --git a/sys-libs/ntdb/Manifest b/sys-libs/ntdb/Manifest
deleted file mode 100644
index 253616df281b..000000000000
--- a/sys-libs/ntdb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ntdb-1.0.tar.gz 794585 BLAKE2B 80c8673238850f164b7190ef56e40f29da58378512172b272038864901d53b0b33f0843d78d47bdee4e420beafd07cbb72a16df1bbb8639641a9db45c3eb51e2 SHA512 27f550f85a7bfd105d4115b55f9919f1871964f576a8470688fe8040fb9e2be209246a291d78f55c61cf0920238d7f41917ad7e2d44b202382b3ea47c8c97100
-EBUILD ntdb-1.0-r1.ebuild 1128 BLAKE2B a9069e647cec4c81677640bfa6943a8c8b38ace3e0d0de52630c1169951d6066415bcc6f55dd24d030b156cf157964e1bcfa56929b70b3afb63b33fc9492e38a SHA512 bf6ee8acf169c0d6c0dd90e3279a7e4c390ea2657c5337d8d2798a6c806622eb4a5cf40995638078b243116b103102a247cb47a2f0a8b611c54ea174722ef5b2
-MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
diff --git a/sys-libs/ntdb/metadata.xml b/sys-libs/ntdb/metadata.xml
deleted file mode 100644
index f05d1f266834..000000000000
--- a/sys-libs/ntdb/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-<maintainer type="project">
-    <email>samba@gentoo.org</email>
-    <name>Samba</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sys-libs/ntdb/ntdb-1.0-r1.ebuild b/sys-libs/ntdb/ntdb-1.0-r1.ebuild
deleted file mode 100644
index 56c66267cf58..000000000000
--- a/sys-libs/ntdb/ntdb-1.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit waf-utils multilib-minimal python-single-r1
-
-DESCRIPTION="A not-so trivial keyword/data database system"
-HOMEPAGE="https://tdb.samba.org/"
-SRC_URI="https://www.samba.org/ftp/tdb/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="!<net-fs/samba-4.1.7
-	${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.2"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local extra_opts=()
-	if ! multilib_is_native_abi || ! use python; then
-		extra_opts+=( --disable-python )
-	fi
-
-	waf-utils_src_configure \
-		"${extra_opts[@]}"
-}
-
-multilib_src_test() {
-	# the default src_test runs 'make test' and 'make check', letting
-	# the tests fail occasionally (reason: unknown)
-	emake check
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index 46d8e8fd2016..395eea9ce302 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -7,6 +7,6 @@ DIST OpenIPMI-2.0.26.tar.gz 3124706 BLAKE2B 08afeae1063b404dec3d6f9e5decdf9ac516
 DIST OpenIPMI-2.0.27.tar.gz 3125193 BLAKE2B 86639a86803e49393aefbaf5b1d1fee8e2bf399b2772bdee7d07a00d5e6657efe5cdf962cacb0397f9de5deb0b18edc05783c3388f4fc19e1ee2de4c01be0663 SHA512 44aa2eb97559514d61654434f24bf8e87c3f89ea7095fd3d46c1a889e16c128f29ca19cfb9747afc7fd432ada84406ee884bc8b9c65e28b8bd033d368b744fe3
 EBUILD openipmi-2.0.22.ebuild 2758 BLAKE2B 2e9d3b059b62cbfefc31fc0c941f5975c705a6b849014a47f26b7b4a7880114405e7ffda9422ae9dd948f7ad6d6aa5b18c12a9e404e7dc2c204a9089982f5ae1 SHA512 68bef9639ea0d72e20ef4b4c1d0d59307c20c70c702160f90c975daeae5a4ddeddfce7123defde623d7df4fd278eff8a53b501c76c210cf056d3bba975c1ad01
 EBUILD openipmi-2.0.26.ebuild 2538 BLAKE2B e560fa3ca1c38da676199f3eda29f5dab8adb037fa3b5b717dbe67e2b8af36a2daf3a737267df9b7db38e8bc792032924c58eb8d458164d3704b0a9a54b36a66 SHA512 aab2dae8346b88c4ffefa34ee5215269bf621d8106c804c33f5c659d410802e4556f12a2e3de394a66477ac3c9d967534c00878999e04dec5503a8e8fad16571
-EBUILD openipmi-2.0.27-r1.ebuild 2332 BLAKE2B 0ad93c44fbf3c9185baa92b7d43ec2a5069f224876ced6b046e8042a7161ae24c461a704dd8b1aecad6ce676c04e07321a5c6cda9879030033e07a2d0fb31059 SHA512 ca518080b08e339141edff29c2a4d551063e5c23c6df7df019e7158fc572439058fbc8c8b3a8d9ef93fd797cae646f2a2514f0e91d98751c351dfe2df76d68c8
+EBUILD openipmi-2.0.27-r1.ebuild 2328 BLAKE2B 1cf19f311bc2cfc430fdd4af1fb467a97c965be81e600576a8ec90cfb6f38560fd8311eea2878e1042e998e4d9cb31ced5f2821b324b8d27369e80bceab8386a SHA512 cd720337b2f7e19f96ec7553c65cda808c9cb5f3e1502096f9447914827e3493b398ec2a0c538dd8ada3dfd5958f13abb4d77dfe4b70e3434e3a793857fac7b7
 EBUILD openipmi-2.0.27.ebuild 2574 BLAKE2B bdda42ac93e50ce16240a2d51ca512f99c8fa5f4d565f0b3be9e1267c368639ae59627f955f185f6c1b5500e903badb19d3ea61ec1f59d9a21d93b90acbd9d66 SHA512 bba8e7809f15d28e4ebdb802165b9e04256b14bc5ab82fe6f063fd7c129599a1f1177b4772547700b4c0978735db5d01eeb88cb656596b2377cc3e4ed9486593
 MISC metadata.xml 347 BLAKE2B 4857bbfde0e588b4ad2ac893f826affe46d77ead16c7565fa775580c23fdd35df745a9050b599d0ff333290a155b48cf6d571065abd8b2fe5cc4b2e136f3efc1 SHA512 f67b97714b2b543109c2bc90d8f474df13e8915b7a14fdc3a16b62f1dfbc59ac27c8e64d19429b87a63ee2c1e4812cee26d8fb797591028484b2072b1951231f
diff --git a/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild b/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
index e4bc46a974e6..464e59cf5b0a 100644
--- a/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 hppa ~ia64 ppc x86"
 IUSE="crypt snmp perl python static-libs tcl"
 S="${WORKDIR}/${MY_P}"
 RESTRICT='test'
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index ecd33c2d3d2a..7c6918a02bbe 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/intel-undervolt/Manifest b/sys-power/intel-undervolt/Manifest
new file mode 100644
index 000000000000..1f01f4330b39
--- /dev/null
+++ b/sys-power/intel-undervolt/Manifest
@@ -0,0 +1,6 @@
+AUX confd 75 BLAKE2B 48999f73a7bf3809383904c90a40d6e53a7c338f76585238260bb9d0261ec1b7a31db4ea8039ee31598b042b87c97e6487d048d7880a118864e7bf11cd474344 SHA512 335fc14643b6b0f8f19152966d41d40021b5e6a894f3c27211dcb42c106eef9c03e1b623b8a7bd9e48aeb904854b11d3ac9681738baa87d6eabfd4ac3df9b188
+AUX initd 506 BLAKE2B 0ead334ec3eb2cbfef7a02e326fe73f91a159b60080391b56dba10c021936fe02cc49fd99141b351e17b6231299a4c2ee7c4751744fa3c057ac06a5a8513d751 SHA512 22ba7987ea2dbebf88740967cb326dc6cc2e6797920d8f850494d3bd95280b41655598d07807fd7c2c3f653ee7b65c5e8ad6260dde083f953804497b40f19594
+DIST intel-undervolt-1.6.tar.gz 22465 BLAKE2B 947f3e3f94316a9988fc0311faa23b07e8e0a99afb737232e6e581f45cca89124a49e47bbc85eb0e836b7fc7f966869910fe4d42581e47d98d8c036390c3dec2 SHA512 1c1de1083654085d6711aad28d2815f2aa05d08b7fddbee425b59ab8109dc1e635c2a9bdda8ba0221420e9e00fcd61013bd4a4633d05ede87808c49898772db3
+EBUILD intel-undervolt-1.6.ebuild 1148 BLAKE2B 8f84169e6bcb0d30fdb3b1901ba7cdbce971e933514e447d67c4cabde2078a57194107f900cd430306d81bfbd245c960d2c9c48780c8ff84694eed8f7afe3385 SHA512 8116d5545b70c0a3a8e81f4c5258462f4f1912712725574177cc92c61e58b355abdc2e70abe854f748eeca1ee747d5c0d436485fd49831580445fbb3e477bd5d
+EBUILD intel-undervolt-9999.ebuild 1148 BLAKE2B 8f84169e6bcb0d30fdb3b1901ba7cdbce971e933514e447d67c4cabde2078a57194107f900cd430306d81bfbd245c960d2c9c48780c8ff84694eed8f7afe3385 SHA512 8116d5545b70c0a3a8e81f4c5258462f4f1912712725574177cc92c61e58b355abdc2e70abe854f748eeca1ee747d5c0d436485fd49831580445fbb3e477bd5d
+MISC metadata.xml 462 BLAKE2B 6d4509f86962260abc93564e10dd087dcc1a7aa4b18c804a4a78c0c51d8659c8bd16227dcc654f60c05a0db178d81643a0a301135cb6a0857122a9b591f20e2c SHA512 99358e143a74ab36d352331d30a65ca100818edd57e62258f5ffb32f8c33f41be06e190b9f1291779db5e68228ce82241c7e30af7052c204df2c70ed7dafae1a
diff --git a/sys-power/intel-undervolt/files/confd b/sys-power/intel-undervolt/files/confd
new file mode 100644
index 000000000000..0911f6a58995
--- /dev/null
+++ b/sys-power/intel-undervolt/files/confd
@@ -0,0 +1 @@
+# /etc/conf.d/intel-undervolt: config file for /etc/init.d/intel-undervolt
diff --git a/sys-power/intel-undervolt/files/initd b/sys-power/intel-undervolt/files/initd
new file mode 100644
index 000000000000..0a43656ea79f
--- /dev/null
+++ b/sys-power/intel-undervolt/files/initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	after thermald
+}
+
+command="/usr/bin/intel-undervolt"
+command_args="daemon"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="/etc/intel-undervolt.conf"
+
+start_pre() {
+	if service_started thermald; then
+		eerror "thermald conflits with ${RC_SVCNAME}, exiting"
+	fi
+
+	ebegin "${RC_SVCNAME} -> apply initial voltage"
+		"${command}" apply
+	eend $?
+}
diff --git a/sys-power/intel-undervolt/intel-undervolt-1.6.ebuild b/sys-power/intel-undervolt/intel-undervolt-1.6.ebuild
new file mode 100644
index 000000000000..74c44d3fe535
--- /dev/null
+++ b/sys-power/intel-undervolt/intel-undervolt-1.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Intel CPU undervolting and throttling configuration tool"
+HOMEPAGE="https://github.com/kitsunyan/intel-undervolt"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kitsunyan/${PN}.git"
+else
+	SRC_URI="https://github.com/kitsunyan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=""
+
+CONFIG_CHECK="~INTEL_RAPL ~X86_MSR"
+
+src_prepare() {
+	# respect CC, CFLAGS and avoid calling pkg-config
+	sed -i \
+		-e 's/^CC=/CC?=/' \
+		-e 's/^CFLAGS=/CFLAGS?=/' \
+		-e '/^UNITDIR=/d' \
+		Makefile || die
+
+	default
+}
+
+src_compile() {
+
+	tc-export CC
+
+	myemakeargs=(
+		BINDIR="${EPREFIX}"/usr/bin
+		SYSCONFDIR="${EPREFIX}"/etc
+		UNITDIR="$(systemd_get_systemunitdir)"
+	)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	myemakeargs+=(
+		DESTDIR="${D}"
+	)
+	emake "${myemakeargs[@]}" install
+
+	newinitd "${FILESDIR}"/initd "${PN}"
+	newconfd "${FILESDIR}"/confd "${PN}"
+
+	einstalldocs
+}
diff --git a/sys-power/intel-undervolt/intel-undervolt-9999.ebuild b/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
new file mode 100644
index 000000000000..74c44d3fe535
--- /dev/null
+++ b/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Intel CPU undervolting and throttling configuration tool"
+HOMEPAGE="https://github.com/kitsunyan/intel-undervolt"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kitsunyan/${PN}.git"
+else
+	SRC_URI="https://github.com/kitsunyan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=""
+
+CONFIG_CHECK="~INTEL_RAPL ~X86_MSR"
+
+src_prepare() {
+	# respect CC, CFLAGS and avoid calling pkg-config
+	sed -i \
+		-e 's/^CC=/CC?=/' \
+		-e 's/^CFLAGS=/CFLAGS?=/' \
+		-e '/^UNITDIR=/d' \
+		Makefile || die
+
+	default
+}
+
+src_compile() {
+
+	tc-export CC
+
+	myemakeargs=(
+		BINDIR="${EPREFIX}"/usr/bin
+		SYSCONFDIR="${EPREFIX}"/etc
+		UNITDIR="$(systemd_get_systemunitdir)"
+	)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	myemakeargs+=(
+		DESTDIR="${D}"
+	)
+	emake "${myemakeargs[@]}" install
+
+	newinitd "${FILESDIR}"/initd "${PN}"
+	newconfd "${FILESDIR}"/confd "${PN}"
+
+	einstalldocs
+}
diff --git a/sys-power/intel-undervolt/metadata.xml b/sys-power/intel-undervolt/metadata.xml
new file mode 100644
index 000000000000..52dabf8e7809
--- /dev/null
+++ b/sys-power/intel-undervolt/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Tool for undervolting and throttling limits alteration for Intel CPUs
+	</longdescription>
+	<upstream>
+		<remote-id type="github">kitsunyan/intel-undervolt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 5711f41bd410..d1083bd4c9c8 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,5 +1,5 @@
 AUX upower-0.99.9-pending-charge1.patch 1351 BLAKE2B 719581956d7bed9efb148bb84a83b0b90cabadf1113fece846416b980c1919895bd1e85575bba0198d856d5a39209ab7c919e2142361ee2cf6361f631f312fc9 SHA512 f100c9cb06c8407fdb8cc2ea27651f3e1eb563e40b98b2a0d7589577652d5c14d824a4de3d503cb858fa5d4360993f63da49cd5f4c8caaec43fde4f20e075f47
 AUX upower-0.99.9-pending-charge2.patch 2016 BLAKE2B 87a3078acf6c95dd8237f894aa25dbf803d42f766682e3e53f5ec30fcd7725178ebab94111945fbf0b4d0e16b656e8723240b14358d1c6e5285086b30da541d2 SHA512 15aa04bcd892feec125508d6a9edb8df98cd5317fce27d9c8907994f1d735be32934c5010566f0a38221ef20b48d8faf73841df6e35447ef0efccdaab371fb0b
 DIST upower-0.99.9.tar.xz 448408 BLAKE2B 5fa2436f33c94cffb736d8e3fad433acf58954cf06ccd403a0361214be5afc45d79ea279f3c5c48dcd58b92ccaf995777c95987d1749fd8c8c8958317e439570 SHA512 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f
-EBUILD upower-0.99.9-r1.ebuild 2352 BLAKE2B f194709d07e2d26f64771ef66131ebcdf953215e167db06bc12b0859289ea566a37b6e5deae89aa6a2f7a300470304250f14da5726e2b396a1db36e4ad7cedbd SHA512 8eaf0350a1bfae0a4de40e9a3297eed1e3e25017bd937deec81d40cfd7511f3f102b5dba64bdf35decd0c06153ea3222f901936872af88648c13819c4aa4878e
+EBUILD upower-0.99.9-r1.ebuild 2351 BLAKE2B 3d40a0b40667d5dbebab4cb38191cc04b0a6d390da70746c991ac29a1d142febd4a9319ed49065e886bd0e942e8704e64b5dab60edc7c9aa926997369646c373 SHA512 88bec5851a4ef85d01460e4333b50ab57e30e3f205d501db13e9eedc476800d1387e21edb7995fbf5d46dfe897bd5422658d2741a3db5201fd90f8a789814806
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/upower-0.99.9-r1.ebuild b/sys-power/upower/upower-0.99.9-r1.ebuild
index ff6119f7893d..70d4b2d6f155 100644
--- a/sys-power/upower/upower-0.99.9-r1.ebuild
+++ b/sys-power/upower/upower-0.99.9-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 0f23661c77bf..3b9fd1acdf9f 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index a63760531947..8df175c924c3 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -7,5 +7,5 @@ AUX cronie-crontab 477 BLAKE2B 3ae5d23fbd5439a314d087f95f7cd469d7c7c617c2d7f2c4b
 DIST cronie-1.5.2.tar.gz 121604 BLAKE2B 4225439fd13a32bba3bd24f25d7dd405cdb123e666ebbf14574143af9d161867f82ea3fc479d81a884590faaa9c42e19c971285e01a19d6ac793b7deb7fc4775 SHA512 6455e234becc44e6568fa25fd72abfaa293cb0bc2d2f1d124e551c068ba01083192b21e82e941158c8c1f41cb6dad3851d665b9f3baa82fd49080f3f8619740b
 DIST cronie-1.5.4.tar.gz 122452 BLAKE2B 042961390807c22aa1db3ab592470538d9a348d33fee8f088dfa20e45ee72c72d9502bf5eb5a957494c55d99a6705b94774442f5a2fb06eeab1aa0b0e1a4d6ae SHA512 40a8cd750bc18dcb264e88cf049b0ea66f053b7b6cc10f38fd4f4e6b912871f41ce7ad126521a08203e81c00846e001016b47da3c5e8730a7b49fc970d7b2a6a
 EBUILD cronie-1.5.2.ebuild 2429 BLAKE2B a1833b8cf76455e02adf64d86e75c485c5778db83b4be44094c1c934fea8998f6268f0369c37ac122c0421a6a36ebc343ccac23c825dbc0a69bb3c98f12dc1a8 SHA512 409f80dbc2cb4074f46602315bcedb43c2f864dbd8f4337bd3b76d4e7f92eb70b8737041b3e1362010137a43a51bf1ee30663f9dbdc572fc399d6c94ebc98329
-EBUILD cronie-1.5.4.ebuild 2428 BLAKE2B 614d79c0c34bcdcf1fd7fcf6ad6f284ef234b0ea763cd88e32965386170fab60276ab35c94a71aa9b5a501eea362132bc0f85198fdf6a0fa155e32aef4218dda SHA512 cffc64013fb97a2bd70dab29701d7aae26095894ad7e132105a1a79149d53cc73f81d04e1082bcd353c6b37457cd10aa1b94265bdd3e1be22ddbabf2bd448ccd
+EBUILD cronie-1.5.4.ebuild 2424 BLAKE2B 8895efeb3df305a5f2983cd29d7eaef790ff2e83df3c1001076166bb15e6d885b18b67bd65639d69fda538791b5f868c71b14ef1dc17f3bb6918a11dabe54052 SHA512 9b2050a98eada85e0577336c9f9c0ea9168559497f466a6f7344c6e0633dd0dadb3c04ee15a5665d12c88f7f2bbb5b983305335046f49f5b7bb5e4cc56c4b97a
 MISC metadata.xml 891 BLAKE2B fe26178ef61d59391ea0ec3817c37bf3ca71b196ceb070244099a7cb1a34110c5c0d0903b682d08f1afc69ed2fd9a18aa9aaee21d61e22f388625dfa7a63a908 SHA512 91d9c91d6997261d59cff08c5c2724476d6709993debf0dbcf4abb38d2c99fe301e7d64ed759fd660e9774e81a8fb51e147a0a194ebe733ed6f9c80940ea7658
diff --git a/sys-process/cronie/cronie-1.5.4.ebuild b/sys-process/cronie/cronie-1.5.4.ebuild
index ed86f92448e9..668ffb5ef571 100644
--- a/sys-process/cronie/cronie-1.5.4.ebuild
+++ b/sys-process/cronie/cronie-1.5.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/cronie-crond/cronie"
 SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
 
 LICENSE="ISC BSD BSD-2 GPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="+anacron +inotify pam selinux"
 
 DEPEND="
diff --git a/sys-process/nmon/Manifest b/sys-process/nmon/Manifest
index 11203864a7d5..f07436cf573a 100644
--- a/sys-process/nmon/Manifest
+++ b/sys-process/nmon/Manifest
@@ -1,7 +1,7 @@
-DIST lmon16f.c 271123 BLAKE2B d0ac71e061fdeadc59f0c07d46ed711570d439f8058b1fe30fd137cb648129f844c6d8b750783543eeddb3bd99f26e07e83ba63cdc55ace83d0f2fc77ab19c43 SHA512 04d22b4678932067d42158f1bc794f79b5a321e10ba7163632be3b930e28176d0d057cd652ef7cd342167741aafdc00a16e612a99522bfe75072e67cf8d0a66b
 DIST lmon16g.c 267681 BLAKE2B ff7484b7853418e679720fcc76257fb7fe0208f8cf43806c76f5d189c370f995313c325d6e9821b686fa3917cc552af9e9b94ce9f9aed6efe98d2d07032d7c31 SHA512 87287183db48338a281438efc7a8b74249cf88c0a0799e826a9a89b0eb39835b0ba223c7ea6decc217848179f4991909b3cf307aa7eec8a3a4604ebf8a4e8ebe
 DIST lmon16i.c 269804 BLAKE2B 9ff75d7f9f54d6ea3d4c9bec611343c2a28f2cff44d0e2a972bce61326befd4ae455941dba406d052c4cdd820ffeae48894131c8d8b746eedbd1bb58582594d8 SHA512 7c2d60b1558c01cfbcfe040eb68652d3a6c5717efb5495563f774ff20384a6cc4532e756d49b8634a022e4681503b7738998a5dbd77e4ca37c114a94a03893cb
-EBUILD nmon-16f.ebuild 961 BLAKE2B a8eb37bcdcc374432dfbbddff81e8715a01d5c9675f3ae936dfd9c24b975a9afbca1c612e87f2c266855a88c0700a22668718ac6d367887bff5ad80548ab878e SHA512 d8aee18fc9778aee3a733ff81bd326dbc877f4de582b3b3489a0063700d4809bc7571728763a720b5ed48074f620f5d51a00b20e92b4ee8780137b470314fca1
-EBUILD nmon-16g.ebuild 963 BLAKE2B cc9b8bf039b008db1c6d34cf3625f8f9e16b8db5a5b5d6a7d521c0514cb83e729fea7cf1078f8dfff4748802feada596c29e320098f0333392bb4dc386a6b28e SHA512 c1d8cfea464ada9feb245075c8d4094f42ef444fc1f4ff53286a2170b8a6561ed50eb5c151cd0bd75880e6f5508c87b72867a4aaa25447b8dd36a473755b42dd
+DIST lmon16j.c 268464 BLAKE2B bec697a4db2f16958b8505fafa0d215a41e2149a16a033ccc361f797cec954b43cf0856fb5b670b4741cafeada1dd2ac07df95d6bd5466ee805be406e79f6560 SHA512 e3a5be0e56f634f2e054a0ab39c92c2ca4e345017da976f891a5ece8cf67d57eb3b749f529394163f8269db829af56f394db5c666151b6c1e6a5505a6235869c
+EBUILD nmon-16g.ebuild 961 BLAKE2B 87e844ac0c902fe0ef07a75d5483dfbfb46c189cd82a279d63253896c0ed28b5e4a80d5b3cfb0696e9a57866f3caffbc0b6685e82eadbd5d512bbb5424e5b813 SHA512 592dee8c488c08c7787ec43dcc3de799d53b1966b634c96f45be327893189af6f9c7c155b0ee6ef625e55a9550f14418e3d1056d6b8524af57df0103891d099e
 EBUILD nmon-16i.ebuild 975 BLAKE2B 16379dca3964be32acdb9ff417607183eee128c7c5b2677cbe3ec581522f60577220004fe2da6ed13910eb2b51fd73e8c0f518a8d8f0b543d36d5cde1a187288 SHA512 1787a9fe96a4b24024bf6c1cc53f4a3001b8cbdbafe8b554ab2c31b4d1fb72252ae33c46f52d74e8a57eff7f20bd76522f0b1044425ff8495946caa3267b6415
+EBUILD nmon-16j.ebuild 975 BLAKE2B 16379dca3964be32acdb9ff417607183eee128c7c5b2677cbe3ec581522f60577220004fe2da6ed13910eb2b51fd73e8c0f518a8d8f0b543d36d5cde1a187288 SHA512 1787a9fe96a4b24024bf6c1cc53f4a3001b8cbdbafe8b554ab2c31b4d1fb72252ae33c46f52d74e8a57eff7f20bd76522f0b1044425ff8495946caa3267b6415
 MISC metadata.xml 433 BLAKE2B ac6a0efd845d02c926f079773da5d75dc7c2ad1c582637b1a711e6f4a23a4d3e9ca1a8257b4033402e23f2904ad55099c791146b00a7eef9eb6362bff015d326 SHA512 6c9688990c2c3b2b7e484b2e9366653f80e47af42c6c75ae6cac06bd98d6d4252a6ab782e0155c25417165da6cf2e4deec95c16384d712b8e6d97f6d19becbca
diff --git a/sys-process/nmon/nmon-16f.ebuild b/sys-process/nmon/nmon-16f.ebuild
deleted file mode 100644
index e416c50b8747..000000000000
--- a/sys-process/nmon/nmon-16f.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P="lmon${PV}"
-
-DESCRIPTION="Nigel's performance MONitor for CPU, memory, network, disks, etc..."
-HOMEPAGE="http://nmon.sourceforge.net/"
-LICENSE="GPL-3"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.c"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -v -f "${DISTDIR}"/${MY_P}.c "${S}"/${PN}.c || die
-}
-
-src_configure() {
-	local cflags=(
-		## recommended by upstream to be always on
-		-DGETUSER
-		-DJFS
-		-DLARGEMEM
-		-DKERNEL_2_6_18
-
-		## archs
-		$(usex amd64 -DX86 '')
-		$(usex x86 -DX86 '')
-		$(usex arm -DARM '')
-		$(usex ppc64 -DPOWER '')
-	)
-	append-cflags "${cflags[@]}"
-	export LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses ) -lm"
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/sys-process/nmon/nmon-16g.ebuild b/sys-process/nmon/nmon-16g.ebuild
index 918ae4569cc1..fad46aabe826 100644
--- a/sys-process/nmon/nmon-16g.ebuild
+++ b/sys-process/nmon/nmon-16g.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.c"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
diff --git a/sys-process/nmon/nmon-16j.ebuild b/sys-process/nmon/nmon-16j.ebuild
new file mode 100644
index 000000000000..4cc52ae9c054
--- /dev/null
+++ b/sys-process/nmon/nmon-16j.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="lmon${PV}"
+
+DESCRIPTION="Nigel's performance MONitor for CPU, memory, network, disks, etc..."
+HOMEPAGE="http://nmon.sourceforge.net/"
+LICENSE="GPL-3"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.c"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}"/${MY_P}.c "${S}"/${PN}.c || die
+}
+
+src_configure() {
+	local cflags=(
+		## recommended by upstream to be always on
+		-DGETUSER
+		-DJFS
+		-DLARGEMEM
+		-DKERNEL_2_6_18
+
+		## archs
+		$(usex amd64 -DX86 '')
+		$(usex x86 -DX86 '')
+		$(usex arm -DARM '')
+		$(usex ppc64 -DPOWER '')
+	)
+	append-cflags "${cflags[@]}"
+	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses) -lm"
+}
+
+src_compile() {
+	emake ${PN} LDLIBS="${LIBS}"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index b2372a1437aa..de6d1f61ecc6 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/cargo/Manifest b/virtual/cargo/Manifest
index 96e2cd197a25..aeea22651fe4 100644
--- a/virtual/cargo/Manifest
+++ b/virtual/cargo/Manifest
@@ -5,4 +5,5 @@ EBUILD cargo-1.31.1.ebuild 307 BLAKE2B 6eece8056fbf8ddda6dd0944bc96abda638d1440b
 EBUILD cargo-1.32.0.ebuild 307 BLAKE2B 022d840c705307aa791561f239d351deb368e0bbc050fc8d616bc5f13596fb09640f25e846a3562bab9300c6bf735f14795b5ebd421bcc8e5ba1fcf9b4ea303b SHA512 736642b466b5ebc8d87dbdef5096776acc1fb68c9f8b94b3518056a2b2e16307c28c9d1a35935ed48a71b4ab85b6e26ceacdabab1cf44e45bf917de8f3b94bda
 EBUILD cargo-1.33.0.ebuild 307 BLAKE2B 022d840c705307aa791561f239d351deb368e0bbc050fc8d616bc5f13596fb09640f25e846a3562bab9300c6bf735f14795b5ebd421bcc8e5ba1fcf9b4ea303b SHA512 736642b466b5ebc8d87dbdef5096776acc1fb68c9f8b94b3518056a2b2e16307c28c9d1a35935ed48a71b4ab85b6e26ceacdabab1cf44e45bf917de8f3b94bda
 EBUILD cargo-1.34.2.ebuild 305 BLAKE2B 40efab792d11fc3359d03a1c05673f7a7b31d270dad9c83c3b401951958c8fa5dd06d3fbd4dfda97a033f60f81502f6bee55ab513631ee6f00231bb475fed047 SHA512 b987fb499c7c73e36c85a972b55a3c27b0cc7fabf0df8ab722089d3286c6bfbe9fe5d9e98a2a4ac6b7aa92a8be17fb546ac4a113da094df19eebb523aa36f09d
+EBUILD cargo-1.35.0.ebuild 306 BLAKE2B 8d84cd18f500d5507106c824119af4c6a60171d225190d3db7e35b807de7965fc53587380ef35c5ff89a3e5d07c3cd7cd2b54abdcf530598d7a0b63d0fa57e5d SHA512 0e27700dbfc5a3921934af8dc9d058c1d7eff0df2d1c35665606938e84e807c3983c4a3c61d7e253fb68ef45e04c3706bd229793d254d40057b9b3196b55d618
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/cargo/cargo-1.35.0.ebuild b/virtual/cargo/cargo-1.35.0.ebuild
new file mode 100644
index 000000000000..2c015c4a0d90
--- /dev/null
+++ b/virtual/cargo/cargo-1.35.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Package manager for Rust"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
+
+RDEPEND="|| (
+			=dev-lang/rust-${PV}*
+			=dev-lang/rust-bin-${PV}*
+		)"
diff --git a/virtual/eject/Manifest b/virtual/eject/Manifest
index 918066b5fae6..ffb543e3fc96 100644
--- a/virtual/eject/Manifest
+++ b/virtual/eject/Manifest
@@ -1,2 +1,2 @@
-EBUILD eject-0-r1.ebuild 363 BLAKE2B d08d3cd96275d79f7cc2e4232c01cf53dee65931e62b3966cf07b92609229e4bff8e6398e3e8ff86d11d5588ba1c2d59b725318d08d2c91895714ad6c91ab645 SHA512 8e1a71ac93a4506ec2c3ced4778394c5922008cc3b82c39d363f9bc71c605b7a6ace84fbcb4b3bc15df65fe4666405b7ee5c7b0d5e996dddf4e769bd14a11fe9
+EBUILD eject-0-r1.ebuild 362 BLAKE2B ac77b1b60a67756876e7cd98d80572c878ba14079f7ccfd76607b8f83e638d903074cbda094f525d9d4a299307e34637c053f164d09a9b543726ee3658333056 SHA512 150e7075f4da0c53dc75ded663bb933f5b8d655818b9387388349c72ae699baf23273bea244d7a5b79b44a3834876d5923af206da11d252339b77189cce03aee
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/virtual/eject/eject-0-r1.ebuild b/virtual/eject/eject-0-r1.ebuild
index 4b11168509ac..a9663a7022ce 100644
--- a/virtual/eject/eject-0-r1.ebuild
+++ b/virtual/eject/eject-0-r1.ebuild
@@ -5,6 +5,6 @@ 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"
+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/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
index 040f4dd43662..140ada49a4a2 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -1,2 +1,2 @@
-EBUILD ffmpeg-9-r2.ebuild 1027 BLAKE2B 1c17f7434394c7111ad406a87fe18057bf904ab712451f31bf15f83b742ed129c470a8fc1d180f1cc18ceab608c12133867fbc6285c6c3b0e35f6e73a91221a3 SHA512 dee42864aff2c06ddce0612a99408ba6efac587e51cee1049db539d0f2ea39544f8f55cadcd1674e991bc9dd8e00ea35db50c514804b961b48a6955ac988f5a8
+EBUILD ffmpeg-9-r2.ebuild 1023 BLAKE2B eea98a854417ad53e20ca18c9478b83d21264da70486cb1a16fcb86ed7e3bccdf93aa6a89ecd6ecc58b949c4a97b701d3c43cadde47d84dfa4a544b2177d5189 SHA512 1ebc4e2482fe3c443b918b1209ec6433ee606ee240d3023a1cbc406239138f9d144e3983a22c62d63c27580938696da59de448556f6495b1a02627540e427f98
 MISC metadata.xml 316 BLAKE2B 478d0f4c19b80f9ba189da1580e09d0c28b7fe0c7c6d92f40a7ee0381b23d6f7a6cecd9f9d9b6f937e6329c01ee79b600f4e9da119ebd04c0b5132e641c0fa27 SHA512 ed51d4cd1e105acc8def63c22ef55fb52115f8cc7f3ffd8b7ad3bdc98d3509071e2c68f251eaa9dfe26d185fffd3851e20368ae6ba3933ddb099d6c01dd46cb7
diff --git a/virtual/ffmpeg/ffmpeg-9-r2.ebuild b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
index f9b41e7f78bd..84ec5b1a4093 100644
--- a/virtual/ffmpeg/ffmpeg-9-r2.ebuild
+++ b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ DESCRIPTION="Virtual package for FFmpeg executable implementation"
 #	!libav? ( media-video/ffmpeg:0= )
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="X +encode gsm jpeg2k libav mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
 
 RDEPEND="
diff --git a/virtual/freedesktop-icon-theme/Manifest b/virtual/freedesktop-icon-theme/Manifest
index a7710a961d21..3a396c01873d 100644
--- a/virtual/freedesktop-icon-theme/Manifest
+++ b/virtual/freedesktop-icon-theme/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedesktop-icon-theme-0-r3.ebuild 553 BLAKE2B 3d81251103033d492e29903d445279695108d4ce554efbbc18115b244a07241f9db696d8bf8d2d40e9177459a1daa5e9d9a85424312a15d681d67c2cbebea31d SHA512 f3786dc59f05890c2af62c9a63cbf30afc2686612afa2196c752d92992a50a3fd072e0d944b47c16379d460e04c0e911c7d8b236d0eb81232f169aeb3ca57d23
+EBUILD freedesktop-icon-theme-0-r3.ebuild 549 BLAKE2B b3e3dac5c5dd61b6ddb5f42ecf1ef2febb3e776e425389c80cad23108f520222cc3e5d3272c68e68a98afa4aaab85153409a6dde9a4753df16ea261b5ed5ebfd SHA512 0420b90f7d62381f93ef818abfee13937b30879eb80173f7842f7a0fe274e9e7262ee9221369b18e5ef74343ea73d6192f52eaf4e6843575f11a54818f05f9ad
 MISC metadata.xml 225 BLAKE2B 81838b4d796d9721db9c105c009fb414f50cf0394c85d19006a221687b19ab7e8933985d81c8f81ef81dcb80383de177aaf12d9d97dbc29021ada35bb7f43a27 SHA512 7a66de18f711494ffdb2145fa8aed4639444cc18286ca5ba374739428598e279be56382e7a90e7d6d5fececf9e060269e5d9b497b94e0f204201d95c55cc163e
diff --git a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild
index d8ec207be732..7c07cd508ba8 100644
--- a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild
+++ b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="A virtual to choose between different icon themes"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="|| (
 	x11-themes/adwaita-icon-theme
diff --git a/virtual/imap-c-client/Manifest b/virtual/imap-c-client/Manifest
index 1fbddd167d7e..f3af9d1476a0 100644
--- a/virtual/imap-c-client/Manifest
+++ b/virtual/imap-c-client/Manifest
@@ -1,4 +1,4 @@
 EBUILD imap-c-client-0.ebuild 303 BLAKE2B a0bc34f47aef428e59b59b1c8fa656673babe63268f0474f2289532e5de2aeb20ddd73686fd86085712685ea4af4357b6dcb9608bc5f9115ba0ea27894e5349c SHA512 a03582fbc7237acb3a5234d21223cce70711b3f933b88ad4e9a946e7b644c8b3e831b2f660bd41439d4a70e0309acd58058ddd4f5ebee3b2cace02207bd05c9d
 EBUILD imap-c-client-1.ebuild 339 BLAKE2B dbfacd261c215932c398bceb1b0896394bbcccf1ec9c253d3def8161a5eb9ec9b73b2a428c27592e8c7b020d7f9037be3134585097606a08926c7062b1210cd0 SHA512 9cfc2d99a9e4113c5126d599b37fa76f36bd44da905822103e24c58d7853b7dc1460772a8a99d3c2d97d053e87d41ff7743f353339a443f9b9d2439927503918
-EBUILD imap-c-client-2.ebuild 377 BLAKE2B d4324dceeff7228cf16cf4f809d4eab3050047fd4ddc0923a4a22eebfe805366bd548b1660f9b8fce4f3191b31a4ea1b141c4ed38a5104c478adc1a447eeaaf0 SHA512 a322d82fc191a37722b5f5d1a28fdf4e05b0af868b2db2b96b2055605fd1b672e932750af3a57a15e9f424a91dab0b749b3d41f8a8f17712b8eae20c8e9a2318
+EBUILD imap-c-client-2.ebuild 373 BLAKE2B 9cca9bff2ed07840198ac15af2a2f39911c96cb3b7d83983838357c4ed5133546b7518513b4999a93ef8b40eb2b85bc9d515d4895ae30b59eb2427a0db8da810 SHA512 9705e31abe0a5c0edd5f86a46f4cde2e48d0947a09a2cc5d3f5a6701433216363446c786b93fe809df9d355b26871673d2483119b447d7f9562769d9703d9e1b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/imap-c-client/imap-c-client-2.ebuild b/virtual/imap-c-client/imap-c-client-2.ebuild
index ea089863c118..709a7089f23f 100644
--- a/virtual/imap-c-client/imap-c-client-2.ebuild
+++ b/virtual/imap-c-client/imap-c-client-2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for IMAP c-client"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="kerberos ssl"
 
 RDEPEND=" || (	net-libs/c-client[kerberos=,ssl=]
diff --git a/virtual/jpeg-compat/Manifest b/virtual/jpeg-compat/Manifest
new file mode 100644
index 000000000000..9460547f8d4d
--- /dev/null
+++ b/virtual/jpeg-compat/Manifest
@@ -0,0 +1,2 @@
+EBUILD jpeg-compat-62.ebuild 391 BLAKE2B 1d03fb2d2d563ae4507b61ef54758e4f57924d93d76793240279efffecbe8017553342c686e040c9059735c541afa376d472ea88d4080d29b7e9e83fd9a81889 SHA512 52e72ea9ed5617f20bda1c0f61bc2085c2324baa6a596ebb7d86f27dabd2dc90c799631a9beda86b4aff3f2886df41a4ee3a2f024ba691868c07573849b3eb70
+MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
diff --git a/virtual/jpeg-compat/jpeg-compat-62.ebuild b/virtual/jpeg-compat/jpeg-compat-62.ebuild
new file mode 100644
index 000000000000..cc4ce8125f6a
--- /dev/null
+++ b/virtual/jpeg-compat/jpeg-compat-62.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="A virtual for the libjpeg.so.62 ABI for binary-only programs"
+SLOT="62"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+RDEPEND="
+	|| (
+		>=media-libs/libjpeg-turbo-1.3.0-r3:0[${MULTILIB_USEDEP}]
+		>=media-libs/jpeg-6b-r12:62[${MULTILIB_USEDEP}]
+	)"
diff --git a/virtual/jpeg-compat/metadata.xml b/virtual/jpeg-compat/metadata.xml
new file mode 100644
index 000000000000..899a49093b0d
--- /dev/null
+++ b/virtual/jpeg-compat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/virtual/jpeg/Manifest b/virtual/jpeg/Manifest
index 5025cec3fbc3..98e1cd17c04b 100644
--- a/virtual/jpeg/Manifest
+++ b/virtual/jpeg/Manifest
@@ -1,3 +1,2 @@
 EBUILD jpeg-0-r3.ebuild 651 BLAKE2B bb68f3685deabc6a915895c646aa07ff3712daafdf7648426fd84167f99f54735da6b561e42e29e20c872d26b3dc9da317cb7758fd3517e0e4b14d0a4dee6824 SHA512 069dbb54d4c8c5c7c780918877cca90171fd8f1d323e70516aeb51447513b726f4696a557c036db39a84d17fecccf86c0c6d6ff1b88ff1483aa3625b1792e0b1
-EBUILD jpeg-62.ebuild 585 BLAKE2B 18d7c04e7692b03a28edc86dcfc49695bdc0c8f641e886a68fbac81478eeed3e092598605ae9e6796c9333524517221da7ac333685dddad0667d190d746f25d3 SHA512 7777609c4daf649eae0171557dfa1872f96ca34c67183553e5ea9744d8021d9eefd4295ced76bfa9b40a8c582235e0c5ac837423fb4f712a89028092bc067ca0
-MISC metadata.xml 478 BLAKE2B f06a20842644632f99e96760fd86828c19c43eb8eeebe63e3d33270ff0dbf2691a4308e6bc02287c986ccdfde72320bbab98b978cf33063f8f009dc6ae29dd64 SHA512 0caf26a58a2888bc999a1728c8cb06a913669913633afa381cf9777d44cc46a910d1fee9ff70228c84a1cecac2aa0146e9dce3a04f43697c6db42e8dcd348bc9
+MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
diff --git a/virtual/jpeg/jpeg-62.ebuild b/virtual/jpeg/jpeg-62.ebuild
deleted file mode 100644
index 3b40ab4281ee..000000000000
--- a/virtual/jpeg/jpeg-62.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="|| (
-		>=media-libs/libjpeg-turbo-1.3.0-r3:0[${MULTILIB_USEDEP}]
-		>=media-libs/jpeg-6b-r12:62[${MULTILIB_USEDEP}]
-		)"
diff --git a/virtual/jpeg/metadata.xml b/virtual/jpeg/metadata.xml
index d5a42ca38ba3..899a49093b0d 100644
--- a/virtual/jpeg/metadata.xml
+++ b/virtual/jpeg/metadata.xml
@@ -5,10 +5,4 @@
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
-	<slots>
-		<slot name="0">For building against. This is the only slot
-			that provides headers and command line tools.</slot>
-		<slot name="62">For binary compatibility, provides
-			libjpeg.so.62 only.</slot>
-	</slots>
 </pkgmetadata>
diff --git a/virtual/logger/Manifest b/virtual/logger/Manifest
index 132dc4cc1649..70e693164ff9 100644
--- a/virtual/logger/Manifest
+++ b/virtual/logger/Manifest
@@ -1,2 +1,2 @@
-EBUILD logger-0-r1.ebuild 607 BLAKE2B aafbb3885bdd097f69b80fd3b58d72e04a221517a12c50063342b92254fad2c450f3c92b016cffc9e690083ff0bf64b01503b09821c87c8f0ab58d0597db2606 SHA512 4773370014718b57fc589d4f84557e1ac03f7b012ffc34380adcfdb769b277812cd0cd2c4d6215d87acaf7a5ede19fd61df419bd124e627d303e450ee790d757
+EBUILD logger-0-r1.ebuild 606 BLAKE2B 047c9665f2590bb50c6ddc72688b620353d7b3356225769a095f4e24f788d61914c204de40db88b1225b6fa64dd963140e8ecf227f87b6792bdb3a82f69b786e SHA512 42b7add40a8e04282e58e4cbdae297dbb7e61f89a2f6a5779f06f8f8dc08ee53129a5e34c1b1e2adbe177c6897a23a8a126e1703a2906cbf5df886814b92c0a4
 MISC metadata.xml 369 BLAKE2B 29642895d74d819ff7cb00b91809f80d01ef37a4e0df40ab3a366b898de2d7b99968bf02b6fbeb42d0b7867451920529cb6ff1bf69bd7480d3b55e2bd3abadec SHA512 a43e7a7e1fe1b62d12129442e43a1c1099fa51b0eea790c299dadd628180e2ea46412506277607571fff179f4860896685fae00f8e0b9e2a9d5c5753d2ade82f
diff --git a/virtual/logger/logger-0-r1.ebuild b/virtual/logger/logger-0-r1.ebuild
index f4617823e358..6e5cf7119f09 100644
--- a/virtual/logger/logger-0-r1.ebuild
+++ b/virtual/logger/logger-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for system loggers"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| (
 	app-admin/metalog
diff --git a/virtual/perl-Archive-Tar/Manifest b/virtual/perl-Archive-Tar/Manifest
index 10ee22a98e27..9813083d9066 100644
--- a/virtual/perl-Archive-Tar/Manifest
+++ b/virtual/perl-Archive-Tar/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Archive-Tar-2.240.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Archive-Tar-2.300.0-r1.ebuild 568 BLAKE2B f4165b7f2a0ee61c5d4bae5100a6a5f6a44e1f7558129d721be84a4ac7ad291e5d9f9967c2dd49a7f33461e4d5d93bc6e82d8b25550dfb2036059af7a0a3d0fb SHA512 b323fa33cd80c756c9cbc53f1a6b454e44be67eb95752666f0294afea60d0bbc5896051885e3eadd7cee794dce37a867c4b3802fb08c42ee3f796d4235d6f3c5
+EBUILD perl-Archive-Tar-2.300.0-r1.ebuild 566 BLAKE2B e5fe82e68bf16f2d6bec514ed5ae9786efffb1b993b3a4279576863d5a687fa171123eee2b88ab2d8a035f54e2ec27bb4cf9172047cecf7a38ed45de882a4b3e SHA512 27cbba724fa11333465ae9ac03db0237aee76d52d53ba7299bba576dc0c404403657948d9323cc020428434970a970e700859eacff32d8b5837b9d75b15dd1e0
 EBUILD perl-Archive-Tar-2.320.0.ebuild 579 BLAKE2B ee43c037c00f5894577191f68424efcd33d2f01ef9e615cc749b5db5aeabe98f92a0d7effc3714431acb2e5c138a0d4258433d8b279e875fb6e09c2454bbf375 SHA512 c2307f5398ca1600770c2af98310e0c94c9ee937fe6d401cf4118be78997685669ef7860a65137b7b92cea3c176971c179373d695d278e21851a712703d46e40
 EBUILD perl-Archive-Tar-2.40.100_rc-r6.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.300.0-r1.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.300.0-r1.ebuild
index 31cbdb704835..f334c3f4380b 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.300.0-r1.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.300.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Attribute-Handlers/Manifest b/virtual/perl-Attribute-Handlers/Manifest
index 8cdcc360f351..8cb4d4f6ebea 100644
--- a/virtual/perl-Attribute-Handlers/Manifest
+++ b/virtual/perl-Attribute-Handlers/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Attribute-Handlers-0.990.0-r2.ebuild 525 BLAKE2B 65ebe50b9d2a69ccecc77081ae7ea12c42eaef793238879c8bd3fdcca40b91950cd262d26a8aa7b4256e0e9db7b03075b3520c42d28c7bc0fd0af387ed25b29f SHA512 6be1c458f79d5275b83e3bf5be3e1115325f02148ad8a7f7eac0b238c9ccf8bf4d8d4403c5bb96ffa927846e9f7018f1ef34e04db1338acea3aa45af4fa43fc5
-EBUILD perl-Attribute-Handlers-1.10.0-r1.ebuild 532 BLAKE2B d98b688951a200053e33b71a51b2ba27f5d7fd3eef580c379137b3e7f90ecbfd9a2cca6d2973fd905c551dff8130e1badfc9868a2b0d4c47026d8f40af379f0d SHA512 9197da3781cb01fe4d4c0c7a7f18bd7d4ccd89b7f86511fc1e40bd6fa771c636018747c5870bbc004d7a37e9824be6e3d1b889a8cca1d9736eae35e716fec15f
+EBUILD perl-Attribute-Handlers-1.10.0-r1.ebuild 521 BLAKE2B 05541bc523c030a794cd17f089705c3b143c189ffdf5b2f065a3e6b95c6061cf80db32bd2b1634336532290a4f1fd12661dd873f5c04a34552f4f970348b0f35 SHA512 99d274dea94f280791477b25ac403432e0d48f6431c8c69b5ec6cc266edf1ee3839b60120a6cca332290b0779fbd40cfb6d3818fd0c9da6a26edb9e7f50d531f
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r1.ebuild b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r1.ebuild
index a19631a57530..245cd069f290 100644
--- a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r1.ebuild
+++ b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-AutoLoader/Manifest b/virtual/perl-AutoLoader/Manifest
index 8b03656728de..dad1c69c6214 100644
--- a/virtual/perl-AutoLoader/Manifest
+++ b/virtual/perl-AutoLoader/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-AutoLoader-5.740.0-r7.ebuild 632 BLAKE2B 51f17be2c1d76655789dc1b8838af5e5766d5b88fcc7d4c31fde087b49ad4491448eea223801eb88b633c727d595eea21cb8c5431e080d9026409c2eaeb222c3 SHA512 b8ace2b7e161554f7659c7948f7a60dfedb588124e3ed3fd9039e195821e7e5863ccef06e3009c509bca046588be071f6bb72eb774cdc449a08c3bb37b990da5
+EBUILD perl-AutoLoader-5.740.0-r7.ebuild 629 BLAKE2B b8810c76de77731b4748667dd3d347109ee62c665632a275b819d4185e50877a3e3b015fcafe0c3af7bce5410d76cf3729a315d7c06d487f4d617859a291a440 SHA512 6a9d8655165c286cad5627c0ad83c6bffe93e8382ffb0a0b47f46c1137fa44a05e222856c02fd2e9b8b980b294a35c50d13c0891844480d4653467adbfa3a27a
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r7.ebuild b/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r7.ebuild
index 0d8d9d3c70ec..ea78b2c76ebc 100644
--- a/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r7.ebuild
+++ b/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-B-Debug/Manifest b/virtual/perl-B-Debug/Manifest
index 0876ae6fb8d4..6389c02814c9 100644
--- a/virtual/perl-B-Debug/Manifest
+++ b/virtual/perl-B-Debug/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-B-Debug-1.230.0-r3.ebuild 572 BLAKE2B bcf8f703d08e7ce2b8a96aa3963bec3379ee41ad8732eacf97375cfefde14341ca6a44745aab5d5b9e85577f99eb1e8c28cee5ec599706f35cfae7463f230db3 SHA512 0baf8432cc5a369806af68b8d7e0529b6536b35330e6cdd3483850cb0cf1fc911f3d04162ecf85fae2b30f3fdcc56b60d3e1fe56c6d482f3b1d7721fd54dc58c
 EBUILD perl-B-Debug-1.240.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-B-Debug-1.260.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
+EBUILD perl-B-Debug-1.260.0.ebuild 568 BLAKE2B b04fc78f0a01e0ba552bcaa4870fc3521669648627b65b7ca5ea12d0134a866bdef9dc756615c6e78a555e3ee20096043d4fe6b2ebe60228bd7a216f91e7aae3 SHA512 ba477c2e274e4dc68019d5b31b0b48101ffacfaad38e7a8377cf98620ba33517ddebc1ba18260e3ef28474233a1d51b59779a19ce3342099405357d033f1dd15
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-B-Debug/perl-B-Debug-1.260.0.ebuild b/virtual/perl-B-Debug/perl-B-Debug-1.260.0.ebuild
index bcd7df6e99fb..1eb46f3f09d1 100644
--- a/virtual/perl-B-Debug/perl-B-Debug-1.260.0.ebuild
+++ b/virtual/perl-B-Debug/perl-B-Debug-1.260.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta-Requirements/Manifest b/virtual/perl-CPAN-Meta-Requirements/Manifest
index 853ad32491c1..283801e9fe92 100644
--- a/virtual/perl-CPAN-Meta-Requirements/Manifest
+++ b/virtual/perl-CPAN-Meta-Requirements/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-CPAN-Meta-Requirements-2.140.0-r4.ebuild 631 BLAKE2B 4b179d79feb10669e4d0989760d1a6264ef21c34da422d1b9dfc2360f0742c9536426316685e49cce2e1c5e91984461668694932b0ccabe3631296cb0b314bed SHA512 8516d881dfb35bbdd7dccfd15613da9d4e48fe53e7aa871b7640c1855cd697722d9f6f8e5bc648289cdf4b6c9cdee61a80dab3a9de4ca27383501f6771920b86
+EBUILD perl-CPAN-Meta-Requirements-2.140.0-r4.ebuild 629 BLAKE2B b8810c76de77731b4748667dd3d347109ee62c665632a275b819d4185e50877a3e3b015fcafe0c3af7bce5410d76cf3729a315d7c06d487f4d617859a291a440 SHA512 6a9d8655165c286cad5627c0ad83c6bffe93e8382ffb0a0b47f46c1137fa44a05e222856c02fd2e9b8b980b294a35c50d13c0891844480d4653467adbfa3a27a
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r4.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r4.ebuild
index b82f4eb75720..ea78b2c76ebc 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r4.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN/Manifest b/virtual/perl-CPAN/Manifest
index e95fc9c08701..81fa6d1dbe0f 100644
--- a/virtual/perl-CPAN/Manifest
+++ b/virtual/perl-CPAN/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-CPAN-2.110.100_rc-r6.ebuild 424 BLAKE2B 1d66536c40fa054f18d9202e7b575031fa566cfbdfad7c4a061a7517ff8bfcc6f25b6176e9e74649148ff328cbea19abba60af9a111d09a85b239acc79f23dfd SHA512 274709f9205a021a821275e57e234037667a801c1dbd2b65871cd4c5a38aab5da3fba7483e3506f12a33470ec25910cacf848dd4d60bb8df0a9a7cf4132bae5f
 EBUILD perl-CPAN-2.180.0.ebuild 409 BLAKE2B b336c66677a0357a4fd581b6d73e46d1ac277d0a280ab9c74551b3f75778bdb65fe596c17ddcf367a0effa290be8d4b0f77bf074b0c6a95f599b8e6eec0b72d3 SHA512 91b5966b38ad661959a8102126a9d5d217f5e1e186aae6d66f6d9a5a221994cb796cd7b84be9ee11a34540df45aaae80c29cb19b5ac9bb9e865dce603c09d9ce
-EBUILD perl-CPAN-2.200.0.ebuild 422 BLAKE2B 751b1592278f7439103179349e009a0e128aee3ea22aacc4728d0590a0e6c5c805d8d3ef4ef3809310c6acd0ac215f1de218aca0d7478f159738fd56a0819593 SHA512 46582347f029d5adade564d47b6a42353a0d4e588fd392775d88e5e412c7f3c47399ed1e7cc14a6e0cb144f35c2e53ba25312fe5be24d444af59b3f28dabde06
+EBUILD perl-CPAN-2.200.0.ebuild 411 BLAKE2B 5e45b95e42ffe9ac4f4a0a5d309f52ef09c941e88641ac4e386e6d9f9d87437c734da9969ea1a3cdc762d909a3e81c143620984a4a7364daa474601c2690d73b SHA512 22da2e8dd2e0b8d3167166fe9ec617e17802064b398629512fb3dca5709b9fb4301155987b3b277139d6e7ea29977b4d96b87f5e3720a1977a3b9d4c108bec6f
 EBUILD perl-CPAN-2.220.0.ebuild 422 BLAKE2B ca32124be449c74f9453f61eedf285dd08ebeb28bfbe32d772ded70e2aa5c8480236af13b76d838396fe4c95fd93afb508482eb55a17c1033695cf8399985a48 SHA512 5f965f1c785a7f98ffc83f7bf7cab0539cc7cfdff3e6deb67e731f6df1567615e27512af56fddca0a4085bbf9409290e654b834ede79040bab03736cd82f0eb4
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-CPAN/perl-CPAN-2.200.0.ebuild b/virtual/perl-CPAN/perl-CPAN-2.200.0.ebuild
index ad925f18754f..54390ef53365 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.200.0.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.200.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Carp/Manifest b/virtual/perl-Carp/Manifest
index 21c40ceb3845..29f9f1ebc89d 100644
--- a/virtual/perl-Carp/Manifest
+++ b/virtual/perl-Carp/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Carp-1.400.0-r1.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
 EBUILD perl-Carp-1.420.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Carp-1.500.0-r1.ebuild 607 BLAKE2B b10804524b1521132ff25775b80e78519222dda6042e1219ea660fa869b74a37bc9e80f3874e171bf835686b9ab5ce8dcf169acee4c99d9877af42f575c27fdc SHA512 61cb7a54bf94bc9fa344fe7d6ec38421e5e26837a86595466a27c6533cc1349d9db6e40a0a95c243c4c3a5f863d2390a10212c58e1b7346e4fcab075b3e28a82
+EBUILD perl-Carp-1.500.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
 MISC metadata.xml 356 BLAKE2B 9e80c3a70b4d2ef550bd705d02d24477dbade20545ad50d21ce19d16afc9d7b167b693eceee72373eee0d77c07e972238f3b4d8357b1c5b9942e7a116ced8141 SHA512 cf5fbb85cd1f54aed3f0df484085dbd6dce8afa8377b9964741f3c224c9979354964da769fcc1c6c5b9017c2f6551062751ed5aac370be300f3854c49ada0d50
diff --git a/virtual/perl-Carp/perl-Carp-1.500.0-r1.ebuild b/virtual/perl-Carp/perl-Carp-1.500.0-r1.ebuild
index c8d864de94b1..27e316434a64 100644
--- a/virtual/perl-Carp/perl-Carp-1.500.0-r1.ebuild
+++ b/virtual/perl-Carp/perl-Carp-1.500.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Zlib/Manifest b/virtual/perl-Compress-Raw-Zlib/Manifest
index e7426477a5b1..04df5f6d6e7d 100644
--- a/virtual/perl-Compress-Raw-Zlib/Manifest
+++ b/virtual/perl-Compress-Raw-Zlib/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Compress-Raw-Zlib-2.69.0-r1.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
 EBUILD perl-Compress-Raw-Zlib-2.74.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Compress-Raw-Zlib-2.76.0.ebuild 586 BLAKE2B 4980988aade545e5858df017b4c953dced6f49346af4cfc24359ffc171e914076a622304c3cf5511efb2fe4726cdf77ab025820c2f525fcfded7ab0c04d95599 SHA512 36a42511f81f70dc0205f7e6e421b5806921330f067e9b1820013847c792f2faf22b050fe17e33d354917a0a4fa193a4b5112a9386757ee9566a239a6b279c01
-EBUILD perl-Compress-Raw-Zlib-2.84.0.ebuild 579 BLAKE2B ee43c037c00f5894577191f68424efcd33d2f01ef9e615cc749b5db5aeabe98f92a0d7effc3714431acb2e5c138a0d4258433d8b279e875fb6e09c2454bbf375 SHA512 c2307f5398ca1600770c2af98310e0c94c9ee937fe6d401cf4118be78997685669ef7860a65137b7b92cea3c176971c179373d695d278e21851a712703d46e40
+EBUILD perl-Compress-Raw-Zlib-2.76.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-Compress-Raw-Zlib-2.84.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.76.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.76.0.ebuild
index 38cfe35b0dd3..fe786cddff29 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.76.0.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.76.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild
index 4f98c32724d2..601e9cf1fdd5 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Data-Dumper/Manifest b/virtual/perl-Data-Dumper/Manifest
index 08885aad6a93..566cc6e1f90a 100644
--- a/virtual/perl-Data-Dumper/Manifest
+++ b/virtual/perl-Data-Dumper/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Data-Dumper-2.160.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-Data-Dumper-2.167.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Data-Dumper-2.170.0.ebuild 586 BLAKE2B 4980988aade545e5858df017b4c953dced6f49346af4cfc24359ffc171e914076a622304c3cf5511efb2fe4726cdf77ab025820c2f525fcfded7ab0c04d95599 SHA512 36a42511f81f70dc0205f7e6e421b5806921330f067e9b1820013847c792f2faf22b050fe17e33d354917a0a4fa193a4b5112a9386757ee9566a239a6b279c01
+EBUILD perl-Data-Dumper-2.170.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
 EBUILD perl-Data-Dumper-2.174.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.170.0.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.170.0.ebuild
index 38cfe35b0dd3..fe786cddff29 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.170.0.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.170.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Devel-PPPort/Manifest b/virtual/perl-Devel-PPPort/Manifest
index 44aed1afd946..73055a54038b 100644
--- a/virtual/perl-Devel-PPPort/Manifest
+++ b/virtual/perl-Devel-PPPort/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Devel-PPPort-3.320.0-r1.ebuild 541 BLAKE2B d891d2cedff1d7678b8e7aa6f5c8f2331ea0387db71487095112cc30c3e255ffc8272ab770ada6ebc5eff7890c3b167da5e032f94f27f0193a01392d4956bc40 SHA512 147a2bd7e47beac1123c6630e59390b58d317077957ddbcf8edc9d3fb4ab36686cfee4aabb4382ea67d5cfd6a0e38792692b4318bfbd14f950db15afcbb042f5
 EBUILD perl-Devel-PPPort-3.350.0.ebuild 554 BLAKE2B 7f315087948631d9798d12699789bea93f563ae0b13c70d836e1da4c6adb3f45773601b936e9c563a7a4d627141ace026906dec76ab9dfc5caf5bc93e893ec94 SHA512 91bfbce379aec3562b730da4147e51cd001178301fd373309e3fb2b85006ca87e2309e38c8ec8815171e22a193d3597cce935d32b97a6dbc9368038615e823f7
-EBUILD perl-Devel-PPPort-3.400.0.ebuild 567 BLAKE2B dcb6f0d680cb6e8ac14fc0f53713eedc4995f3545a14e7bc7164fca1b0b9e17fe099cb9f993a062d535a29e21d48922cbebce989c2f54d21edbc79bba7ffe1fa SHA512 cf238b44248381a51f6668e468fc56cfe411733d8bf7b70870e245e5558247245071e5a264a5dddca71d41fd9071f8e72bb7d16247b749810baf0894aaae3a56
+EBUILD perl-Devel-PPPort-3.400.0.ebuild 556 BLAKE2B 512a3e62da4cb7b18e152e01419a90b4d7fdcb1dd734b99b26e2c75f7abcaf23cddfab9febe23a740e5bcdce93977d93628eea33e35d5134403a76e40dd8cac4 SHA512 c6ae2e9f9f8928ef166a6168514afd36d760aed0a50e33d51dd0633ae9a24333227c846f6177d06f7d5c1434f085f4928793f2c9de813196add74415795b2516
 EBUILD perl-Devel-PPPort-3.520.0.ebuild 567 BLAKE2B cb81dfd22a31023ac91f8bf5ebf71e9c83c8922a9ee2584ea136c407d1336faad8062dfdb0e539b406e0dcbfd0da8c29467c9f25618ef5c415ffbb7b2a0fbf5a SHA512 0f27731b4729f350b3c71c67996ed797770a6edef4881872419bca74bb117c3e09ea82f443d2b66e8e744cf74e8649a6dafcb3b32e4070dfe1b44256228eb637
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.400.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.400.0.ebuild
index c43da767dec4..39dba4fca720 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.400.0.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.400.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest-SHA/Manifest b/virtual/perl-Digest-SHA/Manifest
index 489410a89b7d..c89abd106ce3 100644
--- a/virtual/perl-Digest-SHA/Manifest
+++ b/virtual/perl-Digest-SHA/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Digest-SHA-5.950.100_rc-r6.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-Digest-SHA-5.960.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Digest-SHA-6.10.0.ebuild 586 BLAKE2B 4980988aade545e5858df017b4c953dced6f49346af4cfc24359ffc171e914076a622304c3cf5511efb2fe4726cdf77ab025820c2f525fcfded7ab0c04d95599 SHA512 36a42511f81f70dc0205f7e6e421b5806921330f067e9b1820013847c792f2faf22b050fe17e33d354917a0a4fa193a4b5112a9386757ee9566a239a6b279c01
+EBUILD perl-Digest-SHA-6.10.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
 EBUILD perl-Digest-SHA-6.20.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.10.0.ebuild b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.10.0.ebuild
index 38cfe35b0dd3..fe786cddff29 100644
--- a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.10.0.ebuild
+++ b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest/Manifest b/virtual/perl-Digest/Manifest
index 523bb27be6bb..a3864bf6a410 100644
--- a/virtual/perl-Digest/Manifest
+++ b/virtual/perl-Digest/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Digest-1.170.100_rc-r8.ebuild 656 BLAKE2B 28f3bfc71f7196ad12bcaa7d9ccda8c445f087c76ab62b7572f786fbd1318dd6612cde5afb9a64a02df4232eed5d7bb57843b135daf441fc79981c7db84362f6 SHA512 1ffd67df91af5e70a68a972bcb6550b256017c16eb46c138ca57f45358c404005d1be10aec0e81bf54ecdccca3e07a2361d28120c5eceb4018b191f3307b05d0
+EBUILD perl-Digest-1.170.100_rc-r8.ebuild 654 BLAKE2B d3e179f0b6c1532286be0fb9643e177b04143613df6048ac4942949fe14e3b79fa32668427ddb90309cc7e269ccb021de006b482b440adf1c7be4699ad7415b3 SHA512 1fdec590af5e95cd677f855e0dccda64ed72980a61c1e6a7321e34d3198ca1755bf04440d2dc0ec1c9f4d0b40f5b29945c99a30f4e9f73a3222672aaef7551c8
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r8.ebuild b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r8.ebuild
index bce5b60be89a..f668b4cd406f 100644
--- a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r8.ebuild
+++ b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r8.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Dumpvalue/Manifest b/virtual/perl-Dumpvalue/Manifest
index 88b588eebeed..7cb5adc2961d 100644
--- a/virtual/perl-Dumpvalue/Manifest
+++ b/virtual/perl-Dumpvalue/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Dumpvalue-1.180.0-r4.ebuild 459 BLAKE2B 972926d15ec17b5864d48040d44b207017277184d32a37ef08241d22e6c0c9e9cec788adf4bafd940d52f3b4fa5b34ca1d7f0dae755a2debf4ba4117e79ae7c6 SHA512 ca4ebc585551102a533c3e443fd83298c5e86c0d091e47ccc3cb61ab41362959c8ead89279932262a1dcee512f38eefdd45c9f150266f788e99587f0feb7e45f
+EBUILD perl-Dumpvalue-1.180.0-r4.ebuild 472 BLAKE2B 35e04d398e2950f9cb1c2561c78012860b22b2cfb1107e4eb970a9c0900ebd84cbf4bb09ea2d1c9629f7ed1212b970f4a19e6eca4236ad54ac2f9355e278ee7f SHA512 a15053991139d8ba0e498ff255b3aed5a5ef2963060f33238de1a908b572de8203d9c9ada975d21e24b192761f3709dfaefb7bc7c5c6c22d1f3a164d1aad4948
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r4.ebuild b/virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r4.ebuild
index 5c5f3afec703..9e43bf4b0b90 100644
--- a/virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r4.ebuild
+++ b/virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Encode/Manifest b/virtual/perl-Encode/Manifest
index d0d01a8e4d43..b988693b1c97 100644
--- a/virtual/perl-Encode/Manifest
+++ b/virtual/perl-Encode/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Encode-2.800.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-Encode-2.880.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Encode-2.970.0.ebuild 586 BLAKE2B 4980988aade545e5858df017b4c953dced6f49346af4cfc24359ffc171e914076a622304c3cf5511efb2fe4726cdf77ab025820c2f525fcfded7ab0c04d95599 SHA512 36a42511f81f70dc0205f7e6e421b5806921330f067e9b1820013847c792f2faf22b050fe17e33d354917a0a4fa193a4b5112a9386757ee9566a239a6b279c01
+EBUILD perl-Encode-2.970.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
 EBUILD perl-Encode-3.10.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Encode/perl-Encode-2.970.0.ebuild b/virtual/perl-Encode/perl-Encode-2.970.0.ebuild
index 38cfe35b0dd3..fe786cddff29 100644
--- a/virtual/perl-Encode/perl-Encode-2.970.0.ebuild
+++ b/virtual/perl-Encode/perl-Encode-2.970.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Exporter/Manifest b/virtual/perl-Exporter/Manifest
index 416aec88c766..2c5c10846349 100644
--- a/virtual/perl-Exporter/Manifest
+++ b/virtual/perl-Exporter/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Exporter-5.720.0-r3.ebuild 590 BLAKE2B 435f74078015551bbbf3719854aff354c9323735541263e18b0b7dd7dba914506b2846e150e90d0548f40e8d35dc124c4bef1440f8038cb61ff17687f53c5247 SHA512 55948821d22a941f0a737d321ab1e86d42a8092248e6a42e9b63ea0c2555db06962f7b1ebbb93870a409adef8ae24d6f6c408c2b1a6a697c7af8d635356f435f
-EBUILD perl-Exporter-5.730.0-r1.ebuild 607 BLAKE2B b10804524b1521132ff25775b80e78519222dda6042e1219ea660fa869b74a37bc9e80f3874e171bf835686b9ab5ce8dcf169acee4c99d9877af42f575c27fdc SHA512 61cb7a54bf94bc9fa344fe7d6ec38421e5e26837a86595466a27c6533cc1349d9db6e40a0a95c243c4c3a5f863d2390a10212c58e1b7346e4fcab075b3e28a82
+EBUILD perl-Exporter-5.730.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Exporter/perl-Exporter-5.730.0-r1.ebuild b/virtual/perl-Exporter/perl-Exporter-5.730.0-r1.ebuild
index c8d864de94b1..27e316434a64 100644
--- a/virtual/perl-Exporter/perl-Exporter-5.730.0-r1.ebuild
+++ b/virtual/perl-Exporter/perl-Exporter-5.730.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-CBuilder/Manifest b/virtual/perl-ExtUtils-CBuilder/Manifest
index b7a0b8ecf5f4..f417c208d5ff 100644
--- a/virtual/perl-ExtUtils-CBuilder/Manifest
+++ b/virtual/perl-ExtUtils-CBuilder/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-ExtUtils-CBuilder-0.280.225-r2.ebuild 590 BLAKE2B 671eba3ac58748277b47d30da3614a195a16e527c7ffbb5f1339f71e6d0baaa3cdc1b29d63ab60d98261d1ae60852937db66cda2ab4b994e858721307c9a25b2 SHA512 e569c5c72af058154cef7d2f61ff30ebb2da157b6c108187afca4f69f0eb020826f71302a9b927635c3125e675d61da352e9bed3f4c268a22477ce7a29548625
-EBUILD perl-ExtUtils-CBuilder-0.280.230.ebuild 586 BLAKE2B 4980988aade545e5858df017b4c953dced6f49346af4cfc24359ffc171e914076a622304c3cf5511efb2fe4726cdf77ab025820c2f525fcfded7ab0c04d95599 SHA512 36a42511f81f70dc0205f7e6e421b5806921330f067e9b1820013847c792f2faf22b050fe17e33d354917a0a4fa193a4b5112a9386757ee9566a239a6b279c01
+EBUILD perl-ExtUtils-CBuilder-0.280.230.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
 EBUILD perl-ExtUtils-CBuilder-0.280.231.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.230.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.230.ebuild
index 38cfe35b0dd3..fe786cddff29 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.230.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.230.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Constant/Manifest b/virtual/perl-ExtUtils-Constant/Manifest
index bbeda9b956dd..b9a2118f3ff5 100644
--- a/virtual/perl-ExtUtils-Constant/Manifest
+++ b/virtual/perl-ExtUtils-Constant/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-ExtUtils-Constant-0.230.0-r11.ebuild 575 BLAKE2B 64846db83b40ec2e2203a9993524d4f4d098dbe7001e0f006d010064f83827281cc404da16e733846f4f0702898e9db7907bc3f580576788bf7d7ed24fdddb3d SHA512 cdc0145a9a77f41174c22850b447c4b04c51cc4dde5744d3fa50b07f39878b24eaf225c31dd318e554c6ca1709fdfe662e401068cd8ca449b53cbedfc18e9b1a
-EBUILD perl-ExtUtils-Constant-0.250.0-r1.ebuild 586 BLAKE2B 18ff9637825350c6589772970d45ca3b70758b49c97ded0994fbae79410585fd95336852d0fe4c2a2c0148437dfef941c9bc14033e02616dc05462f6d31a8b9d SHA512 8066fffa5aa41736152af73081fedea42f10026f50dcaea9f3e4b4ad4582f22143e8c0969738f3c45d08cb33c8355c58d999e13d68ab808bc2786072b1859a02
+EBUILD perl-ExtUtils-Constant-0.250.0-r1.ebuild 579 BLAKE2B 8fce7903e67a4d74e05c57fabbdd4588f0da0630af9a548617f027534ca3852a84daf918a59706b1478670043a276ec0254e5cacba8a0593289f55c33397c0e4 SHA512 26ff381f75f70b45f16e48cc4257785294698029f4c80a22e5c81c14d983d1c095db696932257294a200a8d537e93b58aa12d1eda4d60c3b8d2bdfac77660ff7
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r1.ebuild b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r1.ebuild
index e46a81ceb505..eb308079d85a 100644
--- a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Install/Manifest b/virtual/perl-ExtUtils-Install/Manifest
index 294a439d9a00..4e0d509b2c24 100644
--- a/virtual/perl-ExtUtils-Install/Manifest
+++ b/virtual/perl-ExtUtils-Install/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-ExtUtils-Install-2.140.0-r1.ebuild 612 BLAKE2B 82115f222237671044a2f8e158a5aae9c8ae53abcc0bb4189511e5247231f65c882ce14f4ff883c4185ef05f43194b2588010d8d143121525745bf26c800081d SHA512 5307b19b5e03d9eb8fc1931322ed02ad16ec208a86cfb33ab0b3a0fc815bd1c05bdb116900a10984a66af4b10196953cafc8818565abde5c81bfa18e5462c592
+EBUILD perl-ExtUtils-Install-2.140.0-r1.ebuild 601 BLAKE2B 3608bd88f3ea6fc858ec11047fd6ac18e739e322e6d1698a0dfb2f211348d666a1e935674f747a8f6e2b74b06f9880355a7fa0292de39645b0a357bbb5b5d3df SHA512 e392af29c14574cc34c813ccba3041723ec894ee70b5bab5f9ef32bc9448b5581b3aa656487b6d06ba3dda239ccd85eec188f60070db1f87bbdcb56ebfea8cd2
 EBUILD perl-ExtUtils-Install-2.40.0-r3.ebuild 595 BLAKE2B 814182f09720d7be7f447330607a263f83533c78003c83a9da08609c415985c9ef9aeea46724a4168d5e420fea0db1bef13b1f418a084d8a26c64b57b63b6e90 SHA512 696c77f538f41e6159d1d381f77a89a318f5d3bf10c5744d5e78b25c03cfee54d9f64b6f5abd9afb18f437a04e58eeae2995ad46a34f5237ff17acbbfb2fb869
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r1.ebuild b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r1.ebuild
index 4a0b46669ead..6fd60f3bd8bb 100644
--- a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ExtUtils-Install"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-MakeMaker/Manifest b/virtual/perl-ExtUtils-MakeMaker/Manifest
index 5a9fbb1aec99..af1ef874175f 100644
--- a/virtual/perl-ExtUtils-MakeMaker/Manifest
+++ b/virtual/perl-ExtUtils-MakeMaker/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-ExtUtils-MakeMaker-7.100.200_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-ExtUtils-MakeMaker-7.240.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild 607 BLAKE2B b10804524b1521132ff25775b80e78519222dda6042e1219ea660fa869b74a37bc9e80f3874e171bf835686b9ab5ce8dcf169acee4c99d9877af42f575c27fdc SHA512 61cb7a54bf94bc9fa344fe7d6ec38421e5e26837a86595466a27c6533cc1349d9db6e40a0a95c243c4c3a5f863d2390a10212c58e1b7346e4fcab075b3e28a82
+EBUILD perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild
index c8d864de94b1..27e316434a64 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-ParseXS/Manifest b/virtual/perl-ExtUtils-ParseXS/Manifest
index 22e6898ffa66..e543dd69fe42 100644
--- a/virtual/perl-ExtUtils-ParseXS/Manifest
+++ b/virtual/perl-ExtUtils-ParseXS/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-ExtUtils-ParseXS-3.310.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-ExtUtils-ParseXS-3.340.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-ExtUtils-ParseXS-3.390.0.ebuild 586 BLAKE2B 4980988aade545e5858df017b4c953dced6f49346af4cfc24359ffc171e914076a622304c3cf5511efb2fe4726cdf77ab025820c2f525fcfded7ab0c04d95599 SHA512 36a42511f81f70dc0205f7e6e421b5806921330f067e9b1820013847c792f2faf22b050fe17e33d354917a0a4fa193a4b5112a9386757ee9566a239a6b279c01
+EBUILD perl-ExtUtils-ParseXS-3.390.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
 EBUILD perl-ExtUtils-ParseXS-3.400.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.390.0.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.390.0.ebuild
index 38cfe35b0dd3..fe786cddff29 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.390.0.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.390.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Path/Manifest b/virtual/perl-File-Path/Manifest
index c394df31bd8e..50308136f8f0 100644
--- a/virtual/perl-File-Path/Manifest
+++ b/virtual/perl-File-Path/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-File-Path-2.130.0.ebuild 541 BLAKE2B e4701947e0923c6664635cc28e65a08421d314355a5e70e5119aacbebf39f458e42ac51e50fdbd623ecdea99f86c4f752f8e5efe9bfc23aefaa3e99ab2038ead SHA512 bdca0a240035e58a586a33a16ec9965add6d1134630f198bbc99832cff3e575f063358ab47074c58dfe25241c734ddc5583315f280a19399723ac5416136c676
-EBUILD perl-File-Path-2.150.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
+EBUILD perl-File-Path-2.150.0.ebuild 568 BLAKE2B b04fc78f0a01e0ba552bcaa4870fc3521669648627b65b7ca5ea12d0134a866bdef9dc756615c6e78a555e3ee20096043d4fe6b2ebe60228bd7a216f91e7aae3 SHA512 ba477c2e274e4dc68019d5b31b0b48101ffacfaad38e7a8377cf98620ba33517ddebc1ba18260e3ef28474233a1d51b59779a19ce3342099405357d033f1dd15
 EBUILD perl-File-Path-2.160.0.ebuild 579 BLAKE2B ee43c037c00f5894577191f68424efcd33d2f01ef9e615cc749b5db5aeabe98f92a0d7effc3714431acb2e5c138a0d4258433d8b279e875fb6e09c2454bbf375 SHA512 c2307f5398ca1600770c2af98310e0c94c9ee937fe6d401cf4118be78997685669ef7860a65137b7b92cea3c176971c179373d695d278e21851a712703d46e40
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-File-Path/perl-File-Path-2.150.0.ebuild b/virtual/perl-File-Path/perl-File-Path-2.150.0.ebuild
index bcd7df6e99fb..1eb46f3f09d1 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.150.0.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.150.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Spec/Manifest b/virtual/perl-File-Spec/Manifest
index 15352c36d8e5..5983d1b214b9 100644
--- a/virtual/perl-File-Spec/Manifest
+++ b/virtual/perl-File-Spec/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-File-Spec-3.630.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-File-Spec-3.670.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-File-Spec-3.740.0.ebuild 586 BLAKE2B 4980988aade545e5858df017b4c953dced6f49346af4cfc24359ffc171e914076a622304c3cf5511efb2fe4726cdf77ab025820c2f525fcfded7ab0c04d95599 SHA512 36a42511f81f70dc0205f7e6e421b5806921330f067e9b1820013847c792f2faf22b050fe17e33d354917a0a4fa193a4b5112a9386757ee9566a239a6b279c01
+EBUILD perl-File-Spec-3.740.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
 EBUILD perl-File-Spec-3.780.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.740.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.740.0.ebuild
index 38cfe35b0dd3..fe786cddff29 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.740.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.740.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Filter-Simple/Manifest b/virtual/perl-Filter-Simple/Manifest
index caddc7cee388..5c1b3c414204 100644
--- a/virtual/perl-Filter-Simple/Manifest
+++ b/virtual/perl-Filter-Simple/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Filter-Simple-0.920.0-r3.ebuild 584 BLAKE2B 5d9cf4534906d104cf12e95d6785f1acab0dd708a17a6dda3cd81601e1fcfd0fe839a5dd2e101c9bfeb693256d21008762f506431fc0f886723354ef3c85d7f7 SHA512 3d6d1a70d423afec98a057b545b77ec1e9aedb3c67fecb273a5db1a6fcfc19bbb87d54b4227b24c87af9cd1b774394ac0bf402eed47ba7741c4ba9e623558c98
 EBUILD perl-Filter-Simple-0.930.0.ebuild 578 BLAKE2B 68c52600ba1daec42e4e180ee3d71e4b4cbea82f4656ed1673485dd6afaf122da07d37c3b56a34fde1f35fec004af4ccac6ee3089671e88c9cd37e019b74e59a SHA512 b882f65af638882197a70f4bd04820b2f02722e195eaf6508c8072f2175407784cd3e2e83ebf3f412abee1536bef7f2bcb0e59dbf0a8d3a27c3749aa7071025d
-EBUILD perl-Filter-Simple-0.950.0-r1.ebuild 612 BLAKE2B 90643676f07b7e9509b2bfc8a73640ad9e9c51945292d4456f886e489461a3dd0efda6c70602bdd07a4bfe8145a41b39e1186117aa6096fe03ac5908bd51d647 SHA512 f2eb1f5e31ad3d4dda1275a8619ff59b19dc4bd7e03c37db3a4eb2fa9ec119e1a5ec3e5e3a8110191483a60beac7ac8d90f61d397dd9c22a73af2e978ddd6f06
+EBUILD perl-Filter-Simple-0.950.0-r1.ebuild 601 BLAKE2B fd04ae1f2750425f580507d37acafa4ca2ce53cc2c084fd78e5d61cc9f301d2d7132467379930835cb0a49e7d3e8892083cc85e0a72788d8a1823a2c04cc87e6 SHA512 077cbe54b4142a0225d244887d5ccfd005bd246364f8c5ba53d8b64e9c966d85c285e5719e58b3e6742962e01028b6695ee1c570fcfb49dab7f6a0ad8ef5e241
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r1.ebuild b/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r1.ebuild
index a459f3c760dc..ff3c3d904e28 100644
--- a/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r1.ebuild
+++ b/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for perl-core/Filter-Simple"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Getopt-Long/Manifest b/virtual/perl-Getopt-Long/Manifest
index b1424bdc705b..c78de7523e7e 100644
--- a/virtual/perl-Getopt-Long/Manifest
+++ b/virtual/perl-Getopt-Long/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Getopt-Long-2.480.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-Getopt-Long-2.490.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Getopt-Long-2.500.0-r1.ebuild 607 BLAKE2B b10804524b1521132ff25775b80e78519222dda6042e1219ea660fa869b74a37bc9e80f3874e171bf835686b9ab5ce8dcf169acee4c99d9877af42f575c27fdc SHA512 61cb7a54bf94bc9fa344fe7d6ec38421e5e26837a86595466a27c6533cc1349d9db6e40a0a95c243c4c3a5f863d2390a10212c58e1b7346e4fcab075b3e28a82
+EBUILD perl-Getopt-Long-2.500.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r1.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r1.ebuild
index c8d864de94b1..27e316434a64 100644
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r1.ebuild
+++ b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-I18N-LangTags/Manifest b/virtual/perl-I18N-LangTags/Manifest
index 24044601d4a1..98101539f479 100644
--- a/virtual/perl-I18N-LangTags/Manifest
+++ b/virtual/perl-I18N-LangTags/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-I18N-LangTags-0.400.0-r5.ebuild 423 BLAKE2B 1401c116d10ad895ac6b4e677cd81453f37c68eddd43ae89518e3675176595698bc4f223c7246de3658d3f3f5114a4e341be64a9244aac198195811ce6fcfaef SHA512 b84fda2cdf2339ce486723663c5b11d706339471128947869cc6750e4500a70afea21d7b2fd279f705cf6902e4208e47d71225cb3f000e6a272142ec36f1c48b
 EBUILD perl-I18N-LangTags-0.420.0.ebuild 423 BLAKE2B 12ca8593c996903a6b36f80e65c497f8bf84e616de7ea461832924726da8a12a8f444b8cc947f5c5b89fe23a28e721820a1d52318d4e6cc5d45f541aec24edd1 SHA512 49d83eda48d5cc0c9b2f4868f4e92767b23a462a6f38ba30aa22f27726650494af1e9c743141c324246813ebda2b5ab1bff4061295f4b2c79aecd455fb38dc75
-EBUILD perl-I18N-LangTags-0.430.0-r1.ebuild 457 BLAKE2B cbaad4583b7121971d08399d8c5320f7c4c996c1e19911b00860b81dd617b7e8d0122ed0fa9b6798b82336e07d52ef7c2d143f0b6271abea901cac73ab35a79f SHA512 86d6e27fc384c79ff8da38b1748302fb7c6c5d118da9ca7ff1a3e95434c161eebb589141d136c53e860ee0f75e67cde4cc692d36ce650f6cc6c4c5a8ba0d00b9
+EBUILD perl-I18N-LangTags-0.430.0-r1.ebuild 446 BLAKE2B c06306752ff5ba229e6410573f66b97e8f7e270ae5a705d91e69f70a81005becc11d02c9ae526e92effa0ec0543eb845787aa92fe06db6ae8c023f475ab0df0c SHA512 23d0a5c6e617da6ef7fa52c7577f73a9388dc726f17fb0df1f8f6d14546cd7e831699da1a8d452a0dea91f97db1479ff820cbd55ba01f6b97621670e657785e4
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r1.ebuild b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r1.ebuild
index 79e6fb94a536..a315f3b6023a 100644
--- a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r1.ebuild
+++ b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for I18N-LangTags"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/I18N-LangTags-${PV} )
diff --git a/virtual/perl-IO-Socket-IP/Manifest b/virtual/perl-IO-Socket-IP/Manifest
index 950b42a780b4..956f88277baa 100644
--- a/virtual/perl-IO-Socket-IP/Manifest
+++ b/virtual/perl-IO-Socket-IP/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-IO-Socket-IP-0.370.0-r3.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
 EBUILD perl-IO-Socket-IP-0.380.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-IO-Socket-IP-0.390.0-r1.ebuild 607 BLAKE2B b10804524b1521132ff25775b80e78519222dda6042e1219ea660fa869b74a37bc9e80f3874e171bf835686b9ab5ce8dcf169acee4c99d9877af42f575c27fdc SHA512 61cb7a54bf94bc9fa344fe7d6ec38421e5e26837a86595466a27c6533cc1349d9db6e40a0a95c243c4c3a5f863d2390a10212c58e1b7346e4fcab075b3e28a82
+EBUILD perl-IO-Socket-IP-0.390.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r1.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r1.ebuild
index c8d864de94b1..27e316434a64 100644
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r1.ebuild
+++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO/Manifest b/virtual/perl-IO/Manifest
index 79466c8ac09e..5875397bb2d7 100644
--- a/virtual/perl-IO/Manifest
+++ b/virtual/perl-IO/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-IO-1.360.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-IO-1.380.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-IO-1.390.0.ebuild 586 BLAKE2B 4980988aade545e5858df017b4c953dced6f49346af4cfc24359ffc171e914076a622304c3cf5511efb2fe4726cdf77ab025820c2f525fcfded7ab0c04d95599 SHA512 36a42511f81f70dc0205f7e6e421b5806921330f067e9b1820013847c792f2faf22b050fe17e33d354917a0a4fa193a4b5112a9386757ee9566a239a6b279c01
+EBUILD perl-IO-1.390.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
 EBUILD perl-IO-1.400.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-IO/perl-IO-1.390.0.ebuild b/virtual/perl-IO/perl-IO-1.390.0.ebuild
index 38cfe35b0dd3..fe786cddff29 100644
--- a/virtual/perl-IO/perl-IO-1.390.0.ebuild
+++ b/virtual/perl-IO/perl-IO-1.390.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IPC-Cmd/Manifest b/virtual/perl-IPC-Cmd/Manifest
index c098d4c9a260..5eb3793d883d 100644
--- a/virtual/perl-IPC-Cmd/Manifest
+++ b/virtual/perl-IPC-Cmd/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-IPC-Cmd-0.920.100_rc-r6.ebuild 597 BLAKE2B bc52f214e7f43712fc3b18b205ee2fd7eb9bf5a167f4d9acb1b0eff5e4171097066c414c06bf139e1f397207a176138e41d5a15ed946b7872ba2c06dc0d42f8c SHA512 f773447ae231b2724604fef7102cca16d26d822e7bdc81beee289521f4e36b04f8d17f2944372effada8b00b01ce87cc7f1aa36cd04e363edaf97a4e0ea17750
 EBUILD perl-IPC-Cmd-0.960.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-IPC-Cmd-1.0.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
+EBUILD perl-IPC-Cmd-1.0.0.ebuild 568 BLAKE2B b04fc78f0a01e0ba552bcaa4870fc3521669648627b65b7ca5ea12d0134a866bdef9dc756615c6e78a555e3ee20096043d4fe6b2ebe60228bd7a216f91e7aae3 SHA512 ba477c2e274e4dc68019d5b31b0b48101ffacfaad38e7a8377cf98620ba33517ddebc1ba18260e3ef28474233a1d51b59779a19ce3342099405357d033f1dd15
 EBUILD perl-IPC-Cmd-1.20.0.ebuild 579 BLAKE2B ee43c037c00f5894577191f68424efcd33d2f01ef9e615cc749b5db5aeabe98f92a0d7effc3714431acb2e5c138a0d4258433d8b279e875fb6e09c2454bbf375 SHA512 c2307f5398ca1600770c2af98310e0c94c9ee937fe6d401cf4118be78997685669ef7860a65137b7b92cea3c176971c179373d695d278e21851a712703d46e40
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.0.0.ebuild b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.0.0.ebuild
index bcd7df6e99fb..1eb46f3f09d1 100644
--- a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.0.0.ebuild
+++ b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.0.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-JSON-PP/Manifest b/virtual/perl-JSON-PP/Manifest
index ffea884a3abb..f1d7f5b7f2a0 100644
--- a/virtual/perl-JSON-PP/Manifest
+++ b/virtual/perl-JSON-PP/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-JSON-PP-2.273.0.100_rc-r6.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-JSON-PP-2.274.0.200_rc.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-JSON-PP-2.970.10.ebuild 586 BLAKE2B 4980988aade545e5858df017b4c953dced6f49346af4cfc24359ffc171e914076a622304c3cf5511efb2fe4726cdf77ab025820c2f525fcfded7ab0c04d95599 SHA512 36a42511f81f70dc0205f7e6e421b5806921330f067e9b1820013847c792f2faf22b050fe17e33d354917a0a4fa193a4b5112a9386757ee9566a239a6b279c01
+EBUILD perl-JSON-PP-2.970.10.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
 EBUILD perl-JSON-PP-4.20.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-2.970.10.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-2.970.10.ebuild
index 38cfe35b0dd3..fe786cddff29 100644
--- a/virtual/perl-JSON-PP/perl-JSON-PP-2.970.10.ebuild
+++ b/virtual/perl-JSON-PP/perl-JSON-PP-2.970.10.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Locale-Maketext-Simple/Manifest b/virtual/perl-Locale-Maketext-Simple/Manifest
index 989753e75165..fa0f28305a05 100644
--- a/virtual/perl-Locale-Maketext-Simple/Manifest
+++ b/virtual/perl-Locale-Maketext-Simple/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Locale-Maketext-Simple-0.210.100_rc-r8.ebuild 657 BLAKE2B 90096346aa0a67d70210b0e150f35a701d43dc90e6ca820b9ff5757414ebbd89a2f6fe6d01fa16222250be7209d3995d8a6c80f94c884a43c78fb0ab621e2341 SHA512 605211ffd1d1b5f390045f3ab15ecf25122e85eb4628fa2b7e46663f2cb7e848db55ff7834e4861b195817cd771c5adf29d5cc6af3a703ba6658ee1a49cf5604
+EBUILD perl-Locale-Maketext-Simple-0.210.100_rc-r8.ebuild 654 BLAKE2B d3e179f0b6c1532286be0fb9643e177b04143613df6048ac4942949fe14e3b79fa32668427ddb90309cc7e269ccb021de006b482b440adf1c7be4699ad7415b3 SHA512 1fdec590af5e95cd677f855e0dccda64ed72980a61c1e6a7321e34d3198ca1755bf04440d2dc0ec1c9f4d0b40f5b29945c99a30f4e9f73a3222672aaef7551c8
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r8.ebuild b/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r8.ebuild
index 7213bce8de70..f668b4cd406f 100644
--- a/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r8.ebuild
+++ b/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r8.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Locale-Maketext/Manifest b/virtual/perl-Locale-Maketext/Manifest
index e0517cecd3ef..74b4ee9310b7 100644
--- a/virtual/perl-Locale-Maketext/Manifest
+++ b/virtual/perl-Locale-Maketext/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Locale-Maketext-1.260.100_rc-r6.ebuild 466 BLAKE2B 4e3fde67517a897f53862b167da04c16fc8bf42a2850adf4c5554273e2e5e2a02df31e23d24e09948809e7b8d72db7afdcc3f2b6bfb404825847ddadbffad42f SHA512 8757c411af1a794eaa36b161d0efb2629780424917d4efb493e3c6f7b13ad33e473c7993e6fc5ee368f714218973a7d58514e234d6ad6d4edbcde4b440835c2b
 EBUILD perl-Locale-Maketext-1.280.0.ebuild 439 BLAKE2B 070c99705667d41d6501c23bcebf5628663973d08fd402c491130585b78cb50e4f51ca0bc2fa00b2b560aee81a6e94d0056475d469d5007497bca057ff12babf SHA512 31fc714a4ead0165a1560e04e824da31e729595142d4410f408ebf7c1515dc678cc82c03f6595b579a1c7b429b8b65fc426d0f755893c7be3ee613f3d3b69edc
-EBUILD perl-Locale-Maketext-1.290.0-r1.ebuild 588 BLAKE2B 43b26d7a79fb93626fe583de005ac55e1ddaa7402d68095e7820b1d085590659a1e5b5da76ed03987f5028a2a94884704a316a9f59068cdab755827248d7316f SHA512 59b08abc8caad490825eb6cb6e993a0035d8b31dabbaddb52c83834c919821e0b169408a487e86d13459e364bf5506ace328b32ff457f1969ccff4a197f13026
+EBUILD perl-Locale-Maketext-1.290.0-r1.ebuild 577 BLAKE2B 532162392b34ed7ae7518cc899dd5acdf0cf2f7eb2f11e65e22310f24692a88f69f0fe8babe49a3c9367f98c226cac4e17808268170e9f5e3ff55b96fd779587 SHA512 fd6ae2ad1082493317bf55a8f575a8383ef4634a99e68a9d1bde5e090de8ef58356de4a390ada232213235d5f3b4d998d1b09348eb0d85598e72ca35d3ce045b
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r1.ebuild b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r1.ebuild
index c7bc659e90df..676027bfb38f 100644
--- a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r1.ebuild
+++ b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt-FastCalc/Manifest b/virtual/perl-Math-BigInt-FastCalc/Manifest
index a2cf4866a6b5..f4bbd261b677 100644
--- a/virtual/perl-Math-BigInt-FastCalc/Manifest
+++ b/virtual/perl-Math-BigInt-FastCalc/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Math-BigInt-FastCalc-0.400.0-r1.ebuild 557 BLAKE2B ffdff1172ea418175c75c3d1607f5c4ff98fe3d58fb46fa52c0dee9928a118acba65439db500512fc8f9a142c15894cd76d5346c6a514324247a8b47e89cb430 SHA512 cca51455ffa40ab6cbf6c19cd175de1b1c93028469cc923a6a3d186fa186d81fc03897ee6fc60adacbfcd38b2c48108e68fe704d86f6248392655e8367301f3b
 EBUILD perl-Math-BigInt-FastCalc-0.500.500.ebuild 554 BLAKE2B 7f315087948631d9798d12699789bea93f563ae0b13c70d836e1da4c6adb3f45773601b936e9c563a7a4d627141ace026906dec76ab9dfc5caf5bc93e893ec94 SHA512 91bfbce379aec3562b730da4147e51cd001178301fd373309e3fb2b85006ca87e2309e38c8ec8815171e22a193d3597cce935d32b97a6dbc9368038615e823f7
-EBUILD perl-Math-BigInt-FastCalc-0.500.600.ebuild 567 BLAKE2B 92c7630a4a01dc6ade44adaf8324a9c42bc7d69958ba507cf970101eb41c00acaf2e7e9d780dfc55e7cc7e11c615992d4e15c8aa4cda8edf3e44b36a65b1ed0b SHA512 4d5b8139223535fbe7740c4312ca30ae2912dbc9e6767c1d91de03886b70037124079ca68e912ecb7047376e0925be1088b75260ffa386eb8a183a8e559ae5c3
+EBUILD perl-Math-BigInt-FastCalc-0.500.600.ebuild 556 BLAKE2B 512a3e62da4cb7b18e152e01419a90b4d7fdcb1dd734b99b26e2c75f7abcaf23cddfab9febe23a740e5bcdce93977d93628eea33e35d5134403a76e40dd8cac4 SHA512 c6ae2e9f9f8928ef166a6168514afd36d760aed0a50e33d51dd0633ae9a24333227c846f6177d06f7d5c1434f085f4928793f2c9de813196add74415795b2516
 EBUILD perl-Math-BigInt-FastCalc-0.500.800.ebuild 567 BLAKE2B cb81dfd22a31023ac91f8bf5ebf71e9c83c8922a9ee2584ea136c407d1336faad8062dfdb0e539b406e0dcbfd0da8c29467c9f25618ef5c415ffbb7b2a0fbf5a SHA512 0f27731b4729f350b3c71c67996ed797770a6edef4881872419bca74bb117c3e09ea82f443d2b66e8e744cf74e8649a6dafcb3b32e4070dfe1b44256228eb637
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.600.ebuild b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.600.ebuild
index 2bcfa9e5b9d7..39dba4fca720 100644
--- a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.600.ebuild
+++ b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.600.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt/Manifest b/virtual/perl-Math-BigInt/Manifest
index 9149cc0338d0..d1941ff7b3a6 100644
--- a/virtual/perl-Math-BigInt/Manifest
+++ b/virtual/perl-Math-BigInt/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Math-BigInt-1.999.715-r2.ebuild 556 BLAKE2B 78577542a749c4ac5dec3899557cf2fad4ce302a74e8fb6847c63c74e66cf37b40dc20ccc4e18f6fea57604a92d91b3607aaa6a93fde2c5a2b300d2e9a2e95a5 SHA512 86a298812e255a8295c20dd901ab6ea12742e41128fe2296b20c77691503ddade665e89a987d70e4e88a2b6d29d117b2cc6c4253be49385f7520288d92d5f967
 EBUILD perl-Math-BigInt-1.999.806-r1.ebuild 554 BLAKE2B 7f315087948631d9798d12699789bea93f563ae0b13c70d836e1da4c6adb3f45773601b936e9c563a7a4d627141ace026906dec76ab9dfc5caf5bc93e893ec94 SHA512 91bfbce379aec3562b730da4147e51cd001178301fd373309e3fb2b85006ca87e2309e38c8ec8815171e22a193d3597cce935d32b97a6dbc9368038615e823f7
-EBUILD perl-Math-BigInt-1.999.811.ebuild 567 BLAKE2B 92c7630a4a01dc6ade44adaf8324a9c42bc7d69958ba507cf970101eb41c00acaf2e7e9d780dfc55e7cc7e11c615992d4e15c8aa4cda8edf3e44b36a65b1ed0b SHA512 4d5b8139223535fbe7740c4312ca30ae2912dbc9e6767c1d91de03886b70037124079ca68e912ecb7047376e0925be1088b75260ffa386eb8a183a8e559ae5c3
+EBUILD perl-Math-BigInt-1.999.811.ebuild 556 BLAKE2B 512a3e62da4cb7b18e152e01419a90b4d7fdcb1dd734b99b26e2c75f7abcaf23cddfab9febe23a740e5bcdce93977d93628eea33e35d5134403a76e40dd8cac4 SHA512 c6ae2e9f9f8928ef166a6168514afd36d760aed0a50e33d51dd0633ae9a24333227c846f6177d06f7d5c1434f085f4928793f2c9de813196add74415795b2516
 EBUILD perl-Math-BigInt-1.999.816.ebuild 567 BLAKE2B cb81dfd22a31023ac91f8bf5ebf71e9c83c8922a9ee2584ea136c407d1336faad8062dfdb0e539b406e0dcbfd0da8c29467c9f25618ef5c415ffbb7b2a0fbf5a SHA512 0f27731b4729f350b3c71c67996ed797770a6edef4881872419bca74bb117c3e09ea82f443d2b66e8e744cf74e8649a6dafcb3b32e4070dfe1b44256228eb637
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.811.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.811.ebuild
index 2bcfa9e5b9d7..39dba4fca720 100644
--- a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.811.ebuild
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.811.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigRat/Manifest b/virtual/perl-Math-BigRat/Manifest
index 68e208235d6a..c0b6d37c5c95 100644
--- a/virtual/perl-Math-BigRat/Manifest
+++ b/virtual/perl-Math-BigRat/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Math-BigRat-0.260.802-r1.ebuild 557 BLAKE2B ffdff1172ea418175c75c3d1607f5c4ff98fe3d58fb46fa52c0dee9928a118acba65439db500512fc8f9a142c15894cd76d5346c6a514324247a8b47e89cb430 SHA512 cca51455ffa40ab6cbf6c19cd175de1b1c93028469cc923a6a3d186fa186d81fc03897ee6fc60adacbfcd38b2c48108e68fe704d86f6248392655e8367301f3b
 EBUILD perl-Math-BigRat-0.261.100.ebuild 554 BLAKE2B 7f315087948631d9798d12699789bea93f563ae0b13c70d836e1da4c6adb3f45773601b936e9c563a7a4d627141ace026906dec76ab9dfc5caf5bc93e893ec94 SHA512 91bfbce379aec3562b730da4147e51cd001178301fd373309e3fb2b85006ca87e2309e38c8ec8815171e22a193d3597cce935d32b97a6dbc9368038615e823f7
-EBUILD perl-Math-BigRat-0.261.300.ebuild 567 BLAKE2B 92c7630a4a01dc6ade44adaf8324a9c42bc7d69958ba507cf970101eb41c00acaf2e7e9d780dfc55e7cc7e11c615992d4e15c8aa4cda8edf3e44b36a65b1ed0b SHA512 4d5b8139223535fbe7740c4312ca30ae2912dbc9e6767c1d91de03886b70037124079ca68e912ecb7047376e0925be1088b75260ffa386eb8a183a8e559ae5c3
+EBUILD perl-Math-BigRat-0.261.300.ebuild 556 BLAKE2B 512a3e62da4cb7b18e152e01419a90b4d7fdcb1dd734b99b26e2c75f7abcaf23cddfab9febe23a740e5bcdce93977d93628eea33e35d5134403a76e40dd8cac4 SHA512 c6ae2e9f9f8928ef166a6168514afd36d760aed0a50e33d51dd0633ae9a24333227c846f6177d06f7d5c1434f085f4928793f2c9de813196add74415795b2516
 EBUILD perl-Math-BigRat-0.261.400.ebuild 567 BLAKE2B cb81dfd22a31023ac91f8bf5ebf71e9c83c8922a9ee2584ea136c407d1336faad8062dfdb0e539b406e0dcbfd0da8c29467c9f25618ef5c415ffbb7b2a0fbf5a SHA512 0f27731b4729f350b3c71c67996ed797770a6edef4881872419bca74bb117c3e09ea82f443d2b66e8e744cf74e8649a6dafcb3b32e4070dfe1b44256228eb637
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.300.ebuild b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.300.ebuild
index 2bcfa9e5b9d7..39dba4fca720 100644
--- a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.300.ebuild
+++ b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.300.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Memoize/Manifest b/virtual/perl-Memoize/Manifest
index 3974de1ac2e9..ac428e1d92a9 100644
--- a/virtual/perl-Memoize/Manifest
+++ b/virtual/perl-Memoize/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Memoize-1.30.100_rc-r8.ebuild 657 BLAKE2B 90096346aa0a67d70210b0e150f35a701d43dc90e6ca820b9ff5757414ebbd89a2f6fe6d01fa16222250be7209d3995d8a6c80f94c884a43c78fb0ab621e2341 SHA512 605211ffd1d1b5f390045f3ab15ecf25122e85eb4628fa2b7e46663f2cb7e848db55ff7834e4861b195817cd771c5adf29d5cc6af3a703ba6658ee1a49cf5604
+EBUILD perl-Memoize-1.30.100_rc-r8.ebuild 654 BLAKE2B d3e179f0b6c1532286be0fb9643e177b04143613df6048ac4942949fe14e3b79fa32668427ddb90309cc7e269ccb021de006b482b440adf1c7be4699ad7415b3 SHA512 1fdec590af5e95cd677f855e0dccda64ed72980a61c1e6a7321e34d3198ca1755bf04440d2dc0ec1c9f4d0b40f5b29945c99a30f4e9f73a3222672aaef7551c8
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r8.ebuild b/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r8.ebuild
index 7213bce8de70..f668b4cd406f 100644
--- a/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r8.ebuild
+++ b/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r8.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-CoreList/Manifest b/virtual/perl-Module-CoreList/Manifest
index 0cfac1495572..fde96721a5e7 100644
--- a/virtual/perl-Module-CoreList/Manifest
+++ b/virtual/perl-Module-CoreList/Manifest
@@ -2,6 +2,6 @@ EBUILD perl-Module-CoreList-5.201.709.220-r2.ebuild 692 BLAKE2B 406ab8135213f8d0
 EBUILD perl-Module-CoreList-5.201.709.230.ebuild 674 BLAKE2B 9605e981723de11fcc7ed9f77e603d5c14da8a80e106899f209270b39b275db421e2e1c33034607e32b6779bc7fee302fca04b6e6929c9b5214cedb086f6b4d0 SHA512 a744ae47ac08f93774a70aed8ce034ee767fa0a9d286723f81a5cf3fce9de6a81c77400c992c9941677dd5f25eb06474713adc803628bf5ee9dedd587be0ee09
 EBUILD perl-Module-CoreList-5.201.804.140.ebuild 711 BLAKE2B 79776cfef9a832e9eb42e0d881cb48698c26d5a1b7a793565832bb13e27d026cc7f0795b56eb3463a4092f4a725e8a93e823062a7b4dddb1d4e8293777d5b8d7 SHA512 ef3da162fdf5fc1ec07972a517bcfa5c96318df86b1e78a6eede81ea5675a2fba95be79567b2de97953f0aeed5df9f4ad1a426dca96f899cfe9e1de4507c74b2
 EBUILD perl-Module-CoreList-5.201.806.260.ebuild 674 BLAKE2B 9605e981723de11fcc7ed9f77e603d5c14da8a80e106899f209270b39b275db421e2e1c33034607e32b6779bc7fee302fca04b6e6929c9b5214cedb086f6b4d0 SHA512 a744ae47ac08f93774a70aed8ce034ee767fa0a9d286723f81a5cf3fce9de6a81c77400c992c9941677dd5f25eb06474713adc803628bf5ee9dedd587be0ee09
-EBUILD perl-Module-CoreList-5.201.904.190.ebuild 701 BLAKE2B ad28dc5b254cbf1faa3fc783e52d1e2e162613da4510f5fee1a79113cec2c27b6513a9d76fd995a3784e3b2fa5f63f3067413ff4dce12a1f7e03f6a3e6f4f28a SHA512 528a3ebf4660cc9905412cb96be6e97780480841d64e38edd329de31b3a1ecd3ccbedb2f89cd5033bfcb88ef3227689ab6ac571731f481166b99b7dbb0722ba6
-EBUILD perl-Module-CoreList-5.201.905.200.ebuild 701 BLAKE2B 07819170ff96170128f3ef8350c2d6e7543e69af3d021537eb411c8711274229a290adbd015fb40c1dbc327dcb8f961b1aba60dd76459d84829c80249207446d SHA512 c205a916407130621379ee1a8b1d89f5301244d2fa297acbb3669280cbafe95695d0a1e90f986c80fc232959723549a72d956e1597b7827a9d384849c94aa518
+EBUILD perl-Module-CoreList-5.201.904.190.ebuild 690 BLAKE2B cfe9d70ae9d3c2bce8399b055c80143b50f8b7346d7a6f66ab260297e5788940e63ec467d057b8894c3bac342a2ba6d69f95ec522b225f4fcdc683796645ea54 SHA512 ca0681352d095bc149d3fd7e0fef96353d83bfcc3865a8fb34d591cdef5d18c95282a8a7512aa461fe4ce270f51fb30816700cfeb478a50e69047da457f8d35f
+EBUILD perl-Module-CoreList-5.201.905.220.ebuild 701 BLAKE2B 07819170ff96170128f3ef8350c2d6e7543e69af3d021537eb411c8711274229a290adbd015fb40c1dbc327dcb8f961b1aba60dd76459d84829c80249207446d SHA512 c205a916407130621379ee1a8b1d89f5301244d2fa297acbb3669280cbafe95695d0a1e90f986c80fc232959723549a72d956e1597b7827a9d384849c94aa518
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.904.190.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.904.190.ebuild
index e6c5b1a60ae1..c17487e974b5 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.904.190.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.904.190.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.905.200.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.905.220.ebuild
index 506553531181..506553531181 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.905.200.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.905.220.ebuild
diff --git a/virtual/perl-Module-Loaded/Manifest b/virtual/perl-Module-Loaded/Manifest
index 523f77a40915..4daa7441143d 100644
--- a/virtual/perl-Module-Loaded/Manifest
+++ b/virtual/perl-Module-Loaded/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Module-Loaded-0.80.0-r11.ebuild 477 BLAKE2B 53dbe69210b654d753e093e9ddab30e86327c82bcc6505f513b99e20246dd8884365d35d741dd1805c436972ecf8b075aaf1dc908962b54ac5c44da232906da5 SHA512 4ae7c034315381b5b07ee977212a8995dbc6d299f713d0215784673efa52999347de47105f51e005d6049cace7cdb1bd2cdb9212e4bf21811ca242b6c6de36de
+EBUILD perl-Module-Loaded-0.80.0-r11.ebuild 490 BLAKE2B 907514f80d1da6f04f893af9e41d5db439225584b1fa4ad65d55c418fc9e8b4323ba96fa0fc8e14ebf0da3cabbc5393795c4dbe6e608f9961daa6dfe23a0e6de SHA512 3fe6befe325a479444e2ca007da71fa1dd02c94fb42f6822d62f3cb2b75e5dc80c348b544fb1c23876fd172c287dc1b03eb79284251bcf1a42d4d0d6c4796bad
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r11.ebuild b/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r11.ebuild
index 3aff40290424..ebb264e45827 100644
--- a/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r11.ebuild
+++ b/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r11.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Net-Ping/Manifest b/virtual/perl-Net-Ping/Manifest
index 9e6c6aa87bf2..c2dbf0a7da8f 100644
--- a/virtual/perl-Net-Ping/Manifest
+++ b/virtual/perl-Net-Ping/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Net-Ping-2.430.100_rc-r6.ebuild 447 BLAKE2B e676e226851c6fb785479265ed996bb69fc19b2c22ac9ec1fda7984eedfcf1120c4c2a83003eeb8f415b3281392115e3a0dcbaa4dc7fb055c4df7bfafaae8e24 SHA512 77bb6a17998005531790cc90a637274b27eaeaab40276f5b1d00e0719dacf1c4383dd18ba4731a423501b208082d55998787c0c0cb6e957dbcac39b86b502615
 EBUILD perl-Net-Ping-2.550.0.ebuild 432 BLAKE2B 4be32dafedf0c6a342412f0416562c8e20e57083baeead518be2dc290ba452be9d331fe7f224b7736fe3cd1bc9fcfca4899f170dcb042ec7794f650980358307 SHA512 54044ce10e9ef9d1a039a3bc043c49ed61ef88b5546848b1f49fce32d4a33cf831145268f5e4a2923064559c347aef07b8b940cb9725d9c658c0f6ac6ff68bc2
-EBUILD perl-Net-Ping-2.620.0.ebuild 445 BLAKE2B 7239cda1e25eededc971d30af9f75ff96061bc044b6e269ccb7b714ab61a0698333163f44cf6f1eb6c160f6cd011bbef3e83b4a80033153e812b284d28847b4c SHA512 1f7b03bc224b8373f76666d50f2cbede934058ba70e0861fb54b45062630b1cbf31d4a27054bdb52a1c7cf76115eaf8bfa5b1731f9a43defc28281310a0e000a
+EBUILD perl-Net-Ping-2.620.0.ebuild 434 BLAKE2B aa96695d43863e087a39dcfcc025e36652f51b93a5f9b832e59a579555397f0a7743720197fae3f5861daafcde73b9cd7bac3d6de14299465f5dd0ef80ddf4cb SHA512 e5f7384f11247b0ce4579a150a61f8ec4922a3667900eaf5feb86ea47fe37e8b3b39b96a780a5636ae0d41f3810f430335736b5567c3cfb1e4e4d9f61d8d1561
 EBUILD perl-Net-Ping-2.710.0.ebuild 445 BLAKE2B c881f52d606bd4ce8b53070cce6a4315f321c28338f90c48e0322108e2be328310a3d7af97700cfe31fc65ef54a8a063aca497640ddcb0be63aa527d72b3aa0d SHA512 6f85e61cd29ba37a0a21ce7f8656edf1519581e290d0399ca1e12fc999e3f518932360ebd3f222993f64895baf0f14335e1eb4433a26fb6b6452b98dc06fa152
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Net-Ping/perl-Net-Ping-2.620.0.ebuild b/virtual/perl-Net-Ping/perl-Net-Ping-2.620.0.ebuild
index ba927ce39de0..f395dc8bddb0 100644
--- a/virtual/perl-Net-Ping/perl-Net-Ping-2.620.0.ebuild
+++ b/virtual/perl-Net-Ping/perl-Net-Ping-2.620.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Pod-Escapes/Manifest b/virtual/perl-Pod-Escapes/Manifest
index 01022ca1303f..ca52a996e5d8 100644
--- a/virtual/perl-Pod-Escapes/Manifest
+++ b/virtual/perl-Pod-Escapes/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Pod-Escapes-1.70.0-r5.ebuild 565 BLAKE2B 267d984700f4e35c938223f59411deacc4eae118de39bfe1802e1845bcd6550d1e5b35041158d84485ae5faa9a211f1cfa1efa888b3fa80df68068cc66a9b3b8 SHA512 112e13bf51d89d17906ed48fd24a37b3f11c5a3d9cee8beefc2100f1fb3af05504b1076eda566349d20be3d4f87c78c50082b4ef9c850b919fe7e207b77f273b
+EBUILD perl-Pod-Escapes-1.70.0-r5.ebuild 568 BLAKE2B 506821d318fe225228be1fb084ea655c6f4f3229e0da3bbed88175971b79183457ef256e485f23b247945ceb87391462c9790321f1fe7f577cf6fa147e7b6852 SHA512 2e789361a37e549150865817adda5cd050416ae2f07243d38498fd5a7a4c90cc4fc7b217a62f401a03c76033420c2c34c2adc3c08cc06fd9019be604dec5dc3a
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r5.ebuild b/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r5.ebuild
index 8a5081b11653..06c7a21ec248 100644
--- a/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r5.ebuild
+++ b/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Pod-Parser/Manifest b/virtual/perl-Pod-Parser/Manifest
index 67ffd6ef628e..ce603b4bba1a 100644
--- a/virtual/perl-Pod-Parser/Manifest
+++ b/virtual/perl-Pod-Parser/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Pod-Parser-1.630.0-r5.ebuild 631 BLAKE2B 4b179d79feb10669e4d0989760d1a6264ef21c34da422d1b9dfc2360f0742c9536426316685e49cce2e1c5e91984461668694932b0ccabe3631296cb0b314bed SHA512 8516d881dfb35bbdd7dccfd15613da9d4e48fe53e7aa871b7640c1855cd697722d9f6f8e5bc648289cdf4b6c9cdee61a80dab3a9de4ca27383501f6771920b86
+EBUILD perl-Pod-Parser-1.630.0-r5.ebuild 629 BLAKE2B b8810c76de77731b4748667dd3d347109ee62c665632a275b819d4185e50877a3e3b015fcafe0c3af7bce5410d76cf3729a315d7c06d487f4d617859a291a440 SHA512 6a9d8655165c286cad5627c0ad83c6bffe93e8382ffb0a0b47f46c1137fa44a05e222856c02fd2e9b8b980b294a35c50d13c0891844480d4653467adbfa3a27a
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r5.ebuild b/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r5.ebuild
index b82f4eb75720..ea78b2c76ebc 100644
--- a/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r5.ebuild
+++ b/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Scalar-List-Utils/Manifest b/virtual/perl-Scalar-List-Utils/Manifest
index 21dcff477d5b..457d997b9a66 100644
--- a/virtual/perl-Scalar-List-Utils/Manifest
+++ b/virtual/perl-Scalar-List-Utils/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Scalar-List-Utils-1.420.200_rc-r1.ebuild 626 BLAKE2B 88eb25c5eb992457bbf0e428106e835e463b0412c6845816d6f997e130ed8cb06577390c6bd51d20c46dea7b035cdf729556b16c415b2fad5ff485398d80ae11 SHA512 5a44ca37942a57f31d21702e1266028dcabcc3b846e3497b71a0738251ef9a3eff0c82e78da9108861e812c2ebd74bb303df0daa70bfa3b7673149df4a3e8e29
 EBUILD perl-Scalar-List-Utils-1.460.0-r1.ebuild 544 BLAKE2B 34e3203a9281686b31e30955eaa40f9ab3ade29d7d0c4b9c6690759b4a170bf370831cbf6ed6402bf3158e13f477173c61f69cd3475f49e25ce939f345b2ce26 SHA512 28a51ae66558d9e79d7d56b421699e86b65a39db67e1c64971b7ed45c9fdf0cd33c7d9d2ec81d11751c04f06cf2c75490237c5f2b7ffdd0e795f7f05beaedbec
 EBUILD perl-Scalar-List-Utils-1.460.200_rc.ebuild 623 BLAKE2B 2254d6c8f99874c447ae368f169c9b66b866af0b1485daa9536eb48fee3464acec12154dd5250a38c19ed47dd3857127a6344bdea602ab87dc6811f921fd7e53 SHA512 69d7915de61e3dab41f7854588d0fa0d02c8fae58e0da1dd8498c1e97123f7ff720f0fea1a53309ee4677fa978cb852fd7d13efedb1b74bd77820e9fed81de3e
-EBUILD perl-Scalar-List-Utils-1.500.0-r1.ebuild 664 BLAKE2B 3976b2872360c3936f7f1dac22c75ff439c82ac6c8f6a8bc3fcb70714fc76a2e2af7ff5824ed519658866e263fcd977afb17f959ad5ef8e286960f83ae1110f8 SHA512 477fc8ab0dc475f2bc66e3471211baa90605231bf9e8e1978bdba7770ae2de634d4b85e291e2368fe9e61047cc24ea090b075ed627570136a20de486381e11f9
+EBUILD perl-Scalar-List-Utils-1.500.0-r1.ebuild 653 BLAKE2B 1248f54b1617eee3b4929f67b67eb6939f20a5668c6c95d99e6546e852109ce6d737c169ae2cbe7ae819b8a5647bb35e489d80c65d1b78bd609a257568d501f2 SHA512 b00f73776b46a51c4a7605406beb8ed345a248177bf18d46726921e6c7d1ab347fe54bcfc04becac757c87ade52c157a5a7165b59820deeb39b33a3db0169a5b
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r1.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r1.ebuild
index b734ba031217..f3b02838b512 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r1.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Socket/Manifest b/virtual/perl-Socket/Manifest
index 5296345e835b..a731c3af46c5 100644
--- a/virtual/perl-Socket/Manifest
+++ b/virtual/perl-Socket/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Socket-2.20.30_rc-r2.ebuild 590 BLAKE2B 435f74078015551bbbf3719854aff354c9323735541263e18b0b7dd7dba914506b2846e150e90d0548f40e8d35dc124c4bef1440f8038cb61ff17687f53c5247 SHA512 55948821d22a941f0a737d321ab1e86d42a8092248e6a42e9b63ea0c2555db06962f7b1ebbb93870a409adef8ae24d6f6c408c2b1a6a697c7af8d635356f435f
-EBUILD perl-Socket-2.27.0-r1.ebuild 607 BLAKE2B b10804524b1521132ff25775b80e78519222dda6042e1219ea660fa869b74a37bc9e80f3874e171bf835686b9ab5ce8dcf169acee4c99d9877af42f575c27fdc SHA512 61cb7a54bf94bc9fa344fe7d6ec38421e5e26837a86595466a27c6533cc1349d9db6e40a0a95c243c4c3a5f863d2390a10212c58e1b7346e4fcab075b3e28a82
+EBUILD perl-Socket-2.27.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Socket/perl-Socket-2.27.0-r1.ebuild b/virtual/perl-Socket/perl-Socket-2.27.0-r1.ebuild
index c8d864de94b1..27e316434a64 100644
--- a/virtual/perl-Socket/perl-Socket-2.27.0-r1.ebuild
+++ b/virtual/perl-Socket/perl-Socket-2.27.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Storable/Manifest b/virtual/perl-Storable/Manifest
index 0c1f1be6f24f..26a62d5f0895 100644
--- a/virtual/perl-Storable/Manifest
+++ b/virtual/perl-Storable/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Storable-2.560.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-Storable-2.620.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
 EBUILD perl-Storable-3.150.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
-EBUILD perl-Storable-3.80.100_rc.ebuild 588 BLAKE2B 000dd29002c3ac47d817ed5305404dc7d875117e8cfc1d0470035aedb538a69f1558312915dc93dc6560f880b0dae5dc5cc75be8b4fcaec4360c76e82ab2641a SHA512 5f6b1e46135994f409a40c851d240c943b90bc53ef2c970676521e4ad26f3636f9087383cc7e799cc8890698781f2b47239e2ef5ff17829484c9a9f82bed1154
+EBUILD perl-Storable-3.80.100_rc.ebuild 577 BLAKE2B 9b5ecb8edc5059dafd4db22509b251002ebb6ed8c5cea7078db6ce5fdbe4db7f97d15b9bdc2755b6a2ca1e6c3ad6504864078e107ea12594268d83d7bba25337 SHA512 198746e18abf54f3d77b348bcdfba57887183556f74215c6863370520c188258f6177196168715cccc6fd9719e313b101b4a6669a6ec1a2bbe0d86a4fb2f0608
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Storable/perl-Storable-3.80.100_rc.ebuild b/virtual/perl-Storable/perl-Storable-3.80.100_rc.ebuild
index 5b57ff477b48..89a6d92673ec 100644
--- a/virtual/perl-Storable/perl-Storable-3.80.100_rc.ebuild
+++ b/virtual/perl-Storable/perl-Storable-3.80.100_rc.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28.2* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Harness/Manifest b/virtual/perl-Test-Harness/Manifest
index a30cad626103..04ca9f7a4562 100644
--- a/virtual/perl-Test-Harness/Manifest
+++ b/virtual/perl-Test-Harness/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Test-Harness-3.360.100_rc-r3.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-Test-Harness-3.380.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Test-Harness-3.420.0-r1.ebuild 607 BLAKE2B b10804524b1521132ff25775b80e78519222dda6042e1219ea660fa869b74a37bc9e80f3874e171bf835686b9ab5ce8dcf169acee4c99d9877af42f575c27fdc SHA512 61cb7a54bf94bc9fa344fe7d6ec38421e5e26837a86595466a27c6533cc1349d9db6e40a0a95c243c4c3a5f863d2390a10212c58e1b7346e4fcab075b3e28a82
+EBUILD perl-Test-Harness-3.420.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r1.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r1.ebuild
index c8d864de94b1..27e316434a64 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r1.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Simple/Manifest b/virtual/perl-Test-Simple/Manifest
index 6a71608dccee..5a808d1a991c 100644
--- a/virtual/perl-Test-Simple/Manifest
+++ b/virtual/perl-Test-Simple/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Test-Simple-1.1.14_p522-r2.ebuild 554 BLAKE2B 9efbcb5607d6cd97e9e93b5e3970e38dc687c27a856814beccdd7f1e25c9dbc1c15b7493c052b2fa9deee5b50129ca7865a79a2a38e8827aa68fccd8e9f8ea65 SHA512 42e2b65e39e561301961fe7973e07f4a35a6347a6afd9c11b4410067417e63ee4bda8dcc3b8ea46d2ad2e2e2e0bb681557a1e99c9560e0419570c16968fbd7cc
-EBUILD perl-Test-Simple-1.302.133.ebuild 579 BLAKE2B 3c026e59cf9970459c77db69b4a6c28abff380d493670de0fd48ba97d2d123336d49a4cc00f4edee56bffa13c48219b3e19d8bd10e86e3a768c2ff1d0c09bcef SHA512 18e23d0e5945ee09680846c705faa62c13e8e3f9c0e91e431905eee0d2ae13bd5389ecb0eb1ca2a30287e80bb7971ed61c690a21f17e5e353d5ea2791db3e43a
+EBUILD perl-Test-Simple-1.302.133.ebuild 565 BLAKE2B 29e4663a72f7d8dd08ecc31f48404c4ffaaa85ce71dea3f1f1584933f19b40cd0ebe48ecea642802cef7fd246a207c516a72249fcbfafdf762bd94d259bbf1f5 SHA512 b282b7b5415dd3167bd640e25db123d6391ef4d60090acb1c30c1518f3082a2382cee1ba27a19a7e06c30e2eae27c04f1a31c91d816638d117eb9b597616dcf0
 EBUILD perl-Test-Simple-1.302.162.ebuild 576 BLAKE2B 78723ee946fdbd1819bc2aa686855ba9ac1286860830bc4bb93cf989ca344d4a66ab7438441777004aa39cdccb974f3e6a88b6d1f25c29981469399ba1c0565f SHA512 00f90e5437c26225a0fff81c8f7413256a95363f98b0d19099561549d233356023d940fa464619d6f708c151a838f89f15323dbe682c34e360a3e02ae602267c
 EBUILD perl-Test-Simple-1.302.73.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
 EBUILD perl-Test-Simple-1.302.96.ebuild 555 BLAKE2B 0c696245d7815569ff6ff917242bc13eca04435fd3604e6b59b25f51eb22ace55a6d7f9cde424e3daaf5210227bb31f0f951aa503486faaf858b6f35377cf89f SHA512 9f6ea0f18beedbf28f4ed8cff824493afbc460a63209016c76ce5c28526ddc64f97cdfc80deb6a3f98bf55163ab49807df6b854a9080c626fbe7cb0d66a9cde4
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.133.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.133.ebuild
index 151f341da738..b945fa16926d 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.133.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.133.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test/Manifest b/virtual/perl-Test/Manifest
index 2814099a03af..68c57fc9097c 100644
--- a/virtual/perl-Test/Manifest
+++ b/virtual/perl-Test/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Test-1.280.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-Test-1.300.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Test-1.310.0-r1.ebuild 607 BLAKE2B b10804524b1521132ff25775b80e78519222dda6042e1219ea660fa869b74a37bc9e80f3874e171bf835686b9ab5ce8dcf169acee4c99d9877af42f575c27fdc SHA512 61cb7a54bf94bc9fa344fe7d6ec38421e5e26837a86595466a27c6533cc1349d9db6e40a0a95c243c4c3a5f863d2390a10212c58e1b7346e4fcab075b3e28a82
+EBUILD perl-Test-1.310.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Test/perl-Test-1.310.0-r1.ebuild b/virtual/perl-Test/perl-Test-1.310.0-r1.ebuild
index c8d864de94b1..27e316434a64 100644
--- a/virtual/perl-Test/perl-Test-1.310.0-r1.ebuild
+++ b/virtual/perl-Test/perl-Test-1.310.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-Balanced/Manifest b/virtual/perl-Text-Balanced/Manifest
index b006ec2bea49..e2b0ef1af266 100644
--- a/virtual/perl-Text-Balanced/Manifest
+++ b/virtual/perl-Text-Balanced/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Text-Balanced-2.30.0-r5.ebuild 631 BLAKE2B 4b179d79feb10669e4d0989760d1a6264ef21c34da422d1b9dfc2360f0742c9536426316685e49cce2e1c5e91984461668694932b0ccabe3631296cb0b314bed SHA512 8516d881dfb35bbdd7dccfd15613da9d4e48fe53e7aa871b7640c1855cd697722d9f6f8e5bc648289cdf4b6c9cdee61a80dab3a9de4ca27383501f6771920b86
+EBUILD perl-Text-Balanced-2.30.0-r5.ebuild 629 BLAKE2B b8810c76de77731b4748667dd3d347109ee62c665632a275b819d4185e50877a3e3b015fcafe0c3af7bce5410d76cf3729a315d7c06d487f4d617859a291a440 SHA512 6a9d8655165c286cad5627c0ad83c6bffe93e8382ffb0a0b47f46c1137fa44a05e222856c02fd2e9b8b980b294a35c50d13c0891844480d4653467adbfa3a27a
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r5.ebuild b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r5.ebuild
index b82f4eb75720..ea78b2c76ebc 100644
--- a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r5.ebuild
+++ b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Tie-RefHash/Manifest b/virtual/perl-Tie-RefHash/Manifest
index 03f588db5f0b..4093d539d6cc 100644
--- a/virtual/perl-Tie-RefHash/Manifest
+++ b/virtual/perl-Tie-RefHash/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Tie-RefHash-1.390.0-r10.ebuild 568 BLAKE2B 3389115b0bb1609ac6dfff786350fb7f39d98cc3b8022a40fb2ad6e67f3914e3a1096c346bd3e95d13773883aa7e531622be08eb84fafa1b49427c8ca5e8de39 SHA512 2474f5ab1b1a30b12a7072118bc6dfedd38895376b0331baf18223af07e7aec4e4619898d2e0d5f0a470acc071ca30d2e3ec868fb2a44759ac547ec8babf7161
+EBUILD perl-Tie-RefHash-1.390.0-r10.ebuild 581 BLAKE2B 2dc984927517999fbd38959074a7ec15a2a372afc80c597e0197275366a508d937b5ea5f40eebceadf0cafc5e1bb25da75ab8f55df2761e5787be45b1fd73bab SHA512 8b4bdd854a903c05095dc77b6e358596209246cfbca5a24d8a6dd65e2892bf0414ca2d70588e865a467d7cbf0caf02ace9485d01d673cdb097d71fc88280d63d
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r10.ebuild b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r10.ebuild
index 2b5aaf971b7d..7acd1003368f 100644
--- a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r10.ebuild
+++ b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r10.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-cygwin ~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 ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-HiRes/Manifest b/virtual/perl-Time-HiRes/Manifest
index e999db14fc53..821190c21dff 100644
--- a/virtual/perl-Time-HiRes/Manifest
+++ b/virtual/perl-Time-HiRes/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Time-HiRes-1.974.100-r2.ebuild 617 BLAKE2B a767d2b464d38add31ce6bf63192f1e60d024cf2d96f16d5537fee27c4b1278569e31f875d06aff93db8001bddcb02d3f8cd05f792e632cb6637851b3cbf1d16 SHA512 6b8dd45339072bf75c9ac9ad0d58406bfa996e334095de89978fa5ce9c74c10017d7efc7c8a52c69005a1389ce27f4ebab5588912451df1736ebdb0ca44d9291
-EBUILD perl-Time-HiRes-1.975.900.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
+EBUILD perl-Time-HiRes-1.975.900.ebuild 568 BLAKE2B b04fc78f0a01e0ba552bcaa4870fc3521669648627b65b7ca5ea12d0134a866bdef9dc756615c6e78a555e3ee20096043d4fe6b2ebe60228bd7a216f91e7aae3 SHA512 ba477c2e274e4dc68019d5b31b0b48101ffacfaad38e7a8377cf98620ba33517ddebc1ba18260e3ef28474233a1d51b59779a19ce3342099405357d033f1dd15
 EBUILD perl-Time-HiRes-1.976.0.ebuild 579 BLAKE2B ee43c037c00f5894577191f68424efcd33d2f01ef9e615cc749b5db5aeabe98f92a0d7effc3714431acb2e5c138a0d4258433d8b279e875fb6e09c2454bbf375 SHA512 c2307f5398ca1600770c2af98310e0c94c9ee937fe6d401cf4118be78997685669ef7860a65137b7b92cea3c176971c179373d695d278e21851a712703d46e40
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.975.900.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.975.900.ebuild
index bcd7df6e99fb..1eb46f3f09d1 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.975.900.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.975.900.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-Piece/Manifest b/virtual/perl-Time-Piece/Manifest
index 47e83e77a544..7d857bee74ea 100644
--- a/virtual/perl-Time-Piece/Manifest
+++ b/virtual/perl-Time-Piece/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Time-Piece-1.310.0-r2.ebuild 427 BLAKE2B a182e13f91c701a7021f552ada8ed30a5c3e64212e3ec7f5a8bb8025da0fab3b84bc9b54d48b9f16a3e9c561bfdd32396dbbe1bec1e5395330a16c44f406607b SHA512 1f9b31867791a99a96620feb6335dc6016e6c923b30328bb8468905c9f2fa56f26587891c5ac6e168c6bb89b92278dd6c1cd784c8e4930cd53f8724a18a95dca
-EBUILD perl-Time-Piece-1.320.400.ebuild 416 BLAKE2B a8a2dd5f6f7e0de6e3a7a7055445c992257a3c3b4c130c3a6ade5c77941b2adab9a931b7aedd8627cca385048b16d6de2dd9b5de575f4279f357fea48a00d4e6 SHA512 41cac316a5b30c87ea1823546ab62102cead8ab025562c0c96331d4d05b3d157ec682e6ac4c99cbe31d786ba70fe89483d9c2b01eb241a4eec6449930345490d
+EBUILD perl-Time-Piece-1.320.400.ebuild 418 BLAKE2B bdbef8407ff6b885f45e44caeefdc363497e4455bfa2be8cb6ec366905ee878518eaea506181f93771269fa4a0c21118eb078110f21cb078e56b5a49c4e5c70b SHA512 d2f1b3465d22468d1d1eae39b274aff6123ea9458f40ca50b81e8cfd76a1031b8e44c69ea5ca37703c46f5ee14b1d831e3798ba84079b12a35ade0f954880c60
 EBUILD perl-Time-Piece-1.330.0.ebuild 413 BLAKE2B ec2ad3c77132958560efffa0b3dc240e6a08daf840fe63f843dec185b56869c1980268da046cffb0b17a1ed02130fe2a9b767f9e4a1727b81e9e739c83fbe7db SHA512 96ba2fee2a3b8902cb9cf285d343f45d9ac37819bea8a65c9c58eaf9ee54582917e1d5e03259841684d880d9e32c7647182702001397841b05ea7cf4fe43778b
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Time-Piece/perl-Time-Piece-1.320.400.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.320.400.ebuild
index 1020e7759bf9..467071a3b3c8 100644
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.320.400.ebuild
+++ b/virtual/perl-Time-Piece/perl-Time-Piece-1.320.400.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Unicode-Collate/Manifest b/virtual/perl-Unicode-Collate/Manifest
index 13861e5b3088..c715e18fadb7 100644
--- a/virtual/perl-Unicode-Collate/Manifest
+++ b/virtual/perl-Unicode-Collate/Manifest
@@ -1,6 +1,6 @@
 EBUILD perl-Unicode-Collate-1.140.0-r2.ebuild 566 BLAKE2B a5dd6b775e0e0760c0493ed0e33971183e142bb1548a19ec87a8be5b4bfc267e198e4afc54bd9e69d6d2921d217e3c9e02484d5de595ec5e450c63dbae300205 SHA512 2d78f374f4b7c5bde4de7a2658cebee443fc196da75311eb2ac779bdcdba6fde0f47eb7fdb2b7ce81e3549ac77aa57e3fa507e62cd8d80a956ba256266edfb99
 EBUILD perl-Unicode-Collate-1.190.0-r1.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
 EBUILD perl-Unicode-Collate-1.210.0.ebuild 551 BLAKE2B 20fe0c2c0a1b2196339baa91f807378ecb32dfb72dce735c5dbcc0425abce58a57e38b4c7077565b6a3f0680a58e2dde91de6d4c365902ac3a262883f9cc5191 SHA512 9cf62c81b74b202f4e588eca9d8968655be00fa091848e4d708113bbc7cc04aa4593bd5957ee1f2b3228481cf6322faec6be71d0aced3dc6f4ecb177a81faed8
-EBUILD perl-Unicode-Collate-1.250.0.ebuild 578 BLAKE2B 883a41ea1594923136f374eb5cb0dcaa8b6e993481cae799670e6c338edceb93221f9241219e6c0650a46377a59bd654ae923880e6cc256af5718e7cc841e857 SHA512 249ed626be1a480fca1c7ed5f75703548ec2f8a1a2b47712874dd94e238649207b2014494a2a264962e001c4dd2fc993bf4dab9047664a273f61226822b385e4
+EBUILD perl-Unicode-Collate-1.250.0.ebuild 568 BLAKE2B b04fc78f0a01e0ba552bcaa4870fc3521669648627b65b7ca5ea12d0134a866bdef9dc756615c6e78a555e3ee20096043d4fe6b2ebe60228bd7a216f91e7aae3 SHA512 ba477c2e274e4dc68019d5b31b0b48101ffacfaad38e7a8377cf98620ba33517ddebc1ba18260e3ef28474233a1d51b59779a19ce3342099405357d033f1dd15
 EBUILD perl-Unicode-Collate-1.270.0.ebuild 579 BLAKE2B ee43c037c00f5894577191f68424efcd33d2f01ef9e615cc749b5db5aeabe98f92a0d7effc3714431acb2e5c138a0d4258433d8b279e875fb6e09c2454bbf375 SHA512 c2307f5398ca1600770c2af98310e0c94c9ee937fe6d401cf4118be78997685669ef7860a65137b7b92cea3c176971c179373d695d278e21851a712703d46e40
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild
index eeb230761b1c..1eb46f3f09d1 100644
--- a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild
+++ b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Unicode-Normalize/Manifest b/virtual/perl-Unicode-Normalize/Manifest
index 436d9634bd3e..374de40ad26b 100644
--- a/virtual/perl-Unicode-Normalize/Manifest
+++ b/virtual/perl-Unicode-Normalize/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Unicode-Normalize-1.250.0-r3.ebuild 593 BLAKE2B 216c108794bf85a51b59603433f48ca9cced7ffbade33a283ec219125c76a1cef5feafe6de96a6cf5f650cfb9478a053b98703af524dd5d5551d2d72726d1671 SHA512 87e4386be4e467ee3dd64f4a679a30e06eeef70b279df445897c8602d54ddfb3bc2dca8ac0ccc38e9b8bf289c790c7abd48feb7eec68dea4fff3bc7fa35689fd
-EBUILD perl-Unicode-Normalize-1.260.0-r1.ebuild 600 BLAKE2B c41a2a01c4eefa9c2e1dd7aed2a9f225bfd6ca7c3ca55f4b2cca3b6436bd895dbf3f24cf464378ecc22743341eccaefd29624dea364e2e6af8fb2c6ce64d44a8 SHA512 57fee3abf5f0029c6932433539b3b16291f7eab99c82c7418875fd1678bfe944ab9ed8168191be79f3be482b4778aa5600351f86417edad940a443f285a124ef
+EBUILD perl-Unicode-Normalize-1.260.0-r1.ebuild 589 BLAKE2B 9f4a739141a7a87bb014f42ef6d06537b413e3b3507811c36bef1b13e73c0ea0a37b141c910d24bd10a6d8ae16d2eaa3af843166e9f9d0525dc4dd733cdfb846 SHA512 017334e9f574552e3dff487afa4f1191e837d2b6328b3233aa7f993c3b891d213f0c42176df08254641c2c4675ed94028428fb67a8b266e9042b9f8ef50d6b9e
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r1.ebuild b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r1.ebuild
index 1fd717fd2644..e57e6a381811 100644
--- a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r1.ebuild
+++ b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-XSLoader/Manifest b/virtual/perl-XSLoader/Manifest
index f440cced5014..4a92708ea83b 100644
--- a/virtual/perl-XSLoader/Manifest
+++ b/virtual/perl-XSLoader/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-XSLoader-0.220.0-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-XSLoader-0.270.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-XSLoader-0.300.0-r1.ebuild 607 BLAKE2B b10804524b1521132ff25775b80e78519222dda6042e1219ea660fa869b74a37bc9e80f3874e171bf835686b9ab5ce8dcf169acee4c99d9877af42f575c27fdc SHA512 61cb7a54bf94bc9fa344fe7d6ec38421e5e26837a86595466a27c6533cc1349d9db6e40a0a95c243c4c3a5f863d2390a10212c58e1b7346e4fcab075b3e28a82
+EBUILD perl-XSLoader-0.300.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r1.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r1.ebuild
index c8d864de94b1..27e316434a64 100644
--- a/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r1.ebuild
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-autodie/Manifest b/virtual/perl-autodie/Manifest
index 6524dce9a680..b126a394803e 100644
--- a/virtual/perl-autodie/Manifest
+++ b/virtual/perl-autodie/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-autodie-2.290.0-r4.ebuild 632 BLAKE2B 51f17be2c1d76655789dc1b8838af5e5766d5b88fcc7d4c31fde087b49ad4491448eea223801eb88b633c727d595eea21cb8c5431e080d9026409c2eaeb222c3 SHA512 b8ace2b7e161554f7659c7948f7a60dfedb588124e3ed3fd9039e195821e7e5863ccef06e3009c509bca046588be071f6bb72eb774cdc449a08c3bb37b990da5
+EBUILD perl-autodie-2.290.0-r4.ebuild 629 BLAKE2B b8810c76de77731b4748667dd3d347109ee62c665632a275b819d4185e50877a3e3b015fcafe0c3af7bce5410d76cf3729a315d7c06d487f4d617859a291a440 SHA512 6a9d8655165c286cad5627c0ad83c6bffe93e8382ffb0a0b47f46c1137fa44a05e222856c02fd2e9b8b980b294a35c50d13c0891844480d4653467adbfa3a27a
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-autodie/perl-autodie-2.290.0-r4.ebuild b/virtual/perl-autodie/perl-autodie-2.290.0-r4.ebuild
index 0d8d9d3c70ec..ea78b2c76ebc 100644
--- a/virtual/perl-autodie/perl-autodie-2.290.0-r4.ebuild
+++ b/virtual/perl-autodie/perl-autodie-2.290.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-bignum/Manifest b/virtual/perl-bignum/Manifest
index cfc6c193c17e..b3810f5e67b7 100644
--- a/virtual/perl-bignum/Manifest
+++ b/virtual/perl-bignum/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-bignum-0.420.100_rc-r4.ebuild 582 BLAKE2B a81e94c84954f43dfeb42c2bf3efd621f9e88686198279fe19528c95ae785bb5c81b6aa06d4a28a9e239c00800ce85138cec57312f10d65db7b9d2de49834aaa SHA512 4e87eab71799c90b1c7858e6b8f1238008654c1ba4295482585ebf0077c66aa6b7d254841726865dad474c159f933a7120903cb2c50bed4d683fe955cff89525
 EBUILD perl-bignum-0.470.0.ebuild 554 BLAKE2B 7f315087948631d9798d12699789bea93f563ae0b13c70d836e1da4c6adb3f45773601b936e9c563a7a4d627141ace026906dec76ab9dfc5caf5bc93e893ec94 SHA512 91bfbce379aec3562b730da4147e51cd001178301fd373309e3fb2b85006ca87e2309e38c8ec8815171e22a193d3597cce935d32b97a6dbc9368038615e823f7
-EBUILD perl-bignum-0.490.0.ebuild 567 BLAKE2B 92c7630a4a01dc6ade44adaf8324a9c42bc7d69958ba507cf970101eb41c00acaf2e7e9d780dfc55e7cc7e11c615992d4e15c8aa4cda8edf3e44b36a65b1ed0b SHA512 4d5b8139223535fbe7740c4312ca30ae2912dbc9e6767c1d91de03886b70037124079ca68e912ecb7047376e0925be1088b75260ffa386eb8a183a8e559ae5c3
+EBUILD perl-bignum-0.490.0.ebuild 556 BLAKE2B 512a3e62da4cb7b18e152e01419a90b4d7fdcb1dd734b99b26e2c75f7abcaf23cddfab9febe23a740e5bcdce93977d93628eea33e35d5134403a76e40dd8cac4 SHA512 c6ae2e9f9f8928ef166a6168514afd36d760aed0a50e33d51dd0633ae9a24333227c846f6177d06f7d5c1434f085f4928793f2c9de813196add74415795b2516
 EBUILD perl-bignum-0.510.0.ebuild 567 BLAKE2B cb81dfd22a31023ac91f8bf5ebf71e9c83c8922a9ee2584ea136c407d1336faad8062dfdb0e539b406e0dcbfd0da8c29467c9f25618ef5c415ffbb7b2a0fbf5a SHA512 0f27731b4729f350b3c71c67996ed797770a6edef4881872419bca74bb117c3e09ea82f443d2b66e8e744cf74e8649a6dafcb3b32e4070dfe1b44256228eb637
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-bignum/perl-bignum-0.490.0.ebuild b/virtual/perl-bignum/perl-bignum-0.490.0.ebuild
index 2bcfa9e5b9d7..39dba4fca720 100644
--- a/virtual/perl-bignum/perl-bignum-0.490.0.ebuild
+++ b/virtual/perl-bignum/perl-bignum-0.490.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-if/Manifest b/virtual/perl-if/Manifest
index 98d94703d2e8..2b244d259f96 100644
--- a/virtual/perl-if/Manifest
+++ b/virtual/perl-if/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-if-0.60.600-r2.ebuild 590 BLAKE2B 435f74078015551bbbf3719854aff354c9323735541263e18b0b7dd7dba914506b2846e150e90d0548f40e8d35dc124c4bef1440f8038cb61ff17687f53c5247 SHA512 55948821d22a941f0a737d321ab1e86d42a8092248e6a42e9b63ea0c2555db06962f7b1ebbb93870a409adef8ae24d6f6c408c2b1a6a697c7af8d635356f435f
-EBUILD perl-if-0.60.800-r1.ebuild 607 BLAKE2B b10804524b1521132ff25775b80e78519222dda6042e1219ea660fa869b74a37bc9e80f3874e171bf835686b9ab5ce8dcf169acee4c99d9877af42f575c27fdc SHA512 61cb7a54bf94bc9fa344fe7d6ec38421e5e26837a86595466a27c6533cc1349d9db6e40a0a95c243c4c3a5f863d2390a10212c58e1b7346e4fcab075b3e28a82
+EBUILD perl-if-0.60.800-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-if/perl-if-0.60.800-r1.ebuild b/virtual/perl-if/perl-if-0.60.800-r1.ebuild
index c8d864de94b1..27e316434a64 100644
--- a/virtual/perl-if/perl-if-0.60.800-r1.ebuild
+++ b/virtual/perl-if/perl-if-0.60.800-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-libnet/Manifest b/virtual/perl-libnet/Manifest
index c798e9f2e89b..4c6663be3d0c 100644
--- a/virtual/perl-libnet/Manifest
+++ b/virtual/perl-libnet/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-libnet-3.100.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-libnet-3.110.0-r1.ebuild 607 BLAKE2B b10804524b1521132ff25775b80e78519222dda6042e1219ea660fa869b74a37bc9e80f3874e171bf835686b9ab5ce8dcf169acee4c99d9877af42f575c27fdc SHA512 61cb7a54bf94bc9fa344fe7d6ec38421e5e26837a86595466a27c6533cc1349d9db6e40a0a95c243c4c3a5f863d2390a10212c58e1b7346e4fcab075b3e28a82
+EBUILD perl-libnet-3.110.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
 EBUILD perl-libnet-3.80.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-libnet/perl-libnet-3.110.0-r1.ebuild b/virtual/perl-libnet/perl-libnet-3.110.0-r1.ebuild
index c8d864de94b1..27e316434a64 100644
--- a/virtual/perl-libnet/perl-libnet-3.110.0-r1.ebuild
+++ b/virtual/perl-libnet/perl-libnet-3.110.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-podlators/Manifest b/virtual/perl-podlators/Manifest
index 9a8343dbfc7a..e088a3338785 100644
--- a/virtual/perl-podlators/Manifest
+++ b/virtual/perl-podlators/Manifest
@@ -1,4 +1,4 @@
-EBUILD perl-podlators-4.100.0.ebuild 586 BLAKE2B 4980988aade545e5858df017b4c953dced6f49346af4cfc24359ffc171e914076a622304c3cf5511efb2fe4726cdf77ab025820c2f525fcfded7ab0c04d95599 SHA512 36a42511f81f70dc0205f7e6e421b5806921330f067e9b1820013847c792f2faf22b050fe17e33d354917a0a4fa193a4b5112a9386757ee9566a239a6b279c01
+EBUILD perl-podlators-4.100.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
 EBUILD perl-podlators-4.110.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 EBUILD perl-podlators-4.70.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-podlators-4.90.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
diff --git a/virtual/perl-podlators/perl-podlators-4.100.0.ebuild b/virtual/perl-podlators/perl-podlators-4.100.0.ebuild
index 38cfe35b0dd3..fe786cddff29 100644
--- a/virtual/perl-podlators/perl-podlators-4.100.0.ebuild
+++ b/virtual/perl-podlators/perl-podlators-4.100.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads-shared/Manifest b/virtual/perl-threads-shared/Manifest
index c5991ffc6f7a..f0f0388dd894 100644
--- a/virtual/perl-threads-shared/Manifest
+++ b/virtual/perl-threads-shared/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-threads-shared-1.510.0-r1.ebuild 393 BLAKE2B cd3b47281c1ef84cccb992da5fd2a91e6846d4fe12947e7c7603ab671e85d86d55641344af07e2e33921d735ce2e310273e5818abe3823c26d0f1b8139b45eaf SHA512 49498708571ea0d2ae0dfcacdc90e11a24c8636c69fcd3152b568dd5257a5f43cec00969ab0eb087a083dfc5f54b668fc438b9a808fcb708476b2b526950b0ad
 EBUILD perl-threads-shared-1.560.0.ebuild 403 BLAKE2B e353cafea2d97a6eabdaf3ed7c96a479b420b19cfcc5c8ad89f68d575795666844423959c15d36ab135f56bf19354fb0e6b2cb835a6615dbfdfbefc22773124d SHA512 3e763b3758063aa500ab14dcf9737ac75ec6f4a09236344a007a6be5fdd1e555d31ab1d744315ce7575734b1facb6b77d12ae1c4066b2c8fa8b281474fb0261c
-EBUILD perl-threads-shared-1.580.0.ebuild 416 BLAKE2B fcfecc5ba0c0636085de9d279df2e486a0d482b221269a164a02d727f127a9b2215aa56276eedf0c417262451b0d067ebc4d74b4749513731cd2a04c648e1068 SHA512 ee1ba9e402c6f7ea2327f02d45d21859f616d988a2d2b3fe5de683144a7638773f9982dcb4751e6c4f0c0bbc2601ec748e4f4ba132af0ee03bb7d862eb318cb7
+EBUILD perl-threads-shared-1.580.0.ebuild 405 BLAKE2B 9301da075293fecf09e7bd307566545c52fa442df8cdcdb5b48cab4b7b567fc9f9759cf573316ebbd3890a69f1f5eebbe54d7539361d7d50caf24277e00b48ec SHA512 cb6fd5621f9faf8ce22b4db001cf5832e841d44f6402c911c771ea031eb7b3eb88a06d92db0ae91024d779fb6768f0f1d3bbfe4e7d02a3f21c2e1b2514909425
 EBUILD perl-threads-shared-1.600.0.ebuild 416 BLAKE2B 1cc93296875a0b2a01f31483d76428c2575c795d14c4c00261551c808b9e8db492c7fc17f31c69c49adcd46e1f84c0d65fed88fd820492cb4a4d89e1f0443558 SHA512 f4fb2b4adabca1d7762cfd0bf89175446343a2cc3b6f1628f04a8e7b3e1a04f3104a4102ce8286ffbc3fe7afb532af459669fbdefdc639745e091938591b92ce
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-threads-shared/perl-threads-shared-1.580.0.ebuild b/virtual/perl-threads-shared/perl-threads-shared-1.580.0.ebuild
index ba019f2561fb..cc31c024a961 100644
--- a/virtual/perl-threads-shared/perl-threads-shared-1.580.0.ebuild
+++ b/virtual/perl-threads-shared/perl-threads-shared-1.580.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads/Manifest b/virtual/perl-threads/Manifest
index 381e60d28457..5fb8128383d5 100644
--- a/virtual/perl-threads/Manifest
+++ b/virtual/perl-threads/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-threads-2.150.0.ebuild 413 BLAKE2B 19c17cf145c5220dff951fcb2ddd38f03c915cf5db90795b0a259336795068b035e03de1f3465a9e4adb2f23081d57f869af9dcefc00c7035c84a0f12c77b996 SHA512 ab68090ec6d1a3afb6dcd163a3ef6bb12e7ecf6640570206e5079f99d640eb3cd332d2643431d86e275c2fe85d8354fd3e836989fa2c86df75b4b418163cc430
-EBUILD perl-threads-2.220.0-r1.ebuild 457 BLAKE2B 50ac4d910ba192bfedf8a6a99052cc5eeb1c0d5605dddd8bc04d626ad8d9f116ffe17979e7469291b7b3dbb22322f369a7fb54983cd23f791e33e5409e096969 SHA512 06638d31255991977035c5e6ffd5ac418efbb86770f8409b93601e7cb8763f52bbd6407db255dc98951172e3de7fde580101bc96a34b7fc7e1860be0b42f3174
+EBUILD perl-threads-2.220.0-r1.ebuild 446 BLAKE2B 9b4071016b654e84b810b6cb6916960515183bbf375b3710d337e097cb51e21e6fd475168f4ba07cbd95ea1aca3a53e6371ec775042a0395a842f81bc8dbaaf1 SHA512 f89c615119f75dc053a654832050619e779ad13bdac9fc49b38f412ccc239f1f9ce7e2929e36d75c7ba66415c94c3c2b6a6ccd79e9738e9e0176b0a476d3de9f
 EBUILD perl-threads-2.70.0-r1.ebuild 403 BLAKE2B db11dde1c389b910d29dd080829cbb8807d9d4acdf672b8a197ded1ae2d5e218c5fe0111bee0b488838f1fdb0c46bce143a0c1900c5c97398e3e4eee932cea22 SHA512 265aff9394e5115e5260df60898b392b612d5392fc4612a458156b66c05232d6bb2ef3ca434c6f84d3af4907a91c9d5c3876d22c21798609c425344747d4ebf3
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-threads/perl-threads-2.220.0-r1.ebuild b/virtual/perl-threads/perl-threads-2.220.0-r1.ebuild
index 4ef28831cc5c..70abab84cc20 100644
--- a/virtual/perl-threads/perl-threads-2.220.0-r1.ebuild
+++ b/virtual/perl-threads/perl-threads-2.220.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30*[ithreads] =dev-lang/perl-5.28*[ithreads] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-version/Manifest b/virtual/perl-version/Manifest
index 17d8572d2022..d8d70d1b7c83 100644
--- a/virtual/perl-version/Manifest
+++ b/virtual/perl-version/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-version-0.991.600-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-version-0.991.700.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-version-0.992.300.ebuild 586 BLAKE2B 4980988aade545e5858df017b4c953dced6f49346af4cfc24359ffc171e914076a622304c3cf5511efb2fe4726cdf77ab025820c2f525fcfded7ab0c04d95599 SHA512 36a42511f81f70dc0205f7e6e421b5806921330f067e9b1820013847c792f2faf22b050fe17e33d354917a0a4fa193a4b5112a9386757ee9566a239a6b279c01
+EBUILD perl-version-0.992.300.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
 EBUILD perl-version-0.992.400.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-version/perl-version-0.992.300.ebuild b/virtual/perl-version/perl-version-0.992.300.ebuild
index 38cfe35b0dd3..fe786cddff29 100644
--- a/virtual/perl-version/perl-version-0.992.300.ebuild
+++ b/virtual/perl-version/perl-version-0.992.300.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/pypy/Manifest b/virtual/pypy/Manifest
index ab6a68dbc0b0..177a2406838e 100644
--- a/virtual/pypy/Manifest
+++ b/virtual/pypy/Manifest
@@ -1,5 +1,2 @@
-EBUILD pypy-6.0.0.ebuild 489 BLAKE2B 69c9219d436dabe6bd140245df7875671b82a795f3fe82c52c3e4f4c43e5edb2d8f017ddde9d4b3bdf589155c09702185a5844e42ef04d0e9bea1bd7f01be437 SHA512 ffac3f5e811991465794ec61834c9463ad5c62089c85dc00a773ab35b86e17a400fc566d200f9f1dc14ae467b50cddaa8cccb541f2381b792a643f33ec439dd5
-EBUILD pypy-7.0.0.ebuild 544 BLAKE2B c068ff0cf5e1a2f5fe4d4b374e043b17164434a182baea4c92757f6412ae69ac2244662259189d6ee2b4b9ecd63d667d2979b05dd64b1e41bac7f9410cc224f4 SHA512 e3f4d6f6bf8eeef03454f929293f6280dd4f980b0870e47780a7272e77b38e427f9c3881b6871349a0e47c9dfe17f5b215b7b50d58910abc3704d5a1cd9a9b77
-EBUILD pypy-7.1.0.ebuild 544 BLAKE2B c068ff0cf5e1a2f5fe4d4b374e043b17164434a182baea4c92757f6412ae69ac2244662259189d6ee2b4b9ecd63d667d2979b05dd64b1e41bac7f9410cc224f4 SHA512 e3f4d6f6bf8eeef03454f929293f6280dd4f980b0870e47780a7272e77b38e427f9c3881b6871349a0e47c9dfe17f5b215b7b50d58910abc3704d5a1cd9a9b77
 EBUILD pypy-7.1.1.ebuild 544 BLAKE2B c068ff0cf5e1a2f5fe4d4b374e043b17164434a182baea4c92757f6412ae69ac2244662259189d6ee2b4b9ecd63d667d2979b05dd64b1e41bac7f9410cc224f4 SHA512 e3f4d6f6bf8eeef03454f929293f6280dd4f980b0870e47780a7272e77b38e427f9c3881b6871349a0e47c9dfe17f5b215b7b50d58910abc3704d5a1cd9a9b77
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/pypy/pypy-6.0.0.ebuild b/virtual/pypy/pypy-6.0.0.ebuild
deleted file mode 100644
index 2220b64c972b..000000000000
--- a/virtual/pypy/pypy-6.0.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A virtual for PyPy Python implementation"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
diff --git a/virtual/pypy/pypy-7.0.0.ebuild b/virtual/pypy/pypy-7.0.0.ebuild
deleted file mode 100644
index 76abaa124207..000000000000
--- a/virtual/pypy/pypy-7.0.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A virtual for PyPy Python implementation"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
diff --git a/virtual/pypy/pypy-7.1.0.ebuild b/virtual/pypy/pypy-7.1.0.ebuild
deleted file mode 100644
index 76abaa124207..000000000000
--- a/virtual/pypy/pypy-7.1.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A virtual for PyPy Python implementation"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
diff --git a/virtual/pypy3/Manifest b/virtual/pypy3/Manifest
index 88d0a0b704a1..8881c075a0b2 100644
--- a/virtual/pypy3/Manifest
+++ b/virtual/pypy3/Manifest
@@ -1,5 +1,2 @@
-EBUILD pypy3-6.0.0.ebuild 494 BLAKE2B df7057ad5b33b95c70bc9121cc099a13b4a31302ae78b68cf6d9eeb408c34ec06006d44791c8870db2149f70fd8cb56068d61a9e077bf7a4f39da7b872ab8a07 SHA512 f82d20045eaba466ded7f3a8e3aba3abeab31d31016f09c7c8cb07a48b3e7fd9f30174785e4f8a320b7194a392e4fbc9c58a67e03323ca4387f9c4cd82d3e799
-EBUILD pypy3-7.0.0.ebuild 491 BLAKE2B 7f2b413442918e4e7e43dce3a1bde21274ffc0f451509e0526924821e2c0449ceb937e334c06c9bf334e9315ae8e4fbbec475ec16bcd7675275637977b05f225 SHA512 3d5a4927759bb659bd76d39a0cb6129e5635a51a5e635bfd0a50fcadb4e0e461daf2aa96b538a0b2be101c18fa41cb51b8ccd352b395e795239d64c684d11b07
-EBUILD pypy3-7.1.0.ebuild 496 BLAKE2B 06ae95cc290d349422f7b5b6d2503c3935dca1a0416f5671228dafc7670abf28df4469a9c0c204250c4b129061266edf0a1a6cf9cff3a54a3c60b9a969d32a31 SHA512 8415098e0b5ef6c600fdd040cbe2f493ea2581d57957ef4e3aece257f2251603649b2302f1932d9583c307a5be2f2d331cc380bb184d50f317078ff871f1a401
 EBUILD pypy3-7.1.1.ebuild 496 BLAKE2B 06ae95cc290d349422f7b5b6d2503c3935dca1a0416f5671228dafc7670abf28df4469a9c0c204250c4b129061266edf0a1a6cf9cff3a54a3c60b9a969d32a31 SHA512 8415098e0b5ef6c600fdd040cbe2f493ea2581d57957ef4e3aece257f2251603649b2302f1932d9583c307a5be2f2d331cc380bb184d50f317078ff871f1a401
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/pypy3/pypy3-6.0.0.ebuild b/virtual/pypy3/pypy3-6.0.0.ebuild
deleted file mode 100644
index 31d1d113dfd7..000000000000
--- a/virtual/pypy3/pypy3-6.0.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A virtual for PyPy3 Python implementation"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/60"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy3-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy3-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
diff --git a/virtual/pypy3/pypy3-7.0.0.ebuild b/virtual/pypy3/pypy3-7.0.0.ebuild
deleted file mode 100644
index 9aa9539846f0..000000000000
--- a/virtual/pypy3/pypy3-7.0.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A virtual for PyPy3 Python implementation"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy3-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy3-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
diff --git a/virtual/pypy3/pypy3-7.1.0.ebuild b/virtual/pypy3/pypy3-7.1.0.ebuild
deleted file mode 100644
index ae7c453cde1b..000000000000
--- a/virtual/pypy3/pypy3-7.1.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A virtual for PyPy3 Python implementation"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy3-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy3-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
diff --git a/virtual/python-funcsigs/Manifest b/virtual/python-funcsigs/Manifest
index 3b17568ef372..edb865f0e7bc 100644
--- a/virtual/python-funcsigs/Manifest
+++ b/virtual/python-funcsigs/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-funcsigs-2.ebuild 622 BLAKE2B 990d442bb4bd2563fbb010586ef4cf8221c50965a323fdfc27e19eb6a5f70c39063f13767bec0837f3f922e50b167e205b968c188f012981d974dbc2065340ef SHA512 16ca4faf9b6b98ae27f40cbcbc91b41a73f45adabeed70f6682ad7ec889742b9cacdc3db263156b7c115fca178a06657b39d12699bc4bd48428dea2f8e5db90e
+EBUILD python-funcsigs-2-r1.ebuild 618 BLAKE2B c131577d706a628e5d529c94ee543e6563052ea2343e96194d7f2604a7ba2974b53d5b5c4a18f840fc4a91facec00b20ff4811d7d3987afc5a333ad70649b6d7 SHA512 a7f977707b61a9eec219839c06d4cd47c5517be145c982d7588750f806e175a2b1488e62591e71de5ed0561d26a626bd023e7e3e69ad02cef3b93d0d4178d31b
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild b/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild
new file mode 100644
index 000000000000..d67b420a1734
--- /dev/null
+++ b/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+inherit python-r1
+
+DESCRIPTION="A Virtual for Python function signatures from PEP362 (py3.6 variant)"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '>=dev-python/funcsigs-1[${PYTHON_USEDEP}]' python2_7 python3_5 pypy )"
diff --git a/virtual/python-funcsigs/python-funcsigs-2.ebuild b/virtual/python-funcsigs/python-funcsigs-2.ebuild
deleted file mode 100644
index 0ce85c8961e7..000000000000
--- a/virtual/python-funcsigs/python-funcsigs-2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
-
-inherit python-r1
-
-DESCRIPTION="A Virtual for Python function signatures from PEP362 (py3.6 variant)"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '>=dev-python/funcsigs-1[${PYTHON_USEDEP}]' python2_7 python3_5 pypy{,3} )"
diff --git a/virtual/resolvconf/Manifest b/virtual/resolvconf/Manifest
index d74f76322825..b9b604d46970 100644
--- a/virtual/resolvconf/Manifest
+++ b/virtual/resolvconf/Manifest
@@ -1,2 +1,2 @@
-EBUILD resolvconf-1.ebuild 384 BLAKE2B 8ed4710a353a6f122b5c51ad56ed7b437cd05e3228ef5a30ba42d00b309920e2523e19dbc6893e4bddb48f3f58360adf201e140760caec8398efba8e400ea3cb SHA512 d540beab9c29b0af0d11d240777c8790155caa73bf1f6bcd82702c447cee0baefc0a5e35d71b0ece90b924ec4ec830fa4ee5818bcc955085e1bc06885f85ea2e
+EBUILD resolvconf-1.ebuild 383 BLAKE2B f3a1f3e45e85d0779a7f2792e2f366369d842dea3e1903cdf860afff48af87e8348fb7cd406de3b6d03040960503c19a822120be32f363ffec64484c35a06408 SHA512 a5203eab17af9a069584cd3aad99d026385e122704a92f5c55350d93aca6f887b213f22acd01961869eec00961a486533e2dd828ea9825824a77fe52997aecd5
 MISC metadata.xml 217 BLAKE2B 6e1cd12af01db3565487a9412bae9a06912408439877e1a81fc466c0dc0612175846256a14be3b1102bbd43ac663311d34bc441b5d64caf9462c25ada2cfa3a3 SHA512 1cb210be8d67d18e50ea53bedbfe8b2807e4b2e5c9bf82cc037ce5d60f98d60b5a967e8863a2964769eb6a15626db1e001cc1a38a18b2d1809cc73a3578df4e4
diff --git a/virtual/resolvconf/resolvconf-1.ebuild b/virtual/resolvconf/resolvconf-1.ebuild
index 1a77aab6a0c7..e430fa6c19ee 100644
--- a/virtual/resolvconf/resolvconf-1.ebuild
+++ b/virtual/resolvconf/resolvconf-1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual to select between different resolvconf providers"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
 	|| (
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 5b52dee94981..84075d1adfde 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -5,4 +5,5 @@ EBUILD rust-1.31.1.ebuild 320 BLAKE2B d6d9dd7a36a3de887193d218a7c9a22465224e71f8
 EBUILD rust-1.32.0.ebuild 320 BLAKE2B b1e807e0cbc7c4fda2e9ad8597c5d83009193cec9f130493998d0c5e3b267b342fe7d188ec7a5fa63b323916c40154f1273e9447b30f4dbc4385a58f271387e3 SHA512 9bed0818497d426fb37b2643cb4d876f1f918eaf7bfb90a2e17b11e276c4b06704dbc393590b2d1adf163b7110e9fb3f27e87ff325aaa34e08327c787f5d4b08
 EBUILD rust-1.33.0.ebuild 320 BLAKE2B b1e807e0cbc7c4fda2e9ad8597c5d83009193cec9f130493998d0c5e3b267b342fe7d188ec7a5fa63b323916c40154f1273e9447b30f4dbc4385a58f271387e3 SHA512 9bed0818497d426fb37b2643cb4d876f1f918eaf7bfb90a2e17b11e276c4b06704dbc393590b2d1adf163b7110e9fb3f27e87ff325aaa34e08327c787f5d4b08
 EBUILD rust-1.34.2.ebuild 318 BLAKE2B 484372f5834a46bc23531352da32675c0e08079b33cb279ac96e023deb60674a382193a9512f448171970ffbdfd231e076c4c3e12d39f8d8ea7eebfe0d976355 SHA512 fcf10682c7f4aca57f84a6abbd70d498a6759d17bf6d2861f2153126aa4aca5d9f636799df60b6f4fb42e0993350a09dd7de66c03ca2365cf3abb3a877e00855
+EBUILD rust-1.35.0.ebuild 319 BLAKE2B e89cbce85745bbeac3ac5ef4b944de4e4799aef0f1ffa647f05bdcd1b6f6a3dd25ecb7ceee86537f396c44fcf7823a63996d1939fb3ae4a172effa092431f660 SHA512 80d33e755c9a597264680b2f6f9642ce0de57af355c93cd17df317edfd17b437aea45b33e0a60f0f4bc5387eb1300ea00ba9b65b260b8e4823654dcd4515cd64
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.35.0.ebuild b/virtual/rust/rust-1.35.0.ebuild
new file mode 100644
index 000000000000..1ba2f337c1e9
--- /dev/null
+++ b/virtual/rust/rust-1.35.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Rust language compiler"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
+
+BDEPEND=""
+RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 32c2420c0531..0f2eadeb2adb 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 3cc7f2a526fd..b61e61cf33c9 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -7,6 +7,8 @@ DIST mod_http2-1.13.0.tar.gz 1037382 BLAKE2B 8df02fe48d65c08504adf8fad9f328a525c
 DIST mod_http2-1.13.1.tar.gz 1031498 BLAKE2B 53716d7973e5996d48a85cc96c2634d40d6908f15529cf1e17b94ffe23e171de63914c862ab6dcb968cd74a9ca042778f8004b3bfdb2461f3dd30314dd1ef1ad SHA512 e14fe9d1910e5f4a48e3c0f94b2aa7ac73380ee8417b74c6a3e38360fe5bffaa16f59f48b7a0d0d7f9f50f933273b6b96e7530699e2bfd3ea485f34752a55a5b
 DIST mod_http2-1.14.0.tar.gz 1034167 BLAKE2B f29d3937339562f0b8e21ab5eeaca8ff1cab26ce15c692fceffe8e6a1609a49ff6f7488cae4cc30b4fe0e97fe787e077ff771906d7d897afc5b47cc347d74b8f SHA512 dba17eb48af5c22dca3fcd75b4ecd5838dff72c9829bcf9475d8edabb0d2ce4ed2f55249ab1051c1a37e9f2f5a5a7f08f5aa47170f9c39c3b9c404c4ec6547ac
 DIST mod_http2-1.14.1.tar.gz 1032989 BLAKE2B 15359369f8332d9f9d35cb43468b2cd0d98529155d360176c41ac38c24a94824510b518aaa367cff10672bfdd3c7a24269cca4552d993bf7d63f28f857a1ae78 SHA512 04298f0fd9379ae22ba87f5dc95791091ff95cc90c2e898334cc33a0c5115905ec6cbc93676b3a28786436f351c8971721b2786e70cd498fd73ec64b5f46e611
+DIST mod_http2-1.15.0.tar.gz 1036567 BLAKE2B 1ed9fdd7bf13c8ec7ac14b2cd0a109f0cd6e6d1eb8047e1cf6cd107143e23ebb6d9f9ef753942d44ec4d2168e0783dd23dd66b338d8631c504d4cd81b0287b83 SHA512 c3541c930ceee81dfbd688ea155561b6e06aa8ef486830a95e6cfa621f3589aa9c9e15661a4b81463cbe716d02dd28a574e3a74894a74d7c751c88894d378858
+DIST mod_http2-1.15.1.tar.gz 1026120 BLAKE2B 724d09bfafc2fe6a288eeebd7fbdcbe2c3d3e146b0afae42ae72be16931904982b07fd55f4c96da6f8718b5058421813ecd186ac4b4161a74ea7b83c38394ed1 SHA512 3564e8e4cb896420b91669d710d70cdecbe45480078c790960fd7d8c788ac9b843517c2af0747932ad53eb048c39765c4ceb2b7de7e04a1bc7fcb57af0117eb9
 EBUILD mod_h2-1.12.1.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
 EBUILD mod_h2-1.12.2.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
 EBUILD mod_h2-1.12.3.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
@@ -15,5 +17,7 @@ EBUILD mod_h2-1.13.0.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993
 EBUILD mod_h2-1.13.1.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
 EBUILD mod_h2-1.14.0.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
 EBUILD mod_h2-1.14.1.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
+EBUILD mod_h2-1.15.0.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
+EBUILD mod_h2-1.15.1.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
 EBUILD mod_h2-9999.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
 MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/mod_h2-1.15.0.ebuild b/www-apache/mod_h2/mod_h2-1.15.0.ebuild
new file mode 100644
index 000000000000..3e6d435d3f82
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-1.15.1.ebuild b/www-apache/mod_h2/mod_h2-1.15.1.ebuild
new file mode 100644
index 000000000000..3e6d435d3f82
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_macro/Manifest b/www-apache/mod_macro/Manifest
index 76b4e949b6c4..57c166388421 100644
--- a/www-apache/mod_macro/Manifest
+++ b/www-apache/mod_macro/Manifest
@@ -3,5 +3,5 @@ AUX 27_mod_macro.conf 140 BLAKE2B b206bd95e691c753b879ef786e6c743ac7b68155ad95c8
 DIST mod_macro-1.1.10.tar.bz2 13517 BLAKE2B 9cf1e62e2bce43b2fd1438ff83d6693daa571cd781b30b153d6edee4b7818af08f5c5012e9883a588eeb025916422a029a53e53e899a38b35a14a41c58be3218 SHA512 65cc668de21afcb365d8e71369e8c50548270557f66d3905b9757625f0a24cad461c103fe929dcdcabc92438a8e74dcf77e9b807c00045b0c97396e8ce55d04e
 DIST mod_macro-1.2.1.tar.gz 16870 BLAKE2B 6d11763688631a4735fa1f78b9d2a6f9cee200a36ea34fd9f2133c8ad11e735e3b73f753c14607a66aef2a16a40bdec289c7586cfaee2b3e69055e1b18acd5fa SHA512 39e584d90dd576c67952338624ad54b6cd09b1abf88295e760fa9c48f677e96c00a5c0fbf4df1c83501c8a8985c82378014d40722620a03915ff300adaf3fad0
 EBUILD mod_macro-1.1.10.ebuild 668 BLAKE2B 519f81587a7c7c2cc480fbd76defab7ddeae071e845a1140a0c8bbdbefd5f09b4a5b28e003ee3e0c6a0eed27683c26027bb99f5e490e7750fc1ba375e6b7c928 SHA512 338427dcb5db3a8287597bb7419a2a1ff43d675f4be35a478019f30cd19167c62731fedfcee388aa2cb1929fea951228a24b8ad51b447f98e5181de8811e5635
-EBUILD mod_macro-1.2.1.ebuild 749 BLAKE2B dceb6799fa4a480588d5482ca8d60b46b652c6545dc638abfd1e2217f9ab8b69e9789491baa5fc8f02a8fa8536d88ce5cd1024d82e9db7c22bd12b44ad91dcf1 SHA512 aa63b5cc36144d925335ff062b52dbb0dbe55e942e2db6c3f6bbedd88fa564241b0393ee535d070b6753895cc1589ed573570224f0010848eb56c5c3d0e3ee60
+EBUILD mod_macro-1.2.1.ebuild 745 BLAKE2B 3860fe21db3ce07791b3a19bde99b6781c4543d7e5555337145561333806a7b5c2e75c9d5d65e86049a14392acad98e6b07f40953b8d989cb4fe177961e19e02 SHA512 447f3023b48b5a30228c81188672700b197cdf337d9bfe6b048230451ab4ea447c5e45bed8b95e68f190ba06fb84ce40b014c43028986a018e01866e514e4ea1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_macro/mod_macro-1.2.1.ebuild b/www-apache/mod_macro/mod_macro-1.2.1.ebuild
index dfdea3d4bcd0..9a69ca21aab8 100644
--- a/www-apache/mod_macro/mod_macro-1.2.1.ebuild
+++ b/www-apache/mod_macro/mod_macro-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -12,7 +12,7 @@ SRC_URI="http://people.apache.org/~fabien/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-devel/libtool"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index ba516bcba5ad..a5499608721a 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest
index d85d1f38d5c5..9c06724867fe 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,7 +1,5 @@
-DIST airdcpp-webui-2.5.1.tgz 6571762 BLAKE2B dd2d02913125c8166c1ca0f14d9276eed073fa58a46ddbf2ee5e70a97e081852e96a875c9f501781b81de0d2163c4c391c5aa3d078f6946fe35109fe901d8bb5 SHA512 771595f529361330fb54796b32fed61aa8fb37ef1ddbb551c10a8b6352eead6afe7e8a52df223c7e53c27942dd301f50b7234eb915ee378e90eb6ac847b16871
-DIST airdcpp-webui-2.5.2.tgz 6715659 BLAKE2B cfbd185fea4e4b9c07508f9cb29ecd312b004e63a8ce26c2fb0695895fc85e4e657b6813c69e05905ac950eea9288ba01df7814fd5106cce2933ebadc17fb82f SHA512 08dbbb5bcafb1b991f283c6975626843e96818cb02eaf3b0a5a7c700f64780dd18cc897343c57d2f46235c77d44b1da17f8d66fb0f021d75be164a6709978650
 DIST airdcpp-webui-2.6.0.tgz 7829663 BLAKE2B 2c0859598414f456cdca0ef8f0777580d64be6ecc0678e126b61acfe1c2b0cf3361d37b5ff49c89d897953bf998305d2062eb4b55336ddd6d37c52e3c46363c4 SHA512 e4556c0d5697ffcb4d0b4a7f297f9652c339bd1f66242765a74eaffdca077ccbdb323dd70485df34f39e95abfcdc9252280eb28f67cd50a1c28291385dcb2286
-EBUILD airdcpp-webui-2.5.1.ebuild 466 BLAKE2B a6c709a4fc399dff64f01178f72888e354bb5f564f93be837c85a0aea9cfe2c4272d0b63087164a44e2201255bbe5a77d0c370ca26bfebf7245f58059fc7ef0a SHA512 c7587abdf727b97ba914f6c3a89ed03b2e07eaed4cf03e2ce50846b7bb087222fa52f0b59ee81446a9aec3df5a061892a4d40ec257d5b185d340d031ab0ccec0
-EBUILD airdcpp-webui-2.5.2.ebuild 466 BLAKE2B 871c7665811ba71d6cdbe42220bdb9f88174e033c7b0c430788fa08ee24a01290a17612797ba6db9a89dace0c2c4a9a0b95400d8254a7ba06124545d5863dff7 SHA512 ce4e7b13149a79ace635f2f0f1d97fa3cdfb909cfb29323ba48d8d75ae3e3e87848c0f0c397180ea41d3722e471b6401c749557cb9ef2f982d5758886412bc62
+DIST airdcpp-webui-2.6.1.tgz 8418223 BLAKE2B d5f271909d20e8719d707e9eefd464379ec41c8cec378440f7a4483fef1f8c40e119cf827cef88e15c6925d02e71cd4d16dc9471fd5830c9e5bd8ae67a4b02f6 SHA512 be03b595a1f2ffc1bb35835d4bab0eb035dcbee0351aacad529dd4b93fa67af866ab9778a579410ecb8075ede5be8b10eb7cc89eab97f0d2a3f502889cd84fa8
 EBUILD airdcpp-webui-2.6.0.ebuild 466 BLAKE2B 871c7665811ba71d6cdbe42220bdb9f88174e033c7b0c430788fa08ee24a01290a17612797ba6db9a89dace0c2c4a9a0b95400d8254a7ba06124545d5863dff7 SHA512 ce4e7b13149a79ace635f2f0f1d97fa3cdfb909cfb29323ba48d8d75ae3e3e87848c0f0c397180ea41d3722e471b6401c749557cb9ef2f982d5758886412bc62
+EBUILD airdcpp-webui-2.6.1.ebuild 466 BLAKE2B 871c7665811ba71d6cdbe42220bdb9f88174e033c7b0c430788fa08ee24a01290a17612797ba6db9a89dace0c2c4a9a0b95400d8254a7ba06124545d5863dff7 SHA512 ce4e7b13149a79ace635f2f0f1d97fa3cdfb909cfb29323ba48d8d75ae3e3e87848c0f0c397180ea41d3722e471b6401c749557cb9ef2f982d5758886412bc62
 MISC metadata.xml 553 BLAKE2B aacc047cadd9f0d8078a997d9ac02aeda726575f1af69cd4e97afe9159987347247aee7ac74b11b8d23b18a669b447451e3e6123f578b501a872f395e418341c SHA512 0d1233d39b432f28fb9977b06a750e990524b250563e8fa5594bdf7dd6cc5b35468b70abe41e0cae87331c2052b592d4d314a897549f0a247c04af1a15782feb
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.5.1.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.5.1.ebuild
deleted file mode 100644
index 898d2fa96dc8..000000000000
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Web interface for airdcpp-webclient"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="=net-p2p/airdcpp-webclient-${PV%.*}*"
-
-S="${WORKDIR}/package"
-
-src_install() {
-	insinto "/usr/share/airdcpp/web-resources"
-	doins -r dist/.
-}
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.5.2.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.6.1.ebuild
index d656c051b69b..d656c051b69b 100644
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.5.2.ebuild
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.6.1.ebuild
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 630dd5f73036..48a8362d58d6 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -5,8 +5,12 @@ DIST grafana-bin-5.4.3.tar.gz 55228439 BLAKE2B 63ee14b1ab074f453c8f1b870b8c0c513
 DIST grafana-bin-5.4.4.tar.gz 55227302 BLAKE2B f80fcf4447de6eb2f8a450650eb054da6a426e61142c2882cb5faef91b1d9779b77016b822d2f9082c81fe7b6ec14f23996132d880067bd956ac6260b171388e SHA512 c95a3e9b40fdd8fff88c01a66efdda1fc64c258a768bdf65f738562b0c039020de1aa2500cbaa93dff4220715c57ce803ca0ff01344d63a9b8548e4d27dc1af1
 DIST grafana-bin-6.1.4.tar.gz 56564647 BLAKE2B 277a51f056faee911adb46f80673bde05dd872cc2d1387e67066806c8b749e434cb0bf2cd0e55338081814c19edf025927dd2379064aca2acb1e718dc89140af SHA512 7d27dfcc689c4e96f4ea9276c75581ac0762556759c8a70a5f87199a9cdd49493b40b7e44bbcf069b0cb2b4ca60d4b8157c7d977673253db9a80c9c785b4b344
 DIST grafana-bin-6.1.6.tar.gz 56569580 BLAKE2B b8122e5ec6104ba211d7d331fd99e3caaea6b4bc2cdeae3315ea84abc6634723d106fb19b27f68ad5f5f0ff84648f8ea84254a3b0c96519702349acfeb6bd753 SHA512 b8851df5a00b752777c168446326603c5e00ed66e7217551c75a976961c9de1f5a5bf0d262068866ecd0dae685a09ac8829db2bb5201c32e1ecaed6bafc149e4
+DIST grafana-bin-6.2.0.tar.gz 58485103 BLAKE2B 8613821d8dc03518585def91119d3f3b53f1c65a3d31930d4bc3261dfad09d3f30a4de8826fff6057827de5099f9d6945573ffa2aa4908c243b5b82efb531266 SHA512 2f722823577adc7dcf85e1340cef111a09686c9e2a3064b81f53d28fc5a3339f542506bf1fa87b6c242678242683e670f949ab3aaa06d9e542fb6c22e107479c
+DIST grafana-bin-6.2.1.tar.gz 58508207 BLAKE2B 5f543b105768f5151fe868b43927984a9dac4a0987192c2d7d6b2b1b0a1d636fbc4beb898d55a707f5d220785a7c56b0163f834e27293f67b55acaf7c54811a0 SHA512 9a35e953686f8ad0d75d3e2fdfb713fe6cac95ffc56ec4ee78bbbc6d753611675b5bf48e45652cc8a76af38e2358754a415a5b09f660e3a5508a2434b882ec91
 EBUILD grafana-bin-5.4.3-r1.ebuild 1969 BLAKE2B f90d9c8c479edfd60eff8a4c6823fad5ba9683411a6e9b4e137a77990f528d6184ecf0f917520209dd4497e1cfef9198fe305bb76a9c6c4911cd09204481a69a SHA512 d674745ae0614747c945e96990c17c89c1c7e027e909c92a8e08a898d9567d531900e56ea5f2714128549b2094fdc568da3949b6578fd9bb84f3d78c4b339a10
 EBUILD grafana-bin-5.4.4.ebuild 1944 BLAKE2B be7426448610d8b2875bd13a8f37d7c771193e236f572699224dced158835b1fb050573fc425e1d1c8ff4b216aab730ceccd666052c3467d86cca0b88a57fae2 SHA512 ae168b08b5f7c14b0f54d94be5e10fb9ef2c2c4875c8db7b2299cf087734687dc448d08b5f4fdd06ad2c219c29dd5a82802e7e2f68dd0be0daf698fdded24ccd
 EBUILD grafana-bin-6.1.4.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 EBUILD grafana-bin-6.1.6.ebuild 1971 BLAKE2B f8d887e76e958c29296e441bb7165590d910ec9e43c717244e264bd266abdf4874c5ac63c789a61afdf81c5602ac2411cf992507d03b3a941a28a870a3f00051 SHA512 cad905e8e9aa9a8f02431b6fe3c0f780cba7c2ddf3db9477a48bbc0fae8f3b800407e95a926b203b34414be2386bcc21c6b590d9657266f709be95a5e6ed1305
+EBUILD grafana-bin-6.2.0.ebuild 1971 BLAKE2B f8d887e76e958c29296e441bb7165590d910ec9e43c717244e264bd266abdf4874c5ac63c789a61afdf81c5602ac2411cf992507d03b3a941a28a870a3f00051 SHA512 cad905e8e9aa9a8f02431b6fe3c0f780cba7c2ddf3db9477a48bbc0fae8f3b800407e95a926b203b34414be2386bcc21c6b590d9657266f709be95a5e6ed1305
+EBUILD grafana-bin-6.2.1.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-6.2.0.ebuild b/www-apps/grafana-bin/grafana-bin-6.2.0.ebuild
new file mode 100644
index 000000000000..7760f27c61fd
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	exeinto /usr/share/grafana/tools/phantomjs
+	doexe tools/phantomjs/phantomjs
+
+	insinto /usr/share/grafana/tools/phantomjs
+	doins tools/phantomjs/render.js
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/grafana-bin/grafana-bin-6.2.1.ebuild b/www-apps/grafana-bin/grafana-bin-6.2.1.ebuild
new file mode 100644
index 000000000000..ed520bacd97a
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.2.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	exeinto /usr/share/grafana/tools/phantomjs
+	doexe tools/phantomjs/phantomjs
+
+	insinto /usr/share/grafana/tools/phantomjs
+	doins tools/phantomjs/render.js
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 6fe912bbf341..cff6d2b16cd5 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,9 +1,6 @@
-DIST icingaweb2-2.6.1.tar.gz 8165384 BLAKE2B ea9b499f7da9fbdbe8340443f02b5a9fc348549bbffc7777ad63ac1e04c12ff45e5337418f1714b1d76af3818e9733bb0eb51a6bfbc39a7d1eb4820af8747392 SHA512 f2ac728abde9795e578b7d512f5b87e3307faed35a5413aaa2d3a958b57389c5297a124b530667aa248ee368aafaf3875097fa8e27b4c3090bb64badc7c329b7
 DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a SHA512 f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520
 DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb SHA512 f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
-EBUILD icingaweb2-2.6.1.ebuild 2753 BLAKE2B ca25d486a10b97ac6efb871049239c49301e1b242c5cf7021144f67c99f38ad525d5b06bd78b652d44ed7977cf86b43ef3e711af965fad4c583ba6246aac49a0 SHA512 4493fb4bca00b034ba9714c3b16edd202d8a3ccfeb6dd0ccdd4f14c86499fc0be27e59b10a44e14488d89e74926841cf6090156cbacb13fa8acf44035309c3a4
-EBUILD icingaweb2-2.6.2-r1.ebuild 2331 BLAKE2B 1363042c58ee67b76b6f82d89919c7a92edf289ca99ef6e1c157592c9a449ac1afc6459a42b4a1ed89168ee9ef1dc6c6f6012e1090a0b0f98115ec56b04823bf SHA512 73bc873c58b89adc43eed160788406ea9299e66d9388b681e31cd91ef300547c20ec27c8ed09309db12c813ce507e73e88b3850d9e6d87194f9a11758a90683c
 EBUILD icingaweb2-2.6.2.ebuild 2750 BLAKE2B f3a93c50db31b0d18d442a76ad42777bc26136a1aa10baed09c31ebf8b31529e76c21f9c26375e17bf9bce3ff10325e8e6f9cf7dde0cb7a7ddcb34a6788450b0 SHA512 1eff0bc5243c531f4d869ad8d0cf91551649dcae50489dfaad45d342777a6714dc58e752a315a00bae9967664b5b5c74386ebc2fef9193f3553c1027ea0fde70
-EBUILD icingaweb2-2.6.3.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
+EBUILD icingaweb2-2.6.3.ebuild 2527 BLAKE2B 804935e74b5969090cd6caca25e16e0537ce9c467007fa72a56011b0b852b01920bb3592bba24da63a57767d3385229851749eb1a829e62523b6995ebbc6d9ce SHA512 7030468c78d304c7d745d95b3acbe1f8782b323126664449785ce9145fab750dccff5daf2c97e72179fb483790e9a978585ffc9d9e81c6723db337ba9fe96d1c
 EBUILD icingaweb2-9999.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
 MISC metadata.xml 530 BLAKE2B 855edf88f825a4c2f286068f7195264f1ca75f15aecf56d322a2e96b79ccdbea0b45c0a9a6cc4025dd2632cb0c97b60ffda3dd859adb7a2cfb35c0373c72bc0f SHA512 4ec6c57d7342dc1fa154f16e262f762374e37f6e4db09290c1b1188cc27ee605697d28b8349c51dee71fbfd5a90fd091e17b1dff4c9c9745bd6e69df8191897a
diff --git a/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild
deleted file mode 100644
index 0bf5ea9d946a..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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]
-				dev-lang/php:7.2[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]
-				dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.6.2-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.2-r1.ebuild
deleted file mode 100644
index 86c829679241..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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 fpm 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 )
-		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]
-			dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
index 45655f2ebdb1..4d66e260c407 100644
--- a/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
index e3423ca234b8..0c9770bf622e 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -3,5 +3,5 @@ DIST ikiwiki_3.20171001.tar.xz 2638780 BLAKE2B 537008233f4c9612b3d1236eb15fe85a7
 DIST ikiwiki_3.20190228.orig.tar.xz 2672244 BLAKE2B 43012fc14f08c491ebe382e20953b8b01e10c390c28da0184b4e45a1435ada00b1ad6ac61f28c56ba1edb2e22dca1ab1f32eb77fc8d6133b899a26023593d3bd SHA512 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
 EBUILD ikiwiki-3.20170111.ebuild 2086 BLAKE2B fad60188d2fa890350c9b2308409c9259dcc60c629f003ce2ee281c4c059d20d1c0369bbaf6290fd24f541e2b02227fa3ca87091ee49815bbbaacba5937ddc0e SHA512 7efdda5c7beb52be7f3de65a0090be7295f97350e69091d1069908d36f3165293e1ae399dbaa25bea68f5b433d2aa7c48918d7f7f4c1559a303c7f8d71336b52
 EBUILD ikiwiki-3.20171001.ebuild 2087 BLAKE2B 97788b721fcb8c552b9cddf1edbaf86d7815263efd072e0deafdce10ec1a4ef9f8a6879eeee43554f74b2873e15bf22d567e0023627e8834a9308736e065ce6c SHA512 66e0690357126199f0350be0f1fb04b87159480a14ee8e6d7d6b9db37b3b89cc5b2cd3bf3bb09dd828d17350e512f8af4b85033038a7b46f6891d57283bbc304
-EBUILD ikiwiki-3.20190228.ebuild 2091 BLAKE2B bdeec0b4bb1c064c2f00cd58b19c83db4f0e8dfc7820299b3feb69e84f09d15ce78edf0cd39b7541c3eabad667e85b33c7959a8d30adfe2d1a82588629d76a34 SHA512 d45422d03ced2e8bc89ae4b06fe19036dacfba70af9183645288de1114e9013a3e532ebfd53d26ec85e6aea749d088da726388eea896c84fb4d3a422faef17bd
+EBUILD ikiwiki-3.20190228.ebuild 2090 BLAKE2B d21af6459cb5c11855f3c520578510c5bd3206a20e815b52916ef4bce8a8a9a695b8990371c77aae617af13975e8d45e4ecff3dd65c539cbc2dc4025cf187101 SHA512 d4aae81f8cfd839652979eee1a6b749e9af7c672dd01f420880ca14435e204fe3ce10cce6f3dfdd3813c654d022076eb678a4c0ab89a15fa82e09ad6518b907b
 MISC metadata.xml 336 BLAKE2B 659eb5913c4c6c05924f811fac31deea3cea40dd30b32b498ea5b55341f20cf9405065dfdf5d19e82f8ba93ff3ec4d5c5adbedfa51271d6762cff10c4a5088f4 SHA512 7d31f6078d1d49aef54bd46c5e8005d4247eb1cadfd4fdec36592deef15c4450a213d29c353dd43255a10918c2146c335efdbf7b626da2cd4ea98f815e0c5141
diff --git a/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild b/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
index d89cc5295019..5791382b3092 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.orig.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="extras minimal test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 S=${WORKDIR}/IkiWiki-${PV}
 
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index 0ee31ff8c26e..6d4774a45154 100644
--- a/www-apps/klaus/Manifest
+++ b/www-apps/klaus/Manifest
@@ -1,5 +1,5 @@
-DIST klaus-1.2.2.tar.gz 35308 BLAKE2B 4ac2cd77f5c95fd207a83e1688b65e286009a5830c96fce442e3e4a2989a320c0980ab96a03817be27d45d01ccb5e2db277ed535d62a781006b4747c797838d2 SHA512 2f054ca3d285dcf334188d72bbbc4ea99fe8778126d0d215cfd3508cb294d52e2944b3e251f903a863df018ec61d9dcd779f5c6cd284fb2f6cd90abb98783176
 DIST klaus-1.3.0.tar.gz 35363 BLAKE2B 881f9bd1a80d4a580a0dc84a7b8528a5703777817495639bb3ea8f608c2495287a37fe43839d0c64002e1d36453d37f116c73c9a7ef93651bc8a2d010d4d2e2c SHA512 c159d8195b1bde43f46d013f0337e998d905b1f3a9a23caf5f71180d19192c3c391cc5143545bd3d05a2aef45451a43e873ca3828c8f9f69ae3eaaa0d00560cb
-EBUILD klaus-1.2.2.ebuild 846 BLAKE2B ce62579f0ff24ff598da86669077907a4d29c7aad39a677a357c69f18430f020e0796da8bceca6b62bfa7aebbd202af74f92ebc4221b7eef1104ff6691c1321f SHA512 2dc006642ac991309ade7511508b752841db573f8520aa7b98391955501b5e3c8ade1cf0bc2e5fd4ff3bf2ae7574643499495aa8ae402e8e87478457e5822b45
+DIST klaus-1.4.0.tar.gz 36879 BLAKE2B 8a621338514e3be143c5b64a0a486d47edc7e7a14c839bc135e7c1693fd09ddea1529b5b2e1d8e0bb70f152629d7bff288f9221ae4243dac01995da4d00e5848 SHA512 8e596590fe29c62eeb823047780f747a0f4908f926dad8ff54000469dca013fcfcbaf7b53c0555db095fef71e4d9056e9b6e959005550bdfccc338f1ee3a5d2c
 EBUILD klaus-1.3.0.ebuild 845 BLAKE2B 4ccaead04d938250fc8a845eef3f46ab203933b00d0dde34ac73b3479c3cc0bad61372d81c0082b45c87db1da3ad1b52142b1e9cd9aeb37eb20193f8cfc2884e SHA512 82295552e538bb0837b35b1468e1c2fb27f1cabf65cc1fd6bad202f81bc2bf2da1b881b25fcce57f9db621fac99d8079a560335b8740e092a95cf650ac821308
+EBUILD klaus-1.4.0.ebuild 919 BLAKE2B 1a598db00725e56a879816336f06392335aaf2317316a5f3015b99bde856b8f0bff4929f5d2aaa6a4f9c8981a72cbc06170730b36fae630dd69d5334d1c0ffbb SHA512 7e3c5ed3f5fe46ffd85bdcbde573f985d0b68aa53b5d4e65973e69fa65299dc6eb41c8c383ba1fa1e769591a6fc244e17aff35efa1b4dcc6da2eb4939a8f7277
 MISC metadata.xml 684 BLAKE2B 3fd97f5f66e03afef819feddd1995814e607f188ca87ce5a294f3a10f794fdbcba2fdea691bca7e100d0b853925fd1248fea7eafc37cc947d31454a01c070af2 SHA512 37f5386826bc762dda625012e6016f65d0dd3d1ed4b88f62341cb4ed7b2876cc2a819550faed8fbcb939796d6d76f6d4dcca8f0559be329cc9f8f583c188d5e1
diff --git a/www-apps/klaus/klaus-1.2.2.ebuild b/www-apps/klaus/klaus-1.2.2.ebuild
deleted file mode 100644
index c7fba3e90a36..000000000000
--- a/www-apps/klaus/klaus-1.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple, easy-to-set-up Git web viewer"
-HOMEPAGE="https://github.com/jonashaag/klaus/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ctags"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.13.0[${PYTHON_USEDEP}]
-	dev-python/httpauth[${PYTHON_USEDEP}]
-	dev-python/humanize[${PYTHON_USEDEP}]
-	ctags? (
-		dev-python/python-ctags[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# The tests can only be run from a git repository
-# so they are not included in the source distributions
diff --git a/www-apps/klaus/klaus-1.4.0.ebuild b/www-apps/klaus/klaus-1.4.0.ebuild
new file mode 100644
index 000000000000..1966b9410b74
--- /dev/null
+++ b/www-apps/klaus/klaus-1.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple, easy-to-set-up Git web viewer"
+HOMEPAGE="https://github.com/jonashaag/klaus/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ctags"
+
+RDEPEND="
+	>=dev-python/dulwich-0.19.3[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/httpauth[${PYTHON_USEDEP}]
+	dev-python/humanize[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	ctags? ( dev-python/python-ctags[${PYTHON_USEDEP}] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# The tests can only be run from a git repository
+# so they are not included in the source distributions
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman ${PN}.1
+}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 50bfc8e9505d..f5d6b095b7c7 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -4,6 +4,8 @@ AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
 DIST moodle-3.5.6.tgz 46703461 BLAKE2B edd438ffd4f1def04f9619150d8ef486323a5e9f458124d317d36e01eb79e2d0ed0039d8dba43a3956aafc8e92c8d2276b6be730607031ba0e561b62a24488ef SHA512 0a08359576665f78d2370d3f2796dd53cba692c5fe68de7cdf8478bb1f24136c4e78149fa6a3c37118015fdf7a401c50913d151b4b38d9928989255688df73f3
 DIST moodle-3.6.4.tgz 47736743 BLAKE2B b3a41b0025651e161a1ee76ec1c121666e8dd0d830a05165b6c4419dff3caccb5fd006434f5e8284b81bd892a1c184d8a008e2b948d3b63c472f31cca55dc77e SHA512 b3b3b138f8a2779dc41f25656a5f2640afa2f3b933d9e2f99065e176d1f5b6c9c4f8bdf8af53af04957eb520043e1c7c53ff6309896e399f4a012f624481ae44
+DIST moodle-3.7.tgz 45708647 BLAKE2B b4ce21bd98d91ad81f095c00aaee6c30fac238cf54de079e1021ec94109a24aee97f2d9aff0e99a6594c35cfd8ff7e06b83415109992df90e858d88ae8b66033 SHA512 ca3efbb146253e856ff6988abad4bd071e26599ba45e60186e89bda45b06b610de1e88aa165e5ac992e00f23772e932ffe770402c699898d128a3357f02ac895
 EBUILD moodle-3.5.6.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
 EBUILD moodle-3.6.4.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
+EBUILD moodle-3.7.ebuild 2949 BLAKE2B cb6e624bb0c83c5e8a3e7d9a541cb61dcf93dd6b06bdbf417ac96631444665a08bfdb5d1366636c0452421faf6350d4b886d08d6a9a07b8676f45cdcb040ffa8 SHA512 593727dc584922aa6a0074c01ab6d31bf738c7e198d4901ce2766c2dbda9eae26b0f2ccb4360d117da3d8fb76f34b656b6f777d2e1aa992401bc8bd627774c67
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.7.ebuild b/www-apps/moodle/moodle-3.7.ebuild
new file mode 100644
index 000000000000..02e7fab65927
--- /dev/null
+++ b/www-apps/moodle/moodle-3.7.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit versionator webapp
+
+AVC=( $(get_version_components) )
+MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="https://moodle.org"
+SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,postgres?"
+DB_TYPES=${DB_FLAGS//\?/}
+DB_TYPES=${DB_TYPES//,/ }
+
+AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
+AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
+AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
+
+PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-7.1[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	virtual/httpd-php
+	virtual/cron"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# How many dbs were selected? If one and only one, which one is it?
+	MYDB=""
+	DB_COUNT=0
+	for db in ${DB_TYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DB_COUNT=$(($DB_COUNT+1))
+		fi
+	done
+
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
+	dodir ${MOODLEDATA}
+	webapp_serverowned -R "${MOODLEDATA}"
+
+	local MOODLEROOT="${MY_HTDOCSDIR}"
+	insinto ${MOODLEROOT}
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DB_COUNT} -eq 1 ]]; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 036e30b4c9bd..8e576f3f5f2d 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,9 +1,7 @@
 DIST owncloud-10.0.10.tar.bz2 44943557 BLAKE2B a2cdfbef7affc306b7653f1841b0bb2e781d849bbd62d9b8a0f3a019cca5be8a02ca27b5fa5cbb39ddb9a440aa917b279c937ebdae034504d5c1b9ed3eeee603 SHA512 77f9567395ee5319afc397ed7b9bd93687ddfb90022445be06adfb58ae49557223227a656b638b1cdac19b730509292e7ba260846c9f67540418267ac7b518f7
-DIST owncloud-10.0.9.tar.bz2 40769945 BLAKE2B c2187838488e87a85a964a9f1cd181e203fef6475c8797f8fc7204ae91d00522193cf730340dcf3e08b85cb03992d8d922a1d72db0acfc3d77374f0f10f4cbea SHA512 756903ba98ca7612987e51d4f0d38452b8c38a3970ae6ac7ec0d30e469cd7cb7cf1a4a95dbe1a782c3ebddfdf3c2194193853b9f55cb75a9f0ef4c5a437c420b
-DIST owncloud-10.1.0.tar.bz2 20345340 BLAKE2B 0d5d6b1ea5ce6071ccd447737ab897e3ade60178497af538866ea60fdfad9b15a8971fcf921e1297d4b9b14a596c1397d7ae517cf8f0b9e9eb186511fe4e3210 SHA512 2e93510cc6a3668c4d1b9ad072aab05b44e531cadbc7e740a2d4c5822a221878fa2f3804cb2436461e3c2df46b59374bd641464c786a89582b01fcf816bb203d
 DIST owncloud-10.1.1.tar.bz2 20272676 BLAKE2B 36f4a1fb513dc1a49ba571935de309f78c12fad11b4b5297c48fa02541a7c7858ce8c525847c44b89e43a5142f52e37c9c23cfff71aef9380b4192729e5b110c SHA512 4252ac71b87bd7a6372507a501dea4022420b7c2cb6556ec258091238cf3b347a33cd56c2a8afefcf971c0bbd68422fc86db8be2e6bf8fb3b6c76ff3aac228e8
+DIST owncloud-10.2.0.tar.bz2 20370460 BLAKE2B df52e0bfd7090dcddffc2bd87059e17d575ac250bc737a6b38c45ec73cd793e2b2d3deb0bd17e7f91f858e9c4ffe92a551de8204cc0c0246ba833b93721ab3ed SHA512 cbeacfaee4b29d01bbea2a2a0800c34d4ec3d3a430e287b39df1414c359c1aeeaf61fe7d044674f44180bb37962c44f87392a663273e447cd6b0f4d2d62201a6
 EBUILD owncloud-10.0.10.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
-EBUILD owncloud-10.0.9.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
-EBUILD owncloud-10.1.0.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
 EBUILD owncloud-10.1.1.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
+EBUILD owncloud-10.2.0.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.1.0.ebuild b/www-apps/owncloud/owncloud-10.1.0.ebuild
deleted file mode 100644
index f493a0c561af..000000000000
--- a/www-apps/owncloud/owncloud-10.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="https://owncloud.org"
-SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-10.0.9.ebuild b/www-apps/owncloud/owncloud-10.2.0.ebuild
index f493a0c561af..f493a0c561af 100644
--- a/www-apps/owncloud/owncloud-10.0.9.ebuild
+++ b/www-apps/owncloud/owncloud-10.2.0.ebuild
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 2d05e6262f6f..10c3ab3b19e2 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -5,6 +5,8 @@ AUX ttrssd.confd-r2 1581 BLAKE2B ce18840ddb58704abb9311d02e27cfc179bba43668b90cb
 AUX ttrssd.initd-r3 2338 BLAKE2B 6ddcb12c548ef6b34196da7539b5ec2f061db46f041912647ea2741208004d25cc7d51d88375aa06b5866a7ef44995088cc9002d625666bdaaf687733b699a8f SHA512 eb6a9824562f49d42e94522c074719720686cd2d3fb3d0ac13ce5d83fdeae6b17a5047e79e761aea084eb8ff6e6aa733d49131324f8a00406935f8e0b962764b
 AUX ttrssd.logrotated-r1 135 BLAKE2B dc653add518cd3ed5296097d51ca2346e102edcbad5ec82397713ded489e8ed8e49af928331e58b80152f13bddc37d673c67440df388651c875cfbd37ff62080 SHA512 c292020a55688c6edb4306d9d8144ad7d30be94fda08467b8bbe560c7bf02b0877d9591123a226dd030e9a9c01b79df4a3696e54fd1ece0dbdef1c285cdae97a
 DIST tt-rss-20180105.tar.gz 3070929 BLAKE2B 2370104c70f5381d690a29b216269c749bf1f7c6b925eb9499b741e5df3e686d95fce430a144946fd915414481280b67e6d0c881edcdd13aee0fa344dc0bec3f SHA512 86ceec3646629ad7fd3fde2f3c3237e48ad96bd08b46e73c34c76507d9b17613ea309e1bd5e6e85a0d9eb96029e54b54e5ee367c56aab31be3dcec9169c5ada5
+DIST tt-rss-20190523.tar.gz 3336985 BLAKE2B 9f37c676b6ca263b09685ae66c4183b4b1fed2e37c2fb361aeeb15f877916967ebdb272fb60ce554c8a7596f74de7713ca2ff6c70bf1ae8a669da2bd702607e9 SHA512 22fbed0199503ecf3728ed4c2e199bbd9fc617b83ec3a09d80352512460ab9cf46abfe840143e62c747743975d2e5b9c9ce0bfb8498b8c6187ae567552a49213
 EBUILD tt-rss-20180105.ebuild 2116 BLAKE2B 420d5b05643b29abe653a53db201ac1d5bd287faf48a5ed4eb8694e183ce38fec6c36dbe77cbdbe55cdb03508e720bd3371df939dd10d0185398a2fcc3fb5838 SHA512 362544447ff951a400056ebd8a083a0d7f37dd0a6772b5b25bc46aada86d69ed6df37b6f612c8313e2b6cd4667d0e16c5cc18990730e333dbb11588d528242c9
-EBUILD tt-rss-99999999.ebuild 2163 BLAKE2B 2147dd308815ea48e4b91bb62606647d18736772068ea82e5ea52dd155e15a523c271ea1691f65459101d0df5151a2b4dd0f06af4db828ee31261c1be6094186 SHA512 15ff6fc2390ad194a7f7b26e7b448c8e9062b0ab79b9c60edd2e5edc9bf5ca6bcb275469ec7a1a0a0fba0971bf1f1a843908f373862a34644071e484be68d3b4
+EBUILD tt-rss-20190523.ebuild 2123 BLAKE2B 5e741b1b68a15327824b3fb98090ee993dd2517cc0851bd1cbfce3f67f1fc5163e458aeec22767a915f2705c0c4970c8dd2bd3b4586a0ca091d50f2ab2ec0f17 SHA512 7baa07afbcb6112bfbab8409a31a63afab7f566cd764a7e110c61e62555ad330d07e8cba4d541ba1775b789b2c86f3cbb8ea15aec0748874133432f0d3441ce7
+EBUILD tt-rss-99999999.ebuild 2170 BLAKE2B 360b2ada6756ae564c7dc1497f488baebb4d1db78e93ff21c0681a40767b70bbfb5c4c161f08411cbe89cb9f3d3cdf451ba64208b4f3c2f2f7f6534ea25b0f48 SHA512 c453912dc640ba2a235601a8442061e775e0259a468df39bad3dedcd6f69999f906196076c57bcf44b79a8754558f4b3eedb0af400a31efc7077f089d6642c94
 MISC metadata.xml 349 BLAKE2B d14bc6946ab95fa116a982d4d9ea1c76b94c1094876c32451adeb783925410e5f80323943aa8922aef9c4c7bd630038bbab07186f62cbc3aa36b2d7eec5fc306 SHA512 2b18408b092177dc05b0720635e28c8dac334d9013d1e9f30ee7288fd2158a1c47fd313f916dea4e5f1bf37ea04b15e8845f4a7331dcce43579163fb7a36bb6a
diff --git a/www-apps/tt-rss/tt-rss-20190523.ebuild b/www-apps/tt-rss/tt-rss-20190523.ebuild
new file mode 100644
index 000000000000..fbfb5e9a9330
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-20190523.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix user webapp
+
+COMMIT="4a2836ea90c4c471029d189a8c9fe5ec10a9521b"
+DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
+HOMEPAGE="https://tt-rss.org/"
+SRC_URI="https://git.tt-rss.org/git/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="+acl daemon +mysqli postgres"
+REQUIRED_USE="|| ( mysqli postgres )"
+
+DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
+
+RDEPEND="${DEPEND}
+	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] )
+	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] )
+	virtual/httpd-php:*"
+
+DEPEND="!vhosts? ( ${DEPEND} )"
+
+need_httpd_cgi # From webapp.eclass
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use daemon; then
+		enewgroup ttrssd
+		enewuser ttrssd -1 /bin/sh /dev/null ttrssd
+	fi
+}
+
+src_configure() {
+	hprefixify config.php-dist
+
+	sed -i -r \
+		-e "/'DB_TYPE'/s:,.*:, '$(usex mysqli mysql pgsql)'); // mysql or pgsql:" \
+		-e "/'CHECK_FOR_UPDATES'/s/true/false/" \
+		config.php-dist || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r *
+
+	# When updating, grep the plugins directory for additional CACHE_DIR
+	# instances as they cannot be created later due to permissions.
+	dodir "${MY_HTDOCSDIR}"/cache/starred-images
+
+	local dir
+	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
+		webapp_serverowned "${dir#${ED}}"
+	done
+
+	if use daemon; then
+		webapp_hook_script "${FILESDIR}"/permissions
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon-r1.txt
+
+		newinitd "${FILESDIR}"/ttrssd.initd-r3 ttrssd
+		newconfd "${FILESDIR}"/ttrssd.confd-r2 ttrssd
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/ttrssd.logrotated-r1 ttrssd
+
+		elog "After upgrading, please restart ttrssd."
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "You need to merge config.php-dist into config.php manually when upgrading."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild
index b611aa54bd70..1f6d41d337bf 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit git-r3 prefix user webapp
 
@@ -16,8 +16,8 @@ REQUIRED_USE="|| ( mysqli postgres )"
 DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
 
 RDEPEND="${DEPEND}
-	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,pcntl,pdo] )
-	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,pdo] )
+	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] )
+	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] )
 	virtual/httpd-php:*"
 
 DEPEND="!vhosts? ( ${DEPEND} )"
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 19a4ecd0d4dd..e21518333698 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -2,8 +2,10 @@ AUX postinstall-en.txt 1554 BLAKE2B 0a6e291b6d590e03fe4702a9e01f88a59fc4d820f95b
 AUX postupgrade-en.txt 1653 BLAKE2B cf2e403046ff8646b7dfffaec7c267633fa735f1be7448f76c9bfeefb2372c169453123db169d70bf871dc4c1ee1a239aeb17a25a1de582b23b38a7d589fd1c2 SHA512 3fa8b143a4cd8e23798423427ec31174947eeccfdbc5611dca3b32e02484f68602713dd75c3153db344de4151de1924fbaa6807e360fddeda79fa0dc70005913
 DIST wordpress-5.1.1.tar.gz 10654780 BLAKE2B c5105315ed07941811016244737d2a697864521a4cf0fedc9ba260629cedbe77cef642f71ea485813eb89cbef1a1bb60fdca3229611f7d2de435f0c28462a3f1 SHA512 0b06630c894c535b24787cda0ee9c8bc8eab54fe6f6523fd78da55cb00ea9b9404454d51a3b9b77c72fb5ebc94d36719be50785fd82ff3311ca1df9b8fd980c9
 DIST wordpress-5.1.tar.gz 10653910 BLAKE2B 26a4f42dd88d4c2616fb240b8b9a1f64a5380496600e3d132dbc162505907cda49e11b9f132d0f436e9426e77d42d6d78ed6b1e16f04d857429515d192761113 SHA512 e8504be918add0533a99f62e967e2c86afce0c28ae474cace5e4c44f66e8a71394eed7bc6f1e3108734e4410849b28d1da6c545c05a24025067a1321a8fa9a99
+DIST wordpress-5.2.1.tar.gz 11199196 BLAKE2B 284358e40e380f5467f92ced37cee57dd1c6b9400a80f01a5a7a5ae973f9c5af88345ebf46505ae392512a88d0c64dfd4f321edd825fd2d38e1160c3ca352d21 SHA512 b49368ba7a3f0cf101b2ad2c78d609050f371a4c7f6dca7d5966cc167ae20ca78df9a3144e1b91c4044d0a9a12163911d66c8faedc9c4a1e2978d2b54ef54855
 DIST wordpress-5.2.tar.gz 11195223 BLAKE2B 35bc5190751749f12d88a13314f021a9cefb6dd78aee9ec32e439031cd19af0929c1a84741b7965cc30638fc3f568289e75e25e9b63a1696e4c427ef29aa1f85 SHA512 741699a26b956b9d80505954f38e95b9f6328f892efb957d584ba6b669ae28d9a9e63249b72cc7a677cb4ae1008e0545f846492636e7e10442593be2054be824
 EBUILD wordpress-5.1.1.ebuild 1260 BLAKE2B 497617a28239b9636b455fd458e811ae00428a4938891e30d2cdc0144143f29c8bd9988b6dc695ce89b96b044e7cf3ccc14148b7aa13e653c67141625e987d28 SHA512 f6114430beffa148d151909fe1d01ab892b23a25ac83c9e2136ba3c49446164fb4a80407866db25d70e9acf9e0e4b01afbce35735a885d29d002a14332326b9c
 EBUILD wordpress-5.1.ebuild 1260 BLAKE2B 497617a28239b9636b455fd458e811ae00428a4938891e30d2cdc0144143f29c8bd9988b6dc695ce89b96b044e7cf3ccc14148b7aa13e653c67141625e987d28 SHA512 f6114430beffa148d151909fe1d01ab892b23a25ac83c9e2136ba3c49446164fb4a80407866db25d70e9acf9e0e4b01afbce35735a885d29d002a14332326b9c
+EBUILD wordpress-5.2.1.ebuild 1260 BLAKE2B b3478b9f1821baaee2517a15ee9ea6e67e2bc2dfa760e2a7b87bcd3933a2db89903e3d92f85b52db6afaa3906649dc7372cb80cfd6c3c962c87d215dbf6497f9 SHA512 077876f0d5c75686f33cfe5b6422a0bb8eefb56519f8b4cc098dde7c39dc09a38f4a43db4b8412890666e8adcab1f4f39f5601a34c7647b9c428987168dd8209
 EBUILD wordpress-5.2.ebuild 1260 BLAKE2B b3478b9f1821baaee2517a15ee9ea6e67e2bc2dfa760e2a7b87bcd3933a2db89903e3d92f85b52db6afaa3906649dc7372cb80cfd6c3c962c87d215dbf6497f9 SHA512 077876f0d5c75686f33cfe5b6422a0bb8eefb56519f8b4cc098dde7c39dc09a38f4a43db4b8412890666e8adcab1f4f39f5601a34c7647b9c428987168dd8209
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-5.2.1.ebuild b/www-apps/wordpress/wordpress-5.2.1.ebuild
new file mode 100644
index 000000000000..9d6f0eaa173c
--- /dev/null
+++ b/www-apps/wordpress/wordpress-5.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 0e96d2e09cf2..1a8c3e59a239 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index efde5657bd7f..299fbb387701 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -6,14 +6,22 @@ AUX chromium-73-gcc-4.patch 3500 BLAKE2B 0446dc3d5a073d0960fee4338a59452002734dd
 AUX chromium-73-gcc-5.patch 3388 BLAKE2B e8a2940ad9e6e23fe62d0897e5f24c38e9e9b75a08326ea0109eace1f3be8afba269d207a208289e0c9bfbf5be165e345594b97f2733ff0d895c6e054105b714 SHA512 524b3a0f9fdcb5a78a9e94a1e6ba8bfaa632471cb3cf3b2d4d32704744154ebec2b81178234259e2d1486694395c707050696874527375290564672417e64daf
 AUX chromium-73-gcc-6.patch 4452 BLAKE2B 0798c713701fcf438a388e47d89de454e27e7376494192630cc7bbf9edd4690163ba3ed450e52629a4adff67ce36a09c01dc95f450a5bb603bfcb02582a2c164 SHA512 f5d8ab6bd3e4cdb4aee6a7b7ecb552b675893c8902425b2451032372a2905ef2aef983e1a0660ca891dfaf5603c7ce79d979068ba8aafa2c5735d9051f7dc58e
 AUX chromium-73-xdg-current-desktop.patch 5300 BLAKE2B 3825ce2b899fdeffad17b86b537285fd96f59dff958668670c4dbc14aa40732fa98979a4fefaea19378170b516279ba02fe878d103640a9c7bdfd977c2119a21 SHA512 f15495d9a33132aa8f384a463dc42f91a59bbb5b230f5fc6c212c7d7624ddaf22c8a242f81fe67aa5e36d02fe6403e10e8fb890b0b3d40091670ff6fdedcbd92
+AUX chromium-74-7685422.patch 1398 BLAKE2B 87b0dc0512bd11cf8eb1fd19f8691877a90aa648fd3e2124f33254719263e2249fe1e8b2e44abe90431db928bb278e3ca67611472d7391f539e6570e83ac75c3 SHA512 7a4918e8cc42926004b58639056abed48601da310dabadda60557330ab5daf52e84ba45866158bc51445c10f2ad85786b00877d4d9c8cda1ba4577f38ac05efe
+AUX chromium-74-c2c467f.patch 3037 BLAKE2B 25f33c71be5ceaaac0b0b170843be037363b469041dc84e9efc907d94a232f5422e25543fbdea2bf01ffc5e85a86ccf746c742bd5ad39f8a5f7e6375e4594422 SHA512 e9ad65e1f1aad88ce2a468cf1f3dad65ffb2a80ea0baaf5df8f22cefe931150e8aa44a3ade803a49f1bcf54e853d57178cf1410a634eda7a2ce35950b5566391
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-compiler-r7.patch 5729 BLAKE2B 66e7b417d685a3371684a4e173bfa2e6fa49415311ccbd16b60806c3b9f70c805db13c973861033444336d6f714270e5953f961bc54d42fca645c940ba30b706 SHA512 5c6ec5bae53c7b2a1b409a9b4ce8f2e7b1cf95421647b3c1ab49e6f3886aefdb858980065cd7a214e89dfe348f4a5b557c304a94bd7681f5bf4c73c74328d1d7
+AUX chromium-compiler-r8.patch 5437 BLAKE2B 529c02d92b3beb65d8e0f975f3687d2106c81cac3f7cc36e205e6cd780061c2ff21cfd66af32c3ac8e5409df86371fb97ee5d97047c45b16840375db30e3a93a SHA512 6d2af8919082eeb6497539bd876bd4cfbada4b2c477a14da0c8cf6a5a064c14a27775913455e3a3ad884b85db76e9a1f736b863b7d8e612ec9861a29affa6a60
 AUX chromium-fix-char_traits.patch 355 BLAKE2B 5269c43c4d36dc1cd190aedc04e3172fbef0048484ac7e4db15fffd69009c8ba02f0ed786c64b292fbbcd2409ad70545817cd7d45a2cb51fd76bf72250ca0018 SHA512 85ab70f168f56c01e01bdf210d107bebd7c344e95dcb692a19a0f7883ed6aec5325b38c35cd3c9b37c1915820d5e8d401e8ee92c289436fb8bc8341c3c6007a8
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
 AUX chromium-widevine-r4.patch 1155 BLAKE2B 7ba02c4b80883fa7ae5c46d95072798683bdc5c9d65b3cab40e6a3c21b29ce7eb9c45493ec10e522341033a80132818f946569ee774c662daafa4e09fbc2a988 SHA512 8f78c0e22f14f81f1903a77b315c7818603caaadbb5d517a3184a11e9553b99fd42d5a1d2ff19b3d79c03352b2e279a5102afa2fa66f276da2d9c42988a94366
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
+AUX quiche-00f47df.patch 1516 BLAKE2B 0c0f16cda814d9dc51ec3dabb3492cd7f010886bb85f7441c5f57df11e2b3e15b7552dd1fdf99143f5d0abccd5c828c5a930404b188104babdda8e4e5aafa394 SHA512 0d901d2499b4aeaeaad3ccbdd7b377fda90297927bf8dd1b0f7aecd74b55fcb07e6babaa6002c4d0b4d74a40996f6e874d1c9a89f8aa02c7edd4acc477b6f46a
 DIST chromium-73.0.3683.75.tar.xz 710439908 BLAKE2B 23ed7facf2f67e9bbfc2f1baf434892773d9d63dab10cebab350c3b0b2c75a07f84a4f677e01563a441cc3bae0d42212b3eb28b6d7c573b0137d25e478064a3b SHA512 52bd1dac782a2f7960eba48446d4dfc4c6c13c8e9de21bbee250fad2802beb222cff7bea9878c7338926030aa3aa7ffd2dd1238d35e261a0d766b2d9974fdaf6
 DIST chromium-73.0.3683.86.tar.xz 710449412 BLAKE2B 87b4d15440e88be506920813a52e7a503ac81458aa3f2818490c28f6bb5cfc0ca24b316072e5a0664a8bfe6444be23e565579bc232cdfcef42acf8eeca9f216f SHA512 5dd450640c1ea30f7941231e8c459aec0312c18e089b2c8b9104c4ee835a8fa389f5fb9b301b46d87ce260956eaf3e3bd6aff6ae54c279a303aa757537cace15
-EBUILD chromium-73.0.3683.75.ebuild 21719 BLAKE2B a30038651590e33a60d116a3e16bc6273dd516bbee60c18112cfa713d88dde2718d7fea6f9891b067244e6dda5e66c02712ec3b9b36b8c4c3e72a42599c500e4 SHA512 f1c52cc5a79f009b437cd5c934597bf43ac41acfebe40fe97648e78b61e0b5f3974768810bf64af852aac06670e7b4a5ec391f23c78d19c4de5cf88e760b3e55
-EBUILD chromium-73.0.3683.86.ebuild 21772 BLAKE2B 10627c9dd6f47b0407416418e08021ccbcaf6449e7412b4669aa91380d71b6d5ad5f430dea063b5cae492f9579a220957a1daa97085f830e43d7213dea477ee4 SHA512 e837862b3c5af947571ac55cedf2d009b4858f451894a7211bcfa14b98bcec42913508dbe765264074447e7303a39011b234602e6c0734516ab50ffa3d96d891
+DIST chromium-74-2f28731.patch 18581 BLAKE2B 146f6375071a0e85501a7c666d13ecb7ee196a97c6dffb709f2049f219a66c2058b6b29777e3a3cef17272c29cbe38f6c273e03452dfc9a303abc90f539353f6 SHA512 9c3cce89715ea5d27531dc0f53afa25d00c2b73dfa24123680a7960e6784f09bb2accca495a8c2540a9b43204089cb203d92644f7633e758bf24603d207bafb7
+DIST chromium-74-e1b1f3a.patch 20750 BLAKE2B 327752fc232ed568ef494f40d97672ff79d304bbe979f70e98422ac18616004e1289470340657995a6959b34a38df310145e0947ee2d75aca6c55c7d5dd1647f SHA512 b7401e8577577dd1e00fe06cce6a18039a812e4ca08df633b4cb431a15873fbb033525a608a558aa68fed22f1e42c08a04cc01e2b750d750d7a63419eac8d19b
+DIST chromium-74.0.3729.169.tar.xz 749495820 BLAKE2B bfe485220239aad146eab0cd7bf158a20bccf03abe74457ea3933094c9fb200ff7a2e9db4a62fa1a736341ce8ee987520e20bd32e13e213435fd6724d15a7d85 SHA512 783558bbae43a928b7d9fe18717b63be432409c81aba0a38ccb14f38398d8681122bdd763db6d22b01363108253432ed203a86f8c9ba627247219bf1519f839b
+EBUILD chromium-73.0.3683.75.ebuild 21832 BLAKE2B 53b1925509ba4f300ef01b6eaa35fae0423bbb2f6f32bc4214791c697c9dbe04ca5d786c19d04179b8fe72ee232aeaba66243dd927f6205b1106865803e7e589 SHA512 ecd647868b03b6b74ad9025236846b592a0481f867765c383c9d41987e215eef86ee3e5aa51d2ce62c25f3331d18128e30f64fe3b7750b8b13e27c3fcb7263f4
+EBUILD chromium-73.0.3683.86.ebuild 21885 BLAKE2B c2980b7ef99693f5a8f2fa9867c04d75e2f59b2f3e7d5004ee57f6d3ce6df77a4eaee527ab67fdc29d078511c849bfeb3bfd709f9ead79a6880ddaf7326b5454 SHA512 be0448d335432fb076a88100b80d28566a9abbdad6a068283f8c28568a9f65692c3c37bcacfb0cefe688611010431533cbcff4b1b86cccde16699843adf24f64
+EBUILD chromium-74.0.3729.169.ebuild 21692 BLAKE2B e7594a10eb477e1fdd4c8c329850175890e669be10f20a531567696846d57bc4f559612b3b93ca2bc708a3f601a997f3ed41d083c003af05c1c5ba461fa5332d SHA512 ac96743957f12fd10bf2b866376b6a3c6837bd4873b35b796543f41e0e430fad0f64ae026741f548457c4595f2d1e3ca6e6bb225711a882ced20f674419d4770
 MISC metadata.xml 1538 BLAKE2B 6c68f673e2892063f4b7a5afc8314356e3e8182d8765a193c36be7ed6b61e7680dbd0a58e2386904ff2877c81ad45cdae07754996f706f986f16f3a159500930 SHA512 16e98f9dc01cfdce307dd17fc2ba83ff1eff10eaeb65aaf9154b0dedfc61086334d56f50b6ce1d673715148e29e045eb0eed21495efef942ef56e4ba4e514187
diff --git a/www-client/chromium/chromium-73.0.3683.75.ebuild b/www-client/chromium/chromium-73.0.3683.75.ebuild
index 1327e13b300e..4584a7724844 100644
--- a/www-client/chromium/chromium-73.0.3683.75.ebuild
+++ b/www-client/chromium/chromium-73.0.3683.75.ebuild
@@ -97,7 +97,7 @@ BDEPEND="
 		dev-lang/yasm
 	)
 	dev-lang/perl
-	dev-util/gn
+	<dev-util/gn-0.1583
 	dev-vcs/git
 	>=dev-util/gperf-3.0.3
 	>=dev-util/ninja-1.7.2
@@ -136,6 +136,10 @@ are not displayed properly:
 To fix broken icons on the Downloads page, you should install an icon
 theme that covers the appropriate MIME types, and configure this as your
 GTK+ icon theme.
+
+In order to have a native file dialog in an KDE desktop environment, please
+install:
+- kde-apps/kdialog
 "
 
 PATCHES=(
diff --git a/www-client/chromium/chromium-73.0.3683.86.ebuild b/www-client/chromium/chromium-73.0.3683.86.ebuild
index 21e07332c4e2..4d9ce8c95aea 100644
--- a/www-client/chromium/chromium-73.0.3683.86.ebuild
+++ b/www-client/chromium/chromium-73.0.3683.86.ebuild
@@ -97,7 +97,7 @@ BDEPEND="
 		dev-lang/yasm
 	)
 	dev-lang/perl
-	dev-util/gn
+	<dev-util/gn-0.1583
 	dev-vcs/git
 	>=dev-util/gperf-3.0.3
 	>=dev-util/ninja-1.7.2
@@ -136,6 +136,10 @@ are not displayed properly:
 To fix broken icons on the Downloads page, you should install an icon
 theme that covers the appropriate MIME types, and configure this as your
 GTK+ icon theme.
+
+In order to have a native file dialog in an KDE desktop environment, please
+install:
+- kde-apps/kdialog
 "
 
 PATCHES=(
diff --git a/www-client/chromium/chromium-74.0.3729.169.ebuild b/www-client/chromium/chromium-74.0.3729.169.ebuild
new file mode 100644
index 000000000000..ed2d4ab25170
--- /dev/null
+++ b/www-client/chromium/chromium-74.0.3729.169.ebuild
@@ -0,0 +1,713 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://dev.gentoo.org/~floppym/dist/chromium-74-e1b1f3a.patch
+	https://dev.gentoo.org/~floppym/dist/chromium-74-2f28731.patch
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+closure-compile component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+REQUIRED_USE="component-build? ( !suid )"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.26:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/atk-2.26
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-59:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.11.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.2.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12-r0
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+"
+BDEPEND="
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	<dev-util/gn-0.1583
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	closure-compile? ( virtual/jre )
+	virtual/pkgconfig
+"
+
+: ${CHROMIUM_FORCE_CLANG=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-5"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+In order to have a native file dialog in an KDE desktop environment, please
+install:
+- kde-apps/kdialog
+"
+
+PATCHES=(
+	"${FILESDIR}"/chromium-compiler-r8.patch
+	"${FILESDIR}"/chromium-widevine-r4.patch
+	"${FILESDIR}"/chromium-fix-char_traits.patch
+	"${DISTDIR}"/chromium-74-e1b1f3a.patch
+	"${FILESDIR}"/chromium-74-c2c467f.patch
+	"${DISTDIR}"/chromium-74-2f28731.patch
+	"${FILESDIR}"/chromium-74-7685422.patch
+	"${FILESDIR}"/quiche-00f47df.patch
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
+			die "At least gcc 8.0 is required"
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-headers
+		third_party/angle/third_party/vulkan-loader
+		third_party/angle/third_party/vulkan-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/apple_apsl
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/nasm
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/SPIRV-Tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-7.0
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/fft4g
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/yasm/run_yasm.py
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" closure_compile=$(usex closure-compile true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# 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}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# https://bugs.gentoo.org/588596
+	#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; 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
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Work around broken deps
+	#eninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-74-7685422.patch b/www-client/chromium/files/chromium-74-7685422.patch
new file mode 100644
index 000000000000..19747245bd78
--- /dev/null
+++ b/www-client/chromium/files/chromium-74-7685422.patch
@@ -0,0 +1,42 @@
+From 7685422a90e1da829cb32d685a4b970d30738098 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena@lge.com>
+Date: Wed, 3 Apr 2019 18:35:04 +0000
+Subject: [PATCH] base: Value::Type enum class size should be 8-bit.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC is complaining because, when base::Type is used to declare the different
+variants of Type in its union, they are forced to take 8-bit, that is smaller
+than the enum class default size (same as int).
+
+So this change sets explicitely the enum class underlying type to be unsigned
+char.
+
+BUG=chromium:819294
+
+Change-Id: I1765e2503e2c3d3675c73ecb0f7f5bc33456e6f0
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1550366
+Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
+Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#647382}
+---
+ base/values.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/base/values.h b/base/values.h
+index c455936d4961..14b76acec02f 100644
+--- a/base/values.h
++++ b/base/values.h
+@@ -86,7 +86,7 @@ class BASE_EXPORT Value {
+   // See technical note below explaining why this is used.
+   using DoubleStorage = struct { alignas(4) char v[sizeof(double)]; };
+ 
+-  enum class Type {
++  enum class Type : unsigned char {
+     NONE = 0,
+     BOOLEAN,
+     INTEGER,
+-- 
+2.21.0
+
diff --git a/www-client/chromium/files/chromium-74-c2c467f.patch b/www-client/chromium/files/chromium-74-c2c467f.patch
new file mode 100644
index 000000000000..e9e5d22e4a87
--- /dev/null
+++ b/www-client/chromium/files/chromium-74-c2c467f.patch
@@ -0,0 +1,75 @@
+From c2c467f69fc00d353879d7add5f2c04a6acabbb1 Mon Sep 17 00:00:00 2001
+From: David 'Digit' Turner <digit@google.com>
+Date: Wed, 20 Mar 2019 21:41:09 +0000
+Subject: [PATCH] base: Value::FindDoubleKey() converts integers to doubles
+
+Ensure that FindDoubleKey() can return the value of an
+INTEGER key as a double. This is consistent with the behaviour
+of Value::GetDouble() which will auto-convert INTEGER values
+to doubles.
+
+BUG=646113
+R=dcheng@chromium.org,jdoerrie@chromium.org,sdefresne@chromium.org,hidehiko@chromium.org
+
+Change-Id: I2c08cb91b6cfd5db268a182ffffe16682d848008
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1529017
+Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
+Reviewed-by: Daniel Cheng <dcheng@chromium.org>
+Commit-Queue: David Turner <digit@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#642680}
+---
+ base/values.cc          | 10 ++++++++--
+ base/values.h           |  2 ++
+ base/values_unittest.cc |  2 +-
+ 3 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/base/values.cc b/base/values.cc
+index 035aa2350cde..69d66ff8ab00 100644
+--- a/base/values.cc
++++ b/base/values.cc
+@@ -339,8 +339,14 @@ base::Optional<int> Value::FindIntKey(StringPiece key) const {
+ }
+ 
+ base::Optional<double> Value::FindDoubleKey(StringPiece key) const {
+-  const Value* result = FindKeyOfType(key, Type::DOUBLE);
+-  return result ? base::make_optional(result->double_value_) : base::nullopt;
++  const Value* result = FindKey(key);
++  if (result) {
++    if (result->is_int())
++      return base::make_optional(static_cast<double>(result->int_value_));
++    if (result->is_double())
++      return base::make_optional(result->double_value_);
++  }
++  return base::nullopt;
+ }
+ 
+ const std::string* Value::FindStringKey(StringPiece key) const {
+diff --git a/base/values.h b/base/values.h
+index e31cadd83102..6f2cd3cc3d79 100644
+--- a/base/values.h
++++ b/base/values.h
+@@ -200,6 +200,8 @@ class BASE_EXPORT Value {
+   // function's name.
+   base::Optional<bool> FindBoolKey(StringPiece key) const;
+   base::Optional<int> FindIntKey(StringPiece key) const;
++  // Note FindDoubleKey() will auto-convert INTEGER keys to their double
++  // value, for consistency with GetDouble().
+   base::Optional<double> FindDoubleKey(StringPiece key) const;
+ 
+   // |FindStringKey| returns |nullptr| if value is not found or not a string.
+diff --git a/base/values_unittest.cc b/base/values_unittest.cc
+index b23fd8332491..7c545c09d947 100644
+--- a/base/values_unittest.cc
++++ b/base/values_unittest.cc
+@@ -674,7 +674,7 @@ TEST(ValuesTest, FindDoubleKey) {
+   const Value dict(std::move(storage));
+   EXPECT_EQ(base::nullopt, dict.FindDoubleKey("null"));
+   EXPECT_EQ(base::nullopt, dict.FindDoubleKey("bool"));
+-  EXPECT_EQ(base::nullopt, dict.FindDoubleKey("int"));
++  EXPECT_NE(base::nullopt, dict.FindDoubleKey("int"));
+   EXPECT_NE(base::nullopt, dict.FindDoubleKey("double"));
+   EXPECT_EQ(base::nullopt, dict.FindDoubleKey("string"));
+   EXPECT_EQ(base::nullopt, dict.FindDoubleKey("blob"));
+-- 
+2.21.0
+
diff --git a/www-client/chromium/files/chromium-compiler-r8.patch b/www-client/chromium/files/chromium-compiler-r8.patch
new file mode 100644
index 000000000000..5d8bd0efecd5
--- /dev/null
+++ b/www-client/chromium/files/chromium-compiler-r8.patch
@@ -0,0 +1,169 @@
+From aff4a3a1c35dc37141a61d2c6b7e703a55f9b371 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 23 Mar 2019 12:12:37 -0400
+Subject: [PATCH] Disable various compiler configs
+
+---
+ build/config/compiler/BUILD.gn | 55 ++++++++++++----------------------
+ 1 file changed, 19 insertions(+), 36 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index ca6ff2b13809..b614709cd1db 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -240,8 +240,6 @@ config("compiler") {
+ 
+   configs += [
+     # See the definitions below.
+-    ":clang_revision",
+-    ":compiler_cpu_abi",
+     ":compiler_codegen",
+     ":compiler_deterministic",
+   ]
+@@ -489,17 +487,6 @@ config("compiler") {
+     }
+   }
+ 
+-  if (is_clang && !is_nacl && !use_xcode_clang) {
+-    cflags += [
+-      # TODO(hans): Remove this once Clang generates better optimized debug info
+-      # by default. https://crbug.com/765793
+-      "-Xclang",
+-      "-mllvm",
+-      "-Xclang",
+-      "-instcombine-lower-dbg-declare=0",
+-    ]
+-  }
+-
+   # Print absolute paths in diagnostics. There is no precedent for doing this
+   # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
+   # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
+@@ -1540,7 +1527,7 @@ config("chromium_code") {
+       defines = [ "_HAS_NODISCARD" ]
+     }
+   } else {
+-    cflags = [ "-Wall" ]
++    cflags = []
+     if (treat_warnings_as_errors) {
+       cflags += [ "-Werror" ]
+ 
+@@ -1549,10 +1536,6 @@ config("chromium_code") {
+       # well.
+       ldflags = [ "-Werror" ]
+     }
+-    if (is_clang) {
+-      # Enable extra warnings for chromium_code when we control the compiler.
+-      cflags += [ "-Wextra" ]
+-    }
+ 
+     # In Chromium code, we define __STDC_foo_MACROS in order to get the
+     # C99 macros on Mac and Linux.
+@@ -1561,15 +1544,6 @@ config("chromium_code") {
+       "__STDC_FORMAT_MACROS",
+     ]
+ 
+-    if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&
+-        current_cpu != "s390" && current_cpu != "ppc64" &&
+-        current_cpu != "mips" && current_cpu != "mips64") {
+-      # Non-chromium code is not guaranteed to compile cleanly with
+-      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+-      # disabled, so only do that for Release build.
+-      defines += [ "_FORTIFY_SOURCE=2" ]
+-    }
+-
+     if (is_mac) {
+       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
+       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
+@@ -1949,7 +1923,8 @@ config("default_stack_frames") {
+ }
+ 
+ # Default "optimization on" config.
+-config("optimize") {
++config("optimize") { }
++config("xoptimize") {
+   if (is_win) {
+     # TODO(thakis): Remove is_clang here, https://crbug.com/598772
+     if (is_official_build && full_wpo_on_official && !is_clang) {
+@@ -1983,7 +1958,8 @@ config("optimize") {
+ }
+ 
+ # Same config as 'optimize' but without the WPO flag.
+-config("optimize_no_wpo") {
++config("optimize_no_wpo") { }
++config("xoptimize_no_wpo") {
+   if (is_win) {
+     # Favor size over speed, /O1 must be before the common flags. The GYP
+     # build also specifies /Os and /GF but these are implied by /O1.
+@@ -2006,7 +1982,8 @@ config("optimize_no_wpo") {
+ }
+ 
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+   if (is_win) {
+     cflags = [
+       "/Od",  # Disable optimization.
+@@ -2034,7 +2011,8 @@ config("no_optimize") {
+ # Turns up the optimization level. On Windows, this implies whole program
+ # optimization and link-time code generation which is very expensive and should
+ # be used sparingly.
+-config("optimize_max") {
++config("optimize_max") { }
++config("xoptimize_max") {
+   if (is_nacl && is_nacl_irt) {
+     # The NaCl IRT is a special case and always wants its own config.
+     # Various components do:
+@@ -2081,7 +2059,8 @@ config("optimize_max") {
+ #
+ # TODO(crbug.com/621335) - rework how all of these configs are related
+ # so that we don't need this disclaimer.
+-config("optimize_speed") {
++config("optimize_speed") { }
++config("xoptimize_speed") {
+   if (is_nacl && is_nacl_irt) {
+     # The NaCl IRT is a special case and always wants its own config.
+     # Various components do:
+@@ -2119,7 +2098,8 @@ config("optimize_speed") {
+   }
+ }
+ 
+-config("optimize_fuzzing") {
++config("optimize_fuzzing") { }
++config("xoptimize_fuzzing") {
+   cflags = [ "-O1" ] + common_optimize_on_cflags
+   ldflags = common_optimize_on_ldflags
+   visibility = [ ":default_optimization" ]
+@@ -2221,7 +2201,8 @@ config("win_pdbaltpath") {
+ }
+ 
+ # Full symbols.
+-config("symbols") {
++config("symbols") { }
++config("xsymbols") {
+   if (is_win) {
+     if (use_goma || is_clang) {
+       # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
+@@ -2328,7 +2309,8 @@ config("symbols") {
+ # Minimal symbols.
+ # This config guarantees to hold symbol for stack trace which are shown to user
+ # when crash happens in unittests running on buildbot.
+-config("minimal_symbols") {
++config("minimal_symbols") { }
++config("xminimal_symbols") {
+   if (is_win) {
+     # Linker symbols for backtraces only.
+     cflags = []
+@@ -2380,7 +2362,8 @@ config("minimal_symbols") {
+ }
+ 
+ # No symbols.
+-config("no_symbols") {
++config("no_symbols") { }
++config("xno_symbols") {
+   if (!is_win) {
+     cflags = [ "-g0" ]
+     asmflags = cflags
+-- 
+2.21.0
+
diff --git a/www-client/chromium/files/quiche-00f47df.patch b/www-client/chromium/files/quiche-00f47df.patch
new file mode 100644
index 000000000000..720edf934d30
--- /dev/null
+++ b/www-client/chromium/files/quiche-00f47df.patch
@@ -0,0 +1,38 @@
+From 00f47df999c9b19e80fdc01db0ae9ca1b6a12b3a Mon Sep 17 00:00:00 2001
+From: vasilvv <vasilvv@google.com>
+Date: Wed, 3 Apr 2019 13:58:53 -0700
+Subject: [PATCH] GCC: do not delete move constructor of QuicStreamSendBuffer
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+QuicStreamSendBuffer constructor is implicitely required in the
+initialization of the vector of substreams in QuicCryptoStream.
+Though clang apparently ignores that, GCC fails to build.
+
+BUG=chromium:819294
+
+Originally submitted by José Dapena Paz <jose.dapena@lge.com> at https://quiche-review.googlesource.com/c/quiche/+/2420
+
+PiperOrigin-RevId: 241800134
+Change-Id: I4e3c97d6e5895d85340e8c1b740e6196d9104066
+---
+ quic/core/quic_stream_send_buffer.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/quic/core/quic_stream_send_buffer.h b/quic/core/quic_stream_send_buffer.h
+index e34514b..74e9d0d 100644
+--- a/net/third_party/quic/core/quic_stream_send_buffer.h
++++ b/net/third_party/quic/core/quic_stream_send_buffer.h
+@@ -62,7 +62,7 @@ class QUIC_EXPORT_PRIVATE QuicStreamSendBuffer {
+  public:
+   explicit QuicStreamSendBuffer(QuicBufferAllocator* allocator);
+   QuicStreamSendBuffer(const QuicStreamSendBuffer& other) = delete;
+-  QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = delete;
++  QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = default;
+   ~QuicStreamSendBuffer();
+ 
+   // Save |data_length| of data starts at |iov_offset| in |iov| to send buffer.
+-- 
+2.21.0
+
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index c5c97bdc787a..66525f935c31 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -377,7 +377,7 @@ DIST firefox-67.0-zh-CN.xpi 537479 BLAKE2B 4947f23b125fd2fa5bcdbcd48400590d2e35f
 DIST firefox-67.0-zh-TW.xpi 537618 BLAKE2B e62b4689f5f4329efa57c45309115d380057b29238f254e623c6a58adba87142b2f874096750f3cd678325046dea91396f15be488b389b00d80786ec2c206cf0 SHA512 28b2dfe48d7642bfd5509f95da1e0adb034b137789f513068089e290d5e74fd3c4e53ea3d61f884680a2ef577eadcd4d9f16720917ed93a3f417eff3a6eb5313
 DIST firefox-67.0.source.tar.xz 282874008 BLAKE2B 8263d27da7237c2d366f0fab3de0bca551d08569ebab115f9cd356fc61c2ae07365d21119522cbb7606d2c5541bd088cd287cadb9f69d19fa3b5a68414fbdc74 SHA512 a1000d6ca8146a9a3c74a3f69041b755c0c5014c8a608298d9c4cbe39577939d43139a7ad742983697ae90b635d3f5d8f9a008fcc2b3778adaadc25acc49ca29
 EBUILD firefox-52.9.0.ebuild 12991 BLAKE2B f6fd3bb3145bccf8ecdc85da7fc102ec71ccafd9dcff9f5c0d4ab8fd274bb438b1ea271c556f5153e44e7ed58acf7aeb6a095d49f43664ace69a4cce280555af SHA512 f30ca31284836f835bf37eb06d88a40fb49820b0bef66b200e20877eadc823d3220adcf1b5c050e207d8626577abe0d3986a8722a3fba2845d9b663423ee3d63
-EBUILD firefox-60.7.0.ebuild 13728 BLAKE2B e42bc42b7176915375b3e4acb31adcf64a14b0e13b2cc578a2e5176b3c7c7d9dcb38b91da46a81ce12298dc2423b754ab148ce7fd6839d17e08bb38e5290e7a3 SHA512 018baf801c7967aa6e15d37d41e7673f4109748c7db87e325d5e8821d1142e4d439568b56e7117ad5a2e96d0c8be2ea8ba0e0ba437552a975341b33bb6d63ac8
+EBUILD firefox-60.7.0.ebuild 13727 BLAKE2B 9e4e67c6e67d58feff22513b057914d455eb8a6328ba737ecf2106bb12fb61cf3c1e1a0e8a78e89981479348f6ae3225a1042517f7f70161280477fc2afd6272 SHA512 c38d2231e4eca82a07de4afe12b5965289090311e7420b293260ec78afe28d25a3fcf287b1f0e9a0b4a5a19a4ff948ad101b10929f7e21c5e69561e24ab6645f
 EBUILD firefox-66.0.5.ebuild 24349 BLAKE2B 6888769e6e45519cbe6a99afab3f3524ee0c01bf971a1ceeaf7a37c6c17b0b241fd1373838d2d390dfc61c57fba4ddd44c2245cc4b991e3142caf27da5a98b33 SHA512 900b0cba8fbf560c155cd3f489782c740c7b73081319d35c7e7d6e08477ea91072161867c9b4e700e3a099a5cdbf1c6770bb8d617fd2c4118d98b3deb54bb38c
-EBUILD firefox-67.0.ebuild 24552 BLAKE2B 145351ffa9012fc618932d34a4bf3c8d1fd811cfc62b5f12960a706acf465cccde22402e3757818f11a30be9df87a3f0e6683af50a35d38fe1469214a32337bb SHA512 5c3e923e794dccb8a4951d8623f27e4134e7af7d7c5cc80b9cf3b2fbcb30073ad32595d20d9ac7e5d74440c41260a444363cf17f90f6f5b0506a17f31dbcc743
+EBUILD firefox-67.0.ebuild 24554 BLAKE2B 71025d53df8676db9c7b453bb6f8b9abd64dd1868f0215aaafd2568092ff453dc811d22a29b502f1ca808d3574ba98e143f705eec474ef2e9a28a59b5d89a672 SHA512 4f9d30057908e31cad32c20ec73f6a4fd121e84ac5080d85de37f2d2063536c50903bb51a8d8e82b6312f441bac6b78385f1b48238be6790bbd8d0878dfe19e8
 MISC metadata.xml 2540 BLAKE2B 458e01980f6c0dd1722289fa23d3934d66b1cebe4e0f80b89cb1901bf823c67acc852f1a14f6fd2e59829209dead122ddaf77eacc81d3cc3c957d73fc649b187 SHA512 c2d232195fdc5950a1005c9f46e9b304cbe0c2c991312a82d35363021123719bd0f52058d6f33d075c091a02b920baa479a425c07a9bd7ed0c87857ef6479dcc
diff --git a/www-client/firefox/firefox-60.7.0.ebuild b/www-client/firefox/firefox-60.7.0.ebuild
index a40b3c1acd47..5622d52d0447 100644
--- a/www-client/firefox/firefox-60.7.0.ebuild
+++ b/www-client/firefox/firefox-60.7.0.ebuild
@@ -43,7 +43,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/firefox/firefox-67.0.ebuild b/www-client/firefox/firefox-67.0.ebuild
index 96c3b34386a5..7f5184eeb318 100644
--- a/www-client/firefox/firefox-67.0.ebuild
+++ b/www-client/firefox/firefox-67.0.ebuild
@@ -106,7 +106,7 @@ CDEPEND="
 		>=media-libs/libvpx-1.7.0:0=[postproc]
 		<media-libs/libvpx-1.8:0=[postproc]
 	)
-	system-sqlite? ( >=dev-db/sqlite-3.26:3[secure-delete,debug=] )
+	system-sqlite? ( >=dev-db/sqlite-3.27.2:3[secure-delete,debug=] )
 	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
 	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
 			>=dev-libs/dbus-glib-0.72
@@ -123,7 +123,7 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	app-arch/zip
 	app-arch/unzip
-	>=dev-util/cbindgen-0.6.8
+	>=dev-util/cbindgen-0.8.2
 	>=net-libs/nodejs-8.11.0
 	>=sys-devel/binutils-2.30
 	sys-apps/findutils
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index ed123816766a..4fb40f16990b 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,4 +1,4 @@
 AUX chrome-gnome.patch 673 BLAKE2B 6c9b49dbcf31bbfe3c5d996c65f4d820ef68f81130fdb89a92d2523f555b60638de0a3536cc3808b16ac74c8e01e84efec3132e9bb48b5cba81188f49f2df12b SHA512 18121f3f9611f3240b79b78b41cf253279da7301807aac79842f7a869b211ba7201ad90cc6cc69bfdc3ccab0d486084471b67eb373fd212087892f7de21c9c17
-DIST google-chrome-beta_75.0.3770.27-1_amd64.deb 60278798 BLAKE2B 47008bfc968366e26446c28c70996cbeceea6e40869439be70d38275bec8cb0b4d1f93ebf792596367990516b10435953f482de7620d9535dbede86d3d9685c0 SHA512 8b471ab4a04b119707fa149420cbc6686e919c74ee56b7d8f8e6a016bcf208cd0f16eb31e5a30fc57a8468531fd8a79c98407df0d57346c9da5e19c0fabc6fb1
-EBUILD google-chrome-beta-75.0.3770.27.ebuild 2938 BLAKE2B ac488a28185c8b1991ef347a3304fa1c2b7323dadd447e73f3f1df60024a0f411b9552ee069cacf66872b19211b043917533748440c8256fbd688c8288be7397 SHA512 70394cab6660cfebd0347e31af1455d5cede6a5d48392b9449a852806d33fbfc3394f05c2f910ce922df04cfec859c08d27ce1f53e66fb042b097b8b7151b97a
+DIST google-chrome-beta_75.0.3770.66-1_amd64.deb 60416518 BLAKE2B 151a392fb94111c73019c264691a1e206bee8472027fbf857afa043189051086cecfd8c779ae5eee61502857c3d965c8614f82669c34bc35366b2f6aeda4bbc1 SHA512 b206e271b90336891b3a816b63c21a93ea0b64aa725ac754b0629ecd97190b45a67d64008f8f38eae3b2dd55a446d7d719e179d74ccfed25f2062f8fe25691e8
+EBUILD google-chrome-beta-75.0.3770.66.ebuild 2938 BLAKE2B ac488a28185c8b1991ef347a3304fa1c2b7323dadd447e73f3f1df60024a0f411b9552ee069cacf66872b19211b043917533748440c8256fbd688c8288be7397 SHA512 70394cab6660cfebd0347e31af1455d5cede6a5d48392b9449a852806d33fbfc3394f05c2f910ce922df04cfec859c08d27ce1f53e66fb042b097b8b7151b97a
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-75.0.3770.27.ebuild b/www-client/google-chrome-beta/google-chrome-beta-75.0.3770.66.ebuild
index b8601eeffdfb..b8601eeffdfb 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-75.0.3770.27.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-75.0.3770.66.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 5fbe299a4db3..fae94565ec75 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_76.0.3783.0-1_amd64.deb 60136128 BLAKE2B 373ea84da49872eb172bdbf4e9c49657c5a7573113916f0e85b48fd7070967729d74369b19a4ea48f93469ccd99012bcd4856a82050f35b1bf10f177b0b02718 SHA512 835cf2057bcb7b9a6ea551755d52a86dfd2fc16f3309b4d92df670c9188d79968abd86677bf9fd5a50a1d467f49b69e8aa6eea62c5779a663a8bc657aa301965
-EBUILD google-chrome-unstable-76.0.3783.0.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-unstable_76.0.3806.1-1_amd64.deb 60963730 BLAKE2B 79030811b458c985d27ced8526ab53c4a43c93bf45cdfdd0bb5f10a726c4ea82aa3574cece82f17960e623f6de66ec0b3bb8d7a725d3ee8164ae53c9c2c3a582 SHA512 36050216e22c45420819dc4ac2bb8442eb15c006127e7ae358485925cb1aec7b085cbc60f9336dbeefcf0247b5e0496b4fa921ace5de1ba89bf1b092c0620696
+EBUILD google-chrome-unstable-76.0.3806.1.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-76.0.3783.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-76.0.3806.1.ebuild
index e75218fcde20..e75218fcde20 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-76.0.3783.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-76.0.3806.1.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 03e21d1b2466..43cf03c7dd38 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,4 +1,4 @@
 AUX chrome-gnome.patch 653 BLAKE2B 9fd8fe9803c67d3267ab8e772952f3162b402df9e9d0862ffaf6f10572ef9aaf6f4b96b11546379ef5a1aea1fd838a44c949786effbf689996446da4fa72372c SHA512 574ddf719e95f333693b6651d392f6d2722e8ac00d2407883fdf111ea2948a8e53b6813831859dcd0172e2e17a0f9e6b44437132bbc8d9832bbc7139f61cb9ba
-DIST google-chrome-stable_74.0.3729.131-1_amd64.deb 58535144 BLAKE2B 9f91cc5865410c9c2d856028940a941e3616eee39a6b8867ff37f53d4e97d19c859aed5ab0841852f7f0a7d95bb3406f67674ffdc4de3a50b185262c26d0d4d6 SHA512 807a4d66b6ef495aacc36630c0a3a7f17f62420f0ed0bf5e248e431edf08b57473b02a9e2ab99a270e245aeb8a94246e8e5fbc74b4cb904e9eff66e8dcf17804
-EBUILD google-chrome-74.0.3729.131.ebuild 2938 BLAKE2B ac488a28185c8b1991ef347a3304fa1c2b7323dadd447e73f3f1df60024a0f411b9552ee069cacf66872b19211b043917533748440c8256fbd688c8288be7397 SHA512 70394cab6660cfebd0347e31af1455d5cede6a5d48392b9449a852806d33fbfc3394f05c2f910ce922df04cfec859c08d27ce1f53e66fb042b097b8b7151b97a
+DIST google-chrome-stable_74.0.3729.169-1_amd64.deb 58236722 BLAKE2B 99be6e82f3782a50f6786550b67da5dbba01e3cccb9a2f2d7d40de8fb2e76fbf2e7d6ad3b48b63ff56f02fcfdd33d10fae755778409dd9d6c90e8a9ca2c3fa8f SHA512 98bb65afdc44e4b40a3d073cf7c7796eabb4dc8c8cfb02b59d573145a96f06f49a1789b6b706e29d9e9031d70a05fb7c0a1829c90a0ff1e102b280133ea95546
+EBUILD google-chrome-74.0.3729.169.ebuild 2938 BLAKE2B ac488a28185c8b1991ef347a3304fa1c2b7323dadd447e73f3f1df60024a0f411b9552ee069cacf66872b19211b043917533748440c8256fbd688c8288be7397 SHA512 70394cab6660cfebd0347e31af1455d5cede6a5d48392b9449a852806d33fbfc3394f05c2f910ce922df04cfec859c08d27ce1f53e66fb042b097b8b7151b97a
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-74.0.3729.131.ebuild b/www-client/google-chrome/google-chrome-74.0.3729.169.ebuild
index b8601eeffdfb..b8601eeffdfb 100644
--- a/www-client/google-chrome/google-chrome-74.0.3729.131.ebuild
+++ b/www-client/google-chrome/google-chrome-74.0.3729.169.ebuild
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 737d2d511efe..92aa883323dd 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,6 +1,6 @@
 AUX luakit-cflags.patch 240 BLAKE2B 6ea8589e3a552ae67ad45832bafeb97a0138d635e4fc18f8ebc1a18907bbe96b4d2d86e99034be9b821eda0d8e323cc9cb17c91a71d4c10bfc12eaf7c94c87d6 SHA512 a7898e2cc40f4f35753e2c56096955f4098c4fb19a670da021d5aa7baab466c53d0bed96375ef9fbae1579cb881532608a65bd3d2d3572d6b1f043aa02051dc4
 AUX luakit-fix_tests.patch 3877 BLAKE2B a4d1f05a961034ae5b78c84758ffe3cf859786548c6f5e2ca2149b3aa9ff41762a7c821e8fdb59afa1d385310812abb4c42fa32a5f228de0a76010f65d74607b SHA512 40d4aea86e27fb29fd97ca2be9f84aecf25ce148323de6e2233b0c99d583b2ec07b6dbf5afa86852db89d09f1fe04b8c98acc793ff6ad9f66eb4e88f8e8d57f4
 DIST luakit-2017.08.10.tar.gz 399564 BLAKE2B e7efad1e3e2e34971811c2b1fcccf48caeadbb5e87d09bda2835f00cb075ac499b9c7121c7b805acd14f5cae297c16b59fce75fc5dd1c07fa461ed7ed0fae17d SHA512 6cceb241ca5a7ad7dfbb3964888318b5f2c5f734175ea7ecd5178419d037d58dc5e0aba00a7ed8ca3dd811cc5af953c353b0cd203be95a15c6a78c396f9230c8
-EBUILD luakit-2017.08.10.ebuild 1497 BLAKE2B 1207cd0cf28753a35a4309287a39eeaa4ec82046a97e4b1e71c4852f9bcc5512579a2eee6c01be48d1ee3d08e831f1a80d60a09b32d161ef3f5da6bec4e70388 SHA512 d0e86580d33030d4dff9d197292b6f676e8e3c210edbf5312d54430c8baa3a5c1c34bfe8222115dca114c5865f3d9b26fa7b15bba41971e23d6df3036d3c8d62
-EBUILD luakit-9999.ebuild 1457 BLAKE2B 3c55ff25e1092cd22235f4eb31c99d4038feb8425c71fbceef90542caa318651314dc7dfff7f46cd8d014a7f7d030e580946467d16f66d83953506ce697b9ea7 SHA512 ff0201e0e0e76d62791a601a8225dbbf5f2d8585f6ac8d2f8af0a89aedde6b093410d70298c6fa653641e5ac6c65a32ce9e37a8c10813110864a32e2755edd87
+EBUILD luakit-2017.08.10.ebuild 1635 BLAKE2B 54aafcb46ee95bd9a18cae927990e169fc8aefa8aa0b56c83561002f4e66f6cb834327adf2595825dd8250d8cc2b7179be048bd654bc761b8a2ceb988bfbd2d3 SHA512 3ffe5c46f53404c95b2e91c3a9642f1e854dcc712148483f48a08df1d800a4af3aae0bc0677c75c2e71c7d4fa48a82cf78a080b5b5693022fe7cae09811cf069
+EBUILD luakit-9999.ebuild 1357 BLAKE2B e48c69dea22e2d934bb21a9f36a67172ed30377480ad7e9b449dc6db18564839eb3e4b46a371fe6924641e775d877ba5cfde925ac22843bde73979954d5d343d SHA512 3c9e8527fadd9eada1d2f0023e93cea79413ca02eece7f50dcd491f709fbde3df6a706011ad8f4c99eb331ba5789826eee9abf91ca97b649933105713056c4b8
 MISC metadata.xml 170 BLAKE2B eb526dd38c08c5ca150626a4bd6f4e58daeaffd25edcde9782dc8b584d0e302e0e795b9c8ccfa5f96da40ece9cbac094c3867fecf9758a2e530155c1db2dd715 SHA512 ed1f2cc86749299c1a5b0b5d82e82c86816c2f89d41b162b14cfecd7af82fb2ec2ae6a38190002587f5cfc13030b7598b1e49eb438e97bc38e8f4a71ce1e4e08
diff --git a/www-client/luakit/luakit-2017.08.10.ebuild b/www-client/luakit/luakit-2017.08.10.ebuild
index 58974d97427a..487247b7ce74 100644
--- a/www-client/luakit/luakit-2017.08.10.ebuild
+++ b/www-client/luakit/luakit-2017.08.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -56,12 +56,15 @@ src_compile() {
 
 src_test() {
 	emake \
+		LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
 		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
 		run-tests
 }
 
 src_install() {
 	emake \
+		LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
+		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
 		DESTDIR="${D}" \
 		PREFIX="${EPREFIX}/usr" \
 		DOCDIR="${ED}/usr/share/doc/${PF}" \
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index 136f8177f30a..263bf90d2547 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,9 +40,6 @@ DEPEND="${RDEPEND}
 src_compile() {
 	emake \
 		CC=$(tc-getCC) \
-		PREFIX="${EPREFIX}/usr" \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		XDGPREFIX="${EPREFIX}/etc/xdg" \
 		LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
 		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
 		all
@@ -60,8 +57,8 @@ src_install() {
 	emake \
 		DESTDIR="${D}" \
 		PREFIX="${EPREFIX}/usr" \
-		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		XDGPREFIX="${ED}/etc/xdg" \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		XDGPREFIX="${EPREFIX}/etc/xdg" \
 		install
 
 	rm "${ED}/usr/share/doc/${PF}/COPYING.GPLv3" || die
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 0fc3ab5f2e9a..98885bd32f84 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
-DIST opera-beta_60.0.3255.60_amd64.deb 67122988 BLAKE2B 8d3b4a21d2efc7eebd2b438c7e3b2e50b328d2fab46f278bf870919f21dd688d668e43d4df211b330d514697112ce2f5f2893c64f93b862b074934c22a22638d SHA512 58981dae71e25f3c172e65a09aed0aa24edfe34b1d724a8c708b1ea99b294894acd6059c75f59ada4d24cf77040695e35c953e11440579ea2964c509cae757e5
+DIST opera-beta_60.0.3255.103_amd64.deb 67440172 BLAKE2B 8c3304ae40cdb289297e836dacc16aafa49bfb47287da7dfaebf5e967a0905a478bc060ba5be6b2709c30f530724b73e10986d15b838c3c0bb4b0958cd3c6d72 SHA512 b42bb9988a194aa50e359228031b38f4a00aefbb30d3b90edf6f3253a891a4b01d1ab8b99152fe2bfc3e91ebc1f9d4a433c62ed55d80d528e30cdf6272324ddb
 DIST opera-beta_60.0.3255.79_amd64.deb 68344076 BLAKE2B f8617cd2840d2682c8ea8bdbf20c2cd2d579f17d62e9e005cc864d666317787b205cdb5f741398b9476dfd7ca078caac8f38feedd7ca4e00274396ebea86aa89 SHA512 e7de5f9cefa7c04afc34aef6f377cd90ccf87b6362e4ac94125245a845c3e9bf6d7d9d7a99dcd4187de7aa576fa6929c110de9a774fcea5da6dde13f488908dd
-EBUILD opera-beta-60.0.3255.60.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
+EBUILD opera-beta-60.0.3255.103.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
 EBUILD opera-beta-60.0.3255.79.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-60.0.3255.60.ebuild b/www-client/opera-beta/opera-beta-60.0.3255.103.ebuild
index d6081fb28694..d6081fb28694 100644
--- a/www-client/opera-beta/opera-beta-60.0.3255.60.ebuild
+++ b/www-client/opera-beta/opera-beta-60.0.3255.103.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 80c8412ed9b4..41d2b564ea04 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_62.0.3319.0_amd64.deb 66755102 BLAKE2B b51574dee9b05bdd687aeab5a7a3685013ef7f5119da753b982e383cc7d3e86b2b23fae6d201031858afd2893e5bd5f0f3c6b7ad5e4801ecbcca67213e0c7515 SHA512 14c6cd45dcaae839022e0da347faaacf0602a0444e3849503b017fe63b7f31e029dacb7d1418feede59601d173f97054979874bda144e69d119151b9f78c2158
 DIST opera-developer_62.0.3323.0_amd64.deb 66692130 BLAKE2B 72a00ef3eb167a257aedf8e0cdd7928f6306e57d81507a1ff864608d863370e172264b2ac54d68a6d86f1cf900179d10a2f8fb40446388585e5240d58041ddb0 SHA512 a9bc7d93117853c82a85839504da0a1ab59950a745e2193477885144cee460b98501b88576eecd7360ad17c6e10282345230c31ef2a5c203e53b2c5cef65ee06
-EBUILD opera-developer-62.0.3319.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
+DIST opera-developer_62.0.3331.2_amd64.deb 65860794 BLAKE2B 2ea22afe0057f3c15cb54d6aab858f3b2beb63fb127d3b46ab2dfa6cb1b83710ab8f8a4503bf06996a12e51dce2f5997ae996e76026f767f67df3d80e67aa5f6 SHA512 1e652fbc35b72b5f655bb8d235c49c721a958a43db04124c2285bbc5499d0e301453be2b071a85cdc98f672fc0ada0e3e5513ac96c726453cb2afb925d442a12
 EBUILD opera-developer-62.0.3323.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
+EBUILD opera-developer-62.0.3331.2.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-62.0.3319.0.ebuild b/www-client/opera-developer/opera-developer-62.0.3331.2.ebuild
index 132f88d22363..132f88d22363 100644
--- a/www-client/opera-developer/opera-developer-62.0.3319.0.ebuild
+++ b/www-client/opera-developer/opera-developer-62.0.3331.2.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 94b2371c30fd..9098be579407 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,11 @@ 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_60.0.3255.109_amd64.deb 66648238 BLAKE2B 7c35f4c5b93cccffe1a923b36570858a74c4c5045c42da505bc8fdd0646ab805d016bbdce6ab8202620a91ff3ce450e4cb89a6f643211969652d63c76b4f7d37 SHA512 80a0ed6dad6ee3be374d0f73412e3a1eb55912a95951cd5a0d7cd9f442ccee0d30d812e09944fe4a68bb73b068035c62478eb478c332427f5b013aefb96ba8e0
 DIST opera-stable_60.0.3255.83_amd64.deb 67302926 BLAKE2B ad45e40588c3b93f44f769b9db38693407c2dbfc1a61d1e284cd6cf93f93afcde6e12400f47a9b44f928cfc338b670e6e7d958bb39d33468f8d6c70dee94e58a SHA512 037ed829bef7561bec3ced495ca7b975a81ddd8fda87f93988b1f7c220e9fb1ea1f5e425a8e72aa6da0881df94a4b520bddf38a4ef6ae49bed6acb572c949219
 DIST opera-stable_60.0.3255.95_amd64.deb 67318050 BLAKE2B 7c35872268acb6380755f07b6a33a236d5bb920fe04e44a9ab686610e44da0dbf1246e8b36094ad3d3c16a1c9acecbeaa0c772277809530231ed0b048eca98ed SHA512 c58bc42527b5dd876f06c9d7393f03be2b5dc598d7e66159f24bdceef1ea4f6d3832ee48b5a793e39c44ad738d84e22e0083531f5dfcbc9ed1dd169fd9c06d9e
 EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
+EBUILD opera-60.0.3255.109.ebuild 2284 BLAKE2B b3e4b5f48d96003d2f724d35b2c0d998baf843543037b34c40d58e0ce5513d234bdf2daf9b3b9279b3668b9464ecd8517f83a94fc928fb25cc2ce40a1240a153 SHA512 065e87281f1ad7b4c0b3701a21e0e4db5f074ebd16f326a08c0c8f48b4b79d09b1d8261b5ad3ada94e8277cb304d6459279813eb0232b5b41f36ac64ca680aab
 EBUILD opera-60.0.3255.83-r1.ebuild 2283 BLAKE2B 8b99aa39e7bc0b4c206f3ac54ddc5d6495a62a2eac6ef33cd92a09fd91149d55ca5a8615d8300fe4288e92fb4afce1687ae1f1e7d571613ccacc879552bbfa6f SHA512 af90586375d9560be2b636707e531120fa5f7c29309431961b542a09d743ea91718f5a7e6276b7e26301efcdfe2f8925189620b2f4959e6f23fb2583c5555d78
 EBUILD opera-60.0.3255.95.ebuild 2284 BLAKE2B b3e4b5f48d96003d2f724d35b2c0d998baf843543037b34c40d58e0ce5513d234bdf2daf9b3b9279b3668b9464ecd8517f83a94fc928fb25cc2ce40a1240a153 SHA512 065e87281f1ad7b4c0b3701a21e0e4db5f074ebd16f326a08c0c8f48b4b79d09b1d8261b5ad3ada94e8277cb304d6459279813eb0232b5b41f36ac64ca680aab
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-60.0.3255.109.ebuild b/www-client/opera/opera-60.0.3255.109.ebuild
new file mode 100644
index 000000000000..fbf25ee7c636
--- /dev/null
+++ b/www-client/opera/opera-60.0.3255.109.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+
+"
+inherit chromium-2 multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
+"
+done
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+: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}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || 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() {
+	rm "${OPERA_HOME}"/${PN}_autoupdate || die
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 0c23cba052c0..4ed0ab6c0ef2 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
-DIST qutebrowser-1.6.0.tar.gz 3638739 BLAKE2B 8ca5995b9126fa7e017e3f2924c07c01b2d90540e0521d74cdba4ce8f2f83d1c7e8f0dc412ff41936c3a36c17d53060c331ed069d8088ac11b772979a48c7b0d SHA512 54b275f0d00ef48fa88a0bc83f31efd0d1fe708d7223adcf83c9d1a5db60de8e9c77033b8bf4b2b9a526d11ce39941d5d9da8afe9f49f3ed06e6f6f7ef124c20
 DIST qutebrowser-1.6.1.tar.gz 3657215 BLAKE2B da8f4e725a6547b45993bf59b1128aa475656afa4b543a0edc2233bbcb1067a3159f791fd90028008f68cbd7389ae33deeecc158408e27f57b2ae35ca334ea20 SHA512 ff8c50dd8524f6f8623f0d5ae205355a2b86f70eff1320c3b47dad9cb2a481c372d82f698497c0d2745291962999ff111fade14141a8390e337343fb01145998
-EBUILD qutebrowser-1.6.0.ebuild 2351 BLAKE2B fd82c398f2b73f5e2bf8de90b64246bff82d95fd99c7e3d64baffd96f993f8d8e396bdc4f4b83aa3af07092e36500f4656d49907d36b99e5300423b46a6d31c8 SHA512 f974bea576fd4cec11e32767156e0a7607eefbf059b2bea6940396ff5b992a30f1bd3dc09ae1fb8c93101a5185e72981b53a9c978da54b9991c266514d291859
+DIST qutebrowser-1.6.2.tar.gz 3581355 BLAKE2B 64c2c379ddc606aec26e87e328c8ea8ee9e67e74ea9f68109595e40f184ba21b576d9ad02de4fb127c63ec7c0c103fe989b74a67a05ef64bff6f3d238a70c481 SHA512 708fe9c5db54fdab0697e03ce26d901ee18da2a04d3934c0705f9cdff543e859892de2ac9aa9e3b0b12c4a3d6be7a492d34a868058e4a6b21f06d4343caff89a
 EBUILD qutebrowser-1.6.1-r1.ebuild 2522 BLAKE2B 0eef6585e93cccfb2c7afdc4528ece62578d12fd2eb731d8794b3f582592dee71242da36beeab4d62b89d4ee58807f05f3fcd0e7955aea8ca58d994b4c8801d0 SHA512 2755a791ed5633894ed76bd337dde0712cd7f24c9b7f53bf7935e9959c972f5340c56339149c90f71b1b07578fb25a5c3fe60308f208608600c1bf98c8debfa4
+EBUILD qutebrowser-1.6.2.ebuild 2522 BLAKE2B 0eef6585e93cccfb2c7afdc4528ece62578d12fd2eb731d8794b3f582592dee71242da36beeab4d62b89d4ee58807f05f3fcd0e7955aea8ca58d994b4c8801d0 SHA512 2755a791ed5633894ed76bd337dde0712cd7f24c9b7f53bf7935e9959c972f5340c56339149c90f71b1b07578fb25a5c3fe60308f208608600c1bf98c8debfa4
 EBUILD qutebrowser-9999.ebuild 2532 BLAKE2B cb3f420100e7071c43f859c210883f566aec699ce34d5e1183c958d50d1eb35ad9ab0e48431f73ec94ce0cc285d856bbb83f8022f5900e416f47d6301522e97b SHA512 0f4b818ca22ce1c01509469dbddb86c2d4bae94cb2d0fd82c5a470ba7eb28306f71604e2502057192e7c7d5146b3422819a2b0132d8f10c1dee9ffccf1fefba4
 MISC metadata.xml 589 BLAKE2B 40485aca150508671b8b7fd65567c25abb73617b1f9d0d981c6ec9579b563904fefe5828e819276bb2c6e2c19883574334ffce0be7b047ad182bf3cdcadb70ea SHA512 e042cd2ad99080de919fce9f26a09cd6b1dd779cf2d2c8c26f8b214845635efc90e96e41acc025875ad7f8473ef750638ce4bf2f1ac3eeca6f7f762a44062ec0
diff --git a/www-client/qutebrowser/qutebrowser-1.6.0.ebuild b/www-client/qutebrowser/qutebrowser-1.6.0.ebuild
deleted file mode 100644
index a464d065fdc3..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.6.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1 eutils gnome2-utils xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="scripts test"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP},libyaml]
-"
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	if [[ ${PV} == "9999" ]]; then
-		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
-	fi
-
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_test() {
-	py.test tests || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	if use scripts; then
-		# Install only those userscripts that have an explicit license header
-		exeinto /usr/share/qutebrowser/userscripts/
-		doexe misc/userscripts/dmenu_qutebrowser
-		doexe misc/userscripts/openfeeds
-		doexe misc/userscripts/qute-keepass
-		doexe misc/userscripts/qute-pass
-		doexe misc/userscripts/rss
-		doexe misc/userscripts/tor_identity
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	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/www-client/qutebrowser/qutebrowser-1.6.2.ebuild b/www-client/qutebrowser/qutebrowser-1.6.2.ebuild
new file mode 100644
index 000000000000..6cc99d532db9
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-1.6.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit distutils-r1 eutils gnome2-utils xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="scripts test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
+	|| (  (
+			>=dev-python/PyQt5-5.12[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
+		<dev-python/PyQt5-5.12[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets]
+	)
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP},libyaml]
+"
+
+# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
+# isn't complete and X11 is required in order to start up qutebrowser.
+RESTRICT="test"
+
+python_compile_all() {
+	if [[ ${PV} == "9999" ]]; then
+		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
+	fi
+
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_test() {
+	py.test tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/${PN}.1
+	domenu misc/${PN}.desktop
+	doicon -s scalable icons/${PN}.svg
+
+	if use scripts; then
+		# Install only those userscripts that have an explicit license header
+		exeinto /usr/share/qutebrowser/userscripts/
+		doexe misc/userscripts/dmenu_qutebrowser
+		doexe misc/userscripts/openfeeds
+		doexe misc/userscripts/qute-keepass
+		doexe misc/userscripts/qute-pass
+		doexe misc/userscripts/rss
+		doexe misc/userscripts/tor_identity
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "PDF display support" www-plugins/pdfjs
+	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/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index f41ca8c94719..3a137151b2cc 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,16 @@
-DIST vivaldi-snapshot-2.5.1525.37_p1-amd64.deb 60914584 BLAKE2B 9a13eddbd4ca78fabbe4ad485d642a31c01156e29691e83b7b58f683cafaccc4cb4b1fccd24286a552a6480420f66f0b1fd8aec27651f52b7a2cfcd6f1748152 SHA512 54501d8a3e08d7aa9e5e61d6a336505340ff5f546afd57723cab1904fc06de725ba737febc06b7e15c0bd97600cebb1f8f9ddf1a297aedd7522767740138d280
-DIST vivaldi-snapshot-2.5.1525.37_p1-arm64.deb 54980860 BLAKE2B 39844d4f08c10b8cbae60c95428e081d370ad45c6554b55bc9fe37798d596152540bff20788b11476778ba92c95a8c583d31fd0a5dec70b1e0c691fc38901d1e SHA512 505a9744c8a21e8f8e2e0e71bd8e4b6b6952e59ab46222468f0317308941be0f91f539f7bfc3b76dc8cab35681d7be7ee5b33f597681ee32ec901be4e99abc71
-DIST vivaldi-snapshot-2.5.1525.37_p1-armhf.deb 54086564 BLAKE2B aa11f982c37dc18b08f878b1835c6d4a09a67488363e7ac3bc2af37d49c6a7ae7396bd97ba34b41d685320b69feaebb69e75c89a640c456c1114caaf90c3e1ce SHA512 d28bee631cef6875a90d23d41698f42ed9a98a2e435afcfdf19a819af0a7a7e2d49bc6ff633ec66aea9a20aacf41caa8c63d8611579ef1a81c876f55b34bd517
-DIST vivaldi-snapshot-2.5.1525.37_p1-i386.deb 59765892 BLAKE2B 38d636d8c1bd1d329d83fcd97b9661875a9d250007a51f97622ed807bfc4c6f6da02f03385a7413715f655c40ab410e0562c4cfc25dff3a0baccf4db8e33a91b SHA512 3fb9c3a88b2a62e531a255003b18848187b563aec7b1222fd6450767f15608a5499f9ca055fdca0bbe25b71c1946d85d235cd575724a4ffde7c386e44f6d8818
 DIST vivaldi-snapshot-2.6.1546.4_p1-amd64.deb 61549320 BLAKE2B 86fe32ccc8c1522ead2ed2576acdd2cad7c4da42beef8b4f8080119d7a70377df76bafe4fff638d25984fea29e79365996901da8dcde3fcb84a71d6a54621f11 SHA512 d6ad263464a22f75eada9a12eed53e40c43a838e15abc53e1a0dc858428d7c09b68466b5afebbce487349b8284815134d884f000e6a226de9ed367d51bfb761e
 DIST vivaldi-snapshot-2.6.1546.4_p1-arm64.deb 55586020 BLAKE2B 95e77604e482d20054e22f5f6f690d4a63dc657e685095ebc084a77aa908067d715c9ddfb917a5b90e5ff38ecde7b31f24aebb8b114c1a997f0ebcc5eb4d0a66 SHA512 180d15981177c9510061a2116471a19abffd8cd2f6e1d7234bd4d5eb169d6e219d851fd90dc868de38b55983cda1c23a33c01c59b124ec2f37b89b423abc8dcf
 DIST vivaldi-snapshot-2.6.1546.4_p1-armhf.deb 54702208 BLAKE2B ba43bc7587ab7895145955a826ef1e4a8af7b501f5fa617420be46867b1037bf375b07c0ad44cd07eff36a98c99c14b83bf651685f6921508b1998f26a4c3b31 SHA512 8a29e9b921d8bffb2d6c9895e9f7c7f41cdfb2b628a3fba9c0f172eef9b7cba5190dfbce58ac6a7478a0a2fb0755c52d773f4bdbb6dd81e992632154def01cf8
 DIST vivaldi-snapshot-2.6.1546.4_p1-i386.deb 60962732 BLAKE2B 701c11120310f936ca76515b8305a16f606f58f0e477e8b6f2dc3bc2bbf70a9803a33705c175c9ecd37a5305ee3e0cd97b2877cf653ed800a1e0e40a837b9126 SHA512 24bcf2f5c507ae66ef40c4ea4138645db731c7bfc1717b6d616ceffd7237ca2f13922b63b0a031fa90906226e9b714be457c4951ba595efa120edbce5a86ee6c
-EBUILD vivaldi-snapshot-2.5.1525.37_p1.ebuild 2608 BLAKE2B 208c6c0ed454d136ff437ac0f62349e4a6b5865fc760f45742d278b12114662383f9a809ad0da460b61f6b376fe507c21b153ab4517d17fc204a513f7d6351d7 SHA512 15ba32e895442b09bc37f0c37ee936085692a25497e71250c673d4c2977c331df842ff1035d9f1f6e4438bd20630a3e12d59de9b52540bd90179758e278d5a02
+DIST vivaldi-snapshot-2.6.1554.13_p1-amd64.deb 61743740 BLAKE2B 4b2b43acb80da72af47f210d1fb5e0f0b2c1ff44edf9d26b2ed4f0d412992dad04abababf982af4a85dd8a8931cd15502d1a17683a40c3f886ccdcee00fcaea2 SHA512 8a7a3d2fb7513bb3d06f666f89eed27d3f8db08bd29dbc53194208b8cd25f3319185d5acd25a69c3eae652fc837731ccd0c4bdc8c201211de81519e5678e7ece
+DIST vivaldi-snapshot-2.6.1554.13_p1-arm64.deb 55822200 BLAKE2B 292b9e08eadbfd869c8e154bf7c82eb0fbaca43dad3b20ad3c09d4609a1f3890c4b8289267a302cf62e50df0bec8e7cc0f7eb3c636df5c84dc050080a845980d SHA512 f9b680caf36755d0f6d5af4731af5e7a9516706e11c109e69d2ee288a2741cb3da5f9f228cba82f59673d3527e091e80cc1b22dfcb1dfb8cf0c3d037ed460020
+DIST vivaldi-snapshot-2.6.1554.13_p1-armhf.deb 54950556 BLAKE2B b888453e1e6b37fee26c464670dc6369538c1e79f242b10198df0071fcbd67752262542edb10797d1dce9d7ad6305d101af136ae7774fae0e5d3e6c361699577 SHA512 643beaeba2370642f936dca31dd5e87ee59a46734256c9aa14f0e059d831f7c6f9c6e25e495ddc6d026a857a360339b62211b6d1a2b0f030379dc19cbfe4c398
+DIST vivaldi-snapshot-2.6.1554.13_p1-i386.deb 61064144 BLAKE2B 2669b50c1c685b8b0a3636ea79a8f3166c7fd9ec1b7b2b36c2e6c99bbba950c0e9c22727961c3cd99364a1f96e8675d50c4d7f5c63c14be954f56daac5ebacab SHA512 f6b7d5c7206eebba1a37592a138580fdd3d58f0ba15cbf700a1540e55db46de61fac4b6786b8b8dc4db4fca9061d9b022eaabd3e311ab45bb8389fc29075bcd6
+DIST vivaldi-snapshot-2.6.1560.4_p1-amd64.deb 62534328 BLAKE2B 6e83acb739560e677fa08d94df11770930d18a862364edd4a373c1a50bc0c1005d0f6957d7fbadec68a503b7a71f13e1f70e1f36bf6598599fe506e8b9ff5689 SHA512 973777848daa18009da8faeba9efef44006f3e93c4fd14edcdbf40e423b617f89adb4768e7a2a307a5564b6b3b498cd8c29f18f8191994472295d58308a98be2
+DIST vivaldi-snapshot-2.6.1560.4_p1-arm64.deb 56424484 BLAKE2B df08f39c5e374debbc2d08f9d375e2f422e3f35e1e6e9146a54fb502e980d505d54d6d1704b9e7b3262c5b283b41d5b1f0119092d19a6578109ce680ef884b79 SHA512 4ff497a5c0616b6513752438434f9698d081927b269e3aa260c19aeeb480915917aa69f846065fd62d7deec99d3816c35a3d608ca9bb7ac451649fcaa5b74eba
+DIST vivaldi-snapshot-2.6.1560.4_p1-armhf.deb 55575064 BLAKE2B c8a69e3f9153ce414ac0dae778f60df9a121fb1f23a1af1982dd1a25728e6f7acd0984aa50d5bc02a55f6fb312e8d35f342c4b23797eaf3aad76a47fb17a2d18 SHA512 2898c44255e0619bb1c1e74fff2a4c82a936c656c342c25279b08b609f758f460be98401b4e63a05f6d2bd8646948c27e713ce4a2b75f4b8018511f23f23039d
+DIST vivaldi-snapshot-2.6.1560.4_p1-i386.deb 60990056 BLAKE2B a2ae9a4c97295aea74e6417f0cae0c00d8c12dba7e08e6bec39de9542c921ccfae8a33491e27e8de3c67c26ae7da6b0eb201813a2d68eacc41821f9d6e8910c4 SHA512 3196998e329ab24b0e631d2b3b63270dd229e013ce3b2d7baa985149514af09d0cadfe9fd6c41cb770afc816ba61b3b0446549f8c9c9c4ee4c31e38c6dde50d7
 EBUILD vivaldi-snapshot-2.6.1546.4_p1.ebuild 2608 BLAKE2B 208c6c0ed454d136ff437ac0f62349e4a6b5865fc760f45742d278b12114662383f9a809ad0da460b61f6b376fe507c21b153ab4517d17fc204a513f7d6351d7 SHA512 15ba32e895442b09bc37f0c37ee936085692a25497e71250c673d4c2977c331df842ff1035d9f1f6e4438bd20630a3e12d59de9b52540bd90179758e278d5a02
+EBUILD vivaldi-snapshot-2.6.1554.13_p1.ebuild 2608 BLAKE2B 208c6c0ed454d136ff437ac0f62349e4a6b5865fc760f45742d278b12114662383f9a809ad0da460b61f6b376fe507c21b153ab4517d17fc204a513f7d6351d7 SHA512 15ba32e895442b09bc37f0c37ee936085692a25497e71250c673d4c2977c331df842ff1035d9f1f6e4438bd20630a3e12d59de9b52540bd90179758e278d5a02
+EBUILD vivaldi-snapshot-2.6.1560.4_p1.ebuild 2608 BLAKE2B 208c6c0ed454d136ff437ac0f62349e4a6b5865fc760f45742d278b12114662383f9a809ad0da460b61f6b376fe507c21b153ab4517d17fc204a513f7d6351d7 SHA512 15ba32e895442b09bc37f0c37ee936085692a25497e71250c673d4c2977c331df842ff1035d9f1f6e4438bd20630a3e12d59de9b52540bd90179758e278d5a02
 MISC metadata.xml 430 BLAKE2B af595cb3b0a225eed0de6c4232aa705a054baa51585d3970d025a26dc3680e5cdf7ee98169a0906afca266862ad331ffb55a8cf2a39bc640a75beefd5de0814e SHA512 cf63c9ce3cea52a8a014ea6bbefdc4d64204cbeb86334eecaf3a669a90d044cfa90eab057bc39da9b0dd8fd4e0bf814269f0113aa1a96f42cfea4063b4918145
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.5.1525.37_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.6.1554.13_p1.ebuild
index 76ff637ebaa0..76ff637ebaa0 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.5.1525.37_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.6.1554.13_p1.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.6.1560.4_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.6.1560.4_p1.ebuild
new file mode 100644
index 000000000000..76ff637ebaa0
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.6.1560.4_p1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
+	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
+	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.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 ~arm64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	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+: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/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
+
+	gunzip usr/share/doc/${PF}/changelog.gz || 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
+
+	eapply_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 2b3a2fad9369..974f624a350c 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,13 @@
-DIST vivaldi-2.5.1525.41_p1-amd64.deb 59511176 BLAKE2B 855011dede4287aaccaef01a983e5820c39bb7ae6d680813b4b8893528d678af488ca1e2ff642061f5cbbc896ebee4bf23f629d3ce1e196779d60023d0a2dab0 SHA512 ef53264bd01bf593883664b94fb821d3fd84a91a6c96ed26f03160c0d0f05b113c4767b95153d972e77e26fff61cb21023fe999959bd0923db5308b9bdfba529
-DIST vivaldi-2.5.1525.41_p1-armhf.deb 52878692 BLAKE2B ba76c656d4d67248e69a64cf328642a20a7c1a1428443272f5f04850e8a40f84baea6130a86e6789a7f93dc393d1c3c5456d2a26f27b491713998d086ce39d6b SHA512 37209067701f30d0718e320604987931f08beacdde96b33c2cd3cf487daef8f7f44a64bba1c3fa0578023a21510b61b83f061905bf4ad9e299b834d4bcfa0b29
-DIST vivaldi-2.5.1525.41_p1-i386.deb 58063596 BLAKE2B cfe3cf02bd910682d59f655f8e37e0b87390d445cfd7538442628b3e95bdf108e4a3eba0d1df0ff73b542ae1d67bf1c01409aa27f0bbdf855a76cab352c3fc23 SHA512 ad46c050e4642fc7ac040e0ae7179415133d3876f007f8a917e38f37e7b05d2b55febd712f5b51b777bd7ea672aa919f3f2e8a657e8fddf870dc6445170f8628
 DIST vivaldi-2.5.1525.43_p1-amd64.deb 59473456 BLAKE2B 6ab57eeb08c5b939ffb99195955369e1240508d82459986d6a5fda30adb612c7fe229cf8a645348eef56980ba59dfa088092d885435397d572b16eda6570490d SHA512 e5698efbd28b50cec53c1224633a2ad4790fb54fb162b0fb8fd72ddba5bd557109df0d36475ce151cf2a320993f027ff114bf0b37d914dc5453e330910b61b9c
 DIST vivaldi-2.5.1525.43_p1-armhf.deb 52876336 BLAKE2B ca8ba37a0cd12cdc30e9bcebb399ea3e19c5cf2720a3e5826a3463f26a9b5487513a30a60741fca09687102b4d754c29af1679bfa5c8b217081656914e1dd447 SHA512 ae6824f15ee7496e676270a1f5d2ee77944f8d59a056c045a4b1e2676e9d68d8e63010b2e80d1ff647207c6b00beb355cb83db7df4f56f8b8e78b5a6cb81e087
 DIST vivaldi-2.5.1525.43_p1-i386.deb 58058192 BLAKE2B e2c5132a98d18a40d6e660567603b1ce8fe896534999b8918e25be2c6a32f74e390cd9048df1ff984e53f50327c47c85ba09580ec47b0151911fb2b99d2b36ef SHA512 319effeca70f10850130cdeb3eba0121f38069aeafcd8b3f2a253f90eda5381bf64f2118098704aef8cc44262cbb282295cbb0faafcd6d762a405467f269f783
-EBUILD vivaldi-2.5.1525.41_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
+DIST vivaldi-2.5.1525.46_p1-amd64.deb 59499752 BLAKE2B 26aefb61f2798846932a2792cb9eb41368d66b053dce5f33d1fe27ca54f371a83fb65778e5c39296e0ecbb45bbac4f9a92078ade91ae5f8fc17ae13fd64facb3 SHA512 00bfdec91c5d48d998bf3826355e22b2fe885687772439cb26a05decb2adaf78e82ae943bbeeedb7c095a4120a9d65e75dbf91e8a570dd32c159ad86bb089c5d
+DIST vivaldi-2.5.1525.46_p1-armhf.deb 52882364 BLAKE2B b00660eba4732c6dc6f4d7eecd1e9c5bacaab6eb7c0542f50e21174a28e195f6e9e0ae21c71ed6dd93493ff8ca8d6efea2cb71ef905034655d65f679014fe667 SHA512 9ea77276100c9f91cf92eda35e70edc12c583566d25b9825247955c73ed7563b282cf9414b5c0881e715f35c01cdbcc646eb27d2425802cd550cff83f3a14f13
+DIST vivaldi-2.5.1525.46_p1-i386.deb 58061568 BLAKE2B 318edfa183279179e7ade459a0155044307c876691dc0848ccee5bbf0599eff851607f4d943d391d62ec1a478b7ae4cd499ffc96d220ac5cf89639fe66d114b2 SHA512 46baf7ebbccd5be5a727b5ff5e7023a66a7e5185a097ed236a288b180e4b6f4347572ffe6464325569dea3815a5fc34a4c6abd7c9d8c2f8370d7f0133f436a2d
+DIST vivaldi-2.5.1525.48_p1-amd64.deb 59499592 BLAKE2B 09f33e250dcbcead693760484a2444376ef52b705b729da84870a42d45cab6fb4e762900462714c51b037ae5d23bbff51c1744cfb6987a97b1a7c29bf240d69b SHA512 ddcbe9c3d9f26cf6679cfdb6341b0fa991e1dba46b44ca8baf9bbcc7ea739e61eb61d2eac056ca98266e607b815f45cae7969bb39f3687bbc1fa219d9ba927bb
+DIST vivaldi-2.5.1525.48_p1-armhf.deb 52885016 BLAKE2B 870b3dda45a8fb5f5ddc3a2543e7c1efc4979f4d193a1d5228cecf4fb270b8264042f7845081c6aa19f9f8ca557574b394180194895caea4718da418b57a7266 SHA512 a887cc0442d81c9e56d2e3e79b4e824348d7186bb09eda9512e75a4b6568fc6cc7cfbc815f72e1e9a0ef6091c99f99e69d9c5b9f8422cf91e1e462642f1ee92a
+DIST vivaldi-2.5.1525.48_p1-i386.deb 58071364 BLAKE2B 00a4fdfefea9f85a5a0e406a5f741310509659f73137df83c89fa4dd3fe6ea8e5cae7f6003f99179e13b2154a86ed50530413686989bdc2b62556b6dc8a79625 SHA512 d4567413c7ef15bb33bf11a462a62d6a45c0f952b945ff5b476f8aa8c85bf48c9ea4e3dc0f099cba02c1aa6dcf16bef2e2b224dd922f4507247dd5cb09433257
 EBUILD vivaldi-2.5.1525.43_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
+EBUILD vivaldi-2.5.1525.46_p1.ebuild 2900 BLAKE2B 7adba11b98e251040fbab8239a89e82d65beb1f157be0de612f11e6b0b0866c42c3718198e59d3db5d46473c727a64505e7b8c20f648831d0c6bcf9ad69545af SHA512 947799d605ac25bf48c59453ff92414db1f0202169892b727161647eedc9a50ca30aa325df5417eb289370feb53ef46f1d7d90af95116e9be8eb9c659b06c19a
+EBUILD vivaldi-2.5.1525.48_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
 MISC metadata.xml 430 BLAKE2B af595cb3b0a225eed0de6c4232aa705a054baa51585d3970d025a26dc3680e5cdf7ee98169a0906afca266862ad331ffb55a8cf2a39bc640a75beefd5de0814e SHA512 cf63c9ce3cea52a8a014ea6bbefdc4d64204cbeb86334eecaf3a669a90d044cfa90eab057bc39da9b0dd8fd4e0bf814269f0113aa1a96f42cfea4063b4918145
diff --git a/www-client/vivaldi/vivaldi-2.5.1525.46_p1.ebuild b/www-client/vivaldi/vivaldi-2.5.1525.46_p1.ebuild
new file mode 100644
index 000000000000..69ed6a41d087
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-2.5.1525.46_p1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
+	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
+	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 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 browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.${PN}.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/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	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+: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/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
+
+	gunzip usr/share/doc/${PF}/changelog.gz || 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/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/vivaldi/vivaldi-2.5.1525.41_p1.ebuild b/www-client/vivaldi/vivaldi-2.5.1525.48_p1.ebuild
index 479dfcff4842..479dfcff4842 100644
--- a/www-client/vivaldi/vivaldi-2.5.1525.41_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-2.5.1525.48_p1.ebuild
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index b01c225ec647..2bf9387110b4 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index b2e7a0b17b50..9d80cbff43f8 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -7,4 +7,4 @@ EBUILD monitorix-3.10.0-r1.ebuild 2829 BLAKE2B 35b2cab57552086a6afc6e4709895be97
 EBUILD monitorix-3.10.1.ebuild 2758 BLAKE2B da5f92b0af54a146ad093fb2674b0aa332300835949d0a95bdbe6ae7eb9cbe4acdef5d7e316c4cbe2dcd49feaf3c22c25968a93ecca548d224031359d3717b9f SHA512 3a86040d73c2fa23ffaf2f5d43bb10a97b4cd1476bb6cac091e99814915adcb002e9bb7dec56a4cb09bf3500b08d1cb9f608c4ec5384f3406b5ba9e489ede6cd
 EBUILD monitorix-3.11.0.ebuild 2853 BLAKE2B 2f68d7a79ce9ef90aef5dbecfd6ef966b49a8ccc4115b5e005658b1632ed38537e9fecdd310fb0ed9808b330f2fd101a1cdb6d8fc2d59442ea105b85db6fece2 SHA512 0b5829d46b0b13d071649a2270b4bdb41ba3f9bddbdafac6a092fe89dd55ddf80c052d44073bd984e4881135af38500390ee9e91c48d1a7645c033d0c32b3a9a
 EBUILD monitorix-3.9.0.ebuild 2653 BLAKE2B 1231d79709465b94d2208a8497c993e1fa365b58433241d05dc0103b68bdf1385c41e5e37420663f4828390387e7b4fe0322c04407e273083f79226141bb1b65 SHA512 57f7b6aa48943f9f17c9f060dcc29dc505ad57b42378bfa108a9a8a44da6188049f9dd79d98f2e3adff12ec5f84dc16638d8511a6432a68c10e7d64df8290735
-MISC metadata.xml 860 BLAKE2B b5d8f4fcdb15dde12eac4eaa3aefe7b9ef83db36cfdab10cdde772b954ff52163b8d29c807feda524d862a0e244d52cd7d864fe8b992ba0b0ed5c35ca7fe184a SHA512 558f8c284a4045bbee9bdd149a85edc7d02e80f4de4e7f4610c1421d103bebc534e7e2bbf28421e20e7bc7b708b15ca3fd5b159cae6fbadff00b1b74dc00ebf2
+MISC metadata.xml 857 BLAKE2B 952d7eaa095fed062ac2662bf4750ecf002e0015642cc928e56964774aa354b445576aa9d04f8d9368c3454e2f41fa8746df9edcdc84ee2d53d5ee66e0af5c08 SHA512 c44c6e3357b95f174bd886a9373b7259d182a254af2d4ad3495c3d081279f76d5e682db8ae1d28f768d493bd2d85965303f9561b602abcb42248c264342c63b3
diff --git a/www-misc/monitorix/metadata.xml b/www-misc/monitorix/metadata.xml
index 94eca3b782b2..08fea21bf0d9 100644
--- a/www-misc/monitorix/metadata.xml
+++ b/www-misc/monitorix/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dwosky@zoho.com</email>
+		<email>dwosky@pm.me</email>
 		<name>Pedro Arizmendi</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 307a96599a37..0d76ce903459 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 2fd5856fdab6..f822e87bde51 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_75.0.3770.27-1_amd64.deb 60278798 BLAKE2B 47008bfc968366e26446c28c70996cbeceea6e40869439be70d38275bec8cb0b4d1f93ebf792596367990516b10435953f482de7620d9535dbede86d3d9685c0 SHA512 8b471ab4a04b119707fa149420cbc6686e919c74ee56b7d8f8e6a016bcf208cd0f16eb31e5a30fc57a8468531fd8a79c98407df0d57346c9da5e19c0fabc6fb1
-DIST google-chrome-stable_74.0.3729.131-1_amd64.deb 58535144 BLAKE2B 9f91cc5865410c9c2d856028940a941e3616eee39a6b8867ff37f53d4e97d19c859aed5ab0841852f7f0a7d95bb3406f67674ffdc4de3a50b185262c26d0d4d6 SHA512 807a4d66b6ef495aacc36630c0a3a7f17f62420f0ed0bf5e248e431edf08b57473b02a9e2ab99a270e245aeb8a94246e8e5fbc74b4cb904e9eff66e8dcf17804
-DIST google-chrome-unstable_76.0.3783.0-1_amd64.deb 60136128 BLAKE2B 373ea84da49872eb172bdbf4e9c49657c5a7573113916f0e85b48fd7070967729d74369b19a4ea48f93469ccd99012bcd4856a82050f35b1bf10f177b0b02718 SHA512 835cf2057bcb7b9a6ea551755d52a86dfd2fc16f3309b4d92df670c9188d79968abd86677bf9fd5a50a1d467f49b69e8aa6eea62c5779a663a8bc657aa301965
-EBUILD chrome-binary-plugins-74.0.3729.131.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
-EBUILD chrome-binary-plugins-75.0.3770.27_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
-EBUILD chrome-binary-plugins-76.0.3783.0_alpha.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
+DIST google-chrome-beta_75.0.3770.66-1_amd64.deb 60416518 BLAKE2B 151a392fb94111c73019c264691a1e206bee8472027fbf857afa043189051086cecfd8c779ae5eee61502857c3d965c8614f82669c34bc35366b2f6aeda4bbc1 SHA512 b206e271b90336891b3a816b63c21a93ea0b64aa725ac754b0629ecd97190b45a67d64008f8f38eae3b2dd55a446d7d719e179d74ccfed25f2062f8fe25691e8
+DIST google-chrome-stable_74.0.3729.169-1_amd64.deb 58236722 BLAKE2B 99be6e82f3782a50f6786550b67da5dbba01e3cccb9a2f2d7d40de8fb2e76fbf2e7d6ad3b48b63ff56f02fcfdd33d10fae755778409dd9d6c90e8a9ca2c3fa8f SHA512 98bb65afdc44e4b40a3d073cf7c7796eabb4dc8c8cfb02b59d573145a96f06f49a1789b6b706e29d9e9031d70a05fb7c0a1829c90a0ff1e102b280133ea95546
+DIST google-chrome-unstable_76.0.3806.1-1_amd64.deb 60963730 BLAKE2B 79030811b458c985d27ced8526ab53c4a43c93bf45cdfdd0bb5f10a726c4ea82aa3574cece82f17960e623f6de66ec0b3bb8d7a725d3ee8164ae53c9c2c3a582 SHA512 36050216e22c45420819dc4ac2bb8442eb15c006127e7ae358485925cb1aec7b085cbc60f9336dbeefcf0247b5e0496b4fa921ace5de1ba89bf1b092c0620696
+EBUILD chrome-binary-plugins-74.0.3729.169.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
+EBUILD chrome-binary-plugins-75.0.3770.66_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
+EBUILD chrome-binary-plugins-76.0.3806.1_alpha.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-74.0.3729.131.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-74.0.3729.169.ebuild
index c60abbfa5a56..c60abbfa5a56 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-74.0.3729.131.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-74.0.3729.169.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-75.0.3770.27_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-75.0.3770.66_beta.ebuild
index 3fd84e77d226..3fd84e77d226 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-75.0.3770.27_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-75.0.3770.66_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3783.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3806.1_alpha.ebuild
index 3fd84e77d226..3fd84e77d226 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3783.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3806.1_alpha.ebuild
diff --git a/www-plugins/passff-host/Manifest b/www-plugins/passff-host/Manifest
index 9c50827f9df8..3ce4b3c41cfe 100644
--- a/www-plugins/passff-host/Manifest
+++ b/www-plugins/passff-host/Manifest
@@ -1,4 +1,4 @@
-DIST passff-host-1.1.0.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
-DIST passff-host-1.1.0.py 3405 BLAKE2B 6a73c070bc12c1a408ba3d8f1c76f81f1a73e878096d68b7b682b879fe4b51fd45bb24baa9e901bdabf77975ad24713e6846bf713c3e6a42ef8cbe617ef3a927 SHA512 7a275df3fb11f7a3823a7d9fbb41b2b83fb66f893570b95c89d2dfae3669ac12d30d13086c250882241978e555a064021ff26d3837d6e2704b20f3b12b3fd4af
-EBUILD passff-host-1.1.0.ebuild 1350 BLAKE2B 1168d9393644eb61a06fcb212044e840c21cdd22b0547f9826c474e68015c2326b01b1c28b94950b8dac8326c3d9edae8fad896e7456088c9338be7731163abd SHA512 95980b7839b789f70e8cc0ede0e9c63829adcd4570319a5912433ff0cd8955cfffae6055d2e4784baac1f1988c267169993393cdbd44c7cbe70ce1e2ba56acf2
+DIST passff-host-1.2.0.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
+DIST passff-host-1.2.0.py 3658 BLAKE2B 2b8fbd2c0e11cdc12804d4430b1028a45a7ff5abb1446d4c85d98b4b45b7cc78c86c0a801952f8810b8061abcbe1109d858d125717bc80f8194f510b39828c36 SHA512 8e3a61562b511895b07d6fe4edb6326d7cb6c14a8032dbcc4927b9a1c25a1a103042cd7dbbb6e417019fea768f30e32ff60fc4483b165968ec920fbfd40971b0
+EBUILD passff-host-1.2.0.ebuild 1360 BLAKE2B a2b718dad458161e7c0a51a6146606581556ad2c5cecb04a32af1323d70edc684bf695077f20e703109859d290f1a52e1c471caa9b7b14a807a8710f2d1cf3c8 SHA512 7617733f1d11455d37935428cdb7f0e74b81560ddbacbe20a5720d2b231f40afc167e738e522c05223ef17599641fc63640979302b03bf8563a2b522ac831ce8
 MISC metadata.xml 675 BLAKE2B 1db912c207b9b70e56ac1256af5d600ba8f3aa97ce22d2de3c56e752442a757c2cb32dd871c62cd96bca2f2c4016f8efd6853eb2c173b7123012ad26a9f32b6b SHA512 6da18aa19b6c64a80e7197e9a2cd22fc2f72c178890ac413237422b73df5360754cbe00da559c121f4482c53b2b6aa6decd6cbbcf7ff3f868d2b6cf314d964df
diff --git a/www-plugins/passff-host/passff-host-1.1.0.ebuild b/www-plugins/passff-host/passff-host-1.1.0.ebuild
deleted file mode 100644
index aba30e810e6e..000000000000
--- a/www-plugins/passff-host/passff-host-1.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Host app for the PassFF WebExtension"
-HOMEPAGE="https://github.com/passff/passff-host"
-
-SRC_URI="
-	https://github.com/passff/passff-host/releases/download/${PV}/passff.py -> ${P}.py
-	https://github.com/passff/passff-host/releases/download/${PV}/passff.json -> ${P}.json
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="chrome chromium firefox vivaldi"
-REQUIRED_USE="|| ( chrome chromium firefox vivaldi )"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${P}.json" . || die
-	cp "${DISTDIR}/${P}.py" . || die
-}
-
-src_prepare() {
-	default
-	python_fix_shebang "${P}.py"
-}
-
-src_install() {
-	local target_dirs=()
-
-	use chrome   && target_dirs+=( "/etc/opt/chrome/native-messaging-hosts" )
-	use chromium && target_dirs+=( "/etc/chromium/native-messaging-hosts" )
-	use firefox  && target_dirs+=( "/usr/lib/mozilla/native-messaging-hosts" )
-	use vivaldi  && target_dirs+=( "/etc/vivaldi/native-messaging-hosts" )
-
-	for target_dir in "${target_dirs[@]}"; do
-		sed "s;PLACEHOLDER;${target_dir}/passff.py;g" "${P}.json" > "passff.json" || die
-
-		insinto "${target_dir}"
-		doins passff.json
-		exeinto "${target_dir}"
-		newexe "${P}.py" passff.py
-	done
-}
diff --git a/www-plugins/passff-host/passff-host-1.2.0.ebuild b/www-plugins/passff-host/passff-host-1.2.0.ebuild
new file mode 100644
index 000000000000..f42fb96ba19b
--- /dev/null
+++ b/www-plugins/passff-host/passff-host-1.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Host app for the PassFF WebExtension"
+HOMEPAGE="https://github.com/passff/passff-host"
+
+SRC_URI="
+	https://github.com/passff/passff-host/releases/download/${PV}/passff.py -> ${P}.py
+	https://github.com/passff/passff-host/releases/download/${PV}/passff.json -> ${P}.json
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="chrome chromium firefox vivaldi"
+REQUIRED_USE="|| ( chrome chromium firefox vivaldi )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${P}.json" . || die
+	cp "${DISTDIR}/${P}.py" . || die
+}
+
+src_prepare() {
+	default
+	python_fix_shebang "${P}.py"
+}
+
+src_install() {
+	local target_dirs=()
+
+	use chrome   && target_dirs+=( "/etc/opt/chrome/native-messaging-hosts" )
+	use chromium && target_dirs+=( "/etc/chromium/native-messaging-hosts" )
+	use firefox  && target_dirs+=( "/usr/$(get_libdir)/mozilla/native-messaging-hosts" )
+	use vivaldi  && target_dirs+=( "/etc/vivaldi/native-messaging-hosts" )
+
+	for target_dir in "${target_dirs[@]}"; do
+		sed "s;PLACEHOLDER;${target_dir}/passff.py;g" "${P}.json" > "passff.json" || die
+
+		insinto "${target_dir}"
+		doins passff.json
+		exeinto "${target_dir}"
+		newexe "${P}.py" passff.py
+	done
+}
diff --git a/www-plugins/passff/Manifest b/www-plugins/passff/Manifest
index 8fe444cfc582..1f86f946d64c 100644
--- a/www-plugins/passff/Manifest
+++ b/www-plugins/passff/Manifest
@@ -1,3 +1,3 @@
-DIST passff-1.6.3-fx.xpi 66124 BLAKE2B 9638567e141f0bc68d754325df2bc97a45f918778bddf536ccf9b5701a7e805f0081f8cd1c4193cd750c079b7e00880872cecb71324fd7267fe39638f4c46a9a SHA512 83dffe2b2f1284d90c6e37b5e794e45cc8e2e59f782ee0cce37da4bf16a6349f645e5fb59516bf5a10ef6a9e77a775cd81e4e775fb45b8a8454c9db4c0b781b5
-EBUILD passff-1.6.3.ebuild 890 BLAKE2B 6c1ce853b9d044dc641ce3467f5244fe10004253d1aa1b04bca7c637d50e0e7ddf3b0ea5a895854038074e4c87764199b1619db751a5c75fca024db0bc4b10c5 SHA512 b577c4b1c1ba6bf56ecd3338d32604d4763ba789198719389b4746095c9cfc966b62c5e14c774f0955ffbf9a57d05fb1c16acd74bd8f1bdbb82ae4c7a85742cf
+DIST passff-1.8-fx.xpi 72678 BLAKE2B d5ec67fff396d62960fbf813ab9d8f6086028a282bab78aa4dc6e63132e723ce4b1bb6d05015d3934fabbd37460d04f7626043b97fd29c5c72486754ef14e111 SHA512 5500e7439d5eda3481eaa405abaef5b846f4f29b5fee4dffc49084b2ce658f9e13e4ced747a28d368892034921a556e3a989c1f8682365cdab787e41913c8250
+EBUILD passff-1.8.ebuild 890 BLAKE2B 780fb6a985766475a2f4033dffa6a8f99ce4e1668643e8924bc2e617c9fb65a8784655dfb3ad9719d474b784cabf0f1d6ab19faacd52280ccce7660c75ef4edf SHA512 5c11816eb3a1041deb6d4816f2bb82a025b5ea16e2bc6a90db0177449ce82cc6fae26fcbf8188b3cffffdf5fea859bcd28689cd40a1f27ee8b2dd225e68d9f60
 MISC metadata.xml 405 BLAKE2B 67f6bbac11d8079427eaf30bbdb41ceeb738d31b437a9bc4253e912edd4ff4c8294ee27805188728a782bd99ddaba4fd0b274c5a6918159121ad840f328bb1ba SHA512 8312f9bc8e7859745d0ccf2ccda8e8e797d1d1b1b7537554c1ba788277ccb2de72d28a93e7cc55795c9f407389b2dc5067c5f025db98ff08b520ede3cb4aa513
diff --git a/www-plugins/passff/passff-1.6.3.ebuild b/www-plugins/passff/passff-1.6.3.ebuild
deleted file mode 100644
index 80c02c29368a..000000000000
--- a/www-plugins/passff/passff-1.6.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_XPINAME="${P}-fx"
-
-DESCRIPTION="zx2c4 pass manager extension for Firefox"
-HOMEPAGE="https://github.com/passff/passff"
-SRC_URI="https://addons.mozilla.org/firefox/downloads/file/1681210/${MY_XPINAME}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="www-plugins/passff-host[firefox]"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${MY_XPINAME}.xpi" . || die
-}
-
-src_install() {
-	# See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Distribution_options/Sideloading_add-ons#Installation_using_the_standard_extension_folders
-	insinto "/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/"
-	# passff@invicem.pro is the extension id found in the manifest.json
-	newins "${MY_XPINAME}.xpi" "passff@invicem.pro.xpi"
-}
diff --git a/www-plugins/passff/passff-1.8.ebuild b/www-plugins/passff/passff-1.8.ebuild
new file mode 100644
index 000000000000..8a9894c396e9
--- /dev/null
+++ b/www-plugins/passff/passff-1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_XPINAME="${P}-fx"
+
+DESCRIPTION="zx2c4 pass manager extension for Firefox"
+HOMEPAGE="https://github.com/passff/passff"
+SRC_URI="https://addons.mozilla.org/firefox/downloads/file/2983533/${MY_XPINAME}.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="www-plugins/passff-host[firefox]"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${MY_XPINAME}.xpi" . || die
+}
+
+src_install() {
+	# See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Distribution_options/Sideloading_add-ons#Installation_using_the_standard_extension_folders
+	insinto "/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/"
+	# passff@invicem.pro is the extension id found in the manifest.json
+	newins "${MY_XPINAME}.xpi" "passff@invicem.pro.xpi"
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 944af7800047..8356772d77f6 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest
index bca628d153af..16422a3875ee 100644
--- a/www-servers/adsf/Manifest
+++ b/www-servers/adsf/Manifest
@@ -1,3 +1,5 @@
 DIST adsf-1.4.1.tar.gz 170221 BLAKE2B 41a87135b74e62c9d39c64839e7802b3decc47bee04cdd93eb0e1bec6361a654378e9c310bbd18a0bddeb834f444ff67aa0f8efe21dd7ffc94c876db3230b469 SHA512 b0334102308b6ecaead6db1f7b28c3bc27a9ac853fd055e9695e9bcf36ba25db890cae57a91195d398debdfd84b5d6c7ce9142d6bd5bdd30220170210b3cdf6f
+DIST adsf-1.4.2.tar.gz 170414 BLAKE2B e5f4a6f562718f335af0a9ad93d520422a5dddee0b7a737ebcf29f9b597e38422dec6c0e12fbb330d0bd17c4f7e92527f893b08576fc796316ffa1fa31870911 SHA512 20c3000a7c6cc3098ae8473aa6752d84b739492ce2011ca8bb9f31e265eb4fe11ebd8899d934653947cf07f81932511aea5ce542b7452331ab8e49ee4eedcab3
 EBUILD adsf-1.4.1.ebuild 921 BLAKE2B f95fee7b561dfb4c4c88dc94e4d6bdef54928c007dc695f0b68cafc82f08226050bc1475708de5510d631d5990b3b975562a42fd657d1bc1e5c8f20fad6e4e48 SHA512 f1af5f30aaa87c12e337c3310f8a6e48cd5f6242994b836232fe03b9ab8ff6ba04e9f90783b4623a0dd3a466382f237996b9461b46753067ef51fe7f0aa1fede
+EBUILD adsf-1.4.2.ebuild 914 BLAKE2B fd2b1664c76566869ede140251483a930d69ebd4007f17f4159afa526366e576eed15a36b901740d0f4fa9b04b474540b78b00f8e49b3a12cdeb44f640d6d03d SHA512 9936329e6c27c24414b1cfd4b08a79ed6cc39e22449fde44ee1aa2a529ef0cf60dff24dab3ea0c6caa5b2df8b70805fcceec788e541d68fc3b2d0dab118245b4
 MISC metadata.xml 295 BLAKE2B 300607324d7aca3f9af7cf195244b3426a78be1ab6875fc10e645d50e8aad1e4fc6abbaa555cd94248db86afc83bfdd5d58fa78cbf74d0c56b1cfa303dc87b75 SHA512 640f33b2433c2259e00d0fa1daca377084010d7fc28da599ea0d3d4264567691bd4d0ad3033f1c1d852d1cdcf179b88c1e22c75e5955e344c9dfca1e82a79e9c
diff --git a/www-servers/adsf/adsf-1.4.2.ebuild b/www-servers/adsf/adsf-1.4.2.ebuild
new file mode 100644
index 000000000000..2e8d1a60f04b
--- /dev/null
+++ b/www-servers/adsf/adsf-1.4.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="../NEWS.md ../README.md"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Dead Simple Fileserver is a static file server that can launch in a directory"
+HOMEPAGE="https://github.com/ddfreyne/adsf/"
+SRC_URI="https://github.com/ddfreyne/adsf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${P}/adsf"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
+
+ruby_add_bdepend "test? ( dev-ruby/rack-test )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/SimpleCov.command_name/ s:^:#:' \
+		-e '/websocket/ s:^:#:' test/helper.rb || die
+	sed -i -e '/test_receives_update/,/^  end/ s:^:#:' test/test_server.rb || die
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+	rm -f test/test_version.rb || die
+}
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 78b2bcb5abc4..011cdcd920c2 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -7,5 +7,5 @@ DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1e
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7
 EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
-EBUILD apache-2.4.39.ebuild 8134 BLAKE2B a4d286a2ddc61c275d5b204610710b85f2b26aaff318a3fc4d17c3e9d7763c790d1d077aac8b65d311b0c1bd8632a521d29a8abdf59f2d85be5a2e6756fe3855 SHA512 5e35a0bfcb972f185fd81b8a72e41ddd7afce63446481ae64b10f1ee43de971d3f290658922a3b10b21ea9afaf2ca431c110168a4242367736e9567d53558055
+EBUILD apache-2.4.39.ebuild 8133 BLAKE2B 3a9be40933d261b6b92e55ca6971065c55a98670920c9c5f4668895af7d952626cd3712c9b3bd87260fc0058fb23b261c00cae5042ec5cd8e5f3b7c7e3aa7f10 SHA512 f83cd7f34845bbb73617171eb80c0b7e0c68dcbd4d3c2f314e9d3e2fb18f7772f94fbca386ebbcec5e6b083f32928ea8da504a3ec132bf650ed9ddca514c54c3
 MISC metadata.xml 4052 BLAKE2B dba078e60afae4caf7f47f309f4fb6e65a10ee844b1ef8841e64bc5fb0ec34b0d9ee200473ca751e41498ba34a91f9eed2e84f3c86e6063b1c276adbdaba140a SHA512 0db051271c4b2b6487e3e28f0f994ff0c9167d9ced09042838a049d4a63df3787595213aa1c86108fd8c4f27ef961e1c04b375356b91e9d30231317c56ec7d78
diff --git a/www-servers/apache/apache-2.4.39.ebuild b/www-servers/apache/apache-2.4.39.ebuild
index 7a1fd21f41f1..7c3e8d290f84 100644
--- a/www-servers/apache/apache-2.4.39.ebuild
+++ b/www-servers/apache/apache-2.4.39.ebuild
@@ -130,7 +130,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-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-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index fb253ca1d2c7..333b3495107f 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -11,5 +11,5 @@ EBUILD nginx-unit-1.5.ebuild 1659 BLAKE2B 9d12593d5320dfc9d3ba40c9b8a7d8825cd25f
 EBUILD nginx-unit-1.6.ebuild 1659 BLAKE2B 9d12593d5320dfc9d3ba40c9b8a7d8825cd25f3f4674b4c2e7f95e2267a05b85fc22e67212fc025de77138447ec3495c5fa662868c49c60b6018c2e8f9665631 SHA512 cabbe6c59690ac942bcfdfe0c54e06bb0ce3d7ef8460aa15f48822c2050ed6469701b7ffd648df51d36174660a32bb17d43c72035a7f15bec2a3570377633bf8
 EBUILD nginx-unit-1.7.1.ebuild 1659 BLAKE2B 9d12593d5320dfc9d3ba40c9b8a7d8825cd25f3f4674b4c2e7f95e2267a05b85fc22e67212fc025de77138447ec3495c5fa662868c49c60b6018c2e8f9665631 SHA512 cabbe6c59690ac942bcfdfe0c54e06bb0ce3d7ef8460aa15f48822c2050ed6469701b7ffd648df51d36174660a32bb17d43c72035a7f15bec2a3570377633bf8
 EBUILD nginx-unit-1.7.ebuild 1659 BLAKE2B 9d12593d5320dfc9d3ba40c9b8a7d8825cd25f3f4674b4c2e7f95e2267a05b85fc22e67212fc025de77138447ec3495c5fa662868c49c60b6018c2e8f9665631 SHA512 cabbe6c59690ac942bcfdfe0c54e06bb0ce3d7ef8460aa15f48822c2050ed6469701b7ffd648df51d36174660a32bb17d43c72035a7f15bec2a3570377633bf8
-EBUILD nginx-unit-1.8.0.ebuild 1659 BLAKE2B 9d12593d5320dfc9d3ba40c9b8a7d8825cd25f3f4674b4c2e7f95e2267a05b85fc22e67212fc025de77138447ec3495c5fa662868c49c60b6018c2e8f9665631 SHA512 cabbe6c59690ac942bcfdfe0c54e06bb0ce3d7ef8460aa15f48822c2050ed6469701b7ffd648df51d36174660a32bb17d43c72035a7f15bec2a3570377633bf8
+EBUILD nginx-unit-1.8.0.ebuild 1658 BLAKE2B 4a70433925a4a6203430224a8d6c2135acdaa83a59c2664b9cbdfc9a0fb85ba2c6af1a8971f0799edac6174dbd7322da6e73326c31ad429fe4688789488ce57d SHA512 bc7cff71e2ca375783c327a469af347f74eb3b55cff27c38b7393cf8be5d9779cdb85367a35f38a4fd6e80ff7c80e2d956e3ff02b43a573f7616c1793e3d4ff4
 MISC metadata.xml 949 BLAKE2B 31fd3223474719c473dac9015906c04fe7ad706575073eaddcb05b362ee421d57aa9e7bc92952ff01e9dae558fc838e0e7c248a5f0b29822248e61f97c72048a SHA512 5176f55f2d57f45bbe1df67336d798dfb5a412d2851706ba8d26dfba65beed787f59fd2419bfbb135c5dd9cdb1b2fa50220bdef3d0aed6c2e5ef00ca4dd23370
diff --git a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
index a4fad3ff51ec..059d684520c4 100644
--- a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 MY_USE="perl python ruby"
 MY_USE_PHP="php5-6 php7-1 php7-2"
 IUSE="${MY_USE} ${MY_USE_PHP}"
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index b050c3e406fb..3708e947b44b 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -11,9 +11,8 @@ AUX nginx.initd-r4 2192 BLAKE2B b482b9cc473a1df06764d60c7ce5c99a3f680778028bf440
 AUX nginx.logrotate-r1 257 BLAKE2B d62c57377efd5259b6c776861d921b6e4ea026387157d618abd9e578f2e432ac0cf653a0f3842a0620d405759216bdc17afd50b33aaec3ad0c6757dfac3e34d8 SHA512 4892fc1700817c9a459a531df0320fe606a51be7f8b4e3ddf5852fe33def70dbff36fcefd2fce247c6846d6315ea92f3421eb21299a162d082b85fa27572cd95
 AUX nginx.service-r1 327 BLAKE2B 081c72f7f7b98e30b2b45aeb8b1e4ead935c5b9a558fcfc7c18c20a2c0f18711272e91f4688c04c7f0eb833be8f7daff2f7d01bd1a04981f03ed54a07fe1148c SHA512 9b6bcf74df2f74ae6a2c255ebf2d826ea92ed9921b9995da6c9a0c5656e2863a2fe5293ef8a656fbd36298602cc88ffc5d7acfbbf143c23a78c9689d61b05df9
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
-DIST nginx-1.14.2.tar.gz 1015384 BLAKE2B 0d41b078215ca3996f434cf3d43c99a52dd43f8b1b798a4566d3f9509fa35c74c139a3e0dca8b0350ee3eb1064dacc8e76bb2fc3ffc78873eec8fff80e53214d SHA512 d8362dbd86435657d6b13156bd6ad1b251d2ab10bc11cdda959b142dd6120b087e4b314f0025d9bbcc88529cb4b9407fb4df1cfae5d081b7ea1db51ccfc2dbe7
-DIST nginx-1.15.12.tar.gz 1032347 BLAKE2B 6dfd7fc0a17cd6e92c34e568db17368561f63c107654d76d3fcdf6979688e19a6f9396ddfc421c8fea6a6e0def717337e9b9b43eb8c5c8e3b2efc6bae8eaa3a9 SHA512 58961194c4fb94136b657c75c0d2ee3fe6515552a17d66e80d6cd53d342731229c0cbb897700631517275943fc2731179780a3c4b61b93b32a2cf6490ebf0f50
 DIST nginx-1.16.0.tar.gz 1032345 BLAKE2B 187a07e7bde2dc6d7dd476372fa5e880a085f06bba321177428a4064e75bb1012950fdc31125344dab36b8c5d78c60d9f9ca963279cfa46741478c250221c199 SHA512 e99cfaa4538f209c096ea2f93c04b5019756617f3bcd3305c273e98ddc89fed5bf90d65fb9b493149bc47d55ff79e73850bfcac20505fab74930d0102075df3d
+DIST nginx-1.17.0.tar.gz 1032978 BLAKE2B 791e4d309ef1a62db2c135313edc85fe3fdb0c7b42b39a2a1f56059b1128199fcbcd4f24a1929ad3b4b57506f104afd5943229a8b6273d6e2ccb103fa0405476 SHA512 fcba692355c79169672c32796981bc178d42d9cf6880e8f03c99d5f518b7aca5c0414688e17b9c54f307214a64e766e1b022604e725aa4d40784f471d770f061
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 DIST ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz 12672 BLAKE2B fa2febfa63b98303f8890c6774de6ccb09475ccd639d3b74493a4ffd97c90febdc22755c5928018bdac24a537bd13cde165f97e5d2b50bebf598c3fb22ec0206 SHA512 169566b8764bb2b82e029f954a99063a9c61e2cbf982861c5f6818b389a5f37bf5389afb1b5627de9bd3f7af7b3c404be0230f943d47ab621c2a2bd825cc8203
@@ -23,10 +22,9 @@ DIST ngx_http_cache_purge-2.3.tar.gz 12248 BLAKE2B f83b267f4c19a9d4af59645226958
 DIST ngx_http_dav_ext-3.0.0.tar.gz 14558 BLAKE2B 0d370bfe34600d43a540dd19a386aa52ce135b2eae14e4e108a359d5ff3405939130d1c802062c7523057ec35d38322d3fbed8c13deb58ce7a08ebf9e3f106d4 SHA512 d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
 DIST ngx_http_echo-0.61.tar.gz 53155 BLAKE2B 72565b5d79598b5dcd1c10fa0f718e749894ca5f1232d5aae60c61e268b5904af35fdcd35afcf72de93852af9e0ca58805d77cbc37919fba9012158b5545baab SHA512 c90b81a4e85a8e9beeb5ff591dc91adb25fa4e0b6cb47086b577e5fa36db2368442dd011187675e358781956c364b949bc4d920ca2b534481b21c9987d2a9a3b
 DIST ngx_http_fancyindex-0.4.3.tar.gz 25274 BLAKE2B 5ce3102326f6b8cc2b333ed08f7a66476842d2c70089175e577a3ba958317ed702f24ece002506007eb45e9e50b8f6ecb137cde222566308986cba2682b70f7d SHA512 fe5f6afc29c99f66151c1a06e27b5749b0a16227638583d9c961adc94b2942b981184382f95e70d927f00b09b43f597b963a85a41bde5903b10e42f86bc321f1
-DIST ngx_http_geoip2_module-2.0.tar.gz 6766 BLAKE2B 338c9503530ebba6076a2222fe9d164fdfe39ac603c4ecc7ad5b5d1482c1e21d0f1bc52be585d6a88968b29edfd8b1b63ce572e9ee8d8efb4d88889ef4cbb65b SHA512 32a23ba20e4ef3885b09baf938ef57405a6f23e86a7dbecbe5285be74c0433fc33eee70742113706e66ee105909deb1ec844ce36a6f33108597f736341d8c230
 DIST ngx_http_geoip2_module-3.2.tar.gz 8465 BLAKE2B 93d1fb9573e9dbd932670a595d2c0341571eaa2e079ed98e85e282712dc0cdfb798d59ccc2ae7466dab23e093c2eec17d1694f2748d80683928ad135b70b0bfc SHA512 84b26955234e29dbfbf2431b652fcc453c5e86b95f837296df4f3d6c730e3e0773223dae890eebfc9b5763f46082bde6f38d6505b8bf78133b89e7297016cc5d
 DIST ngx_http_headers_more-0.33.tar.gz 28130 BLAKE2B fe3097a7700ce5da087058f7bb44c95164b75137031187400473f6833bf0e33e5c4920807225a6ff94174fe7dbd6186cca176a33a629ca0911faab6804bdd12a SHA512 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
-DIST ngx_http_lua-0.10.14.tar.gz 654097 BLAKE2B ee38aca7d981be5bfd7af52521c51d43bc7a8fed38c97cab29498535875380dd50407cce367e60ab3608baa2bc05556a1d92530a8b4542ce1ef0319e35f9457d SHA512 f2c4241ff52130cd116220e48a1032b9cbc8ff70f0ed0fbb918e18bb7681f0b1e07a2108b2ba5bc551a6557d87971ae4c8bda30e255acff1f7d72dd9232132ba
+DIST ngx_http_lua-0.10.15.tar.gz 655110 BLAKE2B 73bf8e2f157c93f3d4e54b5aa63deb266731a10e3e48b2257756efee8d752e86440ca9c27bd27bc1d90075a5ffb58772eecb7c445db44cd055d2b9e0b4bac082 SHA512 1feea538464275e6e571860592628ad639b2259c8aab7f38575b81c0b355f1ade32a91643267bc9ec16519e3bcf3d132511513dc8c949f74a3bff975c85d8ff7
 DIST ngx_http_naxsi-0.56.tar.gz 192120 BLAKE2B cdbfc278f346ccdc0d5407d70ddd4740816d9fe786d3d65189d47e6f3b030c02352a30ed86bf1650139a21a8408e74c1ec7d7aa3512df1428870279ab384dd15 SHA512 4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd
 DIST ngx_http_push_stream-0.5.4.tar.gz 183493 BLAKE2B ccae3113071cee38fa6a7accd580922dc2fc9fa22af737f400c2c5f59352d93ca6cceb47f2aee70dfc111afdf98d27aeb64ddc5a4dbf617359ea4da09486ac7f SHA512 467ae49409adb675979ff591f98df8c96d71ab5ebc2ef9b3c9430e38e7e84d311b4a98c2b1cb1886d895735223dd2a43370aab61b57b34adb1427c184e6b8c86
 DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 BLAKE2B 54ec1bd0d1cc43cdaafc93ebd46b33374c57351c7f022eae0351d6961680abb03d896e7f058e67c43c4fee300253354feccb92d00e62bf91250e251e1860ec03 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d
@@ -37,9 +35,7 @@ DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1
 DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
-DIST njs-0.2.8.tar.gz 300750 BLAKE2B 180770c9e56bb7a9c2e3c33c5c4ca87ce56eb16fc1fca483c952ecf9885ae45734bdd7f794d0fc316fd6191d7a6a8c093fd49dc80985ab07b0880f3500aaa1be SHA512 f4ab5dc0b807df443c9edb01020eb78979d4747111e3a529a6303100b922f9acc9e281cde6d88a920c30b4780b2cd85ca2f5abd3518488b75f6ed1b12cf8d616
-DIST njs-0.3.1.tar.gz 314049 BLAKE2B d80b90fbf27699151b5717c483841dc2899dc347c8ba1cc61ce5e3efa99290337d35a230fe5097d037bbce401a71a59e261e0b307a2d41b50185a624beb6fd38 SHA512 b2f427366e66827068b1e3956f7b4b56271d4a7aec535bfa22fe56a2ef0dea5ce1c43c4d028affdf32b8397d19ca4d03d974fc6660bf244bbbd899e23f13637d
-EBUILD nginx-1.14.2-r4.ebuild 40544 BLAKE2B 0a0501b50fb0059d3a1aceb7bb91cdd6119200fb474c591a1ce476a25acc8ccfbdcd7b6da666934a74c5750990db87aa5b6768b0adb3267734e6274f3eac5bb9 SHA512 b85b52f946268441af84bb71db020d6e098a33fac6d6b92c4e384b839837e13e2c2e6f591d5a886f9f73c36b10c8109eaecdf1f48f800736cf563a1c8cc16ae3
-EBUILD nginx-1.15.12-r1.ebuild 40546 BLAKE2B 8cb9a2b8efd517d9bd3272b1dbd76db90f8d510fca33826df44260d161ec35c6d31ec764b71ddee5d9edcdc37e626bc2057d4f01251d98686525d7ccc127fa94 SHA512 4846ec9382d1e0d181a4bd00a833b5c3e2a1d3e64fe5dd9c69ad0512d880bbe31b8f001ef0f91678abc75c3b35eb7fc9923fea7d182b7899fa3fe49d98426647
-EBUILD nginx-1.16.0.ebuild 40546 BLAKE2B b08d2ea1420e5ba6545cbaafa998b6242448feeae8385bc753204b35122c2fe5b220383b379d5d7adfa6cc62734c3aac6189dcd3b2f314a567e72661bc97d28e SHA512 19434f6fdf2a1abde98dfeb5f9527b306b0e104dcc900e9099d651e18a07ac19ace2fb7079d0571b4be1108dd5163b151c32bc4b4031aa2a9b3c05e86bf7c76a
+DIST njs-0.3.2.tar.gz 325183 BLAKE2B 6c02d260bcb968480eb02a3dbee8464b2f7dd26a0ca4e4539ed2a4ce7bf494d32b815c742034b92132d5fef3e8eb12132d0ab214b1ffa450ce11273d70d96f57 SHA512 74abf48f2e23714fcce1b87b4dbe354a8a716b1cab825591878a6fd5175400a7f3b74c3968291ace19b2f6a2620df959d572fbcf1868dc4e0f44636e8ea35aaa
+EBUILD nginx-1.16.0-r1.ebuild 40544 BLAKE2B 719b98119cfe23493edd9a85fb2ff96945f1c696e3dd60a8524be84c8e4fce0d7885f6b88846eb756fce7afe443b9623008203af94f995cd4a4a312eea0fbf5d SHA512 2aa4097361453447a2c1a381e5aeaaae86e8fb545e5f658ef84879422057e4c489e42bd4b1b330f887d11ce43069fa82bd316b724631f06ee408bb1d4790b087
+EBUILD nginx-1.17.0.ebuild 40546 BLAKE2B a33875a4dc82bf255e470f0e4ec034674b9aaebf5d7f9bb5dbc2243a132b73db3c7c89a50da8e5a11bb7713beb857d448447a874577cec337fe4a648950a7e73 SHA512 fdb2e7d344dd737dd949fae2d9696ac0c812474a3119e27ec303da252a11a532dece9a1ea01d26d9880ae30a3c59b4df18de6203891f38af1d050f01996eb2fc
 MISC metadata.xml 1310 BLAKE2B 6f40252a833a188f4b62cb2f2a126f93e68cdcd0e3575febdc371106c82d7ebdc6931b162a5ef8070fb6fe1f18e969191f67d3ccdd5e55712dc4d209c16c34c9 SHA512 10403ec29eaa83eb45b7b0b78340103b226145b52b3795e18b1e8bf272efa83586bc190e6e66061f33544434e3c2f94d2229be988733713578e9bb495ce7219c
diff --git a/www-servers/nginx/nginx-1.14.2-r4.ebuild b/www-servers/nginx/nginx-1.14.2-r4.ebuild
deleted file mode 100644
index dde537f4fa24..000000000000
--- a/www-servers/nginx/nginx-1.14.2-r4.ebuild
+++ /dev/null
@@ -1,1089 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.0"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.3"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.14"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.1"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.61"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.3"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="2.0"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.2.8"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
-	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	pcre? ( dev-libs/libpcre:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	http2? (
-		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	http-cache? (
-		userland_GNU? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? (
-		userland_GNU? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( dev-lang/luajit:2= )
-	nginx_modules_http_auth_pam? ( virtual/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? (
-		dev-libs/apr:=
-		dev-libs/apr-util:=
-		dev-libs/libxml2:=
-		net-misc/curl
-		www-servers/apache
-	)
-	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:mainline"
-DEPEND="${CDEPEND}
-	nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		luajit
-		nginx_modules_http_rewrite
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_auth_pam; then
-		cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		eautoreconf
-
-		if use luajit ; then
-			sed -i \
-				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
-				configure || die
-		fi
-
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		./configure \
-			--enable-standalone-module \
-			--disable-mlogc \
-			--with-ssdeep=no \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
-		cd "${S}" || die
-	fi
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
-		export LUAJIT_INC=$(pkg-config --variable includedir luajit)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${D}"usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	if use luajit; then
-		pax-mark m "${ED%/}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX%/}"/var/log/nginx \
-				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX%/}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.15.12-r1.ebuild b/www-servers/nginx/nginx-1.15.12-r1.ebuild
deleted file mode 100644
index 1ef25b421414..000000000000
--- a/www-servers/nginx/nginx-1.15.12-r1.ebuild
+++ /dev/null
@@ -1,1089 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.0"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.3"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.14"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.1"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.61"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.3"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.2"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.3.1"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
-	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	pcre? ( dev-libs/libpcre:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	http2? (
-		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	http-cache? (
-		userland_GNU? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? (
-		userland_GNU? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( dev-lang/luajit:2= )
-	nginx_modules_http_auth_pam? ( virtual/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? (
-		dev-libs/apr:=
-		dev-libs/apr-util:=
-		dev-libs/libxml2:=
-		net-misc/curl
-		www-servers/apache
-	)
-	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		luajit
-		nginx_modules_http_rewrite
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_auth_pam; then
-		cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		eautoreconf
-
-		if use luajit ; then
-			sed -i \
-				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
-				configure || die
-		fi
-
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		./configure \
-			--enable-standalone-module \
-			--disable-mlogc \
-			--with-ssdeep=no \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
-		cd "${S}" || die
-	fi
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
-		export LUAJIT_INC=$(pkg-config --variable includedir luajit)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${D}"usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	if use luajit; then
-		pax-mark m "${ED%/}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX%/}"/var/log/nginx \
-				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX%/}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.16.0-r1.ebuild b/www-servers/nginx/nginx-1.16.0-r1.ebuild
new file mode 100644
index 000000000000..75a7cb6a7bbf
--- /dev/null
+++ b/www-servers/nginx/nginx-1.16.0-r1.ebuild
@@ -0,0 +1,1089 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.0"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.33"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.3"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.15"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.1"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.56"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.1"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.61"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.3"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.2"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.3.2"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_geoip2
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	stream_geoip2
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
+	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( dev-libs/libpcre:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http2? (
+		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http-cache? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( dev-lang/luajit:2= )
+	nginx_modules_http_auth_pam? ( virtual/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? (
+		dev-libs/apr:=
+		dev-libs/apr-util:=
+		dev-libs/libxml2:=
+		net-misc/curl
+		www-servers/apache
+	)
+	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )
+	nginx_modules_stream_geoip? ( dev-libs/geoip )
+	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:mainline"
+DEPEND="${CDEPEND}
+	nginx_modules_http_brotli? ( virtual/pkgconfig )
+	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? (
+		luajit
+		nginx_modules_http_rewrite
+	)
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_auth_pam; then
+		cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		eautoreconf
+
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		./configure \
+			--enable-standalone-module \
+			--disable-mlogc \
+			--with-ssdeep=no \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+
+		cd "${S}" || die
+	fi
+
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+		export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	local WITHOUT_IPV6=
+	if ! use ipv6; then
+		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${D}"usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	if use luajit; then
+		pax-mark m "${ED%/}/usr/sbin/nginx"
+	fi
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX%/}"/var/log/nginx \
+				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/www-servers/nginx/nginx-1.16.0.ebuild b/www-servers/nginx/nginx-1.16.0.ebuild
deleted file mode 100644
index 1b4b842834f2..000000000000
--- a/www-servers/nginx/nginx-1.16.0.ebuild
+++ /dev/null
@@ -1,1089 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.0"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.3"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.14"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.1"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.61"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.3"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.2"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.3.1"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
-	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	pcre? ( dev-libs/libpcre:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	http2? (
-		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	http-cache? (
-		userland_GNU? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? (
-		userland_GNU? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( dev-lang/luajit:2= )
-	nginx_modules_http_auth_pam? ( virtual/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? (
-		dev-libs/apr:=
-		dev-libs/apr-util:=
-		dev-libs/libxml2:=
-		net-misc/curl
-		www-servers/apache
-	)
-	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:mainline"
-DEPEND="${CDEPEND}
-	nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		luajit
-		nginx_modules_http_rewrite
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_auth_pam; then
-		cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		eautoreconf
-
-		if use luajit ; then
-			sed -i \
-				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
-				configure || die
-		fi
-
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		./configure \
-			--enable-standalone-module \
-			--disable-mlogc \
-			--with-ssdeep=no \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
-		cd "${S}" || die
-	fi
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
-		export LUAJIT_INC=$(pkg-config --variable includedir luajit)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${D}"usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	if use luajit; then
-		pax-mark m "${ED%/}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX%/}"/var/log/nginx \
-				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX%/}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.17.0.ebuild b/www-servers/nginx/nginx-1.17.0.ebuild
new file mode 100644
index 000000000000..2985eb0886b4
--- /dev/null
+++ b/www-servers/nginx/nginx-1.17.0.ebuild
@@ -0,0 +1,1089 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.0"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.33"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.3"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.15"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.1"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.56"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.1"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.61"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.3"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.2"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.3.2"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_geoip2
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	stream_geoip2
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
+	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( dev-libs/libpcre:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http2? (
+		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http-cache? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( dev-lang/luajit:2= )
+	nginx_modules_http_auth_pam? ( virtual/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? (
+		dev-libs/apr:=
+		dev-libs/apr-util:=
+		dev-libs/libxml2:=
+		net-misc/curl
+		www-servers/apache
+	)
+	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )
+	nginx_modules_stream_geoip? ( dev-libs/geoip )
+	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	nginx_modules_http_brotli? ( virtual/pkgconfig )
+	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? (
+		luajit
+		nginx_modules_http_rewrite
+	)
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_auth_pam; then
+		cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		eautoreconf
+
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		./configure \
+			--enable-standalone-module \
+			--disable-mlogc \
+			--with-ssdeep=no \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+
+		cd "${S}" || die
+	fi
+
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+		export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	local WITHOUT_IPV6=
+	if ! use ipv6; then
+		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${D}"usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	if use luajit; then
+		pax-mark m "${ED%/}/usr/sbin/nginx"
+	fi
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX%/}"/var/log/nginx \
+				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 5a6f987dff03..672b14fd7f01 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index 4df6a1dfe769..a7848e4edde9 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -1,3 +1,5 @@
 DIST luit-1.1.1.tar.bz2 140044 BLAKE2B 5abf18955b753182198b4ebfa981e34b57707c578f1093f855e201b69b04b6a70fe189c0dcda43338a07d47f892eb3acb8278aba0e739d00e3cf164806d56ca4 SHA512 e834e89fca9987f6d82701f53d3c450cc64b93a804b11465b4a7ec5cb3a5c4ef30115df57dec3cbdbafa46e4a4f1bb4759b723123e2ff2f6b1c12207015638e6
+DIST luit-20190106.tgz 190866 BLAKE2B 44098a00cade37aacdd7e67e1dae68157b652458b8a059de3dc56be9cc79ffba2ba861d403ab65de640853e0aec38c7d8d67febb5b6ae852a25430d2988c3661 SHA512 4324ff2793635e12e7fc0df2d7c5cdeb6241591105d0cfaf40a0da06a08764f08c5ef5f6fc19bc0e5d1f4b34b90e14b7aa393a0e613f5e096c6f91c90988215b
 EBUILD luit-1.1.1.ebuild 667 BLAKE2B bf9567c21c799e5babec6f57a5552735f101bfc901c9dfdddc4e07c9b367f4f409ccc48b65029092d50cf1056137ee651bfd6a2e3c0a6b42c674338cca84c9ce SHA512 16c37b80ab3b53553e852f4122a4f593ccbdd21e39c181464ced8c0ee0ed18335299b658bb3c3a4c3db69cfa9d407fee6b86da4b6552e797f1825a1b8e058375
+EBUILD luit-20190106.ebuild 670 BLAKE2B f87dd6f6f6372163ba20f86a92badc0bfc90159e35aeea24d1cf6a441a19da4c47fe3cb8aaae9d8750a8d5eba66d8a61ef167dfe549e24c52e9f97eae22556ff SHA512 b98143afde5ad484380309966f1bc7d52266678eda41c979e510c7973e5b2f32a1ccfd4f0ad874a7139bffdc01984ab38f995476e5e18295a2a9ff1543a6f2b2
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-apps/luit/luit-20190106.ebuild b/x11-apps/luit/luit-20190106.ebuild
new file mode 100644
index 000000000000..a9f4e3f9811a
--- /dev/null
+++ b/x11-apps/luit/luit-20190106.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Locale and ISO 2022 support for Unicode terminals"
+HOMEPAGE="https://invisible-island.net/luit/"
+SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-apps/groff"
+
+src_configure() {
+	econf --disable-fontenc --enable-iconv
+}
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index cfb40959069c..cff473f1aed4 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1,3 +1,3 @@
 DIST setxkbmap-1.3.1.tar.bz2 133817 BLAKE2B f58f63623afd69275ef25cc33237176c2d1814fa124d7a5dade6ad3cf60b5ee5a8434857cfdb9b17c6f6c6cfce4dbf861a6c6bc232d9e12989acce7be285c63b SHA512 5ddc2fc40ddc5a35815606998d3f111e3c2b8d915bf609462c703f9f691a0b3a6477ee98837c0a28f11dd3f0a30f17a3bcdfa38d4ca45140e521c74d043ecdee
-EBUILD setxkbmap-1.3.1.ebuild 426 BLAKE2B 2d93aae330635fabbef481af23e48dae60f9da26d4d2615a32d629767f851e172ac8ba009e101f9823850a7589a1aac9168cfd16c86e8030998d6131820da7be SHA512 138143d0b8220f34996ac218a43b20b92ec2de0d4954ff592bb63354da39a4de9d1e2c980c6e59356c8d1b27b4e443911721e1e8fd0c48e13e03aff3ff1e32a1
+EBUILD setxkbmap-1.3.1.ebuild 422 BLAKE2B 0b5257d56a6c9d2cf61536ba55aa345223ee873e2ae54b4366136d169ea9c75003037d2eefbb6e7af8c642e69a441681ff4942b28c296fdf655135da642275e4 SHA512 6f4491f48516345f3e5a2ee0a75c2a1e06ead4ad73b4e849acad9af27016a69951c5a28d0226612a679ce3410120fdfd5b8bd28f4f6066381639ae95504e81ad
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild
index b2db0b26cbe4..70b0c5b2f89e 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Controls the keyboard layout of a running X server"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 DEPEND="x11-libs/libxkbfile
 	x11-libs/libX11"
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index aa122eb1f2b8..c3578ef066cd 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,5 +1,5 @@
 DIST xsetroot-1.1.1.tar.bz2 119977 BLAKE2B 7589dc6014c2f905dce4bc72c4a98096eba38354975c307408e1aeb06e27cafcf64ecda7f8e3a470ac25e41108b3aac688fa9d365a3ab41908a52d8044142712 SHA512 04834a8ca658a4aabe03e62588353102e8019d424e25fab450d48e6fc4ac358df5bb98a850c82c61e2495faabfe54f3d92d9563e77c83ace7fd69c278edbbd64
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
 EBUILD xsetroot-1.1.1.ebuild 411 BLAKE2B 1a44a1b61d1bcc1ee9bdfad0c55ed79b90976c2d24e51a8af186557dc68f1d6213a08a9c7619bb66c5f11afcde08e9a02a845466716cbc919a95dd8a411c31a3 SHA512 2ba151cae0817c4f7fd3e5d21b099a9204117d857883b78bb3f9f5c09fb56108dd9308be60a107bf49bbc08b0eb9d69867d5b0942d9591bba35e110dd9426a3f
-EBUILD xsetroot-1.1.2.ebuild 411 BLAKE2B 13ee02f35ec2ea71dd7ae681be62d1aa5519bcf57c833b8d38aa2da721813caec8020bd14ffe749938eb0a2f1765228b9047e8e2eccfc16c0b7fc2aa3bc35aa6 SHA512 e295eeb9a89fb804b43af316768814819f5850962320d1a2f5b1f40e190b8883d219bf4143f2ee163a23965aebd3a3c133711719815cb5602daec8b27eafa286
+EBUILD xsetroot-1.1.2.ebuild 407 BLAKE2B 4b91e2ee6bce7d80006305369bcebf6b75d8d5b3ac60d2f1115c17f4a2c4706b3dda5c44ef269c6cca4b41706fbe10931bae35a57ab8eeaee52f4124483ab3f8 SHA512 500870309f5692ca50f0531fe69b9f9984751779092a92199eafb59488539b9ade408ee301a0ea0ee3adf77594d255d1cb3f4267c50bf03936c6d34aeb548fbb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xsetroot/xsetroot-1.1.2.ebuild b/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
index 6f78038d0412..9a48cb5b0b62 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xsetroot application"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 6b6e22b850e7..c29152c04e01 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index b2440b50990a..57554606a526 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -8,6 +8,8 @@ AUX xorg-server-1.20.4-shm-Use-memfd_create-when-possible.patch 3194 BLAKE2B 6ac
 AUX xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch 1724 BLAKE2B 34c607f6b6a6f21ed6b34d7a87cb3bc1774f526f32144218c7d5d338474c08c98c72a87b41f3d0afcaf81dc0e8d5989a48fd8e64a6a9e25ad968ad8156f6e984 SHA512 49d5af904bac03cfc8ad89b70541e9af6687f7f0153d06ada64e2226d27dddc1b7bb27024bed73c20c365197858957730de005c515bbae8e22b610c3241b70e4
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.20.4.tar.bz2 6123780 BLAKE2B 224dda54f433315f6614cbee5bc54db91d9d9e190c06ac7f26e334b80b9d4a612ff4b2a4f10f50a6f928ecdbea40172d5578289fbf88411f006bcd473253b05d SHA512 f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8
+DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be SHA512 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631
 EBUILD xorg-server-1.20.4.ebuild 5830 BLAKE2B cc5a726bc287b7a78e195e251bb3b687f5c9cbf7443d909874b97c101dc28a1e78ea203d9b8c845dc1d24d49a9f47267262868dac92de8be03da7a418386ef0d SHA512 0551c9620acde87d5cef28b49355076262d81ee4411698d35b19d9e2899ad8250b74ab5835a859670c33df2b6ee73facc2d1b1212a46224e1db78454c277a099
+EBUILD xorg-server-1.20.5.ebuild 5842 BLAKE2B 1ad15eeff10ad590d2851496a2540725a4cf94f62295f0c9265bbd733eb67148451bfe31691d190ceba5e06196908e3eaa590cdfde7d4f4bd8b765688fab873a SHA512 57002ffbd60f1d38074fce2621a2b906194833928cd7b554bb7861e0c6c8973b7e55ef2426aa61fc360029256cdc93863eb102e257fd0bc70bffd6fad01c4d3e
 EBUILD xorg-server-9999.ebuild 5582 BLAKE2B 25f4c05b485b2c55519cbe0eef71bcb40f658731bf19a6b4224bb48305da3865b3b1b7e06faec78fa51986a8a8b2ee3890957d0879a4761e73607575e2e8d560 SHA512 8f246f5671616beee25887cee51a5b8b0c871ce869a15970ac27f026cc0fef61f83b279518d056a2b9943e96e65d579bda9e7aaf9b7281f21c4d706443d8dc0a
 MISC metadata.xml 960 BLAKE2B 886751450005aa4b2c197e0aa439028ab0138e8947a8deb005890ca4845e6e19b19f3134e7e3d105ef2bab68e6f8605fee87a082dd25cbd7fe223b9268ecc607 SHA512 d027e5a630ec940e6c2c5f216fa159aa25092cbbb7078efe2bc52ebee28b856297d0a641f57a2c108cb13ad61e9d8d0007ae9d6f2c2ff01ec4632650ec1b72df
diff --git a/x11-base/xorg-server/xorg-server-1.20.5.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild
new file mode 100644
index 000000000000..91067233690b
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+inherit xorg-3 multilib flag-o-matic
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-libs/xtrans-1.3.5
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	glamor? (
+		media-libs/libepoxy[X]
+		>=media-libs/mesa-18[egl,gbm]
+		!x11-libs/glamor
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	xephyr? (
+		x11-libs/libxcb[xkb]
+		x11-libs/xcb-util
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-18
+	)
+	udev? ( virtual/libudev:= )
+	unwind? ( sys-libs/libunwind )
+	wayland? (
+		>=dev-libs/wayland-1.3.0
+		media-libs/libepoxy
+		>=dev-libs/wayland-protocols-1.1
+	)
+	>=x11-apps/xinit-1.3.3-r1
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd
+	)
+	elogind? (
+		sys-apps/dbus
+		sys-auth/elogind
+		sys-auth/pambase[elogind]
+	)
+	"
+
+DEPEND="${CDEPEND}
+	sys-devel/flex
+	>=x11-base/xorg-proto-2018.3
+	dmx? (
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+	!x11-drivers/xf86-video-modesetting
+"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)
+	elogind? ( udev )
+	?? ( elogind systemd )
+	minimal? ( !glamor !wayland )
+	xephyr? ( kdrive )"
+
+UPSTREAMED_PATCHES=(
+	"${FILESDIR}"/${PN}-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch
+	"${FILESDIR}"/${PN}-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
+	"${FILESDIR}"/${PN}-1.20.4-shm-Use-memfd_create-when-possible.patch
+)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+)
+
+pkg_setup() {
+	if use wayland && ! use glamor; then
+		ewarn "glamor is necessary for acceleration under Xwayland."
+		ewarn "Performance may be unacceptable without it."
+	fi
+
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# NOTE: fop is used for doc generating; and I have no idea if Gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable debug)
+		$(use_enable dmx)
+		$(use_enable glamor)
+		$(use_enable kdrive)
+		$(use_enable unwind libunwind)
+		$(use_enable wayland xwayland)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal dri3)
+		$(use_enable !minimal glx)
+		$(use_enable xcsecurity)
+		$(use_enable xephyr)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		$(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind')
+		$(use_with systemd systemd-daemon)
+		$(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper')
+		$(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid')
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/var/lib/xkb
+		--disable-config-hal
+		--disable-linux-acpi
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+		--with-sha1=libcrypto
+	)
+}
+
+src_install() {
+	xorg-3_src_install
+
+	server_based_install
+
+	if ! use minimal && use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${S}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-11 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+
+	find "${ED}"/var -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	if ! use minimal; then
+		# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+		eselect opengl set xorg-x11 --use-old
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x
+	fi
+}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 24de18dd1c5b..9e2263198f9e 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index d452831a5df4..a5f8c06b8247 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-input-synaptics-1.9.0.tar.bz2 501814 BLAKE2B 7720136dba4e3cb76d21a9624e7e684bc09e22ebd0bc3b53fb170bbfebc29133dcfb471df326ac7b2eec1e4d3e2a3eeef56e57f649ddcc8f4d5e66eba9bd28e8 SHA512 71171ce59136b1c85764d412f9039d6252c94bb2ba44c8c6348aef6509d12219ea17a026440b0e18d26f4d7853d4ca5713eb2404d39deebb8be82886ad57bad4
 DIST xf86-input-synaptics-1.9.1.tar.bz2 503722 BLAKE2B 5ff2f792d187ff0f3fabb1ee194f4eae1397d993627ef3a74b1c838cd611fc2834c6453b57d0dc27d7a6e0bc69b717eb1cb76c87833dd1c66b1af5ac824e1d55 SHA512 978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f
 EBUILD xf86-input-synaptics-1.9.0.ebuild 818 BLAKE2B ddc270a8d1c4a813705dfefeaa5dfa65c1948667e780eef6589cd91b41334da39e360fae375610c6f0618b3c64e4c96b6b747b20098745518d62b6c215062622 SHA512 0f9da16f9ec81fe0902250884ebba5653054bc60c7f41d867d71797adc0af1fccecc02afa87e58d8761e56e271ff81df402f5d618d79cd3a551be3a47d8c4be5
-EBUILD xf86-input-synaptics-1.9.1.ebuild 825 BLAKE2B cc83f952fb1c021cdccda9bf53d4796656242d02782188ed72c31eb8349c7ead9f119141bd399ce560619e4eb72ba77890a09af25fe86c353bddaaeb6e611b42 SHA512 1ffdf73d9392cb59c5583908b9ed4e6f9e252385897772665ac1025017d452464f118cda75b55c74a92010c5e3b38b9665db2ea24368a6f597b9861802575438
+EBUILD xf86-input-synaptics-1.9.1.ebuild 824 BLAKE2B cf50f1f60d2db6f39583cb0d51ecde307b06257d4e44440a9d5bd8562a68005996ae3e0be7b67b0b6e110b114f553e746fabc4f27f8551f0de7c943d3ecf494b SHA512 47a51917484e430d7d78b97b1285db5aa9fe46ce0c8ac136b738fd4db764ed007445a0f4ee8f4dd8de2fdd922684e42b7d8d5eb5104c594ad6faab302841cf43
 MISC metadata.xml 567 BLAKE2B 9681ddc834f81beea16bac80ee70737882f3daa8bb0081df819fdb8ebd335d760a036bc4913d5f8fb38c8b014f397d13fc96edce46118f8424b972f1c5bb22ef SHA512 87c2ca0134811881a7e13385d1f435dca2af70c63e833e23647085327e790a2a6a66e0257cdf4f2a30a5c1c268efdcd3b00b2bf4be6d69a35cd25486d73170cc
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
index 4662dc300a54..e226bf3a1265 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-2
 
 DESCRIPTION="Driver for Synaptics touchpads"
 
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="kernel_linux"
 
 RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 )
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 212c82efa6ed..5297dc2a0ef8 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 80dc1704549c..0e11ce1a9cd5 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -3,5 +3,5 @@ DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf51324
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
 DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
 EBUILD gdk-pixbuf-2.36.12.ebuild 4076 BLAKE2B bc49bef8fc97cb3adcbfa5262713d700089f06cc7392bb85faf080ae02804520a6c89e36c024757cfa7f0e865e70a84639d4094d6a45de6968e3fc1953cf08f5 SHA512 516b6f8b9643e86bd19e10172ccc430e38a289f319a521b45ba336a6f87e163b26c51077a9e4a855502c240b7bedd63021a82b878ce1c779581b82e78a82a0de
-EBUILD gdk-pixbuf-2.38.1.ebuild 4090 BLAKE2B 0271340bb02ec1e4e9c9077e3c51a86f67bf4fc589c65890a3d7a21dc933d0b28a2c762b66ba5bf42923353213798da86434d88469133e2e823e0230fda8d1a5 SHA512 42ea3d708a1e24f01c6ca91efc02583d78f7fd4c9ef3af2e9df72bb4c585a6bee10e057413e91f2dca727c2d3ae1cd6563c0ac6b7604a4df9143f21ef04cf141
+EBUILD gdk-pixbuf-2.38.1.ebuild 4089 BLAKE2B b4e8149a43f84e3ecc18b2dfaca9d99b5f64fd6d11331dc565ebd8a326094d770c31095438ffba69c7eeefa50457ef14920feb9c8c6abe9932f1bc9af824103e SHA512 1d8feb54cbdb851f6e690bab59f20a8c449953ad5ce3626183d78026e9f1bcca2cd6986a0c1ebbc00ed91de65e75097cb9a87b326699b465556d1dea8e4eadbe
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
index 3e3f3ed69a6f..f3d5501c7c6f 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X gtk-doc +introspection jpeg jpeg2k tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 0ad15231fb5b..12afc9b37d21 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -15,5 +15,5 @@ DIST gtk+-3.24.8.tar.xz 22419364 BLAKE2B 262384d0bf1d843edfcb13007eae3584235fa16
 EBUILD gtk+-2.24.32-r1.ebuild 10008 BLAKE2B 8bceca83e3a73a2565cd980c80d1baa5fa2a79de61b4b8cb984738bbf6740c59a5df4b04e878fa2282d46642970e11dc4db8dadbf479447576b854f597b274cc SHA512 f3dca376a7794bc8ecdc47362a09dc58d46de7636dc0fec7dda86727ed47cb0d2105d5901884b60ae0601159ba1a79d0da2e05d725e0d119d9382a7771369ad2
 EBUILD gtk+-3.24.1.ebuild 6868 BLAKE2B e602a63f626d30650b4ffdec0b7e5f21447646bd5cfc3c179aabbbe7c0447fa4714774e929becd35986dd39c4f800858721212945cc609f769aa451c39efa9c2 SHA512 779d1a44e18d00cb6051df289fc413bb9766ea4be932fd6207f83ac0d71c9a15883d585f778c1752460e5957a326f9d2b16550c1009230623c8561381bd51b6d
 EBUILD gtk+-3.24.4-r1.ebuild 7234 BLAKE2B 7f9ba74e4e52d0a12c350782005a939dd35dfba9c488296307a51c46aab52eb5c9548dcce600931f5041323b9471d01639fb80ebef562b4c75c3055839062663 SHA512 c036f96ed89adeb14441a07a04a6c7be48871a207c07faf2ab466d37e15d944a2cfc808198fcad0762db01ddee406ebd75186a07f67c6b644c46ae08c1516363
-EBUILD gtk+-3.24.8.ebuild 7069 BLAKE2B d2468810981e7ea4410e69320d8348045a230ff2e29c0b45e24ed8525adc9a9af7afac556c7ce2782b5394f8f2390c571087d115322f8183a5bca043a48e5242 SHA512 9c0f312a731aa96dd668f98cb865e4b285aa4c8822661ca4e5e154e70b0caa8ef5f0c6b38eea5ebb4bd74600492a724d646f6caaf8a542698f06926c1a5c152f
+EBUILD gtk+-3.24.8.ebuild 7068 BLAKE2B 9092fc5e7c50296a31d57679463fcbac832027fa0847aabef4ea2ac4858c9254c69ff62dca0d933f8dbe27bf50e15fdbf22e65276d8a9b3081b36a04d04e5c72 SHA512 c3f421ecf4bf9b954ace0a84fd17ed5cc2b4597c144b69ac0ec3bff7101261450b1fa2939be29c19dde0c050b2cb2240f40f3defa7943272289ebd27d6c42522
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.8.ebuild b/x11-libs/gtk+/gtk+-3.24.8.ebuild
index b2e17857c858..4b04b444cb59 100644
--- a/x11-libs/gtk+/gtk+-3.24.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.8.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 498ad1722551..40d7f49eeb63 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -6,8 +6,8 @@ DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3ac
 DIST gtksourceview-3.24.8.tar.xz 1408964 BLAKE2B e406aa9f776821abfcc87333fc955b4f3ae334f73a8b1dfa0b123067df24bd4f473e326347c99df7dc6c97adbdde8739cb301e45ca70324f6e8de2ce9e1ea973 SHA512 84a02278344f9fe3c1b8f2440c6179feaea53df93061c63023d92bcaa1ec7ff8e95e1f3a463c23d8487c74492469f3dc367bcca3975ef169bf03925ecee7f7ff
 DIST gtksourceview-4.2.0.tar.xz 1410764 BLAKE2B 8f20a762c16a0abc47ff191a2ea4d6b44a397cabee056e98263d0ba59cbc7207ac72341a630aa83fe7855804bd6add77e0d93e706ac9561c9577843f17e00246 SHA512 f2350b1e7042309c01be0feda6059d788a7ef55c4ccd48e16b4c92a71292ed6f92243455ca42aa0950db61de8d68f4a76f4fac46cd46316b690bcef1ea34c641
 EBUILD gtksourceview-2.10.5-r3.ebuild 1371 BLAKE2B 07d773c8d95b87d929fc337d131d3c334a7063be8fd0af0d83631e02e14357aa3f57773f72f86c38b296e73fa8cc91b7d5e873e20041938cd5a214180bad921e SHA512 b4fb25286017d10ed43035293ed1bc7bd5e89b13ed411d3b3d22cfdc551dc2447c0ef21dc0efaf7c3ecb21b1a69c7d9f5dc9f15b78c358005f17987085f6b04f
-EBUILD gtksourceview-3.24.10.ebuild 1303 BLAKE2B 75da5a2157e6d6f861a07da939eecc8902cf276b57a00cca014a1c3fd7c778c0dc90ea817dce3dc1f4bfe634594bb9c2959f2ea826f72d578ca99473098c1e64 SHA512 235c5dc87df5db85d25b8a0acfe67d633d6aab8e988792c786e0016b051b3054fb007e99f6ac08e7cef105b3152853ee6498b2d95d338d6a0a33ed658f019a89
-EBUILD gtksourceview-3.24.11.ebuild 1305 BLAKE2B 836d8b02ffe41dd37e5b60b3d05b3f3e97e77f2c19d5bf02d2aab5071c4bc8cce90365d1e87b54d6af015ff1bd61a954c1783ef68a784821db310ed3202b91b6 SHA512 d560f3d691c4980a8a917fe601c175b057f9010ae586a9de0996ab2a565c53f68d57a30b9d09f1570dbe16a520a444088ded928253d121a84f9527729711845c
+EBUILD gtksourceview-3.24.10.ebuild 1302 BLAKE2B a379a8c41d4cdffba099cc17d765ee739d1cf11bf304c09cc762920a184fd51410469a7bb480f11247a0bd56748674dd2098a580ac8d85a8cd4b7e1431da506f SHA512 b92533d806f0ec2afff0a2bad8bc20401d5a8e4dfdf05b4a1263872b5199b773c781b394bc420807ccac279479cb494fd030c54ba825e42117bf224800bcc09b
+EBUILD gtksourceview-3.24.11.ebuild 1301 BLAKE2B a8f7df9f565437a6b34e588dea5a7d493414a8b06888245498136c4992ba3eb6303fa167077412d8664b3fe3badb555bd402e9b4bc51fd0c6a54cdb52371a0fa SHA512 4ac49039dbd30a37756a08cfdc425de615cea735bc8c65dbf8216cb1e27cef454744c9a64cc9f1d5082ded904dac9a10ed7aa635b2da3829a9fdbcc9690b5248
 EBUILD gtksourceview-3.24.8.ebuild 1341 BLAKE2B 394f5dd3f61147fb8ec00df11f9d3b2fffe3bbf6bade00e816509753f842110d1bcab10572b901f1825bd937d05c50e6d3e7a05fc6646dc77a9409cc35dd4291 SHA512 354e3549b4b61259abaa4e8ce5a1f4bc191adee90ba9ad1ca8adb54796d86141f498ecaf35a7839149f2e0804172448a3dac700371951530c9cbff3bd7a6891c
 EBUILD gtksourceview-4.2.0.ebuild 1644 BLAKE2B 2f03e337cf53ca9a5edf31e6b72c71d0a50a4c7655c3df23dfa3b94e94cc164416a842b573718ef0665eab04a7f3b3f3a60ab230ac4c9e2134d8ef873ddb4b50 SHA512 465999a1319f257397373df7a6a75222ecbd14c5ac5ab479c12c0e394d61ca2bd2f0b5ce7729d5bfb3d46e54a79417d2008395b984a09db2da6695b93b998799
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.10.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.10.ebuild
index fa0136f80f78..e804eb2a6441 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.10.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.10.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
index 0fd73d20f6c1..83c6b4248bd5 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index 5a09e01b6e83..d29ef5a591dd 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,5 +1,5 @@
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
 DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
-EBUILD libfm-extra-1.2.5.ebuild 2565 BLAKE2B d39853407d9a146d8114f9f06c53551b0a800acfe15be1e425b6e5b0a7a4396ec912cf63d486537820c32a70628178e7111933f5be0dbc5b62203c85872a69af SHA512 f4775b74a6496c15115d8e2c79b8faeddbb6dd0e18cf93e5675d51f7d62c9b490dee85c9bfd8ca0f0b7a28e0f74913580a12ecef83aa89e944d226d8569a86a5
-EBUILD libfm-extra-1.3.1.ebuild 2579 BLAKE2B 57fddd0541183c3a571525d5da01d304150f50896a484dfaf772b22e1f602065c58db5b876ebab410d7044288377f02ccb8dcd3c9c1412684016bafc3cf3d5a2 SHA512 aec03e6d46edd9146cae44f17a6cd1a5577161512c0ca4a84307e9e31f61f19a0bd2efa20363f22f9720afe0a80a6e1bc2c200cd713370d6e87f97ce8f2898cb
+EBUILD libfm-extra-1.2.5.ebuild 2583 BLAKE2B 568b4b39ac46af02a067841c9985a6490a608d4ba556ca31404ccabb2c98ec1587c33844ae568644866fab80f717a528c3c3cbadd635792bb957a623ef69518a SHA512 eb285f96122dfc768505d7c1960b88d11f1b1ffbc57e6a5fbf7314a2e3e900bebb317db9a03e9275cbde8502326074b7517ff5fb045a8f08c59e8f03f6e7d032
+EBUILD libfm-extra-1.3.1.ebuild 2600 BLAKE2B e7966d77c1852512f0ec4667ee4e09695e850657cecafd2098167e805efd2fc7427c85c56b6fcbb1d17e1ba4588d4ac3c579184b292657b628c4bd489226738f SHA512 7b58303d33e67393d734f00c5535b8b1aaf7cc6e6b50642846651e5de9dc128f2536e177f96e36a9670ad68bf1fc06224adb208392622eb17418d3536c8eb4b4
 MISC metadata.xml 493 BLAKE2B 5f295aa7bd56f402ee0452a48ef4a68088d4256bc33480bebe6406e144e4bcfdf3efbf92d39a2f166b6265c8ad9459543cd82cfdbd03e4fb29ffbf2c3a0735eb SHA512 12e967cd0e2f30984b1c3d826c65e33033391687210e1a39efc837871b671fd002f2e2d17673366dadcf74bb55cf2c253524eb7b5e200160b6d982974ad6249b
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
index 831645a5683d..71ee3598ed4f 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 	sys-devel/gettext
+	dev-util/gtk-doc-am
 	!!<=x11-libs/libfm-1.2.3"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
index c4dff66b8025..4fee2a257f54 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 	sys-devel/gettext
+	dev-util/gtk-doc-am
 	!!<=x11-libs/libfm-1.2.3"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index e546b5e03ccd..1074aea7897a 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,8 +1,10 @@
 AUX libfm-qt-0.13.1-check-if-app-exists-before-opening.patch 2010 BLAKE2B 3f33d70abe1467df3b799602c3232af7a490481c1fb2c3dd5a68f4792dc45a251f1e5518df36604090d23a42c43d13051bd144b54eb15cb2a7c722c9283cbacf SHA512 cafb1b97a1f6faeb7e7e9da5fa7c323eea1754078d08e5e0ea4e437c29d7da371318ecc7b944c595ef60f3169697f35db9efbd2ee23282a2bd694fac19d2e634
 AUX libfm-qt-0.13.1-correctly-handle-mountable-types.patch 3498 BLAKE2B ed7a0541d2bcbed1afd30d0045f676f179a0c123376afaeeef29260107f80ea8b0cf89a3a55f4e004fd11a6157b4ef2d3c092c8ddedd2013bef321fb59728660 SHA512 3bc193a1ef82bbe64181e596e082cbcc26b60f1cad8f05cb1d1fdcc1d162af21f8935179e3cf8ff370a7640bd5299a2ef7380436f80f9c620489365fe76c31c3
 AUX libfm-qt-0.13.1-fix-smb-error.patch 11579 BLAKE2B 4a0cdc5c9579415a3334de6295cae8ae5b9a4fdbbd0ecf647484b58edd3c6bed07fc0b93050a81c6d0d55343ea3b0f554cde536f6873ce3db057a6da3e6c267a SHA512 cc00a79ceac417d969001ac35b3c65bb6b437b3c98c62d5e70ea1e23b1a0ad0e11f05ad5c49cee64cdc23b16121ba14a8fc8978aa42b4ba6c64da00f07f72f8d
+AUX libfm-qt-0.14.1-phantom-desktop-files.patch 4871 BLAKE2B 9466f517953a8733f72296bda5c8b0081828fceda505f1603b7d5db193fb7bf72b6ce7c3c007877558b8f1a4295fa73a496e0b279790126a5859bdbd246b07c4 SHA512 19b3803704dba01da16725f1cc20b4cbb6b50210fcc7f0aea397dd8061cff55f9a0e57838b48f59649d6b8e4cc53dfb992b6160687cfa0b8f46b2dda6d431021
 DIST libfm-qt-0.13.1.tar.xz 191972 BLAKE2B 760847be1fbb209003bd2b61a9c475ccf57721c469927039518a5f65543b8264c32f3e2c66c867be0b969fdf4636fb82cde0b2bd4e77b1365fcb9f61b0bd02c8 SHA512 29b8f686950a7b0ea86468d01ca64a6ff8316ccd5f0144808a4332692cf96199431470880a9b560780efeba7add833ab6a0d9b4b24220f8fb7091cc5ef151dc8
 DIST libfm-qt-0.14.1.tar.xz 328192 BLAKE2B ff229256d3232eabc046da1fed3e4b4e51a09c3d1f2815fa726bad62f3fc53111e5d7f003e82e383dde4fe910584644e66613cbc1803ad0e11f7b6bdb2e30cfe SHA512 a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7
 EBUILD libfm-qt-0.13.1-r1.ebuild 1095 BLAKE2B 7e1463e541f2676d4ece12fad6597ffe37cb6fc28af5d5c1c8206f7eee3c63b7c5367f3ea23a2ae15c9acc30c7ca0262e460734ba610438419255e031bd0b049 SHA512 60ce1fe6b3a84af04aa4ae4664fa2ebda0dc3173626698616d863a82506b48dbec8cdac67b8f111e09cb484a2bf709ee7643660a1fe320c92e89cfe9d7aa1f23
-EBUILD libfm-qt-0.14.1-r1.ebuild 822 BLAKE2B 080790b3711cae891be14f98b458e31ca8f83ae2d211cd5a3aa3d4fb7f06f50b5935e6497ca20514315e68d142beff29f8cafd7bcdcc15e8884080c5d6b29bb1 SHA512 d078e48cdd17ae37e27573698f057a88ab1cc88b405a5b911206e5d196bf90e5c6281482eed84a3eb24487713dfa1d929cf1815ffee4f066a4c5a94c87c43fd9
+EBUILD libfm-qt-0.14.1-r1.ebuild 820 BLAKE2B b0fa1057da70dde58554818955213b6b8fad6ab665866c49a76e332aae69e0316be9d4613750ae567aaa37fa13848b7ae07826f724dd358a22aa6579bc5eb21c SHA512 4efc8a8996535974ec8bd94b683910a271037d6103efe46c488da36e80b98c8c3207a5bdb332d79b8558ffce3318e17b9ed1f43274add20e38796f1d782ee513
+EBUILD libfm-qt-0.14.1-r2.ebuild 886 BLAKE2B a3ec8cf450a06881e5bae45c0d6fbb752516ba51377a2b6661ba91d4d446e5f9a3e6e82c59f8edc4e36b223c1371de6ef505f01198ebc0b5813c274c12bf888c SHA512 dd8c6886667c15d104ee4bdc9ee21bb76163c1be46128ca3e4cbb803e183f38a3ed199093f812b868fc7903b7e9ae636c4bb99ccadb89007c6fb91dc901e2d29
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch b/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch
new file mode 100644
index 000000000000..b9edab299cd4
--- /dev/null
+++ b/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch
@@ -0,0 +1,109 @@
+From f944be7d2447d5c579a57fb5519ee5e2dece5871 Mon Sep 17 00:00:00 2001
+From: Tsu Jan <tsujan2000@gmail.com>
+Date: Sun, 21 Apr 2019 14:11:14 +0430
+Subject: [PATCH] Don't ignore creation-deletion sequences
+
+Fixes https://github.com/lxqt/pcmanfm-qt/issues/944
+
+Previously, if a file was in addition queue and then it came into the deletion queue, its addition and deletion were both ignored. That was wrong and could result in showing nonexistent files because addition can also happen in directory list job before being processed by file info job.
+
+Also process accumulated changes only after finishing the current info job and don't clear all deletion paths after processing them (because, logically, only those paths that can be deleted should be removed).
+---
+ src/core/folder.cpp | 60 +++++++++++++++++++++++----------------------
+ 1 file changed, 31 insertions(+), 29 deletions(-)
+
+diff --git a/src/core/folder.cpp b/src/core/folder.cpp
+index 6c2b27d..2385a8b 100644
+--- a/src/core/folder.cpp
++++ b/src/core/folder.cpp
+@@ -228,16 +228,6 @@ void Folder::onFileInfoFinished() {
+         return;
+     }
+ 
+-    // process the changes accumulated during this info job
+-    if(filesystem_info_pending // means a pending change; see "onFileSystemInfoFinished()"
+-       || !paths_to_update.empty() || !paths_to_add.empty() || !paths_to_del.empty()) {
+-        QTimer::singleShot(0, this, &Folder::processPendingChanges);
+-    }
+-    // there's no pending change at the moment; let the next one be processed
+-    else {
+-        has_idle_update_handler = false;
+-    }
+-
+     FileInfoList files_to_add;
+     FileInfoList files_to_delete;
+     std::vector<FileInfoPair> files_to_update;
+@@ -271,6 +261,16 @@ void Folder::onFileInfoFinished() {
+         Q_EMIT filesChanged(files_to_update);
+     }
+     Q_EMIT contentChanged();
++
++    // process the changes accumulated during this info job
++    if(filesystem_info_pending // means a pending change; see "onFileSystemInfoFinished()"
++       || !paths_to_update.empty() || !paths_to_add.empty() || !paths_to_del.empty()) {
++        QTimer::singleShot(0, this, &Folder::processPendingChanges);
++    }
++    // there's no pending change at the moment; let the next one be processed
++    else {
++        has_idle_update_handler = false;
++    }
+ }
+ 
+ void Folder::processPendingChanges() {
+@@ -314,21 +314,24 @@ void Folder::processPendingChanges() {
+     }
+ 
+     // process deletion
+-    if(!paths_to_del.empty()) {
+-        FileInfoList deleted_files;
+-        for(const auto &path: paths_to_del) {
+-            auto name = path.baseName();
+-            auto it = files_.find(name.get());
+-            if(it != files_.end()) {
+-                deleted_files.push_back(it->second);
+-                files_.erase(it);
+-            }
++    FileInfoList deleted_files;
++    auto path_it = paths_to_del.begin();
++    while(path_it != paths_to_del.end()) {
++        const auto& path = *path_it;
++        auto name = path.baseName();
++        auto it = files_.find(name.get());
++        if(it != files_.end()) {
++            deleted_files.push_back(it->second);
++            files_.erase(it);
++            path_it = paths_to_del.erase(path_it);
+         }
+-        if(!deleted_files.empty()) {
+-            Q_EMIT filesRemoved(deleted_files);
+-            Q_EMIT contentChanged();
++        else {
++            ++path_it;
+         }
+-        paths_to_del.clear();
++    }
++    if(!deleted_files.empty()) {
++        Q_EMIT filesRemoved(deleted_files);
++        Q_EMIT contentChanged();
+     }
+ 
+     if(pending_change_notify) {
+@@ -404,13 +407,12 @@ void Folder::eventFileDeleted(const FilePath& path) {
+     bool deleted = true;
+     // qDebug() << "delete " << path.baseName().get();
+     // G_LOCK(lists);
+-    if(std::find(paths_to_add.cbegin(), paths_to_add.cend(), path) != paths_to_add.cend()) {
+-        // if the file was going to be added, just remove it from the addition queue
+-        paths_to_add.erase(std::remove(paths_to_add.begin(), paths_to_add.end(), path), paths_to_add.cend());
+-    }
+-    else if(std::find(paths_to_del.cbegin(), paths_to_del.cend(), path) == paths_to_del.cend()) {
++    /* WARNING: If the file is in the addition queue, we shouldn not remove it from that queue
++       and ignore its deletion because it may have been added by the directory list job, in
++       which case, ignoring an addition-deletion sequence would result in a nonexistent file. */
++    if(std::find(paths_to_del.cbegin(), paths_to_del.cend(), path) == paths_to_del.cend()) {
+         paths_to_del.push_back(path);
+-        // the update queue should be cancelled for a file that is going to be deleted
++        // the update queue can be cancelled for a file that is going to be deleted
+         paths_to_update.erase(std::remove(paths_to_update.begin(), paths_to_update.end(), path), paths_to_update.cend());
+     }
+     else {
diff --git a/x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild
index de820366ee64..6856ff994d3b 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild b/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
new file mode 100644
index 000000000000..54bea0084811
--- /dev/null
+++ b/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/5"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=lxde-base/menu-cache-1.1.0
+	media-libs/libexif:=
+	x11-libs/libxcb:=
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
+
+PATCHES="${FILESDIR}/${PN}-0.14.1-phantom-desktop-files.patch"
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 4271a20089b6..f0079c696878 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -2,6 +2,6 @@ AUX libfm-fix-use-after-free.diff 863 BLAKE2B 6ec30c5c96ea4b33a1b21427e223bde954
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
 DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
 EBUILD libfm-1.2.5.ebuild 3719 BLAKE2B f117cd5f6312e2734ae70e0ef7046143b6768f3174d4a506f374cbca29d049b6b5fcafd21d4ba4714076adbcbcfa096b0ab22bf8471de31c9f79ba1f9b86a32f SHA512 9d873ec7eb023f3e41c9d43b68415b270c871b0b46aeeecd62c8bd7ab0a6c07519cbd777b46eb11cfb211ecd510afac13f9349c4600b2f8100e8f4499cc7b160
-EBUILD libfm-1.3.1.ebuild 3625 BLAKE2B 1b0b71cbbc5242e07e80845dd7fcb1b9be5f28d246bf778d071a980b4eacf5012d2bc2f3d66a04a03523a776c605b0caef44bb0fceb2a07c2e6d6a43387eb3a1 SHA512 c792e2074bae2a039b7a19646484bcfb6d43f1c0135bb2823e1385a9d5606a109ad2a9e3c35f7f8a1a84dab42abc102047f25737cfac6ec8a38d2f0c1f535ee5
-EBUILD libfm-9999.ebuild 3431 BLAKE2B 2f0c94b93a17784f26b4ef81171a41fdbb07b0d57490d5b9afb725874a5a05d912edf3d35806dfb58bb8c1949d1f035fe2be81468ea09fd9081cfcfe03ede4a8 SHA512 8073f7d92c8547fa3998d17057d9d22348e2fb6c57c84a332477e18b7a12d35118661792eeda254fd9a9fe09ff4102c3c3256a5ebaa62fd8ba8a96ab805c32ec
+EBUILD libfm-1.3.1.ebuild 3646 BLAKE2B f220e5cd94cf794bd6ccf6e0792cb05af80a513e0b9020779ad45e8f528d5341c5f7afd00c27c06e55d88dcdcd43674577a241b1d3543cc3c7c5bd60a6690300 SHA512 98dbaf8cf7f6526c9248af28c6fe8ea4a8271ddcf80796ad70e2e0bc52971df4ea7d8e9a70fc513627d0b08314eda5c7910042358b81de5b5dc5036b391c4ede
+EBUILD libfm-9999.ebuild 3452 BLAKE2B a8d62c8fea51194c5514f973645bb4c5d2ca28ee895b188eadd181764c6c975cbcdb6429ff2e85df5b71c6852a9f0ab7333e6a54a71ae98a88fa2118840cd87e SHA512 55c4dbef3ab6e2f6820e8f98220043a469b3577a04841d8f9b09b0e995364b0ff76fa5b180c4a24147d479796a87dc709152044048b5938d0a39a8567b9b9507
 MISC metadata.xml 774 BLAKE2B caefdee6833d990105f460b981552ead9ccf7e463bc54816c93de770efcaec85ba3e9d6bd43c56fb0ed36736ec7e850a70c57b49d5b3f262b25bac1f3712552e SHA512 025fd60a7244e8cc4040da0f53c47be6437c1d4c1cee5601f25fd54a9b6f294abd8e0c10ef356e6a3a390f8bf773a6a9a17271ba448a686764e75d332119b7d4
diff --git a/x11-libs/libfm/libfm-1.3.1.ebuild b/x11-libs/libfm/libfm-1.3.1.ebuild
index 55117ef17be9..3230e2897234 100644
--- a/x11-libs/libfm/libfm-1.3.1.ebuild
+++ b/x11-libs/libfm/libfm-1.3.1.ebuild
@@ -37,7 +37,8 @@ DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	dev-util/glib-utils"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index 6aed4f9e783e..5b87cedea7ae 100644
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ b/x11-libs/libfm/libfm-9999.ebuild
@@ -33,7 +33,8 @@ DEPEND="${COMMON_DEPEND}
 	)
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	dev-util/glib-utils"
 
 DOCS=( AUTHORS TODO )
 
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 3d7d0c9491d6..f1c182fcf690 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,3 +1,3 @@
 DIST libxklavier-5.4.tar.bz2 390428 BLAKE2B 3cd109c6200ef977533d39b1362c33f871c2cd0b011779b726546aa7dc95bf7dc89931dff7ca2e9a012a51aeec602a53df499591ab30e1dd813fcc823318a2e2 SHA512 e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae
-EBUILD libxklavier-5.4.ebuild 1367 BLAKE2B 2bf6ca8f1c4b355df387a8bd61344768909beb1b150662ab6509efd0186696d9c1675f0d2c68434ace6522bcee8e19fa45f80740a58c128dc3190a1395f44cda SHA512 3d89b0905d08fad3db0e259025ed2346ae17edd58313d848a3fed7df55d2524b3ee00e5fec193c7b09d1ce2c68d777250fe25c04fcb517b34713353201eafb56
+EBUILD libxklavier-5.4.ebuild 1363 BLAKE2B acc5ac0bcdc29c582074dd3ab1767dbc5e9310793e801783f6265e7d9b797064a9126cea6011ce1cda10ba9eaa3692afdaf5aa2d5984bb69231c293b01172ea0 SHA512 214585c4b371c8c9fd20c4916ee546205ecf3e9747169071bc5b5cc95eada5e3dccf9ed83177cd1c44e9682eb9b9836d9c43307194aa691f20281efc1bb17e77
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild b/x11-libs/libxklavier/libxklavier-5.4.ebuild
index 3004befeac46..10cb8a219444 100644
--- a/x11-libs/libxklavier/libxklavier-5.4.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~svu/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/16"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index d7308d84e6ae..4041868ea5e2 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,6 +1,6 @@
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-EBUILD pango-1.42.4-r1.ebuild 2293 BLAKE2B 58c0829ce3439304a94bba0c46900a6cc50ddb11f6c01fb12c1932e50dcdbf8f7c5ba462002d26a607b93b9a3315c0412d69f96211c2841f659b494139881ef5 SHA512 ada5d0136b967e8a7895d32a3a8c7b3d19f03655a97d01ff15420fdb9a04f44472b0f8d77775d0db8ea6f39ad9744ed64de3c2ad749ae23f0d88bb599893797a
+EBUILD pango-1.42.4-r1.ebuild 2292 BLAKE2B a19fe7f4b688489df92e346e3cefaebe1e6c4e017a1c4b688a51a3679fbf004e4fc3d48ea008caab95bac3d18082a9d38f387841363295112c1d5f9e328576c9 SHA512 7a0fe909aaecd42fff66e4861ff122a1ef2e2e444eaf9f8998a6a02e3986cab9a95462a25357a3bd3f495e05151407d17cb9a2b2623e1a21f37a47fff3d6a228
 EBUILD pango-1.42.4.ebuild 2047 BLAKE2B 1248ddc636fd6345ddf29062120a48e81e6047f609e0ee2f18d62ebb543163b7b0c37ad7457882b50c07af0a781c95e5e93a31bd033755f50ccab3c9e337a79f SHA512 4da1edd151fc0bc03c8712520ea21145b9bc84209372ca9d81023d0f59e66a0883820c0a5f188f575d709ffefb91b81c8eef04b0b4a5f13b3392d49a9da624c5
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.42.4-r1.ebuild b/x11-libs/pango/pango-1.42.4-r1.ebuild
index 70de8eab6d14..2f658c76c01c 100644
--- a/x11-libs/pango/pango-1.42.4-r1.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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="X +introspection test"
 
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
index 13e0336f46da..3717c26e438f 100644
--- a/x11-libs/startup-notification/Manifest
+++ b/x11-libs/startup-notification/Manifest
@@ -1,5 +1,5 @@
 AUX startup-notification-0.12-sys-select_h.patch 928 BLAKE2B 048e3a834d6ec993d629bd72d13fc3008b7c52885cd34f5b057c77c5be3b8601e05d5280443eb567696ff5e590f49f3b6f184971c92e8bffc8b94cd1103e9b81 SHA512 5f89b2747a2e5d633229b2e858380919121bdfd8f5788898824115fe5c4f60ffb51d0303830b7896657a96f4c2468de0ada0a72782a48cb990d614a1805e91cd
 AUX startup-notification-0.12-time_t-crash-with-32bit.patch 3377 BLAKE2B 2ed2cd342d606e6d3a2065aa127b7c1e2f6352c9e8142795d2a3a654706d771ec5a8cd1c26d5f75538d8961d081577cc3738d1c169790ebe954d3ade07f1721d SHA512 b1bbef28012a08e265e19296f6f6b1adf4bf82efa2d585680f06a352258deee6f2d8b2f842a8f27febe78f23048afe5f39fe80bd555b826aec927d14a289928d
 DIST startup-notification-0.12.tar.gz 355285 BLAKE2B 9822de9745fdeef28d7c6422d2a967394ffc329e7f37e1676c79e900f8e776578698ef47ff199fa05aa795540382f5eab5cb63f6cb20512328897236df1ab152 SHA512 ea1246acdb50dafd9ced9914ec3c8f0d499c0ca3cfd447b43a444c768a6e9ea7135e5c42d9ca0089354698ac235bd86d42f12c70a3a17c9c79f998c07461f7ab
-EBUILD startup-notification-0.12-r1.ebuild 900 BLAKE2B 9c3348c09282911771853837abc74e571b9fd7a81b7016d829d908d2541b5006adbfa8e07d23b96992a9743294c0090675fdf1e57a602226187eeb85d8702c76 SHA512 db328ae37073e8389660beea496d390805301aef7eb9ea341655549a79be42c1109117528a5badbdac425203a56faa24136bbc9a8c6b1daa73238f1ccce32625
+EBUILD startup-notification-0.12-r1.ebuild 899 BLAKE2B 856aa9910d949b6fbdbffdf6900ddf74c02619541e8230760861db77ce2c0a2b8a55488123289d18d58ea227a56d021086612ff5705ec68927adb1bfa3892c93 SHA512 f9f4d01dd1157d3dad263a94e677aa7e1d0ae335431f27f1b8818be18c9cabb83809901ad69d77e576d0f3000a4956c449305ffd9d2eabb6c3c548bc5185a17b
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
index 323479b453fc..84aab9058959 100644
--- a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2 MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.4.3
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index a294b3a7933f..3d9481980547 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -9,5 +9,5 @@ DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444
 DIST vte-0.54.4.tar.xz 1087748 BLAKE2B 65fb762414e832930ce1519dc99fe306b3c9c3860bf8116c29e66b758178d1f0a52705cd6f7ab1be30374fb2956a01aaccc8f6859d0af971f2037809421bb502 SHA512 7e0f4140a4c474fad9a48eaf0e4c29f83e7bf50719087983c238b362c6303824836c34485eb2ca135be0961fa4b83a318d08ef70d4cf0dab0d37dc2e36710c41
 EBUILD vte-0.28.2-r208.ebuild 2962 BLAKE2B 7004c56381a05ed2c0c309736581f2e03478faae88903ca6eb2b74acfefaf37464fc8b1f1a077d3bff1344ad6a60383f4338b0a27ce2521bb0f68727eb252da6 SHA512 bf607001b0dd305cef30e4f1ae3389b73ae30c747a52915e4dd3df9bb051c44f29317c591a2d47add9bc0e95559ead75155338a69acd31fea9fb79c57f18577d
 EBUILD vte-0.48.4.ebuild 2296 BLAKE2B 1ae75d444433f1c6ea478e69968ae1a369b96e6ff7410a22a7f110d157369f15aeb0b22662da1ca4574b60b6151932823e2866596cc45394a38b76eb89009fd0 SHA512 80c270a32cf543c2bb29a534ff07179c5897505132383862cab59ec203789dda70e3c62e6cd6dffe305a3e36113510f2f5b7dfb49bf1de1e476e87a685499315
-EBUILD vte-0.54.4.ebuild 2221 BLAKE2B 9d917a26722a6bf7ccc904437d54da15f3ea3fec9a5a44c64df787e3912175b3599045dde0f90bc40d53fe9547fb3ff6eaed5774c4cf4d1a3bdc180e345b85cc SHA512 0cf5c5054d3bbc0c90fb7ba0af6b5626e20ff88bc7f58af431b36270d6bdad262f5556adb32e05a3c641f63fc7a3fb1fb005bebee14c7a7a6ae671ec08842abd
+EBUILD vte-0.54.4.ebuild 2220 BLAKE2B 0cf1f3d9358bdd6a049c879e649b7c17f4dbb71674845681c5cb81343991e492ee22bf9dbbf99f62f409c58c3dc4a6ff3c42e8ea6d5f7b222a1da68d931c8b84 SHA512 48f232b530ccb9a262721c40f91887fc916ef2a7507461a34887fbadc73ee05eb54b6a5b2ddabe426b143a2a8e8f29f2241ca27d316c426ae881c0abcecc908e
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.54.4.ebuild b/x11-libs/vte/vte-0.54.4.ebuild
index 4c8942032ebf..6e4ff6239afd 100644
--- a/x11-libs/vte/vte-0.54.4.ebuild
+++ b/x11-libs/vte/vte-0.54.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d91f03a0a453..3162da9aee32 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
index 6ee4997bdc0b..b7d92c87ea24 100644
--- a/x11-misc/grsync/Manifest
+++ b/x11-misc/grsync/Manifest
@@ -1,3 +1,3 @@
 DIST grsync-1.2.6.tar.gz 333540 BLAKE2B 20719580309aba5737b74e85629b21b9715ceb8d97bd00d1840a5eda0e04316439d90999b7b787cdf8b368fff90ba489dcfc3b91992dd599f7ae05f4a565f1e7 SHA512 a7aac0cf264c968d50896156730dc0b925045def6e513adf1f2783e19fd1cdd423aa69480963479b95927fb4e863f110f3fc0439661ef7cfcacc7376fe95ff1d
-EBUILD grsync-1.2.6.ebuild 494 BLAKE2B d17c88c8fb447db42f6177cfb85b3060e263f2cdbdf56249e1fe663ed623dcd23c50d0096e6f936260128bd74c0ca84aab17bdd0e7078feca717b9c89a34f48f SHA512 9b6d264f5a7093e6549e2023f7aca53754b79033b23e113841d3322c9712c17350540ff71c95a3a5a9ff89ccb237b2872316ae856a3483a6290e0d4f0c926eb3
+EBUILD grsync-1.2.6.ebuild 498 BLAKE2B 3ed19359d70b48cdc85befe8569b7a1b1b4336131c3b6a2d18d9c6ad221d257a5c414117c58c75a99bebc1fc20dd9d8a244df5b2f516825e39836cee9b39a2c9 SHA512 df1a619c1722547c956fd79a4490f13cb4e6aaedea6e2ff054f22bc419ee93dc5bb05cd7d68b8328f8899758ac066a1f53fa2b50ebee8acd77246f111a1759b7
 MISC metadata.xml 258 BLAKE2B 46e283e28202f000bdb3b2b01ac3b3e4aa25a42715e1940135cdcef61181c745865042fe44a908a5d3e83308f7f98f0eff2b8519c0a4691e3bf5637799de420e SHA512 9909d39f5a2a4d3c92d1c105ea5250603f505e9fbb0ff433c25290ac5c2b53f00d96fe8dc0a98bec2240298b3b7060503f59caf04cb47484a63e4057bcce82c6
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild
index 86540cbfa78e..3476502ec396 100644
--- a/x11-misc/grsync/grsync-1.2.6.ebuild
+++ b/x11-misc/grsync/grsync-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="A gtk frontend to rsync"
 HOMEPAGE="http://www.opbyte.it/grsync/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
 
diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest
index f84a7479b598..638554b2561b 100644
--- a/x11-misc/gxmessage/Manifest
+++ b/x11-misc/gxmessage/Manifest
@@ -1,5 +1,5 @@
 DIST gxmessage-2.20.3.tar.gz 274110 BLAKE2B 9863e680b1d23ba3d69c35e2de826106f1078f585c0be36d1ad51946abbeef8637bc2f872f9fee20738c978146adebfbe47548de48be6b12b92c314ed93d9c32 SHA512 8f677d0ee899c88a40c912ba68b59ba9a21a0ae21db467c64756daea41fbf2a7fb566e26c74e72f89e6009b1e8029af9bd5748f92099f681346399fe7e9d8e27
 DIST gxmessage-3.4.3.tar.gz 275354 BLAKE2B 2801944c3a6542d250f91388a90736ba781013e5c370e42783db620387a07b315b176bac60e30af6e623d4f664291fdf567786e66a1f9e8c383dc772a64547e6 SHA512 4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a
 EBUILD gxmessage-2.20.3.ebuild 851 BLAKE2B d0b7315257ae7aa09db15c7da5625909b241e1f8556e4462483534e4f9da4ecfc56fbbab7da7f99545ab31cde696499804501dd37456cf9fa981555ea1b006c2 SHA512 2d51cc5dda9e95f29214e928197d5a15e7a7594eb4aad230671743731f5fc9df965c04da6d406c7d5f7e64c10224263e36b2addac54794d2ae7e07c6a3b9b903
-EBUILD gxmessage-3.4.3.ebuild 878 BLAKE2B dcfb0f94b7405893ad71c5beef5a74142615f0393e19ec99d91d38b7b8ae645cbc721299703321f7ae793f97c85dea58de731ce17c664f3a6d24abdddc5e534c SHA512 5048188f71c19770e5a4f0db6781556164517e938efbef47f5edd8d7c8ce318b6c52461052d64d5188f6d44638c4d617a7d5df39b6bf40a782843a87a59f2188
+EBUILD gxmessage-3.4.3.ebuild 877 BLAKE2B daf263c07b80ff2fe1eb143582373d14c7410833e07a11138799b78226b25e60e25b08be17bc4bbbdf2b0769f97cb51a279fa697def6ba096dec87dbb5e4901a SHA512 40599f39d099218580411a2dfb4b9fd83fcfef4b5ec91ccd011961e8fd12f2d14f152ef464258b2339c4c808bff6c56c70c4053ff61e32977495b54788234c8f
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
index aa81967dc82f..d06b773c8c53 100644
--- a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
+++ b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index 7342ce21943f..ed4c397773a9 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1,4 +1,7 @@
 AUX light-locker-1.8.0-elogind.patch 9190 BLAKE2B c60e166a853aaee5de2ffcbb708dd0f1b25b9fc5e2ec9a862bce2c0cd8b90928b0ceb4dae2a46e9ce3f41f9665911abaebccd9a73a9cb09c9c113788de60845e SHA512 a837a458d4d221ad4a009d2461c927168f64a3f50ef5484c0aca26913477d35cd0799605d66b8b4876b7530c7c604720fe95783576c658bd6e84b5867df1ef8e
+AUX light-locker-1.9.0-elogind.patch 8835 BLAKE2B ce54ca7d649d1cf88b5d6bf650a53885b023e3ca2c6b62c69a604d8c90e6a939372fd501af4a0beef2aa2a2daba88a353aea015f2446ab3e0ee5b9f6308fbbf1 SHA512 b46c09913d30127c9ce3df890b2308d9897020915960e17d36b732d6194dc269ae69f17afc4f1cc56f807c0e251a05c3b483f8baf28e8bd4820721192a9f0121
 DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
+DIST light-locker-1.9.0.tar.gz 124753 BLAKE2B 510447a5fa107988a06e92cc99d7750bc0df526356630694c5dc718460bd437879bbdcb69e0778bdb58d399aafdbea762bfda53d2e2205a1c4bade27dbff78c5 SHA512 c6f84b38affa20cf0bd7d2341f5a8eff36891ed55401955715a68a011c84c7f2300db670abb95a320eb40aee90885fe044ddf0a721e418ee4724af3e4f6a61a4
 EBUILD light-locker-1.8.0-r1.ebuild 1617 BLAKE2B 340b6658d7bbe2567a4d0786476b77d3979f0aae1c0d9a6c3fe5ce798d7c8aa30d7e0fc97688ed0ade1785c1707f768ddd57402a8e2bf2a946f529da44183505 SHA512 186ae4504e45b0b6f4914e93c009ef7c2cc954cff6632c91a2d3b6ebc81aaef099340e67a59292e1adfd4d7fb68be672f9bc9ad550f464e6e4f9e8c39cd66a55
+EBUILD light-locker-1.9.0-r1.ebuild 1565 BLAKE2B c30a4b419691d87823ec2c9876ffa5c51d48701c714e582ca80a89ff8db08bef7d585d20771f2d1809c127d9a37008888924256854d3eccfee10e53d9a7eb151 SHA512 2725cc37c34e81beca17d2db2679e92b15783c654fc779fe32cc4abc1842a1c9c7a49f6f8c01e9f535ee3b352497da42461b840529fe8542c704db76e8956a7f
 MISC metadata.xml 698 BLAKE2B a8f5e435f66bea6fab128e600e4bfce575c819c2de03c141e9d5ba72880dc58017fce9e4355d700c01d441c4eec56d19f0f2ec8d27027700decedc685a8a2d38 SHA512 583d1108a9be5b71a9e3867b60b20dba60a1c999fe7a27634456b9102af8193dc22e6b7a5410c520f5aa13482a290d4e6cf6bdcde070788fd7ce8d2b74ece144
diff --git a/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch b/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch
new file mode 100644
index 000000000000..298e75844c4b
--- /dev/null
+++ b/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch
@@ -0,0 +1,257 @@
+From 76afbe0757d8846d76bfed350aa9c9e4242aef86 Mon Sep 17 00:00:00 2001
+From: Denis Dupeyron <calchan@gentoo.org>
+Date: Thu, 23 May 2019 13:52:12 -0600
+Subject: [PATCH] Port light-locker-1.8.0-elogind.patch
+
+---
+ README.md              |  2 ++
+ configure.ac.in        | 37 +++++++++++++++++++++++++++++++++++++
+ src/gs-listener-dbus.c | 34 +++++++++++++++++++---------------
+ src/light-locker.c     |  6 ++++++
+ 4 files changed, 64 insertions(+), 15 deletions(-)
+
+diff --git a/README.md b/README.md
+index 86b66d0..b093a4f 100644
+--- a/README.md
++++ b/README.md
+@@ -38,6 +38,8 @@ Here is a list of the different dependencies and their configuration flags:
+ 
+   --with-systemd: This adds the support for systemd logind. This option requires the development files to be installed.
+ 
++  --with-elogind: This adds support for elogind, a standalone version of systemd's logind daemon. Requires the elogind development files be installed. This option cannot be enabled at the same time as the --with-systemd option above.
++
+   --with-upower: This adds the support for UPower.
+ 
+   --with-mit-ext: This enables the lock-after-screensaver feature. This options requires the X11 Screen Saver extension development files to be installed.
+diff --git a/configure.ac.in b/configure.ac.in
+index f95863a..5c92191 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -421,6 +421,42 @@ fi
+ AC_SUBST(SYSTEMD_CFLAGS)
+ AC_SUBST(SYSTEMD_LIBS)
+ 
++dnl ---------------------------------------------------------------------------
++dnl elogind
++dnl ---------------------------------------------------------------------------
++
++AC_ARG_WITH(elogind,
++            AS_HELP_STRING([--with-elogind],
++                           [Add elogind support]),
++            [with_elogind=$withval], [with_elogind=auto])
++
++if test "x$with_systemd" = "xyes" && test "x$with_elogind" = "xyes"; then
++    AC_MSG_ERROR([Conflicting options: --with-systemd and --with-elogind])
++fi
++
++PKG_CHECK_MODULES(ELOGIND,
++                  [libelogind],
++                  [have_elogind=yes], [have_elogind=no])
++
++if test "x$with_elogind" = "xauto" ; then
++        if test x$have_elogind = xno ; then
++                use_elogind=no
++        else
++                use_elogind=yes
++        fi
++else
++       use_elogind=$with_elogind
++fi
++
++if test "x$use_elogind" = "xyes"; then
++        if test "x$have_elogind" = "xno"; then
++                AC_MSG_ERROR([Elogind support explicitly required, but elogind not found])
++        fi
++        AC_DEFINE(WITH_ELOGIND, 1, [elogind support])
++fi
++AC_SUBST(ELOGIND_CFLAGS)
++AC_SUBST(ELOGIND_LIBS)
++
+ dnl ---------------------------------------------------------------------------
+ dnl UPower
+ dnl ---------------------------------------------------------------------------
+@@ -640,6 +676,7 @@ echo "
+                     Platform:
+                     ---------
+         systemd:                  ${use_systemd}
++	elogind:                  ${use_elogind}
+         UPower:                   ${use_upower}
+ 
+                     Features:
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 044a2bf..164856f 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -43,6 +43,10 @@
+ #include <systemd/sd-login.h>
+ #endif
+ 
++#ifdef WITH_ELOGIND
++#include <elogind/systemd/sd-login.h>
++#endif
++
+ #include "gs-listener-dbus.h"
+ #include "gs-marshal.h"
+ #include "gs-debug.h"
+@@ -78,7 +82,7 @@ struct GSListenerPrivate
+         char           *session_id;
+         char           *seat_path;
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         gboolean        have_systemd;
+         char           *sd_session_id;
+         int             delay_fd;
+@@ -134,7 +138,7 @@ gs_listener_send_switch_greeter (GSListener *listener)
+ 
+         gs_debug ("Send switch greeter");
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         /* Compare with 0. On failure this will return < 0.
+          * In the later case we probably aren't using systemd.
+          */
+@@ -175,7 +179,7 @@ gs_listener_send_lock_session (GSListener *listener)
+ 
+         gs_debug ("Send lock session");
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         /* Compare with 0. On failure this will return < 0.
+          * In the later case we probably aren't using systemd.
+          */
+@@ -359,7 +363,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+ 
+         gs_debug ("Send idle hint: %d", idle);
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         if (listener->priv->have_systemd) {
+ 
+                 if (listener->priv->system_connection == NULL) {
+@@ -400,7 +404,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+ void
+ gs_listener_delay_suspend (GSListener *listener)
+ {
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         DBusMessage    *message;
+         DBusMessage    *reply;
+         DBusError       error;
+@@ -473,7 +477,7 @@ gs_listener_delay_suspend (GSListener *listener)
+ void
+ gs_listener_resume_suspend (GSListener *listener)
+ {
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         gs_debug ("Resume suspend: fd=%d", listener->priv->delay_fd);
+ 
+         if (listener->priv->delay_fd >= 0) {
+@@ -1076,7 +1080,7 @@ _listener_message_path_is_our_session (GSListener  *listener,
+         return FALSE;
+ }
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ static gboolean
+ query_session_active (GSListener *listener)
+ {
+@@ -1212,7 +1216,7 @@ query_lid_closed (GSListener *listener)
+ #endif
+ #endif
+ 
+-#if defined(WITH_SYSTEMD) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
+ static gboolean
+ properties_changed_match (DBusMessage *message,
+                           const char  *property)
+@@ -1307,7 +1311,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+                   dbus_message_get_destination (message));
+ #endif
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ 
+         if (listener->priv->have_systemd) {
+ 
+@@ -1880,7 +1884,7 @@ gs_listener_acquire (GSListener *listener,
+                                             listener_dbus_system_filter_function,
+                                             listener,
+                                             NULL);
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+                 if (listener->priv->have_systemd) {
+                         dbus_bus_add_match (listener->priv->system_connection,
+                                             "type='signal'"
+@@ -1971,7 +1975,7 @@ query_session_id (GSListener *listener)
+ 
+         dbus_error_init (&error);
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         if (listener->priv->have_systemd) {
+                 dbus_uint32_t pid = getpid();
+ 
+@@ -2022,7 +2026,7 @@ query_session_id (GSListener *listener)
+         return NULL;
+ }
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ static char *
+ query_sd_session_id (GSListener *listener)
+ {
+@@ -2053,7 +2057,7 @@ init_session_id (GSListener *listener)
+         else
+                 gs_debug ("Got session-id: %s", listener->priv->session_id);
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         g_free (listener->priv->sd_session_id);
+         listener->priv->sd_session_id = query_sd_session_id (listener);
+         if (listener->priv->sd_session_id == NULL)
+@@ -2150,7 +2154,7 @@ gs_listener_init (GSListener *listener)
+ {
+         listener->priv = GS_LISTENER_GET_PRIVATE (listener);
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         /* check if logind is running */
+         listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0);
+         listener->priv->delay_fd = -1;
+@@ -2179,7 +2183,7 @@ gs_listener_finalize (GObject *object)
+         g_free (listener->priv->session_id);
+         g_free (listener->priv->seat_path);
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         g_free (listener->priv->sd_session_id);
+ #endif
+ 
+diff --git a/src/light-locker.c b/src/light-locker.c
+index aefc4c6..51ae519 100644
+--- a/src/light-locker.c
++++ b/src/light-locker.c
+@@ -139,6 +139,7 @@ main (int    argc,
+         gs_debug ("Platform:\n"
+                   "gtk:        %d\n"
+                   "systemd:    %s\n"
++		  "elogind:    %s"
+                   "UPower:     %s",
+                   GTK_MAJOR_VERSION,
+ #ifdef WITH_SYSTEMD
+@@ -146,6 +147,11 @@ main (int    argc,
+ #else
+                   "no",
+ #endif
++#ifdef WITH_ELOGIND
++                  "yes"
++#else
++                  "no"
++#endif
+ #ifdef WITH_UPOWER
+                   "yes"
+ #else
+-- 
+2.21.0
+
diff --git a/x11-misc/light-locker/light-locker-1.9.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..34e6e91e705d
--- /dev/null
+++ b/x11-misc/light-locker/light-locker-1.9.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="A simple locker using lightdm"
+HOMEPAGE="https://github.com/the-cavalry/light-locker"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dpms elogind +screensaver systemd +upower"
+
+BDEPEND="dev-lang/perl
+	dev-perl/XML-Parser
+	dev-util/intltool
+	sys-devel/gettext"
+DEPEND="dev-libs/dbus-glib
+	dev-libs/glib
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/libXxf86vm
+	dpms? ( x11-libs/libXext )
+	elogind? ( sys-auth/elogind )
+	screensaver? ( x11-libs/libXScrnSaver )
+	systemd? ( sys-apps/systemd )
+	upower? ( sys-power/upower )"
+RDEPEND="${DEPEND}
+	x11-misc/lightdm"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+DOCS=( AUTHORS HACKING NEWS README )
+
+PATCHES=(
+	"${FILESDIR}/${P}-elogind.patch"
+)
+
+src_prepare() {
+	default
+	# Fixed upstream right after the release, remove this next time you bump
+	ln -sf README.md README || die
+	# remove xdt-autogen specific macro (just like upstream do) as we need to autoreconf
+	sed -e "/XDT_I18N/d" configure.ac.in > configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with dpms dpms-ext)
+		$(use_with screensaver x)
+		$(use_with screensaver mit-ext)
+		$(use_with systemd)
+		$(use_with elogind)
+		$(use_with upower)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 447e3e5ce320..8a80280c0311 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,6 +1,6 @@
 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
 DIST lightdm-gtk-greeter-2.0.5.tar.gz 571189 BLAKE2B 583e75b1d621ffef4ade7e65fb3ab4891a119f1d416c8011a80d06e1916ecb5903f4c1af432052cb05a72aa38cde38293dd90eed00295fec5ff758e78576e10e SHA512 1ae31a36e19a2e8825bb0bfe4eef51f317306636bc0f14df9ee4c89c81d60ce7193d74e053ce59ae50c6fe05d27be73fb5a83cce732a0df4a3b4390539418fad
 DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
-EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2083 BLAKE2B 2a5513d297d356ba2983b3a767d4b053aa08742c83810584312835167a51ec1efd6a3022e39f42fc5f7e5265cc539beef6de2da58404dea0bb64166f0950542e SHA512 e23fc5efc3ce300a2e579e9b11b87a449a8cad55ee0262ded871b09a195f63739666435767988f9f41d0bbb14bdd4bc54fec1d9bab2a54a94eeb3dc6596cb73e
+EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2082 BLAKE2B f53208b088b0376a2206c982aa05240baa82701d8ce2da8b671dde208aebfdf8eb3b77d5ff496586df3344f186463021b50eac26bd330e3936d4278873df2754 SHA512 6765efd4eeba09f263eca279d9024d98c11e3f390db3cbd159b92245534d9eb435955f0ed9f8093c42d8c788d425994e0ea38ce68fc803ab4ecde173450fcca7
 EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2066 BLAKE2B 94d70ad4542c3438c99592e4d6a133c3ede5d3a80d02df9fc715ba3ad4606d22cab24a519ad3d17fa11dfa31b1fb8946359d1f6058c78f44268a0b22e35980ab SHA512 45f9a5d858d517356919821ed1f70c67b21f0e43de5ef4163b9f84344130c093fd7e1e71f2562e63f58c325442d3251fa0e87f63d37fc6bb71c485310eae5228
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
index 09ed49940b3d..318ca61e70da 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="ayatana branding"
 
 COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 8a6470b68594..c7038da68993 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -6,7 +6,7 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c
 DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7
 DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.26.0-r1.ebuild 3852 BLAKE2B 01ead162fd8ef1318ead8c9ebf8042ab687861f812fa2f63d2b5d664dc7acc199372eb2c578cf759ba47ffdd0a15b371b19181c7510007d929a37a0527de3855 SHA512 d6a0eda1ae31f1954830ac24111273102adf7c366b1105a3f5104426af13b25809ee53223bc0d38e4676ce774054b58a962a10620aeb762028dd1c6f2598d60a
+EBUILD lightdm-1.26.0-r1.ebuild 3851 BLAKE2B 818d44e66767fc8ca55c143ec008632aab9985abd2d00697db4ca46f129c7cde81f4a385b36f10ef67664142f4b464fa95519897c18d4af61f559587acb98765 SHA512 816e627aa18bb213f41e629160d6466494459720e264f0051e5888c870166f818dc5067a75341899d46b9e34f019cbd5cb1f160060666b849bc3bd0f3f1ec426
 EBUILD lightdm-1.28.0.ebuild 3886 BLAKE2B 2013d0787f3c0c0b3d4a68c9595d4df06ad4e0f040bdf89b814c5c12a6734e97c328265075e1de7271c0a1f64e8eefea6a27603e96ac16bdbd4bd2961b3291d7 SHA512 f6920480ce47f8364facb1e4b2b8e22b5d4065f9a6b5474cb6eb8656232863840d38438ba1283c3e006ef8331ce7f504122829c110d1288fb656dcc3983c04b7
 EBUILD lightdm-1.30.0.ebuild 4226 BLAKE2B 0df0010ad4e31f14a65c46acfc51c314edbb3e5a75d8f4e76bf80bd49983d6ecefaace3797c82cdceba5402a6d98796c3e22f6a9aa45548041a22ba13b36a4f6 SHA512 de7c1f643a8e4267bec58d9fe92d82f2419b6ffd568b3e6120e6e0dfaf342f8a808a2e9a093dc670acef7135e1f0fed39f84c1dc6768bdb93100474c3585a953
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
index 8277072aab4e..15b2902a69e4 100644
--- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="audit +gnome +gtk +introspection qt5 vala"
 
 COMMON_DEPEND="
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index adc01b08c963..73c5132b59c8 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,7 +1,7 @@
 DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a
-DIST menulibre-2.1.5.tar.gz 443986 BLAKE2B 5397e1f9d4371c017c8d2358e65bdad58b0ac10765f00fa51b2b20d9e404f19229da00719c6cb209020e5894708882d42adb30f4668e82929e0d1904ca7d3cf5 SHA512 d1bcd055d7f5c77df02470b4b6362ea5af8a6f4dd41f217c73673b63f413c3edca0ae18ccb6cff179a514ee0218613c3201e7687ec36de34436556b8a60a0856
 DIST menulibre-2.2.0.tar.gz 430567 BLAKE2B 7910f9f8e23b2ca3254b5a83a7c16315620bec38ff458a2fe3f65328b8b08ba424d853abb1fdb7334fd2b38da54b632a8d5b178a7cf876873d52c1903adcdab2 SHA512 d08d61fee3c5a9716581716c116d5b82c3221dff24093c765f6ad72d9dc17fde40ebdd2f17bcee7952b22bc4c78bdf1057cbc57af3c4651dfa6dc01cbd3ecbeb
+DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f
 EBUILD menulibre-2.1.3.ebuild 1721 BLAKE2B ce36a304c02ab5bcd8fe7d726cd2177e691aaad42a5e3c9045a6889c106f1db7af1d24380eb8359b7c48c5620423eafadda65567a945c9e2842c52dba3d246ba SHA512 a8f5203ff12c28e6fec86ddeea2f893e6c06a2d357829894da600cf9e6cc52d89fe895e886055e1e526e8917b897c90eacf5d4fda6e15b67e80ca55b97c53a14
-EBUILD menulibre-2.1.5.ebuild 1723 BLAKE2B e129bd9b2267f65ff31ba1d3162925b2c20f33507db2fc84158233ff23db933646fae498cc648611176c638c862b277f668ec80c26156d9e62e7fd577399fe48 SHA512 1c129bf2a83e3365aa7eb4805bc87660ff162339ed09be9f332abcc1a94f08a551564446c04c2dd8c3a847d08168f0f5d5c83ffc673a08451cc194de5596cf21
 EBUILD menulibre-2.2.0.ebuild 1747 BLAKE2B 2d2ac9931f476ec15dd7f832f46e688165767280d4fa5f11aa90610fe715d9fa71130927180fe92dc4ccd1208d67c28af0130df64609266129cf1000b67a56c5 SHA512 0b3ac7dd75e67c4d7d7184f55277a0bca97047f0b31b153f2e0e8a38fa7218aa052d66c3ed3710b1f78e66d29042f23932961ee2a4dc88d2cf2349206c7abdc5
+EBUILD menulibre-2.2.1.ebuild 1708 BLAKE2B 4063a5556b18b5585789fe6e0e19294aa4eaa94735d6ff79938ec8a4998a2b8e5b4e99ef5b17a75e1e2bd5ee406d0f6348879a132b0226a518206da6199a6dd3 SHA512 d1eb66ffc400e73a3a3d3883b8bc4a464bdd74f002f777d1be7e718de1013626bd92f2ba46861179e98d368eee6522df90b44cc100a97651054a607c11ddf654
 MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
diff --git a/x11-misc/menulibre/menulibre-2.1.5.ebuild b/x11-misc/menulibre/menulibre-2.1.5.ebuild
deleted file mode 100644
index 8cd4a64b1072..000000000000
--- a/x11-misc/menulibre/menulibre-2.1.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 eutils gnome2-utils versionator
-
-DESCRIPTION="Advanced freedesktop.org compliant menu editor"
-HOMEPAGE="https://bluesabre.org/projects/menulibre/"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	gnome-base/gnome-menus[introspection]
-	x11-libs/gdk-pixbuf[X,introspection]
-	x11-libs/gtk+:3[X,introspection]
-	x11-libs/gtksourceview:3.0[introspection]
-	x11-themes/hicolor-icon-theme
-"
-
-python_prepare_all() {
-	# too many categories
-	sed -i \
-		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
-		menulibre.desktop.in || die
-
-	local i
-	# fix incorrect behavior when LINGUAS is set to an empty string
-	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
-	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
-		for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
-			if ! has ${i} ${LINGUAS} ; then # if language is disabled
-				rm po/${i}.po || die
-			fi
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/menulibre/menulibre-2.2.1.ebuild b/x11-misc/menulibre/menulibre-2.2.1.ebuild
new file mode 100644
index 000000000000..c0aa8ef2a8d2
--- /dev/null
+++ b/x11-misc/menulibre/menulibre-2.2.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit desktop distutils-r1 xdg-utils
+
+DESCRIPTION="Advanced freedesktop.org compliant menu editor"
+HOMEPAGE="https://bluesabre.org/projects/menulibre/"
+SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	gnome-base/gnome-menus[introspection]
+	x11-libs/gdk-pixbuf[X,introspection]
+	x11-libs/gtk+:3[X,introspection]
+	x11-libs/gtksourceview:3.0[introspection]
+	x11-themes/hicolor-icon-theme
+"
+
+python_prepare_all() {
+	# too many categories
+	sed -i \
+		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
+		-e '/^OnlyShowIn/d' \
+		menulibre.desktop.in || die
+
+	local i
+	# fix incorrect behavior when LINGUAS is set to an empty string
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
+	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
+		for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
+			if ! has ${i} ${LINGUAS} ; then # if language is disabled
+				rm po/${i}.po || die
+			fi
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index b7f2d7b121b8..3d079d7b1370 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,5 +1,5 @@
 DIST obconf-qt-0.13.0.tar.xz 34348 BLAKE2B c44a79f4c70d07907ee4332ea75267b1b9c000371ee4d53b8db9eb9c624c6bd62a739413b8cf4038a514a1417ebbb8318c791bda2774d7420ac8a7b8b211d09f SHA512 537c10e286311d39f3e69c2940f4267d7dd2e55888e1e50d6aeb3cad8f694fec7792ca30e258a69cfe0c5361acecd4232605e47e71e27fa53b25f4bb65a0d703
 DIST obconf-qt-0.14.1.tar.xz 97032 BLAKE2B 8bfe93325d37bdcca40b38f99f635cddf39ad1781e694f002676f6ff6fd0d6c708908ca458a051f63509f572b247b4de5778a1451e763c4372038ef99a1594d7 SHA512 7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed
 EBUILD obconf-qt-0.13.0.ebuild 981 BLAKE2B 7d1e7bb88f8439c558bf752d1a534839fb8ae1873365ffac8b688e4ac327e98d38f86a7492e3b064a80a4a34fa8af0004ef4a4e9e0857d24964821513b931572 SHA512 2d618927d07d3ebceaedf3ce5bd84a998301afd8dd41185cafd413d20e30a41c21b66b883d2a2f6b6bc677232be5ddebdf17252622cdb9ecb54eb73fea682c4b
-EBUILD obconf-qt-0.14.1.ebuild 899 BLAKE2B 87e1bd33fee0f41c95d700e83c1be1a224d1d2966db49daac0190648813a898866a0e2f0e254a2aff8b84f1150c4f9dea24a2b7a9337511f3f54bcd5d38c22c4 SHA512 0704a793756fce2c076481173b516f0b638b154fd65e0cfd99bacccab8a6cbc0371c3a463431d758143685c1b9a8db13a5d33ff64505754e9dfaf026f82f12a5
+EBUILD obconf-qt-0.14.1.ebuild 897 BLAKE2B abc3c5c4068221a95161ffe51178b32baece88769aa979cb719e966922e04089dd229b11afd48f9cd08a6a6a0b240c28ae25e66ed13048abb02178574fa796f0 SHA512 ff86b7a9f2e3f924961461c959d9532e036f95c3d496ea00689173c754286e01defc784186bf1cbaa77c08aace6925b67687bf345dae0f2dad472c45cbe951c3
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
index a969ba2d4885..f67003d63b24 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 0ffbdf31032e..31f00f848c20 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pcmanfm-qt-0.13.0.tar.xz 104864 BLAKE2B 47e24ccb415bea27db9cb5f0ccd1ce6aebedc2f7140572939e533c3da9aca6aca29227a5be7954944ed82483b4420501adf22152628e3d44a206d4f9d5250412 SHA512 7b0d4ca5274e369e3af3c4b332a95ae78af54142aee39aae36832e85ca27d1f2f7509f00dc29d18a1e5a2558c8a82acd6569d2433acf13b2f95174c47779c089
 DIST pcmanfm-qt-0.14.1.tar.xz 227360 BLAKE2B 2401238ad53838c9f6e45d596c43b09eecf555bfe069a5cef633c0442867f04b636bebf29241cae8b5a1161a9dad5648390badcd6a3d8b756ac6438acac4961f SHA512 f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e
 EBUILD pcmanfm-qt-0.13.0-r1.ebuild 1064 BLAKE2B 2281e8f6f34669d2069a36a1a73a9246d1bcd6aa45e9f5f03d2b4f8f661b94975ce446e8d71c8f1384f5ec76d1e6a0a1bc28cabda36275c6ffb98b5563adb12a SHA512 8b27f29933e62f1f0545509924d2deff9712f9975ffcfed25e3d8fe345530bb3746d0df1eb243677ba826d32c1728275052743a152b7ab58bc6715b95fae2964
-EBUILD pcmanfm-qt-0.14.1-r1.ebuild 1143 BLAKE2B d16f8228d3b317e67b68786220f4ec2e7680170de6e703e50b0c174511bdb04bc569a63d628ecfc096007ca3b15e3f44c9cfd17dbe74e988cdb08e6a2a62e1fb SHA512 fcde9f4053727b670cd68b17dfb3761d15c9910994e88b128dbd1882b204b777905cc46486ccd113e6a844a3ce9531d76984ceb6737a449d8fc57c0cc51cc3fe
+EBUILD pcmanfm-qt-0.14.1-r1.ebuild 1141 BLAKE2B a0a6136ef47f11e0313a9a03a4804cbb70f4e40f63711772209566a037241647e942e31873bc8348cdd39ed9a0a3c73a72837f6f1424100c8a71247712e656b8 SHA512 ba8020579cbf486fa47212aa75155bbb80431b3930c96b018d8120ae4d0a199001ce0708efe940e78150ebba51bfeaa1b7b67427390e89db227494da7243d317
 MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
index e8f40638bef8..1a76e7238fba 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
index 64a1791f836e..0c31d3cc510f 100644
--- a/x11-misc/peksystray/Manifest
+++ b/x11-misc/peksystray/Manifest
@@ -1,6 +1,4 @@
 AUX peksystray-0.4.0-asneeded.patch 798 BLAKE2B fa17b9f091ccb94dc11c6086bc1bf648b08b4da3e192fa1998f09375e747cab854f25b72614998ec5289e2992ae1dcbd06dc47ffce5acb299bb4106dab35863e SHA512 d3f4c392d38b2e0f143d7e7dfa7a12ecb82e8d93f6651e254ee17d078487f6d95316f88d66a125ffc25abd2574a053f9a2b0e946bbba7f8a7d5b12903dbc8f21
-DIST peksystray-0.2.1.tar.gz 70261 BLAKE2B 8ff1d72e4cb0d35afc92b46acd7809095ded33630a896638e73bb64ad5b4eafbdcd02f53a4ef1251f567e7f9770dbce7161f47013b8e4543612506238c95b000 SHA512 c52fa6b7c8d5c57831fba993e85eb153d9b03ec04149b4d081bdde4854b099ccb423bb2e6eb36420093918f57449d208ed20dcca17344115eb989a095b69cbb2
 DIST peksystray-0.4.0.tar.bz2 73810 BLAKE2B 4ac452f14acff5afb8e14fc07a18d5efe6b68696c7063d8cd337c14b9bc0cdcb573ff830f9cc7e3b7057154a3e2a179da26977696101fbb56750320a3913b3d3 SHA512 9dc5d1df630b7447575011e971a9657a5987bdd6098c81444b7579c46bfd7747f4df18fa00376e70b046c52ae7ca95d6cb66ce8a57070795f2f8d497fa025341
-EBUILD peksystray-0.2.1.ebuild 606 BLAKE2B 993886553b8a18edc960ef0254ddee08f5f2dca7fa15ade3ce484d3e9eccf862c8ac6ec9972deb943bb01992fe3988c534dd48981e548bc058f6a4d0305f640b SHA512 e9de24dd129fc44d0f1396d679c6c1daebad62d33b3621a9cba9e4693ad947ebfefe129f42fe4e10f09ba9d39d09f1c1e1376e143e87633093b7c89f65991cea
 EBUILD peksystray-0.4.0.ebuild 554 BLAKE2B bfea69bc53205417709b9e6cb74e4cfa59319b3e76eb5bca9a50480a130dafaee741614aaaa2854f36d5419aa3bf62d526b48ca6ed05b4565d3cc555376f6720 SHA512 1f5cd4aa6252412b8870b1bfc5dcbc4137cf3a2ee156ec5a9326c3f1f57258ac04610134ecd081ea962432278abe3bd767026c1e732c32b6b46a9bbb79a8ef60
 MISC metadata.xml 300 BLAKE2B 750e120260f327b198e47b84c2ebfafad92c8e0e4565bf01b06df63ee8ba8c092d1a7f2474bc9b422d786393521c4a2439fdad56f7e5a90974872b904ec55eb0 SHA512 9a298c4fd2d42e5f14b22502fc97899123eb6bfa42143a1efd7df086c2bd97030ab04a731839e787774b216e08cbf829d7c9802b15a0a9ed412e94455e52f484
diff --git a/x11-misc/peksystray/peksystray-0.2.1.ebuild b/x11-misc/peksystray/peksystray-0.2.1.ebuild
deleted file mode 100644
index cfd9973fa440..000000000000
--- a/x11-misc/peksystray/peksystray-0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-DESCRIPTION="A system tray dockapp for window managers supporting docking"
-HOMEPAGE="http://freshmeat.net/projects/peksystray"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf --x-libraries=/usr/$(get_libdir) || die
-	emake || die
-}
-
-src_install() {
-	dobin src/peksystray
-	dodoc AUTHORS NEWS README THANKS TODO
-}
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 08102d2adcbb..828fb3c8a20a 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1,8 @@
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
 DIST polybar-3.2.1.tar.gz 242327 BLAKE2B eb7bfe6e6d58fb4389016b8e5c73feea3984ce3ccefdb1acf202c6d2873a634e4d096658b850e8534c5c8c56e42ac66b3b8e80dabf5625491e5f56523b043ddf SHA512 e93c33738029b2e56a5dda75cbf3ee804c0d89c406444da6991ea8a5dd00e5544ef51d20f3d67ec293fc55ab7095e8e3057aaf8d1c08af61cf0531297e55a18d
+DIST polybar-3.3.1.tar.gz 248790 BLAKE2B 30c2cd2ff537f3a2fe2fe7ce489b5a0ab76a54cd42bbdf8b3727e5f4298898e289c6ea10a460385d8bcdc8ab11749255573bf7d728a01eae895a1ed8a2214c27 SHA512 c0bfaf99dcd19f8fcca8bd041c0f9e5f11fb822c92cf12edc2c59e67896f566ee46d1a0d75f5583d393af3a1958c3244a4eb28224f6336e9eaa98a50d740f834
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
 EBUILD polybar-3.2.1.ebuild 1788 BLAKE2B c44044b3a7e3db34d10c9e018e52f192920f8a42fa6ea93e27c3cd0109143d8331c5f28e74958ed90fd569c632aa88257132c61625b0f5fb30cdfdb09f91b460 SHA512 db2abec6f14c08ed7beeff4fe90b2d832b5f249b64e5b0e4897316de597675bf06e4704ae8aa8635ec40fb3eca0e9be81c38889e82ddb7e98b73d99a69529980
-EBUILD polybar-9999.ebuild 1187 BLAKE2B b42e5685622509643cd9b8c73c2d119eb0adfc5904c52ddce1b66cb0ae4735e05e46a8e18e98f62ee6f47080c57869704b11fc2af7e593292d9736ee4d533551 SHA512 e548c3f17e6ee4c2f5190d5706d83ca567eb3c2f5c2a8bdda6e9984e6d2ba36b1f38c6052095152ca02958ff2fda7af211ff13e44f1294a0c4c7bf2a998fa5d0
+EBUILD polybar-3.3.1.ebuild 1968 BLAKE2B eeb084acbd61dddb5fcc2c1d84821c3a894717201df7233c7825e175212f46faa734dd199050ec931adabf6efb9ef937d24dd48f0e07a9cab50162cda91bd762 SHA512 23b5b98b3ce5e9c31dadbe446c72744f4a72969f08c0439e0a6982002686342ff40389948f20b20728346fdfd94f780695684110176d5c8335f18d3c677fe4a3
+EBUILD polybar-9999.ebuild 1968 BLAKE2B f3482b254e1e8ed6bcbb72531f94ffc3b21ac8cccf29992f6ec3794c3e8d650ef5f89f52f715f8b81925a6e726b68ae96e3de8e22f58b690951a854541bb6548 SHA512 25aaace811e587cccf2b4b2877bdf8e4da746043c0a574b93deaf53ea419e1612a4fcdb2e2af17877b2af53f4aebab1b23ac617555a66697c45b49302c6206e5
 MISC metadata.xml 580 BLAKE2B 965fdbd2a3799e0c8a9b6f03bfb7e21f1f413a226bd4748d860f4711d60bfadc2d6c2fdb37f3bf9933f2c494e7e6e0c0705c9a0ebef943ec2978f3aaf65c0176 SHA512 15b64a04e588b5edeec9aa5e579881c3e7c5a7f3fb66ed4443f32d50b850c437f65bc9050960710f2bb1e80ea52ccca9ecb19e8bf68fe66edddc8896a58aeeb9
diff --git a/x11-misc/polybar/polybar-3.3.1.ebuild b/x11-misc/polybar/polybar-3.3.1.ebuild
new file mode 100644
index 000000000000..d90ec9a2e765
--- /dev/null
+++ b/x11-misc/polybar/polybar-3.3.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A fast and easy-to-use tool for creating status bars"
+HOMEPAGE="https://github.com/jaagr/polybar"
+
+if [[ ${PV} != *9999* ]]; then
+	XPP_VERSION="1.4.0"
+	I3IPCPP_VERSION="0.7.1"
+	SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
+		https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
+	EGIT_CLONE_TYPE="shallow"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="alsa curl i3wm ipc mpd network pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	x11-base/xcb-proto
+	x11-libs/cairo[xcb]
+	x11-libs/libxcb[xkb]
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	i3wm? ( dev-libs/jsoncpp )
+	mpd? ( media-libs/libmpdclient )
+	network? ( net-wireless/wireless-tools )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ ${PV} != *9999* ]]; then
+		rmdir "${S}"/lib/xpp || die
+		mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
+
+		rmdir "${S}"/lib/i3ipcpp || die
+		mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
+
+		sed -i "s/.*cpp_error,.*/&\n\t  'eventstruct'   : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ALSA="$(usex alsa)"
+		-DENABLE_CURL="$(usex curl)"
+		-DENABLE_I3="$(usex i3wm)"
+		-DBUILD_IPC_MSG="$(usex ipc)"
+		-DENABLE_MPD="$(usex mpd)"
+		-DENABLE_NETWORK="$(usex network)"
+		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild
index 3d18bd3871c8..70e8d426aaf5 100644
--- a/x11-misc/polybar/polybar-9999.ebuild
+++ b/x11-misc/polybar/polybar-9999.ebuild
@@ -1,19 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
-inherit cmake-utils git-r3 python-single-r1
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1
 
 DESCRIPTION="A fast and easy-to-use tool for creating status bars"
 HOMEPAGE="https://github.com/jaagr/polybar"
-EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
-EGIT_CLONE_TYPE="shallow"
+
+if [[ ${PV} != *9999* ]]; then
+	XPP_VERSION="1.4.0"
+	I3IPCPP_VERSION="0.7.1"
+	SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
+		https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
+	EGIT_CLONE_TYPE="shallow"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 
 IUSE="alsa curl i3wm ipc mpd network pulseaudio"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -36,6 +46,20 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ ${PV} != *9999* ]]; then
+		rmdir "${S}"/lib/xpp || die
+		mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
+
+		rmdir "${S}"/lib/i3ipcpp || die
+		mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
+
+		sed -i "s/.*cpp_error,.*/&\n\t  'eventstruct'   : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_ALSA="$(usex alsa)"
@@ -46,5 +70,6 @@ src_configure() {
 		-DENABLE_NETWORK="$(usex network)"
 		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
 	)
+
 	cmake-utils_src_configure
 }
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index 419d2ed41c8a..1414fac28bda 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,5 @@
 DIST qps-1.10.18.tar.xz 164256 BLAKE2B 5eee79c2bab6eac23a91292132da4054836f86315a18399099aaad8853a06dbd79cb7c52af8c0e7098125d5cc06c04516235d6acb461e2caaf72584e7e05aa1b SHA512 f2647cb814e6cefba71aa70ee63c92dde88b312c9ada67e677de2bf22141afa3d7196d089606d270b610ddf3bd7466e6534de3614bea1a68d3a3b61a23b1c37d
 DIST qps-1.10.20.tar.xz 209588 BLAKE2B abf50904a97e9d2f5755bfc25509266de9c4b5a941a1010f93f475f02e8801b970ba112b01727e076c7b232cf23f50f6b8f7d2fe7acf2d8b273686f6a92404f3 SHA512 407130ac12f1e68da3e22543634d101c7a8353363ff1d9c6edbf98ce5d48f149aa5d937985f00109b40bd3cdb0b9a8e9745e845dd921be4aaf119022632bb9ef
 EBUILD qps-1.10.18.ebuild 742 BLAKE2B 6c0df4f82820d6c0fcdc54a28af624a301759c3b490585a61d74a16202a6ccc67af22f948d64cac14244a674304442e2f92a9fe9d7d39307152163c29ddbd04f SHA512 cc59e7c752c5f3ee9472e1d92713db7fba7df21b793af980b86d0d6196451f99e0cedf9cc3897534fe27c3382c0167eb258f74983261f18db6eb1914e2fadfb6
-EBUILD qps-1.10.20.ebuild 735 BLAKE2B d8421a74075e55b63b072aa5364fa92b8d4d06676da8f0c7805eabbc53f34dd2dc928805f4026d27fd777fc920bff2e88e548a48af67e38c5ca1b06a1a673c45 SHA512 a9a921be7ab7d56d31dad4d6e6cbd096713940ca72fc7d4bc0c6b868c71209c51407c75ddb30ad7b885bb8db24f288edf77ead652e6a892c73e07833113a539b
+EBUILD qps-1.10.20.ebuild 733 BLAKE2B 3bcfc79c88a00a88edd387b315cb8358cacb6a6916ccdeedf54bd349e29b4f2c900625a9958b0b832de0b8fb7b77715c3ff43222629dfb20e45df17e2b2a6ea9 SHA512 3a42d60777cbfb5ed9fa465c456a47c6192c1afcd352e3fe81ca7846b4b39c517b937b600ab1b7016f3d90226505bddcac1877e7e1be26896a8444915889c90f
 MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-1.10.20.ebuild b/x11-misc/qps/qps-1.10.20.ebuild
index 67921d696b43..707dc0fadb37 100644
--- a/x11-misc/qps/qps-1.10.20.ebuild
+++ b/x11-misc/qps/qps-1.10.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 BDEPEND="
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 80bd77ee01a0..9979584289ea 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -7,6 +7,6 @@ DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e
 DIST sddm-0.18.0.tar.gz 3526688 BLAKE2B 96db3f7b4745b7b5686c3c5e4353c99f175f28c99d329df3bc49cf41788257eaf823c6998b165de90e2150e34470e65ca69731375194072aae7583c8e8dfa811 SHA512 474be3fc159ca31cae409ef5263c47376d41f500d8b495fc7ef896ad0f1a599a5fea9a58d7df2874493dfd9230d0121cdd836ec6171774df2ce1639e8e4c652f
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.18.0.ebuild 2781 BLAKE2B 987031023cf37e50acdcf97b715ac6b99b7835d066bb690680aa0db5bc76012e0ef57973eb473982a5e967005ef38456daf0cb689268a0099ce530a37acd929c SHA512 69d08114ded9191b0ec8df902edf900afb89d80dc6880ea6e081c77e0d87dfbca790fe2658d896cb34d938c6cd375593824f41d0f1d8bfdfdca20adff886f8e8
+EBUILD sddm-0.18.0.ebuild 2777 BLAKE2B c7999e82f40cd0023abb6559f5a603e5e3d8c71c5e7f999bc3f5d56ddc7e71d9054ae86e3b9ed1242d28aaac9279f13d04c071a8eaa50f1c9a3776163b03c4dc SHA512 f34ec03dd08fd59c8cedd8f74bb45c22660907b2eabe51c056b84f247c512d3dd680179e31ce3695beb600bb4841a5ba97f57852275acd1212454c91f4f24771
 EBUILD sddm-0.18.1.ebuild 2796 BLAKE2B 3fd838e7ddd045f5db2ec515edfb69b18a1dcd50704a7a0decf02a4b97b0d776f9f584d564bc716f078911c07bce802256ecfcf432880ea4c3025c3668d29451 SHA512 c18338346335d06d64e967ea6678f1968805a58bd24b6b1a4c801c547dcd97e000b29b5a3fe54b7ab65ed6fff2235427cefed5fc4d6d917e2a47a214382f1880
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/sddm-0.18.0.ebuild b/x11-misc/sddm/sddm-0.18.0.ebuild
index 4763b8f4f54a..11c784821bb0 100644
--- a/x11-misc/sddm/sddm-0.18.0.ebuild
+++ b/x11-misc/sddm/sddm-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 28912b5b2b86..67bfe5359bb4 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,9 +1,9 @@
+AUX x11vnc-0.9.16-anonymous-ssl.patch 841 BLAKE2B d037f4f784fe12cedca33be6a638524785342d4da9c2cd73acf138b64978d8303ee45fe08cc7516dd7baeed596bf53647db82caf693022cceb2e0b43c94f5dab SHA512 8c56c76758eb117db590415debaa18eec441ef952dac607ab77182f414e0e5f76d4a1dd2e543e0542a0fd413a8ec5dc2661f1dbabb27a4d6b36eacb09327ce2c
 AUX x11vnc-0.9.16-crypto.patch 645 BLAKE2B a821861e4e4807e5e019c787d07791912083a3ae2d1e4c77eb3264adee65a68ea51c35fdfcd0d71b996f4af42ff8481c877f5f324180139857e5cfc7d0ac3db3 SHA512 6e9ec1eb5aba65999dda9048fb01e13c55cbbf6f3e226c23e20ee906891487a5c94efd09f54ac765ca1ed99290357403a0b2caa3a7226fc967b0e8ecf19360a6
+AUX x11vnc-0.9.16-libressl.patch 4083 BLAKE2B 0b95dad69a0f7180edfe71da6df2c9e6025ba57ac984a04dc118e642b1ee2a6757c11d400a2e3641e71b367e4ea42d7557d48ba932d55ef839f122ea9170aab2 SHA512 041f57dc654bbf18c9fc741d42d9cc6f0646f619b2d3a473898b2e5d20609e7f475a7abfbd1e0fb9ed01017474aab0241ce04c37cec2e8acbd813f8ee678ee53
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
-DIST x11vnc-0.9.14_p20161013.tar.gz 1702047 BLAKE2B 3c2487208a2318816af408a3396d4b6cd7cbcd5b3aa7879f0390a1a6e0200cbe0bb2cc0c50581b3e3e4de916dae3fdb4426547de7203ebe95ddc62722e4219eb SHA512 82207e4d721dde633aaa13dbd1e6a18799615f8e3c225c33d4f8b01775fb81fb6b92a817e7d014653ac7b2349b0b31e46be8db25c5fd5e3ecee8fb93ca665b97
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
-EBUILD x11vnc-0.9.14_p20161013.ebuild 1374 BLAKE2B 8447ea4607d92d215214e6fb30038eb54f40b7b0c7e87af45996103208e1284e212e1c8c7ea7a72741b3a18a8ef04350bc770ea92201e7dd5eadc8f9a525f9a9 SHA512 520f30e07fab2eac5449ec931477a7e85b0376f4f19babe4d50afa843a13c8863866325fd2a2476a4b7c3d20faa91ba913270c119979287f14440e5610d476d6
-EBUILD x11vnc-0.9.16-r1.ebuild 1839 BLAKE2B d144f710a56ccd92f144315bb18217fbf3d9ff747abca835a52383fe2718c03aa25abddbb31b80b5bc9109794c7e8833602d04735f755820d44a62326e99066e SHA512 b33d6de82001218e7fa03edc3e98c66a2021fdc12ea4e3d00d446a1372629cecebc91ac695949e359e5087ee021fd48e081149098bb3bd8a896935fedc7b146d
-EBUILD x11vnc-0.9.16.ebuild 1362 BLAKE2B a56115a2d7738e3a7410f73ee7c256bf3785bb4698905a74976b3efef96b8678517c4197e632f5b2097520ed069310ace7e21f7726dea7fb2391f7e7ee92b2d2 SHA512 b1af8a7a18b44355d8e6ab956ce4a3bec428bed7afc575ac877f1e05782e35b4630511ec96ed6c14d4dc17c0686e905a39bb1154aa0d85801720d53df9ad80e0
-MISC metadata.xml 725 BLAKE2B dfdda6a6c38d7df5cf8da77b4b2ff64823f5d176711d163d3cb95e50eae631eff64098f774b3886fb1b8baebf16289d7d8958357cdd987ec697f8a915d3a6184 SHA512 07648db4c5c5198e76e08fb5de36424286eccf09e7dc685c61ef0f148c908864275611fbd339cf791551f13a3867f8196a2645ec23927a6f0afe8b4c0bda7e62
+EBUILD x11vnc-0.9.16-r2.ebuild 1954 BLAKE2B 6fc7723a676f81cf9ce0cedb651e9c08d10ab9d1f79acb31bbce5404e3d8abb4a626ae68ee1d9502f9c67608045e4bf49acf58731ffd8b08c11eb604da31328e SHA512 98e99bc49f08d8302836290d308b5415ff9ed99ebfd4193c93c7f919bf8fa4594318cee11cc7e9d4e7423018e31258f951d2c903b398746262ce9232ab653574
+EBUILD x11vnc-0.9.16-r3.ebuild 1991 BLAKE2B ac681294caad34b791298219d76ffd0f60e39b3943fbdaee1c566c56d764978f4fe75e8759b5f48ba475ef0ddfd6b75ae6e3876196a7d6c785a650b7218f26aa SHA512 e1abca08c362bdcdd5087be05078990fad5d3d93fdbb180a0b0d81b39df26957eaab629f8f6ab4ef2eaa4d7dbf08cec3a5d469c005bf823d25f7eeeae86701d4
+MISC metadata.xml 922 BLAKE2B 02740589fa0091f604e1fff99ace802d4b179a35afd2c40d4ae25d40d41af0425a6e16cdb5951b4968813478a5066c6a241d49beba811dc296f125ba2aaddd13 SHA512 b46e3d0b379cf9967ec878e57d0a21b677ca869921546224f6f663eca4da8f2d57a97d07dac9da90999454584f6ea1c80748adf12663ff03b286292603aef2c6
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch
new file mode 100644
index 000000000000..3dafb9aa6b0c
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch
@@ -0,0 +1,26 @@
+From b9cf79fd3d61a7586fe6b24b3141e406cdf334eb Mon Sep 17 00:00:00 2001
+From: Jim Broadus <jbroadus@xevo.com>
+Date: Wed, 2 Jan 2019 17:37:40 -0800
+Subject: [PATCH] Fix anonymous SSL. In version 1.1.0, openssl introduced a
+ security level concept. Only level 0 allows the use of unauthenticated cipher
+ suites such as ADH.
+
+---
+ src/sslhelper.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/sslhelper.c b/src/sslhelper.c
+index 1a3e7474..04c2e273 100644
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
+@@ -1596,6 +1596,10 @@ static int switch_to_anon_dh(void) {
+ 	if (ssl_client_mode) {
+ 		return 1;
+ 	}
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	/* Security level must be set to 0 for unauthenticated suites. */
++	SSL_CTX_set_security_level(ctx, 0);
++#endif
+ 	if (!SSL_CTX_set_cipher_list(ctx, "ADH:@STRENGTH")) {
+ 		return 0;
+ 	}
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
new file mode 100644
index 000000000000..8e5d8a692175
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
@@ -0,0 +1,93 @@
+diff --git a/src/sslhelper.c b/src/sslhelper.c
+index 04c2e27..fb9daa6 100644
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
+@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, int rwflag,
+ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 	const ASN1_INTEGER *revoked_serial;
+ 	X509_STORE_CTX *store_ctx;
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 	X509_OBJECT *obj;
+ #else
+ 	X509_OBJECT obj;
+@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 	* the current certificate in order to verify it's integrity. */
+ 	store_ctx = X509_STORE_CTX_new();
+ 	X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 	obj = X509_OBJECT_new();
+ 	rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj);
+ 	crl = X509_OBJECT_get0_X509_CRL(obj);
+@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 			rfbLog("Invalid signature on CRL\n");
+ 			X509_STORE_CTX_set_error(callback_ctx,
+ 				X509_V_ERR_CRL_SIGNATURE_FAILURE);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 			X509_OBJECT_free(obj);
+ #else
+ 			X509_OBJECT_free_contents(&obj);
+@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 			rfbLog("Found CRL has invalid nextUpdate field\n");
+ 			X509_STORE_CTX_set_error(callback_ctx,
+ 				X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 			X509_OBJECT_free(obj);
+ #else
+ 			X509_OBJECT_free_contents(&obj);
+@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 			rfbLog("Found CRL is expired - "
+ 				"revoking all certificates until you get updated CRL\n");
+ 			X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CRL_HAS_EXPIRED);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 			X509_OBJECT_free(obj);
+ #else
+ 			X509_OBJECT_free_contents(&obj);
+ #endif
+ 			return 0; /* Reject connection */
+ 		}
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 			X509_OBJECT_free(obj);
+ #else
+ 			X509_OBJECT_free_contents(&obj);
+@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 	 * the current certificate in order to check for revocation. */
+ 	store_ctx = X509_STORE_CTX_new();
+ 	X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 	obj = X509_OBJECT_new();
+ 	rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj);
+ 	crl = X509_OBJECT_get0_X509_CRL(obj);
+@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 					"revoked per CRL from issuer %s\n", serial, serial, cp);
+ 				OPENSSL_free(cp);
+ 				X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CERT_REVOKED);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 				X509_OBJECT_free(obj);
+ #else
+ 				X509_OBJECT_free_contents(&obj);
+@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 				return 0; /* Reject connection */
+ 			}
+ 		}
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 			X509_OBJECT_free(obj);
+ #else
+ 			X509_OBJECT_free_contents(&obj);
+@@ -1596,7 +1596,7 @@ static int switch_to_anon_dh(void) {
+ 	if (ssl_client_mode) {
+ 		return 1;
+ 	}
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 	/* Security level must be set to 0 for unauthenticated suites. */
+ 	SSL_CTX_set_security_level(ctx, 0);
+ #endif
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index ff9539136145..40fa3182ee05 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		The primary goal of this program is to create a portable and
 		simple command-line server utility that allows a VNC viewer
diff --git a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
deleted file mode 100644
index ebf7c1d17f60..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools vcs-snapshot
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/e191071c1f375d04ba8f955ea0a30292a485999e.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl xinerama zeroconf"
-
-RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?]
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	>=x11-libs/libXtst-1.1.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	xinerama? ( x11-libs/libXinerama )
-	zeroconf? ( >=net-dns/avahi-0.6.4 )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --without-v4l because of missing video4linux 2.x support wrt #389079
-	econf \
-		$(use_with crypt) \
-		$(use_with fbcon fbdev) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
-		--without-v4l \
-		$(use_with xinerama) \
-		$(use_with zeroconf avahi)
-}
-
-src_install() {
-	default
-	doinitd "${FILESDIR}/x11vnc.init.d"
-	doconfd "${FILESDIR}/x11vnc.conf.d"
-}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
deleted file mode 100644
index b4e3e583f68f..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools vcs-snapshot
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
-
-COMMON_DEPEND="
-	>=net-libs/libvncserver-0.9.8[ssl?]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	>=x11-libs/libXtst-1.1.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	xcomposite? ( x11-libs/libXcomposite )
-	xdamage? ( x11-libs/libXdamage )
-	xfixes? ( x11-libs/libXfixes )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )
-	zeroconf? ( >=net-dns/avahi-0.6.4 )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-"
-# https://bugzilla.redhat.com/show_bug.cgi?id=920554
-RDEPEND="dev-lang/tk:0"
-
-PATCHES=(
-	# https://github.com/LibVNC/x11vnc/issues/86
-	"${FILESDIR}"/${P}-crypto.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --without-v4l because of missing video4linux 2.x support wrt #389079
-	econf \
-		--without-v4l \
-		--without-xkeyboard \
-		--without-fbpm \
-		--without-dpms \
-		$(use_with crypt) \
-		$(use_with fbcon fbdev) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
-		$(use_with xcomposite) \
-		$(use_with xdamage) \
-		$(use_with xfixes) \
-		$(use_with xinerama) \
-		$(use_with xrandr) \
-		$(use_with zeroconf avahi)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
-	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
-}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
new file mode 100644
index 000000000000..7ddfb82395ea
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
+
+COMMON_DEPEND="
+	>=net-libs/libvncserver-0.9.8[ssl]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	>=x11-libs/libXtst-1.1.0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	xcomposite? ( x11-libs/libXcomposite )
+	xdamage? ( x11-libs/libXdamage )
+	xfixes? ( x11-libs/libXfixes )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )
+	zeroconf? ( >=net-dns/avahi-0.6.4 )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+"
+# https://bugzilla.redhat.com/show_bug.cgi?id=920554
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/tk:0
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86
+	"${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	# --with-crypto --with-ssl because USE=-ssl is broken (bug #686494)
+	econf \
+		--with-crypto \
+		--with-ssl \
+		--without-v4l \
+		--without-xkeyboard \
+		--without-fbpm \
+		--without-dpms \
+		$(use_with crypt) \
+		$(use_with fbcon fbdev) \
+		$(use_with xcomposite) \
+		$(use_with xdamage) \
+		$(use_with xfixes) \
+		$(use_with xinerama) \
+		$(use_with xrandr) \
+		$(use_with zeroconf avahi)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
+	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
new file mode 100644
index 000000000000..752f08e414d2
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
+
+COMMON_DEPEND="
+	>=net-libs/libvncserver-0.9.8[ssl=]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	>=x11-libs/libXtst-1.1.0
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	xcomposite? ( x11-libs/libXcomposite )
+	xdamage? ( x11-libs/libXdamage )
+	xfixes? ( x11-libs/libXfixes )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )
+	zeroconf? ( >=net-dns/avahi-0.6.4 )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+"
+# https://bugzilla.redhat.com/show_bug.cgi?id=920554
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/tk:0
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86
+	"${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
+	"${FILESDIR}"/${P}-libressl.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	local myconf=(
+		--without-v4l
+		--without-xkeyboard
+		--without-fbpm
+		--without-dpms
+		$(use_with crypt)
+		$(use_with fbcon fbdev)
+		$(use_with ssl)
+		$(use_with ssl crypto)
+		$(use_with xcomposite)
+		$(use_with xdamage)
+		$(use_with xfixes)
+		$(use_with xinerama)
+		$(use_with xrandr)
+		$(use_with zeroconf avahi)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
+	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16.ebuild
deleted file mode 100644
index fdb0b5c8392a..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools vcs-snapshot
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl xinerama zeroconf"
-
-RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?]
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	>=x11-libs/libXtst-1.1.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	xinerama? ( x11-libs/libXinerama )
-	zeroconf? ( >=net-dns/avahi-0.6.4 )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --without-v4l because of missing video4linux 2.x support wrt #389079
-	econf \
-		--without-v4l \
-		$(use_with crypt) \
-		$(use_with fbcon fbdev) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
-		$(use_with xinerama) \
-		$(use_with zeroconf avahi)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
-	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
-}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 8f8e95aa5832..7830de1f209f 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,7 +2,9 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
 DIST zim-0.69.tar.gz 2044631 BLAKE2B 447fa4fb2d11b1399668ec6b627e23150577b574afb1e5c33738cb690779f49adb2d60e0b01eb82d2cf0dfd4a430099c1ae4b52186b60a2564c501b93aa01822 SHA512 452b2119d63927765c3807dbbdfadea94be31ee7fd3eb9b8cf79e8699c57478ec9cd392299a6e1dc3690dbe520925cddf5fca4596db809a2cc296bb6669d12af
 DIST zim-0.71.0.tar.gz 2882942 BLAKE2B f1701baf547d43d7a9687e6a1d72313649064f1d3927e14bffd5c8e348fa7a311e307f9b1704c19058bfad07d6715c79399acfdc5701efa9291db3e68065175a SHA512 7c82e19d547795f57c563383aca04a51da02463df71cfe18c4cab0307f46fb425ff0f348b43ae0ab26cb29037bc9d99aed63dbf721a542d071f9674f17f0a64a
+DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
 EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
 EBUILD zim-0.71.0.ebuild 1897 BLAKE2B e13582f180fa5ff958f31b70be3be0fb672b27fecba7e096c301cd2c8c53865f3c5e6d22e983816116429f973486d9de89b22db64d24a4a27470782fa1c580af SHA512 a37fbb05b2277d32a6adff6f0e1d96e8dbb9bbca3aafc75ebb1e0907377b68a1fb703df0838291b6cac7a90096ec5f2fa25e1491ccae56acca257b8c19275cc1
+EBUILD zim-0.71.1.ebuild 1897 BLAKE2B e13582f180fa5ff958f31b70be3be0fb672b27fecba7e096c301cd2c8c53865f3c5e6d22e983816116429f973486d9de89b22db64d24a4a27470782fa1c580af SHA512 a37fbb05b2277d32a6adff6f0e1d96e8dbb9bbca3aafc75ebb1e0907377b68a1fb703df0838291b6cac7a90096ec5f2fa25e1491ccae56acca257b8c19275cc1
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.71.1.ebuild b/x11-misc/zim/zim-0.71.1.ebuild
new file mode 100644
index 000000000000..e9579e77339b
--- /dev/null
+++ b/x11-misc/zim/zim-0.71.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg-utils distutils-r1 gnome2-utils virtualx
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	http://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 227d32aaead2..0b7c7b0afa65 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/gkrellm-plugins/Manifest b/x11-plugins/gkrellm-plugins/Manifest
index 7e3cd41840f4..b11ef0bd2c27 100644
--- a/x11-plugins/gkrellm-plugins/Manifest
+++ b/x11-plugins/gkrellm-plugins/Manifest
@@ -1,2 +1,2 @@
-EBUILD gkrellm-plugins-2.0.ebuild 805 BLAKE2B 0c92e4f791213e9a2b436e7060bf586e575a6455cf59bb257b413618c8fe2706b0b79aeba876bb67a872f451e15f41bd55b23d2a386c47d3bbf53ef88d489372 SHA512 452f5ee6e8cf661d2c246d8f7b587202b0aa147f142f29d9127dc2faac3a143a0302ce3767d31514dbc20cb54ecc3ebbb6c6e17c92c0012e34f8d641a312a6e7
+EBUILD gkrellm-plugins-2.0.ebuild 777 BLAKE2B afe9554243cf5c73f0dc98f95d02db91c63df11bf4c4d296b39a8604a74b1338e7bae5e24cb16f35959824245e92406859ca1a3aa00154eabe3ebe8d16a138fe SHA512 f1a6f22fc2f0ddfa1201039a9954e7491247e7e874d5912eb6718ae3749329d43c58dad138275133637abee45ba3f205269e61c84396ce60b1d3becf9964caf5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
index fc1bb55b84e2..5bc906f72683 100644
--- a/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
+++ b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,6 @@ IUSE="wifi"
 
 RDEPEND="!<app-admin/gkrellm-2
 	>=x11-plugins/gkrellaclock-0.3.2
-	x11-plugins/gkrellflynn
 	>=x11-plugins/gkrellkam-2.0.0
 	>=x11-plugins/gkrellm-leds-0.8.0
 	>=x11-plugins/gkrellm-volume-2.1.4
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 4a0ae4add258..69f9cc88d13a 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 98be07842c86..7c9be1b23f31 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,5 +1,5 @@
-DIST terminology-1.3.2.tar.xz 4849832 BLAKE2B db03ab8d40a432e42d645a53a02b96afa37a6d238cb26bea55de6153969164e53986d70091239235ba724556feaa32bc8de68aba5fb766543f1719791f0c5ab6 SHA512 e41e413348451e0df90634af06fb49ec830f9b1454eec2601977e6e35385bd1a62a385a9ab7fc02fc6c3750f5b73785e4f40f14bb36acd58d4c296074b5f32c8
 DIST terminology-1.4.0.tar.xz 4878656 BLAKE2B 7e6b41e1057aa245c9cbcbdf164efd68cef7d3bc92706d10d100bface25a7e29468512ee690795e9f09242b644d80215239f761fe7216ea5d768f48259436778 SHA512 c7fd6605c00983e79a647b1e577868e5d2b713321164cb0ee8ef4b4a4155bf320f3e145ce91ecf1d3b0c40f28ae360b96798e47fd11accfa230932cfbd9e5c9e
-EBUILD terminology-1.3.2-r1.ebuild 706 BLAKE2B 5c8e1d9926a9018003cd57e63a1e7a544c65233ad34733cae78c9162cdfcc5429b919b23cc3c4ea69f54a104155eaec4227ea8006c20129fb456870d73e54563 SHA512 49174f019ddc25cc1a7d64e1035d5ac304e9be4788339516eec94628f7ea3dd0199125b39c5c49c1094dcd9301b5f29b8a431044fa9f6e7b7bc729a425f97149
+DIST terminology-1.4.1.tar.xz 4878484 BLAKE2B a8ec1a6f3a80057316c6c90ea60c2a273702dfbe7dae70fac649c9bbe3245ea8fbacc625a9b9430dbb969cc02b79792f189ea1c16b2ebc0dee9eeb0242dda8f4 SHA512 5756b09aa0f92f9e1fea17d399eca161272a8514e29343873024b9727eaaeeca0b7efe465c01e42cd548b37cf0da7d99733a789921093700519f80a2952f0706
 EBUILD terminology-1.4.0.ebuild 864 BLAKE2B 36c00aa1e5bc52e26f9ab041f9d31df08fd6b76514f6085a26dd58c68ceb67f7244eff0af33dac8d430642f87980ccc675aea7c966e6eb935e4db7feb4184712 SHA512 4d3081f5580b44e9619eac1c9826c1fc9b85a6e2aae7d4de7a19945f1ec8cdb851beca96051958089c907acf4384e4872a32a7e61fe396dd0725b0a19b90ca1e
+EBUILD terminology-1.4.1.ebuild 866 BLAKE2B 45d945cf025162170ed8b024c7d894948c1a8ca1c0c3bf5e87867c23086ce4f88857a750f8304b38e3e4dadb5203af31eec9744cd0b87477dffe7a61a6b24264 SHA512 7222d8bb616e6a8438c31fd0f9f0065133a20b7e3a15b27912fc45b551dd183fbd03c2a0380b46f08497a398fb373d0baa5a0d407997feec29f203d5492dceea
 MISC metadata.xml 425 BLAKE2B 3ae0edab47e72129f59566052da0f7d37d3d26da586ed16286022b5d91495406085dde6021b446e81fc0efca25d4bba354a2c9c3d5418d7808824338fb49c09b SHA512 29155b4eac99276c12c7132a01566153f7f0cb9b416b933b8f0be980b5b53eb4586f3d5ab9daba13c76480d0b90212ead55f9a0c066e5c754900ecc0538a7d81
diff --git a/x11-terms/terminology/terminology-1.3.2-r1.ebuild b/x11-terms/terminology/terminology-1.3.2-r1.ebuild
deleted file mode 100644
index 3f81250defd3..000000000000
--- a/x11-terms/terminology/terminology-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
-HOMEPAGE="https://www.enlightenment.org/about-terminology"
-SRC_URI="https://fau.re/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="nls"
-
-RDEPEND="
-	|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] )
-	|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
-	app-arch/lz4
-	dev-libs/efl[eet,fontconfig]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use nls)
-	)
-
-	meson_src_configure
-}
diff --git a/x11-terms/terminology/terminology-1.4.1.ebuild b/x11-terms/terminology/terminology-1.4.1.ebuild
new file mode 100644
index 000000000000..65b045e742ae
--- /dev/null
+++ b/x11-terms/terminology/terminology-1.4.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="https://www.enlightenment.org/about-terminology"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="extras nls"
+
+RDEPEND="
+	|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] )
+	|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+	app-arch/lz4
+	dev-libs/efl[eet,fontconfig]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use nls)
+		$(meson_use extras tests)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index e85b85739175..708041c2c3c1 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index ba146e36acc7..91a85f4e195a 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -4,5 +4,5 @@ DIST adwaita-icon-theme-3.30.1.tar.xz 19931180 BLAKE2B cf64c6b45dc503496faa4e009
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD adwaita-icon-theme-3.24.0.ebuild 1676 BLAKE2B f8c1341097aa1747f0edbc6eda3280eee7a6d2e92f350529430da92667b0080dc3b215e04d959c3d708d8a306c3bfa670617317b70918fbed1b07f3047fc6d6d SHA512 1bb294b6303ededa38eeab499ac918e4da8278d0bd0223424ec868376c2cc1838b90ea8443b4d3b45b8b633b7aeb05a137a2e23a464878e3bf9f972894f387f0
 EBUILD adwaita-icon-theme-3.26.1.ebuild 1687 BLAKE2B 5a439269b18287dba8e3d96eb5d67ba4bf73bc3a519a959f8e2a3fcc951768b7edb62576b3a640467a18fc64aa4c1a33044a7f535abfe1a8629c464168def5a1 SHA512 ae6a41d2af66b848e3601d0f845953d6294318443fb36fe3fc3d5068280fb96d6d62dbe26639a8c78b3bb0a9a9d23e0496f0384e2a945065562a62f8eda39ffc
-EBUILD adwaita-icon-theme-3.30.1.ebuild 1683 BLAKE2B 78808e1c33c9e1d5e112e5277aacc6f89eea27eaea8edfcb84f31d15782d47e3a39381d6de4bd3fb24aa2b832d201e8b3808c45916373cee117410729ccf5982 SHA512 b88ce9ffb037ec3f859066b0a73c52b50fa32a90685de0121d4144ac2921030f86ea00dfa1332dcecf8181448c001e0fc4dae78b682ad37497726d26d5ece59c
+EBUILD adwaita-icon-theme-3.30.1.ebuild 1682 BLAKE2B 7ff8d980affaefa5bd263244a8649ed9707b705ccf5a4c21db4d18c270fe0fa439c77709275680b0ccadb6483facbd28ff78a5287437bda3b5edfa7c7bb43b90 SHA512 d9a256c51d4b77decd72b5f0d2fdcdd559435e4fda29a1cde68e3ec8b0170759490eae4f928c5ab6d18fb29ae03431994598a5e70c00874366d02db33a255734
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.30.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.30.1.ebuild
index 5f3f5932c822..212d0bd6fd1b 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.30.1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.30.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
index c04ee71b9876..1ceb345d63f8 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -3,5 +3,5 @@ AUX gnome-themes-standard-3.22.2-exclude-engine.patch 1893 BLAKE2B 416f89fb438ce
 DIST gnome-themes-extra-3.28.tar.xz 2953272 BLAKE2B 122ff5f1d95086c5cad6818efa79763ab574b7d6792b846198ac7ed5b521747d4357025ebd0ac6b5ea1161bf1dd3482ac2e867822bf863928b05a8486172ba0d SHA512 bccc446e86b12476b86a0fe2e3354500c8fb3eef62a85c3823d69aaa259e032e1f94e7993bf633397b669c425ef42635b0cf17b376f0b7cf1869bb1d7160ede0
 DIST gnome-themes-standard-3.22.3.tar.xz 2904736 BLAKE2B bc1dad2f6ce913a40bd532064f590c38e7c3db05a1e0564bbde8bf5d0349ca96a8e0d7e7683a5bd1b22ce404f7f6dc1efeb3a02a9177186c6e6686045451ddf0 SHA512 aa2f3ad4d867732cd09df6adb4f48ed2757e3f28930ef791ba97a82007332c810d84dd1074ca518ec0fe71bd7d8b95404854bd799e3b1fe616e1809e8ee33501
 EBUILD gnome-themes-standard-3.22.3-r1.ebuild 1218 BLAKE2B 98bc013cf00e4959289928fc342dedd95cf7caa77bde5d29ee76649b94768004272893756ad6e7e5cfe7871f0ea20949031f97d935150393850725f45275d885 SHA512 e649199dedf053cfe3c44eeb937cfcc8321e21538a1ad11bc3d04f41f37a5a7bd445e5ccd10dd7ae6f20fae55016c4bcab0aec1362b30341c9e59a8cdf0fbd40
-EBUILD gnome-themes-standard-3.28.ebuild 1066 BLAKE2B e310ba8e89a9f4f16c67e73c37e11836be553394f2639a02b3132b8de1e1f32edb33add13d2c6ab9101e3050504873fa0c6cba457ff8ea4ff0e6ec8d18b17ba2 SHA512 ca5b98ae731deec7c00a4bc301ee92b5f75b694fdd43327119ae31a1c3739eb533ef1731c6d989018232119fc1435365d69f9e8ba01f0553ecc640d03f3c8e01
+EBUILD gnome-themes-standard-3.28.ebuild 1065 BLAKE2B 69137aa291669fa8214114ed1a928feeff1e547cff9c0f044a475f4ebfc92aaaa151866d6f923d6e1be108a691dd4fd024efc2d9f59c91bfeb13c8d3776cdb12 SHA512 abfba37eb41e814904b684f5b0398b344f7e88ac12767d47011ff414dd7819db942b96ef47adf91a4085122406224b2c9a5a26ef261d550098de7127218e3876
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
index c2a02860245c..01331c6eed6e 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x64-solaris ~x86-solaris"
 
 # Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
 # their default background image
diff --git a/x11-themes/gtk-engines-adwaita/Manifest b/x11-themes/gtk-engines-adwaita/Manifest
index 3ae316dea57b..c95752a52e7d 100644
--- a/x11-themes/gtk-engines-adwaita/Manifest
+++ b/x11-themes/gtk-engines-adwaita/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-themes-extra-3.28.tar.xz 2953272 BLAKE2B 122ff5f1d95086c5cad6818efa79763ab574b7d6792b846198ac7ed5b521747d4357025ebd0ac6b5ea1161bf1dd3482ac2e867822bf863928b05a8486172ba0d SHA512 bccc446e86b12476b86a0fe2e3354500c8fb3eef62a85c3823d69aaa259e032e1f94e7993bf633397b669c425ef42635b0cf17b376f0b7cf1869bb1d7160ede0
 DIST gnome-themes-standard-3.22.3.tar.xz 2904736 BLAKE2B bc1dad2f6ce913a40bd532064f590c38e7c3db05a1e0564bbde8bf5d0349ca96a8e0d7e7683a5bd1b22ce404f7f6dc1efeb3a02a9177186c6e6686045451ddf0 SHA512 aa2f3ad4d867732cd09df6adb4f48ed2757e3f28930ef791ba97a82007332c810d84dd1074ca518ec0fe71bd7d8b95404854bd799e3b1fe616e1809e8ee33501
 EBUILD gtk-engines-adwaita-3.22.3.ebuild 1102 BLAKE2B b5f935b6c0bd64c141c9fa4dca778078531ba61695d769080a52640de5da5131fa2fa4505ba80db6464c59ccda616424e908e9a89e40544ad6f83f9807d4f7ad SHA512 cec403469a008882eae315199c056d68935207364d4de437636cbac82b7f553e069a5e8f044dbc0bc3b6cf8fe2e4eaff44600827a0d1f09b48bd8ce8f4ca46fa
-EBUILD gtk-engines-adwaita-3.28.ebuild 1107 BLAKE2B 9ba7382fa097b5c5ef7aaeffe437e2bc9581cc525c0a802fa4ca753fc27face794f95217f1a7cd8b209709c243f302c14cd0503342b7d03349367d4954836ef2 SHA512 da714d9077c71ed5b3392663a7e05dc59e4a06712ba4547d2a64d9c5041748e833da2792961188c5f5ba898f38dc0d1875b6d6bf74d83da74b2522bfdef97411
+EBUILD gtk-engines-adwaita-3.28.ebuild 1106 BLAKE2B 2c062059b694468ba9ca4654d2f1201b83faee372ee8082fd330ef25e3997d3789e65940bada7301f876be0c7d90e3139c2fab1a2419efc1b8c10c10f38f76b9 SHA512 a00caa325a8781fb1d090d578b46011dc0a14c324b6d9b84b12691c682284e8e4c150b0ebef25781acc50fdbdf2ade0eb10cf417fc0ca34687408059750ebb34
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
index b5d5dd3fa3ac..c0776abd9766 100644
--- a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
+++ b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
diff --git a/x11-themes/lxqt-themes/Manifest b/x11-themes/lxqt-themes/Manifest
index be007c8eca1e..c72e59ebf27e 100644
--- a/x11-themes/lxqt-themes/Manifest
+++ b/x11-themes/lxqt-themes/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-themes-0.13.0.tar.xz 3203740 BLAKE2B 4dd461e576d2c9231b856dcec39c88098f0058f76bd61fa489bb77aee56f13d7407f17de6d85b254c8d80bd9893a177dc7b6a236d307895f0b12bd7b1dc4b372 SHA512 d246719a04b9247e099a19f8ce1b3d27a2b8c4b57266043fe219daff796014f963b65f50b73a4115badf4901a7b2bdd145f0518647ced45a5857f5b859b14081
 DIST lxqt-themes-0.14.0.tar.xz 3203820 BLAKE2B a8fd0e77f3c6844f13755bd5c6e0e48c194475c082cbcf83b3999e120f548f457293cc0bcf06cff2ab38ac4ddf54346cf07abb80d5f5f326eca5c5a6baee45da SHA512 622449df60f5f50d59ab308a7aaae35114e91bda48e112fb2abb2c394bfdfc5794d2bf0c6ce63689a29081a31bdde191e3c8cb7217f833d76a407f9970eb1fb2
 EBUILD lxqt-themes-0.13.0.ebuild 545 BLAKE2B 5657915234ae348049050a2d60b9169c758dda2aeb0efeb73e110b0c177fc6d813b6ecb27aa5c02c9ce232e0259e732d48650db695353db420332c29b2ad44ae SHA512 134d9ad234c635477b37bdd844136ecbc9c9179db85ba7df649c987d11a8175dd2a5da49663d8757843b2c3dacc015787549bc9df434fd180eda45da0ea824ff
-EBUILD lxqt-themes-0.14.0.ebuild 532 BLAKE2B 5f28bb5627171ca615652f1c77619cacc92f1fc9ea66a3aee6fe2c0ae62f8fee6d16e9fd799c6cf9f6c0cb81b59ecc2f8aeb5bb5f041128dcb832d83cfd8eddf SHA512 d2329855e40f1b256a2c0f9848d8ce6a0bf0d4942664612efe419d93546270beb12a0e7c6a4be69abec50f1f95be24321c9cd68f55aabf9586591e67fff854bd
+EBUILD lxqt-themes-0.14.0.ebuild 530 BLAKE2B edc17e652b4369ea8651f144a4194e93b72b3f934c1a20fc27f48ecc324dcaec22ababc423b6d69c3ec508e0b458a6f47dda538422866cd76cba678542700e87 SHA512 68e1e2011a44a8f28be932695bdc1179d27b2f5a8c4c31ba79e17ccf148dfd7b4b755b75f619b66c5333d96132ae9143bb3c9e23482d937dac201126e3b82569
 MISC metadata.xml 317 BLAKE2B 5570995b3ad6a8fbde584e6ec5d9d0e09e6000313c1b7e1caaea7fc36aed93f86af522fd4ce0ace8ad764135d7d07a3c3a27b97e8144c915a9d3621f53e77c3f SHA512 7ac9d03d1f2248513ae60d61ec213d18ac6757f66924d0273bf93f9c47e6b32a5f05d393c4c92484c59b23d7ddb8f4fd915bc31e45885bef91f44f6a9cabad41
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
index d8ddf1b7c947..f881e16914e0 100644
--- a/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
+++ b/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/x11-themes/sound-theme-freedesktop/Manifest b/x11-themes/sound-theme-freedesktop/Manifest
index 194778a0a6ed..d120321a283f 100644
--- a/x11-themes/sound-theme-freedesktop/Manifest
+++ b/x11-themes/sound-theme-freedesktop/Manifest
@@ -1,3 +1,3 @@
 DIST sound-theme-freedesktop-0.8.tar.bz2 478237 BLAKE2B 3f4f5969bb4cf1b285df8bd79184dc49873a40bd0832d270bc36a9b72c1fb33034cce3595b784a2807954c9fd20fe29ec38d5ded68f02ed717e492ee09a83762 SHA512 f08e0414443f3a47bc433a69a7226d2b9383bc7c64e0711e8a605bd761ac69ea052a6db7f0037d88fbf0900efddaae6466ca96391eb71295ee1d0edbd0364621
-EBUILD sound-theme-freedesktop-0.8.ebuild 629 BLAKE2B e33c62253625061ebfafefd602df6a5f946f91931a738f937c50b36d9369b4ac18be448b452df4a61a823c7468dda8ca2cba0c84dd281aa19ad7149dcfba0e19 SHA512 50c6d4f65293dfc4ee3731a25a8764d0158a0a3ae2232a55c9c7238c761ee0e475990d2f3e3046fcb0e4042a1d372785c6ceeed7f14df3d45f34edad0148ff5c
+EBUILD sound-theme-freedesktop-0.8.ebuild 625 BLAKE2B 857498cecbb1346965b42d7f92d8b0868153757ec8eb6d0ebe9c584fe06d0f325793ded371963fb79a382c310880867065a27912bff7c3906e843a2c716e971f SHA512 9525099c15fb371e21f94c2d42cad37f7fc14fed7ad44db3a4c66a023fd7118a60fb1ccddedb21e12791fef6722191102f484b43358e4f2abb87c48079c786b8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8.ebuild b/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8.ebuild
index 4690ce7bd49c..27dbe3c27690 100644
--- a/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8.ebuild
+++ b/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ SRC_URI="https://people.freedesktop.org/~mccann/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2 CC-BY-3.0 CC-BY-SA-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index dc0083a6811d..7cf463086907 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 776cde80063f..a71a430e2636 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -13,7 +13,7 @@ DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f22229
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
 EBUILD awesome-3.5.9-r2.ebuild 3120 BLAKE2B 71d1668a910bc570389cd9fdba9cf948c6937c53fb335df8d5cc8ab7fbc6811e0635895094be3fd67a49e4a7a43a7cc602d88a9b33534ffc6d6b684911ccc858 SHA512 c4c0d39f617c3cdede84786e4fc8a7c4f01b4e329a06d092a09a773af3be42dd0c28e6178f294710579737f3d441ef4f7cd88fd7afb1e1acfe2279ad81192ac4
-EBUILD awesome-4.2-r2.ebuild 4048 BLAKE2B c346c0cee0af4e95becc345b7d30254df0db768ecf3d84c10fa22fb9b2cab14fba30144027b6f9f2d89a27b8e5aab69e46d94bda9961e871def26e07f4f77c33 SHA512 2779eab46b8f93eff87ff3cd540252dec968e714731c3068effae90b7f7f4e2a8c36474a6e1beb696ef2060d096e6a4adee42b4ed930d583dc812d9ea601e15f
+EBUILD awesome-4.2-r2.ebuild 4046 BLAKE2B f0818242453a6b6e86cc5308f852bc39ceb582599fb14d47ecaaf99f4992fe5b79e530d20f803dc9717d7ac9bac42869dafe81571cbb6209940d8f0e0c90f2d6 SHA512 d20e5c640738bbd7dbcdafd91bf5af40fd5d336d91bd12f814b91f8d0b478fcbfda099fb995c44dffafd3d00973242faa48f85f6eba76d3f19d5df31fa0f14a0
 EBUILD awesome-4.3.ebuild 3696 BLAKE2B 2ecc88fe2aeccff7b40ee66b01e3d332a3a9e5efbf796fb04ec6bca266853c296abda8f5fa657efcbc2b752a75e13ebc27f706b4569ca45f07939a81c1d3aa33 SHA512 be1923652935a8fa73b07a9cb3f718a6909f20d85edc85a476f26c554b989167730c429aa7694c11190f7fb04d9f29e071c27a3362b7f66a3edc9e04dd4949fa
 EBUILD awesome-9999.ebuild 3612 BLAKE2B a7069d2671acfa6ca3c4d03fd1da6a89a794bd703c86889e082d8c6cb9bbbf1709f59d89264569b3f3d58315b1ffde3d0bef3aec925509dd47268c086c799aed SHA512 50a0836b211d4dab36b294e4a42a4775f6b84584bd5acb9aed3e45835b2089fdb85bfb5449d4ac5632de4a4d3992f285527756909bd25097e00dd8a7fe8891eb
 MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea
diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r2.ebuild
index 19707b82ac5a..d40aa18c921c 100644
--- a/x11-wm/awesome/awesome-4.2-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="dbus doc elibc_FreeBSD gnome luajit test"
 RESTRICT="test"
 
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 0cc9e051ad3f..51e037da8f87 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,8 +1,6 @@
 AUX enlightenment-0.22.4-efl-1.22-wayland.patch 2288 BLAKE2B 6e8a9f4d47318372c06a74bb6e3c233c36f9e57332519e706602a0472285e0b249c45d3d6fbd3074d6d720f157b6ddcf1a37da60b60f52908ee0f006a9e11239 SHA512 7ba3e501d7df99aa3f0336c1db09edaf5b2acd9eb6d2ad4f8465d92c595edd2b85e6a16c1408dc75502d73778cd2634ce2f409319887f6e53707208cd4128335
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
-DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0955ce1d608758af0855c550f5581c774bd19dd0b6c8dd8c724b668ff843e1ed4928531f30b60436d9182a07a65fa2af9e3 SHA512 01a9386ee009c76c46cee7176cdeb7f4e97977bdd5014caa51cceeff228ad72f97a362d1eff7e0240e3e2df8b24a6c9d1516c8ab05bd82d288abcfde0d171abd
 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
-EBUILD enlightenment-0.22.3.ebuild 2761 BLAKE2B afd66034af88b166bec62657b0d5d058697178fb42f94184f6bf099526d1755ba317fd96142a9ddd7590bcc65548b30fa06e1db75828fee67583e6bfcb270612 SHA512 5a32871dfa8c5671efc1870249411ca1ecd3b61737cdf11b7f662006293456083ea95223ea2e8b5033952fa1d96494ca437f1a24c34fcfc6c8d99cc400ab275f
 EBUILD enlightenment-0.22.4-r1.ebuild 2202 BLAKE2B 452b356c54a8f77a1cc81b8ec7cd9417f62c19a836c7ca2e1c3896ecdce46134c866c50d7ac033fa335a80f9622318fcf8c90185705292124eed3562dd8029f2 SHA512 b2388a95bb84e8e63ba500514360d144549816125465a33b1494f1f6a3ac6a4804d41672017d6df9dae440e37f4c38e030214254447167c5edf30001a6cca1a3
 EBUILD enlightenment-0.22.4.ebuild 2188 BLAKE2B e5edf01ab49f61a0318e0669f9193482bd713e3bdae5167f73d69d1eedfd3f233dec84f02711fbc39f59d3ef592ff1c1406ea605ed2f541e55a913c35f6ff8b6 SHA512 6082de94db744272db7ea7f767b6c3ef5d4320cabdd65c724248f17ba995c4ca9d914374101b6449a201275adc20ad4d580d59f40b3bdab4e853559467869a78
 MISC metadata.xml 892 BLAKE2B 05d547df7e3f87b0e2d32bb7c3a0b30ad1b233778081c3595071fccdd5124b263d3a34de09c880f79199885b8da4a3c6cd499304ccd249cea9b764be4ba84bf3 SHA512 79cf7b40de376a2d3344d3e76cdb632bad71162814a9039f322ce12ce8473da3398fcc6aecad188a592dcd31ec7d32ce1563955e057c0750c4ed0e68b7551022
diff --git a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
deleted file mode 100644
index 9e7dbed74f62..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson xdg-utils
-
-DESCRIPTION="Enlightenment window manager"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0.17/${PV%%_*}"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
-
-E_CONF_MODS=(
-	applications bindings dialogs display
-	interaction intl menus paths
-	performance randr shelves theme
-	window-manipulation window-remembers
-)
-
-E_NORM_MODS=(
-	appmenu backlight battery bluez4
-	clock conf cpufreq everything
-	fileman fileman-opinfo gadman geolocation
-	ibar ibox lokker luncher
-	mixer msgbus music-control notification
-	packagekit pager pager-plain quickaccess
-	shot start syscon sysinfo
-	systray tasks teamwork temperature
-	tiling time vkbd winlist
-	wireless wizard wl-buffer wl-desktop-shell
-	wl-drm wl-text-input wl-weekeyboard wl-wl
-	wl-x11 xkbswitch xwayland
-)
-
-IUSE_E_MODULES=(
-	${E_CONF_MODS[@]/#/enlightenment_modules_conf-}
-	${E_NORM_MODS[@]/#/enlightenment_modules_}
-)
-
-IUSE="acpi connman doc nls pam systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
-	>=dev-libs/efl-1.20.5[eet,X]
-	virtual/udev
-	x11-libs/libXext
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	x11-misc/xkeyboard-config
-	acpi? ( sys-power/acpid )
-	connman? ( net-misc/connman )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	udisks? ( sys-fs/udisks:2 )
-	wayland? (
-		=dev-libs/efl-1.20*[drm,wayland]
-		>=dev-libs/wayland-1.12.0
-		x11-libs/libxkbcommon
-		x11-libs/pixman
-	)
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	sed -i 's/Categories=Audio/Categories=AudioVideo/g' src/modules/mixer/emixer.desktop || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-D device-udev=true
-		-D install-sysactions=false
-		-D mount-udisks=$(usex udisks true false)
-		-D connman=$(usex connman true false)
-		-D nls=$(usex nls true false)
-		-D pam=$(usex pam true false)
-		-D systemd=$(usex systemd true false)
-		-D wayland=$(usex wayland true false)
-	)
-
-	local u c
-	for u in ${IUSE_E_MODULES[@]} ; do
-		c=${u#enlightenment_modules_}
-
-		case ${c} in
-		wl-*|xwayland)
-			if ! use wayland ; then
-				emesonargs+=( -D ${c}=false )
-				continue
-			fi
-
-		;;
-		esac
-
-		emesonargs+=( -D ${c}=$(usex ${u} true false) )
-
-	done
-
-	meson_src_configure
-}
-
-src_install() {
-	insinto /etc/enlightenment
-	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-
-	if use doc ; then
-		local HTML_DOCS=( doc/. )
-	fi
-
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index a98538c37878..2a73c7bbee10 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -3,7 +3,7 @@ AUX muffin-4.0-cogl-configure.patch 717 BLAKE2B bf55437c4a3c5b41fe4c9dc4bb0a7e58
 DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
 DIST muffin-3.8.2.tar.gz 2723114 BLAKE2B f8218ac1f71ecfa5b74ca7ae8cf76d76e1207e3ce65f715643d477d2fb6429390671f3b05132a64f23a1853297f71563a62c052555f8a26d084469814972a64d SHA512 62dbfb602dd1164779e365e5e6f782431a491a254dcec8faef8a50f27f50cf7b0f8ab958b6df3b75d6b15edcd90c23a2fd6cc18cb11a2a513e669169f09cba05
 DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
-EBUILD muffin-3.6.0.ebuild 2015 BLAKE2B a1e42826b62c46bd57de0f2a849525f9cc9eaa162279188a893f3108d33ca9e5a028a8fc1c6c5b7391d444d266773880f5bb6ed0e680609f4c3a387e40e10a6a SHA512 86c08741e7787f220d94900a34f5fe9db2a8b09d9caadfef96b76ba5051f5eb20409d38f1a7a0111c8791664dcad07046ef88cbe53557b199e41b8cd90c43341
-EBUILD muffin-3.8.2.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
-EBUILD muffin-4.0.3.ebuild 1996 BLAKE2B afb319d995eae03baedea4287c95005ab08f0d3e52dee3986dc03ffe0f27b466f553c7590b0dd68cf72ca7f3b33bb0f3bd5a4db48a2b71fc9f05030013e9b78b SHA512 4deb518b009494b8871d205bdd18bea4058584adb8496ff012564184a080b55d908bd27d4329139be225faf71c7b9e144eaa880e3de62de9e1f3c5f0d29e6f91
+EBUILD muffin-3.6.0.ebuild 2047 BLAKE2B 91bef2b48265f8abb8e72430404ea3b5bb86a9fb7603f7a5f6eca1ce04888a5693c42773abce631544083f0ac33075bb6b1f53ada813cd3249736671a6a38571 SHA512 3c8f33c6760d08a48b9d5cb58ab58afddd6294beabfd46653e5525db99a66abbbe69ad98f0ba14f4bbd8e05e093f1e480bea8948f00f27c8956b7b02a90b9314
+EBUILD muffin-3.8.2.ebuild 2049 BLAKE2B 787f368ec25ce0ba32712fee1304c575e1727f96e0867d2122cec4b303bfcb736e948adfe1db55761790c2d3605bb618450f85e1727c146e8b23c6ea85857b85 SHA512 a7caafcc86ae7fc2327eec12e445e86056cdc080d2ec8870cd67e74e80890b1ed1fd50fe41dbed23c54e1a57229d9f41447dd52136b9453ef29e4cadfd187de9
+EBUILD muffin-4.0.3.ebuild 2028 BLAKE2B 8947af0e8e8f32ed35aa493d8a0eb1a75f09fa142aae590f956f43683d44129e555a972b152410376edc226ae81520059e6c2b89def1c5a794d5e5162be3f2eb SHA512 4bcbd1a07cf209ad3a097a8353da96e2b4265898463da6763c70d2e4e7116003e7208db8c1b6686999db09473b8b8ec1a0797a6e00056847d4f43ffc5098d5cb
 MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
index 5b0e9e55033a..5c2e5abbdfbe 100644
--- a/x11-wm/muffin/muffin-3.6.0.ebuild
+++ b/x11-wm/muffin/muffin-3.6.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools eutils gnome2
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/x11-wm/muffin/muffin-3.8.2.ebuild b/x11-wm/muffin/muffin-3.8.2.ebuild
index 691da9e9652a..1b8f08d29402 100644
--- a/x11-wm/muffin/muffin-3.8.2.ebuild
+++ b/x11-wm/muffin/muffin-3.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools eutils gnome2
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/x11-wm/muffin/muffin-4.0.3.ebuild b/x11-wm/muffin/muffin-4.0.3.ebuild
index 1f5bf4aba312..612e2ad001ad 100644
--- a/x11-wm/muffin/muffin-4.0.3.ebuild
+++ b/x11-wm/muffin/muffin-4.0.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools eutils gnome2
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest
index 24220f55febf..7f7fca5a3138 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -6,5 +6,5 @@ AUX musca-0.9.24_p20100226-null.patch 4271 BLAKE2B 52ec8124f563fbe0e3b281e36cabc
 AUX musca.xsession 16 BLAKE2B ce00d05a09d8611a71c4d219a48bcc3e9386deb67c5ccb7d6638fab0d41862f0a503cb0ff506b71881606abb2a36da3d0df717791ff95cb8b344370ce3c4d366 SHA512 f276046ab82ceeaebf5307ea9050d55767a55cbd1913854ef0f73bdf162d2d751537ad604fc2a99d8d9c9b89426b609f127451c7a3f6b36868c74842d28a8622
 DIST musca-0.9.24_p20100226.tgz 81490 BLAKE2B 6aa9ccdd94749df1a701d605f07c29f8dbb7cb0afb73bdb9392d35df7e518496219e972535e671dd5d6d32520fa7e1d928e91489c2a303aebfe051cdd11a5230 SHA512 9030931dbc332fce144edc6bea907d86aab1eef6b1384958a7889b533af5065a2f20b7233ea063648fff0eb468c2083a310e38586c2c4d83848c773fb1984f45
 EBUILD musca-0.9.24_p20100226-r3.ebuild 1180 BLAKE2B a54c5c5492f08781e36f8da2429bad0d52b84006ca7c81a15075b867864466d0a0eb0219f1223ee2ce28bc77a27c85ea735c554f003677e805077722b5d63169 SHA512 bca766ac4931ad5d81ca212b44c69f85a318a175a303340b8e3116790bda7cae9600aa1108081b3c128c34b8d99aa6d7f0ad6a7120ee80c86dfcc990853bc2e1
-EBUILD musca-0.9.24_p20100226-r4.ebuild 1291 BLAKE2B a775b55a2c935ba4b21c59bcbe8d013d5f8f3ce24ffeb3751e212cde42370e1876f0e484cf37bc139d2863582ed1af8f90aaff74865a756968f7463e66812dbe SHA512 8ce1a6797954ed85d34408f002d78a257915b3c6eae4a5c2465135cda8f0ddbf17c6043ae65fb77f2840872e16be051d9c33b5176a2c49fc01299fafbb9bf45a
+EBUILD musca-0.9.24_p20100226-r4.ebuild 1234 BLAKE2B c729fb8db4480ffacf76ebd4694da222c9e48e280ddadcc10adc5ca1375725ec602a2e4ef6a46d70d573256f921efde1b0178a6fb7e93e22ff983d7b92183de6 SHA512 87c82a3f29f69d4364238a7041ff9867a95d2fe98a85b5af132ceb6d6e054797505d896562be1efe285051c50f6e6dfc1043db99311d4f41d4ac04796cac3d76
 MISC metadata.xml 486 BLAKE2B 12bdde943981e2eb7a6dc26a6744d596a8fce6b8125f788e760f27d1d7f3f6d8c840b173d7cd3418371a33fe2f064421b4f66484507dff22ea4895695a89cd8f SHA512 098a06d7dff066cf54e909923066078fc8347f7402846a66c26bae0e5df4752cd5a44dec6457e977b2060be5f3068e16ad5147e151ea1b4cac23b4e9e20c136a
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
index 129899ded8d0..adef927a76b5 100644
--- a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils savedconfig toolchain-funcs
+EAPI=7
+
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
 HOMEPAGE="https://launchpad.net/musca"
@@ -13,14 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="apis xlisten"
 
-COMMON="x11-libs/libX11"
-DEPEND="${COMMON}
-	sys-apps/sed"
+DEPEND="x11-libs/libX11"
 RDEPEND="
-	${COMMON}
+	${DEPEND}
 	>=x11-misc/dmenu-4.4
-	apis? ( x11-misc/xbindkeys )
-"
+	apis? ( x11-misc/xbindkeys )"
 
 src_prepare() {
 	restore_config config.h
@@ -30,12 +28,13 @@ src_prepare() {
 		-e 's:sed.*exec.*-i::g' \
 		|| die
 
-	epatch \
+	eapply \
 		"${FILESDIR}"/${PN}-0.9.24-make.patch \
 		"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch \
 		"${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch \
 		"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-cycle.patch \
 		"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-pad.patch
+	eapply_user
 
 	local i
 	for i in apis xlisten; do
@@ -49,13 +48,9 @@ src_prepare() {
 
 src_install() {
 	dobin musca
+	use xlisten && dobin xlisten
+	use apis && dobin apis
 
-	local i
-	for i in xlisten apis; do
-		if use ${i}; then
-			dobin ${i}
-		fi
-	done
 	doman musca.1
 
 	exeinto /etc/X11/Sessions
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index d619c826fd9c..3264eb6de594 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 4f3b028b2c8e..293e9ec52f63 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,6 +1,6 @@
 DIST exo-0.12.4.tar.bz2 1235738 BLAKE2B f05ae13bb5ec599686207df3fe7458b8a42227194c91c24397ed282d2c7a6ccf10989f14c662f2e0d986c59695de2b8d50743c8489bc716aaa001cbd23fe3598 SHA512 8f84258aeb5c1fcfe91e775af1e5fed02f36b3d18aa72d497cd05294d54f050d679628cdb4339219c67b203a8cc663704a240fc18e6a918cef363cf4d9b94783
 DIST exo-0.12.5.tar.bz2 1236257 BLAKE2B e1ea6f63e1e64a4f098e03ab45f2ff21a3a3851dcafa314aaadea9fcbb00f790ab18d608b4920dac868a31048d618a67c7f69c7fd5bcd8ea187fea78d20f7d0b SHA512 00165ef85145603f59cc4188d2637ec51c8cc51d9f2288c4e5b0328a2b085e940fbaaa987bf5a51c9999184f2d4f6f9751f4304feb6143416bade826007b3bf6
-EBUILD exo-0.12.4.ebuild 974 BLAKE2B 6ebb54a4157f3024f7f9502acbfe23bf2211dcd8cc4c6fd06bff00e0cb595b4f33040a32704ededdbf36551acd6106906848f36e3fb631fb3e67fa98e425e40b SHA512 a8bdc535037c1114ee8f8f0b1a52015d13e4601d1dd775db0630a650e627c965ced0317c2984cb3f01a09358f6973e78cc6eab968919bbdd0325a78c3e4f6663
+EBUILD exo-0.12.4.ebuild 973 BLAKE2B 32d7e76849460688e87425fec759c80ff86a0c4df8053ad1f291fd5c7b5f0833c0f067cbf59c34a839e06149de77dd6b8f8e872ae35365b781e3115ae1bc5fa2 SHA512 e3e7f48051217562ab90795c4cc403a23d6da6d117c00c502f4475b81839e0712aac9c80601347014e472c121ab478b51a8cfcf5158a73173965f97ba04102ca
 EBUILD exo-0.12.5-r100.ebuild 1025 BLAKE2B 9126a34aec5fca2a5a18d1318f48c37619883a26aceaaf98b52c6ab1d673bb87da517ad59ee8f07b7a4fafa0f0728d584fa61cfbb3f2f3d4434f2b54b22c4ac1 SHA512 61f058fa1c4e597d05da0f31b061380efbfd3a98d92657c0d26c96794dd11a46861d7f6a5714391862457323b24143ac02048400d6bed0773690003be3ca9cb1
 EBUILD exo-0.12.5.ebuild 971 BLAKE2B c77ca40760ca40d6e57715b1bf144fe3fbeef49238a8fbb853e80d438e7355116546b13bb304e2995247e2afdaa27e4755a84509ed69aa40ab08a01b5f84cb9a SHA512 239e7e2c99bb5bc5721e7e986ea04447a325a74d617f1bfb8fdd952431a1aeb7806649b09570486be3b799a771bba2261e67b66b028f48355b0d0e4e4994e03e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/exo/exo-0.12.4.ebuild b/xfce-base/exo/exo-0.12.4.ebuild
index 609b0f8868eb..9f3eb265a50d 100644
--- a/xfce-base/exo/exo-0.12.4.ebuild
+++ b/xfce-base/exo/exo-0.12.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 9d4de5b39637..73b560610c2d 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,5 +1,5 @@
 DIST libxfce4ui-4.13.4.tar.bz2 684065 BLAKE2B 1da875832683b5e06b8e91b4078be8122ae85a91560d7b1768cb8c880fcf5e1d7cd07d24927ae3325ba9c500c6c2cd30e717e517775492b9948add0711f5aa40 SHA512 c82d6ff7ea0da4fc0f664bab92f1e9531162996a26bb092e6ba651cfc4551732cbcd8023908d428b47906c17c331c14bf4804256566ca564befa218dc1194206
 DIST libxfce4ui-4.13.5.tar.bz2 742371 BLAKE2B 1ddfed2f6b2c360e39a00c5bbe7c9e2a01595197e808531438eb8f84e8e13680c4fa8a29f0d1ba61be0726222d253921740e73f960fedd12c3ec8339c345ea81 SHA512 5ce49c7052392ac0df74b0d5069fa7880d7b322a15b10c5c20932f10ae06529be2b21d95f7e1c10a8ecb2e38cce9a2d880ac107c3ce1e7f51d570d5ece7b7d3c
-EBUILD libxfce4ui-4.13.4.ebuild 1737 BLAKE2B d6afb27abf1c7d16dbc2b36fed86a627e67d75aa5ea6e228fa63ee9e32b4e4c8bf8ffd1e44b474118ec3ca02fd09a00f8ae6146f8f5aeb7fcc681ca7aa628a55 SHA512 65fc6d9ecf0607ccc928e8e461c9e379e7a0b3c5720e0e44583d4e1f62c046231ccdef9ef599a6c043a89aae8a9a0a79eeb2f7105ede81effec997933e16742e
+EBUILD libxfce4ui-4.13.4.ebuild 1733 BLAKE2B 36374a9f88c975b57ccfc7e03b2589ad4c08242290aa692308b43e9e68522dfb7ee061acc059562c70d0a46f3112c0c0bd787d4e162ae45161119b4988bad6ba SHA512 9e972e257858f985b1f105aceeb5a59be40e6d2401b344aa042ee238cbae9ef3b06bd0defb8c66a3553657cfb031f870d03481bc7bde92871b3cf551532b5887
 EBUILD libxfce4ui-4.13.5.ebuild 1742 BLAKE2B 78326ca8b4ed0a27c49f4798d5b56ac46a74635567cefb0e81693f8f029792eaf23ec5ffb0b621e2246cfd79caf7d9fa3c305b32303df872d6c734e47be4b84c SHA512 a14b4b7441711cb1c9daa7de8e2e3dee27be1fdbfe123bd1cd3950847ee1baae60c8c6459f26f7c1b53cc0210b6cbfa2c5978c3e0e195de890921c7b9a40b98d
 MISC metadata.xml 348 BLAKE2B b833ebf4da605db088c633bbd7e8a5747edbffae3671d6049154f89b6ecdcf3054624b5e17d55332f405608d57dd3022c1dd78b81376bd2d28c063291d32073c SHA512 f3894d3ccb668e76deaa0651414359838402d2b1e11fbe816375e6147f89847257008d5807766796fb1249217f6454a5f5896941e7ce3bc79dce09b130db4fc6
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
index df96178f0f2a..6af639e0b19d 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug glade introspection startup-notification vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index e838534ab9e8..58d797da71b8 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,5 +1,5 @@
 DIST libxfce4util-4.13.2.tar.bz2 509280 BLAKE2B 40f1fb95abff4857e976dd5f3ae8c8ad5e66e2c1c49723735e85124db71d30f204525cd74baf22e31bf405718f378b0c9ac37ec4189e1f4b9941d0eb6fc141ce SHA512 3bbb718f3a6d2213c86695b3f99d1e67c859ce635e5d066b18745d2ee57c0b2eea468b61079d8e2514c2d8f5fa847539d236ec0ed3fd17fecd9d1b36dc3595c4
 DIST libxfce4util-4.13.3.tar.bz2 511277 BLAKE2B 0815808166bc488cfa3636a18c9486fd1b3a81376766a77eef80ee24274bb290b9bece5e7786f7e412154f201bef251ce90d350c9e69db79bb893fd9081d2dac SHA512 e06bf58d46c5c3c6964a17ca8d998bd8e78bb61577ddcd855680878a890912a167212a2b4e3b347f41f84d2983e71fd1d76716db9c4a88a1d4f45a0f5aaf5e51
-EBUILD libxfce4util-4.13.2.ebuild 1041 BLAKE2B 8b023aafc1f8ecdc8b28fd04ba157b8aba8acb5acfa9c632ad0430a388860385a4b94d6288ee11a85236f89eb0468dbb6317ba8378dbf0e5700d7dfb2e5c787a SHA512 91cf34ea64d24c21d603eef18e95c8d2164aaa9825fc3a2056cce5edb40564fa796e2975374f9a2c78ec97b6d180c5b6573ab23e9f895990a437e258ef9fea52
+EBUILD libxfce4util-4.13.2.ebuild 1040 BLAKE2B a11dbb202a566265ba80d2dbedcd2814c6e3a70fb36522409f1d830dd1ec5c8639899df3d68ba3dec5f34233b964e836c3819814904fe1694167740325990a67 SHA512 e30111c79f541cff506c5b46e979ef589b889f3005ecc6fb0b0c2b28a66afe8ac57f1bc116479175cab9c32ae075f7615d4bafc5f8454675981fa1e97a80ca8b
 EBUILD libxfce4util-4.13.3.ebuild 1048 BLAKE2B 397d348fc9cd6c1442530d58523f66d6c597ea8dea4287d0abf854ec803d717bc2262df1c715fdfb1f1e7a4a45504e3242c0ba3ef721d40fb30383ded56aaf39 SHA512 2f60d797b1bc0d8f76331b71a2889b4bdfac91572d166d48f9e91f4d175311fcb92937f05fd9e7c5a51915c15d9812776c45f773e10f3fd3203b704cc2be1622
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild b/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild
index 6f87c6b032cd..87a4747dfbf0 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/7"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 42f58119abbd..8fc9bbfea785 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,11 +1,7 @@
 DIST Thunar-1.6.16.tar.bz2 1977562 BLAKE2B efad6b45a64c5c80bff3d829207a1a0b45b4b48ab168c38bbcd263445a16dc230b0c5ea7515b65d686cbf256d294bcced19b248c252478a6a1cecb393d71a7f6 SHA512 6c7b8b88e01762e606bfd9e3848a98ae5825ff431f0686dd7bbcb987e448aa4c20d7cca3fb6b7c5d5dfde91ae6f8a16e674769d168f6f875e2efe519f4cdfd1b
 DIST Thunar-1.6.17.tar.bz2 1995398 BLAKE2B c6bc0ebc29cdf8b0d3d184fd5b5019bb6f4caa4e43e16237325ae938e95c077198801e7f0d5210c458e316e0c7f35aa735f8e5bca61372c3cb2f5cf40b78c59a SHA512 2ace85994af51e1651b1e58c4436b5d4a986e75ef56f85c765e7dad8698681a73e009feafff0c9e056153b13c37b915a43529451960a209ae7e0bc23544492b8
-DIST Thunar-1.8.4.tar.bz2 2349249 BLAKE2B 4f1ac9c3177587b5ff2f3acd7220fb08921fc9db9711dd5925b65068db9bb14e7cf9d17834a96395c3fc27927030dbd2ba70d08c5b14d28e4aaf553493bce5f2 SHA512 886c0789aa19c2ab2ef34892c4afd09c857585b4796140ea3c84ccb9e1e1ca2935cf7e3a760a6ca8d8c68a5866663412500b4779878c7f48c9365c3ac7bf0eec
-DIST Thunar-1.8.5.tar.bz2 2303914 BLAKE2B e47e3e635e883ea4d044c8a66014bc11f21da780b1d834f25678763ace0609ee77755fc04b6a437f238275b0a9bf8df485cc826a6bfef93751427ee93d7e43ac SHA512 491f1a69cc1e825c9c2493af719ba22811d1300f1dfe06e98c45c878649921608d14c08e4f61551dfa3d5227ea0b0af6abad1c953d6fe4b9274ade76bc33e6cc
 DIST Thunar-1.8.6.tar.bz2 2317253 BLAKE2B ee992640e1c3df64f7aad13390a263e4599c9f0a19640b77bf5383ab6f93898f8785c86bbe307da9158390aa435699eb9a70ea3a96fb82d3b726db657436ce52 SHA512 086dc139627d8f11341b2db91358ef1831d2b8494d34abac49355dbaf850a21c30f979294f9adf2bc8548e5f817a4e165803a3db74cd989cd3867a4e228d74db
 EBUILD thunar-1.6.16.ebuild 1970 BLAKE2B e1cbcb965868303758bc993bb4078a950956a52161cd888ff02115fbab3053edf68bc2997d990d880feb1fe7e160b14c6e61a3a9523f37abaea5a70873589852 SHA512 10e4fe34c2c4c8cfdf4e301347096b915233097a061f4fc38e5594004d8e24743aaf152005de7c569f26586f57987983c79b98134d175884370ac66050c1d626
 EBUILD thunar-1.6.17.ebuild 1982 BLAKE2B 80c4db25fefa53601d8febf049c580afdf37a7776fb521e7c409d101a11f545e7fc30339dff806883f0a814e5ebb35fcb93bb64767110518f00d6d3642884be2 SHA512 a5c69521c5b22bcab2fbfd48678286934457371f16b6ffb3d1d0860a78a100af569169eb1fa5d0dd4fb43a6317bb5fdbc844d73cfa838991d81498a01cb17161
-EBUILD thunar-1.8.4.ebuild 2005 BLAKE2B ef10efa2bb1f33b302661ed8aae22d00eb0e9417adfde68d75804ae87bb607b3c0d8ef58c158cfb5cc52a60d7ed3d73dfc91119ff347d59285b6a399c4d4db46 SHA512 7a50c1fcea6fdf59c62d3a51ded1b1c5cf978b10cf306ee7111567541f7df254832346793374132201581383b7e7c006edf293d756575e773b4f72726cce682b
-EBUILD thunar-1.8.5.ebuild 1942 BLAKE2B 04ab5fd44b65bfca9f85c78613594f3019e9b5f57ad42878e5dba139a3631caa22c77ecc7904c59a05c97d02067f73cc43b3f7ada12f00fba5d4772bf20c60fb SHA512 5305f3380834f6300e0c67349a941501a4e0f9816cca9c1d66451ee98a44af52a8eef19fe2fa1d1e886cd7345b11d2c8c74056826d6cfbd460a19e8f4c0f7e75
 EBUILD thunar-1.8.6.ebuild 1942 BLAKE2B 4f4279fa467490f8fbe7cc98952892e95f6f73fa18f55eee8aa4b841e6adc9177a75e71d71ff103b9d90d9458464359b9b748c2a16433799de168e3b4e1573ff SHA512 e284953d7ae6bc71d1f7dc814f86708ab20efbe7129ec6df2f1e24ad6fe2e2b43b832254d9d24de22c20e0b0e4c288d7ff2ce6066e7785e6598f3f624bfb5ac6
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.8.4.ebuild b/xfce-base/thunar/thunar-1.8.4.ebuild
deleted file mode 100644
index 9ce63186aa29..000000000000
--- a/xfce-base/thunar/thunar-1.8.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils virtualx xdg-utils
-
-MY_P=${P^}
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="exif introspection libnotify pcre test +trash-panel-plugin udisks"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
-COMMON_DEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.30:=
-	>=x11-libs/gdk-pixbuf-2.14:=
-	>=x11-libs/gtk+-3.22:3=
-	>=xfce-base/exo-0.12:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	exif? ( >=media-libs/libexif-0.6.19:= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	pcre? ( >=dev-libs/libpcre-6:= )
-	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
-	udisks? ( virtual/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/desktop-file-utils-0.20-r1
-	x11-misc/shared-mime-info
-	trash-panel-plugin? ( ${GVFS_DEPEND} )
-	udisks? (
-		virtual/udev
-		${GVFS_DEPEND}[udisks,udev]
-		)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable udisks gudev)
-		$(use_enable libnotify notifications)
-		$(use_enable exif)
-		$(use_enable pcre)
-		$(use_enable trash-panel-plugin tpa-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/thunar/thunar-1.8.5.ebuild b/xfce-base/thunar/thunar-1.8.5.ebuild
deleted file mode 100644
index f1892f3a51b0..000000000000
--- a/xfce-base/thunar/thunar-1.8.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-MY_P=${P^}
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="exif introspection libnotify pcre test +trash-panel-plugin udisks"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
-COMMON_DEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.30:=
-	>=x11-libs/gdk-pixbuf-2.14:=
-	>=x11-libs/gtk+-3.22:3=
-	>=xfce-base/exo-0.12:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	exif? ( >=media-libs/libexif-0.6.19:= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	pcre? ( >=dev-libs/libpcre-6:= )
-	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
-	udisks? ( virtual/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/desktop-file-utils-0.20-r1
-	x11-misc/shared-mime-info
-	trash-panel-plugin? ( ${GVFS_DEPEND} )
-	udisks? (
-		virtual/udev
-		${GVFS_DEPEND}[udisks,udev]
-		)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable udisks gudev)
-		$(use_enable libnotify notifications)
-		$(use_enable exif)
-		$(use_enable pcre)
-		$(use_enable trash-panel-plugin tpa-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 90ded79a6db0..f14e9792ed5c 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,7 +1,5 @@
 DIST xfce4-appfinder-4.12.0.tar.bz2 459338 BLAKE2B bd3fdb379fa50e7977aed87e54956a6e04645fb92dc55bfd22e5723fe162ca0f65dade18d8f077105fe5aa4bc922fe0a8f6fa1308fa2705d570c76d4bbbecc62 SHA512 025d38f9f2d57d1bcc37d38f4956742593cbee820ccf7d375138ca3eb0a9614090e3b969aba9d80b546eac43d2a9fd6c530ff829f0e4f59621ca068159e9adaf
-DIST xfce4-appfinder-4.13.2.tar.bz2 499368 BLAKE2B 2584bfd5dd1e6f8cb28ba3e6ecdcfd6345f26ace2fe97237c9c7b5385824a40f3f88f86d7c7577b9e683bd73d3404087c52df0b451b2408350d8dc3268eb7171 SHA512 96ac782c785649ddf75f8659f9cf10f42c37bab647824f0c76714baca0b61904fa8ba6d23dc1574aae5fdf2538201936d26b42ea6c0f5d5f0f9d71c8ba0a51b8
 DIST xfce4-appfinder-4.13.3.tar.bz2 511606 BLAKE2B 3e1038b7a9d9b4aec4ef6654e8fb0790dba3a378a0416757fbf2f5bfa23dfd655bc2abb9680a3144d6d57830dd18d48bdf48dc6960aaf32d4263e62779ac7f24 SHA512 47f69e8daf6f963b8130c0380f2201cdb2d02212cfb8b5c05fedbebb78222d3bd35db0fd422418cf3f9d1f2b90e66ee4d143bed57881f5673aefca8bc58e059a
 EBUILD xfce4-appfinder-4.12.0-r2.ebuild 857 BLAKE2B d58099530d95557f2daf58dd6ff2d256b61c54c9121f32d5866fc5843f65017921ce85d56110dc19b0bf631ea65b4ed5ef23efcb46216000736559fac938aaf5 SHA512 a65d81e4033ae435ef323005f67af53d0a927d7d0d97f99fd7ccab924d4ab1cd1d7c1bd18856ac567b7f8b1592d6a6a7ff2c232495919c5a5f1a9e7d82dfbee0
-EBUILD xfce4-appfinder-4.13.2.ebuild 787 BLAKE2B 024c79a06caae6edf78fd944370ef024cfb91ef594e798db7449aa51550bd0363ccc87bb28836c7775f9a4baf971ef1ae1c004fa7a6f02137430c67bda9817aa SHA512 84a365bf0ed6c6d6a841f46d87f148f2c978b3ebf7482a4f9a25f2fa145bddcf98922d7414ff1bf9dd135bb46d1dace00b5737a8b2f442247fb354fd7f4e6369
 EBUILD xfce4-appfinder-4.13.3.ebuild 787 BLAKE2B 7419b7c377f2d8602f247779bb722249103d68c0b82e103beb699c3b6971ef37730f6b873104176d023b6b96e7d39acb8f17984d420349c5ab4900f78f48076e SHA512 35e78c1f10608c9688ddb54ea0c64f54ee9f96df0f3c44c58c782f113ba3e926d49503aa3f3eef73339a7ac9af1fd572e96c8efbe9bfef9fbb1b8bf275ed6d68
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.2.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.2.ebuild
deleted file mode 100644
index 98ad1e6778c5..000000000000
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-appfinder/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/garcon-0.3:=
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	>=xfce-base/xfconf-4.10:=
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
diff --git a/xfce-base/xfce4-meta/Manifest b/xfce-base/xfce4-meta/Manifest
index aa37bee73e04..a9c9d3671066 100644
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,2 +1,3 @@
 EBUILD xfce4-meta-4.12-r1.ebuild 733 BLAKE2B 794d9072cd32913eb60f9c895acfb36e6de8c94ce6418516c67e60be494637b989b37899eda1759e439691043c6bb5f23ca9aacf28a11e59321ecf47660a1a17 SHA512 b382d26a9d0c0720394c3d8130e82c6c794aad646bb81555e946eb232018891d3067675f3429b5b81ac66be2f5d1690dd242552bc3bf9f20cd3d5476cb9ac11d
+EBUILD xfce4-meta-4.14_pre1.ebuild 971 BLAKE2B 7a50f99a69d65fcb8ce6c6ef5d3775ea521ca099b39824a2c515e1214473f5955e3e6b7374e0b05b40bafa71e63cdc7323d792c8f3e6bebaa27c881c7ff27a84 SHA512 4c372f5c39ae42005560d3bc93136087c0cb05d3954ef7652935a42b5e420e0b855d127e33faebdfc9e8e79a3c8ad5c0184b52d87b0514273bb6c4d4ebb7c964
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.14_pre1.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.14_pre1.ebuild
new file mode 100644
index 000000000000..b0a2b25906eb
--- /dev/null
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.14_pre1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The Xfce Desktop Environment (meta package)"
+HOMEPAGE="https://www.xfce.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="minimal +svg"
+
+RDEPEND=">=x11-themes/gtk-engines-xfce-3:0
+	x11-themes/hicolor-icon-theme
+	>=xfce-base/exo-0.12.5
+	>=xfce-base/garcon-0.6.2
+	>=xfce-base/libxfce4ui-4.13.5
+	>=xfce-base/libxfce4util-4.13.3
+	>=xfce-base/thunar-1.8.6
+	>=xfce-base/xfce4-appfinder-4.13.3
+	>=xfce-base/xfce4-panel-4.13.5
+	>=xfce-base/xfce4-session-4.13.2
+	>=xfce-base/xfce4-settings-4.13.6
+	>=xfce-base/xfconf-4.13.7
+	>=xfce-base/xfdesktop-4.13.4
+	>=xfce-base/xfwm4-4.13.2
+	>=xfce-extra/thunar-volman-0.9.2
+	>=xfce-extra/tumbler-0.2.4
+	!minimal? (
+		media-fonts/dejavu
+		virtual/freedesktop-icon-theme
+		)
+	svg? ( gnome-base/librsvg )"
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index deed8d32cd68..4f56b675ed3a 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,5 @@
 DIST xfce4-panel-4.12.2.tar.bz2 1167175 BLAKE2B 09d16c58bb2d78242069fc2191009af6bb737fd6571f7d9ceef4b2b2dc0f0be6fcdad17aa588f69573b9d7f62ca0c54ec712bd467ff793b6952ede733889136b SHA512 b455e28ecbd9e2fc152e1132a806307597157605fef19c61091fce90984b2eded2c0b691d1fa2475c218c9d0b12103e348e648a32d3e8d0aa9ca210b7ae36a9e
-DIST xfce4-panel-4.13.4.tar.bz2 1261056 BLAKE2B e09c540fca10417e8f3340cacd3f35dded832b512c11e4c485b93120b331cd4a29bcf0df6dae787cb3fd65567a705dff69d95551b073e49b5fc4fc62f598eb0e SHA512 16a3680aa2ab7fa357ca9d477ea0e41ca159a2c626fe65454ccdca339bb501ff0979264f5a4ae4728e3c0efe24e193eb28e7b5d1e003fecad8ab36b8457203c8
 DIST xfce4-panel-4.13.5.tar.bz2 1259668 BLAKE2B 533f1be8d240787678eae401c07db7d159b2f43c212d57d4fca4bf53f58f033fd12bc193de1740a65dd513658889f5fb404154356bc33eba59fefea8bea27526 SHA512 3eb4034bd6eae38f8f533b8cd2cae4ec8b40cab5f0d6810639baad641b4adaf15d03254ec79cd49d04e3498d3a4752bd9e968a0383468e7337106b3665092c4e
 EBUILD xfce4-panel-4.12.2.ebuild 1504 BLAKE2B 35b2d7c2dbf64d7596d0b413b7ac059d7b163119098dd1019bd4afa9fec3cd20133be387f2d8cf855067cd1305c73f52e9542ead6d2a307ae17d9160caa2d1a9 SHA512 d3c4d3f4097d93e6e17a35dbe20239551cc35257604ccc679571c45efe941e504e356bb1d61fface34182d920b78f20e46c8363c86b8195295cebaf02da042f5
-EBUILD xfce4-panel-4.13.4.ebuild 1342 BLAKE2B f53b2b4bf99364b5e5e06fddd32f8e23548d9f1baf418c9aa08a38e1c6f1f45ba34ecd25950363d7d8f26614d5683c70f59a23e042b629780bc422bb0209bd60 SHA512 d3be27ecd6b561985df7a30414f9d7e7e0b9eda177c07b731cc0bb4d5e5d5fcb3fb7c38eeac76bd9ad97736b4d7c9881f0189fca46b01fc1d8e33045ccc377e6
 EBUILD xfce4-panel-4.13.5.ebuild 1342 BLAKE2B 5c38816b491f669710e2e71c927025448eb4d8a01f0c366f96e6e982634e0efddce1879ae40c5069c07ae17751dc344dbc8943844ac8e377e6f4e06f65c83c86 SHA512 4ffa6dcca11069ec55c93f0fd0bd0d113dd938dfc90cbd7a744ed95ff6008349ef47850f83866393dcf33117e4382fe30d787efcf32ec3223ce2363dab2e150a
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.4.ebuild
deleted file mode 100644
index 1632b090f2e2..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="introspection"
-
-RDEPEND=">=dev-libs/glib-2.24:=
-	>=x11-libs/cairo-1:=
-	>=x11-libs/gtk+-2.20:2=
-	>=x11-libs/gtk+-3.22:3=[introspection?]
-	x11-libs/libX11:=
-	x11-libs/libwnck:3=
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-0.5:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=[introspection?]
-	>=xfce-base/xfconf-4.13:=
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-
-		# enable GTK+2 compatibility
-		--enable-gtk2
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 534ae74412f1..1402a85a2cd2 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -2,9 +2,7 @@ AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 371 BLAKE2B 7737f95e5ce5
 AUX xfce4-session-4.12.1-light-locker_support_to_xflock4.patch 569 BLAKE2B f05f03f7ee891fe286d4cb2781393d1a836e89c5ab6b2f7e0bfdba3582549d054cc6beaefb805d83d12ff1fafc8581ce12d2e284314ac14ef6b3fd9cd1c724f1 SHA512 da3b4fcc3cd059db267807fc46db6b484a2cf9d27e457850adc71e465300eb3d776ae8f10c204f0d419dbfbb135fce60ee5a89a75aad8d3644c7ba749f0a2c83
 AUX xfce4-session-4.13.1-kill-dbus-includes.patch 1279 BLAKE2B 3c446b5dcadc9f68dcfd9b2fd9d8ebd1b94e54fc6f3815ff7ee5d01f9be9fbefd1b2b269344bcff148a4c5199bb3dc58d4e1253450c541f4f996e6d4c55ad64d SHA512 8d5265737db4ade8fe59b7b051b741ca5b1a90a7d2abcdf5a48e658c04b3fc25f304555116009e58125662b243cf3dae1822c7ab387c7fe6ac6e0fb661b2d6b3
 DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
-DIST xfce4-session-4.13.1.tar.bz2 1322823 BLAKE2B e50cc2628a068bed39d2aa6344eab7676e6464c84e3cf11d79518f78db54ea01316bd098a541b6f0897f3decbed2eb37e55009d4bf89d460e136d7a44d31c26a SHA512 5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b
 DIST xfce4-session-4.13.2.tar.bz2 829041 BLAKE2B 3b5c8a5722b7a38a95e12ec2145e2c155928e0ee5d7d8e9f47c86ec4e03f34b983bcd3dcbc1a3d6c2d84f991ed8e9f59b7db76716862c91290280db507a8b84e SHA512 cb1e63a3df9c4ac3efcb0cce20cb5528f9d1a46731ad4b32634ad5f4a53711f05b40d98464bfd562b4e3d42b2555827ece03e63c6a433e879fa0f0a4ccda6a57
 EBUILD xfce4-session-4.12.1-r2.ebuild 1882 BLAKE2B 7c7b06cdd917d710fd5b00cd8344a7f9234c60e6d5797d55f2116468466c2d9b41050dfcde85720768d3c6571ed00c87477a929ba2922bd329c5d630e46e40c9 SHA512 a1ae9a240697d3ab38a28cf9a835b7516009f92a6a6961a07f1477e6e8709da7d2ce0c2ebdab2999b1fbf47a6cddd18d7152946e157669181ab04b48c0cfcf7a
-EBUILD xfce4-session-4.13.1.ebuild 1947 BLAKE2B 2dbc0df69e245a1f40117538a9901ec0e9db880e89a48200b88da090e041c9f9b0c6782adca26f13ad877010fc4112adfa055555156cfdf5247d6a39e931809c SHA512 98c11533356719c6f76eeaff3300d7eee28e3981da46f932897011aff2ced7a9cfe23ec3eb79e6a31692dad82a05b2226544933dfbca2d6f0f02c95fa5a823ce
 EBUILD xfce4-session-4.13.2.ebuild 1824 BLAKE2B b4352ef3e5793e032aaedea4267847eb747a4e7f564832a0c22cfc17fe37d91b0e9f897c79ca45b0d035c9f90dce7f54f112fdd65d2439bc2ff07fe810632c48 SHA512 462de9c5f68e30da0222949b0f961688eccdc8d782771956ef51907e86f34355262ae354d730cbfb1baa25f44bd0d7edb6de608295e154171f38244f4b7a5362
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
deleted file mode 100644
index 67b5f3f2722b..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="elogind nls policykit systemd +xscreensaver"
-
-COMMON_DEPEND="x11-apps/iceauth
-	>=x11-libs/gtk+-3.20:3=
-	x11-libs/libSM:=
-	x11-libs/libwnck:3=
-	x11-libs/libX11:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)]
-	>=xfce-base/xfconf-4.12:=
-	policykit? ( >=sys-auth/polkit-0.102:= )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xrdb
-	nls? ( x11-misc/xdg-user-dirs )
-	xscreensaver? ( || (
-		>=x11-misc/xscreensaver-5.26
-		>=x11-misc/xlockmore-5.43
-		x11-misc/slock
-		x11-misc/alock[pam]
-	) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="elogind? ( policykit )
-	systemd? ( policykit )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
-# TODO: this patch needs updating for the new version, and finding
-# upstream bug.
-#	"${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
-
-	# fix building with no dbus dependency
-	# https://bugs.gentoo.org/667440
-	"${FILESDIR}"/xfce4-session-4.13.1-kill-dbus-includes.patch
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		--with-xsession-prefix="${EPREFIX}"/usr
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	local sessiondir=/etc/X11/Sessions
-	echo startxfce4 > "${T}"/Xfce4 || die
-	exeinto ${sessiondir}
-	doexe "${T}"/Xfce4
-	dosym Xfce4 ${sessiondir}/Xfce
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 0f618ed42eaf..8f04adcc7dee 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,7 +1,5 @@
 DIST xfce4-settings-4.12.4.tar.bz2 1036773 BLAKE2B 512547a172081d75e7eeb97f499e77320a3df1090e80ef548dbbaf84d454b614ddb6a36bbfe4cd06d18b478ada7bd76f385dde374a93380f848ffcc232b133d3 SHA512 9b74daa3f98f15c8cb696dc79f9913fecb37f2ca44c2fd3f24865ae03e9a1db93cb5a8ddb27da3c4af7d7a9e9d718a22e46188ff515caf925a5cedfaab37b189
-DIST xfce4-settings-4.13.5.tar.bz2 1067538 BLAKE2B e1c747582744bd2102f46fa45340d5695240f98941ebe55a83067b9c99b00946b8df9c522313418219acd11048d49b8c6617abde64eb3dce583be59c9272ade3 SHA512 5e7b13b25767091ab0b1a5683359f33e4a86151dd9321681fc4d896fcd9cc569effaebfbab70bc734e07041e9fbb1c3015f9a177146de8a128c4a539462dba5e
 DIST xfce4-settings-4.13.6.tar.bz2 1163147 BLAKE2B 28986789cb82f91dd70d33203503cf49c4e20b548722be3cb8a2214ea16b762841cd56ad0ff7fc106b8ee35c812a7b455076c8fdce79aa7bf84e7706c15bd3ab SHA512 7fe4655a5644dec8688eebc508e23bace7af76c6b8eeb3821fa9a4ec79862cde64cf59ee2ac70a27ff378ef887ce6d109ef1b1d9e5f7e98f96fdb43604e024b6
 EBUILD xfce4-settings-4.12.4.ebuild 1503 BLAKE2B c11e3874f0ef54d18f003aead151f25623ca2ae32a9d8cee943f1e1f3a9398e2bf1eb3710c1193ee387ab70e38f9f19c72dbebcf5f20441b63cdc444aafba483 SHA512 d62e35948f10f10cb6ab49c141a3a2b3dc25183bf87f448b27d167cbcd1bbb0a6a3c484c4a5f58fbabbcebf3dc3b16c320b9899dd2c9af3a88dd097eaac3265e
-EBUILD xfce4-settings-4.13.5.ebuild 1501 BLAKE2B bddb40c911bd63957c5a2ff36d08de769ae55768c62f1581b1b428cddbf6307577adae021896bb7fc561a30b42477d15158912504b8d3d563e57aadae868fb58 SHA512 bc86fc48a7be96eebb740d6df897b58c358cd35dda14a90c3894686083af9a1e04d565b91e27b97b693238684c85d4e51a5e2cf646a6dd586ff8341bf32dd824
 EBUILD xfce4-settings-4.13.6.ebuild 1578 BLAKE2B efc118d9b1cdb9e34f9194712188169469209dcc4e5ae58704a9ecdd9ac628d44893d2ff025e3e6183bc20565c90a9f2c6592817771acccb06bf80bc82d48713 SHA512 7b8bbeea0f3d9028700d05617d1a71696cc8f6ec82adef4538d14c06213075aaf1673ce0ab35dbf5ecac6bd39297de95b48fb5574376dbcb5a0f9ba3125fe38b
 MISC metadata.xml 568 BLAKE2B 84eb32975dbf31237aacc657e8caff9c190ee8c0703206188ecf72ff4e53c582740c2bf0601ef906e7ef4de1fd7943a22fe34ad88321bf70ab86ef41d7a8aac4 SHA512 08955196da3e56d7c1d249282dcbdd7e06f699b8113b3279cbcfa0b3619965465af8b72326c1cdbf562062a307cbf92970f388b8a1765c58a3d107062ee0d431
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.5.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.5.ebuild
deleted file mode 100644
index ab7704362e6a..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
-
-RDEPEND="
-	>=dev-libs/glib-2.24
-	media-libs/fontconfig
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2
-	>=xfce-base/exo-0.11
-	>=xfce-base/libxfce4ui-4.12
-	>=xfce-base/libxfce4util-4.12
-	>=xfce-base/xfconf-4.13
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable upower upower-glib) \
-		$(use_enable input_devices_libinput xorg-libinput) \
-		$(use_enable libnotify) \
-		$(use_enable xklavier libxklavier) \
-		$(use_enable libcanberra sound-settings)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index f609a433a35f..2e4ccdc3f938 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,9 +1,5 @@
 DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
-DIST xfconf-4.13.5.tar.bz2 609549 BLAKE2B ccd5e907752d8fa5b5c4a7468c9eeec4083709bbe11b14ae79b20938e3b7c6ff097805be56b3f8cee146e2d0c0ffb272b856e559d1699c4e40d7c140fe7515fe SHA512 34e6b99be0b288707f8632c5fe4f2e66e01ec3950f4d194a7007afb4bc1cfe8bea44f8f80873de2364680481921332c9860b23bca4ced94ecb95c9199df5315b
-DIST xfconf-4.13.6.tar.bz2 578107 BLAKE2B 6348b536978d1d3f611783e530be7b694c46ad3030ed02e04a6e38122028068ec8392f34667e5d54a09d9115db191d6366619707e117f2b37f3ad8f14a3de2c2 SHA512 0eaa1ad428be5bea97b891a6bf0488293064e31d4869b70389ded940a23f9d8cffd0801dd98932658a67e57d6a0da95998872202cf7756aa24caa8f9d2c5f755
 DIST xfconf-4.13.7.tar.bz2 618676 BLAKE2B 8f7dd97530d4781e2d46d8139800f54991d932db5de0050e66d711bafef1daa0355383fd139789037a92b462042563a9aa2269295785b2f8217a0e9ff6a00c80 SHA512 113fb22b449a318b0cca6521914eda6cfeb6b2056a1aad4d49a5e83c28661c843c9912bbf7eddb7d6cd1f172b532c73dd02259bf6fabe60a377024f9f8d5825d
-EBUILD xfconf-4.12.1-r1.ebuild 1823 BLAKE2B d8af63d40df95e867353c32ef841f33caf711e5c6c3de5b1a3af54432ab356952a9a7797715c1991cbac1e7b1f74d451f18d1afd2650928b726033fa04bf3836 SHA512 11dcc3a86019a72063a4e94817b69c75deb14fa82eb13ef9821b1c26e9b29fd8b944d16b08a1f4e11b9fb33313bc1917b6f521a428c735edc624b7ff0255575f
-EBUILD xfconf-4.13.5.ebuild 1643 BLAKE2B c0ec3ea5952565769892124c73207b720afcd78ee73f354ca1632973b31d1910804ea1ac5ec37c4760f233cc5218cefa6494c5bb4f6cc7f2e75ab155ff746be1 SHA512 bac2083f81068db1c0078aa20ddda95bc057a8a9f4e2b9e75456e9fdf4846af23b0b31f78d4f47c9f367bd6fecafeb1b8561a4d427348c8631a8ea4b1f7c5a6c
-EBUILD xfconf-4.13.6.ebuild 1646 BLAKE2B fac9125900a540df75188349e283b7671e2451c44ce321b8990b4830ec00a271ad3878569898e551ed802e5b26e482917db73b270fca3e73e39cbab1a1e5720a SHA512 6b98d4d1f82b233b8110ffa8abe8c2e2d6336f23312bf6d8c0bf7358b8cc3f03d03fad5779c0010722000bf7fcebcffe6d4e3d95b7e80d2441b6b81105971fb0
+EBUILD xfconf-4.12.1-r1.ebuild 1822 BLAKE2B b37314d0bc755c1144da7e9173e6998e2efcac9501362035ed0989fc8a148f2d55ba3dd7a182fac68994284b8bc98e386c202f9d67282b76d2506e2a9070b96a SHA512 e841c7e830bb3e016c29a968e756f4497f7942740eb2bc7c3f3e298de35189faa0af7d7968260a5dc1fea738fc645f2cd490ce40eb7adb6c28e4fba974717962
 EBUILD xfconf-4.13.7.ebuild 1644 BLAKE2B 8829022a08c21700ec90b0f350f8892fab125859c47ec4922b52cd9104a745203382d3d2ae5e153315f17be17be6ecc04771307cb5a9dce691b3993f47c0e52b SHA512 d28e2c4989873b338166fa2a9837553b1ceb366d20befea84414b7b8b894c2801d14d7be22b7b547595f32d3621d6cda4dca0a697eb83c720fb10412e77bc343
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
index 81f5a2d94ea2..0f7f61db433d 100644
--- a/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
+++ b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug perl"
 
 RDEPEND=">=dev-libs/dbus-glib-0.98
diff --git a/xfce-base/xfconf/xfconf-4.13.5.ebuild b/xfce-base/xfconf/xfconf-4.13.5.ebuild
deleted file mode 100644
index 244033bffc4a..000000000000
--- a/xfce-base/xfconf/xfconf-4.13.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit virtualx xdg-utils
-
-DESCRIPTION="A configuration management system for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug perl"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	>=xfce-base/libxfce4util-4.10:=
-	perl? (
-		dev-lang/perl:=[-build(-)]
-		dev-perl/glib-perl
-	)
-	!<xfce-base/xfce4-panel-4.13.1
-	!<xfce-base/xfce4-settings-4.13.1"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	perl? (
-		dev-perl/ExtUtils-Depends
-		dev-perl/ExtUtils-PkgConfig
-	)"
-
-src_configure() {
-	local myconf=(
-		$(use_enable perl perl-bindings)
-		$(use_enable debug checks)
-		--with-perl-options=INSTALLDIRS=vendor
-	)
-
-	xdg_environment_reset
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake OTHERLDFLAGS="${LDFLAGS}"
-}
-
-my_test() {
-	local out=$(./xfconfd/xfconfd --daemon) || return 1
-	eval "${out}"
-
-	local ret=0
-	# https://bugzilla.xfce.org/show_bug.cgi?id=13840
-	nonfatal emake -j1 check || ret=1
-
-	kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd"
-	return "${ret}"
-}
-
-src_test() {
-	virtx my_test
-}
-
-src_install() {
-	default
-	find "${D}" -type f -name '*.la' -delete || die
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete || die
-	fi
-}
diff --git a/xfce-base/xfconf/xfconf-4.13.6.ebuild b/xfce-base/xfconf/xfconf-4.13.6.ebuild
deleted file mode 100644
index 2cd890f3d36b..000000000000
--- a/xfce-base/xfconf/xfconf-4.13.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit virtualx xdg-utils
-
-DESCRIPTION="A configuration management system for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug perl"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	>=xfce-base/libxfce4util-4.10:=
-	perl? (
-		dev-lang/perl:=[-build(-)]
-		dev-perl/glib-perl
-	)
-	!<xfce-base/xfce4-panel-4.13.1
-	!<xfce-base/xfce4-settings-4.13.1"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	perl? (
-		dev-perl/ExtUtils-Depends
-		dev-perl/ExtUtils-PkgConfig
-	)"
-
-src_configure() {
-	local myconf=(
-		$(use_enable perl perl-bindings)
-		$(use_enable debug checks)
-		--with-perl-options=INSTALLDIRS=vendor
-	)
-
-	xdg_environment_reset
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake OTHERLDFLAGS="${LDFLAGS}"
-}
-
-my_test() {
-	local out=$(./xfconfd/xfconfd --daemon) || return 1
-	eval "${out}"
-
-	local ret=0
-	# https://bugzilla.xfce.org/show_bug.cgi?id=13840
-	nonfatal emake -j1 check || ret=1
-
-	kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd"
-	return "${ret}"
-}
-
-src_test() {
-	virtx my_test
-}
-
-src_install() {
-	default
-	find "${D}" -type f -name '*.la' -delete || die
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete || die
-	fi
-}
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 7dc847c47481..d65599d5c321 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,7 +1,5 @@
 DIST xfdesktop-4.12.4.tar.bz2 1421623 BLAKE2B a18b891d639165d617f2701106dedb2f8577273ece5a4c93f6b5e1ef26f801304ea2014f21bd2821eb9bac9b19e02dd75cd4054a116eefd544f4d8e5d6968879 SHA512 29f170b96836298dc83e3c49650ab7e88a93c1a2fa1599d1d98f3b6c80c9c059748b76a821077eea39b5b4619998bb300ff17f06e88483a59bd5ae2b76d0605e
-DIST xfdesktop-4.13.3.tar.bz2 1487433 BLAKE2B 81c5be8d54da6bfdb121d5632d67abfe6705eeddfb8c247ebf6870261093908660f880c8152d0cff87c912b1f3277d6551993a6a64384e610928c9bc6fda45a9 SHA512 5d828ad653b46ab1edc8300335321bab48e0ad2be1ae02944eff553375a6059513aeb363c73aaec1a6958dd3f1c873920287ad911cfe7b8096b447f1b8165ce3
 DIST xfdesktop-4.13.4.tar.bz2 1485482 BLAKE2B c0f40c448d79e3840d8708e8c5fb4a1d94658ab866c630c5a9b2cd40e3b92b3598e57377ed60621a5b28daedd7ab877aeb13b84735a23f5a302cf07434008012 SHA512 3943fc2af3ca3996a38900fea4a03004e1d3f8728a8517c988bd59744607ed8e4ba3f135d6075833af206df3c35464633f47e374c26fcbb8a20f0f1ecfdb7da6
 EBUILD xfdesktop-4.12.4.ebuild 1305 BLAKE2B fa4e890b1e14d7afbf5f8e7e64e666cf91c36b6c2b80f93bbadaae07906b3678955d4a578a23f0aa2e3054e4c2c048a6bb438cf3f3f9a284b39ad67556c07c73 SHA512 12cebc35ec79e0b580c4256092e502164826c7f9abbb3c8558e36a1b9eb480ba3004fb4f68622081f8043efc0569d3b8fead5a5e2ed3549c43a2d9035db89514
-EBUILD xfdesktop-4.13.3.ebuild 1215 BLAKE2B dc10aa26a8014804048ba4cc5fedd11d71f8cde4afe06881b38f34a5f1e5322a02316e8967f7a112535df14631b5497ba1fe31cf9f815eab610bf43b4e329dd9 SHA512 36dfdae27fa6810ed2267fe3ac6f2a77715c23f3f8ada7768b5b6fa022afb732a5e7b23a6355b951402bd3ac42c641a12301de9dd68f9e1792f776f3a8dd5689
 EBUILD xfdesktop-4.13.4.ebuild 1215 BLAKE2B dc10aa26a8014804048ba4cc5fedd11d71f8cde4afe06881b38f34a5f1e5322a02316e8967f7a112535df14631b5497ba1fe31cf9f815eab610bf43b4e329dd9 SHA512 36dfdae27fa6810ed2267fe3ac6f2a77715c23f3f8ada7768b5b6fa022afb732a5e7b23a6355b951402bd3ac42c641a12301de9dd68f9e1792f776f3a8dd5689
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/xfdesktop-4.13.3.ebuild b/xfce-base/xfdesktop/xfdesktop-4.13.3.ebuild
deleted file mode 100644
index b4de135cc031..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.13.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify +thunar"
-
-RDEPEND=">=x11-libs/cairo-1.12:=
-	>=dev-libs/glib-2.42:=
-	>=x11-libs/gtk+-3.22:3=
-	>=x11-libs/libwnck-3.14:3=
-	x11-libs/libX11:=
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/garcon-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=
-	>=xfce-base/xfconf-4.12.1:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? (
-		>=dev-libs/glib-2.38:=
-		>=xfce-base/thunar-1.7:=
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 869a7ec2b6bb..e14aed85881b 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,9 +1,5 @@
-AUX xfwm4-4.13.1-fix-mask-len.patch 871 BLAKE2B 048bbabfa59671a5e0dba77e353a8daed8677839b82de6e4a9b0419217bc3d91baac8ccd7c8129aa907de4396014503947501a3cb0c12f44ed96795337ff548d SHA512 beb34642c63f1dc1734261039a00ea6e845c0b544c655633096027ad627b003fac221b74345150aac92854416bae054c3bb4efcce195026432061610480500ad
 DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c746121f68e4bd0c64e30b9b0c11abfe13c1fb77321249edd4e5c8d3051f62f135093fabfd8ba215573d330fd3745c2 SHA512 b723638b9cd858beb75232a251471cfb2d01ddb412b536c3f0b432e1f894014e1ad51c77d208d5439ae8a8d970344d0146d5f9475106c1b66d22715af7af42d9
-DIST xfwm4-4.13.1-patchset.tar.bz2 2739 BLAKE2B 895ac4939c9f9ab75e7f9e5b237cc731dd619bc87ac7a4f6623dc30ef5f4b7e0a80c826881a430b9c1d42ae0172fb72af2d4ff7c5ad6b54890f6d9233c4ecf49 SHA512 aa918e8efb050b87afb90594cfeb69a4457117b6bd47142d16f3cdf3d1cd7a4d9d2670dbbb68d939f5d2e52a05b42cefb59325963aabad84fd82ddf1f6ffd6f5
-DIST xfwm4-4.13.1.tar.bz2 1224120 BLAKE2B 983b12775ba8998598efb22a2a7ab6f539cb1c6074c3fbaa882b9627e5ad0ff3b96ed0d4352c31dd04451c37dd706404147b87bd899f6b6f1b38df0162b82a15 SHA512 2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320
 DIST xfwm4-4.13.2.tar.bz2 1139976 BLAKE2B 724cb6562f89048f3f94740ff6984f2780274240800646050c62d0b19e303fcdfb1022227262953c09bb42a9a5a176dca8e1e69252d953df15660dd22f906ecb SHA512 85440a377cd7034e986b317e35c25ac6d4723bd4c1ce1e6951d8545a44f3c47340952fd0211f55cf19411539be6d86f4c34fca7b2219b0873654a6d311c95055
 EBUILD xfwm4-4.12.5.ebuild 1549 BLAKE2B e8fccfcedf7cd833cd36547ca919c9f59ab6fb4b4e56f376c5c5d86178f65b04f6b275dc5509f91c31badcf0aeef7a64ed8b1c19cefabee1bd550703aa8dc5f4 SHA512 c5287cc701a6762d1ec634ced21aaf36b4b2108ab4d9f4a9029e11212e9f4fbdceeacd3c994d8a096de39b351e0adbc3ae613a3f6dd610a956768c9c04e16003
-EBUILD xfwm4-4.13.1-r2.ebuild 1945 BLAKE2B 0f035f0041217d7d3eae637a723872b65deb77ca015166bab9f03c4d7dc4e37896153ea4bb7358679335084bfe69365c2c41fd77343cd6397e9e68ca517f7568 SHA512 7f6889976c91d99710bbd5a3b0af1226d9dd7967114e32e0e5d53b589b3322821d3c939b890f13db1b2a561b99e9dec4cdc4f683a94746645d6a59d5e6dc4f19
 EBUILD xfwm4-4.13.2.ebuild 1712 BLAKE2B f1c7953b879cb57bca4d17c73857b55c66d96aca637a5a8235bd3196bd79f7cb221255143c4c0c1fc74c406f7c4a47fa842543e576f51f91fb370aeb983ff2ee SHA512 c723db233d7802f937dfee28a1a2f7e09e27cdf90cdf3428f8bf4768033518ed338f87fc5e7d7427d7c2684df23c93dfd43ef6421f5d1f7b1f753b0d9f06bac1
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch b/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch
deleted file mode 100644
index 640e297ce92e..000000000000
--- a/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2080fa3c81b3810228ae5a8abbb494c78dd1d566 Mon Sep 17 00:00:00 2001
-From: Timo <timo.teras@iki.fi>
-Date: Thu, 13 Sep 2018 20:25:33 +0200
-Subject: device: Fix wrong mask len
-
-Bug: 14695
-
-The `mask_len` field is setup incorrectly in
-`xfwm_device_fill_xi2_event_mask()`.
-
-The size is the pointer length, not the bitmask data area length.
----
- src/device.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/device.c b/src/device.c
-index b1e33ae2..01c0c81d 100644
---- a/src/device.c
-+++ b/src/device.c
-@@ -301,7 +301,7 @@ xfwm_device_fill_xi2_event_mask (XIEventMask *xievent_mask, gulong core_mask)
-     guint i;
- 
-     xievent_mask->deviceid = XIAllMasterDevices;
--    xievent_mask->mask_len = sizeof (mask);
-+    xievent_mask->mask_len = len;
-     xievent_mask->mask = mask;
- 
-     for (i = 0; i < G_N_ELEMENTS (core_to_xi2); i++)
--- 
-cgit v1.2.1
-
diff --git a/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
deleted file mode 100644
index b929ce60b99d..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite +xpresent"
-
-RDEPEND="dev-libs/dbus-glib:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-3.20:3=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/pango:=
-	>=x11-libs/libwnck-3.14:3=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfconf-4.13:=
-	opengl? ( media-libs/libepoxy:=[X(+)] )
-	startup-notification? ( x11-libs/startup-notification:= )
-	xpresent? ( x11-libs/libXpresent )
-	xcomposite? (
-		x11-libs/libXcomposite:=
-		x11-libs/libXdamage:=
-		x11-libs/libXfixes:=
-		)"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-PATCHES=(
-	# set of patches to fix refresh issues
-	# https://bugs.gentoo.org/614564
-	"${WORKDIR}/${P}-patchset"
-
-	"${FILESDIR}"/xfwm4-4.13.1-fix-mask-len.patch
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xpresent)
-		$(use_enable xcomposite compositor)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 484e74090344..899fab56e820 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest
index 64f842aeef90..1d42438e51ef 100644
--- a/xfce-extra/thunar-volman/Manifest
+++ b/xfce-extra/thunar-volman/Manifest
@@ -1,7 +1,5 @@
 DIST thunar-volman-0.8.1.tar.bz2 474769 BLAKE2B 2bf6378b35f0cd868cc7363909cc5d54a997a5a69758a27d45640968e3ef8d7cb3f5af185d1a8f83e8593610490a8566742070808ab85810cd3411856aa0030a SHA512 a82c019b028277d97e7903dcbeaf4704cb7fc1e95b0ea18c6290a7a8581355691990cbdb5fa0c234ed5dd51c1ba7f1bca9a495e60f9f8597a993845481113bb6
-DIST thunar-volman-0.9.1.tar.bz2 489210 BLAKE2B 4550c49f816438c0692c2afc2350423c9e07d165f58d9aa8f8ab56d0409e74900348ea2d188b07011a07b5c702a97f477a1d35f4d18bf47abff5bdd70ac115c0 SHA512 73d9884dc667e4f8554d2b06f7116bbe25fa4e113300f0cd32bc2229c22001cc709333d5ac5618f7d5c8a35e58fb7a61e48ecafa634c7e239e9af329dc4149bc
 DIST thunar-volman-0.9.2.tar.bz2 495324 BLAKE2B cf02e61d76804b0e1d407c9370daa3c4d0ceaf2c887dcf32a82cacd60e9befbdd7173338dbf025ee16fe3ea4e01c4bd4cd0b1c21452e389712bc103ffd02532d SHA512 808f3dfdf105911275b0c96705604bd1575cd9c5bddaaae96583949c995a3bc84a71ce154c05ed3ce395d4b4d78e4d67770f79b3226fd4a35c509f5e612de72f
 EBUILD thunar-volman-0.8.1-r1.ebuild 1073 BLAKE2B a0e04fdff65b2f1e4d47708d978c9cb59f5a2cd4057ac856582ca8b5edd82f313db8262878481601d68c3e6cbc690130637f6eabf2070194ba875ded4ce1c648 SHA512 88b8c5709347c550a83ce4a8f2c87aeb7253d1aab87cdcf7e2cb7b70356aca4ce692ec64076df64b041c9b6d08aeb413b6fdabde51c664b4f8d890930b39659a
-EBUILD thunar-volman-0.9.1.ebuild 1080 BLAKE2B c36b5cdbb7098f7cda2a5c38ddbc35088b1a83e07181998634e3160ca947415dc6ec76071453a945d2e0e332714729731f69dc918f04342d4b79f26d948f7590 SHA512 5a105c7d02cd36186627b10877d3f6695d4006a9429b47dcda3f531fb5356f68b7de5a96527e578e119a33b88c32f7761b329e0fccf04881d457c559ce9ca5b1
 EBUILD thunar-volman-0.9.2.ebuild 1080 BLAKE2B 5ce48977a2c8e0a4ac732709d0610483943cbc88db8c4014e6ce7f7a2b31490907f83d59c7435b957efb49deeac1b1655140b50c3030ce42012387ba49c92d98 SHA512 f0be8cbd706b336196874a27f27052f8de400f85d5cf668ff270792ba387e2623ce8d0eee079f2df5574bbe1a69341e3e564cdaf84da4e9cee18ed740868b5d1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.9.1.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.9.1.ebuild
deleted file mode 100644
index af502ff646d6..000000000000
--- a/xfce-extra/thunar-volman/thunar-volman-0.9.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Daemon that enforces volume-related policies"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-# CC for tvm-burn-cd.svg
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="libnotify"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30:=
-	virtual/libgudev:=
-	>=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:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/udev
-	>=xfce-base/thunar-1.6[udisks]"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-alsa-plugin/Manifest b/xfce-extra/xfce4-alsa-plugin/Manifest
index 5f2cc9b10bc8..be90c06beb4f 100644
--- a/xfce-extra/xfce4-alsa-plugin/Manifest
+++ b/xfce-extra/xfce4-alsa-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-alsa-plugin-0.1.1.tar.gz 126701 BLAKE2B a117a737023f0d4ef9473030f9a3e313a53687f4a4b049147be6a63320e346db3d0d2cafef55ff13546fdacab70f849acd1006f39b8606fc8a51323562214c08 SHA512 05273467944a08dd87455fcf20da0292899ace7254afcd2eb141c8d3f10996ad8ee08c6e61abb0178f65d52b066b0804e05a579d0a7f7e65b46fe5c4fd744fd7
 DIST xfce4-alsa-plugin-0.2.0.tar.gz 29283 BLAKE2B 42e93d0968e5275ae5c542b85907e45515eb5886f06675c3e25125796d6ae851540d377e4617c89903b3c8349b2ccdb5b49563f127b82ca7f249514819181c97 SHA512 1d4409aac80d2d0fd3022e8467f77b06df7d6e4bd31e69197caa89c2bf3c4347830054b550d0faf530eaafe05835192c915da36b987847687518e71997620e75
 EBUILD xfce4-alsa-plugin-0.1.1.ebuild 746 BLAKE2B 9bd19d11be77603ea98cb43136fe6b666e5946767f8255acdccd6b3e22fa7ccb01b36b3a7f7bc22a1154c56b5d4775d263488c6c3d4fbda5cfd6e07747c30f87 SHA512 45429f79fb29fe949e86f07daa79454282beb36b830f38b665539683d55db3f87aecf04f0049aab38c3578302efe8b5010b4bda0af07f07dd4634c2d82152843
-EBUILD xfce4-alsa-plugin-0.2.0.ebuild 668 BLAKE2B a94df285b97629406f9b4909b192977ab3e276e64b2a86cc2e9bfadaf4802317621b99378a9f9d002b0327c9e10c0b709323edb7abfec59935e7329d2a68ceed SHA512 3bc209af9c41c35b596911071f7206d4e73507a5ee393d38a4f159f9e19b1a568aab4dde4d450533aaa2095c4c0ce3fca82cbfcca7ade8933c1c90876d764d33
+EBUILD xfce4-alsa-plugin-0.2.0.ebuild 668 BLAKE2B ced0f4361ee3a9eb1eeb206bf34c83a77c83130bbb1a6e7ea2a371bf60d3ed538fb7bdc95d216a40fa35b0900426f510887d5d86e74204195eab4604f58e5101 SHA512 eafe8fd6a9f850e7ff6b150a4769656bb561ff39cd4812de0262382332f032bf99076e91fc3bfb3ea1ab25dddcf5515111afff91b1d6a350fa03a9a1c57c00b1
 MISC metadata.xml 330 BLAKE2B 73c387f918e801398808c85c8f8a3ee064dd4b4a1457c04ab2a7aa75065665427b931ecc198105e0a93a8f17bbce0801966659873c1b54a3c4d5e061821880ff SHA512 4348ea62b4041beca20200b351f0f3914b99c413ba18123f70345ef007a403aadc131f15ba535b6f4efbba745e6fa5b7851d74945d09236f36d000732fd34dba
diff --git a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.0.ebuild b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.0.ebuild
index c59e2c8fbfc8..c39931e05f59 100644
--- a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.0.ebuild
+++ b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(vala_depend)
-	dev-util/intltool
+	sys-devel/gettext
 "
 
 src_prepare() {
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 6edb2f16f6fd..4f77d826de06 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-cpugraph-plugin-1.0.5.tar.bz2 328972 BLAKE2B 7c39aa6fd9d0d6ecc5bedce1d99d330765c329d1fa673b61282fdea654ebd997caa118f57dd0776008584eaa2dbe0a6ae7df532ed3b941b03b111f5ae753d2e8 SHA512 3d1246958dd30638104f14a8b0078e25c05b67b42da953a97cb51d2b04e70d3f1da9d42ca4f4575b7114bce5abc4cb94d598737631536c0575b55d9a391e210a
+DIST xfce4-cpugraph-plugin-1.0.90.tar.bz2 386127 BLAKE2B ec1809f64fa2fc142aa6efec315e2c138b7b49261ecce4735cc0dce225c24c69013f4b2a4250dcdf1513029765d81cb757e0bb38ebb3bd024b5b07fe2e0475d0 SHA512 7f2be5b41948ba4c730e6fd58038e96044ef8d007ae55f107a434308bfffc99071706c92854e41a589a807913fb98b9b216c141fc1d37c744275d5a3944aee09
 EBUILD xfce4-cpugraph-plugin-1.0.5-r1.ebuild 816 BLAKE2B 02a7d506a7368ec6c39700f3b87def28e20a1a55812329b27444d650f6bdd0540dad2941cde8d31353e9382b69e9d8290ac0df471770eaa30adfc6a63fb133df SHA512 72e3664cff3909d98e6fa856a400e29230f738544b1506098e685970c1c3403c6ac81fde2ce97014346726b419df0707c0a6e322adf0a0aea58721aa2392b62b
+EBUILD xfce4-cpugraph-plugin-1.0.90.ebuild 817 BLAKE2B f09a905b38acf5b5b3c1fb1512c8ceaa6f759041a8a16e9d3bdd9fee8cfeb575e3a5d30e4f9fe8a7d8f60b78f4c7db1a46dc78a8cc03cec64cf29f4be957f49e SHA512 d65b56072dc31a0290c07a7152f9e587fda77cf9de0fec5ea456ce4aaa51bb20147625c55c3cc1cd18b1667951ec51824b39402f262e9fa7f4c876f480ca8ab1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.90.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.90.ebuild
new file mode 100644
index 000000000000..684e97eec64f
--- /dev/null
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.90.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A system load plug-in for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND=">=x11-libs/gtk+-3.22:3
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/xfce4-panel-4.12:="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index f6693bb8e98c..e0080e15cb7d 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-screenshooter-1.9.3.tar.bz2 502188 BLAKE2B 93b60422eb6cef23b4d1f29fca49370cead8f74c4ee27ea4abf2bb9b4fa006f1dd9e39ccc87c1d915a5e7cc902245caff4b7778b801436a1c25893f46e35f3fb SHA512 ba59fdca3900143a50b3b858986b1152d4574d302d2e041a5287933427a67f64542ca691c130030937344433ea893a1f082086f9c02a9edccaeedbdc0a2a50a2
 DIST xfce4-screenshooter-1.9.5.tar.bz2 502423 BLAKE2B b71dd5d016ff86ea5b654264dca129fd1b9316a0d0f2926a40556448c11a51992e4921c3ff9da952ac5e2962cf5baa18df8a110127cb68e89ee1b1cb2252bb7a SHA512 e5797a6defa4df94c552e8ff39b21f4203b6795669e8145ea5ef609fc7b29bcfa846b19b253b39b12ab0e6c130c7f9e67dd5aa628cefe9b063fb9f74dd2c3ee1
-EBUILD xfce4-screenshooter-1.9.3.ebuild 1118 BLAKE2B f9574ff232b9e90d200d7cc582a5fb7b11b5cf8770a29614e9d7e79f407d83aa72cd91fff3f98f04c9b71a91e5bc77ec57a89e39d599a12ae2f3b15da42880a1 SHA512 e52ee4cc5614e9c5e30739fb4cef250917268bfb2aca746c0b0f7272c21fcef50a67f68b81993c9b2b1134c127f2fec73509380cf1da58f886472a888f27e541
-EBUILD xfce4-screenshooter-1.9.5.ebuild 1139 BLAKE2B bad0b028025759a42bf98f911a04fc74a50600f54feaa9d8fa4252f7d808f76a72b71bb098356d9abd778e96bf1eee7e5a6975a3d71a812832e47c0b587a4260 SHA512 aa045723fe9ab7cae0baee0a357b919bcd8cd202bdb4e35990cc51f7007849b82874bdfcb234b4ca0a671d7f757e877689f6a2b8866ea22520a6e5a7647fe879
+EBUILD xfce4-screenshooter-1.9.5.ebuild 1138 BLAKE2B f22fee31aaee1cfe8292c30d2a8316c1bacce636466b884813484ba9d2f5f0c692f7cdb40ceddf77f4b72f4f1be80b5b3bdd0220b75335556c55f15281abf2a4 SHA512 3f242719f4e19c64249b4f287bb70a4c73ef0ab0c6f6e598780a39db93f6ebe2113868cd010c6b2b384305b55a1e5e03edb59ad77efce63ac20d3d90c513fc6d
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild
deleted file mode 100644
index e054e96d8ddb..000000000000
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Xfce4 screenshooter application and panel plugin"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-screenshooter"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16:=
-	>=net-libs/libsoup-2.26:=
-	>=x11-libs/gdk-pixbuf-2.16:=
-	>=x11-libs/gtk+-3.20:3=
-	dev-libs/libxml2:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--enable-xfixes
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.5.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.5.ebuild
index 50ab11016b06..591249fba2b1 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.5.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16:=
diff --git a/xfce-extra/xfce4-windowck-plugin/Manifest b/xfce-extra/xfce4-windowck-plugin/Manifest
index f93dd370e351..71315fac49b8 100644
--- a/xfce-extra/xfce4-windowck-plugin/Manifest
+++ b/xfce-extra/xfce4-windowck-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-windowck-plugin-0.4.5.tar.gz 68762 BLAKE2B c4fdc900d16d668f06cc2c115c31df6d587ac7a833627b77145df4843497617a81acd508fbf5c54f9a443f4b2eaccf4ff86a445cbb83fbed068204c21f3354d2 SHA512 2750af17892e9083b0d359deb477688144b187b94dd0c8b50e4e88ed125631e7c6bf45a040cd036a9f09d1b8ce242a8d01a572eb9151258bb78c63e4744d367d
 DIST xfce4-windowck-plugin-0.4.6.tar.gz 67622 BLAKE2B 38a1ff76a75b3eb833be586bf93bc9bd73b7237e74cf06fd7540fef85befa4ef9ad8c8351d1d2bfad4af1f342c59b1cb0ebb94e50a3f5cc9c38c5fe9f0377d86 SHA512 a02f6f1b275484dc7ed08f3f9868af7a456c9f3b52bb893c2ac109a0ca8c4376e9d6d714f40d40c491531584486c8be3bebf3669f3186a143f6fcfe923b9f376
-EBUILD xfce4-windowck-plugin-0.4.5.ebuild 1135 BLAKE2B c01992f1f012288e33dd7bc5e0b93defa4cca50c534d68445b57ce041d6f67050aa63842779d601d2164d4f39acb4dacbe5c517485870de80ee4f7039ae9ac4c SHA512 d1de20aa74e43603af6a2ee4b859582633be8f5d26f712cceea88c64e552d271937e3018280c2747978d49ede13e9f7aca8ba16744a56b08df1fc417ab29eb0a
 EBUILD xfce4-windowck-plugin-0.4.6.ebuild 1135 BLAKE2B c01992f1f012288e33dd7bc5e0b93defa4cca50c534d68445b57ce041d6f67050aa63842779d601d2164d4f39acb4dacbe5c517485870de80ee4f7039ae9ac4c SHA512 d1de20aa74e43603af6a2ee4b859582633be8f5d26f712cceea88c64e552d271937e3018280c2747978d49ede13e9f7aca8ba16744a56b08df1fc417ab29eb0a
 MISC metadata.xml 344 BLAKE2B da3508bca7f277819a0903ab1680228f3f9142917f12ddef21086d5a41460b2da0ee494d012fe56414d957c0ccc0c08e323ad7da5009b37a1ebceedcb0b5656e SHA512 4b9ae50a2d6e8b5f3b1e35330c22e4ae5173ca6c5fab8e5d9182a7ca0de8fba3ee8c07c90933b28f4823063009b584e30c471bbbf88113c7cd13a44275aade20
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.5.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.5.ebuild
deleted file mode 100644
index 48bc0eb09e84..000000000000
--- a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit autotools python-any-r1 xdg-utils
-
-DESCRIPTION="Xfce plugin puts the maximized window title and windows buttons on the panel"
-HOMEPAGE="https://github.com/cedl38/xfce4-windowck-plugin"
-SRC_URI="https://github.com/cedl38/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=x11-libs/libwnck-2.30:1
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.10:="
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/intltool
-	dev-util/xfce4-dev-tools
-	media-gfx/imagemagick[png]
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# run xdt-autogen from xfce4-dev-tools added as dependency by EAUTORECONF=1 to
-	# rename configure.ac.in to configure.ac while grabbing $LINGUAS and $REVISION values
-	NOCONFIGURE=1 xdt-autogen || die
-
-	default
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}